diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm
index 05c5cbd6579..b7051e9a607 100644
--- a/code/datums/outfits/outfit.dm
+++ b/code/datums/outfits/outfit.dm
@@ -503,16 +503,16 @@
 			if(OUTFIT_TAB_PDA)
 				I.desc_extended += "For its many years of service, this model has held a virtual monopoly for PDA models for NanoTrasen. The secret? A lapel pin affixed to the back."
 			if(OUTFIT_PDA_OLD)
-				I.icon = 'icons/obj/pda_old.dmi'
+				I.icon = 'icons/obj/modular_computers/pda_old.dmi'
 				I.desc_extended += "Nicknamed affectionately as the 'Brick', PDA enthusiasts rejoice with the return of an old favorite, retrofitted to new modular computing standards."
 			if(OUTFIT_PDA_RUGGED)
-				I.icon = 'icons/obj/pda_rugged.dmi'
+				I.icon = 'icons/obj/modular_computers/pda_rugged.dmi'
 				I.desc_extended += "EVA enthusiasts and owners of fat fingers just LOVE the huge tactile buttons provided by this model. Prone to butt-dialing, but don't let that hold you back."
 			if(OUTFIT_PDA_SLATE)
-				I.icon = 'icons/obj/pda_slate.dmi'
+				I.icon = 'icons/obj/modular_computers/pda_slate.dmi'
 				I.desc_extended += "A bet between an engineer and a disgruntled scientist, it turns out you CAN make a PDA out of an atmospherics scanner. Also, probably don't tell management, just enjoy."
 			if(OUTFIT_PDA_SMART)
-				I.icon = 'icons/obj/pda_smart.dmi'
+				I.icon = 'icons/obj/modular_computers/pda_smart.dmi'
 				I.desc_extended += "NanoTrasen originally designed this as a portable media player. Unfortunately, Royalty-free and corporate-approved ukulele isn't particularly popular."
 		I.update_icon()
 		if(!H.wrists && H.pda_choice == OUTFIT_WRISTBOUND)
diff --git a/code/datums/uplink/uplink_items.dm b/code/datums/uplink/uplink_items.dm
index 0a16e186677..5a7c30838ed 100644
--- a/code/datums/uplink/uplink_items.dm
+++ b/code/datums/uplink/uplink_items.dm
@@ -197,7 +197,7 @@ GLOBAL_DATUM(uplink, /datum/uplink)
 
 /datum/uplink_item/abstract/log_icon()
 	if(!default_abstract_uplink_icon)
-		default_abstract_uplink_icon = image('icons/obj/pda.dmi', "pda-syn")
+		default_abstract_uplink_icon = image('icons/obj/modular_computers/pda.dmi', "pda-syn")
 
 	return "[icon2html(default_abstract_uplink_icon, usr)]"
 
diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm
index c7426ccc243..4689f17cc18 100644
--- a/code/game/machinery/atmo_control.dm
+++ b/code/game/machinery/atmo_control.dm
@@ -213,7 +213,7 @@
 	circuit = /obj/item/circuitboard/air_management/tank_control
 
 /obj/machinery/computer/general_air_control/large_tank_control/terminal
-	icon = 'icons/obj/machinery/modular_terminal.dmi'
+	icon = 'icons/obj/modular_computers/modular_terminal.dmi'
 	icon_screen = "tank"
 	icon_keyboard = "atmos_key"
 	icon_keyboard_emis = "atmos_key_mask"
@@ -223,13 +223,13 @@
 	light_power_on = 1
 
 /obj/machinery/computer/general_air_control/large_tank_control/wall
-	icon = 'icons/obj/modular_telescreen.dmi'
+	icon = 'icons/obj/modular_computers/modular_telescreen.dmi'
 	icon_state = "telescreen"
 	icon_screen = "engi"
 	density = FALSE
 
 /obj/machinery/computer/general_air_control/large_tank_control/terminal
-	icon = 'icons/obj/machinery/modular_terminal.dmi'
+	icon = 'icons/obj/modular_computers/modular_terminal.dmi'
 	icon_screen = "tank"
 	icon_keyboard = "atmos_key"
 	icon_keyboard_emis = "atmos_key_mask"
@@ -317,7 +317,7 @@
 	INVOKE_ASYNC(radio_connection, TYPE_PROC_REF(/datum/radio_frequency, post_signal), src, signal, filter = RADIO_ATMOSIA)
 
 /obj/machinery/computer/general_air_control/supermatter_core
-	icon = 'icons/obj/machinery/modular_terminal.dmi'
+	icon = 'icons/obj/modular_computers/modular_terminal.dmi'
 	icon_screen = "tank"
 	icon_keyboard = "atmos_key"
 	icon_keyboard_emis = "atmos_key_mask"
diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm
index 274ad538e52..1d741bd9d5d 100644
--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -122,7 +122,7 @@
 
 /obj/machinery/computer/operating/terminal
 	name = "patient monitoring terminal"
-	icon = 'icons/obj/machinery/modular_terminal.dmi'
+	icon = 'icons/obj/modular_computers/modular_terminal.dmi'
 	icon_screen = "med_comp"
 	icon_keyboard = "med_key"
 	icon_keyboard_emis = "med_key_mask"
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index 9225d538ecb..6a394a3ac97 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -4,7 +4,7 @@
 	density = 1
 	anchored = 0
 	name = "computer frame"
-	icon = 'icons/obj/machinery/modular_console.dmi'
+	icon = 'icons/obj/modular_computers/modular_console.dmi'
 	icon_state = "0"
 	build_amt = 5
 	var/state = 0
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index fa78e6d0557..1d812852962 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -266,7 +266,7 @@
 
 /obj/machinery/computer/security/engineering/terminal
 	name = "engineering camera monitor"
-	icon = 'icons/obj/machinery/modular_terminal.dmi'
+	icon = 'icons/obj/modular_computers/modular_terminal.dmi'
 	icon_screen = "engines"
 	icon_keyboard = "power_key"
 	icon_keyboard_emis = "power_key_mask"
@@ -296,7 +296,7 @@
 
 /obj/machinery/computer/security/terminal
 	name = "camera monitor terminal"
-	icon = 'icons/obj/machinery/modular_terminal.dmi'
+	icon = 'icons/obj/modular_computers/modular_terminal.dmi'
 	icon_screen = "cameras"
 	icon_keyboard = "security_key"
 	icon_keyboard_emis = "security_key_mask"
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index 9269adfb313..7e760c3fe9b 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -1,6 +1,6 @@
 /obj/machinery/computer
 	name = "computer"
-	icon = 'icons/obj/machinery/modular_console.dmi'
+	icon = 'icons/obj/modular_computers/modular_console.dmi'
 	icon_state = "computer"
 	layer = ABOVE_STRUCTURE_LAYER
 	density = 1
@@ -250,7 +250,7 @@
 
 /obj/machinery/computer/terminal
 	name = "terminal"
-	icon = 'icons/obj/machinery/modular_terminal.dmi'
+	icon = 'icons/obj/modular_computers/modular_terminal.dmi'
 	is_connected = TRUE
 	has_off_keyboards = TRUE
 	can_pass_under = FALSE
diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm
index e74b20659fb..18a833f5a5c 100644
--- a/code/game/machinery/computer/robot.dm
+++ b/code/game/machinery/computer/robot.dm
@@ -1,7 +1,7 @@
 /obj/machinery/computer/robotics
 	name = "robotics control console"
 	desc = "Used to remotely lockdown or detonate linked cyborgs."
-	icon = 'icons/obj/machinery/modular_console.dmi'
+	icon = 'icons/obj/modular_computers/modular_console.dmi'
 
 	icon_screen = "robot"
 	icon_keyboard = "purple_key"
diff --git a/code/game/machinery/controlhub.dm b/code/game/machinery/controlhub.dm
index b011fbc1620..5c11bcfcf92 100644
--- a/code/game/machinery/controlhub.dm
+++ b/code/game/machinery/controlhub.dm
@@ -2,7 +2,7 @@ ABSTRACT_TYPE(/obj/machinery/controlhub)
 /obj/machinery/controlhub
 	name = "control hub"
 	desc = "A control interface that can manage multiple systems from a single point."
-	icon = 'icons/obj/modular_telescreen.dmi'
+	icon = 'icons/obj/modular_computers/modular_telescreen.dmi'
 	anchored = TRUE
 	density = FALSE
 	opacity = FALSE
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index b192ac6ff1a..ba65f4b3a67 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -272,6 +272,7 @@ Deployable Kits
 	icon = 'icons/obj/storage/briefcase.dmi'
 	icon_state = "inf_box"
 	item_state = "inf_box"
+	contained_sprite = TRUE
 	drop_sound = 'sound/items/drop/backpack.ogg'
 	pickup_sound = 'sound/items/pickup/backpack.ogg'
 
@@ -296,6 +297,7 @@ Deployable Kits
 	icon = 'icons/obj/storage/briefcase.dmi'
 	icon_state = "barrier_kit"
 	item_state = "barrier_kit"
+	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_SMALL
 	kit_product = /obj/machinery/deployable/barrier/legion
 
