diff --git a/beestation.dme b/beestation.dme
index 9833e4ed8b733..618e570b46822 100644
--- a/beestation.dme
+++ b/beestation.dme
@@ -2464,6 +2464,7 @@
 #include "code\modules\clothing\suits\armor.dm"
 #include "code\modules\clothing\suits\bio.dm"
 #include "code\modules\clothing\suits\chaplainsuits.dm"
+#include "code\modules\clothing\suits\costume.dm"
 #include "code\modules\clothing\suits\cloaks.dm"
 #include "code\modules\clothing\suits\jacket.dm"
 #include "code\modules\clothing\suits\jobs.dm"
diff --git a/code/datums/greyscale/greyscale_configs.dm b/code/datums/greyscale/greyscale_configs.dm
index c4dac20370942..5bb7cdad049dc 100644
--- a/code/datums/greyscale/greyscale_configs.dm
+++ b/code/datums/greyscale/greyscale_configs.dm
@@ -50,7 +50,7 @@
 
 /datum/greyscale_config/jumpsuit
 	name = "Jumpsuit"
-	icon_file = 'icons/obj/clothing/uniforms.dmi'
+	icon_file = 'icons/obj/clothing/under/color.dmi'
 	json_config = 'code/datums/greyscale/json_configs/jumpsuit.json'
 
 /datum/greyscale_config/jumpsuit_worn
@@ -70,7 +70,7 @@
 
 /datum/greyscale_config/jumpsuit_prison
 	name = "Prison Jumpsuit"
-	icon_file = 'icons/obj/clothing/uniforms.dmi'
+	icon_file = 'icons/obj/clothing/under/color.dmi'
 	json_config = 'code/datums/greyscale/json_configs/jumpsuit_prison.json'
 
 /datum/greyscale_config/jumpsuit_prison_worn
@@ -120,32 +120,32 @@
 
 /datum/greyscale_config/plasmaman_helmet_default
 	name = "Default plasmaman helmet"
-	icon_file = 'icons/obj/clothing/hats.dmi'
+	icon_file = 'icons/obj/clothing/head/hats.dmi'
 	json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_default.json'
 
 /datum/greyscale_config/plasmaman_helmet_default_worn
 	name = "Default plasmaman helmet"
-	icon_file = 'icons/mob/clothing/head.dmi'
+	icon_file = 'icons/mob/clothing/head/head.dmi'
 	json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_default_worn.json'
 
 /datum/greyscale_config/plasmaman_helmet_mark2
 	name = "Mark II plasmaman helmet"
-	icon_file = 'icons/obj/clothing/hats.dmi'
+	icon_file = 'icons/obj/clothing/head/hats.dmi'
 	json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_mk2.json'
 
 /datum/greyscale_config/plasmaman_helmet_mark2_worn
 	name = "Mark II plasmaman helmet"
-	icon_file = 'icons/mob/clothing/head.dmi'
+	icon_file = 'icons/mob/clothing/head/head.dmi'
 	json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_mk2_worn.json'
 
 /datum/greyscale_config/plasmaman_helmet_protective
 	name = "Protective plasmaman helmet"
-	icon_file = 'icons/obj/clothing/hats.dmi'
+	icon_file = 'icons/obj/clothing/head/hats.dmi'
 	json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_protective.json'
 
 /datum/greyscale_config/plasmaman_helmet_protective_worn
 	name = "Protective plasmaman helmet"
-	icon_file = 'icons/mob/clothing/head.dmi'
+	icon_file = 'icons/mob/clothing/head/head.dmi'
 	json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_protective_worn.json'
 
 /datum/greyscale_config/plasmaman_helmet_default_inhand_left
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index f243b24b74bb7..2244eaa07f8e3 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -370,7 +370,7 @@
 			"Clown Dagger" = image(icon = 'icons/obj/wizard.dmi', icon_state = "clownrender"),
 			"Pride-struck Hammer" = image(icon = 'icons/obj/items_and_weapons.dmi', icon_state = "pride"),
 			"Holy Whip" = image(icon = 'icons/obj/items_and_weapons.dmi', icon_state = "chain"),
-			"Atheist's Fedora" = image(icon = 'icons/obj/clothing/hats.dmi', icon_state = "fedora"),
+			"Atheist's Fedora" = image(icon = 'icons/obj/clothing/head/hats.dmi', icon_state = "fedora"),
 			"Dark Blessing" = image(icon = 'icons/obj/changeling_items.dmi', icon_state = "arm_blade"),
 			"Unholy Blessing" = image(icon = 'icons/obj/changeling_items.dmi', icon_state = "tentacle"),
 			"Carp-Sie Plushie" = image(icon = 'icons/obj/plushes.dmi', icon_state = "carpplush"),
