diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index 286bd315b61..1e75bdc84fc 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -12,23 +12,6 @@
 		R.add_fingerprint(user)
 		qdel(src)
 
-
-/obj/item/storage/box/bodybags
-	name = "body bags"
-	desc = "This box contains body bags."
-	icon_state = "bodybags"
-
-/obj/item/storage/box/bodybags/New()
-	..()
-	new /obj/item/bodybag(src)
-	new /obj/item/bodybag(src)
-	new /obj/item/bodybag(src)
-	new /obj/item/bodybag(src)
-	new /obj/item/bodybag(src)
-	new /obj/item/bodybag(src)
-	new /obj/item/bodybag(src)
-
-
 /obj/structure/closet/body_bag
 	name = "body bag"
 	desc = "A plastic bag designed for the storage and transportation of cadavers."
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index a78bc40dd3a..7a78a04ac71 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -65,6 +65,7 @@
 	max_combined_w_class = 42 // 21*2
 
 /obj/item/storage/box/survival
+	icon_state = "box_civ"
 	New()
 		..()
 		contents = list()
@@ -74,6 +75,7 @@
 		return
 
 /obj/item/storage/box/engineer
+	icon_state = "box_eng"
 	New()
 		..()
 		contents = list()
@@ -83,6 +85,7 @@
 		return
 
 /obj/item/storage/box/survival_mining
+	icon_state = "box_min"
 	New()
 		..()
 		contents = list()
@@ -563,6 +566,33 @@
 		new /obj/item/cartridge/security(src)
 		new /obj/item/cartridge/security(src)
 
+/obj/item/storage/box/holobadge
+	name = "holobadge box"
+	icon_state = "box_badge"
+	desc = "A box claiming to contain holobadges."
+	New()
+		new /obj/item/clothing/accessory/holobadge(src)
+		new /obj/item/clothing/accessory/holobadge(src)
+		new /obj/item/clothing/accessory/holobadge(src)
+		new /obj/item/clothing/accessory/holobadge(src)
+		new /obj/item/clothing/accessory/holobadge/cord(src)
+		new /obj/item/clothing/accessory/holobadge/cord(src)
+		..()
+		return
+
+/obj/item/storage/box/evidence
+	name = "evidence bag box"
+	desc = "A box claiming to contain evidence bags."
+	icon_state = "box_evidence"
+
+/obj/item/storage/box/evidence/New()
+	new /obj/item/evidencebag(src)
+	new /obj/item/evidencebag(src)
+	new /obj/item/evidencebag(src)
+	new /obj/item/evidencebag(src)
+	new /obj/item/evidencebag(src)
+	new /obj/item/evidencebag(src)
+	..()
 
 /obj/item/storage/box/handcuffs
 	name = "spare handcuffs"
@@ -642,6 +672,20 @@
 		new /obj/item/storage/pill_bottle( src )
 		new /obj/item/storage/pill_bottle( src )
 
+/obj/item/storage/box/bodybags
+	name = "body bags"
+	desc = "This box contains body bags."
+	icon_state = "bodybags"
+
+/obj/item/storage/box/bodybags/New()
+	..()
+	new /obj/item/bodybag(src)
+	new /obj/item/bodybag(src)
+	new /obj/item/bodybag(src)
+	new /obj/item/bodybag(src)
+	new /obj/item/bodybag(src)
+	new /obj/item/bodybag(src)
+	new /obj/item/bodybag(src)
 
 /obj/item/storage/box/snappops
 	name = "snap pop box"
@@ -834,7 +878,8 @@
 
 /obj/item/storage/box/centcomofficer
 	name = "officer kit"
-
+	icon_state = "box_ert"
+	
 /obj/item/storage/box/centcomofficer/New()
 	..()
 	contents = list()
@@ -850,6 +895,19 @@
 	new /obj/item/reagent_containers/hypospray/combat/nanites(src)
 	new /obj/item/pinpointer/advpinpointer(src)
 
+/obj/item/storage/box/responseteam
+	name = "boxed survival kit"
+	icon_state = "box_ert"
+
+/obj/item/storage/box/responseteam/New()
+	..()
+	new /obj/item/clothing/mask/breath(src)
+	new /obj/item/tank/emergency_oxygen/engi(src)
+	new /obj/item/flashlight/flare(src)
+	new /obj/item/kitchen/knife/combat(src)
+	new /obj/item/radio/centcom(src)
+	new /obj/item/reagent_containers/food/pill/patch/synthflesh(src)
+	new /obj/item/reagent_containers/hypospray/autoinjector(src)
 
 #undef NODESIGN
 #undef NANOTRASEN
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index 2abadbc55f9..6b08e2e4e49 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -285,20 +285,6 @@
 	if(isliving(user))
 		user.visible_message("<span class='warning'>[user] invades [M]'s personal space, thrusting [src] into [M.p_their()] face insistently.</span>","<span class='warning'>You invade [M]'s personal space, thrusting [src] into [M.p_their()] face insistently. You are the law.</span>")
 
-/obj/item/storage/box/holobadge
-	name = "holobadge box"
-	desc = "A box claiming to contain holobadges."
-	New()
-		new /obj/item/clothing/accessory/holobadge(src)
-		new /obj/item/clothing/accessory/holobadge(src)
-		new /obj/item/clothing/accessory/holobadge(src)
-		new /obj/item/clothing/accessory/holobadge(src)
-		new /obj/item/clothing/accessory/holobadge/cord(src)
-		new /obj/item/clothing/accessory/holobadge/cord(src)
-		..()
-		return
-
-
 ///////////
 //SCARVES//
 ///////////
diff --git a/code/modules/detective_work/evidence.dm b/code/modules/detective_work/evidence.dm
index 97d41fcf848..555dbe542de 100644
--- a/code/modules/detective_work/evidence.dm
+++ b/code/modules/detective_work/evidence.dm
@@ -84,15 +84,3 @@
 		to_chat(user, "[src] is empty.")
 		icon_state = "evidenceobj"
 
-/obj/item/storage/box/evidence
-	name = "evidence bag box"
-	desc = "A box claiming to contain evidence bags."
-
-/obj/item/storage/box/evidence/New()
-	new /obj/item/evidencebag(src)
-	new /obj/item/evidencebag(src)
-	new /obj/item/evidencebag(src)
-	new /obj/item/evidencebag(src)
-	new /obj/item/evidencebag(src)
-	new /obj/item/evidencebag(src)
-	..()
diff --git a/code/modules/response_team/ert.dm b/code/modules/response_team/ert.dm
index d678a541912..0c2688cc3f1 100644
--- a/code/modules/response_team/ert.dm
+++ b/code/modules/response_team/ert.dm
@@ -353,16 +353,3 @@ var/ert_request_answered = FALSE
 	name = "centcomm bounced radio"
 	frequency = ERT_FREQ
 	icon_state = "radio"
-
-/obj/item/storage/box/responseteam/
-	name = "boxed survival kit"
-
-/obj/item/storage/box/responseteam/New()
-	..()
-	new /obj/item/clothing/mask/breath(src)
-	new /obj/item/tank/emergency_oxygen/engi(src)
-	new /obj/item/flashlight/flare(src)
-	new /obj/item/kitchen/knife/combat(src)
-	new /obj/item/radio/centcom(src)
-	new /obj/item/reagent_containers/food/pill/patch/synthflesh(src)
-	new /obj/item/reagent_containers/hypospray/autoinjector(src)
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index bd7a6ab837c..ddfe7ccb506 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