@@ -340,6 +342,7 @@ Deployable Kits
 	icon = 'icons/obj/storage/briefcase.dmi'
 	icon_state = "inf_box"
 	item_state = "inf_box"
+	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_NORMAL
 	kit_product = /obj/machinery/iv_drip
 	assembly_time = 4 SECONDS
@@ -350,6 +353,7 @@ Deployable Kits
 	icon = 'icons/obj/storage/briefcase.dmi'
 	icon_state = "barrier_kit"
 	item_state = "barrier_kit"
+	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_BULKY
 	kit_product = /obj/structure/bed/stool/chair/remote/mech/portable
 	assembly_time = 20 SECONDS
diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm
index c63f8442887..4f1d92b38b1 100644
--- a/code/game/machinery/doppler_array.dm
+++ b/code/game/machinery/doppler_array.dm
@@ -3,7 +3,7 @@ GLOBAL_LIST_INIT_TYPED(doppler_arrays, /obj/machinery/doppler_array, list())
 /obj/machinery/doppler_array
 	name = "tachyon-doppler array"
 	desc = "A highly precise sensor array which measures the release of quants from decaying tachyons. The doppler shifting of the mirror-image formed by these quants can reveal the size, location and temporal affects of energetic disturbances within a large radius ahead of the array."
-	icon = 'icons/obj/machinery/modular_console.dmi'
+	icon = 'icons/obj/modular_computers/modular_console.dmi'
 	icon_state = "computer"
 
 	anchored = TRUE
diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm
index aaa60891156..6cee693d1ad 100644
--- a/code/game/objects/items/devices/debugger.dm
+++ b/code/game/objects/items/devices/debugger.dm
@@ -1,4 +1,4 @@
-// Used to resolve throwing vendors without going directly into wiring.
+/// Used to resolve throwing vendors without going directly into wiring.
 /obj/item/debugger
 	name = "debugger"
 	desc = "Used to debug electronic equipment, debuggers come with a retractable data cable that can be plugged into most machines."
@@ -15,6 +15,8 @@
 	matter = list(MATERIAL_PLASTIC = 50, DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 20)
 	origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1)
 
+	contained_sprite = TRUE
+
 /obj/item/debugger/mechanics_hints(mob/user, distance, is_adjacent)
 	. += ..()
 	. += "The debugger can be used on vending machines and APCs to identify and resolve any viral infections."
diff --git a/code/game/objects/items/devices/geiger.dm b/code/game/objects/items/devices/geiger.dm
index 4e50630ab7b..8f6ddd58d81 100644
--- a/code/game/objects/items/devices/geiger.dm
+++ b/code/game/objects/items/devices/geiger.dm
@@ -1,9 +1,10 @@
 /obj/item/geiger
 	name = "geiger counter"
 	desc = "A handheld device used for detecting and measuring radiation in an area."
-	icon = 'icons/obj/geiger_counter.dmi'
+	icon = 'icons/obj/item/scanner.dmi'
 	icon_state = "geiger_off"
-	item_state = "multitool"
+	item_state = "geiger"
+	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_SMALL
 	action_button_name = "Toggle geiger counter"
 	matter = list(MATERIAL_PLASTIC = 100, DEFAULT_WALL_MATERIAL = 100, MATERIAL_GLASS = 50)
@@ -58,6 +59,7 @@
 		update_sound(0)
 		return 1
 
+
 	if(!sound_token) update_sound(1)
 
 	switch(radiation_count)
diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
index dfe4d91504b..4793922725b 100644
--- a/code/game/objects/items/devices/multitool.dm
+++ b/code/game/objects/items/devices/multitool.dm
@@ -9,7 +9,7 @@
 	icon = 'icons/obj/item/multitool.dmi'
 	icon_state = "multitool"
 	item_state = "multitool"
-	item_icons = null
+	contained_sprite = TRUE
 	obj_flags = OBJ_FLAG_CONDUCTABLE
 	force = 11
 	w_class = WEIGHT_CLASS_SMALL
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index da3742e261c..3c95a3a43e7 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -10,9 +10,10 @@ BREATH ANALYZER
 /obj/item/healthanalyzer
 	name = "health analyzer"
 	desc = "A hand-held body scanner able to distinguish vital signs of the subject."
-	icon = 'icons/obj/item/healthanalyzer.dmi'
-	icon_state = "health"
-	item_state = "analyzer"
+	icon = 'icons/obj/item/scanner.dmi'
+	icon_state = "healthanalyzer"
+	item_state = "healthanalyzer"
+	contained_sprite = TRUE
 	obj_flags = OBJ_FLAG_CONDUCTABLE
 	slot_flags = SLOT_BELT
 	throwforce = 3
@@ -373,11 +374,12 @@ BREATH ANALYZER
 		to_chat(usr, "The scanner no longer shows limb damage.")
 
 /obj/item/analyzer
-	name = "analyzer"
+	name = "gas analyzer"
 	desc = "A hand-held environmental scanner which reports current gas levels."
-	icon = 'icons/obj/item/air_analyzer.dmi'
-	icon_state = "analyzer"
-	item_state = "analyzer"
+	icon = 'icons/obj/item/scanner.dmi'
+	icon_state = "airanalyzer"
+	item_state = "airanalyzer"
+	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_SMALL
 	obj_flags = OBJ_FLAG_CONDUCTABLE
 	slot_flags = SLOT_BELT
@@ -393,7 +395,7 @@ BREATH ANALYZER
 	if(!user) return
 	var/air = user.return_air()
 	if (!air) return
-
+	flick("[icon_state]-scan", src)
 	return atmosanalyzer_scan(src, air, user)
 
 /obj/item/analyzer/attack_self(mob/user as mob)
@@ -410,9 +412,11 @@ BREATH ANALYZER
 /obj/item/mass_spectrometer
 	name = "mass spectrometer"
 	desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample."
-	icon = 'icons/obj/item/mass_spectrometer.dmi'
+	icon = 'icons/obj/item/scanner.dmi'
 	icon_state = "spectrometer"
-	item_state = "spectrometer"
+	// Reuses the basic health analyzer inhands.
+	item_state = "healthanalyzer"
+	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_SMALL
 	atom_flags = ATOM_FLAG_OPEN_CONTAINER
 	obj_flags = OBJ_FLAG_CONDUCTABLE
@@ -472,8 +476,7 @@ BREATH ANALYZER
 
 /obj/item/mass_spectrometer/adv
 	name = "advanced mass spectrometer"
-	icon_state = "adv_spectrometer"
-	item_state = "adv_spectrometer"
+	icon_state = "spectrometer_adv"
 	details = TRUE
 	origin_tech = list(TECH_MAGNET = 4, TECH_BIO = 2)
 
@@ -486,9 +489,11 @@ BREATH ANALYZER
 /obj/item/reagent_scanner
 	name = "reagent scanner"
 	desc = "A hand-held reagent scanner which identifies chemical agents."
-	icon = 'icons/obj/item/reagent_scanner.dmi'
+	icon = 'icons/obj/item/scanner.dmi'
 	icon_state = "reagent_scanner"
-	item_state = "analyzer"
+	// Reuses the basic health analyzer inhands.
+	item_state = "healthanalyzer"
+	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_SMALL
 	obj_flags = OBJ_FLAG_CONDUCTABLE
 	slot_flags = SLOT_BELT
@@ -521,16 +526,18 @@ BREATH ANALYZER
 
 /obj/item/reagent_scanner/adv
 	name = "advanced reagent scanner"
-	icon_state = "adv_reagent_scanner"
-	item_state = "analyzer"
+	icon_state = "reagent_scanner_adv"
+	// Reuses the advanced health analyzer inhands.
+	item_state = "healthanalyzer_adv"
 	details = 1
 	origin_tech = list(TECH_MAGNET = 4, TECH_BIO = 2)
 
 /obj/item/slime_scanner
 	name = "slime scanner"
-	icon = 'icons/obj/item/slime_scanner.dmi'
+	icon = 'icons/obj/item/scanner.dmi'
 	icon_state = "slime_scanner"
-	item_state = "analyzer"
+	item_state = "slime_scanner"
+	contained_sprite = TRUE
 	origin_tech = list(TECH_BIO = 1)
 	w_class = WEIGHT_CLASS_SMALL
 	obj_flags = OBJ_FLAG_CONDUCTABLE
@@ -574,8 +581,10 @@ BREATH ANALYZER
 /obj/item/price_scanner
 	name = "price scanner"
 	desc = "Using an up-to-date database of various costs and prices, this device estimates the market price of an item up to 0.001% accuracy."
-	icon = 'icons/obj/item/price_scanner.dmi'
+	icon = 'icons/obj/item/scanner.dmi'
 	icon_state = "price_scanner"
+	item_state = "price_scanner"
+	contained_sprite = TRUE
 	item_flags = ITEM_FLAG_NO_BLUDGEON
 	slot_flags = SLOT_BELT
 	w_class = WEIGHT_CLASS_SMALL
@@ -595,9 +604,11 @@ BREATH ANALYZER
 /obj/item/breath_analyzer
 	name = "breath analyzer"
 	desc = "A hand-held breath analyzer that provides a robust amount of information about the subject's respiratory system."
