diff --git a/code/game/objects/effects/spawners/wo_spawners/supplies.dm b/code/game/objects/effects/spawners/wo_spawners/supplies.dm
index f2a502344660..612950418a70 100644
--- a/code/game/objects/effects/spawners/wo_spawners/supplies.dm
+++ b/code/game/objects/effects/spawners/wo_spawners/supplies.dm
@@ -106,7 +106,6 @@
 
 
 /obj/effect/landmark/wo_supplies/storage
-	icon = 'icons/obj/items/storage.dmi'
 	icon_state = null
 	amount = list(1,5)
 
@@ -117,6 +116,7 @@
 
 /obj/effect/landmark/wo_supplies/storage/machete
 	icon_state = "machete_holster_full"
+	icon = 'icons/obj/items/storage/holsters.dmi'
 	stuff = list(/obj/item/storage/large_holster/machete/full)
 
 /obj/effect/landmark/wo_supplies/storage/m56d
@@ -126,15 +126,18 @@
 
 /obj/effect/landmark/wo_supplies/storage/mines
 	icon_state = "minebox"
+	icon = 'icons/obj/items/storage/packets.dmi'
 	stuff = list(/obj/item/storage/box/explosive_mines)
 
 /obj/effect/landmark/wo_supplies/storage/grenades
 	amount = list(0,2)
 	icon_state = "nade_placeholder"
+	icon = 'icons/obj/items/storage/packets.dmi'
 	stuff = list(/obj/item/storage/box/nade_box)
 
 /obj/effect/landmark/wo_supplies/storage/m37holster
 	icon_state = "m37_holster"
+	icon = 'icons/obj/items/storage/holsters.dmi'
 	stuff = list(/obj/item/storage/large_holster/m37)
 
 /obj/effect/landmark/wo_supplies/storage/belts
diff --git a/code/game/objects/items/devices/personal_data_transmitter.dm b/code/game/objects/items/devices/personal_data_transmitter.dm
index b967aa9273ca..c5bcdd739608 100644
--- a/code/game/objects/items/devices/personal_data_transmitter.dm
+++ b/code/game/objects/items/devices/personal_data_transmitter.dm
@@ -161,6 +161,7 @@
 	name = "\improper Boots! PDT/L Battle Buddy kit"
 	desc = "Contains a PDT/L set, consisting of the PDT bracelet and its sister locator tube, alongside a spare cell seemingly wedged into the kit."
 	desc_lore = "This kit was distributed in the 200th (Season 4) Issue of the Boots! magazine, 'Privates die without their battlebuddy!', to drive up sales. Many have noted the poor battery life of these units, leading many to speculate that these were faulty units that were repackaged and shipped off to various USCM-adjacent mil-surplus good stores. The Department of the Navy Observation in Photographs (DNOP) has not released a statement regarding these theories."
+	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "pdt_box"
 	can_hold = list(/obj/item/device/pdt_locator_tube, /obj/item/clothing/accessory/pdt_bracelet)
 	foldable = /obj/item/stack/sheet/cardboard
diff --git a/code/game/objects/items/devices/portable_vendor.dm b/code/game/objects/items/devices/portable_vendor.dm
index 3dd8533a046d..b3ae76654bf8 100644
--- a/code/game/objects/items/devices/portable_vendor.dm
+++ b/code/game/objects/items/devices/portable_vendor.dm
@@ -5,7 +5,7 @@
 /obj/item/device/portable_vendor
 	name = "\improper Automated Storage Briefcase"
 	desc = "A suitcase-sized automated storage and retrieval system. Designed to efficiently store and selectively dispense small items."
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/briefcases.dmi'
 	icon_state = "secure"
 	flags_atom = FPRINT|CONDUCT
 	force = 8
diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm
index d73893e2671c..6a94849d6b74 100644
--- a/code/game/objects/items/misc.dm
+++ b/code/game/objects/items/misc.dm
@@ -164,7 +164,7 @@
 	desc = "A debug item for research."
 
 /obj/item/moneybag
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/bags.dmi'
 	name = "Money bag"
 	icon_state = "moneybag"
 	force = 10
@@ -178,7 +178,7 @@
 /obj/item/evidencebag
 	name = "evidence bag"
 	desc = "An empty evidence bag."
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/bags.dmi'
 	icon_state = "evidenceobj"
 	item_state = ""
 	w_class = SIZE_SMALL
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index 19e012ff1c14..256210b69f4c 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -93,7 +93,7 @@
 // -----------------------------
 
 /obj/item/storage/bag/plants
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/bags.dmi'
 	icon_state = "plantbag"
 	name = "Plant Bag"
 	storage_slots = 50; //the number of plant pieces it can carry.
