diff --git a/PKHeX/MainWindow/Main.Designer.cs b/PKHeX/MainWindow/Main.Designer.cs
index f382614ec..4cf05774a 100644
--- a/PKHeX/MainWindow/Main.Designer.cs
+++ b/PKHeX/MainWindow/Main.Designer.cs
@@ -314,6 +314,8 @@ public void InitializeComponent()
             this.Menu_Modify = new System.Windows.Forms.ToolStripMenuItem();
             this.Menu_ModifyDex = new System.Windows.Forms.ToolStripMenuItem();
             this.Menu_ModifyPKM = new System.Windows.Forms.ToolStripMenuItem();
+            this.Menu_Undo = new System.Windows.Forms.ToolStripMenuItem();
+            this.Menu_Redo = new System.Windows.Forms.ToolStripMenuItem();
             this.Menu_Unicode = new System.Windows.Forms.ToolStripMenuItem();
             this.Menu_About = new System.Windows.Forms.ToolStripMenuItem();
             this.tabBoxMulti = new System.Windows.Forms.TabControl();
@@ -436,8 +438,7 @@ public void InitializeComponent()
             this.mnuLSave = new System.Windows.Forms.ToolStripMenuItem();
             this.PB_Legal = new System.Windows.Forms.PictureBox();
             this.L_UpdateAvailable = new System.Windows.Forms.LinkLabel();
-            this.Menu_Undo = new System.Windows.Forms.ToolStripMenuItem();
-            this.Menu_Redo = new System.Windows.Forms.ToolStripMenuItem();
+            this.PB_MarkAlola = new System.Windows.Forms.PictureBox();
             this.tabMain.SuspendLayout();
             this.Tab_Main.SuspendLayout();
             this.FLP_Main.SuspendLayout();
@@ -601,6 +602,7 @@ public void InitializeComponent()
             ((System.ComponentModel.ISupportInitialize)(this.dragout)).BeginInit();
             this.mnuL.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PB_Legal)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.PB_MarkAlola)).BeginInit();
             this.SuspendLayout();
             // 
             // tabMain
@@ -3358,6 +3360,7 @@ public void InitializeComponent()
             // 
             // GB_Markings
             // 
+            this.GB_Markings.Controls.Add(this.PB_MarkAlola);
             this.GB_Markings.Controls.Add(this.PB_Mark6);
             this.GB_Markings.Controls.Add(this.PB_MarkPentagon);
             this.GB_Markings.Controls.Add(this.PB_Mark3);
@@ -3391,7 +3394,7 @@ public void InitializeComponent()
             // 
             this.PB_MarkPentagon.Image = ((System.Drawing.Image)(resources.GetObject("PB_MarkPentagon.Image")));
             this.PB_MarkPentagon.InitialImage = ((System.Drawing.Image)(resources.GetObject("PB_MarkPentagon.InitialImage")));
-            this.PB_MarkPentagon.Location = new System.Drawing.Point(83, 15);
+            this.PB_MarkPentagon.Location = new System.Drawing.Point(18, 15);
             this.PB_MarkPentagon.Name = "PB_MarkPentagon";
             this.PB_MarkPentagon.Size = new System.Drawing.Size(20, 20);
             this.PB_MarkPentagon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
@@ -3428,7 +3431,7 @@ public void InitializeComponent()
             // 
             this.PB_MarkCured.Image = ((System.Drawing.Image)(resources.GetObject("PB_MarkCured.Image")));
             this.PB_MarkCured.InitialImage = ((System.Drawing.Image)(resources.GetObject("PB_MarkCured.InitialImage")));
-            this.PB_MarkCured.Location = new System.Drawing.Point(57, 15);
+            this.PB_MarkCured.Location = new System.Drawing.Point(70, 15);
             this.PB_MarkCured.Name = "PB_MarkCured";
             this.PB_MarkCured.Size = new System.Drawing.Size(20, 20);
             this.PB_MarkCured.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
@@ -3452,7 +3455,7 @@ public void InitializeComponent()
             // 
             this.PB_MarkShiny.Image = ((System.Drawing.Image)(resources.GetObject("PB_MarkShiny.Image")));
             this.PB_MarkShiny.InitialImage = ((System.Drawing.Image)(resources.GetObject("PB_MarkShiny.InitialImage")));
-            this.PB_MarkShiny.Location = new System.Drawing.Point(31, 15);
+            this.PB_MarkShiny.Location = new System.Drawing.Point(44, 15);
             this.PB_MarkShiny.Name = "PB_MarkShiny";
             this.PB_MarkShiny.Size = new System.Drawing.Size(20, 20);
             this.PB_MarkShiny.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
