diff --git a/archive/maps/cynosure/cynosure-2.dmm b/archive/maps/cynosure/cynosure-2.dmm
index 807e9dcf43f..3168736fc8d 100644
--- a/archive/maps/cynosure/cynosure-2.dmm
+++ b/archive/maps/cynosure/cynosure-2.dmm
@@ -8906,7 +8906,6 @@
 "eqk" = (
 /obj/structure/window/reinforced,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/machinery/camera/network/civilian{
@@ -21631,7 +21630,6 @@
 /area/surface/station/engineering/atmos)
 "kwY" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /obj/structure/sign/christmas/lights{
@@ -30547,7 +30545,6 @@
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/grey/border,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /obj/effect/floor_decal/spline/plain,
@@ -42043,7 +42040,6 @@
 	},
 /obj/item/clothing/glasses/science,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /obj/machinery/light,
@@ -50317,7 +50313,6 @@
 	dir = 1
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /turf/simulated/floor/tiled/white,
diff --git a/archive/maps/cynosure/cynosure-3.dmm b/archive/maps/cynosure/cynosure-3.dmm
index 6689c57cb8c..7c30d797bd9 100644
--- a/archive/maps/cynosure/cynosure-3.dmm
+++ b/archive/maps/cynosure/cynosure-3.dmm
@@ -11550,7 +11550,6 @@
 /area/surface/station/hallway/primary/secondfloor/east)
 "hMg" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /turf/simulated/floor/carpet/sblucarpet,
@@ -15302,7 +15301,6 @@
 	dir = 4
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /obj/machinery/light{
@@ -16263,7 +16261,6 @@
 /obj/structure/table/wooden_reinforced,
 /obj/item/flashlight/lamp/green,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /turf/simulated/floor/carpet,
@@ -18227,7 +18224,6 @@
 	},
 /obj/effect/floor_decal/corner/lime/diagonal,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled/neutral,
@@ -31476,7 +31472,6 @@
 	},
 /obj/item/bedsheet/medical,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/effect/floor_decal/corner/pink/border{
@@ -35997,7 +35992,6 @@
 	},
 /obj/item/bedsheet/medical,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/effect/floor_decal/corner/pink/border{
diff --git a/archive/maps/cynosure/cynosure-6.dmm b/archive/maps/cynosure/cynosure-6.dmm
index 95ac6376a5a..7896b08d79c 100644
--- a/archive/maps/cynosure/cynosure-6.dmm
+++ b/archive/maps/cynosure/cynosure-6.dmm
@@ -19534,9 +19534,7 @@
 /turf/space/transit/east,
 /area/space)
 "vCc" = (
-/turf/unsimulated/floor{
-	icon_state = "sandwater"
-	},
+/turf/unsimulated/floor,
 /area/beach)
 "vCL" = (
 /obj/structure/table/steel,
@@ -22007,7 +22005,6 @@
 	dir = 8
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/carpet,
diff --git a/archive/maps/northern_star/polaris-2.dmm b/archive/maps/northern_star/polaris-2.dmm
index 55d8e85f285..4b06feca2ef 100644
--- a/archive/maps/northern_star/polaris-2.dmm
+++ b/archive/maps/northern_star/polaris-2.dmm
@@ -678,7 +678,7 @@
 "nb" = (/obj/structure/table/reinforced,/obj/item/pda/ert,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)
 "nc" = (/obj/effect/floor_decal/corner/purple{dir = 9},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops)
 "nd" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops)
-"ne" = (/turf/unsimulated/wall{icon = 'icons/misc/title.dmi'; icon_state = "title"},/area)
+"ne" = (/turf/unsimulated/wall,/area)
 "nf" = (/turf/unsimulated/wall,/area/centcom/specops)
 "ng" = (/obj/machinery/mech_recharger,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops)
 "nh" = (/obj/mecha/combat/gygax/dark,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops)
