From 93dd48595cf3a3efe4974d94479c2963d8c2da85 Mon Sep 17 00:00:00 2001
From: Meteoni-San <141850520+Meteony@users.noreply.github.com>
Date: Sat, 1 Aug 2026 05:26:29 +0000
Subject: [PATCH 01/12] Centralize WinUI theme primitives

---
 .../Assets/Styles/Styles.Common.axaml         | 270 +++++++++++++++++-
 .../Infrastructure/SettingsAnchor.cs          |   6 +-
 .../Views/Controls/InfoBar.axaml.cs           |   4 +-
 .../Views/Controls/Settings/ButtonCard.cs     |   1 +
 .../Controls/Settings/CheckboxButtonCard.cs   |   1 +
 .../Views/Controls/StatusBadge.cs             | 128 +++++++++
 .../Views/Controls/UserAvatarControl.axaml    |   4 +-
 .../DialogPages/PackageDetailsWindow.axaml    |   2 +-
 .../Pages/SettingsPages/General.axaml.cs      |   2 +-
 .../SettingsPages/ManagersHomepage.axaml.cs   | 101 +------
 .../SettingsPages/SourceManagerCard.axaml     |   2 +-
 src/UniGetUI.Avalonia/Views/SidebarView.axaml |   6 +-
 12 files changed, 425 insertions(+), 102 deletions(-)
 create mode 100644 src/UniGetUI.Avalonia/Views/Controls/StatusBadge.cs

diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
index a05097453c..4d2227129e 100644
--- a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
+++ b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
@@ -13,6 +13,14 @@
                     <SolidColorBrush x:Key="AccentFillColorTertiaryBrush"  Color="{DynamicResource SystemAccentColorDark2}"/>
                     <SolidColorBrush x:Key="AccentFillColorDisabledBrush"  Color="#37000000"/>
                     <SolidColorBrush x:Key="AccentFillColorSelectedTextBackgroundBrush" Color="{DynamicResource SystemAccentColor}"/>
+                    <!-- Bridge Avalonia's legacy Fluent accent aliases to the same palette. -->
+                    <SolidColorBrush x:Key="SystemControlBackgroundAccentBrush" Color="{DynamicResource SystemAccentColor}"/>
+                    <SolidColorBrush x:Key="SystemControlForegroundAccentBrush" Color="{DynamicResource SystemAccentColor}"/>
+                    <SolidColorBrush x:Key="SystemControlHighlightAccentBrush" Color="{DynamicResource SystemAccentColor}"/>
+                    <SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="{DynamicResource SystemAccentColor}"/>
+                    <SolidColorBrush x:Key="SystemControlRevealFocusVisualBrush" Color="{DynamicResource SystemAccentColor}"/>
+                    <SolidColorBrush x:Key="TextControlBorderBrushFocused" Color="{DynamicResource SystemAccentColor}"/>
+                    <SolidColorBrush x:Key="TabItemHeaderSelectedPipeFill" Color="{DynamicResource SystemAccentColor}"/>
                     <!-- Subtle fills (WinUI NavigationViewItem hover/selected backgrounds) -->
                     <SolidColorBrush x:Key="SubtleFillColorSecondaryBrush" Color="#09000000"/>
                     <SolidColorBrush x:Key="SubtleFillColorTertiaryBrush"  Color="#06000000"/>
@@ -45,6 +53,15 @@
                     <SolidColorBrush x:Key="TextOnAccentFillColorSecondaryBrush"    Color="#B3FFFFFF"/>
                     <SolidColorBrush x:Key="TextOnAccentFillColorDisabledBrush"     Color="#FFFFFFFF"/>
                     <SolidColorBrush x:Key="TextOnAccentFillColorSelectedTextBrush" Color="#FFFFFFFF"/>
+                    <!-- Avalonia's Button theme reads these keys from inside its control template. -->
+                    <StaticResource x:Key="AccentButtonBackground" ResourceKey="AccentFillColorDefaultBrush"/>
+                    <StaticResource x:Key="AccentButtonBackgroundPointerOver" ResourceKey="AccentFillColorSecondaryBrush"/>
+                    <StaticResource x:Key="AccentButtonBackgroundPressed" ResourceKey="AccentFillColorTertiaryBrush"/>
+                    <StaticResource x:Key="AccentButtonBackgroundDisabled" ResourceKey="AccentFillColorDisabledBrush"/>
+                    <StaticResource x:Key="AccentButtonForeground" ResourceKey="TextOnAccentFillColorPrimaryBrush"/>
+                    <StaticResource x:Key="AccentButtonForegroundPointerOver" ResourceKey="TextOnAccentFillColorPrimaryBrush"/>
+                    <StaticResource x:Key="AccentButtonForegroundPressed" ResourceKey="TextOnAccentFillColorSecondaryBrush"/>
+                    <StaticResource x:Key="AccentButtonForegroundDisabled" ResourceKey="TextOnAccentFillColorDisabledBrush"/>
                     <!-- Settings cards -->
                     <SolidColorBrush x:Key="SettingsCardBackground"      Color="#B3FFFFFF"/>
                     <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#ECECEC"/>
@@ -58,6 +75,10 @@
                     <SolidColorBrush x:Key="ComboBoxBackgroundBorderBrushUnfocused" Color="Transparent"/>
                     <SolidColorBrush x:Key="ComboBoxBorderBrushPointerOver" Color="Transparent"/>
                     <SolidColorBrush x:Key="ComboBoxBorderBrushPressed" Color="Transparent"/>
+                    <!-- Shared WinUI dropdown surface and neutral item states. ComboBox popups
+                         use the same visual language as MenuFlyout-based pickers. -->
+                    <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="#FBFBFB"/>
                     <!-- Column header: WinUI default button (ControlFillColorDefault fill + ControlStrokeColorDefault border) -->
@@ -114,6 +135,14 @@
                     <SolidColorBrush x:Key="AccentFillColorTertiaryBrush"  Color="{DynamicResource SystemAccentColor}"/>
                     <SolidColorBrush x:Key="AccentFillColorDisabledBrush"  Color="#28FFFFFF"/>
                     <SolidColorBrush x:Key="AccentFillColorSelectedTextBackgroundBrush" Color="{DynamicResource SystemAccentColor}"/>
+                    <!-- Avalonia's defaults keep the base accent in dark mode; WinUI uses Light2. -->
+                    <SolidColorBrush x:Key="SystemControlBackgroundAccentBrush" Color="{DynamicResource SystemAccentColorLight2}"/>
+                    <SolidColorBrush x:Key="SystemControlForegroundAccentBrush" Color="{DynamicResource SystemAccentColorLight2}"/>
+                    <SolidColorBrush x:Key="SystemControlHighlightAccentBrush" Color="{DynamicResource SystemAccentColorLight2}"/>
+                    <SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="{DynamicResource SystemAccentColorLight2}"/>
+                    <SolidColorBrush x:Key="SystemControlRevealFocusVisualBrush" Color="{DynamicResource SystemAccentColorLight2}"/>
+                    <SolidColorBrush x:Key="TextControlBorderBrushFocused" Color="{DynamicResource SystemAccentColorLight2}"/>
+                    <SolidColorBrush x:Key="TabItemHeaderSelectedPipeFill" Color="{DynamicResource SystemAccentColorLight2}"/>
                     <!-- Subtle fills (WinUI NavigationViewItem hover/selected backgrounds) -->
                     <SolidColorBrush x:Key="SubtleFillColorSecondaryBrush" Color="#0FFFFFFF"/>
                     <SolidColorBrush x:Key="SubtleFillColorTertiaryBrush"  Color="#0AFFFFFF"/>
@@ -145,6 +174,15 @@
                     <SolidColorBrush x:Key="TextOnAccentFillColorSecondaryBrush"    Color="#80000000"/>
                     <SolidColorBrush x:Key="TextOnAccentFillColorDisabledBrush"     Color="#87FFFFFF"/>
                     <SolidColorBrush x:Key="TextOnAccentFillColorSelectedTextBrush" Color="#FFFFFFFF"/>
+                    <!-- Override the keys consumed by Avalonia's nested .accent button theme. -->
+                    <StaticResource x:Key="AccentButtonBackground" ResourceKey="AccentFillColorDefaultBrush"/>
+                    <StaticResource x:Key="AccentButtonBackgroundPointerOver" ResourceKey="AccentFillColorSecondaryBrush"/>
+                    <StaticResource x:Key="AccentButtonBackgroundPressed" ResourceKey="AccentFillColorTertiaryBrush"/>
+                    <StaticResource x:Key="AccentButtonBackgroundDisabled" ResourceKey="AccentFillColorDisabledBrush"/>
+                    <StaticResource x:Key="AccentButtonForeground" ResourceKey="TextOnAccentFillColorPrimaryBrush"/>
+                    <StaticResource x:Key="AccentButtonForegroundPointerOver" ResourceKey="TextOnAccentFillColorPrimaryBrush"/>
+                    <StaticResource x:Key="AccentButtonForegroundPressed" ResourceKey="TextOnAccentFillColorSecondaryBrush"/>
+                    <StaticResource x:Key="AccentButtonForegroundDisabled" ResourceKey="TextOnAccentFillColorDisabledBrush"/>
                     <!-- Settings cards -->
                     <SolidColorBrush x:Key="SettingsCardBackground"      Color="#0DFFFFFF"/>
                     <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#393939"/>
@@ -158,6 +196,9 @@
                     <SolidColorBrush x:Key="ComboBoxBackgroundBorderBrushUnfocused" Color="Transparent"/>
                     <SolidColorBrush x:Key="ComboBoxBorderBrushPointerOver" Color="Transparent"/>
                     <SolidColorBrush x:Key="ComboBoxBorderBrushPressed" Color="Transparent"/>
+                    <!-- 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"/>
                     <!-- Column header: WinUI default button (ControlFillColorDefault fill + ControlStrokeColorDefault border) -->
@@ -213,11 +254,234 @@
 
     <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
 
