diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
index 73045a3b9b..cfa2ea3998 100644
--- a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
+++ b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
@@ -1,6 +1,7 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="using:UniGetUI.Avalonia.Views.Controls">
+        xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
+        xmlns:primitives="using:Avalonia.Controls.Primitives">
 
     <Styles.Resources>
         <ResourceDictionary>
@@ -53,7 +54,29 @@
                         <GradientStop Offset="0" Color="#0F000000"/>
                         <GradientStop Offset="1" Color="#29000000"/>
                     </LinearGradientBrush>
+                    <SolidColorBrush x:Key="ControlFillColorDefaultBrush" Color="#B3FFFFFF"/>
+                    <SolidColorBrush x:Key="ControlFillColorSecondaryBrush" Color="#80F9F9F9"/>
+                    <SolidColorBrush x:Key="ControlFillColorTertiaryBrush" Color="#4DF9F9F9"/>
+                    <SolidColorBrush x:Key="ControlFillColorDisabledBrush" Color="#4DF9F9F9"/>
+                    <SolidColorBrush x:Key="ControlStrokeColorDefaultBrush" Color="#0F000000"/>
+                    <SolidColorBrush x:Key="ControlStrokeColorSecondaryBrush" Color="#29000000"/>
                     <SolidColorBrush x:Key="TextFillColorDisabledBrush"  Color="#5C000000"/>
+                    <StaticResource x:Key="ButtonBackground" ResourceKey="ControlFillColorDefaultBrush"/>
+                    <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="ControlFillColorSecondaryBrush"/>
+                    <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="ControlFillColorTertiaryBrush"/>
+                    <StaticResource x:Key="ButtonBackgroundDisabled" ResourceKey="ControlFillColorDisabledBrush"/>
+                    <StaticResource x:Key="ButtonForeground" ResourceKey="TextFillColorPrimaryBrush"/>
+                    <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush"/>
+                    <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="TextFillColorSecondaryBrush"/>
+                    <StaticResource x:Key="ButtonForegroundDisabled" ResourceKey="TextFillColorDisabledBrush"/>
+                    <StaticResource x:Key="SplitButtonBackground" ResourceKey="ControlFillColorDefaultBrush"/>
+                    <StaticResource x:Key="SplitButtonBackgroundPointerOver" ResourceKey="ControlFillColorSecondaryBrush"/>
+                    <StaticResource x:Key="SplitButtonBackgroundPressed" ResourceKey="ControlFillColorTertiaryBrush"/>
+                    <StaticResource x:Key="SplitButtonBackgroundDisabled" ResourceKey="ControlFillColorDisabledBrush"/>
+                    <StaticResource x:Key="SplitButtonForeground" ResourceKey="TextFillColorPrimaryBrush"/>
+                    <StaticResource x:Key="SplitButtonForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush"/>
+                    <StaticResource x:Key="SplitButtonForegroundPressed" ResourceKey="TextFillColorSecondaryBrush"/>
+                    <StaticResource x:Key="SplitButtonForegroundDisabled" ResourceKey="TextFillColorDisabledBrush"/>
                     <SolidColorBrush x:Key="TextFillColorInverseBrush"   Color="#FFFFFFFF"/>
                     <!-- Opaque WinUI menu surface and low-contrast divider. -->
                     <SolidColorBrush x:Key="MenuSurfaceBrush"            Color="#FFFFFFFF"/>
@@ -77,7 +100,10 @@
                     <SolidColorBrush x:Key="SettingsCardBackground"      Color="#B3FFFFFF"/>
                     <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#ECECEC"/>
                     <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#F6F6F6"/>
-                    <StaticResource x:Key="SecondaryActionBorderBrush" ResourceKey="ControlElevationBorderBrush"/>
+                    <!-- Secondary actions keep a 1-DIP edge, but use WinUI's low-contrast
+                         control stroke here. The full elevation gradient reads too strongly in
+                         Avalonia on these compact settings buttons. -->
+                    <StaticResource x:Key="SecondaryActionBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush"/>
                     <Thickness x:Key="SecondaryActionBorderThickness">1</Thickness>
                     <!-- WinUI dropdown controls use the same control/card fill as settings actions. -->
                     <StaticResource x:Key="ComboBoxBackground" ResourceKey="SettingsCardBackground"/>
@@ -214,7 +240,34 @@
                     <SolidColorBrush x:Key="InstallOptionsTabPressedBackground" Color="#202020"/>
                     <SolidColorBrush x:Key="InstallOptionsTabSelectedHoverBackground" Color="#323232"/>
                     <SolidColorBrush x:Key="InstallOptionsTabSelectedPressedBackground" Color="#292929"/>
+                    <SolidColorBrush x:Key="ControlFillColorDefaultBrush" Color="#0FFFFFFF"/>
+                    <SolidColorBrush x:Key="ControlFillColorSecondaryBrush" Color="#15FFFFFF"/>
+                    <SolidColorBrush x:Key="ControlFillColorTertiaryBrush" Color="#08FFFFFF"/>
+                    <SolidColorBrush x:Key="ControlFillColorDisabledBrush" Color="#0BFFFFFF"/>
+                    <SolidColorBrush x:Key="ControlStrokeColorDefaultBrush" Color="#12FFFFFF"/>
+                    <SolidColorBrush x:Key="ControlStrokeColorSecondaryBrush" Color="#18FFFFFF"/>
+                    <LinearGradientBrush x:Key="ControlElevationBorderBrush"
+                                         StartPoint="0%,0%" EndPoint="0%,100%">
+                        <GradientStop Offset="0" Color="#18FFFFFF"/>
+                        <GradientStop Offset="1" Color="#12FFFFFF"/>
+                    </LinearGradientBrush>
                     <SolidColorBrush x:Key="TextFillColorDisabledBrush"  Color="#5DFFFFFF"/>
+                    <StaticResource x:Key="ButtonBackground" ResourceKey="ControlFillColorDefaultBrush"/>
+                    <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="ControlFillColorSecondaryBrush"/>
+                    <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="ControlFillColorTertiaryBrush"/>
+                    <StaticResource x:Key="ButtonBackgroundDisabled" ResourceKey="ControlFillColorDisabledBrush"/>
+                    <StaticResource x:Key="ButtonForeground" ResourceKey="TextFillColorPrimaryBrush"/>
+                    <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush"/>
+                    <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="TextFillColorSecondaryBrush"/>
+                    <StaticResource x:Key="ButtonForegroundDisabled" ResourceKey="TextFillColorDisabledBrush"/>
+                    <StaticResource x:Key="SplitButtonBackground" ResourceKey="ControlFillColorDefaultBrush"/>
+                    <StaticResource x:Key="SplitButtonBackgroundPointerOver" ResourceKey="ControlFillColorSecondaryBrush"/>
+                    <StaticResource x:Key="SplitButtonBackgroundPressed" ResourceKey="ControlFillColorTertiaryBrush"/>
+                    <StaticResource x:Key="SplitButtonBackgroundDisabled" ResourceKey="ControlFillColorDisabledBrush"/>
+                    <StaticResource x:Key="SplitButtonForeground" ResourceKey="TextFillColorPrimaryBrush"/>
+                    <StaticResource x:Key="SplitButtonForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush"/>
+                    <StaticResource x:Key="SplitButtonForegroundPressed" ResourceKey="TextFillColorSecondaryBrush"/>
+                    <StaticResource x:Key="SplitButtonForegroundDisabled" ResourceKey="TextFillColorDisabledBrush"/>
                     <SolidColorBrush x:Key="TextFillColorInverseBrush"   Color="#E4000000"/>
                     <!-- WinUI's dark flyout surface is an opaque #2C2C2C. -->
                     <SolidColorBrush x:Key="MenuSurfaceBrush"            Color="#FF2C2C2C"/>