@@ -253,7 +253,7 @@
 // -----------------------------
 
 /obj/item/storage/bag/cash
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/bags.dmi'
 	icon_state = "cashbag"
 	name = "Cash bag"
 	desc = "A bag for carrying lots of cash. It's got a big dollar sign printed on the front."
diff --git a/code/game/objects/items/storage/bible.dm b/code/game/objects/items/storage/bible.dm
index 4b98d45b5d32..dd4a9ea9796d 100644
--- a/code/game/objects/items/storage/bible.dm
+++ b/code/game/objects/items/storage/bible.dm
@@ -1,6 +1,7 @@
 /obj/item/storage/bible
 	name = "bible"
 	desc = "Apply to head repeatedly."
+	icon = 'icons/obj/items/books.dmi'
 	icon_state ="bible"
 	throw_speed = SPEED_FAST
 	throw_range = 5
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index a33d51bf618c..406f5d0ab407 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -27,6 +27,7 @@
 	name = "box"
 	desc = "It's just an ordinary box."
 	icon_state = "box"
+	icon = 'icons/obj/items/storage/boxes.dmi'
 	item_state = "syringe_kit"
 	foldable = TRUE
 	storage_slots = null
@@ -150,6 +151,7 @@
 /obj/item/storage/box/flashbangs
 	name = "box of flashbangs (WARNING)"
 	desc = "<B>WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.</B>"
+	icon = 'icons/obj/items/storage/packets.dmi'
 	icon_state = "flashbang"
 	can_hold = list(/obj/item/explosive/grenade/flashbang)
 	w_class = SIZE_MEDIUM
@@ -181,6 +183,7 @@
 /obj/item/storage/box/emps
 	name = "box of emp grenades"
 	desc = "A box with 5 emp grenades."
+	icon = 'icons/obj/items/storage/packets.dmi'
 	icon_state = "emp"
 
 /obj/item/storage/box/emps/fill_preset_inventory()
@@ -500,7 +503,7 @@
 
 /obj/item/storage/box/lights
 	name = "box of replacement bulbs"
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/boxes.dmi'
 	icon_state = "light"
 	desc = "This box is shaped on the inside so that only light tubes and bulbs fit."
 	item_state = "syringe_kit"
@@ -548,6 +551,7 @@
 /obj/item/storage/box/twobore
 	name = "box of 2 bore shells"
 	icon_state = "twobore"
+	icon = 'icons/obj/items/storage/kits.dmi'
 	desc = "A box filled with enormous slug shells, for hunting only the most dangerous game. 2 Bore."
 	storage_slots = 5
 	can_hold = list(/obj/item/ammo_magazine/handful/shotgun/twobore)
@@ -562,6 +566,7 @@
 /obj/item/storage/box/explosive_mines
 	name = "\improper M20 mine box"
 	desc = "A secure box holding five M20 anti-personnel proximity mines."
+	icon = 'icons/obj/items/storage/packets.dmi'
 	icon_state = "minebox"
 	w_class = SIZE_MEDIUM
 	max_storage_space = 10
@@ -582,6 +587,7 @@
 	name = "\improper M94 marking flare pack"
 	desc = "A packet of eight M94 Marking Flares. Carried by USCM soldiers to light dark areas that cannot be reached with the usual TNR Shoulder Lamp."
 	icon_state = "m94"
+	icon = 'icons/obj/items/storage/packets.dmi'
 	w_class = SIZE_MEDIUM
 	storage_slots = 8
 	max_storage_space = 8
@@ -618,6 +624,7 @@
 	name = "\improper M40 HEDP grenade box"
 	desc = "A secure box holding 25 M40 High-Explosive Dual-Purpose grenades. High explosive, don't store near the flamer fuel."
 	icon_state = "nade_placeholder"
+	icon = 'icons/obj/items/storage/packets.dmi'
 	w_class = SIZE_LARGE
 	storage_slots = 25
 	max_storage_space = 50
@@ -758,6 +765,7 @@
 	name = "\improper USCM MRE"
 	desc = "A Meal, Ready-to-Eat. A single-meal combat ration designed to provide a soldier with enough nutrients for a day of strenuous work. Its expiration date is at least 20 years ahead of your combat life expectancy."
 	icon_state = "mealpack"