+    <!-- 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. -->
+    <Style Selector="Button.accent controls|SvgIcon,
+                     Button.accent:pointerover controls|SvgIcon">
+        <Setter Property="Foreground" Value="{DynamicResource TextOnAccentFillColorPrimaryBrush}"/>
+    </Style>
+    <Style Selector="Button.accent:pressed controls|SvgIcon">
+        <Setter Property="Foreground" Value="{DynamicResource TextOnAccentFillColorSecondaryBrush}"/>
+    </Style>
+    <Style Selector="Button.accent:disabled controls|SvgIcon">
+        <Setter Property="Foreground" Value="{DynamicResource TextOnAccentFillColorDisabledBrush}"/>
+    </Style>
+
+    <!-- Standard non-accent action button. Keep this semantic style separate from the
+         framework's default Button so icon, toolbar, dialog, and accent buttons retain
+         their purpose-specific appearances. Reusable controls such as ButtonCard opt in
+         automatically, making future settings actions consistent by default. -->
+    <Style Selector="Button.secondary-action">
+        <Setter Property="CornerRadius" Value="4"/>
+        <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+    </Style>
+    <Style Selector="Button.secondary-action:pointerover">
+        <Setter Property="Background" Value="{DynamicResource SettingsCardHoverBackground}"/>
+    </Style>
+    <Style Selector="Button.secondary-action:pressed">
+        <Setter Property="Background" Value="{DynamicResource SubtleFillColorTertiaryBrush}"/>
+    </Style>
+
+    <!-- Shared trigger used by button-hosted dropdowns. It intentionally does not target
+         every Button: toolbar commands and ordinary flyouts retain their own semantics. -->
+    <Style Selector="Button.dropdown-trigger">
+        <Setter Property="Padding" Value="10,6"/>
+        <Setter Property="CornerRadius" Value="4"/>
+        <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+    </Style>
+    <Style Selector="Button.dropdown-trigger.wide">
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+    </Style>
+
+    <!-- Shared compact status badge (manager availability, operation history, and future
+         state indicators). Geometry lives in StatusBadge; theme colors remain token-driven. -->
+    <Style Selector="controls|StatusBadge TextBlock.status-badge-text">
+        <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
+    </Style>
+    <Style Selector="controls|StatusBadge.status-success">
+        <Setter Property="Background" Value="{DynamicResource StatusSuccessBackground}"/>
+    </Style>
+    <Style Selector="controls|StatusBadge.status-warning">
+        <Setter Property="Background" Value="{DynamicResource WarningBannerBackground}"/>
+    </Style>
+    <Style Selector="controls|StatusBadge.status-error">
+        <Setter Property="Background" Value="{DynamicResource StatusErrorBackground}"/>
+    </Style>
+    <Style Selector="controls|StatusBadge.status-info">
+        <Setter Property="Background" Value="{DynamicResource StatusInfoBackground}"/>
+    </Style>
+    <Style Selector="controls|StatusBadge.status-success Ellipse.status-badge-icon">
+        <Setter Property="Fill" Value="{DynamicResource StatusSuccessForeground}"/>
+    </Style>
+    <Style Selector="controls|StatusBadge.status-warning Ellipse.status-badge-icon">
+        <Setter Property="Fill" Value="{DynamicResource StatusWarningForeground}"/>
+    </Style>
+    <Style Selector="controls|StatusBadge.status-error Ellipse.status-badge-icon">
+        <Setter Property="Fill" Value="{DynamicResource StatusErrorForeground}"/>
+    </Style>
+    <Style Selector="controls|StatusBadge.status-info Ellipse.status-badge-icon">
+        <Setter Property="Fill" Value="{DynamicResource TextFillColorSecondaryBrush}"/>
+    </Style>
+    <Style Selector="controls|StatusBadge.status-success Path.status-badge-glyph">
+        <Setter Property="Stroke" Value="{DynamicResource StatusSuccessBackground}"/>
+    </Style>
+    <Style Selector="controls|StatusBadge.status-warning Path.status-badge-glyph">
+        <Setter Property="Stroke" Value="{DynamicResource WarningBannerBackground}"/>
+    </Style>
+    <Style Selector="controls|StatusBadge.status-error Path.status-badge-glyph">
+        <Setter Property="Stroke" Value="{DynamicResource StatusErrorBackground}"/>
+    </Style>
+    <Style Selector="controls|StatusBadge.status-info Path.status-badge-glyph">
+        <Setter Property="Stroke" Value="{DynamicResource StatusInfoBackground}"/>
+    </Style>
+    <Style Selector="CheckBox:checked /template/ Border#NormalRectangle,
+                     CheckBox:indeterminate /template/ Border#NormalRectangle">
+        <Setter Property="Background" Value="{DynamicResource AccentFillColorDefaultBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentFillColorDefaultBrush}"/>
+    </Style>
+    <Style Selector="CheckBox:checked:pointerover /template/ Border#NormalRectangle,
+                     CheckBox:indeterminate:pointerover /template/ Border#NormalRectangle">
+        <Setter Property="Background" Value="{DynamicResource AccentFillColorSecondaryBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentFillColorSecondaryBrush}"/>
+    </Style>
+    <Style Selector="CheckBox:checked:pressed /template/ Border#NormalRectangle,
+                     CheckBox:indeterminate:pressed /template/ Border#NormalRectangle">
+        <Setter Property="Background" Value="{DynamicResource AccentFillColorTertiaryBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentFillColorTertiaryBrush}"/>
+    </Style>
+    <Style Selector="CheckBox:checked:disabled /template/ Border#NormalRectangle,
+                     CheckBox:indeterminate:disabled /template/ Border#NormalRectangle">
+        <Setter Property="Background" Value="{DynamicResource AccentFillColorDisabledBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentFillColorDisabledBrush}"/>
+    </Style>
+    <Style Selector="CheckBox:checked /template/ Path#CheckGlyph,
+                     CheckBox:indeterminate /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource TextOnAccentFillColorPrimaryBrush}"/>
+    </Style>
+    <Style Selector="CheckBox:checked:pointerover /template/ Path#CheckGlyph,
+                     CheckBox:indeterminate:pointerover /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource TextOnAccentFillColorPrimaryBrush}"/>
+    </Style>
+    <Style Selector="CheckBox:checked:pressed /template/ Path#CheckGlyph,
+                     CheckBox:indeterminate:pressed /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource TextOnAccentFillColorSecondaryBrush}"/>
+    </Style>
+    <Style Selector="CheckBox:checked:disabled /template/ Path#CheckGlyph,
+                     CheckBox:indeterminate:disabled /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource TextOnAccentFillColorDisabledBrush}"/>
+    </Style>
+
+    <Style Selector="RadioButton:checked /template/ Ellipse#CheckOuterEllipse">
+        <Setter Property="Fill" Value="{DynamicResource AccentFillColorDefaultBrush}"/>
+        <Setter Property="Stroke" Value="{DynamicResource AccentFillColorDefaultBrush}"/>
+    </Style>
+    <Style Selector="RadioButton:checked:pointerover /template/ Ellipse#CheckOuterEllipse">
+        <Setter Property="Fill" Value="{DynamicResource AccentFillColorSecondaryBrush}"/>
+        <Setter Property="Stroke" Value="{DynamicResource AccentFillColorSecondaryBrush}"/>
+    </Style>
+    <Style Selector="RadioButton:checked:pressed /template/ Ellipse#CheckOuterEllipse">
+        <Setter Property="Fill" Value="{DynamicResource AccentFillColorTertiaryBrush}"/>
+        <Setter Property="Stroke" Value="{DynamicResource AccentFillColorTertiaryBrush}"/>
+    </Style>
+    <Style Selector="RadioButton:checked:disabled /template/ Ellipse#CheckOuterEllipse">
+        <Setter Property="Fill" Value="{DynamicResource AccentFillColorDisabledBrush}"/>
+        <Setter Property="Stroke" Value="{DynamicResource AccentFillColorDisabledBrush}"/>
+    </Style>
+    <Style Selector="RadioButton:checked /template/ Ellipse#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource TextOnAccentFillColorPrimaryBrush}"/>
+    </Style>
+    <Style Selector="RadioButton:checked:pointerover /template/ Ellipse#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource TextOnAccentFillColorPrimaryBrush}"/>
+    </Style>
+    <Style Selector="RadioButton:checked:pressed /template/ Ellipse#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource TextOnAccentFillColorSecondaryBrush}"/>
+    </Style>
+    <Style Selector="RadioButton:checked:disabled /template/ Ellipse#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource TextOnAccentFillColorDisabledBrush}"/>
+    </Style>
+
+    <Style Selector="ToggleSwitch:checked /template/ Border#SwitchKnobBounds">
+        <Setter Property="Background" Value="{DynamicResource AccentFillColorDefaultBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentFillColorDefaultBrush}"/>
+    </Style>
+    <Style Selector="ToggleSwitch:checked:pointerover /template/ Border#SwitchKnobBounds">
+        <Setter Property="Background" Value="{DynamicResource AccentFillColorSecondaryBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentFillColorSecondaryBrush}"/>
+    </Style>
+    <Style Selector="ToggleSwitch:checked:pressed /template/ Border#SwitchKnobBounds">
+        <Setter Property="Background" Value="{DynamicResource AccentFillColorTertiaryBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentFillColorTertiaryBrush}"/>
+    </Style>
+    <Style Selector="ToggleSwitch:checked:disabled /template/ Border#SwitchKnobBounds">
+        <Setter Property="Background" Value="{DynamicResource AccentFillColorDisabledBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentFillColorDisabledBrush}"/>
+    </Style>
+    <Style Selector="ToggleSwitch:checked /template/ Ellipse#SwitchKnobOn">
+        <Setter Property="Fill" Value="{DynamicResource TextOnAccentFillColorPrimaryBrush}"/>
+    </Style>
+    <Style Selector="ToggleSwitch:checked:pointerover /template/ Ellipse#SwitchKnobOn">
+        <Setter Property="Fill" Value="{DynamicResource TextOnAccentFillColorPrimaryBrush}"/>
+    </Style>
+    <Style Selector="ToggleSwitch:checked:pressed /template/ Ellipse#SwitchKnobOn">
+        <Setter Property="Fill" Value="{DynamicResource TextOnAccentFillColorSecondaryBrush}"/>
+    </Style>
+    <Style Selector="ToggleSwitch:checked:disabled /template/ Ellipse#SwitchKnobOn">
+        <Setter Property="Fill" Value="{DynamicResource TextOnAccentFillColorDisabledBrush}"/>
+    </Style>
+
+    <Style Selector="ProgressBar">
+        <Setter Property="Foreground" Value="{DynamicResource AccentFillColorDefaultBrush}"/>
+    </Style>
+
     <!-- DataGrid selection: WinUI-style border-only. Permanent transparent border reserves layout
          space so adjacent rows don't shift on select and the accent border isn't clipped on first/last rows. -->
     <Style Selector="DataGridRow">
         <Setter Property="BorderThickness" Value="2"/>
         <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="CornerRadius" Value="4"/>
+    </Style>
+    <Style Selector="DataGridRow /template/ Rectangle#BackgroundRectangle">
+        <Setter Property="RadiusX" Value="4"/>
+        <Setter Property="RadiusY" Value="4"/>
+    </Style>
+    <!-- WinUI selection surfaces use rounded control corners rather than square highlights. -->
+    <Style Selector="ListBoxItem">
+        <Setter Property="CornerRadius" Value="4"/>
+    </Style>
+    <!-- ComboBox popups are separate visual roots, so their item geometry and states must
+         be global. The horizontal margin is the popup's inner gutter: highlights never
+         touch or obscure its rounded left/right frame. -->
+    <Style Selector="ComboBoxItem">
+        <Setter Property="Margin" Value="4,0"/>
+        <Setter Property="Padding" Value="8,4,8,5"/>
+        <Setter Property="MinHeight" Value="32"/>
+        <Setter Property="CornerRadius" Value="4"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
+    </Style>
+    <Style Selector="ComboBoxItem:pointerover /template/ ContentPresenter#PART_ContentPresenter,
+                     ComboBoxItem:selected /template/ ContentPresenter#PART_ContentPresenter,
+                     ComboBoxItem:selected:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPointerOver}"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPointerOver}"/>
+    </Style>
+    <Style Selector="ComboBoxItem:pressed /template/ ContentPresenter#PART_ContentPresenter,
+                     ComboBoxItem:selected:pressed /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPressed}"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPressed}"/>
+    </Style>
+    <Style Selector="TabItem">
+        <Setter Property="CornerRadius" Value="4"/>
     </Style>
     <!-- Column headers default to Avalonia's 12px bare-TextBlock size; WinUI renders them at 14px. -->
     <Style Selector="DataGridColumnHeader">
@@ -262,7 +526,7 @@
         <Setter Property="Background" Value="{DynamicResource MenuDividerBrush}"/>
     </Style>
     <Style Selector="DataGridRow:selected">
-        <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColor}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentFillColorDefaultBrush}"/>
     </Style>
     <Style Selector="DataGridRow:selected /template/ Rectangle#BackgroundRectangle">
         <Setter Property="Fill" Value="Transparent"/>
@@ -357,7 +621,7 @@
         <Setter Property="Background"   Value="{DynamicResource SettingsCardHoverBackground}"/>
     </Style>
     <Style Selector="Border.settings-card-focused">
-        <Setter Property="BorderBrush"     Value="{DynamicResource SystemAccentColor}"/>
+        <Setter Property="BorderBrush"     Value="{DynamicResource AccentFillColorDefaultBrush}"/>
         <Setter Property="BorderThickness" Value="2"/>
     </Style>
 
@@ -376,7 +640,7 @@
 
     <!-- Hyperlink-style text (blue accent, underline) -->
     <Style Selector="TextBlock.hyperlink">
-        <Setter Property="Foreground"       Value="{DynamicResource SystemControlHighlightAccentBrush}"/>
+        <Setter Property="Foreground"       Value="{DynamicResource AccentTextFillColorPrimaryBrush}"/>
         <Setter Property="TextDecorations"  Value="Underline"/>
         <Setter Property="Cursor"           Value="Hand"/>
     </Style>
diff --git a/src/UniGetUI.Avalonia/Infrastructure/SettingsAnchor.cs b/src/UniGetUI.Avalonia/Infrastructure/SettingsAnchor.cs
index 0192c04ad5..f46d568267 100644
--- a/src/UniGetUI.Avalonia/Infrastructure/SettingsAnchor.cs
+++ b/src/UniGetUI.Avalonia/Infrastructure/SettingsAnchor.cs
@@ -59,12 +59,12 @@ private static void Highlight(Control target)
         var layer = AdornerLayer.GetAdornerLayer(target);
         if (layer is null) return;
 
