diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 41d0f8a8051..ed8e2320b40 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -323,14 +323,15 @@
 		status_overlays_lighting = new
 		status_overlays_environ = new
 
-		status_overlays_lock.len = 2
+		status_overlays_lock.len = 3
 		status_overlays_charging.len = 3
 		status_overlays_equipment.len = 4
 		status_overlays_lighting.len = 4
 		status_overlays_environ.len = 4
 
-		status_overlays_lock[1] = make_screen_overlay(icon, "apcox-0")    // 0=blue 1=red
-		status_overlays_lock[2] = make_screen_overlay(icon, "apcox-1")
+		status_overlays_lock[1] = make_screen_overlay(icon, "apcox-0") // none
+		status_overlays_lock[2] = make_screen_overlay(icon, "apcox-1") // coverlocked/locked
+		status_overlays_lock[3] = make_screen_overlay(icon, "apcox-2") // coverlocked + locked
 
 		status_overlays_charging[1] = make_screen_overlay(icon, "apco3-0")
 		status_overlays_charging[2] = make_screen_overlay(icon, "apco3-1")
@@ -384,7 +385,7 @@
 	if(update & 2)
 		cut_overlays()
 		if(!(stat & (BROKEN|MAINT)) && update_state & UPDATE_ALLGOOD)
-			add_overlay(status_overlays_lock[locked+1])
+			add_overlay(status_overlays_lock[locked+coverlocked+1])
 			add_overlay(status_overlays_charging[charging+1])
 			if(operating)
 				add_overlay(status_overlays_equipment[equipment+1])
@@ -1048,6 +1049,7 @@
 	if (href_list["lock"])
 		coverlocked = !coverlocked
 		intent_message(BUTTON_FLICK, 5)
+		update_icon()
 
 	else if (href_list["breaker"])
 		toggle_breaker()
diff --git a/html/changelogs/wezzy_apc3.yml b/html/changelogs/wezzy_apc3.yml
new file mode 100644
index 00000000000..114fcd9a995
--- /dev/null
+++ b/html/changelogs/wezzy_apc3.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Fixes APC sprites. Again. Also, adds cover locking and locked states to APCs to improve glance-ability."
\ No newline at end of file
diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi
index aaeafe67d19..a84cda1e73e 100644
Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