diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
index cfa2ea3998..b01f0a9910 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:settings="using:UniGetUI.Avalonia.Views.Controls.Settings"
         xmlns:primitives="using:Avalonia.Controls.Primitives">
 
     <Styles.Resources>
@@ -69,6 +70,10 @@
                     <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush"/>
                     <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="TextFillColorSecondaryBrush"/>
                     <StaticResource x:Key="ButtonForegroundDisabled" ResourceKey="TextFillColorDisabledBrush"/>
+                    <StaticResource x:Key="ButtonBorderBrush" ResourceKey="ControlElevationBorderBrush"/>
+                    <StaticResource x:Key="ButtonBorderBrushPointerOver" ResourceKey="ControlElevationBorderBrush"/>
+                    <StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="ControlStrokeColorDefaultBrush"/>
+                    <StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="ControlStrokeColorDefaultBrush"/>
                     <StaticResource x:Key="SplitButtonBackground" ResourceKey="ControlFillColorDefaultBrush"/>
                     <StaticResource x:Key="SplitButtonBackgroundPointerOver" ResourceKey="ControlFillColorSecondaryBrush"/>
                     <StaticResource x:Key="SplitButtonBackgroundPressed" ResourceKey="ControlFillColorTertiaryBrush"/>
@@ -77,10 +82,18 @@
                     <StaticResource x:Key="SplitButtonForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush"/>
                     <StaticResource x:Key="SplitButtonForegroundPressed" ResourceKey="TextFillColorSecondaryBrush"/>
                     <StaticResource x:Key="SplitButtonForegroundDisabled" ResourceKey="TextFillColorDisabledBrush"/>
+                    <StaticResource x:Key="SplitButtonBorderBrush" ResourceKey="ControlElevationBorderBrush"/>
+                    <StaticResource x:Key="SplitButtonBorderBrushPointerOver" ResourceKey="ControlElevationBorderBrush"/>
+                    <StaticResource x:Key="SplitButtonBorderBrushPressed" ResourceKey="ControlStrokeColorDefaultBrush"/>
+                    <StaticResource x:Key="SplitButtonBorderBrushDisabled" ResourceKey="ControlStrokeColorDefaultBrush"/>
+                    <StaticResource x:Key="SplitButtonBorderBrushDivider" ResourceKey="ControlStrokeColorDefaultBrush"/>
                     <SolidColorBrush x:Key="TextFillColorInverseBrush"   Color="#FFFFFFFF"/>
                     <!-- Opaque WinUI menu surface and low-contrast divider. -->
                     <SolidColorBrush x:Key="MenuSurfaceBrush"            Color="#FFFFFFFF"/>
                     <SolidColorBrush x:Key="MenuSurfaceBorderBrush"      Color="#0F000000"/>
+                    <!-- TrayIcon's Windows popup is created by Avalonia.Win32 and can consume the
+                         ControlTheme resource directly instead of our MenuFlyoutPresenter style. -->
+                    <StaticResource x:Key="MenuFlyoutPresenterBorderBrush" ResourceKey="MenuSurfaceBorderBrush"/>
                     <SolidColorBrush x:Key="MenuDividerBrush"            Color="#0F000000"/>
                     <!-- Text on accent -->
                     <SolidColorBrush x:Key="TextOnAccentFillColorPrimaryBrush"      Color="#FFFFFFFF"/>
@@ -98,7 +111,7 @@
                     <StaticResource x:Key="AccentButtonForegroundDisabled" ResourceKey="TextOnAccentFillColorDisabledBrush"/>
                     <!-- Settings cards -->
                     <SolidColorBrush x:Key="SettingsCardBackground"      Color="#B3FFFFFF"/>
-                    <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#ECECEC"/>
+                    <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#0F000000"/>
                     <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#F6F6F6"/>
                     <!-- Secondary actions keep a 1-DIP edge, but use WinUI's low-contrast
                          control stroke here. The full elevation gradient reads too strongly in
@@ -113,7 +126,7 @@
                     <StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="ControlElevationBorderBrush"/>
                     <StaticResource x:Key="ComboBoxBackgroundBorderBrushUnfocused" ResourceKey="ControlElevationBorderBrush"/>
                     <StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="ControlElevationBorderBrush"/>
-                    <StaticResource x:Key="ComboBoxBorderBrushPressed" ResourceKey="ControlElevationBorderBrush"/>
+                    <StaticResource x:Key="ComboBoxBorderBrushPressed" ResourceKey="ControlStrokeColorDefaultBrush"/>
                     <Thickness x:Key="ComboBoxOutlineThickness">1</Thickness>
                     <!-- Shared WinUI dropdown surface and neutral item states. ComboBox popups
                          use the same visual language as MenuFlyout-based pickers. -->
@@ -121,6 +134,7 @@
                     <StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="MenuSurfaceBorderBrush"/>
                     <!-- Package list container; near-transparent over Mica (see Styles.WindowsMica) -->
                     <SolidColorBrush x:Key="PackageListBackground"       Color="#FBFBFB"/>
+                    <SolidColorBrush x:Key="PackageListBorderBrush"      Color="#0F000000"/>
                     <!-- Column header: WinUI default button (ControlFillColorDefault fill + ControlStrokeColorDefault border) -->
                     <SolidColorBrush x:Key="PackageListHeaderBackground" Color="#B3FFFFFF"/>
                     <SolidColorBrush x:Key="PackageListHeaderBorderBrush" Color="#0F000000"/>
@@ -133,7 +147,7 @@
                     <!-- Window/page surface; overridden to Transparent by Styles.WindowsMica when Mica is active -->
                     <SolidColorBrush x:Key="MicaPageBackground"          Color="#F3F3F3"/>
                     <SolidColorBrush x:Key="AppSplitterBackground"       Color="#E5E5E5"/>
-                    <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#EEEEEE"/>
+                    <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="Transparent"/>
                     <SolidColorBrush x:Key="AppBorderBrush"              Color="#E5E5E5"/>
                     <SolidColorBrush x:Key="AppBadgeBackground"          Color="#EDEDED"/>
                     <!-- Dialogs -->
@@ -155,6 +169,11 @@
                     <SolidColorBrush x:Key="WarningBannerIconBackground" Color="#9D5D00"/>
                     <SolidColorBrush x:Key="WarningBannerIconForeground" Color="#FFFFFF"/>
                     <SolidColorBrush x:Key="WarningBannerSubtext"        Color="#9D5D00"/>
+                    <!-- Operation status resources matching WinUI SystemFillColor brushes. -->
+                    <SolidColorBrush x:Key="OperationNeutralForegroundBrush" Color="#72000000"/>
+                    <SolidColorBrush x:Key="OperationNeutralBackgroundBrush" Color="#06000000"/>
+                    <SolidColorBrush x:Key="OperationAttentionBackgroundBrush" Color="#80F6F6F6"/>
+                    <SolidColorBrush x:Key="OperationCardBorderBrush" Color="#0F000000"/>
                     <!-- Status banners (success / error / info) -->
                     <SolidColorBrush x:Key="StatusSuccessBackground"     Color="#DFF6DD"/>
                     <SolidColorBrush x:Key="StatusSuccessBorderBrush"    Color="#0F7B0F"/>
@@ -260,6 +279,10 @@
                     <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush"/>
                     <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="TextFillColorSecondaryBrush"/>
                     <StaticResource x:Key="ButtonForegroundDisabled" ResourceKey="TextFillColorDisabledBrush"/>
+                    <StaticResource x:Key="ButtonBorderBrush" ResourceKey="ControlElevationBorderBrush"/>
+                    <StaticResource x:Key="ButtonBorderBrushPointerOver" ResourceKey="ControlElevationBorderBrush"/>
+                    <StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="ControlStrokeColorDefaultBrush"/>
+                    <StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="ControlStrokeColorDefaultBrush"/>
                     <StaticResource x:Key="SplitButtonBackground" ResourceKey="ControlFillColorDefaultBrush"/>
                     <StaticResource x:Key="SplitButtonBackgroundPointerOver" ResourceKey="ControlFillColorSecondaryBrush"/>
                     <StaticResource x:Key="SplitButtonBackgroundPressed" ResourceKey="ControlFillColorTertiaryBrush"/>
@@ -268,10 +291,16 @@
                     <StaticResource x:Key="SplitButtonForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush"/>
                     <StaticResource x:Key="SplitButtonForegroundPressed" ResourceKey="TextFillColorSecondaryBrush"/>
                     <StaticResource x:Key="SplitButtonForegroundDisabled" ResourceKey="TextFillColorDisabledBrush"/>
+                    <StaticResource x:Key="SplitButtonBorderBrush" ResourceKey="ControlElevationBorderBrush"/>
+                    <StaticResource x:Key="SplitButtonBorderBrushPointerOver" ResourceKey="ControlElevationBorderBrush"/>
+                    <StaticResource x:Key="SplitButtonBorderBrushPressed" ResourceKey="ControlStrokeColorDefaultBrush"/>
+                    <StaticResource x:Key="SplitButtonBorderBrushDisabled" ResourceKey="ControlStrokeColorDefaultBrush"/>
+                    <StaticResource x:Key="SplitButtonBorderBrushDivider" ResourceKey="ControlStrokeColorDefaultBrush"/>
                     <SolidColorBrush x:Key="TextFillColorInverseBrush"   Color="#E4000000"/>
                     <!-- WinUI's dark flyout surface is an opaque #2C2C2C. -->
                     <SolidColorBrush x:Key="MenuSurfaceBrush"            Color="#FF2C2C2C"/>
                     <SolidColorBrush x:Key="MenuSurfaceBorderBrush"      Color="#33000000"/>
+                    <StaticResource x:Key="MenuFlyoutPresenterBorderBrush" ResourceKey="MenuSurfaceBorderBrush"/>
                     <SolidColorBrush x:Key="MenuDividerBrush"            Color="#15FFFFFF"/>
                     <!-- Text on accent -->
                     <SolidColorBrush x:Key="TextOnAccentFillColorPrimaryBrush"      Color="#000000"/>
@@ -298,16 +327,17 @@
                     <StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="SettingsCardBackground"/>
                     <StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="SettingsCardHoverBackground"/>
                     <StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="SettingsCardHoverBackground"/>
-                    <SolidColorBrush x:Key="ComboBoxBorderBrush" Color="Transparent"/>
-                    <SolidColorBrush x:Key="ComboBoxBackgroundBorderBrushUnfocused" Color="Transparent"/>
-                    <SolidColorBrush x:Key="ComboBoxBorderBrushPointerOver" Color="Transparent"/>
-                    <SolidColorBrush x:Key="ComboBoxBorderBrushPressed" Color="Transparent"/>
-                    <Thickness x:Key="ComboBoxOutlineThickness">0</Thickness>
+                    <StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="ControlElevationBorderBrush"/>
+                    <StaticResource x:Key="ComboBoxBackgroundBorderBrushUnfocused" ResourceKey="ControlElevationBorderBrush"/>
+                    <StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="ControlElevationBorderBrush"/>
+                    <StaticResource x:Key="ComboBoxBorderBrushPressed" ResourceKey="ControlStrokeColorDefaultBrush"/>
+                    <Thickness x:Key="ComboBoxOutlineThickness">1</Thickness>
                     <!-- Shared WinUI dropdown surface and neutral item states. -->
                     <StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="MenuSurfaceBrush"/>
                     <StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="MenuSurfaceBorderBrush"/>
                     <!-- Package list container; near-transparent over Mica (see Styles.WindowsMica) -->
                     <SolidColorBrush x:Key="PackageListBackground"       Color="#2D2D2D"/>
+                    <SolidColorBrush x:Key="PackageListBorderBrush"      Color="#19000000"/>
                     <!-- Column header: WinUI default button (ControlFillColorDefault fill + ControlStrokeColorDefault border) -->
                     <SolidColorBrush x:Key="PackageListHeaderBackground" Color="#0FFFFFFF"/>
                     <SolidColorBrush x:Key="PackageListHeaderBorderBrush" Color="#12FFFFFF"/>
@@ -320,7 +350,7 @@
                     <!-- Window/page surface; overridden to Transparent by Styles.WindowsMica when Mica is active -->
                     <SolidColorBrush x:Key="MicaPageBackground"          Color="#202020"/>
                     <SolidColorBrush x:Key="AppSplitterBackground"       Color="#1A1A1A"/>
-                    <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#1C1C1C"/>
+                    <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="Transparent"/>
                     <SolidColorBrush x:Key="AppBorderBrush"              Color="#15FFFFFF"/>
                     <SolidColorBrush x:Key="AppBadgeBackground"          Color="#3C3C3C"/>
                     <!-- Dialogs -->
@@ -342,6 +372,11 @@
                     <SolidColorBrush x:Key="WarningBannerIconBackground" Color="#FCE100"/>
                     <SolidColorBrush x:Key="WarningBannerIconForeground" Color="#1a1000"/>
                     <SolidColorBrush x:Key="WarningBannerSubtext"        Color="#FCE100"/>
+                    <!-- Operation status resources matching WinUI SystemFillColor brushes. -->
+                    <SolidColorBrush x:Key="OperationNeutralForegroundBrush" Color="#8BFFFFFF"/>
+                    <SolidColorBrush x:Key="OperationNeutralBackgroundBrush" Color="#08FFFFFF"/>
+                    <SolidColorBrush x:Key="OperationAttentionBackgroundBrush" Color="#08FFFFFF"/>
+                    <SolidColorBrush x:Key="OperationCardBorderBrush" Color="#19000000"/>
                     <!-- Status banners (success / error / info) -->
                     <SolidColorBrush x:Key="StatusSuccessBackground"     Color="#393D1B"/>
                     <SolidColorBrush x:Key="StatusSuccessBorderBrush"    Color="#4F7B27"/>
@@ -383,10 +418,46 @@
         </Setter>
     </Style>
 
