diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm
index 9c6b4af7d..a8dc18b1d 100644
--- a/code/game/objects/effects/decals/cleanable/misc.dm
+++ b/code/game/objects/effects/decals/cleanable/misc.dm
@@ -48,6 +48,7 @@
 /obj/effect/decal/cleanable/dirt
 	name = "dirt"
 	desc = "Someone should clean that up."
+	icon = 'icons/effects/dirt.dmi'
 	icon_state = "dirt"
 	canSmoothWith = list(/obj/effect/decal/cleanable/dirt, /turf/closed/wall, /obj/structure/falsewall)
 	smooth = SMOOTH_FALSE
@@ -59,7 +60,7 @@
 	if(T.tiled_dirt)
 		smooth = SMOOTH_MORE
 		icon = 'icons/effects/dirt.dmi'
-		icon_state = ""
+		icon_state = "dirt"
 		queue_smooth(src)
 	queue_smooth_neighbors(src)
 
diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm
index 29f039aa2..8b923ec78 100644
--- a/code/game/turfs/closed.dm
+++ b/code/game/turfs/closed.dm
@@ -1,4 +1,5 @@
 /turf/closed
+	icon = 'icons/turf/walls.dmi'
 	layer = CLOSED_TURF_LAYER
 	opacity = 1
 	density = TRUE
diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm
index 0ad48b4cd..813074f4e 100644
--- a/code/game/turfs/open.dm
+++ b/code/game/turfs/open.dm
@@ -1,4 +1,5 @@
 /turf/open
+	icon = 'icons/turf/floors.dmi'
 	plane = FLOOR_PLANE
 	var/slowdown = 0 //negative for faster, positive for slower
 
@@ -109,6 +110,7 @@
 	name = "Lattice Crystal"
 	desc = "A glowing azure crystal, with strange properties to make things float."
 	icon = 'icons/turf/floors/crystal_floor.dmi'
+	icon_state = "mapping"
 	baseturfs = /turf/open/indestructible/layenia/crystal
 	slowdown = 1
 	light_range = 4
diff --git a/code/game/turfs/simulated/chasm.dm b/code/game/turfs/simulated/chasm.dm
index 21551d631..c2a0aad98 100644
--- a/code/game/turfs/simulated/chasm.dm
+++ b/code/game/turfs/simulated/chasm.dm
@@ -121,7 +121,7 @@
 	gender = PLURAL
 	desc = "Clouds as far as the eye can see... Watch your step."
 	icon = 'icons/turf/space.dmi'
-	icon_state = "0"
+	icon_state = "clouds"
 	plane = PLANE_SPACE
 	tiled_dirt = FALSE
 	baseturfs = /turf/open/chasm/cloud
diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm
index 82f7ad678..4c888784c 100644
--- a/code/game/turfs/simulated/floor/plasteel_floor.dm
+++ b/code/game/turfs/simulated/floor/plasteel_floor.dm
@@ -41,7 +41,7 @@
 
 
 /turf/open/floor/plasteel/white
-	icon_state = "white"
+	icon_state = "plaswhite"
 /turf/open/floor/plasteel/white/side
 	icon_state = "whitehall"
 /turf/open/floor/plasteel/white/corner
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index ff47a4843..f0d6c6ec1 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -32,7 +32,7 @@
 							//IE if the turf is supposed to be water, set TRUE.
 
 	var/tiled_dirt = FALSE // use smooth tiled dirt decal
-	
+
 	vis_flags = VIS_INHERIT_PLANE|VIS_INHERIT_ID	//when this be added to vis_contents of something it inherit something.plane and be associated with something on clicking, important for visualisation of turf in openspace and interraction with openspace that show you turf.
 
 /turf/vv_edit_var(var_name, new_value)
@@ -48,7 +48,7 @@
 
 	// by default, vis_contents is inherited from the turf that was here before
 	vis_contents.Cut()
-	
+
 	if(color)
 		add_atom_colour(color, FIXED_COLOUR_PRIORITY)
 
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index 7db5adfa8..8ecfcaa21 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -3,7 +3,7 @@
 	verb_say = "chimpers"
 	initial_language_holder = /datum/language_holder/monkey
 	icon = 'icons/mob/monkey.dmi'
-	icon_state = ""
+	icon_state = "monkey1"
 	gender = NEUTER
 	pass_flags = PASSTABLE
 	ventcrawler = VENTCRAWLER_NUDE
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 740f65459..00b7d68d0 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/icons/turf/floors/crystal_floor.dmi b/icons/turf/floors/crystal_floor.dmi
index 1f2ea5c4b..5c67bda57 100644
Binary files a/icons/turf/floors/crystal_floor.dmi and b/icons/turf/floors/crystal_floor.dmi differ
diff --git a/icons/turf/space.dmi b/icons/turf/space.dmi
index 33e3fab9a..e7440c023 100644
Binary files a/icons/turf/space.dmi and b/icons/turf/space.dmi differ