-        Color accent = target.TryFindResource("SystemAccentColor", target.ActualThemeVariant, out var res)
-                       && res is Color c ? c : Colors.DodgerBlue;
+        IBrush accent = target.TryFindResource("AccentFillColorDefaultBrush", target.ActualThemeVariant, out var res)
+                        && res is IBrush brush ? brush : Brushes.DodgerBlue;
 
         var adorner = new Border
         {
-            BorderBrush = new SolidColorBrush(accent),
+            BorderBrush = accent,
             BorderThickness = new Thickness(2),
             CornerRadius = target is Border b ? b.CornerRadius : new CornerRadius(8),
             IsHitTestVisible = false,
diff --git a/src/UniGetUI.Avalonia/Views/Controls/InfoBar.axaml.cs b/src/UniGetUI.Avalonia/Views/Controls/InfoBar.axaml.cs
index 1058a46f97..215e839041 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/InfoBar.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/InfoBar.axaml.cs
@@ -88,10 +88,10 @@ private void ApplySeverity(InfoBarSeverity severity)
             SeverityIcon.ClearValue(ForegroundProperty);
             _severityStripBinding = SeverityStrip.Bind(
                 Border.BackgroundProperty,
-                this.GetResourceObservable("SystemAccentColor"));
+                this.GetResourceObservable("AccentFillColorDefaultBrush"));
             _severityIconBinding = SeverityIcon.Bind(
                 ForegroundProperty,
-                this.GetResourceObservable("SystemAccentColor"));
+                this.GetResourceObservable("AccentFillColorDefaultBrush"));
         }
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/ButtonCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/ButtonCard.cs
index bb3f8c8dbb..6f11baf7d9 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/ButtonCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/ButtonCard.cs
@@ -31,6 +31,7 @@ public string Text
 
     public ButtonCard()
     {
+        _button.Classes.Add("secondary-action");
         _button.MinWidth = 200;
         _button.Click += (_, _) => Click?.Invoke(this, EventArgs.Empty);
         Content = _button;
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxButtonCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxButtonCard.cs
index e10f4388ec..1783f8842d 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxButtonCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxButtonCard.cs
@@ -72,6 +72,7 @@ public bool ButtonAlwaysOn
     public CheckboxButtonCard()
     {
         Button = new Button { Margin = new Thickness(0, 8, 0, 0) };
+        Button.Classes.Add("secondary-action");
         _checkbox = new ToggleSwitch
         {
             // OnContent/OffContent intentionally left null — state label is a
diff --git a/src/UniGetUI.Avalonia/Views/Controls/StatusBadge.cs b/src/UniGetUI.Avalonia/Views/Controls/StatusBadge.cs
new file mode 100644
index 0000000000..35377cfddd
--- /dev/null
+++ b/src/UniGetUI.Avalonia/Views/Controls/StatusBadge.cs
@@ -0,0 +1,128 @@
+using Avalonia;
+using Avalonia.Automation;
+using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using Avalonia.Layout;
+using Avalonia.Media;
+using AvaloniaPath = Avalonia.Controls.Shapes.Path;
+
+namespace UniGetUI.Avalonia.Views.Controls;
+
+public enum StatusBadgeSeverity
+{
+    Info,
+    Success,
+    Warning,
+    Error,
+}
+
+/// <summary>A compact, theme-aware status indicator shared across status surfaces.</summary>
+public sealed class StatusBadge : Border
+{
+    public static readonly StyledProperty<string> TextProperty =
+        AvaloniaProperty.Register<StatusBadge, string>(nameof(Text), "");
+
+    public static readonly StyledProperty<StatusBadgeSeverity> SeverityProperty =
+        AvaloniaProperty.Register<StatusBadge, StatusBadgeSeverity>(nameof(Severity));
+
+    private readonly TextBlock _text;
+    private readonly AvaloniaPath _glyph;
+
+    public string Text
+    {
+        get => GetValue(TextProperty);
+        set => SetValue(TextProperty, value);
+    }
+
+    public StatusBadgeSeverity Severity
+    {
+        get => GetValue(SeverityProperty);
+        set => SetValue(SeverityProperty, value);
+    }
+
+    public StatusBadge()
+    {
+        CornerRadius = new CornerRadius(4);
+        Padding = new Thickness(6, 3);
+        HorizontalAlignment = HorizontalAlignment.Left;
+        VerticalAlignment = VerticalAlignment.Center;
+
+        var icon = new Ellipse { Width = 12, Height = 12 };
+        icon.Classes.Add("status-badge-icon");
+        _glyph = new AvaloniaPath
+        {
+            Width = 5,
+            Height = 5,
+            StrokeThickness = 1.5,
+            StrokeLineCap = PenLineCap.Round,
+            StrokeJoin = PenLineJoin.Round,
+            Stretch = Stretch.None,
+            HorizontalAlignment = HorizontalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Center,
+        };
+        _glyph.Classes.Add("status-badge-glyph");
+
+        var iconHost = new Grid
+        {
+            Width = 12,
+            Height = 12,
+            VerticalAlignment = VerticalAlignment.Center,
+            Children = { icon, _glyph },
+        };
+        AutomationProperties.SetAccessibilityView(iconHost, AccessibilityView.Raw);
+
+        _text = new TextBlock
+        {
+            FontSize = 12,
+            FontWeight = FontWeight.SemiBold,
+            VerticalAlignment = VerticalAlignment.Center,
+        };
+        _text.Classes.Add("status-badge-text");
+
+        Child = new StackPanel
+        {
+            Orientation = Orientation.Horizontal,
+            Spacing = 5,
+            VerticalAlignment = VerticalAlignment.Center,
+            Children = { iconHost, _text },
+        };
+        UpdateAppearance();
+    }
+
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+    {
+        base.OnPropertyChanged(change);
+        if (change.Property == TextProperty || change.Property == SeverityProperty)
+            UpdateAppearance();
+    }
+
+    private void UpdateAppearance()
+    {
+        if (_text is null || _glyph is null)
+            return;
+
+        _text.Text = Text;
+        Classes.Remove("status-info");
+        Classes.Remove("status-success");
+        Classes.Remove("status-warning");
+        Classes.Remove("status-error");
+        Classes.Add(Severity switch
+        {
+            StatusBadgeSeverity.Success => "status-success",
+            StatusBadgeSeverity.Warning => "status-warning",
+            StatusBadgeSeverity.Error => "status-error",
+            _ => "status-info",
+        });
+
+        _glyph.RenderTransform = null;
+        _glyph.Data = Severity switch
+        {
+            StatusBadgeSeverity.Success => Geometry.Parse("M0.5,2.6 L2,4.1 L4.5,0.9"),
+            StatusBadgeSeverity.Warning => Geometry.Parse("M2.5,0.4 L2.5,2.1 M2.1,4.5 L2.9,4.5"),
+            StatusBadgeSeverity.Error => Geometry.Parse("M0.75,0.75 L4.25,4.25 M4.25,0.75 L0.75,4.25"),
+            _ => Geometry.Parse("M2.5,2 L2.5,4.4 M2.5,0.6 L2.5,0.7"),
+        };
+        if (Severity == StatusBadgeSeverity.Success)
+            _glyph.RenderTransform = new TranslateTransform(0, 0.5);
+    }
+}
diff --git a/src/UniGetUI.Avalonia/Views/Controls/UserAvatarControl.axaml b/src/UniGetUI.Avalonia/Views/Controls/UserAvatarControl.axaml
index ec2b11859c..f074d1c63a 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/UserAvatarControl.axaml
+++ b/src/UniGetUI.Avalonia/Views/Controls/UserAvatarControl.axaml
@@ -42,7 +42,7 @@
                                 Padding="0"
                                 Background="Transparent"
                                 BorderThickness="0"
-                                Foreground="{DynamicResource SystemAccentColor}"
+                                Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}"
                                 FontSize="11"
                                 Cursor="Hand"
                                 automation:AutomationProperties.Name="{t:Translate More details}"/>
@@ -77,7 +77,7 @@
                                 Padding="0"
                                 Background="Transparent"
                                 BorderThickness="0"
-                                Foreground="{DynamicResource SystemAccentColor}"
+                                Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}"
                                 FontSize="11"
                                 Cursor="Hand"
                                 automation:AutomationProperties.Name="{t:Translate More details}"/>
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml
index 740c25cdd0..c1efef248d 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml
@@ -196,7 +196,7 @@
                                     Classes="accent action-chevron"
                                     automation:AutomationProperties.Name="{Binding MainActionLabel}">
                                 <Path Data="M 0,0 L 4,4 L 8,0"
-                                      Stroke="White"
+                                      Stroke="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
                                       StrokeThickness="1.5"
                                       StrokeJoin="Miter"
                                       Fill="Transparent"
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml.cs
index 5d2422df93..c231e3d901 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml.cs
@@ -66,7 +66,7 @@ private static StackPanel BuildTranslatorDescription()
             Cursor = new Cursor(StandardCursorType.Hand),
             Margin = new Thickness(4, 0, 0, 0),
         };
-        link.Bind(TextBlock.ForegroundProperty, link.GetResourceObservable("SystemControlHighlightAccentBrush"));
+        link.Bind(TextBlock.ForegroundProperty, link.GetResourceObservable("AccentTextFillColorPrimaryBrush"));
         link.PointerPressed += (_, _) =>
             CoreTools.Launch("https://github.com/Devolutions/UniGetUI/blob/main/TRANSLATION.md");
 
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/ManagersHomepage.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/ManagersHomepage.axaml.cs
index 4719bfe73c..333cafae62 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/ManagersHomepage.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/ManagersHomepage.axaml.cs
@@ -1,16 +1,14 @@
 using Avalonia;
 using Avalonia.Automation;
 using Avalonia.Controls;
-using Avalonia.Controls.Shapes;
 using Avalonia.Layout;
-using Avalonia.Media;
 using UniGetUI.Avalonia.Infrastructure;
 using UniGetUI.Avalonia.ViewModels.Pages.SettingsPages;
+using UniGetUI.Avalonia.Views.Controls;
 using UniGetUI.Avalonia.Views.Controls.Settings;
 using UniGetUI.Core.Tools;
 using UniGetUI.PackageEngine;
 using UniGetUI.PackageEngine.Interfaces;
-using AvaloniaPath = Avalonia.Controls.Shapes.Path;
 using CoreSettings = UniGetUI.Core.SettingsEngine.Settings;
 
 namespace UniGetUI.Avalonia.Views.Pages.SettingsPages;
@@ -24,8 +22,7 @@ public event EventHandler? RestartRequired { add { } remove { } }
     public event EventHandler<Type>? NavigationRequested { add { } remove { } }
     public event EventHandler<IPackageManager>? ManagerNavigationRequested;
 
-    private readonly List<(ToggleSwitch Toggle, IPackageManager Manager, Border Badge,
-        Ellipse BadgeIcon, AvaloniaPath BadgeGlyph, TextBlock BadgeText)> _rows = [];
+    private readonly List<(ToggleSwitch Toggle, IPackageManager Manager, StatusBadge Badge)> _rows = [];
     private bool _isLoadingToggles;
 
     public ManagersHomepage()
@@ -47,53 +44,7 @@ public ManagersHomepage()
             var thickness = isFirst ? new Thickness(1) : new Thickness(1, 0, 1, 1);
 
             // ── Status badge (decorative — status surfaced via toggle HelpText) ─
-            var badgeText = new TextBlock
-            {
-                FontSize = 12,
-                FontWeight = FontWeight.SemiBold,
-                VerticalAlignment = VerticalAlignment.Center,
-            };
-            AutomationProperties.SetAccessibilityView(badgeText, AccessibilityView.Raw);
-
-            var badgeIcon = new Ellipse
-            {
-                Width = 12,
-                Height = 12,
-            };
-            var badgeGlyph = new AvaloniaPath
-            {
-                Width = 5,
-                Height = 5,
-                StrokeThickness = 1.5,
-                StrokeLineCap = PenLineCap.Round,
-                StrokeJoin = PenLineJoin.Round,
-                Stretch = Stretch.None,
-                HorizontalAlignment = HorizontalAlignment.Center,
-                VerticalAlignment = VerticalAlignment.Center,
-            };
-            var iconHost = new Grid
-            {
-                Width = 12,
-                Height = 12,
-                VerticalAlignment = VerticalAlignment.Center,
-                Children = { badgeIcon, badgeGlyph },
-            };
-            AutomationProperties.SetAccessibilityView(iconHost, AccessibilityView.Raw);
-
-            var badgeContent = new StackPanel
-            {
-                Orientation = Orientation.Horizontal,
-                Spacing = 5,
-                VerticalAlignment = VerticalAlignment.Center,
-                Children = { iconHost, badgeText },
-            };
-            var badge = new Border
-            {
-                CornerRadius = new CornerRadius(4),
-                Padding = new Thickness(6, 3, 6, 3),
-                HorizontalAlignment = HorizontalAlignment.Center,
-                Child = badgeContent,
-            };
+            var badge = new StatusBadge { HorizontalAlignment = HorizontalAlignment.Center };
             AutomationProperties.SetAccessibilityView(badge, AccessibilityView.Raw);
 
             // ── Enable/disable toggle ────────────────────────────────────────
@@ -110,14 +61,14 @@ public ManagersHomepage()
                 _isLoadingToggles = true;
                 toggle.IsChecked = manager.IsEnabled();
                 _isLoadingToggles = false;
-                ApplyStatusBadge(manager, toggle, badge, badgeIcon, badgeGlyph, badgeText);
+                ApplyStatusBadge(manager, toggle, badge);
             };
             toggle.IsCheckedChanged += async (_, _) =>
             {
                 if (_isLoadingToggles) return;
                 CoreSettings.SetDictionaryItem(CoreSettings.K.DisabledManagers, manager.Name, toggle.IsChecked != true);
                 await Task.Run(manager.Initialize);
-                ApplyStatusBadge(manager, toggle, badge, badgeIcon, badgeGlyph, badgeText);
+                ApplyStatusBadge(manager, toggle, badge);
                 AccessibilityAnnouncementService.AnnounceToggle(manager.DisplayName, toggle.IsChecked == true);
             };
 
@@ -146,7 +97,7 @@ public ManagersHomepage()
             btn.Click += (_, _) => ManagerNavigationRequested?.Invoke(this, capturedManager);
 
             ManagersPanel.Children.Add(btn);
-            _rows.Add((toggle, manager, badge, badgeIcon, badgeGlyph, badgeText));
+            _rows.Add((toggle, manager, badge));
         }
     }
 
@@ -154,61 +105,39 @@ public ManagersHomepage()
     public void RefreshToggles()
     {
         _isLoadingToggles = true;
-        foreach (var (toggle, manager, badge, badgeIcon, badgeGlyph, badgeText) in _rows)
+        foreach (var (toggle, manager, badge) in _rows)
         {
             toggle.IsChecked = manager.IsEnabled();
-            ApplyStatusBadge(manager, toggle, badge, badgeIcon, badgeGlyph, badgeText);
+            ApplyStatusBadge(manager, toggle, badge);
         }
         _isLoadingToggles = false;
     }
 
-    private void ApplyStatusBadge(
+    private static void ApplyStatusBadge(
         IPackageManager manager,
         ToggleSwitch toggle,
-        Border badge,
-        Ellipse icon,
-        AvaloniaPath glyph,
-        TextBlock text)
+        StatusBadge badge)
     {
-        string bgKey, fgKey, label;
-        glyph.RenderTransform = null;
+        string label;
         if (!manager.IsEnabled())
         {
-            bgKey = "WarningBannerBackground";
-            fgKey = "StatusWarningForeground";
+            badge.Severity = StatusBadgeSeverity.Warning;
             label = CoreTools.Translate("Disabled");
-            glyph.Data = Geometry.Parse("M2.5,0.4 L2.5,2.1 M2.1,4.5 L2.9,4.5");
         }
         else if (manager.Status.Found)
         {
-            bgKey = "StatusSuccessBackground";
-            fgKey = "StatusSuccessForeground";
+            badge.Severity = StatusBadgeSeverity.Success;
             label = CoreTools.Translate("Ready");
-            glyph.Data = Geometry.Parse("M0.5,2.6 L2,4.1 L4.5,0.9");
-            glyph.RenderTransform = new TranslateTransform(0, 0.5);
         }
         else
         {
-            bgKey = "StatusErrorBackground";
-            fgKey = "StatusErrorForeground";
+            badge.Severity = StatusBadgeSeverity.Error;
             label = CoreTools.Translate("Not found");
-            glyph.Data = Geometry.Parse("M0.75,0.75 L4.25,4.25 M4.25,0.75 L0.75,4.25");
         }
-        IBrush background = LookupBrush(bgKey);
-        badge.Background = background;
-        icon.Fill = LookupBrush(fgKey);
-        glyph.Stroke = background;
-        text.Foreground = LookupBrush("TextFillColorPrimaryBrush");
-        text.Text = label;
+        badge.Text = label;
         // Bake state into Name so VoiceOver always announces it on macOS
         AutomationProperties.SetName(toggle, $"{manager.DisplayName}, {label}");
         AutomationProperties.SetItemStatus(toggle, label);
     }
 
-    private IBrush LookupBrush(string key)
-    {
-        if (this.TryFindResource(key, ActualThemeVariant, out var res) && res is IBrush brush)
-            return brush;
-        return Brushes.Transparent;
-    }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SourceManagerCard.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SourceManagerCard.axaml
index 4d6b84d79e..2e09283d88 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SourceManagerCard.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SourceManagerCard.axaml
@@ -64,7 +64,7 @@
                           MinHeight="32">
                         <!-- Accent bar -->
                         <Border Grid.Column="0"
-                                Background="{DynamicResource SystemAccentColor}"
+                                Background="{DynamicResource AccentFillColorDefaultBrush}"
                                 CornerRadius="2"
                                 Margin="0,4"/>
                         <!-- Package icon + name -->
diff --git a/src/UniGetUI.Avalonia/Views/SidebarView.axaml b/src/UniGetUI.Avalonia/Views/SidebarView.axaml
index 7dc13927d9..d73f0ff5fb 100644
--- a/src/UniGetUI.Avalonia/Views/SidebarView.axaml
+++ b/src/UniGetUI.Avalonia/Views/SidebarView.axaml
@@ -66,7 +66,7 @@
                                    IsVisible="{Binding $parent[local:SidebarView].ShowLabels}"/>
                     </StackPanel>
                     <!-- Update count bubble (InfoBadge-style), anchored to the icon's top-right in both rail and flyout -->
