diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 22ed99086c848..8f8cf922d2778 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -199,9 +199,9 @@
 	desc = "A man-sized pod for entering suspended animation. Dubbed 'cryocoffin' by more cynical spacers, it is pretty barebone, counting on stasis system to keep the victim alive rather than packing extended supply of food or air. Can be ordered with symbols of common religious denominations to be used in space funerals too."
 	on_store_name = "Life Pod Oversight"
 	time_till_despawn = 20 MINUTES
-	icon_state = "redpod0"
-	base_icon_state = "redpod0"
-	occupied_icon_state = "redpod1"
+	icon_state = "lifepod_0"
+	base_icon_state = "lifepod_0"
+	occupied_icon_state = "lifepod_1"
 	var/launched = 0
 	var/datum/gas_mixture/airtank
 
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index b9bf5e0070f54..337d5b977d70d 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -14,6 +14,7 @@
 	randpixel = 7
 	w_class = ITEM_SIZE_NORMAL
 	max_amount = 100
+	icon_state = "tile"
 	icon = 'icons/obj/tiles.dmi'
 
 	force = 1
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index e538cd941c3f4..fcba02a7c2641 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -57,5 +57,6 @@
 	name = "spacesuit helmet"
 	desc = "A special helmet designed for work in a hazardous, low-pressure environment. The tinting can be toggled for flash protection at the cost of worse visibility."
 	icon_state = "spacebowl"
+	item_state = "spacebowl"
 	light_overlay = "yellow_light"
 	tinted = FALSE
diff --git a/code/modules/detectivework/microscope/dnascanner.dm b/code/modules/detectivework/microscope/dnascanner.dm
index e47850d1319a4..5ffddc1bfd22f 100644
--- a/code/modules/detectivework/microscope/dnascanner.dm
+++ b/code/modules/detectivework/microscope/dnascanner.dm
@@ -104,7 +104,6 @@
 	if(bloodsamp)
 		var/obj/item/paper/P = new(src)
 		P.SetName("[src] report #[++report_num]: [bloodsamp.name]")
-		P.stamped = list(/obj/item/stamp)
 		P.SetOverlays("paper_stamped")
 		var/data = "No scan information available."
 		if(bloodsamp.dna != null || bloodsamp.trace_dna != null)
diff --git a/code/modules/paperwork/papershredder.dm b/code/modules/paperwork/papershredder.dm
index d7db824017447..7baa3ef57133d 100644
--- a/code/modules/paperwork/papershredder.dm
+++ b/code/modules/paperwork/papershredder.dm
@@ -133,7 +133,7 @@
 
 /obj/item/shreddedp
 	name = "shredded paper"
-	icon = 'icons/obj/paper.dmi'
+	icon = 'icons/obj/machines/bureaucracy/papershredder.dmi'
 	icon_state = "shredp"
 	randpixel = 5
 	throwforce = 0
diff --git a/code/modules/persistence/noticeboards.dm b/code/modules/persistence/noticeboards.dm
index 5179ee17158a5..5e15834195e01 100644
--- a/code/modules/persistence/noticeboards.dm
+++ b/code/modules/persistence/noticeboards.dm
@@ -214,33 +214,33 @@
 	P.SetName("Memo RE: proper analysis procedure")
 	P.info = "<br>We keep test dummies in pens here for a reason, so standard procedure should be to activate newfound alien artifacts and place the two in close proximity. Promising items I might even approve monkey testing on."
 	P.stamped = list(/obj/item/stamp/rd)
-	P.AddOverlays("paper_stamped_rd")
+	P.AddOverlays("paper_stamp-circle")
 	add_paper(P, skip_icon_update = TRUE)
 
 	P = new()
 	P.SetName("Memo RE: materials gathering")
 	P.info = "Corasang,<br>the hands-on approach to gathering our samples may very well be slow at times, but it's safer than allowing the blundering miners to roll willy-nilly over our dig sites in their mechs, destroying everything in the process. And don't forget the escavation tools on your way out there!<br>- R.W"
 	P.stamped = list(/obj/item/stamp/rd)