@@ -743,7 +743,8 @@
 	icon_state = "fedora"
 	item_state = "fedora"
 	slot_flags = ITEM_SLOT_HEAD
-	icon = 'icons/obj/clothing/hats.dmi'
+	icon = 'icons/obj/clothing/head/hats.dmi'
+	worn_icon = 'icons/mob/clothing/head/hats.dmi'
 	force = 0
 	throw_speed = 4
 	throw_range = 7
diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm
index dac0fb93cb424..593df47c61d22 100644
--- a/code/game/objects/items/miscellaneous.dm
+++ b/code/game/objects/items/miscellaneous.dm
@@ -265,7 +265,7 @@
 
 /obj/item/storage/box/magic/hat
 	name = "Bottomless Top Hat"
-	item_icon_file = 'icons/obj/clothing/hats.dmi'
+	item_icon_file = 'icons/obj/clothing/head/hats.dmi'
 	item_icon_state = "tophat"
 	info_text = "Bottomless Top Hat. \n<span class='notice'>Allows for storage of items and living beings inside.</span>"
 
diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm
index 25cbef2105140..2f1adcf9a746a 100644
--- a/code/modules/antagonists/changeling/powers/mutations.dm
+++ b/code/modules/antagonists/changeling/powers/mutations.dm
@@ -395,7 +395,7 @@
 /obj/item/clothing/suit/space/changeling
 	name = "flesh mass"
 	icon_state = "lingspacesuit"
-	icon = 'icons/obj/clothing/suits/costume.dmi'
+	//icon = 'icons/obj/clothing/suits/costume.dmi'
 	worn_icon = 'icons/mob/clothing/suits/costume.dmi'
 	desc = "A huge, bulky mass of armored pressure and temperature-resistant organic tissue, evolved to facilitate space travel and protect from close range threats."
 	item_flags = DROPDEL
diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm
index b0450dea3bc5b..3847b99d816f2 100644
--- a/code/modules/clothing/head/_head.dm
+++ b/code/modules/clothing/head/_head.dm
@@ -1,6 +1,7 @@
 /obj/item/clothing/head
 	name = BODY_ZONE_HEAD
-	icon = 'icons/obj/clothing/hats.dmi'
+	icon = 'icons/obj/clothing/head/default.dmi'
+	worn_icon = 'icons/mob/clothing/head/default.dmi'
 	body_parts_covered = HEAD
 	slot_flags = ITEM_SLOT_HEAD
 	dynamic_hair_suffix = "+generic"
@@ -156,8 +157,8 @@
 		return
 
 	//Start with two sides for the front
-	var/icon/main = icon('icons/mob/clothing/head.dmi', icon_state) //This takes the icon and uses the worn version of the icon
-	var/icon/sub = icon('icons/mob/clothing/head.dmi', icon_state)
+	var/icon/main = icon('icons/mob/clothing/head/head.dmi', icon_state) //This takes the icon and uses the worn version of the icon
+	var/icon/sub = icon('icons/mob/clothing/head/head.dmi', icon_state)
 
 	//merge the sub side with the main, after masking off the middle pixel line
 	var/icon/mask = new('icons/mob/monkey.dmi', "monkey_mask_right") //masking
@@ -168,7 +169,7 @@
 	main.Blend(sub, ICON_OVERLAY)
 
 	//handle side icons
-	sub = icon('icons/mob/clothing/head.dmi', icon_state, dir = EAST)
+	sub = icon('icons/mob/clothing/head/head.dmi', icon_state, dir = EAST)
 	main.Insert(sub, dir = EAST)
 	sub.Flip(WEST)
 	main.Insert(sub, dir = WEST)
diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm
index 3343b17836c0e..605a5ff5cf34a 100644
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -150,9 +150,9 @@
 /obj/item/clothing/head/hardhat/weldhat/worn_overlays(mutable_appearance/standing, isinhands = FALSE, icon_file, item_layer, atom/origin)
 	. = ..()
 	if(!isinhands)
-		. += mutable_appearance('icons/mob/clothing/head.dmi', "weldhelmet", item_layer)
+		. += mutable_appearance('icons/mob/clothing/head/head.dmi', "weldhelmet", item_layer)
 		if(!up)