@@ -238,8 +291,8 @@
                     <SolidColorBrush x:Key="SettingsCardBackground"      Color="#0DFFFFFF"/>
                     <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#19000000"/>
                     <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#323232"/>
-                    <SolidColorBrush x:Key="SecondaryActionBorderBrush"  Color="Transparent"/>
-                    <Thickness x:Key="SecondaryActionBorderThickness">0</Thickness>
+                    <StaticResource x:Key="SecondaryActionBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush"/>
+                    <Thickness x:Key="SecondaryActionBorderThickness">1</Thickness>
                     <!-- WinUI dropdown controls use the same control/card fill as settings actions. -->
                     <StaticResource x:Key="ComboBoxBackground" ResourceKey="SettingsCardBackground"/>
                     <StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="SettingsCardBackground"/>
@@ -314,6 +367,22 @@
 
     <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
 
+    <!-- Avalonia's Fluent focus adorner is square by default. Keep its theme-aware
+         inner/outer brushes and thicknesses, but match WinUI's rounded focus geometry. -->
+    <Style Selector="primitives|AdornerLayer">
+        <Setter Property="DefaultFocusAdorner">
+            <FocusAdornerTemplate>
+                <Border BorderBrush="{DynamicResource SystemControlFocusVisualPrimaryBrush}"
+                        BorderThickness="2"
+                        CornerRadius="6">
+                    <Border BorderBrush="{DynamicResource SystemControlFocusVisualSecondaryBrush}"
+                            BorderThickness="1"
+                            CornerRadius="4"/>
+                </Border>
+            </FocusAdornerTemplate>
+        </Setter>
+    </Style>
+
     <Style Selector="TextBlock">
         <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
     </Style>
@@ -338,7 +407,7 @@
          automatically, making future settings actions consistent by default. -->
     <Style Selector="Button.secondary-action">
         <Setter Property="CornerRadius" Value="4"/>
-        <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}"/>
+        <Setter Property="Background" Value="{DynamicResource ControlFillColorDefaultBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource SecondaryActionBorderBrush}"/>
         <Setter Property="BorderThickness" Value="{DynamicResource SecondaryActionBorderThickness}"/>
         <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
@@ -346,10 +415,11 @@
         <Setter Property="VerticalContentAlignment" Value="Center"/>
     </Style>
     <Style Selector="Button.secondary-action:pointerover">
-        <Setter Property="Background" Value="{DynamicResource SettingsCardHoverBackground}"/>
+        <Setter Property="Background" Value="{DynamicResource ControlFillColorSecondaryBrush}"/>
     </Style>
     <Style Selector="Button.secondary-action:pressed">
-        <Setter Property="Background" Value="{DynamicResource SubtleFillColorTertiaryBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource ControlFillColorTertiaryBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextFillColorSecondaryBrush}"/>
     </Style>
 
     <!-- Shared trigger used by button-hosted dropdowns. It intentionally does not target
@@ -357,11 +427,18 @@
     <Style Selector="Button.dropdown-trigger">
         <Setter Property="Padding" Value="10,6"/>
         <Setter Property="CornerRadius" Value="4"/>
-        <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}"/>
-        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="Background" Value="{DynamicResource ControlFillColorDefaultBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryActionBorderBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
     </Style>
+    <Style Selector="Button.dropdown-trigger:pointerover">
+        <Setter Property="Background" Value="{DynamicResource ControlFillColorSecondaryBrush}"/>
+    </Style>
+    <Style Selector="Button.dropdown-trigger:pressed">
+        <Setter Property="Background" Value="{DynamicResource ControlFillColorTertiaryBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextFillColorSecondaryBrush}"/>
+    </Style>
     <Style Selector="Button.dropdown-trigger.wide">
         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
     </Style>
@@ -444,6 +521,24 @@
         <Setter Property="Fill" Value="{DynamicResource TextOnAccentFillColorDisabledBrush}"/>
     </Style>
 
+    <!-- DataGrid check boxes are 20 DIPs visually but retain the theme's 32-DIP input
+         height. Inset the adorner vertically and let it sit two DIPs outside the box so
+         keyboard focus follows the visible selector instead of the layout slot. -->
+    <Style Selector="CheckBox.package-list-selector">
+        <Setter Property="FocusAdorner">
+            <FocusAdornerTemplate>
+                <Border Margin="-2,4"
+                        BorderBrush="{DynamicResource SystemControlFocusVisualPrimaryBrush}"
+                        BorderThickness="2"
+                        CornerRadius="6">
+                    <Border BorderBrush="{DynamicResource SystemControlFocusVisualSecondaryBrush}"
+                            BorderThickness="1"
+                            CornerRadius="4"/>
+                </Border>
+            </FocusAdornerTemplate>
+        </Setter>
+    </Style>
+
     <Style Selector="RadioButton:checked /template/ Ellipse#CheckOuterEllipse">
         <Setter Property="Fill" Value="{DynamicResource AccentFillColorDefaultBrush}"/>
         <Setter Property="Stroke" Value="{DynamicResource AccentFillColorDefaultBrush}"/>
@@ -610,6 +705,8 @@
          apply. -->
     <Style Selector="ListBoxItem.nav-item">
         <Setter Property="Margin" Value="0,2"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
         <Setter Property="Template">
             <ControlTemplate>
                 <ContentPresenter Name="ContentHost"
@@ -670,11 +767,17 @@
     <Style Selector="ListBoxItem.segment-item:pointerover /template/ ContentPresenter#ContentHost">
         <Setter Property="Background" Value="{DynamicResource SubtleFillColorSecondaryBrush}"/>
     </Style>
+    <Style Selector="ListBoxItem.segment-item:pressed /template/ ContentPresenter#ContentHost">
+        <Setter Property="Background" Value="{DynamicResource ControlFillColorTertiaryBrush}"/>
+    </Style>
     <Style Selector="ListBoxItem.segment-item:selected /template/ ContentPresenter#ContentHost">
-        <Setter Property="Background" Value="{DynamicResource SubtleFillColorSecondaryBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource ControlFillColorDefaultBrush}"/>
     </Style>
     <Style Selector="ListBoxItem.segment-item:selected:pointerover /template/ ContentPresenter#ContentHost">