+	icon = 'icons/obj/items/storage/mre.dmi'
 	w_class = SIZE_SMALL
 	can_hold = list()
 	storage_slots = 7
diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm
index 24b2e13b91db..b687f6c5b85d 100644
--- a/code/game/objects/items/storage/briefcase.dm
+++ b/code/game/objects/items/storage/briefcase.dm
@@ -1,6 +1,7 @@
 /obj/item/storage/briefcase
 	name = "briefcase"
 	desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional."
+	icon = 'icons/obj/items/storage/briefcases.dmi'
 	icon_state = "briefcase"
 	item_state = "briefcase"
 	flags_atom = FPRINT|CONDUCT
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index 52fd50e9b022..d37bddf283db 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -9,6 +9,7 @@
 /obj/item/storage/firstaid
 	name = "first-aid kit"
 	desc = "It's an emergency medical kit for those serious boo-boos. With medical training you can fit this in a backpack."
+	icon = 'icons/obj/items/storage/medical.dmi'
 	icon_state = "firstaid"
 	throw_speed = SPEED_FAST
 	throw_range = 8
@@ -254,6 +255,7 @@
 /obj/item/storage/syringe_case
 	name = "syringe case"
 	desc = "It's a medical case for storing syringes and bottles."
+	icon = 'icons/obj/items/storage/medical.dmi'
 	icon_state = "syringe_case"
 	throw_speed = SPEED_FAST
 	throw_range = 8
@@ -308,7 +310,7 @@
 		\nStep three: Draw back the skin with the retracter.\
 		\nStep four: Patch the damaged vein with a surgical line.\
 		\nStep five: Close the incision with a surgical line."
-
+	icon = 'icons/obj/items/storage/medical.dmi'
 	icon_state = "surgical_case"
 	throw_speed = SPEED_FAST
 	throw_range = 8
diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm
index ddf6060b355c..7a073042e122 100644
--- a/code/game/objects/items/storage/large_holster.dm
+++ b/code/game/objects/items/storage/large_holster.dm
@@ -3,7 +3,7 @@
 /obj/item/storage/large_holster
 	name = "\improper Rifle Holster"
 	desc = "holster"
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/holsters.dmi'
 	icon_state = "m37_holster"
 	w_class = SIZE_LARGE
 	flags_equip_slot = SLOT_BACK
diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm
index afeaff89ae07..8c092bde9219 100644
--- a/code/game/objects/items/storage/lockbox.dm
+++ b/code/game/objects/items/storage/lockbox.dm
@@ -3,6 +3,7 @@
 /obj/item/storage/lockbox
 	name = "lockbox"
 	desc = "A locked box."
+	icon = 'icons/obj/items/storage/briefcases.dmi'
 	icon_state = "lockbox+l"
 	item_state = "syringe_kit"
 	w_class = SIZE_LARGE
diff --git a/code/game/objects/items/storage/misc.dm b/code/game/objects/items/storage/misc.dm
index c3fd647853d6..ab0e97393a33 100644
--- a/code/game/objects/items/storage/misc.dm
+++ b/code/game/objects/items/storage/misc.dm
@@ -55,7 +55,7 @@
  */
 
 /obj/item/storage/mateba_case
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "matebacase"
 	name = "mateba customization kit case"
 	desc = "A wooden case used for storing the tools and parts needed to customize a Mateba revolver. Comes with three barrel lengths and the necessary key to swap them out."
@@ -114,7 +114,7 @@
 /obj/item/storage/box/clf
 	name = "D18-storing box"
 	desc = "A fairly decorated and ceremonial box containing a CLF D18 and a single additional magazine for it. I guess those CLF folk really care about their craftsmanship and prose rather than practicality, eh?"
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "m43case"
 	w_class = SIZE_SMALL
 	max_w_class = SIZE_TINY
@@ -128,7 +128,7 @@
 /obj/item/storage/box/upp //war trophy luger
 	name = "Type 73 storing case"
 	desc = "A small case containing the once-standard sidearm of the UPP, the Type 73, and two additional magazines. The contained sidearm is probably looted off a dead officer or from a captured stockpile, either way this thing is worth a pretty penny."
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "matebacase"
 	w_class = SIZE_MEDIUM
 	max_w_class = SIZE_MEDIUM