diff --git a/archive/maps/southern_cross/southern_cross-1.dmm b/archive/maps/southern_cross/southern_cross-1.dmm
index d5c62f70480..d6116bbea8c 100644
--- a/archive/maps/southern_cross/southern_cross-1.dmm
+++ b/archive/maps/southern_cross/southern_cross-1.dmm
@@ -27310,7 +27310,6 @@
 /area/security/main)
 "bbj" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /obj/machinery/vending/cola,
@@ -27472,7 +27471,6 @@
 	dir = 1
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /obj/machinery/light,
@@ -33576,7 +33574,6 @@
 	pixel_x = 32
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /obj/effect/floor_decal/borderfloorblack{
@@ -45002,7 +44999,6 @@
 "bGE" = (
 /obj/structure/table/steel,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /obj/effect/floor_decal/borderfloorblack{
@@ -46272,7 +46268,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/light,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /obj/item/tabloid,
@@ -55385,7 +55380,6 @@
 	},
 /obj/effect/floor_decal/corner/white/diagonal,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled,
@@ -65663,7 +65657,6 @@
 	pixel_y = 30
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /turf/simulated/floor/tiled/white,
@@ -65882,7 +65875,6 @@
 /obj/item/clothing/glasses/science,
 /obj/item/clothing/glasses/science,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /obj/machinery/light{
@@ -74605,7 +74597,6 @@
 	dir = 4
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /turf/simulated/floor/carpet/sblucarpet,
@@ -78708,7 +78699,6 @@
 /obj/structure/table/glass,
 /obj/machinery/computer/med_data/laptop,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /obj/machinery/light{
@@ -79276,7 +79266,6 @@
 /obj/structure/bed/padded,
 /obj/item/bedsheet/brown,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /turf/simulated/floor/carpet,
@@ -79856,7 +79845,6 @@
 /obj/structure/bed/padded,
 /obj/item/bedsheet/brown,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 32
 	},
 /turf/simulated/floor/carpet,
@@ -83471,7 +83459,6 @@
 	pixel_x = 21
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	layer = 4;
 	pixel_y = -32
 	},
@@ -83517,7 +83504,6 @@
 	pixel_x = 30
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	layer = 4;
 	pixel_y = -32
 	},
@@ -86688,7 +86674,6 @@
 	dir = 4
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/lino,
@@ -90710,7 +90695,6 @@
 	dir = 1
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/machinery/light{
@@ -90741,7 +90725,6 @@
 	dir = 1
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /obj/machinery/light{
@@ -98832,7 +98815,6 @@
 /obj/item/folder/blue_hop,
 /obj/item/pen/multi,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/carpet,
@@ -98966,7 +98948,6 @@
 /obj/item/folder/white_cmo,
 /obj/item/pen/multi,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/carpet/blue,
@@ -98983,7 +98964,6 @@
 /obj/item/folder/white_rd,
 /obj/item/pen/multi,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /turf/simulated/floor/carpet,
@@ -101403,7 +101383,6 @@
 	dir = 8
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/tiled/freezer,
@@ -101420,7 +101399,6 @@
 /obj/item/folder/yellow_ce,
 /obj/item/pen/multi,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /turf/simulated/floor/carpet,
@@ -101582,7 +101560,6 @@
 /obj/item/folder/red_hos,
 /obj/item/pen/multi,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/carpet,
@@ -101592,7 +101569,6 @@
 	dir = 8
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/structure/table/standard,
@@ -102093,7 +102069,6 @@
 "dNA" = (
 /obj/machinery/vending/coffee,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /turf/simulated/floor/wood,
@@ -102178,7 +102153,6 @@
 /obj/structure/table/wooden_reinforced,
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32
 	},
 /obj/item/flashlight/lamp/green,
@@ -106173,7 +106147,6 @@
 /area/construction/seconddeck/construction2)
 "dVc" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = -32
 	},
 /obj/item/stack/cable_coil{
diff --git a/archive/maps/southern_cross/southern_cross-3.dmm b/archive/maps/southern_cross/southern_cross-3.dmm
index 6a7201183a2..37f58085149 100644
--- a/archive/maps/southern_cross/southern_cross-3.dmm
+++ b/archive/maps/southern_cross/southern_cross-3.dmm
@@ -6083,7 +6083,6 @@
 /obj/structure/table/standard,
 /obj/item/storage/box/cups,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32;
 	pixel_y = 0
 	},
@@ -8033,7 +8032,6 @@
 /area/surface/outpost/main/dorms)
 "rl" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 0;
 	pixel_y = 32
 	},
