diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
index a9855999280..852f62ffeca 100644
--- a/code/game/machinery/doors/airlock_types.dm
+++ b/code/game/machinery/doors/airlock_types.dm
@@ -108,6 +108,12 @@
 	doortype = /obj/structure/door_assembly/door_assembly_viro/glass
 	glass = 1
 
+/obj/machinery/door/airlock/glass_maintenance
+	icon = 'icons/obj/doors/airlocks/station/maintenance.dmi'
+	opacity = 0
+	doortype = /obj/structure/door_assembly/door_assembly_mai/glass
+	glass = 1
+
 //////////////////////////////////
 /*
 	Station Airlocks Mineral
@@ -216,6 +222,14 @@
 	overlays_file = 'icons/obj/doors/airlocks/external/overlays.dmi'
 	doortype = /obj/structure/door_assembly/door_assembly_ext
 
+/obj/machinery/door/airlock/glass_external
+	name = "external airlock"
+	icon = 'icons/obj/doors/airlocks/external/external.dmi'
+	overlays_file = 'icons/obj/doors/airlocks/external/overlays.dmi'
+	doortype = /obj/structure/door_assembly/door_assembly_ext/glass
+	opacity = 0
+	glass = 1
+
 //////////////////////////////////
 /*
 	Centcom Airlocks
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index aed76f2b6dc..2054d013079 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -142,20 +142,30 @@
 	icon = 'icons/obj/doors/airlocks/station/maintenance.dmi'
 	typetext = "maintenance"
 	icontext = "mai"
+	glass_type = /obj/machinery/door/airlock/glass_maintenance
 	airlock_type = /obj/machinery/door/airlock/maintenance
 	anchored = 1
 	state = 1
 
+/obj/structure/door_assembly/door_assembly_mai/glass
+	mineral = "glass"
+	material = "glass"
+
 /obj/structure/door_assembly/door_assembly_ext
 	name = "external airlock assembly"
 	icon = 'icons/obj/doors/airlocks/external/external.dmi'
 	overlays_file = 'icons/obj/doors/airlocks/external/overlays.dmi'
 	typetext = "external"
 	icontext = "ext"
+	glass_type = /obj/machinery/door/airlock/glass_external
 	airlock_type = /obj/machinery/door/airlock/external
 	anchored = 1
 	state = 1
 
+/obj/structure/door_assembly/door_assembly_ext/glass
+	mineral = "glass"
+	material = "glass"
+
 /obj/structure/door_assembly/door_assembly_fre
 	name = "freezer airlock assembly"
 	icon = 'icons/obj/doors/airlocks/station/freezer.dmi'
diff --git a/icons/obj/doors/airlocks/external/external.dmi b/icons/obj/doors/airlocks/external/external.dmi
index 1130408c810..4b0461ed59a 100644
Binary files a/icons/obj/doors/airlocks/external/external.dmi and b/icons/obj/doors/airlocks/external/external.dmi differ
diff --git a/icons/obj/doors/airlocks/external/overlays.dmi b/icons/obj/doors/airlocks/external/overlays.dmi
index ce68af3e209..9bd8e5dfa92 100644
Binary files a/icons/obj/doors/airlocks/external/overlays.dmi and b/icons/obj/doors/airlocks/external/overlays.dmi differ