+    <Style Selector=".settings-card-control"
+           x:SetterTargetType="settings:SettingsCard">
+        <Setter Property="FocusAdorner">
+            <FocusAdornerTemplate>
+                <Border Margin="40,0"
+                        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>
 
+    <!-- Match WinUI conservatively: standard Button/ToggleButton surfaces and
+         CommunityToolkit SettingsCard use the 83 ms background transition. Controls
+         such as menus, list rows, ComboBox, tabs, checks/toggles and DataGrid remain
+         discrete, which is what their WinUI templates do. -->
+    <Style Selector="Button /template/ ContentPresenter#PART_ContentPresenter,
+                     ToggleButton /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Transitions">
+            <Transitions>
+                <BrushTransition Property="Background" Duration="0:0:0.083"/>
+            </Transitions>
+        </Setter>
+    </Style>
+    <Style Selector="Border.settings-card">
+        <Setter Property="Transitions">
+            <Transitions>
+                <BrushTransition Property="Background" Duration="0:0:0.083"/>
+            </Transitions>
+        </Setter>
+    </Style>
+
     <!-- Avalonia's Fluent controls still consume UWP-era accent resources, whose dark-theme
          defaults use the base accent and white foreground. Bind every filled accent control to
          the WinUI v2 tokens above so dark mode consistently uses a lighter fill and dark glyphs. -->
@@ -737,6 +808,8 @@
     <!-- View-mode segmented selector (List / Grid / Icons): WinUI Segmented-style selection — subtle
          fill plus an accent underline under the selected segment, not Fluent's full-accent fill. -->
     <Style Selector="ListBoxItem.segment-item">
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="Template">
             <ControlTemplate>
                 <Panel>
@@ -770,6 +843,9 @@
     <Style Selector="ListBoxItem.segment-item:pressed /template/ ContentPresenter#ContentHost">
         <Setter Property="Background" Value="{DynamicResource ControlFillColorTertiaryBrush}"/>
     </Style>
+    <Style Selector="ListBoxItem.segment-item:selected">
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
+    </Style>
     <Style Selector="ListBoxItem.segment-item:selected /template/ ContentPresenter#ContentHost">
         <Setter Property="Background" Value="{DynamicResource ControlFillColorDefaultBrush}"/>
     </Style>
@@ -790,13 +866,9 @@
         <Setter Property="Margin"       Value="40,0"/>
     </Style>
     <Style Selector="Border.settings-card-clickable:pointerover">
-        <Setter Property="Background"   Value="{DynamicResource SettingsCardHoverBackground}"/>
-    </Style>
-    <Style Selector="Border.settings-card-keyboard-focused">
-        <Setter Property="BorderBrush"     Value="{DynamicResource AccentFillColorDefaultBrush}"/>
-        <Setter Property="BorderThickness" Value="2"/>
+        <Setter Property="Background"  Value="{DynamicResource ControlFillColorSecondaryBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
     </Style>
-
     <!-- Setting warning subtext (amber, both themes) -->
     <Style Selector="TextBlock.setting-warning-text">
         <Setter Property="Foreground" Value="{DynamicResource SettingWarningTextForeground}"/>
diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.WindowsMica.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.WindowsMica.axaml
index 5adec68ce0..0e8e839ee6 100644
--- a/src/UniGetUI.Avalonia/Assets/Styles/Styles.WindowsMica.axaml
+++ b/src/UniGetUI.Avalonia/Assets/Styles/Styles.WindowsMica.axaml
@@ -17,21 +17,25 @@
             <SolidColorBrush x:Key="MicaPageBackground"          Color="Transparent"/>
             <!-- Cards / panels: translucent white layers over the (light) Mica -->
             <SolidColorBrush x:Key="SettingsCardBackground"      Color="#B3FFFFFF"/>
-            <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#14000000"/>
+            <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#0F000000"/>
             <!-- Package list: near-transparent so Mica shows through, matching WinUI's SystemFillColorNeutralBackground -->
             <SolidColorBrush x:Key="PackageListBackground"       Color="#06000000"/>
             <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#99FFFFFF"/>
             <SolidColorBrush x:Key="AppSplitterBackground"       Color="#18000000"/>
-            <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#80FFFFFF"/>
+            <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="Transparent"/>
             <SolidColorBrush x:Key="AppBorderBrush"              Color="#18000000"/>
             <SolidColorBrush x:Key="AppBadgeBackground"          Color="#99FFFFFF"/>
             <SolidColorBrush x:Key="AppDialogPanelBackground"    Color="#80FFFFFF"/>
             <SolidColorBrush x:Key="AppDialogSubtleBackground"   Color="#80FFFFFF"/>
             <SolidColorBrush x:Key="AppDialogDarkBackground"     Color="#80FFFFFF"/>
             <SolidColorBrush x:Key="IgnoredUpdatesListBackground" Color="#F3F3F3"/>
-            <!-- Flyouts / menus / dropdowns / tooltips: DWM acrylic backdrop with the card tint over it -->
-            <SolidColorBrush x:Key="FlyoutPresenterBackground"     Color="#80FFFFFF"/>
-            <SolidColorBrush x:Key="MenuFlyoutPresenterBackground" Color="#FFFFFFFF"/>
+            <!-- WinUI MenuFlyoutPresenter is transparent over a DesktopAcrylic backdrop.
+                 These overrides are only merged when Windows transparency is usable;
+                 Styles.Common remains the normal opaque fallback otherwise. -->
+            <SolidColorBrush x:Key="FlyoutPresenterBackground"     Color="#D9FCFCFC"/>
+            <SolidColorBrush x:Key="MenuSurfaceBrush"              Color="#D9FCFCFC"/>
+            <SolidColorBrush x:Key="MenuSurfaceFallbackBrush"      Color="#FFFFFFFF"/>
+            <SolidColorBrush x:Key="MenuFlyoutPresenterBackground" Color="#D9FCFCFC"/>
             <!-- Keep light ComboBox flyouts opaque. A translucent white popup composites
                  against the dimmed owner window and reads as a disabled grey surface. -->
             <SolidColorBrush x:Key="ComboBoxDropDownBackground"    Color="#FFFFFFFF"/>
@@ -63,19 +67,20 @@
             <SolidColorBrush x:Key="PackageListBackground"       Color="#08FFFFFF"/>
             <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#15FFFFFF"/>
             <SolidColorBrush x:Key="AppSplitterBackground"       Color="#66000000"/>
-            <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#66202020"/>
+            <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="Transparent"/>
             <SolidColorBrush x:Key="AppBorderBrush"              Color="#15FFFFFF"/>
             <SolidColorBrush x:Key="AppBadgeBackground"          Color="#66383838"/>
             <SolidColorBrush x:Key="AppDialogPanelBackground"    Color="#662C2C2C"/>
             <SolidColorBrush x:Key="AppDialogSubtleBackground"   Color="#66393939"/>
             <SolidColorBrush x:Key="AppDialogDarkBackground"     Color="#66181818"/>
             <SolidColorBrush x:Key="IgnoredUpdatesListBackground" Color="#66181818"/>
-            <!-- Flyouts / menus / dropdowns / tooltips: MicaWindowHelper gives the popup window a DWM
-                 acrylic backdrop (transient surfaces can't use Mica). Kept mostly opaque so the surface
-                 stays readably dark even when the popup floats over bright content (e.g. the release-notes
-                 WebView) — a lighter tint let the white page wash the menu out (#5007) -->
-            <SolidColorBrush x:Key="FlyoutPresenterBackground"     Color="#BF2D2D2D"/>
-            <SolidColorBrush x:Key="MenuFlyoutPresenterBackground" Color="#FF2C2C2C"/>
+            <!-- WinUI MenuFlyoutPresenter is transparent over a DesktopAcrylic backdrop.
+                 These overrides are only merged when Windows transparency is usable;
+                 Styles.Common remains the normal opaque fallback otherwise. -->
+            <SolidColorBrush x:Key="FlyoutPresenterBackground"     Color="#F52C2C2C"/>
+            <SolidColorBrush x:Key="MenuSurfaceBrush"              Color="#F52C2C2C"/>
+            <SolidColorBrush x:Key="MenuSurfaceFallbackBrush"      Color="#FF2C2C2C"/>
+            <SolidColorBrush x:Key="MenuFlyoutPresenterBackground" Color="#F52C2C2C"/>
             <SolidColorBrush x:Key="ComboBoxDropDownBackground"    Color="#BF2D2D2D"/>
             <SolidColorBrush x:Key="ToolTipBackground"             Color="#BF2D2D2D"/>
             <!-- Expander chrome -->
diff --git a/src/UniGetUI.Avalonia/Infrastructure/AvaloniaOperationRegistry.cs b/src/UniGetUI.Avalonia/Infrastructure/AvaloniaOperationRegistry.cs
index ec4cee0450..1baac257de 100644
--- a/src/UniGetUI.Avalonia/Infrastructure/AvaloniaOperationRegistry.cs
+++ b/src/UniGetUI.Avalonia/Infrastructure/AvaloniaOperationRegistry.cs
@@ -84,16 +84,17 @@ public static void Add(AbstractOperation op)
             Dispatcher.UIThread.Post(UpdateTrayStatus);
         };
 
-        // Cancellation drives Status = Canceled from several code paths, so StatusChanged(Canceled)
-        // can fire more than once for a single operation. Handle the terminal cancel exactly once.
+        // Keep the canceled card visible, matching the removed WinUI control, but retain the
+        // old short IPC lifetime so canceled operations do not stay tracked indefinitely.
         int cancelHandled = 0;
         op.StatusChanged += (_, status) =>
         {
             if (status is OperationStatus.Canceled && Interlocked.Exchange(ref cancelHandled, 1) == 0)
             {
                 WindowsAppNotificationBridge.RemoveProgress(op);
-                _ = RemoveAfterDelayAsync(op, milliseconds: 2500);
+                _ = ForgetTrackingAfterDelayAsync(op, milliseconds: 2500);
             }
+
             Dispatcher.UIThread.Post(UpdateTrayStatus);
         };
 
@@ -165,6 +166,13 @@ public static void Remove(OperationViewModel vm)
         }
     }
 
+    private static async Task ForgetTrackingAfterDelayAsync(AbstractOperation op, int milliseconds)
+    {
+        await Task.Delay(milliseconds);
+        if (op.Status is not (OperationStatus.InQueue or OperationStatus.Running))
+            IpcOperationApi.ForgetTracking(op.Metadata.Identifier);
+    }
+
     private static async Task RemoveAfterDelayAsync(AbstractOperation op, int milliseconds)
     {
         await Task.Delay(milliseconds);
diff --git a/src/UniGetUI.Avalonia/Infrastructure/MicaWindowHelper.cs b/src/UniGetUI.Avalonia/Infrastructure/MicaWindowHelper.cs
index 5574de6671..481dd36dc9 100644
--- a/src/UniGetUI.Avalonia/Infrastructure/MicaWindowHelper.cs
+++ b/src/UniGetUI.Avalonia/Infrastructure/MicaWindowHelper.cs
@@ -21,9 +21,7 @@ namespace UniGetUI.Avalonia.Infrastructure;
 internal static class MicaWindowHelper
 {
     private const int DWMWA_WINDOW_CORNER_PREFERENCE = 33;
-    private const int DWMWA_SYSTEMBACKDROP_TYPE = 38;
     private const int DWMWCP_ROUND = 2;
-    private const int DWMSBT_TRANSIENTWINDOW = 3; // Acrylic — for transient surfaces (menus/flyouts); Mica won't paint on these
 
     private static bool _acrylicPopupsHooked;
     private static bool _micaConfirmedUnavailable;
@@ -49,9 +47,10 @@ public static void Apply(Window window)
         };
     }
 
