WIP

code/modules/clothing/head/hardhat.dm

@@ -16,6 +16,11 @@
 
 	dog_fashion = /datum/dog_fashion/head
 
+
+/obj/item/clothing/head/hardhat/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/update_icon_updates_onmob)
+
 /obj/item/clothing/head/hardhat/attack_self(mob/living/user)
 	toggle_helmet_light(user)
 
@@ -27,15 +32,9 @@
 		turn_off(user)
 	update_icon()
 
-/obj/item/clothing/head/hardhat/update_icon()
+/obj/item/clothing/head/hardhat/update_icon_state()
 	icon_state = "hardhat[on]_[item_color]"
 	item_state = "hardhat[on]_[item_color]"
-	if(ishuman(loc))
-		var/mob/living/carbon/human/H = loc
-		H.update_inv_head()
-	for(var/X in actions)
-		var/datum/action/A = X
-		A.UpdateButtonIcon(force = TRUE)
 
 /obj/item/clothing/head/hardhat/proc/turn_on(mob/user)
 	set_light(brightness_on, power_on)
@@ -132,11 +131,10 @@
 		if(!up)
 			. += mutable_appearance('icons/mob/head.dmi', "weldvisor")
 
-/obj/item/clothing/head/hardhat/weldhat/update_icon()
-	cut_overlays()
+/obj/item/clothing/head/hardhat/weldhat/update_overlays()
+	. = ..()
 	if(!up)
-		add_overlay("weldvisor")
-	..()
+		. += "weldvisor"
 
 /obj/item/clothing/head/hardhat/weldhat/orange
 	icon_state = "hardhat0_orange"

code/modules/clothing/head/helmet.dm

@@ -258,7 +258,11 @@
 
 //LightToggle
 
-/obj/item/clothing/head/helmet/update_icon()
+/obj/item/clothing/head/helment/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/update_icon_updates_onmob)
+
+/obj/item/clothing/head/helmet/update_icon_state()
 	var/state = "[initial(icon_state)]"
 	if(F)
 		if(F.on)
@@ -268,10 +272,6 @@
 
 	icon_state = state
 
-	if(ishuman(loc))
-		var/mob/living/carbon/human/H = loc
-		H.update_inv_head()
-
 /obj/item/clothing/head/helmet/ui_action_click(mob/user, action)
 	if(istype(action, /datum/action/item_action/toggle_helmet_flashlight))
 		toggle_helmlight()

code/modules/clothing/head/misc_special.dm

@@ -197,16 +197,19 @@
 	. = ..()
 	update_icon()
 
-/obj/item/clothing/head/wig/update_icon()
-	cut_overlays()
+/obj/item/clothing/head/wig/update_icon_state()
 	var/datum/sprite_accessory/S = GLOB.hair_styles_list[hair_style]
 	if(!S)
+		icon = 'icons/obj/clothing/hats.dmi'
 		icon_state = "pwig"
-	else
-		var/mutable_appearance/M = mutable_appearance(S.icon,S.icon_state)
+
+/obj/item/clothing/head/wig/update_overlays()
+	. = ..()
+	var/datum/sprite_accessory/S = GLOB.hair_styles_list[hair_style]
+	if(S)
+		var/mutable_appearance/M = mutable_appearance(S.icon, S.icon_state, color = hair_color)
 		M.appearance_flags |= RESET_COLOR
-		M.color = hair_color
-		add_overlay(M)
+		. += M
 
 /obj/item/clothing/head/wig/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE)
 	. = list()