diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm
index 19ff35c86b..d9a5f7a847 100644
--- a/code/__defines/mobs.dm
+++ b/code/__defines/mobs.dm
@@ -112,25 +112,24 @@
 #define MAX_SUPPLIED_LAW_NUMBER 50
 
 //default item on-mob icons
-#define INV_HEAD_DEF_ICON 'icons/mob/head.dmi'
-#define INV_BACK_DEF_ICON 'icons/mob/back.dmi'
 #define INV_L_HAND_DEF_ICON 'icons/mob/items/lefthand.dmi'
 #define INV_R_HAND_DEF_ICON 'icons/mob/items/righthand.dmi'
-#define INV_W_UNIFORM_DEF_ICON "icons/mob/uniform"
-#define INV_ACCESSORIES_DEF_ICON 'icons/mob/ties.dmi'
-#define INV_TIE_DEF_ICON 'icons/mob/ties.dmi'
-#define INV_SUIT_DEF_ICON "icons/mob/suit"
-#define INV_SPACESUIT_DEF_ICON 'icons/mob/spacesuit.dmi'
 #define INV_WEAR_ID_DEF_ICON 'icons/mob/mob.dmi'
-#define INV_GLOVES_DEF_ICON 'icons/mob/hands.dmi'
-#define INV_EYES_DEF_ICON 'icons/mob/eyes.dmi'
-#define INV_EARS_DEF_ICON 'icons/mob/ears.dmi'
-#define INV_FEET_DEF_ICON 'icons/mob/feet.dmi'
-#define INV_BELT_DEF_ICON 'icons/mob/belt.dmi'
-#define INV_MASK_DEF_ICON 'icons/mob/mask.dmi'
 #define INV_HCUFF_DEF_ICON 'icons/mob/mob.dmi'
 #define INV_LCUFF_DEF_ICON 'icons/mob/mob.dmi'
 
+#define INV_HEAD_DEF_ICON 'icons/inventory/head/mob.dmi'
+#define INV_BACK_DEF_ICON 'icons/inventory/back/mob.dmi'
+#define INV_W_UNIFORM_DEF_ICON 'icons/inventory/uniform/mob.dmi'
+#define INV_ACCESSORIES_DEF_ICON 'icons/inventory/accessory/mob.dmi'
+#define INV_SUIT_DEF_ICON 'icons/inventory/suit/mob.dmi'
+#define INV_GLOVES_DEF_ICON 'icons/inventory/hands/mob.dmi'
+#define INV_EYES_DEF_ICON 'icons/inventory/eyes/mob.dmi'
+#define INV_EARS_DEF_ICON 'icons/inventory/ears/mob.dmi'
+#define INV_FEET_DEF_ICON 'icons/inventory/feet/mob.dmi'
+#define INV_BELT_DEF_ICON 'icons/inventory/belt/mob.dmi'
+#define INV_MASK_DEF_ICON 'icons/inventory/face/mob.dmi'
+
 // Character's economic class
 #define CLASS_UPPER 		"Wealthy"
 #define CLASS_UPMID			"Well-off"
diff --git a/code/game/gamemodes/technomancer/core_obj.dm b/code/game/gamemodes/technomancer/core_obj.dm
index 88aa93f4c2..b976e34d51 100644
--- a/code/game/gamemodes/technomancer/core_obj.dm
+++ b/code/game/gamemodes/technomancer/core_obj.dm
@@ -13,7 +13,7 @@
 		TECH_COMBAT = 7, TECH_MAGNET = 9, TECH_DATA = 5
 		)
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/back.dmi'
+		SPECIES_TESHARI = 'icons/inventory/back/mob_teshari.dmi'
 		)
 	var/energy = 10000
 	var/max_energy = 10000
diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm
index 09cee5bb4c..b8dc28b2e9 100644
--- a/code/game/objects/items/devices/chameleonproj.dm
+++ b/code/game/objects/items/devices/chameleonproj.dm
@@ -11,7 +11,7 @@
 	var/can_use = 1
 	var/obj/effect/dummy/chameleon/active_dummy = null
 	var/saved_item = /obj/item/trash/cigbutt
-	var/saved_icon = 'icons/obj/clothing/masks.dmi'
+	var/saved_icon = 'icons/inventory/face/item.dmi'
 	var/saved_icon_state = "cigbutt"
 	var/saved_overlays
 
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 258fa02632..22cfcad31d 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -8,7 +8,7 @@
 	subspace_transmission = 1
 	canhear_range = 0 // can't hear headsets from very far away
 	slot_flags = SLOT_EARS
-	sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/ears.dmi')
+	sprite_sheets = list(SPECIES_TESHARI = 'icons/inventory/ears/mob_teshari.dmi')
 
 	var/translate_binary = 0
 	var/translate_hive = 0
diff --git a/code/game/objects/items/devices/radio/headset_vr.dm b/code/game/objects/items/devices/radio/headset_vr.dm
index 1285ae0709..ce4e3377a9 100644
--- a/code/game/objects/items/devices/radio/headset_vr.dm
+++ b/code/game/objects/items/devices/radio/headset_vr.dm
@@ -22,8 +22,8 @@
 	icon_state = "nt_headset_alt"
 
 /obj/item/device/radio/headset
-	sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/ears.dmi',
-						SPECIES_WEREBEAST = 'icons/mob/species/werebeast/ears.dmi')
+	sprite_sheets = list(SPECIES_TESHARI = 'icons/inventory/ears/mob_teshari.dmi',
+						SPECIES_WEREBEAST = 'icons/inventory/ears/mob_werebeast.dmi')
 
 /obj/item/device/radio/headset/mob_headset	//Adminbus headset for simplemob shenanigans.
 	name = "nonhuman radio receiver"
diff --git a/code/game/objects/items/devices/radio/radiopack.dm b/code/game/objects/items/devices/radio/radiopack.dm
index 3bc222373f..98cbd1064b 100644
--- a/code/game/objects/items/devices/radio/radiopack.dm
+++ b/code/game/objects/items/devices/radio/radiopack.dm
@@ -2,7 +2,7 @@
 	name = "bluespace radio"
 	desc = "A powerful radio that uses a tiny bluespace wormhole to send signals directly to subspace receivers and transmitters, bypassing the limitations of subspace."
 	icon = 'icons/obj/device_vr.dmi' // VOREStation Edit
-	icon_override = 'icons/mob/back_vr.dmi' // VOREStation Edit
+	icon_override = 'icons/inventory/back/mob_vr.dmi' // VOREStation Edit
 	icon_state = "radiopack"
 	item_state = "radiopack"
 	slot_flags = SLOT_BACK
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 06b0e9edce..ddeac74b58 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -42,20 +42,20 @@
 	name = "\proper thermal vision"
 	sight_mode = BORGTHERM
 	icon_state = "thermal"
-	icon = 'icons/obj/clothing/glasses.dmi'
+	icon = 'icons/inventory/eyes/item.dmi'
 
 
 /obj/item/borg/sight/meson
 	name = "\proper meson vision"
 	sight_mode = BORGMESON
 	icon_state = "meson"
-	icon = 'icons/obj/clothing/glasses.dmi'
+	icon = 'icons/inventory/eyes/item.dmi'
 
 /obj/item/borg/sight/material
 	name = "\proper material scanner vision"
 	sight_mode = BORGMATERIAL
 	icon_state = "material"
-	icon = 'icons/obj/clothing/glasses.dmi'
+	icon = 'icons/inventory/eyes/item.dmi'
 
 /obj/item/borg/sight/hud
 	name = "hud"
@@ -65,7 +65,7 @@
 /obj/item/borg/sight/hud/med
 	name = "medical hud"
 	icon_state = "healthhud"
-	icon = 'icons/obj/clothing/glasses.dmi'
+	icon = 'icons/inventory/eyes/item.dmi'
 
 /obj/item/borg/sight/hud/med/New()
 	..()
@@ -76,7 +76,7 @@
 /obj/item/borg/sight/hud/sec
 	name = "security hud"
 	icon_state = "securityhud"
-	icon = 'icons/obj/clothing/glasses.dmi'
+	icon = 'icons/inventory/eyes/item.dmi'
 
 /obj/item/borg/sight/hud/sec/New()
 	..()
diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm
index 062feaeaa7..0e16a7f8c5 100644
--- a/code/game/objects/items/toys/toys.dm
+++ b/code/game/objects/items/toys/toys.dm
@@ -1442,7 +1442,7 @@
 	name = "inflatable duck"
 	desc = "No bother to sink or swim when you can just float!"
 	icon_state = "inflatable"
-	icon = 'icons/obj/clothing/belts.dmi'
+	icon = 'icons/inventory/belt/item.dmi'
 	slot_flags = SLOT_BELT
 	drop_sound = 'sound/items/drop/rubber.ogg'
 
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index e09c9b1e5d..1a109bab91 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -190,7 +190,7 @@
 /obj/item/trash/spitgum
 	name = "old gum"
 	desc = "A disgusting chewed up wad of gum."
-	icon = 'icons/obj/clothing/masks.dmi'
+	icon = 'icons/inventory/face/item.dmi'
 	icon_state = "spit-gum"
 	drop_sound = 'sound/items/drop/flesh.ogg'
 	pickup_sound = 'sound/items/pickup/flesh.ogg'
@@ -198,7 +198,7 @@
 /obj/item/trash/lollibutt
 	name = "lollipop stick"
 	desc = "A lollipop stick devoid of pop."
-	icon = 'icons/obj/clothing/masks.dmi'
+	icon = 'icons/inventory/face/item.dmi'
 	icon_state = "pop-stick"
 	drop_sound = 'sound/items/drop/component.ogg'
 	pickup_sound = 'sound/items/pickup/component.ogg'
@@ -206,7 +206,7 @@
 /obj/item/trash/spitwad
 	name = "spit wad"
 	desc = "A disgusting spitwad."
-	icon = 'icons/obj/clothing/masks.dmi'
+	icon = 'icons/inventory/face/item.dmi'
 	icon_state = "spit-chew"
 	drop_sound = 'sound/items/drop/flesh.ogg'
 	pickup_sound = 'sound/items/pickup/flesh.ogg'
diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm
index 2ab2c95c72..93a2df1615 100644
--- a/code/game/objects/items/weapons/chewables.dm
+++ b/code/game/objects/items/weapons/chewables.dm
@@ -1,7 +1,7 @@
 /obj/item/clothing/mask/chewable
 	name = "chewable item master"
 	desc = "If you are seeing this, ahelp it."
-	icon = 'icons/obj/clothing/masks.dmi'
+	icon = 'icons/inventory/face/item.dmi'
 	drop_sound = 'sound/items/drop/food.ogg'
 	body_parts_covered = 0
 
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 15170138d3..ade55cbeca 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -376,7 +376,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/trash/cigbutt
 	name = "cigarette butt"
 	desc = "A manky old cigarette butt."
-	icon = 'icons/obj/clothing/masks.dmi'
+	icon = 'icons/inventory/face/item.dmi'
 	icon_state = "cigbutt"
 	randpixel = 10
 	w_class = ITEMSIZE_TINY
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index e6370499a0..ad016d0d85 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -5,10 +5,10 @@
 /obj/item/weapon/storage/backpack
 	name = "backpack"
 	desc = "You wear this on your back and put items into it."
-	icon = 'icons/obj/clothing/backpack.dmi'
+	icon = 'icons/inventory/back/item.dmi'
 	icon_state = "backpack"
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/back.dmi'
+		SPECIES_TESHARI = 'icons/inventory/back/mob_teshari.dmi'
 		)
 	w_class = ITEMSIZE_LARGE
 	slot_flags = SLOT_BACK
diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm
index 59505d3f71..c98b1dcfc9 100644
--- a/code/game/objects/items/weapons/storage/backpack_vr.dm
+++ b/code/game/objects/items/weapons/storage/backpack_vr.dm
@@ -1,8 +1,8 @@
 /obj/item/weapon/storage/backpack/saddlebag
 	name = "Horse Saddlebags"
 	desc = "A saddle that holds items. Seems slightly bulky."
-	icon = 'icons/obj/clothing/backpack_vr.dmi'
-	icon_override = 'icons/mob/back_vr.dmi'
+	icon = 'icons/inventory/back/item_vr.dmi'
+	icon_override = 'icons/inventory/back/mob_vr.dmi'
 	item_state = "saddlebag"
 	icon_state = "saddlebag"
 	max_storage_space = INVENTORY_DUFFLEBAG_SPACE //Saddlebags can hold more, like dufflebags
@@ -29,8 +29,8 @@
 /obj/item/weapon/storage/backpack/saddlebag_common //Shared bag for other taurs with sturdy backs
 	name = "Taur Saddlebags"
 	desc = "A saddle that holds items. Seems slightly bulky."
-	icon = 'icons/obj/clothing/backpack_vr.dmi'
-	icon_override = 'icons/mob/back_vr.dmi'
+	icon = 'icons/inventory/back/item_vr.dmi'
+	icon_override = 'icons/inventory/back/mob_vr.dmi'
 	item_state = "saddlebag"
 	icon_state = "saddlebag"
 	var/icon_base = "saddlebag"
@@ -53,8 +53,8 @@
 /obj/item/weapon/storage/backpack/saddlebag_common/robust //Shared bag for other taurs with sturdy backs
 	name = "Robust Saddlebags"
 	desc = "A saddle that holds items. Seems robust."
-	icon = 'icons/obj/clothing/backpack_vr.dmi'
-	icon_override = 'icons/mob/back_vr.dmi'
+	icon = 'icons/inventory/back/item_vr.dmi'
+	icon_override = 'icons/inventory/back/mob_vr.dmi'
 	item_state = "robustsaddle"
 	icon_state = "robustsaddle"
 	icon_base = "robustsaddle"
@@ -62,8 +62,8 @@
 /obj/item/weapon/storage/backpack/saddlebag_common/vest //Shared bag for other taurs with sturdy backs
 	name = "Taur Duty Vest"
 	desc = "An armored vest with the armor modules replaced with various handy compartments with decent storage capacity. Useless for protection though. Holds less than a saddle."
-	icon = 'icons/obj/clothing/backpack_vr.dmi'
-	icon_override = 'icons/mob/back_vr.dmi'
+	icon = 'icons/inventory/back/item_vr.dmi'
+	icon_override = 'icons/inventory/back/mob_vr.dmi'
 	item_state = "taurvest"
 	icon_state = "taurvest"
 	icon_base = "taurvest"
@@ -77,8 +77,8 @@
 
 /obj/item/weapon/storage/backpack
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/back.dmi',
-		SPECIES_WEREBEAST = 'icons/mob/species/werebeast/back.dmi')
+		SPECIES_TESHARI = 'icons/inventory/back/mob_teshari.dmi',
+		SPECIES_WEREBEAST = 'icons/inventory/back/mob_werebeast.dmi')
 
 /obj/item/weapon/storage/backpack/ert
 	max_storage_space = INVENTORY_DUFFLEBAG_SPACE
@@ -88,31 +88,31 @@
 /obj/item/weapon/storage/backpack/explorer
 	name = "exploration backpack"
 	desc = "A backpack for carrying a large number of supplies easily."
-	icon = 'icons/obj/clothing/backpack_vr.dmi'
-	icon_override = 'icons/mob/back_vr.dmi'
+	icon = 'icons/inventory/back/item_vr.dmi'
+	icon_override = 'icons/inventory/back/mob_vr.dmi'
 	icon_state = "explorer"
 
 /obj/item/weapon/storage/backpack/satchel/explorer
 	name = "exploration satchel"
 	desc = "A satchel for carrying a large number of supplies easily."
-	icon = 'icons/obj/clothing/backpack_vr.dmi'
-	icon_override = 'icons/mob/back_vr.dmi'
+	icon = 'icons/inventory/back/item_vr.dmi'
+	icon_override = 'icons/inventory/back/mob_vr.dmi'
 	icon_state = "explorer_satchel"
 	item_state_slots = null
 
 /obj/item/weapon/storage/backpack/messenger/explorer
 	name = "exploration messenger bag"
 	desc = "A sturdy backpack worn over one shoulder."
-	icon = 'icons/obj/clothing/backpack_vr.dmi'
-	icon_override = 'icons/mob/back_vr.dmi'
+	icon = 'icons/inventory/back/item_vr.dmi'
+	icon_override = 'icons/inventory/back/mob_vr.dmi'
 	icon_state = "explorer_courier"
 	item_state_slots = null
 
 /obj/item/weapon/storage/backpack/dufflebag/explorer
 	name = "exploration dufflebag"
 	desc = "A large dufflebag for holding extra supplies."
-	icon = 'icons/obj/clothing/backpack_vr.dmi'
-	icon_override = 'icons/mob/back_vr.dmi'
+	icon = 'icons/inventory/back/item_vr.dmi'
+	icon_override = 'icons/inventory/back/mob_vr.dmi'
 	icon_state = "explorer_duffle"
 
 ///Talon Bags///
@@ -120,31 +120,31 @@
 /obj/item/weapon/storage/backpack/talon
 	name = "ITV backpack"
 	desc = "A backpack for carrying a large number of supplies easily."
-	icon = 'icons/obj/clothing/backpack_vr.dmi'
-	icon_override = 'icons/mob/back_vr.dmi'
+	icon = 'icons/inventory/back/item_vr.dmi'
+	icon_override = 'icons/inventory/back/mob_vr.dmi'
 	icon_state = "talon"
 
 /obj/item/weapon/storage/backpack/satchel/talon
 	name = "ITV satchel"
 	desc = "A satchel for carrying a large number of supplies easily."
-	icon = 'icons/obj/clothing/backpack_vr.dmi'
-	icon_override = 'icons/mob/back_vr.dmi'
+	icon = 'icons/inventory/back/item_vr.dmi'
+	icon_override = 'icons/inventory/back/mob_vr.dmi'
 	icon_state = "talon_satchel"
 	item_state_slots = null
 
 /obj/item/weapon/storage/backpack/messenger/talon
 	name = "ITV messenger bag"
 	desc = "A sturdy backpack worn over one shoulder."
-	icon = 'icons/obj/clothing/backpack_vr.dmi'
-	icon_override = 'icons/mob/back_vr.dmi'
+	icon = 'icons/inventory/back/item_vr.dmi'
+	icon_override = 'icons/inventory/back/mob_vr.dmi'
 	icon_state = "talon_courier"
 	item_state_slots = null
 
 /obj/item/weapon/storage/backpack/dufflebag/talon
 	name = "ITV dufflebag"
 	desc = "A large dufflebag for holding extra supplies."
-	icon = 'icons/obj/clothing/backpack_vr.dmi'
-	icon_override = 'icons/mob/back_vr.dmi'
+	icon = 'icons/inventory/back/item_vr.dmi'
+	icon_override = 'icons/inventory/back/mob_vr.dmi'
 	icon_state = "talon_duffle"
 
 ///Roboticist Bags///
@@ -152,16 +152,16 @@
 /obj/item/weapon/storage/backpack/satchel/roboticist
 	name = "roboticist satchel"
 	desc = "A satchel for carrying a large number of spare parts easily."
-	icon = 'icons/obj/clothing/backpack_vr.dmi'
-	icon_override = 'icons/mob/back_vr.dmi'
+	icon = 'icons/inventory/back/item_vr.dmi'
+	icon_override = 'icons/inventory/back/mob_vr.dmi'
 	item_state = "satchel-robo"
 	icon_state = "satchel-robo"
 
 /obj/item/weapon/storage/backpack/roboticist
 	name = "roboticist backpack"
 	desc = "A backpack for carrying a large number of spare parts easily."
-	icon = 'icons/obj/clothing/backpack_vr.dmi'
-	icon_override = 'icons/mob/back_vr.dmi'
+	icon = 'icons/inventory/back/item_vr.dmi'
+	icon_override = 'icons/inventory/back/mob_vr.dmi'
 	item_state = "backpack-robo"
 	icon_state = "backpack-robo"
 
@@ -170,23 +170,23 @@
 /obj/item/weapon/storage/backpack/vietnam
 	name = "vietnam backpack"
 	desc = "There are tangos in the trees! We need napalm right now! Why is my gun jammed?"
-	icon = 'icons/obj/clothing/backpack_vr.dmi'
-	icon_override = 'icons/mob/back_vr.dmi'
+	icon = 'icons/inventory/back/item_vr.dmi'
+	icon_override = 'icons/inventory/back/mob_vr.dmi'
 	item_state = "nambackpack"
 	icon_state = "nambackpack"
 
 /obj/item/weapon/storage/backpack/russian
 	name = "russian backpack"
 	desc = "Useful for carrying large quantities of vodka."
-	icon = 'icons/obj/clothing/backpack_vr.dmi'
-	icon_override = 'icons/mob/back_vr.dmi'
+	icon = 'icons/inventory/back/item_vr.dmi'
+	icon_override = 'icons/inventory/back/mob_vr.dmi'
 	item_state = "ru_rucksack"
 	icon_state = "ru_rucksack"
 
 /obj/item/weapon/storage/backpack/korean
 	name = "korean backpack"
 	desc = "Insert witty description here."
-	icon = 'icons/obj/clothing/backpack_vr.dmi'
-	icon_override = 'icons/mob/back_vr.dmi'
+	icon = 'icons/inventory/back/item_vr.dmi'
+	icon_override = 'icons/inventory/back/mob_vr.dmi'
 	item_state = "kr_rucksack"
 	icon_state = "kr_rucksack"
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 5412fab07c..dbe0292263 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -1,7 +1,7 @@
 /obj/item/weapon/storage/belt
 	name = "belt"
 	desc = "Can hold various things."
-	icon = 'icons/obj/clothing/belts.dmi'
+	icon = 'icons/inventory/belt/item.dmi'
 	icon_state = "utility"
 	storage_slots = 7
 	max_storage_space = ITEMSIZE_COST_NORMAL * 7 //This should ensure belts always have enough room to store whatever.
@@ -11,7 +11,7 @@
 	equip_sound = 'sound/items/toolbelt_equip.ogg'
 	drop_sound = 'sound/items/drop/toolbelt.ogg'
 	pickup_sound = 'sound/items/pickup/toolbelt.ogg'
-	sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/belt.dmi')
+	sprite_sheets = list(SPECIES_TESHARI = 'icons/inventory/belt/mob_teshari.dmi')
 
 	var/show_above_suit = 0
 
diff --git a/code/game/objects/items/weapons/storage/belt_vr.dm b/code/game/objects/items/weapons/storage/belt_vr.dm
index b07630de39..92da577c31 100644
--- a/code/game/objects/items/weapons/storage/belt_vr.dm
+++ b/code/game/objects/items/weapons/storage/belt_vr.dm
@@ -1,13 +1,13 @@
 /obj/item/weapon/storage/belt
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/belt.dmi',
-		SPECIES_WEREBEAST = 'icons/mob/species/werebeast/belt.dmi')
+		SPECIES_TESHARI = 'icons/inventory/belt/mob_teshari.dmi',
+		SPECIES_WEREBEAST = 'icons/inventory/belt/mob_werebeast.dmi')
 		
 /obj/item/weapon/storage/belt/explorer
 	name = "explorer's belt"
 	desc = "A versatile belt with several pouches. It can hold a very wide variety of items, but less items overall than a dedicated belt. Still, it's useful for any explorer who wants to be prepared for anything they might find."
-	icon = 'icons/obj/clothing/belts_vr.dmi'
-	icon_override = 'icons/mob/belt_vr.dmi'
+	icon = 'icons/inventory/belt/item_vr.dmi'
+	icon_override = 'icons/inventory/belt/mob_vr.dmi'
 	icon_state = "explo_belt"
 	item_state = "explorer_belt"
 	storage_slots = 5	//makes it strictly inferior to any specialized belt as they have seven slots, but it's far more versatile
@@ -54,7 +54,7 @@
 /obj/item/weapon/storage/belt/explorer/pathfinder
 	name = "pathfinder's belt"
 	desc = "A deluxe belt with many pouches. It can hold a very wide variety of items, but less items overall than a dedicated belt. Still, it's useful for any explorer who wants to be prepared for anything they might find."
-	icon = 'icons/obj/clothing/belts_vr.dmi'
+	icon = 'icons/inventory/belt/item_vr.dmi'
 	icon_state = "pathfinder_belt"
 	item_state = "explorer_belt"
 	storage_slots = 7	//two more, bringing it on par with normal belts
diff --git a/code/game/objects/items/weapons/storage/pouches.dm b/code/game/objects/items/weapons/storage/pouches.dm
index 24a81f4112..62e04c0764 100644
--- a/code/game/objects/items/weapons/storage/pouches.dm
+++ b/code/game/objects/items/weapons/storage/pouches.dm
@@ -4,7 +4,7 @@
 /obj/item/weapon/storage/pouch
 	name = "storage pouch (medium)"
 	desc = "This storage pouch can be used to provide some additional storage for quick access."
-	icon = 'icons/obj/clothing/pouches.dmi'
+	icon = 'icons/inventory/pockets/item.dmi'
 	slot_flags = SLOT_POCKET
 	drop_sound = 'sound/items/drop/backpack.ogg'
 	pickup_sound = 'sound/items/pickup/backpack.ogg'
diff --git a/code/game/objects/items/weapons/tanks/tank_types_vr.dm b/code/game/objects/items/weapons/tanks/tank_types_vr.dm
index 68c18aebd2..b40ae4a210 100644
--- a/code/game/objects/items/weapons/tanks/tank_types_vr.dm
+++ b/code/game/objects/items/weapons/tanks/tank_types_vr.dm
@@ -2,7 +2,7 @@
 	name = "double emergency phoron tank"
 	desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable."
 	icon = 'icons/obj/tank_vr.dmi'
-	icon_override = 'icons/mob/belt_vr.dmi'
+	icon_override = 'icons/inventory/belt/mob_vr.dmi'
 	icon_state = "emergency_double_vox"
 	gauge_icon = "indicator_double"
 	gauge_cap = 3
@@ -39,7 +39,7 @@
 
 /obj/item/weapon/tank/vox	//Can't be a child of phoron or the gas amount gets screwey.
 	icon = 'icons/obj/tank_vr.dmi'
-	icon_override = 'icons/mob/back_vr.dmi'
+	icon_override = 'icons/inventory/back/mob_vr.dmi'
 	icon_state = "phoron_vox"
 	gauge_cap = 3
 	gauge_icon = "indicator_double"
@@ -82,7 +82,7 @@
 
 /obj/item/weapon/tank/emergency/phoron
 	icon = 'icons/obj/tank_vr.dmi'
-	icon_override = 'icons/mob/belt_vr.dmi'
+	icon_override = 'icons/inventory/belt/mob_vr.dmi'
 	icon_state = "emergency_phoron_vox"
 	gauge_icon = "indicator_smalltank"
 	volume = 6
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 69e795cb6b..0c6c78dbbe 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -6,7 +6,7 @@ var/list/global/tank_gauge_cache = list()
 	name = "tank"
 	icon = 'icons/obj/tank.dmi'
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/back.dmi'
+		SPECIES_TESHARI = 'icons/inventory/back/mob_teshari.dmi'
 		)
 	drop_sound = 'sound/items/drop/gascan.ogg'
 	pickup_sound = 'sound/items/pickup/gascan.ogg'
diff --git a/code/game/objects/items/weapons/towels.dm b/code/game/objects/items/weapons/towels.dm
index 77e1c43960..119c9d7419 100644
--- a/code/game/objects/items/weapons/towels.dm
+++ b/code/game/objects/items/weapons/towels.dm
@@ -15,11 +15,11 @@
 	..()
 	switch(slot)
 		if(slot_head)
