WIP

code/modules/food_and_drinks/food/customizables.dm

@@ -318,14 +318,17 @@
 	..()
 	update_icon()
 
-/obj/item/reagent_containers/glass/bowl/update_icon()
-	cut_overlays()
+
+/obj/item/reagent_containers/glass/bowl/update_icon_state()
+	if(!reagents || !reagents.total_volume)
+		icon_state = "bowl"
+
+/obj/item/reagent_containers/glass/bowl/update_overlays()
+	. = ..()
 	if(reagents && reagents.total_volume)
 		var/mutable_appearance/filling = mutable_appearance('icons/obj/food/soupsalad.dmi', "fullbowl")
 		filling.color = mix_color_from_reagents(reagents.reagent_list)
-		add_overlay(filling)
-	else
-		icon_state = "bowl"
+		. += filling
 
 #undef INGREDIENTS_FILL
 #undef INGREDIENTS_SCATTER

code/modules/food_and_drinks/kitchen_machinery/gibber.dm

@@ -38,18 +38,18 @@
 			if(M.rating >= 2)
 				. += "<span class='notice'>Gibber has been upgraded to process inorganic materials.</span>"
 
-/obj/machinery/gibber/update_icon()
-	cut_overlays()
+/obj/machinery/gibber/update_overlays()
+	. = ..()
 	if (dirty)
-		add_overlay("grbloody")
+		. += "grbloody"
 	if(stat & (NOPOWER|BROKEN))
 		return
 	if (!occupant)
-		add_overlay("grjam")
+		. += "grjam"
 	else if (operating)
-		add_overlay("gruse")
+		. += "gruse"
 	else
-		add_overlay("gridle")
+		. += "gridle"
 
 /obj/machinery/gibber/attack_paw(mob/user)
 	return attack_hand(user)

code/modules/food_and_drinks/kitchen_machinery/grill.dm

@@ -15,7 +15,7 @@
 	. = ..()
 	grill_loop = new(list(src), FALSE)
 
-/obj/machinery/grill/update_icon()
+/obj/machinery/grill/update_icon_state()
 	if(grilled_item)
 		icon_state = "grill"
 	else if(grill_fuel)

code/modules/food_and_drinks/kitchen_machinery/microwave.dm

@@ -85,7 +85,7 @@
 		. += "<span class='notice'>- Capacity: <b>[max_n_of_items]</b> items.<span>"
 		. += "<span class='notice'>- Cook time reduced by <b>[(efficiency - 1) * 25]%</b>.<span>"
 
-/obj/machinery/microwave/update_icon()
+/obj/machinery/microwave/update_icon_state()
 	if(broken)
 		icon_state = "mwb"
 	else if(dirty_anim_playing)

code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm

@@ -42,7 +42,7 @@
 	..()
 	update_icon()
 
-/obj/machinery/smartfridge/update_icon()
+/obj/machinery/smartfridge/update_icon_state()
 	if(!stat)
 		if(visible_contents)
 			switch(contents.len)
@@ -289,13 +289,12 @@
 	..()
 	update_icon()
 
-/obj/machinery/smartfridge/drying_rack/update_icon()
-	..()
-	cut_overlays()
+/obj/machinery/smartfridge/drying_rack/update_overlays()
+	. = ..()
 	if(drying)
-		add_overlay("drying_rack_drying")
+		. += "drying_rack_drying"
 	if(contents.len)
-		add_overlay("drying_rack_filled")
+		. += "drying_rack_filled"
 
 /obj/machinery/smartfridge/drying_rack/process()
 	..()