diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm
index 3ff49fc793e..ecdb861cb1e 100644
--- a/code/defines/obj/storage.dm
+++ b/code/defines/obj/storage.dm
@@ -158,11 +158,22 @@
 		"/obj/item/weapon/stamp")
 
 	attackby(obj/item/A as obj, mob/user as mob)
-		if (istype(A, /obj/item/weapon/card/id))
-			icon_state = "walletid"
 		..()
+		update_icon()
 		return
 
+	update_icon()
+		for(var/obj/item/weapon/card/id/ID in contents)
+			if(ID.icon_state == "gold")
+				icon_state = "walletid_gold"
+				return
+			else if(ID.icon_state == "id")
+				icon_state = "walletid"
+				return
+		icon_state = "wallet"
+
+
+
 	proc/get_id()
 		for(var/obj/item/weapon/card/id/ID in contents)
 			if(istype(ID))
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index d5869bdd8b4..8fac0732dac 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -36,6 +36,14 @@ FINGERPRINT CARD
 	src.add_fingerprint(user)
 	return
 
+/obj/item/weapon/card/id/attack_hand(mob/user as mob)
+	var/obj/item/weapon/storage/wallet/WL
+	if( istype(loc, /obj/item/weapon/storage/wallet) )
+		WL = loc
+	..()
+	if(WL)
+		WL.update_icon()
+
 /obj/item/weapon/card/id/verb/read()
 	set name = "Read ID Card"
 	set category = "Object"
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 600c2bf5c6d..2362eea8faa 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