diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index 5e762f6246f..b3a0bcc6440 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -562,14 +562,18 @@
 
 /obj/structure/computerframe
 	name = "computer frame"
-	icon = 'icons/obj/stock_parts.dmi'
-	icon_state = "comp_frame_1"
+	icon = 'icons/obj/computer.dmi'
+	icon_state = "computer"
 	density = TRUE
 	anchored = TRUE
 	max_integrity = 100
 	var/state = STATE_EMPTY
 	var/obj/item/circuitboard/circuit = null
 
+/obj/structure/computerframe/Initialize(mapload)
+	. = ..()
+	overlays += "comp_frame_1"
+
 /obj/structure/computerframe/examine(mob/user)
 	. = ..()
 	. += "<span class='notice'>It is <b>[anchored ? "bolted to the floor" : "unbolted"]</b>.</span>"
@@ -618,8 +622,9 @@
 	if(state == STATE_GLASS)
 		new /obj/item/stack/sheet/glass(location, 2)
 
-/obj/structure/computerframe/update_icon_state()
-	icon_state = "comp_frame_[state]"
+/obj/structure/computerframe/update_overlays()
+	..()
+	. += "comp_frame_[state]"
 
 /obj/structure/computerframe/welder_act(mob/user, obj/item/I)
 	if(state != STATE_EMPTY)
diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi
index a9095781e65..153a37305ab 100644
Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ
diff --git a/icons/obj/stock_parts.dmi b/icons/obj/stock_parts.dmi
index e4782e846ac..dadcf4b78c9 100644
Binary files a/icons/obj/stock_parts.dmi and b/icons/obj/stock_parts.dmi differ