diff --git a/ShareX.HelpersLib/ShareXResources.cs b/ShareX.HelpersLib/ShareXResources.cs
index 1976dc1c8..403e9ae1b 100644
--- a/ShareX.HelpersLib/ShareXResources.cs
+++ b/ShareX.HelpersLib/ShareXResources.cs
@@ -64,9 +64,12 @@ public static string UserAgent
 
         public static int CheckerSize { get; } = 15;
 
-        public static void ApplyThemeToForm(Form form)
+        public static void ApplyThemeToForm(Form form, bool setIcon = true)
         {
-            form.Icon = Icon;
+            if (setIcon)
+            {
+                form.Icon = Icon;
+            }
 
             if (ApplyTheme)
             {
diff --git a/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs b/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs
index f4a2dc996..b77f02a02 100644
--- a/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs
+++ b/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs
@@ -1050,7 +1050,7 @@ internal void CreateToolbar()
             tsMain.PerformLayout();
             menuForm.ResumeLayout(false);
 
-            ShareXResources.ApplyThemeToForm(menuForm);
+            ShareXResources.ApplyThemeToForm(menuForm, false);
 
             menuForm.Show(Form);