diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm
index 9da509d16c5a..2ba257101b1a 100644
--- a/code/game/objects/items/props/helmetgarb.dm
+++ b/code/game/objects/items/props/helmetgarb.dm
@@ -542,8 +542,8 @@
 /obj/item/prop/helmetgarb/family_photo
 	name = "family photo"
 	desc = ""
-	icon = 'icons/obj/items/items.dmi'
-	icon_state = "photo"
+	icon = 'icons/obj/items/paper.dmi'
+	icon_state = "photo_item"
 	///The human who spawns with the photo
 	var/datum/weakref/owner
 	///The belonging human name
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index 38eb0f93f072..c8559866b68f 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -11,7 +11,7 @@
 *******/
 /obj/item/device/camera_film
 	name = "film cartridge"
-	icon = 'icons/obj/items/items.dmi'
+	icon = 'icons/obj/items/paper.dmi'
 	desc = "A camera film cartridge. Insert it into a camera to reload it."
 	icon_state = "film"
 	item_state = "electropack"
@@ -27,8 +27,8 @@
 ********/
 /obj/item/photo
 	name = "photo"
-	icon = 'icons/obj/items/items.dmi'
-	icon_state = "photo"
+	icon = 'icons/obj/items/paper.dmi'
+	icon_state = "photo_item"
 	item_state = "paper"
 	w_class = SIZE_TINY
 	var/icon/img //Big photo image
