diff --git a/data/units/Arch_Mage.cfg b/data/units/Arch_Mage.cfg
index f815d0aec14..793158890bf 100644
--- a/data/units/Arch_Mage.cfg
+++ b/data/units/Arch_Mage.cfg
@@ -44,6 +44,7 @@ Special Notes: the arch mage's fireballs are magical, and always have a high cha
 	
 	[attack]
 		name=staff
+		icon=attacks/staff-magic.png
 		type=impact
 		range=melee
 		damage=7
diff --git a/data/units/Dark_Sorcerer.cfg b/data/units/Dark_Sorcerer.cfg
index e162c528d43..4526b14d0be 100644
--- a/data/units/Dark_Sorcerer.cfg
+++ b/data/units/Dark_Sorcerer.cfg
@@ -29,6 +29,7 @@ Special Notes: the ranged attacks of a dark sorcerer are magical, and always hav
 	get_hit_sound=groan.wav
 	[attack]
 		name=staff
+		icon=attacks/staff-necromantic.png
 		type=impact
 		range=melee
 		damage=6
diff --git a/data/units/Elvish_Marksman.cfg b/data/units/Elvish_Marksman.cfg
index 64caf0683b5..e8797eb08a1 100644
--- a/data/units/Elvish_Marksman.cfg
+++ b/data/units/Elvish_Marksman.cfg
@@ -80,7 +80,7 @@ Special Notes: Their marksmanship gives these elves a high chance of hitting the
 	[/attack]
 	[attack]
 		name=longbow
-		icon=attacks/bow-elven.png
+		icon=attacks/bow-elven-magic.png
 		type=pierce
 		special=marksman
 		range=ranged
diff --git a/data/units/Elvish_Sharpshooter.cfg b/data/units/Elvish_Sharpshooter.cfg
index 06ee1a426f3..d54e70cc35e 100644
--- a/data/units/Elvish_Sharpshooter.cfg
+++ b/data/units/Elvish_Sharpshooter.cfg
@@ -80,7 +80,7 @@ Special Notes: Their marksmanship gives these elves a high chance of hitting the
 	[/attack]
 	[attack]
 		name=longbow
-		icon=attacks/bow-elven.png
+		icon=attacks/bow-elven-magic.png
 		type=pierce
 		special=marksman
 		range=ranged
diff --git a/data/units/Mage.cfg b/data/units/Mage.cfg
index 96839c66d2e..d114983d633 100644
--- a/data/units/Mage.cfg
+++ b/data/units/Mage.cfg
@@ -52,6 +52,7 @@ Special Notes: the ranged attack of a mage is magical, and always has a high cha
 	[/death]
 	[attack]
 		name=staff
+		icon=attacks/staff-magic.png
 		type=impact
 		range=melee
 		damage=5
diff --git a/data/units/Necromancer.cfg b/data/units/Necromancer.cfg
index 604c48669be..4e332c10696 100644
--- a/data/units/Necromancer.cfg
+++ b/data/units/Necromancer.cfg
@@ -26,6 +26,7 @@ Special Notes: The ranged attacks of a necromancer are magical, and always have
 	get_hit_sound=groan.wav
 	[attack]
 		name=staff
+		icon=attacks/staff-necromantic.png
 		type=impact
 		range=melee
 		damage=4
diff --git a/data/units/Red_Mage.cfg b/data/units/Red_Mage.cfg
index 68aef2739d4..e2f9b61fd61 100644
--- a/data/units/Red_Mage.cfg
+++ b/data/units/Red_Mage.cfg
@@ -53,6 +53,7 @@ Special Notes: the red mage's fireballs are magical, and always have a high chan
 	[/death]
 	[attack]
 		name=staff
+		icon=attacks/staff-magic.png
 		type=impact
 		range=melee
 		damage=6
diff --git a/data/units/Silver_Mage.cfg b/data/units/Silver_Mage.cfg
index 4e3c4d647fb..273ed499723 100644
--- a/data/units/Silver_Mage.cfg
+++ b/data/units/Silver_Mage.cfg
@@ -90,6 +90,7 @@ Special Notes: the ranged attack of a silver mage is magical, and always has a h
 	[/teleport_anim]
 	[attack]
 		name=staff
+		icon=attacks/staff-magic.png
 		type=impact
 		range=melee
 		damage=7
diff --git a/data/units/White_Mage.cfg b/data/units/White_Mage.cfg
index b0610448e41..e3848a5aa7f 100644
--- a/data/units/White_Mage.cfg
+++ b/data/units/White_Mage.cfg
@@ -61,6 +61,7 @@ Special Notes: the light cast by a white mage is magical in nature, and always h
 	[/death]
 	[attack]
 		name=staff
+		icon=attacks/staff-magic.png
 		type=impact
 		range=melee
 		damage=6