diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index af0c9eb4295..9de9b2de0cc 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -2,7 +2,7 @@
 	name = "computer"
 	icon = 'icons/obj/machinery/modular_console.dmi'
 	icon_state = "computer"
-	layer = ABOVE_HUMAN_LAYER
+	layer = ABOVE_STRUCTURE_LAYER
 	density = 1
 	anchored = 1.0
 	idle_power_usage = 300
@@ -78,8 +78,8 @@
 
 /obj/machinery/computer/update_icon()
 
-	if(dir != SOUTH)
-		layer = BELOW_WINDOW_LAYER
+	if(dir == SOUTH)
+		layer = ABOVE_HUMAN_LAYER
 	ClearOverlays()
 	if(stat & NOPOWER)
 		set_light(0)
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index d3a44bb630d..499c2592a25 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -13,7 +13,7 @@
 	density = TRUE
 	pass_flags_self = PASSWINDOW
 	w_class = WEIGHT_CLASS_NORMAL
-	layer = SIDE_WINDOW_LAYER
+	layer = OBJ_LAYER
 	anchored = TRUE
 	atom_flags = ATOM_FLAG_CHECKS_BORDER
 	obj_flags = OBJ_FLAG_ROTATABLE|OBJ_FLAG_MOVES_UNSUPPORTED
@@ -63,8 +63,6 @@
 	if(!full)
 		if(dir == SOUTH)
 			layer = ABOVE_HUMAN_LAYER
-		else
-			layer = SIDE_WINDOW_LAYER
 	QUEUE_SMOOTH(src)
 
 /obj/structure/window/proc/take_damage(var/damage = 0,  var/sound_effect = 1, message = TRUE)
diff --git a/code/modules/modular_computers/computers/subtypes/dev_console.dm b/code/modules/modular_computers/computers/subtypes/dev_console.dm
index 6e20e9e9ace..209d0353b0a 100644
--- a/code/modules/modular_computers/computers/subtypes/dev_console.dm
+++ b/code/modules/modular_computers/computers/subtypes/dev_console.dm
@@ -12,6 +12,7 @@
 	hardware_flag = PROGRAM_CONSOLE
 	anchored = TRUE
 	density = TRUE
+	layer = ABOVE_STRUCTURE_LAYER
 	message_output_range = 1
 	base_idle_power_usage = 100
 	base_active_power_usage = 500
@@ -22,3 +23,8 @@
 	screensaver_light_color = LIGHT_COLOR_WHITE
 	is_holographic = TRUE
 	pass_flags_self = PASSTABLE
+
+/obj/item/modular_computer/console/update_icon()
+	. = ..()
+	if(dir == SOUTH)
+		layer = ABOVE_HUMAN_LAYER
diff --git a/html/changelogs/kano-dot-layernt.yml b/html/changelogs/kano-dot-layernt.yml
new file mode 100644
index 00000000000..ca90ac435d0
--- /dev/null
+++ b/html/changelogs/kano-dot-layernt.yml
@@ -0,0 +1,7 @@
+
+author: Kano
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixed some layering issues pertaining to consoles."
diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm
index 0c57fad6427..632233e5c03 100644
--- a/maps/sccv_horizon/sccv_horizon.dmm
+++ b/maps/sccv_horizon/sccv_horizon.dmm
@@ -13198,9 +13198,6 @@
 /turf/unsimulated/floor,
 /area/centcom/checkpoint/aft)
 "bQr" = (
-/obj/machinery/light{
-	dir = 1
-	},
 /obj/effect/floor_decal/corner/dark_blue/full{
 	dir = 1
 	},
@@ -50327,7 +50324,9 @@
 /obj/effect/floor_decal/corner/dark_blue{
 	dir = 10
 	},
-/obj/item/modular_computer/console/preset/security,
+/obj/item/modular_computer/console/preset/security{
+	dir = 1
+	},
 /obj/structure/railing/mapped,
 /turf/simulated/floor/tiled/dark,
 /area/horizon/command/bridge/controlroom)
@@ -65763,7 +65762,9 @@
 	},
 /obj/structure/railing/mapped,
 /obj/effect/floor_decal/corner/dark_blue/full,
-/obj/machinery/computer/ship/navigation,
+/obj/machinery/computer/ship/navigation{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/command/bridge/controlroom)
 "jkU" = (
@@ -99921,6 +99922,9 @@
 	dir = 1;
 	pixel_y = 28
 	},
+/obj/machinery/light/floor{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/command/bridge/controlroom)
 "ofM" = (
@@ -104957,7 +104961,9 @@
 	dir = 8
 	},
 /obj/effect/floor_decal/corner/dark_blue/full,
-/obj/machinery/computer/ship/navigation,
+/obj/machinery/computer/ship/navigation{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/command/bridge/controlroom)
 "oPe" = (