@@ -3900,7 +3903,7 @@ public void InitializeComponent()
             this.CB_MainLanguage});
             this.Menu_Language.Image = global::PKHeX.Properties.Resources.language;
             this.Menu_Language.Name = "Menu_Language";
-            this.Menu_Language.Size = new System.Drawing.Size(152, 22);
+            this.Menu_Language.Size = new System.Drawing.Size(139, 22);
             this.Menu_Language.Text = "Language";
             // 
             // CB_MainLanguage
@@ -3919,7 +3922,7 @@ public void InitializeComponent()
             this.Menu_Redo});
             this.Menu_Modify.Image = global::PKHeX.Properties.Resources.settings;
             this.Menu_Modify.Name = "Menu_Modify";
-            this.Menu_Modify.Size = new System.Drawing.Size(152, 22);
+            this.Menu_Modify.Size = new System.Drawing.Size(139, 22);
             this.Menu_Modify.Text = "Set to SAV";
             // 
             // Menu_ModifyDex
@@ -3942,13 +3945,33 @@ public void InitializeComponent()
             this.Menu_ModifyPKM.Text = "Modify PKM Info";
             this.Menu_ModifyPKM.Click += new System.EventHandler(this.mainMenuModifyPKM);
             // 
+            // Menu_Undo
+            // 
+            this.Menu_Undo.Enabled = false;
+            this.Menu_Undo.Name = "Menu_Undo";
+            this.Menu_Undo.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U)));
+            this.Menu_Undo.ShowShortcutKeys = false;
+            this.Menu_Undo.Size = new System.Drawing.Size(164, 22);
+            this.Menu_Undo.Text = "Undo Last Change";
+            this.Menu_Undo.Click += new System.EventHandler(this.clickUndo);
+            // 
+            // Menu_Redo
+            // 
+            this.Menu_Redo.Enabled = false;
+            this.Menu_Redo.Name = "Menu_Redo";
+            this.Menu_Redo.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y)));
+            this.Menu_Redo.ShowShortcutKeys = false;
+            this.Menu_Redo.Size = new System.Drawing.Size(164, 22);
+            this.Menu_Redo.Text = "Redo Last Change";
+            this.Menu_Redo.Click += new System.EventHandler(this.clickRedo);
+            // 
             // Menu_Unicode
             // 
             this.Menu_Unicode.Checked = true;
             this.Menu_Unicode.CheckOnClick = true;
             this.Menu_Unicode.CheckState = System.Windows.Forms.CheckState.Checked;
             this.Menu_Unicode.Name = "Menu_Unicode";
-            this.Menu_Unicode.Size = new System.Drawing.Size(152, 22);
+            this.Menu_Unicode.Size = new System.Drawing.Size(139, 22);
             this.Menu_Unicode.Text = "Unicode";
             this.Menu_Unicode.Click += new System.EventHandler(this.mainMenuUnicode);
             // 
@@ -3958,7 +3981,7 @@ public void InitializeComponent()
             this.Menu_About.Name = "Menu_About";
             this.Menu_About.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P)));
             this.Menu_About.ShowShortcutKeys = false;
-            this.Menu_About.Size = new System.Drawing.Size(152, 22);
+            this.Menu_About.Size = new System.Drawing.Size(139, 22);
             this.Menu_About.Text = "About &PKHeX";
             this.Menu_About.Click += new System.EventHandler(this.mainMenuAbout);
             // 
@@ -5607,25 +5630,16 @@ public void InitializeComponent()
             this.L_UpdateAvailable.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             this.L_UpdateAvailable.Visible = false;
             // 
-            // Menu_Undo
+            // PB_MarkAlola
             // 
-            this.Menu_Undo.Enabled = false;
-            this.Menu_Undo.Name = "Menu_Undo";
-            this.Menu_Undo.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U)));
-            this.Menu_Undo.ShowShortcutKeys = false;
-            this.Menu_Undo.Size = new System.Drawing.Size(164, 22);
-            this.Menu_Undo.Text = "Undo Last Change";
-            this.Menu_Undo.Click += new System.EventHandler(this.clickUndo);
-            // 
-            // Menu_Redo
-            // 
-            this.Menu_Redo.Enabled = false;
-            this.Menu_Redo.Name = "Menu_Redo";
-            this.Menu_Redo.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y)));
-            this.Menu_Redo.ShowShortcutKeys = false;
-            this.Menu_Redo.Size = new System.Drawing.Size(164, 22);
-            this.Menu_Redo.Text = "Redo Last Change";
-            this.Menu_Redo.Click += new System.EventHandler(this.clickRedo);
+            this.PB_MarkAlola.Image = global::PKHeX.Properties.Resources.sanchi;
+            this.PB_MarkAlola.InitialImage = global::PKHeX.Properties.Resources.sanchi;
+            this.PB_MarkAlola.Location = new System.Drawing.Point(96, 15);
+            this.PB_MarkAlola.Name = "PB_MarkAlola";
+            this.PB_MarkAlola.Size = new System.Drawing.Size(20, 20);
+            this.PB_MarkAlola.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+            this.PB_MarkAlola.TabIndex = 9;
+            this.PB_MarkAlola.TabStop = false;
             // 
             // Main
             // 
