diff --git a/ControlElements/TextImageButtonFactory.cs b/ControlElements/TextImageButtonFactory.cs
index 9be61228d..501cef798 100644
--- a/ControlElements/TextImageButtonFactory.cs
+++ b/ControlElements/TextImageButtonFactory.cs
@@ -122,10 +122,10 @@ namespace MatterHackers.MatterControl
 		{
 			// Create button based on view container widget
 			var buttonViewWidget = new ButtonViewStates(
-				new TextImageWidget(label, normalFillColor, normalBorderColor, normalTextColor, borderWidth, Margin, null, fontSize: this.fontSize, height: this.FixedHeight, imageSpacing: ImageSpacing),
-				new TextImageWidget(label, hoverFillColor, hoverBorderColor, hoverTextColor, borderWidth, Margin, null, fontSize: this.fontSize, height: this.FixedHeight, imageSpacing: ImageSpacing),
-				new TextImageWidget(label, pressedFillColor, pressedBorderColor, pressedTextColor, borderWidth, Margin, null, fontSize: this.fontSize, height: this.FixedHeight, imageSpacing: ImageSpacing),
-				new TextImageWidget(label, disabledFillColor, disabledBorderColor, disabledTextColor, borderWidth, Margin, null, fontSize: this.fontSize, height: this.FixedHeight, imageSpacing: ImageSpacing)
+				new TextImageWidget(label, normalFillColor, normalBorderColor, normalTextColor, borderWidth, Margin, null, fontSize: this.fontSize, height: this.FixedHeight * GuiWidget.DeviceScale, imageSpacing: ImageSpacing),
+				new TextImageWidget(label, hoverFillColor, hoverBorderColor, hoverTextColor, borderWidth, Margin, null, fontSize: this.fontSize, height: this.FixedHeight * GuiWidget.DeviceScale, imageSpacing: ImageSpacing),
+				new TextImageWidget(label, pressedFillColor, pressedBorderColor, pressedTextColor, borderWidth, Margin, null, fontSize: this.fontSize, height: this.FixedHeight * GuiWidget.DeviceScale, imageSpacing: ImageSpacing),
+				new TextImageWidget(label, disabledFillColor, disabledBorderColor, disabledTextColor, borderWidth, Margin, null, fontSize: this.fontSize, height: this.FixedHeight * GuiWidget.DeviceScale, imageSpacing: ImageSpacing)
 			);
 
 			var textImageButton = new Button(0, 0, buttonViewWidget)
diff --git a/PartPreviewWindow/View3D/ColorSwatchSelector.cs b/PartPreviewWindow/View3D/ColorSwatchSelector.cs
index 741f6ddc6..141652111 100644
--- a/PartPreviewWindow/View3D/ColorSwatchSelector.cs
+++ b/PartPreviewWindow/View3D/ColorSwatchSelector.cs
@@ -91,8 +91,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			var colorWidget = new GuiWidget()
 			{
 				BackgroundColor = color,
-				Width = buttonSize,
-				Height = buttonSize,
+				Width = buttonSize * GuiWidget.DeviceScale,
+				Height = buttonSize * GuiWidget.DeviceScale,
 				Margin = buttonSpacing
 			};
 
diff --git a/PartPreviewWindow/View3D/TumbleCubeControl.cs b/PartPreviewWindow/View3D/TumbleCubeControl.cs
index ff477f93d..3afa7e3c4 100644
--- a/PartPreviewWindow/View3D/TumbleCubeControl.cs
+++ b/PartPreviewWindow/View3D/TumbleCubeControl.cs
@@ -54,7 +54,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 		Vector2 lastMovePosition;
 
 		public TumbleCubeControl(InteractionLayer interactionLayer)
-			: base(100, 100)
+			: base(100 * GuiWidget.DeviceScale, 100 * GuiWidget.DeviceScale)
 		{
 			this.interactionLayer = interactionLayer;
 
diff --git a/RootSystemWindow.cs b/RootSystemWindow.cs
index 1d0b080c0..8b06166fb 100644
--- a/RootSystemWindow.cs
+++ b/RootSystemWindow.cs
@@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl
 {
 	public class RootSystemWindow : SystemWindow
 	{
-		private static Vector2 minSize { get; set; } = new Vector2(600, 600);
+		private static Vector2 minSize { get; set; } = new Vector2(600, 480);
 
 		private Stopwatch totalDrawTime = new Stopwatch();