-	P.AddOverlays("paper_stamped_rd")
+	P.AddOverlays("paper_stamp-circle")
 	add_paper(P, skip_icon_update = TRUE)
 
 	P = new()
 	P.SetName("Memo RE: ethical quandaries")
 	P.info = "Darion-<br><br>I don't care what his rank is, our business is that of science and knowledge - questions of moral application do not come into this. Sure, so there are those who would employ the energy-wave particles my modified device has managed to abscond for their own personal gain, but I can hardly see the practical benefits of some of these artifacts our benefactors left behind. Ward--"
 	P.stamped = list(/obj/item/stamp/rd)
-	P.AddOverlays("paper_stamped_rd")
+	P.AddOverlays("paper_stamp-circle")
 	add_paper(P, skip_icon_update = TRUE)
 
 	P = new()
 	P.SetName("READ ME! Before you people destroy any more samples")
 	P.info = "how many times do i have to tell you people, these xeno-arch samples are del-i-cate, and should be handled so! careful application of a focussed, concentrated heat or some corrosive liquids should clear away the extraneous carbon matter, while application of an energy beam will most decidedly destroy it entirely - like someone did to the chemical dispenser! W, <b>the one who signs your paychecks</b>"
 	P.stamped = list(/obj/item/stamp/rd)
-	P.AddOverlays("paper_stamped_rd")
+	P.AddOverlays("paper_stamp-circle")
 	add_paper(P, skip_icon_update = TRUE)
 
 	P = new()
 	P.SetName("Reminder regarding the anomalous material suits")
 	P.info = "Do you people think the anomaly suits are cheap to come by? I'm about a hair trigger away from instituting a log book for the damn things. Only wear them if you're going out for a dig, and for god's sake don't go tramping around in them unless you're field testing something, R"
 	P.stamped = list(/obj/item/stamp/rd)
-	P.AddOverlays("paper_stamped_rd")
+	P.AddOverlays("paper_stamp-circle")
 	add_paper(P)
diff --git a/icons/mob/light_overlays.dmi b/icons/mob/light_overlays.dmi
index ff92cea1dabac..688fb9575b440 100644
Binary files a/icons/mob/light_overlays.dmi and b/icons/mob/light_overlays.dmi differ
diff --git a/icons/obj/light_overlays.dmi b/icons/obj/light_overlays.dmi
index 65ce38b92a263..48b4d9e697b73 100644
Binary files a/icons/obj/light_overlays.dmi and b/icons/obj/light_overlays.dmi differ
diff --git a/icons/obj/machines/medical/bodyscanner.dmi b/icons/obj/machines/medical/bodyscanner.dmi
index 3ae302b0c242e..db7d9d375d52e 100644
Binary files a/icons/obj/machines/medical/bodyscanner.dmi and b/icons/obj/machines/medical/bodyscanner.dmi differ
diff --git a/icons/obj/machines/robot_charger.dmi b/icons/obj/machines/robot_charger.dmi
index 152c4f4bf4cad..8180201b4573d 100644
Binary files a/icons/obj/machines/robot_charger.dmi and b/icons/obj/machines/robot_charger.dmi differ
diff --git a/maps/away/mining/mining-signal.dmm b/maps/away/mining/mining-signal.dmm
index 74fc6f32c8a37..3b0841ac8a8d4 100644
--- a/maps/away/mining/mining-signal.dmm
+++ b/maps/away/mining/mining-signal.dmm
@@ -223,19 +223,13 @@
 /turf/simulated/floor/tiled/white,
 /area/outpost/abandoned)
 "aX" = (
-/obj/machinery/r_n_d/circuit_imprinter{
-	icon_state = "circuit_imprinter_t";
-	reason_broken = 1
-	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/machinery/r_n_d/circuit_imprinter,
 /turf/simulated/floor/tiled/white,
 /area/outpost/abandoned)
 "aY" = (
-/obj/machinery/r_n_d/protolathe{
-	icon_state = "protolathe_t";
-	reason_broken = 1
-	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/machinery/r_n_d/protolathe,
 /turf/simulated/floor/tiled/white,
 /area/outpost/abandoned)
 "aZ" = (
@@ -314,11 +308,7 @@
 /turf/simulated/floor/tiled,
 /area/outpost/abandoned)
 "bp" = (
-/obj/machinery/door/airlock/glass/science{
-	icon_state = "door_locked";
-	locked = 1;
-	secured_wires = 1
-	},
+/obj/machinery/door/airlock/glass/science,
 /turf/simulated/floor/tiled,
 /area/outpost/abandoned)
 "bq" = (
@@ -457,19 +447,12 @@
 /obj/random/loot,
 /turf/simulated/floor/tiled/white,
 /area/outpost/abandoned)
-"bH" = (
-/turf/simulated/floor/tiled/white,
-/area/outpost/abandoned)
 "bI" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/trash/cigbutt/cigarbutt,
 /turf/simulated/floor/diona,
 /area/outpost/abandoned)
-"bJ" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/white,
-/area/outpost/abandoned)
 "bK" = (
 /obj/effect/gibspawner/human,
 /turf/simulated/floor/tiled/white,
@@ -703,7 +686,7 @@
 /turf/simulated/floor/wood,
 /area/outpost/abandoned)
 "ct" = (
-/obj/machinery/door/airlock/centcom,
+/obj/machinery/door/airlock/glass/science,
 /obj/machinery/door/blast/regular{
 	id_tag = "mars_blast"
 	},
@@ -1016,9 +999,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/outpost/abandoned)
-"dH" = (
-/turf/simulated/floor/tiled,
-/area/outpost/abandoned)
 "dI" = (
 /obj/effect/decal/cleanable/cobweb,
 /obj/machinery/alarm{
@@ -1198,7 +1178,7 @@
 /turf/simulated/floor/plating,
 /area/outpost/abandoned)
 "en" = (
-/obj/machinery/door/airlock/centcom,
+/obj/machinery/door/airlock/glass/science,
 /turf/simulated/floor/tiled/dark,
 /area/outpost/abandoned)
 "ep" = (
@@ -1705,15 +1685,6 @@
 /obj/machinery/light/small,
 /turf/simulated/floor/tiled/dark,
 /area/outpost/abandoned)
-"fT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/firealarm{
-	dir = 1;
-	icon_state = "firex";
-	pixel_y = -24
-	},
-/turf/simulated/floor/tiled/dark,
-/area/outpost/abandoned)
 "fU" = (
 /obj/structure/table/standard,
 /obj/structure/window/reinforced{
@@ -1798,9 +1769,9 @@
 /turf/simulated/floor/plating,
 /area/outpost/abandoned)
 "gg" = (
-/obj/machinery/computer/power_monitor,
 /obj/effect/decal/cleanable/cobweb2,
 /obj/structure/cable,
+/obj/machinery/computer/modular/preset/engineering,
 /turf/simulated/floor/plating,
 /area/outpost/abandoned)
 "gh" = (
@@ -2527,11 +2498,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/outpost/abandoned)
-"HD" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/white,
-/area/outpost/abandoned)
 "IX" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular/open,
