diff --git a/ActionBar/PrintActionRow.cs b/ActionBar/PrintActionRow.cs
index a5aabd556..ecbce2e5a 100644
--- a/ActionBar/PrintActionRow.cs
+++ b/ActionBar/PrintActionRow.cs
@@ -48,6 +48,7 @@ namespace MatterHackers.MatterControl.ActionBar
             textImageButtonFactory.disabledTextColor = RGBA_Bytes.LightGray;
             textImageButtonFactory.hoverTextColor = RGBA_Bytes.White;
             textImageButtonFactory.pressedTextColor = RGBA_Bytes.White;
+            textImageButtonFactory.invertImageColor = false;
 
             textImageButtonFactory.borderWidth = -1;
             textImageButtonFactory.disabledFillColor = ActiveTheme.Instance.PrimaryAccentColor;
diff --git a/ControlElements/TextImageButtonFactory.cs b/ControlElements/TextImageButtonFactory.cs
index da6cab965..43b4e906b 100644
--- a/ControlElements/TextImageButtonFactory.cs
+++ b/ControlElements/TextImageButtonFactory.cs
@@ -78,11 +78,7 @@ namespace MatterHackers.MatterControl
             }
 
             if (image != null && image.Width > 0)
-            {
-                if (!ActiveTheme.Instance.IsDarkTheme)
-                {
-                    InvertLightness.DoInvertLightness(image);
-                }
+            {                
                 
                 imageWidget = new ImageWidget(image);
                 imageWidget.VAnchor = VAnchor.ParentCenter;
@@ -158,6 +154,7 @@ namespace MatterHackers.MatterControl
         public int fontSize = 12;
         public double borderWidth = 1;
         public bool invertImageLocation = false;
+        public bool invertImageColor = true;
         FlowDirection flowDirection;
         public int FixedWidth = 0;
         public int FixedHeight = 40;
@@ -194,10 +191,10 @@ namespace MatterHackers.MatterControl
             ImageBuffer buffer = new ImageBuffer(10, 10, 32, new BlenderBGRA());
             ImageIO.LoadImageData(path, buffer);
 
-            if (!ActiveTheme.Instance.IsDarkTheme)
-            {
-                InvertLightness.DoInvertLightness(buffer);
-            }
+            //if (!ActiveTheme.Instance.IsDarkTheme && invertImageColor)
+            //{
+            //    InvertLightness.DoInvertLightness(buffer);
+            //}
             return buffer;
         }
 
@@ -291,21 +288,37 @@ namespace MatterHackers.MatterControl
             if (normalImageName != null)
             {
                 ImageIO.LoadImageData(this.GetImageLocation(normalImageName), normalImage);
+                if (!ActiveTheme.Instance.IsDarkTheme && invertImageColor)
+                {
+                    InvertLightness.DoInvertLightness(normalImage);
+                }
             }
 
             if (hoverImageName != null)
             {
                 ImageIO.LoadImageData(this.GetImageLocation(pressedImageName), pressedImage);
+                if (!ActiveTheme.Instance.IsDarkTheme && invertImageColor)
+                {
+                    InvertLightness.DoInvertLightness(pressedImage);
+                }
             }
 
             if (pressedImageName != null)
             {
                 ImageIO.LoadImageData(this.GetImageLocation(hoverImageName), hoverImage);
+                if (!ActiveTheme.Instance.IsDarkTheme && invertImageColor)
+                {
+                    InvertLightness.DoInvertLightness(hoverImage);
+                }
             }
 
             if (disabledImageName != null)
             {
                 ImageIO.LoadImageData(this.GetImageLocation(disabledImageName), disabledImage);
+                if (!ActiveTheme.Instance.IsDarkTheme && invertImageColor)
+                {
+                    InvertLightness.DoInvertLightness(disabledImage);
+                }
             }
 
             if (invertImageLocation)
@@ -363,21 +376,39 @@ namespace MatterHackers.MatterControl
             if (normalImageName != null)
             {
                 ImageIO.LoadImageData(this.GetImageLocation(normalImageName), normalImage);
+                
+                if (!ActiveTheme.Instance.IsDarkTheme && invertImageColor)
+                {
+                    InvertLightness.DoInvertLightness(normalImage);
+                }
             }
 
             if (pressedImageName != null)
             {
                 ImageIO.LoadImageData(this.GetImageLocation(pressedImageName), pressedImage);
+                if (!ActiveTheme.Instance.IsDarkTheme && invertImageColor)
+                {
+                    InvertLightness.DoInvertLightness(pressedImage);
+                }
+
             }
 
             if (normalToPressedImageName != null)
             {
                 ImageIO.LoadImageData(this.GetImageLocation(normalToPressedImageName), normalToPressedImage);
+                if (!ActiveTheme.Instance.IsDarkTheme && invertImageColor)
+                {
+                    InvertLightness.DoInvertLightness(normalToPressedImage);
+                }
             }
 
             if (pressedToNormalImageName != null)
             {
                 ImageIO.LoadImageData(this.GetImageLocation(pressedToNormalImageName), pressedToNormalImage);
+                if (!ActiveTheme.Instance.IsDarkTheme && invertImageColor)
+                {
+                    InvertLightness.DoInvertLightness(pressedToNormalImage);
+                }
             }
 
 
@@ -412,7 +443,7 @@ namespace MatterHackers.MatterControl
             {
                 iconImage = new ImageBuffer();
                 ImageIO.LoadImageData(this.GetImageLocation(iconImageName), iconImage);
-                if (!ActiveTheme.Instance.IsDarkTheme)
+                if (!ActiveTheme.Instance.IsDarkTheme && invertImageColor)
                 {
                     InvertLightness.DoInvertLightness(iconImage);
                 }
diff --git a/PartPreviewWindow/GcodeViewBasic.cs b/PartPreviewWindow/GcodeViewBasic.cs
index 3307047fb..45000f832 100644
--- a/PartPreviewWindow/GcodeViewBasic.cs
+++ b/PartPreviewWindow/GcodeViewBasic.cs
@@ -184,6 +184,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
         void AddViewControls()
         {
             TextImageButtonFactory iconTextImageButtonFactory = new TextImageButtonFactory();
+            iconTextImageButtonFactory.invertImageColor = false;
 
             FlowLayoutWidget transformTypeSelector = new FlowLayoutWidget();
             transformTypeSelector.BackgroundColor = new RGBA_Bytes(0, 0, 0, 120);
diff --git a/PartPreviewWindow/PartPreviewBaseWidget.cs b/PartPreviewWindow/PartPreviewBaseWidget.cs
index 59bf79037..bff396e17 100644
--- a/PartPreviewWindow/PartPreviewBaseWidget.cs
+++ b/PartPreviewWindow/PartPreviewBaseWidget.cs
@@ -73,6 +73,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
             expandMenuOptionFactory.hoverFillColor = new RGBA_Bytes(255, 255, 255, 50);
             expandMenuOptionFactory.pressedFillColor = new RGBA_Bytes(255, 255, 255, 50);
             expandMenuOptionFactory.disabledFillColor = new RGBA_Bytes(255, 255, 255, 50);
+            
 
             checkboxButtonFactory.fontSize = 11;
             checkboxButtonFactory.FixedWidth = 138;
diff --git a/PartPreviewWindow/View3DTransfromPart.cs b/PartPreviewWindow/View3DTransfromPart.cs
index 52aa98f89..7b556be9e 100644
--- a/PartPreviewWindow/View3DTransfromPart.cs
+++ b/PartPreviewWindow/View3DTransfromPart.cs
@@ -900,6 +900,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
             transformTypeSelector.BackgroundColor = new RGBA_Bytes(0, 0, 0, 120);
             textImageButtonFactory.FixedHeight = 20;
             textImageButtonFactory.FixedWidth = 20;
+            textImageButtonFactory.invertImageColor = false;
+
             string rotateIconPath = Path.Combine("Icons", "ViewTransformControls", "rotate.png");
             rotateViewButton = textImageButtonFactory.GenerateRadioButton("", rotateIconPath);
             rotateViewButton.Margin = new BorderDouble(3);
diff --git a/PrintQueue/PrintQueueControl.cs b/PrintQueue/PrintQueueControl.cs
index 2b9dded18..8e8d4575b 100644
--- a/PrintQueue/PrintQueueControl.cs
+++ b/PrintQueue/PrintQueueControl.cs
@@ -10,6 +10,7 @@ using MatterHackers.Agg.UI;
 using MatterHackers.VectorMath;
 using MatterHackers.MatterControl;
 using MatterHackers.MatterControl.DataStorage;
+using MatterHackers.Agg.ImageProcessing;
 
 namespace MatterHackers.MatterControl.PrintQueue
 {
@@ -50,6 +51,11 @@ namespace MatterHackers.MatterControl.PrintQueue
             {
                 ImageBuffer wattermarkImage = new ImageBuffer();
                 ImageIO.LoadImageData(imagePathAndFile, wattermarkImage);
+                //if (!ActiveTheme.Instance.IsDarkTheme)
+                //{
+                //    InvertLightness.DoInvertLightness(wattermarkImage);
+                //}
+
                 GuiWidget watermarkWidget = new ImageWidget(wattermarkImage);
                 watermarkWidget.VAnchor = Agg.UI.VAnchor.ParentCenter;
                 watermarkWidget.HAnchor = Agg.UI.HAnchor.ParentCenter;
diff --git a/PrintQueue/PrintQueueMenu.cs b/PrintQueue/PrintQueueMenu.cs
index 2c22ae32e..89bc995af 100644
--- a/PrintQueue/PrintQueueMenu.cs
+++ b/PrintQueue/PrintQueueMenu.cs
@@ -82,7 +82,7 @@ namespace MatterHackers.MatterControl.PrintQueue
                 {LocalizedString.Get(" Export to Folder"), exportGCodeToFolderButton_Click},
                 {LocalizedString.Get("Extra"), null},
                 {LocalizedString.Get(" Create Part Sheet"), createPartsSheetsButton_Click},
-					{LocalizedString.Get("  Remove All"), removeAllFromQueueButton_Click},
+					{LocalizedString.Get(" Remove All"), removeAllFromQueueButton_Click},
                 };
             }