-			. += mutable_appearance('icons/mob/clothing/head.dmi', "weldvisor", item_layer)
+			. += mutable_appearance('icons/mob/clothing/head/head.dmi', "weldvisor", item_layer)
 
 /obj/item/clothing/head/hardhat/weldhat/update_icon()
 	cut_overlays()
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 1f93d77de94be..9fa2cbb814547 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -1,6 +1,8 @@
 /obj/item/clothing/head/helmet
 	name = "helmet"
 	desc = "Standard Security gear. Protects the head from impacts."
+	icon = 'icons/obj/clothing/head/helmet.dmi'
+	worn_icon = 'icons/mob/clothing/head/helmet.dmi'
 	icon_state = "helmet"
 	item_state = "helmet"
 	armor = list(MELEE = 35,  BULLET = 30, LASER = 30, ENERGY = 40, BOMB = 25, BIO = 0, RAD = 0, FIRE = 50, ACID = 50, STAMINA = 30)
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 78a05ebfe6020..dc7711d1ff008 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -492,8 +492,8 @@ Contains:
 
 /obj/item/clothing/head/helmet/space/hardsuit/skinsuit
 	name = "skinsuit helmet"
-	icon = 'icons/obj/clothing/hats.dmi'
-	worn_icon = 'icons/mob/clothing/head.dmi'
+	icon = 'icons/obj/clothing/head/hats.dmi'
+	worn_icon = 'icons/mob/clothing/head/hats.dmi'
 	icon_state = "skinsuit_helmet"
 	item_state = "skinsuit_helmet"
 	max_integrity = 200
@@ -518,7 +518,7 @@ Contains:
 /obj/item/clothing/suit/space/hardsuit/skinsuit
 	name = "skinsuit"
 	desc = "A slim, compression-based spacesuit meant to protect the user during emergency situations. It's only a little warmer than your uniform."
-	icon = 'icons/obj/clothing/suits.dmi'
+	icon = 'icons/obj/clothing/suit/suits.dmi'
 	worn_icon = 'icons/mob/clothing/suits/suits.dmi'
 	icon_state = "skinsuit"
 	item_state = "s_suit"
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index fd9d175666d9d..cbf252b2dd439 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -163,15 +163,15 @@
 	. = ..()
 	if(!isinhands)
 		if(smile)
-			var/mutable_appearance/M = mutable_appearance('icons/mob/clothing/head.dmi', smile_state, item_layer)
+			var/mutable_appearance/M = mutable_appearance('icons/mob/clothing/head/plasmaman_head.dmi', smile_state, item_layer)
 			M.color = smile_color
 			. += M
 		if(helmet_on)
-			. += mutable_appearance('icons/mob/clothing/head.dmi', visor_state + "_light", item_layer)
+			. += mutable_appearance('icons/mob/clothing/head/plasmaman_head.dmi', visor_state + "_light", item_layer)
 		if(!up)
-			. += mutable_appearance('icons/mob/clothing/head.dmi', visor_state + "_weld", item_layer)
+			. += mutable_appearance('icons/mob/clothing/head/plasmaman_head.dmi', visor_state + "_weld", item_layer)
 		if(attached_hat)
-			. += attached_hat.build_worn_icon(origin, attached_hat.icon_state, default_layer = HEAD_LAYER, default_icon_file = 'icons/mob/clothing/head.dmi')
+			. += attached_hat.build_worn_icon(default_layer = HEAD_LAYER, default_icon_file = 'icons/mob/clothing/head/default.dmi')
 
 /obj/item/clothing/head/helmet/space/plasmaman/verb/unattach_hat()
 	set name = "Remove Hat"
diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm
index 73bd943f6272a..b72d6abfadd69 100644
--- a/code/modules/clothing/suits/costume.dm
+++ b/code/modules/clothing/suits/costume.dm
@@ -1,12 +1,12 @@
 /obj/item/clothing/suit/costume
-	icon = 'icons/obj/clothing/suits/costume.dmi'
+	//icon = 'icons/obj/clothing/suits/costume.dmi'
 	worn_icon = 'icons/mob/clothing/suits/costume.dmi'
 
 /obj/item/clothing/suit/hooded/flashsuit
 	name = "flashy costume"
 	desc = "What did you expect?"
 	icon_state = "flashsuit"
