diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 92db899cec8..6aec34116ed 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -319,19 +319,29 @@
 /obj/item/stock_parts/cell/crap
 	name = "\improper Nanotrasen brand rechargeable AA battery"
 	desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
+	icon_state = "aa_cell"
 	maxcharge = STANDARD_CELL_CHARGE * 0.5
 	custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*0.4)
 
+/obj/item/stock_parts/cell/crap/Initialize(mapload)
+	AddElement(/datum/element/update_icon_blocker)
+	return ..()
+
 /obj/item/stock_parts/cell/crap/empty
 	empty = TRUE
 
 /obj/item/stock_parts/cell/upgraded
 	name = "upgraded power cell"
 	desc = "A power cell with a slightly higher capacity than normal!"
+	icon_state = "9v_cell"
 	maxcharge = STANDARD_CELL_CHARGE * 2.5
 	custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*0.5)
 	chargerate = STANDARD_CELL_RATE * 0.5
 
+/obj/item/stock_parts/cell/upgraded/Initialize(mapload)
+	AddElement(/datum/element/update_icon_blocker)
+	return ..()
+
 /obj/item/stock_parts/cell/upgraded/plus
 	name = "upgraded power cell+"
 	desc = "A power cell with an even higher capacity than the base model!"
diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm
index 85704c0c5b7..700f99a6435 100644
--- a/code/modules/research/designs/power_designs.dm
+++ b/code/modules/research/designs/power_designs.dm
@@ -24,7 +24,7 @@
 	construction_time = 10 SECONDS
 	build_path = /obj/item/stock_parts/cell/high/empty
 	category = list(
-		RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2
+		RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_1
 	)
 	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
 
@@ -37,7 +37,7 @@
 	construction_time = 10 SECONDS
 	build_path = /obj/item/stock_parts/cell/super/empty
 	category = list(
-		RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3
+		RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2
 	)
 	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
 
diff --git a/icons/obj/machines/cell_charger.dmi b/icons/obj/machines/cell_charger.dmi
index 5ce285fc817..0c9ca535442 100644
Binary files a/icons/obj/machines/cell_charger.dmi and b/icons/obj/machines/cell_charger.dmi differ
diff --git a/modular_skyrat/modules/aesthetics/cells/cell.dmi b/modular_skyrat/modules/aesthetics/cells/cell.dmi
index 706f5b4b3b5..b0098d976b0 100644
Binary files a/modular_skyrat/modules/aesthetics/cells/cell.dmi and b/modular_skyrat/modules/aesthetics/cells/cell.dmi differ