-        <Setter Property="Background" Value="{DynamicResource SubtleFillColorTertiaryBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource ControlFillColorSecondaryBrush}"/>
+    </Style>
+    <Style Selector="ListBoxItem.segment-item:selected:pressed /template/ ContentPresenter#ContentHost">
+        <Setter Property="Background" Value="{DynamicResource ControlFillColorTertiaryBrush}"/>
     </Style>
     <Style Selector="ListBoxItem.segment-item:selected /template/ Border#SelectionPill">
         <Setter Property="Opacity" Value="1"/>
@@ -748,7 +851,7 @@
                     <ResourceDictionary x:Key="Light">
                         <SolidColorBrush x:Key="ToggleButtonBackgroundChecked"             Color="#FBFBFB"/>
                         <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver"  Color="#F6F6F6"/>
-                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed"      Color="#EDEDED"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed"      Color="#F5F5F5"/>
                         <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedDisabled"     Color="#FBFBFB"/>
                         <SolidColorBrush x:Key="ToggleButtonBorderBrushChecked"            Color="#ECECEC"/>
                         <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPointerOver" Color="#ECECEC"/>
@@ -761,7 +864,7 @@
                     <ResourceDictionary x:Key="Dark">
                         <SolidColorBrush x:Key="ToggleButtonBackgroundChecked"             Color="#2D2D2D"/>
                         <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver"  Color="#323232"/>
-                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed"      Color="#3C3C3C"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed"      Color="#282828"/>
                         <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedDisabled"     Color="#2D2D2D"/>
                         <SolidColorBrush x:Key="ToggleButtonBorderBrushChecked"            Color="#393939"/>
                         <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPointerOver" Color="#393939"/>
@@ -783,11 +886,11 @@
                 <ResourceDictionary.ThemeDictionaries>
                     <ResourceDictionary x:Key="Light">
                         <SolidColorBrush x:Key="ToggleButtonBackground"                    Color="Transparent"/>
-                        <SolidColorBrush x:Key="ToggleButtonBackgroundPointerOver"         Color="#0F000000"/>
-                        <SolidColorBrush x:Key="ToggleButtonBackgroundPressed"             Color="#1A000000"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundPointerOver"         Color="#09000000"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundPressed"             Color="#06000000"/>
                         <SolidColorBrush x:Key="ToggleButtonBackgroundChecked"             Color="Transparent"/>
-                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver"  Color="#0F000000"/>
-                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed"      Color="#1A000000"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver"  Color="#09000000"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed"      Color="#06000000"/>
                         <SolidColorBrush x:Key="ToggleButtonBorderBrush"                   Color="Transparent"/>
                         <SolidColorBrush x:Key="ToggleButtonBorderBrushPointerOver"        Color="Transparent"/>
                         <SolidColorBrush x:Key="ToggleButtonBorderBrushPressed"            Color="Transparent"/>
@@ -800,11 +903,11 @@
                     </ResourceDictionary>
                     <ResourceDictionary x:Key="Dark">
                         <SolidColorBrush x:Key="ToggleButtonBackground"                    Color="Transparent"/>
-                        <SolidColorBrush x:Key="ToggleButtonBackgroundPointerOver"         Color="#15FFFFFF"/>
-                        <SolidColorBrush x:Key="ToggleButtonBackgroundPressed"             Color="#20FFFFFF"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundPointerOver"         Color="#0FFFFFFF"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundPressed"             Color="#0AFFFFFF"/>
                         <SolidColorBrush x:Key="ToggleButtonBackgroundChecked"             Color="Transparent"/>
-                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver"  Color="#15FFFFFF"/>
-                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed"      Color="#20FFFFFF"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver"  Color="#0FFFFFFF"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed"      Color="#0AFFFFFF"/>
                         <SolidColorBrush x:Key="ToggleButtonBorderBrush"                   Color="Transparent"/>
                         <SolidColorBrush x:Key="ToggleButtonBorderBrushPointerOver"        Color="Transparent"/>
                         <SolidColorBrush x:Key="ToggleButtonBorderBrushPressed"            Color="Transparent"/>
diff --git a/src/UniGetUI.Avalonia/Infrastructure/OperationHistoryLogDialog.cs b/src/UniGetUI.Avalonia/Infrastructure/OperationHistoryLogDialog.cs
index a76be453dd..33d559b408 100644
--- a/src/UniGetUI.Avalonia/Infrastructure/OperationHistoryLogDialog.cs
+++ b/src/UniGetUI.Avalonia/Infrastructure/OperationHistoryLogDialog.cs
@@ -4,6 +4,7 @@
 using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Platform.Storage;
+using Avalonia.Styling;
 using UniGetUI.Avalonia.ViewModels.Pages.LogPages;
 using UniGetUI.Avalonia.Views;
 using UniGetUI.Avalonia.Views.Controls;
@@ -21,9 +22,9 @@ public static async Task ShowAsync(OperationHistoryRecord record)
         if (MainWindow.Instance is not { } owner)
             return;
 
-        bool dark = ThemeHelper.IsDark;
-        var defaultBrush = new SolidColorBrush(dark ? Color.FromRgb(250, 250, 250) : Color.FromRgb(0, 0, 0));
-        var errorBrush = new SolidColorBrush(dark ? Color.FromRgb(255, 80, 80) : Color.FromRgb(205, 0, 0));
+        ThemeVariant theme = ThemeHelper.Variant;
+        IBrush defaultBrush = LookupBrush("TextFillColorPrimaryBrush", theme, Brushes.White);
+        IBrush errorBrush = LookupBrush("StatusErrorForeground", theme, Brushes.Red);
 
         var lines = record.Output
             .Select(l => new LogLineItem(l.Text.Replace("\r", "").Replace("\n", ""),
@@ -45,7 +46,8 @@ public static async Task ShowAsync(OperationHistoryRecord record)
             MinWidth = 460,
             MinHeight = 300,
             Title = CoreTools.Translate("Operation log") + (target.Length > 0 ? $" — {target}" : ""),
-            Background = Application.Current?.FindResource("AppDialogBackground") as IBrush,
+            TitleMargin = new Thickness(24, 0, 0, 0),
+            Background = LookupBrush("AppDialogBackground", theme, Brushes.Transparent),
         };
 
         var copyButton = CreateDialogButton(CoreTools.Translate("Copy to clipboard"));
@@ -69,6 +71,7 @@ public static async Task ShowAsync(OperationHistoryRecord record)
         };
 
         var closeButton = CreateDialogButton(CoreTools.Translate("Close"), 100);
+        closeButton.Classes.Remove("secondary-action");
         closeButton.Classes.Add("accent");
         closeButton.Click += (_, _) => dialog.Close();
 
@@ -84,7 +87,7 @@ public static async Task ShowAsync(OperationHistoryRecord record)
         {
             CornerRadius = new CornerRadius(8),
             ClipToBounds = true,
-            Background = Application.Current?.FindResource("AppDialogDarkBackground") as IBrush,
+            Background = LookupBrush("AppWindowBackground", theme, Brushes.Transparent),
             Child = editor,
         };
         Grid.SetRow(editorBorder, 1);