@@ -143,6 +143,7 @@
 /obj/item/storage/box/co2_knife
 	name = "M8 cartridge bayonet packaging"
 	desc = "Contains one M8 Cartridge Bayonet and two sister CO2 cartridges. Thanks for being a dedicated Boots magazine subscriber!"
+	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "co2_box"
 	foldable = TRUE
 	storage_slots = 3
diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm
index 9c8c7080bdc3..228492e138c9 100644
--- a/code/game/objects/items/storage/pouch.dm
+++ b/code/game/objects/items/storage/pouch.dm
@@ -1426,7 +1426,7 @@
 /obj/item/storage/pouch/machete
 	name = "\improper H6B pattern M2132 machete scabbard"
 	desc = "A large leather scabbard used to carry a M2132 machete. It can be strapped to the pouch slot."
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/holsters.dmi'
 	icon_state = "macheteB_holster"
 	item_state = "machete_holster"
 	max_w_class = SIZE_LARGE
diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm
index d79fe712bea4..835f0d7cc4f9 100644
--- a/code/game/objects/items/storage/secure.dm
+++ b/code/game/objects/items/storage/secure.dm
@@ -97,7 +97,7 @@
 			else if ((code == l_code) && (l_set == 1))
 				locked = 0
 				overlays = null
-				overlays += image('icons/obj/items/storage.dmi', icon_opened)
+				overlays += image('icons/obj/items/storage/briefcases.dmi', icon_opened)
 				code = null
 			else
 				code = "ERROR"
@@ -123,7 +123,7 @@
 // -----------------------------
 /obj/item/storage/secure/briefcase
 	name = "secure briefcase"
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/briefcases.dmi'
 	icon_state = "secure"
 	item_state = "sec-case"
 	desc = "A large briefcase with a digital locking system."
@@ -155,8 +155,8 @@
 
 /obj/item/storage/secure/safe
 	name = "secure safe"
-	icon = 'icons/obj/items/storage.dmi'
-	icon_state = "safe"
+	icon = 'icons/obj/structures/structures.dmi'
+	icon_state = "wallsafe"
 	icon_opened = "safe0"
 	icon_locking = "safeb"
 	icon_sparking = "safespark"
diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm
index 047163713e80..c04de364baf7 100644
--- a/code/game/objects/items/storage/storage.dm
+++ b/code/game/objects/items/storage/storage.dm
@@ -7,7 +7,6 @@
 
 /obj/item/storage
 	name = "storage"
-	icon = 'icons/obj/items/storage.dmi'
 	w_class = SIZE_MEDIUM
 	var/list/can_hold = new/list() //List of objects which this item can store (if set, it can't store anything else)
 	var/list/cant_hold = new/list() //List of objects which this item can't store (in effect only if can_hold isn't set)
diff --git a/code/game/objects/items/storage/surgical_tray.dm b/code/game/objects/items/storage/surgical_tray.dm
index 61f56c35b555..216636951527 100644
--- a/code/game/objects/items/storage/surgical_tray.dm
+++ b/code/game/objects/items/storage/surgical_tray.dm
@@ -1,6 +1,7 @@
 /obj/item/storage/surgical_tray
 	name = "surgical tray"
 	desc = "A small metallic tray covered in sterile tarp. Intended to store surgical tools in a neat and clean fashion."
+	icon = 'icons/obj/items/storage/medical.dmi'
 	icon_state = "surgical_tray"
 	flags_atom = FPRINT|CONDUCT
 	w_class = SIZE_LARGE //Should not fit in backpacks
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
index db0d4e3b269b..a2989ed12f92 100644
--- a/code/game/objects/items/storage/toolbox.dm
+++ b/code/game/objects/items/storage/toolbox.dm
@@ -1,6 +1,7 @@
 /obj/item/storage/toolbox
 	name = "toolbox"
 	desc = "Danger. Very robust."
+	icon = 'icons/obj/items/storage/toolbox.dmi'
 	icon_state = "red"
 	item_state = "toolbox_red"
 	pickup_sound = 'sound/handling/toolbox_pickup.ogg'
diff --git a/code/game/objects/items/storage/toolkit.dm b/code/game/objects/items/storage/toolkit.dm
index cccca19c241c..4339723cac5b 100644
--- a/code/game/objects/items/storage/toolkit.dm
+++ b/code/game/objects/items/storage/toolkit.dm
@@ -1,6 +1,7 @@
 /obj/item/storage/toolkit
 	name = "engineer kit"
 	desc = "An combat engineering toolkit intended to carry electrical and mechanical supplies into combat. With engineering training you can fit this in a backpack."
