diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index ad553a7e25..4b2b3e2203 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -1263,7 +1263,7 @@
 /obj/item/storage/box/marshmallow
 	name = "box of marshmallows"
 	desc = "A box of marshmallows."
-	icon_state = "marshmallowbox"
+	illustration = "marshmallow"
 
 /obj/item/storage/box/marshmallow/PopulateContents()
 	for (var/i in 1 to 5)
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
index a1750a2c23..3da0fc1eac 100644
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -620,6 +620,7 @@
 	w_class = WEIGHT_CLASS_TINY
 	tastes = list("marshmallow" = 2)
 	foodtype = SUGAR | JUNKFOOD
+	var/burned = 0
 
 /obj/item/reagent_containers/food/snacks/marshmallow/attackby(obj/item/I, mob/user)
 	switch (I.get_temperature())
@@ -638,14 +639,33 @@
 				burnmallow(TRUE)
 		if (3000 to INFINITY)
 			burnmallow(TRUE)
-	..()
+	return ..()
 
 /obj/item/reagent_containers/food/snacks/marshmallow/proc/burnmallow(reallyburned = FALSE)
-	if (reallyburned && icon_state != "marshmallowrburned")
+	if (reallyburned && burned == 1)
 		icon_state = "marshmallowrburned"
 		desc = "[initial(desc)] It looks very burned."
-		tastes = list("charcoal" = 2)
-	else if (icon_state != "marshmallowrburned")
+	else if (burned == 0)
 		icon_state = "marshmallowburned"
 		desc = "[initial(desc)] It looks just right for eating!"
-		tastes = list("marshmallow" = 1, "cream" = 1)
\ No newline at end of file
+
+/obj/item/reagent_containers/food/snacks/marshmallow/fire_act(temp,volume)
+	switch (temp)
+		if (355 to 1500)
+			if (prob(30))
+				burnmallow()
+		if (1500 to 2000)
+			if (prob(50))
+				burnmallow()
+			else
+				burnmallow(TRUE)
+		if (2000 to 3000)
+			if (prob(10))
+				burnmallow()
+			else
+				burnmallow(TRUE)
+		if (3000 to 7000)
+			burnmallow(TRUE)
+		if (7000 to INFINITY)
+			burn()
+	..()
\ No newline at end of file
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 3785f660e3..8fee8fcf9f 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