diff --git a/code/__defines/lighting.dm b/code/__defines/lighting.dm
index 48ec6f22322..e7124ae435b 100644
--- a/code/__defines/lighting.dm
+++ b/code/__defines/lighting.dm
@@ -80,7 +80,7 @@
 // Some brightness/range defines for objects.
 #define L_WALLMOUNT_POWER 0.4
 #define L_WALLMOUNT_RANGE 2
-#define L_WALLMOUNT_HI_POWER 2	// For red/delta alert on fire alarms.
+#define L_WALLMOUNT_HI_POWER 1	// For red/delta alert on fire alarms.
 #define L_WALLMOUNT_HI_RANGE 4
 // This controls by how much console sprites are dimmed before being overlayed.
 #define HOLOSCREEN_ADDITION_FACTOR 1
diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm
index 33eccb5dbfd..bc2f84159c3 100644
--- a/code/game/machinery/floodlight.dm
+++ b/code/game/machinery/floodlight.dm
@@ -34,10 +34,10 @@
 
 	// If the cell is almost empty rarely "flicker" the light. Aesthetic only.
 	if((cell.percent() < 10) && prob(5))
-		set_light(brightness_on/2, brightness_on/4)
+		set_light(brightness_on/2, 0.5)
 		spawn(20)
 			if(on)
-				set_light(brightness_on, brightness_on/2)
+				set_light(brightness_on, 1)
 
 	cell.use(use*CELLRATE)
 
@@ -50,7 +50,7 @@
 		return 0
 
 	on = 1
-	set_light(brightness_on, brightness_on / 2)
+	set_light(brightness_on, 1)
 	update_icon()
 	if(loud)
 		visible_message("\The [src] turns on.")
@@ -58,7 +58,7 @@
 
 /obj/machinery/floodlight/proc/turn_off(var/loud = 0)
 	on = 0
-	set_light(0, 0)
+	set_light(0)
 	update_icon()
 	if(loud)
 		visible_message("\The [src] shuts down.")
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index c71f2aaccbf..1954adaed71 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -22,7 +22,7 @@
 	var/custom_sprite = 0 //Due to all the sprites involved, a var for our custom borgs may be best
 	var/crisis //Admin-settable for combat module use.
 	var/crisis_override = 0
-	var/integrated_light_power = 6
+	var/integrated_light_power = 4
 	var/datum/wires/robot/wires
 
 //Icon stuff
@@ -423,7 +423,7 @@
 /mob/living/silicon/robot/proc/update_robot_light()
 	if(lights_on)
 		if(intenselight)
-			set_light(integrated_light_power * 2, integrated_light_power)
+			set_light(integrated_light_power * 2, 1)
 		else
 			set_light(integrated_light_power)
 	else
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index c8c225c68f8..e4c6ce434dc 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -229,13 +229,13 @@
 	..()
 
 /obj/machinery/light/update_icon()
-
 	switch(status)		// set icon_states
 		if(LIGHT_OK)
-			if (supports_nightmode && nightmode)
-				icon_state = "[base_state][on]_night"
+			icon_state = "[base_state][on]"
+			if (supports_nightmode && nightmode && on)
+				color = "#d2d2d2"
 			else
-				icon_state = "[base_state][on]"
+				color = null
 
 		if(LIGHT_EMPTY)
 			icon_state = "[base_state]-empty"
@@ -246,7 +246,9 @@
 		if(LIGHT_BROKEN)
 			icon_state = "[base_state]-broken"
 			on = 0
-	return
+
+	if (!on)
+		color = null
 
 // update the icon_state and luminosity of the light depending on its state
 /obj/machinery/light/proc/update(var/trigger = 1)
diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi
index c9eb63b99e6..c38aad8025a 100644
Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