diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkDockingFrame.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkDockingFrame.bf
index 0c364619..8d67fdf9 100644
--- a/BeefLibs/Beefy2D/src/theme/dark/DarkDockingFrame.bf
+++ b/BeefLibs/Beefy2D/src/theme/dark/DarkDockingFrame.bf
@@ -38,7 +38,8 @@ namespace Beefy.theme.dark
 			mDragMarginSize = GS!(64);
 			mDragWindowMarginSize = GS!(10);
 
-			mWindowMargin = 0;
+			if (mParentDockingFrame == null)
+				mWindowMargin = GS!(1);
 			mSplitterSize = GS!(6.0f);
 			mWindowSpacing = GS!(2.0f);
 		}
diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkTabbedView.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkTabbedView.bf
index 14882ee1..8a2b5bcd 100644
--- a/BeefLibs/Beefy2D/src/theme/dark/DarkTabbedView.bf
+++ b/BeefLibs/Beefy2D/src/theme/dark/DarkTabbedView.bf
@@ -506,7 +506,7 @@ namespace Beefy.theme.dark
 	                if (tabIdx < mTabs.Count - 1)
 	                {
 	                    tabButton.mWidth = (float)Math.Round(Math.Min(tabButton.mWantWidth, showWidth + GS!(8)));
-	                    tabButton.mCloseButton.mVisible = tabButton.mWidth >= tabButton.mWantWidth;
+	                    tabButton.mCloseButton.mVisible = tabButton.mWidth + 1 >= tabButton.mWantWidth;
 	                }
 	                else
 	                {
diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkTheme.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkTheme.bf
index 20a20471..86fecab5 100644
--- a/BeefLibs/Beefy2D/src/theme/dark/DarkTheme.bf
+++ b/BeefLibs/Beefy2D/src/theme/dark/DarkTheme.bf
@@ -431,7 +431,7 @@ namespace Beefy.theme.dark
         {
             DarkDockingFrame dockingFrame = new DarkDockingFrame();
             if (parent == null)
-                dockingFrame.mWindowMargin = 1;
+                dockingFrame.mWindowMargin = GS!(1);
 			else if (var darkParent = parent as DarkDockingFrame)
 			{
 				dockingFrame.mDrawBkg = darkParent.mDrawBkg;
diff --git a/IDE/src/IDEApp.bf b/IDE/src/IDEApp.bf
index 5c0344eb..4c0c6800 100644
--- a/IDE/src/IDEApp.bf
+++ b/IDE/src/IDEApp.bf
@@ -6771,7 +6771,7 @@ namespace IDE
             OutputSmart(useStr);
         }
 
-		public void SetScale(float scale, bool force = false)
+		public void PhysSetScale(float scale, bool force = false)
 		{
 			var prevScale = DarkTheme.sScale;
 			float useScale = Math.Clamp(scale, 0.5f, 4.0f);
@@ -6818,6 +6818,12 @@ namespace IDE
 			}
 		}
 
+		public void SetScale(float scale, bool force = false)
+		{
+			PhysSetScale(scale, force);
+			gApp.mSettings.mEditorSettings.mUIScale = DarkTheme.sScale * 100.0f;
+		}
+
         void SysKeyDown(KeyDownEvent evt)
         {
 			if (evt.mHandled)
diff --git a/IDE/src/Settings.bf b/IDE/src/Settings.bf
index a8a850ad..c8ed8b63 100644
--- a/IDE/src/Settings.bf
+++ b/IDE/src/Settings.bf
@@ -792,7 +792,7 @@ namespace IDE
 			gApp.mSettings.mEditorSettings.mFontSize = Math.Clamp(gApp.mSettings.mEditorSettings.mFontSize, 6.0f, 72.0f);
 
 			Font.ClearFontNameCache();
-			gApp.SetScale(gApp.mSettings.mEditorSettings.mUIScale / 100.0f, true);
+			gApp.PhysSetScale(gApp.mSettings.mEditorSettings.mUIScale / 100.0f, true);
 
 			DeleteAndNullify!(gApp.mKeyChordState);
 
diff --git a/IDE/src/ui/ProjectPanel.bf b/IDE/src/ui/ProjectPanel.bf
index 92981b83..0411ae6f 100644
--- a/IDE/src/ui/ProjectPanel.bf
+++ b/IDE/src/ui/ProjectPanel.bf
@@ -26,7 +26,8 @@ namespace IDE.ui
 		public override void RehupScale(float oldScale, float newScale)
 		{
 			base.RehupScale(oldScale, newScale);
-			Utils.SnapScale(ref mLabelOffset, newScale / oldScale);
+			if (mLabelOffset != 0)
+				mLabelOffset = GS!(-16);
 		}
 
         protected override float GetLabelOffset()
diff --git a/IDE/src/ui/WatchPanel.bf b/IDE/src/ui/WatchPanel.bf
index 13530b79..70bb186c 100644
--- a/IDE/src/ui/WatchPanel.bf
+++ b/IDE/src/ui/WatchPanel.bf
@@ -1624,8 +1624,8 @@ namespace IDE.ui
 
 		public override void RehupScale(float oldScale, float newScale)
 		{
-			SetScaleData();
 			base.RehupScale(oldScale, newScale);
+			SetScaleData();
 		}
 
 		public void Serialize(StructuredData data, bool includeItems)