-			sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi')
+			sprite_sheets = list(SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi')
 		if(slot_wear_suit)
-			sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi')
+			sprite_sheets = list(SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi')
 		if(slot_belt)
-			sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/belt.dmi')
+			sprite_sheets = list(SPECIES_TESHARI = 'icons/inventory/belt/mob_teshari.dmi')
 
 /obj/item/weapon/towel/attack_self(mob/living/user as mob)
 	user.visible_message(text("<span class='notice'>[] uses [] to towel themselves off.</span>", user, src))
diff --git a/code/game/objects/items/weapons/traps_vr.dm b/code/game/objects/items/weapons/traps_vr.dm
index f1338f691d..0b7c543f02 100644
--- a/code/game/objects/items/weapons/traps_vr.dm
+++ b/code/game/objects/items/weapons/traps_vr.dm
@@ -1,7 +1,7 @@
 /obj/item/weapon/beartrap
 	slot_flags = SLOT_MASK
 	item_icons = list(
-		slot_wear_mask_str = 'icons/mob/mask_vr.dmi'
+		slot_wear_mask_str = 'icons/inventory/face/mob_vr.dmi'
 		)
 
 /obj/item/weapon/beartrap/equipped()
diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm
index 48e62010cc..41db4704fd 100644
--- a/code/game/objects/random/misc.dm
+++ b/code/game/objects/random/misc.dm
@@ -946,7 +946,7 @@
 /obj/random/thermalponcho
 	name = "random thermal poncho"
 	desc = "This is a thermal poncho spawn."
-	icon = 'icons/obj/clothing/ties.dmi'
+	icon = 'icons/inventory/accessory/item.dmi'
 	icon_state = "classicponcho"
 
 /obj/random/thermalponcho/item_to_spawn()
@@ -959,7 +959,7 @@
 /obj/random/pouch
 	name = "Random Storage Pouch"
 	desc = "This is a random storage pouch."
-	icon = 'icons/obj/clothing/pouches.dmi'
+	icon = 'icons/inventory/pockets/item.dmi'
 	icon_state = "random"
 
 /obj/random/pouch/item_to_spawn()
diff --git a/code/game/objects/random/spacesuits.dm b/code/game/objects/random/spacesuits.dm
index 2d394625b9..5db5bbb074 100644
--- a/code/game/objects/random/spacesuits.dm
+++ b/code/game/objects/random/spacesuits.dm
@@ -4,7 +4,7 @@
 /obj/random/multiple/voidsuit
 	name = "Random Voidsuit"
 	desc = "This is a random voidsuit."
-	icon = 'icons/obj/clothing/spacesuits.dmi'
+	icon = 'icons/inventory/suit/item.dmi'
 	icon_state = "void"
 
 /obj/random/multiple/voidsuit/item_to_spawn()
@@ -98,7 +98,7 @@
 /obj/random/multiple/voidsuit/mining
 	name = "Random Mining Voidsuit"
 	desc = "This is a random mining voidsuit."
-	icon = 'icons/obj/clothing/spacesuits.dmi'
+	icon = 'icons/inventory/suit/item.dmi'
 	icon_state = "rig-mining"
 
 /obj/random/multiple/voidsuit/mining/item_to_spawn()
@@ -116,7 +116,7 @@
 /obj/random/multiple/voidsuit/engineering
 	name = "Random Engineering Voidsuit"
 	desc = "This is a random engineering voidsuit."
-	icon = 'icons/obj/clothing/spacesuits.dmi'
+	icon = 'icons/inventory/suit/item.dmi'
 	icon_state = "rig-engineering"
 
 /obj/random/multiple/voidsuit/engineering/item_to_spawn()
@@ -146,7 +146,7 @@
 /obj/random/multiple/voidsuit/security
 	name = "Random Security Voidsuit"
 	desc = "This is a random security voidsuit."
-	icon = 'icons/obj/clothing/spacesuits.dmi'
+	icon = 'icons/inventory/suit/item.dmi'
 	icon_state = "rig-sec"
 
 /obj/random/multiple/voidsuit/security/item_to_spawn()
@@ -168,7 +168,7 @@
 /obj/random/multiple/voidsuit/medical
 	name = "Random Medical Voidsuit"
 	desc = "This is a random medical voidsuit."
-	icon = 'icons/obj/clothing/spacesuits.dmi'
+	icon = 'icons/inventory/suit/item.dmi'
 	icon_state = "rig-medical"
 
 /obj/random/multiple/voidsuit/medical/item_to_spawn()
@@ -194,7 +194,7 @@
 /obj/random/multiple/voidsuit/vintage
 	name = "Random Vintage Voidsuit"
 	desc = "This is a random vintage voidsuit."
-	icon = 'icons/obj/clothing/spacesuits.dmi'
+	icon = 'icons/inventory/suit/item.dmi'
 	icon_state = "rig-vintagecrew"
 
 /obj/random/multiple/voidsuit/vintage/item_to_spawn()
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index b9abfabf04..08c594153d 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -336,7 +336,6 @@
 /obj/item/weapon/storage/belt/chameleon
 	name = "belt"
 	desc = "Can hold various things.  It also has a small dial inside one of the pouches."
-	icon = 'icons/obj/clothing/belts.dmi'
 	icon_state = "utilitybelt"
 	origin_tech = list(TECH_ILLEGAL = 3)
 	var/global/list/clothing_choices
@@ -376,7 +375,7 @@
 /obj/item/clothing/accessory/chameleon
 	name = "black tie"
 	desc = "Looks like a black tie, but his one also has a dial inside."
-	icon = 'icons/obj/clothing/ties.dmi'
+	icon = 'icons/inventory/accessory/item.dmi'
 	icon_state = "blacktie"
 	origin_tech = list(TECH_ILLEGAL = 3)
 	var/global/list/clothing_choices
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index e58b71ca72..5b92899f5c 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -229,7 +229,7 @@
 	throwforce = 2
 	slot_flags = SLOT_EARS
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/ears.dmi')
+		SPECIES_TESHARI = 'icons/inventory/ears/mob_teshari.dmi')
 
 /obj/item/clothing/ears/attack_hand(mob/user as mob)
 	if (!user) return
@@ -312,7 +312,7 @@
 		)
 	gender = PLURAL //Carn: for grammarically correct text-parsing
 	w_class = ITEMSIZE_SMALL
-	icon = 'icons/obj/clothing/gloves.dmi'
+	icon = 'icons/inventory/hands/item.dmi'
 	siemens_coefficient = 0.9
 	blood_sprite_state = "bloodyhands"
 	var/wired = 0
@@ -328,8 +328,8 @@
 	slot_flags = SLOT_GLOVES
 	attack_verb = list("challenged")
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/gloves.dmi',
-		SPECIES_VOX = 'icons/mob/species/vox/gloves.dmi'
+		SPECIES_TESHARI = 'icons/inventory/hands/mob_teshari.dmi',
+		SPECIES_VOX = 'icons/inventory/hands/mob_vox.dmi'
 		)
 	drop_sound = 'sound/items/drop/gloves.ogg'
 	pickup_sound = 'sound/items/pickup/gloves.ogg'
@@ -438,7 +438,7 @@
 /obj/item/clothing/gloves/ring
 	name = "ring"
 	w_class = ITEMSIZE_TINY
-	icon = 'icons/obj/clothing/rings.dmi'
+	icon = 'icons/inventory/hands/item.dmi'
 	gender = NEUTER
 	species_restricted = list("exclude", SPECIES_DIONA)
 	siemens_coefficient = 1
@@ -453,7 +453,7 @@
 //Head
 /obj/item/clothing/head
 	name = "head"
-	icon = 'icons/obj/clothing/hats.dmi'
+	icon = 'icons/inventory/head/item.dmi'
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/lefthand_hats.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand_hats.dmi',
@@ -470,8 +470,8 @@
 	var/image/helmet_light
 
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi',
-		SPECIES_VOX = 'icons/mob/species/vox/head.dmi'
+		SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi',
+		SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi'
 		)
 	drop_sound = 'sound/items/drop/hat.ogg'
 	pickup_sound = 'sound/items/pickup/hat.ogg'
@@ -564,7 +564,7 @@
 //Mask
 /obj/item/clothing/mask
 	name = "mask"
-	icon = 'icons/obj/clothing/masks.dmi'
+	icon = 'icons/inventory/face/item.dmi'
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/lefthand_masks.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand_masks.dmi',
@@ -574,10 +574,10 @@
 	body_parts_covered = FACE|EYES
 	blood_sprite_state = "maskblood"
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/masks.dmi',
-		SPECIES_VOX = 'icons/mob/species/vox/masks.dmi',
-		SPECIES_TAJ = 'icons/mob/species/tajaran/mask.dmi',
-		SPECIES_UNATHI = 'icons/mob/species/unathi/mask.dmi'
+		SPECIES_TESHARI = 'icons/inventory/face/mob_teshari.dmi',
+		SPECIES_VOX = 'icons/inventory/face/mob_vox.dmi',
+		SPECIES_TAJ = 'icons/inventory/face/mob_tajaran.dmi',
+		SPECIES_UNATHI = 'icons/inventory/face/mob_unathi.dmi'
 		)
 
 	var/voicechange = 0
@@ -599,7 +599,7 @@
 //Shoes
 /obj/item/clothing/shoes
 	name = "shoes"
-	icon = 'icons/obj/clothing/shoes.dmi'
+	icon = 'icons/inventory/feet/item.dmi'
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/lefthand_shoes.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand_shoes.dmi',
@@ -628,8 +628,8 @@
 	var/overshoes = 0
 	species_restricted = list("exclude",SPECIES_TESHARI, SPECIES_VOX)
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/shoes.dmi',
-		SPECIES_VOX = 'icons/mob/species/vox/shoes.dmi'
+		SPECIES_TESHARI = 'icons/inventory/feet/mob_teshari.dmi',
+		SPECIES_VOX = 'icons/inventory/feet/mob_vox.dmi'
 		)
 	drop_sound = 'sound/items/drop/shoes.ogg'
 	pickup_sound = 'sound/items/pickup/shoes.ogg'
@@ -729,7 +729,7 @@
 ///////////////////////////////////////////////////////////////////////
 //Suit
 /obj/item/clothing/suit
-	icon = 'icons/obj/clothing/suits.dmi'
+	icon = 'icons/inventory/suit/item.dmi'
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/lefthand_suits.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand_suits.dmi',
@@ -751,8 +751,8 @@
 
 
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi',
-		SPECIES_VOX = 'icons/mob/species/vox/suit.dmi'
+		SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi',
+		SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi'
 		)
 
 	valid_accessory_slots = (ACCESSORY_SLOT_OVER | ACCESSORY_SLOT_ARMBAND)
@@ -819,7 +819,7 @@
 ///////////////////////////////////////////////////////////////////////
 //Under clothing
 /obj/item/clothing/under
-	icon = 'icons/obj/clothing/uniforms.dmi'
+	icon = 'icons/inventory/uniform/item.dmi'
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/lefthand_uniforms.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand_uniforms.dmi',
@@ -845,8 +845,8 @@
 	var/rolled_down = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled
 	var/rolled_sleeves = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/uniform.dmi',
-		SPECIES_VOX = 'icons/mob/species/vox/uniform.dmi'
+		SPECIES_TESHARI = 'icons/inventory/uniform/mob_teshari.dmi',
+		SPECIES_VOX = 'icons/inventory/uniform/mob_vox.dmi'
 		)
 
 	//convenience var for defining the icon state for the overlay used when the clothing is worn.
@@ -872,8 +872,8 @@
 		|ACCESSORY_SLOT_DEPT\
 		|ACCESSORY_SLOT_OVER)
 
-	var/icon/rolled_down_icon = 'icons/mob/uniform_rolled_down.dmi'
-	var/icon/rolled_down_sleeves_icon = 'icons/mob/uniform_sleeves_rolled.dmi'
+	var/icon/rolled_down_icon = 'icons/inventory/uniform/mob_rolled_down.dmi'
+	var/icon/rolled_down_sleeves_icon = 'icons/inventory/uniform/mob_sleeves_rolled.dmi'
 
 /obj/item/clothing/under/attack_hand(var/mob/user)
 	if(LAZYLEN(accessories))
diff --git a/code/modules/clothing/clothing_vr.dm b/code/modules/clothing/clothing_vr.dm
index b8610fdfcb..a33461a7e4 100644
--- a/code/modules/clothing/clothing_vr.dm
+++ b/code/modules/clothing/clothing_vr.dm
@@ -5,9 +5,9 @@
 	var/list/inside_emotes = list()
 	var/recent_squish = 0
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/shoes.dmi',
-		SPECIES_VOX = 'icons/mob/species/vox/shoes.dmi',
-		SPECIES_WEREBEAST = 'icons/mob/species/werebeast/feet.dmi')
+		SPECIES_TESHARI = 'icons/inventory/feet/mob_teshari.dmi',
+		SPECIES_VOX = 'icons/inventory/feet/mob_vox.dmi',
+		SPECIES_WEREBEAST = 'icons/inventory/feet/mob_werebeast.dmi')
 
 /obj/item/clothing/shoes/New()
 	inside_emotes = list(
@@ -85,14 +85,14 @@
 
 /obj/item/clothing/gloves
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/gloves.dmi',
-		SPECIES_VOX = 'icons/mob/species/vox/gloves.dmi',
-		SPECIES_WEREBEAST = 'icons/mob/species/werebeast/hands.dmi')
+		SPECIES_TESHARI = 'icons/inventory/hands/mob_teshari.dmi',
+		SPECIES_VOX = 'icons/inventory/hands/mob_vox.dmi',
+		SPECIES_WEREBEAST = 'icons/inventory/hands/mob_werebeast.dmi')
 
 /obj/item/clothing/ears
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/ears.dmi',
-		SPECIES_WEREBEAST = 'icons/mob/species/werebeast/ears.dmi')
+		SPECIES_TESHARI = 'icons/inventory/ears/mob_teshari.dmi',
+		SPECIES_WEREBEAST = 'icons/inventory/ears/mob_werebeast.dmi')
 
 /obj/item/clothing/relaymove(var/mob/living/user,var/direction)
 
@@ -119,7 +119,7 @@
 //Mask
 /obj/item/clothing/mask
 	name = "mask"
-	icon = 'icons/obj/clothing/masks_vr.dmi' // This is intentional because of our custom species.
+	icon = 'icons/inventory/face/item_vr.dmi' // This is intentional because of our custom species.
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/lefthand_masks.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand_masks.dmi',
@@ -128,38 +128,38 @@
 	slot_flags = SLOT_MASK
 	body_parts_covered = FACE|EYES
 	item_icons = list(
-		slot_wear_mask_str = 'icons/mob/mask_vr.dmi'
+		slot_wear_mask_str = 'icons/inventory/face/mob_vr.dmi'
 		)
 	sprite_sheets = list(
-		SPECIES_TESHARI		= 'icons/mob/species/teshari/masks_vr.dmi',
-		SPECIES_VOX 		= 'icons/mob/species/vox/masks.dmi',
-		SPECIES_TAJ 		= 'icons/mob/species/tajaran/mask_vr.dmi',
-		SPECIES_UNATHI 		= 'icons/mob/species/unathi/mask_vr.dmi',
-		SPECIES_SERGAL 		= 'icons/mob/species/sergal/mask_vr.dmi',
-		SPECIES_NEVREAN 	= 'icons/mob/species/nevrean/mask_vr.dmi',
-		SPECIES_ZORREN_HIGH	= 'icons/mob/species/fox/mask_vr.dmi',
-		SPECIES_ZORREN_FLAT = 'icons/mob/species/fennec/mask_vr.dmi',
-		SPECIES_AKULA 		= 'icons/mob/species/akula/mask_vr.dmi',
-		SPECIES_VULPKANIN 	= 'icons/mob/species/vulpkanin/mask.dmi',
-		SPECIES_XENOCHIMERA	= 'icons/mob/species/tajaran/mask_vr.dmi',
-		SPECIES_WEREBEAST	= 'icons/mob/species/werebeast/masks.dmi'
+		SPECIES_TESHARI		= 'icons/inventory/face/mob_teshari.dmi',
+		SPECIES_VOX 		= 'icons/inventory/face/mob_vox.dmi',
+		SPECIES_TAJ 		= 'icons/inventory/face/mob_tajaran.dmi',
+		SPECIES_UNATHI 		= 'icons/inventory/face/mob_unathi.dmi',
+		SPECIES_SERGAL 		= 'icons/inventory/face/mob_sergal.dmi',
+		SPECIES_NEVREAN 	= 'icons/inventory/face/mob_nevrean.dmi',
+		SPECIES_ZORREN_HIGH	= 'icons/inventory/face/mob_fox.dmi',
+		SPECIES_ZORREN_FLAT = 'icons/inventory/face/mob_fennec.dmi',
+		SPECIES_AKULA 		= 'icons/inventory/face/mob_akula.dmi',
+		SPECIES_VULPKANIN 	= 'icons/inventory/face/mob_vulpkanin.dmi',
+		SPECIES_XENOCHIMERA	= 'icons/inventory/face/mob_tajaran.dmi',
+		SPECIES_WEREBEAST	= 'icons/inventory/face/mob_werebeast.dmi'
 		)
-//"Spider" 		= 'icons/mob/species/spider/mask_vr.dmi' Add this later when they have custom mask sprites and everything.
+//"Spider" 		= 'icons/inventory/mask/mob_spider.dmi' Add this later when they have custom mask sprites and everything.
 
 //Switch to taur sprites if a taur equips
 /obj/item/clothing/suit
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi',
-		SPECIES_VOX = 'icons/mob/species/vox/suit.dmi',
-		SPECIES_WEREBEAST = 'icons/mob/species/werebeast/suit.dmi')
+		SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi',
+		SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi',
+		SPECIES_WEREBEAST = 'icons/inventory/suit/mob_werebeast.dmi')
 
 /obj/item/clothing/under
 	sensor_mode = 3
 	var/sensorpref = 5
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/uniform.dmi',
-		SPECIES_VOX = 'icons/mob/species/vox/uniform.dmi',
-		SPECIES_WEREBEAST = 'icons/mob/species/werebeast/uniform.dmi')
+		SPECIES_TESHARI = 'icons/inventory/uniform/mob_teshari.dmi',
+		SPECIES_VOX = 'icons/inventory/uniform/mob_vox.dmi',
+		SPECIES_WEREBEAST = 'icons/inventory/uniform/mob_werebeast.dmi')
 
 /obj/item/clothing/under/New(var/mob/living/carbon/human/H)
 	..()
@@ -176,6 +176,6 @@
 
 /obj/item/clothing/head
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi',
-		SPECIES_VOX = 'icons/mob/species/vox/head.dmi',
-		SPECIES_WEREBEAST = 'icons/mob/species/werebeast/head.dmi')
+		SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi',
+		SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi',
+		SPECIES_WEREBEAST = 'icons/inventory/head/mob_werebeast.dmi')
diff --git a/code/modules/clothing/ears/earrings.dm b/code/modules/clothing/ears/earrings.dm
index 154f69f44a..82746980bd 100644
--- a/code/modules/clothing/ears/earrings.dm
+++ b/code/modules/clothing/ears/earrings.dm
@@ -2,7 +2,7 @@
 /obj/item/clothing/ears/earring
 	name = "earring"
 	desc = "An earring of some kind."
-	icon = 'icons/obj/clothing/ears.dmi'
+	icon = 'icons/inventory/ears/item.dmi'
 
 /obj/item/clothing/ears/earring/stud
 	name = "pearl stud earrings"
diff --git a/code/modules/clothing/ears/ears.dm b/code/modules/clothing/ears/ears.dm
index 07e74d7321..99f9b00912 100644
--- a/code/modules/clothing/ears/ears.dm
+++ b/code/modules/clothing/ears/ears.dm
@@ -43,7 +43,7 @@
 /obj/item/clothing/ears/skrell
 	name = "skrell tentacle wear"
 	desc = "Some stuff worn by skrell to adorn their head tentacles."
-	icon = 'icons/obj/clothing/ears.dmi'
+	icon = 'icons/inventory/ears/item.dmi'
 	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS
 	species_restricted = list(SPECIES_SKRELL)
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 69e56bbbf0..3db7ad58cf 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -13,7 +13,7 @@ BLIND     // can't see anything
 
 /obj/item/clothing/glasses
 	name = "glasses"
-	icon = 'icons/obj/clothing/glasses.dmi'
+	icon = 'icons/inventory/eyes/item.dmi'
 	w_class = ITEMSIZE_SMALL
 	slot_flags = SLOT_EYES
 	plane_slots = list(slot_glasses)
@@ -31,8 +31,8 @@ BLIND     // can't see anything
 	pickup_sound = 'sound/items/pickup/accessory.ogg'
 
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/eyes.dmi',
-		SPECIES_VOX = 'icons/mob/species/vox/eyes.dmi'
+		SPECIES_TESHARI = 'icons/inventory/eyes/mob_teshari.dmi',
+		SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi'
 		)
 
 /obj/item/clothing/glasses/update_clothing_icon()
diff --git a/code/modules/clothing/glasses/glasses_vr.dm b/code/modules/clothing/glasses/glasses_vr.dm
index 4471f3d9c5..63be852414 100644
--- a/code/modules/clothing/glasses/glasses_vr.dm
+++ b/code/modules/clothing/glasses/glasses_vr.dm
@@ -64,8 +64,8 @@
 /obj/item/clothing/glasses/graviton/medgravpatch
 	name = "medical graviton eyepatch"
 	desc = "A graviton eyepatch with a medical overlay."
-	icon = 'icons/obj/clothing/glasses_vr.dmi'
-	icon_override = 'icons/mob/eyes_vr.dmi'
+	icon = 'icons/inventory/eyes/item_vr.dmi'
+	icon_override = 'icons/inventory/eyes/mob_vr.dmi'
 	icon_state = "medgravpatch"
 	item_state_slots = list(slot_r_hand_str = "blindfold", slot_l_hand_str = "blindfold")
 	action_button_name = "Toggle Eyepatch"
@@ -77,8 +77,8 @@
 /obj/item/clothing/glasses/tajblind
 	name = "embroidered veil"
 	desc = "An Tajaran made veil that allows the user to see while obscuring their eyes."
-	icon = 'icons/obj/clothing/glasses_vr.dmi'
-	icon_override = 'icons/mob/eyes_vr.dmi'
+	icon = 'icons/inventory/eyes/item_vr.dmi'
+	icon_override = 'icons/inventory/eyes/mob_vr.dmi'
 	icon_state = "tajblind"
 	item_state = "tajblind"
 	prescription = 1
@@ -87,8 +87,8 @@
 /obj/item/clothing/glasses/hud/health/tajblind
 	name = "lightweight veil"
 	desc = "An Tajaran made veil that allows the user to see while obscuring their eyes. This one has an installed medical HUD."
-	icon = 'icons/obj/clothing/glasses_vr.dmi'
-	icon_override = 'icons/mob/eyes_vr.dmi'
+	icon = 'icons/inventory/eyes/item_vr.dmi'
+	icon_override = 'icons/inventory/eyes/mob_vr.dmi'
 	icon_state = "tajblind_med"
 	item_state = "tajblind_med"
 	body_parts_covered = EYES
@@ -96,8 +96,8 @@
 /obj/item/clothing/glasses/sunglasses/sechud/tajblind
 	name = "sleek veil"
 	desc = "An Tajaran made veil that allows the user to see while obscuring their eyes. This one has an in-built security HUD."
-	icon = 'icons/obj/clothing/glasses_vr.dmi'
-	icon_override = 'icons/mob/eyes_vr.dmi'
+	icon = 'icons/inventory/eyes/item_vr.dmi'
+	icon_override = 'icons/inventory/eyes/mob_vr.dmi'
 	icon_state = "tajblind_sec"
 	item_state = "tajblind_sec"
 	prescription = 1
@@ -106,8 +106,8 @@
 /obj/item/clothing/glasses/meson/prescription/tajblind
 	name = "industrial veil"
 	desc = "An Tajaran made veil that allows the user to see while obscuring their eyes. This one has installed mesons."
-	icon = 'icons/obj/clothing/glasses_vr.dmi'
-	icon_override = 'icons/mob/eyes_vr.dmi'
+	icon = 'icons/inventory/eyes/item_vr.dmi'
+	icon_override = 'icons/inventory/eyes/mob_vr.dmi'
 	icon_state = "tajblind_meson"
 	item_state = "tajblind_meson"
 	off_state = "tajblind"
@@ -116,8 +116,8 @@
 /obj/item/clothing/glasses/material/prescription/tajblind
 	name = "mining veil"
 	desc = "An Tajaran made veil that allows the user to see while obscuring their eyes. This one has an installed material scanner."
-	icon = 'icons/obj/clothing/glasses_vr.dmi'
-	icon_override = 'icons/mob/eyes_vr.dmi'
+	icon = 'icons/inventory/eyes/item_vr.dmi'
+	icon_override = 'icons/inventory/eyes/mob_vr.dmi'
 	icon_state = "tajblind_meson"
 	item_state = "tajblind_meson"
 	off_state = "tajblind"
@@ -125,7 +125,7 @@
 
 /obj/item/clothing/glasses
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/eyes.dmi',
-		SPECIES_VOX = 'icons/mob/species/vox/eyes.dmi',
-		SPECIES_WEREBEAST = 'icons/mob/species/werebeast/eyes.dmi'
+		SPECIES_TESHARI = 'icons/inventory/eyes/mob_teshari.dmi',
+		SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi',
+		SPECIES_WEREBEAST = 'icons/inventory/eyes/mob_werebeast.dmi'
 		)
diff --git a/code/modules/clothing/glasses/hud_vr.dm b/code/modules/clothing/glasses/hud_vr.dm
index a6cee840b6..e280f985c6 100644
--- a/code/modules/clothing/glasses/hud_vr.dm
+++ b/code/modules/clothing/glasses/hud_vr.dm
@@ -116,8 +116,8 @@
 /obj/item/clothing/glasses/omnihud/visor
 	name = "AR visor"
 	desc = "The VZR-AR are a product based upon the classic AR Glasses, just more fashionable."
-	icon_override = 'icons/mob/eyes_vr.dmi'
-	icon = 'icons/mob/eyes_vr.dmi'
+	icon_override = 'icons/inventory/eyes/mob_vr.dmi'
+	icon = 'icons/inventory/eyes/mob_vr.dmi'
 	icon_state = "visor_CIV"
 	item_state = "visor_CIV"
 
diff --git a/code/modules/clothing/gloves/arm_guards_vr.dm b/code/modules/clothing/gloves/arm_guards_vr.dm
index 00f78dcc5d..69b3bee05d 100644
--- a/code/modules/clothing/gloves/arm_guards_vr.dm
+++ b/code/modules/clothing/gloves/arm_guards_vr.dm
@@ -2,5 +2,5 @@
 	name = "imperial gauntlets"
 	desc = "Made of some exotic metal, and crafted by space elves. Elves have delicate hands."
 	icon_state = "ge_gloves"
-	icon = 'icons/obj/clothing/gloves_vr.dmi'
-	icon_override = 'icons/mob/hands_vr.dmi'
\ No newline at end of file
+	icon = 'icons/inventory/hands/item_vr.dmi'
+	icon = 'icons/inventory/hands/mob_vr.dmi'
\ No newline at end of file
diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm
index 4b410163fe..bb4e035196 100644
--- a/code/modules/clothing/head/collectable.dm
+++ b/code/modules/clothing/head/collectable.dm
@@ -10,8 +10,8 @@
 	desc = "an ultra rare hat. It commands a certain respect."
 	icon_state = "petehat"
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi',
-		SPECIES_VOX = 'icons/mob/species/vox/head.dmi'
+		SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi',
+		SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi'
 		)
 
 /obj/item/clothing/head/collectable/slime
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index cf0527c6a6..bbe3f21b44 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -172,8 +172,8 @@
 	icon_state = "swathelm"
 	item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat")
 	sprite_sheets = list(
-		SPECIES_TAJ = 'icons/mob/species/tajaran/helmet.dmi',
-		SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi',
+		SPECIES_TAJ = 'icons/inventory/head/mob_tajaran.dmi',
+		SPECIES_UNATHI = 'icons/inventory/head/mob_unathi.dmi',
 		)
 
 	armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0)
