diff --git a/Ninjacrab.PersistentWindows.Solution/SystrayShell/Program.cs b/Ninjacrab.PersistentWindows.Solution/SystrayShell/Program.cs
index a868b7a..3455e3c 100644
--- a/Ninjacrab.PersistentWindows.Solution/SystrayShell/Program.cs
+++ b/Ninjacrab.PersistentWindows.Solution/SystrayShell/Program.cs
@@ -476,7 +476,9 @@ if not errorlevel 1 goto wait_to_finish";
             else
             {
                 NotifyIcon ni = systrayForm.notifyIconMain;
-                ni.Icon = BusyIcon;
+                if (!systrayForm.toggleIcon) {
+                    ni.Icon = BusyIcon; 
+                }
 
                 if (silent)
                     return;
@@ -501,7 +503,10 @@ if not errorlevel 1 goto wait_to_finish";
             else
             {
                 NotifyIcon ni = systrayForm.notifyIconMain;
-                ni.Icon = IdleIcon;
+                if (!systrayForm.toggleIcon)
+                {
+                    ni.Icon = IdleIcon;
+                }
 
                 if (Gui)
                 {
diff --git a/Ninjacrab.PersistentWindows.Solution/SystrayShell/SystrayForm.cs b/Ninjacrab.PersistentWindows.Solution/SystrayShell/SystrayForm.cs
index 3c453f8..e7bd829 100644
--- a/Ninjacrab.PersistentWindows.Solution/SystrayShell/SystrayForm.cs
+++ b/Ninjacrab.PersistentWindows.Solution/SystrayShell/SystrayForm.cs
@@ -18,7 +18,7 @@ namespace PersistentWindows.SystrayShell
         private const int MaxSnapshots = 38; // 0-9, a-z, ` and final one for undo
 
         private bool pauseAutoRestore = false;
-        private bool toggleIcon = false;
+        public bool toggleIcon = false;
 
         private int skipUpgradeCounter = 0;
         private bool pauseUpgradeCounter = false;