diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo
index 8c737e36..c9976a13 100644
Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ
diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide
index 51da4eff..77c7bee3 100644
Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide differ
diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal
index a6f39700..0ce68d12 100644
Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal differ
diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
index 2e2020a4..d5fec73d 100644
Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache
index bf49d409..683d4f45 100644
Binary files a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache and b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache differ
diff --git a/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.Designer.cs b/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.Designer.cs
index edc54ec1..e360e4ef 100644
--- a/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.Designer.cs
+++ b/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.Designer.cs
@@ -28,13 +28,14 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ImageEditorBase));
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.stPanel2 = new Switch_Toolbox.Library.Forms.STPanel();
             this.stPanel1 = new Switch_Toolbox.Library.Forms.STPanel();
             this.stPanel4 = new Switch_Toolbox.Library.Forms.STPanel();
             this.pictureBoxCustom1 = new Switch_Toolbox.Library.Forms.PictureBoxCustom();
-            this.stContextMenuStrip2 = new Switch_Toolbox.Library.Forms.STContextMenuStrip();
+            this.stContextMenuStrip2 = new Switch_Toolbox.Library.Forms.STContextMenuStrip(this.components);
             this.copyImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.stPanel3 = new Switch_Toolbox.Library.Forms.STPanel();
             this.alphaBtn = new Switch_Toolbox.Library.Forms.STButton();
@@ -184,7 +185,6 @@
             this.alphaBtn.BackColor = System.Drawing.Color.Transparent;
             this.alphaBtn.BackgroundImage = global::Switch_Toolbox.Library.Properties.Resources.AlphaIcon;
             this.alphaBtn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.alphaBtn.Enabled = false;
             this.alphaBtn.FlatAppearance.BorderSize = 0;
             this.alphaBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.alphaBtn.Location = new System.Drawing.Point(70, 3);
diff --git a/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.cs b/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.cs
index 58ba4a57..f652f504 100644
--- a/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.cs
+++ b/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.cs
@@ -159,7 +159,9 @@ namespace Switch_Toolbox.Library.Forms
             InitializeComponent();
 
             useComponentSelectorToolStripMenuItem.Checked = Runtime.ImageEditor.UseComponetSelector;
+
             displayAlphaToolStripMenuItem.Checked = Runtime.ImageEditor.DisplayAlpha;
+            SetAlphaEnableUI(Runtime.ImageEditor.DisplayAlpha);
 
             propertiesEditor = new ImagePropertiesEditor();
             propertiesEditor.Dock = DockStyle.Fill;
@@ -1015,10 +1017,6 @@ namespace Switch_Toolbox.Library.Forms
             ApplyEdit(ImageCache[currentCacheIndex]);
         }
 
-        private void displayAlphaToolStripMenuItem_Click(object sender, EventArgs e) {
-            UpdateAlphaEnable();
-        }
-
         private void useComponentSelectorToolStripMenuItem_Click(object sender, EventArgs e)
         {
             if (useComponentSelectorToolStripMenuItem.Checked)
@@ -1032,18 +1030,30 @@ namespace Switch_Toolbox.Library.Forms
 
         private void UpdateAlphaEnable()
         {
-            if (displayAlphaToolStripMenuItem.Checked)
+            if (Runtime.ImageEditor.DisplayAlpha)
                 displayAlphaToolStripMenuItem.Checked = false;
             else
                 displayAlphaToolStripMenuItem.Checked = true;
 
-            alphaBtn.Enabled = displayAlphaToolStripMenuItem.Checked; 
+            SetAlphaEnableUI(displayAlphaToolStripMenuItem.Checked );
+
             Runtime.ImageEditor.DisplayAlpha = displayAlphaToolStripMenuItem.Checked;
             UpdateMipDisplay();
         }
 
-        private void alphaBtn_Click(object sender, EventArgs e)
+        private void SetAlphaEnableUI(bool UseAlpha)
         {
+            if (UseAlpha)
+                alphaBtn.BackgroundImage = Properties.Resources.AlphaIcon;
+            else
+                alphaBtn.BackgroundImage = Properties.Resources.AlphaIconDisabled;
+        }
+
+        private void displayAlphaToolStripMenuItem_Click(object sender, EventArgs e) {
+            UpdateAlphaEnable();
+        }
+
+        private void alphaBtn_Click(object sender, EventArgs e) {
             UpdateAlphaEnable();
         }
     }
diff --git a/Switch_Toolbox_Library/Properties/Resources.Designer.cs b/Switch_Toolbox_Library/Properties/Resources.Designer.cs
index 5774371c..bb06f982 100644
--- a/Switch_Toolbox_Library/Properties/Resources.Designer.cs
+++ b/Switch_Toolbox_Library/Properties/Resources.Designer.cs
@@ -80,6 +80,16 @@ namespace Switch_Toolbox.Library.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap AlphaIconDisabled {
+            get {
+                object obj = ResourceManager.GetObject("AlphaIconDisabled", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/Switch_Toolbox_Library/Properties/Resources.resx b/Switch_Toolbox_Library/Properties/Resources.resx
index 89651da8..e374724d 100644
--- a/Switch_Toolbox_Library/Properties/Resources.resx
+++ b/Switch_Toolbox_Library/Properties/Resources.resx
@@ -361,4 +361,7 @@
   <data name="AlphaIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\AlphaIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="AlphaIconDisabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\AlphaIconDisabled.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/Switch_Toolbox_Library/Resources/AlphaIconDisabled.png b/Switch_Toolbox_Library/Resources/AlphaIconDisabled.png
new file mode 100644
index 00000000..f6ddb5ba
Binary files /dev/null and b/Switch_Toolbox_Library/Resources/AlphaIconDisabled.png differ
diff --git a/Switch_Toolbox_Library/Switch_Toolbox_Library.csproj b/Switch_Toolbox_Library/Switch_Toolbox_Library.csproj
index b83071ba..8608bdba 100644
--- a/Switch_Toolbox_Library/Switch_Toolbox_Library.csproj
+++ b/Switch_Toolbox_Library/Switch_Toolbox_Library.csproj
@@ -1032,6 +1032,9 @@
   <ItemGroup>
     <None Include="Resources\AlphaIcon.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\AlphaIconDisabled.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>