-	icon = 'icons/obj/item/breath_analyzer.dmi'
+	icon = 'icons/obj/item/scanner.dmi'
 	icon_state = "breath_analyzer"
-	item_state = "analyzer"
+	// Reuses the basic health analyzer inhands.
+	item_state = "healthanalyzer"
+	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_SMALL
 	obj_flags = OBJ_FLAG_CONDUCTABLE
 	slot_flags = SLOT_BELT
@@ -705,9 +716,10 @@ BREATH ANALYZER
 /obj/item/advanced_healthanalyzer
 	name = "advanced health analyzer"
 	desc = "An expensive and varied-use health analyzer that prints full-body scans after a short scanning delay."
-	icon = 'icons/obj/item/advanced_healthanalyzer.dmi'
-	icon_state = "health_adv"
-	item_state = "analyzer"
+	icon = 'icons/obj/item/scanner.dmi'
+	icon_state = "healthanalyzer_adv"
+	item_state = "healthanalyzer_adv"
+	contained_sprite = TRUE
 	slot_flags = SLOT_BELT
 	w_class = WEIGHT_CLASS_NORMAL
 	origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 3)
diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm
index 69a912402fa..e7beab69a6a 100644
--- a/code/game/objects/items/devices/spy_bug.dm
+++ b/code/game/objects/items/devices/spy_bug.dm
@@ -65,7 +65,7 @@
 /obj/item/spy_monitor
 	name = "\improper PDA"
 	desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge."
-	icon = 'icons/obj/pda.dmi'
+	icon = 'icons/obj/modular_computers/pda.dmi'
 	icon_state = "pda"
 	item_state = "electronic"
 
diff --git a/code/game/objects/items/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm
index 25aab9dc419..5262b24c433 100644
--- a/code/game/objects/items/devices/t_scanner.dm
+++ b/code/game/objects/items/devices/t_scanner.dm
@@ -3,10 +3,10 @@
 /obj/item/t_scanner
 	name = "\improper T-ray scanner"
 	desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
-	icon = 'icons/obj/item/t_scanner.dmi'
+	icon = 'icons/obj/item/scanner.dmi'
 	icon_state = "t-ray0"
 	item_state = "t-ray"
-
+	contained_sprite = TRUE
 	slot_flags = SLOT_BELT
 	w_class = WEIGHT_CLASS_SMALL
 	matter = list(MATERIAL_PLASTIC = 100, MATERIAL_ALUMINIUM = 50)
@@ -16,10 +16,12 @@
 	var/scan_range = 3
 
 	var/on = 0
-	var/list/active_scanned = list() //assoc list of objects being scanned, mapped to their overlay
-	var/client/user_client //since making sure overlays are properly added and removed is pretty important, so we track the current user explicitly
-
-	var/global/list/overlay_cache = list() //cache recent overlays
+	/// Assoc list of objects being scanned, mapped to their overlay.
+	var/list/active_scanned = list()
+	/// Since making sure overlays are properly added and removed is pretty important, so we track the current user explicitly.
+	var/client/user_client
+	/// Cache recent overlays.
+	var/global/list/overlay_cache = list()
 
 /obj/item/t_scanner/Destroy()
 	. = ..()
@@ -53,7 +55,7 @@
 		set_user_client(null)
 	update_icon()
 
-//If reset is set, then assume the client has none of our overlays, otherwise we only send new overlays.
+/// If reset is set, then assume the client has none of our overlays, otherwise we only send new overlays.
 /obj/item/t_scanner/process()
 	if(!on)
 		return
@@ -87,7 +89,7 @@
 		user_client.images -= active_scanned[O]
 		active_scanned -= O
 
-//creates a new overlay for a scanned object
+/// Creates a new overlay for a scanned object
 /obj/item/t_scanner/proc/get_overlay(obj/scanned)
 	//Use a cache so we don't create a whole bunch of new images just because someone's walking back and forth in a room.
 	//Also means that images are reused if multiple people are using t-rays to look at the same objects.
diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm
index 2555b28cbae..5ba79d571c0 100644
--- a/code/game/objects/items/tools/crowbar.dm
+++ b/code/game/objects/items/tools/crowbar.dm
@@ -63,6 +63,10 @@
 	desc = "A hydraulic rescue tool that functions like a crowbar by applying strong amounts of hydraulic pressure to force open different things. Also known as jaws of life."
 	icon = 'icons/obj/item/hydraulic_rescue_tool.dmi'
 	icon_state = "jawspry"
+	item_state = "jawspry"
+	contained_sprite = TRUE
+	// Really do not want to deal with reconciling sprite implementations between parent and child for now.
+	item_icons = null
 	force = 15
 	throwforce = 1
 	w_class = WEIGHT_CLASS_NORMAL
diff --git a/code/game/objects/items/weapons/autopsy.dm b/code/game/objects/items/weapons/autopsy.dm
index b5fa54fac72..a029a25d414 100644
--- a/code/game/objects/items/weapons/autopsy.dm
+++ b/code/game/objects/items/weapons/autopsy.dm
@@ -5,7 +5,7 @@
 /obj/item/autopsy_scanner
 	name = "autopsy scanner"
 	desc = "Extracts information on wounds."
-	icon = 'icons/obj/item/autopsy_scanner.dmi'
+	icon = 'icons/obj/item/scanner.dmi'
 	icon_state = "autopsy"
 	item_state = "autopsy"
 	contained_sprite = TRUE
diff --git a/code/game/objects/items/weapons/circuitboards/circuitboard.dm b/code/game/objects/items/weapons/circuitboards/circuitboard.dm
index 28d5c671d7b..2ba48210f4d 100644
--- a/code/game/objects/items/weapons/circuitboards/circuitboard.dm
+++ b/code/game/objects/items/weapons/circuitboards/circuitboard.dm
@@ -4,6 +4,7 @@
 	icon = 'icons/obj/module.dmi'
 	icon_state = "id_mod"
 	item_state = "electronic"
+	contained_sprite = TRUE
 	origin_tech = list(TECH_DATA = 2)
 	w_class = WEIGHT_CLASS_SMALL
 	obj_flags = OBJ_FLAG_CONDUCTABLE
diff --git a/code/game/objects/items/weapons/ipc_scanner.dm b/code/game/objects/items/weapons/ipc_scanner.dm
index 272a3377830..0cda9477b08 100644
--- a/code/game/objects/items/weapons/ipc_scanner.dm
+++ b/code/game/objects/items/weapons/ipc_scanner.dm
@@ -1,7 +1,7 @@
 /obj/item/ipc_tag_scanner
 	name = "IPC tag scanner"
 	desc = "A hand-held IPC tag scanner, that, when used to analyze the info of an IPC, will output its tag status and information."
-	icon = 'icons/obj/ipc_utilities.dmi'
+	icon = 'icons/obj/item/scanner.dmi'
 	icon_state = "ipc_tag_scanner"
 	item_state = "ipc_tag_scanner"
 	contained_sprite = TRUE
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index 201f01f9e9b..525219e345a 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -1524,7 +1524,8 @@
 	name = "tau ceti armed forces pamphlet"
 	desc = "A simple pamphlet containing information about the Tau Ceti Armed Forces."
 	icon_state = "tcfl_pamphlet"
-	item_state = "paper"
+	item_state = "tcfl_pamphlet"
+	contained_sprite = TRUE
 	title = "Tau Ceti Armed Forces pamphlet"
 	author = "Tau Ceti Armed Forces recruitment center"
 	pickup_sound = 'sound/items/drop/paper.ogg'
diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm
index fad2ee710fc..c837016e586 100644
--- a/code/game/objects/items/weapons/teleportation.dm
+++ b/code/game/objects/items/weapons/teleportation.dm
@@ -273,7 +273,7 @@ Frequency:
 /obj/item/closet_teleporter
 	name = "closet teleporter"
 	desc = "A device that allows a user to connect two closets into a bluespace network."
-	icon = 'icons/obj/modular_components.dmi'
+	icon = 'icons/obj/modular_computers/modular_components.dmi'
 	icon_state = "cpu_normal_photonic"
 	obj_flags = OBJ_FLAG_CONDUCTABLE
 	w_class = WEIGHT_CLASS_SMALL
diff --git a/code/game/objects/random/tech.dm b/code/game/objects/random/tech.dm
index cc9abbfa91c..4d9316fbc2c 100644
--- a/code/game/objects/random/tech.dm
+++ b/code/game/objects/random/tech.dm
@@ -15,8 +15,8 @@
 /obj/random/technology_scanner
 	name = "random scanner"
 	desc = "This is a random technology scanner."
