diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm
index 0b4197a8ba15..357917cd2865 100644
--- a/code/game/machinery/buttons.dm
+++ b/code/game/machinery/buttons.dm
@@ -45,7 +45,12 @@
 /obj/machinery/button/update_icon_state()
 	. = ..()
 	if(panel_open)
-		icon_state = "button-open"
+		icon_state = "doorctrl-open"
+		if(device)
+			add_overlay("button-device")
+		if(board)
+			add_overlay("button-board")
+
 	else
 		if(stat & (NOPOWER|BROKEN))
 			icon_state = "[skin]-p"
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index 48814a92bb41..b744834c2478 100644
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