diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm
index 065a1c24c38..6e8d61d9ce5 100644
--- a/code/game/machinery/flasher.dm
+++ b/code/game/machinery/flasher.dm
@@ -34,18 +34,18 @@
 	AddComponent(/datum/component/proximity_monitor)
 
 /obj/machinery/flasher/power_change()
-	if( powered() )
+	if(powered())
 		stat &= ~NOPOWER
 		set_light(1, LIGHTING_MINIMUM_POWER)
 	else
-		stat |= ~NOPOWER
+		stat |= NOPOWER
 		set_light(0)
 	update_icon()
 
 /obj/machinery/flasher/update_icon_state()
 	. = ..()
 
-	if(stat & NOPOWER)
+	if((stat & NOPOWER) || !anchored)
 		icon_state = "[base_state]1-p"
 	else
 		icon_state = "[base_state]1"
@@ -53,11 +53,13 @@
 /obj/machinery/flasher/update_overlays()
 	. = ..()
 	underlays.Cut()
-
+	cut_overlays()
 	if(stat & NOPOWER)
 		return
 
-	underlays += emissive_appearance(icon, "[base_state]_lightmask")
+	if(anchored)
+		. += "[base_state]-s"
+		underlays += emissive_appearance(icon, "[base_state]_lightmask")
 
 
 //Let the AI trigger them directly.
@@ -125,10 +127,9 @@
 	anchored = !anchored
 	if(anchored)
 		WRENCH_ANCHOR_MESSAGE
-		overlays.Cut()
 	else
 		WRENCH_UNANCHOR_MESSAGE
-		overlays += "[base_state]-s"
+	update_icon()
 
 // Flasher button
 /obj/machinery/flasher_button
diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm
index 530e24a8c83..d99a631e47c 100755
--- a/code/game/machinery/igniter.dm
+++ b/code/game/machinery/igniter.dm
@@ -88,7 +88,7 @@
 		icon_state = "[base_state]"
 //		src.sd_set_light(2)
 	else
-		stat |= ~NOPOWER
+		stat |= NOPOWER
 		icon_state = "[base_state]-p"
 //		src.sd_set_light(0)
 
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index e60e47d519f..0e560310e5b 100755
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