diff --git a/code/game/objects/random/loot.dm b/code/game/objects/random/loot.dm
index d1f8f799a60..750b513b0a3 100644
--- a/code/game/objects/random/loot.dm
+++ b/code/game/objects/random/loot.dm
@@ -312,7 +312,7 @@
 /obj/random/telecrystals
 	name = "random telecrystals"
 	desc = "Contains a random amount of telecrystals."
-	icon_state = "crystal"
+	icon_state = "coin"
 	spawnlist = list(
 		/obj/item/stack/telecrystal{amount = 10} = 0.5,
 		/obj/item/stack/telecrystal{amount = 15} = 0.4,
@@ -323,7 +323,7 @@
 /obj/random/contraband
 	name = "random contraband"
 	desc = "This is some random contraband."
-	icon_state = "need_sprite"
+	icon_state = "coin"
 	problist = list(
 		/obj/item/storage/pill_bottle/mortaphenyl = 3,
 		/obj/item/storage/pill_bottle/happy = 2,
@@ -367,7 +367,6 @@
 /obj/random/contraband/pill
 	name = "random contraband pill"
 	desc = "This is a random pill of illegal drugs."
-	icon_state = "knife"
 	problist = list(
 		/obj/item/reagent_containers/pill/cocaine = 3,
 		/obj/item/reagent_containers/pill/contemplus = 3,
@@ -380,7 +379,6 @@
 /obj/random/contraband/pillbottle
 	name = "random contraband pill bottle"
 	desc = "This is a random bottle of illegal pills."
-	icon_state = "knife"
 	problist = list(
 		/obj/item/storage/pill_bottle/cocaine = 1,
 		/obj/item/storage/pill_bottle/contemplus = 1,
@@ -406,7 +404,6 @@
 /obj/random/spacecash
 	name = "random credit chips"
 	desc = "This is a random credit chip."
-	icon_state = "cash"
 	problist = list(
 		/obj/item/spacecash/c1 = 6,
 		/obj/item/spacecash/c10 = 3,
diff --git a/code/game/objects/random/weapon.dm b/code/game/objects/random/weapon.dm
index 9ccd5262cd7..f2d89ba7697 100644
--- a/code/game/objects/random/weapon.dm
+++ b/code/game/objects/random/weapon.dm
@@ -113,8 +113,7 @@
 /obj/random/sword
 	name = "random sword"
 	desc = "This is a random sword."
-	icon = 'icons/obj/weapons.dmi'
-	icon_state = "claymore"
+	icon_state = "melee"
 	spawnlist = list(
 		/obj/item/material/sword,
 		/obj/item/material/sword/katana,
diff --git a/html/changelogs/hazelmouse-spritestuff.yml b/html/changelogs/hazelmouse-spritestuff.yml
new file mode 100644
index 00000000000..87a34e746b5
--- /dev/null
+++ b/html/changelogs/hazelmouse-spritestuff.yml
@@ -0,0 +1,59 @@
+################################
+# 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
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: hazelmouse
+
+# 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, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Resolved icon states that were missing in map editing software for several random objects and traps."
+  - imagedel: "Deleted superfluous icons for punji traps."
diff --git a/icons/obj/item/traps/punji.dmi b/icons/obj/item/traps/punji.dmi
index a4fe3606ccd..067892501d1 100644
Binary files a/icons/obj/item/traps/punji.dmi and b/icons/obj/item/traps/punji.dmi differ
diff --git a/icons/obj/item/traps/traps.dmi b/icons/obj/item/traps/traps.dmi
index 68f5949b216..b1d66861e1d 100644
Binary files a/icons/obj/item/traps/traps.dmi and b/icons/obj/item/traps/traps.dmi differ