diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm
index d67361795e..a62cf129d7 100644
--- a/code/controllers/subsystem/air.dm
+++ b/code/controllers/subsystem/air.dm
@@ -220,6 +220,7 @@ var/datum/subsystem/air/SSair
 		currentrun.len--
 		if (isturf(T))
 			T.process_cell(fire_count)
+
 		if (MC_TICK_CHECK)
 			return
 
diff --git a/code/controllers/subsystem/processing/overlays.dm b/code/controllers/subsystem/processing/overlays.dm
index 2c6bdb9c8f..2336b85f37 100644
--- a/code/controllers/subsystem/processing/overlays.dm
+++ b/code/controllers/subsystem/processing/overlays.dm
@@ -99,8 +99,9 @@ var/datum/subsystem/processing/overlays/SSoverlays
 			overlays[i] = iconstate2appearance(overlays[i])
 		else
 			var/image/I = overlays[i]
-			appearance_bro.appearance = overlays[i]
-			appearance_bro.dir = I.dir
+			appearance_bro.appearance = I
+			if(isturf(src))
+				appearance_bro.dir = I.dir
 			overlays[i] = appearance_bro.appearance
 
 	var/list/cached_overlays = our_overlays	//sanic
@@ -129,8 +130,9 @@ var/datum/subsystem/processing/overlays/SSoverlays
 			overlays[i] = iconstate2appearance(overlays[i])
 		else
 			var/image/I = overlays[i]
-			appearance_bro.appearance = overlays[i]
-			appearance_bro.dir = I.dir
+			appearance_bro.appearance = I
+			if(isturf(src))
+				appearance_bro.dir = I.dir
 			overlays[i] = appearance_bro.appearance
 
 	LAZYINITLIST(our_overlays)	//always initialized after this point
diff --git a/icons/mob/mam_bodyparts.dmi b/icons/mob/mam_bodyparts.dmi
index e390b5cc41..0cb697ab94 100644
Binary files a/icons/mob/mam_bodyparts.dmi and b/icons/mob/mam_bodyparts.dmi differ
diff --git a/icons/mob/mutant_bodyparts.dmi b/icons/mob/mutant_bodyparts.dmi
index 25594b3283..ec0607eac1 100644
Binary files a/icons/mob/mutant_bodyparts.dmi and b/icons/mob/mutant_bodyparts.dmi differ