diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 54292a3af3..e7fa7447b5 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1347,19 +1347,19 @@
 		return TRUE
 	operating = TRUE
 	update_icon(AIRLOCK_OPENING, 1)
-	src.set_opacity(0)
-	sleep(5)
-	density = FALSE
-	sleep(9)
-	src.layer = OPEN_DOOR_LAYER
-	update_icon(AIRLOCK_OPEN, 1)
+	sleep(1)
 	set_opacity(0)
-	operating = FALSE
-	air_update_turf(1)
 	update_freelook_sight()
+	sleep(4)
+	density = FALSE
+	air_update_turf(1)
+	sleep(1)
+	layer = OPEN_DOOR_LAYER
+	update_icon(AIRLOCK_OPEN, 1)
+	operating = FALSE
 	if(delayed_close_requested)
 		delayed_close_requested = FALSE
-		addtimer(CALLBACK(src, .proc/close), 2)
+		addtimer(CALLBACK(src, .proc/close), 1)
 	return TRUE
 
 
@@ -1391,21 +1391,24 @@
 		return TRUE
 	operating = TRUE
 	update_icon(AIRLOCK_CLOSING, 1)
-	src.layer = CLOSED_DOOR_LAYER
+	layer = CLOSED_DOOR_LAYER
 	if(air_tight)
 		density = TRUE
-	sleep(5)
-	density = TRUE
+		air_update_turf(1)
+	sleep(1)
+	if(!air_tight)
+		density = TRUE
+		air_update_turf(1)
+	sleep(4)
 	if(!safe)
 		crush()
-	sleep(9)
-	update_icon(AIRLOCK_CLOSED, 1)
 	if(visible && !glass)
 		set_opacity(1)
+	update_freelook_sight()
+	sleep(1)
+	update_icon(AIRLOCK_CLOSED, 1)
 	operating = FALSE
 	delayed_close_requested = FALSE
-	air_update_turf(1)
-	update_freelook_sight()
 	if(safe)
 		CheckForMobs()
 	return TRUE
diff --git a/icons/obj/doors/airlocks/abductor/abductor_airlock.dmi b/icons/obj/doors/airlocks/abductor/abductor_airlock.dmi
index d0ef3d2462..58be8d778e 100644
Binary files a/icons/obj/doors/airlocks/abductor/abductor_airlock.dmi and b/icons/obj/doors/airlocks/abductor/abductor_airlock.dmi differ
diff --git a/icons/obj/doors/airlocks/survival/survival.dmi b/icons/obj/doors/airlocks/survival/survival.dmi
index f96d174c47..b796b4c8e0 100644
Binary files a/icons/obj/doors/airlocks/survival/survival.dmi and b/icons/obj/doors/airlocks/survival/survival.dmi differ
diff --git a/icons/obj/doors/airlocks/survival/survival_overlays.dmi b/icons/obj/doors/airlocks/survival/survival_overlays.dmi
index e8bede8217..94c1a9fa34 100644
Binary files a/icons/obj/doors/airlocks/survival/survival_overlays.dmi and b/icons/obj/doors/airlocks/survival/survival_overlays.dmi differ