diff --git a/TLM/TLM/Resources/MainMenu/MainMenuButton-bg-active.png b/TLM/TLM/Resources/MainMenu/MainMenuButton-bg-active.png
index cb20579df..94058303e 100644
Binary files a/TLM/TLM/Resources/MainMenu/MainMenuButton-bg-active.png and b/TLM/TLM/Resources/MainMenu/MainMenuButton-bg-active.png differ
diff --git a/TLM/TLM/Resources/MainMenu/MainMenuButton-bg-hovered.png b/TLM/TLM/Resources/MainMenu/MainMenuButton-bg-hovered.png
index 7077eac51..5b632a566 100644
Binary files a/TLM/TLM/Resources/MainMenu/MainMenuButton-bg-hovered.png and b/TLM/TLM/Resources/MainMenu/MainMenuButton-bg-hovered.png differ
diff --git a/TLM/TLM/Resources/MainMenu/MainMenuButton-bg-normal.png b/TLM/TLM/Resources/MainMenu/MainMenuButton-bg-normal.png
index 651080f50..c1183979f 100644
Binary files a/TLM/TLM/Resources/MainMenu/MainMenuButton-bg-normal.png and b/TLM/TLM/Resources/MainMenu/MainMenuButton-bg-normal.png differ
diff --git a/TLM/TLM/Resources/MainMenu/MainMenuButton-fg-active.png b/TLM/TLM/Resources/MainMenu/MainMenuButton-fg-active.png
index bda37bb6e..0994f2959 100644
Binary files a/TLM/TLM/Resources/MainMenu/MainMenuButton-fg-active.png and b/TLM/TLM/Resources/MainMenu/MainMenuButton-fg-active.png differ
diff --git a/TLM/TLM/Resources/MainMenu/MainMenuButton-fg-hovered.png b/TLM/TLM/Resources/MainMenu/MainMenuButton-fg-hovered.png
index 43994b189..9969450f2 100644
Binary files a/TLM/TLM/Resources/MainMenu/MainMenuButton-fg-hovered.png and b/TLM/TLM/Resources/MainMenu/MainMenuButton-fg-hovered.png differ
diff --git a/TLM/TLM/Resources/MainMenu/MainMenuButton-fg-normal.png b/TLM/TLM/Resources/MainMenu/MainMenuButton-fg-normal.png
index bb5df12e9..49dd03ceb 100644
Binary files a/TLM/TLM/Resources/MainMenu/MainMenuButton-fg-normal.png and b/TLM/TLM/Resources/MainMenu/MainMenuButton-fg-normal.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/ClearTraffic-fg-active.png b/TLM/TLM/Resources/MainMenu/Tool/ClearTraffic-fg-active.png
index d2f9fe627..148764f18 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/ClearTraffic-fg-active.png and b/TLM/TLM/Resources/MainMenu/Tool/ClearTraffic-fg-active.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/ClearTraffic-fg-normal.png b/TLM/TLM/Resources/MainMenu/Tool/ClearTraffic-fg-normal.png
index df85c2bbb..31162e558 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/ClearTraffic-fg-normal.png and b/TLM/TLM/Resources/MainMenu/Tool/ClearTraffic-fg-normal.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/Help-fg-active.png b/TLM/TLM/Resources/MainMenu/Tool/Help-fg-active.png
index 2f1fefaa7..f4ecdcb62 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/Help-fg-active.png and b/TLM/TLM/Resources/MainMenu/Tool/Help-fg-active.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/Help-fg-normal.png b/TLM/TLM/Resources/MainMenu/Tool/Help-fg-normal.png
index a4f4fcb11..8dc79b2cd 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/Help-fg-normal.png and b/TLM/TLM/Resources/MainMenu/Tool/Help-fg-normal.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/JunctionRestrictions-fg-active.png b/TLM/TLM/Resources/MainMenu/Tool/JunctionRestrictions-fg-active.png
index 5339ef94e..e8c945f66 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/JunctionRestrictions-fg-active.png and b/TLM/TLM/Resources/MainMenu/Tool/JunctionRestrictions-fg-active.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/JunctionRestrictions-fg-normal.png b/TLM/TLM/Resources/MainMenu/Tool/JunctionRestrictions-fg-normal.png
index 27c9546c7..8767f5274 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/JunctionRestrictions-fg-normal.png and b/TLM/TLM/Resources/MainMenu/Tool/JunctionRestrictions-fg-normal.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/LaneArrows-fg-active.png b/TLM/TLM/Resources/MainMenu/Tool/LaneArrows-fg-active.png
index bc888fe1c..a0baabaac 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/LaneArrows-fg-active.png and b/TLM/TLM/Resources/MainMenu/Tool/LaneArrows-fg-active.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/LaneArrows-fg-normal.png b/TLM/TLM/Resources/MainMenu/Tool/LaneArrows-fg-normal.png
index 711754905..c4d477250 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/LaneArrows-fg-normal.png and b/TLM/TLM/Resources/MainMenu/Tool/LaneArrows-fg-normal.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/LaneConnector-fg-active.png b/TLM/TLM/Resources/MainMenu/Tool/LaneConnector-fg-active.png
index a807fc47b..4c882f33c 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/LaneConnector-fg-active.png and b/TLM/TLM/Resources/MainMenu/Tool/LaneConnector-fg-active.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/LaneConnector-fg-normal.png b/TLM/TLM/Resources/MainMenu/Tool/LaneConnector-fg-normal.png
index d48e2f929..4c882f33c 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/LaneConnector-fg-normal.png and b/TLM/TLM/Resources/MainMenu/Tool/LaneConnector-fg-normal.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/ManualTL-fg-active.png b/TLM/TLM/Resources/MainMenu/Tool/ManualTL-fg-active.png
index f35561701..9fc2f2abc 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/ManualTL-fg-active.png and b/TLM/TLM/Resources/MainMenu/Tool/ManualTL-fg-active.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/ManualTL-fg-normal.png b/TLM/TLM/Resources/MainMenu/Tool/ManualTL-fg-normal.png
index f3edc4244..731b90515 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/ManualTL-fg-normal.png and b/TLM/TLM/Resources/MainMenu/Tool/ManualTL-fg-normal.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/ParkingRestrictions-fg-active.png b/TLM/TLM/Resources/MainMenu/Tool/ParkingRestrictions-fg-active.png
index aec1a6786..e22948988 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/ParkingRestrictions-fg-active.png and b/TLM/TLM/Resources/MainMenu/Tool/ParkingRestrictions-fg-active.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/ParkingRestrictions-fg-normal.png b/TLM/TLM/Resources/MainMenu/Tool/ParkingRestrictions-fg-normal.png
index 8d728a3a7..6cafc0cfd 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/ParkingRestrictions-fg-normal.png and b/TLM/TLM/Resources/MainMenu/Tool/ParkingRestrictions-fg-normal.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/PrioritySigns-fg-active.png b/TLM/TLM/Resources/MainMenu/Tool/PrioritySigns-fg-active.png
index bb5bddb0c..5fdf635fb 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/PrioritySigns-fg-active.png and b/TLM/TLM/Resources/MainMenu/Tool/PrioritySigns-fg-active.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/PrioritySigns-fg-normal.png b/TLM/TLM/Resources/MainMenu/Tool/PrioritySigns-fg-normal.png
index 6f58dab9e..2b84f7ddb 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/PrioritySigns-fg-normal.png and b/TLM/TLM/Resources/MainMenu/Tool/PrioritySigns-fg-normal.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/RoundButton-bg-active.png b/TLM/TLM/Resources/MainMenu/Tool/RoundButton-bg-active.png
index 0ebd41ef6..01ca6011f 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/RoundButton-bg-active.png and b/TLM/TLM/Resources/MainMenu/Tool/RoundButton-bg-active.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/RoundButton-bg-disabled.png b/TLM/TLM/Resources/MainMenu/Tool/RoundButton-bg-disabled.png
index 36d2db391..e8d9b9290 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/RoundButton-bg-disabled.png and b/TLM/TLM/Resources/MainMenu/Tool/RoundButton-bg-disabled.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/RoundButton-bg-hovered.png b/TLM/TLM/Resources/MainMenu/Tool/RoundButton-bg-hovered.png
index adc7eeb73..05224c576 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/RoundButton-bg-hovered.png and b/TLM/TLM/Resources/MainMenu/Tool/RoundButton-bg-hovered.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/RoundButton-bg-normal.png b/TLM/TLM/Resources/MainMenu/Tool/RoundButton-bg-normal.png
index 75e9e5b65..c212adfbd 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/RoundButton-bg-normal.png and b/TLM/TLM/Resources/MainMenu/Tool/RoundButton-bg-normal.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/RoutingDetector-fg-active.png b/TLM/TLM/Resources/MainMenu/Tool/RoutingDetector-fg-active.png
index 4039eb8c5..34f372dfc 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/RoutingDetector-fg-active.png and b/TLM/TLM/Resources/MainMenu/Tool/RoutingDetector-fg-active.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/RoutingDetector-fg-normal.png b/TLM/TLM/Resources/MainMenu/Tool/RoutingDetector-fg-normal.png
index 4039eb8c5..b62774757 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/RoutingDetector-fg-normal.png and b/TLM/TLM/Resources/MainMenu/Tool/RoutingDetector-fg-normal.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/SpeedLimits-fg-active.png b/TLM/TLM/Resources/MainMenu/Tool/SpeedLimits-fg-active.png
index e3d0e5dab..5cb9f831d 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/SpeedLimits-fg-active.png and b/TLM/TLM/Resources/MainMenu/Tool/SpeedLimits-fg-active.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/SpeedLimits-fg-normal.png b/TLM/TLM/Resources/MainMenu/Tool/SpeedLimits-fg-normal.png
index 632e4a673..c16532e9a 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/SpeedLimits-fg-normal.png and b/TLM/TLM/Resources/MainMenu/Tool/SpeedLimits-fg-normal.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/TimedTL-fg-active.png b/TLM/TLM/Resources/MainMenu/Tool/TimedTL-fg-active.png
index c17d4df28..9a67f80dd 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/TimedTL-fg-active.png and b/TLM/TLM/Resources/MainMenu/Tool/TimedTL-fg-active.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/TimedTL-fg-normal.png b/TLM/TLM/Resources/MainMenu/Tool/TimedTL-fg-normal.png
index 8d22d41ef..299e56859 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/TimedTL-fg-normal.png and b/TLM/TLM/Resources/MainMenu/Tool/TimedTL-fg-normal.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/ToggleTL-fg-active.png b/TLM/TLM/Resources/MainMenu/Tool/ToggleTL-fg-active.png
index f1c4fa1ae..3c407a0ba 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/ToggleTL-fg-active.png and b/TLM/TLM/Resources/MainMenu/Tool/ToggleTL-fg-active.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/ToggleTL-fg-normal.png b/TLM/TLM/Resources/MainMenu/Tool/ToggleTL-fg-normal.png
index 5c73ccfbe..1d449b3d4 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/ToggleTL-fg-normal.png and b/TLM/TLM/Resources/MainMenu/Tool/ToggleTL-fg-normal.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/TrafficDespawning-fg-active.png b/TLM/TLM/Resources/MainMenu/Tool/TrafficDespawning-fg-active.png
index ef56979a9..f37456712 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/TrafficDespawning-fg-active.png and b/TLM/TLM/Resources/MainMenu/Tool/TrafficDespawning-fg-active.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/TrafficDespawning-fg-normal.png b/TLM/TLM/Resources/MainMenu/Tool/TrafficDespawning-fg-normal.png
index 426e25d9e..f62e16bbf 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/TrafficDespawning-fg-normal.png and b/TLM/TLM/Resources/MainMenu/Tool/TrafficDespawning-fg-normal.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/VehicleRestrictions-fg-active.png b/TLM/TLM/Resources/MainMenu/Tool/VehicleRestrictions-fg-active.png
index 9aa906afd..c4370ddce 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/VehicleRestrictions-fg-active.png and b/TLM/TLM/Resources/MainMenu/Tool/VehicleRestrictions-fg-active.png differ
diff --git a/TLM/TLM/Resources/MainMenu/Tool/VehicleRestrictions-fg-normal.png b/TLM/TLM/Resources/MainMenu/Tool/VehicleRestrictions-fg-normal.png
index 988d41519..244b7ea51 100644
Binary files a/TLM/TLM/Resources/MainMenu/Tool/VehicleRestrictions-fg-normal.png and b/TLM/TLM/Resources/MainMenu/Tool/VehicleRestrictions-fg-normal.png differ
diff --git a/TLM/TLM/Resources/RoadSelectionPanel/Clear-fg-disabled.png b/TLM/TLM/Resources/RoadSelectionPanel/Clear-fg-disabled.png
index 33a10fb32..dba3adbd4 100644
Binary files a/TLM/TLM/Resources/RoadSelectionPanel/Clear-fg-disabled.png and b/TLM/TLM/Resources/RoadSelectionPanel/Clear-fg-disabled.png differ
diff --git a/TLM/TLM/Resources/RoadSelectionPanel/Clear-fg-normal.png b/TLM/TLM/Resources/RoadSelectionPanel/Clear-fg-normal.png
index 681a27f03..8f319f38d 100644
Binary files a/TLM/TLM/Resources/RoadSelectionPanel/Clear-fg-normal.png and b/TLM/TLM/Resources/RoadSelectionPanel/Clear-fg-normal.png differ
diff --git a/TLM/TLM/Resources/RoadSelectionPanel/HighPriority_RHT-fg-disabled.png b/TLM/TLM/Resources/RoadSelectionPanel/HighPriority_RHT-fg-disabled.png
index f2d6aa9c0..d25dae856 100644
Binary files a/TLM/TLM/Resources/RoadSelectionPanel/HighPriority_RHT-fg-disabled.png and b/TLM/TLM/Resources/RoadSelectionPanel/HighPriority_RHT-fg-disabled.png differ
diff --git a/TLM/TLM/Resources/RoadSelectionPanel/HighPriority_RHT-fg-normal.png b/TLM/TLM/Resources/RoadSelectionPanel/HighPriority_RHT-fg-normal.png
index e96f59d08..63a151d85 100644
Binary files a/TLM/TLM/Resources/RoadSelectionPanel/HighPriority_RHT-fg-normal.png and b/TLM/TLM/Resources/RoadSelectionPanel/HighPriority_RHT-fg-normal.png differ
diff --git a/TLM/TLM/Resources/RoadSelectionPanel/RoundButton-bg-active.png b/TLM/TLM/Resources/RoadSelectionPanel/RoundButton-bg-active.png
index efcc9c49e..01ca6011f 100644
Binary files a/TLM/TLM/Resources/RoadSelectionPanel/RoundButton-bg-active.png and b/TLM/TLM/Resources/RoadSelectionPanel/RoundButton-bg-active.png differ
diff --git a/TLM/TLM/Resources/RoadSelectionPanel/RoundButton-bg-disabled.png b/TLM/TLM/Resources/RoadSelectionPanel/RoundButton-bg-disabled.png
index a194720e1..e8d9b9290 100644
Binary files a/TLM/TLM/Resources/RoadSelectionPanel/RoundButton-bg-disabled.png and b/TLM/TLM/Resources/RoadSelectionPanel/RoundButton-bg-disabled.png differ
diff --git a/TLM/TLM/Resources/RoadSelectionPanel/RoundButton-bg-hovered.png b/TLM/TLM/Resources/RoadSelectionPanel/RoundButton-bg-hovered.png
index 15a33b342..05224c576 100644
Binary files a/TLM/TLM/Resources/RoadSelectionPanel/RoundButton-bg-hovered.png and b/TLM/TLM/Resources/RoadSelectionPanel/RoundButton-bg-hovered.png differ
diff --git a/TLM/TLM/Resources/RoadSelectionPanel/RoundButton-bg-normal.png b/TLM/TLM/Resources/RoadSelectionPanel/RoundButton-bg-normal.png
index 9da7dc4e4..c212adfbd 100644
Binary files a/TLM/TLM/Resources/RoadSelectionPanel/RoundButton-bg-normal.png and b/TLM/TLM/Resources/RoadSelectionPanel/RoundButton-bg-normal.png differ
diff --git a/TLM/TLM/Resources/RoadSelectionPanel/Roundabout_RHT-fg-disabled.png b/TLM/TLM/Resources/RoadSelectionPanel/Roundabout_RHT-fg-disabled.png
index c2858aa55..9511b56d8 100644
Binary files a/TLM/TLM/Resources/RoadSelectionPanel/Roundabout_RHT-fg-disabled.png and b/TLM/TLM/Resources/RoadSelectionPanel/Roundabout_RHT-fg-disabled.png differ
diff --git a/TLM/TLM/Resources/RoadSelectionPanel/Roundabout_RHT-fg-normal.png b/TLM/TLM/Resources/RoadSelectionPanel/Roundabout_RHT-fg-normal.png
index 7f55b2098..cd3769531 100644
Binary files a/TLM/TLM/Resources/RoadSelectionPanel/Roundabout_RHT-fg-normal.png and b/TLM/TLM/Resources/RoadSelectionPanel/Roundabout_RHT-fg-normal.png differ
diff --git a/TLM/TLM/Resources/RoadSelectionPanel/Stop_RHT-fg-disabled.png b/TLM/TLM/Resources/RoadSelectionPanel/Stop_RHT-fg-disabled.png
index 6d255b8d8..d39deefed 100644
Binary files a/TLM/TLM/Resources/RoadSelectionPanel/Stop_RHT-fg-disabled.png and b/TLM/TLM/Resources/RoadSelectionPanel/Stop_RHT-fg-disabled.png differ
diff --git a/TLM/TLM/Resources/RoadSelectionPanel/Stop_RHT-fg-normal.png b/TLM/TLM/Resources/RoadSelectionPanel/Stop_RHT-fg-normal.png
index ce0d20d48..b3d20faa8 100644
Binary files a/TLM/TLM/Resources/RoadSelectionPanel/Stop_RHT-fg-normal.png and b/TLM/TLM/Resources/RoadSelectionPanel/Stop_RHT-fg-normal.png differ
diff --git a/TLM/TLM/Resources/RoadSelectionPanel/Yield_RHT-fg-disabled.png b/TLM/TLM/Resources/RoadSelectionPanel/Yield_RHT-fg-disabled.png
index 2590f08c4..23eebfb68 100644
Binary files a/TLM/TLM/Resources/RoadSelectionPanel/Yield_RHT-fg-disabled.png and b/TLM/TLM/Resources/RoadSelectionPanel/Yield_RHT-fg-disabled.png differ
diff --git a/TLM/TLM/Resources/RoadSelectionPanel/Yield_RHT-fg-normal.png b/TLM/TLM/Resources/RoadSelectionPanel/Yield_RHT-fg-normal.png
index 31e5396c9..ee9858d9f 100644
Binary files a/TLM/TLM/Resources/RoadSelectionPanel/Yield_RHT-fg-normal.png and b/TLM/TLM/Resources/RoadSelectionPanel/Yield_RHT-fg-normal.png differ
diff --git a/TLM/TLM/U/UBuilder.cs b/TLM/TLM/U/UBuilder.cs
index ad354264b..f4632355b 100644
--- a/TLM/TLM/U/UBuilder.cs
+++ b/TLM/TLM/U/UBuilder.cs
@@ -89,6 +89,7 @@ public TButton Button<TButton>(UIComponent parent,
         public TLabel Label<TLabel>(UIComponent parent,
                                     string t,
                                     UStackMode stack = UStackMode.ToTheRight,
+                                    float spacing = 0f,
                                     bool processMarkup = false)
             where TLabel : UILabel, ISmartSizableControl {
             var label = parent.AddUIComponent(typeof(TLabel)) as TLabel;
@@ -110,7 +111,7 @@ public ULabel Label_(UIComponent parent,
                              string t,
                              UStackMode stack = UStackMode.ToTheRight,
                              bool processMarkup = false) {
-            return Label<ULabel>(parent, t, stack, processMarkup);
+            return Label<ULabel>(parent, t, stack, 0f, processMarkup);
         }
 
         public TPanel Panel<TPanel>(UIComponent parent,
diff --git a/TLM/TLM/UI/MainMenu/MainMenuWindow.cs b/TLM/TLM/UI/MainMenu/MainMenuWindow.cs
index 173443ada..60d0c3353 100644
--- a/TLM/TLM/UI/MainMenu/MainMenuWindow.cs
+++ b/TLM/TLM/UI/MainMenu/MainMenuWindow.cs
@@ -258,10 +258,12 @@ private UILabel SetupControls_TopRow(UBuilder builder) {
             //-------------------------------------------------------
             // Mod name/version label (also serves as a drag handle)
             //-------------------------------------------------------
+            string titleText = "Traffic Manager : PE";
             UILabel versionLabel = builder.Label<U.ULabel>(
                 parent: this,
-                t: TrafficManagerMod.ModName,
-                stack: UStackMode.Below);
+                t: titleText,
+                stack: UStackMode.Below,
+                spacing: 6f);
             this.VersionLabel = versionLabel;
 
             //-------------------------------------------------------
@@ -271,7 +273,7 @@ private UILabel SetupControls_TopRow(UBuilder builder) {
                 parent: this,
                 text: string.Empty,
                 tooltip: Translation.Menu.Get("Tooltip:Toggle onscreen display panel"),
-                size: new Vector2(18f, 18f),
+                size: new Vector2(16f, 16f),
                 stack: UStackMode.None);
 
             this.toggleOsdButton_ = osdToggle;
@@ -296,7 +298,7 @@ private UILabel SetupControls_TopRow(UBuilder builder) {
                     r.Control.isVisible = true; // not sure why its hidden on create? TODO
                     r.Stack(
                         mode: UStackMode.ToTheRight,
-                        spacing: UConst.UIPADDING * 3f,
+                        spacing: toolPanel.size.x + rightPanel.size.x - versionLabel.size.x - 9f,
                         stackRef: versionLabel);
                 });
 
@@ -395,7 +397,8 @@ public override void OnBeforeResizerUpdate() {
         /// <summary>Called by UResizer for every control to be 'resized'.</summary>
         public override void OnAfterResizerUpdate() {
             if (this.DragHandle != null) {
-                this.DragHandle.size = this.VersionLabel.size;
+                this.DragHandle.size = new Vector2(toolPanel.size.x + rightPanel.size.x - 9f,
+                    VersionLabel.size.y);
 
                 // Push the window back into screen if the label/draghandle are partially offscreen
                 U.UIUtil.ClampToScreen(