diff --git a/massmeta/code/modules/clothing/suits/wiz_robe.dm b/massmeta/code/modules/clothing/suits/wiz_robe.dm
index 5b3e1d2a00c99..2e58cfc49a735 100644
--- a/massmeta/code/modules/clothing/suits/wiz_robe.dm
+++ b/massmeta/code/modules/clothing/suits/wiz_robe.dm
@@ -3,8 +3,8 @@
 /obj/item/clothing/suit/space/hardsuit/shielded/wizard
 	name = "battlemage armour"
 	desc = "Not all wizards are afraid of getting up close and personal."
-	icon_state = "battlemage"
-	inhand_icon_state = "battlemage"
+	icon_state = "hardsuit-wiz"
+	inhand_icon_state = "wiz_hardsuit"
 	min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
 	max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/wizard
@@ -19,8 +19,8 @@
 /obj/item/clothing/head/helmet/space/hardsuit/shielded/wizard
 	name = "battlemage helmet"
 	desc = "A suitably impressive helmet."
-	icon_state = "battlemage"
-	inhand_icon_state = "battlemage"
+	icon_state = "hardsuit-wiz"
+	inhand_icon_state = "wiz_hardsuit"
 	min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
 	max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
 	armor_type = /datum/armor/hardsuit_wizard_shielded
diff --git a/massmeta/features/hardsuits/code/hardsuit.dm b/massmeta/features/hardsuits/code/hardsuit.dm
index 951c83ec972b8..7c1acfde9e855 100644
--- a/massmeta/features/hardsuits/code/hardsuit.dm
+++ b/massmeta/features/hardsuits/code/hardsuit.dm
@@ -4,6 +4,8 @@
 /obj/item/clothing/suit/space/hardsuit
 	name = "hardsuit"
 	desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding."
+	lefthand_file = 'massmeta/features/hardsuits/icons/clothing_lefthand.dmi'
+	righthand_file = 'massmeta/features/hardsuits/icons/clothing_righthand.dmi'
 	icon = 'massmeta/features/hardsuits/icons/suits.dmi'
 	worn_icon = 'massmeta/features/hardsuits/icons/suit.dmi'
 	icon_state = "hardsuit-engineering"
@@ -592,7 +594,7 @@
 	toggle_hardsuit_mode(user)
 	if(iscarbon(user))
 		var/mob/living/carbon/C = user
-		C.update_worn_head(src, forced = 1)
+		C.update_worn_head()
 	icon_state = "hardsuit[on]-[hardsuit_type]"
 	worn_icon_state = "hardsuit[on]-[hardsuit_type]"
 	user.update_worn_head()
@@ -937,7 +939,7 @@
 /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal
 	name = "paranormal response team helmet"
 	desc = "A helmet worn by those who deal with paranormal threats for a living."
-	icon_state = "hardsuit0-prt"
+	icon_state = "hardsuit0-inq"
 	inhand_icon_state = "hardsuit0-prt"
 	hardsuit_type = "prt"
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
diff --git a/massmeta/features/hardsuits/icons/clothing_lefthand.dmi b/massmeta/features/hardsuits/icons/clothing_lefthand.dmi
new file mode 100644
index 0000000000000..1b2b577bf577f
Binary files /dev/null and b/massmeta/features/hardsuits/icons/clothing_lefthand.dmi differ
diff --git a/massmeta/features/hardsuits/icons/clothing_righthand.dmi b/massmeta/features/hardsuits/icons/clothing_righthand.dmi
new file mode 100644
index 0000000000000..c4a6284f334e2
Binary files /dev/null and b/massmeta/features/hardsuits/icons/clothing_righthand.dmi differ