diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm
index add962a685a..d5ab7f0142c 100644
--- a/code/game/objects/items/weapons/storage/misc.dm
+++ b/code/game/objects/items/weapons/storage/misc.dm
@@ -22,6 +22,22 @@
 		/obj/item/weapon/dice/d100 = 1
 	)
 
+/obj/item/weapon/storage/card
+	name = "card box"
+	desc = "A small leather case to show how classy you are compared to everyone else."
+	icon_state = "card_holder_empty"
+	can_hold = list(/obj/item/weapon/deck, /obj/item/battle_monsters/deck, /obj/item/weapon/hand, /obj/item/weapon/pack/, /obj/item/weapon/card) //sneaky folks can hide ID and other cards
+	storage_slots = 1 //can hold one deck
+	use_sound = "sound/items/drop/shoes.ogg"
+	drop_sound = "sound/items/drop/hat.ogg"
+
+/obj/item/weapon/storage/card/update_icon()
+	if(contents.len)
+		icon_state = "card_holder_items"
+	else
+		icon_state = "card_holder_empty"
+	return
+
 /*
  * Donut Box
  */
diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm
index 8d6351a4d79..d6f24450afb 100644
--- a/code/modules/client/preference_setup/loadout/loadout_general.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_general.dm
@@ -20,7 +20,7 @@
 
 /datum/gear/holder
 	display_name = "card holder"
-	path = /obj/item/weapon/deck/holder
+	path = /obj/item/weapon/storage/card
 
 /datum/gear/cardemon_pack
 	display_name = "cardemon booster pack"
diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm
index 42322b026d1..14198556a3f 100644
--- a/code/modules/games/cards.dm
+++ b/code/modules/games/cards.dm
@@ -11,11 +11,6 @@
 /obj/item/weapon/deck/proc/generate_deck() //the procs that creates the cards
 	return
 
-/obj/item/weapon/deck/holder
-	name = "card box"
-	desc = "A small leather case to show how classy you are compared to everyone else."
-	icon_state = "card_holder"
-
 /obj/item/weapon/deck/cards
 	name = "deck of cards"
 	desc = "A simple deck of playing cards."
diff --git a/code/modules/item_worth/worths_list.dm b/code/modules/item_worth/worths_list.dm
index e9a4c878891..e47c24ed895 100644
--- a/code/modules/item_worth/worths_list.dm
+++ b/code/modules/item_worth/worths_list.dm
@@ -412,7 +412,7 @@ var/list/worths = list(
 					/obj/item/weapon/evidencebag = 5,
 					/obj/item/weapon/sample = 15,
 					/obj/item/weapon/board = 15,
-					/obj/item/weapon/deck/holder = 10,
+					/obj/item/weapon/storage/card = 10,
 					/obj/item/weapon/pack = 6,
 					/obj/item/weapon/holo = 0,
 					/obj/item/weapon/beach_ball/holoball = 0,
diff --git a/html/changelogs/doxxcards.yml b/html/changelogs/doxxcards.yml
new file mode 100644
index 00000000000..d73c1c30d3e
--- /dev/null
+++ b/html/changelogs/doxxcards.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: Doxxmedearly
+
+# 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: 
+  - rscadd: "Card holders now hold cards like they should. Children's card game elitists, rejoice!"
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index c41ed89b218..5dfb9f0d64b 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index a20649b7498..3e7391d2948 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -30926,7 +30926,7 @@
 "ltb" = (
 /obj/structure/table/wood,
 /obj/item/weapon/deck/cards,
-/obj/item/weapon/deck/holder,
+/obj/item/weapon/storage/card,
 /obj/item/weapon/deck/tarot,
 /turf/simulated/floor/wood,
 /area/medical/patient_wing_library)
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index dd2d2a4ac59..87f8f87dd14 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -3219,6 +3219,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
+"aga" = (
+/obj/structure/table/wood,
+/obj/item/weapon/deck/cards,
+/obj/item/weapon/deck/tarot,
+/obj/item/weapon/storage/card,
+/turf/simulated/floor/carpet,
+/area/library)
 "agb" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -53728,13 +53735,6 @@
 	},
 /turf/simulated/floor/carpet,
 /area/library)
-"bPU" = (
-/obj/structure/table/wood,
-/obj/item/weapon/deck/cards,
-/obj/item/weapon/deck/holder,
-/obj/item/weapon/deck/tarot,
-/turf/simulated/floor/carpet,
-/area/library)
 "bPX" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/structure/disposalpipe/segment{
@@ -97550,7 +97550,7 @@ bNt
 bOn
 bON
 bPx
-bPU
+aga
 bPT
 abX
 bIT