@@ -96,19 +99,41 @@ public static async Task ShowAsync(OperationHistoryRecord record)
             HorizontalAlignment = HorizontalAlignment.Right,
             Children = { closeButton },
         };
-        Grid.SetRow(footer, 2);
 
-        dialog.Content = new Grid
+        var body = new Grid
         {
-            Margin = new Thickness(16),
-            RowDefinitions = new RowDefinitions("Auto,*,Auto"),
+            Margin = new Thickness(24, 0, 24, 24),
+            RowDefinitions = new RowDefinitions("Auto,*"),
             RowSpacing = 10,
-            Children = { toolbar, editorBorder, footer },
+            Children = { toolbar, editorBorder },
+        };
+        Grid.SetRow(body, 0);
+
+        var footerSurface = new Border
+        {
+            Background = LookupBrush("AppWindowBackground", theme, Brushes.Transparent),
+            Padding = new Thickness(24),
+            Child = footer,
+        };
+        Grid.SetRow(footerSurface, 1);
+
+        dialog.Content = new Grid
+        {
+            RowDefinitions = new RowDefinitions("*,Auto"),
+            Children = { body, footerSurface },
         };
 
         await dialog.ShowDialog(owner);
     }
 
+    private static IBrush LookupBrush(string key, ThemeVariant theme, IBrush fallback)
+    {
+        if (Application.Current?.TryGetResource(key, theme, out var resource) == true &&
+            resource is IBrush brush)
+            return brush;
+        return fallback;
+    }
+
     private static Button CreateDialogButton(string content, double minWidth = 0) => new()
     {
         Content = content,
@@ -117,6 +142,7 @@ public static async Task ShowAsync(OperationHistoryRecord record)
         Padding = new Thickness(11, 5, 11, 6),
         CornerRadius = new CornerRadius(4),
         FontSize = 14,
+        Classes = { "secondary-action" },
         HorizontalContentAlignment = HorizontalAlignment.Center,
         VerticalContentAlignment = VerticalAlignment.Center,
     };
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/OperationFailedDialog.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/OperationFailedDialog.axaml
index af6f1eb7fb..174e386b3a 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/OperationFailedDialog.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/OperationFailedDialog.axaml
@@ -4,16 +4,56 @@
         xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
         xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
         x:Class="UniGetUI.Avalonia.Views.DialogPages.OperationFailedDialog"
-        MaxWidth="800"
+        MaxWidth="850"
         MinWidth="500"
-        MaxHeight="550"
+        MaxHeight="490"
         MinHeight="300"
+        TitleMargin="24,0,0,0"
         Background="{DynamicResource AppDialogBackground}">
 
-    <Grid RowDefinitions="Auto,*,Auto">
+    <dialogs:ImmersiveDialog.Styles>
+        <!-- Scoped to this dialog family: these do not alter global Button resources. -->
+        <Style Selector="Button.operation-dialog-action">
+            <Setter Property="Height" Value="32"/>
+            <Setter Property="MinWidth" Value="0"/>
+            <Setter Property="CornerRadius" Value="4"/>
+            <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource SecondaryActionBorderBrush}"/>
+            <Setter Property="BorderThickness" Value="{DynamicResource SecondaryActionBorderThickness}"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+        </Style>
+        <Style Selector="Button.operation-dialog-action:pointerover">
+            <Setter Property="Background" Value="{DynamicResource SettingsCardHoverBackground}"/>
+        </Style>
+        <Style Selector="Button.operation-dialog-action:pressed">
+            <Setter Property="Background" Value="{DynamicResource SubtleFillColorTertiaryBrush}"/>
+            <Setter Property="Foreground" Value="{DynamicResource TextFillColorSecondaryBrush}"/>
+        </Style>
+        <Style Selector="SplitButton.operation-dialog-action">
+            <Setter Property="Height" Value="32"/>
+            <Setter Property="MinWidth" Value="0"/>
+            <Setter Property="CornerRadius" Value="4"/>
+            <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource SecondaryActionBorderBrush}"/>
+            <Setter Property="BorderThickness" Value="{DynamicResource SecondaryActionBorderThickness}"/>
+            <Setter Property="FontSize" Value="14"/>
+        </Style>
+        <Style Selector="SplitButton.operation-dialog-action:pointerover">
+            <Setter Property="Background" Value="{DynamicResource SettingsCardHoverBackground}"/>
+        </Style>
+        <Style Selector="SplitButton.operation-dialog-action:pressed">
+            <Setter Property="Background" Value="{DynamicResource SubtleFillColorTertiaryBrush}"/>
+            <Setter Property="Foreground" Value="{DynamicResource TextFillColorSecondaryBrush}"/>
+        </Style>
+    </dialogs:ImmersiveDialog.Styles>
+
+    <Grid RowDefinitions="Auto,*,Auto"
+          Background="{DynamicResource AppDialogBackground}">
 
         <!-- ── Header ── -->
-        <Border Grid.Row="0" Padding="16,14,16,10">
+        <Border Grid.Row="0" Padding="24,8,24,12">
             <TextBlock x:Name="HeaderContent"
                        TextWrapping="WrapWithOverflow"
                        FontSize="14"/>
@@ -21,19 +61,19 @@
 
         <!-- ── Colored output log ── -->
         <Border Grid.Row="1"
-                Margin="8,0,8,8"
+                Margin="24,0,24,24"
                 CornerRadius="6"
                 ClipToBounds="True"
-                Background="{DynamicResource AppDialogDarkBackground}">
+                Background="{DynamicResource AppWindowBackground}">
             <controls:LogTextEditor x:Name="OutputText"
                                     automation:AutomationProperties.AccessibilityView="Raw"/>
         </Border>
 
         <!-- ── Footer buttons ── -->
         <Border Grid.Row="2"
-                BorderThickness="0,1,0,0"
-                Padding="16,10">
+                Background="{DynamicResource AppWindowBackground}">
             <Grid x:Name="ButtonsLayout"
+                  Margin="24"
                   ColumnSpacing="8">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/OperationFailedDialog.axaml.cs b/src/UniGetUI.Avalonia/Views/DialogPages/OperationFailedDialog.axaml.cs
index f6bba12f6c..d5db85b6be 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/OperationFailedDialog.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/OperationFailedDialog.axaml.cs
@@ -37,6 +37,7 @@ public OperationFailedDialog(AbstractOperation operation)
             Content = CoreTools.Translate("Close"),
             HorizontalAlignment = HorizontalAlignment.Stretch,
             HorizontalContentAlignment = HorizontalAlignment.Center,
+            Classes = { "operation-dialog-action" },
         };
         closeButton.Click += (_, _) => Close();
 