-	icon = 'icons/obj/item/air_analyzer.dmi'
-	icon_state = "analyzer"
+	icon = 'icons/obj/item/scanner.dmi'
+	icon_state = "airanalyzer"
 	problist = list(
 		/obj/item/t_scanner = 5,
 		/obj/item/radio = 2,
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index c79d57f6f1b..a3284de8a89 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -842,8 +842,9 @@
 /obj/item/cratescanner
 	name = "crate contents scanner"
 	desc = "A  handheld device used to scan and print a manifest of a container's contents. Does not work on locked crates, for privacy reasons."
-	icon = 'icons/obj/item/cratescanner.dmi'
-	icon_state = "cratescanner"
+	icon = 'icons/obj/item/scanner.dmi'
+	icon_state = "crate_scanner"
+	item_state = "crate_scanner"
 	matter = list(DEFAULT_WALL_MATERIAL = 250, MATERIAL_GLASS = 140)
 	w_class = WEIGHT_CLASS_SMALL
 	obj_flags = OBJ_FLAG_CONDUCTABLE
diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm
index a75056b82b0..945279cdbc1 100644
--- a/code/game/objects/structures/inflatable.dm
+++ b/code/game/objects/structures/inflatable.dm
@@ -5,6 +5,8 @@
 	name = "inflatable"
 	w_class = WEIGHT_CLASS_SMALL
 	icon = 'icons/obj/item/inflatables.dmi'
+	item_state = "folded"
+	contained_sprite = TRUE
 	var/deploy_path = null
 
 /obj/item/inflatable/mechanics_hints(mob/user, distance, is_adjacent)
@@ -334,6 +336,8 @@
 	drop_sound = 'sound/items/drop/backpack.ogg'
 	pickup_sound = 'sound/items/pickup/backpack.ogg'
 
+	contained_sprite = TRUE
+
 /obj/item/storage/bag/inflatable/emergency
 	name = "emergency inflatable barrier box"
 	desc = "Contains inflatable walls and doors. This box has emergency labelling on it and outlines that there's only enough inflatables within to secure a small area."
diff --git a/code/modules/cargo/export_scanner.dm b/code/modules/cargo/export_scanner.dm
index aa6423b225e..b7420a7a565 100644
--- a/code/modules/cargo/export_scanner.dm
+++ b/code/modules/cargo/export_scanner.dm
@@ -1,8 +1,10 @@
 /obj/item/export_scanner
 	name = "export scanner"
 	desc = "A device used to check objects against NanoTrasen exports and bounty database."
-	icon = 'icons/obj/item/export_scanner.dmi'
+	icon = 'icons/obj/item/scanner.dmi'
 	icon_state = "export_scanner"
+	item_state = "export_scanner"
+	contained_sprite = TRUE
 	slot_flags = SLOT_BELT
 	item_flags = ITEM_FLAG_NO_BLUDGEON
 	w_class = WEIGHT_CLASS_SMALL
diff --git a/code/modules/heavy_vehicle/components/remote.dm b/code/modules/heavy_vehicle/components/remote.dm
index 44b8cfb42c7..06b3f536f14 100644
--- a/code/modules/heavy_vehicle/components/remote.dm
+++ b/code/modules/heavy_vehicle/components/remote.dm
@@ -1,7 +1,7 @@
 /obj/item/remote_mecha
 	name = "standard exosuit remote upgrade"
 	desc = "A device that, when inserted into an exosuit, allows it to be remotely piloted."
-	icon = 'icons/obj/modular_components.dmi'
+	icon = 'icons/obj/modular_computers/modular_components.dmi'
 	icon_state = "aislot"
 	origin_tech = list(TECH_BLUESPACE = 3, TECH_MATERIAL = 4, TECH_DATA = 4)
 	w_class = WEIGHT_CLASS_SMALL
diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm
index b454938b000..6ba1f885a1e 100644
--- a/code/modules/hydroponics/trays/tray_tools.dm
+++ b/code/modules/hydroponics/trays/tray_tools.dm
@@ -25,7 +25,7 @@
 /// Like a health analyzer, but for plants! Tells you everything you need to know.
 /obj/item/analyzer/plant_analyzer
 	name = "plant analyzer"
-	icon = 'icons/obj/item/plant_analyzer.dmi'
+	icon = 'icons/obj/item/scanner.dmi'
 	icon_state = "hydro"
 	item_state = "hydro"
 	var/form_title
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index e0571a03e98..88c05cad061 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -500,6 +500,7 @@
 		b.dat = paper.info
 		b.name = "blank book"
 		b.icon_state = "book[rand(1,7)]"
+		b.item_state = icon_state
 		qdel(paper)
 		return
 
diff --git a/code/modules/mining/drilling/scanner.dm b/code/modules/mining/drilling/scanner.dm
index f21ee09c934..9c53c4e0fda 100644
--- a/code/modules/mining/drilling/scanner.dm
+++ b/code/modules/mining/drilling/scanner.dm
@@ -1,7 +1,7 @@
 /obj/item/mining_scanner
 	name = "deep ore scanner"
 	desc = "A complex device used to locate ore deep underground."
-	icon = 'icons/obj/item/mining_scanner.dmi'
+	icon = 'icons/obj/item/scanner.dmi'
 	icon_state = "manual_mining"
 	item_state = "manual_mining"
 	contained_sprite = TRUE
diff --git a/code/modules/mining/ore_detector.dm b/code/modules/mining/ore_detector.dm
index 7bca37a9c6c..c73599cc25f 100644
--- a/code/modules/mining/ore_detector.dm
+++ b/code/modules/mining/ore_detector.dm
@@ -9,8 +9,10 @@
 /obj/item/ore_detector
 	name = "ore detector"
 	desc = "A device capable of locating and displaying ores to the average untrained hole explorer."
-	icon = 'icons/obj/item/adv_mining_scanner.dmi'
-	icon_state = "advmining0"
+	icon = 'icons/obj/item/scanner.dmi'
+	icon_state = "mining_adv0"
+	item_state = "mining_adv"
+	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_SMALL
 	slot_flags = SLOT_BELT
 	force = 1
@@ -40,7 +42,7 @@
 	return ..()
 
 /obj/item/ore_detector/update_icon()
-	icon_state = "advmining[active]"
+	icon_state = "mining_adv[active]"
 
 /obj/item/ore_detector/attack_self(mob/user)
 	ui_interact(user)
@@ -128,7 +130,7 @@
 					found_ores = TRUE
 
 		if(found_ores)
-			var/image/ore_ping = image(icon = 'icons/obj/item/adv_mining_scanner.dmi', icon_state = "signal_overlay", loc = anchor, layer = UNDER_HUD_LAYER)
+			var/image/ore_ping = image(icon = 'icons/obj/item/scanner.dmi', icon_state = "signal_overlay", loc = anchor, layer = UNDER_HUD_LAYER)
 			ore_ping.appearance_flags |= KEEP_APART|RESET_ALPHA|RESET_COLOR|RESET_TRANSFORM
 			ore_ping.pixel_x = rand(-6, 6)
 			ore_ping.pixel_y = rand(-6, 6)
diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm
index 4a3c202fb42..b141ae95726 100644
--- a/code/modules/mob/living/bot/medbot.dm
+++ b/code/modules/mob/living/bot/medbot.dm
@@ -127,7 +127,7 @@
 	if(!underlays.len)
 		underlays += image(firstaid_item.icon, firstaid_item.icon_state)
 		var/matrix/M = matrix()
-		var/image/ha_image = image('icons/obj/item/healthanalyzer.dmi', "health")
+		var/image/ha_image = image('icons/obj/item/scanner.dmi', "healthanalyzer")
 		M.Translate(5, 0)
 		ha_image.transform = M
 		underlays += ha_image
@@ -376,7 +376,7 @@
 					to_chat(user, SPAN_NOTICE("You add the health sensor to [src]."))
 					name = "first-aid/robot arm/health analyzer assembly"
 					var/matrix/M = matrix()
-					var/image/ha_image = image('icons/obj/item/healthanalyzer.dmi', "health")
+					var/image/ha_image = image('icons/obj/item/scanner.dmi', "health")
 					M.Translate(5, 0)
 					ha_image.transform = M
 					underlays += ha_image
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 7398053cfa4..4263d8a4bbf 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -271,9 +271,11 @@ There are several things that need to be remembered:
 	if(update_icons)
 		update_icon()
 
-//Overlays for the worn overlay so you can overlay while you overlay
-//eg: ammo counters, primed grenade flashing, etc.
-//"icon_file" is used automatically for inhands etc. to make sure it gets the correct inhand file
+/**
+ * Overlays for the worn overlay so you can overlay while you overlay
+ * eg: ammo counters, primed grenade flashing, etc.
+ * "icon_file" is used automatically for inhands etc. to make sure it gets the correct inhand file
+ */
 /obj/item/proc/worn_overlays(icon_file)
 	. = list()
 	var/mutable_appearance/M = null
@@ -320,7 +322,7 @@ There are several things that need to be remembered:
 			return WORN_GLOVES
 	return ""
 
-//BASE MOB SPRITE
+/// BASE MOB SPRITE
 /mob/living/carbon/human/proc/update_body(var/update_icons=1, var/force_base_icon = FALSE)
 	if (QDELETED(src))
 		return
@@ -436,8 +438,10 @@ There are several things that need to be remembered:
 	if(update_icons)
 		update_icon()
 
-// This proc generates & returns an icon representing a human's hair, using a cached icon from SSicon_cache if possible.
-// If `hair_is_visible` is FALSE, only facial hair will be drawn.
+/**
+ * This proc generates & returns an icon representing a human's hair, using a cached icon from SSicon_cache if possible.
+ * If `hair_is_visible` is FALSE, only facial hair will be drawn.
+ */
 /mob/living/carbon/human/proc/generate_hair_icon(hair_is_visible = TRUE)
 	var/cache_key = "[f_style ? "[f_style][r_facial][g_facial][b_facial]" : "nofacial"]_[(h_style && hair_is_visible) ? "[h_style][r_hair][g_hair][b_hair]" : "nohair"]_[(g_style && g_style != "None" && hair_is_visible) ? "[g_style][r_grad][g_grad][b_grad]" : "nograd"]"
 
@@ -481,7 +485,7 @@ There are several things that need to be remembered:
 
 	return face_standing
 
-//HAIR OVERLAY
+/// HAIR OVERLAY
 /mob/living/carbon/human/proc/update_hair(var/update_icons=1)
 	if (QDELETED(src))
 		return
@@ -560,7 +564,7 @@ There are several things that need to be remembered:
 		update_icon()
 
 /* --------------------------------------- */
-//For legacy support.
+/// For legacy support.
 /mob/living/carbon/human/regenerate_icons()
 	..()
 
diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm
index db9afbb3ef5..786ca5bee22 100644
--- a/code/modules/mob/living/silicon/robot/analyzer.dm
+++ b/code/modules/mob/living/silicon/robot/analyzer.dm
@@ -3,9 +3,11 @@
 //
 /obj/item/robotanalyzer
 	name = "cyborg analyzer"
-	icon = 'icons/obj/item/robotanalyzer.dmi'
+	icon = 'icons/obj/item/scanner.dmi'
 	icon_state = "robotanalyzer"
-	item_state = "analyzer"
+	// Reuses the basic health analyzer inhands.
+	item_state = "healthanalyzer"
+	contained_sprite = TRUE
 	desc = "A hand-held scanner able to diagnose robotic injuries."
 	obj_flags = OBJ_FLAG_CONDUCTABLE
 	slot_flags = SLOT_BELT
@@ -135,9 +137,6 @@
 /obj/item/robotanalyzer/augment
 	name = "retractable cyborg analyzer"
 	desc = "An scanner implanted directly into the hand, popping through the finger. This scanner can diagnose robotic injuries."
-	icon = 'icons/obj/item/robotanalyzer.dmi'
-	icon_state = "robotanalyzer"
-	item_state = "analyzer"
 	slot_flags = null
 	w_class = WEIGHT_CLASS_HUGE
 
diff --git a/code/modules/modular_computers/computers/subtypes/dev_console.dm b/code/modules/modular_computers/computers/subtypes/dev_console.dm
index 209d0353b0a..77f891a7cb8 100644
--- a/code/modules/modular_computers/computers/subtypes/dev_console.dm
+++ b/code/modules/modular_computers/computers/subtypes/dev_console.dm
@@ -1,7 +1,7 @@
 /obj/item/modular_computer/console
 	name = "console"
 	desc = "A stationary computer."
-	icon = 'icons/obj/machinery/modular_console.dmi'
+	icon = 'icons/obj/modular_computers/modular_console.dmi'
 	icon_state = "computer"
 	icon_state_unpowered = "computer"
 	icon_state_screensaver = "standby"
diff --git a/code/modules/modular_computers/computers/subtypes/dev_handheld.dm b/code/modules/modular_computers/computers/subtypes/dev_handheld.dm
index db5e5c928fb..5cc6b6dafbf 100644
--- a/code/modules/modular_computers/computers/subtypes/dev_handheld.dm
+++ b/code/modules/modular_computers/computers/subtypes/dev_handheld.dm
@@ -2,7 +2,7 @@
 	name = "tablet computer"
 	lexical_name = "tablet"
 	desc = "A portable device for your needs on the go."
-	icon = 'icons/obj/modular_tablet.dmi'
+	icon = 'icons/obj/modular_computers/modular_tablet.dmi'
 	icon_state = "tablet"
 	icon_state_unpowered = "tablet"
 	icon_state_menu = "menu"
diff --git a/code/modules/modular_computers/computers/subtypes/dev_laptop.dm b/code/modules/modular_computers/computers/subtypes/dev_laptop.dm
index c4959ac527a..c250bb00139 100644
--- a/code/modules/modular_computers/computers/subtypes/dev_laptop.dm
+++ b/code/modules/modular_computers/computers/subtypes/dev_laptop.dm
@@ -6,7 +6,7 @@
 	hardware_flag = PROGRAM_LAPTOP
 	can_reset = TRUE
 	icon_state_unpowered = "laptop-open"
-	icon = 'icons/obj/modular_laptop.dmi'
+	icon = 'icons/obj/modular_computers/modular_laptop.dmi'
 	icon_state = "laptop-open"
 	icon_state_broken = "laptop-broken"
 	randpixel = 6
diff --git a/code/modules/modular_computers/computers/subtypes/dev_pda.dm b/code/modules/modular_computers/computers/subtypes/dev_pda.dm
index 8d4a2d09239..533248fe018 100644
--- a/code/modules/modular_computers/computers/subtypes/dev_pda.dm
+++ b/code/modules/modular_computers/computers/subtypes/dev_pda.dm
@@ -2,7 +2,7 @@
 	name = "\improper PDA"
 	lexical_name = "tablet"
 	desc = "A personal data assistant. The latest in portable microcomputer solutions from Thinktronic Systems LTD."
-	icon = 'icons/obj/pda.dmi'
+	icon = 'icons/obj/modular_computers/pda.dmi'
 	icon_state = "pda"
 	item_state = "electronic"
 	contained_sprite = TRUE
@@ -18,13 +18,13 @@
 	icon_state_broken = icon_state
 
 /obj/item/modular_computer/handheld/pda/old
-	icon = 'icons/obj/pda_old.dmi'
+	icon = 'icons/obj/modular_computers/pda_old.dmi'
 
 /obj/item/modular_computer/handheld/pda/rugged
-	icon = 'icons/obj/pda_rugged.dmi'
+	icon = 'icons/obj/modular_computers/pda_rugged.dmi'
 
 /obj/item/modular_computer/handheld/pda/slate
-	icon = 'icons/obj/pda_slate.dmi'
+	icon = 'icons/obj/modular_computers/pda_slate.dmi'
 
 /obj/item/modular_computer/handheld/pda/smart
-	icon = 'icons/obj/pda_smart.dmi'
+	icon = 'icons/obj/modular_computers/pda_smart.dmi'
diff --git a/code/modules/modular_computers/computers/subtypes/dev_silicon.dm b/code/modules/modular_computers/computers/subtypes/dev_silicon.dm
index ae9c27326c2..23419091b60 100644
--- a/code/modules/modular_computers/computers/subtypes/dev_silicon.dm
+++ b/code/modules/modular_computers/computers/subtypes/dev_silicon.dm
@@ -3,7 +3,7 @@
 	desc = "A synthetic computer."
 	hardware_flag = PROGRAM_SILICON
 	icon_state_unpowered = "laptop-open"
-	icon = 'icons/obj/modular_laptop.dmi'
+	icon = 'icons/obj/modular_computers/modular_laptop.dmi'
 	icon_state = "laptop-open"
 	icon_state_broken = "laptop-broken"
 	base_idle_power_usage = 5
diff --git a/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm b/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm
index 21e74cdd4d7..a94673eca0f 100644
--- a/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm
+++ b/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm
@@ -1,7 +1,7 @@
 /obj/item/modular_computer/telescreen
 	name = "telescreen"
 	desc = "A stationary wall-mounted touchscreen"
-	icon = 'icons/obj/modular_telescreen.dmi'
+	icon = 'icons/obj/modular_computers/modular_telescreen.dmi'
 	icon_state = "telescreen"
 	icon_state_unpowered = "telescreen"
 	icon_state_menu = "menu"
diff --git a/code/modules/modular_computers/computers/subtypes/dev_wristbound.dm b/code/modules/modular_computers/computers/subtypes/dev_wristbound.dm
index 46dfae05060..820c4b47023 100644
--- a/code/modules/modular_computers/computers/subtypes/dev_wristbound.dm
+++ b/code/modules/modular_computers/computers/subtypes/dev_wristbound.dm
@@ -3,7 +3,7 @@
 	lexical_name = "wristbound"
 	desc = "A portable wristbound device for your needs on the go. Quite comfortable."
 	desc_extended = "A NanoTrasen design, this wristbound computer allows the user to quickly and safely access critical info, without taking their hands out of the equation."
-	icon = 'icons/obj/modular_wristbound.dmi'
+	icon = 'icons/obj/modular_computers/modular_wristbound.dmi'
 	icon_state = "wristbound"
 	icon_state_unpowered = "wristbound"
 	icon_state_menu = "menu"
diff --git a/code/modules/modular_computers/hardware/hardware.dm b/code/modules/modular_computers/hardware/hardware.dm
index 2c2dbb4cc8a..3686dc633a5 100644
--- a/code/modules/modular_computers/hardware/hardware.dm
+++ b/code/modules/modular_computers/hardware/hardware.dm
@@ -1,7 +1,7 @@
 /obj/item/computer_hardware
 	name = "Hardware"
 	desc = "Unknown Hardware."
-	icon = 'icons/obj/modular_components.dmi'
+	icon = 'icons/obj/modular_computers/modular_components.dmi'
 	var/obj/item/modular_computer/parent_computer
 	/// If the hardware uses extra power, change this.
 	var/power_usage = 0
diff --git a/code/modules/modular_computers/items/paper_scanner.dm b/code/modules/modular_computers/items/paper_scanner.dm
index 4046d9dec31..d9e64a519ff 100644
--- a/code/modules/modular_computers/items/paper_scanner.dm
+++ b/code/modules/modular_computers/items/paper_scanner.dm
@@ -1,7 +1,7 @@
 /obj/item/paper_scanner
 	name = "paper scanner"
 	desc = "A simple device that can be used to scan paper or paper bundles in order to digitize them."
-	icon = 'icons/obj/devices/paperscanner.dmi'
+	icon = 'icons/obj/item/scanner.dmi'
 	icon_state = "paperscanner"
 	item_state = "paperscanner"
 	contained_sprite = TRUE
diff --git a/code/modules/overmap/ship_weaponry/_targeting_console.dm b/code/modules/overmap/ship_weaponry/_targeting_console.dm
index 9d17f37e7d8..428c9964beb 100644
--- a/code/modules/overmap/ship_weaponry/_targeting_console.dm
+++ b/code/modules/overmap/ship_weaponry/_targeting_console.dm
@@ -16,7 +16,7 @@
 /obj/machinery/computer/ship/targeting/terminal
 	name = "targeting systems terminal"
 	desc = "A targeting systems terminal using Zavodskoi software."
-	icon = 'icons/obj/machinery/modular_terminal.dmi'
+	icon = 'icons/obj/modular_computers/modular_terminal.dmi'
 	icon_screen = "hostile"
 	icon_keyboard = "red_key"
 	icon_keyboard_emis = "red_key_mask"
diff --git a/code/modules/overmap/ships/computers/engine_control.dm b/code/modules/overmap/ships/computers/engine_control.dm
index 4961ecbf1db..ee74eded8c1 100644
--- a/code/modules/overmap/ships/computers/engine_control.dm
+++ b/code/modules/overmap/ships/computers/engine_control.dm
@@ -19,7 +19,7 @@
 
 /obj/machinery/computer/ship/engines/terminal
 	name = "engine control terminal"
-	icon = 'icons/obj/machinery/modular_terminal.dmi'
+	icon = 'icons/obj/modular_computers/modular_terminal.dmi'
 	icon_screen = "engines"
 	icon_keyboard = "tech_key"
 	icon_keyboard_emis = "tech_key_mask"
diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm
index bef793e9141..c048c8b95fb 100644
--- a/code/modules/overmap/ships/computers/helm.dm
+++ b/code/modules/overmap/ships/computers/helm.dm
@@ -27,7 +27,7 @@
 
 /obj/machinery/computer/ship/helm/terminal
 	name = "helm control terminal"
-	icon = 'icons/obj/machinery/modular_terminal.dmi'
+	icon = 'icons/obj/modular_computers/modular_terminal.dmi'
 	icon_screen = "helm"
 	icon_keyboard = "security_key"
 	icon_keyboard_emis = "security_key_mask"
@@ -329,7 +329,7 @@
 
 /obj/machinery/computer/ship/navigation/terminal
 	name = "navigation terminal"
-	icon = 'icons/obj/machinery/modular_terminal.dmi'
+	icon = 'icons/obj/modular_computers/modular_terminal.dmi'
 	icon_screen = "nav"
 	icon_keyboard = "generic_key"
 	icon_keyboard_emis = "generic_key_mask"
diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm
index 306dc0dd73c..950973b5b3f 100644
--- a/code/modules/overmap/ships/computers/sensors.dm
+++ b/code/modules/overmap/ships/computers/sensors.dm
@@ -38,7 +38,7 @@
 
 /obj/machinery/computer/ship/sensors/terminal
 	name = "sensors terminal"
-	icon = 'icons/obj/machinery/modular_terminal.dmi'
+	icon = 'icons/obj/modular_computers/modular_terminal.dmi'
 	icon_screen = "teleport"
 	icon_keyboard = "teleport_key"
 	icon_keyboard_emis = "teleport_key_mask"
diff --git a/code/modules/overmap/ships/computers/shuttle.dm b/code/modules/overmap/ships/computers/shuttle.dm
index d8133db34b1..bcbb7126360 100644
--- a/code/modules/overmap/ships/computers/shuttle.dm
+++ b/code/modules/overmap/ships/computers/shuttle.dm
@@ -65,7 +65,7 @@
 
 /obj/machinery/computer/shuttle_control/explore/terminal
 	name = "shuttle control terminal"
-	icon = 'icons/obj/machinery/modular_terminal.dmi'
+	icon = 'icons/obj/modular_computers/modular_terminal.dmi'
 	icon_screen = "helm"
 	icon_keyboard = "tech_key"
 	icon_keyboard_emis = "tech_key_mask"
diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm
index f9d6c5ccab4..e1d8d49744e 100644
--- a/code/modules/paperwork/handlabeler.dm
+++ b/code/modules/paperwork/handlabeler.dm
@@ -31,6 +31,7 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "labeler0"
 	item_state = "labeler0"
+	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_SMALL
 	var/label = null
 	var/labels_left = 30
diff --git a/code/modules/power/fusion/consoles/core_control.dm b/code/modules/power/fusion/consoles/core_control.dm
index 04670bcc202..e9bc490b1ae 100644
--- a/code/modules/power/fusion/consoles/core_control.dm
+++ b/code/modules/power/fusion/consoles/core_control.dm
@@ -4,7 +4,7 @@
 
 /obj/machinery/computer/fusion/core_control/terminal
 	name = "\improper INDRA fusion core control"
-	icon = 'icons/obj/machinery/modular_terminal.dmi'
+	icon = 'icons/obj/modular_computers/modular_terminal.dmi'
 	icon_screen = "solar_screen"
 	icon_keyboard = "id_key"
 	icon_keyboard_emis = "id_key_mask"
diff --git a/code/modules/power/fusion/consoles/gyrotron_control.dm b/code/modules/power/fusion/consoles/gyrotron_control.dm
index 9bcd1b61c85..b4d27d896de 100644
--- a/code/modules/power/fusion/consoles/gyrotron_control.dm
+++ b/code/modules/power/fusion/consoles/gyrotron_control.dm
@@ -9,7 +9,7 @@
 
 /obj/machinery/computer/fusion/gyrotron/terminal
 	name = "gyrotron control terminal"
-	icon = 'icons/obj/machinery/modular_terminal.dmi'
+	icon = 'icons/obj/modular_computers/modular_terminal.dmi'
 	icon_screen = "rust_screen"
 	icon_keyboard = "generic_key"
 	icon_keyboard_emis = "generic_key_mask"
diff --git a/code/modules/power/fusion/consoles/injector_control.dm b/code/modules/power/fusion/consoles/injector_control.dm
index 1b0f8f0326f..66c8c50c7a0 100644
--- a/code/modules/power/fusion/consoles/injector_control.dm
+++ b/code/modules/power/fusion/consoles/injector_control.dm
@@ -9,7 +9,7 @@
 
 /obj/machinery/computer/fusion/fuel_control/terminal
 	name = "fuel injection control terminal"
-	icon = 'icons/obj/machinery/modular_terminal.dmi'
+	icon = 'icons/obj/modular_computers/modular_terminal.dmi'
 	icon_screen = "power_screen"
 	icon_keyboard = "med_key"
 	icon_keyboard_emis = "med_key_mask"
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index a363338655e..55c07486c49 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -269,7 +269,7 @@
 /obj/machinery/power/solar_control
 	name = "solar panel control"
 	desc = "A controller for solar panel arrays."
-	icon = 'icons/obj/machinery/modular_console.dmi'
+	icon = 'icons/obj/modular_computers/modular_console.dmi'
 	icon_state = "computer"
 	light_color = LIGHT_COLOR_YELLOW
 	anchored = 1
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index 6248f1b0dd0..5c4873f96d0 100755
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -252,6 +252,8 @@
 	desc = "Used to set the destination of properly wrapped packages."
 	icon = 'icons/obj/item/dest_tagger.dmi'
 	icon_state = "dest_tagger"
+	item_state = "dest_tagger"
+	contained_sprite = TRUE
 	var/currTag = 0
 	matter = list(DEFAULT_WALL_MATERIAL = 250, MATERIAL_GLASS = 140)
 	w_class = WEIGHT_CLASS_SMALL
diff --git a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
index 8108ece7bbc..de6d9dd428a 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
@@ -2,9 +2,10 @@
 /obj/item/ano_scanner
 	name = "Alden-Saraspova counter"
 	desc = "Aids in triangulation of exotic particles."
-	icon = 'icons/obj/xenoarchaeology.dmi'
+	icon = 'icons/obj/item/scanner.dmi'
 	icon_state = "xenoarch_scanner"
 	item_state = "xenoarch_scanner"
+	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_SMALL
 	slot_flags = SLOT_BELT
 	var/nearest_artifact_id = "unknown"
diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
index 547b52f7e2e..9579bcddf09 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
@@ -6,9 +6,10 @@
 /obj/item/depth_scanner
 	name = "depth analysis scanner"
 	desc = "Used to check spatial depth and density of rock outcroppings."
-	icon = 'icons/obj/xenoarchaeology.dmi'
+	icon = 'icons/obj/item/scanner.dmi'
 	icon_state = "depth_scanner"
 	item_state = "depth_scanner"
+	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_SMALL
 	slot_flags = SLOT_BELT
 	var/list/positive_locations = list()
diff --git a/code/modules/synthesized_instruments/real_instruments/Guitar/guitar.dm b/code/modules/synthesized_instruments/real_instruments/Guitar/guitar.dm
index b1b1cc7d4a6..1e54ed7f67a 100644
--- a/code/modules/synthesized_instruments/real_instruments/Guitar/guitar.dm
+++ b/code/modules/synthesized_instruments/real_instruments/Guitar/guitar.dm
@@ -4,6 +4,7 @@
 	icon = 'icons/obj/musician.dmi'
 	icon_state = "guitar"
 	item_state = "guitar"
+	contained_sprite = TRUE
 	slot_flags = SLOT_BACK
 	sound_player = /datum/sound_player/synthesizer
 	path = /datum/instrument/guitar/clean_crisis
@@ -15,6 +16,7 @@
 	icon = 'icons/obj/musician.dmi'
 	icon_state = "eguitar"
 	item_state = "eguitar"
+	contained_sprite = TRUE
 	slot_flags = SLOT_BACK
 	sound_player = /datum/sound_player/synthesizer
 	path = /datum/instrument/guitar
@@ -25,6 +27,7 @@
 	icon = 'icons/obj/tajara_items.dmi'
 	icon_state = "prrama"
 	item_state = "prrama"
+	contained_sprite = TRUE
 
 /obj/item/synthesized_instrument/guitar/prrama/interact(mob/user)
 	if(!istajara(user))
diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm
index cc3ea9817af..af31dd9a624 100644
--- a/code/modules/telesci/gps.dm
+++ b/code/modules/telesci/gps.dm
@@ -6,6 +6,7 @@ GLOBAL_LIST_EMPTY(gps_list)
 	icon = 'icons/obj/item/gps.dmi'
 	icon_state = "gps-com"
 	item_state = "radio"
+	contained_sprite = TRUE
 	w_class = WEIGHT_CLASS_SMALL
 	slot_flags = SLOT_BELT
 	origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2)
