diff --git a/ActionBar/PrintActionRow.cs b/ActionBar/PrintActionRow.cs
index b38b259c0..e91bafc07 100644
--- a/ActionBar/PrintActionRow.cs
+++ b/ActionBar/PrintActionRow.cs
@@ -111,7 +111,7 @@ namespace MatterHackers.MatterControl.ActionBar
 				WizardWindow.Show<SetupOptionsPage>("/SetupOptions", "Setup Wizard");
 			};
 
-			resetConnectionButton = buttonFactory.Generate("Reset".Localize().ToUpper(), StaticData.Instance.LoadIcon("e_stop4.png", 32,32).InvertLightness());
+			resetConnectionButton = buttonFactory.Generate("Reset".Localize().ToUpper(), StaticData.Instance.LoadIcon("e_stop.png", 14, 14));
 			resetConnectionButton.ToolTipText = "Reboots the firmware on the controller".Localize();
 			resetConnectionButton.Margin = defaultMargin;
 			resetConnectionButton.Click += (s, e) => UiThread.RunOnIdle(PrinterConnection.Instance.RebootBoard);
diff --git a/ActionBar/PrinterConnectAndSelectControl.cs b/ActionBar/PrinterConnectAndSelectControl.cs
index 193bb8240..5a2c1efc4 100644
--- a/ActionBar/PrinterConnectAndSelectControl.cs
+++ b/ActionBar/PrinterConnectAndSelectControl.cs
@@ -236,7 +236,7 @@ namespace MatterHackers.MatterControl.ActionBar
 			this.Margin = 0;
 			this.Padding = 0;
 
-			connectButton = buttonFactory.Generate("Connect".Localize().ToUpper(), StaticData.Instance.LoadIcon("connect.png", 16, 16));
+			connectButton = buttonFactory.Generate("Connect".Localize().ToUpper(), StaticData.Instance.LoadIcon("connect.png", 14, 14));
 			connectButton.Name = "Connect to printer button";
 			connectButton.ToolTipText = "Connect to the currently selected printer".Localize();
 			connectButton.Click += (s, e) =>
@@ -251,7 +251,7 @@ namespace MatterHackers.MatterControl.ActionBar
 			};
 			this.AddChild(connectButton);
 
-			disconnectButton = buttonFactory.Generate("Disconnect".Localize().ToUpper(), StaticData.Instance.LoadIcon("connect.png", 16, 16));
+			disconnectButton = buttonFactory.Generate("Disconnect".Localize().ToUpper(), StaticData.Instance.LoadIcon("connect.png", 14, 14));
 			disconnectButton.Name = "Disconnect from printer button";
 			disconnectButton.Visible = false;
 			disconnectButton.ToolTipText = "Disconnect from current printer".Localize();
diff --git a/ActionBar/TemperatureWidgetBase.cs b/ActionBar/TemperatureWidgetBase.cs
index 52087c178..045e5a997 100644
--- a/ActionBar/TemperatureWidgetBase.cs
+++ b/ActionBar/TemperatureWidgetBase.cs
@@ -69,7 +69,7 @@ namespace MatterHackers.MatterControl.ActionBar
 			};
 			this.AddChild(container);
 
-			if (!ActiveTheme.Instance.IsDarkTheme)
+			if (ActiveTheme.Instance.IsDarkTheme)
 			{
 				this.ImageWidget.Image = this.ImageWidget.Image.InvertLightness();
 			}
diff --git a/ActionBar/TemperatureWidgetBed.cs b/ActionBar/TemperatureWidgetBed.cs
index e8895f008..3d5a5fdcf 100644
--- a/ActionBar/TemperatureWidgetBed.cs
+++ b/ActionBar/TemperatureWidgetBed.cs
@@ -54,8 +54,7 @@ namespace MatterHackers.MatterControl.ActionBar
 			this.ToolTipText = "Current bed temperature".Localize();
 
 			var icon = StaticData.Instance.LoadIcon("bed.png");