@@ -8186,7 +8184,6 @@
 /area/surface/outpost/main/dorms)
 "ry" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 0;
 	pixel_y = 32
 	},
@@ -8340,7 +8337,6 @@
 "rO" = (
 /obj/structure/table/standard,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32;
 	pixel_y = 0
 	},
@@ -8970,7 +8966,6 @@
 "tb" = (
 /obj/structure/table/standard,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32;
 	pixel_y = 0
 	},
@@ -9070,7 +9065,6 @@
 /area/surface/outpost/main/pool)
 "tm" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32;
 	pixel_y = 0
 	},
@@ -9114,7 +9108,6 @@
 /area/surface/outpost/main/pool)
 "ts" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32;
 	pixel_y = 0
 	},
@@ -9760,7 +9753,6 @@
 "vf" = (
 /obj/structure/table/reinforced,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 0;
 	pixel_y = 32
 	},
@@ -9790,7 +9782,6 @@
 "vi" = (
 /obj/structure/table/standard,
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = -32;
 	pixel_y = 0
 	},
diff --git a/archive/maps/southern_cross/southern_cross-6.dmm b/archive/maps/southern_cross/southern_cross-6.dmm
index e2314b6e01f..9f4cfce79f2 100644
--- a/archive/maps/southern_cross/southern_cross-6.dmm
+++ b/archive/maps/southern_cross/southern_cross-6.dmm
@@ -2239,7 +2239,7 @@
 "Rc" = (/obj/item/pizzabox/meat,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start)
 "Rd" = (/obj/item/bedsheet/clown,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start)
 "Re" = (/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/space)
-"Rf" = (/turf/unsimulated/wall{icon = 'icons/misc/title.dmi'; icon_state = "title"},/area/space)
+"Rf" = (/turf/unsimulated/wall,/area/space)
 "Rg" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; tiles = 0},/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/simulated/mineral,/area/space)
 "Rh" = (/turf/unsimulated/wall,/area/tdome/tdomeobserve)
 "Ri" = (/obj/machinery/door/blast/regular{id = "thunderdomeaxe"; name = "Axe Supply"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome/tdome1)
diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm
index b6a4c667faf..6ce0748d57d 100644
--- a/code/game/machinery/camera/presets.dm
+++ b/code/game/machinery/camera/presets.dm
@@ -119,7 +119,7 @@ var/global/list/engineering_networks = list(
 // X-RAY
 
 /obj/machinery/camera/xray
-	icon_state = "xraycam" // Thanks to Krutchen for the icons.
+	icon_state = "camera" // Thanks to Krutchen for the icons. // no xraycam in vr icons
 
 /obj/machinery/camera/xray/command
 	network = list(NETWORK_COMMAND)
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index f312853691b..f5873b5d61c 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -200,7 +200,7 @@ GLOBAL_LIST_EMPTY(entertainment_screens)
 /obj/machinery/computer/security/nuclear
 	name = "head mounted camera monitor"
 	desc = "Used to access the built-in cameras in helmets."
-	icon_state = "syndicam"
+	icon_state = "syndie"
 	network = list(NETWORK_MERCENARY)
 	circuit = null
 	req_access = list(150)
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index b695eb3617b..17f96197929 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -520,7 +520,7 @@
 	..(severity)
 
 /obj/machinery/computer/secure_data/detective_computer
-	icon_state = "messyfiles"
+	icon_state = "forensic"
 
 #undef SEC_DATA_R_LIST
 #undef SEC_DATA_MAINT
diff --git a/code/game/objects/effects/gibs.dm b/code/game/objects/effects/gibs.dm
index e3ede73f845..27cac182a90 100644
--- a/code/game/objects/effects/gibs.dm
+++ b/code/game/objects/effects/gibs.dm
@@ -8,6 +8,9 @@
 	var/list/gibdirections = list() //of lists
 	var/fleshcolor //Used for gibbed humans.
 	var/bloodcolor //Used for gibbed humans.
+	invisibility = 99 // So a badmin can go view these by changing their see_invisible.
+	icon = 'icons/effects/map_effects.dmi'
+	icon_state = "gibspawn"
 
 /obj/effect/gibspawner/New(location, var/datum/dna/MobDNA, var/fleshcolor, var/bloodcolor)
 	..()
diff --git a/code/game/objects/effects/spawners/gibspawner.dm b/code/game/objects/effects/spawners/gibspawner.dm
index 0fcfe6d6a04..c35a753a860 100644
--- a/code/game/objects/effects/spawners/gibspawner.dm
+++ b/code/game/objects/effects/spawners/gibspawner.dm
@@ -23,4 +23,4 @@
 /obj/effect/gibspawner/robot/New()
 	gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), alldirs, alldirs)
 	gibamounts[6] = pick(0,1,2)