-    // Applies the Windows 11 transient-surface treatment to popup hosts. Menus use an
-    // opaque WinUI surface; combo dropdowns, tooltips, and ordinary flyouts use acrylic.
-    // Registered once at startup when Mica is enabled.
+    // Applies the Windows 11 transient-surface treatment to popup hosts. WinUI menu
+    // flyouts/context menus use desktop acrylic just like the other transient surfaces.
+    // The native tray popup is intentionally excluded. Registered once at startup when
+    // Mica is enabled; otherwise the existing opaque surfaces remain as the fallback.
     public static void EnableAcrylicPopups()
     {
         if (!IsMicaEnabled() || _acrylicPopupsHooked)
@@ -61,10 +60,9 @@ public static void EnableAcrylicPopups()
         // In-app menus, flyouts, tooltips, and combo popups are hosted in a PopupRoot.
         Control.LoadedEvent.AddClassHandler<PopupRoot>((root, _) => ApplyAcrylicToPopup(root));
 
-        // The system-tray context menu is NOT a PopupRoot — Avalonia hosts it in its own Window
-        // (Avalonia.Win32.TrayIconImpl.TrayPopupRoot), so it misses the handler above and would
-        // render with no surface over the desktop. Catch it by type name and apply the opaque
-        // menu treatment. The other Windows (MainWindow/dialogs) are handled via Apply().
+        // The system-tray context menu is not an app flyout and must keep its existing
+        // opaque/native-looking surface. Catch Avalonia's dedicated tray popup host here.
+        // The other Windows (MainWindow/dialogs) are handled via Apply().
         Control.LoadedEvent.AddClassHandler<Window>((win, _) =>
         {
             if (win.GetType().Name == "TrayPopupRoot")
@@ -77,39 +75,54 @@ private static void ApplyAcrylicToPopup(TopLevel root)
         if (!IsMicaEnabled())
             return;
 
-        // Menus use WinUI's opaque flyout surface. Other transient controls (combo boxes,
-        // tooltips and ordinary flyouts) retain acrylic.
-        bool isMenu = root.GetType().Name == "TrayPopupRoot"
-                      || root.GetVisualDescendants()
-                          .Any(control => control is MenuFlyoutPresenter or ContextMenu);
-        if (isMenu)
-        {
-            root.TransparencyLevelHint = new[] { WindowTransparencyLevel.None };
-            if (root.TryFindResource("MenuSurfaceBrush", root.ActualThemeVariant, out object? resource)
-                && resource is IBrush brush)
-            {
-                root.Background = brush;
-            }
+        bool isTrayMenu = root.GetType().Name == "TrayPopupRoot";
+        bool isAppMenu = !isTrayMenu
+                         && root.GetVisualDescendants()
+                             .Any(control => control is MenuFlyoutPresenter or ContextMenu);
 
-            ApplyRoundedCorners(root);
+        if (isTrayMenu)
+        {
+            ApplyOpaqueMenuFallback(root);
             return;
         }
 
-        // Request acrylic (not Transparent): the Transparent level makes a layered window, and DWM
-        // system backdrops never paint on those — so the popup ended up fully see-through with only
-        // the presenter tint and make its contents unreadable. AcrylicBlur gives a composited window
-        // DWM can actually fill. This path only runs when Mica is enabled
-        // (Win11 + transparency effects), so acrylic is always available here.
+        // Avalonia's AcrylicBlur is already a real Win32 composition acrylic path:
+        // it enables the host-backdrop brush and installs Avalonia's backdrop blur/saturation
+        // effect. Keep one acrylic path for menus, flyouts, tooltips and combo popups instead
+        // of stacking a second DWM transient backdrop on ordinary Flyout surfaces.
         root.TransparencyLevelHint = new[] { WindowTransparencyLevel.AcrylicBlur, WindowTransparencyLevel.Blur };
         root.Background = Brushes.Transparent;
 
         if (root.TryGetPlatformHandle()?.Handle is not { } handle || handle == 0)
+        {
+            if (isAppMenu)
+                ApplyOpaqueMenuFallback(root);
             return;
+        }
 
         int corner = DWMWCP_ROUND;
         NativeMethods.DwmSetWindowAttribute(handle, DWMWA_WINDOW_CORNER_PREFERENCE, ref corner, sizeof(int));
-        int backdrop = DWMSBT_TRANSIENTWINDOW;
-        NativeMethods.DwmSetWindowAttribute(handle, DWMWA_SYSTEMBACKDROP_TYPE, ref backdrop, sizeof(int));
+    }
+
+    private static void ApplyOpaqueMenuFallback(TopLevel root)
+    {
+        root.TransparencyLevelHint = new[] { WindowTransparencyLevel.None };
+
+        if (root.TryFindResource("MenuSurfaceFallbackBrush", root.ActualThemeVariant, out object? resource)
+            && resource is IBrush brush)
+        {
+            // A local resource wins over the Windows-Mica transparent menu resource, so the
+            // presenter and root both return to the current solid menu appearance.
+            root.Resources["MenuSurfaceBrush"] = brush;
+            root.Background = brush;
+        }
+        else if (root.TryFindResource("MenuSurfaceBrush", root.ActualThemeVariant, out resource)
+                 && resource is IBrush existingBrush)
+        {
+            root.Background = existingBrush;
+        }
+
+        ApplyRoundedCorners(root);
     }
 
     private static void ApplyRoundedCorners(TopLevel root)
diff --git a/src/UniGetUI.Avalonia/ViewModels/DialogPages/OperationViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/DialogPages/OperationViewModel.cs
index 5b5ff7f5a7..ec50a41ff7 100644
--- a/src/UniGetUI.Avalonia/ViewModels/DialogPages/OperationViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/DialogPages/OperationViewModel.cs
@@ -29,7 +29,10 @@ public sealed record OperationBadgeVm(
     string IconPath,
     string Primary,
     string Secondary
-);
+)
+{
+    public bool HasSecondary => !string.IsNullOrEmpty(Secondary);
+}
 
 public sealed partial class OperationViewModel : ViewModelBase
 {
@@ -50,10 +53,15 @@ public sealed partial class OperationViewModel : ViewModelBase
     [ObservableProperty] private string _buttonText;
     [ObservableProperty] private bool _progressIndeterminate;
     [ObservableProperty] private double _progressValue;
-    [ObservableProperty] private IBrush _progressBrush;
-    [ObservableProperty] private IBrush _backgroundBrush;
     [ObservableProperty] private IImage? _packageIcon;
 
+    private OperationStatus _visualStatus;
+    public bool IsInQueue => _visualStatus is OperationStatus.InQueue;
+    public bool IsRunning => _visualStatus is OperationStatus.Running;
+    public bool IsSucceeded => _visualStatus is OperationStatus.Succeeded;
+    public bool IsFailed => _visualStatus is OperationStatus.Failed;
+    public bool IsCanceled => _visualStatus is OperationStatus.Canceled;
+
     private static readonly Uri _fallbackIconUri =
         new("avares://UniGetUI/Assets/package_color.png");
 
@@ -75,8 +83,7 @@ public OperationViewModel(AbstractOperation operation)
             ? operation.GetOutput()[^1].Item1
             : CoreTools.Translate("Please wait...");
         _buttonText = CoreTools.Translate("Cancel");
-        _progressBrush = new SolidColorBrush(Color.Parse("#888888"));
-        _backgroundBrush = Brushes.Transparent;
+        _visualStatus = operation.Status;
 
         _ = LoadIconAsync();
 
@@ -198,35 +205,32 @@ private void ApplyStatus(OperationStatus status)
 
     private void ApplyStatusVisuals(OperationStatus status)
     {
+        _visualStatus = status;
+        OnPropertyChanged(nameof(IsInQueue));
+        OnPropertyChanged(nameof(IsRunning));
+        OnPropertyChanged(nameof(IsSucceeded));
+        OnPropertyChanged(nameof(IsFailed));
+        OnPropertyChanged(nameof(IsCanceled));
+
         switch (status)
         {
             case OperationStatus.InQueue:
-                ProgressBrush = new SolidColorBrush(Color.Parse("#888888"));
-                BackgroundBrush = Brushes.Transparent;
                 ButtonText = CoreTools.Translate("Cancel");
                 break;
 
             case OperationStatus.Running:
-                ProgressBrush = new SolidColorBrush(Color.Parse("#F0A500"));
-                BackgroundBrush = new SolidColorBrush(Color.FromArgb(30, 240, 165, 0));
                 ButtonText = CoreTools.Translate("Cancel");
                 break;
 
             case OperationStatus.Succeeded:
-                ProgressBrush = new SolidColorBrush(Color.Parse("#0F7B0F"));
-                BackgroundBrush = new SolidColorBrush(Color.FromArgb(30, 15, 123, 15));
                 ButtonText = CoreTools.Translate("Close");
                 break;
 
             case OperationStatus.Failed:
-                ProgressBrush = new SolidColorBrush(Color.Parse("#BC0000"));
-                BackgroundBrush = new SolidColorBrush(Color.FromArgb(40, 188, 0, 0));
                 ButtonText = CoreTools.Translate("Close");
                 break;
 
             case OperationStatus.Canceled:
-                ProgressBrush = new SolidColorBrush(Color.Parse("#9D5D00"));
-                BackgroundBrush = Brushes.Transparent;
                 ButtonText = CoreTools.Translate("Close");
                 break;
         }
diff --git a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/InternetViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/InternetViewModel.cs
index b2e0f3c6a0..bdc8f81809 100644
--- a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/InternetViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/InternetViewModel.cs
@@ -45,6 +45,7 @@ public SettingsCard BuildCredentialsCard()
             MinWidth = 200,
             Margin = new Thickness(0, 0, 0, 4),
         };
+        _usernameBox.Classes.Add("search-field-standalone");
 
         _passwordBox = new TextBox
         {
@@ -52,6 +53,7 @@ public SettingsCard BuildCredentialsCard()
             MinWidth = 200,
             PasswordChar = '●',
         };
+        _passwordBox.Classes.Add("search-field-standalone");
 
         var creds = CoreSettings.GetProxyCredentials();
         if (creds is not null)
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxButtonCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxButtonCard.cs
index 1783f8842d..e67ca7682c 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxButtonCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxButtonCard.cs
@@ -98,6 +98,7 @@ public CheckboxButtonCard()
         IS_INVERTED = false;
         AutomationProperties.SetAccessibilityView(Button, AccessibilityView.Control);
 
+        RightAlignWrappedContent = true;
         Content = new StackPanel
         {
             Orientation = Orientation.Horizontal,
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxCard.cs
index d93cc8b94a..c42c2809a5 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxCard.cs
@@ -142,14 +142,9 @@ public CheckboxCard()
         _checkbox.IsCheckedChanged += _checkbox_Toggled;
         ApplyAutomationMetadata(_checkbox, _textblock.Text);
 
-        // The SettingsCard measures the Header with infinite width, so TextWrapping
-        // alone won't constrain the warning block. Fix it by updating MaxWidth after
-        // every layout pass, leaving room for the Content (toggle) area.
-        SizeChanged += (_, e) =>
-        {
-            var contentWidth = (Content as Control)?.Bounds.Width ?? 0;
-            _warningBlock.MaxWidth = Math.Max(100, e.NewSize.Width - contentWidth - 48);
-        };
+        // Header width is constrained by SettingsCard's responsive grid, so both the title
+        // and warning text wrap naturally around the right-side toggle.
+        RightAlignWrappedContent = true;
     }
 
     protected void UpdateStateLabel()
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs
index 6a30a021ad..01d89df725 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs
@@ -126,14 +126,8 @@ public SecureCheckboxCard()
         this.GetObservable(IsEnabledProperty)
             .SubscribeValue(enabled => _warningBlock.Opacity = enabled ? 1 : 0.2);
 
-        // The Devolutions SettingsCard measures the Header with infinite width, so
-        // TextWrapping alone won't constrain the warning block. We fix it by updating
-        // MaxWidth after every layout pass, leaving room for the Content (toggle) area.
-        SizeChanged += (_, e) =>
-        {
-            var contentWidth = (Content as Control)?.Bounds.Width ?? 0;
-            _warningBlock.MaxWidth = Math.Max(100, e.NewSize.Width - contentWidth - 48);
-        };
+        // Keep the toggle group on the right when the SettingsCard enters its wrapped layout.
+        RightAlignWrappedContent = true;
     }
 
     protected virtual async Task _checkbox_Toggled()
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsCard.cs
index e312b63d60..2de5976c70 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsCard.cs
@@ -24,8 +24,18 @@ public class SettingsCard : UserControl
     private readonly ContentControl _descriptionPresenter;
     private readonly ContentControl _contentPresenter;
     private readonly StackPanel _descriptionRow;
+    private readonly StackPanel _headerStack;
+    private readonly Grid _layoutGrid;
     private readonly SvgIcon _chevron;
 
+    // Match CommunityToolkit SettingsCard's responsive breakpoints. At normal widths
+    // the layout is unchanged; below these widths the content drops below the header,
+    // and at the narrowest width the header icon is hidden.
+    private const double ContentWrapThreshold = 476;
+    private const double ContentUnwrapThreshold = 488;
+    private const double HideHeaderIconThreshold = 286;
+    private bool _contentWrapped;
+
     // ── Styled properties ──────────────────────────────────────────────────
     public static readonly StyledProperty<object?> HeaderProperty =
         AvaloniaProperty.Register<SettingsCard, object?>(nameof(Header));
@@ -44,6 +54,12 @@ public class SettingsCard : UserControl
     private object? _rightContent;
     private bool _isClickEnabled;
 
+    /// <summary>
+    /// Keep compact toggle-style content at the right edge when the card wraps.
+    /// Other settings controls follow the WinUI SettingsCard behavior and align left.
+    /// </summary>
+    protected bool RightAlignWrappedContent { get; set; }
+
     // ── Events ─────────────────────────────────────────────────────────────
     public event EventHandler<RoutedEventArgs>? Click;
 
@@ -58,6 +74,7 @@ public class SettingsCard : UserControl
             _contentPresenter.Content = value is string s
                 ? new TextBlock { Text = s, FontSize = 14, VerticalAlignment = VerticalAlignment.Center }
                 : value;
+            UpdateResponsiveLayout(Bounds.Width);
         }
     }
 
@@ -92,7 +109,7 @@ public Control? HeaderIcon
         {
             _headerIcon = value;
             _iconPresenter.Content = value;
-            _iconPresenter.IsVisible = value is not null;
+            UpdateResponsiveLayout(Bounds.Width);
         }
     }
 
@@ -103,6 +120,7 @@ public bool IsClickEnabled
         {
             _isClickEnabled = value;
             Focusable = value;
+            _border.Focusable = false;
             Cursor = value ? new Cursor(StandardCursorType.Hand) : Cursor.Default;
             _chevron.IsVisible = value;
             if (value)
@@ -118,31 +136,10 @@ public bool IsClickEnabled
         set => _border.CornerRadius = value;
     }
 
-    // Base (unfocused) thickness as assigned by the consumer. Grouped cards use a
-    // partial thickness like "1,0,1,1" to share a divider with the card above; we
-    // must remember it so we can restore it when focus leaves.
-    private Thickness _baseBorderThickness = new(1);
-
     public new Thickness BorderThickness
     {
         get => _border.BorderThickness;
-        set
-        {
-            _baseBorderThickness = value;
-            // While keyboard-focused the border is forced complete (see GotFocus); don't clobber it.
-            if (!_border.Classes.Contains("settings-card-keyboard-focused"))
-                _border.BorderThickness = value;
-        }
-    }
-
-    // A focused card needs a border on all four sides, even when its base thickness omits
-    // the top (grouped cards). The accent focus style can't supply this: BorderThickness is
-    // a local value on _border, which wins over the style setter — so we set it here instead.
-    private static Thickness FocusedBorderThickness(Thickness baseThickness)
-    {
-        double t = Math.Max(Math.Max(baseThickness.Left, baseThickness.Right),
-                            Math.Max(baseThickness.Top, baseThickness.Bottom));
-        return new Thickness(Math.Max(t, 1));
+        set => _border.BorderThickness = value;
     }
 
     // ── Constructor ────────────────────────────────────────────────────────
@@ -176,21 +173,13 @@ public SettingsCard()
         };
         _descriptionRow.Children.Add(_descriptionPresenter);
 