@@ -5851,6 +5865,7 @@ public void InitializeComponent()
             ((System.ComponentModel.ISupportInitialize)(this.dragout)).EndInit();
             this.mnuL.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.PB_Legal)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.PB_MarkAlola)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -6265,6 +6280,7 @@ public void InitializeComponent()
         private System.Windows.Forms.NumericUpDown NUD_ShadowID;
         private System.Windows.Forms.ToolStripMenuItem Menu_Undo;
         private System.Windows.Forms.ToolStripMenuItem Menu_Redo;
+        private System.Windows.Forms.PictureBox PB_MarkAlola;
     }
 }
 
diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs
index 4b7a8d393..25ea01660 100644
--- a/PKHeX/MainWindow/Main.cs
+++ b/PKHeX/MainWindow/Main.cs
@@ -945,6 +945,7 @@ private void openSAV(SaveFile sav, string path)
             PB_Legal.Visible = PB_WarnMove1.Visible = PB_WarnMove2.Visible = PB_WarnMove3.Visible = PB_WarnMove4.Visible = SAV.Generation >= 6;
 
             PB_MarkPentagon.Visible = SAV.Generation >= 6;
+            PB_MarkAlola.Visible = SAV.Generation >= 7;
             TB_Secure1.Visible = TB_Secure2.Visible = L_GameSync.Visible = L_Secure1.Visible = L_Secure2.Visible = SAV.Exportable && SAV.Generation >= 6;
             TB_GameSync.Visible = SAV.Exportable && SAV.Generation == 6;
 
@@ -1452,9 +1453,9 @@ private void setMarkings()
 
             PB_MarkShiny.Image = Util.ChangeOpacity(PB_MarkShiny.InitialImage, !BTN_Shinytize.Enabled ? 1 : 0.1);
             PB_MarkCured.Image = Util.ChangeOpacity(PB_MarkCured.InitialImage, CHK_Cured.Checked ? 1 : 0.1);
-
-            int Version = pkm.Version;
-            PB_MarkPentagon.Image = Util.ChangeOpacity(PB_MarkPentagon.InitialImage, Version >= 24 && Version <= 29 ? 1 : 0.1);
+            
+            PB_MarkPentagon.Image = Util.ChangeOpacity(PB_MarkPentagon.InitialImage, pkm.Gen6 ? 1 : 0.1);
+            PB_MarkAlola.Image = Util.ChangeOpacity(PB_MarkAlola.InitialImage, pkm.Gen7 ? 1 : 0.1);
         }
         // Clicked Label Shortcuts //
         private void clickQR(object sender, EventArgs e)
diff --git a/PKHeX/PKHeX.csproj b/PKHeX/PKHeX.csproj
index dcb6a6e64..f18c1cf8d 100644
--- a/PKHeX/PKHeX.csproj
+++ b/PKHeX/PKHeX.csproj
@@ -2884,6 +2884,9 @@
   <ItemGroup>
     <None Include="Resources\img\Bag\Bag_Z.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\img\misc\sanchi.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/PKHeX/Properties/Resources.Designer.cs b/PKHeX/Properties/Resources.Designer.cs
index 0ec342564..2a5a704d7 100644
--- a/PKHeX/Properties/Resources.Designer.cs
+++ b/PKHeX/Properties/Resources.Designer.cs
@@ -16708,6 +16708,16 @@ internal class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap sanchi {
+            get {
+                object obj = ResourceManager.GetObject("sanchi", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/PKHeX/Properties/Resources.resx b/PKHeX/Properties/Resources.resx
index 3f00da23f..4fa78ef13 100644
--- a/PKHeX/Properties/Resources.resx
+++ b/PKHeX/Properties/Resources.resx
@@ -6481,4 +6481,7 @@
   <data name="Bag_Z" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\Bag\Bag_Z.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="sanchi" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\misc\sanchi.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/PKHeX/Resources/img/misc/sanchi.png b/PKHeX/Resources/img/misc/sanchi.png
new file mode 100644
index 000000000..8982c02d1
Binary files /dev/null and b/PKHeX/Resources/img/misc/sanchi.png differ