diff --git a/code/game/gamemodes/changeling/powers/armor.dm b/code/game/gamemodes/changeling/powers/armor.dm
index b27b0ef523..87a3eee449 100644
--- a/code/game/gamemodes/changeling/powers/armor.dm
+++ b/code/game/gamemodes/changeling/powers/armor.dm
@@ -2,7 +2,7 @@
 	name = "Organic Space Suit"
 	desc = "We grow an organic suit to protect ourselves from space exposure."
 	helptext = "To remove the suit, use the ability again."
-	ability_icon_state = "ling_space_suit"
+	ability_icon_state = "lingspacesuit"
 	genomecost = 1
 	verbpath = /mob/proc/changeling_spacesuit
 
@@ -17,7 +17,7 @@
 	name = "Chitinous Spacearmor"
 	desc = "We turn our skin into tough chitin to protect us from damage and space exposure."
 	helptext = "To remove the armor, use the ability again."
-	ability_icon_state = "ling_armor"
+	ability_icon_state = "lingarmor"
 	genomecost = 3
 	verbpath = /mob/proc/changeling_spacearmor
 
@@ -34,7 +34,6 @@
 /obj/item/clothing/suit/space/changeling
 	name = "flesh mass"
 	icon_state = "lingspacesuit"
-	item_state = "lingspacehelmet"
 	desc = "A huge, bulky mass of pressure and temperature-resistant organic tissue, evolved to facilitate space travel."
 	flags = STOPPRESSUREDAMAGE			 //Not THICKMATERIAL because it's organic tissue, so if somebody tries to inject something into it,
 										//it still ends up in your blood. (also balance but muh fluff)
@@ -55,7 +54,6 @@
 /obj/item/clothing/head/helmet/space/changeling
 	name = "flesh mass"
 	icon_state = "lingspacehelmet"
-	item_state = "lingspacehelmet"
 	desc = "A covering of pressure and temperature-resistant organic tissue with a glass-like chitin front."
 	flags = BLOCKHAIR | STOPPRESSUREDAMAGE //Again, no THICKMATERIAL.
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
diff --git a/code/game/gamemodes/technomancer/equipment.dm b/code/game/gamemodes/technomancer/equipment.dm
index efec413e30..2e0fe3833a 100644
--- a/code/game/gamemodes/technomancer/equipment.dm
+++ b/code/game/gamemodes/technomancer/equipment.dm
@@ -82,8 +82,7 @@
 /obj/item/weapon/storage/belt/holding
 	name = "Belt of Holding"
 	desc = "Can hold more than you'd expect."
-	icon_state = "emsbelt"
-	item_state = "emsbelt"
+	icon_state = "ems"
 	max_w_class = 3		// Can hold normal sized items.
 	storage_slots = 14	// Twice the capacity of a typical belt.
 	max_storage_space = 42
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 97fea878ea..cdbf477101 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -214,25 +214,25 @@
 	name = "virologist satchel"
 	desc = "A sterile satchel with virologist colours."
 	icon_state = "satchel-vir"
-	item_state_slots = list(slot_r_hand_str = "medicalpack", slot_l_hand_str = "medicalpack")
+	item_state_slots = list(slot_r_hand_str = "viropack", slot_l_hand_str = "viropack")
 
 /obj/item/weapon/storage/backpack/satchel/chem
 	name = "chemist satchel"
 	desc = "A sterile satchel with chemist colours."
 	icon_state = "satchel-chem"
-	item_state_slots = list(slot_r_hand_str = "medicalpack", slot_l_hand_str = "medicalpack")
+	item_state_slots = list(slot_r_hand_str = "chempack", slot_l_hand_str = "chempack")
 
 /obj/item/weapon/storage/backpack/satchel/gen
 	name = "geneticist satchel"
 	desc = "A sterile satchel with geneticist colours."
 	icon_state = "satchel-gen"
-	item_state_slots = list(slot_r_hand_str = "medicalpack", slot_l_hand_str = "medicalpack")
+	item_state_slots = list(slot_r_hand_str = "genpack", slot_l_hand_str = "genpack")
 
 /obj/item/weapon/storage/backpack/satchel/tox
 	name = "scientist satchel"
 	desc = "Useful for holding research materials."
 	icon_state = "satchel-tox"
-	item_state_slots = list(slot_r_hand_str = "medicalpack", slot_l_hand_str = "medicalpack")
+	item_state_slots = list(slot_r_hand_str = "toxpack", slot_l_hand_str = "toxpack")
 
 /obj/item/weapon/storage/backpack/satchel/sec
 	name = "security satchel"
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index d2556917a4..08c7c56f4f 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -2,7 +2,7 @@
 	name = "belt"
 	desc = "Can hold various things."
 	icon = 'icons/obj/clothing/belts.dmi'