@@ -149,6 +150,7 @@ private Control SimpleRetryButton(AbstractOperation operation, string retryMode,
             Content = label,
             HorizontalAlignment = HorizontalAlignment.Stretch,
             HorizontalContentAlignment = HorizontalAlignment.Center,
+            Classes = { "operation-dialog-action" },
         };
         button.Click += (_, _) =>
         {
@@ -170,6 +172,7 @@ string label
             Content = label,
             HorizontalAlignment = HorizontalAlignment.Stretch,
             HorizontalContentAlignment = HorizontalAlignment.Center,
+            Classes = { "operation-dialog-action" },
         };
         splitButton.Click += (_, _) =>
         {
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.axaml
index 4f7399e96e..3df604d694 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.axaml
@@ -6,17 +6,18 @@
         xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
         x:Class="UniGetUI.Avalonia.Views.DialogPages.OperationOutputWindow"
         x:DataType="vm:OperationOutputViewModel"
-        MaxWidth="700"
-        MinWidth="400"
-        MaxHeight="500"
+        MaxWidth="780"
+        MinWidth="460"
+        MaxHeight="520"
         MinHeight="300"
+        TitleMargin="24,0,0,0"
         Background="{DynamicResource AppDialogBackground}"
         Title="{Binding Title}">
 
-    <Border Margin="8"
+    <Border Margin="24,0,24,24"
             CornerRadius="6"
             ClipToBounds="True"
-            Background="{DynamicResource AppDialogDarkBackground}">
+            Background="{DynamicResource AppWindowBackground}">
         <controls:LogTextEditor x:Name="OutputText"
                                 automation:AutomationProperties.Name="{Binding Title}"
                                 automation:AutomationProperties.AccessibilityView="Raw"/>
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml
index f2c1e3cea4..f707015285 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml
@@ -71,13 +71,6 @@
             <Setter Property="HorizontalContentAlignment" Value="Center"/>
             <Setter Property="VerticalContentAlignment" Value="Center"/>
         </Style>
-        <Style Selector="Button.action-main:pointerover /template/ ContentPresenter">
-            <Setter Property="Background" Value="{DynamicResource PackageActionHoverBackground}"/>
-        </Style>
-        <Style Selector="Button.action-chevron:pointerover /template/ ContentPresenter">
-            <Setter Property="Background" Value="{DynamicResource PackageActionHoverBackground}"/>
-        </Style>
-
         <!-- Screenshot pip dots (Button hosting an Ellipse) -->
         <Style Selector="Button.pip">
             <Setter Property="Background" Value="Transparent"/>
diff --git a/src/UniGetUI.Avalonia/Views/MainWindow.axaml b/src/UniGetUI.Avalonia/Views/MainWindow.axaml
index b0c1d91b12..1d9535245f 100644
--- a/src/UniGetUI.Avalonia/Views/MainWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/MainWindow.axaml
@@ -87,6 +87,40 @@
         <Style Selector="Button.caption-close:pressed /template/ ContentPresenter">
             <Setter Property="Background" Value="#A4262C"/>
         </Style>
+        <!-- WinUI-like splitter: the track fills the resize gap while a compact pill
+             marks the drag axis. -->
+        <Style Selector="GridSplitter.winui-horizontal-splitter">
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Template">
+                <ControlTemplate>
+                    <!-- Match the visible splitter track to the operation-card width.
+                         OperationsList uses 8 DIPs of horizontal inset. -->
+                    <Border Background="{TemplateBinding Background}"
+                            Margin="8,0"
+                            CornerRadius="6">
+                        <Border Width="22" Height="4"
+                                CornerRadius="2"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Background="{DynamicResource TextFillColorTertiaryBrush}"
+                                IsHitTestVisible="False"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter>
+        </Style>
+        <Style Selector="GridSplitter.winui-horizontal-splitter:pointerover">
+            <Setter Property="Background" Value="{DynamicResource SubtleFillColorSecondaryBrush}"/>
+        </Style>
+        <Style Selector="GridSplitter.winui-horizontal-splitter:pressed">
+            <Setter Property="Background" Value="{DynamicResource SubtleFillColorTertiaryBrush}"/>
+        </Style>
+        <Style Selector="Border.operations-panel-border">
+            <Setter Property="BorderBrush" Value="{DynamicResource AppBorderBrush}"/>
+        </Style>
+        <Style Selector="Border.operations-panel-border.splitter-active">
+            <!-- Preserve the one-DIP separator's layout while the splitter surface replaces it. -->
+            <Setter Property="BorderBrush" Value="Transparent"/>
+        </Style>
     </Window.Styles>
     <Panel>
         <!-- Solid inactive-state fallback, using the same theme resource as the #5111 Mica failure path. -->
@@ -151,7 +185,7 @@
             </ContentControl>
 
             <!-- ── Content: banners + page + operations ── -->
-            <Grid x:Name="ContentRoot" Grid.Column="1" RowDefinitions="*,4,Auto">
+            <Grid x:Name="ContentRoot" Grid.Column="1" RowDefinitions="*,0,Auto">
 
             <!-- ── Page content (banners now surface as bottom-right toasts; see ToastHost) ── -->
             <TransitioningContentControl Grid.Row="0"
@@ -169,18 +203,23 @@
 
             <!-- ── GridSplitter (only visible when operations are present) ── -->
             <GridSplitter x:Name="OperationsSplitter"
+                          Classes="winui-horizontal-splitter"
                           Grid.Row="1"
+                          Margin="0,0,0,2"
                           HorizontalAlignment="Stretch"
                           VerticalAlignment="Stretch"
+                          ResizeDirection="Rows"
                           IsVisible="{Binding OperationsSplitterVisible}"
-                          automation:AutomationProperties.AccessibilityView="Raw"
-                          Background="Transparent"/>
+                          PointerEntered="OperationsSplitter_PointerEntered"
+                          PointerExited="OperationsSplitter_PointerExited"
+                          automation:AutomationProperties.AccessibilityView="Raw"/>
 
             <!-- ── Operations panel ── -->
-            <Border Grid.Row="2"
+            <Border x:Name="OperationsPanelBorder"
+                    Classes="operations-panel-border"
+                    Grid.Row="2"
                     IsVisible="{Binding OperationsPanelVisible}"
                     BorderThickness="0,1,0,0"
-                    BorderBrush="{DynamicResource AppBorderBrush}"
                     automation:AutomationProperties.AccessibilityView="Control"
                     automation:AutomationProperties.Name="{t:Translate Operations}"
                     automation:AutomationProperties.LandmarkType="{x:Static peers:AutomationLandmarkType.Region}"
@@ -682,22 +721,43 @@
                               Width="10" Height="2"
                               HorizontalAlignment="Center" VerticalAlignment="Center"/>
                     </Button>
-                    <!-- Maximize / Restore: square outline, geometry swapped in code-behind -->
+                    <!-- Maximize / Restore Down. Windows uses the real ChromeRestore symbol from
+                         its caption-icon font; the path is retained as a portable fallback. -->
                     <Button x:Name="MaximizeButton"
                             Width="46" Height="44"
                             Classes="caption"
-                                                        automation:AutomationProperties.Name="{t:Translate Maximize}"
+                            automation:AutomationProperties.Name="{t:Translate Maximize}"
                             ToolTip.Tip="{t:Translate Maximize}"
                             Click="MaximizeButton_Click">
-                        <Path x:Name="MaximizeIcon"
-                              Stroke="{Binding $parent[Button].Foreground}"
-                              StrokeThickness="1"
-                              StrokeLineCap="Round"
-                                                            automation:AutomationProperties.AccessibilityView="Raw"
-
-                              Data="M0,0 H10 V10 H0 Z"
-                              Width="10" Height="10"
-                              HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <Panel Width="16" Height="16"
+                               automation:AutomationProperties.AccessibilityView="Raw">
+                            <Path x:Name="MaximizeIcon"
+                                  Stroke="{Binding $parent[Button].Foreground}"
+                                  StrokeThickness="1"
+                                  StrokeJoin="Miter"
+                                  Data="M1.5,1.5 H10.5 V10.5 H1.5 Z"
+                                  Width="12" Height="12"
+                                  HorizontalAlignment="Center"
+                                  VerticalAlignment="Center"/>
+                            <TextBlock x:Name="RestoreIcon"
+                                       IsVisible="False"
+                                       Text="&#xE923;"
+                                       FontSize="10"
+                                       TextAlignment="Center"
+                                       HorizontalAlignment="Center"
+                                       VerticalAlignment="Center"/>
+                            <Path x:Name="RestoreFallbackIcon"
+                                  IsVisible="False"
+                                  Stroke="{Binding $parent[Button].Foreground}"
+                                  StrokeThickness="1"
+                                  StrokeLineCap="Round"
+                                  StrokeJoin="Round"
+                                  Data="M5,3 V2.5 A1.5,1.5 0 0 1 6.5,1 H12.5 A1.5,1.5 0 0 1 14,2.5 V8.5 A1.5,1.5 0 0 1 12.5,10 H11 M3.5,4 H9.5 A1.5,1.5 0 0 1 11,5.5 V12.5 A1.5,1.5 0 0 1 9.5,14 H3.5 A1.5,1.5 0 0 1 2,12.5 V5.5 A1.5,1.5 0 0 1 3.5,4 Z"
+                                  Width="10" Height="10"
+                                  Stretch="Uniform"
+                                  HorizontalAlignment="Center"
+                                  VerticalAlignment="Center"/>
+                        </Panel>
                     </Button>
                     <!-- Close: X -->
                     <Button Width="46" Height="44"
diff --git a/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs b/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
index b8060789c8..467bce795e 100644
--- a/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
@@ -5,6 +5,7 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 using Avalonia;
+using Avalonia.Automation;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -139,6 +140,7 @@ public partial class MainWindow : Window
     private readonly SemaphoreSlim _modalTransitionSemaphore = new(1, 1);
     private readonly List<ImmersiveDialog> _modalStack = new();
     private readonly Dictionary<ImmersiveDialog, Control?> _modalFocusHistory = new();
+    private readonly Dictionary<ImmersiveDialog, (double MinWidth, double MinHeight)> _modalMinimumSizeHistory = new();
     private readonly List<UniGetUiWebView> _webViewsHiddenForModal = new();
     private IDisposable? _modalTitleSubscription;
     private Control? _focusBeforeModal;
@@ -165,6 +167,15 @@ public MainWindow()
         Instance = this;
         DataContext = new MainWindowViewModel();
         InitializeComponent();
+        if (OperatingSystem.IsWindows())
+        {
+            // WinUI's caption button uses ChromeRestore (U+E923). Windows 11 supplies it
+            // through Segoe Fluent Icons; Windows 10 exposes the same symbol in MDL2 Assets.
+            RestoreIcon.FontFamily = new FontFamily(
+                OperatingSystem.IsWindowsVersionAtLeast(10, 0, 22000)
+                    ? "Segoe Fluent Icons"
+                    : "Segoe MDL2 Assets");
+        }
         SetupTitleBar();
         SetupTitleBarFocusOpacity();
         SetupResponsiveRail();
@@ -383,6 +394,10 @@ private void UpdateOperationsPanelRow()
         if (ContentRoot.RowDefinitions.Count < 3)
             return;
 
+        ContentRoot.RowDefinitions[1].Height = ViewModel.OperationsSplitterVisible
+            ? new GridLength(12, GridUnitType.Pixel)
+            : new GridLength(0, GridUnitType.Pixel);
+
         RowDefinition row = ContentRoot.RowDefinitions[2];
         if (ViewModel.OperationsPanelVisible && ViewModel.OperationsPanelExpanded)
         {
@@ -480,6 +495,13 @@ private void SetupResponsiveRail()
     public void RefreshNavigationMode()
         => ViewModel.Sidebar.Mode = SidebarViewModel.ParseMode(Settings.GetValue(Settings.K.NavMenuMode));
 
+    // Let the splitter hover surface replace the separator visually without changing its layout thickness.
+    private void OperationsSplitter_PointerEntered(object? sender, PointerEventArgs e)
+        => OperationsPanelBorder.Classes.Set("splitter-active", true);
+
+    private void OperationsSplitter_PointerExited(object? sender, PointerEventArgs e)
+        => OperationsPanelBorder.Classes.Set("splitter-active", false);
+
     // Light-dismiss: clicking outside the open flyout closes it (no darkening — the layer is transparent).
     private void FlyoutDismiss_PointerPressed(object? sender, PointerPressedEventArgs e)
         => ViewModel.Sidebar.IsPaneOpen = false;
@@ -960,13 +982,13 @@ private void MaximizeButton_Click(object? sender, RoutedEventArgs e)
 
     private void UpdateMaximizeButtonState(bool isMaximized)
     {
-        MaximizeIcon.Data = Geometry.Parse(
-            isMaximized
-                ? "M3,0 H10 V7 H8 V2 H3 Z M0,3 H7 V10 H0 Z"
-                : "M0,0 H10 V10 H0 Z");
-        ToolTip.SetTip(
-            MaximizeButton,
-            CoreTools.Translate(isMaximized ? "Restore" : "Maximize"));
+        MaximizeIcon.IsVisible = !isMaximized;
+        RestoreIcon.IsVisible = isMaximized && OperatingSystem.IsWindows();
+        RestoreFallbackIcon.IsVisible = isMaximized && !OperatingSystem.IsWindows();
+
+        string label = CoreTools.Translate(isMaximized ? "Restore" : "Maximize");
+        ToolTip.SetTip(MaximizeButton, label);
+        AutomationProperties.SetName(MaximizeButton, label);
     }
 
     // True when the WM_NCHITTEST screen point (physical px in lParam) falls within the maximize
@@ -1679,6 +1701,11 @@ public async Task ShowImmersiveDialogAsync(ImmersiveDialog dialog)
                 if (index >= 0)
                     _modalStack.RemoveAt(index);
                 _modalFocusHistory.Remove(dialog);
+                if (_modalMinimumSizeHistory.Remove(dialog, out var minimumSize))
+                {
+                    dialog.MinWidth = minimumSize.MinWidth;
+                    dialog.MinHeight = minimumSize.MinHeight;
+                }
 
                 if (opened)
                 {
@@ -1725,6 +1752,7 @@ public async Task ShowImmersiveDialogAsync(ImmersiveDialog dialog)
 
     private void PresentModal(ImmersiveDialog dialog)
     {
+        _modalMinimumSizeHistory.TryAdd(dialog, (dialog.MinWidth, dialog.MinHeight));
         _modalTitleSubscription?.Dispose();
         _modalTitleSubscription = dialog.GetObservable(ImmersiveDialog.TitleProperty)
             .SubscribeValue(title => ModalTitle.Text = title ?? "");
@@ -1803,6 +1831,13 @@ private void UpdateModalSurfaceSize()
         ModalSurface.Height = double.IsFinite(dialog.MaxHeight)
             ? Math.Min(dialog.MaxHeight, ModalSurface.MaxHeight)
             : double.NaN;
+
+        if (_modalMinimumSizeHistory.TryGetValue(dialog, out var minimumSize))
+        {
+            dialog.MinWidth = Math.Min(minimumSize.MinWidth, ModalSurface.MaxWidth);
+            double availableContentHeight = Math.Max(0, ModalSurface.MaxHeight - ModalHeader.Height);
+            dialog.MinHeight = Math.Min(minimumSize.MinHeight, availableContentHeight);
+        }
     }
 
     private async Task AnimateModalAsync(bool opening)
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/InstallOptionsPanel.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/InstallOptionsPanel.axaml
index 11b6a4ef46..55210144fd 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/InstallOptionsPanel.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/InstallOptionsPanel.axaml
@@ -25,6 +25,7 @@
                                TextWrapping="Wrap"/>
                     <Button x:Name="ResetButton"
                             Grid.Column="1"
+                            Classes="secondary-action"
                             Content="{Binding ResetLabel}"
                             automation:AutomationProperties.Name="{Binding ResetLabel}"
                             Command="{Binding ResetOptionsCommand}"
@@ -32,6 +33,7 @@
                             Margin="4,0"/>
                     <Button x:Name="ApplyButton"
                             Grid.Column="2"
+                            Classes="secondary-action"
                             Content="{Binding ApplyLabel}"
                             automation:AutomationProperties.Name="{Binding ApplyLabel}"
                             Command="{Binding SaveOptionsCommand}"
@@ -125,11 +127,13 @@
                                    Opacity="{Binding LocationOpacity}"/>
                         <Button x:Name="SelectDirButton"
                                 Grid.Column="1"
+                                Classes="secondary-action"
                                 Content="{Binding SelectDirLabel}"
                                 automation:AutomationProperties.Name="{Binding SelectDirLabel}"
                                 IsEnabled="{Binding LocationSelectEnabled}"
                                 Margin="4,0"/>
                         <Button Grid.Column="2"
+                                Classes="secondary-action"
                                 Content="{Binding ResetDirLabel}"
                                 automation:AutomationProperties.Name="{Binding ResetDirLabel}"
                                 Command="{Binding ResetLocationCommand}"
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/InstallOptionsPanel.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/InstallOptionsPanel.axaml.cs
index fa233cb05f..afce7abf0e 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/InstallOptionsPanel.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/InstallOptionsPanel.axaml.cs
@@ -21,13 +21,9 @@ public InstallOptionsPanel(IPackageManager manager)
         ViewModel.PropertyChanged += (_, e) =>
         {
             if (e.PropertyName == nameof(InstallOptionsPanelViewModel.HasChanges))
-            {
-                if (ViewModel.HasChanges)
-                    ApplyButton.Classes.Add("accent");
-                else
-                    ApplyButton.Classes.Remove("accent");
-            }
+                UpdateApplyButtonStyle();
         };
+        UpdateApplyButtonStyle();
 
         // Wire location picker (needs Visual reference for StorageProvider)
         SelectDirButton.Click += (_, _) =>
@@ -38,4 +34,18 @@ public InstallOptionsPanel(IPackageManager manager)
         CustomUpdateBox.TextChanged += (_, _) => ViewModel.MarkChanged();
         CustomUninstallBox.TextChanged += (_, _) => ViewModel.MarkChanged();
     }
+
+    private void UpdateApplyButtonStyle()
+    {
+        if (ViewModel.HasChanges)
+        {
+            ApplyButton.Classes.Remove("secondary-action");
+            ApplyButton.Classes.Add("accent");
+        }
+        else
+        {
+            ApplyButton.Classes.Remove("accent");
+            ApplyButton.Classes.Add("secondary-action");
+        }
+    }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/PackageManagerPage.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/PackageManagerPage.axaml.cs
index 7db4aaa81f..c6aa9a7d30 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/PackageManagerPage.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/PackageManagerPage.axaml.cs
@@ -88,7 +88,13 @@ private void BuildPage()
         Grid.SetColumnSpan(execHint, 2);
         execGrid.Children.Add(execHint);
 
-        var execCombo = new ComboBox { HorizontalAlignment = HorizontalAlignment.Stretch };
+        var execCombo = new ComboBox
+        {
+            HorizontalAlignment = HorizontalAlignment.Stretch,
+            MinHeight = 32,
+            CornerRadius = new CornerRadius(4),
+            Padding = new Thickness(10, 4, 8, 5),
+        };
         AutomationProperties.SetName(execCombo, CoreTools.Translate("Select the executable to be used. The following list shows the executables found by UniGetUI"));
         foreach (var path in manager.FindCandidateExecutableFiles())
             AddExecutablePathItem(execCombo, path);
@@ -122,6 +128,8 @@ private void BuildPage()
             Content = CoreTools.Translate("Browse..."),
             IsEnabled = customPathsAllowed,
             Margin = new Thickness(8, 0, 0, 0),
+            MinWidth = 96,
+            Classes = { "secondary-action" },
         };
         browseExecutableButton.Click += async (_, _) =>
         {
@@ -258,7 +266,13 @@ private void BuildPage()
             (CoreTools.Translate("Custom..."), "custom"),
         ];
 
-        var ageCombo = new ComboBox { MinWidth = 200 };
+        var ageCombo = new ComboBox
+        {
+            MinWidth = 200,
+            MinHeight = 32,
+            CornerRadius = new CornerRadius(4),
+            Padding = new Thickness(10, 4, 8, 5),
+        };
         AutomationProperties.SetName(ageCombo, CoreTools.Translate("Minimum age for updates"));
         foreach (var (label, _) in ageItems)
             ageCombo.Items.Add(label);
@@ -271,6 +285,7 @@ private void BuildPage()
         var customAgeInput = new TextBox
         {
             MinWidth = 200,
+            Classes = { "search-field-standalone" },
             PlaceholderText = CoreTools.Translate("e.g. 10"),
             [AutomationProperties.NameProperty] = CoreTools.Translate("Custom minimum age (days)"),
             Text = CoreSettings.GetDictionaryItem<string, string>(
@@ -622,6 +637,7 @@ private ButtonCard BuildVcpkgRootCard()
             Content = CoreTools.Translate("Reset"),
             IsEnabled = ViewModel.IsCustomVcpkgRootSet,
             Margin = new Thickness(4, 0),
+            Classes = { "secondary-action" },
         };
         AutomationProperties.SetName(resetBtn, CoreTools.Translate("Reset vcpkg root location"));
         var openBtn = new Button
@@ -629,6 +645,7 @@ private ButtonCard BuildVcpkgRootCard()
             Content = CoreTools.Translate("Open"),
             IsEnabled = ViewModel.IsCustomVcpkgRootSet,
             Margin = new Thickness(4, 0),
+            Classes = { "secondary-action" },
         };
         AutomationProperties.SetName(openBtn, CoreTools.Translate("Open vcpkg root location"));
 
diff --git a/src/UniGetUI.Avalonia/Views/SidebarView.axaml.cs b/src/UniGetUI.Avalonia/Views/SidebarView.axaml.cs
index 11ca756a88..4b0420464c 100644
--- a/src/UniGetUI.Avalonia/Views/SidebarView.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/SidebarView.axaml.cs
@@ -57,6 +57,8 @@ public SidebarView()
         NavigationPillStem.RenderTransform = _pillStemTransform;
         NavigationPillBottomCap.RenderTransform = _pillBottomCapTranslate;
 
+        SidebarLayout.SizeChanged += (_, _) => QueueSelectionPillUpdate(animate: false);
+
         if (FlyoutBase.GetAttachedFlyout(MoreNavBtn) is { } moreFlyout)
         {
             moreFlyout.Opened += (_, _) => _isMoreFlyoutOpen = true;
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
index 8295c4fab1..36e38a868d 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
@@ -98,6 +98,33 @@
          <Setter Property="Background" Value="{DynamicResource SearchBoxFocusedBackground}"/>
          <Setter Property="BorderBrush" Value="{DynamicResource SearchBoxFocusedBorderBrush}"/>
       </Style>
+      <!-- The full splitter track is interactive. Its subtle rounded hover surface sits beneath
+           the persistent grip, matching WinUI's pane-resize affordance. -->
+      <Style Selector="GridSplitter.winui-vertical-splitter">
+         <Setter Property="Background" Value="Transparent"/>
+         <Setter Property="Template">
+            <ControlTemplate>
+               <!-- Match the visible splitter track to the package-list container on the
+                    right, whose outer card is inset 6 DIPs vertically. -->
+               <Border Background="{TemplateBinding Background}"
+                       Margin="0,6"
+                       CornerRadius="6">
+                  <Border Width="4" Height="22"
+                          CornerRadius="2"
+                          HorizontalAlignment="Center"
+                          VerticalAlignment="Center"
+                          Background="{DynamicResource TextFillColorTertiaryBrush}"
+                          IsHitTestVisible="False"/>
+               </Border>
+            </ControlTemplate>
+         </Setter>
+      </Style>
+      <Style Selector="GridSplitter.winui-vertical-splitter:pointerover">
+         <Setter Property="Background" Value="{DynamicResource SubtleFillColorSecondaryBrush}"/>
+      </Style>
+      <Style Selector="GridSplitter.winui-vertical-splitter:pressed">
+         <Setter Property="Background" Value="{DynamicResource SubtleFillColorTertiaryBrush}"/>
+      </Style>
    </UserControl.Styles>
 
    <UserControl.Resources>
@@ -244,7 +271,7 @@
         <Grid x:Name="FilteringPanel"
               Grid.Row="2"
               ClipToBounds="True"
-              ColumnDefinitions="220,4,*">
+              ColumnDefinitions="220,12,*">
 
             <!-- Both presentations use this single content definition. Their containers remain
                  isolated so compact compositor state cannot leak into the inline pane. -->
@@ -478,11 +505,12 @@
             </Border>
             <!-- ===== DRAG SPLITTER ===== -->
             <GridSplitter x:Name="FilterSplitter"
+                          Classes="winui-vertical-splitter"
                           Grid.Column="1"
+                          Margin="0,0,2,0"
                           IsVisible="{Binding IsFilterPaneOpen}"
                           HorizontalAlignment="Stretch"
-                          ResizeDirection="Columns"
-                          Background="{DynamicResource MicaPageBackground}"/>
+                          ResizeDirection="Columns"/>
 
             <!-- ===== OVERLAY BACKDROP (overlay mode only, dismisses pane on click) ===== -->
             <Border x:Name="FilterOverlayBackdrop"
@@ -569,6 +597,7 @@
                                     <DataGridTemplateColumn.CellTemplate>
                                         <DataTemplate x:DataType="pkg:PackageWrapper">
                                             <CheckBox IsChecked="{Binding IsChecked}"
+                                                      Classes="package-selector package-list-selector"
                                                       automation:AutomationProperties.Name="{Binding Package.AutomationName}"
                                                       HorizontalAlignment="Center"
                                                       VerticalAlignment="Center"
@@ -733,6 +762,7 @@
                                 HorizontalAlignment="Left" VerticalAlignment="Top"
                                 Background="Transparent" ZIndex="10">
                             <CheckBox IsChecked="{Binding AllPackagesChecked, Mode=TwoWay}"
+                                      Classes="package-selector package-list-selector"
                                       automation:AutomationProperties.Name="{t:Translate Select all}"
                                       HorizontalAlignment="Center"
                                       VerticalAlignment="Center"
@@ -803,6 +833,7 @@
                                                      room to stack them without overlap. -->
                                                 <Panel Grid.Column="2">
                                                     <CheckBox IsChecked="{Binding IsChecked, Mode=TwoWay}"
+                                                              Classes="package-selector"
                                                               automation:AutomationProperties.Name="{Binding Package.AutomationName}"
                                                               VerticalAlignment="Top"
                                                               HorizontalAlignment="Center"
@@ -847,6 +878,7 @@
                                                 BorderBrush="{DynamicResource SettingsCardBorderBrush}" BorderThickness="1" Padding="4">
                                             <Grid RowDefinitions="30,57,30,15">
                                                 <CheckBox Grid.Row="0"
+                                                          Classes="package-selector"
                                                           IsChecked="{Binding IsChecked, Mode=TwoWay}"
                                                           automation:AutomationProperties.Name="{Binding Package.AutomationName}"
                                                           HorizontalAlignment="Left"
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
index 23b3c0e834..24e08d8d0f 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
@@ -532,7 +532,7 @@ private void UpdateFilterPaneColumn(bool open, bool animate = false)
                 InlineSidePanel.IsVisible = open;
                 SetInlineSidePanelTransformInstant(open ? 0 : -_savedFilterPaneWidth);
                 FilteringPanel.ColumnDefinitions[0].Width = open ? new GridLength(_savedFilterPaneWidth) : new GridLength(0);
-                FilteringPanel.ColumnDefinitions[1].Width = open ? new GridLength(4) : new GridLength(0);
+                FilteringPanel.ColumnDefinitions[1].Width = open ? new GridLength(12) : new GridLength(0);
             }
         }
     }
@@ -670,7 +670,7 @@ private async void AnimateInlineFilterPane(bool open)
         {
             // Reserve the column (one reflow), then slide the pane in from -width to 0.
             col0.Width = new GridLength(_savedFilterPaneWidth);
-            col1.Width = new GridLength(4);
+            col1.Width = new GridLength(12);
             InlineSidePanel.IsVisible = true;
             InlineSidePanel.RenderTransform = TranslateX(0);
         }