-        var leftStack = new StackPanel
+        _headerStack = new StackPanel
         {
             Orientation = Orientation.Vertical,
             VerticalAlignment = VerticalAlignment.Center,
         };
-        leftStack.Children.Add(_headerPresenter);
-        leftStack.Children.Add(_descriptionRow);
-
-        var leftRow = new StackPanel
-        {
-            Orientation = Orientation.Horizontal,
-            VerticalAlignment = VerticalAlignment.Center,
-        };
-        leftRow.Children.Add(_iconPresenter);
-        leftRow.Children.Add(leftStack);
+        _headerStack.Children.Add(_headerPresenter);
+        _headerStack.Children.Add(_descriptionRow);
 
         _contentPresenter = new ContentControl
         {
@@ -212,43 +201,92 @@ public SettingsCard()
         };
         AutomationProperties.SetAccessibilityView(_chevron, AccessibilityView.Raw);
 
-        var grid = new Grid
+        // This mirrors the WinUI SettingsCard template: icon | header | content | action.
+        // Keeping the header directly in the star-sized grid column is important: unlike a
+        // horizontal StackPanel, it receives a finite width and TextBlock wrapping can engage
+        // before the right-side control overlaps it.
+        _layoutGrid = new Grid
         {
-            ColumnDefinitions = new ColumnDefinitions("*,Auto,Auto"),
+            ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto,Auto"),
+            RowDefinitions = new RowDefinitions("*,Auto"),
             MinHeight = 60,
             Margin = new Thickness(16, 8, 16, 8),
         };
-        Grid.SetColumn(leftRow, 0);
-        Grid.SetColumn(_contentPresenter, 1);
-        Grid.SetColumn(_chevron, 2);
-        grid.Children.Add(leftRow);
-        grid.Children.Add(_contentPresenter);
-        grid.Children.Add(_chevron);
+        Grid.SetRow(_iconPresenter, 0);
+        Grid.SetColumn(_iconPresenter, 0);
+        Grid.SetRow(_headerStack, 0);
+        Grid.SetColumn(_headerStack, 1);
+        Grid.SetRow(_contentPresenter, 0);
+        Grid.SetColumn(_contentPresenter, 2);
+        Grid.SetRow(_chevron, 0);
+        Grid.SetRowSpan(_chevron, 2);
+        Grid.SetColumn(_chevron, 3);
+        _layoutGrid.Children.Add(_iconPresenter);
+        _layoutGrid.Children.Add(_headerStack);
+        _layoutGrid.Children.Add(_contentPresenter);
+        _layoutGrid.Children.Add(_chevron);
 
         _border = new Border
         {
             CornerRadius = new CornerRadius(8),
             BorderThickness = new Thickness(1),
-            Child = grid,
+            Child = _layoutGrid,
         };
         _border.Classes.Add("settings-card");
+        Classes.Add("settings-card-control");
 
         base.Content = _border;
 
         PointerPressed += OnPointerPressed;
         KeyDown += OnKeyDown;
-        GotFocus += (_, e) =>
+        SizeChanged += (_, e) => UpdateResponsiveLayout(e.NewSize.Width);
+        // Keyboard focus keeps the SettingsCard itself as the focus target. A card-specific
+        // adorner style in Styles.Common only insets the visual ring to the visible card bounds.
+        SyncAutomationProperties();
+    }
+
+    private void UpdateResponsiveLayout(double width)
+    {
+        // Before first layout there is no useful width yet. HeaderIcon starts hidden when null,
+        // and the first SizeChanged pass will apply the responsive state.
+        if (width <= 0)
         {
-            if (!_isClickEnabled || e.NavigationMethod == NavigationMethod.Pointer) return;
-            _border.Classes.Add("settings-card-keyboard-focused");
-            _border.BorderThickness = FocusedBorderThickness(_baseBorderThickness);
-        };
-        LostFocus += (_, _) =>
+            _iconPresenter.IsVisible = _headerIcon is not null;
+            return;
+        }
+
+        double cardWidth = Math.Max(0, width - _border.Margin.Left - _border.Margin.Right);
+        bool wrapContent = _rightContent is not null
+            && (_contentWrapped
+                ? cardWidth <= ContentUnwrapThreshold
+                : cardWidth <= ContentWrapThreshold);
+        bool hideHeaderIcon = cardWidth <= HideHeaderIconThreshold;
+
+        _iconPresenter.IsVisible = _headerIcon is not null && !hideHeaderIcon;
+
+        if (wrapContent == _contentWrapped)
+            return;
+
+        _contentWrapped = wrapContent;
+        if (wrapContent)
         {
-            _border.Classes.Remove("settings-card-keyboard-focused");
-            _border.BorderThickness = _baseBorderThickness;
-        };
-        SyncAutomationProperties();
+            Grid.SetRow(_contentPresenter, 1);
+            Grid.SetColumn(_contentPresenter, 1);
+            _contentPresenter.HorizontalAlignment = HorizontalAlignment.Stretch;
+            _contentPresenter.HorizontalContentAlignment =
+                RightAlignWrappedContent ? HorizontalAlignment.Right : HorizontalAlignment.Left;
+            _contentPresenter.Margin = new Thickness(0);
+            _layoutGrid.RowSpacing = 8;
+        }
+        else
+        {
+            Grid.SetRow(_contentPresenter, 0);
+            Grid.SetColumn(_contentPresenter, 2);
+            _contentPresenter.HorizontalAlignment = HorizontalAlignment.Right;
+            _contentPresenter.HorizontalContentAlignment = HorizontalAlignment.Right;
+            _contentPresenter.Margin = new Thickness(16, 0, 0, 0);
+            _layoutGrid.RowSpacing = 0;
+        }
     }
 
     protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
@@ -281,8 +319,8 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
                 ? new TextBlock
                 {
                     Text = s,
-                    TextWrapping = TextWrapping.NoWrap,
-                    TextTrimming = TextTrimming.CharacterEllipsis,
+                    TextWrapping = TextWrapping.Wrap,
+                    TextTrimming = TextTrimming.None,
                     FontSize = 12,
                     Opacity = 0.7,
                 }
@@ -339,10 +377,8 @@ private void OnPointerPressed(object? sender, PointerPressedEventArgs e)
         if (!_isClickEnabled) return;
         if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) return;
 
-        // Pointer activation should retain the normal card stroke. Keep the accent focus visual
-        // for keyboard navigation, where it conveys useful focus information.
-        _border.Classes.Remove("settings-card-keyboard-focused");
-        _border.BorderThickness = _baseBorderThickness;
+        // Pointer activation leaves the card's normal stroke untouched; keyboard focus is
+        // handled solely by the external focus adorner.
         InvokeClick();
         e.Handled = true;
     }
@@ -350,7 +386,7 @@ private void OnPointerPressed(object? sender, PointerPressedEventArgs e)
     private void OnKeyDown(object? sender, KeyEventArgs e)
     {
         if (!_isClickEnabled) return;
-        if (e.Source != this) return;   // only when the card itself has focus, not a child
+        if (e.Source != this) return;   // only when the card itself has focus, not a child control
         if (e.Key is not (Key.Enter or Key.Space)) return;
 
         InvokeClick();
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/TextboxCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/TextboxCard.cs
index b8d2d4bea1..2d4d7cc5f3 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/TextboxCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/TextboxCard.cs
@@ -82,6 +82,7 @@ public TextboxCard()
         };
 
         _textbox = new TextBox { MinWidth = 200, MaxWidth = 300 };
+        _textbox.Classes.Add("search-field-standalone");
 
         var s = new StackPanel { Orientation = Orientation.Horizontal };
         s.Children.Add(_helpbutton);
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/ImmersiveConfirmationDialog.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/ImmersiveConfirmationDialog.axaml
index 326d7ce93d..cdcd73493d 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/ImmersiveConfirmationDialog.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/ImmersiveConfirmationDialog.axaml
@@ -41,8 +41,6 @@
                         Padding="11,5,11,6"
                         CornerRadius="4"
                         FontSize="14"
-                        Background="{DynamicResource AppDialogBackground}"
-                        BorderThickness="0"
                         HorizontalAlignment="Stretch"
                         HorizontalContentAlignment="Center"
                         VerticalContentAlignment="Center"/>
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/InstallOptionsControl.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/InstallOptionsControl.axaml
index a47221f4ff..dbfae501c1 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/InstallOptionsControl.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/InstallOptionsControl.axaml
@@ -19,10 +19,6 @@
             <Setter Property="Background" Value="{DynamicResource InstallOptionsTabSelectedBackground}"/>
             <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPointerOver}"/>
         </Style>
-        <Style Selector="ComboBox.install-option-input:focus-within">
-            <Setter Property="Background" Value="{DynamicResource InstallOptionsTabSelectedBackground}"/>
-            <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPressed}"/>
-        </Style>
 
         <!-- WinUI-style rich tabs: roomy headers that hold an icon + two text lines. -->
         <Style Selector="TabControl.install-options-tabs">
@@ -55,9 +51,11 @@
                                 <ScrollViewer x:Name="TabHeadersScrollViewer"
                                               Grid.Column="1"
                                               HorizontalScrollBarVisibility="Hidden"
-                                              VerticalScrollBarVisibility="Disabled">
+                                              VerticalScrollBarVisibility="Disabled"
+                                              HorizontalContentAlignment="Center">
                                     <ItemsPresenter Name="PART_ItemsPresenter"
-                                                    ItemsPanel="{TemplateBinding ItemsPanel}"/>
+                                                    ItemsPanel="{TemplateBinding ItemsPanel}"
+                                                    HorizontalAlignment="Center"/>
                                 </ScrollViewer>
                                 <Button x:Name="NextTabButton"
                                         Grid.Column="2"
@@ -147,7 +145,7 @@
             <Setter Property="IsVisible" Value="False"/>
         </Style>
         <!-- Blur the locked options themselves; the overlay remains sharp above them. -->
-        <Style Selector="StackPanel.lockable-options.locked">
+        <Style Selector="Border.lockable-options.locked">
             <Setter Property="Effect">
                 <BlurEffect Radius="6"/>
             </Setter>
@@ -228,9 +226,11 @@
 
         <!-- ── Options area + lock overlay ── -->
         <Grid>
-          <StackPanel Spacing="12"
-                      Classes="lockable-options"
-                      Classes.locked="{Binding FollowGlobal}">
+          <Border Margin="-6"
+                  Padding="6"
+                  Classes="lockable-options"
+                  Classes.locked="{Binding FollowGlobal}">
+          <StackPanel Spacing="12">
 
             <!-- Explainer (applies to every tab, like WinUI) -->
             <TextBlock Text="{Binding GeneralInfoLabel}"
@@ -693,6 +693,7 @@
             </TabControl>
 
           </StackPanel>
+          </Border>
 
           <!-- Lock overlay shown while following the default options. The options content
                beneath it is Gaussian-blurred by the conditional style above. -->
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/InstallOptionsControl.axaml.cs b/src/UniGetUI.Avalonia/Views/DialogPages/InstallOptionsControl.axaml.cs
index a8cda424eb..2ebb61d27c 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/InstallOptionsControl.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/InstallOptionsControl.axaml.cs
@@ -3,6 +3,7 @@
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 using Avalonia.VisualTree;
 using UniGetUI.Avalonia.Infrastructure;
 using UniGetUI.Avalonia.ViewModels;
@@ -12,12 +13,19 @@ namespace UniGetUI.Avalonia.Views.DialogPages;
 public partial class InstallOptionsControl : UserControl
 {
     private const double TabScrollStep = 160d;
+    private bool _tabHeaderLayoutUpdateQueued;
 
     private InstallOptionsViewModel ViewModel => (InstallOptionsViewModel)DataContext!;
 
     public InstallOptionsControl()
     {
         InitializeComponent();
+
+        // The tab-header ScrollViewer's Extent is not reliable during the first synchronous
+        // layout pass while the immersive flyout is being attached. Re-evaluate once render
+        // layout settles so the overflow chevrons reflect the final header extent.
+        AttachedToVisualTree += (_, _) => QueueTabHeaderLayoutUpdate(InstallOptionsTabs);
+        InstallOptionsTabs.SizeChanged += (_, _) => QueueTabHeaderLayoutUpdate(InstallOptionsTabs);
     }
 
     public void FocusProfileSelector() => ProfileSelectorComboBox.Focus();
@@ -44,7 +52,22 @@ private static void ScrollTabHeaders(Control? source, double delta)
     private void InstallOptionsTabs_LayoutUpdated(object? sender, EventArgs e)
     {
         if (sender is TabControl tabControl)
-            UpdateTabScrollButtons(tabControl);
+            QueueTabHeaderLayoutUpdate(tabControl);
+    }
+
+    private void QueueTabHeaderLayoutUpdate(TabControl tabControl)
+    {
+        if (_tabHeaderLayoutUpdateQueued)
+            return;
+
+        _tabHeaderLayoutUpdateQueued = true;
+        Dispatcher.UIThread.Post(
+            () =>
+            {
+                _tabHeaderLayoutUpdateQueued = false;
+                UpdateTabScrollButtons(tabControl);
+            },
+            DispatcherPriority.Render);
     }
 
     private static ScrollViewer? FindTabHeadersScrollViewer(TabControl? tabControl)
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/OperationFailedDialog.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/OperationFailedDialog.axaml
index 174e386b3a..7f82c7856d 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/OperationFailedDialog.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/OperationFailedDialog.axaml
@@ -12,41 +12,22 @@
         Background="{DynamicResource AppDialogBackground}">
 
     <dialogs:ImmersiveDialog.Styles>
-        <!-- Scoped to this dialog family: these do not alter global Button resources. -->
+        <!-- Keep the old dialog geometry, but let the standard WinUI-like Button/SplitButton
+             resources own normal, hover, pressed and border states. -->
         <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"
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml
index f707015285..6368f171ec 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml
@@ -15,23 +15,55 @@
         Background="{DynamicResource AppDialogBackground}"
         Title="{t:Translate Package details}">
 
+    <dialogs:ImmersiveDialog.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Light">
+                    <SolidColorBrush x:Key="PackageDetailsExpanderBorderBrush" Color="#0F000000"/>
+                    <SolidColorBrush x:Key="PackageDetailsExpanderChevronHoverBackground" Color="#09000000"/>
+                    <SolidColorBrush x:Key="PackageDetailsExpanderChevronPressedBackground" Color="#06000000"/>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Dark">
+                    <SolidColorBrush x:Key="PackageDetailsExpanderBorderBrush" Color="#19000000"/>
+                    <SolidColorBrush x:Key="PackageDetailsExpanderChevronHoverBackground" Color="#0FFFFFFF"/>
+                    <SolidColorBrush x:Key="PackageDetailsExpanderChevronPressedBackground" Color="#0AFFFFFF"/>
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+        </ResourceDictionary>
+    </dialogs:ImmersiveDialog.Resources>
+
     <dialogs:ImmersiveDialog.Styles>
+        <!-- The WinUI package-details page used an ordinary Expander here. Recreate its
+             standard card surfaces while preserving this port's existing geometry. -->
         <Style Selector="Expander#InstallOptionsExpander /template/ ToggleButton#ExpanderHeader">
             <Setter Property="Background" Value="{DynamicResource InstallOptionsSectionBackground}"/>
-            <Setter Property="BorderThickness" Value="0"/>
-        </Style>
-        <!-- Fluent's Expander template applies direction-specific content borders to its own
-             template borders.  Clear every border owned by this Expander template; borders in
-             the hosted installation-options control are outside this template scope. -->
-        <Style Selector="Expander#InstallOptionsExpander /template/ Border">
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="BorderBrush" Value="Transparent"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource PackageDetailsExpanderBorderBrush}"/>
+            <Setter Property="BorderThickness" Value="1"/>
         </Style>
         <Style Selector="Expander#InstallOptionsExpander /template/ ToggleButton#ExpanderHeader:pointerover /template/ Border#ToggleButtonBackground">
             <Setter Property="Background" Value="{DynamicResource InstallOptionsSectionBackground}"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource PackageDetailsExpanderBorderBrush}"/>
