diff --git a/PKHeX.Core/PersonalInfo/PersonalInfo.cs b/PKHeX.Core/PersonalInfo/PersonalInfo.cs
index 3d075e969..c8cd09e6e 100644
--- a/PKHeX.Core/PersonalInfo/PersonalInfo.cs
+++ b/PKHeX.Core/PersonalInfo/PersonalInfo.cs
@@ -93,7 +93,7 @@ public int FormeIndex(int species, int forme)
                 return species;
             if (FormStatsIndex <= 0) // no formes present
                 return species;
-            if (forme > FormeCount) // beyond range of species' formes
+            if (forme >= FormeCount) // beyond range of species' formes
                 return species;
 
             return FormStatsIndex + forme - 1;
diff --git a/PKHeX.WinForms/Properties/Resources.Designer.cs b/PKHeX.WinForms/Properties/Resources.Designer.cs
index 8783c677c..4fc6ba3e3 100644
--- a/PKHeX.WinForms/Properties/Resources.Designer.cs
+++ b/PKHeX.WinForms/Properties/Resources.Designer.cs
@@ -2333,9 +2333,9 @@ internal class Resources {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap _25_7 {
+        internal static System.Drawing.Bitmap _25_7c {
             get {
-                object obj = ResourceManager.GetObject("_25_7", resourceCulture);
+                object obj = ResourceManager.GetObject("_25_7c", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
diff --git a/PKHeX.WinForms/Properties/Resources.resx b/PKHeX.WinForms/Properties/Resources.resx
index 563cc474e..f2c36c395 100644
--- a/PKHeX.WinForms/Properties/Resources.resx
+++ b/PKHeX.WinForms/Properties/Resources.resx
@@ -5956,8 +5956,8 @@
   <data name="_490_e" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\Pokemon Sprites\490-e.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="_25_7" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Pokemon Sprites\25-7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="_25_7c" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\Pokemon Sprites\25-7c.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="_744_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\Pokemon Sprites\744-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
diff --git a/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-7.png b/PKHeX.WinForms/Resources/img/Pokemon Sprites/25-7c.png
similarity index 100%
rename from PKHeX.WinForms/Resources/img/Pokemon Sprites/25-7.png
rename to PKHeX.WinForms/Resources/img/Pokemon Sprites/25-7c.png