diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm
index 322f55feac5..b7c0922bcec 100644
--- a/code/game/machinery/firealarm.dm
+++ b/code/game/machinery/firealarm.dm
@@ -11,6 +11,7 @@ FIRE ALARM
 	desc = "<i>\"Pull this in case of emergency\"</i>. Thus, keep pulling it forever."
 	icon = 'icons/obj/monitors.dmi'
 	icon_state = "firealarm_on"
+	/// Whether or not the fire alarm will sound the alarm if its temperature rises above 200C
 	var/detecting = TRUE
 	var/working = TRUE
 	var/time = 10.0
@@ -50,10 +51,18 @@ FIRE ALARM
 		return
 	if(stat & BROKEN)
 		icon_state = "firealarm_broken"
-	else if(stat & NOPOWER)
+		return
+	if(stat & NOPOWER)
 		icon_state = "firealarm_off"
-	else if(!detecting)
+		return
+	
+	var/area/area = get_area(src)
+	if(area.fire)
+		icon_state = "firealarm_alarming"
+		return
+	if(!detecting)
 		icon_state = "firealarm_detect"
+		return
 	else
 		icon_state = "firealarm_on"
 
diff --git a/icons/obj/monitors.dmi b/icons/obj/monitors.dmi
index bc45a663a76..c85e90fdbf4 100644
Binary files a/icons/obj/monitors.dmi and b/icons/obj/monitors.dmi differ