+        </Style>
+        <Style Selector="Expander#InstallOptionsExpander /template/ ToggleButton#ExpanderHeader:pressed /template/ Border#ToggleButtonBackground">
+            <Setter Property="Background" Value="{DynamicResource InstallOptionsSectionBackground}"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource PackageDetailsExpanderBorderBrush}"/>
+        </Style>
+        <Style Selector="Expander#InstallOptionsExpander /template/ Border#ExpanderContent">
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource PackageDetailsExpanderBorderBrush}"/>
+        </Style>
+        <Style Selector="Expander#InstallOptionsExpander /template/ Border#ExpandCollapseChevronBorder">
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="BorderBrush" Value="Transparent"/>
+            <Setter Property="BorderThickness" Value="0"/>
         </Style>
         <Style Selector="Expander#InstallOptionsExpander /template/ ToggleButton#ExpanderHeader:pointerover /template/ Border#ExpandCollapseChevronBorder">
-            <Setter Property="Background" Value="{DynamicResource SettingsCardHoverBackground}"/>
+            <Setter Property="Background" Value="{DynamicResource PackageDetailsExpanderChevronHoverBackground}"/>
+            <Setter Property="BorderBrush" Value="Transparent"/>
+        </Style>
+        <Style Selector="Expander#InstallOptionsExpander /template/ ToggleButton#ExpanderHeader:pressed /template/ Border#ExpandCollapseChevronBorder">
+            <Setter Property="Background" Value="{DynamicResource PackageDetailsExpanderChevronPressedBackground}"/>
+            <Setter Property="BorderBrush" Value="Transparent"/>
         </Style>
 
         <!-- Tag pill -->
@@ -247,7 +279,6 @@
                                   IsExpanded="False"
                                   CornerRadius="8"
                                   Padding="0"
-                                  BorderThickness="0"
                                   Background="Transparent">
                             <Expander.Header>
                                 <Grid ColumnDefinitions="Auto,*,Auto"
diff --git a/src/UniGetUI.Avalonia/Views/MainWindow.axaml b/src/UniGetUI.Avalonia/Views/MainWindow.axaml
index 1d9535245f..a94aa44a22 100644
--- a/src/UniGetUI.Avalonia/Views/MainWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/MainWindow.axaml
@@ -5,6 +5,7 @@
         xmlns:views="using:UniGetUI.Avalonia.Views"
         xmlns:vm="using:UniGetUI.Avalonia.ViewModels"
         xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
+        xmlns:conv="using:UniGetUI.Avalonia.Converters"
         xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
         xmlns:infra="using:UniGetUI.Avalonia.Infrastructure"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -16,9 +17,13 @@
         Width="1450"
         MinWidth="700"
         MinHeight="500">
+    <Window.Resources>
+        <conv:ScaleClampConverter x:Key="OperationTitleWidthConverter"/>
+    </Window.Resources>
     <Window.Styles>
         <Style Selector="Border#GlobalSearchContainer">
             <Setter Property="Background" Value="{DynamicResource SearchBoxInactiveBackground}"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}"/>
         </Style>
         <!-- Global search box focus: a WinUI-style accent underline that spans the whole box
              (field + button) along the bottom, instead of recoloring the entire border. Toggled
@@ -91,6 +96,11 @@
              marks the drag axis. -->
         <Style Selector="GridSplitter.winui-horizontal-splitter">
             <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Transitions">
+                <Transitions>
+                    <BrushTransition Property="Background" Duration="0:0:0.083"/>
+                </Transitions>
+            </Setter>
             <Setter Property="Template">
                 <ControlTemplate>
                     <!-- Match the visible splitter track to the operation-card width.
@@ -116,11 +126,50 @@
         </Style>
         <Style Selector="Border.operations-panel-border">
             <Setter Property="BorderBrush" Value="{DynamicResource AppBorderBrush}"/>
+            <Setter Property="Transitions">
+                <Transitions>
+                    <BrushTransition Property="BorderBrush" Duration="0:0:0.083"/>
+                </Transitions>
+            </Setter>
         </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>
+
+        <!-- Semantic operation colors match the removed WinUI card's SystemFillColor brushes. -->
+        <Style Selector="Border.operation-card">
+            <Setter Property="Background" Value="{DynamicResource OperationNeutralBackgroundBrush}"/>
+        </Style>
+        <Style Selector="Border.operation-card.running">
+            <Setter Property="Background" Value="{DynamicResource OperationAttentionBackgroundBrush}"/>
+        </Style>
+        <Style Selector="Border.operation-card.failed">
+            <Setter Property="Background" Value="{DynamicResource StatusErrorBackground}"/>
+        </Style>
+        <Style Selector="ProgressBar.operation-progress">
+            <Setter Property="Foreground" Value="{DynamicResource OperationNeutralForegroundBrush}"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="BorderBrush" Value="Transparent"/>
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="MinHeight" Value="0"/>
+        </Style>
+        <Style Selector="ProgressBar.operation-progress.running">
+            <Setter Property="Foreground" Value="{DynamicResource AccentFillColorDefaultBrush}"/>
+        </Style>
+        <Style Selector="ProgressBar.operation-progress.succeeded">
+            <Setter Property="Foreground" Value="{DynamicResource StatusSuccessForeground}"/>
+        </Style>
+        <Style Selector="ProgressBar.operation-progress.failed">
+            <Setter Property="Foreground" Value="{DynamicResource StatusErrorForeground}"/>
+        </Style>
+        <Style Selector="ProgressBar.operation-progress.canceled">
+            <Setter Property="Foreground" Value="{DynamicResource StatusWarningForeground}"/>
+        </Style>
+
+        <Style Selector="Button.operation-output:pressed">
+            <Setter Property="RenderTransform" Value="none"/>
+        </Style>
     </Window.Styles>
     <Panel>
         <!-- Solid inactive-state fallback, using the same theme resource as the #5111 Mica failure path. -->
@@ -169,8 +218,7 @@
                             Width="250"
                             ClipToBounds="True"
                             IsVisible="{Binding Sidebar.NavDockVisible}"
-                            BorderBrush="{DynamicResource AppBorderBrush}"
-                            BorderThickness="0,0,1,0"
+                            BorderThickness="0"
                             Content="{Binding Sidebar}"
                             automation:AutomationProperties.AccessibilityView="Control"
                             automation:AutomationProperties.Name="{t:Translate Navigation panel}"
@@ -301,144 +349,180 @@
                                   Margin="8,4,8,4">
                         <ItemsControl.ItemTemplate>
                             <DataTemplate x:DataType="vm:OperationViewModel">
-                                <Border Background="{Binding BackgroundBrush}"
-                                        CornerRadius="6"
-                                        Padding="10,6"
-                                        Margin="0,3,0,3">
-                                    <Grid ColumnDefinitions="*,Auto">
-
-                                        <Border Grid.Column="0"
-                                                Background="Transparent"
-                                                Cursor="Hand"
-                                                Tapped="OperationCard_Tapped">
-                                        <Grid ColumnDefinitions="Auto,*">
-
-                                        <!-- Package icon -->
-                                        <Image Grid.Column="0"
-                                               Source="{Binding PackageIcon}"
-                                               Width="32" Height="24"
-                                               Margin="0,0,10,0"
-                                                 automation:AutomationProperties.AccessibilityView="Raw"
-                                               VerticalAlignment="Center"
-                                               Stretch="Uniform"/>
-
-                                        <!-- Centre: title, live line, progress, badges -->
-                                        <StackPanel Grid.Column="1"
-                                                    Spacing="3"
+                                <!-- Match the removed WinUI OperationTemplate: a 48-DIP card made
+                                     from a 32-DIP control row plus 8-DIP card padding. -->
+                                <Border Classes="operation-card"
+                                        Classes.inqueue="{Binding IsInQueue}"
+                                        Classes.running="{Binding IsRunning}"
+                                        Classes.succeeded="{Binding IsSucceeded}"
+                                        Classes.failed="{Binding IsFailed}"
+                                        Classes.canceled="{Binding IsCanceled}"
+                                        BorderBrush="{DynamicResource OperationCardBorderBrush}"
+                                        BorderThickness="1"
+                                        CornerRadius="8"
+                                        Margin="0,4"
+                                        Padding="8"
+                                        Cursor="Hand"
+                                        Tapped="OperationCard_Tapped">
+                                    <Grid ColumnDefinitions="40,*,Auto,110,36"
+                                          ColumnSpacing="0">
+
+                                            <Image Grid.Column="0"
+                                                   Source="{Binding PackageIcon}"
+                                                   Width="32" Height="24"
+                                                   Margin="0"
+                                                   automation:AutomationProperties.AccessibilityView="Raw"
+                                                   VerticalAlignment="Center"
+                                                   Stretch="Uniform"/>
+
+                                            <!-- Preserve WinUI's Auto + * behavior inside the flexible region:
+                                                 short titles use only their natural width, while long titles
+                                                 are capped to 40% so live output always retains the larger share. -->
+                                            <Grid x:Name="OperationFlexibleRegion"
+                                                  Grid.Column="1"
+                                                  ColumnDefinitions="Auto,*">
+                                                <TextBlock Grid.Column="0"
+                                                           Margin="6,0,0,0"
+                                                           MaxWidth="{Binding #OperationFlexibleRegion.Bounds.Width, Converter={StaticResource OperationTitleWidthConverter}, ConverterParameter=0.4}"
+                                                           VerticalAlignment="Center"
+                                                           Text="{Binding Title}"
+                                                           TextTrimming="CharacterEllipsis"/>
+
+                                                <!-- The live line and progress strip intentionally occupy
+                                                     the same column, exactly like the old WinUI template. -->
+                                                <Button Grid.Column="1"
+                                                        Classes="operation-output"
+                                                        Margin="12,0,0,0"
+                                                        Height="32"
+                                                        HorizontalAlignment="Stretch"
+                                                        HorizontalContentAlignment="Left"
+                                                        VerticalAlignment="Center"
+                                                        VerticalContentAlignment="Center"
+                                                        Command="{Binding ShowDetailsCommand}"
+                                                        automation:AutomationProperties.Name="{Binding Title}"
+                                                        automation:AutomationProperties.HelpText="{Binding LiveLine}"
+                                                        Content="{Binding LiveLine}"
+                                                        BorderThickness="0"
+                                                        CornerRadius="5"
+                                                        FontFamily="Consolas,Cascadia Mono,Menlo,monospace"
+                                                        Padding="8,7,8,4"
+                                                        Cursor="Hand"/>
+
+                                                <Border Grid.Column="1"
+                                                        Height="12"
+                                                        Margin="12,0,0,0"
+                                                        VerticalAlignment="Bottom"
+                                                        CornerRadius="6"
+                                                        IsHitTestVisible="False"
+                                                        automation:AutomationProperties.AccessibilityView="Raw">
+                                                    <ProgressBar Classes="operation-progress"
+                                                                 Classes.inqueue="{Binding IsInQueue}"
+                                                                 Classes.running="{Binding IsRunning}"
+                                                                 Classes.succeeded="{Binding IsSucceeded}"
+                                                                 Classes.failed="{Binding IsFailed}"
+                                                                 Classes.canceled="{Binding IsCanceled}"
+                                                                 IsIndeterminate="{Binding ProgressIndeterminate}"
+                                                                 Value="{Binding ProgressValue}"
+                                                                 Minimum="0" Maximum="100"
+                                                                 Height="2.5"
+                                                                 Margin="0"
+                                                                 VerticalAlignment="Bottom"
+                                                                 CornerRadius="0,0,6,6"/>
+                                                </Border>
+                                            </Grid>
+
+                                            <Border Grid.Column="2"
+                                                    CornerRadius="6"
+                                                    VerticalAlignment="Center">
+                                                <ItemsControl ItemsSource="{Binding Badges}">
+                                                    <ItemsControl.ItemsPanel>
+                                                        <ItemsPanelTemplate>
+                                                            <StackPanel Orientation="Horizontal" Spacing="0"/>
+                                                        </ItemsPanelTemplate>
+                                                    </ItemsControl.ItemsPanel>
+                                                    <ItemsControl.ItemTemplate>
+                                                        <DataTemplate x:DataType="vm:OperationBadgeVm">
+                                                            <Button Width="32"
+                                                                    Height="32"
+                                                                    Margin="6,0,0,0"
+                                                                    Padding="0"
+                                                                    BorderThickness="0"
+                                                                    CornerRadius="6"
+                                                                    automation:AutomationProperties.Name="{Binding Label}"
+                                                                    automation:AutomationProperties.HelpText="{Binding Primary}"
+                                                                    ToolTip.Tip="{Binding Primary}">
+                                                                <controls:SvgIcon Path="{Binding IconPath}"
+                                                                                  Width="20" Height="20"
+                                                                                  Foreground="{DynamicResource AppIconForeground}"/>
+                                                                <Button.Flyout>
+                                                                    <Flyout>
+                                                                        <Grid ColumnDefinitions="Auto,*"
+                                                                              ColumnSpacing="12"
+                                                                              MaxWidth="260"
+                                                                              VerticalAlignment="Center">
+                                                                            <controls:SvgIcon Path="{Binding IconPath}"
+                                                                                              Width="20" Height="20"
+                                                                                              VerticalAlignment="Center"
+                                                                                              Foreground="{DynamicResource AppIconForeground}"/>
+                                                                            <StackPanel Grid.Column="1"
+                                                                                        VerticalAlignment="Center">
+                                                                                <TextBlock Text="{Binding Primary}"
+                                                                                           MaxWidth="200"
+                                                                                           TextWrapping="Wrap"/>
+                                                                                <TextBlock Text="{Binding Secondary}"
+                                                                                           IsVisible="{Binding HasSecondary}"
+                                                                                           Margin="0,6,0,0"
+                                                                                           MaxWidth="200"
+                                                                                           Opacity="0.6"
+                                                                                           TextWrapping="Wrap"/>
+                                                                            </StackPanel>
+                                                                        </Grid>
+                                                                    </Flyout>
+                                                                </Button.Flyout>
+                                                            </Button>
+                                                        </DataTemplate>
+                                                    </ItemsControl.ItemTemplate>
+                                                </ItemsControl>
+                                            </Border>
+
+                                            <Button Grid.Column="3"
+                                                    Margin="6,0,1,0"
+                                                    Height="32"
+                                                    HorizontalAlignment="Stretch"
+                                                    HorizontalContentAlignment="Center"
                                                     VerticalAlignment="Center"
