diff --git a/code/datums/actions/mobs/ninja.dm b/code/datums/actions/mobs/ninja.dm
index 275df224df20..8841dd2c2c60 100644
--- a/code/datums/actions/mobs/ninja.dm
+++ b/code/datums/actions/mobs/ninja.dm
@@ -24,7 +24,7 @@
 	name = "Create Throwing Stars (3E)"
 	desc = "Creates some throwing stars"
 	button_icon_state = "throwingstar"
-	button_icon = 'icons/obj/weapons/misc.dmi'
+	button_icon = 'icons/obj/weapons/thrown.dmi'
 
 /datum/action/item_action/ninjanet
 	name = "Energy Net (25E)"
@@ -36,7 +36,7 @@
 	name = "Recall Energy Katana (Variable Cost)"
 	desc = "Teleports the Energy Katana linked to this suit to its wearer, cost based on distance."
 	button_icon_state = "energy_katana"
-	button_icon = 'icons/obj/weapons/swords.dmi'
+	button_icon = 'icons/obj/weapons/longsword.dmi'
 
 /datum/action/item_action/ninja_stealth
 	name = "Toggle Stealth"
diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm
index c8ab760ffd69..ac11b8c98563 100644
--- a/code/datums/martial/sleeping_carp.dm
+++ b/code/datums/martial/sleeping_carp.dm
@@ -174,7 +174,7 @@
 	throwforce = 20
 	throw_speed = 2
 	attack_verb = list("smashed", "slammed", "whacked", "thwacked")
-	icon = 'icons/obj/weapons/misc.dmi'
+	icon = 'icons/obj/weapons/staff.dmi'
 	icon_state = "bostaff0"
 	base_icon_state = "bostaff"
 	lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
diff --git a/code/game/objects/items/devices/busterarm/_buster.dm b/code/game/objects/items/devices/busterarm/_buster.dm
index b828191fbb05..bfcca612cd0a 100644
--- a/code/game/objects/items/devices/busterarm/_buster.dm
+++ b/code/game/objects/items/devices/busterarm/_buster.dm
@@ -32,7 +32,7 @@
 /obj/item/buster
 	item_flags = DROPDEL
 	w_class = 5
-	icon = 'icons/obj/wizard.dmi'
+	icon = 'icons/obj/weapons/hand.dmi'
 	icon_state = "disintegrate"
 	item_state = "disintegrate"
 	lefthand_file = 'icons/mob/inhands/misc/touchspell_lefthand.dmi'
diff --git a/code/game/objects/items/devices/busterarm/megabuster.dm b/code/game/objects/items/devices/busterarm/megabuster.dm
index ddee326e555b..f84eda9cd247 100644
--- a/code/game/objects/items/devices/busterarm/megabuster.dm
+++ b/code/game/objects/items/devices/busterarm/megabuster.dm
@@ -61,7 +61,7 @@
 /obj/item/buster/megabuster
 	name = "supercharged fist"
 	desc = "The result of all the prosthetic's power building up. It's fading fast."
-	icon = 'icons/obj/wizard.dmi'
+	icon = 'icons/obj/weapons/hand.dmi'
 	icon_state = "fist"
 	item_state = "disintegrate"
 	lefthand_file = 'icons/mob/inhands/misc/touchspell_lefthand.dmi'
diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm
index a1c4a621be82..3a9f71b5af79 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -417,6 +417,7 @@
 /obj/item/restraints/legcuffs/bola
 	name = "bola"
 	desc = "A restraining device designed to be thrown at the target. Upon connecting with said target, it will wrap around their legs, making it difficult for them to move quickly."
+	icon = 'icons/obj/weapons/thrown.dmi'
 	icon_state = "bola"
 	icon_state_preview = "bola_preview"
 	item_state = "bola"
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index 76e46ad15311..82e646764b64 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -8,6 +8,7 @@
 /obj/item/nullrod
 	name = "null rod"
 	desc = "A rod of pure obsidian; its very presence disrupts and dampens the powers of Nar'sie and Ratvar's followers."
+	icon = 'icons/obj/weapons/staff.dmi'
 	icon_state = "nullrod"
 	item_state = "nullrod"
 	lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
@@ -131,7 +132,7 @@
 ----------------------------------------------------------------------------*/
 
 /obj/item/nullrod/claymore
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "holyblade"
 	item_state = "holyblade"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -201,7 +202,7 @@
 /obj/item/nullrod/vibro
 	name = "high frequency blade"
 	desc = "Bad references are the DNA of the soul."
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "vibroblade"//ignore that the sec vibro sword uses the high frequency sprite
 	item_state = "vibroblade"//and this this uses vibroblade sprites
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -222,7 +223,6 @@
 /obj/item/nullrod/vibro/spellblade
 	name = "dormant spellblade"
 	desc = "The blade grants the wielder nearly limitless power...if they can figure out how to turn it on, that is."
-	icon = 'icons/obj/weapons/swords.dmi'
 	icon_state = "spellblade"
 	item_state = "spellblade"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -252,7 +252,7 @@
 /obj/item/nullrod/corvo
 	name = "folding blade"
 	desc = "A relic of a fallen empire. Touch of the outsider not included."
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/shortsword.dmi'
 	lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
 	icon_state = "corvo_0"
@@ -291,7 +291,7 @@
 /obj/item/nullrod/glowing
 	name = "force weapon"
 	desc = "The blade glows with the power of faith. Or possibly a battery."
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "swordon"
 	item_state = "swordon"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -320,7 +320,7 @@
 /obj/item/nullrod/Hypertool
 	name = "hypertool"
 	desc = "A tool so powerful even you cannot perfectly use it."
-	icon = 'icons/obj/device.dmi'
+	icon = 'icons/obj/weapons/hammer.dmi'
 	icon_state = "hypertool"
 	item_state = "hypertool"
 	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
@@ -336,7 +336,7 @@
 /obj/item/nullrod/whip
 	name = "holy whip"
 	desc = "What a terrible night to be on Space Station 13."
-	icon = 'icons/obj/weapons/misc.dmi'
+	icon = 'icons/obj/weapons/whip.dmi'
 	icon_state = "chain"
 	item_state = "chain"
 	lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
@@ -356,7 +356,7 @@
 /obj/item/nullrod/bostaff
 	name = "monk's staff"
 	desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts, it is now used to harass the clown."
-	icon = 'icons/obj/weapons/misc.dmi'
+	icon = 'icons/obj/weapons/staff.dmi'
 	icon_state = "bostaff0"
 	item_state = "bostaff0"
 	lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
@@ -384,7 +384,7 @@
 /obj/item/nullrod/tribal_knife
 	name = "arrhythmic knife"
 	desc = "They say fear is the true mind killer, but stabbing them in the head works too. Honour compels you to not sheathe it once drawn."
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/shortsword.dmi'
 	icon_state = "crysknife"
 	item_state = "crysknife"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -413,10 +413,10 @@
 /obj/item/nullrod/hammer
 	name = "relic war hammer"
 	desc = "This war hammer cost the chaplain forty thousand space dollars."
-	icon = 'icons/obj/weapons/misc.dmi'
-	icon_state = "hammer"
-	item_state = "hammer"
-	base_icon_state = "hammer"
+	icon = 'icons/obj/weapons/hammer.dmi'
+	icon_state = "relic_hammer"
+	item_state = "relic_hammer"
+	base_icon_state = "relic_hammer"
 	lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/hammers_righthand.dmi'
 	slot_flags = ITEM_SLOT_BACK