diff --git a/html/changelogs/Bat-Inhands.yml b/html/changelogs/Bat-Inhands.yml
new file mode 100644
index 00000000000..4e4336c5098
--- /dev/null
+++ b/html/changelogs/Bat-Inhands.yml
@@ -0,0 +1,67 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: Batrachophrenoboocosmomachia
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Restores or migrates to contained_sprite already-existing inhands sprites for MANY items."
+  - rscadd: "Adds new inhand (coder)sprites for many additional items."
+  - rscadd: "Ports inhand sprites for Hydraulic Rescue Tool from /tg/station."
+  - rscadd: "Adds flick animation to gas analyzer."
+  - bugfix: "Fixes minor issues with several inhand sprites (pixel shifting, mismatched colors, etc)."
+  - code_imp: "Moves sprites for 'scanner' type items to all reside in icons/obj/item/scanner.dmi."
+  - code_imp: "Standardizes icon_state naming conventions for several items."
+  - code_imp: "Updates code docs to use DMDocs."
+  - code_imp: "Consolidates scattered modular_computer sprite files to single subfolder."
+  - qol: "Renames 'analyzer' to 'gas analyzer' for consistency with other 'analyzer' devices."
diff --git a/html/changelogs/BatTomix-Inhands.yml b/html/changelogs/BatTomix-Inhands.yml
new file mode 100644
index 00000000000..c72d174a2ad
--- /dev/null
+++ b/html/changelogs/BatTomix-Inhands.yml
@@ -0,0 +1,13 @@
+# Your name.
+author: Batrachophrenoboocosmomachia, Tomixcomics
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Adds new Inflatables and Inflatables Box inhand sprites (Tomixcomics spriting)."
diff --git a/icons/obj/apc_repair.dmi b/icons/obj/apc_repair.dmi
index df295e2551b..805e51e974b 100644
Binary files a/icons/obj/apc_repair.dmi and b/icons/obj/apc_repair.dmi differ
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index 97a660d0485..10c5b30e4bc 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/devices/paperscanner.dmi b/icons/obj/devices/paperscanner.dmi
deleted file mode 100644
index 1af5e969134..00000000000
Binary files a/icons/obj/devices/paperscanner.dmi and /dev/null differ
diff --git a/icons/obj/geiger_counter.dmi b/icons/obj/geiger_counter.dmi
deleted file mode 100644
index 3e67804ccc4..00000000000
Binary files a/icons/obj/geiger_counter.dmi and /dev/null differ
diff --git a/icons/obj/hacktool.dmi b/icons/obj/hacktool.dmi
index ce2f374a50a..32a59fb2576 100644
Binary files a/icons/obj/hacktool.dmi and b/icons/obj/hacktool.dmi differ
diff --git a/icons/obj/ipc_utilities.dmi b/icons/obj/ipc_utilities.dmi
index b98485fe6e6..1fe75552083 100644
Binary files a/icons/obj/ipc_utilities.dmi and b/icons/obj/ipc_utilities.dmi differ
diff --git a/icons/obj/item/adv_mining_scanner.dmi b/icons/obj/item/adv_mining_scanner.dmi
deleted file mode 100644
index ffbc48ce56d..00000000000
Binary files a/icons/obj/item/adv_mining_scanner.dmi and /dev/null differ
diff --git a/icons/obj/item/advanced_healthanalyzer.dmi b/icons/obj/item/advanced_healthanalyzer.dmi
deleted file mode 100644
index 1e5657ae5fa..00000000000
Binary files a/icons/obj/item/advanced_healthanalyzer.dmi and /dev/null differ
diff --git a/icons/obj/item/air_analyzer.dmi b/icons/obj/item/air_analyzer.dmi
deleted file mode 100644
index 847c696185b..00000000000
Binary files a/icons/obj/item/air_analyzer.dmi and /dev/null differ
diff --git a/icons/obj/item/autopsy_scanner.dmi b/icons/obj/item/autopsy_scanner.dmi
deleted file mode 100644
index 6bda17e0eb7..00000000000
Binary files a/icons/obj/item/autopsy_scanner.dmi and /dev/null differ
diff --git a/icons/obj/item/breath_analyzer.dmi b/icons/obj/item/breath_analyzer.dmi
deleted file mode 100644
index dbef0c6b023..00000000000
Binary files a/icons/obj/item/breath_analyzer.dmi and /dev/null differ
diff --git a/icons/obj/item/cratescanner.dmi b/icons/obj/item/cratescanner.dmi
deleted file mode 100644
index fd5b2bccee6..00000000000
Binary files a/icons/obj/item/cratescanner.dmi and /dev/null differ
diff --git a/icons/obj/item/dest_tagger.dmi b/icons/obj/item/dest_tagger.dmi
index 7cbb0324c6b..52484cabfb7 100644
Binary files a/icons/obj/item/dest_tagger.dmi and b/icons/obj/item/dest_tagger.dmi differ
diff --git a/icons/obj/item/export_scanner.dmi b/icons/obj/item/export_scanner.dmi
deleted file mode 100644
index 3947c16e985..00000000000
Binary files a/icons/obj/item/export_scanner.dmi and /dev/null differ
diff --git a/icons/obj/item/healthanalyzer.dmi b/icons/obj/item/healthanalyzer.dmi
deleted file mode 100644
index 7ee9c251d57..00000000000
Binary files a/icons/obj/item/healthanalyzer.dmi and /dev/null differ
diff --git a/icons/obj/item/hydraulic_rescue_tool.dmi b/icons/obj/item/hydraulic_rescue_tool.dmi
index ac40068a16f..a6b7a32f9c7 100644
Binary files a/icons/obj/item/hydraulic_rescue_tool.dmi and b/icons/obj/item/hydraulic_rescue_tool.dmi differ
diff --git a/icons/obj/item/inflatables.dmi b/icons/obj/item/inflatables.dmi
index 473b81a0237..bb47bfe5500 100644
Binary files a/icons/obj/item/inflatables.dmi and b/icons/obj/item/inflatables.dmi differ
diff --git a/icons/obj/item/mass_spectrometer.dmi b/icons/obj/item/mass_spectrometer.dmi
deleted file mode 100644
index 2df3712d33e..00000000000
Binary files a/icons/obj/item/mass_spectrometer.dmi and /dev/null differ
diff --git a/icons/obj/item/mining_scanner.dmi b/icons/obj/item/mining_scanner.dmi
deleted file mode 100644
index 50573c04123..00000000000
Binary files a/icons/obj/item/mining_scanner.dmi and /dev/null differ
diff --git a/icons/obj/item/plant_analyzer.dmi b/icons/obj/item/plant_analyzer.dmi
deleted file mode 100644
index 7b13bbab2c5..00000000000
Binary files a/icons/obj/item/plant_analyzer.dmi and /dev/null differ
diff --git a/icons/obj/item/price_scanner.dmi b/icons/obj/item/price_scanner.dmi
deleted file mode 100644
index 6cee1b4cc7c..00000000000
Binary files a/icons/obj/item/price_scanner.dmi and /dev/null differ
diff --git a/icons/obj/item/reagent_containers/weldpack.dmi b/icons/obj/item/reagent_containers/weldpack.dmi
index fe3f29ae04f..a6901e00104 100644
Binary files a/icons/obj/item/reagent_containers/weldpack.dmi and b/icons/obj/item/reagent_containers/weldpack.dmi differ
diff --git a/icons/obj/item/reagent_scanner.dmi b/icons/obj/item/reagent_scanner.dmi
deleted file mode 100644
index cdd9077b7d9..00000000000
Binary files a/icons/obj/item/reagent_scanner.dmi and /dev/null differ
diff --git a/icons/obj/item/robotanalyzer.dmi b/icons/obj/item/robotanalyzer.dmi
deleted file mode 100644
index 6ed501d5f92..00000000000
Binary files a/icons/obj/item/robotanalyzer.dmi and /dev/null differ
diff --git a/icons/obj/item/scanner.dmi b/icons/obj/item/scanner.dmi
new file mode 100644
index 00000000000..cbc6186420b
Binary files /dev/null and b/icons/obj/item/scanner.dmi differ
diff --git a/icons/obj/item/slime_scanner.dmi b/icons/obj/item/slime_scanner.dmi
deleted file mode 100644
index c2930820dfa..00000000000
Binary files a/icons/obj/item/slime_scanner.dmi and /dev/null differ
diff --git a/icons/obj/item/t_scanner.dmi b/icons/obj/item/t_scanner.dmi
deleted file mode 100644
index 96d995f9093..00000000000
Binary files a/icons/obj/item/t_scanner.dmi and /dev/null differ
diff --git a/icons/obj/item/taperecorder.dmi b/icons/obj/item/taperecorder.dmi
index b83eae6cfd6..044427aaa9a 100644
Binary files a/icons/obj/item/taperecorder.dmi and b/icons/obj/item/taperecorder.dmi differ
diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi
index 2108e719c52..aeea835eaf3 100644
Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ
diff --git a/icons/obj/modular_components.dmi b/icons/obj/modular_computers/modular_components.dmi
similarity index 100%
rename from icons/obj/modular_components.dmi
rename to icons/obj/modular_computers/modular_components.dmi
diff --git a/icons/obj/machinery/modular_console.dmi b/icons/obj/modular_computers/modular_console.dmi
similarity index 100%
rename from icons/obj/machinery/modular_console.dmi
rename to icons/obj/modular_computers/modular_console.dmi
diff --git a/icons/obj/modular_laptop.dmi b/icons/obj/modular_computers/modular_laptop.dmi
similarity index 100%
rename from icons/obj/modular_laptop.dmi
rename to icons/obj/modular_computers/modular_laptop.dmi
diff --git a/icons/obj/modular_tablet.dmi b/icons/obj/modular_computers/modular_tablet.dmi
similarity index 100%
rename from icons/obj/modular_tablet.dmi
rename to icons/obj/modular_computers/modular_tablet.dmi
diff --git a/icons/obj/modular_telescreen.dmi b/icons/obj/modular_computers/modular_telescreen.dmi
similarity index 100%
rename from icons/obj/modular_telescreen.dmi
rename to icons/obj/modular_computers/modular_telescreen.dmi
diff --git a/icons/obj/machinery/modular_terminal.dmi b/icons/obj/modular_computers/modular_terminal.dmi
similarity index 100%
rename from icons/obj/machinery/modular_terminal.dmi
rename to icons/obj/modular_computers/modular_terminal.dmi
diff --git a/icons/obj/modular_wristbound.dmi b/icons/obj/modular_computers/modular_wristbound.dmi
similarity index 100%
rename from icons/obj/modular_wristbound.dmi
rename to icons/obj/modular_computers/modular_wristbound.dmi
diff --git a/icons/obj/pda.dmi b/icons/obj/modular_computers/pda.dmi
similarity index 100%
rename from icons/obj/pda.dmi
rename to icons/obj/modular_computers/pda.dmi
diff --git a/icons/obj/pda_old.dmi b/icons/obj/modular_computers/pda_old.dmi
similarity index 100%
rename from icons/obj/pda_old.dmi
rename to icons/obj/modular_computers/pda_old.dmi
diff --git a/icons/obj/pda_rugged.dmi b/icons/obj/modular_computers/pda_rugged.dmi
similarity index 100%
rename from icons/obj/pda_rugged.dmi
rename to icons/obj/modular_computers/pda_rugged.dmi
diff --git a/icons/obj/pda_slate.dmi b/icons/obj/modular_computers/pda_slate.dmi
similarity index 100%
rename from icons/obj/pda_slate.dmi
rename to icons/obj/modular_computers/pda_slate.dmi
diff --git a/icons/obj/pda_smart.dmi b/icons/obj/modular_computers/pda_smart.dmi
similarity index 100%
rename from icons/obj/pda_smart.dmi
rename to icons/obj/modular_computers/pda_smart.dmi
diff --git a/icons/obj/module.dmi b/icons/obj/module.dmi
index 75c4a2a3d8d..97fe37fb56d 100644
Binary files a/icons/obj/module.dmi and b/icons/obj/module.dmi differ
diff --git a/icons/obj/storage/courierbag.dmi b/icons/obj/storage/courierbag.dmi
index 60bd541e82c..915b4051e42 100644
Binary files a/icons/obj/storage/courierbag.dmi and b/icons/obj/storage/courierbag.dmi differ
diff --git a/icons/obj/storage/satchel.dmi b/icons/obj/storage/satchel.dmi
index 15b08a4b448..1ade73ad694 100644
Binary files a/icons/obj/storage/satchel.dmi and b/icons/obj/storage/satchel.dmi differ
diff --git a/icons/obj/tank.dmi b/icons/obj/tank.dmi
index e59a05128ce..e7d7cf8f1e1 100644
Binary files a/icons/obj/tank.dmi and b/icons/obj/tank.dmi differ
diff --git a/icons/obj/xenoarchaeology.dmi b/icons/obj/xenoarchaeology.dmi
index 68940b26995..aa80feb1190 100644
Binary files a/icons/obj/xenoarchaeology.dmi and b/icons/obj/xenoarchaeology.dmi differ
diff --git a/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm b/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm
index 798435298c4..8348f1e5b62 100644
--- a/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm
+++ b/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm
@@ -10261,7 +10261,7 @@
 "Gp" = (
 /obj/machinery/constructable_frame/temp_deco{
 	dir = 4;
-	icon = 'icons/obj/machinery/modular_console.dmi';
+	icon = 'icons/obj/modular_computers/modular_console.dmi';
 	icon_state = "1"
 	},
 /turf/simulated/floor/tiled/dark,
@@ -13101,7 +13101,7 @@
 "Py" = (
 /obj/machinery/constructable_frame/temp_deco{
 	dir = 4;
-	icon = 'icons/obj/machinery/modular_console.dmi';
+	icon = 'icons/obj/modular_computers/modular_console.dmi';
 	icon_state = "computer-broken"
 	},
 /turf/simulated/floor/tiled/dark,
diff --git a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dm b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dm
index f8e2f7a96d3..7ea200838e1 100644
--- a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dm
+++ b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dm
@@ -124,7 +124,7 @@
 	name = "shuttle control console"
 	shuttle_tag = "Elyran Naval Shuttle"
 	req_access = list(ACCESS_ELYRAN_NAVAL_INFANTRY_SHIP)
-	icon = 'icons/obj/machinery/modular_terminal.dmi'
+	icon = 'icons/obj/modular_computers/modular_terminal.dmi'
 	icon_screen = "helm"
 	icon_keyboard = "security_key"
 	icon_keyboard_emis = "security_key_mask"
diff --git a/maps/away/ships/sadar_scout/sadar_scout.dm b/maps/away/ships/sadar_scout/sadar_scout.dm
index 94b58fa3d70..9cd19e17cf7 100644
--- a/maps/away/ships/sadar_scout/sadar_scout.dm
+++ b/maps/away/ships/sadar_scout/sadar_scout.dm
@@ -159,7 +159,7 @@
 /obj/machinery/computer/shuttle_control/explore/sadar_shuttle
 	name = "shuttle control console"
 	shuttle_tag = "Modified Salvage Skiff"
-	icon = 'icons/obj/machinery/modular_terminal.dmi'
+	icon = 'icons/obj/modular_computers/modular_terminal.dmi'
 	icon_state = "computer"
 	icon_screen = "helm"
 	icon_keyboard = "security_key"
diff --git a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dm b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dm
index e2583dfa3ac..6034bb39dbf 100644
--- a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dm
+++ b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dm
@@ -159,7 +159,7 @@
 
 // wall nav console
 /obj/machinery/computer/ship/navigation/wall
-	icon = 'icons/obj/modular_telescreen.dmi'
+	icon = 'icons/obj/modular_computers/modular_telescreen.dmi'
 	icon_state = "telescreen"
 	icon_screen = "command"
 	density = FALSE