-                                                    Margin="0,0,8,0">
-
-                                            <TextBlock Text="{Binding Title}"
-                                                       FontWeight="SemiBold"
-                                                       FontSize="14"
-                                                       TextTrimming="CharacterEllipsis"/>
-
-                                            <Button Content="{Binding LiveLine}"
-                                                    Command="{Binding ShowDetailsCommand}"
-                                                    automation:AutomationProperties.HelpText="{Binding Title}"
-                                                    FontSize="11"
-                                                    Opacity="0.65"
-                                                    HorizontalAlignment="Left"
+                                                    VerticalContentAlignment="Center"
+                                                    Command="{Binding ButtonCommand}"
+                                                    Content="{Binding ButtonText}"
+                                                    automation:AutomationProperties.Name="{Binding ButtonText}"
+                                                    BorderThickness="0"
+                                                    CornerRadius="6,0,0,6"
+                                                    FontSize="14"/>
+
+                                            <Button Grid.Column="4"
+                                                    Width="36"
+                                                    Height="32"
+                                                    Margin="0"
                                                     Padding="0"
-                                                    Background="Transparent"
+                                                    HorizontalAlignment="Stretch"
+                                                    VerticalAlignment="Center"
                                                     BorderThickness="0"
-                                                    CornerRadius="0"
-                                                    Cursor="Hand"/>
-
-                                            <ProgressBar IsIndeterminate="{Binding ProgressIndeterminate}"
-                                                         Value="{Binding ProgressValue}"
-                                                         automation:AutomationProperties.Name="{Binding Title}"
-                                                         automation:AutomationProperties.ItemStatus="{Binding LiveLine}"
-                                                         Minimum="0" Maximum="100"
-                                                         Height="3"
-                                                         CornerRadius="2"
-                                                         Foreground="{Binding ProgressBrush}"/>
-
-                                            <!-- Badge icon-buttons (Admin, Interactive, …) -->
-                                            <ItemsControl ItemsSource="{Binding Badges}">
-                                                <ItemsControl.ItemsPanel>
-                                                    <ItemsPanelTemplate>
-                                                        <StackPanel Orientation="Horizontal" Spacing="4"/>
-                                                    </ItemsPanelTemplate>
-                                                </ItemsControl.ItemsPanel>
-                                                <ItemsControl.ItemTemplate>
-                                                    <DataTemplate x:DataType="vm:OperationBadgeVm">
-                                                        <Button Background="{DynamicResource AppBadgeBackground}"
-                                                                BorderThickness="0"
-                                                                CornerRadius="4"
-                                                                Padding="5,2"
-                                                                automation:AutomationProperties.Name="{Binding Label}"
-                                                                automation:AutomationProperties.HelpText="{Binding Primary}"
-                                                                ToolTip.Tip="{Binding Primary}">
-                                                            <StackPanel Orientation="Horizontal" Spacing="4">
-                                                                <controls:SvgIcon Path="{Binding IconPath}"
-                                                                                  Width="12" Height="12"
-                                                                                  Foreground="{DynamicResource AppIconForeground}"/>
-                                                                <TextBlock Text="{Binding Label}"
-                                                                           FontSize="10"
-                                                                           Opacity="0.8"/>
-                                                            </StackPanel>
-                                                            <Button.Flyout>
-                                                                <Flyout>
-                                                                    <StackPanel Spacing="6" MaxWidth="240">
-                                                                        <TextBlock Text="{Binding Label}"
-                                                                                   FontWeight="SemiBold"
-                                                                                   TextWrapping="Wrap"/>
-                                                                        <TextBlock Text="{Binding Primary}"
-                                                                                   Opacity="0.85"
-                                                                                   TextWrapping="Wrap"/>
-                                                                        <TextBlock Text="{Binding Secondary}"
-                                                                                   Opacity="0.7"
-                                                                                   FontSize="11"
-                                                                                   TextWrapping="Wrap"/>
-                                                                    </StackPanel>
-                                                                </Flyout>
-                                                            </Button.Flyout>
-                                                        </Button>
-                                                    </DataTemplate>
-                                                </ItemsControl.ItemTemplate>
-                                            </ItemsControl>
-
-                                        </StackPanel>
-                                        </Grid>
-                                        </Border>
-
-                                        <!-- Split-button: Cancel/Close + "…" menu -->
-                                        <Border Grid.Column="1"
-                                                CornerRadius="6"
-                                                ClipToBounds="True"
-                                                VerticalAlignment="Center">
-                                            <StackPanel Orientation="Horizontal" Height="30">
-                                                <Button Content="{Binding ButtonText}"
-                                                        Command="{Binding ButtonCommand}"
-                                                        automation:AutomationProperties.Name="{Binding ButtonText}"
-                                                        Height="30"
-                                                        Padding="14,0"
-                                                        CornerRadius="0"
-                                                        FontSize="12"
-                                                        VerticalContentAlignment="Center"
-                                                        HorizontalContentAlignment="Center"/>
-                                                <Border Width="1"
-                                                        VerticalAlignment="Stretch"
-                                                    automation:AutomationProperties.AccessibilityView="Raw"
-                                                        Background="{DynamicResource AppBorderBrush}"
-                                                        Opacity="0.3"/>
-                                                <Button Width="32"
-                                                        Height="30"
-                                                        Padding="0"
-                                                        CornerRadius="0"
-                                                        VerticalContentAlignment="Center"
-                                                        HorizontalContentAlignment="Center"
+                                                    CornerRadius="0,6,6,0"
                                                     automation:AutomationProperties.Name="{t:Translate More}"
-                                                        Flyout="{Binding OpMenu}">
-                                                    <TextBlock Text="⋯" FontSize="14"
-                                                               HorizontalAlignment="Center"
-                                                               VerticalAlignment="Center"
-                                                               automation:AutomationProperties.AccessibilityView="Raw"/>
-                                                </Button>
-                                            </StackPanel>
-                                        </Border>
-
+                                                    Flyout="{Binding OpMenu}">
+                                                <StackPanel Orientation="Horizontal"
+                                                            Spacing="3"
+                                                            HorizontalAlignment="Center"
+                                                            VerticalAlignment="Center"
+                                                            automation:AutomationProperties.AccessibilityView="Raw">
+                                                    <Border Width="3" Height="3" CornerRadius="1.5"
+                                                            Background="{DynamicResource TextFillColorPrimaryBrush}"/>
+                                                    <Border Width="3" Height="3" CornerRadius="1.5"
+                                                            Background="{DynamicResource TextFillColorPrimaryBrush}"/>
+                                                    <Border Width="3" Height="3" CornerRadius="1.5"
+                                                            Background="{DynamicResource TextFillColorPrimaryBrush}"/>
+                                                </StackPanel>
+                                            </Button>
                                     </Grid>
                                 </Border>
                             </DataTemplate>
@@ -671,7 +755,7 @@
                         CornerRadius="8"
                         Padding="4"
                         Background="{DynamicResource AppWindowBackground}"
-                        BorderBrush="{DynamicResource AppBorderBrush}"
+                        BorderBrush="{DynamicResource MenuSurfaceBorderBrush}"
                         BorderThickness="1"
                         BoxShadow="0 8 24 0 #40000000">
                     <ListBox x:Name="SuggestionsList"
diff --git a/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs b/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
index af502bdedf..4341c1aecb 100644
--- a/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
@@ -423,7 +423,7 @@ private double ComputeOperationsAutoHeight()
             return 0;
 
         const double chrome = 42;
-        const double fallbackRow = 68;
+        const double fallbackRow = 56;
 
         double rows = 0;
         int visible = Math.Min(count, 3);
diff --git a/src/UniGetUI.Avalonia/Views/Pages/HelpPage.axaml b/src/UniGetUI.Avalonia/Views/Pages/HelpPage.axaml
index adc87814b8..0bd8bc35ba 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/HelpPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/HelpPage.axaml
@@ -79,7 +79,6 @@
             </StackPanel>
 
             <Button Grid.Column="2"
-                    Classes="flat"
                     Height="35"
                     Command="{Binding OpenInBrowserCommand}"
                     automation:AutomationProperties.Name="{t:Translate View page on browser}">
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SourceManagerCard.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SourceManagerCard.axaml
index f842920231..25657a7f70 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SourceManagerCard.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SourceManagerCard.axaml
@@ -122,6 +122,7 @@
                       automation:AutomationProperties.Name="{t:Translate Known sources}"/>
             <Grid ColumnDefinitions="*,2*" ColumnSpacing="8">
                 <TextBox Grid.Column="0"
+                         Classes="search-field-standalone"
                          PlaceholderText="{Binding NameHint}"
                          Text="{Binding NewSourceName}"
                          IsEnabled="{Binding NameUrlEditable}"
@@ -129,6 +130,7 @@
                          FontSize="14"
                          automation:AutomationProperties.Name="{Binding NameHint}"/>
                 <TextBox Grid.Column="1"
+                         Classes="search-field-standalone"
                          PlaceholderText="{Binding UrlHint}"
                          Text="{Binding NewSourceUrl}"
                          IsEnabled="{Binding NameUrlEditable}"
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
index 36e38a868d..a849df2134 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
@@ -25,6 +25,17 @@
       <Style Selector="DataGridCell:current">
          <Setter Property="BorderBrush" Value="Transparent"/>
       </Style>
+
+      <!-- Package-row hover uses the same rounded RowBorder surface as selection.
+           Avalonia's default hover paints the inner BackgroundRectangle instead, which can
+           reach the viewport edge without the row's outer corner geometry. -->
+      <Style Selector="DataGrid#PackageList DataGridRow:pointerover">
+         <Setter Property="Background" Value="{DynamicResource SubtleFillColorSecondaryBrush}"/>
+      </Style>
+      <Style Selector="DataGrid#PackageList DataGridRow:pointerover /template/ Rectangle#BackgroundRectangle">
+         <Setter Property="Fill" Value="Transparent"/>
+      </Style>
+
       <!-- Remove the DataGrid's built-in line between the header and the rows -->
       <Style Selector="DataGrid /template/ Rectangle#PART_ColumnHeadersAndRowsSeparator">
          <Setter Property="IsVisible" Value="False"/>
@@ -34,21 +45,81 @@
          <Setter Property="Background" Value="{DynamicResource PackageListHeaderBackground}"/>
          <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
          <Setter Property="HorizontalContentAlignment" Value="Center"/>
-         <Setter Property="AreSeparatorsVisible" Value="False"/>
          <Setter Property="SeparatorBrush" Value="Transparent"/>
          <Setter Property="BorderThickness" Value="0"/>
          <Setter Property="CornerRadius" Value="0"/>
+         <!-- Keep the whole 44-DIP header row interactive. -->
+         <Setter Property="MinHeight" Value="44"/>
+         <Setter Property="Margin" Value="0"/>
+      </Style>
+      <Style Selector="DataGrid#PackageList DataGridColumnHeader /template/ Border#HeaderBorder">
          <Setter Property="Margin" Value="0,6,0,6"/>
       </Style>