@@ -530,7 +530,7 @@
 /obj/item/nullrod/handedsword
 	name = "Justice"
 	desc = "Ashes to ashes... Rust to rust..."
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "dualright"
 	item_state = "dualright"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -545,7 +545,7 @@
 /obj/item/nullrod/handedsword/other
 	name = "Splendor"
 	desc = "\"I'm going to ultrakill you!\" -Righteous Judge"
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "dualleft"
 	item_state = "dualleft"
 
@@ -583,7 +583,7 @@
 /obj/item/nullrod/godhand
 	name = "god hand"
 	desc = "This hand of yours glows with an awesome power!"
-	icon = 'icons/obj/wizard.dmi'
+	icon = 'icons/obj/weapons/hand.dmi'
 	icon_state = "disintegrate"
 	item_state = "disintegrate"
 	lefthand_file = 'icons/mob/inhands/misc/touchspell_lefthand.dmi'
@@ -630,7 +630,7 @@
 /obj/item/nullrod/armblade
 	name = "dark blessing"
 	desc = "Particularly twisted deities grant gifts of dubious value."
-	icon = 'icons/obj/changeling.dmi'
+	icon = 'icons/obj/weapons/hand.dmi'
 	icon_state = "arm_blade"
 	item_state = "arm_blade"
 	tool_behaviour = TOOL_MINING
@@ -706,17 +706,6 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	sharpness = SHARP_POINTY
 
-/obj/item/nullrod/egyptian
-	name = "egyptian staff"
-	desc = "A tutorial in mummification is carved into the staff. You could probably craft the wraps if you had some cloth."
-	icon = 'icons/obj/guns/magic.dmi'
-	icon_state = "pharoah_sceptre"
-	item_state = "pharoah_sceptre"
-	lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
-	w_class = WEIGHT_CLASS_NORMAL
-	attack_verb = list("bashes", "smacks", "whacks")
-
 /obj/item/nullrod/servoskull/equipped(mob/living/carbon/human/user, slot)
 	..()
 	if(hud_type && slot == ITEM_SLOT_EYES)
@@ -817,13 +806,13 @@
 |
 ----------------------------------------------------------------------------*/
 /obj/item/nullrod/staff
-	icon = 'icons/obj/wizard.dmi'
 	name = "holy staff"
+	desc = "It has a mysterious, protective aura."
+	icon = 'icons/obj/weapons/staff.dmi'
 	icon_state = "staff-blue"
 	item_state = "godstaff-blue"
 	lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
-	desc = "It has a mysterious, protective aura."
 	w_class = WEIGHT_CLASS_HUGE
 	force = 5
 	slot_flags = ITEM_SLOT_BACK
@@ -877,6 +866,7 @@
 /obj/item/nullrod/cross
 	name = "golden crucifix"
 	desc = "Resist the devil, and he will flee from you."
+	icon = 'icons/obj/misc.dmi'
 	icon_state = "cross"
 	item_state = "cross"
 	force = 0 // How often we forget
@@ -976,7 +966,7 @@
 /obj/item/nullrod/clown
 	name = "clown dagger"
 	desc = "Used for absolutely hilarious sacrifices."
-	icon = 'icons/obj/wizard.dmi'
+	icon = 'icons/obj/weapons/khopesh.dmi'
 	icon_state = "clownrender"
 	item_state = "render"
 	hitsound = 'sound/items/bikehorn.ogg'
@@ -1013,7 +1003,7 @@
 /obj/item/nullrod/egyptian
 	name = "egyptian staff"
 	desc = "A tutorial in mummification is carved into the staff. You could probably craft the wraps if you had some cloth."
-	icon = 'icons/obj/guns/magic.dmi'
+	icon = 'icons/obj/weapons/staff.dmi'
 	icon_state = "pharoah_sceptre"
 	item_state = "pharoah_sceptre"
 	lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
@@ -1037,7 +1027,7 @@ it also swaps back if it gets thrown into the chaplain, but the chaplain catches
 /obj/item/nullrod/talking
 	name = "possessed blade"
 	desc = "When the station falls into chaos, it's nice to have a friend by your side."
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "talking_sword"
 	item_state = "talking_sword"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -1348,7 +1338,7 @@ it also swaps back if it gets thrown into the chaplain, but the chaplain catches
 /obj/item/nullrod/sord
 	name = "\improper UNREAL SORD"
 	desc = "This thing is so unspeakably HOLY you are having a hard time even holding it."
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "sord"
 	item_state = "sord"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -1369,7 +1359,7 @@ it also swaps back if it gets thrown into the chaplain, but the chaplain catches
 /obj/item/nullrod/talking/chainsword
 	name = "possessed chainsaw sword"
 	desc = "Suffer not a heretic to live."
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "chainswordon"
 	item_state = "chainswordon"
 	chaplain_spawnable = FALSE
diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm
index 1f35ce9d377a..dd3478550408 100644
--- a/code/game/objects/items/kitchen.dm
+++ b/code/game/objects/items/kitchen.dm
@@ -82,9 +82,10 @@
 
 /obj/item/kitchen/knife
 	name = "kitchen knife"
+	desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
+	icon = 'icons/obj/weapons/shortsword.dmi'
 	icon_state = "knife"
 	item_state = "knife"
-	desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
 	flags_1 = CONDUCT_1
 	force = 10
 	w_class = WEIGHT_CLASS_SMALL
@@ -126,7 +127,7 @@
 /obj/item/kitchen/knife/ritual
 	name = "ritual knife"
 	desc = "The unearthly energies that once powered this blade are now dormant."
-	icon = 'icons/obj/wizard.dmi'
+	icon = 'icons/obj/weapons/khopesh.dmi'
 	icon_state = "render"
 	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
@@ -216,8 +217,7 @@
 
 /obj/item/kitchen/knife/combat/cyborg
 	name = "cyborg knife"
-	icon = 'icons/obj/items_cyborg.dmi'
-	icon_state = "knife"
+	icon_state = "cyborg_knife"
 	desc = "A cyborg-mounted plasteel knife. Extremely sharp and durable."
 
 /obj/item/kitchen/knife/carrotshiv
@@ -244,7 +244,6 @@
 /obj/item/kitchen/knife/shank
 	name = "shank"
 	desc = "A crude knife fashioned by securing a glass shard and a rod together with cables, and welding them together."
-	icon = 'icons/obj/weapons/swords.dmi'
 	icon_state = "shank"
 	item_state = "shank"
 	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_EARS
@@ -278,9 +277,8 @@
 
 /obj/item/kitchen/knife/makeshift
 	name = "makeshift knife"
-	icon_state = "knife_makeshift"
-	icon = 'icons/obj/improvised.dmi'
 	desc = "A flimsy, poorly made replica of a classic cooking utensil."
+	icon_state = "knife_makeshift"
 	force = 8
 	throwforce = 8
 
diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm
index 0f229f5cd9a1..22eaffa79ebe 100644
--- a/code/game/objects/items/latexballoon.dm
+++ b/code/game/objects/items/latexballoon.dm
@@ -1,7 +1,7 @@
 /obj/item/latexballon
 	name = "latex glove"
 	desc = "Sterile and airtight."
-	icon = 'icons/obj/toy.dmi'
+	icon = 'icons/obj/weapons/hand.dmi'
 	icon_state = "latexballon"
 	item_state = "lgloves"
 	force = 0
diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm
index 62f568306497..aef68ef194b0 100644
--- a/code/game/objects/items/melee/energy.dm
+++ b/code/game/objects/items/melee/energy.dm
@@ -65,6 +65,7 @@
 /obj/item/melee/transforming/energy/axe
 	name = "energy axe"
 	desc = "An energized battle axe."
