diff --git a/HellionChat/Ui/ChatLogWindow.cs b/HellionChat/Ui/ChatLogWindow.cs
index 9a83e00..65f635a 100644
--- a/HellionChat/Ui/ChatLogWindow.cs
+++ b/HellionChat/Ui/ChatLogWindow.cs
@@ -1541,7 +1541,7 @@ public sealed class ChatLogWindow : Window
                     using (ImRaii.PushColor(ImGuiCol.Text, ColourUtil.RgbaToAbgr(iconColor)))
                     using (Plugin.FontManager.FontAwesome.Push())
                     {
-                        clicked = ImGui.Button($"{icon.ToIconString()}##sidebar-tab-{tabI}", new Vector2(36f, 32f));
+                        clicked = ImGui.Button($"{icon.ToIconString()}##sidebar-tab-{tabI}", new Vector2(36f, ImGui.GetFrameHeight()));
                     }
 
                     if (isCurrentTab)
diff --git a/HellionChat/Ui/StatusBar.cs b/HellionChat/Ui/StatusBar.cs
index 77a6811..595d030 100644
--- a/HellionChat/Ui/StatusBar.cs
+++ b/HellionChat/Ui/StatusBar.cs
@@ -99,8 +99,6 @@ internal sealed class StatusBar
 
         ImGui.Dummy(new Vector2(0, 2)); // BorderTop-Spacing
 
-        using var group = ImRaii.Group();
-
         // Slot 1: Active-Channel-Indicator
         var inputCh = plugin.CurrentTab?.CurrentChannel?.Channel ?? InputChannel.Invalid;
         var hasChannel = inputCh != InputChannel.Invalid;
@@ -145,8 +143,8 @@ internal sealed class StatusBar
         // Slot 5: Version (rechtsbündig, muted)
         var versionText = $"v{Plugin.Interface.Manifest.AssemblyVersion} · Hellion";
         var versionWidth = ImGui.CalcTextSize(versionText).X;
-        var rightCursor = ImGui.GetWindowSize().X - versionWidth - ImGui.GetStyle().WindowPadding.X;
-        ImGui.SameLine(rightCursor);
+        var contentRegionMax = ImGui.GetContentRegionMax().X;
+        ImGui.SameLine(contentRegionMax - versionWidth);
         using (ImRaii.PushColor(ImGuiCol.Text, ColourUtil.RgbaToAbgr(theme.Colors.TextMuted)))
         {
             ImGui.TextUnformatted(versionText);