-                    <Border Background="{DynamicResource SystemAccentColor}"
+                    <Border Background="{DynamicResource AccentFillColorDefaultBrush}"
                             CornerRadius="8"
                             Padding="3,1"
                             MinWidth="16"
@@ -76,9 +76,9 @@
                             VerticalAlignment="Top"
                             Margin="26,5,0,0">
                         <TextBlock Text="{Binding UpdatesBadgeCount}"
-                                   FontSize="9"
+                                   FontSize="11"
                                    FontWeight="Bold"
-                                   Foreground="White"
+                                   Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"/>
                     </Border>

From 5e365248d4d87698656e516863f281109ea09bb2 Mon Sep 17 00:00:00 2001
From: Meteoni-San <141850520+Meteony@users.noreply.github.com>
Date: Sat, 1 Aug 2026 05:26:48 +0000
Subject: [PATCH 02/12] Unify immersive confirmation dialogs

---
 .../Infrastructure/ConfirmationDialog.cs      | 57 +++----------
 .../UninstallConfirmationDialog.cs            | 84 +++----------------
 .../DiscardBundleChangesDialog.axaml          | 39 ---------
 .../DiscardBundleChangesDialog.axaml.cs       | 27 +++---
 .../ImmersiveConfirmationDialog.axaml         | 52 ++++++++++++
 .../ImmersiveConfirmationDialog.axaml.cs      | 69 +++++++++++++++
 .../Views/DialogPages/ImmersiveDialog.cs      |  2 +
 .../DialogPages/ResetSettingsDialog.axaml     | 39 ---------
 .../DialogPages/ResetSettingsDialog.axaml.cs  | 28 ++++---
 .../Views/DialogPages/TelemetryDialog.axaml   | 49 -----------
 .../DialogPages/TelemetryDialog.axaml.cs      | 58 +++++++++----
 src/UniGetUI.Avalonia/Views/MainWindow.axaml  | 16 ++--
 .../Views/MainWindow.axaml.cs                 |  1 +
 13 files changed, 231 insertions(+), 290 deletions(-)
 delete mode 100644 src/UniGetUI.Avalonia/Views/DialogPages/DiscardBundleChangesDialog.axaml
 create mode 100644 src/UniGetUI.Avalonia/Views/DialogPages/ImmersiveConfirmationDialog.axaml
 create mode 100644 src/UniGetUI.Avalonia/Views/DialogPages/ImmersiveConfirmationDialog.axaml.cs
 delete mode 100644 src/UniGetUI.Avalonia/Views/DialogPages/ResetSettingsDialog.axaml
 delete mode 100644 src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml

diff --git a/src/UniGetUI.Avalonia/Infrastructure/ConfirmationDialog.cs b/src/UniGetUI.Avalonia/Infrastructure/ConfirmationDialog.cs
index fee7e88bf3..ef72d861d8 100644
--- a/src/UniGetUI.Avalonia/Infrastructure/ConfirmationDialog.cs
+++ b/src/UniGetUI.Avalonia/Infrastructure/ConfirmationDialog.cs
@@ -1,8 +1,7 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Layout;
 using Avalonia.Media;
 using UniGetUI.Avalonia.Views;
+using UniGetUI.Avalonia.Views.DialogPages;
 using UniGetUI.Core.Tools;
 
 namespace UniGetUI.Avalonia.Infrastructure;
@@ -13,52 +12,22 @@ internal static class ConfirmationDialog
     public static async Task<bool> ShowAsync(string message)
     {
         if (MainWindow.Instance is not { } owner)
-            return true;
+            return false;
 
-        bool confirmed = false;
-        var dialog = new Window
+        var messageBlock = new TextBlock
         {
-            Width = 460,
-            SizeToContent = SizeToContent.Height,
-            MinHeight = 170,
-            CanResize = false,
-            ShowInTaskbar = false,
-            WindowStartupLocation = WindowStartupLocation.CenterOwner,
-            Title = CoreTools.Translate("Are you sure?"),
-        };
-
-        var noButton = new Button { Content = CoreTools.Translate("No"), MinWidth = 100 };
-        noButton.Click += (_, _) => dialog.Close();
-
-        var yesButton = new Button { Content = CoreTools.Translate("Yes"), MinWidth = 100 };
-        yesButton.Classes.Add("accent");
-        yesButton.Click += (_, _) => { confirmed = true; dialog.Close(); };
-
-        dialog.Content = new StackPanel
-        {
-            Margin = new Thickness(20),
-            Spacing = 16,
-            Children =
-            {
-                new TextBlock
-                {
-                    Text = CoreTools.Translate("Are you sure?"),
-                    FontSize = 18,
-                    FontWeight = FontWeight.SemiBold,
-                    TextWrapping = TextWrapping.Wrap,
-                },
-                new TextBlock { Text = message, Opacity = 0.82, TextWrapping = TextWrapping.Wrap },
-                new StackPanel
-                {
-                    Orientation = Orientation.Horizontal,
-                    Spacing = 8,
-                    HorizontalAlignment = HorizontalAlignment.Right,
-                    Children = { noButton, yesButton },
-                },
-            },
+            Text = message,
+            FontSize = 14,
+            LineHeight = 20,
+            TextWrapping = TextWrapping.Wrap,
         };
+        var dialog = new ImmersiveConfirmationDialog(
+            CoreTools.Translate("Are you sure?"),
+            messageBlock,
+            CoreTools.Translate("Yes"),
+            CoreTools.Translate("No"));
 
         await dialog.ShowDialog(owner);
-        return confirmed;
+        return dialog.Result is true;
     }
 }
diff --git a/src/UniGetUI.Avalonia/Infrastructure/UninstallConfirmationDialog.cs b/src/UniGetUI.Avalonia/Infrastructure/UninstallConfirmationDialog.cs
index 47d89a17ea..2afa9d7a77 100644
--- a/src/UniGetUI.Avalonia/Infrastructure/UninstallConfirmationDialog.cs
+++ b/src/UniGetUI.Avalonia/Infrastructure/UninstallConfirmationDialog.cs
@@ -1,9 +1,8 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Layout;
 using Avalonia.Media;
 using UniGetUI.Core.Tools;
 using UniGetUI.PackageEngine.Interfaces;
+using UniGetUI.Avalonia.Views.DialogPages;
 
 namespace UniGetUI.Avalonia.Infrastructure;
 
@@ -21,22 +20,6 @@ public static async Task<bool> ConfirmAsync(Window owner, IReadOnlyList<IPackage
             return false;
         }
 