@@ -12151,8 +12117,8 @@ cG
 dF
 dV
 es
-HD
-HD
+bL
+bL
 fF
 cG
 aa
@@ -12754,7 +12720,7 @@ ce
 cx
 cY
 cG
-dH
+aI
 dY
 ev
 eP
@@ -13968,7 +13934,7 @@ aa
 af
 dI
 ea
-dH
+aI
 eV
 cW
 fK
@@ -14372,7 +14338,7 @@ af
 af
 dK
 cW
-dH
+aI
 eX
 cW
 fM
@@ -14577,7 +14543,7 @@ eb
 cW
 eY
 ft
-dH
+aI
 fW
 aH
 aH
@@ -14767,7 +14733,7 @@ aW
 bf
 af
 bs
-bH
+dD
 bP
 af
 cg
@@ -14779,7 +14745,7 @@ ec
 eA
 eW
 fu
-dH
+aI
 af
 af
 gj
@@ -15171,14 +15137,14 @@ az
 bg
 af
 bt
-bJ
+dW
 aA
 af
 bZ
 tb
 bZ
 cy
-dH
+aI
 cW
 cw
 fa
@@ -15575,7 +15541,7 @@ aY
 az
 af
 bv
-bJ
+dW
 bQ
 bX
 ck
@@ -15583,11 +15549,11 @@ vb
 dd
 dt
 dP
-dH
+aI
 cW
 eZ
 cW
-dH
+aI
 af
 af
 gl
@@ -15790,8 +15756,8 @@ eB
 fb
 cw
 fQ
-dH
-dH
+aI
+aI
 cW
 gy
 cw
@@ -15979,7 +15945,7 @@ aA
 az
 af
 bx
-bJ
+dW
 bP
 af
 af
@@ -15995,7 +15961,7 @@ cw
 cW
 cW
 gm
