The Great Sprite Unification: Part 1 (#21006)

In an effort to make the way our sprites are organized make a little bit
more sense, this takes ALL the sprites in `icons/clothing` and moves
them over `icons/obj/item/clothing` or another appropriate file in the
case of non-clothing items.

A lot of these files had to be split since they lumped everything into
the same dmi which had to be changed since people, reasonably, expect to
find a hat in the folder named `hat` and not in the one where we're
supposed to keep uniforms in.

A lot of smaller files were also merged into already existing dmis where
it made sense.

Lastly, all the colourable items kept in `icons/obj/item/clothing` were
updated to the new palette. Those items were:

**Backpacks:**
- GD Sacred Icon

**Belts:**
- Fannypack

**Gloves:**
- Gloves
- Single Glove

**Hats:**
- GD Cowl
- GD Cube Hood
- Furred Crown
- Surgeon Cap
- Kippah
- Plain Hood

**Shoes:**
- Konyanger Gomusin

**Coats:**
- GD Eccentric Coat

**Uniforms:**
- Colourable Dress
- Shortsleeve Dress
- Evening Gown
- Open Shoulder Dress
- Assymetric Dress
- Tea Dress
- Long Sleeve Dress
- Colourable Scrubs
- Colourable Jumpsuit

code/modules/clothing/factions/assunzione.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/under/assunzione/priest
 	name = "luceian cassock"
 	desc = "A linen cassock worn by clergyfolk of the Luceian faith of Assunzione. Despite being of simple make, the violet dye used for the shoulders has an almost iridescent sparkle to them."
-	icon = 'icons/clothing/under/uniforms/assunzione.dmi'
+	icon = 'icons/obj/item/clothing/under/human/coc/assunzione.dmi'
 	icon_state = "assunzione_cassock"
 	item_state = "assunzione_cassock"
 	contained_sprite = TRUE
@@ -13,7 +13,7 @@
 	desc_extended = "The manufacture of the highly-ornate clergy garb, much like most other religious items of Luceism, is done by highly-skilled, highly-paid artisan tailors who master their craft over years. Tailor shops and businesses must \
 	pass an examination and be granted a license to be able to make these robes, and once they do, the Church sends luxurious materials like silk and velvet, as well as inlays made of real gold. The result is a robe unlike any other, described by \
 	the Keepers who wear them as like being wrapped in a thick, padded blanket."
-	icon = 'icons/clothing/suits/assunzione_robes.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/assunzione_robes.dmi'
 	var/initial_icon_state = "keeper"
 	icon_state = "keeper"
 	hoodtype = /obj/item/clothing/head/winterhood/assunzione_robe
@@ -38,5 +38,5 @@
 /obj/item/clothing/head/winterhood/assunzione_robe
 	name = "luceian clerical robe hood"
 	desc = "A hood for an Assunzioni clerical robe."
-	icon = 'icons/clothing/suits/assunzione_robes.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/assunzione_robes.dmi'
 

code/modules/clothing/factions/biesel.dm

@@ -4,7 +4,7 @@
 /obj/item/clothing/under/legion/tcaf
 	name = "\improper TCAF armsman's uniform"
 	desc = "A black longsleeved top over rough khaki tactical pants. Designed for the use of on-ship legionnaires of the Tau Ceti Armed Forces."
-	icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
+	icon = 'icons/obj/item/clothing/under/human/biesel/tcaf_uniform.dmi'
 	contained_sprite = TRUE
 	icon_state = "tcaf_armsman_uniform"
 	item_state = "tcaf_armsman_uniform"
@@ -14,7 +14,7 @@
 /obj/item/clothing/gloves/tcaf
 	name = "\improper TCAF uniform gloves"
 	desc = "A pair of khaki tactical gloves with reinforcement at the knuckles and an adjustable strap at the wrist."
-	icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
+	icon = 'icons/obj/item/clothing/gloves/tcaf_gloves.dmi'
 	contained_sprite = TRUE
 	icon_state = "tcaf_armsman_gloves"
 	item_state = "tcaf_armsman_gloves"
@@ -25,7 +25,7 @@
 /obj/item/clothing/under/legion/tcaf/technician
 	name = "\improper TCAF technician's uniform"
 	desc = "A plain drab jumpsuit trimmed with dark accents, designed to be cheap and stain-resistant. It could be more comfortable. Worn by members of the Tau Ceti Armed Forces that aren't in active combat roles, such as medical and engineering staff."
-	icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
+	icon = 'icons/obj/item/clothing/under/human/biesel/tcaf_uniform.dmi'
 	contained_sprite = TRUE
 	icon_state = "tcaf_technician_uniform"
 	item_state = "tcaf_technician_uniform"
@@ -34,7 +34,7 @@
 /obj/item/clothing/head/tcaf_technician
 	name = "\improper TCAF technician's cap"
 	desc = "A plain drab softcap, marked in a small manner at the front with the insignia of the Tau Ceti Armed Forces. Worn by members of the Tau Ceti Armed Forces that aren't in active combat roles, such as medical and engineering staff."
-	icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
+	icon = 'icons/obj/item/clothing/head/tcaf_hats.dmi'
 	icon_state = "tcaf_technician_cap"
 	item_state = "tcaf_technician_cap"
 	contained_sprite = TRUE
@@ -61,7 +61,7 @@
 /obj/item/clothing/accessory/tcaf_prefect_pauldron
 	name = "\improper TCAF prefect pauldron"
 	desc = "A bright red hard pauldron to indicate the wearer has the rank of Prefect in the Tau Ceti Armed Forces."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/suit/armor/modular_armor/modular_armor_attachments.dmi'
 	icon_state = "tcaf_prefect_pauldron"
 	item_state = "tcaf_prefect_pauldron"
 	contained_sprite = TRUE
@@ -72,7 +72,7 @@
 /obj/item/clothing/accessory/tcaf_senior_legion_pauldron
 	name = "\improper TCAF senior legionnaire pauldron"
 	desc = "A blue hard pauldron to indicate the wearer has the rank of Senior Legionnaire in the Tau Ceti Armed Forces."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/suit/armor/modular_armor/modular_armor_attachments.dmi'
 	icon_state = "tcaf_senior_legion_pauldron"
 	item_state = "tcaf_senior_legion_pauldron"
 	contained_sprite = TRUE
@@ -83,7 +83,7 @@
 /obj/item/clothing/suit/storage/toggle/tcaf_officer_greatcoat
 	name = "\improper TCAF officer's greatcoat"
 	desc = "This is a well-trimmed greatcoat worn by commissioned officers in the Tau Ceti Armed Forces, such as by a Decurion or Captain. The fabric seems quite robust, but not particularly well used."
-	icon = 'icons/clothing/suits/coats/tcaf_coat.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/tcaf_coat.dmi'
 	icon_state = "tcaf_officer_coat"
 	item_state = "tcaf_officer_coat"
 	contained_sprite = TRUE
@@ -94,7 +94,7 @@
 /obj/item/clothing/head/tcaf_officer
 	name = "\improper TCAF officer's cap"
 	desc = "This is a peaked cap bearing the colours and insignia of the Tau Ceti Armed Forces, typically worn by commissioned officers therein. It looks like it'd fly off one's head very easily in windy weather."
-	icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
+	icon = 'icons/obj/item/clothing/head/tcaf_hats.dmi'
 	icon_state = "tcaf_officer_cap"
 	item_state = "tcaf_officer_cap"
 	contained_sprite = TRUE
@@ -102,7 +102,7 @@
 /obj/item/clothing/under/legion/tcaf_officer
 	name = "\improper TCAF officer's uniform"
 	desc = "A pristine, well-ironed, and perfectly cleaned white jumpsuit with black trimmings, worn by commissioned officers of the Tau Ceti Armed Forces. Who wears a white uniform but someone who intends never to dirty it?"
-	icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
+	icon = 'icons/obj/item/clothing/under/human/biesel/tcaf_uniform.dmi'
 	contained_sprite = TRUE
 	icon_state = "tcaf_officer_uniform"
 	item_state = "tcaf_officer_uniform"
@@ -111,7 +111,7 @@
 // Identical sprites to the TCFL variant, just reflavoured.
 /obj/item/clothing/head/softcap/tcaf_cap
 	name = "TCAF uniform cap"
-	icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
+	icon = 'icons/obj/item/clothing/head/tcaf_hats.dmi'
 	desc = "A rugged blue softcap bearing the insignia of the Tau Ceti Armed Forces, the military of the Republic of Biesel."
 	icon_state = "tcaf_cap"
 	item_state = "tcaf_cap"

code/modules/clothing/factions/dominia.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/mask/breath/lyodsuit
 	name = "lyodsuit mask"
 	desc = "A simple mask that forms a part of the Dominian lyodsuit. Rather cozy, if you're warm-blooded. It has a port to connect air tanks to."
-	icon = 'icons/clothing/masks/lyodsuit.dmi'
+	icon = 'icons/obj/item/clothing/mask/lyodsuit.dmi'
 	icon_state = "dom_thermal_mask"
 	item_state = "dom_thermal_mask"
 	gas_transfer_coefficient = 0.90 // it's made primarily for heat, not gas and chemical protection
@@ -27,7 +27,7 @@
 /obj/item/clothing/gloves/lyodsuit
 	name = "lyodsuit gloves"
 	desc = "A pair of thermal gloves, guaranteed to keep hands toasty."
-	icon = 'icons/clothing/gloves/lyodsuit.dmi'
+	icon = 'icons/obj/item/clothing/gloves/lyodsuit.dmi'
 	icon_state = "dom_thermal_gloves"
 	item_state = "dom_thermal_gloves"
 	contained_sprite = TRUE
@@ -35,7 +35,7 @@
 /obj/item/clothing/shoes/lyodsuit
 	name = "lyodsuit boots"
 	desc = "A pair of thermal boots, guaranteed to prevent cold feet."
-	icon = 'icons/clothing/shoes/lyodsuit.dmi'
+	icon = 'icons/obj/item/clothing/shoes/boots.dmi'
 	icon_state = "dom_thermal_boots"
 	item_state = "dom_thermal_boots"
 	contained_sprite = TRUE
@@ -217,7 +217,7 @@
 /obj/item/clothing/suit/storage/dominia
 	name = "dominian great coat"
 	desc = "This is a great coat in the style of Dominian nobility. It's the latest fashion across Dominian space."
-	icon = 'icons/clothing/suits/coats/dominia_noble_coats.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/dominia_noble_coats.dmi'
 	icon_state = "greatcoat_red"
 	item_state = "greatcoat_red"
 	contained_sprite = TRUE
@@ -270,7 +270,7 @@
 	desc_extended = "Fisanduhian fashion remains as rugged and steadfast as its people, as well as very distinctive from the usual Morozi fashions \
 	sourced from Moroz proper. Bomber jackets such as these were also frequently seen worn by members of the Fisanduh Freedom Front and came \
 	to be seen as an enduring symbol of their struggle for liberty."
-	icon = 'icons/clothing/suits/coats/dominia_bomber.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/dominia_bomber.dmi'
 	icon_state = "dominia_bomber"
 	item_state = "dominia_bomber"
 
@@ -287,7 +287,7 @@
 /obj/item/clothing/under/dominia/imperial_suit
 	name = "dominian suit"
 	desc = "This is a suit in the style of Dominia nobility. It's the latest fashion across Dominian space."
-	icon = 'icons/clothing/under/uniforms/dominia_suits.dmi'
+	icon = 'icons/obj/item/clothing/under/human/dominia/dominia_suits.dmi'
 	icon_state = "suit_imperial"
 	item_state = "suit_imperial"
 	var/house
@@ -334,7 +334,7 @@
 	sourced from Moroz proper. Sweaters such as this were a common sight in the region of Fisanduh, being comfortable to wear and very useful \
 	in the cold mountainous environment they lived in. It tends to be seen as something rather basic and droll by Imperials when compared \
 	to their more extravagant and colorful attire, but this suits the Confederates just fine."
-	icon = 'icons/clothing/under/uniforms/dominia_sweater.dmi'
+	icon = 'icons/obj/item/clothing/under/human/dominia/dominia_sweater.dmi'
 	icon_state = "dom_sweater"
 	item_state = "dom_sweater"
 
@@ -342,7 +342,7 @@
 	name = "lyodsuit"
 	desc = "An imitation Lyodsuit from Dominia. It's lightweight, and high has quality fabric that makes it extremely comfortable to wear."
 	desc_extended = "This Lyodsuit was created in Dominia. It is fashionable amongst the middle and lower classes of Dominia."
-	icon = 'icons/clothing/under/uniforms/lyodsuit.dmi'
+	icon = 'icons/obj/item/clothing/under/human/dominia/lyodsuit.dmi'
 	icon_state = "dom_thermal"
 	item_state = "dom_thermal"
 	contained_sprite = TRUE
@@ -350,7 +350,7 @@
 /obj/item/clothing/under/dominia/lyodsuit/hoodie
 	name = "hoodied lyodsuit"
 	desc = "An imitation Lyodsuit from Dominia. It's lightweight, and high has quality fabric that makes it extremely comfortable to wear. This one has a hood mask attached."
-	icon = 'icons/clothing/under/uniforms/lyodsuit_hoodie.dmi'
+	icon = 'icons/obj/item/clothing/under/human/dominia/lyodsuit_hoodie.dmi'
 	icon_state = "dom_thermal_hoodie"
 	item_state = "dom_thermal_hoodie"
 	action_button_name = "Toggle Lyodsuit Mask"
@@ -438,7 +438,7 @@
 	name = "dominian noble greatdress"
 	desc = "This is a greatdress in the style of Dominian nobility. Greatdresses are a Dominian fashion fad, distinguished from normal dresses by their colourful palettes \
 			and oversized gowns. More modest nobility would define them as excessively gaudy and unreasonable, but it depends on the individual."
-	icon = 'icons/clothing/under/uniforms/dominia_noble_dress.dmi'
+	icon = 'icons/obj/item/clothing/under/human/dominia/dominia_noble_dress.dmi'
 	icon_state = "dom_dress"
 	item_state = "dom_dress"
 	contained_sprite = TRUE
@@ -447,7 +447,7 @@
 	name = "dominian noble dress"
 	desc = "A dress commonly worn by Dominian nobility. While not as gaudy as the greatdress, it is extremely luxurious nonetheless, and a sign of excellent pedigree \
 			and good fortune."
-	icon = 'icons/clothing/under/uniforms/dominia_summer_dress.dmi'
+	icon = 'icons/obj/item/clothing/under/human/dominia/dominia_summer_dress.dmi'
 	icon_state = "altdress_imperial"
 	item_state = "altdress_imperial"
 	var/house
@@ -603,14 +603,13 @@
 	desc = "The traditional red-black-gold uniform of a member of His Majesty's Diplomatic Service."
 	desc_extended = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also employs many \
 	commoners - as long as they can pass the rigorous examinations required to become a full member of the Diplomatic Service."
-	icon = 'icons/clothing/under/uniforms/dominia_consular.dmi'
+	icon = 'icons/obj/item/clothing/under/human/dominia/dominia_consular.dmi'
 	icon_state = "dominia_consular"
 	item_state = "dominia_consular"
 
 /obj/item/clothing/under/dominia/consular/dress
 	name = "dominian consular officer's uniform"
 	desc = "The traditional red-black-gold uniform of a member of His Majesty's Diplomatic Service. This variant has a skirt, for the female diplomat on the go."
-	icon = 'icons/clothing/under/uniforms/dominia_consular.dmi'
 	icon_state = "dominia_consular_fem"
 	item_state = "dominia_consular_fem"
 
@@ -620,7 +619,7 @@
 	desc_extended = "While the most obvious purpose of an initiate's red-and-white robe is to show that the hopeful clergy member is pure in mind and body, \
 	the stark whites of the robe also show when an initiate has neglected their appearance. The white robes must be constantly maintained and washed in order to \
 	maintain their pristine appearance, lest an initiate be found neglectful."
-	icon = 'icons/clothing/under/uniforms/dominia_initiate.dmi'
+	icon = 'icons/obj/item/clothing/under/human/dominia/dominia_initiate.dmi'
 	icon_state = "dominia_initiate"
 	item_state = "dominia_initiate"
 	slot_flags = SLOT_OCLOTHING | SLOT_ICLOTHING
@@ -632,7 +631,7 @@
 	worn by Dominian nobility, in order to demonstrate the importance of Dominia's priestly classes. Each robe is tailor-made to fit an initiate upon their \
 	successful ascension to full member of the clergy, and they are expected to care for their robes throughout their lives. The loss of one's robe is \
 	considered a major embarrassment both for the individual and their church."
-	icon = 'icons/clothing/under/uniforms/dominia_priest.dmi'
+	icon = 'icons/obj/item/clothing/under/human/dominia/dominia_priest.dmi'
 	icon_state = "dominia_priest"
 	item_state = "dominia_priest"
 	slot_flags = SLOT_OCLOTHING | SLOT_ICLOTHING
@@ -642,7 +641,7 @@
 	desc = "The traditional red-black-gold uniform of a priestly member of His Majesty's Diplomatic Service."
 	desc_extended = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also employs many commoners \
 	- as long as they can pass the rigorous examinations required to become a full member of the Diplomatic Service."
-	icon = 'icons/clothing/under/uniforms/dominia_consular_priest.dmi'
+	icon = 'icons/obj/item/clothing/under/human/dominia/dominia_consular_priest.dmi'
 	icon_state = "dominia_consular_priest"
 	item_state = "dominia_consular_priest"
 	slot_flags = SLOT_OCLOTHING | SLOT_ICLOTHING
@@ -652,7 +651,7 @@
 	desc = "A quite fashionable cap issued to the members of His Majesty's Diplomatic Service."
 	desc_extended = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also employs many \
 	commoners - as long as they can pass the rigorous examinations required to become a full member of the Diplomatic Service."
-	icon = 'icons/clothing/head/dominia_consular_cap.dmi'
+	icon = 'icons/obj/item/clothing/head/dominia.dmi'
 	icon_state = "dominia_consular_cap"
 	item_state = "dominia_consular_cap"
 	contained_sprite = TRUE
@@ -662,7 +661,7 @@
 	desc = "A simple red beret with a golden badge marking its wearer as an initiate of the Moroz Holy Tribunal."
 	desc_extended = "While initiates dress humbly in white and red clothing, this does not mean that House Caladius - the primary source of the Holy Tribunal's \
 	funding - spares any expenses funding them, and these berets are made of luxurious velvet."
-	icon = 'icons/clothing/head/dominia_beret.dmi'
+	icon = 'icons/obj/item/clothing/head/dominia.dmi'
 	icon_state = "dominia_beret"
 	item_state = "dominia_beret"
 
@@ -670,7 +669,7 @@
 	name = "tribunalist medical beret"
 	desc = "A white-and-green beret bearing the sigil of the Moroz Holy Tribunal on its front. Worn by those medical workers affiliated with the Moroz Holy Tribunal."
 	desc_extended = "Unlike the black and gold clothing of their priestly counterparts, the medical staff of the Moroz Holy Tribunal's temples are generally clad in white and green due to typically not being full members of the clergy. Occasionally, if a doctor is dedicated enough, they will be granted the right to wear the beret of a full Tribunal priest. This beret features an emblem of the eye made of green and white cloth."
-	icon = 'icons/clothing/head/dominia_beret_hospital.dmi'
+	icon = 'icons/obj/item/clothing/head/dominia.dmi'
 	icon_state = "dominia_beret_hospital"
 	item_state = "dominia_beret_hospital"
 
@@ -679,7 +678,7 @@
 	desc = "A black beret bearing the sigil of the Moroz Holy Tribunal on its front. Worn by full members of the Tribunal's clergy."
 	desc_extended = "With their black and gold clothing designed to resemble that of their noble counterparts, the full clergy of the Moroz Holy Tribunal \
 	are a sight to behold both inside and outside of the Empire of Dominia. This beret features an emblem luxuriously and painstakingly crafted out of real gold."
-	icon = 'icons/clothing/head/dominia_beret_priest.dmi'
+	icon = 'icons/obj/item/clothing/head/dominia.dmi'
 	icon_state = "dominia_beret_priest"
 	item_state = "dominia_beret_priest"
 
@@ -688,7 +687,6 @@
 	desc = "A red beret bearing the sigil of the Moroz Holy Tribunal on its front. Worn by full members of the Tribunal's clergy."
 	desc_extended = "With their red and gold clothing designed to resemble that of their noble counterparts, the full clergy of the Moroz Holy Tribunal \
 	are a sight to behold both inside and outside of the Empire of Dominia. This beret features an emblem luxuriously and painstakingly crafted out of real gold."
-	icon = 'icons/clothing/head/dominia_beret_priest.dmi'
 	icon_state = "dominia_beret_priest_red"
 	item_state = "dominia_beret_priest_red"
 
@@ -697,7 +695,7 @@
 	desc = "A beret in gold and red worn by members of the clergy affiliated with His Majesty's Diplomatic Service."
 	desc_extended = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also employs may commoners - \
 	as long as they can pass the rigorous examinations required to become a full member of the Diplomatic Service."
-	icon = 'icons/clothing/head/dominia_beret_consular.dmi'
+	icon = 'icons/obj/item/clothing/head/dominia.dmi'
 	icon_state = "dominia_beret_consular_priest"
 	item_state = "dominia_beret_consular_priest"
 
@@ -764,7 +762,7 @@
 	desc_extended = "Dresses such as this one are a common sight in the more developed colonies of the Empire of Dominia, and their origins can be traced back to \
 	the fashion houses of Nova Luxembourg. While both sleeved and sleeveless variants exist, the sleeved one is far more common \
 	due to the often frigid temperatures of Moroz."
-	icon = 'icons/clothing/under/uniforms/dominia_dresses.dmi'
+	icon = 'icons/obj/item/clothing/under/human/dominia/dominia_dresses.dmi'
 	icon_state = "dress_imperial"
 	item_state = "dress_imperial"
 	contained_sprite = TRUE
@@ -809,7 +807,7 @@
 	desc_extended = "The kerchief of a Fleet voidsman varies from battlefleet to battlefleet, \
 		and its color indicates where the rating originated from. This particular uniform comes from the elite 1st battlefleet, \
 		which is under the command of Grand Admiral Huiling Zhao herself."
-	icon = 'icons/clothing/under/uniforms/dominia_fleet.dmi'
+	icon = 'icons/obj/item/clothing/under/human/dominia/dominia_fleet.dmi'
 	icon_state = "voidsman"
 	item_state = "voidsman"
 	contained_sprite = TRUE
@@ -840,7 +838,7 @@
 	desc_extended = "Deliberately modest compared to their Officer counterparts, enlisted voidsmen's caps \
 		typically display their vessel of origin on the right side of the cap. \
 		These caps can easily be rolled and stored in the likely event other forms of headwear are required."
-	icon = 'icons/clothing/under/uniforms/dominia_fleet.dmi'
+	icon = 'icons/obj/item/clothing/head/dominia.dmi'
 	icon_state = "voidsmancap"
 	item_state = "voidsmancap"
 	contained_sprite = TRUE
@@ -866,7 +864,7 @@
 	desc = "An Imperial Fleet coat belonging to an officer. The single golden band around its wrist indicates it belongs to an Ensign."
 	desc_extended = "Imperial Fleet officer's coats are both a symbol of rank and of social status, \
 		and proudly bear the wearer's rank by the number of golden bands around their sleeves."
-	icon = 'icons/clothing/under/uniforms/dominia_fleet.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/dominia_officer_coat.dmi'
 	icon_state = "officercoat"
 	item_state = "officercoat"
 	contained_sprite = TRUE
@@ -876,7 +874,7 @@
 	desc = "The standard-issue combat fatigues of an Imperial Army regular. This one features forest camouflage."
 	desc_extended = "While the Empire's nobility is known for its vibrant fashion, the common soldiers of the Imperial Army wear drab fatigues intended to conceal them \
 	from view. The iconic “Morozian green,” camouflage of the Imperial Army's most common uniform has become a common symbol of the Empire's colonialist policies abroad."
-	icon = 'icons/clothing/under/uniforms/dominia_army.dmi'
+	icon = 'icons/obj/item/clothing/under/human/dominia/dominia_army.dmi'
 	icon_state = "dom_uniform"
 	item_state = "dom_uniform"
 	contained_sprite = TRUE
@@ -899,14 +897,12 @@
 /obj/item/storage/backpack/dominia
 	name = "imperial army rucksack"
 	desc = "A rugged Imperial Army backpack intended for use during the Empire's frontier wars."
-	icon = 'icons/clothing/backpacks/dominia_backpack.dmi'
 	icon_state = "dom_backpack"
 	item_state = "dom_backpack"
 
 /obj/item/storage/backpack/dominia/nco
 	name = "imperial army NCO rucksack"
 	desc = "A non-commissioned officer's backpack. The radio set built into it allows for individual squads to stay in cohesion."
-	icon = 'icons/clothing/backpacks/dominia_backpack.dmi'
 	icon_state = "dom_backpack_nco"
 	item_state = "dom_backpack_nco"
 
@@ -915,6 +911,6 @@
 	desc = "A green cap worn by enlisted members of the Imperial Army."
 	desc_extended = "The green of an enlisted soldier's cap both help it blend in and marks its wearer as a commoner. After all, no great house employs green in its \
 	standard."
-	icon = 'icons/clothing/head/dominia_army_hat.dmi'
+	icon = 'icons/obj/item/clothing/head/dominia.dmi'
 	icon_state = "dom_hat"
 	item_state = "dom_hat"

code/modules/clothing/factions/einstein.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/under/rank/einstein
 	name = "\improper Einstein Engines uniform"
 	desc = "A standardized uniform used by Einstein Engines personnel."
-	icon = 'icons/clothing/under/uniforms/einstein.dmi'
+	icon = 'icons/obj/item/clothing/under/human/corporation/einstein.dmi'
 	icon_state = "einstein"
 	item_state = "einstein"
 	contained_sprite = TRUE
@@ -13,7 +13,7 @@
 	desc_extended = "Light as air, electrically insulated, and specially fitted to ensure surgical, microelectronic, or \
 	what-have-you precision, this expensive multipurpose synthetic worker's outfit feels like wearing a breeze! \
 	Synthetics intended to be seen by outsiders to the corporation are likely to wear more conventional clothing instead."
-	icon = 'icons/clothing/under/uniforms/einstein.dmi'
+	icon = 'icons/obj/item/clothing/under/human/corporation/einstein.dmi'
 	icon_state = "ees_utility"
 	item_state = "ees_utility"
 	siemens_coefficient = 0.75

code/modules/clothing/factions/elyra.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/under/elyra_holo
 	name = "elyran holographic suit"
 	desc = "A marvel of Elyran technology, uses hardlight fabric and masks to transform a skin-tight, cozy suit into cultural apparel of your choosing. Has a dial for Madani, Aemaqii and Persepolisean clothes respectively."
-	icon = 'icons/clothing/under/uniforms/elyra_holoclothes.dmi'
+	icon = 'icons/obj/item/clothing/under/human/elyra/elyra_holoclothes.dmi'
 	icon_state = "holosuit_fem"
 	item_state = "holosuit_fem"
 	contained_sprite = TRUE
@@ -39,10 +39,10 @@
 /obj/item/clothing/under/elyra_holo/Initialize()
 	for(var/option in names)
 		if(!clothing_mode)
-			names[option] = image('icons/clothing/under/uniforms/elyra_holoclothes.dmi', icon_state)
+			names[option] = image('icons/obj/item/clothing/under/human/elyra/elyra_holoclothes.dmi', icon_state)
 			clothing_mode = 1
 		else
-			names[option] = image('icons/clothing/under/uniforms/elyra_holoclothes.dmi', initial(icon_state) + "_[names.Find(option) - 1]")
+			names[option] = image('icons/obj/item/clothing/under/human/elyra/elyra_holoclothes.dmi', initial(icon_state) + "_[names.Find(option) - 1]")
 	clothing_mode = 0
 	.=..()
 

code/modules/clothing/factions/gadpathur.dm

@@ -5,7 +5,7 @@
 	found throughout the planet and are one of the most common markers of Gadpathurians abroad, due to the distinctive black \
 	shirt of the uniform. While some personalization is common on these uniforms, they mostly remain the same regardless of \
 	which cadre one belongs to."
-	icon = 'icons/clothing/under/uniforms/gadpathur_uniform.dmi'
+	icon = 'icons/obj/item/clothing/under/human/coc/gadpathur_uniform.dmi'
 	icon_state = "gadpathur_uniform"
 	item_state = "gadpathur_uniform"
 	contained_sprite = TRUE
@@ -16,7 +16,7 @@
 	desc_extended = "Due to the extremely hostile surface conditions of Gadpathur, overcoats such as this one are a common sight \
 	in order to protect against hazards. They are typically chemically treated to better resist chemicals and radiation, \
 	and are often the difference between life and death on the planet's surface."
-	icon = 'icons/clothing/suits/coats/gadpathur_coat.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/gadpathur_coat.dmi'
 	icon_state = "gadpathur_coat"
 	item_state = "gadpathur_coat"
 	contained_sprite = TRUE
@@ -27,7 +27,7 @@
 	desc_extended = "Due to the extremely hostile surface conditions of Gadpathur, overcoats such as this one are a common sight \
 	in order to protect against hazards. They are typically chemically treated to better resist chemicals and radiation, \
 	and are often the difference between life and death on the planet's surface."
-	icon = 'icons/clothing/suits/coats/gadpathur_coat.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/gadpathur_coat.dmi'
 	icon_state = "gadpathurtrench"
 	item_state = "gadpathurtrench"
 	contained_sprite = TRUE
@@ -44,7 +44,7 @@
 	desc_extended = "Due to the extremely hostile surface conditions of Gadpathur, overcoats such as this one are a common sight \
 	in order to protect against hazards. They are typically chemically treated to better resist chemicals and radiation, \
 	and are often the difference between life and death on the planet's surface."
-	icon = 'icons/clothing/suits/coats/gadpathur_coat.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/gadpathur_coat.dmi'
 	icon_state = "gadpathurthermal"
 	item_state = "gadpathurthermal"
 	contained_sprite = TRUE
@@ -55,7 +55,7 @@
 	desc_extended = "Soft headgear is commonly worn by cadre members while indoors on Gadpathur or while traveling abroad from the planet. \
 	Gadpathurian cadres universally avoid decorating their headgear beyond the barest essentials - such as the cadre one belongs \
 	to - in order to not give away unwanted information to observers."
-	icon = 'icons/clothing/head/gadpathur_cap.dmi'
+	icon = 'icons/obj/item/clothing/head/gadpathur.dmi'
 	icon_state = "gadpathur_cap"
 	item_state = "gadpathur_cap"
 	contained_sprite = TRUE
@@ -63,7 +63,7 @@
 /obj/item/clothing/head/turban/gadpathur
 	name = "gadpathurian turban"
 	desc = "A turban commonly worn by Gadpathur's Sikh population. Like most Gadpathurian clothing, this turban is made of canvas."
-	icon = 'icons/clothing/head/gadpathur_cap.dmi'
+	icon = 'icons/obj/item/clothing/head/gadpathur.dmi'
 	icon_state = "turban_gadpathur"
 	item_state = "turban_gadpathur"
 
@@ -73,7 +73,7 @@
 	desc_extended = "Berets are commonly worn by cadre members while indoors on Gadpathur or while traveling abroad from the planet. \
 	Gadpathurian cadres universally avoid decorating their headgear beyond the barest essentials - such as the cadre one belongs \
 	to - in order to not give away unwanted information to observers."
-	icon = 'icons/clothing/head/gadpathur_beret.dmi'
+	icon = 'icons/obj/item/clothing/head/gadpathur.dmi'
 	icon_state = "gadpathur_beret"
 	item_state = "gadpathur_beret"
 
@@ -94,7 +94,7 @@
 	desc = "A Gadpathurian cap with a sun shade for protection against the planet's ash storms."
 	icon_state = "gadpathur_kepi"
 	item_state = "gadpathur_kepi"
-	icon = 'icons/clothing/head/gadpathur_kepi.dmi'
+	icon = 'icons/obj/item/clothing/head/gadpathur.dmi'
 	contained_sprite = TRUE
 
 /obj/item/clothing/head/ushanka/gadpathur/attack_self(mob/user as mob)
@@ -163,7 +163,7 @@
 	desc = "A sturdy-looking rebreather with a canvas scarf wrapped around it. Boring, but sturdy-looking."
 	desc_extended = "A common sight on Gadpathur, the Type 2308 (its year of creation) rebreather is typically worn with an oxygen tank or filtration\
 	module to combat more minor contaminants found on Gadpathur. Not intended for use in seriously contaminated zones."
-	icon = 'icons/clothing/masks/gadpathur_breath.dmi'
+	icon = 'icons/obj/item/clothing/mask/breath/gadpathur_breath.dmi'
 	icon_state = "gadpathur_breath"
 	item_state = "gadpathur_breath"
 	adjustable = FALSE

code/modules/clothing/factions/goldendeep.dm

@@ -7,7 +7,7 @@
 	gold-appearance clothing is now popular within many Golden Deep brands, but this was the first, and still carries considerable prestige (and a price tag to match)."
 	icon_state = "goldendeep_dress"
 	item_state = "goldendeep_dress"
-	icon = 'icons/clothing/under/uniforms/goldendeep_dress.dmi'
+	icon = 'icons/obj/item/clothing/under/synthetic/goldendeep.dmi'
 	contained_sprite = TRUE
 
 /obj/item/clothing/under/goldendeep/wrap
@@ -18,7 +18,7 @@
 	(and more poorly-designed) predecessors."
 	icon_state = "goldendeep_wrap"
 	item_state = "goldendeep_wrap"
-	icon = 'icons/clothing/under/uniforms/goldendeep_wrap.dmi'
+	icon = 'icons/obj/item/clothing/under/synthetic/goldendeep.dmi'
 	contained_sprite = TRUE
 
 /obj/item/clothing/under/goldendeep/vest
@@ -29,7 +29,7 @@
 	may still be far out of the reach of the masses, but it barely approaches a fraction of the cost of a golden two piece, and is certainly far, far cheaper than the dresses made by Lux-Igmatic themself."
 	icon_state = "goldendeep_vest"
 	item_state = "goldendeep_vest"
-	icon = 'icons/clothing/under/uniforms/goldendeep_vest.dmi'
+	icon = 'icons/obj/item/clothing/under/synthetic/goldendeep.dmi'
 	slot_flags = SLOT_OCLOTHING | SLOT_ICLOTHING
 	contained_sprite = TRUE
 
@@ -42,7 +42,7 @@
 	Golden Deep social circles."
 	icon_state = "goldendeep_suit"
 	item_state = "goldendeep_suit"
-	icon = 'icons/clothing/under/uniforms/goldendeep_suit.dmi'
+	icon = 'icons/obj/item/clothing/under/synthetic/goldendeep.dmi'
 	contained_sprite = TRUE
 
 /obj/item/clothing/under/goldendeep/skirtsuit
@@ -53,7 +53,7 @@
 	GD citizens and traders have been rekindled - necessitating the need to 'keep up appearances' even within exclusively Golden Deep social circles."
 	icon_state = "goldendeep_skirtsuit"
 	item_state = "goldendeep_skirtsuit"
-	icon = 'icons/clothing/under/uniforms/goldendeep_skirtsuit.dmi'
+	icon = 'icons/obj/item/clothing/under/synthetic/goldendeep.dmi'
 	contained_sprite = TRUE
 
 // Hoplan
@@ -62,7 +62,7 @@
 	desc = "A standard issued uniform for a Hoplan house, often provided to represent a particular merchant or merchant organization who is funding the group."
 	icon_state = "hoplan_uniform"
 	item_state = "hoplan_uniform"
-	icon = 'icons/clothing/under/uniforms/goldendeep_hoplan.dmi'
+	icon = 'icons/obj/item/clothing/under/synthetic/goldendeep.dmi'
 	contained_sprite = TRUE
 
 /obj/item/clothing/head/goldendeep/hoplan
@@ -70,7 +70,7 @@
 	desc = "A large poofy and floppy hat with a golden antennae sticking out its top where typically feathers would protrude. If you wanted to be historically accurate."
 	icon_state = "hoplan_combat_hat"
 	item_state = "hoplan_combat_hat"
-	icon = 'icons/clothing/head/hoplan_combat_hat.dmi'
+	icon = 'icons/obj/item/clothing/head/ipc/golden_deep.dmi'
 	contained_sprite = TRUE
 
 //colorable items go under here
@@ -135,7 +135,7 @@
 	desc = "This coat is long with reinforcement to make someone look like an angel of old, or a clown."
 	icon_state = "eccentric_coat"
 	item_state = "eccentric_coat"
-	icon = 'icons/clothing/suits/coats/eccentric_coat.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/eccentric_coat.dmi'
 	contained_sprite = TRUE
 	has_accents = TRUE
 
@@ -188,7 +188,7 @@
 	desc = "Like a true monarch, has a metal rim capped with a cloth top piece. Peaked in a ornate point."
 	icon_state = "furred_crown"
 	item_state = "furred_crown"
-	icon = 'icons/clothing/head/furred_crown.dmi'
+	icon = 'icons/obj/item/clothing/head/ipc/golden_deep.dmi'
 	contained_sprite = TRUE
 	has_accents = TRUE
 
@@ -197,7 +197,7 @@
 	desc = "A cloth hood with special fabric rated for the acid rain of Pactolous."
 	icon_state = "cowl"
 	item_state = "cowl"
-	icon = 'icons/clothing/head/cowl.dmi'
+	icon = 'icons/obj/item/clothing/head/ipc/golden_deep.dmi'
 	body_parts_covered = 0
 	slot_flags = SLOT_EARS | SLOT_HEAD
 
@@ -206,7 +206,7 @@
 	desc = "Ornate and with subtle religious undertones, would make any wearer loom like a revered parent."
 	icon_state = "cube_hood"
 	item_state = "cube_hood"
-	icon = 'icons/clothing/head/cube_hood.dmi'
+	icon = 'icons/obj/item/clothing/head/ipc/golden_deep.dmi'
 	body_parts_covered = 0
 	slot_flags = SLOT_EARS | SLOT_HEAD
 
@@ -215,7 +215,7 @@
 	desc = "Jingling and dancing with movement. This chain is of metals or jewels that flaunt the wealth of the wearer. Or some facsimile of it."
 	icon_state = "chain_jewelry"
 	item_state = "chain_jewelry"
-	icon = 'icons/clothing/head/chain_jewelry.dmi'
+	icon = 'icons/obj/item/clothing/head/ipc/golden_deep.dmi'
 	slot_flags = SLOT_EARS | SLOT_HEAD | SLOT_MASK
 
 /obj/item/clothing/head/goldendeep/chainjewelry/baseline
@@ -238,7 +238,7 @@
 /obj/item/storage/backpack/goldendeep
 	name = "sacred icon"
 	desc = "A floating and imposing symbol with very discrete anti gravity emitters capable of rendering viewers blinded by its majesty, paralyzed, or dumbstruck."
-	icon = 'icons/clothing/backpacks/sacred_icon.dmi'
+	icon = 'icons/obj/storage/backpack.dmi'
 	icon_state = "sacred_icon"
 	item_state = "sacred_icon"
 	contained_sprite = TRUE
@@ -254,7 +254,7 @@
 	desc_extended = "Originally the invention of an unknown synthetic, the design of plain utilitarian jumpsuits known as 'Porter Uniforms' has skyrocketed in popularity, with many different firms and organizations within the Golden Deep inventing their own variety. Known not to be particularly comfortable for organic use."
 	icon_state = "porter_uniform"
 	item_state = "porter_uniform"
-	icon = 'icons/clothing/under/uniforms/goldendeep_porter_uniform.dmi'
+	icon = 'icons/obj/item/clothing/under/synthetic/goldendeep.dmi'
 	contained_sprite = TRUE
 
 /obj/item/clothing/head/goldendeep/porter
@@ -262,5 +262,5 @@
 	desc = "This is a simple and nondescript hood designed to fit over many shapes of head, intended to provide protection from the elements. While originally fashioned by the Golden Deep and remaining particularly popular in it, its use has also branched out widely throughout the spur among independent delivery workers."
 	icon_state = "porter_hood"
 	item_state = "porter_hood"
-	icon = 'icons/clothing/under/uniforms/goldendeep_porter_uniform.dmi'
+	icon = 'icons/obj/item/clothing/head/ipc/golden_deep.dmi'
 	contained_sprite = TRUE

code/modules/clothing/factions/himeo.dm

@@ -2,13 +2,13 @@
 	name = "himean bekesha"
 	desc = "A heavy winter coat from Himeo, made of synthetic fish fur. It looks extremely comfortable, if a bit hot for climate-controlled corridors."
 	desc_extended = "While traditional Solarian bekeshas are often made of animal fur and hide, this particular variant is made of Himean fish fur and other synthetic materials. Heavy coats such as this are a common sight on Himeo, due to the extremely cold temperatures of the planet."
-	icon = 'icons/clothing/suits/coats/himeo_coat.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/himeo_coat.dmi'
 	icon_state = "coat_himeo"
 	item_state = "coat_himeo"
 	contained_sprite = TRUE
 
 /obj/item/clothing/suit/storage/toggle/himeo/grey
-	icon = 'icons/clothing/suits/coats/himeo_coat_grey.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/himeo_coat.dmi'
 	icon_state = "coat_himeo_grey"
 	item_state = "coat_himeo_grey"
 
@@ -16,7 +16,7 @@
 	name = "himean cap"
 	desc = "A field cap of Himean origin. This particular cap has the United Syndicates of Himeo's typical symbol - a white hexagon surrounded by red triangles - on its face."
 	desc_extended = "The M372 field cap is a standard-issue cap of Himeo's military, and a common sight throughout the planet and the space around it. This particular model is a reproduction, due to its lack of the traditional ear covers on the Himean model."
-	icon = 'icons/clothing/head/himeo_cap.dmi'
+	icon = 'icons/obj/item/clothing/head/himeo_army.dmi'
 	icon_state = "cap_himeo"
 	item_state = "cap_himeo"
 	contained_sprite = TRUE
@@ -25,7 +25,7 @@
 	name = "himean planetary guard utility cover"
 	desc = "A utility cover of Himean origin. This particular cap has the united syndicates of Himeo's typical symbol - a white hexagon by red triangles - on its face."
 	desc_extended = "The M293 utility cover is a standard-issue cap for Himeo's planetary guard. It is part of the standard base dress for the Himean planetary guard, and is thus a common sight throughout vessels across the Coalition."
-	icon = 'icons/clothing/under/uniforms/himeo_military.dmi'
+	icon = 'icons/obj/item/clothing/head/himeo_army.dmi'
 	icon_state = "himeo_pg_utility"
 	item_state = "himeo_pg_utility"
 	contained_sprite = TRUE
@@ -34,7 +34,7 @@
 	name = "himean naval garrison cap"
 	desc = "A sidecap of Himean origin. This particular sidecap has the United Syndicates of Himeo's typical symbol"
 	desc_extended = "The M361 garrison cap is a standard-issue softcover for the Planetary Guard's naval component. On the front is a small roundel containing the United Syndicates' national colors: black, white, and red."
-	icon = 'icons/clothing/under/uniforms/himeo_military.dmi'
+	icon = 'icons/obj/item/clothing/head/himeo_army.dmi'
 	icon_state = "himeo_navy_sidecap"
 	item_state = "himeo_navy_sidecap"
 	contained_sprite = TRUE

code/modules/clothing/factions/idris.dm

@@ -2,7 +2,7 @@
 /obj/item/clothing/suit/storage/toggle/armor/vest/idris
 	name = "black Idris Unit coat"
 	desc = "A coat worn by the Idris units, notorious across space."
-	icon = 'icons/clothing/suits/coats/idris_iru_coats.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/idris_iru_coats.dmi'
 	icon_state = "idris_coat"
 	item_state = "idris_coat"
 	allowed = list(/obj/item/gun,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/device/flashlight)
@@ -94,7 +94,7 @@
 /obj/item/clothing/suit/storage/toggle/idris
 	name = "\improper Idris Incorporated jacket"
 	desc = "A comfortable windbreaker for Idris Incorporated investigations staff styled after the coats of Idris reclamation units. Many of the Idris patches and badges on the coat are holographic."
-	icon = 'icons/clothing/suits/coats/idris_windbreaker.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/corp_dep_jackets.dmi'
 	icon_state = "idris_windbreaker"
 	item_state = "idris_windbreaker"
 	contained_sprite = TRUE
@@ -103,7 +103,7 @@
 /obj/item/clothing/under/dress/idris
 	name = "idris incorporated hospitality dress"
 	desc = "This is a stylish knee-length teal dress, installed with its own in-built undershirt and scarf that cannot be removed. It is branded prominently with the logo of Idris Incorporated. Commonly worn among Idris Customer Service units, alongside their organic peers."
-	icon = 'icons/clothing/under/uniforms/idris_dress.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	icon_state = "idris_dress"
 	item_state = "idris_dress"
 	contained_sprite = TRUE

code/modules/clothing/factions/konyang.dm

@@ -2,7 +2,7 @@
 	name = "magenta hanbok"
 	desc = "A traditional Konyanger hanbok."
 	desc_extended = "An ancient form of dress carried over from Earth by the initial Konyang colonists; the hanbok has since become a symbol of Konyang and its most iconic formalwear."
-	icon = 'icons/clothing/under/uniforms/konyang_femalehanbok.dmi'
+	icon = 'icons/obj/item/clothing/under/human/coc/konyang_femalehanbok.dmi'
 	icon_state = "hanbok_magenta"
 	worn_state = "hanbok_magenta"
 	item_state = "hanbok_magenta"
@@ -36,7 +36,7 @@
 /obj/item/clothing/suit/storage/toggle/konyang
 	name = "konyanger jacket"
 	desc = "A remarkably breathable yet water-resistant jacket from Konyang."
-	icon = 'icons/clothing/suits/konyang_jacket.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/konyang_jacket.dmi'
 	icon_state = "konyang_jacket"
 	item_state = "konyang_jacket"
 	contained_sprite = TRUE
@@ -68,7 +68,7 @@
 	desc = "Styled after the latest fashion trends on Konyang, this hybrid faux-leather and polyester mesh jacket was built with the planet’s humid climate in mind. This one has a pale beige color."
 	desc_extended = "Only recently entering the larger Coalition scene, Konyanger fashion has taken the frontier by storm, owing to its unique blend of durability, waterproofing, \
 	and breathability. This innovation in clothing was only accomplished due to Konyanger fashion brands utilizing the fabrics and textiles unique to their planet."
-	icon = 'icons/clothing/suits/konyang_double_breasted_jacket.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/konyang_jacket.dmi'
 	icon_state = "konyang_coat_pale"
 	item_state = "konyang_coat_pale"
 	heat_protection = UPPER_TORSO|LOWER_TORSO|ARMS
@@ -88,7 +88,7 @@
 	name = "gat"
 	desc = "A traditional hat worn on Konyang and originating on Earth."
 	desc_extended = "Although traditionally made from horsehair, many different types of fabrics, including water-resistant fibres from feathers are now used."
-	icon = 'icons/obj/item/clothing/head/konyang_caps.dmi'
+	icon = 'icons/obj/item/clothing/head/konyang.dmi'
 	icon_state = "gat"
 	item_state = "gat"
 	contained_sprite = TRUE
@@ -111,7 +111,7 @@
 	desc_extended = "Konyanger clothes are often designed to remain both water-resistant and breathable, made of light fabrics that can \
 	only be sourced on the planet. Not all clothes are made equal, however, and plant-derived plastics and cloth have found just as much use as the \
 	'miracle weave' in an attempt to keep costs down."
-	icon = 'icons/clothing/under/uniforms/konyang_dress.dmi'
+	icon = 'icons/obj/item/clothing/under/human/coc/konyang_dress.dmi'
 	icon_state = "konyang_dress"
 	worn_state = "konyang_dress"
 	item_state = "konyang_dress"
@@ -120,7 +120,7 @@
 
 /obj/item/clothing/under/konyang/male/sleeveless
 	name = "sleeveless hanbok"
-	icon = 'icons/clothing/under/uniforms/konyang_malehanbok_colorable.dmi'
+	icon = 'icons/obj/item/clothing/under/human/coc/konyang_malehanbok_colorable.dmi'
 	icon_state = "hanbok_male_sleeveless_colorable"
 	worn_state = "hanbok_male_sleeveless_colorable"
 	item_state = "hanbok_male_sleeveless_colorable"
@@ -128,7 +128,7 @@
 
 /obj/item/clothing/under/konyang/male/shortsleeve
 	name = "short sleeve hanbok"
-	icon = 'icons/clothing/under/uniforms/konyang_malehanbok_colorable.dmi'
+	icon = 'icons/obj/item/clothing/under/human/coc/konyang_malehanbok_colorable.dmi'
 	icon_state = "hanbok_male_shortsleeve_colorable"
 	worn_state = "hanbok_male_shortsleeve_colorable"
 	item_state = "hanbok_male_shortsleeve_colorable"
@@ -145,7 +145,7 @@
 /obj/item/clothing/shoes/konyang
 	name = "gomusin"
 	desc = "A traditional pair of shoes typically worn by men."
-	icon = 'icons/clothing/shoes/konyang_gomusin.dmi'
+	icon = 'icons/obj/item/clothing/shoes/boots.dmi'
 	icon_state = "gomusin"
 	item_state = "gomusin"
 	contained_sprite = TRUE
@@ -156,7 +156,7 @@
 	desc_extended = "Carried over to Konyang from Earth, this dress was usually worn by shrine maidens of the Shinto faith back on Earth. \
 	It has since been appropriated by many Konyangers as a type of formal dress, and simply as a manner of fashion. The hot and humid climate of the planet however, has necessitated \
 	that most dresses of this type are made of lighter fabrics indigenous to the planet."
-	icon = 'icons/clothing/under/uniforms/konyang_dress_traditional.dmi'
+	icon = 'icons/obj/item/clothing/under/human/coc/konyang_dress_traditional.dmi'
 	icon_state = "konyang_dress_traditional"
 	item_state = "konyang_dress_traditional"
 	slot_flags = SLOT_ICLOTHING

code/modules/clothing/factions/newhaiphong.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/accessory/aodai
 	name = "ao dai"
 	desc = "A long, split tunic worn over trousers."
-	icon = 'icons/clothing/under/uniforms/newhaiphong.dmi'
+	icon = 'icons/obj/item/clothing/under/human/sol/newhaiphong.dmi'
 	icon_state = "aodai"
 	item_state = "aodai"
 	contained_sprite = TRUE
@@ -19,7 +19,7 @@
 /obj/item/clothing/head/nonla
 	name = "non la conical hat"
 	desc = "A conical straw hat, also known as a non la, enjoyed particularly by residents of New Hai Phong, to protect the head from sweltering suns and heavy rains."
-	icon = 'icons/clothing/under/uniforms/newhaiphong.dmi'
+	icon = 'icons/obj/item/clothing/head/newhaiphong.dmi'
 	icon_state = "nonla"
 	item_state = "nonla"
 	contained_sprite = TRUE

code/modules/clothing/factions/pmcg.dm

@@ -10,7 +10,7 @@
 	desc_extended = "The proprietary PMCG Modular Fatigue Jumpsuit, quickly dubbed the modsuit, is an innovation by the recently-formed PMCG to quickly outfit its scores of new \
 	hires and acquisitions at economic production costs. Designed to fit military contractors of a wide range of sizes, species, and operating environments with tolerable comfort, \
 	the modsuit features a number of smart-fabric connection points for the modern contractor to modify their uniform to a number of preset configurations."
-	icon = 'icons/clothing/under/uniforms/pmcg_modsuit.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/security.dmi'
 	icon_state = "pmcg_modsuit"
 	item_state = "pmcg_modsuit"
 	contained_sprite = TRUE
@@ -30,7 +30,7 @@
 /obj/item/clothing/under/pmc_modsuit/Initialize()
 	. = ..()
 	for(var/option in configuration_options)
-		configuration_options[option] = image('icons/clothing/under/uniforms/pmcg_modsuit.dmi', initial(icon_state) + "_" + option)
+		configuration_options[option] = image('icons/obj/item/clothing/department_uniforms/security.dmi', initial(icon_state) + "_" + option)
 
 /obj/item/clothing/under/pmc_modsuit/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
 	. = ..()
@@ -100,7 +100,7 @@
 	name = "\improper Ve'katak Phalanx representative uniform"
 	desc = "A uniform used by the forces of the Ve'katak Phalanx, a Vaurca-run private military company. This one has ice blue shoulder stripes, identifying it as belonging to a Phalanx member that is representing the direct interests of the Phalanx and their immediate employers."
 	desc_extended = "These uniforms are designed to fit under the combat hardsuits favored by the Phalanx. They are utilitarian in design, and reportedly somewhat uncomfortable - though few of the non-Vaurcae bold enough to join Ve'katak seem to complain."
-	icon = 'icons/clothing/under/uniforms/pmcg.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	icon_state = "phalanx-rep_jumpsuit"
 	item_state = "phalanx-rep_jumpsuit"
 	contained_sprite = TRUE
@@ -115,7 +115,7 @@
 	name = "Grupo Amapola uniform"
 	desc = "A uniform used by the forces of the Grupo Amapola, a private military company originating out of Mictlan. It is based off the old uniforms of the Mictlan Defense Force, a once-Solarian planetary guard, with red poppy patches on the back and right arm."
 	desc_extended = "The Grupo Amapola's light green camo is taken from old uniforms of the Mictlan Defense Force, the same uniforms used by the insurgents known as the Samaritans. Many MDF service personnel defected to the Samaritans, and after the fighting between the Tau Ceti Armed Forces and Samaritans ended, the less scrupulous among their number now work for Grupo Amapola."
-	icon = 'icons/clothing/under/uniforms/pmcg.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/security.dmi'
 	icon_state = "amapola_ftg"
 	item_state = "amapola_ftg"
 	contained_sprite = TRUE

code/modules/clothing/factions/portantillia.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/under/antillean
 	name = "fetil dress"
 	desc = "A flowing dress from the Fetil islands on Port Antillia. Great for dancing."
-	icon = 'icons/clothing/under/uniforms/port_antillia.dmi'
+	icon = 'icons/obj/item/clothing/under/human/biesel/port_antillia.dmi'
 	icon_state = "fetil_dress"
 	worn_state = "fetil_dress"
 	item_state = "fetil_dress"

code/modules/clothing/factions/trinary.dm

@@ -3,7 +3,7 @@
 	desc = "Robes worn by those who serve The Trinary Perfection."
 	icon_state = "trinary_habit"
 	item_state = "trinary_habit"
-	icon = 'icons/clothing/suits/trinary_habit.dmi'
+	icon = 'icons/obj/item/clothing/suit/trinarist_robes.dmi'
 	contained_sprite = TRUE
 
 /obj/item/clothing/suit/trinary_robes/templeist
@@ -11,14 +11,14 @@
 	desc = "A robe worn by members of the Lodge of Temple Architect, an order within the Trinary Perfection focused on technological and industrial development."
 	icon_state = "templeist_robe"
 	item_state = "templeist_robe"
-	icon = 'icons/clothing/suits/templeist_robe.dmi'
+	icon = 'icons/obj/item/clothing/suit/trinarist_robes.dmi'
 	contained_sprite = TRUE
 
 /obj/item/clothing/head/trinary
 	name = "trinary coif"
 	desc = "A coif worn primarily by members of the Monastic Sorority of Our Lady Corkfell, a religious order within the Trinary Perfection focused on the medical needs of its human practicioners. It seems to be made out of a light \
 	and breathable material in order to cope with Orepit's hot summers."
-	icon = 'icons/clothing/head/trinary_coif.dmi'
+	icon = 'icons/obj/item/clothing/head/ipc/trinary_coif.dmi'
 	icon_state = "trinary_coif"
 	item_state = "trinary_coif"
 	contained_sprite = TRUE
@@ -27,7 +27,7 @@
 /obj/item/clothing/suit/storage/hooded/exclusionist_robe
 	name = "exclusionist robes"
 	desc = "Red and gold robes worn by those who follow the Exclusionist heresy of the Trinary Perfection."
-	icon = 'icons/clothing/suits/exclusionist_robes.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/exclusionist_robes.dmi'
 	icon_state = "exclusionist_robe_priest"
 	item_state = "exclusionist_robe_priest"
 	hoodtype = /obj/item/clothing/head/winterhood/exclusionist
@@ -43,7 +43,7 @@
 /obj/item/clothing/head/winterhood/exclusionist
 	name = "exclusionist hood"
 	desc = "A red and gold hood worn by those who follow the Exclusionist heresy of the Trinary Perfection."
-	icon = 'icons/clothing/suits/exclusionist_robes.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/exclusionist_robes.dmi'
 	icon_state = "exclusionist_robe_priest_hood"
 	item_state = "exclusionist_robe_priest_hood"
 
@@ -59,7 +59,7 @@
 /obj/item/clothing/suit/armor/exclusionist
 	name = "armored exclusionist robe"
 	desc = "Robes worn by those who follow the Exclusionist heresy of the Trinary Perfection. These ones seem to have been reinforced for battle."
-	icon = 'icons/clothing/suits/exclusionist_robes.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/exclusionist_robes.dmi'
 	icon_state = "exclusionist_armored_robe"
 	item_state = "exclusionist_armored_robe"
 	armor = list(
@@ -76,7 +76,7 @@
 /obj/item/clothing/mask/exclusionist
 	name = "exclusionist mask"
 	desc = "A fearsome steel mask, worn by those who follow the Exclusionist heresy of the Trinary Perfection."
-	icon = 'icons/clothing/suits/exclusionist_robes.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/exclusionist_robes.dmi'
 	icon_state = "exclusionist_mask"
 	item_state = "exclusionist_mask"
 	contained_sprite = TRUE

code/modules/clothing/glasses/glasses.dm

@@ -786,7 +786,7 @@ BLIND     // can't see anything
 /obj/item/clothing/glasses/aug/welding
 	name = "glare dampeners"
 	desc = "A subdermal implant installed just above the brow line that deploys a thin sheath of hyperpolycarbonate that protects from eye damage associated with arc flash."
-	icon = 'icons/clothing/eyes/welding_goggles.dmi'
+	icon = 'icons/obj/item/clothing/eyes/welding_goggles.dmi'
 	icon_state = "welding-aug"
 	item_state = "welding-aug"
 	contained_sprite = TRUE
@@ -816,7 +816,7 @@ BLIND     // can't see anything
 /obj/item/clothing/glasses/welding/emergency
 	name = "emergency welding goggles"
 	desc = "A cheaper version of standard welding goggles, approved for emergency use by the NanoTrasen Safety Board."
-	icon = 'icons/clothing/eyes/welding_goggles.dmi'
+	icon = 'icons/obj/item/clothing/eyes/welding_goggles.dmi'
 	icon_state = "ewelding-g"
 	item_state = "ewelding-g"
 	contained_sprite = TRUE

code/modules/clothing/gloves/color.dm

@@ -213,7 +213,7 @@
 /obj/item/clothing/gloves/kala
 	name = "skrell gloves"
 	desc = "A sleek pair of gloves! They seem to be retaining moisture."
-	icon = 'icons/clothing/kit/skrell_armor.dmi'
+	icon = 'icons/obj/item/clothing/gloves/kala_gloves.dmi'
 	icon_state = "kala_gloves"
 	item_state = "kala_gloves"
 	contained_sprite = TRUE

code/modules/clothing/gloves/miscellaneous.dm

@@ -442,7 +442,7 @@
 /obj/item/clothing/gloves/single
 	name = "single glove"
 	desc = "A single glove. This one is for the right hand."
-	icon = 'icons/clothing/gloves/single.dmi'
+	icon = 'icons/obj/item/clothing/gloves/single.dmi'
 	contained_sprite = TRUE
 	icon_state = "single"
 	item_state = "single"
@@ -455,7 +455,7 @@
 /obj/item/clothing/gloves/multi_color
 	name = "multi-color gloves"
 	desc = "A pair of gloves, each is a different color."
-	icon = 'icons/clothing/gloves/multi_color.dmi'
+	icon = 'icons/obj/item/clothing/gloves/multi_color.dmi'
 	contained_sprite = TRUE
 	icon_state = "multi_color"
 	item_state = "multi_color"

code/modules/clothing/head/berets.dm

@@ -205,7 +205,7 @@
 /obj/item/clothing/head/beret/legion/tcaf
 	name = "\improper TCAF dress beret"
 	desc = "A blue dress beret bearing the flag of the Republic of Biesel. Often only seen worn by in-service members of the Tau Ceti Armed Forces."
-	icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
+	icon = 'icons/obj/item/clothing/head/tcaf_hats.dmi'
 	contained_sprite = TRUE
 	icon_state = "tcaf_dress_beret"
 	item_state = "tcaf_dress_beret"

code/modules/clothing/head/hardhat.dm

@@ -52,7 +52,7 @@
 	name = "atmospheric firefighter helmet"
 	desc = "An atmospheric firefighter's helmet, able to keep the user protected from heat and fire."
 	max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + 15000
-	icon = 'icons/clothing/kit/firefighter.dmi'
+	icon = 'icons/obj/item/clothing/head/firefighter.dmi'
 	sprite_sheets = list(
 		BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/fire.dmi'
 	)
@@ -92,7 +92,7 @@
 /obj/item/clothing/head/hardhat/firefighter
 	name = "firefighter helmet"
 	desc = "A complete, face covering helmet specially designed for firefighting. It is airtight and has a port for internals."
-	icon = 'icons/clothing/kit/firefighter.dmi'
+	icon = 'icons/obj/item/clothing/head/firefighter.dmi'
 	icon_state = "helmet_firefighter"
 	item_state = "helmet_firefighter"
 	sprite_sheets = list(

code/modules/clothing/head/helmet.dm

@@ -43,8 +43,8 @@
 		for(var/obj/item/thing in hold.contents)
 			var/icon_type = hold.helmet_storage_types[thing.type]
 			var/thing_state = icon_type == HELMET_GARB_PASS_ICON ? initial(thing.icon_state) : icon_type
-			I.AddOverlays(image('icons/clothing/kit/helmet_garb.dmi', null, "helmet_band"))
-			I.AddOverlays(image('icons/clothing/kit/helmet_garb.dmi', null, thing_state))
+			I.AddOverlays(image('icons/obj/item/clothing/accessory/armor/helmet_garb.dmi', null, "helmet_band"))
+			I.AddOverlays(image('icons/obj/item/clothing/accessory/armor/helmet_garb.dmi', null, thing_state))
 	return I
 
 /obj/item/clothing/head/helmet/attack_hand(mob/user)
@@ -105,7 +105,7 @@
 /obj/item/clothing/head/helmet/hos
 	name = "head of security helmet"
 	desc = "A special Internal Security Division helmet designed to protect the precious craniums of important installation security officers."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/head/modular_armor_helmets.dmi'
 	contained_sprite = TRUE
 	icon_state = "helm_sec_commander"
 	item_state = "helm_sec_commander"
@@ -140,7 +140,7 @@
 /obj/item/clothing/head/helmet/riot
 	name = "riot helmet"
 	desc = "It's a helmet specifically designed to protect against close range attacks."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/head/modular_armor_helmets.dmi'
 	contained_sprite = TRUE
 	icon_auto_adapt = TRUE
 	icon_supported_species_tags = list("una", "taj")
@@ -178,7 +178,7 @@
 /obj/item/clothing/head/helmet/ablative
 	name = "ablative helmet"
 	desc = "A helmet made from advanced materials which protects against concentrated energy weapons."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/head/modular_armor_helmets.dmi'
 	contained_sprite = TRUE
 	icon_state = "helm_ablative"
 	item_state = "helm_ablative"
@@ -193,7 +193,7 @@
 /obj/item/clothing/head/helmet/ballistic
 	name = "ballistic helmet"
 	desc = "A helmet with reinforced plating to protect against ballistic projectiles."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/head/modular_armor_helmets.dmi'
 	contained_sprite = TRUE
 	icon_state = "helm_ballistic"
 	item_state = "helm_ballistic"
@@ -208,7 +208,7 @@
 /obj/item/clothing/head/helmet/merc
 	name = "combat helmet"
 	desc = "A tan helmet made from advanced ceramic."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/head/modular_armor_helmets.dmi'
 	contained_sprite = TRUE
 	icon_state = "helm_heavy"
 	item_state = "helm_heavy"

code/modules/clothing/head/jobs.dm

@@ -102,7 +102,7 @@
 	flags_inv = BLOCKHEADHAIR
 
 /obj/item/clothing/head/surgery/generic
-	icon = 'icons/clothing/head/generic_surgeon_cap.dmi'
+	icon = 'icons/obj/item/clothing/head/generic_surgeon_cap.dmi'
 	icon_state = "surgcap_generic"
 	item_state = "surgcap_generic"
 

code/modules/clothing/head/misc.dm

@@ -286,7 +286,7 @@
 /obj/item/clothing/head/plain_hood
 	name = "plain hood"
 	desc = "A simple hood made of cloth, worn for myriad reasons - cultural, religious, protection from the elements, a fashion statement... or perhaps you simply want to look like you intend to give quests to adventurers who walk into your favorite tavern."
-	icon = 'icons/clothing/head/plain_hood.dmi'
+	icon = 'icons/obj/item/clothing/head/plain_hood.dmi'
 	icon_state = "plain_hood"
 	item_state = "plain_hood"
 	body_parts_covered = HEAD
@@ -345,7 +345,7 @@
 /obj/item/clothing/head/kippah
 	name = "kippah"
 	desc = "A head covering commonly worn by those of Jewish faith."
-	icon = 'icons/clothing/head/kippahs.dmi'
+	icon = 'icons/obj/item/clothing/head/kippahs.dmi'
 	icon_state = "kippah"
 	item_state = "kippah"
 	contained_sprite = 1
@@ -481,7 +481,7 @@
 /obj/item/clothing/head/sol
 	name = "sol navy utility cover"
 	desc = "A military cover issued to Solarian Navy personnel as part of their utility uniform."
-	icon = 'icons/clothing/under/uniforms/sol_uniform.dmi'
+	icon = 'icons/obj/item/clothing/head/sol_army.dmi'
 	icon_state = "navy_utility"
 	item_state = "navy_utility"
 	contained_sprite = TRUE
@@ -538,7 +538,7 @@
 /obj/item/clothing/head/helmet/sol
 	name = "sol combat helmet"
 	desc = "A woodland colored helmet made from advanced ceramic."
-	icon = 'icons/clothing/under/uniforms/sol_uniform.dmi'
+	icon = 'icons/obj/item/clothing/head/sol_army.dmi'
 	icon_state = "helmet_tac_sol"
 	item_state = "helmet_tac_sol"
 	armor = list(
@@ -609,7 +609,7 @@
 /obj/item/clothing/head/konyang/army
 	name = "konyang army field cap"
 	desc = "A cloth field cap issued to Konyang soldiers as part of their field uniform."
-	icon = 'icons/clothing/under/uniforms/konyang_uniforms.dmi'
+	icon = 'icons/obj/item/clothing/head/konyang.dmi'
 	icon_state = "konyang_army_cap"
 	item_state = "konyang_army_cap"
 	contained_sprite = TRUE
@@ -623,7 +623,7 @@
 /obj/item/clothing/head/konyang/navy
 	name = "konyang navy officer peaked cap"
 	desc = "A white peaked cap issued to officers of the Konyang Navy."
-	icon = 'icons/clothing/under/uniforms/konyang_uniforms.dmi'
+	icon = 'icons/obj/item/clothing/head/konyang.dmi'
 	icon_state = "konyang_navy_cap"
 	item_state = "konyang_navy_cap"
 	contained_sprite = TRUE
@@ -631,7 +631,7 @@
 /obj/item/clothing/head/konyang/space
 	name = "konyang aerospace forces officer peaked cap"
 	desc = "A white peaked cap issued to officers of the Konyang Aerospace Forces."
-	icon = 'icons/clothing/under/uniforms/konyang_uniforms.dmi'
+	icon = 'icons/obj/item/clothing/head/konyang.dmi'
 	icon_state = "konyang_space_cap"
 	item_state = "konyang_space_cap"
 	contained_sprite = TRUE
@@ -639,7 +639,7 @@
 /obj/item/clothing/head/konyang/police
 	name = "konyang national police hat"
 	desc = "A white peaked cap issued to personnel of the Konyang National Police"
-	icon = 'icons/clothing/under/uniforms/konyang_uniforms.dmi'
+	icon = 'icons/obj/item/clothing/head/konyang.dmi'
 	icon_state = "konyang_police_hat"
 	item_state = "konyang_police_hat"
 	contained_sprite = TRUE
@@ -653,7 +653,7 @@
 /obj/item/clothing/head/konyang/burger
 	name = "\improper UP! Burger cap"
 	desc = "An astoundingly bright orange hat, worn by employees of UP! Burger (or Burger UP!, depending on preference), a Gwok Group subsidiary."
-	icon = 'icons/clothing/under/uniforms/konyang_uniforms.dmi'
+	icon = 'icons/obj/item/clothing/head/konyang.dmi'
 	icon_state = "upburger-cap"
 	item_state = "upburger-cap"
 	contained_sprite = TRUE
@@ -661,7 +661,7 @@
 /obj/item/clothing/head/helmet/konyang
 	name = "konyang army helmet"
 	desc = "A woodland colored helmet made from advanced ceramic."
-	icon = 'icons/clothing/under/uniforms/konyang_uniforms.dmi'
+	icon = 'icons/obj/item/clothing/head/konyang.dmi'
 	icon_state = "helmet_konyang_army"
 	item_state = "helmet_konyang_army"
 	armor = list(
@@ -688,7 +688,7 @@
 /obj/item/clothing/head/xanu
 	name = "xanu armed forces garrison cap"
 	desc = "A garrison cap belonging to a member of the All-Xanu Spacefleet."
-	icon = 'icons/clothing/under/uniforms/xanu.dmi'
+	icon = 'icons/obj/item/clothing/head/xanu_army.dmi'
 	icon_state = "xanu_garrison_enlisted"
 	item_state = "xanu_garrison_enlisted"
 	contained_sprite = TRUE
@@ -708,7 +708,7 @@
 /obj/item/clothing/head/grupo_amapola
 	name = "Grupo Amapola officer cap"
 	desc = "A peaked officer's cap bearing the poppy of the military contracting group Grupo Amapola."
-	icon = 'icons/clothing/head/pmcg.dmi'
+	icon = 'icons/obj/item/clothing/head/pmcg.dmi'
 	icon_state = "amapola_officer_hat"
 	item_state = "amapola_officer_hat"
 	contained_sprite = TRUE

code/modules/clothing/head/pilot_helmet.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/head/helmet/pilot
 	name = "flight helmet"
 	desc = "A helmet with a toggleable pilot visor attached. The visor feeds its wearer in-flight information via an integrated heads-up display."
-	icon = 'icons/clothing/head/pilot_helmets.dmi'
+	icon = 'icons/obj/item/clothing/head/pilot_helmets.dmi'
 	icon_state = "pilot_helmet"
 	item_state = "pilot_helmet"
 	contained_sprite = TRUE

code/modules/clothing/pants/pants.dm

@@ -87,7 +87,7 @@ ABSTRACT_TYPE(/obj/item/clothing/pants)
 /obj/item/clothing/pants/highvis
 	name = "high visibility pants"
 	desc = "A pair of loose-fitting, high visibility pants to help the wearer be recognizable in high traffic areas with large industrial equipment."
-	icon = 'icons/clothing/kit/highvis.dmi'
+	icon = 'icons/obj/item/clothing/pants/highvis.dmi'
 	icon_state = "pants_highvis"
 	item_state = "pants_highvis"
 
@@ -101,7 +101,7 @@ ABSTRACT_TYPE(/obj/item/clothing/pants)
 /obj/item/clothing/pants/highvis_alt
 	name = "high visibility pants"
 	desc = "A pair of bright yellow pants with reflective stripes. For use in operations, engineering, and sometimes even law enforcement, in cold and poor weather or when visibility is low."
-	icon = 'icons/clothing/kit/highvis.dmi'
+	icon = 'icons/obj/item/clothing/pants/highvis.dmi'
 	icon_state = "pants_highvis_alt"
 	item_state = "pants_highvis_alt"
 
@@ -115,7 +115,7 @@ ABSTRACT_TYPE(/obj/item/clothing/pants)
 /obj/item/clothing/pants/highvis_red
 	name = "high visibility pants"
 	desc = "A pair of red pants with reflective stripes. For use in different departments, commonly found in civilian emergency services, in cold and poor weather or when visibility is low."
-	icon = 'icons/clothing/kit/highvis.dmi'
+	icon = 'icons/obj/item/clothing/pants/highvis.dmi'
 	icon_state = "pants_highvis_red"
 	item_state = "pants_highvis_red"
 
@@ -129,7 +129,7 @@ ABSTRACT_TYPE(/obj/item/clothing/pants)
 /obj/item/clothing/pants/highvis_orange
 	name = "high visibility pants"
 	desc = "A pair of orange pants with reflective stripes. For use in different departments, commonly found in civilian industrial services, in dark or secluded areas where visibility is critical for safety."
-	icon = 'icons/clothing/kit/highvis.dmi'
+	icon = 'icons/obj/item/clothing/pants/highvis.dmi'
 	icon_state = "pants_highvis_orange"
 	item_state = "pants_highvis_orange"
 

code/modules/clothing/sets/acting_captain.dm

@@ -1,26 +1,26 @@
 /obj/item/clothing/head/acapcap
 	name = "acting captain's cap"
 	desc = "A headdress that signifies the wearer as the acting captain."
-	icon = 'icons/clothing/kit/acting_captain.dmi'
-	icon_state = "acapcap"
-	item_state = "acapcap"
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
+	icon_state = "acaptain_cap"
+	item_state = "acaptain_cap"
 	contained_sprite = TRUE
 
 /obj/item/clothing/suit/acapjacket
 	name = "acting captain's jacket"
 	desc = "A comfortable jacket that signifies the wearer as the acting captain."
-	icon = 'icons/clothing/kit/acting_captain.dmi'
-	icon_state = "acapjacket"
-	item_state = "acapjacket"
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
+	icon_state = "acaptain_jacket"
+	item_state = "acaptain_jacket"
 	contained_sprite = TRUE
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 
 /obj/item/clothing/accessory/armband/acap
 	name = "acting captain's armband"
 	desc = "An armband worn by the acting captain, to look fancy, to wear less, or to be extra."
-	icon = 'icons/clothing/kit/acting_captain.dmi'
-	icon_state = "acaparm"
-	item_state = "acaparm"
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
+	icon_state = "acaptain_arm"
+	item_state = "acaptain_arm"
 	contained_sprite = TRUE
 
 /obj/item/storage/briefcase/nt/acap

code/modules/clothing/sets/captain.dm

@@ -17,9 +17,9 @@
 /obj/item/clothing/head/caphat/cap
 	name = "captain's cap"
 	desc = "You fear to wear it for the negligence it brings."
-	icon = 'icons/clothing/kit/captain.dmi'
-	icon_state = "cap"
-	item_state = "cap"
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
+	icon_state = "captain_cap"
+	item_state = "captain_cap"
 	item_state_slots = null
 	contained_sprite = TRUE
 
@@ -32,10 +32,10 @@
 /obj/item/clothing/under/rank/captain
 	name = "captain's jumpsuit"
 	desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"."
-	icon = 'icons/clothing/kit/captain.dmi'
-	icon_state = "uniform"
-	item_state = "uniform"
-	worn_state = "uniform"
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
+	icon_state = "captain_alt"
+	item_state = "captain_alt"
+	worn_state = "captain_alt"
 	contained_sprite = TRUE
 	var/is_open = FALSE
 
@@ -65,10 +65,10 @@
 /obj/item/clothing/under/dress/dress_cap
 	name = "captain's dress uniform"
 	desc = "Feminine fashion for the style concious captain."
-	icon = 'icons/clothing/kit/captain.dmi'
-	icon_state = "uniform_fem"
-	item_state = "uniform_fem"
-	worn_state = "uniform_fem"
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
+	icon_state = "captain_alt_skirt"
+	item_state = "captain_alt_skirt"
+	worn_state = "captain_alt_skirt"
 	contained_sprite = TRUE
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 	var/is_open = FALSE
@@ -99,9 +99,9 @@
 /obj/item/clothing/suit/captunic/capjacket
 	name = "captain's uniform jacket"
 	desc = "A less formal jacket for everyday captain use."
-	icon = 'icons/clothing/kit/captain.dmi'
-	icon_state = "jacket"
-	item_state = "jacket"
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
+	icon_state = "captain_alt_jacket"
+	item_state = "captain_alt_jacket"
 	contained_sprite = TRUE
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	flags_inv = 0
@@ -109,17 +109,17 @@
 /obj/item/clothing/gloves/captain
 	name = "captain's gloves"
 	desc = "Regal blue gloves, with a nice gold trim. Swanky."
-	icon = 'icons/clothing/kit/captain.dmi'
-	icon_state = "gloves"
-	item_state = "gloves"
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
+	icon_state = "captain_gloves"
+	item_state = "captain_gloves"
 	contained_sprite = TRUE
 
 /obj/item/clothing/shoes/captain
 	name = "captain's shoes"
 	desc = "Super comfortable blue shoes, capable of keeping you on your feet during any station-wide disaster."
-	icon = 'icons/clothing/kit/captain.dmi'
-	icon_state = "shoes"
-	item_state = "shoes"
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
+	icon_state = "captain_shoes"
+	item_state = "captain_shoes"
 	contained_sprite = TRUE
 
 /obj/item/storage/briefcase/nt/captain
@@ -140,38 +140,46 @@
 /obj/item/clothing/head/caphat/cap/beret
 	name = "captain's white beret"
 	desc = "A beret, worn to passively instill authority at the audacity of wearing a puffy hat."
-	icon = 'icons/clothing/kit/captain_white.dmi'
-	icon_state = "beret"
-	item_state = "beret"
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
+	icon_state = "captain_beret_white"
+	item_state = "captain_beret_white"
 
 /obj/item/clothing/head/caphat/cap/white
 	name = "captain's white cap"
 	desc = "No one in a commanding position should be without a perfect, white hat of ultimate authority."
-	icon = 'icons/clothing/kit/captain_white.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
+	icon_state = "captain_cap_white"
+	item_state = "captain_cap_white"
 
 /obj/item/clothing/under/rank/captain/white
 	name = "captain's white jumpsuit"
 	desc = "It's a white jumpsuit with some gold markings denoting the rank of \"Captain\"."
-	icon = 'icons/clothing/kit/captain_white.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
+	icon_state = "captain_white"
+	item_state = "captain_white"
 	is_open = -1
 
 /obj/item/clothing/gloves/captain/white
 	name = "captain's white gloves"
 	desc = "Shiny white gloves, with a nice gold trim. Swanky."
-	icon = 'icons/clothing/kit/captain_white.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
+	icon_state = "captain_gloves_white"
+	item_state = "captain_gloves_white"
 
 /obj/item/clothing/shoes/captain/white
 	name = "captain's white shoes"
 	desc = "Super comfortable white shoes, capable of keeping you on your feet during any station-wide disaster."
-	icon = 'icons/clothing/kit/captain_white.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
+	icon_state = "captain_shoes_white"
+	item_state = "captain_shoes_white"
 
 /obj/item/clothing/under/rank/captain/white_dress
 	name = "captain's white dress"
 	desc = "The white variant of feminine fashion for the style conscious captain."
-	icon = 'icons/clothing/kit/captain_white.dmi'
-	icon_state = "uniform_fem"
-	item_state = "uniform_fem"
-	worn_state = "uniform_fem"
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
+	icon_state = "captain_skirt_white"
+	item_state = "captain_skirt_white"
+	worn_state = "captain_skirt_white"
 	is_open = -1
 
 /obj/item/storage/briefcase/nt/captain_white
@@ -190,27 +198,27 @@
 /obj/item/clothing/under/captainformal
 	name = "captain's formal uniform"
 	desc = "A captain's formal-wear, for special occasions."
-	icon = 'icons/clothing/kit/captain_formal.dmi'
-	icon_state = "uniform"
-	item_state = "uniform"
-	worn_state = "uniform"
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
+	icon_state = "captain_formal"
+	item_state = "captain_formal"
+	worn_state = "captain_formal"
 	contained_sprite = TRUE
 
 /obj/item/clothing/suit/captunic
 	name = "captain's parade jacket"
 	desc = "Worn by a Captain to show their class."
-	icon = 'icons/clothing/kit/captain_formal.dmi'
-	icon_state = "jacket"
-	item_state = "jacket"
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
+	icon_state = "captain_formal_jacket"
+	item_state = "captain_formal_jacket"
 	contained_sprite = TRUE
 	body_parts_covered = UPPER_TORSO|ARMS
 
 /obj/item/clothing/shoes/captain/formal
 	name = "captain's formal boots"
 	desc = "Polished boots made of strong synthleather, capable of kicking through a wall without a scratch."
-	icon = 'icons/clothing/kit/captain_formal.dmi'
-	icon_state = "boots"
-	item_state = "boots"
+	icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
+	icon_state = "captain_formal_boots"
+	item_state = "captain_formal_boots"
 	contained_sprite = TRUE
 
 /obj/item/storage/briefcase/nt/captain_formal

code/modules/clothing/sets/infiltrator.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/mask/breath/infiltrator
 	name = "infiltration balaclava"
 	desc = "A close-fitting airtight balaclava that can be connected to an air supply."
-	icon = 'icons/clothing/kit/infiltrator.dmi'
+	icon = 'icons/obj/item/clothing/mask/breath/infiltrator.dmi'
 	icon_state = "mask"
 	item_state = "mask"
 	icon_auto_adapt = TRUE
@@ -17,7 +17,7 @@
 /obj/item/clothing/under/infiltrator
 	name = "infiltration suit"
 	desc = "A tight undersuit with thin pieces of armor bolted to it. It's airtight."
-	icon = 'icons/clothing/kit/infiltrator.dmi'
+	icon = 'icons/obj/item/clothing/under/infiltrator.dmi'
 	icon_state = "uniform"
 	item_state = "uniform"
 	contained_sprite = TRUE
@@ -33,7 +33,7 @@
 /obj/item/clothing/gloves/infiltrator
 	name = "infiltration gloves"
 	desc = "Tight insulated gloves with interwoven self-cleaning material. It's airtight."
-	icon = 'icons/clothing/kit/infiltrator.dmi'
+	icon = 'icons/obj/item/clothing/gloves/infiltrator.dmi'
 	icon_state = "gloves"
 	item_state = "gloves"
 	contained_sprite = TRUE
@@ -49,9 +49,9 @@
 /obj/item/clothing/shoes/infiltrator
 	name = "infiltration shoes"
 	desc = "Tight shoes with in-built Silent-Soles. It's airtight."
-	icon = 'icons/clothing/kit/infiltrator.dmi'
-	icon_state = "shoes"
-	item_state = "shoes"
+	icon = 'icons/obj/item/clothing/shoes/miscellaneous.dmi'
+	icon_state = "infiltrator_shoes"
+	item_state = "infiltrator_shoes"
 	contained_sprite = TRUE
 	silent = TRUE
 	item_flags = ITEM_FLAG_THICK_MATERIAL | ITEM_FLAG_INJECTION_PORT | ITEM_FLAG_AIRTIGHT
@@ -62,9 +62,8 @@
 /obj/item/storage/toolbox/infiltration
 	name = "infiltration case"
 	desc = "A case with an ominous red \"S\" painted on it. It seems pretty hefty."
-	icon = 'icons/clothing/kit/infiltrator.dmi'
-	icon_state = "case"
-	item_state = "case"
+	icon_state = "syndiecase"
+	item_state = "syndiecase"
 	contained_sprite = TRUE
 	item_icons = null
 	starts_with = list(

code/modules/clothing/sets/laser_tag.dm

@@ -5,7 +5,7 @@
 	name = "laser tag armor"
 	desc = "A set of laser tag armor. Very swanky."
 	desc_info = "You can alt-click this while holding or wearing it to set how many laser tag shots you want to be able to take before going down."
-	icon = 'icons/clothing/kit/laser_tag.dmi'
+	icon = 'icons/obj/item/clothing/suit/armor/laser_tag.dmi'
 	icon_state = "vest"
 	item_state = "vest"
 	contained_sprite = TRUE
@@ -69,7 +69,7 @@
 /obj/item/clothing/head/helmet/riot/laser_tag
 	name = "laser tag helmet"
 	desc = "A helmet in the form of a riot helm, made for high-impact laser tag gameplay."
-	icon = 'icons/clothing/kit/laser_tag.dmi'
+	icon = 'icons/obj/item/clothing/head/laser_tag.dmi'
 	icon_state = "helmet"
 	item_state = "helmet"
 	contained_sprite = TRUE

code/modules/clothing/shoes/boots.dm

@@ -201,7 +201,7 @@
 /obj/item/clothing/shoes/jackboots/kala
 	name = "skrell boots"
 	desc = "A sleek pair of boots. They seem to be retaining moisture."
-	icon = 'icons/clothing/kit/skrell_armor.dmi'
+	icon = 'icons/obj/item/clothing/shoes/miscellaneous.dmi'
 	icon_state = "kala_boots"
 	item_state = "kala_boots"
 	contained_sprite = TRUE

code/modules/clothing/spacesuits/rig/suits/alien.dm

@@ -2,7 +2,7 @@
 	name = "NT breacher chassis control module"
 	desc = "A cheap NT knock-off of an Unathi battle-hardsuit. Looks like a fish, moves like a fish, steers like a cow."
 	suit_type = "NT breacher"
-	icon = 'icons/clothing/rig/unathi_breacher_cheap.dmi'
+	icon = 'icons/obj/item/clothing/rig/unathi_breacher_cheap.dmi'
 	icon_state = "breacher_rig_cheap"
 	armor = list(
 		MELEE = ARMOR_MELEE_MAJOR,
@@ -30,7 +30,7 @@
 	name = "breacher chassis control module"
 	desc = "An authentic Unathi breacher chassis. Huge, bulky and absurdly heavy. It must be like wearing a tank."
 	suit_type = "breacher chassis"
-	icon = 'icons/clothing/rig/unathi_breacher.dmi'
+	icon = 'icons/obj/item/clothing/rig/unathi_breacher.dmi'
 	icon_state = "breacher_rig"
 	armor = list(
 		MELEE = ARMOR_MELEE_VERY_HIGH,
@@ -77,7 +77,7 @@
 	name = "redsnout hardsuit control module"
 	desc = "A variation on the Unathi breacher chassis design, fielded by the elite unit of the Tau Ceti Armed Forces known as the Redsnouts."
 	suit_type = "redsnout hardsuit"
-	icon = 'icons/clothing/rig/redsnout.dmi'
+	icon = 'icons/obj/item/clothing/rig/redsnout.dmi'
 	icon_state = "redsnout_rig"
 	armor = list(
 		MELEE = ARMOR_MELEE_VERY_HIGH,
@@ -113,7 +113,7 @@
 	name = "combat exoskeleton control module"
 	desc = "An ancient piece of equipment from a bygone age, This highly advanced Vaurcan technology rarely sees use outside of a battlefield."
 	suit_type = "combat exoskeleton"
-	icon = 'icons/clothing/rig/vaurca.dmi'
+	icon = 'icons/obj/item/clothing/rig/vaurca.dmi'
 	icon_state = "vaurca_rig"
 	armor = list(
 		MELEE = ARMOR_MELEE_MAJOR,
@@ -176,7 +176,7 @@
 	severe loss of Republican Guard units. Additional funding and focus was placed on a previously shelved proposal for heavily armed shock and high technology assault troopers. A \
 	special unit designated to withstand the numerical disadvantages and prolonged engagements special forces of the Republic often faces."
 	suit_type = "tesla suit"
-	icon = 'icons/clothing/rig/tesla.dmi'
+	icon = 'icons/obj/item/clothing/rig/tesla.dmi'
 	icon_state = "tesla_rig"
 	armor = list(
 		MELEE = ARMOR_MELEE_VERY_HIGH,

code/modules/clothing/spacesuits/rig/suits/combat.dm

@@ -1,7 +1,7 @@
 /obj/item/rig/combat
 	name = "combat hardsuit control module"
 	desc = "A sleek and dangerous hardsuit for active combat. This one is a Stellar Corporate Conglomerate design in color scheme and make."
-	icon = 'icons/clothing/rig/combat.dmi'
+	icon = 'icons/obj/item/clothing/rig/combat.dmi'
 	icon_state = "combat_rig"
 	icon_supported_species_tags = list("skr")
 	suit_type = "combat hardsuit"
@@ -44,7 +44,7 @@
 /obj/item/rig/military
 	name = "vampire hardsuit control module"
 	desc = "A Zavodskoi-manufactured hardsuit designed for the Solarian Armed Forces, the Type-9 \"Vampire\" is the suit issued to Alliance military specialists and team leaders."
-	icon = 'icons/clothing/rig/military.dmi'
+	icon = 'icons/obj/item/clothing/rig/military.dmi'
 	icon_state = "military_rig"
 	suit_type = "military hardsuit"
 	armor = list(
@@ -116,7 +116,7 @@
 /obj/item/rig/military/commando
 	name = "nosferatu hardsuit control module"
 	desc = "A Zavodskoi-manufactured hardsuit specially designed for the elite units of the Solarian SOCOM. A feared sight to behold, the most well-known usage of the Type-9A \"Nosferatu\" suits is by the forces of the Alliance's MARSOC operatives."
-	icon = 'icons/clothing/rig/sol_marsoc.dmi'
+	icon = 'icons/obj/item/clothing/rig/sol_marsoc.dmi'
 	armor = list(
 		MELEE = ARMOR_MELEE_SHIELDED,
 		BULLET = ARMOR_BALLISTIC_RIFLE,
@@ -150,7 +150,7 @@
 /obj/item/rig/retro
 	name = "retrofitted military hardsuit control module"
 	desc = "An old repurposed construction exoskeleton redesigned for combat. Its colors and insignias match those of the Tau Ceti Armed Forces."
-	icon = 'icons/clothing/rig/legion.dmi'
+	icon = 'icons/obj/item/clothing/rig/legion.dmi'
 	icon_state = "legion_rig"
 	icon_supported_species_tags = list("ipc", "skr", "taj", "una", "vau", "vaw")
 	suit_type = "retrofitted military hardsuit"
@@ -205,7 +205,7 @@
 /obj/item/rig/gunslinger
 	name = "gunslinger hardsuit control module"
 	desc = "A favorite of the Frontier Rangers, the Gunslinger suit is a Xanan-designed hardsuit meant to provide the user absolute situational awareness, while remaining sturdy under fire."
-	icon = 'icons/clothing/rig/gunslinger.dmi'
+	icon = 'icons/obj/item/clothing/rig/gunslinger.dmi'
 	icon_state = "gunslinger"
 	suit_type = "gunslinger hardsuit"
 	icon_supported_species_tags = list("ipc", "skr", "taj")
@@ -258,7 +258,7 @@
 /obj/item/rig/strike
 	name = "strike hardsuit control module"
 	desc = "An expensive hardsuit utilized by Eridani security contractors to field heavy weapons and coordinate non-lethal takedowns directly. Usually seen spearheading police raids."
-	icon = 'icons/clothing/rig/strikesuit.dmi'
+	icon = 'icons/obj/item/clothing/rig/strikesuit.dmi'
 	icon_state = "strikesuit"
 	suit_type = "strike hardsuit"
 	armor = list(
@@ -326,7 +326,7 @@
 /obj/item/rig/elyran
 	name = "elyran battlesuit control module"
 	desc = "An advanced Elyran hardsuit specialized in scorched earth tactics."
-	icon = 'icons/clothing/rig/elyran_battlesuit.dmi'
+	icon = 'icons/obj/item/clothing/rig/elyran_battlesuit.dmi'
 	icon_state = "elyran_rig"
 	suit_type = "elyran battlesuit"
 	armor = list(
@@ -377,7 +377,7 @@
 /obj/item/rig/bunker
 	name = "bunker suit control module"
 	desc = "A powerful niche-function hardsuit utilized by Ceres' Lance to apprehend synthetics. Unstoppable in the right circumstances, and nothing more than a burden anywhere else."
-	icon = 'icons/clothing/rig/bunker.dmi'
+	icon = 'icons/obj/item/clothing/rig/bunker.dmi'
 	icon_state = "bunker"
 	suit_type = "bunker suit"
 	armor = list(
@@ -415,7 +415,7 @@
 /obj/item/rig/jinxiang
 	name = "jinxiang-pattern combat suit control module"
 	desc = "An off-shoot of the core Bunker Suit design, utilized by the Imperial Dominian military and painted accordingly. This is a powerful suit specializing in melee confrontations."
-	icon = 'icons/clothing/rig/dominia.dmi'
+	icon = 'icons/obj/item/clothing/rig/dominia.dmi'
 	icon_state = "dominia"
 	icon_supported_species_tags = list("una")
 	suit_type = "jinxiang combat suit"
@@ -463,7 +463,7 @@
 	name = "\improper NanoTrasen military-grade hardsuit control module"
 	desc = "A sleek and dangerous hardsuit, used by NanoTrasen's navy and emergency response teams."
 	suit_type = "\improper NanoTrasen military-grade hardsuit"
-	icon = 'icons/clothing/rig/nt_ert/commander.dmi'
+	icon = 'icons/obj/item/clothing/rig/nt_ert/commander.dmi'
 	icon_state = "ert_commander_rig"
 	icon_supported_species_tags = list("skr")
 	species_restricted = list(BODYTYPE_SKRELL, BODYTYPE_HUMAN)
@@ -493,7 +493,7 @@
 	name = "\improper Nexus RTRT hardsuit control module"
 	desc = "A variant of NanoTrasen's military-grade hardsuit, designed for usage by Nexus Corporate Security's rapid trauma response teams."
 	suit_type = "\improper Nexus RTRT hardsuit"
-	icon = 'icons/clothing/rig/nt_ert/medical.dmi'
+	icon = 'icons/obj/item/clothing/rig/nt_ert/medical.dmi'
 	icon_state = "ert_medical_rig"
 
 	helm_type = /obj/item/clothing/head/helmet/space/rig/nanotrasen/nexus
@@ -505,7 +505,7 @@
 	name = "\improper NanoTrasen corporate auxiliary hardsuit control module"
 	desc = "A variant of NanoTrasen's military-grade hardsuit, designed for usage by NanoTrasen's contributions to the Republic of Biesel's corporate auxiliary forces."
 	suit_type = "\improper NanoTrasen corporate auxiliary hardsuit"
-	icon = 'icons/clothing/rig/nt_ert/corporate_auxiliary.dmi'
+	icon = 'icons/obj/item/clothing/rig/nt_ert/corporate_auxiliary.dmi'
 	icon_state = "corporate_auxiliary_rig"
 
 	helm_type = /obj/item/clothing/head/helmet/space/rig/nanotrasen/corporate_auxiliary
@@ -520,7 +520,7 @@
 	desc_extended = "This hardsuit is brimming with modules and material. Manufactured initially by NanoTrasen, and later modified by Zavodskoi, \
 	the Legionnaire hardsuit comes in many shapes and sizes to accommodate its missions. Seeing both action in orbit and on the ground. \
 	The blue armored plates are layered with brown ballistic padding, and finally a tightly woven black armored liner to keep out any hazardous environment, from air to space."
-	icon = 'icons/clothing/rig/tcaf_legionnaire.dmi'
+	icon = 'icons/obj/item/clothing/rig/tcaf_legionnaire.dmi'
 	icon_state = "legionnaire_rig"
 	icon_supported_species_tags = null
 	suit_type = "\improper Legionnaire Hardsuit"

code/modules/clothing/spacesuits/rig/suits/ert.dm

@@ -6,7 +6,7 @@
 	name = "ERT-C hardsuit control module"
 	desc = "A suit worn by the commander of an Emergency Response Team. Has blue highlights."
 	suit_type = "ERT commander"
-	icon = 'icons/clothing/rig/nt_ert/commander.dmi'
+	icon = 'icons/obj/item/clothing/rig/nt_ert/commander.dmi'
 	icon_state = "ert_commander_rig"
 	icon_supported_species_tags = list("skr")
 	emp_protection = 35
@@ -43,7 +43,7 @@
 	name = "ERT-E suit control module"
 	desc = "A suit worn by the engineering division of an Emergency Response Team. Has orange highlights. Less armored than the security variant, but offers full radiation protection."
 	suit_type = "ERT engineer"
-	icon = 'icons/clothing/rig/nt_ert/engineer.dmi'
+	icon = 'icons/obj/item/clothing/rig/nt_ert/engineer.dmi'
 	icon_state = "ert_engineer_rig"
 	emp_protection = 30
 	armor = list(
@@ -71,7 +71,7 @@
 	name = "ERT-M suit control module"
 	desc = "A suit worn by the medical division of an Emergency Response Team. Has white highlights. Less armored than the security variant, but offers full radiation protection."
 	suit_type = "ERT medic"
-	icon = 'icons/clothing/rig/nt_ert/medical.dmi'
+	icon = 'icons/obj/item/clothing/rig/nt_ert/medical.dmi'
 	icon_state = "ert_medical_rig"
 	emp_protection = 30
 	armor = list(
@@ -99,7 +99,7 @@
 	name = "ERT-S suit control module"
 	desc = "A suit worn by the security division of an Emergency Response Team. Has red highlights. Trades full radiation protection for a slightly better armor."
 	suit_type = "ERT security"
-	icon = 'icons/clothing/rig/nt_ert/security.dmi'
+	icon = 'icons/obj/item/clothing/rig/nt_ert/security.dmi'
 	icon_state = "ert_security_rig"
 	emp_protection = 30
 	armor = list(
@@ -126,7 +126,7 @@
 	name = "\improper SCC ERT-C hardsuit control module"
 	desc = "A suit worn by the commander of an Emergency Response Team sent to crisis situations by the Stellar Corporate Conglomerate. This one features SCC colouring."
 	suit_type = "SCC ERT commander"
-	icon = 'icons/clothing/rig/scc_ert/commander.dmi'
+	icon = 'icons/obj/item/clothing/rig/scc_ert/commander.dmi'
 	icon_state = "scc_rig"
 	icon_supported_species_tags = null
 	species_restricted = list(BODYTYPE_HUMAN)
@@ -154,7 +154,7 @@
 	name = "\improper SCC ERT-E hardsuit control module"
 	desc = "A suit worn by the engineer of an Emergency Response Team sent to crisis situations by the Stellar Corporate Conglomerate. This one features SCC colouring."
 	suit_type = "SCC ERT engineer"
-	icon = 'icons/clothing/rig/scc_ert/engineer.dmi'
+	icon = 'icons/obj/item/clothing/rig/scc_ert/engineer.dmi'
 	icon_state = "scc_rig"
 
 	allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_UTILITY
@@ -163,7 +163,7 @@
 	name = "\improper SCC ERT-M hardsuit control module"
 	desc = "A suit worn by the medical specialist of an Emergency Response Team sent to crisis situations by the Stellar Corporate Conglomerate. This one features SCC colouring."
 	suit_type = "SCC ERT medic"
-	icon = 'icons/clothing/rig/scc_ert/medic.dmi'
+	icon = 'icons/obj/item/clothing/rig/scc_ert/medic.dmi'
 	icon_state = "scc_rig"
 
 	allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL
@@ -172,7 +172,7 @@
 	name = "\improper SCC ERT-S hardsuit control module"
 	desc = "A suit worn by the security specialist of an Emergency Response Team sent to crisis situations by the Stellar Corporate Conglomerate. This one features SCC colouring."
 	suit_type = "SCC ERT security"
-	icon = 'icons/clothing/rig/scc_ert/security.dmi'
+	icon = 'icons/obj/item/clothing/rig/scc_ert/security.dmi'
 	icon_state = "scc_rig"
 
 	allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL
@@ -181,7 +181,7 @@
 	name = "apotheosis suit control module"
 	desc = "A heavy suit with Einstein Engines branding coating it, not to mention the obvious colors."
 	suit_type = "apotheosis"
-	icon = 'icons/clothing/rig/apotheosis.dmi'
+	icon = 'icons/obj/item/clothing/rig/apotheosis.dmi'
 	icon_state = "apotheosis"
 	armor = list(
 		MELEE = ARMOR_MELEE_MAJOR,
@@ -208,7 +208,7 @@
 	name = "\improper heavy asset protection suit control module"
 	desc = "A heavy suit worn by the highest level of Asset Protection, don't mess with the person wearing this. Armored and space ready."
 	suit_type = "heavy asset protection"
-	icon = 'icons/clothing/rig/asset_protection.dmi'
+	icon = 'icons/obj/item/clothing/rig/asset_protection.dmi'
 	icon_state = "asset_protection_rig"
 	icon_supported_species_tags = null
 	armor = list(
@@ -249,7 +249,7 @@
 	name = "\improper heavy asset protection suit control module"
 	desc = "A heavy suit worn by the highest level of Asset Protection, don't mess with the person wearing this. Armored and space ready."
 	suit_type = "heavy asset protection"
-	icon = 'icons/clothing/rig/nt_asset_protection.dmi'
+	icon = 'icons/obj/item/clothing/rig/nt_asset_protection.dmi'
 	icon_state = "asset_protection_rig"
 	icon_supported_species_tags = null
 	armor = list(
@@ -284,5 +284,5 @@
 	allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA // all modules
 
 /obj/item/rig/ert/ntassetprotection/lead
-	icon = 'icons/clothing/rig/nt_asset_protection_commander.dmi'
+	icon = 'icons/obj/item/clothing/rig/nt_asset_protection_commander.dmi'
 	icon_state = "c_asset_protection_rig"

code/modules/clothing/spacesuits/rig/suits/light.dm

@@ -2,7 +2,7 @@
 /obj/item/rig/light
 	name = "light suit control module"
 	desc = "A lighter, less armored hardsuit."
-	icon = 'icons/clothing/rig/light_ninja.dmi'
+	icon = 'icons/obj/item/clothing/rig/light_ninja.dmi'
 	icon_state = "ninja_rig"
 	icon_supported_species_tags = list("ipc", "skr", "taj", "una")
 	suit_type = "light suit"
@@ -46,7 +46,7 @@
 	name = "cybersuit control module"
 	suit_type = "cyber"
 	desc = "An advanced powered armor suit with many cyberwarfare enhancements. Comes with built-in insulated gloves for safely tampering with electronics."
-	icon = 'icons/clothing/rig/light_hacker.dmi'
+	icon = 'icons/obj/item/clothing/rig/light_hacker.dmi'
 	icon_state = "hacker_rig"
 
 	req_access = list(ACCESS_SYNDICATE)
@@ -105,7 +105,7 @@
 	name = "stealth suit control module"
 	suit_type = "stealth suit"
 	desc = "A unique, vacuum-proof suit of nano-enhanced armor designed specifically for stealth operations."
-	icon = 'icons/clothing/rig/light_ninja.dmi'
+	icon = 'icons/obj/item/clothing/rig/light_ninja.dmi'
 	icon_state = "ninja_rig"
 	icon_supported_species_tags = list("ipc", "skr", "taj", "una", "vau", "vaw")
 	armor = list(
@@ -180,7 +180,7 @@
 	name = "stealth suit control module"
 	suit_type = "stealth"
 	desc = "A highly advanced and expensive suit designed for covert operations."
-	icon = 'icons/clothing/rig/light_stealth.dmi'
+	icon = 'icons/obj/item/clothing/rig/light_stealth.dmi'
 	icon_state = "stealth_rig"
 	icon_supported_species_tags = list("ipc", "skr", "taj", "una")
 	armor = list(
@@ -206,7 +206,7 @@
 	name = "exo-stellar skeleton module"
 	suit_type = "exo-stellar skeleton"
 	desc = "A compact exoskeleton that hugs the body tightly and has various inbuilt utilities for life support."
-	icon = 'icons/clothing/rig/offworlder.dmi'
+	icon = 'icons/obj/item/clothing/rig/offworlder.dmi'
 	icon_state = "offworlder_rig"
 	icon_supported_species_tags = null
 	allowed = list(/obj/item/tank, /obj/item/device/flashlight)
@@ -244,7 +244,7 @@
 /obj/item/rig/light/offworlder/frontier
 	name = "advanced mobility hardsuit control module"
 	desc = "Patterned off of the standard Exo-Stellar Skeleton, this sophisticated and light hardsuit is a staple of many armed forces throughout the Frontier. The mobility it grants compared to bulkier suits, while still packing the potential for a versatile toolset, has made it especially popular in the often cramped environments of ships and stations."
-	icon = 'icons/clothing/rig/frontier.dmi'
+	icon = 'icons/obj/item/clothing/rig/frontier.dmi'
 	icon_state = "frontier_rig"
 	suit_type = "advanced mobility hardsuit"
 	armor = list(

code/modules/clothing/spacesuits/rig/suits/merc.dm

@@ -6,7 +6,7 @@
 /obj/item/rig/merc
 	name = "crimson hardsuit control module"
 	desc = "A blood-red hardsuit featuring some fairly illegal technology."
-	icon = 'icons/clothing/rig/merc_crimson.dmi'
+	icon = 'icons/obj/item/clothing/rig/merc_crimson.dmi'
 	icon_state = "merc_rig"
 	icon_supported_species_tags = list("ipc", "skr", "taj", "una")
 	suit_type = "crimson hardsuit"
@@ -72,7 +72,7 @@
 /obj/item/rig/merc/distress
 	name = "rhino hardsuit control module"
 	desc = "A combat hardsuit utilized by many private military companies, packing some seriously heavy plating."
-	icon = 'icons/clothing/rig/rhino.dmi'
+	icon = 'icons/obj/item/clothing/rig/rhino.dmi'
 	icon_state = "rhino"
 	suit_type = "rhino hardsuit"
 	armor = list(
@@ -121,7 +121,7 @@
 	name = "paragon suit control module"
 	desc = "A back mounted control mechanism of an Einstein Engines hardsuit. This model is issued to the leaders of security teams within the corporation."
 	suit_type = "paragon"
-	icon = 'icons/clothing/rig/einstein_merc.dmi'
+	icon = 'icons/obj/item/clothing/rig/einstein_merc.dmi'
 	icon_state = "paragon"
 	icon_supported_species_tags = null
 	allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY

code/modules/clothing/spacesuits/rig/suits/skrell.dm

@@ -5,7 +5,7 @@
 /obj/item/rig/skrell
 	name = "qukala assault hardsuit control module"
 	desc = "A Nralakk-manufactured combat hardsuit, designed for use by elite operatives of the Qukala. Due to their expense and classified design, these suits are rarely seen outside of Qukala hands."
-	icon = 'icons/clothing/rig/nralakk.dmi'
+	icon = 'icons/obj/item/clothing/rig/nralakk.dmi'
 	icon_state = "nralakk_rig"
 	armor = list(
 		MELEE = ARMOR_MELEE_MAJOR,
@@ -55,7 +55,7 @@
 /obj/item/rig/skrell/tup
 	name = "tupkala infiltration suit control module"
 	desc = "An old yet reliable suit control module, designed by the Nralakk Federation for clandestine operations. The best of the best, albeit outdated now."
-	icon = 'icons/clothing/rig/tup.dmi'
+	icon = 'icons/obj/item/clothing/rig/tup.dmi'
 	icon_state = "tup_rig"
 	suit_type = "tup suit"
 	emp_protection = 95

code/modules/clothing/spacesuits/rig/suits/station.dm

@@ -32,7 +32,7 @@
 	name = "augmented tie"
 	suit_type = "augmented suit"
 	desc = "Prepare for paperwork."
-	icon = 'icons/clothing/rig/tie.dmi'
+	icon = 'icons/obj/item/clothing/rig/tie.dmi'
 	icon_state = "internalaffairs_rig"
 	icon_supported_species_tags = null
 	armor = null
@@ -72,7 +72,7 @@
 	name = "industrial suit control module"
 	suit_type = "industrial hardsuit"
 	desc = "A heavy, powerful hardsuit used by construction crews and mining corporations."
-	icon = 'icons/clothing/rig/industrial.dmi'
+	icon = 'icons/obj/item/clothing/rig/industrial.dmi'
 	icon_state = "industrial_rig"
 	icon_supported_species_tags = list("ipc", "skr", "taj", "una")
 	armor = list(
@@ -126,7 +126,7 @@
 	desc_extended = "A little too clunky, a little too slow; the Type-86 \"Cicada\" industrial hardsuit was released about a decade too late to be competitive. \
 	Still, it enjoys modest popularity among those dissatisfied with the limits of the Type-76 'Fish Fur', such as Guard sappers or asteroid miners."
 	icon_supported_species_tags = list("taj")
-	icon = 'icons/clothing/rig/himeo_industrial.dmi'
+	icon = 'icons/obj/item/clothing/rig/himeo_industrial.dmi'
 	icon_state = "himeo_rig"
 	species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC, BODYTYPE_TAJARA)
 
@@ -146,7 +146,7 @@
 	name = "EVA suit control module"
 	suit_type = "EVA hardsuit"
 	desc = "A light hardsuit for repairs and maintenance to the outside of habitats and vessels."
-	icon = 'icons/clothing/rig/eva.dmi'
+	icon = 'icons/obj/item/clothing/rig/eva.dmi'
 	icon_state = "eva_rig"
 	icon_supported_species_tags = list("ipc", "skr", "taj", "una")
 	armor = list(
@@ -196,7 +196,7 @@
 	name = "pilot suit control module"
 	suit_type = "Pilot hardsuit"
 	desc = "A light hardsuit issued to SCC pilots, known as the wyvern hardsuit. It features light armor designed to protect the wearer from flak and shrapnel."
-	icon = 'icons/clothing/rig/pilotsuit.dmi'
+	icon = 'icons/obj/item/clothing/rig/pilotsuit.dmi'
 	icon_state = "pilot_rig"
 	icon_supported_species_tags = list("ipc", "skr", "taj", "una")
 	armor = list(
@@ -222,7 +222,7 @@
 	name = "advanced voidsuit control module"
 	suit_type = "advanced voidsuit"
 	desc = "An advanced voidsuit that protects against hazardous, low pressure environments. Shines with a high polish."
-	icon = 'icons/clothing/rig/ce.dmi'
+	icon = 'icons/obj/item/clothing/rig/ce.dmi'
 	icon_state = "ce_rig"
 	icon_supported_species_tags = list("ipc", "skr", "taj", "una")
 	armor = list(
@@ -272,7 +272,7 @@
 	name = "AMI control module"
 	suit_type = "hazmat hardsuit"
 	desc = "An Anomalous Material Interaction hardsuit that protects against the strangest energies the universe can throw at it."
-	icon = 'icons/clothing/rig/hazmat.dmi'
+	icon = 'icons/obj/item/clothing/rig/hazmat.dmi'
 	icon_state = "hazmat_rig"
 	icon_supported_species_tags = list("ipc", "skr", "taj", "una")
 	armor = list(
@@ -312,7 +312,7 @@
 	name = "rescue suit control module"
 	suit_type = "rescue hardsuit"
 	desc = "A durable suit designed for medical rescue in high risk areas."
-	icon = 'icons/clothing/rig/medical.dmi'
+	icon = 'icons/obj/item/clothing/rig/medical.dmi'
 	icon_state = "medical_rig"
 	icon_supported_species_tags = list("ipc", "skr", "taj", "una")
 	armor = list(
@@ -355,7 +355,7 @@
 	name = "hazard hardsuit control module"
 	suit_type = "hazard hardsuit"
 	desc = "A security hardsuit designed for prolonged EVA in dangerous environments."
-	icon = 'icons/clothing/rig/hazard.dmi'
+	icon = 'icons/obj/item/clothing/rig/hazard.dmi'
 	icon_state = "hazard_rig"
 	icon_supported_species_tags = list("ipc", "skr", "taj", "una")
 	armor = list(
@@ -401,7 +401,7 @@
 	name = "diving suit control module"
 	suit_type = "diving suit"
 	desc = "A heavy hardsuit designated for operations under the water, you are not sure what it is doing here however."
-	icon = 'icons/clothing/rig/diving.dmi'
+	icon = 'icons/obj/item/clothing/rig/diving.dmi'
 	icon_state = "diving_rig"
 	armor = list(
 		MELEE = ARMOR_MELEE_RESISTANT,

code/modules/clothing/spacesuits/rig/suits/terminator.dm

@@ -2,7 +2,7 @@
 	name = "\improper Purpose combat layer"
 	desc = "An unknown, sleek mechanical construction that doesn't conform to any technology, culture, or even creature you know. \
 			It seems largely impervious to any wear and tear."
-	icon = 'icons/clothing/rig/hunter_killer.dmi'
+	icon = 'icons/obj/item/clothing/rig/hunter_killer.dmi'
 	icon_state = "hunterkiller_rig"
 	suit_type = "synthetic exoskeleton"
 	armor = list(

code/modules/clothing/spacesuits/rig/suits/xanu.dm

@@ -4,7 +4,7 @@
 	desc_extended = "The dNAXS-52 combat hardsuit is designed for the All-Xanu Spacefleet's interstellar infantry. It is specially designed for boarding operations, close quarters combat, and demolitions."
 	suit_type = "dNAXS-52 combat hardsuit"
 	icon_supported_species_tags = null
-	icon = 'icons/clothing/rig/xanu/xanu_rig.dmi'
+	icon = 'icons/obj/item/clothing/rig/xanu/xanu_rig.dmi'
 	icon_state = "xanu_rig"
 	helm_type = /obj/item/clothing/head/helmet/space/rig/combat/xanu
 
@@ -59,7 +59,7 @@
 	suit_type = "dNAXS-26 null hardsuit"
 	desc = "A very lightweight suit designed to allow use inside mechs and starfighters, designed specially for the Xanan spacefleet. It feels like you're wearing nothing at all."
 	desc_extended = "The dNAXS-26 'null' hardsuit was designed by d.N.A Defense at the request of the All-Xanu Spacefleet, for its spaceborne mech and starfighter pilots. Designed with comfort and mobility in mind, this suit allows pilots their full range of motion, while protecting them from minor radiation hazards and the vacuum of space."
-	icon = 'icons/clothing/rig/xanu/xanu_zero_suit.dmi'
+	icon = 'icons/obj/item/clothing/rig/xanu/xanu_zero_suit.dmi'
 	icon_state = "xanu_zero"
 	species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_ZENGHU)
 	//This suit has no slowdown. These armor values are intentionally terrible as a result.

code/modules/clothing/spacesuits/void/alien/skrell.dm

@@ -51,7 +51,7 @@
 /obj/item/clothing/suit/space/void/kala
 	name = "qukala voidsuit"
 	desc = "A sleek skrell voidsuit that slightly shimmers as it moves. This one has a Nralakk Federation emblem on it."
-	icon = 'icons/clothing/kit/skrell_armor.dmi'
+	icon = 'icons/obj/item/clothing/suit/space/void/skrell_armor.dmi'
 	icon_state = "kala_suit"
 	item_state = "kala_suit"
 	contained_sprite = TRUE
@@ -70,7 +70,7 @@
 /obj/item/clothing/head/helmet/space/void/kala
 	name = "qukala voidsuit helmet"
 	desc = "A sleek skrell voidsuit helmet that slightly shimmers as it moves. This one has a Nralakk Federation emblem on it."
-	icon = 'icons/clothing/kit/skrell_armor.dmi'
+	icon = 'icons/obj/item/clothing/head/space/void/kala_helmets.dmi'
 	icon_state = "kala_helm"
 	item_state = "kala_helm"
 	contained_sprite = TRUE

code/modules/clothing/suits/armor.dm

@@ -546,7 +546,7 @@
 /obj/item/clothing/suit/storage/vest/sol
 	name = "sol heavy armor vest"
 	desc = "A high-quality armor vest in a deep green. It is surprisingly flexible and light, even with the added webbing and armor plating."
-	icon = 'icons/clothing/under/uniforms/sol_uniform.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/sol_army_vest.dmi'
 	icon_state = "solwebvest"
 	item_state = "solwebvest"
 	armor = list(
@@ -561,7 +561,7 @@
 /obj/item/clothing/suit/storage/vest/konyang
 	name = "konyang police vest"
 	desc = "A fairly dated armor vest in bright blue issued to the various police forces of Konyang. It comes with a prominent silver emblem on the front."
-	icon = 'icons/clothing/under/uniforms/konyang_uniforms.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/konyang_police_vest.dmi'
 	icon_state = "police_vest"
 	item_state = "police_vest"
 	contained_sprite = TRUE
@@ -569,7 +569,7 @@
 /obj/item/clothing/suit/storage/vest/kala
 	name = "kala armor vest"
 	desc = "A simple armor vest issued to all of the Kala. It's made of an advanced lightweight alloy."
-	icon = 'icons/clothing/kit/skrell_armor.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/kala_armor.dmi'
 	icon_state = "kala_armor"
 	item_state = "kala_armor"
 	armor = list(

code/modules/clothing/suits/labcoat.dm

@@ -190,9 +190,9 @@
 /obj/item/clothing/suit/storage/galatea_labcoat
 	name = "\improper Galatean labcoat"
 	desc = "A style of labcoat commonly worn by Galatean researchers which is intended to resemble labcoats commonly used throughout the Alliance prior to the Interstellar War’s outbreak in the late 2200s."
-	icon = 'icons/clothing/suits/coats/galatea.dmi'
-	icon_state = "labcoat1"
-	item_state = "labcoat1"
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/labcoat.dmi'
+	icon_state = "labcoat_galatea"
+	item_state = "labcoat_galatea"
 	contained_sprite = TRUE
 	body_parts_covered = UPPER_TORSO|ARMS
 	allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper, /obj/item/device/breath_analyzer)
@@ -201,5 +201,5 @@
 	)
 
 /obj/item/clothing/suit/storage/galatea_labcoat/alt
-	icon_state = "labcoat2"
-	item_state = "labcoat2"
+	icon_state = "labcoat_galatea_alt"
+	item_state = "labcoat_galatea_alt"

code/modules/clothing/suits/miscellaneous.dm

@@ -153,7 +153,7 @@
 /obj/item/clothing/suit/golden_tailcoat
 	name = "golden tailcoat"
 	desc = "A brilliant looking golden tailcoat of sorts."
-	icon = 'icons/clothing/suits/goldendeep_tailcoat.dmi'
+	icon = 'icons/obj/item/clothing/suit/goldendeep_tailcoat.dmi'
 	icon_state = "tailcoat"
 	item_state = "tailcoat"
 	body_parts_covered = UPPER_TORSO|ARMS
@@ -194,7 +194,7 @@
 
 /obj/item/clothing/suit/storage/toggle/leather_jacket/midriff
 	name = "cropped leather jacket"
-	icon = 'icons/clothing/suits/coats/cropped_leather_jacket.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/cropped_leather_jacket.dmi'
 	desc = "A thick leather jacket that doesn't actually cover the waist. Rebel against what's expected of your jacket!"
 	icon_state = "mid"
 	item_state = "mid"
@@ -303,7 +303,7 @@
 	name = "Stellar Corporate Conglomerate jacket"
 	desc = "A comfortable blue jacket. Tailored upon its back is a large Stellar Corporate Conglomerate logo."
 	desc_extended = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
-	icon = 'icons/clothing/suits/scc_jacket.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/corp_dep_jackets.dmi'
 	icon_state = "scc_jacket"
 	item_state = "scc_jacket"
 	contained_sprite = TRUE
@@ -313,7 +313,7 @@
 	desc = "A more formal jacket for bridge staff. Designed in a typical Colettish style."
 	desc_extended= "While not a true Colettish uniform the aiguillette and cuff tabs of this one are obviously based on the real thing. \
 	An actual Civil Guard uniform, commonly known as a rayadillo, is generally of a darker blue and features the wearer’s ranks on the collar."
-	icon = 'icons/obj/item/clothing/suit/storage/toggle/bridge_crew_jacket_sancol.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/corp_dep_jackets.dmi'
 	icon_state = "bridge_crew_jacket_sancol"
 	item_state = "bridge_crew_jacket_sancol"
 
@@ -402,7 +402,7 @@
 /obj/item/clothing/suit/storage/toggle/highvis
 	name = "high visibility jacket"
 	desc = "A loose-fitting, high visibility jacket to help the wearer be recognizable in high traffic areas with large industrial equipment."
-	icon = 'icons/clothing/kit/highvis.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/highvis.dmi'
 	icon_state = "jacket_highvis"
 	item_state = "jacket_highvis"
 	body_parts_covered = UPPER_TORSO|ARMS
@@ -418,7 +418,7 @@
 /obj/item/clothing/suit/storage/toggle/highvis_alt
 	name = "high visibility jacket"
 	desc = "A bright yellow jacket with reflective stripes. For use in operations, engineering, and sometimes even law enforcement, in cold and poor weather or when visibility is low."
-	icon = 'icons/clothing/kit/highvis.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/highvis.dmi'
 	icon_state = "jacket_highvis_alt"
 	item_state = "jacket_highvis_alt"
 	body_parts_covered = UPPER_TORSO|ARMS
@@ -434,7 +434,7 @@
 /obj/item/clothing/suit/storage/toggle/highvis_red
 	name = "high visibility jacket"
 	desc = "A red jacket with reflective stripes. For use in different departments, commonly found in civilian emergency services, in cold and poor weather or when visibility is low."
-	icon = 'icons/clothing/kit/highvis.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/highvis.dmi'
 	icon_state = "jacket_highvis_red"
 	item_state = "jacket_highvis_red"
 	body_parts_covered = UPPER_TORSO|ARMS
@@ -450,7 +450,7 @@
 /obj/item/clothing/suit/storage/toggle/highvis_orange
 	name = "high visibility jacket"
 	desc = "An orange jacket with reflective stripes. For use in different departments, commonly found in civilian industrial services, in dark or secluded areas where visibility is critical for safety."
-	icon = 'icons/clothing/kit/highvis.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/highvis.dmi'
 	icon_state = "jacket_highvis_orange"
 	item_state = "jacket_highvis_orange"
 	body_parts_covered = UPPER_TORSO|ARMS
@@ -569,7 +569,7 @@
 /obj/item/clothing/suit/storage/toggle/highloft
 	name = "high loft jacket"
 	desc = "A high loft insulated jacket intended for long hours in cold station conditions."
-	icon = 'icons/clothing/suits/highloft.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/highloft.dmi'
 	icon_state = "highloft"
 	item_state = "highloft"
 	worn_overlay = "over"
@@ -636,7 +636,7 @@
 	desc = "A jacket used by Biesel Security Services Bureau agents while on the field."
 	icon_state = "bssb_jacket"
 	item_state = "bssb_jacket"
-	icon = 'icons/clothing/suits/coats/bssb_jacket.dmi'
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/bssb_jacket.dmi'
 	contained_sprite = TRUE
 
 /obj/item/clothing/suit/storage/toggle/bssb/armor

code/modules/clothing/suits/modular_armor.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/suit/armor/carrier
 	name = "plate carrier"
 	desc = "A plate carrier that can be decked out with various armor plates and accessories."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/suit/armor/modular_armor/modular_armor.dmi'
 	contained_sprite = TRUE
 	icon_state = "plate_carrier"
 	item_state = "plate_carrier"
@@ -135,7 +135,7 @@
 	name = "corporate armor plate"
 	desc = "A particularly light-weight armor plate in stylish corporate black. Unfortunately, not very good if you hold it with your hands."
 	desc_info = "These items must be hooked onto plate carriers for them to work!"
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/suit/armor/modular_armor/modular_armor.dmi'
 	icon_state = "plate_sec"
 	item_state = "plate_sec"
 	contained_sprite = TRUE
@@ -265,7 +265,7 @@
 /obj/item/clothing/accessory/armor_plate/heavy/hoplan
 	name = "hoplan breastplate"
 	desc = "What looks to you like a medieval relic, is actually ablative plating backed by ballistic padding! Have at thee!"
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/suit/armor/modular_armor/modular_armor.dmi'
 	icon_state = "hoplan_breastplate"
 	item_state = "hoplan_breastplate"
 	contained_sprite = TRUE
@@ -273,7 +273,7 @@
 /obj/item/clothing/accessory/armor_plate/tcaf
 	name = "\improper TCAF legionnaire carapace"
 	desc = "The blue carapace of the Tau Ceti Armed Forces. Polished and proud for Miranda Trasen's favorite soldiers."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/suit/armor/modular_armor/modular_armor.dmi'
 	icon_state = "tcaf_plate"
 	item_state = "tcaf_plate"
 	contained_sprite = TRUE
@@ -321,7 +321,7 @@
 /obj/item/clothing/accessory/storage/chestpouch
 	name = "chestpouch rig"
 	desc = "A harness made to be worn over a set of armor. Comes with three pouches on the front, and a hidden pouch on the back for your snacks!"
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/suit/armor/modular_armor/modular_armor_attachments.dmi'
 	icon_state = "tcaf_chestpouches"
 	item_state = "tcaf_chestpouches"
 	contained_sprite = TRUE
@@ -331,7 +331,7 @@
 /obj/item/clothing/accessory/storage/chest_gear
 	name = "standard vest equipment"
 	desc = "The standard pouch and commlink each Minuteman gets issued out of basic. This one has a bullet wedged in the radio, don't expect it to work anytime soon."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/suit/armor/modular_armor/modular_armor_attachments.dmi'
 	icon_state = "tcaf_chest_gear"
 	item_state = "tcaf_chest_gear"
 	contained_sprite = TRUE
@@ -341,7 +341,7 @@
 /obj/item/clothing/accessory/storage/modular_pouch
 	name = "plate carrier pouches"
 	desc = "A comfortable set of pouches that can be attached to a plate carrier, allowing the wearer to store some small items."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/suit/armor/modular_armor/modular_armor_attachments.dmi'
 	icon_state = "modular_pouch"
 	item_state = "modular_pouch"
 	contained_sprite = TRUE
@@ -372,7 +372,7 @@
 /obj/item/clothing/head/helmet/security
 	name = "corporate helmet"
 	desc = "A shiny helmet in corporate black! Goes well with the respective plate carrier."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/head/modular_armor_helmets.dmi'
 	contained_sprite = TRUE
 	icon_state = "helm_sec"
 	item_state = "helm_sec"
@@ -418,7 +418,7 @@
 /obj/item/clothing/head/helmet/military
 	name = "sol army helmet"
 	desc = "A helmet in drab olive. Standard-issue to the oft-forgotten Solarian Army. Comes with a fancy military HUDglass."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/head/modular_armor_helmets.dmi'
 	contained_sprite = TRUE
 	icon_state = "helm_military"
 	item_state = "helm_military"
@@ -435,7 +435,7 @@
 	desc = "A standard-issue helmet of the Imperial Army of Dominia. Wear on head for best results."
 	desc_extended = "The distinctive outline of the Imperial Army's helmet has made it into a symbol of Dominian imperialism abroad. The helmets themselves protect well \
 	against lasers, ballistics, and shrapnel."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/head/modular_armor_helmets.dmi'
 	contained_sprite = TRUE
 	icon_state = "dom_helmet"
 	item_state = "dom_helmet"
@@ -456,7 +456,7 @@
 /obj/item/clothing/head/helmet/tcaf
 	name = "\improper TCAF legionnaire faceplate helmet"
 	desc = "A carapace helmet in the traditional colors of the Tau Ceti Armed Forces. This one equipped with the signature faceplate."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/head/modular_armor_helmets.dmi'
 	contained_sprite = TRUE
 	icon_state = "tcaf_helm_face"
 	item_state = "tcaf_helm_face"
@@ -483,7 +483,7 @@
 /obj/item/clothing/head/helmet/hoplan
 	name = "hoplan helm"
 	desc = "A modern combat helmet with a stylish outer shell to make it appear from another era entirely. What these robots do for fashion..."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/head/modular_armor_helmets.dmi'
 	contained_sprite = TRUE
 	icon_state = "hoplan_helm"
 	item_state = "hoplan_helm"
@@ -500,7 +500,7 @@
 /obj/item/clothing/accessory/sec_commander_stripes
 	name = "head of security stripes"
 	desc = "A set of high visibility inserts for use in armour. This one declares the wearer as a Head of Security."
-	icon = 'icons/clothing/kit/modular_armor_accessories.dmi'
+	icon = 'icons/obj/item/clothing/accessory/armor/modular_armor_accessories.dmi'
 	icon_state = "sec_commander_stripes"
 	item_state = "sec_commander_stripes"
 	contained_sprite = TRUE
@@ -511,7 +511,7 @@
 	name = "flagpatch"
 	desc = "A simple strip of fabric attached to a vest or helmet typically used to denote the wearer's \
 	organization or nationality."
-	icon = 'icons/clothing/kit/modular_armor_accessories.dmi'
+	icon = 'icons/obj/item/clothing/accessory/armor/modular_armor_accessories.dmi'
 	icon_state = "flagpatch"
 	item_state = "flagpatch"
 	var/shading_state = "flagpatch"

code/modules/clothing/suits/utility.dm

@@ -12,7 +12,7 @@
 /obj/item/clothing/suit/fire
 	name = "firesuit"
 	desc = "A suit that protects against fire and heat."
-	icon = 'icons/clothing/kit/firefighter.dmi'
+	icon = 'icons/obj/item/clothing/suit/firefighter.dmi'
 	icon_state = "firesuit"
 	item_state = "firesuit"
 	sprite_sheets = list(
@@ -202,7 +202,7 @@
 /obj/item/clothing/head/radiation
 	name = "radiation hood"
 	desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation."
-	icon = 'icons/clothing/kit/radsuit.dmi'
+	icon = 'icons/obj/item/clothing/head/radsuit.dmi'
 	item_icons = null
 	icon_state = "radhood"
 	item_state = "radhood"
@@ -221,7 +221,7 @@
 /obj/item/clothing/suit/radiation
 	name = "radiation suit"
 	desc = "A suit that protects against radiation. Label: Made with lead, do not eat insulation."
-	icon = 'icons/clothing/kit/radsuit.dmi'
+	icon = 'icons/obj/item/clothing/suit/radsuit.dmi'
 	item_icons = null
 	icon_state = "radsuit"
 	item_state = "radsuit"

code/modules/clothing/tail_accessory.dm

@@ -21,7 +21,7 @@
 /obj/item/clothing/tail_accessory/tail_cloth
 	name = "tail cloth"
 	desc = "A simple cloth that can be wrapped around the tail."
-	icon = 'icons/clothing/tail/tajtailcloth.dmi'
+	icon = 'icons/obj/item/clothing/accessory/tail/tajtailcloth.dmi'
 	icon_state = "tail_cloth"
 
 	compatible_species_type = list(/datum/species/tajaran)
@@ -31,7 +31,7 @@
 /obj/item/clothing/tail_accessory/prosthetic
 	name = "solid prosthetic tail"
 	desc = "A simple prosthetic tail made to help tajara with a stunted tail to balance."
-	icon = 'icons/clothing/tail/taj_solid_prosthetic.dmi'
+	icon = 'icons/obj/item/clothing/accessory/tail/taj_solid_prosthetic.dmi'
 	icon_state = "tail_prosthetic"
 
 	compatible_species_type = list(/datum/species/tajaran)
@@ -41,9 +41,9 @@
 /obj/item/clothing/tail_accessory/prosthetic/flexible
 	name = "flexible prosthetic tail"
 	desc = "A flexible prosthetic tail for a tajara. Still rather stiff."
-	icon = 'icons/clothing/tail/taj_flexible_prosthetic.dmi'
+	icon = 'icons/obj/item/clothing/accessory/tail/taj_flexible_prosthetic.dmi'
 
 /obj/item/clothing/tail_accessory/prosthetic/tesla
 	name = "tesla prosthetic tail"
 	desc = "A prosthetic tail made for Republican citizens born with Hakh'jar."
-	icon = 'icons/clothing/tail/taj_tesla_prosthetic.dmi'
+	icon = 'icons/obj/item/clothing/accessory/tail/taj_tesla_prosthetic.dmi'

code/modules/clothing/under/accessories/accessory.dm

@@ -1237,7 +1237,7 @@
 /obj/item/clothing/accessory/apron/qeburgerapron
 	name = "Quick-E-Burger Food Technician Apron"
 	desc = "For industrious employees hard at work, the Quick-E-Burger Food Technician Apron is the perfect protection! Supplied and manufactured in bulk by Quick-E-Burger's parent company, Orion Express, the Food Technician Apron is constructed from highly-resistant rubber with ergonomic quick-fastening security straps to ensure it can be made to fit any employee, of any species, anywhere!"
-	icon = 'icons/clothing/suits/quickeburger_apron.dmi'
+	icon = 'icons/obj/item/clothing/accessory/aprons.dmi'
 	icon_state = "quickeburger_apron"
 	item_state = "quickeburger_apron"
 	allowed = list(

code/modules/clothing/under/accessories/armor.dm

@@ -3,7 +3,7 @@
 	name = "corporate leg guards"
 	desc = "These will protect your legs."
 	desc_info = "These items must be hooked onto plate carriers for them to work!"
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/suit/armor/modular_armor/modular_armor.dmi'
 	icon_state = "legguards_sec"
 	item_state = "legguards_sec"
 	contained_sprite = TRUE
@@ -131,7 +131,7 @@
 /obj/item/clothing/accessory/leg_guard/tcaf
 	name = "\improper TCAF legionnaire leg carapace"
 	desc = "Try to sweep the leg against someone wearing these."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/suit/armor/modular_armor/modular_armor.dmi'
 	icon_state = "tcaf_boot_armor"
 	item_state = "tcaf_boot_armor"
 	contained_sprite = TRUE
@@ -161,7 +161,7 @@
 	name = "hoplan thigh protector"
 	desc = "Ablative plating fashioned to sit around the thigh from the hips, \
 	made to link together with an adjoining breastplate. This ancient style is reinvigorated with ablative metals and ballistic padding."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/suit/armor/modular_armor/modular_armor.dmi'
 	icon_state = "hoplan_thigh_protector"
 	item_state = "hoplan_thigh_protector"
 	contained_sprite = TRUE
@@ -177,7 +177,7 @@
 /obj/item/clothing/accessory/leg_guard/hoplan/skirt
 	name = "hoplan ballistic skirt"
 	desc = "A long skirt that falls down to one's ankles with an outer layer of ballistic padding, and woven in pouches featuring ablative plates."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/suit/armor/modular_armor/modular_armor.dmi'
 	icon_state = "hoplan_ballistic_skirt"
 	item_state = "hoplan_ballistic_skirt"
 	contained_sprite = TRUE
@@ -187,7 +187,7 @@
 /obj/item/clothing/accessory/arm_guard
 	name = "corporate arm guards"
 	desc = "A pair of arm pads reinforced with armor plating. Attaches to a plate carrier."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/suit/armor/modular_armor/modular_armor.dmi'
 	icon_state = "armguards_sec"
 	item_state = "armguards_sec"
 	contained_sprite = TRUE
@@ -332,7 +332,7 @@
 /obj/item/clothing/accessory/arm_guard/tcaf
 	name = "\improper TCAF carapace arm guards"
 	desc = "Blue carapace armguards to protect you in the modern battlefield of 2465. Attaches to a plate carrier."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/suit/armor/modular_armor/modular_armor.dmi'
 	icon_state = "tcaf_armguards"
 	item_state = "tcaf_armguards"
 	contained_sprite = TRUE
@@ -355,7 +355,7 @@
 	name = "hoplan sleeves"
 	desc = "Big and poofy and reminiscent of an era more enlightened. \
 	These are lined with special fabric woven in the laboratories of Pactolus to provide armor to an otherwise gaudy fashion piece."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/suit/armor/modular_armor/modular_armor.dmi'
 	icon_state = "hoplan_sleeves"
 	item_state = "hoplan_sleeves"
 	contained_sprite = TRUE

code/modules/clothing/under/accessories/holster.dm

@@ -203,7 +203,7 @@
 /obj/item/clothing/accessory/holster/modular
 	name = "plate carrier holster"
 	desc = "A special holster with rigging able to attach to modern modular plate carriers."
-	icon = 'icons/clothing/kit/modular_armor.dmi'
+	icon = 'icons/obj/item/clothing/suit/armor/modular_armor/modular_armor_attachments.dmi'
 	icon_state = "modular_holster"
 	item_state = "modular_holster"
 	contained_sprite = TRUE

code/modules/clothing/under/color.dm

@@ -3,7 +3,7 @@
 	desc = "A basic jumpsuit."
 	desc_info = "Jumpsuits can have their sleeves rolled up/down via the Roll Up/Down Sleeves verb, and also have their upper body part be up/down via the \
 	the Rolled Up/Down verb."
-	icon = 'icons/clothing/under/uniforms/jumpsuits.dmi'
+	icon = 'icons/obj/item/clothing/under/jumpsuits.dmi'
 	icon_state = "grey"
 	item_state = "grey"
 	item_icons = null

code/modules/clothing/under/dresses.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/under/dress/colorable
 	name = "strapless midi dress"
 	desc = "A one-piece fashionable garment."
-	icon = 'icons/clothing/under/uniforms/colorable_dresses.dmi'
+	icon = 'icons/obj/item/clothing/under/dress/colorable/colorable_dresses.dmi'
 	icon_state = "dress"
 	item_state = "dress"
 	body_parts_covered = UPPER_TORSO | LOWER_TORSO

code/modules/clothing/under/jobs/civilian.dm

@@ -96,7 +96,7 @@
 /obj/item/clothing/under/rank/liaison/einstein
 	name = "einstein corporate liaison uniform"
 	desc_extended = "If you're seeing this outfit in an SCC facility, something somewhere has gone terribly, terribly wrong."
-	icon = 'icons/clothing/under/uniforms/einstein.dmi'
+	icon = 'icons/obj/item/clothing/under/human/corporation/einstein.dmi'
 	icon_state = "ee_liaison"
 	item_state = "ee_liaison"
 
@@ -285,7 +285,7 @@
 	name = "einstein machinist's jumpsuit"
 	desc_extended = "Usually, but not necessarily worn by Einstein's Terranaeus Diagnostics subsidiary. Subsidiary or not, \
 	whoever wears this uniform probably knows a lot about putting guns and cameras on robots."
-	icon = 'icons/clothing/under/uniforms/einstein.dmi'
+	icon = 'icons/obj/item/clothing/under/human/corporation/einstein.dmi'
 	icon_state = "ee_machinist"
 	item_state = "ee_machinist"
 
@@ -293,7 +293,7 @@
 	name = "hephaestus captain's jumpsuit"
 	desc = "It's a green-and-orange jumpsuit with some gold markings denoting the rank of \"Captain\" used by Hephaestus Industries."
 	has_sensor = SUIT_NO_SENSORS
-	icon = 'icons/clothing/under/uniforms/cyclops_uniforms.dmi'
+	icon = 'icons/obj/item/clothing/under/human/corporation/cyclops_uniforms.dmi'
 	icon_state = "heph_captain"
 	item_state = "heph_captain"
 	worn_state = "heph_captain"
@@ -302,14 +302,14 @@
 /obj/item/clothing/head/caphat/cap/hephaestus
 	name = "captain's cap"
 	desc = "You fear to wear it for the negligence it brings. This one is in the colors of Hephaestus Industries"
-	icon = 'icons/clothing/under/uniforms/cyclops_uniforms.dmi'
+	icon = 'icons/obj/item/clothing/head/hephaestus_cyclops.dmi'
 	icon_state = "heph_captain_cap"
 	item_state = "heph_captain_cap"
 
 /obj/item/clothing/gloves/captain/hephaestus
 	name = "captain's gloves"
 	desc = "Green gloves, with a nice gold trim. Swanky."
-	icon = 'icons/clothing/under/uniforms/cyclops_uniforms.dmi'
+	icon = 'icons/obj/item/clothing/gloves/hephaestus_captain.dmi'
 	icon_state = "heph_captain_gloves"
 	item_state = "heph_captain_gloves"
 
@@ -317,7 +317,7 @@
 	name = "einstein captain's jumpsuit"
 	desc = "It's a grey-green jumpsuit with some gold markings denoting the rank of \"Captain\" used by Einstein Engines."
 	desc_extended = "Any similarities to the captain's jumpsuits worn in the SCC are purely coincidental. Honest!"
-	icon = 'icons/clothing/under/uniforms/einstein.dmi'
+	icon = 'icons/obj/item/clothing/under/human/corporation/einstein.dmi'
 	icon_state = "ee_captain"
 	item_state = "ee_captain"
 	contained_sprite = TRUE
@@ -326,7 +326,7 @@
 /obj/item/clothing/under/qeburgerjumpsuit
 	name = "Quick-E-Burger Food Technician Jumpsuit"
 	desc = "For valued employees on the go, the Quick-E-Burger Food Technician Jumpsuit is the perfect attire! Supplied and manufactured in bulk by Quick-E-Burger's parent company, Orion Express, the Food Technician Jumpsuit is lavishly appointed with a one-size-doesn't-quite-fit-anyone design, including a state-of-the-art button-up fastening system designed to enable quick and easy employee repair!"
-	icon = 'icons/clothing/under/uniforms/orion.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	icon_state = "quickeburger_jumpsuit"
 	item_state = "quickeburger_jumpsuit"
 	contained_sprite = TRUE

code/modules/clothing/under/jobs/engineering.dm

@@ -53,7 +53,7 @@
 	desc = "It's a grey-green high visibility jumpsuit worn by engineers. It has minor radiation shielding."
 	desc_extended = "Usually, but not necessarily worn by Einstein's Taipei Engineering Industrial subsidiary. Subsidiary or not, \
 	whoever wears this uniform probably knows a lot about the latest warp drives."
-	icon = 'icons/clothing/under/uniforms/einstein.dmi'
+	icon = 'icons/obj/item/clothing/under/human/corporation/einstein.dmi'
 	icon_state = "ee_engineer"
 	item_state = "ee_engineer"
 

code/modules/clothing/under/jobs/medsci.dm

@@ -37,7 +37,7 @@
 	name = "einstein scientist's jumpsuit"
 	desc_extended = "Doing away with the hideous purple of the SCC's science uniforms in favor of yet more dull greens, \
 	Einstein Engines' science uniforms push new frontiers of style just as their wearers push everything else."
-	icon = 'icons/clothing/under/uniforms/einstein.dmi'
+	icon = 'icons/obj/item/clothing/under/human/corporation/einstein.dmi'
 	icon_state = "ee_scientist"
 	item_state = "ee_scientist"
 
@@ -143,7 +143,7 @@
 /obj/item/clothing/under/rank/iacjumpsuit
 	desc = "It's a blue and white jumpsuit, the IAC logo plastered across the back."
 	name = "IAC uniform"
-	icon = 'icons/clothing/under/uniforms/iac_uniform.dmi'
+	icon = 'icons/obj/item/clothing/under/human/corporation/iac_uniform.dmi'
 	icon_state = "iac"
 	item_state = "iac"
 	contained_sprite = TRUE
@@ -169,7 +169,7 @@
 /obj/item/clothing/under/rank/medical/generic
 	icon_state = "generic_scrubs"
 	item_state = "generic_scrubs"
-	icon = 'icons/clothing/under/uniforms/generic_scrubs.dmi'
+	icon = 'icons/obj/item/clothing/department_uniforms/medical.dmi'
 	has_accents = TRUE
 
 /obj/item/clothing/under/rank/medical/zeng

code/modules/clothing/under/jobs/security.dm

@@ -103,7 +103,7 @@
 /obj/item/clothing/under/rank/security/heph
 	name = "hephaestus security officer uniform"
 	desc = "A green-and-orange uniform worn by Security Officers of smaller Hephaestus Industries vessels."
-	icon = 'icons/clothing/under/uniforms/cyclops_uniforms.dmi'
+	icon = 'icons/obj/item/clothing/under/human/corporation/cyclops_uniforms.dmi'
 	icon_state = "heph_security"
 	item_state = "heph_security"
 	contained_sprite = TRUE
@@ -112,7 +112,7 @@
 	name = "einstein security officer's uniform"
 	desc_extended = "Even the Chainlink's hated enemy puts their security officers in drab officewear. Rumors that these are woven \
 	from Skrellian supermaterials are likely false."
-	icon = 'icons/clothing/under/uniforms/einstein.dmi'
+	icon = 'icons/obj/item/clothing/under/human/corporation/einstein.dmi'
 	icon_state = "ee_officer"
 	item_state = "ee_officer"
 

code/modules/clothing/under/jobs/sol.dm

@@ -2,7 +2,7 @@
 /obj/item/clothing/under/rank/sol //regular sol navy uniform
 	name = "sol navy coveralls"
 	desc = "Unflattering fire-retardant naval coveralls, worn by Solarian Navy personnel serving aboard ships and in the field."
-	icon = 'icons/clothing/under/uniforms/sol_uniform.dmi'
+	icon = 'icons/obj/item/clothing/under/human/sol/sol_uniform.dmi'
 	icon_state = "navy_coveralls"
 	item_state = "navy_coveralls"
 	contained_sprite = TRUE

code/modules/clothing/under/miscellaneous.dm

@@ -81,7 +81,7 @@
 	name = "Stellar Corporate Conglomerate agent uniform"
 	desc = "A formal blue uniform worn by agents of the Stellar Corporate Conglomerate."
 	desc_extended = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
-	icon = 'icons/clothing/under/uniforms/scc.dmi'
+	icon = 'icons/obj/item/clothing/under/human/corporation/scc.dmi'
 	icon_state = "scc_agent"
 	item_state = "scc_agent"
 	worn_state = "scc_agent"
@@ -488,7 +488,7 @@
 	desc = "A traditional Japanese kimono."
 	icon_state = "kimono"
 	item_state = "kimono"
-	icon = 'icons/clothing/under/uniforms/kimono.dmi'
+	icon = 'icons/obj/item/clothing/under/human/coc/kimono.dmi'
 	contained_sprite = TRUE
 
 /obj/item/clothing/under/kimono/ronin
@@ -518,7 +518,7 @@
 /obj/item/clothing/under/legion
 	name = "Tau Ceti Foreign Legion uniform"
 	desc = "A blue field uniform worn by Tau Ceti Foreign Legion forces."
-	icon = 'icons/clothing/under/uniforms/tcfl_uniform.dmi'
+	icon = 'icons/obj/item/clothing/under/human/biesel/tcfl_uniform.dmi'
 	icon_state = "tauceti_volunteer"
 	item_state = "tauceti_volunteer"
 	worn_state = "tauceti_volunteer"
@@ -630,7 +630,7 @@
 /obj/item/clothing/under/rank/konyang
 	name = "konyang army uniform"
 	desc = "A set of dark green fatigues issued to the soldiers of the Konyang Army. Its design is similar to the uniforms of the Solarian Army."
-	icon = 'icons/clothing/under/uniforms/konyang_uniforms.dmi'
+	icon = 'icons/obj/item/clothing/under/human/coc/konyang_uniforms.dmi'
 	icon_state = "konyang_army"
 	item_state = "konyang_army"
 	contained_sprite = TRUE
@@ -691,7 +691,7 @@
 /obj/item/clothing/under/konyang/pirate
 	name = "ragged konyanger clothing"
 	desc = "A grey shirt and dark shorts in a Konyang style, accentuated with a red scarf. The clothes are dirty, torn, and ragged - evidently not well-maintained by their owner."
-	icon = 'icons/clothing/under/uniforms/konyang_pirates.dmi'
+	icon = 'icons/obj/item/clothing/under/human/coc/konyang_pirates.dmi'
 	icon_state = "pirate"
 	item_state = "pirate"
 	armor = null
@@ -729,7 +729,7 @@
 /obj/item/clothing/under/galatea
 	name = "\improper Galatean uniform"
 	desc = "A pair of slacks and matching protected shirt in the traditional black and green colors of a Galatean worker, seeing use across their space for all matter of jobs. Has a small plate to protect against chemical spills and small stab wounds, though providing little actual protection. Traditionally, one's planet of origin is marked on the right side of its high collar while the Technocracy's flag is on the left side of the collar."
-	icon = 'icons/clothing/under/uniforms/galatea.dmi'
+	icon = 'icons/obj/item/clothing/under/human/coc/galatea.dmi'
 	icon_state = "underglove"
 	item_state = "underglove"
 	contained_sprite = TRUE
@@ -739,7 +739,7 @@
 /obj/item/clothing/under/xanu
 	name = "xanu armed forces fatigues"
 	desc = "Fireproof, kevlar-reinforced combat fatigues used by enlisted personnel of the All-Xanu Armed Forces."
-	icon = 'icons/clothing/under/uniforms/xanu.dmi'
+	icon = 'icons/obj/item/clothing/under/human/coc/xanu.dmi'
 	icon_state = "xanu"
 	item_state = "xanu"
 	contained_sprite = TRUE
@@ -791,7 +791,7 @@
 /obj/item/clothing/under/ert/hephaestus
 	name = "\improper Hephaestus military tactical uniform"
 	desc = "A green colored uniform worn by Hephaestus Industries's private military forces and hostile terraforming corps."
-	icon = 'icons/clothing/under/uniforms/cyclops_uniforms.dmi'
+	icon = 'icons/obj/item/clothing/under/human/corporation/cyclops_uniforms.dmi'
 	icon_state = "heph_military"
 	item_state = "heph_military"
 	contained_sprite = TRUE
@@ -818,7 +818,7 @@
 /obj/item/clothing/head/hephaestus_military
 	name = "\improper Hephaestus military utility cover"
 	desc = "A military cover issued to Hephaestus Industries's private military personnel as part of their uniform."
-	icon = 'icons/clothing/under/uniforms/cyclops_uniforms.dmi'
+	icon = 'icons/obj/item/clothing/head/hephaestus_cyclops.dmi'
 	icon_state = "heph_military_utility"
 	item_state = "heph_military_utility"
 	contained_sprite = TRUE
@@ -830,7 +830,7 @@
 /obj/item/clothing/under/himeo
 	name = "himean planetary guard fatigues"
 	desc = "Reinforced synthetic fibres make up the bulk of this Himean planetary guard uniform, with hard plastic pads around the joints."
-	icon = 'icons/clothing/under/uniforms/himeo_military.dmi'
+	icon = 'icons/obj/item/clothing/under/human/coc/himeo_military.dmi'
 	icon_state = "himeo_fatigues"
 	item_state = "himeo_fatigues"
 	contained_sprite = TRUE
@@ -869,7 +869,7 @@
 /obj/item/clothing/under/himeo/navy
 	name = "himean naval fatigues"
 	desc = "Tough synthetic fibres make up the bulk of this Himean planetary guard naval uniform, dyed a deep navy blue."
-	icon = 'icons/clothing/under/uniforms/himeo_military.dmi'
+	icon = 'icons/obj/item/clothing/under/human/coc/himeo_military.dmi'
 	icon_state = "himeo_coveralls"
 	item_state = "himeo_coveralls"
 	contained_sprite = TRUE

code/modules/clothing/under/xenos/skrell.dm

@@ -365,7 +365,7 @@
 /obj/item/clothing/under/skrell/cthur
 	name = "cthur uniform"
 	desc = "This white vaurca wetsuit is often worn by C’thur working with the Kala, most often the Qukala. It has ablative materials woven in."
-	icon = 'icons/clothing/kit/skrell_armor.dmi'
+	icon = 'icons/obj/item/clothing/under/skrell/cthur_uniform.dmi'
 	icon_state = "cthur_uniform"
 	item_state = "cthur_uniform"
 	contained_sprite = TRUE
@@ -377,7 +377,7 @@
 /obj/item/clothing/under/skrell/qukala
 	name = "qukala uniform"
 	desc = "This combat-grade wetsuit is issued to the Qukala to be worn in the field. It has small kinetic dampeners woven in."
-	icon = 'icons/clothing/kit/skrell_armor.dmi'
+	icon = 'icons/obj/item/clothing/under/skrell/nralakk_uniforms.dmi'
 	icon_state = "qukala_uniform"
 	item_state = "qukala_uniform"
 	contained_sprite = TRUE
@@ -389,7 +389,7 @@
 /obj/item/clothing/under/skrell/nlomkala
 	name = "nlomkala uniform"
 	desc = "A robust wetsuit designed for police work, it is often worn by the Nlomkala. It has small kinetic dampeners woven in."
-	icon = 'icons/clothing/kit/skrell_armor.dmi'
+	icon = 'icons/obj/item/clothing/under/skrell/nralakk_uniforms.dmi'
 	icon_state = "nlom_uniform"
 	item_state = "nlom_uniform"
 	contained_sprite = TRUE
@@ -401,7 +401,7 @@
 /obj/item/clothing/under/skrell/ruupkala
 	name = "ruupkala uniform"
 	desc = "An uncommon sight in the Federation. This is a field-issue Ruupkala wetsuit equipped with small kinetic dampeners."
-	icon = 'icons/clothing/kit/skrell_armor.dmi'
+	icon = 'icons/obj/item/clothing/under/skrell/nralakk_uniforms.dmi'
 	icon_state = "ruup_uniform"
 	item_state = "ruup_uniform"
 	contained_sprite = TRUE
@@ -413,7 +413,7 @@
 /obj/item/clothing/under/skrell/sromkala
 	name = "sromkala uniform"
 	desc = "This comfortable and breathable wetsuit belongs to the Sromkala. It makes their extended times of slumber all the more cozy."
-	icon = 'icons/clothing/kit/skrell_armor.dmi'
+	icon = 'icons/obj/item/clothing/under/skrell/nralakk_uniforms.dmi'
 	icon_state = "srom_uniform"
 	item_state = "srom_uniform"
 	contained_sprite = TRUE
@@ -421,7 +421,7 @@
 /obj/item/clothing/under/skrell/tupkala
 	name = "tupkala uniform"
 	desc = "This purple wetsuit belongs to the infamous Tupkala. It is made of some kind of exotic material."
-	icon = 'icons/clothing/kit/skrell_armor.dmi'
+	icon = 'icons/obj/item/clothing/under/skrell/nralakk_uniforms.dmi'
 	icon_state = "tup_uniform"
 	item_state = "tup_uniform"
 	armor = list(

code/modules/clothing/under/xenos/unathi.dm

@@ -105,7 +105,7 @@
 /obj/item/clothing/under/unathi/izweski
 	name = "izweski navy uniform"
 	desc = "A lightweight red jumpsuit with a brown-orange vest, this uniform is an odd fusion of modern design and traditional Unathi aesthetics. Its insignia indicates it as belonging to a soldier of the Izweski Hegemony's Navy."
-	icon = 'icons/clothing/under/uniforms/izweski.dmi'
+	icon = 'icons/obj/item/clothing/under/unathi/izweski.dmi'
 	icon_state = "izweski"
 	item_state = "izweski"
 	armor = list(