-        bool isConfirmed = false;
-        var dialog = new UniGetUI.Avalonia.Views.DialogPages.ImmersiveDialog
-        {
-            MaxWidth = packages.Count == 1 ? 520 : 560,
-            MaxHeight = packages.Count == 1 ? 220 : 380,
-            Title = CoreTools.Translate("Are you sure?"),
-        };
-
-        var titleBlock = new TextBlock
-        {
-            Text = CoreTools.Translate("Are you sure?"),
-            FontSize = 18,
-            FontWeight = FontWeight.SemiBold,
-            TextWrapping = TextWrapping.Wrap,
-        };
-
         var messageBlock = new TextBlock
         {
             Text = packages.Count == 1
@@ -47,25 +30,8 @@ public static async Task<bool> ConfirmAsync(Window owner, IReadOnlyList<IPackage
             Opacity = 0.82,
             TextWrapping = TextWrapping.Wrap,
         };
-
-        var root = new Grid
-        {
-            Margin = new Thickness(20),
-            RowDefinitions = new RowDefinitions("Auto,*,Auto"),
-            RowSpacing = 14,
-        };
-
-        var headerPanel = new StackPanel
-        {
-            Spacing = 8,
-            Children =
-            {
-                titleBlock,
-                messageBlock,
-            },
-        };
-        Grid.SetRow(headerPanel, 0);
-        root.Children.Add(headerPanel);
+        var body = new StackPanel { Spacing = 12 };
+        body.Children.Add(messageBlock);
 
         if (packages.Count > 1)
         {
@@ -87,45 +53,19 @@ public static async Task<bool> ConfirmAsync(Window owner, IReadOnlyList<IPackage
                 MaxHeight = 220,
                 Content = packageListBlock,
             };
-            Grid.SetRow(packageListViewer, 1);
-            root.Children.Add(packageListViewer);
+            body.Children.Add(packageListViewer);
         }
 
-        var noButton = new Button
-        {
-            Content = CoreTools.Translate("No"),
-            MinWidth = 100,
-        };
-        noButton.Click += (_, _) => dialog.Close();
-
-        var yesButton = new Button
-        {
-            Content = CoreTools.Translate("Yes"),
-            MinWidth = 100,
-        };
-        yesButton.Classes.Add("accent");
-        yesButton.Click += (_, _) =>
-        {
-            isConfirmed = true;
-            dialog.Close();
-        };
-
-        var footerPanel = new StackPanel
+        var dialog = new ImmersiveConfirmationDialog(
+            CoreTools.Translate("Are you sure?"),
+            body,
+            CoreTools.Translate("Yes"),
+            CoreTools.Translate("No"))
         {
-            Orientation = Orientation.Horizontal,
-            Spacing = 8,
-            HorizontalAlignment = HorizontalAlignment.Right,
-            Children =
-            {
-                noButton,
-                yesButton,
-            },
+            MaxWidth = packages.Count == 1 ? 520 : 560,
+            MaxHeight = packages.Count == 1 ? 220 : 380,
         };
-        Grid.SetRow(footerPanel, 2);
-        root.Children.Add(footerPanel);
-
-        dialog.Content = root;
         await dialog.ShowDialog(owner);
-        return isConfirmed;
+        return dialog.Result is true;
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/DiscardBundleChangesDialog.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/DiscardBundleChangesDialog.axaml
deleted file mode 100644
index 8648171cf3..0000000000
--- a/src/UniGetUI.Avalonia/Views/DialogPages/DiscardBundleChangesDialog.axaml
+++ /dev/null
@@ -1,39 +0,0 @@
-<dialogs:ImmersiveDialog xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:dialogs="using:UniGetUI.Avalonia.Views.DialogPages"
-        xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
-        xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
-        x:Class="UniGetUI.Avalonia.Views.DialogPages.DiscardBundleChangesDialog"
-        Title="{t:Translate Unsaved changes}"
-        MaxWidth="460"
-        MinHeight="160"
-
-        Background="{DynamicResource AppDialogBackground}">
-
-    <Grid Margin="20"
-          RowDefinitions="Auto,Auto"
-          RowSpacing="12">
-
-        <TextBlock Grid.Row="0"
-                   Text="{t:Translate You have unsaved changes in the current bundle. Do you want to discard them?}"
-                   TextWrapping="Wrap"
-                   Opacity="0.85"/>
-
-        <StackPanel Grid.Row="1"
-                    Orientation="Horizontal"
-                    HorizontalAlignment="Right"
-                    Spacing="8">
-            <Button x:Name="CancelButton"
-                    Content="{t:Translate Cancel}"
-                    MinWidth="80"
-                    automation:AutomationProperties.Name="{t:Translate Cancel}"/>
-            <Button x:Name="DiscardButton"
-                    Content="{t:Translate Discard changes}"
-                    MinWidth="140"
-                    Classes="accent"
-                    automation:AutomationProperties.Name="{t:Translate Discard changes}"/>
-        </StackPanel>
-
-    </Grid>
-
-</dialogs:ImmersiveDialog>
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/DiscardBundleChangesDialog.axaml.cs b/src/UniGetUI.Avalonia/Views/DialogPages/DiscardBundleChangesDialog.axaml.cs
index 1f1e1cc868..988939da9d 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/DiscardBundleChangesDialog.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/DiscardBundleChangesDialog.axaml.cs
@@ -1,22 +1,25 @@
 using Avalonia.Controls;
-using Avalonia.Threading;
+using UniGetUI.Core.Tools;
 
 namespace UniGetUI.Avalonia.Views.DialogPages;
 
-public partial class DiscardBundleChangesDialog : UniGetUI.Avalonia.Views.DialogPages.ImmersiveDialog
+public sealed class DiscardBundleChangesDialog : ImmersiveConfirmationDialog
 {
-    public bool Confirmed { get; private set; }
+    public bool Confirmed => Result is true;
 
     public DiscardBundleChangesDialog()
     {
-        InitializeComponent();
-        CancelButton.Click += (_, _) => Close();
-        DiscardButton.Click += (_, _) => { Confirmed = true; Close(); };
-    }
-
-    protected override void OnOpened(EventArgs e)
-    {
-        base.OnOpened(e);
-        Dispatcher.UIThread.Post(() => DiscardButton.Focus(), DispatcherPriority.Background);
+        Configure(
+            CoreTools.Translate("Unsaved changes"),
+            new TextBlock
+            {
+                Text = CoreTools.Translate("You have unsaved changes in the current bundle. Do you want to discard them?"),
+                TextWrapping = global::Avalonia.Media.TextWrapping.Wrap,
+                Opacity = 0.85,
+            },
+            CoreTools.Translate("Discard changes"),
+            CoreTools.Translate("Cancel"));
+        MaxWidth = 460;
+        MinHeight = 160;
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/ImmersiveConfirmationDialog.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/ImmersiveConfirmationDialog.axaml
new file mode 100644
index 0000000000..326d7ce93d
--- /dev/null
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/ImmersiveConfirmationDialog.axaml
@@ -0,0 +1,52 @@
+<dialogs:ImmersiveDialog xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:dialogs="using:UniGetUI.Avalonia.Views.DialogPages"
+        x:Class="UniGetUI.Avalonia.Views.DialogPages.ImmersiveConfirmationDialog"
+        TitleMargin="24,24,0,0"
+        MaxWidth="548"
+        MinWidth="320"
+        MinHeight="136"
+        HorizontalContentAlignment="Stretch"
+        VerticalContentAlignment="Stretch"
+        Background="{DynamicResource AppDialogBackground}">
+
+    <Grid RowDefinitions="*,Auto"
+          Background="{DynamicResource AppDialogBackground}">
+        <ContentControl x:Name="BodyPresenter"
+                        Grid.Row="0"
+                        Margin="24"
+                        HorizontalContentAlignment="Stretch"
+                        VerticalContentAlignment="Top"/>
+
+        <Border Grid.Row="1"
+                Background="{DynamicResource AppDialogDarkBackground}"
+                CornerRadius="0,0,8,8"
+                ClipToBounds="True">
+            <Grid ColumnDefinitions="*,*" ColumnSpacing="8" Margin="24">
+                <Button x:Name="PrimaryButton"
+                        Grid.Column="0"
+                        Classes="accent"
+                        Height="32"
+                        MinWidth="0"
+                        Padding="11,5,11,6"
+                        CornerRadius="4"
+                        FontSize="14"
+                        HorizontalAlignment="Stretch"
+                        HorizontalContentAlignment="Center"
+                        VerticalContentAlignment="Center"/>
+                <Button x:Name="SecondaryButton"
+                        Grid.Column="1"
+                        Height="32"
+                        MinWidth="0"
+                        Padding="11,5,11,6"
+                        CornerRadius="4"
+                        FontSize="14"
+                        Background="{DynamicResource AppDialogBackground}"
+                        BorderThickness="0"
+                        HorizontalAlignment="Stretch"
+                        HorizontalContentAlignment="Center"
+                        VerticalContentAlignment="Center"/>
+            </Grid>
+        </Border>
+    </Grid>
+</dialogs:ImmersiveDialog>
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/ImmersiveConfirmationDialog.axaml.cs b/src/UniGetUI.Avalonia/Views/DialogPages/ImmersiveConfirmationDialog.axaml.cs
new file mode 100644
index 0000000000..5e3cd0f0dc
--- /dev/null
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/ImmersiveConfirmationDialog.axaml.cs
@@ -0,0 +1,69 @@
+using Avalonia.Automation;
+using Avalonia.Controls;
+using Avalonia.Threading;
+
+namespace UniGetUI.Avalonia.Views.DialogPages;
+
+/// <summary>
+/// Shared WinUI-style immersive confirmation surface. Dialog-specific classes supply only
+/// their body and labels; title spacing, footer hierarchy, actions, focus, and result handling
+/// remain consistent across the application.
+/// </summary>
+public partial class ImmersiveConfirmationDialog : ImmersiveDialog
+{
+    public bool? Result { get; private set; }
+    public bool RequireChoice { get; set; }
+    public bool FocusPrimaryButton { get; set; } = true;
+
+    public ImmersiveConfirmationDialog()
+    {
+        InitializeComponent();
+        PrimaryButton.Click += (_, _) => Complete(true);
+        SecondaryButton.Click += (_, _) => Complete(false);
+        Closing += (_, e) =>
+        {
+            if (RequireChoice && Result is null)
+                e.Cancel = true;
+        };
+    }
+
+    public ImmersiveConfirmationDialog(
+        string title,
+        object body,
+        string primaryText,
+        string secondaryText) : this()
+    {
+        Configure(title, body, primaryText, secondaryText);
+    }
+
+    protected void Configure(
+        string title,
+        object body,
+        string primaryText,
+        string secondaryText)
+    {
+        Title = title;
+        BodyPresenter.Content = body;
+        PrimaryButton.Content = primaryText;
+        SecondaryButton.Content = secondaryText;
+        AutomationProperties.SetName(PrimaryButton, primaryText);
+        AutomationProperties.SetName(SecondaryButton, secondaryText);
+    }
+
+    protected override void OnOpened(EventArgs e)
+    {
+        // A dialog instance may be shown again. Never let a previous choice leak into a
+        // later presentation (especially when RequireChoice governs close behavior).
+        Result = null;
+        base.OnOpened(e);
+        Dispatcher.UIThread.Post(
+            () => (FocusPrimaryButton ? PrimaryButton : SecondaryButton).Focus(),
+            DispatcherPriority.Background);
+    }
+
+    private void Complete(bool result)
+    {
+        Result = result;
+        Close();
+    }
+}
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/ImmersiveDialog.cs b/src/UniGetUI.Avalonia/Views/DialogPages/ImmersiveDialog.cs
index c18adf3df1..b9e00c6166 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/ImmersiveDialog.cs
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/ImmersiveDialog.cs
@@ -20,6 +20,8 @@ public class ImmersiveDialog : ContentControl
     internal event EventHandler? CloseRequested;
     public event EventHandler<CancelEventArgs>? Closing;
 
+    public Thickness TitleMargin { get; set; } = new(20, 0, 0, 0);
+
     public string? Title
     {
         get => GetValue(TitleProperty);
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/ResetSettingsDialog.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/ResetSettingsDialog.axaml
deleted file mode 100644
index 16b5baae40..0000000000
--- a/src/UniGetUI.Avalonia/Views/DialogPages/ResetSettingsDialog.axaml
+++ /dev/null
@@ -1,39 +0,0 @@
-<dialogs:ImmersiveDialog xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:dialogs="using:UniGetUI.Avalonia.Views.DialogPages"
-        xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
-        xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
-        x:Class="UniGetUI.Avalonia.Views.DialogPages.ResetSettingsDialog"
-        Title="{t:Translate Reset UniGetUI}"
-        MaxWidth="460"
-        MinHeight="160"
-
-        Background="{DynamicResource AppDialogBackground}">
-
-    <Grid Margin="20"
-          RowDefinitions="Auto,Auto"
-          RowSpacing="12">
-
-        <TextBlock Grid.Row="0"
-                   Text="{t:Translate Do you really want to reset UniGetUI to its default settings? This action cannot be undone.}"
-                   TextWrapping="Wrap"
-                   Opacity="0.85"/>
-
-        <StackPanel Grid.Row="1"
-                    Orientation="Horizontal"
-                    HorizontalAlignment="Right"
-                    Spacing="8">
-            <Button x:Name="CancelButton"
-                    Content="{t:Translate Cancel}"
-                    MinWidth="80"
-                    automation:AutomationProperties.Name="{t:Translate Cancel}"/>
-            <Button x:Name="ResetButton"
-                    Content="{t:Translate Reset UniGetUI}"
-                    MinWidth="140"
-                    Classes="accent"
-                    automation:AutomationProperties.Name="{t:Translate Reset UniGetUI}"/>
-        </StackPanel>
-
-    </Grid>
-
-</dialogs:ImmersiveDialog>
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/ResetSettingsDialog.axaml.cs b/src/UniGetUI.Avalonia/Views/DialogPages/ResetSettingsDialog.axaml.cs
index 1d38565837..dafc25ce91 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/ResetSettingsDialog.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/ResetSettingsDialog.axaml.cs
@@ -1,22 +1,26 @@
 using Avalonia.Controls;
-using Avalonia.Threading;
+using UniGetUI.Core.Tools;
 
 namespace UniGetUI.Avalonia.Views.DialogPages;
 
-public partial class ResetSettingsDialog : UniGetUI.Avalonia.Views.DialogPages.ImmersiveDialog
+public sealed class ResetSettingsDialog : ImmersiveConfirmationDialog
 {
-    public bool Confirmed { get; private set; }
+    public bool Confirmed => Result is true;
 
     public ResetSettingsDialog()
     {
-        InitializeComponent();
-        CancelButton.Click += (_, _) => Close();
-        ResetButton.Click += (_, _) => { Confirmed = true; Close(); };
-    }
-
-    protected override void OnOpened(EventArgs e)
-    {
-        base.OnOpened(e);
-        Dispatcher.UIThread.Post(() => CancelButton.Focus(), DispatcherPriority.Background);
+        Configure(
+            CoreTools.Translate("Reset UniGetUI"),
+            new TextBlock
+            {
+                Text = CoreTools.Translate("Do you really want to reset UniGetUI to its default settings? This action cannot be undone."),
+                TextWrapping = global::Avalonia.Media.TextWrapping.Wrap,
+                Opacity = 0.85,
+            },
+            CoreTools.Translate("Reset UniGetUI"),
+            CoreTools.Translate("Cancel"));
+        MaxWidth = 460;
+        MinHeight = 160;
+        FocusPrimaryButton = false;
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml
deleted file mode 100644
index 9a85f9369b..0000000000
--- a/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml
+++ /dev/null
@@ -1,49 +0,0 @@
-<dialogs:ImmersiveDialog xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:dialogs="using:UniGetUI.Avalonia.Views.DialogPages"
-    xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
-        xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
-        x:Class="UniGetUI.Avalonia.Views.DialogPages.TelemetryDialog"
-        Title="{t:Translate Share anonymous usage data}"
-        IsCloseButtonVisible="False"
-        MaxWidth="520"
-        MinWidth="420"
-        MinHeight="250"
-
-        Background="{DynamicResource AppDialogBackground}">
-
-    <Grid Margin="20"
-          RowDefinitions="Auto,Auto"
-          RowSpacing="12">
-
-        <!-- Body -->
-        <StackPanel Grid.Row="0" Spacing="8">
-            <TextBlock Text="{t:Translate UniGetUI collects anonymous usage data with the sole purpose of understanding and improving the user experience.}"
-                       TextWrapping="Wrap" Opacity="0.85"/>
-            <TextBlock x:Name="Body2" TextWrapping="Wrap" Opacity="0.85"/>
-            <TextBlock x:Name="DetailsLink"
-                       Text="{t:Translate More details about the shared data and how it will be processed}"
-                       TextDecorations="Underline"
-                       Cursor="Hand"
-                       Opacity="0.9"
-                       automation:AutomationProperties.Name="{t:Translate More details about the shared data and how it will be processed}"
-                       automation:AutomationProperties.ControlTypeOverride="Hyperlink"/>
-            <TextBlock Text="{t:Translate Text='Do you accept that UniGetUI collects and sends anonymous usage statistics, with the sole purpose of understanding and improving the user experience?'}"
-                       TextWrapping="Wrap" Opacity="0.85"/>
-        </StackPanel>
-
-        <!-- Buttons -->
-        <StackPanel Grid.Row="1"
-                    Orientation="Horizontal"
-                    HorizontalAlignment="Right"
-                    Spacing="8"
-                    Margin="0,4,0,0">
-            <Button x:Name="DeclineButton" Content="{t:Translate Decline}" MinWidth="100"
-                    automation:AutomationProperties.Name="{t:Translate Decline}"/>
-            <Button x:Name="AcceptButton"  Content="{t:Translate Accept}" MinWidth="100" Classes="accent"
-                    automation:AutomationProperties.Name="{t:Translate Accept}"/>
-        </StackPanel>
-
-    </Grid>
-
-</dialogs:ImmersiveDialog>
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml.cs b/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml.cs
index c30a2f656e..f186a71fa8 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml.cs
@@ -1,35 +1,57 @@
+using Avalonia.Automation;
+using Avalonia.Automation.Peers;
 using Avalonia.Controls;
-using Avalonia.Threading;
+using Avalonia.Input;
 using UniGetUI.Core.Tools;
 
 namespace UniGetUI.Avalonia.Views.DialogPages;
 
-public partial class TelemetryDialog : UniGetUI.Avalonia.Views.DialogPages.ImmersiveDialog
+public sealed class TelemetryDialog : ImmersiveConfirmationDialog
 {
-    public bool? Result { get; private set; }
-
     public TelemetryDialog()
     {
-        InitializeComponent();
-
-        Body2.Text = CoreTools.Translate("No personal information is collected nor sent, and the collected data is anonimized, so it can't be back-tracked to you.");
-
-        DetailsLink.Bind(TextBlock.ForegroundProperty,
-            DetailsLink.GetResourceObservable("SystemControlHighlightAccentBrush"));
-        DetailsLink.PointerPressed += (_, e) =>
+        var detailsLink = new TextBlock
+        {
+            Text = CoreTools.Translate("More details about the shared data and how it will be processed"),
+            TextDecorations = global::Avalonia.Media.TextDecorations.Underline,
+            Cursor = new Cursor(StandardCursorType.Hand),
+            Opacity = 0.9,
+        };
+        AutomationProperties.SetName(detailsLink, detailsLink.Text);
+        AutomationProperties.SetControlTypeOverride(detailsLink, AutomationControlType.Hyperlink);
+        detailsLink.Bind(TextBlock.ForegroundProperty,
+            detailsLink.GetResourceObservable("AccentTextFillColorPrimaryBrush"));
+        detailsLink.PointerPressed += (_, e) =>
         {
             if (e.GetCurrentPoint(null).Properties.IsLeftButtonPressed)
                 CoreTools.Launch("https://devolutions.net/legal/");
         };
 
-        Closing += (_, e) => { if (Result is null) e.Cancel = true; };
-        DeclineButton.Click += (_, _) => { Result = false; Close(); };
-        AcceptButton.Click += (_, _) => { Result = true; Close(); };
+        var body = new StackPanel { Spacing = 8 };
+        body.Children.Add(BodyText(CoreTools.Translate(
+            "UniGetUI collects anonymous usage data with the sole purpose of understanding and improving the user experience.")));
+        body.Children.Add(BodyText(CoreTools.Translate(
+            "No personal information is collected nor sent, and the collected data is anonimized, so it can't be back-tracked to you.")));
+        body.Children.Add(detailsLink);
+        body.Children.Add(BodyText(CoreTools.Translate(
+            "Do you accept that UniGetUI collects and sends anonymous usage statistics, with the sole purpose of understanding and improving the user experience?")));
+
+        Configure(
+            CoreTools.Translate("Share anonymous usage data"),
+            body,
+            CoreTools.Translate("Accept"),
+            CoreTools.Translate("Decline"));
+        MaxWidth = 548;
+        MinWidth = 420;
+        MinHeight = 250;
+        IsCloseButtonVisible = false;
+        RequireChoice = true;
     }
 
-    protected override void OnOpened(EventArgs e)
+    private static TextBlock BodyText(string text) => new()
     {
-        base.OnOpened(e);
-        Dispatcher.UIThread.Post(() => AcceptButton.Focus(), DispatcherPriority.Background);
-    }
+        Text = text,
+        TextWrapping = global::Avalonia.Media.TextWrapping.Wrap,
+        Opacity = 0.85,
+    };
 }
diff --git a/src/UniGetUI.Avalonia/Views/MainWindow.axaml b/src/UniGetUI.Avalonia/Views/MainWindow.axaml
index 231075a32c..7689e43e36 100644
--- a/src/UniGetUI.Avalonia/Views/MainWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/MainWindow.axaml
@@ -40,7 +40,7 @@
         <!-- Focus: accent underline (declared after hover so it wins when both apply). -->
         <Style Selector="Border#GlobalSearchContainer:focus-within Border#SearchFocusUnderline">
             <Setter Property="Opacity" Value="1"/>
-            <Setter Property="Background" Value="{DynamicResource SystemAccentColor}"/>
+            <Setter Property="Background" Value="{DynamicResource AccentFillColorDefaultBrush}"/>
         </Style>
         <Style Selector="Border#GlobalSearchContainer:focus-within">
             <Setter Property="Background" Value="{DynamicResource SearchBoxFocusedBackground}"/>
@@ -728,16 +728,14 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Background="{DynamicResource AppDialogBackground}"
-                    BorderBrush="{DynamicResource AppBorderBrush}"
-                    BorderThickness="1"
                     CornerRadius="8"
                     ClipToBounds="True"
                     KeyboardNavigation.TabNavigation="Cycle"
                     BoxShadow="0 8 32 0 #59000000">
                 <Grid RowDefinitions="Auto,*">
-                    <Grid Grid.Row="0"
+                    <Grid x:Name="ModalHeader"
+                          Grid.Row="0"
                           Height="48"
-                          Margin="20,0,0,0"
                           ColumnDefinitions="*,Auto">
                         <TextBlock x:Name="ModalTitle"
                                    VerticalAlignment="Center"
@@ -762,6 +760,14 @@
                                     Grid.Row="1"
                                     HorizontalContentAlignment="Stretch"
                                     VerticalContentAlignment="Stretch"/>
+                    <!-- Draw the outline above dialog content so opaque footer surfaces cannot
+                         cover the antialiased inner edge of the rounded border. -->
+                    <Border Grid.RowSpan="2"
+                            BorderBrush="{DynamicResource AppBorderBrush}"
+                            BorderThickness="1"
+                            CornerRadius="8"
+                            IsHitTestVisible="False"
+                            ZIndex="10"/>
                 </Grid>
             </Border>
         </Grid>
diff --git a/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs b/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
index 1dfd5e473d..67d1a6ca61 100644
--- a/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
@@ -1657,6 +1657,7 @@ private void PresentModal(ImmersiveDialog dialog)
         _modalTitleSubscription = dialog.GetObservable(ImmersiveDialog.TitleProperty)
             .SubscribeValue(title => ModalTitle.Text = title ?? "");
         ModalCloseButton.IsVisible = dialog.IsCloseButtonVisible;
+        ModalTitle.Margin = dialog.TitleMargin;
         ModalContent.Content = dialog;
         ModalLayer.IsVisible = true;
         UpdateModalSurfaceSize();

From 254f1fa177bc169564f9e539b3af737095d4831f Mon Sep 17 00:00:00 2001
From: Meteoni-San <141850520+Meteony@users.noreply.github.com>
Date: Sat, 1 Aug 2026 05:26:48 +0000
Subject: [PATCH 03/12] Polish operation history interface

---
 .../OperationHistoryLogDialog.cs              | 32 ++++---
 .../LogPages/OperationHistoryRowViewModel.cs  | 27 ++----
 .../Pages/LogPages/OperationHistoryPage.axaml | 86 +++++++++++++------
 .../LogPages/OperationHistoryPage.axaml.cs    | 57 +++++++++++-
 4 files changed, 143 insertions(+), 59 deletions(-)

diff --git a/src/UniGetUI.Avalonia/Infrastructure/OperationHistoryLogDialog.cs b/src/UniGetUI.Avalonia/Infrastructure/OperationHistoryLogDialog.cs
index f874895bf0..a76be453dd 100644
--- a/src/UniGetUI.Avalonia/Infrastructure/OperationHistoryLogDialog.cs
+++ b/src/UniGetUI.Avalonia/Infrastructure/OperationHistoryLogDialog.cs
@@ -7,6 +7,7 @@
 using UniGetUI.Avalonia.ViewModels.Pages.LogPages;
 using UniGetUI.Avalonia.Views;
 using UniGetUI.Avalonia.Views.Controls;
+using UniGetUI.Avalonia.Views.DialogPages;
 using UniGetUI.Core.Tools;
 using UniGetUI.PackageEngine.Operations.History;
 
@@ -37,28 +38,27 @@ public static async Task ShowAsync(OperationHistoryRecord record)
         var editor = new LogTextEditor();
         editor.SetLines(lines);
 
-        var dialog = new Window
+        var dialog = new ImmersiveDialog
         {
-            Width = 780,
-            Height = 520,
+            MaxWidth = 780,
+            MaxHeight = 520,
             MinWidth = 460,
             MinHeight = 300,
-            ShowInTaskbar = false,
-            WindowStartupLocation = WindowStartupLocation.CenterOwner,
             Title = CoreTools.Translate("Operation log") + (target.Length > 0 ? $" — {target}" : ""),
+            Background = Application.Current?.FindResource("AppDialogBackground") as IBrush,
         };
 
-        var copyButton = new Button { Content = CoreTools.Translate("Copy to clipboard") };
+        var copyButton = CreateDialogButton(CoreTools.Translate("Copy to clipboard"));
         copyButton.Click += async (_, _) =>
         {
             var clipboard = TopLevel.GetTopLevel(dialog)?.Clipboard;
             if (clipboard is not null) await clipboard.SetTextAsync(plainText);
         };
 
-        var exportButton = new Button { Content = CoreTools.Translate("Export to a file") };
+        var exportButton = CreateDialogButton(CoreTools.Translate("Export to a file"));
         exportButton.Click += async (_, _) =>
         {
-            var file = await dialog.StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions
+            var file = await owner.StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions
             {
                 Title = CoreTools.Translate("Export log"),
                 SuggestedFileName = CoreTools.Translate("UniGetUI Log"),
@@ -68,7 +68,7 @@ public static async Task ShowAsync(OperationHistoryRecord record)
                 await File.WriteAllTextAsync(file.Path.LocalPath, plainText);
         };
 
-        var closeButton = new Button { Content = CoreTools.Translate("Close"), MinWidth = 100 };
+        var closeButton = CreateDialogButton(CoreTools.Translate("Close"), 100);
         closeButton.Classes.Add("accent");
         closeButton.Click += (_, _) => dialog.Close();
 
@@ -84,7 +84,7 @@ public static async Task ShowAsync(OperationHistoryRecord record)
         {
             CornerRadius = new CornerRadius(8),
             ClipToBounds = true,
-            Background = Application.Current?.FindResource("ApplicationPageBackgroundThemeBrush") as IBrush,
+            Background = Application.Current?.FindResource("AppDialogDarkBackground") as IBrush,
             Child = editor,
         };
         Grid.SetRow(editorBorder, 1);
@@ -108,4 +108,16 @@ public static async Task ShowAsync(OperationHistoryRecord record)
 
         await dialog.ShowDialog(owner);
     }
+
+    private static Button CreateDialogButton(string content, double minWidth = 0) => new()
+    {
+        Content = content,
+        MinWidth = minWidth,
+        Height = 32,
+        Padding = new Thickness(11, 5, 11, 6),
+        CornerRadius = new CornerRadius(4),
+        FontSize = 14,
+        HorizontalContentAlignment = HorizontalAlignment.Center,
+        VerticalContentAlignment = VerticalAlignment.Center,
+    };
 }
diff --git a/src/UniGetUI.Avalonia/ViewModels/Pages/LogPages/OperationHistoryRowViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/Pages/LogPages/OperationHistoryRowViewModel.cs
index c2f0340d7b..6f94d28474 100644
--- a/src/UniGetUI.Avalonia/ViewModels/Pages/LogPages/OperationHistoryRowViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/Pages/LogPages/OperationHistoryRowViewModel.cs
@@ -1,6 +1,6 @@
-using Avalonia.Media;
 using CommunityToolkit.Mvvm.Input;
 using UniGetUI.Avalonia.Infrastructure;
+using UniGetUI.Avalonia.Views.Controls;
 using UniGetUI.Core.Tools;
 using UniGetUI.PackageEngine.Operations.History;
 
@@ -70,32 +70,17 @@ public string SourceLabel
         _ => Record.Status,
     };
 
-    public string StatusIconPath => SymbolBase + (Record.Status switch
+    public StatusBadgeSeverity StatusSeverity => Record.Status switch
     {
-        OperationHistoryRecord.StatusSucceeded => "success_round.svg",
-        OperationHistoryRecord.StatusFailed => "cross.svg",
-        _ => "info_round.svg",
-    });
+        OperationHistoryRecord.StatusSucceeded => StatusBadgeSeverity.Success,
+        OperationHistoryRecord.StatusFailed => StatusBadgeSeverity.Error,
+        _ => StatusBadgeSeverity.Info,
+    };
 
     public string StatusTooltip => Record.ExitCode is { } code
         ? CoreTools.Translate("Exit code: {0}", code)
         : StatusLabel;
 
-    public IBrush StatusBrush
-    {
-        get
-        {
-            bool dark = ThemeHelper.IsDark;
-            var color = Record.Status switch
-            {
-                OperationHistoryRecord.StatusSucceeded => dark ? Color.FromRgb(90, 220, 90) : Color.FromRgb(0, 150, 0),
-                OperationHistoryRecord.StatusFailed => dark ? Color.FromRgb(255, 90, 90) : Color.FromRgb(200, 0, 0),
-                _ => dark ? Color.FromRgb(190, 190, 190) : Color.FromRgb(120, 120, 120),
-            };
-            return new SolidColorBrush(color);
-        }
-    }
-
     public DateTime Timestamp
         => DateTime.TryParse(Record.TimestampUtc, null,
                System.Globalization.DateTimeStyles.RoundtripKind, out var utc)
diff --git a/src/UniGetUI.Avalonia/Views/Pages/LogPages/OperationHistoryPage.axaml b/src/UniGetUI.Avalonia/Views/Pages/LogPages/OperationHistoryPage.axaml
index 06c7cf56e4..01b5bb6aad 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/LogPages/OperationHistoryPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/LogPages/OperationHistoryPage.axaml
@@ -17,6 +17,18 @@
             <Setter Property="Padding" Value="12,6"/>
             <Setter Property="MinHeight" Value="0"/>
             <Setter Property="FontSize" Value="14"/>
+            <Setter Property="FontWeight" Value="Normal"/>
+            <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
+            <Setter Property="CornerRadius" Value="4"/>
+        </Style>
+        <Style Selector="TabItem:selected">
+            <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}"/>
+        </Style>
+        <Style Selector="TabItem:selected:pointerover /template/ Border#PART_LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}"/>
+        </Style>
+        <Style Selector="TabItem:selected:pressed /template/ Border#PART_LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}"/>
         </Style>
         <Style Selector="TabItem /template/ #PART_SelectedPipe" x:SetterTargetType="Control">
             <Setter Property="IsVisible" Value="False"/>
@@ -50,8 +62,8 @@
         </Style>
         <Style Selector="DataGridColumnHeader">
             <Setter Property="Background" Value="{DynamicResource PackageListHeaderBackground}"/>
-            <Setter Property="HorizontalContentAlignment" Value="Left"/>
-            <Setter Property="Padding" Value="8,0,0,0"/>
+            <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"/>
@@ -101,7 +113,7 @@
                             <DataGridTemplateColumn Header="{t:Translate Operation}" Width="1*" MinWidth="120" Tag="kind">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate x:DataType="vm:OperationHistoryRowViewModel">
-                                        <StackPanel Orientation="Horizontal" Spacing="6" Margin="4,0" VerticalAlignment="Center">
+                                        <StackPanel Orientation="Horizontal" Spacing="6" Margin="12,0,4,0" VerticalAlignment="Center">
                                             <controls:SvgIcon Path="{Binding KindIconPath}" Width="24" Height="24" VerticalAlignment="Center"/>
                                             <TextBlock Text="{Binding KindLabel}" VerticalAlignment="Center" TextTrimming="CharacterEllipsis"/>
                                         </StackPanel>
@@ -141,12 +153,9 @@
                             <DataGridTemplateColumn Header="{t:Translate Status}" Width="1.1*" MinWidth="100" Tag="status">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate x:DataType="vm:OperationHistoryRowViewModel">
-                                        <StackPanel Orientation="Horizontal" Spacing="6" Margin="4,0" VerticalAlignment="Center"
-                                                    ToolTip.Tip="{Binding StatusTooltip}">
-                                            <controls:SvgIcon Path="{Binding StatusIconPath}" Width="18" Height="18" VerticalAlignment="Center"/>
-                                            <TextBlock Text="{Binding StatusLabel}" Foreground="{Binding StatusBrush}"
-                                                       VerticalAlignment="Center" TextTrimming="CharacterEllipsis"/>
-                                        </StackPanel>
+                                        <controls:StatusBadge Text="{Binding StatusLabel}"
+                                                              Severity="{Binding StatusSeverity}"
+                                                              ToolTip.Tip="{Binding StatusTooltip}"/>
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>
@@ -163,7 +172,11 @@
                             <DataGridTemplateColumn Header="" Width="150">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate x:DataType="vm:OperationHistoryRowViewModel">
-                                        <StackPanel x:Name="HistoryActions" Orientation="Horizontal" Spacing="2" Margin="4,0" VerticalAlignment="Center">
+                                        <StackPanel x:Name="HistoryActions"
+                                                    Orientation="Horizontal"
+                                                    Spacing="2"
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center">
                                             <Button Command="{Binding RevertCommand}" IsEnabled="{Binding CanRevert}"
                                                     ToolTip.Tip="{t:Translate Revert this operation}"
                                                     automation:AutomationProperties.Name="{t:Translate Revert this operation}">
@@ -207,12 +220,10 @@
                 <!-- Footer: Clear on the left, quick filters on the bottom right (like the package list) -->
                 <Grid Grid.Row="1" ColumnDefinitions="Auto,*,Auto" Margin="0,4,0,0">
                     <Button Grid.Column="0"
+                            Classes="secondary-action"
                             Command="{Binding ClearCommand}"
-                            Padding="10,6"
-                            CornerRadius="4"
-                            Background="Transparent"
-                            BorderThickness="1"
-                            BorderBrush="{DynamicResource AppBorderBrush}"
+                            Height="40"
+                            Padding="10,4"
                             automation:AutomationProperties.Name="{t:Translate Clear history}">
                         <StackPanel Orientation="Horizontal" Spacing="8">
                             <controls:SvgIcon Path="avares://UniGetUI/Assets/Symbols/delete.svg" Width="16" Height="16"/>
@@ -221,18 +232,39 @@
                     </Button>
 
                     <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="6" VerticalAlignment="Center">
-                        <ComboBox MinWidth="130"
-                                  ItemsSource="{Binding StatusOptions}"
-                                  SelectedItem="{Binding SelectedStatus}"
-                                  automation:AutomationProperties.Name="{t:Translate Filter by status}"/>
-                        <ComboBox MinWidth="130"
-                                  ItemsSource="{Binding KindOptions}"
-                                  SelectedItem="{Binding SelectedKind}"
-                                  automation:AutomationProperties.Name="{t:Translate Filter by type}"/>
-                        <ComboBox MinWidth="130"
-                                  ItemsSource="{Binding ManagerOptions}"
-                                  SelectedItem="{Binding SelectedManager}"
-                                  automation:AutomationProperties.Name="{t:Translate Filter by manager}"/>
+                        <Button Classes="dropdown-trigger wide" MinWidth="130" Tag="status"
+                                Click="FilterButton_Click"
+                                automation:AutomationProperties.Name="{t:Translate Filter by status}">
+                            <Grid ColumnDefinitions="*,Auto" ColumnSpacing="8">
+                                <TextBlock Text="{Binding SelectedStatus.Label}" VerticalAlignment="Center"/>
+                                <Path Grid.Column="1" Data="M 0,0 L 5,5 L 10,0"
+                                      Stroke="{DynamicResource TextFillColorPrimaryBrush}"
+                                      StrokeThickness="1.5" StrokeJoin="Miter" Fill="Transparent"
+                                      VerticalAlignment="Center"/>
+                            </Grid>
+                        </Button>
+                        <Button Classes="dropdown-trigger wide" MinWidth="130" Tag="kind"
+                                Click="FilterButton_Click"
+                                automation:AutomationProperties.Name="{t:Translate Filter by type}">
+                            <Grid ColumnDefinitions="*,Auto" ColumnSpacing="8">
+                                <TextBlock Text="{Binding SelectedKind.Label}" VerticalAlignment="Center"/>
+                                <Path Grid.Column="1" Data="M 0,0 L 5,5 L 10,0"
+                                      Stroke="{DynamicResource TextFillColorPrimaryBrush}"
+                                      StrokeThickness="1.5" StrokeJoin="Miter" Fill="Transparent"
+                                      VerticalAlignment="Center"/>
+                            </Grid>
+                        </Button>
+                        <Button Classes="dropdown-trigger wide" MinWidth="130" Tag="manager"
+                                Click="FilterButton_Click"
+                                automation:AutomationProperties.Name="{t:Translate Filter by manager}">
+                            <Grid ColumnDefinitions="*,Auto" ColumnSpacing="8">
+                                <TextBlock Text="{Binding SelectedManager.Label}" VerticalAlignment="Center"/>
+                                <Path Grid.Column="1" Data="M 0,0 L 5,5 L 10,0"
+                                      Stroke="{DynamicResource TextFillColorPrimaryBrush}"
+                                      StrokeThickness="1.5" StrokeJoin="Miter" Fill="Transparent"
+                                      VerticalAlignment="Center"/>
+                            </Grid>
+                        </Button>
                     </StackPanel>
                 </Grid>
             </Grid>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/LogPages/OperationHistoryPage.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/LogPages/OperationHistoryPage.axaml.cs
index 3b789225c3..392d9e2c9b 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/LogPages/OperationHistoryPage.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/LogPages/OperationHistoryPage.axaml.cs
@@ -40,7 +40,18 @@ public OperationHistoryPage()
         // Double-click → open the log; Enter/Delete keyboard shortcuts on the list.
         // Handle on the tunnel (preview) phase so Enter opens the log instead of the DataGrid's
         // built-in "move to next row" navigation, which otherwise consumes the key first.
-        HistoryList.DoubleTapped += (_, _) => ViewLog(SelectedRow);
+        HistoryList.DoubleTapped += (_, e) =>
+        {
+            // Inline actions own their pointer gestures; a double-click on one must not
+            // bubble into the row's "open log" shortcut as a second, unrelated action.
+            if (e.Source is Visual source
+                && source.FindAncestorOfType<Button>(includeSelf: true) is not null)
+            {
+                return;
+            }
+
+            ViewLog(SelectedRow);
+        };
         HistoryList.AddHandler(InputElement.KeyDownEvent, OnHistoryKeyDown, RoutingStrategies.Tunnel);
     }
 
