diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index e152d6079b0..ed1c1bd2842 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -5,7 +5,7 @@
 	name = "Door"
 	desc = "It opens and closes."
 	icon = 'icons/obj/doors/Doorint.dmi'
-	icon_state = "door1"
+	icon_state = "door_closed"
 	anchored = 1
 	opacity = 1
 	density = 1
@@ -467,9 +467,9 @@
 
 /obj/machinery/door/update_icon()
 	if(density)
-		icon_state = "door1"
+		icon_state = "door_closed"
 	else
-		icon_state = "door0"
+		icon_state = "door_open"
 	return
 
 
@@ -501,7 +501,7 @@
 	operating = TRUE
 
 	do_animate("opening")
-	icon_state = "door0"
+	icon_state = "door_open"
 	set_opacity(0)
 	sleep(3)
 	src.density = 0
diff --git a/html/changelogs/Ferner-200909-bugfix_airlockopen.yml b/html/changelogs/Ferner-200909-bugfix_airlockopen.yml
new file mode 100644
index 00000000000..023ad3ab620
--- /dev/null
+++ b/html/changelogs/Ferner-200909-bugfix_airlockopen.yml
@@ -0,0 +1,4 @@
+author: Ferner
+delete-after: True
+changes: 
+  - bugfix: "Fixed standard airlocks becoming shuttle ones for a split-second on occasion, and others disappearing."
\ No newline at end of file
diff --git a/icons/obj/doors/doorint.dmi b/icons/obj/doors/doorint.dmi
index d345808e31b..44a0a797038 100644
Binary files a/icons/obj/doors/doorint.dmi and b/icons/obj/doors/doorint.dmi differ
diff --git a/icons/obj/doors/doormorgue.dmi b/icons/obj/doors/doormorgue.dmi
index 626ac4bb6de..0ca293ad0c8 100644
Binary files a/icons/obj/doors/doormorgue.dmi and b/icons/obj/doors/doormorgue.dmi differ