-	icon = 'icons/obj/clothing/suits/costume.dmi'
+	//icon = 'icons/obj/clothing/suits/costume.dmi'
 	worn_icon = 'icons/mob/clothing/suits/costume.dmi'
 	item_state = "armor"
 	body_parts_covered = CHEST|GROIN
diff --git a/code/modules/mapping/mapping_items/armoury_spawners.dm b/code/modules/mapping/mapping_items/armoury_spawners.dm
index 173a5fb4cca20..86815f9e5d88d 100644
--- a/code/modules/mapping/mapping_items/armoury_spawners.dm
+++ b/code/modules/mapping/mapping_items/armoury_spawners.dm
@@ -54,7 +54,7 @@
 	linear_scaling_rate = 0.2
 
 /obj/effect/loot_jobscale/armoury/bulletproof_vest
-	icon = 'icons/obj/clothing/suits.dmi'
+	icon = 'icons/obj/clothing/suits/armor.dmi'
 	icon_state = "bulletproof"
 	loot = list(/obj/item/clothing/suit/armor/bulletproof)
 	fan_out_items = TRUE
@@ -62,7 +62,7 @@
 	linear_scaling_rate = 0.5
 
 /obj/effect/loot_jobscale/armoury/bulletproof_helmet
-	icon = 'icons/obj/clothing/hats.dmi'
+	icon = 'icons/obj/clothing/head/helmet.dmi'
 	icon_state = "helmetalt"
 	loot = list(/obj/item/clothing/head/helmet/alt)
 	fan_out_items = TRUE
@@ -70,7 +70,7 @@
 	linear_scaling_rate = 0.5
 
 /obj/effect/loot_jobscale/armoury/riot_suit
-	icon = 'icons/obj/clothing/suits.dmi'
+	icon = 'icons/obj/clothing/suits/armor.dmi'
 	icon_state = "riot"
 	loot = list(/obj/item/clothing/suit/armor/riot)
 	fan_out_items = TRUE
@@ -78,7 +78,7 @@
 	linear_scaling_rate = 0.4
 
 /obj/effect/loot_jobscale/armoury/riot_helmet
-	icon = 'icons/obj/clothing/hats.dmi'
+	icon = 'icons/obj/clothing/head/helmet.dmi'
 	icon_state = "riot"
 	loot = list(/obj/item/clothing/head/helmet/riot)
 	fan_out_items = TRUE
diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm
index c2fafcf4b2873..9f51266d8f4eb 100644
--- a/code/modules/mining/equipment/explorer_gear.dm
+++ b/code/modules/mining/equipment/explorer_gear.dm
@@ -117,6 +117,6 @@
 /obj/item/clothing/head/helmet/space/hostile_environment/worn_overlays(mutable_appearance/standing, isinhands = FALSE, icon_file, item_layer, atom/origin)
 	. = ..()
 	if(!isinhands)
-		var/mutable_appearance/M = mutable_appearance('icons/mob/clothing/head.dmi', "hostile_env_glass", item_layer)
+		var/mutable_appearance/M = mutable_appearance('icons/mob/clothing/head/head.dmi', "hostile_env_glass", item_layer)
 		M.appearance_flags = RESET_COLOR
 		. += M
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 1ba5169c1b12a..b7f69c1a4e635 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -412,7 +412,7 @@ There are several things that need to be remembered:
 	update_mutant_bodyparts()
 	if(head)
 		update_hud_head(head)
-		var/icon_file = 'icons/mob/clothing/head.dmi'
+		var/icon_file = 'icons/mob/clothing/head/head.dmi'
 		if(istype(head, /obj/item/clothing/head))
 			var/obj/item/clothing/head/HE = head
 			if(HE.sprite_sheets & (dna?.species.bodyflag))
@@ -553,7 +553,7 @@ There are several things that need to be remembered:
 	if(back)
 		update_hud_back(back)
 		var/icon_file = 'icons/mob/clothing/back.dmi'
-		
+
 		if(istype(back, /obj/item))
 			var/obj/item/I = back
 			if(I.sprite_sheets & dna?.species.bodyflag)
diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm
index 0c0251369b688..0a95b65522333 100644
--- a/code/modules/mob/living/carbon/update_icons.dm
+++ b/code/modules/mob/living/carbon/update_icons.dm
@@ -161,7 +161,7 @@
 		inv.update_icon()
 
 	if(head)