@@ -117,6 +128,50 @@ private void OnRowContextRequested(object? sender, ContextRequestedEventArgs e)
         },
     };
 
+    private void FilterButton_Click(object? sender, RoutedEventArgs e)
+    {
+        if (sender is not Button { Tag: string facet } button) return;
+
+        (IEnumerable<HistoryFilterOption> options, HistoryFilterOption? selected) = facet switch
+        {
+            "status" => (_viewModel.StatusOptions, _viewModel.SelectedStatus),
+            "kind" => (_viewModel.KindOptions, _viewModel.SelectedKind),
+            "manager" => (_viewModel.ManagerOptions, _viewModel.SelectedManager),
+            _ => ([], null),
+        };
+
+        var flyout = new MenuFlyout { Placement = PlacementMode.TopEdgeAlignedRight };
+        foreach (HistoryFilterOption option in options)
+        {
+            var item = new MenuItem
+            {
+                Header = option.Label,
+                ToggleType = MenuItemToggleType.Radio,
+                IsChecked = ReferenceEquals(option, selected),
+            };
+            item.Click += (_, _) => SetHistoryFilter(facet, option);
+            flyout.Items.Add(item);
+        }
+
+        flyout.ShowAt(button);
+    }
+
+    private void SetHistoryFilter(string facet, HistoryFilterOption option)
+    {
+        switch (facet)
+        {
+            case "status":
+                _viewModel.SelectedStatus = option;
+                break;
+            case "kind":
+                _viewModel.SelectedKind = option;
+                break;
+            case "manager":
+                _viewModel.SelectedManager = option;
+                break;
+        }
+    }
+
     // Copy details needs clipboard access (a top-level concern), so it uses a click handler rather than a command.
     private MenuItem BuildCopyDetailsItem(OperationHistoryRowViewModel row)
     {

From 1e87191224091e8d5d3833efc6251d22ff3beaab Mon Sep 17 00:00:00 2001
From: Meteoni-San <141850520+Meteony@users.noreply.github.com>
Date: Sat, 1 Aug 2026 05:26:48 +0000
Subject: [PATCH 04/12] Polish package list interactions

---
 .../Views/SoftwarePages/AbstractPackagesPage.axaml | 14 +++++---------
 .../SoftwarePages/AbstractPackagesPage.axaml.cs    | 12 +++++++++++-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
index c951472200..63e61cfaef 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
@@ -92,7 +92,7 @@
       <!-- Focus: accent underline (declared after hover so it wins when both apply). -->
       <Style Selector="Border#MegaQueryContainer:focus-within Border#MegaQueryUnderline">
          <Setter Property="Opacity" Value="1"/>
-         <Setter Property="Background" Value="{DynamicResource SystemAccentColor}"/>
+         <Setter Property="Background" Value="{DynamicResource AccentFillColorDefaultBrush}"/>
       </Style>
       <Style Selector="Border#MegaQueryContainer:focus-within">
          <Setter Property="Background" Value="{DynamicResource SearchBoxFocusedBackground}"/>
@@ -572,7 +572,7 @@
                                                     <controls:SvgIcon Path="avares://UniGetUI/Assets/Symbols/package.svg"
                                                                       Width="24" Height="24" IsVisible="{Binding !HasCustomIcon}"/>
                                                     <controls:SvgIcon Path="{Binding TagBackdropIconPath}"
-                                                                      Foreground="{DynamicResource SystemAccentColor}"
+                                                                      Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}"
                                                                       Width="20" Height="20"
                                                                       Margin="0,0,-3,-3"
                                                                       IsVisible="{Binding TagIconVisible}"
