diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 9af7029d3d4..f7a66dbba5e 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -144,7 +144,7 @@ GLOBAL_LIST_EMPTY(rad_collectors)
 	if(stat & (NOPOWER|BROKEN))
 		return
 	if(active)
-		add_overlay("on")
+		add_overlay(loaded_tank ? "on" : "error")
 
 
 /obj/machinery/power/rad_collector/proc/toggle_power()
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index f6d1fccdb73..501e53d2c9b 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -84,23 +84,16 @@
 	capacity = C / (15000) * 1e6
 
 /obj/machinery/power/smes/update_icon()
-	overlays.Cut()
-	if(stat & BROKEN)	return
+	cut_overlays()
+	if(stat & BROKEN)
+		return
 
-	overlays += image('icons/obj/power.dmi', "smes-op[outputting]")
-
-	if(inputting == 2)
-		overlays += image('icons/obj/power.dmi', "smes-oc2")
-	else if(inputting == 1)
-		overlays += image('icons/obj/power.dmi', "smes-oc1")
-	else
-		if(input_attempt)
-			overlays += image('icons/obj/power.dmi', "smes-oc0")
+	add_overlay("smes-op[outputting ? 1 : 0]")
+	add_overlay("smes-oc[inputting ? 1 : 0]")
 
 	var/clevel = chargedisplay()
-	if(clevel>0)
-		overlays += image('icons/obj/power.dmi', "smes-og[clevel]")
-	return
+	if(clevel > 0)
+		add_overlay("smes-og[clevel]")
 
 /obj/machinery/power/smes/attackby(obj/item/I, mob/user, params)
 	//opening using screwdriver
@@ -249,7 +242,7 @@
 	return ..()
 
 /obj/machinery/power/smes/proc/chargedisplay()
-	return round(5.5*charge/(capacity ? capacity : 5e6))
+	return clamp(round(5.5 * charge / capacity), 0, 5)
 
 /obj/machinery/power/smes/process()
 	if(stat & BROKEN)
diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi
index 0a77587a252..895c56a86d8 100644
Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ
diff --git a/icons/obj/singularity.dmi b/icons/obj/singularity.dmi
index d56355516ce..eb89113b834 100644
Binary files a/icons/obj/singularity.dmi and b/icons/obj/singularity.dmi differ
diff --git a/icons/obj/supermatter.dmi b/icons/obj/supermatter.dmi
index 4fd64bb4fc0..2f4591f3489 100644
Binary files a/icons/obj/supermatter.dmi and b/icons/obj/supermatter.dmi differ