diff --git a/code/defines/obj/clothing/head.dm b/code/defines/obj/clothing/head.dm
index e3c22b16014..8bb91355159 100644
--- a/code/defines/obj/clothing/head.dm
+++ b/code/defines/obj/clothing/head.dm
@@ -175,8 +175,10 @@
 /obj/item/clothing/head/helmet/space/engineering
 	name = "Engineering space helmet"
 	desc = "A special helmet designed for work in a hazardous, low-pressure environment. Painted in Engineering Orange to designate its department of origin."
-	icon_state = "helm-orange"
+	icon_state = "helm_engineering0"
 	item_state = "helm-orange"
+	var/brightness_on = 4
+	var/on = 0
 	radiation_protection = 0.25
 	armor = list(melee = 40, bullet = 30, laser = 20, taser = 5, bomb = 35, bio = 50, rad = 50)
 
@@ -191,8 +193,10 @@
 /obj/item/clothing/head/helmet/space/command/chief_engineer
 	name = "Chief engineer space helmet"
 	desc = "A special helmet designed to work in a hazardous, low-pressure environment. Bears the insignia of the chief engineer."
-	icon_state = "helm-ce"
+	icon_state = "helm_ce0"
 	item_state = "helm-ce"
+	var/brightness_on = 4
+	var/on = 0
 
 /obj/item/clothing/head/helmet/space/command/chief_medical_officer
 	name = "Chief medical offier space helmet"
diff --git a/code/game/objects/devices/flashlight.dm b/code/game/objects/devices/flashlight.dm
index 58a0bc399f4..96efa242359 100644
--- a/code/game/objects/devices/flashlight.dm
+++ b/code/game/objects/devices/flashlight.dm
@@ -82,4 +82,68 @@
 /obj/item/clothing/head/helmet/hardhat/dropped(mob/user)
 	if(on)
 		user.sd_SetLuminosity(user.luminosity - brightness_on)
+		src.sd_SetLuminosity(brightness_on)
+
+/obj/item/clothing/head/helmet/space/engineering/verb/toggle()
+	set name = "Toggle Helmet Light"
+	set category = "Object"
+	on = !on
+	icon_state = "helm_engineering[on]"
+
+	if(on)
+		usr.sd_SetLuminosity(usr.luminosity + brightness_on)
+	else
+		usr.sd_SetLuminosity(usr.luminosity - brightness_on)
+
+/obj/item/clothing/head/helmet/space/engineering/attack_self(mob/user)
+	on = !on
+	icon_state = "helm_engineering[on]"
+
+	if(on)
+		user.sd_SetLuminosity(user.luminosity + brightness_on)
+	else
+		user.sd_SetLuminosity(user.luminosity - brightness_on)
+
+/obj/item/clothing/head/helmet/space/engineering/pickup(mob/user)
+	if(on)
+		src.sd_SetLuminosity(0)
+		usr.sd_SetLuminosity(usr.luminosity + brightness_on)
+
+
+
+/obj/item/clothing/head/helmet/space/engineering/dropped(mob/user)
+	if(on)
+		usr.sd_SetLuminosity(usr.luminosity - brightness_on)
+		src.sd_SetLuminosity(brightness_on)
+
+/obj/item/clothing/head/helmet/space/command/chief_engineer/verb/toggle()
+	set name = "Toggle Helmet Light"
+	set category = "Object"
+	on = !on
+	icon_state = "helm_ce[on]"
+
+	if(on)
+		usr.sd_SetLuminosity(usr.luminosity + brightness_on)
+	else
+		usr.sd_SetLuminosity(usr.luminosity - brightness_on)
+
+/obj/item/clothing/head/helmet/space/command/chief_engineer/attack_self(mob/user)
+	on = !on
+	icon_state = "helm_ce[on]"
+
+	if(on)
+		user.sd_SetLuminosity(user.luminosity + brightness_on)
+	else
+		user.sd_SetLuminosity(user.luminosity - brightness_on)
+
+/obj/item/clothing/head/helmet/space/command/chief_engineer/pickup(mob/user)
+	if(on)
+		src.sd_SetLuminosity(0)
+		usr.sd_SetLuminosity(usr.luminosity + brightness_on)
+
+
+
+/obj/item/clothing/head/helmet/space/command/chief_engineer/dropped(mob/user)
+	if(on)
+		usr.sd_SetLuminosity(usr.luminosity - brightness_on)
 		src.sd_SetLuminosity(brightness_on)
\ No newline at end of file
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 138445d5280..8e01f44c89c 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 2fc44640ff9..d23fa0cad43 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