diff --git a/_maps/RandomRuins/SpaceRuins/dragoontomb.dmm b/_maps/RandomRuins/SpaceRuins/dragoontomb.dmm
index eb168fbedc7..459e2a312c1 100644
--- a/_maps/RandomRuins/SpaceRuins/dragoontomb.dmm
+++ b/_maps/RandomRuins/SpaceRuins/dragoontomb.dmm
@@ -28,7 +28,7 @@
 /obj/item/clothing/shoes/workboots/mining,
 /obj/item/clothing/gloves/color/black,
 /obj/effect/mob_spawn/corpse/human/charredskeleton,
-/obj/item/borg/sight/meson,
+/obj/item/clothing/glasses/meson,
 /obj/item/pickaxe/improvised,
 /turf/open/misc/asteroid/basalt/airless,
 /area/ruin/unpowered/no_grav)
diff --git a/code/__DEFINES/sight.dm b/code/__DEFINES/sight.dm
index 5a3e0d17ef3..0a14db75ef9 100644
--- a/code/__DEFINES/sight.dm
+++ b/code/__DEFINES/sight.dm
@@ -25,6 +25,7 @@
 #define BORGTHERM (1<<1)
 #define BORGXRAY (1<<2)
 #define BORGMATERIAL (1<<3)
+#define BORGDEFAULT 0
 
 //for clothing visor toggles, these determine which vars to toggle
 #define VISOR_FLASHPROTECT (1<<0)
diff --git a/code/game/objects/items/robot/items/hud.dm b/code/game/objects/items/robot/items/hud.dm
index f2d46d29585..19bb6bdc1c5 100644
--- a/code/game/objects/items/robot/items/hud.dm
+++ b/code/game/objects/items/robot/items/hud.dm
@@ -22,16 +22,6 @@
 	icon_state = "securityhudnight"
 	sight_mode = BORGXRAY
 
-/obj/item/borg/sight/thermal
-	name = "\proper thermal vision"
-	sight_mode = BORGTHERM
-	icon_state = "thermal"
-
-/obj/item/borg/sight/meson
-	name = "\proper meson vision"
-	sight_mode = BORGMESON
-	icon_state = "meson"
-
 /obj/item/borg/sight/material
 	name = "\proper material vision"
 	sight_mode = BORGMATERIAL
diff --git a/code/game/objects/items/tools/painter/decal_painter.dm b/code/game/objects/items/tools/painter/decal_painter.dm
index f1c934d028d..35abfb90b94 100644
--- a/code/game/objects/items/tools/painter/decal_painter.dm
+++ b/code/game/objects/items/tools/painter/decal_painter.dm
@@ -156,3 +156,6 @@
 	else if(cyborg.cell.charge <= 0)
 		balloon_alert(user, "not enough energy!")
 		return
+
+/obj/item/airlock_painter/decal/cyborg/click_alt(mob/user)
+	return CLICK_ACTION_BLOCKING
diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm
index d6f8d35c147..fbdccc3e1f3 100644
--- a/code/modules/mob/living/silicon/robot/robot_model.dm
+++ b/code/modules/mob/living/silicon/robot/robot_model.dm
@@ -421,16 +421,12 @@
 	button_icon_state = "meson"
 
 /datum/action/cooldown/borg_meson/Activate()
-	if(usr.sight & SEE_TURFS)
-		usr.clear_sight(SEE_TURFS)
-		owner.lighting_cutoff_red += 5
-		owner.lighting_cutoff_green += 15
-		owner.lighting_cutoff_blue += 5
+	var/mob/living/silicon/robot/borg = owner
+	if(borg.sight & SEE_TURFS)
+		borg.sight_mode = BORGDEFAULT
 	else
-		usr.add_sight(SEE_TURFS)
-		owner.lighting_cutoff_red -= 5
-		owner.lighting_cutoff_green -= 15
-		owner.lighting_cutoff_blue -= 5
+		borg.sight_mode = BORGMESON
+	borg.update_sight()
 
 /obj/item/robot_model/engineering/be_transformed_to(obj/item/robot_model/old_model, forced = FALSE)
 	var/datum/action/cooldown/borg_meson/night_vision = new(loc)
@@ -988,16 +984,15 @@
 /datum/action/cooldown/borg_thermal
 	name = "Toggle Thermal Night Vision"
 	button_icon = 'icons/mob/actions/actions_mecha.dmi'
-	button_icon_state = "meson"
+	button_icon_state = "thermal"
 
 /datum/action/cooldown/borg_thermal/Activate()
-	if(usr.sight & SEE_TURFS)
-		usr.clear_sight(SEE_TURFS|SEE_MOBS)
-		usr.lighting_cutoff = LIGHTING_CUTOFF_VISIBLE
+	var/mob/living/silicon/robot/borg = owner
+	if(borg.sight & SEE_MOBS)
+		borg.sight_mode = BORGDEFAULT
 	else
-		usr.add_sight(SEE_TURFS|SEE_MOBS)
-		usr.lighting_cutoff = LIGHTING_CUTOFF_HIGH
-	usr.sync_lighting_plane_cutoff()
+		borg.sight_mode = BORGTHERM
+	borg.update_sight()
 
 /obj/item/robot_model/saboteur/be_transformed_to(obj/item/robot_model/old_model, forced = FALSE)
 	var/datum/action/cooldown/borg_thermal/thermal_vision = new(loc)
diff --git a/tools/UpdatePaths/Scripts/93026_borgening_fixes.txt b/tools/UpdatePaths/Scripts/93026_borgening_fixes.txt
new file mode 100644
index 00000000000..4f86d86e1af
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/93026_borgening_fixes.txt
@@ -0,0 +1,3 @@
+/obj/item/borg/sight/meson : @DELETE
+
+/obj/item/borg/sight/thermal : @DELETE