diff --git a/code/modules/clothing/head/helmet_vr.dm b/code/modules/clothing/head/helmet_vr.dm
index 6f36aef383..53e9c581af 100644
--- a/code/modules/clothing/head/helmet_vr.dm
+++ b/code/modules/clothing/head/helmet_vr.dm
@@ -11,30 +11,30 @@
 	desc = "If you wanna to keep your brain inside yo' head, you'd best put this on!"
 	icon_state = "unsc_helm"
 	item_state = "unsc_helm"
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/mob/head_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
 
 /obj/item/clothing/head/helmet/combat/imperial
 	name = "imperial soldier helmet"
 	desc = "Veni, vidi, vici; I came, I saw, I conquered."
 	icon_state = "ge_helm"
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/mob/head_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
 
 /obj/item/clothing/head/helmet/combat/imperial/centurion
 	name = "imperial centurion helmet"
 	desc = "Vendi, vidi, visa; I came, I saw, I realised this hat was too expensive."
 	icon_state = "ge_helmcent"
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/mob/head_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
 
 // Armor Versions Here	
 /obj/item/clothing/head/helmet/combat/crusader
 	name = "crusader helmet"
 	desc = "ye olde armored helmet"
 	icon_state = "crusader"
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/obj/clothing/hats_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/item_vr.dmi'
 	armor = list(melee = 80, bullet = 50, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 2
 
@@ -42,8 +42,8 @@
 	name = "bedevere's helmet"
 	desc = "ye olde armored helmet"
 	icon_state = "bedevere_helmet"
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/obj/clothing/hats_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/item_vr.dmi'
 	armor = list(melee = 80, bullet = 50, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
 	tint = TINT_HEAVY
 	siemens_coefficient = 2
@@ -90,8 +90,8 @@
 	name = "crusader costume helmet"
 	desc = "ye olde armored helmet"
 	icon_state = "crusader"
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/obj/clothing/hats_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/item_vr.dmi'
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 1
 
@@ -99,8 +99,8 @@
 	name = "bedevere's costume helmet"
 	desc = "ye olde armored helmet"
 	icon_state = "bedevere_helmet"
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/obj/clothing/hats_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/item_vr.dmi'
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 	tint = TINT_HEAVY
 	siemens_coefficient = 1
diff --git a/code/modules/clothing/head/hood_vr.dm b/code/modules/clothing/head/hood_vr.dm
index c1de0bafc3..906bc98b02 100644
--- a/code/modules/clothing/head/hood_vr.dm
+++ b/code/modules/clothing/head/hood_vr.dm
@@ -32,5 +32,5 @@
 /obj/item/clothing/head/hood/winter/talon
 	name = "ITV winter hood"
 	desc = "A cozy winter hood attached to a heavy winter jacket."
-	icon_override = 'icons/mob/head_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "winterhood_talon"
\ No newline at end of file
diff --git a/code/modules/clothing/head/jobs_vr.dm b/code/modules/clothing/head/jobs_vr.dm
index 19a3a8163d..d77ff798ba 100644
--- a/code/modules/clothing/head/jobs_vr.dm
+++ b/code/modules/clothing/head/jobs_vr.dm
@@ -2,7 +2,7 @@
 	name = "Type-34C Semi-Enclosed Headwear"
 	desc = "Civilian model of a popular helmet used by certain law enforcement agencies. It does not have any armor plating, but has a neo-laminated fiber lining."
 	icon_state = "cyberpunkgoggle"
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/mob/head_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	flags_inv = HIDEEARS|HIDEEYES|BLOCKHAIR
 	
\ No newline at end of file
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 780333ae7e..d096eb5883 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -186,10 +186,10 @@
 
 /obj/item/clothing/head/kitty/update_icon(var/mob/living/carbon/human/user)
 	if(!istype(user)) return
-	var/icon/ears = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kitty")
+	var/icon/ears = new/icon("icon" = 'icons/inventory/head/mob.dmi', "icon_state" = "kitty")
 	ears.Blend(rgb(user.r_hair, user.g_hair, user.b_hair), ICON_ADD)
 
-	var/icon/earbit = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kittyinner")
+	var/icon/earbit = new/icon("icon" = 'icons/inventory/head/mob.dmi', "icon_state" = "kittyinner")
 	ears.Blend(earbit, ICON_OVERLAY)
 
 /obj/item/clothing/head/richard
diff --git a/code/modules/clothing/head/misc_vr.dm b/code/modules/clothing/head/misc_vr.dm
index be84af47a6..403b685744 100644
--- a/code/modules/clothing/head/misc_vr.dm
+++ b/code/modules/clothing/head/misc_vr.dm
@@ -5,23 +5,23 @@
 	name = "fish skull"
 	desc = "You... you're not actually going to wear that, right?"
 	icon_state = "fishskull"
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/mob/head_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	flags_inv = HIDEEARS|BLOCKHAIR
 
 /obj/item/clothing/head/crown
 	name = "crown"
 	desc = "How regal!"
 	icon_state = "crown"
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/mob/head_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
 
 /obj/item/clothing/head/fancy_crown
 	name = "fancy crown"
 	desc = "How extraordinarily regal!"
 	icon_state = "fancycrown"
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/mob/head_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
 
 /obj/item/clothing/head/shiny_hood
 	icon_override = 'icons/mob/modular_shiny_vr.dmi'
@@ -51,8 +51,8 @@
 /obj/item/clothing/head/pelt
 	name = "Bear pelt"
 	desc = "A luxurious bear pelt, good to keep warm in winter. Or to sleep through winter."
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/mob/head_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "bearpelt_brown"
 	item_state = "bearpelt_brown"
 
@@ -92,16 +92,16 @@
 	name = "pizza delivery visor"
 	desc = "A fancy visor showing alignment to pizza delivery service. Extremely risky career choice."
 	icon_state = "pizzadelivery"
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/mob/head_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
 
 //////////TALON HATS//////////
 
 /obj/item/clothing/head/soft/talon
 	name = "ITV baseball cap"
 	desc = "It's a ballcap bearing the colors of ITV."
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/mob/head_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "talonsoft"
 	item_state = "talonsoft"
 	item_state_slots = list(slot_r_hand_str = "blacksoft", slot_l_hand_str = "blacksoft")
@@ -109,23 +109,23 @@
 /obj/item/clothing/head/caphat/talon
 	name = "ITV nautical hat"
 	desc = "It's a classic nautical hat bearing the colors of ITV. Perfect for commanding the Talon."
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/mob/head_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "talon_captain_cap"
 	item_state = "taloncaptaincap"
 
 /obj/item/clothing/head/beret/talon
 	name = "ITV beret"
 	desc = "It's a basic baret colored to match ITV's uniforms."
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/mob/head_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "beret_talon"
 	item_state = "baret_talon"
 
 /obj/item/clothing/head/beret/talon/command
 	name = "ITV officer beret"
 	desc = "It's a basic baret colored to match ITV's uniforms with a badge pinned on the front. Perfect for commanders."
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/mob/head_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	icon_state = "beret_talon_officer"
 	item_state = "baret_talon_command"
\ No newline at end of file
diff --git a/code/modules/clothing/head/pilot_helmet.dm b/code/modules/clothing/head/pilot_helmet.dm
index 519f7cd1a7..f2c3956e47 100644
--- a/code/modules/clothing/head/pilot_helmet.dm
+++ b/code/modules/clothing/head/pilot_helmet.dm
@@ -6,7 +6,7 @@
 	icon_state = "pilot_helmet1"
 	item_icons = list(slot_head_str = 'icons/mob/pilot_helmet.dmi')
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/pilot_helmet.dmi'
+		SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi'
 		)
 	flags = THICKMATERIAL
 	armor = list(melee = 20, bullet = 10, laser = 10, energy = 5, bomb = 10, bio = 0, rad = 0)
diff --git a/code/modules/clothing/head/pilot_helmet_vr.dm b/code/modules/clothing/head/pilot_helmet_vr.dm
index 55afe6f713..26557b2ca3 100644
--- a/code/modules/clothing/head/pilot_helmet_vr.dm
+++ b/code/modules/clothing/head/pilot_helmet_vr.dm
@@ -2,7 +2,7 @@
 /obj/item/clothing/head/pilot_vr
 	name = "standard pilot helmet"
 	desc = "Standard pilot gear. Protects the head from impacts. This one has a retractable visor"
-	icon = 'icons/obj/clothing/helmets_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
 	icon_state = "pilot1"
 	armor = list(melee = 20, bullet = 10, laser = 10, energy = 5, bomb = 10, bio = 0, rad = 0)
 	flags_inv = HIDEEARS
@@ -11,9 +11,9 @@
 	heat_protection = HEAD
 	max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
 	w_class = ITEMSIZE_NORMAL
-	item_icons = list(slot_head_str = 'icons/mob/head_vr.dmi')
+	item_icons = list(slot_head_str = 'icons/inventory/head/mob_vr.dmi')
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/helmet_vr.dmi'
+		SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi'
 		)
 	action_button_name = "Toggle Visor"
 
@@ -30,9 +30,9 @@
 	name = "colored pilot helmet"
 	desc = "A colored version of the standard pilot helmet. Protects the head from impacts. This one has a retractable visor"
 	icon_state = "pilot2"
-	item_icons = list(slot_head_str = 'icons/mob/head_vr.dmi')
+	item_icons = list(slot_head_str = 'icons/inventory/head/mob_vr.dmi')
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/helmet_vr.dmi'
+		SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi'
 		)
 	action_button_name = "Toggle Visor"
 
@@ -51,9 +51,9 @@
 	name = "ITV pilot helmet"
 	desc = "An ITV version of the standard pilot helmet. Protects the head from impacts. This one has a retractable visor"
 	icon_state = "pilot3"
-	item_icons = list(slot_head_str = 'icons/mob/head_vr.dmi')
+	item_icons = list(slot_head_str = 'icons/inventory/head/mob_vr.dmi')
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/helmet_vr.dmi'
+		SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi'
 		)
 	action_button_name = "Toggle Visor"
 
diff --git a/code/modules/clothing/masks/gasmask_vr.dm b/code/modules/clothing/masks/gasmask_vr.dm
index 81b9f7ced0..cdc7d52e0c 100644
--- a/code/modules/clothing/masks/gasmask_vr.dm
+++ b/code/modules/clothing/masks/gasmask_vr.dm
@@ -6,15 +6,15 @@
 
 // Since we changed the gas mask sprite, if we want the old one for some reason use this.
 /obj/item/clothing/mask/gas/wwii
-	icon = 'icons/obj/clothing/masks.dmi'
-	icon_override = 'icons/mob/mask.dmi'
+	icon = 'icons/inventory/face/item.dmi'
+	icon_override = 'icons/inventory/face/mob.dmi'
 	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
 
 /obj/item/clothing/mask/gas/imperial
 	name = "imperial soldier facemask"
 	desc = "A close-fitting tactical mask that can be connected to an air supply."
 	icon_state = "ge_visor"
-	icon = 'icons/obj/clothing/masks_vr.dmi'
-	icon_override = 'icons/mob/mask_vr.dmi'
+	icon = 'icons/inventory/face/item_vr.dmi'
+	icon_override = 'icons/inventory/face/mob_vr.dmi'
 	body_parts_covered = FACE|EYES
 	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
\ No newline at end of file
diff --git a/code/modules/clothing/rings/material.dm b/code/modules/clothing/rings/material.dm
index 3607b6bc8a..218065b253 100644
--- a/code/modules/clothing/rings/material.dm
+++ b/code/modules/clothing/rings/material.dm
@@ -1,7 +1,7 @@
 /////////////////////////////////////////
 //Material Rings
 /obj/item/clothing/gloves/ring/material
-	icon = 'icons/obj/clothing/rings.dmi'
+	icon = 'icons/inventory/hands/item.dmi'
 	icon_state = "material"
 
 /obj/item/clothing/gloves/ring/material/New(var/newloc, var/new_material)
diff --git a/code/modules/clothing/rings/rings_vr.dm b/code/modules/clothing/rings/rings_vr.dm
index 56c72cc7c5..45306a7acc 100644
--- a/code/modules/clothing/rings/rings_vr.dm
+++ b/code/modules/clothing/rings/rings_vr.dm
@@ -1,7 +1,7 @@
 /obj/item/clothing/gloves/ring/wedding
 	name = "golden wedding ring"
 	desc = "For showing your devotion to another person. It has a golden glimmer to it."
-	icon = 'icons/obj/clothing/gloves_vr.dmi'
+	icon = 'icons/inventory/hands/item_vr.dmi'
 	icon_state = "wedring_g"
 	item_state = "wedring_g"
 	var/partnername = ""
diff --git a/code/modules/clothing/shoes/boots_vr.dm b/code/modules/clothing/shoes/boots_vr.dm
index 4c62209499..9f2f044f70 100644
--- a/code/modules/clothing/shoes/boots_vr.dm
+++ b/code/modules/clothing/shoes/boots_vr.dm
@@ -2,5 +2,5 @@
 	name = "hoofboots"
 	desc = "A pair of high-heeled boots with hooves on the front of the soles, for use with a hobby horse or to disguise your footprints."
 	icon_state = "hoofboots"
-	icon = 'icons/obj/clothing/shoes_vr.dmi'
-	icon_override = 'icons/mob/feet_vr.dmi'
\ No newline at end of file
+	icon = 'icons/inventory/feet/item_vr.dmi'
+	icon_override = 'icons/inventory/feet/mob_vr.dmi'
\ No newline at end of file
diff --git a/code/modules/clothing/shoes/leg_guards_vr.dm b/code/modules/clothing/shoes/leg_guards_vr.dm
index 52903bafa5..5000ef6670 100644
--- a/code/modules/clothing/shoes/leg_guards_vr.dm
+++ b/code/modules/clothing/shoes/leg_guards_vr.dm
@@ -2,5 +2,5 @@
 	name = "imperial leg guards"
 	desc = "Good for Roman around."
 	icon_state = "ge_boots"
-	icon = 'icons/obj/clothing/shoes_vr.dmi'
-	icon_override = 'icons/mob/feet_vr.dmi'
\ No newline at end of file
+	icon = 'icons/inventory/feet/item_vr.dmi'
+	icon_override = 'icons/inventory/feet/mob_vr.dmi'
\ No newline at end of file
diff --git a/code/modules/clothing/shoes/miscellaneous_vr.dm b/code/modules/clothing/shoes/miscellaneous_vr.dm
index 9e68be33dd..0e7accaa34 100644
--- a/code/modules/clothing/shoes/miscellaneous_vr.dm
+++ b/code/modules/clothing/shoes/miscellaneous_vr.dm
@@ -3,16 +3,16 @@
 	desc = "A pair of costume boots fashioned after bird talons."
 	icon_state = "griffinboots"
 	item_state = "griffinboots"
-	icon = 'icons/obj/clothing/shoes_vr.dmi'
-	icon_override = 'icons/mob/feet_vr.dmi'
+	icon = 'icons/inventory/feet/item_vr.dmi'
+	icon_override = 'icons/inventory/feet/mob_vr.dmi'
 
 /obj/item/clothing/shoes/bhop
 	name = "jump boots"
 	desc = "A specialized pair of combat boots with a built-in propulsion system for rapid foward movement."
 	icon_state = "jetboots"
 	item_state = "jetboots"
-	icon = 'icons/obj/clothing/shoes_vr.dmi'
-	icon_override = 'icons/mob/feet_vr.dmi'
+	icon = 'icons/inventory/feet/item_vr.dmi'
+	icon_override = 'icons/inventory/feet/mob_vr.dmi'
 	// resistance_flags = FIRE_PROOF
 	action_button_name = "Activate Jump Boots"
 	permeability_coefficient = 0.05
@@ -44,8 +44,8 @@
 /obj/item/clothing/shoes/magboots/adv
 	name = "advanced magboots"
 	desc = "Advanced magnetic boots for a trained user. They have a lower magnetic force, allowing the user to move more quickly."
-	icon = 'icons/obj/clothing/shoes_vr.dmi'
-	icon_override = 'icons/mob/feet_vr.dmi'
+	icon = 'icons/inventory/feet/item_vr.dmi'
+	icon_override = 'icons/inventory/feet/mob_vr.dmi'
 	
 	icon_state = "advmag0"
 	item_flags = PHORONGUARD
@@ -66,8 +66,8 @@
 	desc = "A pair of olde knight boots."
 	icon_state = "knight_boots1"
 	item_state = "knight_boots1"
-	icon = 'icons/obj/clothing/shoes_vr.dmi'
-	icon_override = 'icons/obj/clothing/shoes_vr.dmi'
+	icon = 'icons/inventory/feet/item_vr.dmi'
+	icon_override = 'icons/inventory/feet/item_vr.dmi'
 	armor = list(melee = 80, bullet = 50, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
 	
 /obj/item/clothing/shoes/knight/black
@@ -82,8 +82,8 @@
 	desc = "A pair of olde knight boots."
 	icon_state = "knight_boots1"
 	item_state = "knight_boots1"
-	icon = 'icons/obj/clothing/shoes_vr.dmi'
-	icon_override = 'icons/obj/clothing/shoes_vr.dmi'
+	icon = 'icons/inventory/feet/item_vr.dmi'
+	icon_override = 'icons/inventory/feet/item_vr.dmi'
 	
 /obj/item/clothing/shoes/knight_costume/black
 	name = "knight boots"
diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm
index 3c1843698c..600e89a82c 100644
--- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm
@@ -11,11 +11,11 @@
 	cold_protection =    HEAD|FACE|EYES
 	light_range = 4
 	sprite_sheets = list(
-		SPECIES_TAJ = 'icons/mob/species/tajaran/helmet.dmi',
-		SPECIES_SKRELL = 'icons/mob/species/skrell/helmet.dmi',
-		SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi',
-		SPECIES_VOX = 'icons/mob/species/vox/head.dmi',
-		SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi'
+		SPECIES_TAJ = 'icons/inventory/head/mob_tajaran.dmi',
+		SPECIES_SKRELL = 'icons/inventory/head/mob_skrell.dmi',
+		SPECIES_UNATHI = 'icons/inventory/head/mob_unathi.dmi',
+		SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi',
+		SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi'
 		)
 	species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI) //vox, diona, and zaddat can't use hardsuits not designed for them
 	max_pressure_protection = null
@@ -54,10 +54,10 @@
 	resilience = 0.2
 	can_breach = 1
 	sprite_sheets = list(
-		SPECIES_TAJ = 'icons/mob/species/tajaran/suit.dmi',
-		SPECIES_UNATHI = 'icons/mob/species/unathi/suit.dmi',
-		SPECIES_VOX = 'icons/mob/species/vox/suit.dmi',
-		SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi'
+		SPECIES_TAJ = 'icons/inventory/suit/mob_tajaran.dmi',
+		SPECIES_UNATHI = 'icons/inventory/suit/mob_unathi.dmi',
+		SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi',
+		SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi'
 		)
 	supporting_limbs = list()
 	species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI) //vox, diona, and zaddat can't use hardsuits not designed for them
diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
index 1d211e0bf1..83ea1913d7 100644
--- a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
@@ -1,37 +1,35 @@
 /obj/item/clothing/head/helmet/space/rig
 	sprite_sheets = list(
-		SPECIES_TAJ 			= 'icons/mob/species/tajaran/helmet.dmi',
-		SPECIES_SKRELL 			= 'icons/mob/species/skrell/helmet.dmi',
-		SPECIES_UNATHI 			= 'icons/mob/species/unathi/helmet.dmi',
-		SPECIES_XENOHYBRID 		= 'icons/mob/species/unathi/helmet.dmi',
-		SPECIES_AKULA 			= 'icons/mob/species/akula/helmet_vr.dmi',
-		SPECIES_SERGAL			= 'icons/mob/species/sergal/helmet_vr.dmi',
-		SPECIES_NEVREAN			= 'icons/mob/species/sergal/helmet_vr.dmi',
-		SPECIES_VULPKANIN 		= 'icons/mob/species/vulpkanin/helmet.dmi',
-		SPECIES_ZORREN_HIGH 	= 'icons/mob/species/vulpkanin/helmet.dmi',
-		SPECIES_FENNEC 			= 'icons/mob/species/vulpkanin/helmet.dmi',
-		SPECIES_PROMETHEAN		= 'icons/mob/species/skrell/helmet.dmi',
-		SPECIES_VOX 			= 'icons/mob/species/vox/head.dmi',
-		SPECIES_TESHARI 		= 'icons/mob/species/teshari/head.dmi'
+		SPECIES_TAJ 			= 'icons/inventory/head/mob_tajaran.dmi',
+		SPECIES_SKRELL 			= 'icons/inventory/head/mob_skrell.dmi',
+		SPECIES_UNATHI 			= 'icons/inventory/head/mob_unathi.dmi',
+		SPECIES_XENOHYBRID 		= 'icons/inventory/head/mob_unathi.dmi',
+		SPECIES_AKULA 			= 'icons/inventory/head/mob_akula.dmi',
+		SPECIES_SERGAL			= 'icons/inventory/head/mob_sergal.dmi',
+		SPECIES_NEVREAN			= 'icons/inventory/head/mob_sergal.dmi',
+		SPECIES_VULPKANIN 		= 'icons/inventory/head/mob_vulpkanin.dmi',
+		SPECIES_ZORREN_HIGH 	= 'icons/inventory/head/mob_vulpkanin.dmi',
+		SPECIES_FENNEC 			= 'icons/inventory/head/mob_vulpkanin.dmi',
+		SPECIES_PROMETHEAN		= 'icons/inventory/head/mob_skrell.dmi',
+		SPECIES_VOX 			= 'icons/inventory/head/mob_vox.dmi',
+		SPECIES_TESHARI 		= 'icons/inventory/head/mob_teshari.dmi'
 		)
 
-
-
 /obj/item/clothing/suit/space/rig
 	sprite_sheets = list(
-		SPECIES_TAJ 			= 'icons/mob/species/tajaran/suit.dmi',
-		SPECIES_SKRELL 			= 'icons/mob/species/skrell/suit.dmi',
-		SPECIES_UNATHI 			= 'icons/mob/species/unathi/suit.dmi',
-		SPECIES_XENOHYBRID 		= 'icons/mob/species/unathi/suit.dmi',
-		SPECIES_AKULA 			= 'icons/mob/species/akula/suit_vr.dmi',
-		SPECIES_SERGAL			= 'icons/mob/species/sergal/suit_vr.dmi',
-		SPECIES_NEVREAN			= 'icons/mob/species/sergal/suit_vr.dmi',
-		SPECIES_VULPKANIN		= 'icons/mob/species/vulpkanin/suit.dmi',
-		SPECIES_ZORREN_HIGH		= 'icons/mob/species/vulpkanin/suit.dmi',
-		SPECIES_FENNEC			= 'icons/mob/species/vulpkanin/suit.dmi',
-		SPECIES_PROMETHEAN		= 'icons/mob/species/skrell/suit.dmi',
-		SPECIES_VOX 			= 'icons/mob/species/vox/suit.dmi',
-		SPECIES_TESHARI 		= 'icons/mob/species/teshari/suit.dmi'
+		SPECIES_TAJ 			= 'icons/inventory/suit/mob_tajaran.dmi',
+		SPECIES_SKRELL 			= 'icons/inventory/suit/mob_skrell.dmi',
+		SPECIES_UNATHI 			= 'icons/inventory/suit/mob_unathi.dmi',
+		SPECIES_XENOHYBRID 		= 'icons/inventory/suit/mob_unathi.dmi',
+		SPECIES_AKULA 			= 'icons/inventory/suit/mob_akula.dmi',
+		SPECIES_SERGAL			= 'icons/inventory/suit/mob_sergal.dmi',
+		SPECIES_NEVREAN			= 'icons/inventory/suit/mob_sergal.dmi',
+		SPECIES_VULPKANIN		= 'icons/inventory/suit/mob_vulpkanin.dmi',
+		SPECIES_ZORREN_HIGH		= 'icons/inventory/suit/mob_vulpkanin.dmi',
+		SPECIES_FENNEC			= 'icons/inventory/suit/mob_vulpkanin.dmi',
+		SPECIES_PROMETHEAN		= 'icons/inventory/suit/mob_skrell.dmi',
+		SPECIES_VOX 			= 'icons/inventory/suit/mob_vox.dmi',
+		SPECIES_TESHARI 		= 'icons/inventory/suit/mob_teshari.dmi'
 		)
 
 /obj/item/clothing/head/helmet/space/rig
diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm
index af3349eafc..89d854b370 100644
--- a/code/modules/clothing/spacesuits/rig/suits/alien.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm
@@ -74,7 +74,7 @@
 	name = "talons"
 	species_restricted = list(SPECIES_VOX)
 	sprite_sheets = list(
-		SPECIES_VOX = 'icons/mob/species/vox/shoes.dmi'
+		SPECIES_VOX = 'icons/inventory/feet/mob_vox.dmi'
 		)
 
 /obj/item/clothing/suit/space/rig/vox
@@ -84,7 +84,7 @@
 	siemens_coefficient = 0
 	species_restricted = list(SPECIES_VOX)
 	sprite_sheets = list(
-		SPECIES_VOX = 'icons/mob/species/vox/gloves.dmi'
+		SPECIES_VOX = 'icons/inventory/hands/mob_vox.dmi'
 		)
 
 /obj/item/weapon/rig/vox/carapace
diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm
index b67b11fab8..ed51525e25 100644
--- a/code/modules/clothing/spacesuits/spacesuits.dm
+++ b/code/modules/clothing/spacesuits/spacesuits.dm
@@ -37,7 +37,7 @@
 		verbs |= /obj/item/clothing/head/helmet/space/proc/toggle_camera
 
 	if(type == /obj/item/clothing/head/helmet/space) //VOREStation edit - use the specially refitted sprites by KBraid. Done this way to avoid breaking subtypes.
-		sprite_sheets[SPECIES_TESHARI] = 'icons/mob/species/teshari/helmet_vr.dmi'
+		sprite_sheets[SPECIES_TESHARI] = 'icons/inventory/head/mob_vr_teshari.dmi'
 
 /obj/item/clothing/head/helmet/space/proc/toggle_camera()
 	set name = "Toggle Helmet Camera"
@@ -68,8 +68,7 @@
 /obj/item/clothing/suit/space
 	name = "Space suit"
 	desc = "A suit that protects against low pressure environments."
-	icon = 'icons/obj/clothing/spacesuits.dmi'
-	update_icon_define = INV_SPACESUIT_DEF_ICON
+	icon = 'icons/inventory/suit/item.dmi'
 	icon_state = "space"
 	w_class = ITEMSIZE_HUGE // So you can't fit this in your bag and be prepared at all times.
 	gas_transfer_coefficient = 0.01
@@ -95,7 +94,7 @@
 /obj/item/clothing/suit/space/Initialize()
 	. = ..()
 	if(type == /obj/item/clothing/suit/space)
-		sprite_sheets[SPECIES_TESHARI] = 'icons/mob/species/teshari/suit_vr.dmi'
+		sprite_sheets[SPECIES_TESHARI] = 'icons/inventory/suit/mob_vr_teshari.dmi' // aAAAaaAAAAA
 //VOREStation edit end.
 
 /obj/item/clothing/suit/space/equipped(mob/M)
diff --git a/code/modules/clothing/spacesuits/void/ert_vr.dm b/code/modules/clothing/spacesuits/void/ert_vr.dm
index c771132f18..330374fbdd 100644
--- a/code/modules/clothing/spacesuits/void/ert_vr.dm
+++ b/code/modules/clothing/spacesuits/void/ert_vr.dm
@@ -7,7 +7,7 @@
 	slowdown = 0.5
 	siemens_coefficient = 0.5
 	species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX,SPECIES_TESHARI)	//this thing can autoadapt