+	icon = 'icons/obj/weapons/axe.dmi'
 	icon_state = "axe0"
 	lefthand_file = 'icons/mob/inhands/weapons/axes_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/axes_righthand.dmi'
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index e860f45da432..8d5b387f5042 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -4,7 +4,7 @@
 /obj/item/melee/chainofcommand
 	name = "chain of command"
 	desc = "A tool used by great men to placate the frothing masses."
-	icon = 'icons/obj/weapons/misc.dmi'
+	icon = 'icons/obj/weapons/whip.dmi'
 	icon_state = "chain"
 	item_state = "chain"
 	lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
@@ -25,7 +25,7 @@
 /obj/item/melee/synthetic_arm_blade
 	name = "synthetic arm blade"
 	desc = "A grotesque blade that on closer inspection seems made of synthetic flesh, it still feels like it would hurt very badly as a weapon."
-	icon = 'icons/obj/changeling.dmi'
+	icon = 'icons/obj/weapons/hand.dmi'
 	icon_state = "arm_blade"
 	item_state = "arm_blade"
 	lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
@@ -44,7 +44,7 @@
 /obj/item/melee/sabre
 	name = "officer's sabre"
 	desc = "An elegant weapon, its monomolecular edge is capable of cutting through flesh and bone with ease."
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "sabre"
 	item_state = "sabre"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -65,7 +65,7 @@
 /obj/item/melee/cutlass
 	name = "cutlass"
 	desc = "YAAAAAR! A fine weapon for a pirate, fit for slicing land-lubbers." //All pirate weapons must have pirate quips from now on it is non-negotiable
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "metalcutlass"
 	item_state = "metalcutlass"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -150,7 +150,7 @@
 /obj/item/melee/beesword
 	name = "The Stinger"
 	desc = "Taken from a giant bee and folded over one thousand times in pure honey. Can sting through anything."
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "beesword"
 	item_state = "stinger"
 	lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
@@ -365,8 +365,8 @@
 /obj/item/melee/classic_baton/donkbat
 	name = "toy baseball bat"
 	desc = "A colorful foam baseball bat. The label on the handle reads Donksoft. Feels...heavy."
-	icon = 'icons/obj/toy.dmi'
-	icon_state = "baseballbat_donk"
+	icon = 'icons/obj/weapons/bat.dmi'
+	icon_state = "baseball_bat_donk"
 	item_state = "baseball_bat_donk"
 	lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
@@ -534,7 +534,7 @@
 /obj/item/melee/supermatter_sword
 	name = "supermatter sword"
 	desc = "In a station full of bad ideas, this might just be the worst."
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "supermatter_sword"
 	item_state = "supermatter_sword"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -631,7 +631,7 @@
 /obj/item/melee/singularity_sword
 	name = "singularity sword"
 	desc = "Spins so hard that it turns any struck foe into mincemeat instantaneously. Make sure not to stick around when you swing it at someone."
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "singularity_sword"
 	item_state = "singularity_sword"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -661,7 +661,7 @@
 /obj/item/melee/curator_whip
 	name = "curator's whip"
 	desc = "Somewhat eccentric and outdated, it still stings like hell to be hit by."
-	icon = 'icons/obj/weapons/misc.dmi'
+	icon = 'icons/obj/weapons/whip.dmi'
 	icon_state = "whip"
 	item_state = "chain"
 	lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
diff --git a/code/game/objects/items/melee/transforming.dm b/code/game/objects/items/melee/transforming.dm
index ef9160a77d02..fc26244cbff3 100644
--- a/code/game/objects/items/melee/transforming.dm
+++ b/code/game/objects/items/melee/transforming.dm
@@ -94,7 +94,7 @@
 	name = "vibration blade"
 	desc = "A blade with an edge that vibrates rapidly, enabling it to easily cut through armor and flesh alike."
 	hitsound = "swing_hit"
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "hfrequency0"
 	icon_state_on = "hfrequency1"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
diff --git a/code/game/objects/items/raised_hand.dm b/code/game/objects/items/raised_hand.dm
index 091624ccdb8f..3b4173fa4474 100644
--- a/code/game/objects/items/raised_hand.dm
+++ b/code/game/objects/items/raised_hand.dm
@@ -1,7 +1,7 @@
 /obj/item/raisedhands
 	name = "raised hands"
 	desc = "What are you, French?"
-	icon = 'icons/obj/toy.dmi'
+	icon = 'icons/obj/weapons/hand.dmi'
 	icon_state = "latexballon"
 	item_state = "nothing"
 	force = 0
diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm
index 1a837b6338d3..802ddf9c105d 100644
--- a/code/game/objects/items/shields.dm
+++ b/code/game/objects/items/shields.dm
@@ -1,6 +1,6 @@
 /obj/item/shield
 	name = "shield"
-	icon = 'icons/obj/shields.dmi'
+	icon = 'icons/obj/weapons/shield.dmi'
 	slowdown = 0.2
 	item_flags = SLOWS_WHILE_IN_HAND
 	block_chance = 50
diff --git a/code/game/objects/items/singularityhammer.dm b/code/game/objects/items/singularityhammer.dm
index 558b9d9e0b23..b648f730c4c2 100644
--- a/code/game/objects/items/singularityhammer.dm
+++ b/code/game/objects/items/singularityhammer.dm
@@ -3,7 +3,7 @@
 	desc = "The pinnacle of close combat technology, the hammer harnesses the power of a miniaturized singularity to deal crushing blows."
 	icon_state = "singhammer0"
 	base_icon_state = "singhammer"
-	icon = 'icons/obj/wizard.dmi'
+	icon = 'icons/obj/weapons/hammer.dmi'
 	lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/hammers_righthand.dmi'
 	flags_1 = CONDUCT_1
@@ -83,7 +83,7 @@
 	desc = "A weapon worthy of a god, able to strike with the force of a lightning bolt. It crackles with barely contained energy."
 	icon_state = "mjollnir0"
 	base_icon_state = "mjollnir"
-	icon = 'icons/obj/wizard.dmi'
+	icon = 'icons/obj/weapons/hammer.dmi'
 	lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/hammers_righthand.dmi'
 	flags_1 = CONDUCT_1
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index d7f6ea70926b..97c180eb9299 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -347,8 +347,8 @@
 /obj/item/toy/foamblade/baseball
 	name = "toy baseball bat"
 	desc = "A colorful foam baseball bat. The label on the handle reads Donksoft."
-	icon = 'icons/obj/toy.dmi'
-	icon_state = "baseballbat_donk"
+	icon = 'icons/obj/weapons/bat.dmi'
+	icon_state = "baseball_bat_donk"
 	item_state = "baseball_bat_donk"
 	lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
@@ -359,7 +359,7 @@
 /obj/item/toy/foamblade/baseball/nerf
 	name = "antique toy baseball bat"
 	desc = "A colorful foam baseball bat. The label on the handle is almost rubbed off...\"nerf or nothing\"? what does that mean"
-	icon_state = "baseballbat"
+	icon_state = "baseball_bat_toy"
 	item_state = "baseball_bat_plastic"
 
 /obj/item/toy/windupToolbox
@@ -441,7 +441,7 @@
 /obj/item/toy/katana
 	name = "replica katana"
 	desc = "Woefully underpowered in D20."
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "katana"
 	item_state = "katana"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -1384,7 +1384,7 @@ obj/item/toy/turn_tracker
 /obj/item/toy/toy_dagger
 	name = "toy dagger"
 	desc = "A cheap plastic replica of a dagger. Produced by THE ARM Toys, Inc."
-	icon = 'icons/obj/wizard.dmi'
+	icon = 'icons/obj/weapons/khopesh.dmi'
 	icon_state = "render"
 	item_state = "cultdagger"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -1755,7 +1755,7 @@ obj/item/toy/turn_tracker
 /obj/item/gun/magic/sickly_blade_toy
 	name = "plastic replica blade"
 	desc = "A sickly green crescent blade, decorated with a plastic eye. You feel like this was cheaply made. A Donk Co logo is on the hilt."