-
-			if (!ActiveTheme.Instance.IsDarkTheme)
+			if (ActiveTheme.Instance.IsDarkTheme)
 			{
 				icon = icon.InvertLightness();
 			}
diff --git a/ApplicationView/ThemeConfig.cs b/ApplicationView/ThemeConfig.cs
index 09d9c4188..856f08f29 100644
--- a/ApplicationView/ThemeConfig.cs
+++ b/ApplicationView/ThemeConfig.cs
@@ -132,13 +132,14 @@ namespace MatterHackers.MatterControl
 
 			DefaultThumbView.ThumbColor = new RGBA_Bytes(theme.PrimaryTextColor, 30);
 
-
 			var commonOptions = new ButtonFactoryOptions();
 			commonOptions.Normal.TextColor = theme.PrimaryTextColor;
 			commonOptions.Hover.TextColor = theme.PrimaryTextColor;
 			commonOptions.Pressed.TextColor = theme.PrimaryTextColor;
 			commonOptions.Disabled.TextColor = theme.TertiaryBackgroundColor;
-			commonOptions.Margin = new BorderDouble(16, 0);
+			commonOptions.Margin = new BorderDouble(14, 0);
+			commonOptions.FontSize = 12;
+			commonOptions.ImageSpacing = 8;
 			commonOptions.BorderWidth = 0;
 			commonOptions.FixedHeight = 32;
 
@@ -153,6 +154,7 @@ namespace MatterHackers.MatterControl
 			this.SmallMarginButtonFactory = new TextImageButtonFactory(commonOptions.Clone(options =>
 			{
 				options.Margin = new BorderDouble(8, 0);
+				options.ImageSpacing = 6;
 			}));
 
 			this.RadioButtons = new TextImageButtonFactory(commonOptions.Clone(options =>
diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs
index faabb7d7e..d71a1c479 100644
--- a/PartPreviewWindow/View3D/View3DWidget.cs
+++ b/PartPreviewWindow/View3D/View3DWidget.cs
@@ -242,7 +242,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
 				var buttonSpacing = ApplicationController.Instance.Theme.ButtonSpacing;
 
-				Button addButton = smallMarginButtonFactory.Generate("Insert".Localize(), StaticData.Instance.LoadIcon("AddAzureResource_16x.png", 16, 16));
+				Button addButton = smallMarginButtonFactory.Generate("Insert".Localize(), StaticData.Instance.LoadIcon("AddAzureResource_16x.png", 14, 14));
 				addButton.Margin = buttonSpacing;
 				addButton.Click += (sender, e) =>
 				{
diff --git a/StaticData/Icons/AddAzureResource_16x.png b/StaticData/Icons/AddAzureResource_16x.png
index 1adad40fc..eb4a3cb6a 100644
Binary files a/StaticData/Icons/AddAzureResource_16x.png and b/StaticData/Icons/AddAzureResource_16x.png differ
diff --git a/StaticData/Icons/bed.png b/StaticData/Icons/bed.png
index 73e229c52..534d004b2 100644
Binary files a/StaticData/Icons/bed.png and b/StaticData/Icons/bed.png differ
diff --git a/StaticData/Icons/connect.png b/StaticData/Icons/connect.png
index 165075dd9..09d5ab358 100644
Binary files a/StaticData/Icons/connect.png and b/StaticData/Icons/connect.png differ
diff --git a/StaticData/Icons/e_stop.png b/StaticData/Icons/e_stop.png
index 3532c4ed3..614612312 100644
Binary files a/StaticData/Icons/e_stop.png and b/StaticData/Icons/e_stop.png differ
diff --git a/StaticData/Icons/hotend.png b/StaticData/Icons/hotend.png
index 1d7690da6..751864a98 100644
Binary files a/StaticData/Icons/hotend.png and b/StaticData/Icons/hotend.png differ
diff --git a/StaticData/Icons/icon_save_32x32.png b/StaticData/Icons/icon_save_32x32.png
index 498849712..e58829d34 100644
Binary files a/StaticData/Icons/icon_save_32x32.png and b/StaticData/Icons/icon_save_32x32.png differ