-	icon = 'icons/obj/clothing/suits_vr.dmi'
+	icon = 'icons/inventory/suit/item_vr.dmi'
 	w_class = ITEMSIZE_NORMAL //the mark vii packs itself down when not in use, thanks future-materials
 	breach_threshold = 16 //Extra Thicc
 	resilience = 0.05 //Military Armor
@@ -109,7 +109,7 @@
 	species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX,SPECIES_TESHARI)	//this thing can autoadapt too
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100)
 	siemens_coefficient = 0.5
-	icon = 'icons/obj/clothing/hats_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
 	enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_AUGMENTED)
 	var/away_planes = null
 	plane_slots = list(slot_head)
@@ -166,75 +166,75 @@
 
 /obj/item/clothing/suit/space/void/responseteam
 	sprite_sheets = list(
-		SPECIES_HUMAN			= 'icons/mob/spacesuit_vr.dmi',
-		SPECIES_TAJ 			= 'icons/mob/species/tajaran/suit_vr.dmi',
-		SPECIES_SKRELL 			= 'icons/mob/species/skrell/suit_vr.dmi',
-		SPECIES_UNATHI 			= 'icons/mob/species/unathi/suit_vr.dmi',
-		SPECIES_XENOHYBRID 		= 'icons/mob/species/unathi/suit_vr.dmi',
-		SPECIES_AKULA			= 'icons/mob/species/akula/suit_vr.dmi',
-		SPECIES_SERGAL			= 'icons/mob/species/sergal/suit_vr.dmi',
-		SPECIES_VULPKANIN		= 'icons/mob/species/vulpkanin/suit_vr.dmi',
-		SPECIES_ZORREN_HIGH		= 'icons/mob/species/vulpkanin/suit_vr.dmi',
-		SPECIES_FENNEC			= 'icons/mob/species/vulpkanin/suit_vr.dmi',
-		SPECIES_SHADEKIN_CREW		= 'icons/mob/species/vulpkanin/suit_vr.dmi',
-		SPECIES_VASILISSAN		= 'icons/mob/spacesuit_vr.dmi',
-		SPECIES_NEVREAN			= 'icons/mob/spacesuit_vr.dmi',
-		SPECIES_RAPALA			= 'icons/mob/spacesuit_vr.dmi',
-		SPECIES_ALRAUNE			= 'icons/mob/spacesuit_vr.dmi',
-		SPECIES_ZADDAT			= 'icons/mob/spacesuit_vr.dmi'
+		SPECIES_HUMAN			= 'icons/inventory/suit/mob_vr.dmi',
+		SPECIES_TAJ 			= 'icons/inventory/suit/mob_vr_tajaran.dmi',
+		SPECIES_SKRELL 			= 'icons/inventory/suit/mob_vr_skrell.dmi',
+		SPECIES_UNATHI 			= 'icons/inventory/suit/mob_vr_unathi.dmi',
+		SPECIES_XENOHYBRID 		= 'icons/inventory/suit/mob_vr_unathi.dmi',
+		SPECIES_AKULA			= 'icons/inventory/suit/mob_akula.dmi',
+		SPECIES_SERGAL			= 'icons/inventory/suit/mob_sergal.dmi',
+		SPECIES_VULPKANIN		= 'icons/inventory/suit/mob_vr_vulpkanin.dmi',
+		SPECIES_ZORREN_HIGH		= 'icons/inventory/suit/mob_vr_vulpkanin.dmi',
+		SPECIES_FENNEC			= 'icons/inventory/suit/mob_vr_vulpkanin.dmi',
+		SPECIES_SHADEKIN_CREW		= 'icons/inventory/suit/mob_vr_vulpkanin.dmi',
+		SPECIES_VASILISSAN		= 'icons/inventory/suit/mob_vr.dmi',
+		SPECIES_NEVREAN			= 'icons/inventory/suit/mob_vr.dmi',
+		SPECIES_RAPALA			= 'icons/inventory/suit/mob_vr.dmi',
+		SPECIES_ALRAUNE			= 'icons/inventory/suit/mob_vr.dmi',
+		SPECIES_ZADDAT			= 'icons/inventory/suit/mob_vr.dmi'
 		)
 	sprite_sheets_obj = list(
-		SPECIES_TAJ			= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_SKRELL			= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_UNATHI			= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_XENOHYBRID		= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_AKULA			= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_SERGAL			= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_VULPKANIN		= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_ZORREN_HIGH		= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_FENNEC			= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_SHADEKIN_CREW		= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_VASILISSAN		= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_NEVREAN			= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_RAPALA			= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_ALRAUNE			= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_ZADDAT			= 'icons/obj/clothing/suits_vr.dmi'
+		SPECIES_TAJ			= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_SKRELL			= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_UNATHI			= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_XENOHYBRID		= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_AKULA			= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_SERGAL			= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_VULPKANIN		= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_ZORREN_HIGH		= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_FENNEC			= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_SHADEKIN_CREW		= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_VASILISSAN		= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_NEVREAN			= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_RAPALA			= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_ALRAUNE			= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_ZADDAT			= 'icons/inventory/suit/item_vr.dmi'
 		)
 
 /obj/item/clothing/head/helmet/space/void/responseteam
 	sprite_sheets = list(
-		SPECIES_HUMAN			= 'icons/mob/head_vr.dmi',
-		SPECIES_TAJ 			= 'icons/mob/species/tajaran/helmet_vr.dmi',
-		SPECIES_SKRELL 			= 'icons/mob/species/skrell/helmet_vr.dmi',
-		SPECIES_UNATHI 			= 'icons/mob/species/unathi/helmet_vr.dmi',
-		SPECIES_XENOHYBRID 		= 'icons/mob/species/unathi/helmet_vr.dmi',
-		SPECIES_AKULA			= 'icons/mob/species/unathi/helmet_vr.dmi',
-		SPECIES_SERGAL			= 'icons/mob/species/unathi/helmet_vr.dmi',
-		SPECIES_VULPKANIN		= 'icons/mob/species/vulpkanin/helmet_vr.dmi',
-		SPECIES_ZORREN_HIGH		= 'icons/mob/species/vulpkanin/helmet_vr.dmi',
-		SPECIES_FENNEC			= 'icons/mob/species/vulpkanin/helmet_vr.dmi',
-		SPECIES_SHADEKIN_CREW		= 'icons/mob/species/vulpkanin/helmet_vr.dmi',
-		SPECIES_VASILISSAN		= 'icons/mob/head_vr.dmi',
-		SPECIES_NEVREAN			= 'icons/mob/head_vr.dmi',
-		SPECIES_RAPALA			= 'icons/mob/head_vr.dmi',
-		SPECIES_ALRAUNE			= 'icons/mob/head_vr.dmi',
-		SPECIES_ZADDAT			= 'icons/mob/head_vr.dmi'
+		SPECIES_HUMAN			= 'icons/inventory/head/mob_vr.dmi',
+		SPECIES_TAJ 			= 'icons/inventory/head/mob_vr_tajaran.dmi',
+		SPECIES_SKRELL 			= 'icons/inventory/head/mob_vr_skrell.dmi',
+		SPECIES_UNATHI 			= 'icons/inventory/head/mob_vr_unathi.dmi',
+		SPECIES_XENOHYBRID 		= 'icons/inventory/head/mob_vr_unathi.dmi',
+		SPECIES_AKULA			= 'icons/inventory/head/mob_vr_unathi.dmi',
+		SPECIES_SERGAL			= 'icons/inventory/head/mob_vr_unathi.dmi',
+		SPECIES_VULPKANIN		= 'icons/inventory/head/mob_vr_vulpkanin.dmi',
+		SPECIES_ZORREN_HIGH		= 'icons/inventory/head/mob_vr_vulpkanin.dmi',
+		SPECIES_FENNEC			= 'icons/inventory/head/mob_vr_vulpkanin.dmi',
+		SPECIES_SHADEKIN_CREW		= 'icons/inventory/head/mob_vulpkanin.dmi',
+		SPECIES_VASILISSAN		= 'icons/inventory/head/mob_vr.dmi',
+		SPECIES_NEVREAN			= 'icons/inventory/head/mob_vr.dmi',
+		SPECIES_RAPALA			= 'icons/inventory/head/mob_vr.dmi',
+		SPECIES_ALRAUNE			= 'icons/inventory/head/mob_vr.dmi',
+		SPECIES_ZADDAT			= 'icons/inventory/head/mob_vr.dmi'
 		)
 	sprite_sheets_obj = list(
-		SPECIES_TAJ 			= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_SKRELL			= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_UNATHI			= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_XENOHYBRID		= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_AKULA			= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_SERGAL			= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_VULPKANIN		= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_ZORREN_HIGH		= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_FENNEC			= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_SHADEKIN_CREW		= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_VASILISSAN		= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_NEVREAN			= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_RAPALA			= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_ALRAUNE			= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_ZADDAT			= 'icons/obj/clothing/hats_vr.dmi'
+		SPECIES_TAJ 			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_SKRELL			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_UNATHI			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_XENOHYBRID		= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_AKULA			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_SERGAL			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_VULPKANIN		= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_ZORREN_HIGH		= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_FENNEC			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_SHADEKIN_CREW		= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_VASILISSAN		= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_NEVREAN			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_RAPALA			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_ALRAUNE			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_ZADDAT			= 'icons/inventory/head/item_vr.dmi'
 		)
 	sprite_sheets_refit = list()	//have to nullify this as well just to be thorough
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/void/military_vr.dm b/code/modules/clothing/spacesuits/void/military_vr.dm
index 94355ba9c4..8eb7ff9ebd 100644
--- a/code/modules/clothing/spacesuits/void/military_vr.dm
+++ b/code/modules/clothing/spacesuits/void/military_vr.dm
@@ -31,8 +31,8 @@
 	icon_state = "rig0-odst"
 	item_state = "rig0-odst"
 	item_state_slots = null
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/mob/head_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	light_overlay = "helmet_light_dual"
 	species_restricted = null
 
@@ -40,9 +40,9 @@
 	name = "\improper Ace's ODST Helmet"
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "rig0-odst_ace"
-	desc = "Etched under the inner visor is the phrase <i>\"Don’t let your past define you; let it mold you into the person you want to be.\"</i>"
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/mob/head_vr.dmi'*/
+	desc = "Etched under the inner visor is the phrase <i>\"Don�t let your past define you; let it mold you into the person you want to be.\"</i>"
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'*/
 
 /obj/item/clothing/suit/space/void/merc/odst
 	name = "ODST Armor"
@@ -50,8 +50,8 @@
 	icon_state = "odst"
 	item_state = "odst"
 	item_state_slots = null
-	icon = 'icons/obj/clothing/suits_vr.dmi'
-	icon_override = 'icons/mob/suit_vr.dmi'
+	icon = 'icons/inventory/suit/item_vr.dmi'
+	icon_override = 'icons/inventory/suit/mob_vr.dmi'
 	species_restricted = null
 	breach_threshold = 16 //Extra Thicc
 	resilience = 0.05 //Military Armor
diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm
index 1ad116978b..444f563127 100644
--- a/code/modules/clothing/spacesuits/void/station.dm
+++ b/code/modules/clothing/spacesuits/void/station.dm
@@ -204,16 +204,16 @@
 
 /obj/item/clothing/head/helmet/space/void/medical/alt
 	sprite_sheets = list(
-		SPECIES_HUMAN			= 'icons/mob/head.dmi',
-		SPECIES_TAJ 			= 'icons/mob/species/tajaran/helmet.dmi',
-		SPECIES_SKRELL 			= 'icons/mob/species/skrell/helmet.dmi',
-		SPECIES_UNATHI 			= 'icons/mob/species/unathi/helmet.dmi'
-		)
+		SPECIES_HUMAN			= 'icons/inventory/head/mob.dmi',
+		SPECIES_TAJ 			= 'icons/inventory/head/mob_tajaran.dmi',
+		SPECIES_SKRELL 			= 'icons/inventory/head/mob_skrell.dmi',
+		SPECIES_UNATHI 			= 'icons/inventory/head/mob_unathi.dmi'
+	)
 	sprite_sheets_obj = list(
-		SPECIES_TAJ 			= 'icons/obj/clothing/hats.dmi',
-		SPECIES_SKRELL			= 'icons/obj/clothing/hats.dmi',
-		SPECIES_UNATHI			= 'icons/obj/clothing/hats.dmi'
-		)
+		SPECIES_TAJ 			= 'icons/inventory/head/item.dmi',
+		SPECIES_SKRELL			= 'icons/inventory/head/item.dmi',
+		SPECIES_UNATHI			= 'icons/inventory/head/item.dmi'
+	)
 
 /obj/item/clothing/head/helmet/space/void/medical/alt/tesh
 	name = "streamlined teshari medical voidsuit helmet"
@@ -223,10 +223,10 @@
 
 /obj/item/clothing/head/helmet/space/void/medical/alt/tesh
 	sprite_sheets = list(
-		SPECIES_TESHARI			= 'icons/mob/species/teshari/head.dmi'
+		SPECIES_TESHARI			= 'icons/inventory/head/mob_teshari.dmi'
 		)
 	sprite_sheets_obj = list(
-		SPECIES_TESHARI			= 'icons/obj/clothing/hats.dmi'
+		SPECIES_TESHARI			= 'icons/inventory/head/item.dmi'
 		)
 
 /obj/item/clothing/suit/space/void/medical/alt
@@ -240,15 +240,15 @@
 
 /obj/item/clothing/suit/space/void/medical/alt
 	sprite_sheets = list(
-		SPECIES_HUMAN			= 'icons/mob/spacesuit.dmi',
-		SPECIES_TAJ 			= 'icons/mob/species/tajaran/suit.dmi',
-		SPECIES_SKRELL 			= 'icons/mob/species/skrell/suit.dmi',
-		SPECIES_UNATHI 			= 'icons/mob/species/unathi/suit.dmi'
+		SPECIES_HUMAN			= 'icons/inventory/suit/mob.dmi',
+		SPECIES_TAJ 			= 'icons/inventory/suit/mob_tajaran.dmi',
+		SPECIES_SKRELL 			= 'icons/inventory/suit/mob_skrell.dmi',
+		SPECIES_UNATHI 			= 'icons/inventory/suit/mob_unathi.dmi'
 		)
 	sprite_sheets_obj = list(
-		SPECIES_TAJ			= 'icons/obj/clothing/spacesuits.dmi',
-		SPECIES_SKRELL			= 'icons/obj/clothing/spacesuits.dmi',
-		SPECIES_UNATHI			= 'icons/obj/clothing/spacesuits.dmi'
+		SPECIES_TAJ			= 'icons/inventory/suit/item.dmi',
+		SPECIES_SKRELL			= 'icons/inventory/suit/item.dmi',
+		SPECIES_UNATHI			= 'icons/inventory/suit/item.dmi'
 		)
 
 /obj/item/clothing/suit/space/void/medical/alt/tesh
@@ -259,10 +259,10 @@
 
 /obj/item/clothing/suit/space/void/medical/alt/tesh
 	sprite_sheets = list(
-		SPECIES_TESHARI			= 'icons/mob/species/teshari/suit.dmi'
+		SPECIES_TESHARI			= 'icons/inventory/suit/mob_teshari.dmi'
 		)
 	sprite_sheets_obj = list(
-		SPECIES_TESHARI			= 'icons/obj/clothing/spacesuits.dmi'
+		SPECIES_TESHARI			= 'icons/inventory/suit/item.dmi'
 		)
 
 //Security
diff --git a/code/modules/clothing/spacesuits/void/station_vr.dm b/code/modules/clothing/spacesuits/void/station_vr.dm
index 0684095afb..0c35f5a62b 100644
--- a/code/modules/clothing/spacesuits/void/station_vr.dm
+++ b/code/modules/clothing/spacesuits/void/station_vr.dm
@@ -1,49 +1,49 @@
 /obj/item/clothing/head/helmet/space/void/medical/alt
 	sprite_sheets = list(
-		SPECIES_HUMAN			= 'icons/mob/head.dmi',
-		SPECIES_TAJ 			= 'icons/mob/species/tajaran/helmet.dmi',
-		SPECIES_SKRELL 			= 'icons/mob/species/skrell/helmet.dmi',
-		SPECIES_UNATHI 			= 'icons/mob/species/unathi/helmet.dmi',
-		SPECIES_XENOHYBRID 		= 'icons/mob/species/unathi/helmet.dmi',
-		SPECIES_AKULA			= 'icons/mob/species/unathi/helmet.dmi',
-		SPECIES_SERGAL			= 'icons/mob/species/unathi/helmet.dmi',
-		SPECIES_VULPKANIN		= 'icons/mob/species/vulpkanin/helmet.dmi',
-		SPECIES_ZORREN_HIGH		= 'icons/mob/species/vulpkanin/helmet.dmi',
-		SPECIES_FENNEC			= 'icons/mob/species/vulpkanin/helmet.dmi'
+		SPECIES_HUMAN			= 'icons/inventory/head/mob.dmi',
+		SPECIES_TAJ 			= 'icons/inventory/head/mob_tajaran.dmi',
+		SPECIES_SKRELL 			= 'icons/inventory/head/mob_skrell.dmi',
+		SPECIES_UNATHI 			= 'icons/inventory/head/mob_unathi.dmi',
+		SPECIES_XENOHYBRID 		= 'icons/inventory/head/mob_unathi.dmi',
+		SPECIES_AKULA			= 'icons/inventory/head/mob_unathi.dmi',
+		SPECIES_SERGAL			= 'icons/inventory/head/mob_unathi.dmi',
+		SPECIES_VULPKANIN		= 'icons/inventory/head/mob_vulpkanin.dmi',
+		SPECIES_ZORREN_HIGH		= 'icons/inventory/head/mob_vulpkanin.dmi',
+		SPECIES_FENNEC			= 'icons/inventory/head/mob_vulpkanin.dmi'
 		)
 	sprite_sheets_obj = list(
-		SPECIES_TAJ 			= 'icons/obj/clothing/hats.dmi',
-		SPECIES_SKRELL			= 'icons/obj/clothing/hats.dmi',
-		SPECIES_UNATHI			= 'icons/obj/clothing/hats.dmi',
-		SPECIES_XENOHYBRID		= 'icons/obj/clothing/hats.dmi',
-		SPECIES_AKULA			= 'icons/obj/clothing/hats.dmi',
-		SPECIES_SERGAL			= 'icons/obj/clothing/hats.dmi',
-		SPECIES_VULPKANIN		= 'icons/obj/clothing/hats.dmi',
-		SPECIES_ZORREN_HIGH		= 'icons/obj/clothing/hats.dmi',
-		SPECIES_FENNEC			= 'icons/obj/clothing/hats.dmi'
+		SPECIES_TAJ 			= 'icons/inventory/head/item.dmi',
+		SPECIES_SKRELL			= 'icons/inventory/head/item.dmi',
+		SPECIES_UNATHI			= 'icons/inventory/head/item.dmi',
+		SPECIES_XENOHYBRID		= 'icons/inventory/head/item.dmi',
+		SPECIES_AKULA			= 'icons/inventory/head/item.dmi',
+		SPECIES_SERGAL			= 'icons/inventory/head/item.dmi',
+		SPECIES_VULPKANIN		= 'icons/inventory/head/item.dmi',
+		SPECIES_ZORREN_HIGH		= 'icons/inventory/head/item.dmi',
+		SPECIES_FENNEC			= 'icons/inventory/head/item.dmi'
 		)
 
 /obj/item/clothing/suit/space/void/medical/alt
 	sprite_sheets = list(
-		SPECIES_HUMAN			= 'icons/mob/spacesuit.dmi',
-		SPECIES_TAJ 			= 'icons/mob/species/tajaran/suit.dmi',
-		SPECIES_SKRELL 			= 'icons/mob/species/skrell/suit.dmi',
-		SPECIES_UNATHI 			= 'icons/mob/species/unathi/suit.dmi',
-		SPECIES_XENOHYBRID 		= 'icons/mob/species/unathi/suit.dmi',
-		SPECIES_AKULA			= 'icons/mob/species/akula/suit_vr.dmi',
-		SPECIES_SERGAL			= 'icons/mob/species/sergal/suit_vr.dmi',
-		SPECIES_VULPKANIN		= 'icons/mob/species/vulpkanin/suit.dmi',
-		SPECIES_ZORREN_HIGH		= 'icons/mob/species/vulpkanin/suit.dmi',
-		SPECIES_FENNEC			= 'icons/mob/species/vulpkanin/suit.dmi'
+		SPECIES_HUMAN			= 'icons/inventory/suit/mob.dmi',
+		SPECIES_TAJ 			= 'icons/inventory/suit/mob_tajaran.dmi',
+		SPECIES_SKRELL 			= 'icons/inventory/suit/mob_skrell.dmi',
+		SPECIES_UNATHI 			= 'icons/inventory/suit/mob_unathi.dmi',
+		SPECIES_XENOHYBRID 		= 'icons/inventory/suit/mob_unathi.dmi',
+		SPECIES_AKULA			= 'icons/inventory/suit/mob_akula.dmi',
+		SPECIES_SERGAL			= 'icons/inventory/suit/mob_sergal.dmi',
+		SPECIES_VULPKANIN		= 'icons/inventory/suit/mob_vulpkanin.dmi',
+		SPECIES_ZORREN_HIGH		= 'icons/inventory/suit/mob_vulpkanin.dmi',
+		SPECIES_FENNEC			= 'icons/inventory/suit/mob_vulpkanin.dmi'
 		)
 	sprite_sheets_obj = list(
-		SPECIES_TAJ			= 'icons/obj/clothing/spacesuits.dmi',
-		SPECIES_SKRELL			= 'icons/obj/clothing/spacesuits.dmi',
-		SPECIES_UNATHI			= 'icons/obj/clothing/spacesuits.dmi',
-		SPECIES_XENOHYBRID		= 'icons/obj/clothing/spacesuits.dmi',
-		SPECIES_AKULA			= 'icons/obj/clothing/spacesuits.dmi',
-		SPECIES_SERGAL			= 'icons/obj/clothing/spacesuits.dmi',
-		SPECIES_VULPKANIN		= 'icons/obj/clothing/spacesuits.dmi',
-		SPECIES_ZORREN_HIGH		= 'icons/obj/clothing/spacesuits.dmi',
-		SPECIES_FENNEC			= 'icons/obj/clothing/spacesuits.dmi'
+		SPECIES_TAJ			= 'icons/inventory/suit/item.dmi',
+		SPECIES_SKRELL			= 'icons/inventory/suit/item.dmi',
+		SPECIES_UNATHI			= 'icons/inventory/suit/item.dmi',
+		SPECIES_XENOHYBRID		= 'icons/inventory/suit/item.dmi',
+		SPECIES_AKULA			= 'icons/inventory/suit/item.dmi',
+		SPECIES_SERGAL			= 'icons/inventory/suit/item.dmi',
+		SPECIES_VULPKANIN		= 'icons/inventory/suit/item.dmi',
+		SPECIES_ZORREN_HIGH		= 'icons/inventory/suit/item.dmi',
+		SPECIES_FENNEC			= 'icons/inventory/suit/item.dmi'
 		)
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm
index 72d500579a..3d2c6b24d5 100644
--- a/code/modules/clothing/spacesuits/void/void.dm
+++ b/code/modules/clothing/spacesuits/void/void.dm
@@ -15,16 +15,16 @@
 	//Species-specific stuff.
 	species_restricted = list("Human", "Promethean")
 	sprite_sheets_refit = list(
-		SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi',
-		SPECIES_TAJ = 'icons/mob/species/tajaran/helmet.dmi',
-		SPECIES_SKRELL = 'icons/mob/species/skrell/helmet.dmi'
+		SPECIES_UNATHI = 'icons/inventory/head/mob_unathi.dmi',
+		SPECIES_TAJ = 'icons/inventory/head/mob_tajaran.dmi',
+		SPECIES_SKRELL = 'icons/inventory/head/mob_skrell.dmi'
 		//Teshari have a general sprite sheet defined in modules/clothing/clothing.dm
 		)
 	sprite_sheets_obj = list(
-		SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/hats.dmi',
-		SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/hats.dmi',
-		SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/hats.dmi',
-		SPECIES_TESHARI = 'icons/obj/clothing/species/teshari/hats.dmi'
+		SPECIES_UNATHI = 'icons/inventory/head/item_unathi.dmi',
+		SPECIES_TAJ = 'icons/inventory/head/item_tajaran.dmi',
+		SPECIES_SKRELL = 'icons/inventory/head/item_skrell.dmi',
+		SPECIES_TESHARI = 'icons/inventory/head/item_teshari.dmi'
 		)
 
 	light_overlay = "helmet_light"
@@ -45,16 +45,16 @@
 
 	species_restricted = list("Human", SPECIES_SKRELL, "Promethean")
 	sprite_sheets_refit = list(
-		SPECIES_UNATHI = 'icons/mob/species/unathi/suit.dmi',
-		SPECIES_TAJ = 'icons/mob/species/tajaran/suit.dmi',
-		SPECIES_SKRELL = 'icons/mob/species/skrell/suit.dmi'
+		SPECIES_UNATHI = 'icons/inventory/suit/mob_unathi.dmi',
+		SPECIES_TAJ = 'icons/inventory/suit/mob_tajaran.dmi',
+		SPECIES_SKRELL = 'icons/inventory/suit/mob_skrell.dmi'
 		//Teshari have a general sprite sheet defined in modules/clothing/clothing.dm
 		)
 	sprite_sheets_obj = list(
-		SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/suits.dmi',
-		SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/suits.dmi',
-		SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/suits.dmi',
-		SPECIES_TESHARI = 'icons/obj/clothing/species/teshari/suits.dmi'
+		SPECIES_UNATHI = 'icons/inventory/suit/item_unathi.dmi',
+		SPECIES_TAJ = 'icons/inventory/suit/item_tajaran.dmi',
+		SPECIES_SKRELL = 'icons/inventory/suit/item_skrell.dmi',
+		SPECIES_TESHARI = 'icons/inventory/suit/item_teshari.dmi'
 		)
 
 	//Breach thresholds, should ideally be inherited by most (if not all) voidsuits.