-	icon = 'icons/obj/eldritch.dmi'
+	icon = 'icons/obj/weapons/khopesh.dmi'
 	icon_state = "eldritch_blade"
 	item_state = "eldritch_blade"
 	lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
diff --git a/code/game/objects/items/two_handed/baseball_bat.dm b/code/game/objects/items/two_handed/baseball_bat.dm
index 400a7bbcd90a..9056637282cb 100644
--- a/code/game/objects/items/two_handed/baseball_bat.dm
+++ b/code/game/objects/items/two_handed/baseball_bat.dm
@@ -1,7 +1,7 @@
 /obj/item/melee/baseball_bat
 	name = "baseball bat"
 	desc = "A traditional tool for a game of Baseball. Modern wood isn't very strong, try not to crack the bat!"
-	icon = 'icons/obj/weapons/misc.dmi'
+	icon = 'icons/obj/weapons/bat.dmi'
 	icon_state = "baseball_bat"
 	item_state = "baseball_bat"
 	lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
diff --git a/code/game/objects/items/two_handed/fireaxe.dm b/code/game/objects/items/two_handed/fireaxe.dm
index 0d726252caac..d6da8e16f7f9 100644
--- a/code/game/objects/items/two_handed/fireaxe.dm
+++ b/code/game/objects/items/two_handed/fireaxe.dm
@@ -1,5 +1,5 @@
 /obj/item/fireaxe
-	icon = 'icons/obj/tools.dmi'
+	icon = 'icons/obj/weapons/axe.dmi'
 	icon_state = "fireaxe0"
 	base_icon_state = "fireaxe"
 	lefthand_file = 'icons/mob/inhands/weapons/axes_lefthand.dmi'
@@ -80,7 +80,6 @@
 /obj/item/fireaxe/energy
 	name = "energy fire axe"
 	desc = "A massive, two handed, energy-based hardlight axe capable of cutting through solid metal. 'Glory to atmosia' is carved on the side of the handle."
-	icon = 'icons/obj/weapons/energy.dmi'
 	icon_state = "energy-fireaxe0"
 	base_icon_state = "energy-fireaxe"
 	demolition_mod = 4 // DESTROY
diff --git a/code/game/objects/items/two_handed/highfrequencyblade.dm b/code/game/objects/items/two_handed/highfrequencyblade.dm
index c1341fcd7ae0..4a75a50068d2 100644
--- a/code/game/objects/items/two_handed/highfrequencyblade.dm
+++ b/code/game/objects/items/two_handed/highfrequencyblade.dm
@@ -1,5 +1,5 @@
 /obj/item/vibro_weapon
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "hfrequency0"
 	base_icon_state = "hfrequency"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 3bdcd65b0f54..005cd5e96406 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -34,7 +34,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 /obj/item/sord
 	name = "\improper SORD"
 	desc = "This thing is so unspeakably shitty you are having a hard time even holding it."
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "sord"
 	item_state = "sord"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -54,7 +54,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 /obj/item/claymore
 	name = "claymore"
 	desc = "What are you standing around staring at this for? Get to killing!"
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "claymore"
 	item_state = "claymore"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -224,7 +224,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 /obj/item/claymore/bone
 	name = "Bone Sword"
 	desc = "Jagged pieces of bone are tied to what looks like a goliath's femur."
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "bone_sword"
 	item_state = "bone_sword"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -242,7 +242,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 /obj/item/katana
 	name = "katana"
 	desc = "Woefully underpowered in D20."
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "katana"
 	item_state = "katana"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -371,7 +371,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 /obj/item/throwing_star
 	name = "throwing star"
 	desc = "An ancient weapon still used to this day, due to its ease of lodging itself into its victim's body parts."
-	icon = 'icons/obj/weapons/misc.dmi'
+	icon = 'icons/obj/weapons/thrown.dmi'
 	icon_state = "throwingstar"
 	item_state = "eshield0"
 	lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
@@ -398,7 +398,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 
 /obj/item/switchblade
 	name = "switchblade"
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/shortsword.dmi'
 	icon_state = "switchblade"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
@@ -510,7 +510,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 /obj/item/cane
 	name = "cane"
 	desc = "A cane used by a true gentleman. Or a clown."
-	icon = 'icons/obj/weapons/misc.dmi'
+	icon = 'icons/obj/weapons/staff.dmi'
 	icon_state = "cane"
 	item_state = "stick"
 	lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
@@ -524,7 +524,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 /obj/item/staff
 	name = "wizard staff"
 	desc = "Apparently a staff used by the wizard."
-	icon = 'icons/obj/wizard.dmi'
+	icon = 'icons/obj/weapons/staff.dmi'
 	icon_state = "staff"
 	lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
@@ -575,7 +575,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 /obj/item/staff/stick
 	name = "stick"
 	desc = "A great tool to drag someone else's drinks across the bar."
-	icon = 'icons/obj/weapons/misc.dmi'
+	icon = 'icons/obj/weapons/staff.dmi'
 	icon_state = "cane"
 	item_state = "stick"
 	lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
@@ -661,7 +661,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 /obj/item/tailclub
 	name = "tail club"
 	desc = "For the beating to death of lizards with their own tails."
-	icon = 'icons/obj/weapons/misc.dmi'
+	icon = 'icons/obj/weapons/hammer.dmi'
 	icon_state = "tailclub"
 	force = 14
 	throwforce = 1 // why are you throwing a club do you even weapon
@@ -672,7 +672,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 /obj/item/melee/chainofcommand/tailwhip
 	name = "liz o' nine tails"
 	desc = "A whip fashioned from the severed tails of lizards."
-	icon = 'icons/obj/weapons/misc.dmi'
 	icon_state = "tailwhip"
 	item_flags = NONE
 
@@ -762,6 +761,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 /obj/item/circlegame
 	name = "circled hand"
 	desc = "If somebody looks at this while it's below your waist, you get to bop them."
+	icon = 'icons/obj/weapons/hand.dmi'
 	icon_state = "madeyoulook"
 	force = 0
 	throwforce = 0
@@ -771,7 +771,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 /obj/item/slapper
 	name = "slapper"
 	desc = "This is how real men fight."
-	icon = 'icons/obj/toy.dmi'
+	icon = 'icons/obj/weapons/hand.dmi'
 	icon_state = "latexballon"
 	item_state = "nothing"
 	force = 0
diff --git a/code/game/objects/structures/mjollnir.dm b/code/game/objects/structures/mjollnir.dm
index 45665b1efebd..3b5dcff3371e 100644
--- a/code/game/objects/structures/mjollnir.dm
+++ b/code/game/objects/structures/mjollnir.dm
@@ -1,7 +1,7 @@
 /obj/structure/mjollnir
 	name = "Mjolnir"
 	desc = "This once powerful hammer feels cold to the touch, but a thrum of magic inside tells you its only a matter of time until someone awakens it again."
-	icon = 'icons/obj/wizard.dmi'
+	icon = 'icons/obj/weapons/hammer.dmi'
 	icon_state = "mjollnir-inert"
 	resistance_flags = INDESTRUCTIBLE
 	anchored = TRUE
diff --git a/code/modules/antagonists/bloodsuckers/bloodsuckers_objects.dm b/code/modules/antagonists/bloodsuckers/bloodsuckers_objects.dm
index 52f553ff0ad0..fdae977124e4 100644
--- a/code/modules/antagonists/bloodsuckers/bloodsuckers_objects.dm
+++ b/code/modules/antagonists/bloodsuckers/bloodsuckers_objects.dm
@@ -94,7 +94,7 @@
 /obj/item/stake
 	name = "wooden stake"
 	desc = "A simple wooden stake carved to a sharp point."