@@ -696,7 +696,7 @@
                                                     <controls:SvgIcon Path="avares://UniGetUI/Assets/Symbols/package.svg"
                                                                       Width="44" Height="44" IsVisible="{Binding !HasCustomIcon}"/>
                                                     <controls:SvgIcon Path="{Binding TagBackdropIconPath}"
-                                                                      Foreground="{DynamicResource SystemAccentColor}"
+                                                                      Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}"
                                                                       Width="28" Height="28"
                                                                       Margin="0,0,-4,-4"
                                                                       IsVisible="{Binding TagIconVisible}"
@@ -806,7 +806,7 @@
                                                     <controls:SvgIcon Path="avares://UniGetUI/Assets/Symbols/package.svg"
                                                                       Width="64" Height="64" IsVisible="{Binding !HasCustomIcon}"/>
                                                     <controls:SvgIcon Path="{Binding TagBackdropIconPath}"
-                                                                      Foreground="{DynamicResource SystemAccentColor}"
+                                                                      Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}"
                                                                       Width="38" Height="38"
                                                                       Margin="0,0,-5,-5"
                                                                       IsVisible="{Binding TagIconVisible}"
@@ -954,11 +954,7 @@
                         VerticalAlignment="Center">
                 <TextBlock x:Name="OrderByLabel" Text="{t:Translate Order by:}" FontSize="13" VerticalAlignment="Center"/>
                 <Button x:Name="OrderByButton"
-                        Padding="10,6"
-                        CornerRadius="4"
-                        Background="{DynamicResource SettingsCardBackground}"
-                        BorderThickness="1"
-                        BorderBrush="Transparent"
+                        Classes="dropdown-trigger"
                         automation:AutomationProperties.LabeledBy="{Binding #OrderByLabel}">
                     <StackPanel Orientation="Horizontal" Spacing="6">
                         <TextBlock Text="{Binding SortFieldName}" VerticalAlignment="Center" FontSize="14"/>
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
index 5368116446..2644cd3f0e 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
@@ -15,6 +15,7 @@
 using Avalonia.Platform.Storage;
 using Avalonia.Rendering.Composition;
 using Avalonia.Threading;
+using Avalonia.VisualTree;
 using UniGetUI.Avalonia.Extensions;
 using UniGetUI.Avalonia.Infrastructure;
 using UniGetUI.Avalonia.ViewModels.Pages;
@@ -92,7 +93,16 @@ or nameof(PackagesPageViewModel.SortAscending))
         GenerateToolBar(ViewModel);
 
         // Double-click a list row → show details
-        PackageList.DoubleTapped += (_, _) => _ = ShowDetailsForPackage(SelectedItem);
+        PackageList.DoubleTapped += (_, e) =>
+        {
+            if (e.Source is Visual source
+                && (source is CheckBox || source.GetVisualAncestors().Any(control => control is CheckBox)))
+            {
+                return;
+            }
+
+            _ = ShowDetailsForPackage(SelectedItem);
+        };
 
         // Native DataGrid column sorting. The default SortMemberPath path resolves the property by
         // reflection, which full-trim NativeAOT release builds strip away — so CanUserSort reports

From 8bddc3c7453ea759e2eb5d2c59877ff2a2c16b7d Mon Sep 17 00:00:00 2001
From: Meteoni-San <141850520+Meteony@users.noreply.github.com>
Date: Sat, 1 Aug 2026 05:48:05 +0000
Subject: [PATCH 05/12] Fix Avalonia CI compilation and formatting

---
 .../Infrastructure/UninstallConfirmationDialog.cs               | 2 +-
 .../Views/Pages/LogPages/OperationHistoryPage.axaml.cs          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/UniGetUI.Avalonia/Infrastructure/UninstallConfirmationDialog.cs b/src/UniGetUI.Avalonia/Infrastructure/UninstallConfirmationDialog.cs
index 2afa9d7a77..a5c3c17a40 100644
--- a/src/UniGetUI.Avalonia/Infrastructure/UninstallConfirmationDialog.cs
+++ b/src/UniGetUI.Avalonia/Infrastructure/UninstallConfirmationDialog.cs
@@ -1,8 +1,8 @@
 using Avalonia.Controls;
 using Avalonia.Media;
+using UniGetUI.Avalonia.Views.DialogPages;
 using UniGetUI.Core.Tools;
 using UniGetUI.PackageEngine.Interfaces;
-using UniGetUI.Avalonia.Views.DialogPages;
 
 namespace UniGetUI.Avalonia.Infrastructure;
 
diff --git a/src/UniGetUI.Avalonia/Views/Pages/LogPages/OperationHistoryPage.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/LogPages/OperationHistoryPage.axaml.cs
index 392d9e2c9b..1c9171b533 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/LogPages/OperationHistoryPage.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/LogPages/OperationHistoryPage.axaml.cs
@@ -1,4 +1,5 @@
 using System.Windows.Input;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Input.Platform;

From 39e14127a62159e230a81a04837440e9de977e2c Mon Sep 17 00:00:00 2001
From: Meteoni-San <141850520+Meteony@users.noreply.github.com>
Date: Sat, 1 Aug 2026 06:06:41 +0000
Subject: [PATCH 06/12] Center ComboBox content vertically

---
 src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
index 4d2227129e..144d2b083c 100644
--- a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
+++ b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
@@ -460,11 +460,15 @@
     <!-- ComboBox popups are separate visual roots, so their item geometry and states must
          be global. The horizontal margin is the popup's inner gutter: highlights never
          touch or obscure its rounded left/right frame. -->
+    <Style Selector="ComboBox">
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+    </Style>
     <Style Selector="ComboBoxItem">
         <Setter Property="Margin" Value="4,0"/>
         <Setter Property="Padding" Value="8,4,8,5"/>
         <Setter Property="MinHeight" Value="32"/>
         <Setter Property="CornerRadius" Value="4"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
     </Style>
     <Style Selector="ComboBoxItem:pointerover /template/ ContentPresenter#PART_ContentPresenter,

From f4f6b6f9f3fbee553af1e503cf726451ff94cebf Mon Sep 17 00:00:00 2001
From: Meteoni-San <141850520+Meteony@users.noreply.github.com>
Date: Mon, 3 Aug 2026 12:09:33 +0000
Subject: [PATCH 07/12] Add light-theme outlines to secondary buttons