-	..()
\ No newline at end of file
+	..()
diff --git a/code/game/objects/random/guns_and_ammo.dm b/code/game/objects/random/guns_and_ammo.dm
index bd465e66083..b7a582f3316 100644
--- a/code/game/objects/random/guns_and_ammo.dm
+++ b/code/game/objects/random/guns_and_ammo.dm
@@ -126,7 +126,6 @@
 /obj/random/handgun
 	name = "Random Handgun"
 	desc = "This is a random sidearm."
-	icon = 'icons/obj/gun.dmi'
 	icon_state = "gun"
 
 /obj/random/handgun/item_to_spawn()
@@ -239,7 +238,6 @@
 /obj/random/projectile/random
 	name = "Random Projectile Weapon"
 	desc = "This is a random projectile weapon."
-	icon = 'icons/obj/gun.dmi'
 	icon_state = "gun_2"
 
 /obj/random/projectile/random/item_to_spawn()
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index cef84b5b9a8..4d1ba478eda 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -737,6 +737,7 @@
 	closet_appearance = null
 	open_sound = 'sound/effects/rustle1.ogg'
 	close_sound = 'sound/effects/rustle2.ogg'
+	icon_state = ""
 
 //Wooden Crate
 /obj/structure/closet/crate/wooden
@@ -746,6 +747,7 @@
 	closet_appearance = null
 	open_sound = 'sound/effects/wooden_closet_open.ogg'
 	close_sound = 'sound/effects/wooden_closet_close.ogg'
+	icon_state = ""
 
 //Chest
 /obj/structure/closet/crate/chest
@@ -755,6 +757,7 @@
 	closet_appearance = null
 	open_sound = 'sound/effects/wooden_closet_open.ogg'
 	close_sound = 'sound/effects/wooden_closet_close.ogg'
+	icon_state = ""
 
 //Mining Cart
 /obj/structure/closet/crate/miningcar
@@ -764,3 +767,4 @@
 	closet_appearance = null
 	open_sound = 'sound/effects/wooden_closet_open.ogg'
 	close_sound = 'sound/effects/wooden_closet_close.ogg'
+	icon_state = ""
diff --git a/code/game/turfs/unsimulated/floor.dm b/code/game/turfs/unsimulated/floor.dm
index 7f3df78c134..6601917c198 100644
--- a/code/game/turfs/unsimulated/floor.dm
+++ b/code/game/turfs/unsimulated/floor.dm
@@ -1,7 +1,7 @@
 /turf/unsimulated/floor
 	name = "floor"
 	icon = 'icons/turf/floors.dmi'
