diff --git a/_maps/shuttles/emergency_skyrat.dmm b/_maps/shuttles/emergency_skyrat.dmm
index e6cc6a1fb73..9f250b37d14 100644
--- a/_maps/shuttles/emergency_skyrat.dmm
+++ b/_maps/shuttles/emergency_skyrat.dmm
@@ -89,7 +89,7 @@
 /area/shuttle/escape)
 "dw" = (
 /obj/machinery/door/window/brigdoor/security{
-	req_access_txt = "2"
+	dir = 1
 	},
 /turf/open/floor/iron/shuttle/evac{
 	icon_state = "floorsec"
@@ -155,8 +155,12 @@
 	},
 /area/shuttle/escape)
 "fi" = (
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced/spawner,
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/obj/structure/window/reinforced/spawner{
+	dir = 1
+	},
 /turf/open/floor/iron/shuttle/evac{
 	icon_state = "floorsec2"
 	},
@@ -425,15 +429,12 @@
 	},
 /area/shuttle/escape)
 "qh" = (
-/obj/machinery/button/flasher{
-	id = "shuttle_flasher";
-	pixel_x = -25;
-	pixel_y = -6
-	},
-/obj/structure/window/reinforced/spawner,
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
+/obj/structure/window/reinforced/spawner{
+	dir = 1
+	},
 /turf/open/floor/iron/shuttle/evac{
 	icon_state = "floorsec2"
 	},
@@ -454,7 +455,6 @@
 	},
 /area/shuttle/escape)
 "qQ" = (
-/obj/machinery/door/airlock/external/glass,
 /turf/open/floor/iron/shuttle/evac{
 	icon_state = "floorplace"
 	},
@@ -948,11 +948,6 @@
 	icon_state = "floorsec2"
 	},
 /area/shuttle/escape/brig)
-"JF" = (
-/turf/closed/wall/mineral/titanium/shuttle_wall/evac{
-	icon_state = "15,8"
-	},
-/area/shuttle/escape)
 "JR" = (
 /turf/closed/wall/mineral/titanium/shuttle_wall/evac{
 	icon_state = "10,18"
@@ -1035,6 +1030,12 @@
 	icon_state = "flooreng2"
 	},
 /area/shuttle/escape)
+"Nq" = (
+/obj/machinery/door/airlock/external/glass,
+/turf/open/floor/iron/shuttle/evac{
+	icon_state = "floorplace"
+	},
+/area/shuttle/escape)
 "Nv" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 1
@@ -1221,6 +1222,11 @@
 	icon_state = "floorsec2"
 	},
 /area/shuttle/escape/brig)
+"UG" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/evac{
+	icon_state = "15,14"
+	},
+/area/shuttle/escape)
 "UH" = (
 /obj/structure/tank_dispenser/oxygen,
 /turf/open/floor/iron/shuttle/evac{
@@ -1250,6 +1256,11 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/machinery/button/flasher{
+	id = "shuttle_flasher";
+	pixel_x = -25;
+	pixel_y = -6
+	},
 /turf/open/floor/iron/shuttle/evac{
 	icon_state = "floorsec2"
 	},
@@ -1317,6 +1328,11 @@
 	icon_state = "5,7"
 	},
 /area/shuttle/escape)
+"YF" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/evac{
+	icon_state = "15,16"
+	},
+/area/shuttle/escape)
 "YW" = (
 /turf/closed/wall/mineral/titanium/shuttle_wall/window/evac{
 	icon_state = "15,13"
@@ -1324,8 +1340,7 @@
 /area/shuttle/escape)
 "Zb" = (
 /turf/closed/wall/mineral/titanium/shuttle_wall/window/evac{
-	dir = 1;
-	icon_state = "1,16"
+	icon_state = "15,18"
 	},
 /area/shuttle/escape)
 "Zo" = (
@@ -1362,18 +1377,18 @@ ZF
 ZF
 tG
 hy
-qQ
-qQ
 Zb
+Nq
+YF
 zw
-qQ
+UG
 YW
 TU
 TU
 Yb
 IB
 Tb
-JF
+IB
 cz
 uS
 HQ
@@ -1391,18 +1406,18 @@ ZF
 ZF
 vm
 QD
-MJ
+qQ
 MJ
 aY
 MJ
-MJ
+qQ
 zc
 OY
 OY
 VC
 JZ
 qh
-OY
+JZ
 rh
 UT
 mL
diff --git a/modular_skyrat/modules/advanced_shuttles/icons/evac_shuttle.dmi b/modular_skyrat/modules/advanced_shuttles/icons/evac_shuttle.dmi
index 3f9c914eb2f..681c90da82d 100644
Binary files a/modular_skyrat/modules/advanced_shuttles/icons/evac_shuttle.dmi and b/modular_skyrat/modules/advanced_shuttles/icons/evac_shuttle.dmi differ