diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index b7374e187b9..c63263b6ee3 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -432,21 +432,26 @@
 			else if(breath.temperature > 360.15)
 				if(prob(20))
 					src << "\red You feel your face burning and a searing heat in your lungs!"
-			fire_alert = max(fire_alert, 1)
 
 			switch(breath.temperature)
 				if(-INFINITY to 120)
 					apply_damage(COLD_GAS_DAMAGE_LEVEL_3, BURN, "head")
+					fire_alert = max(fire_alert, 1)
 				if(120 to 200)
 					apply_damage(COLD_GAS_DAMAGE_LEVEL_2, BURN, "head")
+					fire_alert = max(fire_alert, 1)
 				if(200 to 260)
 					apply_damage(COLD_GAS_DAMAGE_LEVEL_1, BURN, "head")
+					fire_alert = max(fire_alert, 1)
 				if(360 to 400)
 					apply_damage(HEAT_GAS_DAMAGE_LEVEL_1, BURN, "head")
+					fire_alert = max(fire_alert, 2)
 				if(400 to 1000)
 					apply_damage(HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head")
+					fire_alert = max(fire_alert, 2)
 				if(1000 to INFINITY)
 					apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head")
+					fire_alert = max(fire_alert, 2)
 
 		//Temporary fixes to the alerts.
 
@@ -489,10 +494,13 @@
 			switch(bodytemperature)
 				if(360 to 400)
 					apply_damage(HEAT_DAMAGE_LEVEL_1, BURN)
+					fire_alert = max(fire_alert, 2)
 				if(400 to 1000)
 					apply_damage(HEAT_DAMAGE_LEVEL_2, BURN)
+					fire_alert = max(fire_alert, 2)
 				if(1000 to INFINITY)
 					apply_damage(HEAT_DAMAGE_LEVEL_3, BURN)
+					fire_alert = max(fire_alert, 2)
 
 		else if(bodytemperature < 260.15)
 			fire_alert = max(fire_alert, 1)
@@ -500,10 +508,13 @@
 				switch(bodytemperature)
 					if(200 to 260)
 						apply_damage(COLD_DAMAGE_LEVEL_1, BURN)
+						fire_alert = max(fire_alert, 1)
 					if(120 to 200)
 						apply_damage(COLD_DAMAGE_LEVEL_2, BURN)
+						fire_alert = max(fire_alert, 1)
 					if(-INFINITY to 120)
 						apply_damage(COLD_DAMAGE_LEVEL_3, BURN)
+						fire_alert = max(fire_alert, 1)
 
 		// Account for massive pressure differences.  Done by Polymorph
 		// Made it possible to actually have something that can protect against high pressure... Done by Errorage. Polymorph now has an axe sticking from his head for his previous hardcoded nonsense!
@@ -1070,7 +1081,7 @@
 				if(hal_screwyhud == 3 || oxygen_alert)	oxygen.icon_state = "oxy1"
 				else									oxygen.icon_state = "oxy0"
 			if(fire)
-				if(fire_alert)							fire.icon_state = "fire1"
+				if(fire_alert)							fire.icon_state = "fire[fire_alert]" //fire_alert is either 0 if no alert, 1 for cold and 2 for heat.
 				else									fire.icon_state = "fire0"
 
 			if(bodytemp)
diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm
index e5b494c123e..23d0c1b8a25 100644
--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ b/code/modules/mob/living/carbon/monkey/life.dm
@@ -311,7 +311,7 @@
 		if(breath.temperature > (T0C+66)) // Hot air hurts :(
 			if(prob(20))
 				src << "\red You feel a searing heat in your lungs!"
-			fire_alert = max(fire_alert, 1)
+			fire_alert = max(fire_alert, 2)
 		else
 			fire_alert = 0
 
@@ -510,7 +510,7 @@
 
 		if (toxin)	toxin.icon_state = "tox[toxins_alert ? 1 : 0]"
 		if (oxygen) oxygen.icon_state = "oxy[oxygen_alert ? 1 : 0]"
-		if (fire) fire.icon_state = "fire[fire_alert ? 1 : 0]"
+		if (fire) fire.icon_state = "fire[fire_alert ? 2 : 0]"
 		//NOTE: the alerts dont reset when youre out of danger. dont blame me,
 		//blame the person who coded them. Temporary fix added.
 
diff --git a/icons/mob/screen1_Midnight.dmi b/icons/mob/screen1_Midnight.dmi
index 4a37495c38b..64367227676 100644
Binary files a/icons/mob/screen1_Midnight.dmi and b/icons/mob/screen1_Midnight.dmi differ
diff --git a/icons/mob/screen1_Orange.dmi b/icons/mob/screen1_Orange.dmi
index aeace0ff95f..cc24f679ebe 100644
Binary files a/icons/mob/screen1_Orange.dmi and b/icons/mob/screen1_Orange.dmi differ
diff --git a/icons/mob/screen1_old.dmi b/icons/mob/screen1_old.dmi
index 425bcfe3276..63e1e5d2ca6 100644
Binary files a/icons/mob/screen1_old.dmi and b/icons/mob/screen1_old.dmi differ
diff --git a/icons/mob/screen1_robot.dmi b/icons/mob/screen1_robot.dmi
index dd022ddfa75..1796092eae0 100644
Binary files a/icons/mob/screen1_robot.dmi and b/icons/mob/screen1_robot.dmi differ