diff --git a/code/modules/clothing/spacesuits/void/void_vr.dm b/code/modules/clothing/spacesuits/void/void_vr.dm
index ae10305eb5..4a8050ac44 100644
--- a/code/modules/clothing/spacesuits/void/void_vr.dm
+++ b/code/modules/clothing/spacesuits/void/void_vr.dm
@@ -8,59 +8,59 @@
 /obj/item/clothing/head/helmet/space/void
 	species_restricted = list(SPECIES_HUMAN, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA)
 	sprite_sheets = list(
-		SPECIES_TAJ 				= 'icons/mob/species/tajaran/helmet.dmi',
-		SPECIES_SKRELL 				= 'icons/mob/species/skrell/helmet.dmi',
-		SPECIES_UNATHI 				= 'icons/mob/species/unathi/helmet.dmi',
-		SPECIES_TESHARI				= 'icons/mob/species/teshari/head.dmi',
-		SPECIES_XENOHYBRID 			= 'icons/mob/species/unathi/helmet.dmi',
-		SPECIES_AKULA				= 'icons/mob/species/akula/helmet_vr.dmi',
-		SPECIES_SERGAL				= 'icons/mob/species/sergal/helmet_vr.dmi',
-		SPECIES_NEVREAN				= 'icons/mob/species/sergal/helmet_vr.dmi',
-		SPECIES_VULPKANIN			= 'icons/mob/species/vulpkanin/helmet.dmi',
-		SPECIES_ZORREN_HIGH			= 'icons/mob/species/vulpkanin/helmet.dmi',
-		SPECIES_FENNEC				= 'icons/mob/species/vulpkanin/helmet.dmi'
+		SPECIES_TAJ 				= 'icons/inventory/head/mob_tajaran.dmi',
+		SPECIES_SKRELL 				= 'icons/inventory/head/mob_skrell.dmi',
+		SPECIES_UNATHI 				= 'icons/inventory/head/mob_unathi.dmi',
+		SPECIES_TESHARI				= 'icons/inventory/head/mob_teshari.dmi',
+		SPECIES_XENOHYBRID 			= 'icons/inventory/head/mob_unathi.dmi',
+		SPECIES_AKULA				= 'icons/inventory/head/mob_akula.dmi',
+		SPECIES_SERGAL				= 'icons/inventory/head/mob_sergal.dmi',
+		SPECIES_NEVREAN				= 'icons/inventory/head/mob_sergal.dmi',
+		SPECIES_VULPKANIN			= 'icons/inventory/head/mob_vulpkanin.dmi',
+		SPECIES_ZORREN_HIGH			= 'icons/inventory/head/mob_vulpkanin.dmi',
+		SPECIES_FENNEC				= 'icons/inventory/head/mob_vulpkanin.dmi'
 		)
 	sprite_sheets_obj = list(
-		SPECIES_TAJ 			= 'icons/obj/clothing/species/tajaran/hats.dmi', // Copied from void.dm
-		SPECIES_SKRELL			= 'icons/obj/clothing/species/skrell/hats.dmi',  // Copied from void.dm
-		SPECIES_UNATHI			= 'icons/obj/clothing/species/unathi/hats.dmi',  // Copied from void.dm
-		SPECIES_TESHARI			= 'icons/obj/clothing/species/teshari/hats.dmi',  // Copied from void.dm
-		SPECIES_XENOHYBRID		= 'icons/obj/clothing/species/unathi/hats.dmi',
-		SPECIES_AKULA			= 'icons/obj/clothing/species/akula/hats.dmi',
-		SPECIES_SERGAL			= 'icons/obj/clothing/species/sergal/hats.dmi',
-		SPECIES_NEVREAN			= 'icons/obj/clothing/species/sergal/hats.dmi',
-		SPECIES_VULPKANIN		= 'icons/obj/clothing/species/vulpkanin/hats.dmi',
-		SPECIES_ZORREN_HIGH		= 'icons/obj/clothing/species/vulpkanin/hats.dmi',
-		SPECIES_FENNEC			= 'icons/obj/clothing/species/vulpkanin/hats.dmi'
+		SPECIES_TAJ 			= 'icons/inventory/head/item_tajaran.dmi',
+		SPECIES_SKRELL			= 'icons/inventory/head/item_skrell.dmi',
+		SPECIES_UNATHI			= 'icons/inventory/head/item_unathi.dmi',
+		SPECIES_TESHARI			= 'icons/inventory/head/item_teshari.dmi',
+		SPECIES_XENOHYBRID		= 'icons/inventory/head/item_unathi.dmi',
+		SPECIES_AKULA			= 'icons/inventory/head/item_akula.dmi',
+		SPECIES_SERGAL			= 'icons/inventory/head/item_sergal.dmi',
+		SPECIES_NEVREAN			= 'icons/inventory/head/item_sergal.dmi',
+		SPECIES_VULPKANIN		= 'icons/inventory/head/item_vulpkanin.dmi',
+		SPECIES_ZORREN_HIGH		= 'icons/inventory/head/item_vulpkanin.dmi',
+		SPECIES_FENNEC			= 'icons/inventory/head/item_vulpkanin.dmi'
 		)
 
 /obj/item/clothing/suit/space/void
 	species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA)
 	sprite_sheets = list(
-		SPECIES_TAJ 				= 'icons/mob/species/tajaran/suit.dmi',
-		SPECIES_SKRELL 				= 'icons/mob/species/skrell/suit.dmi',
-		SPECIES_UNATHI 				= 'icons/mob/species/unathi/suit.dmi',
-		SPECIES_TESHARI				= 'icons/mob/species/teshari/suit.dmi',
-		SPECIES_XENOHYBRID 			= 'icons/mob/species/unathi/suit.dmi',
-		SPECIES_AKULA				= 'icons/mob/species/akula/suit_vr.dmi',
-		SPECIES_SERGAL				= 'icons/mob/species/sergal/suit_vr.dmi',
-		SPECIES_NEVREAN				= 'icons/mob/species/sergal/suit_vr.dmi',
-		SPECIES_VULPKANIN			= 'icons/mob/species/vulpkanin/suit.dmi',
-		SPECIES_ZORREN_HIGH			= 'icons/mob/species/vulpkanin/suit.dmi',
-		SPECIES_FENNEC				= 'icons/mob/species/vulpkanin/suit.dmi'
+		SPECIES_TAJ 				= 'icons/inventory/suit/mob_tajaran.dmi',
+		SPECIES_SKRELL 				= 'icons/inventory/suit/mob_skrell.dmi',
+		SPECIES_UNATHI 				= 'icons/inventory/suit/mob_unathi.dmi',
+		SPECIES_TESHARI				= 'icons/inventory/suit/mob_teshari.dmi',
+		SPECIES_XENOHYBRID 			= 'icons/inventory/suit/mob_unathi.dmi',
+		SPECIES_AKULA				= 'icons/inventory/suit/mob_akula.dmi',
+		SPECIES_SERGAL				= 'icons/inventory/suit/mob_sergal.dmi',
+		SPECIES_NEVREAN				= 'icons/inventory/suit/mob_sergal.dmi',
+		SPECIES_VULPKANIN			= 'icons/inventory/suit/mob_vulpkanin.dmi',
+		SPECIES_ZORREN_HIGH			= 'icons/inventory/suit/mob_vulpkanin.dmi',
+		SPECIES_FENNEC				= 'icons/inventory/suit/mob_vulpkanin.dmi'
 		)
 	sprite_sheets_obj = list(
-		SPECIES_TAJ			= 'icons/obj/clothing/species/tajaran/suits.dmi', // Copied from void.dm
-		SPECIES_SKRELL			= 'icons/obj/clothing/species/skrell/suits.dmi',  // Copied from void.dm
-		SPECIES_UNATHI			= 'icons/obj/clothing/species/unathi/suits.dmi',  // Copied from void.dm
-		SPECIES_TESHARI			= 'icons/obj/clothing/species/teshari/suits.dmi',  // Copied from void.dm
-		SPECIES_XENOHYBRID		= 'icons/obj/clothing/species/unathi/suits.dmi',
-		SPECIES_AKULA			= 'icons/obj/clothing/species/akula/suits.dmi',
-		SPECIES_SERGAL			= 'icons/obj/clothing/species/sergal/suits.dmi',
-		SPECIES_NEVREAN			= 'icons/obj/clothing/species/sergal/suits.dmi',
-		SPECIES_VULPKANIN		= 'icons/obj/clothing/species/vulpkanin/suits.dmi',
-		SPECIES_ZORREN_HIGH		= 'icons/obj/clothing/species/vulpkanin/suits.dmi',
-		SPECIES_FENNEC			= 'icons/obj/clothing/species/vulpkanin/suits.dmi'
+		SPECIES_TAJ			= 'icons/inventory/suit/item_tajaran.dmi',
+		SPECIES_SKRELL			= 'icons/inventory/suit/item_skrell.dmi',
+		SPECIES_UNATHI			= 'icons/inventory/suit/item_unathi.dmi',
+		SPECIES_TESHARI			= 'icons/inventory/suit/item_teshari.dmi',
+		SPECIES_XENOHYBRID		= 'icons/inventory/suit/item_unathi.dmi',
+		SPECIES_AKULA			= 'icons/inventory/suit/item_akula.dmi',
+		SPECIES_SERGAL			= 'icons/inventory/suit/item_sergal.dmi',
+		SPECIES_NEVREAN			= 'icons/inventory/suit/item_sergal.dmi',
+		SPECIES_VULPKANIN		= 'icons/inventory/suit/item_vulpkanin.dmi',
+		SPECIES_ZORREN_HIGH		= 'icons/inventory/suit/item_vulpkanin.dmi',
+		SPECIES_FENNEC			= 'icons/inventory/suit/item_vulpkanin.dmi'
 		)
 
 	// This is a hack to prevent the item_state variable on the suits from taking effect
@@ -74,8 +74,8 @@
 	desc = "Hostile Environiment Cross-Kinetic Helmet: A helmet designed to withstand the wide variety of hazards from \[REDACTED\]. It wasn't enough for its last owner."
 	icon_state = "hostile_env"
 	item_state = "hostile_env"
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/mob/head_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	armor = list(melee = 60, bullet = 35, laser = 35, energy = 15, bomb = 55, bio = 100, rad = 20)
 
 /obj/item/clothing/head/helmet/space/void/heck/Initialize()
@@ -96,8 +96,8 @@
 	desc = "Hostile Environment Cross-Kinetic Suit: A suit designed to withstand the wide variety of hazards from \[REDACTED\]. It wasn't enough for its last owner."
 	icon_state = "hostile_env"
 	item_state = "hostile_env"
-	icon = 'icons/obj/clothing/suits_vr.dmi'
-	icon_override = 'icons/mob/suit_vr.dmi'
+	icon = 'icons/inventory/suit/item_vr.dmi'
+	icon_override = 'icons/inventory/suit/mob_vr.dmi'
 	slowdown = 1.5
 	armor = list(melee = 60, bullet = 35, laser = 35, energy = 15, bomb = 55, bio = 100, rad = 20)
 
@@ -106,8 +106,8 @@
 	desc = "A free helmet, gifted you by your new not-quite-corporate master!"
 	icon_state = "syndicate-contract"
 	item_state = "syndicate-contract"
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/mob/head_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60)
 	siemens_coefficient = 0.6
 	camera_networks = list(NETWORK_MERCENARY)
@@ -117,8 +117,8 @@
 	desc = "A free suit, gifted you by your new not-quite-corporate master!"
 	icon_state = "syndicate-contract"
 	item_state = "syndicate-contract"
-	icon = 'icons/obj/clothing/suits_vr.dmi'
-	icon_override = 'icons/mob/suit_vr.dmi'
+	icon = 'icons/inventory/suit/item_vr.dmi'
+	icon_override = 'icons/inventory/suit/mob_vr.dmi'
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60)
 	siemens_coefficient = 0.6
 
@@ -127,21 +127,22 @@
 	desc = "From out of space and time, this helmet will protect you while you perform your duties."
 	icon_state = "chronohelmet"
 	item_state = "chronohelmet"
-	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/mob/head_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
 
 /obj/item/clothing/suit/space/void/chrono
 	name = "chrono-suit"
 	desc = "From out of space and time, this helmet will protect you while you perform your duties."
 	icon_state = "chronosuit"
 	item_state = "chronosuit"
-	icon = 'icons/obj/clothing/suits_vr.dmi'
-	icon_override = 'icons/mob/suit_vr.dmi'
+	icon = 'icons/inventory/suit/item_vr.dmi'
+	icon_override = 'icons/inventory/suit/mob_vr.dmi'
 
 /obj/item/clothing/suit/space/void/autolok
 	name = "AutoLok pressure suit"
 	desc = "A high-tech snug-fitting pressure suit. Fits any species. It offers very little physical protection, but is equipped with sensors that will automatically deploy the integral helmet to protect the wearer."
-	icon = 'icons/obj/clothing/suits_vr.dmi'
+	icon = 'icons/inventory/suit/item_vr.dmi'
+	icon_override = 'icons/inventory/suit/mob_vr.dmi'
 	icon_state = "autoloksuit"
 	item_state = "autoloksuit"
 	item_state_slots = list(slot_r_hand_str = "space_suit_syndicate", slot_l_hand_str = "space_suit_syndicate")
@@ -154,29 +155,29 @@
 
 /obj/item/clothing/suit/space/void/autolok
 	sprite_sheets = list(
-		SPECIES_HUMAN			= 'icons/mob/spacesuit_vr.dmi',
-		SPECIES_TAJ 			= 'icons/mob/species/tajaran/suit_vr.dmi',
-		SPECIES_SKRELL 			= 'icons/mob/species/skrell/suit_vr.dmi',
-		SPECIES_UNATHI 			= 'icons/mob/species/unathi/suit_vr.dmi',
-		SPECIES_XENOHYBRID 		= 'icons/mob/species/unathi/suit_vr.dmi',
-		SPECIES_AKULA			= 'icons/mob/species/unathi/suit_vr.dmi',
-		SPECIES_SERGAL			= 'icons/mob/species/unathi/suit_vr.dmi',
-		SPECIES_VULPKANIN		= 'icons/mob/species/vulpkanin/suit_vr.dmi',
-		SPECIES_ZORREN_HIGH		= 'icons/mob/species/vulpkanin/suit_vr.dmi',
-		SPECIES_FENNEC			= 'icons/mob/species/vulpkanin/suit_vr.dmi',
-		SPECIES_TESHARI			= 'icons/mob/species/teshari/suit_vr.dmi'
+		SPECIES_HUMAN			= 'icons/inventory/suit/mob_vr.dmi',
+		SPECIES_TAJ 			= 'icons/inventory/suit/mob_vr_tajaran.dmi',
+		SPECIES_SKRELL 			= 'icons/inventory/suit/mob_vr_skrell.dmi',
+		SPECIES_UNATHI 			= 'icons/inventory/suit/mob_vr_unathi.dmi',
+		SPECIES_XENOHYBRID 		= 'icons/inventory/suit/mob_vr_unathi.dmi',
+		SPECIES_AKULA			= 'icons/inventory/suit/mob_vr_unathi.dmi',
+		SPECIES_SERGAL			= 'icons/inventory/suit/mob_vr_unathi.dmi',
+		SPECIES_VULPKANIN		= 'icons/inventory/suit/mob_vr_vulpkanin.dmi',
+		SPECIES_ZORREN_HIGH		= 'icons/inventory/suit/mob_vr_vulpkanin.dmi',
+		SPECIES_FENNEC			= 'icons/inventory/suit/mob_vr_vulpkanin.dmi',
+		SPECIES_TESHARI			= 'icons/inventory/suit/mob_vr_teshari.dmi'
 		)
 	sprite_sheets_obj = list(
-		SPECIES_TAJ			= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_SKRELL			= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_UNATHI			= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_XENOHYBRID		= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_AKULA			= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_SERGAL			= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_VULPKANIN		= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_ZORREN_HIGH		= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_FENNEC			= 'icons/obj/clothing/suits_vr.dmi',
-		SPECIES_TESHARI			= 'icons/obj/clothing/suits_vr.dmi'
+		SPECIES_TAJ			= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_SKRELL			= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_UNATHI			= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_XENOHYBRID		= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_AKULA			= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_SERGAL			= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_VULPKANIN		= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_ZORREN_HIGH		= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_FENNEC			= 'icons/inventory/suit/item_vr.dmi',
+		SPECIES_TESHARI			= 'icons/inventory/suit/item_vr.dmi'
 		)
 
 /obj/item/clothing/suit/space/void/autolok/Initialize()
@@ -228,33 +229,33 @@
 	icon_state = "autolokhelmet"
 	item_state = "autolokhelmet"
 	species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX)	//this thing can autoadapt too
-	icon = 'icons/obj/clothing/hats_vr.dmi'
+	icon = 'icons/inventory/head/item_vr.dmi'
 	flags_inv = HIDEEARS|BLOCKHAIR //removed HIDEFACE/MASK/EYES flags so sunglasses or facemasks don't disappear. still gotta have BLOCKHAIR or it'll clip out tho.
 
 /obj/item/clothing/head/helmet/space/void/autolok
 	sprite_sheets = list(
-		SPECIES_HUMAN			= 'icons/mob/head_vr.dmi',
-		SPECIES_TAJ 			= 'icons/mob/species/tajaran/helmet_vr.dmi',
-		SPECIES_SKRELL 			= 'icons/mob/species/skrell/helmet_vr.dmi',
-		SPECIES_UNATHI 			= 'icons/mob/species/unathi/helmet_vr.dmi',
-		SPECIES_XENOHYBRID 		= 'icons/mob/species/unathi/helmet_vr.dmi',
-		SPECIES_AKULA			= 'icons/mob/species/unathi/helmet_vr.dmi',
-		SPECIES_SERGAL			= 'icons/mob/species/unathi/helmet_vr.dmi',
-		SPECIES_VULPKANIN		= 'icons/mob/species/vulpkanin/helmet_vr.dmi',
-		SPECIES_ZORREN_HIGH		= 'icons/mob/species/vulpkanin/helmet_vr.dmi',
-		SPECIES_FENNEC			= 'icons/mob/species/vulpkanin/helmet_vr.dmi',
-		SPECIES_TESHARI			= 'icons/mob/species/teshari/helmet_vr.dmi'
+		SPECIES_HUMAN			= 'icons/inventory/head/mob_vr.dmi',
+		SPECIES_TAJ 			= 'icons/inventory/head/mob_vr_tajaran.dmi',
+		SPECIES_SKRELL 			= 'icons/inventory/head/mob_vr_skrell.dmi',
+		SPECIES_UNATHI 			= 'icons/inventory/head/mob_vr_unathi.dmi',
+		SPECIES_XENOHYBRID 		= 'icons/inventory/head/mob_vr_unathi.dmi',
+		SPECIES_AKULA			= 'icons/inventory/head/mob_vr_unathi.dmi',
+		SPECIES_SERGAL			= 'icons/inventory/head/mob_vr_unathi.dmi',
+		SPECIES_VULPKANIN		= 'icons/inventory/head/mob_vr_vulpkanin.dmi',
+		SPECIES_ZORREN_HIGH		= 'icons/inventory/head/mob_vr_vulpkanin.dmi',
+		SPECIES_FENNEC			= 'icons/inventory/head/mob_vr_vulpkanin.dmi',
+		SPECIES_TESHARI			= 'icons/inventory/head/mob_vr_teshari.dmi'
 		)
 	sprite_sheets_obj = list(
-		SPECIES_TAJ 			= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_SKRELL			= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_UNATHI			= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_XENOHYBRID		= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_AKULA			= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_SERGAL			= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_VULPKANIN		= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_ZORREN_HIGH		= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_FENNEC			= 'icons/obj/clothing/hats_vr.dmi',
-		SPECIES_TESHARI			= 'icons/obj/clothing/hats_vr.dmi'
+		SPECIES_TAJ 			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_SKRELL			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_UNATHI			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_XENOHYBRID		= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_AKULA			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_SERGAL			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_VULPKANIN		= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_ZORREN_HIGH		= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_FENNEC			= 'icons/inventory/head/item_vr.dmi',
+		SPECIES_TESHARI			= 'icons/inventory/head/item_vr.dmi'
 		)
 	sprite_sheets_refit = list()	//have to nullify this as well just to be thorough
\ No newline at end of file
diff --git a/code/modules/clothing/suits/aliens/teshari.dm b/code/modules/clothing/suits/aliens/teshari.dm
index 65a19bf8c2..ee3450c64f 100644
--- a/code/modules/clothing/suits/aliens/teshari.dm
+++ b/code/modules/clothing/suits/aliens/teshari.dm
@@ -2,8 +2,8 @@
 /obj/item/clothing/suit/storage/teshari/cloak
 	name = "black cloak"
 	desc = "It drapes over a Teshari's shoulders and closes at the neck with pockets convienently placed inside."
-	icon = 'icons/mob/species/teshari/teshari_cloak.dmi'
-	icon_override = 'icons/mob/species/teshari/teshari_cloak.dmi'
+	icon = 'icons/inventory/suit/item_teshari.dmi'
+	icon = 'icons/inventory/suit/mob_teshari.dmi'
 	icon_state = "tesh_cloak_bn"
 	item_state = "tesh_cloak_bn"
 	species_restricted = list(SPECIES_TESHARI)
@@ -131,10 +131,6 @@
 
 
 // Job Cloaks
-/obj/item/clothing/suit/storage/teshari/cloak/jobs
-	icon = 'icons/mob/species/teshari/deptcloak.dmi'
-	icon_override = 'icons/mob/species/teshari/deptcloak.dmi'
-
 /obj/item/clothing/suit/storage/teshari/cloak/jobs/cap
 	name = "facility director cloak"
 	desc = "A soft Teshari cloak made for the Facility Director"
@@ -278,16 +274,12 @@
 /obj/item/clothing/suit/storage/toggle/labcoat/teshari
 	name = "Teshari labcoat"
 	desc = "A small suit that protects against minor chemical spills. This one is a good fit on Teshari."
-	icon = 'icons/obj/clothing/species/teshari/suits.dmi'
-	icon_override = 'icons/mob/species/teshari/suit.dmi'
 	icon_state = "tesh_labcoat"
 	species_restricted = list(SPECIES_TESHARI)
 
 /obj/item/clothing/suit/storage/toggle/tesharicoat
 	name = "small black coat"
 	desc = "A coat that seems too small to fit a human."
-	icon = 'icons/obj/clothing/species/teshari/suits.dmi'
-	icon_override = 'icons/mob/species/teshari/suit.dmi'
 	icon_state = "tesharicoat"
 	body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS
 	species_restricted = list(SPECIES_TESHARI)
@@ -295,8 +287,6 @@
 /obj/item/clothing/suit/storage/toggle/tesharicoatwhite
 	name = "small coat"
 	desc = "A coat that seems too small to fit a human."
-	icon = 'icons/obj/clothing/species/teshari/suits.dmi'
-	icon_override = 'icons/mob/species/teshari/suit.dmi'
 	icon_state = "tesharicoatwhite"
 	body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS
 	species_restricted = list(SPECIES_TESHARI)
@@ -305,8 +295,6 @@
 /obj/item/clothing/suit/storage/hooded/teshari
 	name = "Hooded Teshari Cloak"
 	desc = "A soft teshari cloak with an added hood."
-	icon_override = 'icons/mob/species/teshari/teshari_hood.dmi'
-	icon = 'icons/mob/species/teshari/teshari_hood.dmi'
 	icon_state = "tesh_hcloak_bo"
 	item_state_slots = list(slot_r_hand_str = "tesh_hcloak_bo", slot_l_hand_str = "tesh_hcloak_bo")
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
@@ -319,8 +307,6 @@
 /obj/item/clothing/head/tesh_hood
 	name = "Cloak Hood"
 	desc = "A hood attached to a teshari cloak."
-	icon_override = 'icons/mob/species/teshari/teshari_hood.dmi'
-	icon = 'icons/mob/species/teshari/teshari_hood.dmi'
 	icon_state = "tesh_hood_bo"
 	item_state_slots = list(slot_r_hand_str = "tesh_hood_bo", slot_l_hand_str = "tesh_hood_bo")
 	flags_inv = BLOCKHAIR
@@ -606,8 +592,6 @@
 /obj/item/clothing/suit/storage/teshari/beltcloak
 	name = "belted cloak"
 	desc = "A more ridged and stylized Teshari cloak."
-	icon = 'icons/mob/species/teshari/teshari_cloak.dmi'
-	icon_override = 'icons/mob/species/teshari/teshari_cloak.dmi'
 	icon_state = "tesh_beltcloak_bo"
 	item_state = "tesh_beltcloak_bo"
 	species_restricted = list(SPECIES_TESHARI)
@@ -739,10 +723,6 @@
 	item_state = "tesh_beltcloak_brg"
 
 //Belted job cloaks
-/obj/item/clothing/suit/storage/teshari/beltcloak/jobs
-	icon = 'icons/mob/species/teshari/deptcloak.dmi'
-	icon_override = 'icons/mob/species/teshari/deptcloak.dmi'
-
 /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cargo
 	name = "cargo belted cloak"
 	desc = "A soft Teshari cloak made for the Cargo department"
diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm
index ba986f56fc..c71030ca44 100644
--- a/code/modules/clothing/suits/armor_vr.dm
+++ b/code/modules/clothing/suits/armor_vr.dm
@@ -61,16 +61,16 @@
 	name = "marine body armor"
 	desc = "When I joined the Corps, we didn't have any fancy-schmanzy armor. We had sticks! Two sticks, and a rock for the whole platoon-and we had to <i>share</i> the rock!"
 	icon_state = "unsc_armor"
-	icon = 'icons/obj/clothing/suits_vr.dmi'
-	icon_override = 'icons/mob/suit_vr.dmi'
+	icon = 'icons/inventory/suit/item_vr.dmi'
+	icon_override = 'icons/inventory/suit/mob_vr.dmi'
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO // ToDo: Break up the armor into smaller bits.
 
 /obj/item/clothing/suit/armor/combat/imperial
 	name = "imperial soldier armor"
 	desc = "Made out of an especially light metal, it lets you conquer in style."
 	icon_state = "ge_armor"
-	icon = 'icons/obj/clothing/suits_vr.dmi'
-	icon_override = 'icons/mob/suit_vr.dmi'
+	icon = 'icons/inventory/suit/item_vr.dmi'
+	icon_override = 'icons/inventory/suit/mob_vr.dmi'
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 
 /obj/item/clothing/suit/armor/combat/imperial/centurion
@@ -79,12 +79,12 @@
 	icon_state = "ge_armorcent"
 
 /obj/item/clothing/suit/storage/vest/wardencoat/alt2
-	icon = 'icons/obj/clothing/suits_vr.dmi'
-	icon_override = 'icons/mob/suit_vr.dmi'
+	icon = 'icons/inventory/suit/item_vr.dmi'
+	icon_override = 'icons/inventory/suit/mob_vr.dmi'
 
 /obj/item/clothing/suit/storage/vest/hoscoat/jensen/alt
-	icon = 'icons/obj/clothing/suits_vr.dmi'
-	icon_override = 'icons/mob/suit_vr.dmi'
+	icon = 'icons/inventory/suit/item_vr.dmi'
+	icon_override = 'icons/inventory/suit/mob_vr.dmi'
 
 // Armor Versions Here
 /obj/item/clothing/suit/armor/combat/crusader
diff --git a/code/modules/clothing/suits/hooded_vr.dm b/code/modules/clothing/suits/hooded_vr.dm
index 8d0b6a9c38..47d0bb1274 100644
--- a/code/modules/clothing/suits/hooded_vr.dm
+++ b/code/modules/clothing/suits/hooded_vr.dm
@@ -5,8 +5,8 @@
 /obj/item/clothing/suit/storage/hooded/techpriest
 	name = "tech priest robe"
 	desc = "Praise be to the Omnissiah."
-	icon = 'icons/obj/clothing/suits_vr.dmi'
-	icon_override = 'icons/mob/suit_vr.dmi'
+	icon = 'icons/inventory/suit/item_vr.dmi'
+	icon_override = 'icons/inventory/suit/mob_vr.dmi'
 	icon_state = "techpriest"
 	hoodtype = /obj/item/clothing/head/hood/techpriest
 	armor = list(melee = 20, bullet = 10, laser = 10, energy = 10, bomb = 25, bio = 50, rad = 25)
@@ -73,8 +73,8 @@
 /obj/item/clothing/suit/storage/hooded/wintercoat/talon
 	name = "ITV winter coat"
 	desc = "A cozy winter coat, covered in thick fur and baring the colors of ITV."
-	icon = 'icons/obj/clothing/suits_vr.dmi'
-	icon_override = 'icons/mob/suit_vr.dmi'
+	icon = 'icons/inventory/suit/item_vr.dmi'
+	icon_override = 'icons/inventory/suit/mob_vr.dmi'
 	icon_state = "taloncoat"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	hoodtype = /obj/item/clothing/head/hood/winter/talon
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 5d5f168096..1119079e2a 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -242,7 +242,7 @@
 /obj/item/clothing/suit/suspenders
 	name = "suspenders"
 	desc = "They suspend the illusion of the mime's play."