-	icon = 'icons/obj/stakes.dmi'
+	icon = 'icons/obj/weapons/stake.dmi'
 	icon_state = "wood"
 	lefthand_file = 'icons/mob/inhands/antag/bs_leftinhand.dmi'
 	righthand_file = 'icons/mob/inhands/antag/bs_rightinhand.dmi'
diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm
index 257c04b025b0..f2969625a6af 100644
--- a/code/modules/antagonists/changeling/powers/mutations.dm
+++ b/code/modules/antagonists/changeling/powers/mutations.dm
@@ -150,7 +150,7 @@
 /obj/item/melee/arm_blade
 	name = "arm blade"
 	desc = "A grotesque blade made out of bone and flesh that cleaves through people as a hot knife through butter."
-	icon = 'icons/obj/changeling.dmi'
+	icon = 'icons/obj/weapons/hand.dmi'
 	icon_state = "arm_blade"
 	item_state = "arm_blade"
 	lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
@@ -243,7 +243,7 @@
 /obj/item/gun/magic/tentacle
 	name = "tentacle"
 	desc = "A fleshy tentacle that can stretch out and grab things or people."
-	icon = 'icons/obj/changeling.dmi'
+	icon = 'icons/obj/weapons/hand.dmi'
 	icon_state = "tentacle"
 	item_state = "tentacle"
 	lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
@@ -574,7 +574,7 @@
 /obj/item/melee/flesh_maul
 	name = "flesh maul"
 	desc = "A horrifying mass of pulsing flesh and glistening bone. More than capable of crushing anyone unfortunate enough to be hit by it."
-	icon = 'icons/obj/changeling.dmi'
+	icon = 'icons/obj/weapons/hand.dmi'
 	icon_state = "flesh_maul"
 	item_state = "flesh_maul"
 	lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm
index e01ca1c7ea42..e4cbdbae5a6f 100644
--- a/code/modules/antagonists/cult/blood_magic.dm
+++ b/code/modules/antagonists/cult/blood_magic.dm
@@ -336,7 +336,7 @@
 /obj/item/melee/blood_magic
 	name = "\improper magical aura"
 	desc = "A sinister looking aura that distorts the flow of reality around it."
-	icon = 'icons/obj/wizard.dmi'
+	icon = 'icons/obj/weapons/hand.dmi'
 	lefthand_file = 'icons/mob/inhands/misc/touchspell_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/touchspell_righthand.dmi'
 	icon_state = "disintegrate"
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index c7fcd224b4de..66fa8b98c516 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -10,7 +10,7 @@
 /obj/item/melee/cultblade/dagger
 	name = "ritual dagger"
 	desc = "A strange dagger said to be used by sinister groups for \"preparing\" a corpse before sacrificing it to their dark gods."
-	icon = 'icons/obj/wizard.dmi'
+	icon = 'icons/obj/weapons/khopesh.dmi'
 	icon_state = "render"
 	item_state = "cultdagger"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -34,7 +34,7 @@
 /obj/item/melee/cultblade
 	name = "eldritch longsword"
 	desc = "A sword humming with unholy energy. It glows with a dim red light."
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "cultblade"
 	item_state = "cultblade"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -104,7 +104,7 @@
 	light_system = MOVABLE_LIGHT
 	light_range = 4
 	attack_verb = list("cleaved", "slashed", "torn", "hacked", "ripped", "diced", "carved")
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "cultbastard"
 	item_state = "cultbastard"
 	hitsound = 'sound/weapons/bladeslice.ogg'
@@ -820,7 +820,7 @@ GLOBAL_VAR_INIT(curselimit, 0)
 /obj/item/blood_beam
 	name = "\improper magical aura"
 	desc = "Sinister looking aura that distorts the flow of reality around it."
-	icon = 'icons/obj/wizard.dmi'
+	icon = 'icons/obj/weapons/hand.dmi'
 	lefthand_file = 'icons/mob/inhands/misc/touchspell_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/touchspell_righthand.dmi'
 	icon_state = "disintegrate"
diff --git a/code/modules/antagonists/eldritch_cult/eldritch_items.dm b/code/modules/antagonists/eldritch_cult/eldritch_items.dm
index 32d16a4ff7ee..5dfedff50c56 100644
--- a/code/modules/antagonists/eldritch_cult/eldritch_items.dm
+++ b/code/modules/antagonists/eldritch_cult/eldritch_items.dm
@@ -94,7 +94,7 @@
 /obj/item/melee/sickly_blade
 	name = "sickly blade"
 	desc = "A sickly, green crescent blade, decorated with an ornamental eye. You feel like you're being watched..."
-	icon = 'icons/obj/eldritch.dmi'
+	icon = 'icons/obj/weapons/khopesh.dmi'
 	icon_state = "eldritch_blade"
 	item_state = "eldritch_blade"
 	lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
diff --git a/code/modules/antagonists/horror/horror_datums.dm b/code/modules/antagonists/horror/horror_datums.dm
index 66cd9688a257..6673acb81918 100644
--- a/code/modules/antagonists/horror/horror_datums.dm
+++ b/code/modules/antagonists/horror/horror_datums.dm
@@ -124,7 +124,7 @@
 /obj/item/horrorsummonhorn
 	name = "old horn"
 	desc = "A very old horn. You feel an incredible urge to blow into it."
-	icon = 'icons/obj/horror.dmi'
+	icon = 'icons/obj/misc.dmi'
 	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
 	item_state = "horn"
@@ -180,7 +180,7 @@
 /obj/item/horrortentacle
 	name = "tentacle"
 	desc = "A long, slimy, arm-like appendage."
-	icon = 'icons/obj/horror.dmi'
+	icon = 'icons/obj/weapons/hand.dmi'
 	icon_state = "horrortentacle"
 	item_state = "tentacle"
 	lefthand_file = 'icons/mob/inhands/antag/horror_lefthand.dmi'
diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm
index 9afff16d77f9..20798fe545cf 100644
--- a/code/modules/antagonists/wizard/equipment/artefact.dm
+++ b/code/modules/antagonists/wizard/equipment/artefact.dm
@@ -6,7 +6,7 @@
 /obj/item/veilrender
 	name = "veil render"
 	desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast city."
-	icon = 'icons/obj/wizard.dmi'
+	icon = 'icons/obj/weapons/khopesh.dmi'
 	icon_state = "render"
 	item_state = "knife"
 	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
diff --git a/code/modules/clothing/outfits/imperial.dm b/code/modules/clothing/outfits/imperial.dm
index 9d603a6f101b..2163675c9989 100644
--- a/code/modules/clothing/outfits/imperial.dm
+++ b/code/modules/clothing/outfits/imperial.dm
@@ -94,7 +94,7 @@
 	hitsound = 'sound/weapons/chainsawhit.ogg'
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "imp_chainswordon"
 	item_state = "imp_chainswordon"
 	sharpness = SHARP_EDGED
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 04c1dd9b146e..aa3d5adc2490 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -588,7 +588,7 @@ GLOBAL_LIST_EMPTY(aide_list)
 	desc = "A curved sword smelted from an unknown metal. Looking at it gives you the otherworldly urge to pawn it off for '30k', whatever that means."
 	lefthand_file = 'yogstation/icons/mob/inhands/weapons/scimmy_lefthand.dmi'
 	righthand_file = 'yogstation/icons/mob/inhands/weapons/scimmy_righthand.dmi'
-	icon = 'yogstation/icons/obj/lavaland/artefacts.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "rune_scimmy"
 	force = 20
 	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
