diff --git a/code/game/dna/dna2_domutcheck.dm b/code/game/dna/dna2_domutcheck.dm
index 8bf993f43eb..9d8f68fd81a 100644
--- a/code/game/dna/dna2_domutcheck.dm
+++ b/code/game/dna/dna2_domutcheck.dm
@@ -38,14 +38,12 @@
 				gene.activate(M,connected,flags)
 				if(M)
 					M.active_genes |= gene.type
-					M.update_icon = 1
 			// If Gene is NOT active:
 			else
 //				testing("[gene.name] deactivated!")
 				gene.deactivate(M,connected,flags)
 				if(M)
 					M.active_genes -= gene.type
-					M.update_icon = 1
 		*/
 
 // Use this to force a mut check on a single gene!
@@ -97,11 +95,9 @@
 			gene.activate(M,connected,flags)
 			if(M)
 				M.active_genes |= gene.type
-				M.update_icon = 1
 		// If Gene is NOT active:
 		else
 			//testing("[gene.name] deactivated!")
 			gene.deactivate(M,connected,flags)
 			if(M)
 				M.active_genes -= gene.type
-				M.update_icon = 1
diff --git a/code/game/dna/genes/goon_disabilities.dm b/code/game/dna/genes/goon_disabilities.dm
index e5ebf16975c..04fa6d5f524 100644
--- a/code/game/dna/genes/goon_disabilities.dm
+++ b/code/game/dna/genes/goon_disabilities.dm
@@ -348,8 +348,7 @@
 
 	L.adjust_fire_stacks(0.5)
 	L.visible_message("\red <b>[L.name]</b> suddenly bursts into flames!")
-	L.on_fire = 1
-	L.update_icon = 1
+	L.IgniteMob()
 	playsound(L.loc, 'sound/effects/bamf.ogg', 50, 0)
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index f407e35fe25..f6fd8281a7d 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -9,7 +9,6 @@
 	var/next_attack = 0
 	var/pounce_cooldown = 0
 	var/pounce_cooldown_time = 30
-	update_icon = 1
 	var/leap_on_click = 0
 	var/custom_pixel_x_offset = 0 //for admin fuckery.
 	var/custom_pixel_y_offset = 0
diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm
index 952a7095564..ddf675947ca 100644
--- a/code/modules/mob/living/carbon/slime/slime.dm
+++ b/code/modules/mob/living/carbon/slime/slime.dm
@@ -12,7 +12,6 @@
 	health = 150
 	gender = NEUTER
 
-	update_icon = 0
 	nutrition = 700
 
 	see_in_dark = 8
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 0a61d9030c1..48b562397ee 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -199,8 +199,6 @@
 
 	mouse_drag_pointer = MOUSE_ACTIVE_POINTER
 
-	var/update_icon = 1 //Set to 1 to trigger update_icons() at the next life() call
-
 	var/status_flags = CANSTUN|CANWEAKEN|CANPARALYSE|CANPUSH	//bitflags defining which status effects can be inflicted (replaces canweaken, canstun, etc)
 
 	var/area/lastarea = null
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index 91ae6fa24bf..ed64d73df4e 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -94,8 +94,7 @@
 			M.bodytemperature = temperature
 			if(temperature > 500)//emagged
 				M.adjust_fire_stacks(0.5)
-				M.on_fire = 1
-				M.update_icon = 1
+				M.IgniteMob()
 				playsound(M.loc, 'sound/effects/bamf.ogg', 50, 0)
 		return 1