diff --git a/changelog b/changelog
index a5c5c4d5d5b..26fc5baa2cf 100644
--- a/changelog
+++ b/changelog
@@ -15,6 +15,7 @@ Version 1.2-svn
    * correctly use translated team names when available
    * fix the completion when controlling multiple sides (bug #8101, patch #653)
    * first turn of a game is saved again (fixes bug #7909 and bug #8117)
+    * fix female units using male frames from time to time
  * sound
    * add advanced sound tab to pref allowing you to play with sample_rate and
      buffer_size options
diff --git a/data/units/Human_Mage.cfg b/data/units/Human_Mage.cfg
index d627af1f024..be8912dd995 100644
--- a/data/units/Human_Mage.cfg
+++ b/data/units/Human_Mage.cfg
@@ -245,9 +245,6 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}
 						image="units/human-magi/mage+female-attack-magic2.png"
 					[/frame]
 				[/else]
-				[frame]
-					image="units/human-magi/mage+female-attack-magic2.png"
-				[/frame]
 				[frame]
 					image="units/human-magi/mage+female-attack-magic1.png"
 				[/frame]
diff --git a/data/units/Human_Mage_Arch.cfg b/data/units/Human_Mage_Arch.cfg
index 8ae18edb808..65067b74c1c 100644
--- a/data/units/Human_Mage_Arch.cfg
+++ b/data/units/Human_Mage_Arch.cfg
@@ -115,11 +115,6 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}
 			
 			[frame]
 				begin=-240
-				end=-200
-				image="units/human-magi/arch-mage-fireball-1.png"
-			[/frame]
-			[frame]
-				begin=-200
 				end=-180
 				image="units/human-magi/arch-mage-fireball-1.png"
 			[/frame]
diff --git a/data/units/Human_Mage_Great.cfg b/data/units/Human_Mage_Great.cfg
index 3ab341b115d..afe4c543f03 100644
--- a/data/units/Human_Mage_Great.cfg
+++ b/data/units/Human_Mage_Great.cfg
@@ -104,11 +104,6 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}
 			
 			[frame]
 				begin=-240
-				end=-200
-				image="units/human-magi/great-mage-fireball-1.png"
-			[/frame]
-			[frame]
-				begin=-200
 				end=-180
 				image="units/human-magi/great-mage-fireball-1.png"
 			[/frame]
diff --git a/data/units/Human_Mage_Red.cfg b/data/units/Human_Mage_Red.cfg
index 4794461113f..d1aeda86002 100644
--- a/data/units/Human_Mage_Red.cfg
+++ b/data/units/Human_Mage_Red.cfg
@@ -125,11 +125,6 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}
 			
 			[frame]
 				begin=-240
-				end=-200
-				image="units/human-magi/red-mage-fireball-1.png"
-			[/frame]
-			[frame]
-				begin=-200
 				end=-180
 				image="units/human-magi/red-mage-fireball-1.png"
 			[/frame]
diff --git a/data/units/Human_Outlaw_Rogue.cfg b/data/units/Human_Outlaw_Rogue.cfg
index 628650bb79e..c8fa34f5b88 100644
--- a/data/units/Human_Outlaw_Rogue.cfg
+++ b/data/units/Human_Outlaw_Rogue.cfg
@@ -89,14 +89,9 @@ Special Notes:"+{SPECIAL_NOTES_BACKSTAB}+{SPECIAL_NOTES_SKIRMISHER}
             [/missile_frame]
             [frame]
                 begin=-200
-                end=-100
-                image="units/human-outlaws/rogue-ranged.png"
-                sound=throwing-knife-miss.ogg
-            [/frame]
-            [frame]
-                begin=-100
                 end=50
                 image="units/human-outlaws/rogue-ranged.png"
+                sound=throwing-knife-miss.ogg
             [/frame]
         [/animation]
         [animation]
@@ -109,14 +104,9 @@ Special Notes:"+{SPECIAL_NOTES_BACKSTAB}+{SPECIAL_NOTES_SKIRMISHER}
             [/missile_frame]
             [frame]
                 begin=-200
-                end=-100
-                image="units/human-outlaws/rogue-ranged.png"
-                sound=throwing-knife.ogg
-            [/frame]
-            [frame]
-                begin=-100
                 end=50
                 image="units/human-outlaws/rogue-ranged.png"
+                sound=throwing-knife.ogg
             [/frame]
         [/animation]
 	[/attack]
diff --git a/data/units/Undead_Necro_Dark_Adept.cfg b/data/units/Undead_Necro_Dark_Adept.cfg
index c3f1a89d7a1..c66f36a023b 100644
--- a/data/units/Undead_Necro_Dark_Adept.cfg
+++ b/data/units/Undead_Necro_Dark_Adept.cfg
@@ -191,6 +191,9 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}
 				[frame]
 					image="units/undead-necromancers/adept+female-ranged-6.png"
 				[/frame]
+				[frame]
+					image="units/undead-necromancers/adept+female-ranged-6.png"
+				[/frame]
 				[frame]
 					image="units/undead-necromancers/adept+female-ranged-7.png"
 				[/frame]
@@ -217,6 +220,9 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}
 				[frame]
 					image="units/undead-necromancers/adept+female-ranged-6.png"
 				[/frame]
+				[frame]
+					image="units/undead-necromancers/adept+female-ranged-6.png"
+				[/frame]
 				[frame]
 					image="units/undead-necromancers/adept+female-ranged-7.png"
 				[/frame]