-      <Style Selector="DataGridColumnHeader:nth-child(1)">
+      <!-- Keep DataGrid's separator visibility state for right-edge detection, but don't let
+           the stock 1-DIP separator reserve a transparent gap between adjacent headers. -->
+      <Style Selector="DataGrid#PackageList DataGridColumnHeader /template/ Rectangle#VerticalSeparator">
+         <Setter Property="Width" Value="0"/>
+      </Style>
+      <Style Selector="DataGrid#PackageList DataGridColumnHeader:nth-child(1)">
          <Setter Property="CornerRadius" Value="4,0,0,4"/>
       </Style>
-      <Style Selector="DataGridColumnHeader:nth-last-child(1)">
+      <!-- DataGrid itself marks the actual visible right-edge header by hiding its separator. -->
+      <Style Selector="DataGrid#PackageList DataGridColumnHeader[AreSeparatorsVisible=False]">
          <Setter Property="CornerRadius" Value="0,4,4,0"/>
       </Style>
+      <Style Selector="DataGrid#PackageList DataGridColumnHeader:pointerover">
+         <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderHoveredBackgroundBrush}"/>
+      </Style>
+      <Style Selector="DataGrid#PackageList DataGridColumnHeader:pointerover /template/ Grid#PART_ColumnHeaderRoot">
+         <Setter Property="Background" Value="Transparent"/>
+      </Style>
+      <Style Selector="DataGrid#PackageList DataGridColumnHeader:pressed">
+         <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderPressedBackgroundBrush}"/>
+      </Style>
+      <Style Selector="DataGrid#PackageList DataGridColumnHeader:pressed /template/ Grid#PART_ColumnHeaderRoot">
+         <Setter Property="Background" Value="Transparent"/>
+      </Style>
       <Style Selector="Expander /template/ ToggleButton#ExpanderHeader">
          <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}"/>
       </Style>
+      <!-- All package-page filter cards share this class. Override Fluent's flyout-derived
+           minimum width so the cards can contract to any saved pane width without overflowing. -->
+      <Style Selector="Expander.filter-pane-expander">
+         <Setter Property="MinWidth" Value="0"/>
+         <Setter Property="HorizontalAlignment" Value="Stretch"/>
+         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+      </Style>
+      <!-- Search-mode options must shrink with the filter pane just like the checkbox rows.
+           A fixed RadioButton height makes wrapped labels prefer extra width and then clip. -->
+      <Style Selector="RadioButton.filter-radio">
+         <Setter Property="HorizontalAlignment" Value="Stretch"/>
+         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+         <Setter Property="MinHeight" Value="30"/>
+      </Style>
+      <Style Selector="RadioButton.filter-radio /template/ ContentPresenter#PART_ContentPresenter">
+         <Setter Property="TextWrapping" Value="Wrap"/>
+      </Style>
+       <!-- The old WinUI source actions were HyperlinkButtons. Keep their border transparent
+            in every state and use subtle hover/pressed fills instead of generic Button chrome. -->
+       <Style Selector="Button.filter-hyperlink">
+          <Setter Property="Background" Value="Transparent"/>
+          <Setter Property="BorderBrush" Value="Transparent"/>
+          <Setter Property="BorderThickness" Value="1"/>
+          <Setter Property="Foreground" Value="{DynamicResource AccentTextFillColorPrimaryBrush}"/>
+       </Style>
+       <Style Selector="Button.filter-hyperlink:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+          <Setter Property="Background" Value="{DynamicResource SubtleFillColorSecondaryBrush}"/>
+          <Setter Property="BorderBrush" Value="Transparent"/>
+          <Setter Property="Foreground" Value="{DynamicResource AccentTextFillColorSecondaryBrush}"/>
+       </Style>
+       <Style Selector="Button.filter-hyperlink:pressed">
+          <Setter Property="RenderTransform" Value="none"/>
+       </Style>
+       <Style Selector="Button.filter-hyperlink:pressed /template/ ContentPresenter#PART_ContentPresenter">
+          <Setter Property="Background" Value="{DynamicResource SubtleFillColorTertiaryBrush}"/>
+          <Setter Property="BorderBrush" Value="Transparent"/>
+          <Setter Property="Foreground" Value="{DynamicResource AccentTextFillColorTertiaryBrush}"/>
+       </Style>
       <!-- Toolbar buttons: flat, no background/border in normal state (WinUI AppBarButton style) -->
       <Style Selector="#ToolbarRow Button">
          <Setter Property="Background" Value="Transparent"/>
@@ -58,14 +129,15 @@
          <Setter Property="Background" Value="Transparent"/>
          <Setter Property="BorderThickness" Value="0"/>
       </Style>
-      <!-- Main action button: card background with border -->
+      <!-- Main package action: filled but intentionally borderless, matching the old
+           WinUI toolbar treatment. The two halves still read as one fused control. -->
       <Style Selector="Button#MainToolbarButton">
          <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}"/>
-         <Setter Property="BorderThickness" Value="1"/>
+         <Setter Property="BorderThickness" Value="0"/>
       </Style>
       <Style Selector="Button#MainToolbarButtonDropdown">
          <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}"/>
-         <Setter Property="BorderThickness" Value="1"/>
+         <Setter Property="BorderThickness" Value="0"/>
       </Style>
       <!-- Render the three-state "Select all" checkbox's indeterminate glyph as a dash instead of a square -->
       <Style Selector="CheckBox:indeterminate /template/ Path#CheckGlyph">
@@ -102,6 +174,11 @@
            the persistent grip, matching WinUI's pane-resize affordance. -->
       <Style Selector="GridSplitter.winui-vertical-splitter">
          <Setter Property="Background" Value="Transparent"/>
+         <Setter Property="Transitions">
+            <Transitions>
+               <BrushTransition Property="Background" Duration="0:0:0.083"/>
+            </Transitions>
+         </Setter>
          <Setter Property="Template">
             <ControlTemplate>
                <!-- Match the visible splitter track to the package-list container on the
@@ -128,19 +205,50 @@
    </UserControl.Styles>
 
    <UserControl.Resources>
-      <ResourceDictionary>
-         <!-- Do not introduce a separate outline around a hovered/pressed filter header. -->
-         <StaticResource x:Key="ExpanderHeaderBorderBrushPointerOver" ResourceKey="ExpanderHeaderBorderBrush"/>
-         <StaticResource x:Key="ExpanderHeaderBorderBrushPressed" ResourceKey="ExpanderHeaderBorderBrush"/>
-         <!-- Only the outer compact pane keeps the pre-alpha outline. -->
-         <ResourceDictionary.ThemeDictionaries>
-            <ResourceDictionary x:Key="Light">
-               <SolidColorBrush x:Key="FilterPaneOutlineBrush" Color="#ECECEC"/>
-            </ResourceDictionary>
-            <ResourceDictionary x:Key="Dark">
-               <SolidColorBrush x:Key="FilterPaneOutlineBrush" Color="#393939"/>
-            </ResourceDictionary>
-         </ResourceDictionary.ThemeDictionaries>
+       <ResourceDictionary>
+          <!-- Match WinUI Expander interaction states inside the filter pane.
+               The card/header stays visually stable; only the chevron button reacts. -->
+          <SolidColorBrush x:Key="ExpanderChevronBackground" Color="Transparent"/>
+          <SolidColorBrush x:Key="ExpanderChevronBackgroundDisabled" Color="Transparent"/>
+          <SolidColorBrush x:Key="ExpanderChevronBorderBrush" Color="Transparent"/>
+          <SolidColorBrush x:Key="ExpanderChevronBorderBrushPointerOver" Color="Transparent"/>
+          <SolidColorBrush x:Key="ExpanderChevronBorderBrushPressed" Color="Transparent"/>
+          <SolidColorBrush x:Key="ExpanderChevronBorderBrushDisabled" Color="Transparent"/>
+
+          <!-- The slide-in pane shell keeps its original outline; these are only the
+               equivalent controls hosted inside the pane. -->
+          <ResourceDictionary.ThemeDictionaries>
+             <ResourceDictionary x:Key="Light">
+                <SolidColorBrush x:Key="FilterPaneOutlineBrush" Color="#ECECEC"/>
+                <SolidColorBrush x:Key="FilterExpanderContentBackground" Color="#06000000"/>
+                <!-- CardBackgroundFillColorDefaultBrush / CardStrokeColorDefaultBrush -->
+                <SolidColorBrush x:Key="ExpanderHeaderBackgroundPointerOver" Color="#B3FFFFFF"/>
+                <SolidColorBrush x:Key="ExpanderHeaderBackgroundPressed" Color="#B3FFFFFF"/>
+                <SolidColorBrush x:Key="ExpanderHeaderBackgroundDisabled" Color="#B3FFFFFF"/>
+                <SolidColorBrush x:Key="ExpanderHeaderBorderBrush" Color="#0F000000"/>
+                <SolidColorBrush x:Key="ExpanderHeaderBorderBrushPointerOver" Color="#0F000000"/>
+                <SolidColorBrush x:Key="ExpanderHeaderBorderBrushPressed" Color="#0F000000"/>
+                <SolidColorBrush x:Key="ExpanderHeaderBorderBrushDisabled" Color="#0F000000"/>
+                <SolidColorBrush x:Key="ExpanderContentBorderBrush" Color="#0F000000"/>
+                <!-- SubtleFillColorSecondaryBrush / SubtleFillColorTertiaryBrush -->
+                <SolidColorBrush x:Key="ExpanderChevronBackgroundPointerOver" Color="#09000000"/>
+                <SolidColorBrush x:Key="ExpanderChevronBackgroundPressed" Color="#06000000"/>
+             </ResourceDictionary>
+             <ResourceDictionary x:Key="Dark">
+                <SolidColorBrush x:Key="FilterPaneOutlineBrush" Color="#393939"/>
+                <SolidColorBrush x:Key="FilterExpanderContentBackground" Color="#08FFFFFF"/>
+                <SolidColorBrush x:Key="ExpanderHeaderBackgroundPointerOver" Color="#0DFFFFFF"/>
+                <SolidColorBrush x:Key="ExpanderHeaderBackgroundPressed" Color="#0DFFFFFF"/>
+                <SolidColorBrush x:Key="ExpanderHeaderBackgroundDisabled" Color="#0DFFFFFF"/>
+                <SolidColorBrush x:Key="ExpanderHeaderBorderBrush" Color="#19000000"/>
+                <SolidColorBrush x:Key="ExpanderHeaderBorderBrushPointerOver" Color="#19000000"/>
+                <SolidColorBrush x:Key="ExpanderHeaderBorderBrushPressed" Color="#19000000"/>
+                <SolidColorBrush x:Key="ExpanderHeaderBorderBrushDisabled" Color="#19000000"/>
+                <SolidColorBrush x:Key="ExpanderContentBorderBrush" Color="#19000000"/>
+                <SolidColorBrush x:Key="ExpanderChevronBackgroundPointerOver" Color="#0FFFFFFF"/>
+                <SolidColorBrush x:Key="ExpanderChevronBackgroundPressed" Color="#0AFFFFFF"/>
+             </ResourceDictionary>
+          </ResourceDictionary.ThemeDictionaries>
          <conv:ScaleClampConverter x:Key="ScaleClampConverter"/>
       </ResourceDictionary>
    </UserControl.Resources>
@@ -278,27 +386,46 @@
             <Grid.Resources>
                 <DataTemplate x:Key="FilterPaneContentTemplate"
                               x:DataType="vm:PackagesPageViewModel">
-                    <ScrollViewer
-                              HorizontalScrollBarVisibility="Disabled"
-                              Padding="4,8,4,0"
-                              automation:AutomationProperties.AccessibilityView="Control"
-                              automation:AutomationProperties.Name="{t:Translate Filters}"
-                              automation:AutomationProperties.LandmarkType="{x:Static peers:AutomationLandmarkType.Search}"
-                              Background="{DynamicResource MicaPageBackground}">
-                    <StackPanel x:Name="SidePanelGrid" Spacing="8" Margin="0,0,0,8">
+                    <ScrollViewer x:Name="FilterPaneScrollViewer"
+                                  HorizontalScrollBarVisibility="Disabled"
+                                  VerticalScrollBarVisibility="Auto"
+                                  HorizontalContentAlignment="Left"
+                                  VerticalContentAlignment="Top"
+                                  HorizontalAlignment="Stretch"
+                                  VerticalAlignment="Stretch"
+                                  Padding="0"
+                                  automation:AutomationProperties.AccessibilityView="Control"
+                                  automation:AutomationProperties.Name="{t:Translate Filters}"
+                                  automation:AutomationProperties.LandmarkType="{x:Static peers:AutomationLandmarkType.Search}"
+                                  Background="{DynamicResource MicaPageBackground}">
+                       <Border Width="{Binding #FilterPaneScrollViewer.Viewport.Width}"
+                               Padding="4,3,4,4"
+                               HorizontalAlignment="Left"
+                               VerticalAlignment="Top">
+                          <StackPanel x:Name="SidePanelGrid"
+                                      Spacing="8"
+                                      HorizontalAlignment="Stretch"
+                                      VerticalAlignment="Top">
 
                         <!-- Sources expander -->
-                        <Expander HorizontalAlignment="Stretch"
-                                  HorizontalContentAlignment="Stretch"
+                        <Expander Classes="filter-pane-expander"
                                   IsExpanded="True"
                                   CornerRadius="8"
                                   Padding="16,8,16,8"
-                                  Background="{DynamicResource SettingsCardBackground}">
+                                  Background="{DynamicResource FilterExpanderContentBackground}">
                             <Expander.Header>
-                                <StackPanel Orientation="Horizontal" Spacing="8">
-                                    <controls:SvgIcon Path="avares://UniGetUI/Assets/Symbols/Sources.svg" Width="16" Height="16" VerticalAlignment="Center"/>
-                                    <TextBlock Text="{t:Translate Sources}" FontSize="14" FontWeight="SemiBold" VerticalAlignment="Center"/>
-                                </StackPanel>
+                                <Grid ColumnDefinitions="Auto,*" ColumnSpacing="8">
+                                    <controls:SvgIcon Grid.Column="0"
+                                                      Path="avares://UniGetUI/Assets/Symbols/Sources.svg"
+                                                      Width="16" Height="16"
+                                                      VerticalAlignment="Center"/>
+                                    <TextBlock Grid.Column="1"
+                                               Text="{t:Translate Sources}"
+                                               FontSize="14"
+                                               FontWeight="SemiBold"
+                                               VerticalAlignment="Center"
+                                               TextWrapping="Wrap"/>
+                                </Grid>
                             </Expander.Header>
                             <StackPanel Orientation="Vertical">
                                 <TextBlock x:Name="SourcesPlaceholderText"