-	icon_state = "utilitybelt"
+	icon_state = "utility"
 	storage_slots = 7
 	max_storage_space = 28 //This should ensure belts always have enough room to store whatever.
 	max_w_class = 3
@@ -27,11 +27,10 @@
 		var/mob/M = src.loc
 		M.update_inv_belt()
 
-
 /obj/item/weapon/storage/belt/utility
 	name = "tool-belt" //Carn: utility belt is nicer, but it bamboozles the text parsing.
 	desc = "Can hold various tools."
-	icon_state = "utilitybelt"
+	icon_state = "utility"
 	can_hold = list(
 		///obj/item/weapon/combitool,
 		/obj/item/weapon/crowbar,
@@ -59,7 +58,6 @@
 		/obj/item/weapon/tape_roll,
 		)
 
-
 /obj/item/weapon/storage/belt/utility/full/New()
 	..()
 	new /obj/item/weapon/screwdriver(src)
@@ -69,7 +67,6 @@
 	new /obj/item/weapon/wirecutters(src)
 	new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange"))
 
-
 /obj/item/weapon/storage/belt/utility/atmostech/New()
 	..()
 	new /obj/item/weapon/screwdriver(src)
@@ -79,12 +76,10 @@
 	new /obj/item/weapon/wirecutters(src)
 	new /obj/item/device/t_scanner(src)
 
-
-
 /obj/item/weapon/storage/belt/medical
 	name = "medical belt"
 	desc = "Can hold various medical equipment."