---
 src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
index 144d2b083c..91a75be48a 100644
--- a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
+++ b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
@@ -66,6 +66,8 @@
                     <SolidColorBrush x:Key="SettingsCardBackground"      Color="#B3FFFFFF"/>
                     <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#ECECEC"/>
                     <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#F6F6F6"/>
+                    <SolidColorBrush x:Key="SecondaryActionBorderBrush"  Color="#0F000000"/>
+                    <Thickness x:Key="SecondaryActionBorderThickness">0.5</Thickness>
                     <!-- WinUI dropdown controls use the same control/card fill as settings actions. -->
                     <StaticResource x:Key="ComboBoxBackground" ResourceKey="SettingsCardBackground"/>
                     <StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="SettingsCardBackground"/>
@@ -187,6 +189,8 @@
                     <SolidColorBrush x:Key="SettingsCardBackground"      Color="#0DFFFFFF"/>
                     <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#393939"/>
                     <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#323232"/>
+                    <SolidColorBrush x:Key="SecondaryActionBorderBrush"  Color="Transparent"/>
+                    <Thickness x:Key="SecondaryActionBorderThickness">0</Thickness>
                     <!-- WinUI dropdown controls use the same control/card fill as settings actions. -->
                     <StaticResource x:Key="ComboBoxBackground" ResourceKey="SettingsCardBackground"/>
                     <StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="SettingsCardBackground"/>
@@ -275,8 +279,8 @@
     <Style Selector="Button.secondary-action">
         <Setter Property="CornerRadius" Value="4"/>
         <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}"/>
-        <Setter Property="BorderBrush" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryActionBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="{DynamicResource SecondaryActionBorderThickness}"/>
         <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>

From 25591ea7e9e3ca342464cc49f66dcfbcc5beb928 Mon Sep 17 00:00:00 2001
From: Meteoni-San <141850520+Meteony@users.noreply.github.com>
Date: Mon, 3 Aug 2026 12:10:03 +0000
Subject: [PATCH 08/12] Add light-theme outlines to combo boxes

---
 .../Assets/Styles/Styles.Common.axaml                 | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
index 91a75be48a..06187b7071 100644
--- a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
+++ b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
@@ -73,10 +73,11 @@
                     <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"/>
+                    <SolidColorBrush x:Key="ComboBoxBorderBrush" Color="#0F000000"/>
+                    <SolidColorBrush x:Key="ComboBoxBackgroundBorderBrushUnfocused" Color="#0F000000"/>
+                    <SolidColorBrush x:Key="ComboBoxBorderBrushPointerOver" Color="#0F000000"/>
+                    <SolidColorBrush x:Key="ComboBoxBorderBrushPressed" Color="#0F000000"/>
+                    <Thickness x:Key="ComboBoxOutlineThickness">0.5</Thickness>
                     <!-- Shared WinUI dropdown surface and neutral item states. ComboBox popups
                          use the same visual language as MenuFlyout-based pickers. -->
                     <StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="MenuSurfaceBrush"/>
@@ -200,6 +201,7 @@
                     <SolidColorBrush x:Key="ComboBoxBackgroundBorderBrushUnfocused" Color="Transparent"/>
                     <SolidColorBrush x:Key="ComboBoxBorderBrushPointerOver" Color="Transparent"/>
                     <SolidColorBrush x:Key="ComboBoxBorderBrushPressed" Color="Transparent"/>
+                    <Thickness x:Key="ComboBoxOutlineThickness">0</Thickness>
                     <!-- Shared WinUI dropdown surface and neutral item states. -->
                     <StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="MenuSurfaceBrush"/>
                     <StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="MenuSurfaceBorderBrush"/>
@@ -465,6 +467,7 @@
          be global. The horizontal margin is the popup's inner gutter: highlights never
          touch or obscure its rounded left/right frame. -->
     <Style Selector="ComboBox">
+        <Setter Property="BorderThickness" Value="{DynamicResource ComboBoxOutlineThickness}"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
     </Style>
     <Style Selector="ComboBoxItem">

From 33a306eb7346c09db6fcc4e9a491e7fef07395c6 Mon Sep 17 00:00:00 2001
From: Meteoni-San <141850520+Meteony@users.noreply.github.com>
Date: Mon, 3 Aug 2026 12:10:25 +0000
Subject: [PATCH 09/12] Keep light-theme combo box flyouts opaque

---
 src/UniGetUI.Avalonia/Assets/Styles/Styles.WindowsMica.axaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.WindowsMica.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.WindowsMica.axaml
index ffa8b1d590..c47a7559c5 100644
--- a/src/UniGetUI.Avalonia/Assets/Styles/Styles.WindowsMica.axaml
+++ b/src/UniGetUI.Avalonia/Assets/Styles/Styles.WindowsMica.axaml
@@ -31,7 +31,9 @@
             <!-- 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"/>
-            <SolidColorBrush x:Key="ComboBoxDropDownBackground"    Color="#80FFFFFF"/>
+            <!-- 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"/>
             <SolidColorBrush x:Key="ToolTipBackground"             Color="#80FFFFFF"/>
             <!-- Expander chrome -->
             <SolidColorBrush x:Key="ExpanderHeaderBackground"            Color="#80FFFFFF"/>

From b97c0256cad67c5e64a7bfb0fcb2d4d521660a39 Mon Sep 17 00:00:00 2001
From: Meteoni-San <141850520+Meteony@users.noreply.github.com>
Date: Mon, 3 Aug 2026 12:22:35 +0000
Subject: [PATCH 10/12] Keep light-theme tooltips opaque

---
 src/UniGetUI.Avalonia/Assets/Styles/Styles.WindowsMica.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.WindowsMica.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.WindowsMica.axaml
index c47a7559c5..5c18cf20b0 100644
--- a/src/UniGetUI.Avalonia/Assets/Styles/Styles.WindowsMica.axaml
+++ b/src/UniGetUI.Avalonia/Assets/Styles/Styles.WindowsMica.axaml
@@ -34,7 +34,7 @@
             <!-- 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"/>
-            <SolidColorBrush x:Key="ToolTipBackground"             Color="#80FFFFFF"/>
+            <SolidColorBrush x:Key="ToolTipBackground"             Color="#FFFFFFFF"/>
             <!-- Expander chrome -->
             <SolidColorBrush x:Key="ExpanderHeaderBackground"            Color="#80FFFFFF"/>
             <SolidColorBrush x:Key="ExpanderHeaderBackgroundPointerOver" Color="#99FFFFFF"/>

From 0b0af5433cc152a2cdbfd2246433b1442c3073ba Mon Sep 17 00:00:00 2001
From: Meteoni-San <141850520+Meteony@users.noreply.github.com>
Date: Mon, 3 Aug 2026 12:23:08 +0000
Subject: [PATCH 11/12] Polish ignored updates dialog surfaces

---
 src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml      | 2 ++
 src/UniGetUI.Avalonia/Assets/Styles/Styles.WindowsMica.axaml | 2 ++
 .../Views/DialogPages/ManageIgnoredUpdatesWindow.axaml       | 5 ++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
index 06187b7071..f49f5fcf89 100644
--- a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
+++ b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
@@ -104,6 +104,7 @@
                     <SolidColorBrush x:Key="AppDialogPanelBackground"    Color="#F9F9F9"/>
                     <SolidColorBrush x:Key="AppDialogSubtleBackground"   Color="#EEEEEE"/>
                     <SolidColorBrush x:Key="AppDialogDarkBackground"     Color="#EEEEEE"/>
+                    <SolidColorBrush x:Key="IgnoredUpdatesListBackground" Color="#F3F3F3"/>
                     <SolidColorBrush x:Key="ScreenshotLetterboxBackground" Color="#202020"/>
                     <SolidColorBrush x:Key="SmokeFillColorDefaultBrush" Color="#4D000000"/>
                     <!-- Warning banner -->
@@ -227,6 +228,7 @@
                     <SolidColorBrush x:Key="AppDialogPanelBackground"    Color="#2C2C2C"/>
                     <SolidColorBrush x:Key="AppDialogSubtleBackground"   Color="#393939"/>
                     <SolidColorBrush x:Key="AppDialogDarkBackground"     Color="#1A1A1A"/>
+                    <SolidColorBrush x:Key="IgnoredUpdatesListBackground" Color="#1A1A1A"/>
                     <SolidColorBrush x:Key="ScreenshotLetterboxBackground" Color="#202020"/>
                     <SolidColorBrush x:Key="SmokeFillColorDefaultBrush" Color="#4D000000"/>
                     <!-- Warning banner -->
diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.WindowsMica.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.WindowsMica.axaml
index 5c18cf20b0..afac5d3f78 100644
--- a/src/UniGetUI.Avalonia/Assets/Styles/Styles.WindowsMica.axaml
+++ b/src/UniGetUI.Avalonia/Assets/Styles/Styles.WindowsMica.axaml
@@ -28,6 +28,7 @@
             <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"/>
@@ -68,6 +69,7 @@
             <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
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml
index d2da082545..bf7839740c 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml
@@ -38,6 +38,7 @@
                        Opacity="0.75"/>
 
             <Button x:Name="ResetButton" Grid.Column="1" VerticalAlignment="Center"
+                    Classes="secondary-action"
                     automation:AutomationProperties.Name="{Binding ResetLabel}">
                 <TextBlock Text="{Binding ResetLabel}"/>
                 <Button.Flyout>
@@ -60,6 +61,7 @@
                                        Text="{Binding ResetConfirm}"
                                        TextWrapping="Wrap"/>
                             <Button Grid.Row="1" Grid.Column="0"
+                                    Classes="secondary-action"
                                     Content="{Binding ResetYes}"
                                     automation:AutomationProperties.Name="{Binding ResetYes}"
                                     HorizontalAlignment="Stretch"
@@ -80,7 +82,7 @@
         <!-- ── Package list (mirrors the WinUI ItemsView: flat rows, no header) ── -->
         <Border Grid.Row="1"
                 CornerRadius="8"
-                Background="{DynamicResource AppDialogDarkBackground}">
+                Background="{DynamicResource IgnoredUpdatesListBackground}">
           <Panel>
 
             <!-- Empty state -->
@@ -151,6 +153,7 @@
                                            Text="{Binding Manager}" TextTrimming="CharacterEllipsis" ToolTip.Tip="{Binding Manager}"/>
 
                                 <Button Grid.Column="10" Width="32" Height="32" Padding="0" Margin="4,0,0,0"
+                                        Classes="secondary-action"
                                         VerticalAlignment="Center"
                                         Command="{Binding RemoveCommand}"
                                         automation:AutomationProperties.Name="{Binding RemoveAutomationName}"

From 6575cd2433648fbeee2ce6beac3cc6325f4ad8e4 Mon Sep 17 00:00:00 2001
From: Meteoni-San <141850520+Meteony@users.noreply.github.com>
Date: Mon, 3 Aug 2026 12:56:19 +0000
Subject: [PATCH 12/12] Match light control borders to WinUI

---
 .../Assets/Styles/Styles.Common.axaml         | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
index f49f5fcf89..4008920c6f 100644
--- a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
+++ b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
@@ -42,6 +42,13 @@
                     <SolidColorBrush x:Key="SearchBoxInactiveBackground"      Color="#B3FFFFFF"/>
                     <SolidColorBrush x:Key="SearchBoxFocusedBackground"       Color="#FFFFFFFF"/>
                     <SolidColorBrush x:Key="SearchBoxFocusedBorderBrush"      Color="#0F000000"/>
+                    <!-- WinUI light controls use a one-DIP elevation stroke with a stronger
+                         lower edge so pale controls remain distinct from pale surfaces. -->
+                    <LinearGradientBrush x:Key="ControlElevationBorderBrush"
+                                         StartPoint="0%,0%" EndPoint="0%,100%">
+                        <GradientStop Offset="0" Color="#0F000000"/>
+                        <GradientStop Offset="1" Color="#29000000"/>
+                    </LinearGradientBrush>
                     <SolidColorBrush x:Key="TextFillColorDisabledBrush"  Color="#5C000000"/>
                     <SolidColorBrush x:Key="TextFillColorInverseBrush"   Color="#FFFFFFFF"/>
                     <!-- Opaque WinUI menu surface and low-contrast divider. -->
@@ -66,18 +73,18 @@
                     <SolidColorBrush x:Key="SettingsCardBackground"      Color="#B3FFFFFF"/>
                     <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#ECECEC"/>
                     <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#F6F6F6"/>
-                    <SolidColorBrush x:Key="SecondaryActionBorderBrush"  Color="#0F000000"/>
-                    <Thickness x:Key="SecondaryActionBorderThickness">0.5</Thickness>
+                    <StaticResource x:Key="SecondaryActionBorderBrush" ResourceKey="ControlElevationBorderBrush"/>
+                    <Thickness x:Key="SecondaryActionBorderThickness">1</Thickness>
                     <!-- WinUI dropdown controls use the same control/card fill as settings actions. -->
                     <StaticResource x:Key="ComboBoxBackground" ResourceKey="SettingsCardBackground"/>
                     <StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="SettingsCardBackground"/>
                     <StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="SettingsCardHoverBackground"/>
                     <StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="SettingsCardHoverBackground"/>
-                    <SolidColorBrush x:Key="ComboBoxBorderBrush" Color="#0F000000"/>
-                    <SolidColorBrush x:Key="ComboBoxBackgroundBorderBrushUnfocused" Color="#0F000000"/>
-                    <SolidColorBrush x:Key="ComboBoxBorderBrushPointerOver" Color="#0F000000"/>
-                    <SolidColorBrush x:Key="ComboBoxBorderBrushPressed" Color="#0F000000"/>
-                    <Thickness x:Key="ComboBoxOutlineThickness">0.5</Thickness>
+                    <StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="ControlElevationBorderBrush"/>
+                    <StaticResource x:Key="ComboBoxBackgroundBorderBrushUnfocused" ResourceKey="ControlElevationBorderBrush"/>
+                    <StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="ControlElevationBorderBrush"/>
+                    <StaticResource x:Key="ComboBoxBorderBrushPressed" ResourceKey="ControlElevationBorderBrush"/>
+                    <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. -->
                     <StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="MenuSurfaceBrush"/>