-dH
+aI
 gE
 gL
 gO
@@ -16181,7 +16147,7 @@ aZ
 ax
 af
 aA
-bH
+dD
 bP
 af
 aa
@@ -16199,7 +16165,7 @@ ga
 gn
 gn
 gF
-dH
+aI
 gP
 cW
 cW
@@ -16406,7 +16372,7 @@ cy
 gS
 cW
 gL
-dH
+aI
 hu
 af
 aa
@@ -16608,7 +16574,7 @@ af
 cy
 dM
 eD
-dH
+aI
 hv
 af
 aa
@@ -16787,7 +16753,7 @@ bb
 bi
 af
 bA
-bH
+dD
 bQ
 af
 aa
@@ -16810,7 +16776,7 @@ ab
 IX
 hb
 hj
-dH
+aI
 ht
 af
 aa
@@ -16989,7 +16955,7 @@ af
 af
 af
 bu
-bJ
+dW
 bQ
 af
 af
@@ -17191,7 +17157,7 @@ ao
 ao
 af
 bB
-bJ
+dW
 bP
 bY
 cm
@@ -17393,7 +17359,7 @@ ao
 ao
 bn
 bx
-bH
+dD
 bS
 bZ
 cn
@@ -18403,7 +18369,7 @@ af
 af
 af
 bC
-bJ
+dW
 bP
 bY
 cs
@@ -18605,7 +18571,7 @@ aI
 aQ
 af
 bC
-bJ
+dW
 bU
 af
 af
@@ -18807,7 +18773,7 @@ aI
 aI
 bo
 by
-bH
+dD
 bU
 af
 aa
@@ -19211,7 +19177,7 @@ aI
 aI
 bo
 bx
-bJ
+dW
 bU
 af
 aa
@@ -19413,7 +19379,7 @@ aI
 bk
 af
 bx
-bJ
+dW
 bV
 af
 aa
@@ -19615,7 +19581,7 @@ aI
 aI
 bp
 bx
-bH
+dD
 bP
 af
 af
@@ -19817,8 +19783,8 @@ af
 af
 af
 bx
-bJ
-bJ
+dW
+dW
 bO
 af
 cN
@@ -20019,7 +19985,7 @@ ap
 aH
 af
 aA
-bH
+dD
 aA
 bP
 af
@@ -20221,7 +20187,7 @@ aI
 aa
 aa
 aa
-bH
+dD
 aA
 aA
 af
@@ -20424,7 +20390,7 @@ aa
 aa
 aa
 aa
-bH
+dD
 bP
 af
 cQ
@@ -20435,7 +20401,7 @@ en
 dT
 dT
 dT
-fT
+eL
 af
 af
 aa
@@ -20626,7 +20592,7 @@ aI
 aa
 aa
 aa
-bH
+dD
 bU
 af
 cQ
@@ -21029,8 +20995,8 @@ aH
 aI
 bq
 bE
-bJ
-bJ
+dW
+dW
 bP
 af
 cR
@@ -21232,7 +21198,7 @@ aI
 af
 bF
 aH
-bH
+dD
 bP
 ct
 cS
diff --git a/maps/random_ruins/exoplanet_ruins/oldlab/oldlab.dmm b/maps/random_ruins/exoplanet_ruins/oldlab/oldlab.dmm
index 92454c6b408b4..dfca7b43c9362 100644
--- a/maps/random_ruins/exoplanet_ruins/oldlab/oldlab.dmm
+++ b/maps/random_ruins/exoplanet_ruins/oldlab/oldlab.dmm
@@ -2132,7 +2132,7 @@
 /obj/effect/floor_decal/techfloor{
 	dir = 1
 	},
-/obj/machinery/computer/power_monitor,
+/obj/machinery/computer/modular/preset/engineering,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/map_template/oldlab/solars)
 "Ku" = (
@@ -2328,6 +2328,11 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/map_template/oldlab/station/breakroom)
+"MB" = (
+/obj/structure/grille,
+/obj/machinery/computer/modular/preset/engineering,
+/turf/simulated/floor/exoplanet/concrete/reinforced,
+/area/map_template/oldlab/solars)
 "ME" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -3084,7 +3089,7 @@
 /area/map_template/oldlab/solars)
 
 (1,1,1) = {"
-Xx
+MB
 Xx
 Xx
 Xx