diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 2942fb0f251..ba3319ff23e 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -2,10 +2,7 @@
 	name = "helmet"
 	desc = "Reinforced headgear. Protects the head from impacts."
 	icon_state = "helmet"
-	item_state_slots = list(
-		slot_l_hand_str = "helmet",
-		slot_r_hand_str = "helmet",
-		)
+	item_state = "helmet"
 	valid_accessory_slots = list(ACCESSORY_SLOT_HELM_C, ACCESSORY_SLOT_HELM_H)
 	restricted_accessory_slots = list(ACCESSORY_SLOT_HELM_C, ACCESSORY_SLOT_HELM_H)
 	item_flags = ITEM_FLAG_THICKMATERIAL
diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm
index d2b794c4aba..60472304dc6 100644
--- a/code/modules/clothing/spacesuits/spacesuits.dm
+++ b/code/modules/clothing/spacesuits/spacesuits.dm
@@ -5,13 +5,10 @@
 /obj/item/clothing/head/helmet/space
 	name = "Space helmet"
 	icon_state = "space"
+	item_state = "space"
 	desc = "A special helmet designed for work in a hazardous, low-pressure environment."
 	item_flags = ITEM_FLAG_STOPPRESSUREDAMAGE | ITEM_FLAG_THICKMATERIAL | ITEM_FLAG_AIRTIGHT
 	flags_inv = BLOCKHAIR
-	item_state_slots = list(
-		slot_l_hand_str = "s_helmet",
-		slot_r_hand_str = "s_helmet",
-		)
 	permeability_coefficient = 0
 	armor = list(melee = 40, bullet = 10, laser = 35,energy = 15, bomb = 0, bio = 100)
 	coverage = 1.0
diff --git a/code/modules/clothing/spacesuits/void/_void.dm b/code/modules/clothing/spacesuits/void/_void.dm
index f69a8665c9b..8ab7ca9a9fd 100644
--- a/code/modules/clothing/spacesuits/void/_void.dm
+++ b/code/modules/clothing/spacesuits/void/_void.dm
@@ -3,6 +3,7 @@
 	name = "void helmet"
 	desc = "A high-tech dark red space suit helmet. Used for AI satellite maintenance."
 	icon_state = "void"
+	item_state = "void"
 
 	heat_protection = HEAD
 	armor = list(melee = 40, bullet = 20, laser = 35,energy = 15, bomb = 35, bio = 100)
diff --git a/code/modules/clothing/spacesuits/void/security.dm b/code/modules/clothing/spacesuits/void/security.dm
index eb945705dbd..78041cad28c 100644
--- a/code/modules/clothing/spacesuits/void/security.dm
+++ b/code/modules/clothing/spacesuits/void/security.dm
@@ -51,10 +51,10 @@
 	light_overlay = "helmet_light_dual"
 
 /obj/item/clothing/suit/space/void/security/hos
-	icon_state = "sechos_voidsuit"
-	item_state = "sechos_voidsuit"
 	name = "security commander voidsuit"
 	desc = "A heavily armored voidsuit. Gold trimming shows who's the boss here, while heavy pauldrons and kama make it extra durable."
+	icon_state = "sechos_voidsuit"
+	item_state = "sechos_voidsuit"
 	armor = list(melee = 80, bullet = 120, laser = 90, energy = 35, bomb = 45, bio = 100)
 	allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/melee/baton)
 
diff --git a/icons/inv_slots/hats/hand_l_default.dmi b/icons/inv_slots/hats/hand_l_default.dmi
index 0e77035c322..1a20e1b7e72 100644
Binary files a/icons/inv_slots/hats/hand_l_default.dmi and b/icons/inv_slots/hats/hand_l_default.dmi differ
diff --git a/icons/inv_slots/hats/hand_r_default.dmi b/icons/inv_slots/hats/hand_r_default.dmi
index d631f8e0d24..aa6a5d16115 100644
Binary files a/icons/inv_slots/hats/hand_r_default.dmi and b/icons/inv_slots/hats/hand_r_default.dmi differ