@@ -972,7 +972,7 @@ GLOBAL_LIST_EMPTY(aide_list)
 /obj/item/melee/ghost_sword
 	name = "\improper spectral blade"
 	desc = "A rusted and dulled blade. It doesn't look like it'd do much damage. It glows weakly."
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "spectral"
 	item_state = "spectral"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
diff --git a/code/modules/mining/lavaland/seismicarm.dm b/code/modules/mining/lavaland/seismicarm.dm
index 9f1fb090d8fe..45fe082c5cef 100644
--- a/code/modules/mining/lavaland/seismicarm.dm
+++ b/code/modules/mining/lavaland/seismicarm.dm
@@ -33,7 +33,7 @@
 /obj/item/melee/overcharged_emitter
 	name = "supercharged emitter"
 	desc = "The result of all the prosthetic's power building up in its palm. It's fading fast."
-	icon = 'icons/obj/wizard.dmi'
+	icon = 'icons/obj/weapons/hand.dmi'
 	icon_state = "flagellation"
 	item_state = "hivehand"
 	color = "#04b8ff"
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index d7b6f6e7c641..45ea43cbc2e7 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -648,7 +648,7 @@
 /obj/item/self_grasp
 	name = "self-grasp"
 	desc = "Sometimes all you can do is slow the bleeding."
-	icon = 'icons/obj/toy.dmi'
+	icon = 'icons/obj/weapons/hand.dmi'
 	icon_state = "latexballon"
 	item_state = "nothing"
 	force = 0
diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm
index 028f5b9aaca3..f14ed0755d2b 100644
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -1603,7 +1603,7 @@
 /obj/item/melee/supermatter_sword/hand
 	name = "supermatter hand"
 	desc = "A hand of a robust supermatter golem."
-	icon = 'icons/obj/wizard.dmi'
+	icon = 'icons/obj/weapons/hand.dmi'
 	lefthand_file = 'icons/mob/inhands/misc/touchspell_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/touchspell_righthand.dmi'
 	icon_state = "disintegrate"
diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm
index 6836f3b3d06c..b9fe75c1cbc0 100644
--- a/code/modules/ninja/energy_katana.dm
+++ b/code/modules/ninja/energy_katana.dm
@@ -13,6 +13,7 @@
 /obj/item/energy_katana
 	name = "energy katana"
 	desc = "A katana infused with strong energy."
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "energy_katana"
 	item_state = "energy_katana"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -29,7 +30,6 @@
 	sharpness = SHARP_EDGED
 	max_integrity = 200
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
-	icon = 'icons/obj/weapons/swords.dmi'
 	var/datum/effect_system/spark_spread/spark_system
 	var/datum/action/innate/dash/ninja/jaunt
 	var/dash_toggled = TRUE
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index b25cd1aa8a0b..b1e5253ded62 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -624,9 +624,9 @@
 	
 	if(bayonet)
 		var/state = "bayonet" //Generic state.
-		if(bayonet.icon_state in icon_states('icons/obj/guns/bayonets.dmi')) //Snowflake state?
+		if(bayonet.icon_state in icon_states('icons/obj/guns/attachment.dmi'))
 			state = bayonet.icon_state
-		var/icon/bayonet_icons = 'icons/obj/guns/bayonets.dmi'
+		var/icon/bayonet_icons = 'icons/obj/guns/attachment.dmi'
 		var/mutable_appearance/knife_overlay = mutable_appearance(bayonet_icons, state)
 		knife_overlay.pixel_x = knife_x_offset
 		knife_overlay.pixel_y = knife_y_offset
diff --git a/code/modules/projectiles/guns/ballistic/bow.dm b/code/modules/projectiles/guns/ballistic/bow.dm
index 22c3a5d68add..97e8cf4583b8 100644
--- a/code/modules/projectiles/guns/ballistic/bow.dm
+++ b/code/modules/projectiles/guns/ballistic/bow.dm
@@ -329,7 +329,7 @@
 	desc = "One of two blades used to form a break bow. Can attack with both blades at the same time or combine them into a bow."
 	icon_state = "brakebow_blade"
 	item_state = "brakebow_blade"
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/shortsword.dmi'
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
 	hitsound = 'sound/weapons/bladeslice.ogg'
diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm
index 0e8c5d12011d..9ba6f41f5833 100644
--- a/code/modules/projectiles/guns/magic/staff.dm
+++ b/code/modules/projectiles/guns/magic/staff.dm
@@ -118,7 +118,7 @@
 	desc = "Taken from a giant bee and folded over one thousand times in pure honey. Can sting through anything."
 	fire_sound = 'sound/items/syringeproj.ogg'
 	ammo_type = /obj/item/ammo_casing/magic/spellblade/beesword
-	icon = 'icons/obj/weapons/swords.dmi'
+	icon = 'icons/obj/weapons/longsword.dmi'
 	icon_state = "beesword"
 	item_state = "stinger"
 	lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
index b4251fa0f9d8..3c82d0a955f6 100644
--- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm
+++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
@@ -135,7 +135,7 @@
 /obj/item/kitchen/knife/envy //Envy's knife: Found in the Envy ruin. Attackers take on the appearance of whoever they strike.
 	name = "envy's knife"
 	desc = "Their success will be yours."
-	icon = 'icons/obj/wizard.dmi'
+	icon = 'icons/obj/weapons/khopesh.dmi'
 	icon_state = "render"
 	item_state = "knife"
 	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
diff --git a/code/modules/spells/spell_types/pointed/cast_iron.dm b/code/modules/spells/spell_types/pointed/cast_iron.dm
index 4cb7b094a2bf..0648033282a7 100644
--- a/code/modules/spells/spell_types/pointed/cast_iron.dm
+++ b/code/modules/spells/spell_types/pointed/cast_iron.dm
@@ -1,7 +1,7 @@
 /datum/action/cooldown/spell/pointed/projectile/cast_iron
 	name = "Cast Iron"
 	desc = "This spell fires a cast iron bolt."
-	button_icon = 'yogstation/icons/obj/pan.dmi'
+	button_icon = 'icons/obj/weapons/shortsword.dmi'
 	button_icon_state = "frying_pan"
 
 	school = SCHOOL_EVOCATION
@@ -24,7 +24,7 @@
 
 /obj/projectile/magic/cast_iron
 	name = "cast iron"
-	icon = 'yogstation/icons/obj/pan.dmi'
+	icon = 'icons/obj/weapons/shortsword.dmi'
 	icon_state = "frying_pan"
 	damage = 20
 	damage_type = BRUTE
diff --git a/code/modules/spells/spell_types/touch/_touch.dm b/code/modules/spells/spell_types/touch/_touch.dm
index 9777c0e21442..78789fd95aa7 100644
--- a/code/modules/spells/spell_types/touch/_touch.dm
+++ b/code/modules/spells/spell_types/touch/_touch.dm
@@ -318,7 +318,7 @@
 /obj/item/melee/touch_attack
 	name = "\improper outstretched hand"
 	desc = "High Five?"
-	icon = 'icons/obj/wizard.dmi'
+	icon = 'icons/obj/weapons/hand.dmi'
 	lefthand_file = 'icons/mob/inhands/misc/touchspell_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/touchspell_righthand.dmi'
 	icon_state = "latexballon"
diff --git a/code/modules/spells/spell_types/touch/invisible_touch.dm b/code/modules/spells/spell_types/touch/invisible_touch.dm
index c2c87702e68b..df4adf5db8ec 100644
--- a/code/modules/spells/spell_types/touch/invisible_touch.dm
+++ b/code/modules/spells/spell_types/touch/invisible_touch.dm
@@ -5,7 +5,7 @@
 	desc = "Touch something to make it disappear temporarily."
 	background_icon_state = "bg_mime"
 	overlay_icon_state = "bg_mime_border"