-		overlays_standing[HEAD_LAYER] = head.build_worn_icon(default_layer = HEAD_LAYER, default_icon_file = 'icons/mob/clothing/head.dmi')
+		overlays_standing[HEAD_LAYER] = head.build_worn_icon(default_layer = HEAD_LAYER, default_icon_file = 'icons/mob/clothing/head/head.dmi')
 		update_hud_head(head)
 
 	apply_overlay(HEAD_LAYER)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index f5c949a888a37..a5742d1cfed79 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -641,7 +641,7 @@
 		else
 			add_overlay("ov-opencover -c")
 	if(hat)
-		var/mutable_appearance/head_overlay = hat.build_worn_icon(src, default_layer = 20, default_icon_file = 'icons/mob/clothing/head.dmi')
+		var/mutable_appearance/head_overlay = hat.build_worn_icon(src, default_layer = 20, default_icon_file = 'icons/mob/clothing/head/head.dmi')
 		head_overlay.pixel_y += hat_offset
 		add_overlay(head_overlay)
 	update_fire()
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm b/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm
index d120312b5f6ee..2c34ac2576a2a 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm
@@ -81,7 +81,7 @@
 		if(client && hud_used && hud_used.hud_shown)
 			head.screen_loc = ui_drone_head
 			client.screen += head
-		var/used_head_icon = 'icons/mob/clothing/head.dmi'
+		var/used_head_icon = 'icons/mob/clothing/head/head.dmi'
 		if(istype(head, /obj/item/clothing/mask))
 			used_head_icon = 'icons/mob/mask.dmi'
 
diff --git a/icons/mob/clothing/head/default.dmi b/icons/mob/clothing/head/default.dmi
new file mode 100644
index 0000000000000..8c532956a820c
Binary files /dev/null and b/icons/mob/clothing/head/default.dmi differ
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head/head.dmi
similarity index 100%
rename from icons/mob/clothing/head.dmi
rename to icons/mob/clothing/head/head.dmi
diff --git a/icons/obj/clothing/head/beret.dmi b/icons/obj/clothing/head/beret.dmi
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/icons/obj/clothing/head/bio.dmi b/icons/obj/clothing/head/bio.dmi
new file mode 100644
index 0000000000000..8cd355aaaedcf
Binary files /dev/null and b/icons/obj/clothing/head/bio.dmi differ
diff --git a/icons/obj/clothing/head/default.dmi b/icons/obj/clothing/head/default.dmi
new file mode 100644
index 0000000000000..1ebf652b3c179
Binary files /dev/null and b/icons/obj/clothing/head/default.dmi differ
diff --git a/icons/obj/clothing/head/hats.dmi b/icons/obj/clothing/head/hats.dmi
index e868f30c4cebc..55f4771944c93 100644
Binary files a/icons/obj/clothing/head/hats.dmi and b/icons/obj/clothing/head/hats.dmi differ
diff --git a/icons/obj/clothing/head/helmet.dmi b/icons/obj/clothing/head/helmet.dmi
new file mode 100644
index 0000000000000..a1d356aff1f73
Binary files /dev/null and b/icons/obj/clothing/head/helmet.dmi differ
diff --git a/icons/obj/clothing/head/plasmaman_hats.dmi b/icons/obj/clothing/head/plasmaman_hats.dmi
new file mode 100644
index 0000000000000..f8f0310f60423
Binary files /dev/null and b/icons/obj/clothing/head/plasmaman_hats.dmi differ
diff --git a/icons/obj/clothing/head/sombrero.dmi b/icons/obj/clothing/head/sombrero.dmi
new file mode 100644
index 0000000000000..feedd93d10d51
Binary files /dev/null and b/icons/obj/clothing/head/sombrero.dmi differ
diff --git a/icons/obj/clothing/head/spacehelm.dmi b/icons/obj/clothing/head/spacehelm.dmi
new file mode 100644
index 0000000000000..e94b0acaf5eee
Binary files /dev/null and b/icons/obj/clothing/head/spacehelm.dmi differ
diff --git a/icons/obj/clothing/head/wizard.dmi b/icons/obj/clothing/head/wizard.dmi
new file mode 100644
index 0000000000000..9d72f6d5690f2
Binary files /dev/null and b/icons/obj/clothing/head/wizard.dmi differ
diff --git a/icons/obj/clothing/suits/default.dmi b/icons/obj/clothing/suits/default.dmi
new file mode 100644
index 0000000000000..1ebf652b3c179
Binary files /dev/null and b/icons/obj/clothing/suits/default.dmi differ