diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm
index fb2a9ef4b5e..8e67ec0ce5b 100644
--- a/code/game/machinery/vending_types.dm
+++ b/code/game/machinery/vending_types.dm
@@ -471,14 +471,14 @@
 		/obj/item/device/holowarrant = 5
 	)
 	premium = list(
-		/obj/item/storage/box/donut = 2
+		/obj/item/storage/fancy/donut = 2
 	)
 	contraband = list(
 		/obj/item/clothing/glasses/sunglasses = 2,
 		/obj/item/grenade/flashbang = 4
 	)
 	restock_blocked_items = list(
-		/obj/item/storage/box/donut,
+		/obj/item/storage/fancy/donut,
 		/obj/item/storage/box/evidence,
 		/obj/item/device/flash,
 		/obj/item/reagent_containers/spray/pepper
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 983f0569e49..49d3cb59d2e 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -15,11 +15,8 @@
 
 
 /obj/item/storage/fancy
-	name = "donut box"
-	desc = "A box of half-a-dozen donuts."
-	icon = 'icons/obj/food.dmi'
-	icon_state = "donutbox6"
-	var/icon_type = "donut"
+	item_state = "syringe_kit" //placeholder, many of these don't have inhands
+	var/icon_type = null
 	var/storage_type = "box"
 	drop_sound = 'sound/items/drop/box.ogg'
 	use_sound = 'sound/items/storage/box.ogg'
@@ -29,7 +26,7 @@
 	src.icon_state = "[src.icon_type]box[total_contents]"
 	return
 
-/obj/item/storage/fancy/examine(mob/user)
+/obj/item/storage/fancy/examine(mob/user as mob)
 	if(!..(user, 1))
 		return
 
@@ -42,15 +39,46 @@
 
 	return
 
+/*
+ * Donut Box
+ */
+
+/obj/item/storage/fancy/donut
+	name = "donut box"
+	desc = "A box of half-a-dozen donuts."
+	icon = 'icons/obj/food.dmi'
+	icon_state = "donutbox"
+	icon_type = "donut"
+	center_of_mass = list("x" = 16,"y" = 9)
+	can_hold = list(/obj/item/reagent_containers/food/snacks/donut)
+	starts_with = list(/obj/item/reagent_containers/food/snacks/donut/normal = 6)
+	storage_slots = 6
+
+/obj/item/storage/fancy/donut/fill()
+	. = ..()
+	update_icon()
+
+/obj/item/storage/fancy/donut/update_icon()
+	cut_overlays()
+	var/i = 0
+	for(var/obj/item/reagent_containers/food/snacks/donut/D in contents)
+		add_overlay("[i][D.overlay_state]")
+		i++
+
+/obj/item/storage/fancy/donut/empty
+	starts_with = null
+
+
 /*
  * Egg Box
  */
 /obj/item/storage/fancy/egg_box
-	name = "egg box"
+	name = "egg carton"
 	desc = "A carton of eggs."
 	icon = 'icons/obj/food.dmi'
 	icon_state = "eggbox"
 	icon_type = "egg"
+	storage_type = "carton"
 	center_of_mass = list("x" = 16,"y" = 7)
 	storage_slots = 12
 	can_hold = list(
@@ -84,7 +112,6 @@
 	icon = 'icons/obj/crayons.dmi'
 	icon_state = "crayonbox"
 	icon_type = "crayon"
-	drop_sound = 'sound/items/drop/box.ogg'
 	w_class = 2.0
 	can_hold = list(
 		/obj/item/pen/crayon
@@ -260,9 +287,11 @@
  */
 /obj/item/storage/fancy/vials
 	name = "vial storage box"
+	desc = "A box of vials."
 	icon = 'icons/obj/vialbox.dmi'
 	icon_state = "vialbox6"
 	icon_type = "vial"
+	use_sound = 'sound/items/drop/glass.ogg'
 	drop_sound = 'sound/items/drop/metalboots.ogg'
 	storage_slots = 6
 	can_hold = list(/obj/item/reagent_containers/glass/beaker/vial)
@@ -274,6 +303,7 @@
 	icon = 'icons/obj/vialbox.dmi'
 	icon_state = "vialbox0"
 	item_state = "syringe_kit"
+	use_sound = 'sound/items/drop/glass.ogg'
 	drop_sound = 'sound/items/drop/metalboots.ogg'
 	max_w_class = 2
 	can_hold = list(/obj/item/reagent_containers/glass/beaker/vial)
@@ -301,10 +331,11 @@
 	update_icon()
 
 /obj/item/storage/fancy/chocolate_box
+	name = "chocolate box"
+	desc = "A lot like life, you never know what you're going to get."
 	icon = 'icons/obj/chocolate.dmi'
 	icon_state = "chocolatebox"
 	icon_type = "chocolate"
-	name = "chocolate box"
 	storage_slots = 8
 	can_hold = list(
 		/obj/item/reagent_containers/food/snacks/truffle/random
diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm
index 9940dda3ad4..5e2890e8f0a 100644
--- a/code/game/objects/items/weapons/storage/misc.dm
+++ b/code/game/objects/items/weapons/storage/misc.dm
@@ -38,34 +38,6 @@
 		icon_state = "card_holder_empty"
 	return
 
-/*
- * Donut Box
- */
-
-/obj/item/storage/box/donut
-	icon = 'icons/obj/food.dmi'
-	icon_state = "donutbox"
-	center_of_mass = list("x" = 16,"y" = 9)
-	name = "donut box"
-	can_hold = list(/obj/item/reagent_containers/food/snacks/donut)
-	foldable = /obj/item/stack/material/cardboard
-	starts_with = list(/obj/item/reagent_containers/food/snacks/donut/normal = 6)
-
-/obj/item/storage/box/donut/fill()
-	. = ..()
-	update_icon()
-
-/obj/item/storage/box/donut/update_icon()
-	cut_overlays()
-	var/i = 0
-	for(var/obj/item/reagent_containers/food/snacks/donut/D in contents)
-		add_overlay("[i][D.overlay_state]")
-		i++
-
-/obj/item/storage/box/donut/empty
-	starts_with = null
-	max_storage_space = 12
-
 /obj/item/storage/box/pineapple
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "pineapple_rings"
diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm
index fe7281f4a5d..7315f1424ad 100644
--- a/code/game/objects/items/weapons/surgery_tools.dm
+++ b/code/game/objects/items/weapons/surgery_tools.dm
@@ -178,6 +178,7 @@
 
 /obj/item/storage/fancy/tray
 	name = "surgery tray"
+	desc = "A tray of surgical tools."
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "surgerytray"
 	use_sound = null
diff --git a/code/modules/materials/material_recipes.dm b/code/modules/materials/material_recipes.dm
index 7c0b126a868..76dc3f0706b 100644
--- a/code/modules/materials/material_recipes.dm
+++ b/code/modules/materials/material_recipes.dm
@@ -140,7 +140,7 @@
 /material/cardboard/generate_recipes()
 	..()
 	recipes += new/datum/stack_recipe("box", /obj/item/storage/box)
-	recipes += new/datum/stack_recipe("donut box", /obj/item/storage/box/donut/empty)
+	recipes += new/datum/stack_recipe("donut box", /obj/item/storage/fancy/donut/empty)
 	recipes += new/datum/stack_recipe("egg box", /obj/item/storage/fancy/egg_box)
 	recipes += new/datum/stack_recipe("light tubes box", /obj/item/storage/box/lights/tubes)
 	recipes += new/datum/stack_recipe("light bulbs box", /obj/item/storage/box/lights/bulbs)
diff --git a/html/changelogs/wezzy_fancy_box_fix.yml b/html/changelogs/wezzy_fancy_box_fix.yml
new file mode 100644
index 00000000000..961d473d684
--- /dev/null
+++ b/html/changelogs/wezzy_fancy_box_fix.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "Fixes donut boxes examine not working properly, and surgery tray description being one of a donut box."
diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm
index d6bbd08358e..068110abe95 100644
--- a/maps/aurora/aurora-1_centcomm.dmm
+++ b/maps/aurora/aurora-1_centcomm.dmm
@@ -10566,7 +10566,7 @@
 /area/centcom/control)
 "ayU" = (
 /obj/structure/table/reinforced,
-/obj/item/storage/box/donut,
+/obj/item/storage/fancy/donut,
 /turf/unsimulated/floor{
 	icon_state = "floor"
 	},
@@ -11324,7 +11324,7 @@
 /area/centcom/specops)
 "aAv" = (
 /obj/structure/table/reinforced,
-/obj/item/storage/box/donut,
+/obj/item/storage/fancy/donut,
 /turf/unsimulated/floor{
 	icon_state = "dark"
 	},
@@ -27677,7 +27677,7 @@
 /area/shuttle/escape/centcom)
 "nZO" = (
 /obj/structure/table/standard,
-/obj/item/storage/box/donut{
+/obj/item/storage/fancy/donut{
 	pixel_y = 0
 	},
 /turf/unsimulated/floor{
diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index e122958bf78..20c44e4cb7f 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -31638,7 +31638,7 @@
 	icon_state = "1-8"
 	},
 /obj/structure/table/standard,
-/obj/item/storage/box/donut,
+/obj/item/storage/fancy/donut,
 /obj/machinery/firealarm/south,
 /turf/simulated/floor/tiled,
 /area/engineering/break_room)
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index a75da56aea5..90f031cb942 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -7682,7 +7682,7 @@
 /area/security/brig)
 "apn" = (
 /obj/structure/table/standard,
-/obj/item/storage/box/donut,
+/obj/item/storage/fancy/donut,
 /obj/machinery/newscaster{
 	pixel_x = -28
 	},
@@ -18297,7 +18297,7 @@
 /area/security/brig)
 "aGI" = (
 /obj/structure/table/wood,
-/obj/item/storage/box/donut{
+/obj/item/storage/fancy/donut{
 	pixel_y = 2
 	},
 /obj/machinery/firealarm/west,
@@ -21815,7 +21815,7 @@
 /area/crew_quarters/captain)
 "aMp" = (
 /obj/structure/table/wood,
-/obj/item/storage/box/donut,
+/obj/item/storage/fancy/donut,
 /turf/simulated/floor/carpet,
 /area/crew_quarters/captain)
 "aMq" = (
@@ -31467,7 +31467,7 @@
 /area/crew_quarters/medbreak)
 "bcn" = (
 /obj/structure/table/glass,
-/obj/item/storage/box/donut,
+/obj/item/storage/fancy/donut,
 /obj/effect/floor_decal/corner/white/diagonal,
 /obj/machinery/newscaster{
 	pixel_y = 32
diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm
index a35ada2bf5a..c1a3d1239ae 100644
--- a/maps/aurora/aurora-5_interstitial.dmm
+++ b/maps/aurora/aurora-5_interstitial.dmm
@@ -1726,7 +1726,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /obj/machinery/firealarm/north,
 /obj/structure/table/wood,
-/obj/item/storage/box/donut,
+/obj/item/storage/fancy/donut,
 /obj/machinery/camera/network/security{
 	c_tag = "Security - Training Division 3";
 	dir = 8
diff --git a/maps/exodus/exodus-1_station.dmm b/maps/exodus/exodus-1_station.dmm
index 5ef842b1794..dc3807d31a0 100644
--- a/maps/exodus/exodus-1_station.dmm
+++ b/maps/exodus/exodus-1_station.dmm
@@ -2810,7 +2810,7 @@
 	icon_state = "tube1";
 	dir = 4
 	},
-/obj/item/storage/box/donut,
+/obj/item/storage/fancy/donut,
 /obj/effect/floor_decal/corner/blue,
 /turf/simulated/floor/tiled,
 /area/security/main)
@@ -28413,7 +28413,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/item/storage/box/donut,
+/obj/item/storage/fancy/donut,
 /obj/effect/floor_decal/corner/blue/full,
 /turf/simulated/floor/tiled,
 /area/bridge)
@@ -30260,7 +30260,7 @@
 	},
 /obj/machinery/light,
 /obj/structure/table/stone/marble,
-/obj/item/storage/box/donut,
+/obj/item/storage/fancy/donut,
 /turf/simulated/floor/tiled,
 /area/crew_quarters/kitchen)
 "bed" = (
@@ -31684,7 +31684,7 @@
 /area/crew_quarters/captain)
 "bgT" = (
 /obj/structure/table/wood,
-/obj/item/storage/box/donut,
+/obj/item/storage/fancy/donut,
 /obj/structure/cable/green{
 	d1 = 4;
 	d2 = 8;
@@ -33190,7 +33190,7 @@
 /obj/machinery/recharger{
 	pixel_y = 4
 	},
-/obj/item/storage/box/donut,
+/obj/item/storage/fancy/donut,
 /turf/simulated/floor/wood,
 /area/bridge/meeting_room)
 "bjH" = (
@@ -55556,7 +55556,7 @@
 "bWV" = (
 /obj/effect/floor_decal/corner/white/diagonal,
 /obj/structure/table/glass,
-/obj/item/storage/box/donut,
+/obj/item/storage/fancy/donut,
 /turf/simulated/floor/tiled,
 /area/crew_quarters/medbreak)
 "bWW" = (
diff --git a/maps/exodus/exodus-2_centcomm.dmm b/maps/exodus/exodus-2_centcomm.dmm
index 0f2d77abbc5..aa71c5f8d56 100644
--- a/maps/exodus/exodus-2_centcomm.dmm
+++ b/maps/exodus/exodus-2_centcomm.dmm
@@ -7860,7 +7860,7 @@
 /area/shuttle/administration/centcom)
 "axh" = (
 /obj/structure/table/reinforced,
-/obj/item/storage/box/donut,
+/obj/item/storage/fancy/donut,
 /turf/unsimulated/floor{
 	icon_state = "dark"
 	},
@@ -12075,7 +12075,7 @@
 /area/wizard_station)
 "aKF" = (
 /obj/structure/table/wood,
-/obj/item/storage/box/donut,
+/obj/item/storage/fancy/donut,
 /turf/unsimulated/floor{
 	dir = 8;
 	icon_state = "wood"
@@ -13847,7 +13847,7 @@
 /area/centcom/control)
 "aOK" = (
 /obj/structure/table/reinforced,
-/obj/item/storage/box/donut,
+/obj/item/storage/fancy/donut,
 /turf/unsimulated/floor{
 	icon_state = "floor"
 	},
diff --git a/maps/runtime/runtime-1.dmm b/maps/runtime/runtime-1.dmm
index 6a7a1e0a856..3aca8346f52 100644
--- a/maps/runtime/runtime-1.dmm
+++ b/maps/runtime/runtime-1.dmm
@@ -1049,7 +1049,7 @@
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/entry)
 "cG" = (
-/obj/item/storage/box/donut,
+/obj/item/storage/fancy/donut,
 /obj/effect/floor_decal/corner/blue{
 	dir = 1
 	},