@@ -318,28 +445,26 @@
                                       RowSpacing="4"
                                       ColumnSpacing="4">
                                     <Button x:Name="SelectAllSourcesButton"
+                                            Classes="filter-hyperlink"
                                             Grid.Column="0"
                                             HorizontalAlignment="Stretch"
                                             HorizontalContentAlignment="Center"
                                             Command="{Binding SelectAllSources_CmdCommand}"
                                             automation:AutomationProperties.Name="{t:Translate Select all}"
-                                            Padding="2"
-                                            Background="Transparent"
-                                            BorderThickness="0">
+                                            Padding="2">
                                         <TextBlock Text="{t:Translate Select all}" FontSize="12" FontWeight="SemiBold"
-                                                   Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}"/>
+                                                   TextWrapping="Wrap" TextAlignment="Center"/>
                                     </Button>
                                     <Button x:Name="ClearSourceSelectionButton"
+                                            Classes="filter-hyperlink"
                                             Grid.Column="1"
                                             HorizontalAlignment="Stretch"
                                             HorizontalContentAlignment="Center"
                                             Command="{Binding ClearSourceSelection_CmdCommand}"
                                             automation:AutomationProperties.Name="{t:Translate Clear selection}"
-                                            Padding="2"
-                                            Background="Transparent"
-                                            BorderThickness="0">
+                                            Padding="2">
                                         <TextBlock Text="{t:Translate Clear selection}" FontSize="12" FontWeight="SemiBold"
-                                                   Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}"/>
+                                                   TextWrapping="Wrap" TextAlignment="Center"/>
                                     </Button>
                                     <ItemsControl x:Name="SourcesTreeView"
                                               Grid.Row="1"
@@ -382,7 +507,10 @@
                                                                       IsVisible="{Binding IsExpanded}"/>
                                                             </Grid>
                                                         </ToggleButton>
-                                                                <TextBlock Grid.Column="1" Text="{Binding PackageName}" VerticalAlignment="Center"/>
+                                                                <TextBlock Grid.Column="1"
+                                                                           Text="{Binding PackageName}"
+                                                                           VerticalAlignment="Center"
+                                                                           TextWrapping="Wrap"/>
                                                             </Grid>
                                                         </CheckBox.Content>
                                                     </CheckBox>
@@ -407,17 +535,24 @@
                         </Expander>
 
                         <!-- Filter options expander -->
-                        <Expander HorizontalAlignment="Stretch"
-                                  HorizontalContentAlignment="Stretch"
+                        <Expander Classes="filter-pane-expander"
                                   IsExpanded="False"
                                   CornerRadius="8"
                                   Padding="16,8,16,8"
-                                  Background="{DynamicResource SettingsCardBackground}">
+                                  Background="{DynamicResource FilterExpanderContentBackground}">
                             <Expander.Header>
-                                <StackPanel Orientation="Horizontal" Spacing="8">
-                                    <controls:SvgIcon Path="avares://UniGetUI/Assets/Symbols/Filter.svg" Width="16" Height="16" VerticalAlignment="Center"/>
-                                    <TextBlock Text="{t:Translate Filters}" FontSize="14" FontWeight="SemiBold" VerticalAlignment="Center"/>
-                                </StackPanel>
+                                <Grid ColumnDefinitions="Auto,*" ColumnSpacing="8">
+                                    <controls:SvgIcon Grid.Column="0"
+                                                      Path="avares://UniGetUI/Assets/Symbols/Filter.svg"
+                                                      Width="16" Height="16"
+                                                      VerticalAlignment="Center"/>
+                                    <TextBlock Grid.Column="1"
+                                               Text="{t:Translate Filters}"
+                                               FontSize="14"
+                                               FontWeight="SemiBold"
+                                               VerticalAlignment="Center"
+                                               TextWrapping="Wrap"/>
+                                </Grid>
                             </Expander.Header>
                             <StackPanel HorizontalAlignment="Stretch" Orientation="Vertical" Spacing="0">
                                 <CheckBox x:Name="InstantSearchCheckbox"
@@ -439,54 +574,52 @@
                         </Expander>
 
                         <!-- Search mode expander -->
-                        <Expander HorizontalAlignment="Stretch"
-                                  HorizontalContentAlignment="Stretch"
+                        <Expander Classes="filter-pane-expander"
                                   IsExpanded="True"
                                   CornerRadius="8"
                                   Padding="16,8,16,8"
-                                  Background="{DynamicResource SettingsCardBackground}">
+                                  Background="{DynamicResource FilterExpanderContentBackground}">
                             <Expander.Header>
-                                <StackPanel Orientation="Horizontal" Spacing="8">
-                                    <controls:SvgIcon Path="avares://UniGetUI/Assets/Symbols/search_filled.svg" Width="16" Height="16" VerticalAlignment="Center"/>
-                                    <TextBlock Text="{t:Translate Search mode}" FontSize="14" FontWeight="SemiBold" VerticalAlignment="Center"/>
-                                </StackPanel>
+                                <Grid ColumnDefinitions="Auto,*" ColumnSpacing="8">
+                                    <controls:SvgIcon Grid.Column="0"
+                                                      Path="avares://UniGetUI/Assets/Symbols/search_filled.svg"
+                                                      Width="16" Height="16"
+                                                      VerticalAlignment="Center"/>
+                                    <TextBlock Grid.Column="1"
+                                               Text="{t:Translate Search mode}"
+                                               FontSize="14"
+                                               FontWeight="SemiBold"
+                                               VerticalAlignment="Center"
+                                               TextWrapping="Wrap"/>
+                                </Grid>
                             </Expander.Header>
                             <StackPanel HorizontalAlignment="Stretch" Orientation="Vertical" Spacing="0">
-                                <RadioButton Height="30"
-                                             Margin="0,-2,0,-2"
+                                <RadioButton Classes="filter-radio"
                                              IsChecked="{Binding SearchMode_Name, Mode=TwoWay}"
-                                             automation:AutomationProperties.Name="{t:Translate Package Name}">
-                                    <TextBlock Text="{t:Translate Package Name}" TextWrapping="Wrap"/>
-                                </RadioButton>
-                                <RadioButton Height="30"
-                                             Margin="0,-2,0,-2"
+                                             Content="{t:Translate Package Name}"
+                                             automation:AutomationProperties.Name="{t:Translate Package Name}"/>
+                                <RadioButton Classes="filter-radio"
                                              IsChecked="{Binding SearchMode_Id, Mode=TwoWay}"
-                                             automation:AutomationProperties.Name="{t:Translate Package ID}">
-                                    <TextBlock Text="{t:Translate Package ID}" TextWrapping="Wrap"/>
-                                </RadioButton>
-                                <RadioButton Height="30"
-                                             Margin="0,-2,0,-2"
+                                             Content="{t:Translate Package ID}"
+                                             automation:AutomationProperties.Name="{t:Translate Package ID}"/>
+                                <RadioButton Classes="filter-radio"
                                              IsChecked="{Binding SearchMode_Both, Mode=TwoWay}"
-                                             automation:AutomationProperties.Name="{t:Translate Both}">
-                                    <TextBlock Text="{t:Translate Both}" TextWrapping="Wrap"/>
-                                </RadioButton>
-                                <RadioButton Height="30"
-                                             Margin="0,-2,0,-2"
+                                             Content="{t:Translate Both}"
+                                             automation:AutomationProperties.Name="{t:Translate Both}"/>
+                                <RadioButton Classes="filter-radio"
                                              IsChecked="{Binding SearchMode_Exact, Mode=TwoWay}"
-                                             automation:AutomationProperties.Name="{t:Translate Exact match}">
-                                    <TextBlock Text="{t:Translate Exact match}" TextWrapping="Wrap"/>
-                                </RadioButton>
-                                <RadioButton Height="30"
-                                             Margin="0,-2,0,-2"
+                                             Content="{t:Translate Exact match}"
+                                             automation:AutomationProperties.Name="{t:Translate Exact match}"/>
+                                <RadioButton Classes="filter-radio"
                                              IsChecked="{Binding SearchMode_Similar, Mode=TwoWay}"
                                              IsEnabled="{Binding SimilarSearchEnabled}"
-                                             automation:AutomationProperties.Name="{t:Translate Show similar packages}">
-                                    <TextBlock Text="{t:Translate Show similar packages}" TextWrapping="Wrap"/>
-                                </RadioButton>
+                                             Content="{t:Translate Show similar packages}"
+                                             automation:AutomationProperties.Name="{t:Translate Show similar packages}"/>
                             </StackPanel>
                         </Expander>
 
-                    </StackPanel>
+                          </StackPanel>
+                       </Border>
                     </ScrollViewer>
                 </DataTemplate>
             </Grid.Resources>
@@ -501,6 +634,8 @@
                     <BitmapCache RenderAtScale="1"/>
                 </Border.CacheMode>
                 <ContentControl Content="{Binding}"
+                                HorizontalContentAlignment="Stretch"
+                                VerticalContentAlignment="Stretch"
                                 ContentTemplate="{StaticResource FilterPaneContentTemplate}"/>
             </Border>
             <!-- ===== DRAG SPLITTER ===== -->
@@ -517,6 +652,7 @@
                     Grid.Column="0"
                     Grid.ColumnSpan="3"
                     ZIndex="9"
+                    CornerRadius="8"
                     Background="#60000000"
                     IsVisible="False"
                     IsHitTestVisible="True"/>
@@ -538,6 +674,8 @@
                     <BitmapCache RenderAtScale="1"/>
                 </Border.CacheMode>
                 <ContentControl Content="{Binding}"
+                                HorizontalContentAlignment="Stretch"
+                                VerticalContentAlignment="Stretch"
                                 ContentTemplate="{StaticResource FilterPaneContentTemplate}"/>
             </Border>
 
@@ -560,14 +698,14 @@
                 <Border Margin="0,6,0,6"
                         IsVisible="{Binding !MegaQueryVisible}"
                         CornerRadius="8"
-                        BorderThickness="0"
+                        BorderBrush="{DynamicResource PackageListBorderBrush}"
+                        BorderThickness="1"
                         Background="{DynamicResource PackageListBackground}">
                 <Grid RowDefinitions="Auto,*">
                     <!-- Header bar for grid/icons views (select-all) — hidden in list mode, which has its own DataGrid header -->
                     <Border Grid.Row="0"
                             IsVisible="{Binding !IsListViewMode}"
-                            BorderBrush="{DynamicResource AppBorderBrush}"
-                            BorderThickness="0,0,0,1"
+                            BorderThickness="0"
                             Padding="10,0">
                         <CheckBox IsChecked="{Binding AllPackagesChecked, Mode=TwoWay}"
                                   Content="{t:Translate Select all}"
@@ -785,8 +923,8 @@
                                             HorizontalAlignment="Stretch"
                                             automation:AutomationProperties.Name="{Binding Package.AutomationName}"
                                             automation:AutomationProperties.ItemType="{t:Translate Package}"
-                                                Background="{DynamicResource SettingsCardBackground}"
-                                                BorderBrush="{DynamicResource SettingsCardBorderBrush}" BorderThickness="1" Padding="4">
+                                                Background="{DynamicResource ControlFillColorDefaultBrush}"
+                                                BorderBrush="Transparent" BorderThickness="1" Padding="4">
                                             <Grid ColumnDefinitions="48,*,28" ColumnSpacing="4">
                                                 <Panel Grid.Column="0" Width="44" Height="44"
                                                        VerticalAlignment="Center" HorizontalAlignment="Center"
@@ -874,8 +1012,8 @@
                                             HorizontalAlignment="Stretch"
                                             automation:AutomationProperties.Name="{Binding Package.AutomationName}"
                                             automation:AutomationProperties.ItemType="{t:Translate Package}"
-                                                Background="{DynamicResource SettingsCardBackground}"
-                                                BorderBrush="{DynamicResource SettingsCardBorderBrush}" BorderThickness="1" Padding="4">
+                                                Background="{DynamicResource ControlFillColorDefaultBrush}"
+                                                BorderBrush="Transparent" BorderThickness="1" Padding="4">
                                             <Grid RowDefinitions="30,57,30,15">
                                                 <CheckBox Grid.Row="0"
                                                           Classes="package-selector"
@@ -1097,7 +1235,7 @@
                          SelectedIndex="{Binding ViewModeIndex, Mode=TwoWay}"
                          Background="Transparent"
                          BorderThickness="1"
-                         BorderBrush="{DynamicResource AppBorderBrush}"
+                         BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
                          CornerRadius="4"
                          Padding="0">
                     <ListBox.ItemsPanel>
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
index 24e08d8d0f..fe81215513 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
@@ -100,11 +100,16 @@ or nameof(PackagesPageViewModel.SortAscending))
         GenerateToolBar(ViewModel);
         InitializeToolbarOverflow();
 
-        // Double-click a list row → show details
+        // Double-click a package row → show details. DataGrid-level gestures also receive
+        // header double-clicks, so require an actual row ancestor rather than blacklisting headers.
         PackageList.DoubleTapped += (_, e) =>
         {
-            if (e.Source is Visual source
-                && (source is CheckBox || source.GetVisualAncestors().Any(control => control is CheckBox)))
+            if (e.Source is not Visual source)
+                return;
+
+            var ancestors = source.GetVisualAncestors().ToList();
+            if ((source is CheckBox || ancestors.Any(control => control is CheckBox))
+                || (source is not DataGridRow && !ancestors.Any(control => control is DataGridRow)))
             {
                 return;
             }