diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index ee42be94315..3b1ef103d98 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -17,6 +17,7 @@
 	var/smile = FALSE
 	var/smile_color = "#FF0000"
 	var/visor_icon = "envisor"
+	var/light_icon = "enlight"
 	var/smile_state = "envirohelm_smile"
 
 	dyeable = TRUE
@@ -54,13 +55,13 @@
 /obj/item/clothing/head/helmet/space/plasmaman/update_icon_state()
 	if(!up)
 		icon_state = base_icon_state
-	else
-		icon_state = "[base_icon_state][on ? "-light":""]"
 
 /obj/item/clothing/head/helmet/space/plasmaman/update_overlays()
 	. = ..()
 	if(!up)
 		. += visor_icon
+	else if(on)
+		. += light_icon
 
 /obj/item/clothing/head/helmet/space/plasmaman/attack_self__legacy__attackchain(mob/user)
 	toggle_light(user)
@@ -205,6 +206,7 @@
 	icon_state = "prototype_envirohelm"
 	actions_types = list(/datum/action/item_action/toggle_welding_screen/plasmaman)
 	visor_icon = "prototype_envisor"
+	light_icon = "prototype_enlight"
 
 /obj/item/clothing/head/helmet/space/plasmaman/botany
 	name = "botany plasma envirosuit helmet"
@@ -221,12 +223,14 @@
 	desc = "The makeup is painted on, it's a miracle it doesn't chip. It's not very colourful."
 	icon_state = "mime_envirohelm"
 	visor_icon = "mime_envisor"
+	light_icon = "mime_envirohelm-light"
 
 /obj/item/clothing/head/helmet/space/plasmaman/clown
 	name = "clown envirosuit helmet"
 	desc = "The makeup is painted on, it's a miracle it doesn't chip. <i>'HONK!'</i>"
 	icon_state = "clown_envirohelm"
 	visor_icon = "clown_envisor"
+	light_icon = "clown_envirohelm-light"
 
 /obj/item/clothing/head/helmet/space/plasmaman/hop
 	name = "head of personnel's envirosuit helmet"
@@ -247,6 +251,7 @@
 	name = "wizard plasma envirosuit helmet"
 	desc = "A magical plasmaman containment helmet designed to spread chaos in safety and comfort."
 	icon_state = "wizard_envirohelm"
+	light_icon = "wizard_enlight"
 	gas_transfer_coefficient = 0.01
 	armor = list(MELEE = 20, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 10, RAD = 10, FIRE = INFINITY, ACID = INFINITY)
 	resistance_flags = FIRE_PROOF | ACID_PROOF
@@ -261,12 +266,14 @@
 	name = "coke envirosuit helmet"
 	desc = "A plasmaman envirohelm designed by Space Cola Co for the plasmamen."
 	icon_state = "coke_envirohelm"
+	light_icon = "coke_enlight"
 
 /obj/item/clothing/head/helmet/space/plasmaman/tacticool
 	name = "diver envirosuit helmet"
 	desc = "A plasmaman helm resembling old diver helms."
 	icon_state = "diver_envirohelm"
 	base_icon_state = "diver_envirohelm"
+	light_icon = "diver_enlight"
 	/// Different icons and names for the helm to use when reskinning
 	var/list/static/plasmaman_helm_options = list("Diver" = "diver_envirohelm", "Knight" = "knight_envirohelm", "Skull" = "skull_envirohelm")
 	/// Checks if the helm has been reskinned already
@@ -298,16 +305,19 @@
 			name = initial(name)
 			desc = initial(desc)
 			base_icon_state = initial(base_icon_state)
+			light_icon = initial(light_icon)
 		if("Knight")
 			name = "knight envirosuit helmet"
 			desc = "A plasmaman envirohelm designed in the shape of a knight helm."
 			base_icon_state = "knight_envirohelm"
 			visor_icon = "knight_envisor"
+			light_icon = "knight_enlight"
 		if("Skull")
 			name = "skull envirosuit helmet"
 			desc = "A plasmaman envirohelm designed in the shape of a skull."
 			base_icon_state = "skull_envirohelm"
 			visor_icon = "skull_envisor"
+			light_icon = "skull_enlight"
 	update_icon()
 	M.update_inv_head()
 	reskinned = TRUE
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 22d4dc98cc8..0a1932d6a77 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -1567,6 +1567,7 @@
 /// LightFire53: Ikelos
 /obj/item/clothing/head/helmet/space/plasmaman/lf53_fluff
 	icon_state = "ikelos_envirohelm" // New item needed because `initial(icon_state)` is used.
+	light_icon = "ikelos_envirohelm-light"
 	icon = 'icons/obj/custom_items.dmi'
 
 /// Xerdies: Squiddle Toodle
diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm
index 2ed8bc75f87..7fb4ac3e404 100644
--- a/code/modules/mob/living/carbon/human/human_update_icons.dm
+++ b/code/modules/mob/living/carbon/human/human_update_icons.dm
@@ -816,6 +816,8 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
 			var/obj/item/clothing/head/helmet/space/plasmaman/P = head
 			if(!P.up)
 				standing.overlays += P.visor_icon
+			else if(P.on && P.light_icon)
+				standing.overlays += P.light_icon
 
 		if(istype(head, /obj/item/clothing/head))
 			var/obj/item/clothing/head/w_hat = head
diff --git a/icons/mob/clothing/species/plasmaman/helmet.dmi b/icons/mob/clothing/species/plasmaman/helmet.dmi
index 3f37af0b2a0..ca375086a79 100644
Binary files a/icons/mob/clothing/species/plasmaman/helmet.dmi and b/icons/mob/clothing/species/plasmaman/helmet.dmi differ
diff --git a/icons/obj/clothing/species/plasmaman/hats.dmi b/icons/obj/clothing/species/plasmaman/hats.dmi
index 51d946d6028..3069551ab41 100644
Binary files a/icons/obj/clothing/species/plasmaman/hats.dmi and b/icons/obj/clothing/species/plasmaman/hats.dmi differ