-	icon_state = "Floor3"
+	icon_state = ""
 
 /turf/unsimulated/mask
 	name = "mask"
@@ -14,4 +14,4 @@
 /turf/unsimulated/elevator_shaft
 	name = "floor"
 	icon = 'icons/turf/floors.dmi'
-	icon_state = "elevatorshaft"
\ No newline at end of file
+	icon_state = "elevatorshaft"
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 7d0bc8b9703..ee1013ddf75 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -143,7 +143,7 @@
 /obj/item/clothing/suit/justice
 	name = "justice suit"
 	desc = "This pretty much looks ridiculous."
-	icon_state = "gentle_coat"
+	icon_state = "gentlecoat"
 	item_state_slots = list(slot_r_hand_str = "greatcoat", slot_l_hand_str = "greatcoat")
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET
@@ -482,14 +482,16 @@
 /obj/item/clothing/suit/stripper/stripper_pink
 	name = "pink skimpy dress"
 	desc = "A rather skimpy pink dress."
-	icon_state = "stripper_p_over"
+	icon = 'icons/inventory/uniform/item.dmi'
+	icon_state = "stripper_p"
 	item_state_slots = list(slot_r_hand_str = "pink_labcoat", slot_l_hand_str = "pink_labcoat")
 	siemens_coefficient = 1
 
 /obj/item/clothing/suit/stripper/stripper_green
 	name = "green skimpy dress"
 	desc = "A rather skimpy green dress."
-	icon_state = "stripper_g_over"
+	icon = 'icons/inventory/uniform/item.dmi'
+	icon_state = "stripper_g"
 	item_state_slots = list(slot_r_hand_str = "green_labcoat", slot_l_hand_str = "green_labcoat")
 	siemens_coefficient = 1
 
diff --git a/code/modules/detectivework/tools/scanner.dm b/code/modules/detectivework/tools/scanner.dm
index b00ab89f39d..2ac3f36f3c9 100644
--- a/code/modules/detectivework/tools/scanner.dm
+++ b/code/modules/detectivework/tools/scanner.dm
@@ -1,4 +1,5 @@
 /obj/item/detective_scanner
+	icon = 'icons/obj/device.dmi'
 	name = "forensic scanner"
 	desc = "Used to scan objects for DNA and fingerprints."
 	icon_state = "forensic"
diff --git a/code/modules/organs/misc.dm b/code/modules/organs/misc.dm
index c6d9f32682a..50e4d55b2c0 100644
--- a/code/modules/organs/misc.dm
+++ b/code/modules/organs/misc.dm
@@ -46,7 +46,7 @@
 /obj/item/organ/internal/stack
 	name = "cortical stack"
 	parent_organ = BP_HEAD
-	icon_state = "brain-prosthetic"
+	icon_state = "brain_prosthetic"
 	organ_tag = "stack"
 	vital = 1
 	var/backup_time = 0
diff --git a/code/modules/projectiles/ammunition/rounds.dm b/code/modules/projectiles/ammunition/rounds.dm
index 069b0bf0d10..263f0cdc88a 100644
--- a/code/modules/projectiles/ammunition/rounds.dm
+++ b/code/modules/projectiles/ammunition/rounds.dm
@@ -472,7 +472,7 @@
 /obj/item/ammo_casing/rocket
 	name = "rocket shell"
 	desc = "A high explosive designed to be fired from a launcher."
-	icon_state = "rocketshell"
+	icon_state = "sshell_alt"
 	projectile_type = /obj/item/projectile/bullet/srmrocket
 	caliber = "rocket"
 	matter = list(MAT_STEEL = 10000)