-	icon = 'icons/obj/clothing/belts.dmi'
+	icon = 'icons/inventory/belt/item.dmi'
 	icon_state = "suspenders"
 	blood_overlay_type = "armor" //it's the less thing that I can put here
 	body_parts_covered = 0
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index eb75c00eef..190e8bae2b 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -43,7 +43,7 @@
 /obj/item/clothing/suit/poncho
 	name = "poncho"
 	desc = "A simple, comfortable poncho."
-	icon = 'icons/mob/suit.dmi'
+	icon = 'icons/inventory/suit/mob.dmi'
 	icon_state = "poncho"
 	item_state = "poncho"
 	item_icons = list(
@@ -105,9 +105,7 @@
 
 /obj/item/clothing/suit/syndicatefake
 	name = "red space suit replica"
-	icon = 'icons/obj/clothing/spacesuits.dmi'
 	icon_state = "syndicate"
-	default_worn_icon = 'icons/mob/spacesuit.dmi'
 	desc = "A plastic replica of the syndicate space suit, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!"
 	w_class = ITEMSIZE_NORMAL
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen,/obj/item/toy)
diff --git a/code/modules/clothing/suits/miscellaneous_vr.dm b/code/modules/clothing/suits/miscellaneous_vr.dm
index 9ff69f6c26..e595cd59cd 100644
--- a/code/modules/clothing/suits/miscellaneous_vr.dm
+++ b/code/modules/clothing/suits/miscellaneous_vr.dm
@@ -4,16 +4,16 @@
 /obj/item/clothing/suit/chiton
 	name = "chiton"
 	desc = "A traditional piece of clothing from Greece."
-	icon = 'icons/obj/clothing/suits_vr.dmi'
+	icon = 'icons/inventory/suit/item_vr.dmi'
 	icon_state = "chiton"
-	icon_override = 'icons/mob/suit_vr.dmi'
+	icon_override = 'icons/inventory/suit/mob_vr.dmi'
 
 /obj/item/clothing/suit/oversize
 	name = "oversized t-shirt"
 	desc = "This ain't your daddy's shirt! Well, it might be..."
-	icon = 'icons/obj/clothing/suits_vr.dmi'
+	icon = 'icons/inventory/suit/item_vr.dmi'
 	icon_state = "oversize"
-	icon_override = 'icons/mob/suit_vr.dmi'
+	icon_override = 'icons/inventory/suit/mob_vr.dmi'
 
 //HERE BE TAUR RELATED CLOTHES
 
@@ -88,16 +88,16 @@
 /obj/item/clothing/suit/storage/det_trench/alt
 	name = "sleek modern coat"
 	desc = "A sleek overcoat made of neo-laminated fabric. Has a reasonably sized pocket on the inside."
-	icon = 'icons/obj/clothing/suits_vr.dmi'
-	icon_override = 'icons/mob/suit_vr.dmi'
+	icon = 'icons/inventory/suit/item_vr.dmi'
+	icon_override = 'icons/inventory/suit/mob_vr.dmi'
 	icon_state = "cyberpunksleek"
 	item_state = "cyberpunksleek"
 
 /obj/item/clothing/suit/storage/det_trench/alt2
 	name = "sleek modern coat (long)"
 	desc = "A sleek long overcoat made of neo-laminated fabric. Has a reasonably sized pocket on the inside."
-	icon = 'icons/obj/clothing/suits_vr.dmi'
-	icon_override = 'icons/mob/suit_vr.dmi'
+	icon = 'icons/inventory/suit/item_vr.dmi'
+	icon_override = 'icons/inventory/suit/mob_vr.dmi'
 	icon_state = "cyberpunksleek_long"
 	item_state = "cyberpunksleek_long"
 
@@ -105,7 +105,7 @@
 /obj/item/clothing/suit/storage/toggle/hoodie/talon
 	name = "ITV hoodie"
 	desc = "A warm, blue sweatshirt bearing ITV markings."
-	icon = 'icons/obj/clothing/suits_vr.dmi'
-	icon_override = 'icons/mob/suit_vr.dmi'
+	icon = 'icons/inventory/suit/item_vr.dmi'
+	icon_override = 'icons/inventory/suit/mob_vr.dmi'
 	icon_state = "talonhoodie"
 	item_state_slots = list(slot_r_hand_str = "suit_blue", slot_l_hand_str = "suit_blue")
\ No newline at end of file
diff --git a/code/modules/clothing/suits/solgov.dm b/code/modules/clothing/suits/solgov.dm
index 73463c002c..a20ce165ee 100644
--- a/code/modules/clothing/suits/solgov.dm
+++ b/code/modules/clothing/suits/solgov.dm
@@ -1,8 +1,8 @@
 //SolGov Uniform Suits
 /obj/item/clothing/suit/storage/solgov
 	name = "master solgov jacket"
-	icon = 'icons/obj/clothing/suits_solgov.dmi'
-	icon_override = 'icons/mob/suit_solgov.dmi'
+	icon = 'icons/inventory/suit/item.dmi'
+	icon_override = 'icons/inventory/suit/mob.dmi'
 
 //Service
 
@@ -262,8 +262,8 @@
 	desc = "A uniform dress jacket, fancy."
 	icon_state = "blackdress"
 	item_state = "blackdress"
-	icon = 'icons/obj/clothing/suits_solgov.dmi'
-	icon_override = 'icons/mob/suit_solgov.dmi'
+	icon = 'icons/inventory/suit/item.dmi'
+	icon_override = 'icons/inventory/suit/mob.dmi'
 	body_parts_covered = UPPER_TORSO|ARMS
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
@@ -293,8 +293,8 @@
 /obj/item/clothing/suit/storage/hooded/wintercoat/solgov
 	name = "\improper SifGuard winter coat"
 	icon_state = "coatec"
-	icon = 'icons/obj/clothing/suits_solgov.dmi'
-	icon_override = 'icons/mob/suit_solgov.dmi'
+	icon = 'icons/inventory/suit/item.dmi'
+	icon_override = 'icons/inventory/suit/mob.dmi'
 	armor = list(melee = 25, bullet = 10, laser = 5, energy = 10, bomb = 20, bio = 0, rad = 10)
 	valid_accessory_slots = (ACCESSORY_SLOT_INSIGNIA|ACCESSORY_SLOT_RANK)
 
@@ -344,8 +344,8 @@
 	desc = "An Stealth Assault Enterprises . Black and undecorated."
 	icon_state = "terranservice"
 	item_state = "terranservice"
-	icon = 'icons/obj/clothing/suits_solgov.dmi'
-	icon_override = 'icons/mob/suit_solgov.dmi'
+	icon = 'icons/inventory/suit/item.dmi'
+	icon_override = 'icons/inventory/suit/mob.dmi'
 
 /obj/item/clothing/suit/storage/saare/service/command
 	name = "SAARE command coat"
@@ -360,8 +360,8 @@
 	desc = "A Stealth Assault Enterprises uniform dress jacket, fancy."
 	icon_state = "terrandress"
 	item_state = "terrandress"
-	icon = 'icons/obj/clothing/suits_solgov.dmi'
-	icon_override = 'icons/mob/suit_solgov.dmi'
+	icon = 'icons/inventory/suit/item.dmi'
+	icon_override = 'icons/inventory/suit/mob.dmi'
 	body_parts_covered = UPPER_TORSO|ARMS
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index 0dde614e04..fb1494f4bc 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -103,15 +103,15 @@
 /obj/item/clothing/suit/radiation/teshari
 	name = "Small radiation suit"
 	desc = "A specialist suit that protects against radiation, designed specifically for use by Teshari. Made to order by Aether."
-	icon = 'icons/obj/clothing/species/teshari/suits.dmi'
-	icon_override = 'icons/mob/species/teshari/suit.dmi'
+	icon = 'icons/inventory/suit/item_teshari.dmi'
+	icon_override = 'icons/inventory/suit/mob_teshari.dmi'
 	icon_state = "rad_fitted"
 	species_restricted = list(SPECIES_TESHARI)
 
 /obj/item/clothing/head/radiation/teshari
 	name = "Small radiation hood"
 	desc = "A specialist hood with radiation protective properties, designed specifically for use by Teshari. Made to order by Aether."
-	icon = 'icons/obj/clothing/species/teshari/hats.dmi'
-	icon_override = 'icons/mob/species/teshari/head.dmi'
+	icon = 'icons/inventory/suit/item_teshari.dmi'
+	icon_override = 'icons/inventory/head/mob_teshari.dmi'
 	icon_state = "rad_fitted"
 	species_restricted = list(SPECIES_TESHARI)
\ No newline at end of file
diff --git a/code/modules/clothing/suits/utility_vr.dm b/code/modules/clothing/suits/utility_vr.dm
index 529547469b..d19a340567 100644
--- a/code/modules/clothing/suits/utility_vr.dm
+++ b/code/modules/clothing/suits/utility_vr.dm
@@ -5,8 +5,8 @@
 /obj/item/clothing/suit/storage/toggle/paramedic
 	name = "paramedic vest"
 	desc = "A vest that protects against minor chemical spills."
-	icon = 'icons/obj/clothing/suits_vr.dmi'
-	icon_override = 'icons/mob/suit_vr.dmi'
+	icon = 'icons/inventory/suit/item_vr.dmi'
+	icon_override = 'icons/inventory/suit/mob_vr.dmi'
 	icon_state = "paramedic-vest"
 	item_state = "paramedic-vest"
 	item_state_slots = list(slot_r_hand_str = "blue_labcoat", slot_l_hand_str = "blue_labcoat")
@@ -19,14 +19,14 @@
 
 /obj/item/clothing/head/radiation
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/helmet_vr.dmi',
-		SPECIES_VOX = 'icons/mob/species/vox/head.dmi',
-		SPECIES_WEREBEAST = 'icons/mob/species/werebeast/head.dmi'
+		SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi',
+		SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi',
+		SPECIES_WEREBEAST = 'icons/inventory/head/mob_werebeast.dmi'
 		)
 
 /obj/item/clothing/suit/radiation
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/suit_vr.dmi',
-		SPECIES_VOX = 'icons/mob/species/vox/suit.dmi',
-		SPECIES_WEREBEAST = 'icons/mob/species/werebeast/suit.dmi'
+		SPECIES_TESHARI = 'icons/inventory/suit/mob_vr_teshari.dmi',
+		SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi',
+		SPECIES_WEREBEAST = 'icons/inventory/suit/mob_werebeast.dmi'
 		)
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index d9468d6118..ab231df431 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -1,7 +1,7 @@
 /obj/item/clothing/accessory
 	name = "tie"
 	desc = "A neosilk clip-on tie."
-	icon = 'icons/obj/clothing/ties.dmi'
+	icon = 'icons/inventory/accessory/item.dmi'
 	icon_state = "bluetie"
 	item_state_slots = list(slot_r_hand_str = "", slot_l_hand_str = "")
 	appearance_flags = RESET_COLOR	// Stops has_suit's color from being multiplied onto the accessory
@@ -15,7 +15,7 @@
 	var/concealed_holster = 0
 	var/mob/living/carbon/human/wearer = null 	// To check if the wearer changes, so species spritesheets change properly.
 	var/list/on_rolled = list()					// Used when jumpsuit sleevels are rolled ("rolled" entry) or it's rolled down ("down"). Set to "none" to hide in those states.
-	sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/ties.dmi') //Teshari can into webbing, too!
+	sprite_sheets = list(SPECIES_TESHARI = 'icons/inventory/accessory/mob_teshari.dmi') //Teshari can into webbing, too!
 	drop_sound = 'sound/items/drop/accessory.ogg'
 	pickup_sound = 'sound/items/pickup/accessory.ogg'
 
@@ -345,7 +345,7 @@
 /obj/item/clothing/accessory/bracelet
 	name = "bracelet"
 	desc = "A simple silver bracelet with a clasp."
-	icon = 'icons/obj/clothing/ties.dmi'
+	icon = 'icons/inventory/accessory/item.dmi'
 	icon_state = "bracelet"
 	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_TIE
diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm
index b64ad331fa..ea35860168 100644
--- a/code/modules/clothing/under/accessories/accessory_vr.dm
+++ b/code/modules/clothing/under/accessories/accessory_vr.dm
@@ -6,15 +6,15 @@
 	name = "plain choker"
 	slot_flags = SLOT_TIE | SLOT_OCLOTHING
 	desc = "A simple, plain choker. Or maybe it's a collar? Use in-hand to customize it."
-	icon = 'icons/obj/clothing/ties_vr.dmi'
-	icon_override = 'icons/mob/ties_vr.dmi'
+	icon = 'icons/inventory/accessory/item_vr.dmi'
+	icon_override = 'icons/inventory/accessory/mob_vr.dmi'
 	icon_state = "choker_cst"
 	item_state = "choker_cst"
 	overlay_state = "choker_cst"
 	var/customized = 0
 	var/icon_previous_override
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/ties_vr.dmi'
+		SPECIES_TESHARI = 'icons/inventory/accessory/mob_vr_teshari.dmi'
 		)
 
 //Forces different sprite sheet on equip
@@ -58,14 +58,14 @@
 
 /obj/item/clothing/accessory/collar
 	slot_flags = SLOT_TIE | SLOT_OCLOTHING
-	icon = 'icons/obj/clothing/ties_vr.dmi'
-	icon_override = 'icons/mob/ties_vr.dmi'
+	icon = 'icons/inventory/accessory/item_vr.dmi'
+	icon_override = 'icons/inventory/accessory/mob_vr.dmi'
 	icon_state = "collar_blk"
 	var/writtenon = 0
 	var/icon_previous_override
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/ties_vr.dmi'
-		)
+		SPECIES_TESHARI = 'icons/inventory/accessory/mob_vr_teshari.dmi'
+	)
 
 //Forces different sprite sheet on equip
 /obj/item/clothing/accessory/collar/New()
@@ -360,8 +360,8 @@
 	desc = "A silver medal awarded to a group which has demonstrated exceptional teamwork to achieve a notable feat."
 
 /obj/item/clothing/accessory/medal/silver/unity/tabiranth
-	icon = 'icons/obj/clothing/ties_vr.dmi'
-	icon_override = 'icons/mob/ties_vr.dmi'
+	icon = 'icons/inventory/accessory/item_vr.dmi'
+	icon_override = 'icons/inventory/accessory/mob_vr.dmi'
 	icon_state = "silverthree"
 	item_state = "silverthree"
 	overlay_state = "silverthree"
@@ -370,8 +370,8 @@
 /obj/item/clothing/accessory/talon
 	name = "ITV pin"
 	desc = "A collectable enamel pin that resembles ITV's company logo."
-	icon = 'icons/obj/clothing/ties_vr.dmi'
-	icon_override = 'icons/mob/ties_vr.dmi'
+	icon = 'icons/inventory/accessory/item_vr.dmi'
+	icon_override = 'icons/inventory/accessory/mob_vr.dmi'
 	icon_state = "talon_pin"
 	item_state = "talonpin"
 	overlay_state = "talonpin"
\ No newline at end of file
diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm
index 79a603b9aa..b4e748713f 100644
--- a/code/modules/clothing/under/accessories/armor.dm
+++ b/code/modules/clothing/under/accessories/armor.dm
@@ -397,7 +397,7 @@
 /obj/item/clothing/accessory/armor/helmcover
 	name = "helmet cover"
 	desc = "A fabric cover for armored helmets."
-	icon_override = 'icons/mob/ties.dmi'
+	icon_override = 'icons/inventory/accessory/mob.dmi'
 	icon = 'icons/obj/clothing/modular_armor.dmi'
 	icon_state = "helmcover_blue"
 	slot = ACCESSORY_SLOT_HELM_C
diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm
index 04baf0a269..3582d8a070 100644
--- a/code/modules/clothing/under/accessories/clothing.dm
+++ b/code/modules/clothing/under/accessories/clothing.dm
@@ -48,7 +48,7 @@
 	desc = "A simple, comfortable poncho."
 	icon_state = "classicponcho"
 	item_state = "classicponcho"
-	icon_override = 'icons/mob/ties.dmi'
+	icon_override = 'icons/inventory/accessory/mob.dmi'
 	var/fire_resist = T0C+100
 	allowed = list(/obj/item/weapon/tank/emergency/oxygen)
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
@@ -58,7 +58,7 @@
 	w_class = ITEMSIZE_NORMAL
 	slot = ACCESSORY_SLOT_OVER
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi'
+		SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi'
 	)
 
 /obj/item/clothing/accessory/poncho/equipped() //Solution for race-specific sprites for an accessory which is also a suit. Suit icons break if you don't use icon override which then also overrides race-specific sprites.
@@ -66,9 +66,9 @@
 	var/mob/living/carbon/human/H = loc
 	if(istype(H) && H.wear_suit == src)
 		if(H.species.name == SPECIES_TESHARI)
-			icon_override = 'icons/mob/species/teshari/suit.dmi'
+			icon_override = 'icons/inventory/suit/mob_teshari.dmi'
 		else
-			icon_override = 'icons/mob/ties.dmi'
+			icon_override = 'icons/inventory/accessory/mob.dmi'
 		update_clothing_icon()
 
 /obj/item/clothing/accessory/poncho/dropped() //Resets the override to prevent the wrong .dmi from being used because equipped only triggers when wearing ponchos as suits.
@@ -262,7 +262,7 @@
 	desc = "For some classy, murderous fun."
 	icon_state = "vest"
 	item_state = "vest"
-	icon_override = 'icons/mob/ties.dmi'
+	icon_override = 'icons/inventory/accessory/mob.dmi'
 	item_state_slots = list(slot_r_hand_str = "wcoat", slot_l_hand_str = "wcoat")
 	allowed = list(/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask)
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
@@ -313,7 +313,7 @@
 /obj/item/clothing/accessory/sweater
 	name = "sweater"
 	desc = "A warm knit sweater."
-	icon_override = 'icons/mob/ties.dmi'
+	icon_override = 'icons/inventory/accessory/mob.dmi'
 	icon_state = "sweater"
 	slot_flags = SLOT_OCLOTHING | SLOT_TIE
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
diff --git a/code/modules/clothing/under/accessories/holster_vr.dm b/code/modules/clothing/under/accessories/holster_vr.dm
index f99e798faa..8cd7681dd9 100644
--- a/code/modules/clothing/under/accessories/holster_vr.dm
+++ b/code/modules/clothing/under/accessories/holster_vr.dm
@@ -6,11 +6,11 @@
 /obj/item/clothing/accessory/holster/machete/rapier
 	name = "rapier sheath"
 	desc = "A beautiful red sheath, probably for a beautiful blade."
-	icon = 'icons/obj/clothing/ties_vr.dmi'
+	icon = 'icons/inventory/accessory/item_vr.dmi'
 	icon_state = "sheath"
 	slot_flags = SLOT_BELT|ACCESSORY_SLOT_WEAPON
 	var/has_full_icon = 1
-	icon_override = 'icons/mob/ties_vr.dmi'
+	icon_override = 'icons/inventory/accessory/mob_vr.dmi'
 	overlay_state = "sheath"
 	can_hold = list(/obj/item/weapon/melee/rapier)
 
diff --git a/code/modules/clothing/under/imperial_vr.dm b/code/modules/clothing/under/imperial_vr.dm
index 9cffdb56fd..855cd0b50c 100644
--- a/code/modules/clothing/under/imperial_vr.dm
+++ b/code/modules/clothing/under/imperial_vr.dm
@@ -1,6 +1,6 @@
 /obj/item/clothing/under/imperial
 	desc = "imperial military jumpsuit"
-	icon = 'icons/obj/clothing/uniforms_vr.dmi'
-	icon_override = 'icons/mob/uniform_vr.dmi'
+	icon = 'icons/inventory/uniform/item_vr.dmi'
+	icon_override = 'icons/inventory/uniform/mob_vr.dmi'
 	icon_state = "crimson"
 	item_state = "crimson"
\ No newline at end of file
diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm
index a8edae23de..02ad7cd329 100644
--- a/code/modules/clothing/under/miscellaneous_vr.dm
+++ b/code/modules/clothing/under/miscellaneous_vr.dm
@@ -18,8 +18,8 @@
 
 /obj/item/clothing/under/hyperfiber
 	name = "HYPER jumpsuit"
-	icon = 'icons/obj/clothing/uniforms_vr.dmi'
-	icon_override = 'icons/mob/uniform_vr.dmi'
+	icon = 'icons/inventory/uniform/item_vr.dmi'
+	icon_override = 'icons/inventory/uniform/mob_vr.dmi'
 	icon_state = "hyper"
 	item_icons = list(
 			slot_l_hand_str = 'icons/mob/items/lefthand_uniforms.dmi',
@@ -122,8 +122,8 @@
 /obj/item/clothing/under/dress/qipao
 	name = "qipao"
 	desc = "A type of feminine body-hugging dress with distinctive Chinese features of Manchu origin."
-	icon = 'icons/obj/clothing/uniforms_vr.dmi'
-	icon_override = 'icons/mob/uniform_vr.dmi'
+	icon = 'icons/inventory/uniform/item_vr.dmi'
+	icon_override = 'icons/inventory/uniform/mob_vr.dmi'
 	icon_state = "qipao"
 	item_state = "qipao"
 
@@ -140,9 +140,9 @@
 /obj/item/clothing/under/pizzaguy
 	name = "pizza delivery uniform"
 	desc = "A dedicated outfit for pizza delivery people, one of most dangerous occupations around these parts. Can be rolled up for extra show of skin."
-	icon = 'icons/obj/clothing/uniforms_vr.dmi'
+	icon = 'icons/inventory/uniform/item_vr.dmi'
 	index = "vr"
-	rolled_down_icon = 'icons/mob/uniform_rolled_down_vr.dmi'
+	rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
 	icon_state = "pizzadelivery"
 	item_state = "pizzadelivery"
 	rolled_down = 0
@@ -152,10 +152,10 @@
 /obj/item/clothing/under/rank/talon/basic
 	name = "ITV jumpsuit"
 	desc = "A basic jumpsuit that bares the ITV logo on the breast."
-	icon = 'icons/obj/clothing/uniforms_vr.dmi'
+	icon = 'icons/inventory/uniform/item_vr.dmi'
 	index = "vr"
-	rolled_down_icon = 'icons/mob/uniform_rolled_down_vr.dmi'
-	icon_override = 'icons/mob/uniform_vr.dmi'
+	rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
+	icon_override = 'icons/inventory/uniform/mob_vr.dmi'
 	icon_state = "talon_basic"
 	item_state = "talon_basic"
 	rolled_sleeves = 0
@@ -163,10 +163,10 @@
 /obj/item/clothing/under/rank/talon/proper
 	name = "ITV proper jumpsuit"
 	desc = "A neat and proper uniform for a proper company."
-	icon = 'icons/obj/clothing/uniforms_vr.dmi'
+	icon = 'icons/inventory/uniform/item_vr.dmi'
 	index = "vr"
-	rolled_down_icon = 'icons/mob/uniform_rolled_down_vr.dmi'
-	icon_override = 'icons/mob/uniform_vr.dmi'
+	rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
+	icon_override = 'icons/inventory/uniform/mob_vr.dmi'
 	icon_state = "talon_jumpsuit"
 	item_state = "talon_jumpsuit"
 	rolled_sleeves = 0
@@ -174,10 +174,10 @@
 /obj/item/clothing/under/rank/talon/security
 	name = "ITV security jumpsuit"
 	desc = "A sleek, streamlined version of ITV's standard jumpsuit that bares security markings."
-	icon = 'icons/obj/clothing/uniforms_vr.dmi'
+	icon = 'icons/inventory/uniform/item_vr.dmi'
 	index = "vr"
-	rolled_down_icon = 'icons/mob/uniform_rolled_down_vr.dmi'
-	icon_override = 'icons/mob/uniform_vr.dmi'
+	rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
+	icon_override = 'icons/inventory/uniform/mob_vr.dmi'
 	icon_state = "talon_security"
 	item_state = "talon_security"
 	rolled_sleeves = 0
@@ -185,10 +185,10 @@
 /obj/item/clothing/under/rank/talon/pilot
 	name = "ITV pilot jumpsuit"
 	desc = "A sleek, streamlined version of ITV's standard jumpsuit. Made from cushioned fabric to handle intense flight."
-	icon = 'icons/obj/clothing/uniforms_vr.dmi'
+	icon = 'icons/inventory/uniform/item_vr.dmi'
 	index = "vr"
-	rolled_down_icon = 'icons/mob/uniform_rolled_down_vr.dmi'
-	icon_override = 'icons/mob/uniform_vr.dmi'
+	rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
+	icon_override = 'icons/inventory/uniform/mob_vr.dmi'
 	icon_state = "talon_pilot"
 	item_state = "talon_pilot"
 	rolled_sleeves = 0
@@ -196,10 +196,10 @@
 /obj/item/clothing/under/rank/talon/command
 	name = "ITV command jumpsuit"
 	desc = "A commanding jumpsuit fit for a commanding officer."
-	icon = 'icons/obj/clothing/uniforms_vr.dmi'
+	icon = 'icons/inventory/uniform/item_vr.dmi'
 	index = "vr"
-	rolled_down_icon = 'icons/mob/uniform_rolled_down_vr.dmi'
-	icon_override = 'icons/mob/uniform_vr.dmi'
+	rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
+	icon_override = 'icons/inventory/uniform/mob_vr.dmi'
 	icon_state = "talon_captain"
 	item_state = "talon_captain"
 	rolled_sleeves = 0
\ No newline at end of file
diff --git a/code/modules/clothing/under/nanotrasen_vr.dm b/code/modules/clothing/under/nanotrasen_vr.dm
index 65dee31347..9375efd71e 100644
--- a/code/modules/clothing/under/nanotrasen_vr.dm
+++ b/code/modules/clothing/under/nanotrasen_vr.dm
@@ -3,9 +3,9 @@
 /obj/item/clothing/under/nanotrasen
 	name = "NanoTrasen uniform"
 	desc = "A comfortable turtleneck and black trousers sporting nanotrasen symbols."
-	icon = 'icons/obj/clothing/uniforms_solgov.dmi'
-	icon_override = 'icons/mob/uniform_solgov.dmi'
-	item_icons = list(slot_w_uniform_str = 'icons/mob/uniform_solgov.dmi', slot_r_hand_str = "black", slot_l_hand_str = "black")
+	icon = 'icons/inventory/uniform/item.dmi'
+	icon_override = 'icons/inventory/uniform/mob.dmi'
+	item_icons = list(slot_w_uniform_str = 'icons/inventory/uniform/mob.dmi', slot_r_hand_str = "black", slot_l_hand_str = "black")
 	icon_state = "blackutility"
 	worn_state = "blackutility"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
diff --git a/code/modules/clothing/under/solgov.dm b/code/modules/clothing/under/solgov.dm
index cd2c111098..5854c006e2 100644
--- a/code/modules/clothing/under/solgov.dm
+++ b/code/modules/clothing/under/solgov.dm
@@ -4,8 +4,8 @@
 /obj/item/clothing/under/solgov
 	name = "master solgov uniform"
 	desc = "You shouldn't be seeing this."
-	icon = 'icons/obj/clothing/uniforms_solgov.dmi'
-	item_icons = list(slot_w_uniform_str = 'icons/mob/uniform_solgov.dmi')
+	icon = 'icons/inventory/uniform/item.dmi'
+	item_icons = list(slot_w_uniform_str = 'icons/inventory/uniform/mob.dmi')
 	rolled_down = 0
 	rolled_sleeves = 0
 	armor = list(melee = 5, bullet = 0, laser = 5, energy = 5, bomb = 0, bio = 5, rad = 5)
@@ -474,8 +474,8 @@
 /obj/item/clothing/under/saare
 	name = "master SAARE uniform"
 	desc = "You shouldn't be seeing this."
-	icon = 'icons/obj/clothing/uniforms_solgov.dmi'
-	item_icons = list(slot_w_uniform_str = 'icons/mob/uniform_solgov.dmi')
+	icon = 'icons/inventory/uniform/item.dmi'
+	item_icons = list(slot_w_uniform_str = 'icons/inventory/uniform/mob.dmi')
 	armor = list(melee = 5, bullet = 0, laser = 5, energy = 5, bomb = 0, bio = 5, rad = 5)
 	siemens_coefficient = 0.8
 
diff --git a/code/modules/clothing/under/solgov_vr.dm b/code/modules/clothing/under/solgov_vr.dm
index dd0b351d29..57d88880eb 100644
--- a/code/modules/clothing/under/solgov_vr.dm
+++ b/code/modules/clothing/under/solgov_vr.dm
@@ -57,16 +57,16 @@
 /obj/item/clothing/under/solgov/utility/army/olive
 	name = "olive fatigues"
 	desc = "An olive version of the TCG marine utility uniform, made from durable material."
-	icon = 'icons/obj/clothing/uniforms_vr.dmi'
-	icon_override = 'icons/mob/uniform_vr.dmi'
+	icon = 'icons/inventory/uniform/item_vr.dmi'
+	icon_override = 'icons/inventory/uniform/mob_vr.dmi'
 	icon_state = "bdu_olive"
 	item_state = "bdu_olive"
 
 /obj/item/clothing/under/solgov/utility/army/desert
 	name = "desert fatigues"
 	desc = "A desert version of the TCG marine utility uniform, made from durable material."
-	icon = 'icons/obj/clothing/uniforms_vr.dmi'
-	icon_override = 'icons/mob/uniform_vr.dmi'
+	icon = 'icons/inventory/uniform/item_vr.dmi'
+	icon_override = 'icons/inventory/uniform/mob_vr.dmi'
 	icon_state = "bdu_olive"
 	item_state = "bdu_olive"
 	desc = "A tan version of the TCG Marines utility uniform, made from durable material."
diff --git a/code/modules/clothing/under/xenos/teshari.dm b/code/modules/clothing/under/xenos/teshari.dm
index 39c3590bf4..5782c9e05e 100644
--- a/code/modules/clothing/under/xenos/teshari.dm
+++ b/code/modules/clothing/under/xenos/teshari.dm
@@ -1,5 +1,5 @@
 /obj/item/clothing/under/teshari
-	icon = 'icons/obj/clothing/species/teshari/uniform.dmi'
+	icon = 'icons/inventory/uniform/item_teshari.dmi'
 	icon_state = "seromi_grey"
 	species_restricted = list(SPECIES_TESHARI)
 
@@ -134,8 +134,6 @@
 /obj/item/clothing/under/teshari/undercoat
 	name = "Undercoat"
 	desc =  "A Teshari traditional garb, with a modern twist! Made of micro and nanofibres to make it light and billowy, perfect for going fast and stylishly!"
-	icon = 'icons/mob/species/teshari/teshari_uniform.dmi'
-	icon_override = 'icons/mob/species/teshari/teshari_uniform.dmi'
 	icon_state = "tesh_uniform_bo"
 	item_state = "tesh_uniform_bo"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
@@ -256,11 +254,6 @@
 	item_state = "tesh_uniform_brg"
 
 //Job Undercoats
-
-/obj/item/clothing/under/teshari/undercoat/jobs
-	icon = 'icons/mob/species/teshari/deptjacket.dmi'
-	icon_override = 'icons/mob/species/teshari/deptjacket.dmi'
-
 /obj/item/clothing/under/teshari/undercoat/jobs/cap
 	name = "facility director undercoat"
 	desc = "A traditional Teshari garb made for the Facility Director"
diff --git a/code/modules/integrated_electronics/core/assemblies/clothing.dm b/code/modules/integrated_electronics/core/assemblies/clothing.dm
index 98af46f71d..d881d7bd4a 100644
--- a/code/modules/integrated_electronics/core/assemblies/clothing.dm
+++ b/code/modules/integrated_electronics/core/assemblies/clothing.dm
@@ -156,7 +156,7 @@
 	name = "electronic earwear"
 	desc = "It's a wearable case for electronics. This one appears to be a technical-looking headset."
 	description_info = "Control-shift-click on this with an item in hand to use it on the integrated circuit."
-	icon = 'icons/obj/clothing/ears.dmi'
+	icon = 'icons/inventory/ears/item.dmi'
 	icon_state = "circuitry"
 	item_state = "circuitry"
 
diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index 78b61ffc26..e4f5eb1d08 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -11,8 +11,8 @@ var/list/holder_mob_icon_cache = list()
 	show_messages = 1
 
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi',
-		SPECIES_VOX = 'icons/mob/species/vox/head.dmi'
+		SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi',
+		SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi'
 		)
 
 	origin_tech = null
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index e3ca9150f1..57da920cbb 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -16,7 +16,7 @@
 
 	var/speech_bubble_appearance = "normal"					// Part of icon_state to use for speech bubbles when talking.	See talk.dmi for available icons.
 	var/fire_icon_state = "humanoid"						// The icon_state used inside OnFire.dmi for when on fire.
