diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 7dee8f55dec..a5e037413c2 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -1449,15 +1449,17 @@
 	name = "d6"
 	desc = "A dice with six sides."
 	var/sides = 6
-	icon_state = "dice"
-	item_state = "dice"
+	icon = 'dice.dmi'
+	icon_state = "d66"
+
+/obj/item/weapon/dice/New()
+	icon_state = "[name][rand(sides)]"
 
 /obj/item/weapon/dice/d20 // -- TLE
 	name = "d20"
-	desc = "A dice with...hell that is many sides."
+	desc = "A dice with twenty sides."
 	sides = 20
-	icon_state = "d20"
-	item_state = "dice"
+	icon_state = "d2020"
 
 /obj/item/weapon/pai_cable
 	desc = "A flexible coated cable with a universal jack on one end."
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 01ef9def176..bda3d86715b 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -402,6 +402,7 @@
 	else if(temp_sides == 20 && result == 1)
 		comment = "Ouch, bad luck."
 	user << text("\red You throw a [src]. It lands on a [result]. [comment]")
+	icon_state = "[name][result]"
 	for(var/mob/O in viewers(user, null))
 		if(O == (user))
 			continue
diff --git a/icons/obj/dice.dmi b/icons/obj/dice.dmi
new file mode 100644
index 00000000000..669ad215c5c
Binary files /dev/null and b/icons/obj/dice.dmi differ