diff --git a/PKHeX.Drawing.Misc/Properties/Resources.Designer.cs b/PKHeX.Drawing.Misc/Properties/Resources.Designer.cs
index ce63b0a75..9743ae0e7 100644
--- a/PKHeX.Drawing.Misc/Properties/Resources.Designer.cs
+++ b/PKHeX.Drawing.Misc/Properties/Resources.Designer.cs
@@ -4940,6 +4940,196 @@ public class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap type_icon_s_00 {
+            get {
+                object obj = ResourceManager.GetObject("type_icon_s_00", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap type_icon_s_01 {
+            get {
+                object obj = ResourceManager.GetObject("type_icon_s_01", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap type_icon_s_02 {
+            get {
+                object obj = ResourceManager.GetObject("type_icon_s_02", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap type_icon_s_03 {
+            get {
+                object obj = ResourceManager.GetObject("type_icon_s_03", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap type_icon_s_04 {
+            get {
+                object obj = ResourceManager.GetObject("type_icon_s_04", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap type_icon_s_05 {
+            get {
+                object obj = ResourceManager.GetObject("type_icon_s_05", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap type_icon_s_06 {
+            get {
+                object obj = ResourceManager.GetObject("type_icon_s_06", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap type_icon_s_07 {
+            get {
+                object obj = ResourceManager.GetObject("type_icon_s_07", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap type_icon_s_08 {
+            get {
+                object obj = ResourceManager.GetObject("type_icon_s_08", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap type_icon_s_09 {
+            get {
+                object obj = ResourceManager.GetObject("type_icon_s_09", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap type_icon_s_10 {
+            get {
+                object obj = ResourceManager.GetObject("type_icon_s_10", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap type_icon_s_11 {
+            get {
+                object obj = ResourceManager.GetObject("type_icon_s_11", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap type_icon_s_12 {
+            get {
+                object obj = ResourceManager.GetObject("type_icon_s_12", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap type_icon_s_13 {
+            get {
+                object obj = ResourceManager.GetObject("type_icon_s_13", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap type_icon_s_14 {
+            get {
+                object obj = ResourceManager.GetObject("type_icon_s_14", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap type_icon_s_15 {
+            get {
+                object obj = ResourceManager.GetObject("type_icon_s_15", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap type_icon_s_16 {
+            get {
+                object obj = ResourceManager.GetObject("type_icon_s_16", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap type_icon_s_17 {
+            get {
+                object obj = ResourceManager.GetObject("type_icon_s_17", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap type_icon_s_99 {
+            get {
+                object obj = ResourceManager.GetObject("type_icon_s_99", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/PKHeX.Drawing.Misc/Properties/Resources.resx b/PKHeX.Drawing.Misc/Properties/Resources.resx
index 86c227af6..5677f7d5c 100644
--- a/PKHeX.Drawing.Misc/Properties/Resources.resx
+++ b/PKHeX.Drawing.Misc/Properties/Resources.resx
@@ -1582,6 +1582,63 @@
   <data name="type_icon_99" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\types\square\type_icon_99.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="type_icon_s_00" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\types\square_s\type_icon_s_00.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="type_icon_s_01" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\types\square_s\type_icon_s_01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="type_icon_s_02" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\types\square_s\type_icon_s_02.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="type_icon_s_03" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\types\square_s\type_icon_s_03.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="type_icon_s_04" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\types\square_s\type_icon_s_04.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="type_icon_s_05" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\types\square_s\type_icon_s_05.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="type_icon_s_06" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\types\square_s\type_icon_s_06.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="type_icon_s_07" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\types\square_s\type_icon_s_07.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="type_icon_s_08" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\types\square_s\type_icon_s_08.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="type_icon_s_09" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\types\square_s\type_icon_s_09.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="type_icon_s_10" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\types\square_s\type_icon_s_10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="type_icon_s_11" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\types\square_s\type_icon_s_11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="type_icon_s_12" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\types\square_s\type_icon_s_12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="type_icon_s_13" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\types\square_s\type_icon_s_13.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="type_icon_s_14" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\types\square_s\type_icon_s_14.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="type_icon_s_15" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\types\square_s\type_icon_s_15.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="type_icon_s_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\types\square_s\type_icon_s_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="type_icon_s_17" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\types\square_s\type_icon_s_17.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="type_icon_s_99" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\types\square_s\type_icon_s_99.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="type_wide_00" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\types\wide\type_wide_00.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
diff --git a/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_00.png b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_00.png
new file mode 100644
index 000000000..edd55bb8f
Binary files /dev/null and b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_00.png differ
diff --git a/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_01.png b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_01.png
new file mode 100644
index 000000000..b67f3de83
Binary files /dev/null and b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_01.png differ
diff --git a/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_02.png b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_02.png
new file mode 100644
index 000000000..7c656e50d
Binary files /dev/null and b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_02.png differ
diff --git a/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_03.png b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_03.png
new file mode 100644
index 000000000..0cbaccb64
Binary files /dev/null and b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_03.png differ
diff --git a/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_04.png b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_04.png
new file mode 100644
index 000000000..69f7757bf
Binary files /dev/null and b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_04.png differ
diff --git a/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_05.png b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_05.png
new file mode 100644
index 000000000..4b145b452
Binary files /dev/null and b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_05.png differ
diff --git a/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_06.png b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_06.png
new file mode 100644
index 000000000..64ce63885
Binary files /dev/null and b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_06.png differ
diff --git a/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_07.png b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_07.png
new file mode 100644
index 000000000..ba2817c8e
Binary files /dev/null and b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_07.png differ
diff --git a/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_08.png b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_08.png
new file mode 100644
index 000000000..233bd4254
Binary files /dev/null and b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_08.png differ
diff --git a/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_09.png b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_09.png
new file mode 100644
index 000000000..b3d6c53fd
Binary files /dev/null and b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_09.png differ
diff --git a/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_10.png b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_10.png
new file mode 100644
index 000000000..a43b1f23b
Binary files /dev/null and b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_10.png differ
diff --git a/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_11.png b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_11.png
new file mode 100644
index 000000000..30f0f6bc5
Binary files /dev/null and b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_11.png differ
diff --git a/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_12.png b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_12.png
new file mode 100644
index 000000000..a524e1550
Binary files /dev/null and b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_12.png differ
diff --git a/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_13.png b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_13.png
new file mode 100644
index 000000000..34fde714f
Binary files /dev/null and b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_13.png differ
diff --git a/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_14.png b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_14.png
new file mode 100644
index 000000000..881a242cc
Binary files /dev/null and b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_14.png differ
diff --git a/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_15.png b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_15.png
new file mode 100644
index 000000000..082319b1d
Binary files /dev/null and b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_15.png differ
diff --git a/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_16.png b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_16.png
new file mode 100644
index 000000000..de76f8b2d
Binary files /dev/null and b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_16.png differ
diff --git a/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_17.png b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_17.png
new file mode 100644
index 000000000..ce7623b47
Binary files /dev/null and b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_17.png differ
diff --git a/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_99.png b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_99.png
new file mode 100644
index 000000000..aa386295b
Binary files /dev/null and b/PKHeX.Drawing.Misc/Resources/img/types/square_s/type_icon_s_99.png differ
diff --git a/PKHeX.Drawing.Misc/Util/TypeSpriteUtil.cs b/PKHeX.Drawing.Misc/Util/TypeSpriteUtil.cs
index a8c6a625a..eb4f4341f 100644
--- a/PKHeX.Drawing.Misc/Util/TypeSpriteUtil.cs
+++ b/PKHeX.Drawing.Misc/Util/TypeSpriteUtil.cs
@@ -22,6 +22,13 @@ public static class TypeSpriteUtil
         return Get($"type_icon_{type:00}");
     }
 
+    public static Bitmap? GetTypeSpriteIconSmall(byte type, int generation = PKX.Generation)
+    {
+        if (generation <= 2)
+            type = (byte)((MoveType)type).GetMoveTypeGeneration(generation);
+        return Get($"type_icon_s_{type:00}");
+    }
+
     public static Bitmap? GetTypeSpriteGem(byte type)
     {
         return Get($"gem_{type:00}");
diff --git a/PKHeX.WinForms/Controls/PKM Editor/MoveChoice.cs b/PKHeX.WinForms/Controls/PKM Editor/MoveChoice.cs
index 2f715f0a1..438e1b6e7 100644
--- a/PKHeX.WinForms/Controls/PKM Editor/MoveChoice.cs	
+++ b/PKHeX.WinForms/Controls/PKM Editor/MoveChoice.cs	
@@ -30,7 +30,7 @@ private void UpdateTypeSprite(int value)
         }
 
         var type = MoveInfo.GetType((ushort)value, Context);
-        PB_Type.Image = TypeSpriteUtil.GetTypeSpriteIcon(type);
+        PB_Type.Image = TypeSpriteUtil.GetTypeSpriteIconSmall(type);
     }
 
     private static void LoadClamp(ComboBox cb, int value)
diff --git a/PKHeX.WinForms/Controls/PKM Editor/MoveDisplay.cs b/PKHeX.WinForms/Controls/PKM Editor/MoveDisplay.cs
index fa37641d6..2850c49d9 100644
--- a/PKHeX.WinForms/Controls/PKM Editor/MoveDisplay.cs	
+++ b/PKHeX.WinForms/Controls/PKM Editor/MoveDisplay.cs	
@@ -30,7 +30,7 @@ public int Populate(PKM pk, ushort move, EntityContext context, ReadOnlySpan<str
         var size = PokePreview.MeasureSize(name, L_Move.Font);
         var ctrlWidth = PB_Type.Width + PB_Type.Margin.Horizontal + size.Width + L_Move.Margin.Horizontal;
 
-        PB_Type.Image = TypeSpriteUtil.GetTypeSpriteIcon(type);
+        PB_Type.Image = TypeSpriteUtil.GetTypeSpriteIconSmall(type);
         L_Move.Text = name;
         if (valid)
             L_Move.ResetForeColor();
diff --git a/PKHeX.WinForms/Subforms/PKM Editors/MoveShopEditor.cs b/PKHeX.WinForms/Subforms/PKM Editors/MoveShopEditor.cs
index a081aa125..144c1d62f 100644
--- a/PKHeX.WinForms/Subforms/PKM Editors/MoveShopEditor.cs	
+++ b/PKHeX.WinForms/Subforms/PKM Editors/MoveShopEditor.cs	
@@ -159,7 +159,7 @@ private void PopulateRecords()
             }
             row.Cells[ColumnIndex].Value = $"{i + Bias:00}";
             row.Cells[ColumnType].Value = type.ToString("00") + (isValid ? 0 : 1) + names[move]; // type -> valid -> name sorting
-            row.Cells[ColumnTypeIcon].Value = TypeSpriteUtil.GetTypeSpriteIcon(type);
+            row.Cells[ColumnTypeIcon].Value = TypeSpriteUtil.GetTypeSpriteIconSmall(type);
             row.Cells[ColumnName].Value = names[indexes[i]];
         }
     }
diff --git a/PKHeX.WinForms/Subforms/PKM Editors/TechRecordEditor.cs b/PKHeX.WinForms/Subforms/PKM Editors/TechRecordEditor.cs
index 7847b2e22..0c9b61b4b 100644
--- a/PKHeX.WinForms/Subforms/PKM Editors/TechRecordEditor.cs	
+++ b/PKHeX.WinForms/Subforms/PKM Editors/TechRecordEditor.cs	
@@ -59,7 +59,7 @@ private void PopulateRecords(EntityContext context, ReadOnlySpan<ushort> current
                 row.Cells[ColumnName].Style.BackColor = Color.LightBlue;
 
             row.Cells[ColumnIndex].Value = i.ToString("000");
-            row.Cells[ColumnTypeIcon].Value = TypeSpriteUtil.GetTypeSpriteIcon(type);
+            row.Cells[ColumnTypeIcon].Value = TypeSpriteUtil.GetTypeSpriteIconSmall(type);
             row.Cells[ColumnType].Value = type.ToString("00") + (isValid ? 0 : 1) + names[move]; // type -> valid -> name sorting
             row.Cells[ColumnName].Value = names[move];
         }