diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 874846982fe..33761bbeefe 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -80,8 +80,6 @@
 	var/tox_breath_dam_min = MIN_PLASMA_DAMAGE
 	var/tox_breath_dam_max = MAX_PLASMA_DAMAGE
 
-	var/custom_fire = 0 //Whether we handle fire icons ourself
-
 	///////////
 	// PROCS //
 	///////////
diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm
index fd82ab5a17e..730518381ab 100644
--- a/code/modules/mob/living/carbon/human/species_types.dm
+++ b/code/modules/mob/living/carbon/human/species_types.dm
@@ -358,7 +358,6 @@ var/global/image/plasmaman_on_fire = image("icon"='icons/mob/OnFire.dmi', "icon_
 	safe_oxygen_min = 0 //We don't breath this
 	safe_toxins_min = 16 //We breath THIS!
 	safe_toxins_max = 0
-	custom_fire = 1
 	var/skin = 0
 
 /datum/species/plasmaman/skin
@@ -386,12 +385,7 @@ var/global/image/plasmaman_on_fire = image("icon"='icons/mob/OnFire.dmi', "icon_
 			var/obj/item/clothing/suit/space/eva/plasmaman/P = H.wear_suit
 			if(istype(P))
 				P.Extinguish(H)
-
-	if(H.on_fire)
-		H.underlays |= plasmaman_on_fire
-	else
-		//Thank god humans don't use underlays
-		H.underlays.Cut()
+	H.update_fire()
 
 //Heal from plasma
 /datum/species/plasmaman/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 307763e4044..c33e23bbf8e 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -177,9 +177,6 @@ Please contact me on #coderbus IRC. ~Carnie x
 
 	remove_overlay(FIRE_LAYER)
 	if(on_fire)
-		if(dna)
-			if(dna.species.custom_fire)
-				return
 		overlays_standing[FIRE_LAYER] = image("icon"='icons/mob/OnFire.dmi', "icon_state"="Standing", "layer"=-FIRE_LAYER)
 
 	apply_overlay(FIRE_LAYER)
diff --git a/icons/mob/OnFire.dmi b/icons/mob/OnFire.dmi
index abd550d9bdd..44ead91e362 100644
Binary files a/icons/mob/OnFire.dmi and b/icons/mob/OnFire.dmi differ