diff --git a/code/modules/vore/smoleworld/smoleworld_vr.dm b/code/modules/vore/smoleworld/smoleworld_vr.dm
index 06aa6b22676..5280d64e275 100644
--- a/code/modules/vore/smoleworld/smoleworld_vr.dm
+++ b/code/modules/vore/smoleworld/smoleworld_vr.dm
@@ -37,6 +37,7 @@
 
 //Extra micro turfs
 /turf/simulated/floor/smole/grass
+	icon = 'icons/turf/outdoors.dmi'
 	name = "grass"
 	icon_state = "grass0"
 	initial_flooring = /decl/flooring/grass/outdoors
diff --git a/icons/effects/map_effects.dmi b/icons/effects/map_effects.dmi
index 8b2dc22e3c4..86791f69db9 100644
Binary files a/icons/effects/map_effects.dmi and b/icons/effects/map_effects.dmi differ
diff --git a/icons/inventory/head/item_vr.dmi b/icons/inventory/head/item_vr.dmi
index 813586c308e..ddd335b5bc3 100644
Binary files a/icons/inventory/head/item_vr.dmi and b/icons/inventory/head/item_vr.dmi differ
diff --git a/icons/misc/random_spawners.dmi b/icons/misc/random_spawners.dmi
index 9db47700622..19fec95f8b5 100644
Binary files a/icons/misc/random_spawners.dmi and b/icons/misc/random_spawners.dmi differ
diff --git a/icons/mob/modular_shiny_vr.dmi b/icons/mob/modular_shiny_vr.dmi
index 7398b80193a..6ab4a931c21 100644
Binary files a/icons/mob/modular_shiny_vr.dmi and b/icons/mob/modular_shiny_vr.dmi differ
diff --git a/icons/obj/card_vr.dmi b/icons/obj/card_vr.dmi
index 5f76cab0350..fe5a0d8a0e1 100644
Binary files a/icons/obj/card_vr.dmi and b/icons/obj/card_vr.dmi differ
diff --git a/icons/obj/closets/bodybag.dmi b/icons/obj/closets/bodybag.dmi
index d6922f8bbec..1aa41bd0f04 100644
Binary files a/icons/obj/closets/bodybag.dmi and b/icons/obj/closets/bodybag.dmi differ
diff --git a/icons/obj/closets/chest.dmi b/icons/obj/closets/chest.dmi
index 66e51b7d9df..f8e86c45794 100644
Binary files a/icons/obj/closets/chest.dmi and b/icons/obj/closets/chest.dmi differ
diff --git a/icons/obj/closets/laundry.dmi b/icons/obj/closets/laundry.dmi
index 7f818848171..4264c91d418 100644
Binary files a/icons/obj/closets/laundry.dmi and b/icons/obj/closets/laundry.dmi differ
diff --git a/icons/obj/closets/miningcar.dmi b/icons/obj/closets/miningcar.dmi
index 9fcdaf7fd05..4caea04d1cd 100644
Binary files a/icons/obj/closets/miningcar.dmi and b/icons/obj/closets/miningcar.dmi differ
diff --git a/icons/obj/closets/wooden.dmi b/icons/obj/closets/wooden.dmi
index 0c4816f4903..e2460d8fb8c 100644
Binary files a/icons/obj/closets/wooden.dmi and b/icons/obj/closets/wooden.dmi differ
diff --git a/icons/obj/flora/sifflora.dmi b/icons/obj/flora/sifflora.dmi
index ae29d4c0f4d..2a2eac7e6c8 100644
Binary files a/icons/obj/flora/sifflora.dmi and b/icons/obj/flora/sifflora.dmi differ
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index aed970c79e7..969836f5c3a 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/icons/obj/syringe.dmi b/icons/obj/syringe.dmi
index 6ac3040bee7..00e4c82485f 100644
Binary files a/icons/obj/syringe.dmi and b/icons/obj/syringe.dmi differ
diff --git a/maps/groundbase/gb-centcomm.dmm b/maps/groundbase/gb-centcomm.dmm
index 734c903995f..89c40b7a512 100644
--- a/maps/groundbase/gb-centcomm.dmm
+++ b/maps/groundbase/gb-centcomm.dmm
@@ -13572,7 +13572,6 @@
 /area/centcom/security)
 "Sn" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /obj/effect/floor_decal/borderfloorblack{
diff --git a/maps/groundbase/gb-misc.dmm b/maps/groundbase/gb-misc.dmm
index efbbcf5a278..a0c93058647 100644
--- a/maps/groundbase/gb-misc.dmm
+++ b/maps/groundbase/gb-misc.dmm
@@ -2066,9 +2066,7 @@
 /turf/unsimulated/beach/sand,
 /area/beach)
 "gt" = (
-/turf/unsimulated/floor{
-	icon_state = "sandwater"
-	},
+/turf/unsimulated/floor,
 /area/beach)
 "gu" = (
 /turf/unsimulated/beach/coastline{
diff --git a/maps/stellar_delight/ship_misc.dmm b/maps/stellar_delight/ship_misc.dmm
index 251e171f688..01f2c019d30 100644
--- a/maps/stellar_delight/ship_misc.dmm
+++ b/maps/stellar_delight/ship_misc.dmm
@@ -2070,9 +2070,7 @@
 /turf/unsimulated/beach/sand,
 /area/beach)
 "gt" = (
-/turf/unsimulated/floor{
-	icon_state = "sandwater"
-	},
+/turf/unsimulated/floor,
 /area/beach)
 "gu" = (
 /turf/unsimulated/beach/coastline{
diff --git a/maps/tether/submaps/tether_centcom.dmm b/maps/tether/submaps/tether_centcom.dmm
index 2bbba0df2b6..153049fb766 100644
--- a/maps/tether/submaps/tether_centcom.dmm
+++ b/maps/tether/submaps/tether_centcom.dmm
@@ -2780,7 +2780,6 @@
 /area/centcom/command)
 "iU" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /obj/effect/floor_decal/borderfloorblack{
@@ -8426,7 +8425,6 @@
 /area/shuttle/supply)
 "HH" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_y = 30
 	},
 /turf/simulated/floor/lino,
@@ -14155,7 +14153,6 @@
 /area/shuttle/ccboat)
 "VK" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "frame";
 	pixel_x = 32
 	},
 /obj/effect/floor_decal/borderfloorblack{
diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm
index cc263c9b1ca..6fd74b68191 100644
--- a/maps/tether/submaps/tether_misc.dmm
+++ b/maps/tether/submaps/tether_misc.dmm
@@ -2553,9 +2553,7 @@
 /turf/simulated/floor/holofloor/bmarble,
 /area/holodeck/source_chess)
 "wZ" = (
-/turf/unsimulated/floor{
-	icon_state = "sandwater"
-	},
+/turf/unsimulated/floor,
 /area/beach)
 "xc" = (
 /obj/machinery/scale,
diff --git a/tools/github-actions/nanomap-renderer-invoker.sh b/tools/github-actions/nanomap-renderer-invoker.sh
index 9654ad360a6..836e361a0eb 100755
--- a/tools/github-actions/nanomap-renderer-invoker.sh
+++ b/tools/github-actions/nanomap-renderer-invoker.sh
@@ -66,7 +66,7 @@ for mapdir in "${mapdirs[@]}"; do
 	fi
 
 	#Render maps to initial images ignoring some tg specific icon_state handling
-	result=$(~/dmm-tools minimap "${map_files[@]}" --disable smart-cables,overlays,pretty 2>&1 | tee /dev/fd/5)
+	result=$(~/dmm-tools minimap "${map_files[@]}" --disable smart-cables,overlays,pretty,transit-tube 2>&1 | tee /dev/fd/5)
 
 	#Check if anything errored
 	if [[ ($? -ne 0) || ("${result}" =~ ("bad icon"|"bad path"|"error")) ]]; then