diff --git a/code/game/machinery/computer/RCON_Console.dm b/code/game/machinery/computer/RCON_Console.dm
index f403c0749fa..fbd1190fd7f 100644
--- a/code/game/machinery/computer/RCON_Console.dm
+++ b/code/game/machinery/computer/RCON_Console.dm
@@ -8,7 +8,7 @@
 	name = "\improper RCON console"
 	desc = "Console used to remotely control electrical machinery on the station."
 	icon_keyboard = "power_key"
-	icon_screen = "ai_fixer" //VOREStation Edit
+	icon_screen = "ai-fixer"
 	light_color = "#a97faa"
 	circuit = /obj/item/weapon/circuitboard/rcon_console
 	req_one_access = list(access_engine)
@@ -40,4 +40,6 @@
 /obj/machinery/computer/rcon/update_icon()
 	..()
 	if(!(stat & (NOPOWER|BROKEN)))
-		overlays += image(icon, "ai-fixer-empty", overlay_layer) //VOREStation Edit
\ No newline at end of file
+		add_overlay("ai-fixer-empty")
+	else
+		cut_overlay("ai-fixer-empty")
diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm
index 874055afc2b..daca64cc42d 100644
--- a/code/game/machinery/computer/aifixer.dm
+++ b/code/game/machinery/computer/aifixer.dm
@@ -135,8 +135,8 @@
 
 	if(occupant)
 		if(occupant.stat)
-			overlays += image(icon, "ai-fixer-404", overlay_layer)
+			add_overlay("ai-fixer-404")
 		else
-			overlays += image(icon, "ai-fixer-full", overlay_layer)
+			add_overlay("ai-fixer-full")
 	else
-		overlays += image(icon, "ai-fixer-empty", overlay_layer)
+		add_overlay("ai-fixer-empty")
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index c6c44160b5b..49ba537a2d4 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -1,6 +1,6 @@
 /obj/machinery/computer
 	name = "computer"
-	icon = 'icons/obj/computer_vr.dmi'
+	icon = 'icons/obj/computer.dmi'
 	icon_state = "computer"
 	density = 1
 	anchored = 1.0
@@ -13,12 +13,10 @@
 	var/icon_screen = "generic"
 	var/light_range_on = 2
 	var/light_power_on = 1
-	var/overlay_layer
 
 	clicksound = "keyboard"
 
 /obj/machinery/computer/New()
-	overlay_layer = layer
 	..()
 
 /obj/machinery/computer/Initialize()
@@ -66,31 +64,28 @@
 	ex_act(2)
 
 /obj/machinery/computer/update_icon()
-	overlays.Cut()
+	cut_overlays()
+	// No power
 	if(stat & NOPOWER)
 		set_light(0)
 		if(icon_keyboard)
-			overlays += image(icon,"[icon_keyboard]_off", overlay_layer)
-		return
+			add_overlay("[icon_keyboard]_off")
+	// Yes power
 	else
+		if(icon_keyboard)
+			add_overlay(icon_keyboard)
 		set_light(light_range_on, light_power_on)
 
-	if(stat & BROKEN)
-		overlays += image(icon,"[icon_state]_broken", overlay_layer)
-	else
-		overlays += image(icon,icon_screen, overlay_layer)
-
-	if(icon_keyboard)
-		overlays += image(icon, icon_keyboard, overlay_layer)
+		// Broken
+		if(stat & BROKEN)
+			add_overlay("[icon_state]_broken")
+		// Not broken
+		else
+			add_overlay(icon_screen)	
 
 /obj/machinery/computer/power_change()
 	..()
 	update_icon()
-	if(stat & NOPOWER)
-		set_light(0)
-	else
-		set_light(light_range_on, light_power_on)
-
 
 /obj/machinery/computer/proc/set_broken()
 	stat |= BROKEN
@@ -116,4 +111,4 @@
 				playsound(src, "keyboard", 100, 1, 0)
 			return
 		attack_hand(user)
-		return
\ No newline at end of file
+		return
diff --git a/code/game/machinery/computer/shutoff_monitor.dm b/code/game/machinery/computer/shutoff_monitor.dm
index 9bb21461160..aed7bd25b9b 100644
--- a/code/game/machinery/computer/shutoff_monitor.dm
+++ b/code/game/machinery/computer/shutoff_monitor.dm
@@ -67,4 +67,4 @@
 /obj/machinery/computer/shutoff_monitor/update_icon()
 	..()
 	if(!(stat & (NOPOWER|BROKEN)))
-		overlays += image('icons/obj/computer.dmi', "ai-fixer-empty", overlay_layer)
+		add_overlay("ai-fixer-empty")
diff --git a/code/modules/power/sensors/sensor_monitoring.dm b/code/modules/power/sensors/sensor_monitoring.dm
index 2e280e28ae6..e243b7f75b7 100644
--- a/code/modules/power/sensors/sensor_monitoring.dm
+++ b/code/modules/power/sensors/sensor_monitoring.dm
@@ -7,7 +7,7 @@
 	name = "Power Monitoring Console"
 	desc = "Computer designed to remotely monitor power levels around the station"
 	icon_keyboard = "power_key"
-	icon_screen = "power:0"
+	icon_screen = "power_monitor"
 	light_color = "#ffcc33"
 
 	//computer stuff
@@ -31,9 +31,9 @@
 /obj/machinery/computer/power_monitor/update_icon()
 	if(!(stat & (NOPOWER|BROKEN)))
 		if(alerting)
-			icon_screen = "power:1"
+			icon_screen = "[initial(icon_screen)]"
 		else
-			icon_screen = "power:0"
+			icon_screen = "[initial(icon_screen)]_warn"
 	..()
 */
 // On creation automatically connects to active sensors. This is delayed to ensure sensors already exist.
diff --git a/code/modules/resleeving/designer.dm b/code/modules/resleeving/designer.dm
index 0ecef69db0f..3e2aa57aab8 100644
--- a/code/modules/resleeving/designer.dm
+++ b/code/modules/resleeving/designer.dm
@@ -5,7 +5,7 @@
 	name = "body design console"
 	catalogue_data = list(/datum/category_item/catalogue/information/organization/khi,
 						/datum/category_item/catalogue/technology/resleeving)
-	icon = 'icons/obj/computer_vr.dmi'
+	icon = 'icons/obj/computer.dmi'
 	icon_keyboard = "med_key"
 	icon_screen = "explosive"
 	light_color = "#315ab4"
diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi
index 408264594c8..2bf432df4b1 100644
Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ
diff --git a/icons/obj/modular_console.dmi b/icons/obj/modular_console.dmi
index e16c2c7be81..125711410dc 100644
Binary files a/icons/obj/modular_console.dmi and b/icons/obj/modular_console.dmi differ
diff --git a/icons/obj/modular_laptop.dmi b/icons/obj/modular_laptop.dmi
index 8f060dd5001..4294fa43701 100644
Binary files a/icons/obj/modular_laptop.dmi and b/icons/obj/modular_laptop.dmi differ
diff --git a/icons/obj/modular_tablet.dmi b/icons/obj/modular_tablet.dmi
index 5c86d27d898..33ca98c9408 100644
Binary files a/icons/obj/modular_tablet.dmi and b/icons/obj/modular_tablet.dmi differ