-	button_icon = 'icons/obj/wizard.dmi'
+	button_icon = 'icons/obj/weapons/hand.dmi'
 	button_icon_state = "nothing"
 	panel = "Mime"
 
diff --git a/icons/mob/inhands/weapons/hammers_lefthand.dmi b/icons/mob/inhands/weapons/hammers_lefthand.dmi
index c0de5a858acd..413e8b8b25fe 100644
Binary files a/icons/mob/inhands/weapons/hammers_lefthand.dmi and b/icons/mob/inhands/weapons/hammers_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/hammers_righthand.dmi b/icons/mob/inhands/weapons/hammers_righthand.dmi
index 92b0682162c8..fcb60344e009 100644
Binary files a/icons/mob/inhands/weapons/hammers_righthand.dmi and b/icons/mob/inhands/weapons/hammers_righthand.dmi differ
diff --git a/icons/obj/changeling.dmi b/icons/obj/changeling.dmi
index eb1d748c906e..3673fbf72d6d 100644
Binary files a/icons/obj/changeling.dmi and b/icons/obj/changeling.dmi differ
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index a4463fee5913..ace5f48beb6b 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/icons/obj/eldritch.dmi b/icons/obj/eldritch.dmi
index f2e71c05c915..9abea6e93316 100644
Binary files a/icons/obj/eldritch.dmi and b/icons/obj/eldritch.dmi differ
diff --git a/icons/obj/guns/attachment.dmi b/icons/obj/guns/attachment.dmi
index bdb21bfed535..b614355978fb 100644
Binary files a/icons/obj/guns/attachment.dmi and b/icons/obj/guns/attachment.dmi differ
diff --git a/icons/obj/guns/bayonets.dmi b/icons/obj/guns/bayonets.dmi
deleted file mode 100644
index 32b5448b8edc..000000000000
Binary files a/icons/obj/guns/bayonets.dmi and /dev/null differ
diff --git a/icons/obj/guns/magic.dmi b/icons/obj/guns/magic.dmi
index 7ae2646ec3b8..53c06f55ff28 100644
Binary files a/icons/obj/guns/magic.dmi and b/icons/obj/guns/magic.dmi differ
diff --git a/icons/obj/handcuffs.dmi b/icons/obj/handcuffs.dmi
index e88626d31afb..dc5d1c4df854 100644
Binary files a/icons/obj/handcuffs.dmi and b/icons/obj/handcuffs.dmi differ
diff --git a/icons/obj/horror.dmi b/icons/obj/horror.dmi
deleted file mode 100644
index b5716b3ada48..000000000000
Binary files a/icons/obj/horror.dmi and /dev/null differ
diff --git a/icons/obj/improvised.dmi b/icons/obj/improvised.dmi
index a86e0adc3e25..105a202c877e 100644
Binary files a/icons/obj/improvised.dmi and b/icons/obj/improvised.dmi differ
diff --git a/icons/obj/items_cyborg.dmi b/icons/obj/items_cyborg.dmi
index cddb57303d22..ed8977a81678 100644
Binary files a/icons/obj/items_cyborg.dmi and b/icons/obj/items_cyborg.dmi differ
diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi
index 0fefe11b5393..359a37cf45c3 100644
Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ
diff --git a/icons/obj/lavaland/artefacts.dmi b/icons/obj/lavaland/artefacts.dmi
index 00d590b2ac43..c98175be406a 100644
Binary files a/icons/obj/lavaland/artefacts.dmi and b/icons/obj/lavaland/artefacts.dmi differ
diff --git a/icons/obj/mind_blade.dmi b/icons/obj/mind_blade.dmi
deleted file mode 100644
index 1358eabd5651..000000000000
Binary files a/icons/obj/mind_blade.dmi and /dev/null differ
diff --git a/icons/obj/misc.dmi b/icons/obj/misc.dmi
index 6dd043dce7b2..1c4738d43ad0 100644
Binary files a/icons/obj/misc.dmi and b/icons/obj/misc.dmi differ
diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi
index 6e80f9d97e95..f0689b718961 100644
Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ
diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi
index 2c488ee01b26..65d8182b9b7a 100644
Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ
diff --git a/icons/obj/weapons/axe.dmi b/icons/obj/weapons/axe.dmi
new file mode 100644
index 000000000000..0cd70b2ce56b
Binary files /dev/null and b/icons/obj/weapons/axe.dmi differ
diff --git a/icons/obj/weapons/bat.dmi b/icons/obj/weapons/bat.dmi
new file mode 100644
index 000000000000..b06edba39a70
Binary files /dev/null and b/icons/obj/weapons/bat.dmi differ
diff --git a/icons/obj/weapons/baton.dmi b/icons/obj/weapons/baton.dmi
index 74f4f0c78360..348db83f41ba 100644
Binary files a/icons/obj/weapons/baton.dmi and b/icons/obj/weapons/baton.dmi differ
diff --git a/icons/obj/weapons/energy.dmi b/icons/obj/weapons/energy.dmi
index fd43e6c19efb..b52bcd7fcc90 100644
Binary files a/icons/obj/weapons/energy.dmi and b/icons/obj/weapons/energy.dmi differ
diff --git a/icons/obj/weapons/hammer.dmi b/icons/obj/weapons/hammer.dmi
new file mode 100644
index 000000000000..d3fd7936e6c2
Binary files /dev/null and b/icons/obj/weapons/hammer.dmi differ
diff --git a/icons/obj/weapons/hand.dmi b/icons/obj/weapons/hand.dmi
new file mode 100644
index 000000000000..02b7c849c1a8
Binary files /dev/null and b/icons/obj/weapons/hand.dmi differ
diff --git a/icons/obj/weapons/khopesh.dmi b/icons/obj/weapons/khopesh.dmi
new file mode 100644
index 000000000000..0a74214e2dca
Binary files /dev/null and b/icons/obj/weapons/khopesh.dmi differ
diff --git a/icons/obj/weapons/longsword.dmi b/icons/obj/weapons/longsword.dmi
new file mode 100644
index 000000000000..a8f7496ac450
Binary files /dev/null and b/icons/obj/weapons/longsword.dmi differ
diff --git a/icons/obj/weapons/misc.dmi b/icons/obj/weapons/misc.dmi
deleted file mode 100644
index 79b1fa2653ff..000000000000
Binary files a/icons/obj/weapons/misc.dmi and /dev/null differ
diff --git a/icons/obj/shields.dmi b/icons/obj/weapons/shield.dmi
similarity index 100%
rename from icons/obj/shields.dmi
rename to icons/obj/weapons/shield.dmi
diff --git a/icons/obj/weapons/shortsword.dmi b/icons/obj/weapons/shortsword.dmi
new file mode 100644
index 000000000000..600e2d4e1a75
Binary files /dev/null and b/icons/obj/weapons/shortsword.dmi differ
diff --git a/icons/obj/weapons/staff.dmi b/icons/obj/weapons/staff.dmi
new file mode 100644
index 000000000000..e80dcbbf906e
Binary files /dev/null and b/icons/obj/weapons/staff.dmi differ
diff --git a/icons/obj/stakes.dmi b/icons/obj/weapons/stake.dmi
similarity index 100%
rename from icons/obj/stakes.dmi
rename to icons/obj/weapons/stake.dmi
diff --git a/icons/obj/weapons/swords.dmi b/icons/obj/weapons/swords.dmi
deleted file mode 100644
index f0ccc86e7078..000000000000
Binary files a/icons/obj/weapons/swords.dmi and /dev/null differ
diff --git a/icons/obj/weapons/thrown.dmi b/icons/obj/weapons/thrown.dmi
new file mode 100644
index 000000000000..1fe0b4f53166
Binary files /dev/null and b/icons/obj/weapons/thrown.dmi differ
diff --git a/icons/obj/weapons/whip.dmi b/icons/obj/weapons/whip.dmi
new file mode 100644
index 000000000000..b067b11af5b8
Binary files /dev/null and b/icons/obj/weapons/whip.dmi differ
diff --git a/icons/obj/wizard.dmi b/icons/obj/wizard.dmi
index 290bbb36d1c5..6d4da66b168f 100644
Binary files a/icons/obj/wizard.dmi and b/icons/obj/wizard.dmi differ
diff --git a/yogstation/code/datums/martial/garden_warfare.dm b/yogstation/code/datums/martial/garden_warfare.dm
index 152cfa49bfd1..32f1c4cd4daa 100644
--- a/yogstation/code/datums/martial/garden_warfare.dm
+++ b/yogstation/code/datums/martial/garden_warfare.dm
@@ -158,7 +158,7 @@
 
 /datum/action/vine_snatch
 	name = "Vine Snatch - using it while having a target, recently marked with a vine mark in the range of 2 tiles will pull an item in their active hands to you, or pull and knockdown them."
