diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm
index 1e72707e86..2fe15a99d8 100644
--- a/code/game/machinery/cell_charger.dm
+++ b/code/game/machinery/cell_charger.dm
@@ -2,7 +2,7 @@
 	name = "cell charger"
 	desc = "It charges power cells."
 	icon = 'icons/obj/power.dmi'
-	icon_state = "ccharger0"
+	icon_state = "ccharger"
 	anchored = TRUE
 	use_power = IDLE_POWER_USE
 	idle_power_usage = 5
@@ -12,19 +12,16 @@
 	var/chargelevel = -1
 
 /obj/machinery/cell_charger/proc/updateicon()
-	icon_state = "ccharger[charging ? 1 : 0]"
+	cut_overlays()
 
-	if(charging && !(stat & (BROKEN|NOPOWER)))
-		var/newlevel = 	round(charging.percent() * 4 / 100)
-
-		if(chargelevel != newlevel)
-			chargelevel = newlevel
-
-			cut_overlays()
-			add_overlay("ccharger-o[newlevel]")
-
-	else
-		cut_overlays()
+	if(charging)
+		add_overlay(image(charging.icon, charging.icon_state))
+		add_overlay("ccharger-on")
+		if(!(stat & (BROKEN|NOPOWER)))
+			var/newlevel = 	round(charging.percent() * 4 / 100)
+			if(chargelevel != newlevel)
+				chargelevel = newlevel
+				add_overlay("ccharger-o[newlevel]")
 
 /obj/machinery/cell_charger/examine(mob/user)
 	..()
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 6b5203ce84..d01516e312 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -120,8 +120,8 @@
 	if(auto_name)
 		name = "\improper [get_area(src)] APC"
 
-	pixel_x = (src.tdir & 3)? 0 : (src.tdir == 4 ? 24 : -25)
-	pixel_y = (src.tdir & 3)? (src.tdir ==1 ? 23 : -24) : 0
+	pixel_x = (src.tdir & 3)? 0 : (src.tdir == 4 ? 26 : -27)
+	pixel_y = (src.tdir & 3)? (src.tdir == 1 ? 25 : -25) : 0
 	if (building)
 		area = get_area(src)
 		opened = 1
diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi
index 6b2ae55351..e1604715ac 100644
Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