diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 7926e02bb3d..724b9abe56d 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -869,7 +869,7 @@
 /turf/open/floor/carpet,
 /area/crew_quarters/heads/hos)
 "aco" = (
-/obj/structure/closet/bombcloset,
+/obj/structure/closet/bombcloset/security,
 /turf/open/floor/plasteel/showroomfloor,
 /area/security/main)
 "acp" = (
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 2fc1ca36aac..86e73bf5e1f 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -25204,7 +25204,7 @@
 /area/security/prison)
 "baF" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/bombcloset,
+/obj/structure/closet/bombcloset/security,
 /turf/open/floor/plasteel/vault{
 	dir = 8
 	},
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 6ec6a8586c8..53a07330d2a 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -4763,7 +4763,7 @@
 /turf/open/floor/plasteel,
 /area/security/warden)
 "ajw" = (
-/obj/structure/closet/bombcloset,
+/obj/structure/closet/bombcloset/security,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	dir = 4
 	},
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 5133b5e4991..8b3f2240eac 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -2788,7 +2788,7 @@
 /turf/open/floor/plasteel/showroomfloor,
 /area/security/main)
 "aip" = (
-/obj/structure/closet/bombcloset,
+/obj/structure/closet/bombcloset/security,
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel/showroomfloor,
 /area/security/main)
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
index 970abed8171..b1e83a9d6f7 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -151,22 +151,22 @@
 
 /obj/structure/closet/bombcloset/PopulateContents()
 	..()
-	new /obj/item/clothing/suit/bomb_suit( src )
-	new /obj/item/clothing/under/color/black( src )
-	new /obj/item/clothing/shoes/sneakers/black( src )
-	new /obj/item/clothing/head/bomb_hood( src )
+	new /obj/item/clothing/suit/bomb_suit(src)
+	new /obj/item/clothing/under/color/black(src)
+	new /obj/item/clothing/shoes/sneakers/black(src)
+	new /obj/item/clothing/head/bomb_hood(src)
 
+/obj/structure/closet/bombcloset/security/PopulateContents()
+	new /obj/item/clothing/suit/bomb_suit/security(src)
+	new /obj/item/clothing/under/rank/security(src)
+	new /obj/item/clothing/shoes/jackboots(src)
+	new /obj/item/clothing/head/bomb_hood/security(src)
 
-/obj/structure/closet/bombclosetsecurity
-	name = "\improper EOD closet"
-	desc = "It's a storage unit for explosion-protective suits."
-	icon_state = "bomb"
-
-/obj/structure/closet/bombclosetsecurity/PopulateContents()
-	new /obj/item/clothing/suit/bomb_suit/security( src )
-	new /obj/item/clothing/under/rank/security( src )
-	new /obj/item/clothing/shoes/sneakers/brown( src )
-	new /obj/item/clothing/head/bomb_hood/security( src )
+/obj/structure/closet/bombcloset/white/PopulateContents()
+	new /obj/item/clothing/suit/bomb_suit/white(src)
+	new /obj/item/clothing/under/color/black(src)
+	new /obj/item/clothing/shoes/sneakers/black(src)
+	new /obj/item/clothing/head/bomb_hood/white(src)
 
 /*
  * Ammunition
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index 835ac2374bc..38fbe299f52 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -59,6 +59,8 @@
 	flags_1 = THICKMATERIAL_1
 	armor = list(melee = 20, bullet = 0, laser = 20,energy = 10, bomb = 100, bio = 0, rad = 0, fire = 80, acid = 50)
 	flags_inv = HIDEFACE|HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR
+	dynamic_hair_suffix = ""
+	dynamic_fhair_suffix = ""
 	cold_protection = HEAD
 	min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
 	heat_protection = HEAD
@@ -92,15 +94,23 @@
 
 
 /obj/item/clothing/head/bomb_hood/security
-	icon_state = "bombsuitsec"
-	item_state = "bombsuitsec"
-
+	icon_state = "bombsuit_sec"
+	item_state = "bombsuit_sec"
 
 /obj/item/clothing/suit/bomb_suit/security
-	icon_state = "bombsuitsec"
-	item_state = "bombsuitsec"
+	icon_state = "bombsuit_sec"
+	item_state = "bombsuit_sec"
 	allowed = list(/obj/item/gun/energy, /obj/item/melee/baton, /obj/item/restraints/handcuffs)
 
+
+/obj/item/clothing/head/bomb_hood/white
+	icon_state = "bombsuit_white"
+	item_state = "bombsuit_white"
+
+/obj/item/clothing/suit/bomb_suit/white
+	icon_state = "bombsuit_white"
+	item_state = "bombsuit_white"
+
 /*
  * Radiation protection
  */
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index a359ddcd0b1..8100aaa5c8c 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 0649adcacfb..a0cb865d25d 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 484c5d80a8b..0b4b52ea406 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 927e3507e3a..d960d9193fe 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index f3def66edf0..21bbbfc0318 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -254,9 +254,9 @@
 #include "code\datums\soullink.dm"
 #include "code\datums\spawners_menu.dm"
 #include "code\datums\verbs.dm"
+#include "code\datums\world_topic.dm"
 #include "code\datums\actions\flightsuit.dm"
 #include "code\datums\actions\ninja.dm"
-#include "code\datums\world_topic.dm"
 #include "code\datums\antagonists\antag_datum.dm"
 #include "code\datums\antagonists\datum_abductor.dm"
 #include "code\datums\antagonists\datum_brother.dm"