-	button_icon = 'icons/obj/changeling.dmi'
+	button_icon = 'icons/obj/weapons/hand.dmi'
 	button_icon_state = "tentacle"
 	var/mob/living/carbon/human/marked_dude = null
 	var/last_time_marked = 0
diff --git a/yogstation/code/game/objects/items/fryingpan.dm b/yogstation/code/game/objects/items/fryingpan.dm
index 1ab09be3a910..e6b72ccfa567 100644
--- a/yogstation/code/game/objects/items/fryingpan.dm
+++ b/yogstation/code/game/objects/items/fryingpan.dm
@@ -3,7 +3,7 @@
 	desc = "A cast-iron frying pan designed for cooking food."
 	lefthand_file = 'yogstation/icons/mob/inhands/weapons/pan_lefthand.dmi'
 	righthand_file = 'yogstation/icons/mob/inhands/weapons/pan_righthand.dmi'
-	icon = 'yogstation/icons/obj/pan.dmi'
+	icon = 'icons/obj/weapons/shortsword.dmi'
 	icon_state = "frying_pan"
 	w_class = 3
 	force = 12
diff --git a/yogstation/code/game/objects/items/weaponry.dm b/yogstation/code/game/objects/items/weaponry.dm
index 44169c7604fd..24678f9ea552 100644
--- a/yogstation/code/game/objects/items/weaponry.dm
+++ b/yogstation/code/game/objects/items/weaponry.dm
@@ -1,7 +1,7 @@
 /obj/item/highfive
 	name = "raised hand"
 	desc = "Slap my hand."
-	icon = 'icons/obj/toy.dmi'
+	icon = 'icons/obj/weapons/hand.dmi'
 	icon_state = "latexballon"
 	item_state = "nothing"
 	hitsound = 'sound/weapons/punchmiss.ogg'
@@ -28,7 +28,7 @@
 /obj/item/handholding
 	name = "hand for holding"
 	desc = "You rapscallion, how scandalous!"
-	icon = 'icons/obj/toy.dmi'
+	icon = 'icons/obj/weapons/hand.dmi'
 	icon_state = "latexballon"
 	item_state = "nothing"
 	hitsound = 'sound/weapons/punchmiss.ogg'
diff --git a/yogstation/code/game/objects/items/wielded/sledgehammer.dm b/yogstation/code/game/objects/items/wielded/sledgehammer.dm
index 9c1c26c8df9f..13ba57273911 100644
--- a/yogstation/code/game/objects/items/wielded/sledgehammer.dm
+++ b/yogstation/code/game/objects/items/wielded/sledgehammer.dm
@@ -4,7 +4,7 @@
 /obj/item/melee/sledgehammer
 	name = "sledgehammer"
 	desc = "An archaic tool used to drive nails and break down hollow walls."
-	icon = 'icons/obj/weapons/misc.dmi'
+	icon = 'icons/obj/weapons/hammer.dmi'
 	worn_icon = 'yogstation/icons/mob/clothing/back.dmi'
 	icon_state = "sledgehammer"
 	item_state = "sledgehammer"
diff --git a/yogstation/code/game/objects/items/wielded/vxtvulhammer.dm b/yogstation/code/game/objects/items/wielded/vxtvulhammer.dm
index dcdf2f921549..7e919048e0e7 100644
--- a/yogstation/code/game/objects/items/wielded/vxtvulhammer.dm
+++ b/yogstation/code/game/objects/items/wielded/vxtvulhammer.dm
@@ -2,7 +2,7 @@
  * Vxtvul Hammer
  */
 /obj/item/melee/vxtvulhammer
-	icon = 'icons/obj/weapons/misc.dmi'
+	icon = 'icons/obj/weapons/hammer.dmi'
 	icon_state = "vxtvul_hammer0-0"
 	base_icon_state = "vxtvul_hammer"
 	lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi'
diff --git a/yogstation/code/modules/mining/lavaland/doppelmirror.dm b/yogstation/code/modules/mining/lavaland/doppelmirror.dm
index 9ddd50f45dcc..9960a9843b4e 100644
--- a/yogstation/code/modules/mining/lavaland/doppelmirror.dm
+++ b/yogstation/code/modules/mining/lavaland/doppelmirror.dm
@@ -4,7 +4,7 @@
 /obj/item/dopmirror
 	name = "ominous mirror"
 	desc = "What do you see looking back at you?"
-	icon = 'yogstation/icons/obj/lavaland/artefacts.dmi'
+	icon = 'icons/obj/lavaland/artefacts.dmi'
 	icon_state = "mirrornormal"
 	actions_types = list(/datum/action/item_action/mirrorrecall, /datum/action/item_action/rerollmirror)
 	COOLDOWN_DECLARE(next_search)
@@ -105,7 +105,7 @@
 /datum/action/item_action/mirrorrecall
 	name = "Recall"
 	desc = "Bring the reflection back into the mirror."
-	button_icon = 'yogstation/icons/obj/lavaland/artefacts.dmi'
+	button_icon = 'icons/obj/lavaland/artefacts.dmi'
 	button_icon_state = "mirrornormal"
 
 /datum/action/item_action/rerollmirror
@@ -229,7 +229,7 @@
 
 /datum/action/innate/jumpback
 	name = "Return to Mirror"
-	button_icon = 'yogstation/icons/obj/lavaland/artefacts.dmi'
+	button_icon = 'icons/obj/lavaland/artefacts.dmi'
 	button_icon_state = "mirrornormal"
 
 /datum/action/innate/jumpback/Activate()
@@ -245,7 +245,7 @@
 #define COOLDOWN_REAPPEAR 20 SECONDS
 /datum/action/innate/appear
 	name = "Exit Mirror"
-	button_icon = 'yogstation/icons/obj/lavaland/artefacts.dmi'
+	button_icon = 'icons/obj/lavaland/artefacts.dmi'
 	button_icon_state = "mirrorcrack"
 	COOLDOWN_DECLARE(next_appearance)
 
diff --git a/yogstation/icons/obj/lavaland/artefacts.dmi b/yogstation/icons/obj/lavaland/artefacts.dmi
deleted file mode 100644
index eeedbe0617a2..000000000000
Binary files a/yogstation/icons/obj/lavaland/artefacts.dmi and /dev/null differ
diff --git a/yogstation/icons/obj/pan.dmi b/yogstation/icons/obj/pan.dmi
deleted file mode 100644
index cb1815badaf1..000000000000
Binary files a/yogstation/icons/obj/pan.dmi and /dev/null differ