diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index ac06e34a86..d6847d7cf4 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -66,6 +66,21 @@
 	
 	. = list()
 
+	// Connecty
+	if(initial(icon_state) == "computer")
+		var/append_string = ""
+		var/left = turn(dir, 90)
+		var/right = turn(dir, -90)
+		var/turf/L = get_step(src, left)
+		var/turf/R = get_step(src, right)
+		var/obj/machinery/computer/LC = locate() in L
+		var/obj/machinery/computer/RC = locate() in R
+		if(LC && LC.dir == dir && initial(LC.icon_state) == "computer")
+			append_string += "_L"
+		if(RC && RC.dir == dir && initial(RC.icon_state) == "computer")
+			append_string += "_R"
+		icon_state = "computer[append_string]"
+
 	if(icon_keyboard)
 		if(stat & NOPOWER)
 			playsound(src, 'sound/machines/terminal_off.ogg', 50, 1)
@@ -76,6 +91,7 @@
 	var/overlay_state = icon_screen
 	if(stat & BROKEN)
 		overlay_state = "[icon_state]_broken"
+
 	. += mutable_appearance(icon, overlay_state)
 	. += emissive_appearance(icon, overlay_state)
 	playsound(src, 'sound/machines/terminal_on.ogg', 50, 1)
diff --git a/code/modules/modular_computers/computers/subtypes/dev_console.dm b/code/modules/modular_computers/computers/subtypes/dev_console.dm
index a259651da6..a467a77730 100644
--- a/code/modules/modular_computers/computers/subtypes/dev_console.dm
+++ b/code/modules/modular_computers/computers/subtypes/dev_console.dm
@@ -16,4 +16,21 @@
 	steel_sheet_cost = 20
 	light_strength = 4
 	max_damage = 300
-	broken_damage = 150
\ No newline at end of file
+	broken_damage = 150
+
+/obj/item/modular_computer/console/update_icon()
+	. = ..()
+	// Connecty
+	if(initial(icon_state) == "console")
+		var/append_string = ""
+		var/left = turn(dir, -90)
+		var/right = turn(dir, 90)
+		var/turf/L = get_step(src, left)
+		var/turf/R = get_step(src, right)
+		var/obj/item/modular_computer/console/LC = locate() in L
+		var/obj/item/modular_computer/console/RC = locate() in R
+		if(LC && LC.dir == dir && initial(LC.icon_state) == "console")
+			append_string += "_L"
+		if(RC && RC.dir == dir && initial(RC.icon_state) == "console")
+			append_string += "_R"
+		icon_state = "console[append_string]"
diff --git a/code/modules/overmap/ships/computers/engine_control.dm b/code/modules/overmap/ships/computers/engine_control.dm
index 52342e23d3..1110f6b246 100644
--- a/code/modules/overmap/ships/computers/engine_control.dm
+++ b/code/modules/overmap/ships/computers/engine_control.dm
@@ -6,6 +6,13 @@
 	icon_screen = "engines"
 	circuit = /obj/item/weapon/circuitboard/engine
 
+// fancy sprite
+/obj/machinery/computer/ship/engines/adv
+	icon_keyboard = null
+	icon_state = "adv_engines"
+	icon_screen = "adv_engines_screen"
+	light_color = "#05A6A8"
+
 /obj/machinery/computer/ship/engines/tgui_interact(mob/user, datum/tgui/ui)
 	if(!linked)
 		display_reconnect_dialog(user, "ship control systems")
diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm
index e0692314f9..fe24315788 100644
--- a/code/modules/overmap/ships/computers/helm.dm
+++ b/code/modules/overmap/ships/computers/helm.dm
@@ -30,6 +30,13 @@ GLOBAL_LIST_EMPTY(all_waypoints)
 	var/accellimit = 0.001 //manual limiter for acceleration
 	req_one_access = list(access_pilot) //VOREStation Edit
 
+// fancy sprite
+/obj/machinery/computer/ship/helm/adv
+	icon_keyboard = null
+	icon_state = "adv_helm"
+	icon_screen = "adv_helm_screen"
+	light_color = "#70ffa0"
+
 /obj/machinery/computer/ship/helm/Initialize()
 	. = ..()
 	get_known_sectors()
diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm
index 3775af9a75..9a1c0fb115 100644
--- a/code/modules/overmap/ships/computers/sensors.dm
+++ b/code/modules/overmap/ships/computers/sensors.dm
@@ -7,6 +7,13 @@
 	extra_view = 4
 	var/obj/machinery/shipsensors/sensors
 
+// fancy sprite
+/obj/machinery/computer/ship/sensors/adv
+	icon_keyboard = null
+	icon_state = "adv_sensors"
+	icon_screen = "adv_sensors_screen"
+	light_color = "#05A6A8"
+
 /obj/machinery/computer/ship/sensors/attempt_hook_up(obj/effect/overmap/visitable/ship/sector)
 	if(!(. = ..()))
 		return
diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi
index 165cc44179..1c73e51f3f 100644
Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ
diff --git a/icons/obj/computer_vr.dmi b/icons/obj/computer_vr.dmi
index 34716d288c..c75bc3a7b5 100644
Binary files a/icons/obj/computer_vr.dmi and b/icons/obj/computer_vr.dmi differ
diff --git a/icons/obj/modular_console.dmi b/icons/obj/modular_console.dmi
index 125711410d..60c2c0f25b 100644
Binary files a/icons/obj/modular_console.dmi and b/icons/obj/modular_console.dmi differ