diff --git a/PKHeX.Drawing/Resources/img/Trainer Sprites/tr_00.png b/PKHeX.Drawing/Resources/img/Trainer Sprites/tr_00.png
index 8f2d568c6..5c6127f5a 100644
Binary files a/PKHeX.Drawing/Resources/img/Trainer Sprites/tr_00.png and b/PKHeX.Drawing/Resources/img/Trainer Sprites/tr_00.png differ
diff --git a/PKHeX.Drawing/Resources/img/Trainer Sprites/tr_01.png b/PKHeX.Drawing/Resources/img/Trainer Sprites/tr_01.png
index 8f2d568c6..ae3354f90 100644
Binary files a/PKHeX.Drawing/Resources/img/Trainer Sprites/tr_01.png and b/PKHeX.Drawing/Resources/img/Trainer Sprites/tr_01.png differ
diff --git a/PKHeX.Drawing/Sprites/SpriteUtil.cs b/PKHeX.Drawing/Sprites/SpriteUtil.cs
index 9d615c6b5..28589422c 100644
--- a/PKHeX.Drawing/Sprites/SpriteUtil.cs
+++ b/PKHeX.Drawing/Sprites/SpriteUtil.cs
@@ -112,10 +112,12 @@ private static Image GetSprite(PKM pk, bool isBoxBGRed = false)
 
         private static Image? GetSprite(SaveFile sav)
         {
-            string file = "tr_00";
-            if (sav is SAV6AO)
-                file = $"tr_{sav.MultiplayerSpriteID:00}";
-            return Resources.ResourceManager.GetObject(file) as Image;
+            if (sav is SAV6XY or SAV6AO)
+            {
+                string file = $"tr_{sav.MultiplayerSpriteID:00}";
+                return Resources.ResourceManager.GetObject(file) as Image ?? Resources.tr_00;
+            }
+            return null;
         }
 
         private static Image GetWallpaper(SaveFile sav, int box)
diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs
index 3f1aa04a3..ad3f14a1a 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs	
+++ b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs	
@@ -42,8 +42,8 @@ public SAV_Trainer(SaveFile sav)
             cba = new[] { CHK_Badge1, CHK_Badge2, CHK_Badge3, CHK_Badge4, CHK_Badge5, CHK_Badge6, CHK_Badge7, CHK_Badge8, };
 
             L_MultiplayerSprite.Enabled = CB_MultiplayerSprite.Enabled =
-            L_MultiplayerSprite.Visible = CB_MultiplayerSprite.Visible =
-            PB_Sprite.Visible = CHK_MegaRayquazaUnlocked.Visible = SAV is SAV6AO;
+            L_MultiplayerSprite.Visible = CB_MultiplayerSprite.Visible = PB_Sprite.Visible = SAV is not SAV6AODemo;
+            CHK_MegaRayquazaUnlocked.Visible = SAV is SAV6AO;
 
             L_Style.Visible = TB_Style.Visible = SAV is SAV6XY;
             if (SAV is not SAV6XY)
@@ -84,8 +84,9 @@ private void GetComboBoxes()
             var names = Enum.GetNames(typeof(TrainerSprite6));
             var values = (int[])Enum.GetValues(typeof(TrainerSprite6));
             var data = names.Zip(values, (a, b) => new ComboItem(a, b))
-                .Where(z => z.Value >= 2) // ignore Calem & Serena (no sprite)
                 .ToList();
+            if (SAV is not SAV6AO)
+                data.RemoveAll(z => z.Value > 36);
 
             CB_MultiplayerSprite.InitializeBinding();
             CB_MultiplayerSprite.DataSource = data;