diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm
index d93ff2a4985..2d71e96176d 100644
--- a/code/game/machinery/airlock_control.dm
+++ b/code/game/machinery/airlock_control.dm
@@ -175,6 +175,7 @@ obj/machinery/access_button
 			icon_state = "access_button_off"
 
 	attack_hand(mob/user)
+		src.add_fingerprint(usr)
 		if(!allowed(user))
 			user << "\red Access Denied"
 
diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm
index 60d606749d5..a7ea1f255dd 100644
--- a/code/game/machinery/door_control.dm
+++ b/code/game/machinery/door_control.dm
@@ -27,6 +27,7 @@
 	return src.attack_hand(user)
 
 /obj/machinery/door_control/attack_hand(mob/user as mob)
+	src.add_fingerprint(usr)
 	if(stat & (NOPOWER|BROKEN))
 		return
 
@@ -89,7 +90,6 @@
 	spawn(15)
 		if(!(stat & NOPOWER))
 			icon_state = "doorctrl0"
-	src.add_fingerprint(usr)
 
 /obj/machinery/door_control/power_change()
 	..()
@@ -112,6 +112,7 @@
 
 /obj/machinery/driver_button/attack_hand(mob/user as mob)
 
+	src.add_fingerprint(usr)
 	if(stat & (NOPOWER|BROKEN))
 		return
 	if(active)
diff --git a/icons/mecha/mech_construction.dmi b/icons/mecha/mech_construction.dmi
index 96c3c950bdc..d7f3722c64a 100644
Binary files a/icons/mecha/mech_construction.dmi and b/icons/mecha/mech_construction.dmi differ
diff --git a/maps/tgstation.2.0.9.dmm b/maps/tgstation.2.0.9.dmm
index d8bf9b3dc31..cf38e4623bb 100644
--- a/maps/tgstation.2.0.9.dmm
+++ b/maps/tgstation.2.0.9.dmm
@@ -5297,7 +5297,7 @@
 "bXS" = (/turf/simulated/floor{tag = "icon-warnwhite (NORTH)"; icon_state = "warnwhite"; dir = 1},/area/assembly/assembly_line)
 "bXT" = (/obj/structure/table,/obj/item/device/mmi,/obj/item/device/mmi,/obj/item/device/mmi,/turf/simulated/floor{tag = "icon-warnwhite (NORTH)"; icon_state = "warnwhite"; dir = 1},/area/assembly/assembly_line)
 "bXU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/assembly/assembly_line)
-"bXV" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/aft)
+"bXV" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/aft)
 "bXW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/maintenance/aft)
 "bXX" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{dir = 8; icon_state = "yellowcorner"},/area/hallway/primary/aft)
 "bXY" = (/obj/machinery/door/firedoor/border_only,/obj/effect/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_x = 32},/turf/simulated/floor{icon_state = "yellowcorner"},/area/hallway/primary/aft)