diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index a98d7b08c13..378f92238bc 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -27,7 +27,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\
 	desc = "An electronically-lockable pod for growing organic tissue."
 	density = 1
 	icon = 'icons/obj/cloning.dmi'
-	icon_state = "pod_0"
+	icon_state = "pod_idle"
 	req_access = list(ACCESS_GENETICS) //For premature unlocking.
 
 	var/mob/living/carbon/human/occupant
@@ -419,7 +419,9 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\
 
 /obj/machinery/clonepod/screwdriver_act(mob/user, obj/item/I)
 	. = TRUE
-	default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]", I)
+	// These icon states don't really matter since we need to call update_icon() to handle panel open/closed overlays anyway.
+	default_deconstruction_screwdriver(user, null, null, I)
+	update_icon()
 
 /obj/machinery/clonepod/wrench_act(mob/user, obj/item/I)
 	. = TRUE
@@ -545,11 +547,17 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\
 
 /obj/machinery/clonepod/update_icon()
 	..()
-	icon_state = "pod_0"
+	cut_overlays()
+
+	if(panel_open)
+		add_overlay(list("panel_open"))
+
 	if(occupant && !(stat & NOPOWER))
-		icon_state = "pod_1"
-	else if(mess && !panel_open)
-		icon_state = "pod_g"
+		icon_state = "pod_cloning"
+	else if(mess)
+		icon_state = "pod_mess"
+	else
+		icon_state = "pod_idle"
 
 /obj/machinery/clonepod/relaymove(mob/user)
 	if(user.stat == CONSCIOUS)
diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm
index 434c0af1136..a0006fd00d6 100644
--- a/code/game/objects/effects/misc.dm
+++ b/code/game/objects/effects/misc.dm
@@ -88,7 +88,7 @@
 	name = "horrific experiment"
 	desc = "Some sort of pod filled with blood and vicerea. You swear you can see it moving..."
 	icon = 'icons/obj/cloning.dmi'
-	icon_state = "pod_g"
+	icon_state = "pod_mess"
 
 
 //Makes a tile fully lit no matter what
diff --git a/icons/obj/cloning.dmi b/icons/obj/cloning.dmi
index 69abac9ee4f..83f5d6352d2 100644
Binary files a/icons/obj/cloning.dmi and b/icons/obj/cloning.dmi differ