diff --git a/code/__defines/_layers.dm b/code/__defines/_layers.dm
index a26f926e5ae..60a3c1ee8b6 100644
--- a/code/__defines/_layers.dm
+++ b/code/__defines/_layers.dm
@@ -3,7 +3,6 @@
 #define PLANE_SPACE_DUST (PLANE_SPACE_PARALLAX + 1) // -96
 #define PLANE_ABOVE_PARALLAX (PLANE_SPACE_BACKGROUND + 3) // -95
 
-
 #define LOWER_ON_TURF_LAYER (TURF_LAYER + 0.05)	// under the below
 #define ON_TURF_LAYER (TURF_LAYER + 0.1)	// sitting on the turf - should be preferred over direct use of TURF_LAYER
 #define AO_LAYER (ON_TURF_LAYER + 0.1)
@@ -16,6 +15,7 @@
 #define BELOW_MOB_LAYER 3.7
 #define ABOVE_MOB_LAYER 4.1
 #define LIGHTING_LAYER 11
+#define EFFECTS_ABOVE_LIGHTING_LAYER 12 // For overlays you want to be above light.
 #define HUD_LAYER 20			//Above lighting, but below obfuscation. For in-game HUD effects (whereas SCREEN_LAYER is for abstract/OOC things like inventory slots)
 #define OBFUSCATION_LAYER 21	//Where images covering the view for eyes are put
 #define SCREEN_LAYER 22			//Mob HUD/effects layer
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 30a6ef33541..2caad06a52f 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -822,13 +822,20 @@
 	return FALSE
 
 /mob/living/silicon/robot/updateicon()
-	cut_overlays()
+	overlays.Cut() // The new way the overlays are applied requires this overlays.Cut difference to remove
+// correctly
+
+//The below lines up to the panels are how the 'borgs get their overlays now. It's made cleaner
+// via the vars below.
+
+	var/overlay_help = image(icon,"eyes-[module_sprites[icontype]]-help", EFFECTS_ABOVE_LIGHTING_LAYER)
+	var/overlay_harm = image(icon,"eyes-[module_sprites[icontype]]-harm", EFFECTS_ABOVE_LIGHTING_LAYER)
 
 	if(stat == CONSCIOUS)
 		if(a_intent == I_HELP)
-			add_overlay("eyes-[module_sprites[icontype]]-help")
+			overlays += overlay_help
 		else
-			add_overlay("eyes-[module_sprites[icontype]]-harm")
+			overlays += overlay_harm
 
 	if(opened)
 		var/panelprefix = custom_sprite ? src.ckey : "ov"
diff --git a/html/changelogs/BorgGlowEyes.yml b/html/changelogs/BorgGlowEyes.yml
new file mode 100644
index 00000000000..7d87f3f9c35
--- /dev/null
+++ b/html/changelogs/BorgGlowEyes.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: Chada-1
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Made 'borgo eyes able to glow in the dark via a new _layers definition."