diff --git a/icons/obj/bodybag.dmi b/icons/obj/bodybag.dmi
index 157a7692b2a8..3a60dbaf51fa 100644
Binary files a/icons/obj/bodybag.dmi and b/icons/obj/bodybag.dmi differ
diff --git a/icons/obj/cryobag.dmi b/icons/obj/cryobag.dmi
deleted file mode 100644
index d27485711e65..000000000000
Binary files a/icons/obj/cryobag.dmi and /dev/null differ
diff --git a/icons/obj/items/Marine_Research.dmi b/icons/obj/items/Marine_Research.dmi
index 972008a9210c..1b7623440f4d 100644
Binary files a/icons/obj/items/Marine_Research.dmi and b/icons/obj/items/Marine_Research.dmi differ
diff --git a/icons/obj/items/bedsheets.dmi b/icons/obj/items/bedsheets.dmi
new file mode 100644
index 000000000000..933a8094e239
Binary files /dev/null and b/icons/obj/items/bedsheets.dmi differ
diff --git a/icons/obj/items/ceramic_plates.dmi b/icons/obj/items/ceramic_plates.dmi
new file mode 100644
index 000000000000..3b63f4997d23
Binary files /dev/null and b/icons/obj/items/ceramic_plates.dmi differ
diff --git a/icons/obj/items/cigarettes.dmi b/icons/obj/items/cigarettes.dmi
index 89b3ca2195fa..7f24bc848962 100644
Binary files a/icons/obj/items/cigarettes.dmi and b/icons/obj/items/cigarettes.dmi differ
diff --git a/icons/obj/items/crayons.dmi b/icons/obj/items/crayons.dmi
deleted file mode 100644
index 1c7053a8a958..000000000000
Binary files a/icons/obj/items/crayons.dmi and /dev/null differ
diff --git a/icons/obj/items/cup.dmi b/icons/obj/items/cup.dmi
deleted file mode 100644
index adc3e4e2e4d4..000000000000
Binary files a/icons/obj/items/cup.dmi and /dev/null differ
diff --git a/icons/obj/items/drinks.dmi b/icons/obj/items/drinks.dmi
index 1203f3d18edd..6ce7b7eeb2a5 100644
Binary files a/icons/obj/items/drinks.dmi and b/icons/obj/items/drinks.dmi differ
diff --git a/icons/obj/items/economy.dmi b/icons/obj/items/economy.dmi
new file mode 100644
index 000000000000..a9fc4b371187
Binary files /dev/null and b/icons/obj/items/economy.dmi differ
diff --git a/icons/obj/items/floor_tiles.dmi b/icons/obj/items/floor_tiles.dmi
new file mode 100644
index 000000000000..438aa98966e0
Binary files /dev/null and b/icons/obj/items/floor_tiles.dmi differ
diff --git a/icons/obj/items/items.dmi b/icons/obj/items/items.dmi
index 81a0e526f1b7..22858084e3b3 100644
Binary files a/icons/obj/items/items.dmi and b/icons/obj/items/items.dmi differ
diff --git a/icons/obj/items/medical_stacks.dmi b/icons/obj/items/medical_stacks.dmi
new file mode 100644
index 000000000000..e574cc5e5011
Binary files /dev/null and b/icons/obj/items/medical_stacks.dmi differ
diff --git a/icons/obj/items/misc.dmi b/icons/obj/items/misc.dmi
deleted file mode 100644
index 5e1b9cdca434..000000000000
Binary files a/icons/obj/items/misc.dmi and /dev/null differ
diff --git a/icons/obj/items/notepads.dmi b/icons/obj/items/notepads.dmi
deleted file mode 100644
index 007be4dc0e71..000000000000
Binary files a/icons/obj/items/notepads.dmi and /dev/null differ
diff --git a/icons/obj/items/paint.dmi b/icons/obj/items/paint.dmi
new file mode 100644
index 000000000000..e540b5bdfe72
Binary files /dev/null and b/icons/obj/items/paint.dmi differ
diff --git a/icons/obj/items/paper.dmi b/icons/obj/items/paper.dmi
index b15d4be6076d..bb24ac6b3377 100644
Binary files a/icons/obj/items/paper.dmi and b/icons/obj/items/paper.dmi differ
diff --git a/icons/obj/items/plush.dmi b/icons/obj/items/plush.dmi
deleted file mode 100644
index 8596fd69df9c..000000000000
Binary files a/icons/obj/items/plush.dmi and /dev/null differ
diff --git a/icons/obj/items/policetape.dmi b/icons/obj/items/policetape.dmi
deleted file mode 100644
index 326173a88084..000000000000
Binary files a/icons/obj/items/policetape.dmi and /dev/null differ
diff --git a/icons/obj/items/radio.dmi b/icons/obj/items/radio.dmi
index 6352a14baef0..5ef6000c37c8 100644
Binary files a/icons/obj/items/radio.dmi and b/icons/obj/items/radio.dmi differ
diff --git a/icons/obj/items/security.dmi b/icons/obj/items/security.dmi
new file mode 100644
index 000000000000..1c6baddcdfc4
Binary files /dev/null and b/icons/obj/items/security.dmi differ
diff --git a/icons/obj/items/stacks.dmi b/icons/obj/items/stacks.dmi
new file mode 100644
index 000000000000..346bd390b801
Binary files /dev/null and b/icons/obj/items/stacks.dmi differ
diff --git a/icons/obj/items/syringe.dmi b/icons/obj/items/syringe.dmi
index d08b2a8c2d9f..0b2f11fe4fd1 100644
Binary files a/icons/obj/items/syringe.dmi and b/icons/obj/items/syringe.dmi differ
diff --git a/icons/obj/items/table_parts.dmi b/icons/obj/items/table_parts.dmi
new file mode 100644
index 000000000000..e44e2eba8f2c
Binary files /dev/null and b/icons/obj/items/table_parts.dmi differ
diff --git a/icons/obj/items/tools.dmi b/icons/obj/items/tools.dmi
new file mode 100644
index 000000000000..f840ecd8c99e
Binary files /dev/null and b/icons/obj/items/tools.dmi differ
diff --git a/icons/obj/items/toy.dmi b/icons/obj/items/toy.dmi
index 4a40561475c6..e69b438cfca3 100644
Binary files a/icons/obj/items/toy.dmi and b/icons/obj/items/toy.dmi differ
diff --git a/icons/obj/items/xeno_tag.dmi b/icons/obj/items/xeno_tag.dmi
deleted file mode 100644
index 19315fce0b26..000000000000
Binary files a/icons/obj/items/xeno_tag.dmi and /dev/null differ
diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi
index 5989745e26eb..5231c4eef8cb 100644
Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index 1dc934be2103..94370a35f355 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/obj/structures/props/chairs.dmi b/icons/obj/structures/props/chairs.dmi
new file mode 100644
index 000000000000..1d9e32e513d2
Binary files /dev/null and b/icons/obj/structures/props/chairs.dmi differ
diff --git a/icons/obj/structures/props/sofas.dmi b/icons/obj/structures/props/sofas.dmi
deleted file mode 100644
index 29e390c9aa10..000000000000
Binary files a/icons/obj/structures/props/sofas.dmi and /dev/null differ
diff --git a/icons/obj/structures/props/stationobjs.dmi b/icons/obj/structures/props/stationobjs.dmi
index 09868e92fd88..77aa65c33551 100644
Binary files a/icons/obj/structures/props/stationobjs.dmi and b/icons/obj/structures/props/stationobjs.dmi differ