-	var/suit_storage_icon = 'icons/mob/belt_mirror.dmi'		// Icons used for worn items in suit storage slot.
+	var/suit_storage_icon = 'icons/inventory/suit_store/mob.dmi' // Icons used for worn items in suit storage slot.
 
 	// Damage overlay and masks.
 	var/damage_overlays = 'icons/mob/human_races/masks/dam_human.dmi'
diff --git a/code/modules/mob/living/carbon/human/species/station/teshari.dm b/code/modules/mob/living/carbon/human/species/station/teshari.dm
index c2864e9f7c..18a30a018c 100644
--- a/code/modules/mob/living/carbon/human/species/station/teshari.dm
+++ b/code/modules/mob/living/carbon/human/species/station/teshari.dm
@@ -38,7 +38,7 @@
 	damage_overlays = 'icons/mob/human_races/masks/dam_teshari.dmi'
 	damage_mask = 'icons/mob/human_races/masks/dam_mask_teshari.dmi'
 	blood_mask = 'icons/mob/human_races/masks/blood_teshari.dmi'
-	suit_storage_icon = 'icons/mob/species/teshari/belt_mirror.dmi'
+	suit_storage_icon = 'icons/inventory/suit_store/mob_teshari.dmi'
 
 	fire_icon_state = "generic" // Humanoid is too big for them and spriting a new one is really annoying.
 
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm
index 3c01214918..dd88d811ee 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm
@@ -144,7 +144,7 @@
 	..()
 	if(hat)
 		var/hat_state = hat.item_state ? hat.item_state : hat.icon_state
-		var/image/I = image('icons/mob/head.dmi', src, hat_state)
+		var/image/I = image('icons/inventory/head/mob.dmi', src, hat_state)
 		I.pixel_y = -15 // Sakimm are tiny!
 		I.appearance_flags = RESET_COLOR
 		add_overlay(I)
diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm
index ade53adebc..f210835b18 100644
--- a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm
@@ -136,7 +136,7 @@ var/list/_slime_default_emotes = list(
 	// Hat simulator.
 	if(hat)
 		var/hat_state = hat.item_state ? hat.item_state : hat.icon_state
-		var/image/I = image('icons/mob/head.dmi', src, hat_state)
+		var/image/I = image('icons/inventory/head/mob.dmi', src, hat_state)
 		I.pixel_y = -7 // Slimes are small.
 		I.appearance_flags = RESET_COLOR
 		add_overlay(I)
diff --git a/code/modules/mob/new_player/sprite_accessories_extra.dm b/code/modules/mob/new_player/sprite_accessories_extra.dm
index a124eff96b..c236037388 100644
--- a/code/modules/mob/new_player/sprite_accessories_extra.dm
+++ b/code/modules/mob/new_player/sprite_accessories_extra.dm
@@ -498,7 +498,7 @@
 /*
 werewolf_nose
 	name = "Werewolf nose"
-	icon = 'icons/mob/species/werebeast/werebeast_markings.dmi'
+	icon = 'icons/inventory/werebeast_markings/mob_werebeast.dmi'
 	icon_state = "werewolf_nose"
 	color_blend_mode = ICON_MULTIPLY
 	body_parts = list(BP_HEAD)
@@ -506,7 +506,7 @@ werewolf_nose
 
 werewolf_face
 	name = "Werewolf face"
-	icon = 'icons/mob/species/werebeast/werebeast_markings.dmi'
+	icon = 'icons/inventory/werebeast_markings/mob_werebeast.dmi'
 	icon_state = "werewolf"
 	color_blend_mode = ICON_MULTIPLY
 	body_parts = list(BP_HEAD)
@@ -514,7 +514,7 @@ werewolf_face
 
 werewolf_belly
 	name = "Werewolf belly"
-	icon = 'icons/mob/species/werebeast/werebeast_markings.dmi'
+	icon = 'icons/inventory/werebeast_markings/mob_werebeast.dmi'
 	icon_state = "werewolf"
 	color_blend_mode = ICON_MULTIPLY
 	body_parts = list(BP_GROIN,BP_TORSO)
@@ -522,7 +522,7 @@ werewolf_belly
 
 werewolf_socks
 	name = "Werewolf socks"
-	icon = 'icons/mob/species/werebeast/werebeast_markings.dmi'
+	icon = 'icons/inventory/werebeast_markings/mob_werebeast.dmi'
 	icon_state = "werewolf"
 	color_blend_mode = ICON_MULTIPLY
 	body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND)
diff --git a/code/modules/projectiles/guns/energy/gunsword_vr.dm b/code/modules/projectiles/guns/energy/gunsword_vr.dm
index 2b8b45a9fe..20ffc1ccea 100644
--- a/code/modules/projectiles/guns/energy/gunsword_vr.dm
+++ b/code/modules/projectiles/guns/energy/gunsword_vr.dm
@@ -7,7 +7,7 @@
 
 	icon_override = 'icons/vore/custom_guns_vr.dmi'
 	item_state = "gbuster"
-	item_icons = list(slot_r_hand_str = 'icons/vore/custom_guns_vr.dmi', slot_l_hand_str = 'icons/vore/custom_guns_vr.dmi', "slot_belt" = 'icons/mob/belt_vr.dmi')
+	item_icons = list(slot_r_hand_str = 'icons/vore/custom_guns_vr.dmi', slot_l_hand_str = 'icons/vore/custom_guns_vr.dmi', "slot_belt" = 'icons/inventory/belt/mob_vr.dmi')
 
 	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 4)
diff --git a/code/modules/projectiles/guns/energy/hooklauncher.dm b/code/modules/projectiles/guns/energy/hooklauncher.dm
index 79ddf7443d..ee2d44042a 100644
--- a/code/modules/projectiles/guns/energy/hooklauncher.dm
+++ b/code/modules/projectiles/guns/energy/hooklauncher.dm
@@ -22,7 +22,7 @@
 /obj/item/weapon/gun/energy/hooklauncher/ring
 	name = "ominous ring"
 	desc = "A small ring with strange symbols engraved upon it."
-	icon = 'icons/obj/clothing/rings.dmi'
+	icon = 'icons/inventory/hands/item.dmi'
 	icon_state = "seal-signet"
 	item_state = "concealed"
 
diff --git a/code/modules/projectiles/guns/energy/laser_vr.dm b/code/modules/projectiles/guns/energy/laser_vr.dm
index 0199d154c4..60eb948158 100644
--- a/code/modules/projectiles/guns/energy/laser_vr.dm
+++ b/code/modules/projectiles/guns/energy/laser_vr.dm
@@ -197,7 +197,7 @@
 	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "phaserkill"
 	item_state = "phaser"
-	item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi', "slot_belt" = 'icons/mob/belt_vr.dmi')
+	item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi', "slot_belt" = 'icons/inventory/belt/mob_vr.dmi')
 	fire_sound = 'sound/weapons/laser2.ogg'
 	origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2, TECH_POWER = 4)
 	charge_cost = 300
diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
index 7cba0803a3..d98b4b29c6 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
@@ -182,7 +182,7 @@
 	icon = 'icons/vore/custom_clothes_vr.dmi'
 	icon_state = "solara_dress"
 
-	icon_override = 'icons/mob/uniform.dmi'
+	icon_override = 'icons/inventory/uniform/mob.dmi'
 	item_state = "solara_dress"
 
 //For general use
@@ -698,10 +698,10 @@
 	desc = " This is Lethe's Hat! A little tag attached inside reads: 'If found please return to Lethe! Or else!' It looks rather worn in. It also lacks armor."
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 
-	icon = 'icons/obj/clothing/hats.dmi'
+	icon = 'icons/inventory/head/item.dmi'
 	icon_state = "hoscap"
 
-	icon_override = 'icons/mob/head.dmi'
+	icon_override = 'icons/inventory/head/mob.dmi'
 	item_state = "hoscap"
 
 /obj/item/weapon/storage/belt/utility/fluff/vulpine
diff --git a/code/modules/vore/resizing/holder_micro_vr.dm b/code/modules/vore/resizing/holder_micro_vr.dm
index cbcbe3b0e7..1f4f65084d 100644
--- a/code/modules/vore/resizing/holder_micro_vr.dm
+++ b/code/modules/vore/resizing/holder_micro_vr.dm
@@ -4,7 +4,7 @@
 	name = "micro"
 	desc = "Another crewmember, small enough to fit in your hand."
 	icon_state = "micro"
-	icon_override = 'icons/mob/head_vr.dmi'
+	icon_override = 'icons/inventory/head/mob_vr.dmi'
 	slot_flags = SLOT_FEET | SLOT_HEAD | SLOT_ID
 	w_class = ITEMSIZE_SMALL
 	item_icons = list() // No in-hand sprites (for now, anyway, we could totally add some)
diff --git a/code/modules/xenoarcheaology/tools/equipment.dm b/code/modules/xenoarcheaology/tools/equipment.dm
index b241f714be..276d8e305e 100644
--- a/code/modules/xenoarcheaology/tools/equipment.dm
+++ b/code/modules/xenoarcheaology/tools/equipment.dm
@@ -1,7 +1,7 @@
 /obj/item/clothing/suit/bio_suit/anomaly
 	name = "Anomaly suit"
 	desc = "A sealed bio suit capable of insulating against exotic alien energies."
-	icon = 'icons/obj/clothing/spacesuits.dmi'
+	icon = 'icons/inventory/suit/item.dmi'
 	icon_state = "engspace_suit"
 	item_state = "engspace_suit"
 	update_icon_define = "icons/mob/spacesuit.dmi"
diff --git a/icons/obj/clothing/ties.dmi b/icons/inventory/accessory/item.dmi
similarity index 100%
rename from icons/obj/clothing/ties.dmi
rename to icons/inventory/accessory/item.dmi
diff --git a/icons/obj/clothing/ties_vr.dmi b/icons/inventory/accessory/item_vr.dmi
similarity index 100%
rename from icons/obj/clothing/ties_vr.dmi
rename to icons/inventory/accessory/item_vr.dmi
diff --git a/icons/mob/ties.dmi b/icons/inventory/accessory/mob.dmi
similarity index 100%
rename from icons/mob/ties.dmi
rename to icons/inventory/accessory/mob.dmi
diff --git a/icons/mob/species/teshari/ties.dmi b/icons/inventory/accessory/mob_teshari.dmi
similarity index 100%
rename from icons/mob/species/teshari/ties.dmi
rename to icons/inventory/accessory/mob_teshari.dmi
diff --git a/icons/mob/ties_vr.dmi b/icons/inventory/accessory/mob_vr.dmi
similarity index 100%
rename from icons/mob/ties_vr.dmi
rename to icons/inventory/accessory/mob_vr.dmi
diff --git a/icons/mob/species/teshari/ties_vr.dmi b/icons/inventory/accessory/mob_vr_teshari.dmi
similarity index 100%
rename from icons/mob/species/teshari/ties_vr.dmi
rename to icons/inventory/accessory/mob_vr_teshari.dmi
diff --git a/icons/mob/species/werebeast/ears.dmi b/icons/inventory/accessory/mob_werebeast.dmi
similarity index 100%
rename from icons/mob/species/werebeast/ears.dmi
rename to icons/inventory/accessory/mob_werebeast.dmi
diff --git a/icons/obj/clothing/backpack.dmi b/icons/inventory/back/item.dmi
similarity index 100%
rename from icons/obj/clothing/backpack.dmi
rename to icons/inventory/back/item.dmi
diff --git a/icons/obj/clothing/backpack_vr.dmi b/icons/inventory/back/item_vr.dmi
similarity index 100%
rename from icons/obj/clothing/backpack_vr.dmi
rename to icons/inventory/back/item_vr.dmi
diff --git a/icons/mob/back.dmi b/icons/inventory/back/mob.dmi
similarity index 100%
rename from icons/mob/back.dmi
rename to icons/inventory/back/mob.dmi
diff --git a/icons/inventory/back/mob_teshari.dmi b/icons/inventory/back/mob_teshari.dmi
new file mode 100644
index 0000000000..bdec7b1467
Binary files /dev/null and b/icons/inventory/back/mob_teshari.dmi differ
diff --git a/icons/mob/back_vr.dmi b/icons/inventory/back/mob_vr.dmi
similarity index 100%
rename from icons/mob/back_vr.dmi
rename to icons/inventory/back/mob_vr.dmi
diff --git a/icons/mob/species/werebeast/back.dmi b/icons/inventory/back/mob_werebeast.dmi
similarity index 100%
rename from icons/mob/species/werebeast/back.dmi
rename to icons/inventory/back/mob_werebeast.dmi
diff --git a/icons/obj/clothing/belts.dmi b/icons/inventory/belt/item.dmi
similarity index 100%
rename from icons/obj/clothing/belts.dmi
rename to icons/inventory/belt/item.dmi
diff --git a/icons/obj/clothing/belts_vr.dmi b/icons/inventory/belt/item_vr.dmi
similarity index 100%
rename from icons/obj/clothing/belts_vr.dmi
rename to icons/inventory/belt/item_vr.dmi
diff --git a/icons/mob/belt.dmi b/icons/inventory/belt/mob.dmi
similarity index 100%
rename from icons/mob/belt.dmi
rename to icons/inventory/belt/mob.dmi
diff --git a/icons/mob/species/teshari/belt.dmi b/icons/inventory/belt/mob_teshari.dmi
similarity index 100%
rename from icons/mob/species/teshari/belt.dmi
rename to icons/inventory/belt/mob_teshari.dmi
diff --git a/icons/mob/belt_vr.dmi b/icons/inventory/belt/mob_vr.dmi
similarity index 100%
rename from icons/mob/belt_vr.dmi
rename to icons/inventory/belt/mob_vr.dmi
diff --git a/icons/mob/species/werebeast/belt.dmi b/icons/inventory/belt/mob_werebeast.dmi
similarity index 100%
rename from icons/mob/species/werebeast/belt.dmi
rename to icons/inventory/belt/mob_werebeast.dmi
diff --git a/icons/obj/clothing/ears.dmi b/icons/inventory/ears/item.dmi
similarity index 100%
rename from icons/obj/clothing/ears.dmi
rename to icons/inventory/ears/item.dmi
diff --git a/icons/mob/ears.dmi b/icons/inventory/ears/mob.dmi
similarity index 100%
rename from icons/mob/ears.dmi
rename to icons/inventory/ears/mob.dmi
diff --git a/icons/mob/species/teshari/ears.dmi b/icons/inventory/ears/mob_teshari.dmi
similarity index 100%
rename from icons/mob/species/teshari/ears.dmi
rename to icons/inventory/ears/mob_teshari.dmi
diff --git a/icons/mob/species/werebeast/ties.dmi b/icons/inventory/ears/mob_werebeast.dmi
similarity index 100%
rename from icons/mob/species/werebeast/ties.dmi
rename to icons/inventory/ears/mob_werebeast.dmi
diff --git a/icons/obj/clothing/glasses.dmi b/icons/inventory/eyes/item.dmi
similarity index 100%
rename from icons/obj/clothing/glasses.dmi
rename to icons/inventory/eyes/item.dmi
diff --git a/icons/obj/clothing/glasses_vr.dmi b/icons/inventory/eyes/item_vr.dmi
similarity index 100%
rename from icons/obj/clothing/glasses_vr.dmi
rename to icons/inventory/eyes/item_vr.dmi
diff --git a/icons/inventory/eyes/mob.dmi b/icons/inventory/eyes/mob.dmi
new file mode 100644
index 0000000000..70113e3d8c
Binary files /dev/null and b/icons/inventory/eyes/mob.dmi differ
diff --git a/icons/mob/species/teshari/eyes.dmi b/icons/inventory/eyes/mob_teshari.dmi
similarity index 100%
rename from icons/mob/species/teshari/eyes.dmi
rename to icons/inventory/eyes/mob_teshari.dmi
diff --git a/icons/mob/species/vox/eyes.dmi b/icons/inventory/eyes/mob_vox.dmi
similarity index 100%
rename from icons/mob/species/vox/eyes.dmi
rename to icons/inventory/eyes/mob_vox.dmi
diff --git a/icons/mob/eyes_vr.dmi b/icons/inventory/eyes/mob_vr.dmi
similarity index 100%
rename from icons/mob/eyes_vr.dmi
rename to icons/inventory/eyes/mob_vr.dmi
diff --git a/icons/mob/species/werebeast/eyes.dmi b/icons/inventory/eyes/mob_werebeast.dmi
similarity index 100%
rename from icons/mob/species/werebeast/eyes.dmi
rename to icons/inventory/eyes/mob_werebeast.dmi
diff --git a/icons/obj/clothing/masks.dmi b/icons/inventory/face/item.dmi
similarity index 100%
rename from icons/obj/clothing/masks.dmi
rename to icons/inventory/face/item.dmi
diff --git a/icons/obj/clothing/masks_vr.dmi b/icons/inventory/face/item_vr.dmi
similarity index 100%
rename from icons/obj/clothing/masks_vr.dmi
rename to icons/inventory/face/item_vr.dmi
diff --git a/icons/mob/mask.dmi b/icons/inventory/face/mob.dmi
similarity index 100%
rename from icons/mob/mask.dmi
rename to icons/inventory/face/mob.dmi
diff --git a/icons/mob/species/akula/mask_vr.dmi b/icons/inventory/face/mob_akula.dmi
similarity index 100%
rename from icons/mob/species/akula/mask_vr.dmi
rename to icons/inventory/face/mob_akula.dmi
diff --git a/icons/mob/species/fennec/mask_vr.dmi b/icons/inventory/face/mob_fennec.dmi
similarity index 100%
rename from icons/mob/species/fennec/mask_vr.dmi
rename to icons/inventory/face/mob_fennec.dmi
diff --git a/icons/mob/species/fox/mask_vr.dmi b/icons/inventory/face/mob_fox.dmi
similarity index 100%
rename from icons/mob/species/fox/mask_vr.dmi
rename to icons/inventory/face/mob_fox.dmi
diff --git a/icons/mob/species/nevrean/mask_vr.dmi b/icons/inventory/face/mob_nevrean.dmi
similarity index 100%
rename from icons/mob/species/nevrean/mask_vr.dmi
rename to icons/inventory/face/mob_nevrean.dmi
diff --git a/icons/mob/species/sergal/mask_vr.dmi b/icons/inventory/face/mob_sergal.dmi
similarity index 100%
rename from icons/mob/species/sergal/mask_vr.dmi
rename to icons/inventory/face/mob_sergal.dmi
diff --git a/icons/mob/species/tajaran/mask.dmi b/icons/inventory/face/mob_tajaran.dmi
similarity index 100%
rename from icons/mob/species/tajaran/mask.dmi
rename to icons/inventory/face/mob_tajaran.dmi
diff --git a/icons/mob/species/teshari/masks.dmi b/icons/inventory/face/mob_teshari.dmi
similarity index 100%
rename from icons/mob/species/teshari/masks.dmi
rename to icons/inventory/face/mob_teshari.dmi
diff --git a/icons/mob/species/unathi/mask.dmi b/icons/inventory/face/mob_unathi.dmi
similarity index 100%
rename from icons/mob/species/unathi/mask.dmi
rename to icons/inventory/face/mob_unathi.dmi
diff --git a/icons/mob/species/vox/masks.dmi b/icons/inventory/face/mob_vox.dmi
similarity index 100%
rename from icons/mob/species/vox/masks.dmi
rename to icons/inventory/face/mob_vox.dmi
diff --git a/icons/mob/mask_vr.dmi b/icons/inventory/face/mob_vr.dmi
similarity index 100%
rename from icons/mob/mask_vr.dmi
rename to icons/inventory/face/mob_vr.dmi
diff --git a/icons/mob/species/tajaran/mask_vr.dmi b/icons/inventory/face/mob_vr_tajaran.dmi
similarity index 100%
rename from icons/mob/species/tajaran/mask_vr.dmi
rename to icons/inventory/face/mob_vr_tajaran.dmi
diff --git a/icons/mob/species/teshari/masks_vr.dmi b/icons/inventory/face/mob_vr_teshari.dmi
similarity index 100%
rename from icons/mob/species/teshari/masks_vr.dmi
rename to icons/inventory/face/mob_vr_teshari.dmi
diff --git a/icons/mob/species/unathi/mask_vr.dmi b/icons/inventory/face/mob_vr_unathi.dmi
similarity index 100%
rename from icons/mob/species/unathi/mask_vr.dmi
rename to icons/inventory/face/mob_vr_unathi.dmi
diff --git a/icons/mob/species/vulpkanin/mask.dmi b/icons/inventory/face/mob_vulpkanin.dmi
similarity index 100%
rename from icons/mob/species/vulpkanin/mask.dmi
rename to icons/inventory/face/mob_vulpkanin.dmi
diff --git a/icons/mob/species/werebeast/masks.dmi b/icons/inventory/face/mob_werebeast.dmi
similarity index 100%
rename from icons/mob/species/werebeast/masks.dmi
rename to icons/inventory/face/mob_werebeast.dmi
diff --git a/icons/obj/clothing/shoes.dmi b/icons/inventory/feet/item.dmi
similarity index 100%
rename from icons/obj/clothing/shoes.dmi
rename to icons/inventory/feet/item.dmi
diff --git a/icons/obj/clothing/shoes_vr.dmi b/icons/inventory/feet/item_vr.dmi
similarity index 100%
rename from icons/obj/clothing/shoes_vr.dmi
rename to icons/inventory/feet/item_vr.dmi
diff --git a/icons/mob/feet.dmi b/icons/inventory/feet/mob.dmi
similarity index 100%
rename from icons/mob/feet.dmi
rename to icons/inventory/feet/mob.dmi
diff --git a/icons/mob/species/teshari/shoes.dmi b/icons/inventory/feet/mob_teshari.dmi
similarity index 100%
rename from icons/mob/species/teshari/shoes.dmi
rename to icons/inventory/feet/mob_teshari.dmi
diff --git a/icons/mob/species/vox/shoes.dmi b/icons/inventory/feet/mob_vox.dmi
similarity index 100%
rename from icons/mob/species/vox/shoes.dmi
rename to icons/inventory/feet/mob_vox.dmi
diff --git a/icons/mob/feet_vr.dmi b/icons/inventory/feet/mob_vr.dmi
similarity index 100%
rename from icons/mob/feet_vr.dmi
rename to icons/inventory/feet/mob_vr.dmi
diff --git a/icons/mob/species/werebeast/feet.dmi b/icons/inventory/feet/mob_werebeast.dmi
similarity index 100%
rename from icons/mob/species/werebeast/feet.dmi
rename to icons/inventory/feet/mob_werebeast.dmi
diff --git a/icons/obj/clothing/gloves.dmi b/icons/inventory/hands/item.dmi
similarity index 62%
rename from icons/obj/clothing/gloves.dmi
rename to icons/inventory/hands/item.dmi
index bfb27a0ec8..9949cefb10 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/inventory/hands/item.dmi differ
diff --git a/icons/obj/clothing/gloves_vr.dmi b/icons/inventory/hands/item_vr.dmi
similarity index 100%
rename from icons/obj/clothing/gloves_vr.dmi
rename to icons/inventory/hands/item_vr.dmi
diff --git a/icons/mob/hands.dmi b/icons/inventory/hands/mob.dmi
similarity index 100%
rename from icons/mob/hands.dmi
rename to icons/inventory/hands/mob.dmi
diff --git a/icons/mob/species/teshari/gloves.dmi b/icons/inventory/hands/mob_teshari.dmi
similarity index 100%
rename from icons/mob/species/teshari/gloves.dmi
rename to icons/inventory/hands/mob_teshari.dmi
diff --git a/icons/mob/species/vox/gloves.dmi b/icons/inventory/hands/mob_vox.dmi
similarity index 100%
rename from icons/mob/species/vox/gloves.dmi
rename to icons/inventory/hands/mob_vox.dmi
diff --git a/icons/mob/hands_vr.dmi b/icons/inventory/hands/mob_vr.dmi
similarity index 100%
rename from icons/mob/hands_vr.dmi
rename to icons/inventory/hands/mob_vr.dmi
diff --git a/icons/mob/species/werebeast/hands.dmi b/icons/inventory/hands/mob_werebeast.dmi
similarity index 100%
rename from icons/mob/species/werebeast/hands.dmi
rename to icons/inventory/hands/mob_werebeast.dmi
diff --git a/icons/obj/clothing/hats.dmi b/icons/inventory/head/item.dmi
similarity index 100%
rename from icons/obj/clothing/hats.dmi
rename to icons/inventory/head/item.dmi
diff --git a/icons/obj/clothing/species/akula/hats.dmi b/icons/inventory/head/item_akula.dmi
similarity index 100%
rename from icons/obj/clothing/species/akula/hats.dmi
rename to icons/inventory/head/item_akula.dmi
diff --git a/icons/obj/clothing/species/sergal/hats.dmi b/icons/inventory/head/item_sergal.dmi
similarity index 100%
rename from icons/obj/clothing/species/sergal/hats.dmi
rename to icons/inventory/head/item_sergal.dmi
diff --git a/icons/obj/clothing/species/skrell/hats.dmi b/icons/inventory/head/item_skrell.dmi
similarity index 100%
rename from icons/obj/clothing/species/skrell/hats.dmi
rename to icons/inventory/head/item_skrell.dmi
diff --git a/icons/obj/clothing/species/tajaran/hats.dmi b/icons/inventory/head/item_tajaran.dmi
similarity index 100%
rename from icons/obj/clothing/species/tajaran/hats.dmi
rename to icons/inventory/head/item_tajaran.dmi
diff --git a/icons/obj/clothing/species/teshari/hats.dmi b/icons/inventory/head/item_teshari.dmi
similarity index 100%
rename from icons/obj/clothing/species/teshari/hats.dmi
rename to icons/inventory/head/item_teshari.dmi
diff --git a/icons/obj/clothing/species/unathi/hats.dmi b/icons/inventory/head/item_unathi.dmi
similarity index 100%
rename from icons/obj/clothing/species/unathi/hats.dmi
rename to icons/inventory/head/item_unathi.dmi
diff --git a/icons/obj/clothing/species/vox/hats.dmi b/icons/inventory/head/item_vox.dmi
similarity index 100%
rename from icons/obj/clothing/species/vox/hats.dmi
rename to icons/inventory/head/item_vox.dmi
diff --git a/icons/inventory/head/item_vr.dmi b/icons/inventory/head/item_vr.dmi
new file mode 100644
index 0000000000..d35d62e18e
Binary files /dev/null and b/icons/inventory/head/item_vr.dmi differ
diff --git a/icons/obj/clothing/species/vulpkanin/hats.dmi b/icons/inventory/head/item_vulpkanin.dmi
similarity index 100%
rename from icons/obj/clothing/species/vulpkanin/hats.dmi
rename to icons/inventory/head/item_vulpkanin.dmi
diff --git a/icons/mob/head.dmi b/icons/inventory/head/mob.dmi
similarity index 100%
rename from icons/mob/head.dmi
rename to icons/inventory/head/mob.dmi
diff --git a/icons/mob/species/akula/helmet_vr.dmi b/icons/inventory/head/mob_akula.dmi
similarity index 100%
rename from icons/mob/species/akula/helmet_vr.dmi
rename to icons/inventory/head/mob_akula.dmi
diff --git a/icons/mob/species/sergal/helmet_vr.dmi b/icons/inventory/head/mob_sergal.dmi
similarity index 100%
rename from icons/mob/species/sergal/helmet_vr.dmi
rename to icons/inventory/head/mob_sergal.dmi
diff --git a/icons/mob/species/skrell/helmet.dmi b/icons/inventory/head/mob_skrell.dmi
similarity index 100%
rename from icons/mob/species/skrell/helmet.dmi
rename to icons/inventory/head/mob_skrell.dmi
diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/inventory/head/mob_tajaran.dmi
similarity index 100%
rename from icons/mob/species/tajaran/helmet.dmi
rename to icons/inventory/head/mob_tajaran.dmi
diff --git a/icons/mob/species/teshari/head.dmi b/icons/inventory/head/mob_teshari.dmi
similarity index 100%
rename from icons/mob/species/teshari/head.dmi
rename to icons/inventory/head/mob_teshari.dmi
diff --git a/icons/mob/species/unathi/helmet.dmi b/icons/inventory/head/mob_unathi.dmi
similarity index 100%
rename from icons/mob/species/unathi/helmet.dmi
rename to icons/inventory/head/mob_unathi.dmi
diff --git a/icons/mob/species/vox/head.dmi b/icons/inventory/head/mob_vox.dmi
similarity index 100%
rename from icons/mob/species/vox/head.dmi
rename to icons/inventory/head/mob_vox.dmi
diff --git a/icons/mob/head_vr.dmi b/icons/inventory/head/mob_vr.dmi
similarity index 100%
rename from icons/mob/head_vr.dmi
rename to icons/inventory/head/mob_vr.dmi
diff --git a/icons/mob/species/skrell/helmet_vr.dmi b/icons/inventory/head/mob_vr_skrell.dmi
similarity index 100%
rename from icons/mob/species/skrell/helmet_vr.dmi
rename to icons/inventory/head/mob_vr_skrell.dmi
diff --git a/icons/mob/species/tajaran/helmet_vr.dmi b/icons/inventory/head/mob_vr_tajaran.dmi
similarity index 100%
rename from icons/mob/species/tajaran/helmet_vr.dmi
rename to icons/inventory/head/mob_vr_tajaran.dmi
diff --git a/icons/mob/species/teshari/helmet_vr.dmi b/icons/inventory/head/mob_vr_teshari.dmi
similarity index 100%
rename from icons/mob/species/teshari/helmet_vr.dmi
rename to icons/inventory/head/mob_vr_teshari.dmi
diff --git a/icons/mob/species/unathi/helmet_vr.dmi b/icons/inventory/head/mob_vr_unathi.dmi
similarity index 100%
rename from icons/mob/species/unathi/helmet_vr.dmi
rename to icons/inventory/head/mob_vr_unathi.dmi
diff --git a/icons/mob/species/vulpkanin/helmet_vr.dmi b/icons/inventory/head/mob_vr_vulpkanin.dmi
similarity index 100%
rename from icons/mob/species/vulpkanin/helmet_vr.dmi
rename to icons/inventory/head/mob_vr_vulpkanin.dmi
diff --git a/icons/mob/species/vulpkanin/helmet.dmi b/icons/inventory/head/mob_vulpkanin.dmi
similarity index 100%
rename from icons/mob/species/vulpkanin/helmet.dmi
rename to icons/inventory/head/mob_vulpkanin.dmi
diff --git a/icons/mob/species/werebeast/head.dmi b/icons/inventory/head/mob_werebeast.dmi
similarity index 100%
rename from icons/mob/species/werebeast/head.dmi
rename to icons/inventory/head/mob_werebeast.dmi
diff --git a/icons/obj/clothing/pouches.dmi b/icons/inventory/pockets/item.dmi
similarity index 100%
rename from icons/obj/clothing/pouches.dmi
rename to icons/inventory/pockets/item.dmi
diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi
new file mode 100644
index 0000000000..82ae304307
Binary files /dev/null and b/icons/inventory/suit/item.dmi differ
diff --git a/icons/obj/clothing/species/akula/suits.dmi b/icons/inventory/suit/item_akula.dmi
similarity index 100%
rename from icons/obj/clothing/species/akula/suits.dmi
rename to icons/inventory/suit/item_akula.dmi
diff --git a/icons/obj/clothing/species/sergal/suits.dmi b/icons/inventory/suit/item_sergal.dmi
similarity index 100%
rename from icons/obj/clothing/species/sergal/suits.dmi
rename to icons/inventory/suit/item_sergal.dmi
diff --git a/icons/obj/clothing/species/skrell/suits.dmi b/icons/inventory/suit/item_skrell.dmi
similarity index 100%
rename from icons/obj/clothing/species/skrell/suits.dmi
rename to icons/inventory/suit/item_skrell.dmi
diff --git a/icons/obj/clothing/species/tajaran/suits.dmi b/icons/inventory/suit/item_tajaran.dmi
similarity index 100%
rename from icons/obj/clothing/species/tajaran/suits.dmi
rename to icons/inventory/suit/item_tajaran.dmi
diff --git a/icons/inventory/suit/item_teshari.dmi b/icons/inventory/suit/item_teshari.dmi
new file mode 100644
index 0000000000..840c4abb81
Binary files /dev/null and b/icons/inventory/suit/item_teshari.dmi differ
diff --git a/icons/obj/clothing/species/unathi/suits.dmi b/icons/inventory/suit/item_unathi.dmi
similarity index 100%
rename from icons/obj/clothing/species/unathi/suits.dmi
rename to icons/inventory/suit/item_unathi.dmi
diff --git a/icons/obj/clothing/species/vox/suits.dmi b/icons/inventory/suit/item_vox.dmi
similarity index 100%
rename from icons/obj/clothing/species/vox/suits.dmi
rename to icons/inventory/suit/item_vox.dmi
diff --git a/icons/obj/clothing/suits_vr.dmi b/icons/inventory/suit/item_vr.dmi
similarity index 100%
rename from icons/obj/clothing/suits_vr.dmi
rename to icons/inventory/suit/item_vr.dmi
diff --git a/icons/obj/clothing/species/vulpkanin/suits.dmi b/icons/inventory/suit/item_vulpkanin.dmi
similarity index 100%
rename from icons/obj/clothing/species/vulpkanin/suits.dmi
rename to icons/inventory/suit/item_vulpkanin.dmi
diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi
new file mode 100644
index 0000000000..f5c48376be
Binary files /dev/null and b/icons/inventory/suit/mob.dmi differ
diff --git a/icons/mob/species/akula/suit_vr.dmi b/icons/inventory/suit/mob_akula.dmi
similarity index 100%
rename from icons/mob/species/akula/suit_vr.dmi
rename to icons/inventory/suit/mob_akula.dmi
diff --git a/icons/mob/species/sergal/suit_vr.dmi b/icons/inventory/suit/mob_sergal.dmi
similarity index 100%
rename from icons/mob/species/sergal/suit_vr.dmi
rename to icons/inventory/suit/mob_sergal.dmi
diff --git a/icons/mob/species/skrell/suit.dmi b/icons/inventory/suit/mob_skrell.dmi
similarity index 100%
rename from icons/mob/species/skrell/suit.dmi
rename to icons/inventory/suit/mob_skrell.dmi
diff --git a/icons/mob/species/tajaran/suit.dmi b/icons/inventory/suit/mob_tajaran.dmi
similarity index 100%
rename from icons/mob/species/tajaran/suit.dmi
rename to icons/inventory/suit/mob_tajaran.dmi
diff --git a/icons/inventory/suit/mob_teshari.dmi b/icons/inventory/suit/mob_teshari.dmi
new file mode 100644
index 0000000000..1fb217782e
Binary files /dev/null and b/icons/inventory/suit/mob_teshari.dmi differ
diff --git a/icons/mob/species/unathi/suit.dmi b/icons/inventory/suit/mob_unathi.dmi
similarity index 100%
rename from icons/mob/species/unathi/suit.dmi
rename to icons/inventory/suit/mob_unathi.dmi
diff --git a/icons/mob/species/vox/suit.dmi b/icons/inventory/suit/mob_vox.dmi
similarity index 100%
rename from icons/mob/species/vox/suit.dmi
rename to icons/inventory/suit/mob_vox.dmi
diff --git a/icons/inventory/suit/mob_vr.dmi b/icons/inventory/suit/mob_vr.dmi
new file mode 100644
index 0000000000..35f233c1c3
Binary files /dev/null and b/icons/inventory/suit/mob_vr.dmi differ
diff --git a/icons/mob/species/skrell/suit_vr.dmi b/icons/inventory/suit/mob_vr_skrell.dmi
similarity index 100%
rename from icons/mob/species/skrell/suit_vr.dmi
rename to icons/inventory/suit/mob_vr_skrell.dmi
diff --git a/icons/mob/species/tajaran/suit_vr.dmi b/icons/inventory/suit/mob_vr_tajaran.dmi
similarity index 100%
rename from icons/mob/species/tajaran/suit_vr.dmi
rename to icons/inventory/suit/mob_vr_tajaran.dmi
diff --git a/icons/mob/species/teshari/suit_vr.dmi b/icons/inventory/suit/mob_vr_teshari.dmi
similarity index 100%
rename from icons/mob/species/teshari/suit_vr.dmi
rename to icons/inventory/suit/mob_vr_teshari.dmi
diff --git a/icons/mob/species/unathi/suit_vr.dmi b/icons/inventory/suit/mob_vr_unathi.dmi
similarity index 100%
rename from icons/mob/species/unathi/suit_vr.dmi
rename to icons/inventory/suit/mob_vr_unathi.dmi
diff --git a/icons/mob/species/vulpkanin/suit_vr.dmi b/icons/inventory/suit/mob_vr_vulpkanin.dmi
similarity index 100%
rename from icons/mob/species/vulpkanin/suit_vr.dmi
rename to icons/inventory/suit/mob_vr_vulpkanin.dmi
diff --git a/icons/mob/species/vulpkanin/suit.dmi b/icons/inventory/suit/mob_vulpkanin.dmi
similarity index 100%
rename from icons/mob/species/vulpkanin/suit.dmi
rename to icons/inventory/suit/mob_vulpkanin.dmi
diff --git a/icons/mob/species/werebeast/suit.dmi b/icons/inventory/suit/mob_werebeast.dmi
similarity index 100%
rename from icons/mob/species/werebeast/suit.dmi
rename to icons/inventory/suit/mob_werebeast.dmi
diff --git a/icons/mob/belt_mirror.dmi b/icons/inventory/suit_store/mob.dmi
similarity index 100%
rename from icons/mob/belt_mirror.dmi
rename to icons/inventory/suit_store/mob.dmi
diff --git a/icons/mob/species/teshari/belt_mirror.dmi b/icons/inventory/suit_store/mob_teshari.dmi
similarity index 100%
rename from icons/mob/species/teshari/belt_mirror.dmi
rename to icons/inventory/suit_store/mob_teshari.dmi
diff --git a/icons/mob/species/werebeast/belt_mirror.dmi b/icons/inventory/suit_store/mob_werebeast.dmi
similarity index 100%
rename from icons/mob/species/werebeast/belt_mirror.dmi
rename to icons/inventory/suit_store/mob_werebeast.dmi
diff --git a/icons/inventory/uniform/item.dmi b/icons/inventory/uniform/item.dmi
new file mode 100644
index 0000000000..212861643f
Binary files /dev/null and b/icons/inventory/uniform/item.dmi differ
diff --git a/icons/inventory/uniform/item_teshari.dmi b/icons/inventory/uniform/item_teshari.dmi
new file mode 100644
index 0000000000..481bfc4fc3
Binary files /dev/null and b/icons/inventory/uniform/item_teshari.dmi differ
diff --git a/icons/obj/clothing/uniforms_vr.dmi b/icons/inventory/uniform/item_vr.dmi
similarity index 100%
rename from icons/obj/clothing/uniforms_vr.dmi
rename to icons/inventory/uniform/item_vr.dmi
diff --git a/icons/inventory/uniform/mob.dmi b/icons/inventory/uniform/mob.dmi
new file mode 100644
index 0000000000..0a2c5a996d
Binary files /dev/null and b/icons/inventory/uniform/mob.dmi differ
diff --git a/icons/mob/uniform_rolled_down.dmi b/icons/inventory/uniform/mob_rolled_down.dmi
similarity index 100%
rename from icons/mob/uniform_rolled_down.dmi
rename to icons/inventory/uniform/mob_rolled_down.dmi
diff --git a/icons/mob/uniform_sleeves_rolled.dmi b/icons/inventory/uniform/mob_sleeves_rolled.dmi
similarity index 100%
rename from icons/mob/uniform_sleeves_rolled.dmi
rename to icons/inventory/uniform/mob_sleeves_rolled.dmi
diff --git a/icons/inventory/uniform/mob_teshari.dmi b/icons/inventory/uniform/mob_teshari.dmi
new file mode 100644
index 0000000000..4796d1fecd
Binary files /dev/null and b/icons/inventory/uniform/mob_teshari.dmi differ
diff --git a/icons/mob/species/vox/uniform.dmi b/icons/inventory/uniform/mob_vox.dmi
similarity index 100%
rename from icons/mob/species/vox/uniform.dmi
rename to icons/inventory/uniform/mob_vox.dmi
diff --git a/icons/mob/uniform_vr.dmi b/icons/inventory/uniform/mob_vr.dmi
similarity index 100%
rename from icons/mob/uniform_vr.dmi
rename to icons/inventory/uniform/mob_vr.dmi
diff --git a/icons/mob/uniform_rolled_down_vr.dmi b/icons/inventory/uniform/mob_vr_rolled_down.dmi
similarity index 100%
rename from icons/mob/uniform_rolled_down_vr.dmi
rename to icons/inventory/uniform/mob_vr_rolled_down.dmi
diff --git a/icons/mob/species/werebeast/uniform.dmi b/icons/inventory/uniform/mob_werebeast.dmi
similarity index 100%
rename from icons/mob/species/werebeast/uniform.dmi
rename to icons/inventory/uniform/mob_werebeast.dmi
diff --git a/icons/mob/head.dmi.orig b/icons/mob/head.dmi.orig
deleted file mode 100644
index 1ac40803aa..0000000000
Binary files a/icons/mob/head.dmi.orig and /dev/null differ
diff --git a/icons/mob/spacesuit.dmi b/icons/mob/spacesuit.dmi
deleted file mode 100644
index 7d7c0c61cf..0000000000
Binary files a/icons/mob/spacesuit.dmi and /dev/null differ
diff --git a/icons/mob/spacesuit_vr.dmi b/icons/mob/spacesuit_vr.dmi
deleted file mode 100644
index 836b3a623d..0000000000
Binary files a/icons/mob/spacesuit_vr.dmi and /dev/null differ
diff --git a/icons/mob/species/teshari/back.dmi b/icons/mob/species/teshari/back.dmi
deleted file mode 100644
index 9de0f3544c..0000000000
Binary files a/icons/mob/species/teshari/back.dmi and /dev/null differ
diff --git a/icons/mob/species/teshari/deptcloak.dmi b/icons/mob/species/teshari/deptcloak.dmi
deleted file mode 100644
index 7a9a412853..0000000000
Binary files a/icons/mob/species/teshari/deptcloak.dmi and /dev/null differ
diff --git a/icons/mob/species/teshari/deptjacket.dmi b/icons/mob/species/teshari/deptjacket.dmi
deleted file mode 100644
index 020415a61e..0000000000
Binary files a/icons/mob/species/teshari/deptjacket.dmi and /dev/null differ
diff --git a/icons/mob/species/teshari/suit.dmi b/icons/mob/species/teshari/suit.dmi
deleted file mode 100644
index 714b0408a5..0000000000
Binary files a/icons/mob/species/teshari/suit.dmi and /dev/null differ
diff --git a/icons/mob/species/teshari/teshari_cloak.dmi b/icons/mob/species/teshari/teshari_cloak.dmi
deleted file mode 100644
index a222ede26b..0000000000
Binary files a/icons/mob/species/teshari/teshari_cloak.dmi and /dev/null differ
diff --git a/icons/mob/species/teshari/teshari_hood.dmi b/icons/mob/species/teshari/teshari_hood.dmi
deleted file mode 100644
index 64ae2eced3..0000000000
Binary files a/icons/mob/species/teshari/teshari_hood.dmi and /dev/null differ
diff --git a/icons/mob/species/teshari/teshari_uniform.dmi b/icons/mob/species/teshari/teshari_uniform.dmi
deleted file mode 100644
index 092f78a0e1..0000000000
Binary files a/icons/mob/species/teshari/teshari_uniform.dmi and /dev/null differ
diff --git a/icons/mob/species/teshari/uniform.dmi b/icons/mob/species/teshari/uniform.dmi
deleted file mode 100644
index aab4dcfe06..0000000000
Binary files a/icons/mob/species/teshari/uniform.dmi and /dev/null differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
deleted file mode 100644
index 58b92c82dd..0000000000
Binary files a/icons/mob/suit.dmi and /dev/null differ
diff --git a/icons/mob/suit_1.dmi b/icons/mob/suit_1.dmi
deleted file mode 100644
index 7515beba12..0000000000
Binary files a/icons/mob/suit_1.dmi and /dev/null differ
diff --git a/icons/mob/suit_solgov.dmi b/icons/mob/suit_solgov.dmi
deleted file mode 100644
index de20b89c17..0000000000
Binary files a/icons/mob/suit_solgov.dmi and /dev/null differ
diff --git a/icons/mob/suit_vr.dmi b/icons/mob/suit_vr.dmi
deleted file mode 100644
index 77862540b3..0000000000
Binary files a/icons/mob/suit_vr.dmi and /dev/null differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
deleted file mode 100644
index 9c210eb641..0000000000
Binary files a/icons/mob/uniform.dmi and /dev/null differ
diff --git a/icons/mob/uniform_1.dmi b/icons/mob/uniform_1.dmi
deleted file mode 100644
index 1f22a767b6..0000000000
Binary files a/icons/mob/uniform_1.dmi and /dev/null differ
diff --git a/icons/mob/uniform_fat.dmi b/icons/mob/uniform_fat.dmi
deleted file mode 100644
index c887239f1f..0000000000
Binary files a/icons/mob/uniform_fat.dmi and /dev/null differ
diff --git a/icons/mob/uniform_huge_old.dmi b/icons/mob/uniform_huge_old.dmi
deleted file mode 100644
index 3bac93b933..0000000000
Binary files a/icons/mob/uniform_huge_old.dmi and /dev/null differ
diff --git a/icons/mob/uniform_rolled_down_1.dmi b/icons/mob/uniform_rolled_down_1.dmi
deleted file mode 100644
index 2412be7420..0000000000
Binary files a/icons/mob/uniform_rolled_down_1.dmi and /dev/null differ
diff --git a/icons/mob/uniform_sleeves_rolled_1.dmi b/icons/mob/uniform_sleeves_rolled_1.dmi
deleted file mode 100644
index 2412be7420..0000000000
Binary files a/icons/mob/uniform_sleeves_rolled_1.dmi and /dev/null differ
diff --git a/icons/mob/uniform_sleeves_rolled_vr.dmi b/icons/mob/uniform_sleeves_rolled_vr.dmi
deleted file mode 100644
index cf74d73796..0000000000
Binary files a/icons/mob/uniform_sleeves_rolled_vr.dmi and /dev/null differ
diff --git a/icons/mob/uniform_solgov.dmi b/icons/mob/uniform_solgov.dmi
deleted file mode 100644
index ecc6310dc4..0000000000
Binary files a/icons/mob/uniform_solgov.dmi and /dev/null differ
diff --git a/icons/obj/clothing/hats_vr.dmi b/icons/obj/clothing/hats_vr.dmi
deleted file mode 100644
index bc6cd12245..0000000000
Binary files a/icons/obj/clothing/hats_vr.dmi and /dev/null differ
diff --git a/icons/obj/clothing/helmets_vr.dmi b/icons/obj/clothing/helmets_vr.dmi
deleted file mode 100644
index 3b210b9980..0000000000
Binary files a/icons/obj/clothing/helmets_vr.dmi and /dev/null differ
diff --git a/icons/obj/clothing/rings.dmi b/icons/obj/clothing/rings.dmi
deleted file mode 100644
index 5274bf8735..0000000000
Binary files a/icons/obj/clothing/rings.dmi and /dev/null differ
diff --git a/icons/obj/clothing/spacesuits.dmi b/icons/obj/clothing/spacesuits.dmi
deleted file mode 100644
index ae9cc5764f..0000000000
Binary files a/icons/obj/clothing/spacesuits.dmi and /dev/null differ
diff --git a/icons/obj/clothing/spacesuits_vr.dmi b/icons/obj/clothing/spacesuits_vr.dmi
deleted file mode 100644
index cf74d73796..0000000000
Binary files a/icons/obj/clothing/spacesuits_vr.dmi and /dev/null differ
diff --git a/icons/obj/clothing/species/teshari/suits.dmi b/icons/obj/clothing/species/teshari/suits.dmi
deleted file mode 100644
index 820649befa..0000000000
Binary files a/icons/obj/clothing/species/teshari/suits.dmi and /dev/null differ
diff --git a/icons/obj/clothing/species/teshari/uniform.dmi b/icons/obj/clothing/species/teshari/uniform.dmi
deleted file mode 100644
index 82d4d126da..0000000000
Binary files a/icons/obj/clothing/species/teshari/uniform.dmi and /dev/null differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
deleted file mode 100644
index 788bfa06ba..0000000000
Binary files a/icons/obj/clothing/suits.dmi and /dev/null differ
diff --git a/icons/obj/clothing/suits_1.dmi b/icons/obj/clothing/suits_1.dmi
deleted file mode 100644
index 3e905eda58..0000000000
Binary files a/icons/obj/clothing/suits_1.dmi and /dev/null differ
diff --git a/icons/obj/clothing/suits_solgov.dmi b/icons/obj/clothing/suits_solgov.dmi
deleted file mode 100644
index e5259d22e8..0000000000
Binary files a/icons/obj/clothing/suits_solgov.dmi and /dev/null differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
deleted file mode 100644
index 7b397d3ead..0000000000
Binary files a/icons/obj/clothing/uniforms.dmi and /dev/null differ
diff --git a/icons/obj/clothing/uniforms_1.dmi b/icons/obj/clothing/uniforms_1.dmi
deleted file mode 100644
index 348cf8dd94..0000000000
Binary files a/icons/obj/clothing/uniforms_1.dmi and /dev/null differ
diff --git a/icons/obj/clothing/uniforms_solgov.dmi b/icons/obj/clothing/uniforms_solgov.dmi
deleted file mode 100644
index 2b55ea04a2..0000000000
Binary files a/icons/obj/clothing/uniforms_solgov.dmi and /dev/null differ
diff --git a/maps/southern_cross/items/clothing/sc_accessory.dm b/maps/southern_cross/items/clothing/sc_accessory.dm
index 66d977ffc2..f47c344fcd 100644
--- a/maps/southern_cross/items/clothing/sc_accessory.dm
+++ b/maps/southern_cross/items/clothing/sc_accessory.dm
@@ -10,5 +10,5 @@
 	desc = "Sturdy mess of black synthcotton belts and buckles."
 	icon_state = "pilot_webbing2"
 	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/ties.dmi'
+		SPECIES_TESHARI = 'icons/inventory/accessory/mob_teshari.dmi'
 	)
\ No newline at end of file