diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index cfaf138a13fc9..be49385dbaa1a 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -74,7 +74,7 @@
 
 /obj/machinery/door/airlock
 	name = "Airlock"
-	icon = 'icons/obj/doors/airlocks/station/public.dmi'
+	icon = 'icons/obj/doors/airlocks/tall/maintenance.dmi'
 	icon_state = "closed"
 	max_integrity = 300
 	var/normal_integrity = AIRLOCK_INTEGRITY_N
@@ -581,9 +581,6 @@
 			if(!greyscale_config)
 				. += get_airlock_overlay("[airlock_material]_opening", icon , src)
 
-	if(lights && hasPower())
-		. += get_airlock_overlay("lights_[light_state]", overlays_file, src, em_block = FALSE)
-
 	if(panel_open)
 		. += get_airlock_overlay("panel_[frame_state][security_level ? "_protected" : null]", overlays_file, src, em_block = TRUE)
 	if(frame_state == AIRLOCK_FRAME_CLOSED && welded)
@@ -592,7 +589,18 @@
 	if(airlock_state == AIRLOCK_EMAG)
 		. += get_airlock_overlay("sparks", overlays_file, src, em_block = FALSE)
 
-	if(hasPower())
+	if(hasPower()) //Indicator Lights section
+
+		if(unres_sides && airlock_state == AIRLOCK_CLOSED) //Unrestricted access side. This is the lowest priority light, so we do it first
+			for(var/heading in list(dir,turn(dir, 180))) //Only check the door's dir and the flip
+				if(!(unres_sides & heading))
+					continue
+				for(var/mutable_appearance/bluelight in get_airlock_overlay("lights_unres", overlays_file, src, em_block = FALSE))
+					. += make_mutable_appearance_directional(bluelight, heading)
+
+		if(lights) //bolt lights
+			. += get_airlock_overlay("lights_[light_state]", overlays_file, src, em_block = FALSE)
+
 		if(frame_state == AIRLOCK_FRAME_CLOSED)
 			if(atom_integrity < integrity_failure * max_integrity)
 				. += get_airlock_overlay("sparks_broken", overlays_file, src, em_block = FALSE)
@@ -608,21 +616,6 @@
 	if(frame_state == AIRLOCK_FRAME_CLOSED && seal)
 		. += get_airlock_overlay("sealed", overlays_file, src, em_block = TRUE)
 
-	if(hasPower() && unres_sides)
-		for(var/heading in list(NORTH,SOUTH,EAST,WEST))
-			if(!(unres_sides & heading))
-				continue
-			var/mutable_appearance/floorlight = mutable_appearance('icons/obj/doors/airlocks/station/overlays.dmi', "unres_[heading]", FLOAT_LAYER, src, ABOVE_LIGHTING_PLANE)
-			switch (heading)
-				if (NORTH)
-					floorlight.pixel_y = 32
-				if (SOUTH)
-					floorlight.pixel_y = -32
-				if (EAST)
-					floorlight.pixel_x = 28
-				if (WEST)
-					floorlight.pixel_x = -28
-			. += floorlight
 	update_greyscale()
 
 // I HATE AIRLOCKS AHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
diff --git a/icons/obj/doors/airlocks/tall/overlays.dmi b/icons/obj/doors/airlocks/tall/overlays.dmi
index 78645a7a75a66..5200ae837178a 100644
Binary files a/icons/obj/doors/airlocks/tall/overlays.dmi and b/icons/obj/doors/airlocks/tall/overlays.dmi differ