-	icon_state = "medicalbelt"
+	icon_state = "medical"
 	can_hold = list(
 		/obj/item/device/healthanalyzer,
 		/obj/item/weapon/dnainjector,
@@ -115,12 +110,12 @@
 /obj/item/weapon/storage/belt/medical/emt
 	name = "EMT utility belt"
 	desc = "A sturdy black webbing belt with attached pouches."
-	icon_state = "emsbelt"
+	icon_state = "ems"
 
 /obj/item/weapon/storage/belt/security
 	name = "security belt"
 	desc = "Can hold security gear like handcuffs and flashes."
-	icon_state = "securitybelt"
+	icon_state = "security"
 	max_w_class = 3
 	can_hold = list(
 		/obj/item/weapon/grenade,
@@ -150,7 +145,7 @@
 /obj/item/weapon/storage/belt/detective
 	name = "forensic utility belt"
 	desc = "A belt for holding forensics equipment."
-	icon_state = "securitybelt"
+	icon_state = "security"
 	storage_slots = 7
 	max_w_class = 3
 	can_hold = list(
@@ -190,7 +185,7 @@
 /obj/item/weapon/storage/belt/soulstone
 	name = "soul stone belt"
 	desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away"
-	icon_state = "soulstonebelt"
+	icon_state = "soulstone"
 	storage_slots = 6
 	can_hold = list(
 		/obj/item/device/soulstone
@@ -209,7 +204,7 @@
 /obj/item/weapon/storage/belt/champion
 	name = "championship belt"
 	desc = "Proves to the world that you are the strongest!"
-	icon_state = "championbelt"
+	icon_state = "champion"
 	storage_slots = 1
 	can_hold = list(
 		"/obj/item/clothing/mask/luchador"
@@ -218,7 +213,7 @@
 /obj/item/weapon/storage/belt/security/tactical
 	name = "combat belt"
 	desc = "Can hold security gear like handcuffs and flashes, with more pouches for more storage."
-	icon_state = "swatbelt"
+	icon_state = "swat"
 	storage_slots = 9
 	max_w_class = 3
 	max_storage_space = 28
@@ -231,7 +226,7 @@
 /obj/item/weapon/storage/belt/janitor
 	name = "janitorial belt"
 	desc = "A belt used to hold most janitorial supplies."
-	icon_state = "janibelt"
+	icon_state = "janitor"
 	storage_slots = 7
 	max_w_class = 3
 	can_hold = list(
@@ -250,4 +245,33 @@
 		/obj/item/taperoll,
 		/obj/item/weapon/reagent_containers/spray,
 		/obj/item/weapon/soap
+		)
+
+/obj/item/weapon/storage/belt/archaeology
+	name = "excavation gear-belt"
+	desc = "Can hold various excavation gear."
+	icon_state = "gear"
+	can_hold = list(
+		/obj/item/weapon/storage/box/samplebags,
+		/obj/item/device/core_sampler,
+		/obj/item/device/beacon_locator,
+		/obj/item/device/radio/beacon,
+		/obj/item/device/gps,
+		/obj/item/device/measuring_tape,
+		/obj/item/device/flashlight,
+		/obj/item/weapon/pickaxe,
+		/obj/item/device/depth_scanner,
+		/obj/item/device/camera,
+		/obj/item/weapon/paper,
+		/obj/item/weapon/photo,
+		/obj/item/weapon/folder,
+		/obj/item/weapon/pen,
+		/obj/item/weapon/folder,
+		/obj/item/weapon/clipboard,
+		/obj/item/weapon/anodevice,
+		/obj/item/clothing/glasses,
+		/obj/item/weapon/wrench,
+		/obj/item/weapon/storage/box/excavation,
+		/obj/item/weapon/anobattery,
+		/obj/item/device/ano_scanner
 		)
\ No newline at end of file
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 9d4ec828b1..e829f6c86f 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -32,7 +32,8 @@
 /obj/item/clothing/head/chaplain_hood
 	name = "chaplain's hood"
 	desc = "It's hood that covers the head. It keeps you warm during the space winters."
-	icon_state = "beret_black"
+	icon_state = "chaplain_hood"
+	item_state_slots = list(slot_r_hand_str = "beret_black", slot_l_hand_str = "beret_black")
 	flags_inv = BLOCKHAIR
 	body_parts_covered = HEAD
 
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index d57ebe40ff..3a2ad098ad 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -78,7 +78,7 @@
 /obj/item/clothing/head/nursehat
 	name = "nurse's hat"
 	desc = "It allows quick identification of trained medical personnel."
-	item_state_slots = list(slot_r_hand_str = "nursehat", slot_l_hand_str = "nursehat")
+	icon_state = "nursehat"
 	siemens_coefficient = 0.9
 	body_parts_covered = 0
 
diff --git a/code/modules/research/xenoarchaeology/tools/gearbelt.dm b/code/modules/research/xenoarchaeology/tools/gearbelt.dm
deleted file mode 100644
index fa92fa1624..0000000000
--- a/code/modules/research/xenoarchaeology/tools/gearbelt.dm
+++ /dev/null
@@ -1,29 +0,0 @@
-
-/obj/item/weapon/storage/belt/archaeology
-	name = "excavation gear-belt"
-	desc = "Can hold various excavation gear."
-	icon_state = "gearbelt"
-	can_hold = list(
-		/obj/item/weapon/storage/box/samplebags,
-		/obj/item/device/core_sampler,
-		/obj/item/device/beacon_locator,
-		/obj/item/device/radio/beacon,
-		/obj/item/device/gps,
-		/obj/item/device/measuring_tape,
-		/obj/item/device/flashlight,
-		/obj/item/weapon/pickaxe,
-		/obj/item/device/depth_scanner,
-		/obj/item/device/camera,
-		/obj/item/weapon/paper,
-		/obj/item/weapon/photo,
-		/obj/item/weapon/folder,
-		/obj/item/weapon/pen,
-		/obj/item/weapon/folder,
-		/obj/item/weapon/clipboard,
-		/obj/item/weapon/anodevice,
-		/obj/item/clothing/glasses,
-		/obj/item/weapon/wrench,
-		/obj/item/weapon/storage/box/excavation,
-		/obj/item/weapon/anobattery,
-		/obj/item/device/ano_scanner
-		)
diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi
index 5f8e67691e..9eaa1546e4 100644
Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 4ab57826c1..5a343aa2ae 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/items/lefthand_storage.dmi b/icons/mob/items/lefthand_storage.dmi
index 21c6653e3f..80c8a70302 100644
Binary files a/icons/mob/items/lefthand_storage.dmi and b/icons/mob/items/lefthand_storage.dmi differ
diff --git a/icons/mob/items/righthand_storage.dmi b/icons/mob/items/righthand_storage.dmi
index 215ae85788..0b5b26bba6 100644
Binary files a/icons/mob/items/righthand_storage.dmi and b/icons/mob/items/righthand_storage.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 598e51c860..fff04a0c60 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi
index 7fa721499b..7a5326775b 100644
Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index f098e49ce6..6d13ab616c 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 954b5996c9..e11c97c709 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/polaris.dme b/polaris.dme
index 6b0e41e146..52cb45c0a4 100644
--- a/polaris.dme
+++ b/polaris.dme
@@ -1930,7 +1930,6 @@
 #include "code\modules\research\xenoarchaeology\machinery\geosample_scanner.dm"
 #include "code\modules\research\xenoarchaeology\tools\ano_device_battery.dm"
 #include "code\modules\research\xenoarchaeology\tools\anomaly_suit.dm"
-#include "code\modules\research\xenoarchaeology\tools\gearbelt.dm"
 #include "code\modules\research\xenoarchaeology\tools\suspension_generator.dm"
 #include "code\modules\research\xenoarchaeology\tools\tools.dm"
 #include "code\modules\research\xenoarchaeology\tools\tools_anoscanner.dm"