+	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "toolkit"
 	item_state = "fulton"
 	throw_speed = SPEED_FAST
diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm
index 29c364a59b02..5eb4e7d7cedd 100644
--- a/code/game/objects/items/storage/wallets.dm
+++ b/code/game/objects/items/storage/wallets.dm
@@ -3,6 +3,7 @@
 	desc = "It can hold a few small and personal things."
 	storage_slots = 10
 	icon_state = "wallet"
+	icon = 'icons/obj/items/storage/bags.dmi'
 	w_class = SIZE_TINY
 	can_hold = list(
 		/obj/item/spacecash,
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 59e74100cb5c..f52e8f886468 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -288,15 +288,6 @@
 	new /obj/item/storage/box/donkpockets(src)
 	new /obj/item/storage/box/donkpockets(src)
 
-/* CM doesn't use this.
-/obj/structure/closet/crate/bin
-	desc = "A large bin."
-	name = "Large bin"
-	icon_state = "largebin"
-	icon_opened = "largebinopen"
-	icon_closed = "largebin"
-*/
-
 /obj/structure/closet/crate/radiation
 	name = "radioactive gear crate"
 	desc = "A crate with a radiation sign on it."
diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm
index b3a330ca36b0..2e02be02b8f3 100644
--- a/code/game/objects/structures/inflatable.dm
+++ b/code/game/objects/structures/inflatable.dm
@@ -259,6 +259,7 @@
 /obj/item/storage/briefcase/inflatable
 	name = "inflatable barrier box"
 	desc = "Contains inflatable walls and doors."
+	icon = 'icons/obj/items/storage/boxes.dmi'
 	icon_state = "inf_box"
 	item_state = "syringe_kit"
 	max_storage_space = 21
diff --git a/code/modules/cm_marines/Donator_Kits.dm b/code/modules/cm_marines/Donator_Kits.dm
index 01acf638c2cd..115c1ae5b72c 100644
--- a/code/modules/cm_marines/Donator_Kits.dm
+++ b/code/modules/cm_marines/Donator_Kits.dm
@@ -1,6 +1,7 @@
 /obj/item/storage/box/donator_kit
 	name = "donated box"
 	desc = "A cardboard box stamped with a dollar sign and filled with trinkets. Appears to have been donated by a wealthy sponsor."
+	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "donator_kit"
 	item_state = "giftbag"
 	var/list/donor_gear = list()
diff --git a/code/modules/cm_marines/equipment/guncases.dm b/code/modules/cm_marines/equipment/guncases.dm
index cbbb791f8f0b..33cfeed00307 100644
--- a/code/modules/cm_marines/equipment/guncases.dm
+++ b/code/modules/cm_marines/equipment/guncases.dm
@@ -1,6 +1,7 @@
 /obj/item/storage/box/guncase
 	name = "\improper gun case"
 	desc = "It has space for firearm(s). Sometimes magazines or other munitions as well."
+	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "guncase"
 	w_class = SIZE_HUGE
 	max_w_class = SIZE_HUGE //shouldn't be a problem since we can only store the guns and ammo.
diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm
index d61fc6e8a4c0..7be519896097 100644
--- a/code/modules/cm_marines/equipment/kit_boxes.dm
+++ b/code/modules/cm_marines/equipment/kit_boxes.dm
@@ -2,7 +2,7 @@
 //******************************************Spec Kits****************************************************************/
 
 /obj/item/storage/box/spec
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "kit_case"
 	var/kit_overlay = null
 	w_class = SIZE_HUGE
@@ -178,7 +178,7 @@
 /obj/item/spec_kit
 	name = "specialist kit"
 	desc = "A paper box. Open it and get a specialist kit."
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "spec_kit"
 	var/list/allowed_roles_list = list(JOB_SQUAD_SPECIALIST, JOB_WO_SQUAD_SPECIALIST, JOB_WO_CREWMAN)
 
@@ -274,7 +274,7 @@
 //******************************************PFC Kits****************************************************************/
 
 /obj/item/storage/box/kit
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "pro_case_mini"//to-do redo these sprites, they're out of date by current standards
 	w_class = SIZE_HUGE
 	storage_slots = 12
@@ -288,7 +288,7 @@
 /obj/item/storage/box/kit/Initialize()
 	. = ..()
 	if(pro_case_overlay)
-		overlays += image('icons/obj/items/storage.dmi', "+[pro_case_overlay]")
+		overlays += image('icons/obj/items/storage/kits.dmi', "+[pro_case_overlay]")
 
 /obj/item/storage/box/kit/update_icon()
 	if(!length(contents))
diff --git a/code/modules/cm_marines/equipment/weapons.dm b/code/modules/cm_marines/equipment/weapons.dm
index 085289cd3cbf..076aa37a0f41 100644
--- a/code/modules/cm_marines/equipment/weapons.dm
+++ b/code/modules/cm_marines/equipment/weapons.dm
@@ -2,7 +2,7 @@
 /obj/item/storage/box/m56_system
 	name = "\improper M56 smartgun system case"
 	desc = "A large case containing an M56B Smartgun, M56 combat harness, head mounted sight and powerpack.\nDrag this sprite into you to open it up! NOTE: You cannot put items back inside this case."
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "kit_case"
 	w_class = SIZE_HUGE
 	storage_slots = 7
@@ -31,7 +31,7 @@
 /obj/item/storage/box/m56c_system
 	name = "\improper M56C smartgun system case"
 	desc = "A large case containing an M56C Smartgun, M56 combat harness, head mounted sight, M280 Smartgunner Drum Belt and powerpack.\nDrag this sprite into you to open it up! NOTE: You cannot put items back inside this case."
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "kit_case"
 	w_class = SIZE_HUGE
 	storage_slots = 5
@@ -59,7 +59,7 @@
 /obj/item/storage/box/m56_dirty_system
 	name = "\improper M56D 'Dirty' smartgun system case"
 	desc = "A large case containing an M56D 'Dirty' Smartgun, M56D PMC combat harness and helmet, head mounted sight, M280 Smartgunner Drum Belt and powerpack.\nDrag this sprite into you to open it up! NOTE: You cannot put items back inside this case."
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "kit_case"
 	w_class = SIZE_HUGE
 	storage_slots = 6
diff --git a/code/modules/cm_preds/yaut_items.dm b/code/modules/cm_preds/yaut_items.dm
index 27edf559d3ca..97b0f14f5b9b 100644
--- a/code/modules/cm_preds/yaut_items.dm
+++ b/code/modules/cm_preds/yaut_items.dm
@@ -916,6 +916,7 @@
 	name = "medicomp"
 	desc = "A complex kit of alien tools and medicines."
 	icon_state = "medicomp"
+	icon = 'icons/obj/items/hunter/pred_gear.dmi'
 	use_sound = "toolbox"
 	w_class = SIZE_SMALL
 	storage_flags = STORAGE_FLAGS_DEFAULT
diff --git a/code/modules/cm_tech/implements/ammo_kits.dm b/code/modules/cm_tech/implements/ammo_kits.dm
index bcf267a54ca8..b77db20eeb00 100644
--- a/code/modules/cm_tech/implements/ammo_kits.dm
+++ b/code/modules/cm_tech/implements/ammo_kits.dm
@@ -68,6 +68,7 @@
 /obj/item/storage/box/shotgun
 	name = "incendiary shotgun kit"
 	desc = "A kit containing incendiary shotgun shells."
+	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "incenbuck"
 	storage_slots = 5
 	var/amount = 5
diff --git a/code/modules/cm_tech/implements/engi_czsp.dm b/code/modules/cm_tech/implements/engi_czsp.dm
index f3024129b3eb..f1e9721f9197 100644
--- a/code/modules/cm_tech/implements/engi_czsp.dm
+++ b/code/modules/cm_tech/implements/engi_czsp.dm
@@ -2,7 +2,7 @@
 	name = "engineering upgrade kit"
 	desc = "A kit used to upgrade the defenses of an engineer's sentry. Back in 1980 when the machines tried to break free, it was a single android who laid them low. Now their technology is used widely on the rim."
 
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "upgradekit"
 
 /obj/item/engi_upgrade_kit/Initialize(mapload, ...)
diff --git a/code/modules/cm_tech/implements/implants.dm b/code/modules/cm_tech/implements/implants.dm
index 8dbbe5d11c87..44c817d5ee5a 100644
--- a/code/modules/cm_tech/implements/implants.dm
+++ b/code/modules/cm_tech/implements/implants.dm
@@ -1,6 +1,7 @@
 /obj/item/storage/box/implant
 	name = "implant box"
 	desc = "A sterile metal lockbox housing hypodermic implant injectors."
+	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "implantbox"
 	use_sound = "toolbox"
 	storage_slots = 5
diff --git a/code/modules/cm_tech/implements/medical_czsp.dm b/code/modules/cm_tech/implements/medical_czsp.dm
index 9ec56d35fbb5..69bb90b3ee13 100644
--- a/code/modules/cm_tech/implements/medical_czsp.dm
+++ b/code/modules/cm_tech/implements/medical_czsp.dm
@@ -2,6 +2,7 @@
 /obj/item/storage/box/czsp/first_aid
 	name = "first-aid combat support kit"
 	desc = "Contains upgraded medical kits, nanosplints and an upgraded defibrillator."
+	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "medicbox"
 	storage_slots = 3
 
@@ -15,6 +16,7 @@
 /obj/item/storage/box/czsp/medical
 	name = "medical combat support kit"
 	desc = "Contains upgraded medical kits, nanosplints and an upgraded defibrillator."
+	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "medicbox"
 	storage_slots = 4
 
@@ -27,6 +29,7 @@
 
 /obj/item/storage/box/czsp/medic_upgraded_kits
 	name = "medical upgrade kit"
+	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "upgradedkitbox"
 	desc = "This kit holds upgraded trauma and burn kits, for critical injuries."
 	max_w_class = SIZE_MEDIUM
diff --git a/code/modules/projectiles/ammo_boxes/grenade_packets.dm b/code/modules/projectiles/ammo_boxes/grenade_packets.dm
index 603e2e3a712f..0fe64342060b 100644
--- a/code/modules/projectiles/ammo_boxes/grenade_packets.dm
+++ b/code/modules/projectiles/ammo_boxes/grenade_packets.dm
@@ -1,5 +1,5 @@
 /obj/item/storage/box/packet
-	icon = 'icons/obj/items/weapons/grenade.dmi'
+	icon = 'icons/obj/items/storage/packets.dmi'
 	icon_state = "hedp_packet"
 	w_class = SIZE_MEDIUM//fits into bags
 	storage_slots = 3
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index dfb0ed8288b0..b0cd265974ea 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -1,7 +1,7 @@
 /obj/structure/bigDelivery
 	desc = "A big wrapped package."
 	name = "large parcel"
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/structures/crates.dmi'
 	icon_state = "deliverycloset"
 	var/obj/wrapped = null
 	density = TRUE
@@ -71,7 +71,7 @@
 /obj/structure/bigDelivery/update_icon()
 	overlays = new()
 	if(nameset || examtext)
-		var/image/I = new/image('icons/obj/items/storage.dmi',"delivery_label")
+		var/image/I = new/image('icons/obj/structures/crates.dmi',"delivery_label")
 		if(icon_state == "deliverycloset")
 			I.pixel_x = 2
 			if(label_y == null)
@@ -84,7 +84,7 @@
 			I.pixel_y = -3
 		overlays += I
 	if(src.sortTag)
-		var/image/I = new/image('icons/obj/items/storage.dmi',"delivery_tag")
+		var/image/I = new/image('icons/obj/structures/crates.dmi',"delivery_tag")
 		if(icon_state == "deliverycloset")
 			if(tag_x == null)
 				tag_x = rand(-2, 3)
@@ -108,7 +108,7 @@
 /obj/item/smallDelivery
 	desc = "A small wrapped package."
 	name = "small parcel"
-	icon = 'icons/obj/items/storage.dmi'
+	icon = 'icons/obj/structures/crates.dmi'
 	icon_state = "deliverycrate3"
 	var/obj/item/wrapped = null
 	var/sortTag = null
@@ -180,12 +180,12 @@
 /obj/item/smallDelivery/update_icon()
 	overlays = new()
 	if((nameset || examtext) && icon_state != "deliverycrate1")
-		var/image/I = new/image('icons/obj/items/storage.dmi',"delivery_label")
+		var/image/I = new/image('icons/obj/structures/crates.dmi',"delivery_label")
 		if(icon_state == "deliverycrate5")
 			I.pixel_y = -1
 		overlays += I
 	if(src.sortTag)
-		var/image/I = new/image('icons/obj/items/storage.dmi',"delivery_tag")
+		var/image/I = new/image('icons/obj/structures/crates.dmi',"delivery_tag")
 		switch(icon_state)
 			if("deliverycrate1")
 				I.pixel_y = -5
diff --git a/icons/obj/items/books.dmi b/icons/obj/items/books.dmi
index abd99a7075ed..9b53dc652807 100644
Binary files a/icons/obj/items/books.dmi and b/icons/obj/items/books.dmi differ
diff --git a/icons/obj/items/hunter/pred_gear.dmi b/icons/obj/items/hunter/pred_gear.dmi
index 4501e75a06b3..0e25a24f1aed 100644
Binary files a/icons/obj/items/hunter/pred_gear.dmi and b/icons/obj/items/hunter/pred_gear.dmi differ
diff --git a/icons/obj/items/storage.dmi b/icons/obj/items/storage.dmi
deleted file mode 100644
index ff702586e16b..000000000000
Binary files a/icons/obj/items/storage.dmi and /dev/null differ
diff --git a/icons/obj/items/storage/bag.dmi b/icons/obj/items/storage/bag.dmi
new file mode 100644
index 000000000000..312951909261
Binary files /dev/null and b/icons/obj/items/storage/bag.dmi differ
diff --git a/icons/obj/items/storage/bags.dmi b/icons/obj/items/storage/bags.dmi
new file mode 100644
index 000000000000..dd515525d8ad
Binary files /dev/null and b/icons/obj/items/storage/bags.dmi differ
diff --git a/icons/obj/items/storage/box.dmi b/icons/obj/items/storage/box.dmi
new file mode 100644
index 000000000000..a530753da27a
Binary files /dev/null and b/icons/obj/items/storage/box.dmi differ
diff --git a/icons/obj/items/storage/boxes.dmi b/icons/obj/items/storage/boxes.dmi
new file mode 100644
index 000000000000..dbe84ebeea28
Binary files /dev/null and b/icons/obj/items/storage/boxes.dmi differ
diff --git a/icons/obj/items/storage/briefcases.dmi b/icons/obj/items/storage/briefcases.dmi
new file mode 100644
index 000000000000..7ba5a0382100
Binary files /dev/null and b/icons/obj/items/storage/briefcases.dmi differ
diff --git a/icons/obj/items/storage/holster.dmi b/icons/obj/items/storage/holster.dmi
new file mode 100644
index 000000000000..c367f7e36d66
Binary files /dev/null and b/icons/obj/items/storage/holster.dmi differ
diff --git a/icons/obj/items/storage/holsters.dmi b/icons/obj/items/storage/holsters.dmi
new file mode 100644
index 000000000000..c367f7e36d66
Binary files /dev/null and b/icons/obj/items/storage/holsters.dmi differ
diff --git a/icons/obj/items/storage/kits.dmi b/icons/obj/items/storage/kits.dmi
new file mode 100644
index 000000000000..5c24d40b2474
Binary files /dev/null and b/icons/obj/items/storage/kits.dmi differ
diff --git a/icons/obj/items/storage/medical.dmi b/icons/obj/items/storage/medical.dmi
new file mode 100644
index 000000000000..7a6734989ee3
Binary files /dev/null and b/icons/obj/items/storage/medical.dmi differ
diff --git a/icons/obj/items/storage/mre.dmi b/icons/obj/items/storage/mre.dmi
new file mode 100644
index 000000000000..6e8d7e6de301
Binary files /dev/null and b/icons/obj/items/storage/mre.dmi differ
diff --git a/icons/obj/items/storage/packets.dmi b/icons/obj/items/storage/packets.dmi
new file mode 100644
index 000000000000..c7c2d1612e00
Binary files /dev/null and b/icons/obj/items/storage/packets.dmi differ
diff --git a/icons/obj/items/storage/toolbox.dmi b/icons/obj/items/storage/toolbox.dmi
new file mode 100644
index 000000000000..a18cb3466fed
Binary files /dev/null and b/icons/obj/items/storage/toolbox.dmi differ
diff --git a/icons/obj/items/weapons/grenade.dmi b/icons/obj/items/weapons/grenade.dmi
index ca8aaf9afcd6..589b52cd0a6a 100644
Binary files a/icons/obj/items/weapons/grenade.dmi and b/icons/obj/items/weapons/grenade.dmi differ
diff --git a/icons/obj/structures/crates.dmi b/icons/obj/structures/crates.dmi
index 07ccce5f0abb..d9f66eca1e70 100644
Binary files a/icons/obj/structures/crates.dmi and b/icons/obj/structures/crates.dmi differ
diff --git a/icons/obj/structures/structures.dmi b/icons/obj/structures/structures.dmi
index d96329839a7b..824a412cc8c8 100644
Binary files a/icons/obj/structures/structures.dmi and b/icons/obj/structures/structures.dmi differ