diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 0125f77711c..77d2af411e2 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -39,7 +39,7 @@
 /obj/item/storage/fancy/donut_box
 	name = "donut box"
 	icon_type = "donut"
-	icon_state = "donutbox_back"
+	icon_state = "donutbox"
 	storage_slots = 6
 	can_hold = list(/obj/item/reagent_containers/food/snacks/donut)
 	icon_type = "donut"
@@ -50,12 +50,9 @@
 	. = ..()
 	for(var/I = 1 to length(contents))
 		var/obj/item/reagent_containers/food/snacks/donut/donut = contents[I]
-		var/icon/new_donut_icon = icon('icons/obj/food/containers.dmi', "donut_[donut.donut_sprite_type]")
-		new_donut_icon.Shift(EAST, 3 * (I-1))
+		var/icon/new_donut_icon = icon('icons/obj/food/containers.dmi', "[(I - 1)]donut[donut.donut_sprite_type]")
 		. += new_donut_icon
 
-	. += "donutbox_front"
-
 /obj/item/storage/fancy/donut_box/populate_contents()
 	for(var/I in 1 to storage_slots)
 		new /obj/item/reagent_containers/food/snacks/donut(src)
diff --git a/code/modules/food_and_drinks/food/foods/baked_goods.dm b/code/modules/food_and_drinks/food/foods/baked_goods.dm
index cf080c449b9..068636f363d 100644
--- a/code/modules/food_and_drinks/food/foods/baked_goods.dm
+++ b/code/modules/food_and_drinks/food/foods/baked_goods.dm
@@ -1,3 +1,5 @@
+#define DONUT_NORMAL	1
+#define DONUT_FROSTED	2
 
 //////////////////////
 //		Cakes		//
@@ -370,7 +372,7 @@
 	var/extra_reagent = null
 	filling_color = "#D2691E"
 	var/randomized_sprinkles = 1
-	var/donut_sprite_type = "regular"
+	var/donut_sprite_type = DONUT_NORMAL
 	tastes = list("donut" = 1)
 
 /obj/item/reagent_containers/food/snacks/donut/New()
@@ -379,7 +381,7 @@
 		icon_state = "donut2"
 		name = "frosted donut"
 		reagents.add_reagent("sprinkles", 2)
-		donut_sprite_type = "frosted"
+		donut_sprite_type = DONUT_FROSTED
 		filling_color = "#FF69B4"
 
 /obj/item/reagent_containers/food/snacks/donut/sprinkles
@@ -387,7 +389,7 @@
 	icon_state = "donut2"
 	list_reagents = list("nutriment" = 3, "sugar" = 2, "sprinkles" = 2)
 	filling_color = "#FF69B4"
-	donut_sprite_type = "frosted"
+	donut_sprite_type = DONUT_FROSTED
 	randomized_sprinkles = 0
 
 /obj/item/reagent_containers/food/snacks/donut/chaos
@@ -411,7 +413,6 @@
 	desc = "You jelly?"
 	icon_state = "jdonut1"
 	extra_reagent = "berryjuice"
-	donut_sprite_type = "jelly"
 	tastes = list("jelly" = 1, "donut" = 3)
 
 /obj/item/reagent_containers/food/snacks/donut/jelly/New()
@@ -421,7 +422,7 @@
 	if(prob(30))
 		icon_state = "jdonut2"
 		name = "frosted jelly Donut"
-		donut_sprite_type = "frostedjelly"
+		donut_sprite_type = DONUT_FROSTED
 		reagents.add_reagent("sprinkles", 2)
 		filling_color = "#FF69B4"
 
@@ -525,3 +526,6 @@
 	filling_color = "#F5DEB8"
 	list_reagents = list("nutriment" = 1)
 	tastes = list("cracker" = 1)
+
+#undef DONUT_NORMAL
+#undef DONUT_FROSTED
diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi
index 8a317b9edb0..7f22d0f9be5 100644
Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