From c640b9ffa39f96bbcc04f7ebfdde0ab57184ecf4 Mon Sep 17 00:00:00 2001
From: GabrielDuf <gabrielduf@hotmail.com>
Date: Wed, 20 May 2026 11:20:26 -0400
Subject: [PATCH 1/3] improve avalonia ui

---
 src/UniGetUI.Avalonia/App.axaml.cs            |  15 --
 .../Assets/Styles/Styles.Common.axaml         | 147 ++++++++++++
 .../Assets/Styles/Styles.Linux.axaml          |  81 -------
 .../Assets/Styles/Styles.Windows.axaml        |  87 -------
 .../Assets/Styles/Styles.macOS.axaml          |  83 -------
 .../Models/PackageCollections.cs              |  34 +++
 .../ViewModels/MainWindowViewModel.cs         |   8 +
 .../SoftwarePages/PackagesPageViewModel.cs    |  67 +++++-
 .../Controls/Settings/CheckboxButtonCard.cs   |  30 ++-
 .../Views/Controls/Settings/CheckboxCard.cs   |  35 ++-
 .../Controls/Settings/SecureCheckboxCard.cs   |  26 ++-
 src/UniGetUI.Avalonia/Views/MainWindow.axaml  |  11 +-
 .../SoftwarePages/AbstractPackagesPage.axaml  | 215 +++++++++++++++---
 .../AbstractPackagesPage.axaml.cs             |   3 +
 14 files changed, 519 insertions(+), 323 deletions(-)
 delete mode 100644 src/UniGetUI.Avalonia/Assets/Styles/Styles.Linux.axaml
 delete mode 100644 src/UniGetUI.Avalonia/Assets/Styles/Styles.Windows.axaml
 delete mode 100644 src/UniGetUI.Avalonia/Assets/Styles/Styles.macOS.axaml

diff --git a/src/UniGetUI.Avalonia/App.axaml.cs b/src/UniGetUI.Avalonia/App.axaml.cs
index 52ca50067..6abd79e4e 100644
--- a/src/UniGetUI.Avalonia/App.axaml.cs
+++ b/src/UniGetUI.Avalonia/App.axaml.cs
@@ -1,10 +1,8 @@
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using Avalonia.Markup.Xaml.Styling;
 using Avalonia.Platform;
 using Avalonia.Styling;
 using Avalonia.Threading;
@@ -23,25 +21,12 @@ namespace UniGetUI.Avalonia;
 
 public partial class App : Application
 {
-    [UnconditionalSuppressMessage(
-        "Trimming",
-        "IL2026",
-        Justification = "Platform theme dictionaries are Avalonia resources included in the app package; only the resource URI is selected dynamically.")]
     public override void Initialize()
     {
         AvaloniaXamlLoader.Load(this);
 #if AVALONIA_DIAGNOSTICS_ENABLED
         this.AttachDeveloperTools();
 #endif
-
-        string platform = OperatingSystem.IsWindows() ? "Windows"
-            : OperatingSystem.IsMacOS() ? "macOS"
-            : "Linux";
-
-        Styles.Add(new StyleInclude(new Uri("avares://UniGetUI.Avalonia/"))
-        {
-            Source = new Uri($"avares://UniGetUI.Avalonia/Assets/Styles/Styles.{platform}.axaml")
-        });
     }
 
     public override void OnFrameworkInitializationCompleted()
diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
index d8c151aca..3e5f04a7d 100644
--- a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
+++ b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
@@ -2,8 +2,155 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="using:UniGetUI.Avalonia.Views.Controls">
 
+    <Styles.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <!-- WinUI Fluent v2 design tokens (Avalonia's Fluent theme only ships UWP-era names; these polyfill the v2 set). -->
+                <ResourceDictionary x:Key="Light">
+                    <!-- Accent fills -->
+                    <SolidColorBrush x:Key="AccentFillColorDefaultBrush"  Color="{DynamicResource SystemAccentColor}"/>
+                    <SolidColorBrush x:Key="AccentFillColorSecondaryBrush" Color="{DynamicResource SystemAccentColorDark1}"/>
+                    <SolidColorBrush x:Key="AccentFillColorTertiaryBrush"  Color="{DynamicResource SystemAccentColorDark2}"/>
+                    <SolidColorBrush x:Key="AccentFillColorDisabledBrush"  Color="#37000000"/>
+                    <SolidColorBrush x:Key="AccentFillColorSelectedTextBackgroundBrush" Color="{DynamicResource SystemAccentColor}"/>
+                    <!-- Accent text (darker accents read better on light bg) -->
+                    <SolidColorBrush x:Key="AccentTextFillColorPrimaryBrush"   Color="{DynamicResource SystemAccentColorDark2}"/>
+                    <SolidColorBrush x:Key="AccentTextFillColorSecondaryBrush" Color="{DynamicResource SystemAccentColorDark3}"/>
+                    <SolidColorBrush x:Key="AccentTextFillColorTertiaryBrush"  Color="{DynamicResource SystemAccentColorDark1}"/>
+                    <SolidColorBrush x:Key="AccentTextFillColorDisabledBrush"  Color="#5C000000"/>
+                    <!-- Text fill -->
+                    <SolidColorBrush x:Key="TextFillColorPrimaryBrush"   Color="#E4000000"/>
+                    <SolidColorBrush x:Key="TextFillColorSecondaryBrush" Color="#9E000000"/>
+                    <SolidColorBrush x:Key="TextFillColorTertiaryBrush"  Color="#72000000"/>
+                    <SolidColorBrush x:Key="TextFillColorDisabledBrush"  Color="#5C000000"/>
+                    <SolidColorBrush x:Key="TextFillColorInverseBrush"   Color="#FFFFFFFF"/>
+                    <!-- Text on accent -->
+                    <SolidColorBrush x:Key="TextOnAccentFillColorPrimaryBrush"      Color="#FFFFFFFF"/>
+                    <SolidColorBrush x:Key="TextOnAccentFillColorSecondaryBrush"    Color="#B3FFFFFF"/>
+                    <SolidColorBrush x:Key="TextOnAccentFillColorDisabledBrush"     Color="#FFFFFFFF"/>
+                    <SolidColorBrush x:Key="TextOnAccentFillColorSelectedTextBrush" Color="#FFFFFFFF"/>
+                    <!-- Settings cards -->
+                    <SolidColorBrush x:Key="SettingsCardBackground"      Color="#FBFBFB"/>
+                    <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#ECECEC"/>
+                    <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#F6F6F6"/>
+                    <!-- Window structure -->
+                    <SolidColorBrush x:Key="AppWindowBackground"         Color="#F3F3F3"/>
+                    <SolidColorBrush x:Key="AppTitleBarBackground"       Color="#F3F3F3"/>
+                    <SolidColorBrush x:Key="AppSplitterBackground"       Color="#E5E5E5"/>
+                    <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#EEEEEE"/>
+                    <SolidColorBrush x:Key="AppBorderBrush"              Color="#E5E5E5"/>
+                    <SolidColorBrush x:Key="AppBadgeBackground"          Color="#EDEDED"/>
+                    <!-- Dialogs -->
+                    <SolidColorBrush x:Key="AppDialogBackground"         Color="#FFFFFF"/>
+                    <SolidColorBrush x:Key="AppDialogPanelBackground"    Color="#F9F9F9"/>
+                    <SolidColorBrush x:Key="AppDialogSubtleBackground"   Color="#EEEEEE"/>
+                    <SolidColorBrush x:Key="AppDialogDarkBackground"     Color="#EEEEEE"/>
+                    <!-- Warning banner -->
+                    <SolidColorBrush x:Key="WarningBannerBackground"     Color="#FFF4CE"/>
+                    <SolidColorBrush x:Key="WarningBannerBorderBrush"    Color="#9D5D00"/>
+                    <SolidColorBrush x:Key="WarningBannerIconBackground" Color="#9D5D00"/>
+                    <SolidColorBrush x:Key="WarningBannerIconForeground" Color="#FFFFFF"/>
+                    <SolidColorBrush x:Key="WarningBannerSubtext"        Color="#9D5D00"/>
+                    <!-- Status banners (success / error / info) -->
+                    <SolidColorBrush x:Key="StatusSuccessBackground"     Color="#DFF6DD"/>
+                    <SolidColorBrush x:Key="StatusSuccessBorderBrush"    Color="#0F7B0F"/>
+                    <SolidColorBrush x:Key="StatusErrorBackground"       Color="#FDE7E9"/>
+                    <SolidColorBrush x:Key="StatusErrorBorderBrush"      Color="#C42B1C"/>
+                    <SolidColorBrush x:Key="StatusInfoBackground"        Color="#E5F1FA"/>
+                    <SolidColorBrush x:Key="StatusInfoBorderBrush"       Color="#005FB8"/>
+                    <!-- Status badge foreground -->
+                    <SolidColorBrush x:Key="StatusSuccessForeground"     Color="#0F7B0F"/>
+                    <SolidColorBrush x:Key="StatusWarningForeground"     Color="#9D5D00"/>
+                    <SolidColorBrush x:Key="StatusErrorForeground"       Color="#C42B1C"/>
+                    <!-- Setting warning subtext -->
+                    <SolidColorBrush x:Key="SettingWarningTextForeground" Color="#9D5D00"/>
+                    <!-- Operation log output text -->
+                    <SolidColorBrush x:Key="LogOutputVerboseForeground"   Color="#5C5C5C"/>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Dark">
+                    <!-- Accent fills (lighter accents on dark bg) -->
+                    <SolidColorBrush x:Key="AccentFillColorDefaultBrush"   Color="{DynamicResource SystemAccentColorLight2}"/>
+                    <SolidColorBrush x:Key="AccentFillColorSecondaryBrush" Color="{DynamicResource SystemAccentColorLight1}"/>
+                    <SolidColorBrush x:Key="AccentFillColorTertiaryBrush"  Color="{DynamicResource SystemAccentColor}"/>
+                    <SolidColorBrush x:Key="AccentFillColorDisabledBrush"  Color="#28FFFFFF"/>
+                    <SolidColorBrush x:Key="AccentFillColorSelectedTextBackgroundBrush" Color="{DynamicResource SystemAccentColor}"/>
+                    <!-- Accent text -->
+                    <SolidColorBrush x:Key="AccentTextFillColorPrimaryBrush"   Color="{DynamicResource SystemAccentColorLight3}"/>
+                    <SolidColorBrush x:Key="AccentTextFillColorSecondaryBrush" Color="{DynamicResource SystemAccentColorLight3}"/>
+                    <SolidColorBrush x:Key="AccentTextFillColorTertiaryBrush"  Color="{DynamicResource SystemAccentColorLight2}"/>
+                    <SolidColorBrush x:Key="AccentTextFillColorDisabledBrush"  Color="#5CFFFFFF"/>
+                    <!-- Text fill -->
+                    <SolidColorBrush x:Key="TextFillColorPrimaryBrush"   Color="#FFFFFFFF"/>
+                    <SolidColorBrush x:Key="TextFillColorSecondaryBrush" Color="#C5FFFFFF"/>
+                    <SolidColorBrush x:Key="TextFillColorTertiaryBrush"  Color="#87FFFFFF"/>
+                    <SolidColorBrush x:Key="TextFillColorDisabledBrush"  Color="#5DFFFFFF"/>
+                    <SolidColorBrush x:Key="TextFillColorInverseBrush"   Color="#E4000000"/>
+                    <!-- Text on accent -->
+                    <SolidColorBrush x:Key="TextOnAccentFillColorPrimaryBrush"      Color="#000000"/>
+                    <SolidColorBrush x:Key="TextOnAccentFillColorSecondaryBrush"    Color="#80000000"/>
+                    <SolidColorBrush x:Key="TextOnAccentFillColorDisabledBrush"     Color="#87FFFFFF"/>
+                    <SolidColorBrush x:Key="TextOnAccentFillColorSelectedTextBrush" Color="#FFFFFFFF"/>
+                    <!-- Settings cards -->
+                    <SolidColorBrush x:Key="SettingsCardBackground"      Color="#2D2D2D"/>
+                    <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#393939"/>
+                    <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#323232"/>
+                    <!-- Window structure -->
+                    <SolidColorBrush x:Key="AppWindowBackground"         Color="#202020"/>
+                    <SolidColorBrush x:Key="AppTitleBarBackground"       Color="#202020"/>
+                    <SolidColorBrush x:Key="AppSplitterBackground"       Color="#1A1A1A"/>
+                    <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#1C1C1C"/>
+                    <SolidColorBrush x:Key="AppBorderBrush"              Color="#353535"/>
+                    <SolidColorBrush x:Key="AppBadgeBackground"          Color="#3C3C3C"/>
+                    <!-- Dialogs -->
+                    <SolidColorBrush x:Key="AppDialogBackground"         Color="#202020"/>
+                    <SolidColorBrush x:Key="AppDialogPanelBackground"    Color="#2C2C2C"/>
+                    <SolidColorBrush x:Key="AppDialogSubtleBackground"   Color="#393939"/>
+                    <SolidColorBrush x:Key="AppDialogDarkBackground"     Color="#1A1A1A"/>
+                    <!-- Warning banner -->
+                    <SolidColorBrush x:Key="WarningBannerBackground"     Color="#433519"/>
+                    <SolidColorBrush x:Key="WarningBannerBorderBrush"    Color="#A07208"/>
+                    <SolidColorBrush x:Key="WarningBannerIconBackground" Color="#FCE100"/>
+                    <SolidColorBrush x:Key="WarningBannerIconForeground" Color="#1a1000"/>
+                    <SolidColorBrush x:Key="WarningBannerSubtext"        Color="#FCE100"/>
+                    <!-- Status banners (success / error / info) -->
+                    <SolidColorBrush x:Key="StatusSuccessBackground"     Color="#393D1B"/>
+                    <SolidColorBrush x:Key="StatusSuccessBorderBrush"    Color="#4F7B27"/>
+                    <SolidColorBrush x:Key="StatusErrorBackground"       Color="#442726"/>
+                    <SolidColorBrush x:Key="StatusErrorBorderBrush"      Color="#8B4A48"/>
+                    <SolidColorBrush x:Key="StatusInfoBackground"        Color="#1B2A35"/>
+                    <SolidColorBrush x:Key="StatusInfoBorderBrush"       Color="#2E4756"/>
+                    <!-- Status badge foreground -->
+                    <SolidColorBrush x:Key="StatusSuccessForeground"     Color="#6CCB5F"/>
+                    <SolidColorBrush x:Key="StatusWarningForeground"     Color="#FCE100"/>
+                    <SolidColorBrush x:Key="StatusErrorForeground"       Color="#FF99A4"/>
+                    <!-- Setting warning subtext -->
+                    <SolidColorBrush x:Key="SettingWarningTextForeground" Color="#FCE100"/>
+                    <!-- Operation log output text -->
+                    <SolidColorBrush x:Key="LogOutputVerboseForeground"   Color="#9D9D9D"/>
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+        </ResourceDictionary>
+    </Styles.Resources>
+
     <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
 
+    <!-- DataGrid selection: WinUI-style border-only. Negative margin offsets the added border so adjacent rows don't shift. -->
+    <Style Selector="DataGridRow">
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+    </Style>
+    <Style Selector="DataGridRow:selected">
+        <Setter Property="BorderThickness" Value="2"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColor}"/>
+        <Setter Property="Margin" Value="0,-2"/>
+    </Style>
+    <Style Selector="DataGridRow:selected /template/ Rectangle#BackgroundRectangle">
+        <Setter Property="Fill" Value="Transparent"/>
+    </Style>
+    <Style Selector="DataGridRow:selected:pointerover /template/ Rectangle#BackgroundRectangle">
+        <Setter Property="Fill" Value="{DynamicResource SettingsCardHoverBackground}"/>
+    </Style>
+
     <!-- SettingsCard appearance -->
     <Style Selector="Border.settings-card">
         <Setter Property="Background"   Value="{DynamicResource SettingsCardBackground}"/>
diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Linux.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Linux.axaml
deleted file mode 100644
index 5364da18e..000000000
--- a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Linux.axaml
+++ /dev/null
@@ -1,81 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Styles.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Dark">
-                    <!-- Settings cards -->
-                    <SolidColorBrush x:Key="SettingsCardBackground"      Color="#222534"/>
-                    <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#3a3a3a"/>
-                    <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#2e3448"/>
-                    <!-- Window structure -->
-                    <SolidColorBrush x:Key="AppWindowBackground"         Color="#191b29"/>
-                    <SolidColorBrush x:Key="AppTitleBarBackground"       Color="#191b29"/>
-                    <SolidColorBrush x:Key="AppSplitterBackground"       Color="#14161a"/>
-                    <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#16181c"/>
-                    <SolidColorBrush x:Key="AppBorderBrush"              Color="#323439"/>
-                    <SolidColorBrush x:Key="AppBadgeBackground"          Color="#3c3e44"/>
-                    <!-- Dialogs -->
-                    <SolidColorBrush x:Key="AppDialogBackground"         Color="#191b29"/>
-                    <SolidColorBrush x:Key="AppDialogPanelBackground"    Color="#2a2d34"/>
-                    <SolidColorBrush x:Key="AppDialogSubtleBackground"   Color="#3a3d44"/>
-                    <SolidColorBrush x:Key="AppDialogDarkBackground"     Color="#12141a"/>
-                    <!-- Warning banner -->
-                    <SolidColorBrush x:Key="WarningBannerBackground"     Color="#3d2800"/>
-                    <SolidColorBrush x:Key="WarningBannerBorderBrush"    Color="#7a5200"/>
-                    <SolidColorBrush x:Key="WarningBannerIconBackground" Color="#f0a500"/>
-                    <SolidColorBrush x:Key="WarningBannerIconForeground" Color="#1a1000"/>
-                    <SolidColorBrush x:Key="WarningBannerSubtext"        Color="#ffe082"/>
-                    <!-- Status banners (success / error / info) -->
-                    <SolidColorBrush x:Key="StatusSuccessBackground"     Color="#1a3d1a"/>
-                    <SolidColorBrush x:Key="StatusSuccessBorderBrush"    Color="#2e6b2e"/>
-                    <SolidColorBrush x:Key="StatusSuccessForeground"     Color="#66bb6a"/>
-                    <SolidColorBrush x:Key="StatusErrorBackground"       Color="#3d1a1a"/>
-                    <SolidColorBrush x:Key="StatusErrorBorderBrush"      Color="#6b2e2e"/>
-                    <SolidColorBrush x:Key="StatusErrorForeground"       Color="#ef9a9a"/>
-                    <SolidColorBrush x:Key="StatusWarningForeground"     Color="#ffe082"/>
-                    <SolidColorBrush x:Key="StatusInfoBackground"        Color="#1a2035"/>
-                    <SolidColorBrush x:Key="StatusInfoBorderBrush"       Color="#2e3a60"/>
-                    <!-- Setting warning subtext -->
-                    <SolidColorBrush x:Key="SettingWarningTextForeground" Color="#ffc107"/>
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="Light">
-                    <!-- Settings cards -->
-                    <SolidColorBrush x:Key="SettingsCardBackground"      Color="#fbfbfd"/>
-                    <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#eff0f3"/>
-                    <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#f5f6f9"/>
-                    <!-- Window structure -->
-                    <SolidColorBrush x:Key="AppWindowBackground"         Color="#f0f3f9"/>
-                    <SolidColorBrush x:Key="AppTitleBarBackground"       Color="#f0f3f9"/>
-                    <SolidColorBrush x:Key="AppSplitterBackground"       Color="#d8d8d8"/>
-                    <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#f8f8f8"/>
-                    <SolidColorBrush x:Key="AppBorderBrush"              Color="#cccccc"/>
-                    <SolidColorBrush x:Key="AppBadgeBackground"          Color="#e0e0e0"/>
-                    <!-- Dialogs -->
-                    <SolidColorBrush x:Key="AppDialogBackground"         Color="#ffffff"/>
-                    <SolidColorBrush x:Key="AppDialogPanelBackground"    Color="#f5f5f5"/>
-                    <SolidColorBrush x:Key="AppDialogSubtleBackground"   Color="#ebebeb"/>
-                    <SolidColorBrush x:Key="AppDialogDarkBackground"     Color="#e8e8e8"/>
-                    <!-- Warning banner -->
-                    <SolidColorBrush x:Key="WarningBannerBackground"     Color="#fff8e1"/>
-                    <SolidColorBrush x:Key="WarningBannerBorderBrush"    Color="#d4a700"/>
-                    <SolidColorBrush x:Key="WarningBannerIconBackground" Color="#f0a500"/>
-                    <SolidColorBrush x:Key="WarningBannerIconForeground" Color="#1a1000"/>
-                    <SolidColorBrush x:Key="WarningBannerSubtext"        Color="#7a4f00"/>
-                    <!-- Status banners (success / error / info) -->
-                    <SolidColorBrush x:Key="StatusSuccessBackground"     Color="#e8f5e9"/>
-                    <SolidColorBrush x:Key="StatusSuccessBorderBrush"    Color="#4caf50"/>
-                    <SolidColorBrush x:Key="StatusSuccessForeground"     Color="#2e7d32"/>
-                    <SolidColorBrush x:Key="StatusErrorBackground"       Color="#ffebee"/>
-                    <SolidColorBrush x:Key="StatusErrorBorderBrush"      Color="#f44336"/>
-                    <SolidColorBrush x:Key="StatusErrorForeground"       Color="#c62828"/>
-                    <SolidColorBrush x:Key="StatusWarningForeground"     Color="#7a4f00"/>
-                    <SolidColorBrush x:Key="StatusInfoBackground"        Color="#e3f2fd"/>
-                    <SolidColorBrush x:Key="StatusInfoBorderBrush"       Color="#1976d2"/>
-                    <!-- Setting warning subtext -->
-                    <SolidColorBrush x:Key="SettingWarningTextForeground" Color="#a05c00"/>
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
-        </ResourceDictionary>
-    </Styles.Resources>
-</Styles>
diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Windows.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Windows.axaml
deleted file mode 100644
index 6154a9ddb..000000000
--- a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Windows.axaml
+++ /dev/null
@@ -1,87 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Styles.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Dark">
-                    <!-- Settings cards -->
-                    <SolidColorBrush x:Key="SettingsCardBackground"      Color="#222534"/>
-                    <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#3a3a3a"/>
-                    <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#2e3448"/>
-                    <!-- Window structure -->
-                    <SolidColorBrush x:Key="AppWindowBackground"         Color="#191b29"/>
-                    <SolidColorBrush x:Key="AppTitleBarBackground"       Color="#191b29"/>
-                    <SolidColorBrush x:Key="AppSplitterBackground"       Color="#14161a"/>
-                    <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#16181c"/>
-                    <SolidColorBrush x:Key="AppBorderBrush"              Color="#323439"/>
-                    <SolidColorBrush x:Key="AppBadgeBackground"          Color="#3c3e44"/>
-                    <!-- Dialogs -->
-                    <SolidColorBrush x:Key="AppDialogBackground"         Color="#191b29"/>
-                    <SolidColorBrush x:Key="AppDialogPanelBackground"    Color="#2a2d34"/>
-                    <SolidColorBrush x:Key="AppDialogSubtleBackground"   Color="#3a3d44"/>
-                    <SolidColorBrush x:Key="AppDialogDarkBackground"     Color="#12141a"/>
-                    <!-- Warning banner -->
-                    <SolidColorBrush x:Key="WarningBannerBackground"     Color="#3d2800"/>
-                    <SolidColorBrush x:Key="WarningBannerBorderBrush"    Color="#7a5200"/>
-                    <SolidColorBrush x:Key="WarningBannerIconBackground" Color="#f0a500"/>
-                    <SolidColorBrush x:Key="WarningBannerIconForeground" Color="#1a1000"/>
-                    <SolidColorBrush x:Key="WarningBannerSubtext"        Color="#ffe082"/>
-                    <!-- Status banners (success / error / info) -->
-                    <SolidColorBrush x:Key="StatusSuccessBackground"     Color="#1a3d1a"/>
-                    <SolidColorBrush x:Key="StatusSuccessBorderBrush"    Color="#2e6b2e"/>
-                    <SolidColorBrush x:Key="StatusErrorBackground"       Color="#3d1a1a"/>
-                    <SolidColorBrush x:Key="StatusErrorBorderBrush"      Color="#6b2e2e"/>
-                    <SolidColorBrush x:Key="StatusInfoBackground"        Color="#1a2035"/>
-                    <SolidColorBrush x:Key="StatusInfoBorderBrush"       Color="#2e3a60"/>
-                    <!-- Status badge foreground -->
-                    <SolidColorBrush x:Key="StatusSuccessForeground"     Color="#66bb6a"/>
-                    <SolidColorBrush x:Key="StatusWarningForeground"     Color="#ffe082"/>
-                    <SolidColorBrush x:Key="StatusErrorForeground"       Color="#ef9a9a"/>
-                    <!-- Setting warning subtext -->
-                    <SolidColorBrush x:Key="SettingWarningTextForeground" Color="#ffc107"/>
-                    <!-- Operation log output text -->
-                    <SolidColorBrush x:Key="LogOutputVerboseForeground"   Color="#9D9D9D"/>
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="Light">
-                    <!-- Settings cards -->
-                    <SolidColorBrush x:Key="SettingsCardBackground"      Color="#fbfbfd"/>
-                    <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#eff0f3"/>
-                    <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#f5f6f9"/>
-                    <!-- Window structure -->
-                    <SolidColorBrush x:Key="AppWindowBackground"         Color="#f0f3f9"/>
-                    <SolidColorBrush x:Key="AppTitleBarBackground"       Color="#f0f3f9"/>
-                    <SolidColorBrush x:Key="AppSplitterBackground"       Color="#d8d8d8"/>
-                    <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#f8f8f8"/>
-                    <SolidColorBrush x:Key="AppBorderBrush"              Color="#cccccc"/>
-                    <SolidColorBrush x:Key="AppBadgeBackground"          Color="#e0e0e0"/>
-                    <!-- Dialogs -->
-                    <SolidColorBrush x:Key="AppDialogBackground"         Color="#ffffff"/>
-                    <SolidColorBrush x:Key="AppDialogPanelBackground"    Color="#f5f5f5"/>
-                    <SolidColorBrush x:Key="AppDialogSubtleBackground"   Color="#ebebeb"/>
-                    <SolidColorBrush x:Key="AppDialogDarkBackground"     Color="#e8e8e8"/>
-                    <!-- Warning banner -->
-                    <SolidColorBrush x:Key="WarningBannerBackground"     Color="#fff8e1"/>
-                    <SolidColorBrush x:Key="WarningBannerBorderBrush"    Color="#d4a700"/>
-                    <SolidColorBrush x:Key="WarningBannerIconBackground" Color="#f0a500"/>
-                    <SolidColorBrush x:Key="WarningBannerIconForeground" Color="#1a1000"/>
-                    <SolidColorBrush x:Key="WarningBannerSubtext"        Color="#7a4f00"/>
-                    <!-- Status banners (success / error / info) -->
-                    <SolidColorBrush x:Key="StatusSuccessBackground"     Color="#e8f5e9"/>
-                    <SolidColorBrush x:Key="StatusSuccessBorderBrush"    Color="#4caf50"/>
-                    <SolidColorBrush x:Key="StatusErrorBackground"       Color="#ffebee"/>
-                    <SolidColorBrush x:Key="StatusErrorBorderBrush"      Color="#f44336"/>
-                    <SolidColorBrush x:Key="StatusInfoBackground"        Color="#e3f2fd"/>
-                    <SolidColorBrush x:Key="StatusInfoBorderBrush"       Color="#1976d2"/>
-                    <!-- Status badge foreground -->
-                    <SolidColorBrush x:Key="StatusSuccessForeground"     Color="#2e7d32"/>
-                    <SolidColorBrush x:Key="StatusWarningForeground"     Color="#7a4f00"/>
-                    <SolidColorBrush x:Key="StatusErrorForeground"       Color="#c62828"/>
-                    <!-- Setting warning subtext -->
-                    <SolidColorBrush x:Key="SettingWarningTextForeground" Color="#a05c00"/>
-                    <!-- Operation log output text -->
-                    <SolidColorBrush x:Key="LogOutputVerboseForeground"   Color="#5C5C5C"/>
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
-        </ResourceDictionary>
-    </Styles.Resources>
-</Styles>
diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.macOS.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.macOS.axaml
deleted file mode 100644
index 8d2909c11..000000000
--- a/src/UniGetUI.Avalonia/Assets/Styles/Styles.macOS.axaml
+++ /dev/null
@@ -1,83 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Styles.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Dark">
-                    <!-- Settings cards -->
-                    <SolidColorBrush x:Key="SettingsCardBackground"      Color="#222534"/>
-                    <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#3a3a3a"/>
-                    <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#2e3448"/>
-                    <!-- Window structure -->
-                    <SolidColorBrush x:Key="AppWindowBackground"         Color="#191b29"/>
-                    <SolidColorBrush x:Key="AppTitleBarBackground"       Color="#191b29"/>
-                    <SolidColorBrush x:Key="AppSplitterBackground"       Color="#14161a"/>
-                    <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#16181c"/>
-                    <SolidColorBrush x:Key="AppBorderBrush"              Color="#323439"/>
-                    <SolidColorBrush x:Key="AppBadgeBackground"          Color="#3c3e44"/>
-                    <!-- Dialogs -->
-                    <SolidColorBrush x:Key="AppDialogBackground"         Color="#191b29"/>
-                    <SolidColorBrush x:Key="AppDialogPanelBackground"    Color="#2a2d34"/>
-                    <SolidColorBrush x:Key="AppDialogSubtleBackground"   Color="#3a3d44"/>
-                    <SolidColorBrush x:Key="AppDialogDarkBackground"     Color="#12141a"/>
-                    <!-- Warning banner -->
-                    <SolidColorBrush x:Key="WarningBannerBackground"     Color="#3d2800"/>
-                    <SolidColorBrush x:Key="WarningBannerBorderBrush"    Color="#7a5200"/>
-                    <SolidColorBrush x:Key="WarningBannerIconBackground" Color="#f0a500"/>
-                    <SolidColorBrush x:Key="WarningBannerIconForeground" Color="#1a1000"/>
-                    <SolidColorBrush x:Key="WarningBannerSubtext"        Color="#ffe082"/>
-                    <!-- Status banners (success / error / info) -->
-                    <SolidColorBrush x:Key="StatusSuccessBackground"     Color="#1a3d1a"/>
-                    <SolidColorBrush x:Key="StatusSuccessBorderBrush"    Color="#2e6b2e"/>
-                    <SolidColorBrush x:Key="StatusErrorBackground"       Color="#3d1a1a"/>
-                    <SolidColorBrush x:Key="StatusErrorBorderBrush"      Color="#6b2e2e"/>
-                    <SolidColorBrush x:Key="StatusInfoBackground"        Color="#1a2035"/>
-                    <SolidColorBrush x:Key="StatusInfoBorderBrush"       Color="#2e3a60"/>
-                    <!-- Status badge foreground -->
-                    <SolidColorBrush x:Key="StatusSuccessForeground"     Color="#66bb6a"/>
-                    <SolidColorBrush x:Key="StatusWarningForeground"     Color="#ffe082"/>
-                    <SolidColorBrush x:Key="StatusErrorForeground"       Color="#ef9a9a"/>
-                    <!-- Setting warning subtext -->
-                    <SolidColorBrush x:Key="SettingWarningTextForeground" Color="#ffc107"/>
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="Light">
-                    <!-- Settings cards -->
-                    <SolidColorBrush x:Key="SettingsCardBackground"      Color="#fbfbfd"/>
-                    <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#eff0f3"/>
-                    <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#f5f6f9"/>
-                    <!-- Window structure -->
-                    <SolidColorBrush x:Key="AppWindowBackground"         Color="#f0f3f9"/>
-                    <SolidColorBrush x:Key="AppTitleBarBackground"       Color="#f0f3f9"/>
-                    <SolidColorBrush x:Key="AppSplitterBackground"       Color="#d8d8d8"/>
-                    <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#f8f8f8"/>
-                    <SolidColorBrush x:Key="AppBorderBrush"              Color="#cccccc"/>
-                    <SolidColorBrush x:Key="AppBadgeBackground"          Color="#e0e0e0"/>
-                    <!-- Dialogs -->
-                    <SolidColorBrush x:Key="AppDialogBackground"         Color="#ffffff"/>
-                    <SolidColorBrush x:Key="AppDialogPanelBackground"    Color="#f5f5f5"/>
-                    <SolidColorBrush x:Key="AppDialogSubtleBackground"   Color="#ebebeb"/>
-                    <SolidColorBrush x:Key="AppDialogDarkBackground"     Color="#e8e8e8"/>
-                    <!-- Warning banner -->
-                    <SolidColorBrush x:Key="WarningBannerBackground"     Color="#fff8e1"/>
-                    <SolidColorBrush x:Key="WarningBannerBorderBrush"    Color="#d4a700"/>
-                    <SolidColorBrush x:Key="WarningBannerIconBackground" Color="#f0a500"/>
-                    <SolidColorBrush x:Key="WarningBannerIconForeground" Color="#1a1000"/>
-                    <SolidColorBrush x:Key="WarningBannerSubtext"        Color="#7a4f00"/>
-                    <!-- Status banners (success / error / info) -->
-                    <SolidColorBrush x:Key="StatusSuccessBackground"     Color="#e8f5e9"/>
-                    <SolidColorBrush x:Key="StatusSuccessBorderBrush"    Color="#4caf50"/>
-                    <SolidColorBrush x:Key="StatusErrorBackground"       Color="#ffebee"/>
-                    <SolidColorBrush x:Key="StatusErrorBorderBrush"      Color="#f44336"/>
-                    <SolidColorBrush x:Key="StatusInfoBackground"        Color="#e3f2fd"/>
-                    <SolidColorBrush x:Key="StatusInfoBorderBrush"       Color="#1976d2"/>
-                    <!-- Status badge foreground -->
-                    <SolidColorBrush x:Key="StatusSuccessForeground"     Color="#2e7d32"/>
-                    <SolidColorBrush x:Key="StatusWarningForeground"     Color="#7a4f00"/>
-                    <SolidColorBrush x:Key="StatusErrorForeground"       Color="#c62828"/>
-                    <!-- Setting warning subtext -->
-                    <SolidColorBrush x:Key="SettingWarningTextForeground" Color="#a05c00"/>
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
-        </ResourceDictionary>
-    </Styles.Resources>
-</Styles>
diff --git a/src/UniGetUI.Avalonia/Models/PackageCollections.cs b/src/UniGetUI.Avalonia/Models/PackageCollections.cs
index 21b45e931..125c99342 100644
--- a/src/UniGetUI.Avalonia/Models/PackageCollections.cs
+++ b/src/UniGetUI.Avalonia/Models/PackageCollections.cs
@@ -296,6 +296,40 @@ public enum Sorter
     public Sorter CurrentSorter { get; private set; } = Sorter.Name;
     private bool _ascending = true;
 
+    /// <summary>Fires when any wrapper's IsChecked changes, or when items are added/removed.</summary>
+    public event EventHandler? SelectionStateChanged;
+
+    public ObservablePackageCollection()
+    {
+        CollectionChanged += OnCollectionChanged;
+    }
+
+    private void OnCollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+    {
+        if (e.OldItems is not null)
+            foreach (PackageWrapper w in e.OldItems) w.PropertyChanged -= OnWrapperPropertyChanged;
+        if (e.NewItems is not null)
+            foreach (PackageWrapper w in e.NewItems) w.PropertyChanged += OnWrapperPropertyChanged;
+        SelectionStateChanged?.Invoke(this, EventArgs.Empty);
+    }
+
+    private void OnWrapperPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(PackageWrapper.IsChecked))
+            SelectionStateChanged?.Invoke(this, EventArgs.Empty);
+    }
+
+    /// <summary>Returns the tri-state value for a "select-all" checkbox: true=all, false=none, null=some.</summary>
+    public bool? GetSelectionState()
+    {
+        if (Count == 0) return false;
+        int checkedCount = 0;
+        foreach (var w in this) if (w.IsChecked) checkedCount++;
+        if (checkedCount == 0) return false;
+        if (checkedCount == Count) return true;
+        return null;
+    }
+
     public List<IPackage> GetPackages() =>
         this.Select(w => w.Package).ToList();
 
diff --git a/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs
index 34fcb3076..4b3ccba2d 100644
--- a/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs
@@ -127,6 +127,14 @@ private void OnPageViewModelPropertyChanged(object? sender, System.ComponentMode
         }
     }
 
+    // ─── Title bar ───────────────────────────────────────────────────────────
+    // Mirrors WinUI behavior: the version appears next to "UniGetUI" only when
+    // the ShowVersionNumberOnTitlebar setting is enabled (the setting is gated
+    // on restart, so a one-shot read at construction is sufficient).
+    public string TitleBarText { get; } = Settings.Get(Settings.K.ShowVersionNumberOnTitlebar)
+        ? $"UniGetUI {CoreTools.Translate("version {0}", CoreData.VersionName)}"
+        : "UniGetUI";
+
     // ─── Banners ─────────────────────────────────────────────────────────────
     public InfoBarViewModel UpdatesBanner { get; } = new() { Severity = InfoBarSeverity.Success };
     public InfoBarViewModel ErrorBanner { get; } = new() { Severity = InfoBarSeverity.Error };
diff --git a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
index 8b6c0daac..310e46ea4 100644
--- a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
@@ -70,7 +70,16 @@ public class SourceTreeNode : INotifyPropertyChanged
     public string? PackageID { get; init; }
     public string? Version { get; init; }
     public string? Source { get; init; }
-    public AvaloniaList<SourceTreeNode> Children { get; } = new();
+    public AvaloniaList<SourceTreeNode> Children { get; }
+
+    public bool HasChildren => Children.Count > 0;
+
+    public SourceTreeNode()
+    {
+        Children = new AvaloniaList<SourceTreeNode>();
+        Children.CollectionChanged += (_, _) =>
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(HasChildren)));
+    }
 
     public event PropertyChangedEventHandler? PropertyChanged;
 
@@ -91,7 +100,21 @@ public bool IsExpanded
 
 public partial class PackagesPageViewModel : ViewModelBase
 {
-    public double FilterPaneColumnWidth => IsFilterPaneOpen ? 220.0 : 0.0;
+    // Live width of the filter pane. Code-behind keeps this in sync with the GridSplitter
+    // so the toolbar's main button (bound to FilterPaneColumnWidth) tracks resizes.
+    private double _trackedFilterPaneWidth = 220.0;
+    public double TrackedFilterPaneWidth
+    {
+        get => _trackedFilterPaneWidth;
+        set
+        {
+            if (Math.Abs(_trackedFilterPaneWidth - value) < 0.5) return;
+            _trackedFilterPaneWidth = value;
+            if (IsFilterPaneOpen) OnPropertyChanged(nameof(FilterPaneColumnWidth));
+        }
+    }
+
+    public double FilterPaneColumnWidth => IsFilterPaneOpen ? _trackedFilterPaneWidth : 0.0;
     partial void OnIsFilterPaneOpenChanged(bool value)
     {
         OnPropertyChanged(nameof(FilterPaneColumnWidth));
@@ -195,6 +218,11 @@ public PackagesPageViewModel(PackagesPageData data)
         SearchBoxPlaceholder = CoreTools.Translate("Search for packages");
 
         AllPackagesChecked = data.PackagesAreCheckedByDefault;
+        FilteredPackages.SelectionStateChanged += (_, _) =>
+        {
+            if (_suppressSelectionRecompute) return;
+            AllPackagesChecked = FilteredPackages.GetSelectionState();
+        };
 
         Loader = data.Loader;
         Loader.StartedLoading += Loader_StartedLoading;
@@ -241,12 +269,12 @@ public Button AddToolbarButton(string svgName, string label, Action onClick, boo
         var icon = new SvgIcon
         {
             Path = $"avares://UniGetUI.Avalonia/Assets/Symbols/{svgName}.svg",
-            Width = 16,
-            Height = 16,
+            Width = 20,
+            Height = 20,
             VerticalAlignment = VerticalAlignment.Center,
         };
 
-        var content = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 4 };
+        var content = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6 };
         content.Children.Add(icon);
         if (showLabel)
         {
@@ -260,8 +288,8 @@ public Button AddToolbarButton(string svgName, string label, Action onClick, boo
 
         var btn = new Button
         {
-            Height = 36,
-            Padding = new Thickness(8, 4),
+            Height = 40,
+            Padding = new Thickness(10, 4),
             CornerRadius = new CornerRadius(4),
             Content = content,
         };
@@ -275,13 +303,19 @@ public Button AddToolbarButton(string svgName, string label, Action onClick, boo
     /// <summary>Adds a thin vertical separator to the toolbar.</summary>
     public void AddToolbarSeparator()
     {
+        object? borderResource = null;
+        Application.Current?.Resources.TryGetResource(
+            "AppBorderBrush",
+            Application.Current?.ActualThemeVariant,
+            out borderResource);
+
         var sep = new Separator
         {
             Width = 1,
-            Height = 30,
+            Height = 32,
             Margin = new Thickness(4, 4),
-            Background = Application.Current?.FindResource("AppBorderBrush") as IBrush
-                         ?? new SolidColorBrush(Color.FromArgb(60, 255, 255, 255)),
+            Background = borderResource as IBrush
+                         ?? new SolidColorBrush(Color.FromArgb(80, 128, 128, 128)),
         };
         AutomationProperties.SetAccessibilityView(sep, AccessibilityView.Raw);
         ToolBarItems.Add(sep);
@@ -559,10 +593,19 @@ partial void OnSearchModeChanged(SearchMode value)
     public bool SearchMode_Exact { get => SearchMode == SearchMode.Exact; set { if (value) SearchMode = SearchMode.Exact; } }
     public bool SearchMode_Similar { get => SearchMode == SearchMode.Similar; set { if (value) SearchMode = SearchMode.Similar; } }
 
+    private bool _suppressSelectionRecompute;
     partial void OnAllPackagesCheckedChanged(bool? value)
     {
-        if (value == true) FilteredPackages.SelectAll();
-        else if (value == false) FilteredPackages.ClearSelection();
+        _suppressSelectionRecompute = true;
+        try
+        {
+            if (value == true) FilteredPackages.SelectAll();
+            else if (value == false) FilteredPackages.ClearSelection();
+        }
+        finally
+        {
+            _suppressSelectionRecompute = false;
+        }
     }
 
     // ─── Sources ──────────────────────────────────────────────────────────────
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxButtonCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxButtonCard.cs
index 7cd29d8e6..c54a661a5 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxButtonCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxButtonCard.cs
@@ -15,6 +15,9 @@ public sealed partial class CheckboxButtonCard : SettingsCard
     public ToggleSwitch _checkbox;
     public TextBlock _textblock;
     public Button Button;
+    private readonly TextBlock _stateLabel;
+    private static readonly string EnabledLabel = CoreTools.Translate("Enabled");
+    private static readonly string DisabledLabel = CoreTools.Translate("Disabled");
     private bool IS_INVERTED;
 
     private CoreSettings.K setting_name = CoreSettings.K.Unset;
@@ -26,6 +29,7 @@ public CoreSettings.K SettingName
             IS_INVERTED = CoreSettings.ResolveKey(value).StartsWith("Disable");
             _checkbox.IsChecked = CoreSettings.Get(setting_name) ^ IS_INVERTED ^ ForceInversion;
             _textblock.Opacity = (_checkbox.IsChecked ?? false) ? 1 : 0.7;
+            UpdateStateLabel();
             Button.IsEnabled = (_checkbox.IsChecked ?? false) || _buttonAlwaysOn;
         }
     }
@@ -70,10 +74,19 @@ public CheckboxButtonCard()
         Button = new Button { Margin = new Thickness(0, 8, 0, 0) };
         _checkbox = new ToggleSwitch
         {
+            // OnContent/OffContent intentionally left null — state label is a
+            // sibling TextBlock to the LEFT of the knob.
+            OnContent = null,
+            OffContent = null,
+            VerticalAlignment = VerticalAlignment.Center,
+        };
+        _stateLabel = new TextBlock
+        {
+            Text = DisabledLabel,
+            VerticalAlignment = VerticalAlignment.Center,
             Margin = new Thickness(0, 0, 8, 0),
-            OnContent = new TextBlock { Text = CoreTools.Translate("Enabled") },
-            OffContent = new TextBlock { Text = CoreTools.Translate("Disabled") },
         };
+        AutomationProperties.SetAccessibilityView(_stateLabel, AccessibilityView.Raw);
         _textblock = new TextBlock
         {
             Margin = new Thickness(2, 0, 0, 0),
@@ -84,7 +97,12 @@ public CheckboxButtonCard()
         IS_INVERTED = false;
         AutomationProperties.SetAccessibilityView(Button, AccessibilityView.Control);
 
-        Content = _checkbox;
+        Content = new StackPanel
+        {
+            Orientation = Orientation.Horizontal,
+            VerticalAlignment = VerticalAlignment.Center,
+            Children = { _stateLabel, _checkbox },
+        };
         Header = _textblock;
         Description = Button;
 
@@ -94,6 +112,7 @@ public CheckboxButtonCard()
             StateChanged?.Invoke(this, EventArgs.Empty);
             Button.IsEnabled = (_checkbox.IsChecked ?? false) ? true : _buttonAlwaysOn;
             _textblock.Opacity = (_checkbox.IsChecked ?? false) ? 1 : 0.7;
+            UpdateStateLabel();
             if (_textblock.Text is not null)
             {
                 AccessibilityAnnouncementService.AnnounceToggle(_textblock.Text, _checkbox.IsChecked ?? false);
@@ -102,4 +121,9 @@ public CheckboxButtonCard()
         Button.Click += (s, e) => Click?.Invoke(s, e);
         ApplyAutomationMetadata(_checkbox, _textblock.Text);
     }
+
+    private void UpdateStateLabel()
+    {
+        _stateLabel.Text = (_checkbox.IsChecked ?? false) ? EnabledLabel : DisabledLabel;
+    }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxCard.cs
index a1e24c950..cebe2c0eb 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxCard.cs
@@ -26,6 +26,9 @@ public ICommand? StateChangedCommand
     public ToggleSwitch _checkbox;
     public TextBlock _textblock;
     public TextBlock _warningBlock;
+    private readonly TextBlock _stateLabel;
+    private static readonly string EnabledLabel = CoreTools.Translate("Enabled");
+    private static readonly string DisabledLabel = CoreTools.Translate("Disabled");
     protected bool IS_INVERTED;
 
     private CoreSettings.K setting_name = CoreSettings.K.Unset;
@@ -38,6 +41,7 @@ public CoreSettings.K SettingName
             IS_INVERTED = CoreSettings.ResolveKey(value).StartsWith("Disable");
             _checkbox.IsChecked = CoreSettings.Get(setting_name) ^ IS_INVERTED ^ ForceInversion;
             _textblock.Opacity = (_checkbox.IsChecked ?? false) ? 1 : 0.7;
+            UpdateStateLabel();
             _checkbox.IsCheckedChanged += _checkbox_Toggled;
             SyncToggleItemStatus();
         }
@@ -77,12 +81,21 @@ public CheckboxCard()
     {
         _checkbox = new ToggleSwitch
         {
-            Margin = new Thickness(0, 0, 8, 0),
-            OnContent = new TextBlock { Text = CoreTools.Translate("Enabled") },
-            OffContent = new TextBlock { Text = CoreTools.Translate("Disabled") },
+            // OnContent/OffContent intentionally left null — the state label is
+            // rendered as a sibling TextBlock to the LEFT of the knob below.
+            OnContent = null,
+            OffContent = null,
+            VerticalAlignment = VerticalAlignment.Center,
         };
         // Force CheckBox role so macOS VoiceOver exposes checked/unchecked state
         AutomationProperties.SetControlTypeOverride(_checkbox, AutomationControlType.CheckBox);
+        _stateLabel = new TextBlock
+        {
+            Text = DisabledLabel,
+            VerticalAlignment = VerticalAlignment.Center,
+            Margin = new Thickness(0, 0, 8, 0),
+        };
+        AutomationProperties.SetAccessibilityView(_stateLabel, AccessibilityView.Raw);
         _textblock = new TextBlock
         {
             VerticalAlignment = VerticalAlignment.Center,
@@ -100,7 +113,12 @@ public CheckboxCard()
         IS_INVERTED = false;
         AutomationProperties.SetAccessibilityView(_warningBlock, AccessibilityView.Raw);
 
-        Content = _checkbox;
+        Content = new StackPanel
+        {
+            Orientation = Orientation.Horizontal,
+            VerticalAlignment = VerticalAlignment.Center,
+            Children = { _stateLabel, _checkbox },
+        };
         Header = new StackPanel
         {
             Spacing = 4,
@@ -112,11 +130,17 @@ public CheckboxCard()
         ApplyAutomationMetadata(_checkbox, _textblock.Text);
     }
 
+    protected void UpdateStateLabel()
+    {
+        _stateLabel.Text = (_checkbox.IsChecked ?? false) ? EnabledLabel : DisabledLabel;
+    }
+
     protected virtual void _checkbox_Toggled(object? sender, RoutedEventArgs e)
     {
         CoreSettings.Set(setting_name, (_checkbox.IsChecked ?? false) ^ IS_INVERTED ^ ForceInversion);
         StateChanged?.Invoke(this, EventArgs.Empty);
         _textblock.Opacity = (_checkbox.IsChecked ?? false) ? 1 : 0.7;
+        UpdateStateLabel();
         SyncToggleItemStatus();
         if (_textblock.Text is not null)
         {
@@ -165,6 +189,7 @@ public string KeyName
                     ^ IS_INVERTED
                     ^ ForceInversion;
                 _textblock.Opacity = (_checkbox.IsChecked ?? false) ? 1 : 0.7;
+                UpdateStateLabel();
                 _disableStateChangedEvent = false;
                 SyncToggleItemStatus();
             }
@@ -184,6 +209,7 @@ public CoreSettings.K DictionaryName
                     ^ IS_INVERTED
                     ^ ForceInversion;
                 _textblock.Opacity = (_checkbox.IsChecked ?? false) ? 1 : 0.7;
+                UpdateStateLabel();
                 SyncToggleItemStatus();
             }
         }
@@ -201,6 +227,7 @@ protected override void _checkbox_Toggled(object? sender, RoutedEventArgs e)
         );
         StateChanged?.Invoke(this, EventArgs.Empty);
         _textblock.Opacity = (_checkbox.IsChecked ?? false) ? 1 : 0.7;
+        UpdateStateLabel();
         SyncToggleItemStatus();
         if (_textblock.Text is not null)
         {
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs
index 7332c4432..a0aa8e79d 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs
@@ -25,6 +25,9 @@ public ICommand? StateChangedCommand
     public TextBlock _textblock;
     public TextBlock _warningBlock;
     public ProgressBar _loading;   // Avalonia has no ProgressRing; use indeterminate ProgressBar
+    private readonly TextBlock _stateLabel;
+    private static readonly string EnabledLabel = CoreTools.Translate("Enabled");
+    private static readonly string DisabledLabel = CoreTools.Translate("Disabled");
     private bool IS_INVERTED;
 
     private SecureSettings.K setting_name = SecureSettings.K.Unset;
@@ -37,6 +40,7 @@ public SecureSettings.K SettingName
             IS_INVERTED = SecureSettings.ResolveKey(value).StartsWith("Disable");
             _checkbox.IsChecked = SecureSettings.Get(setting_name) ^ IS_INVERTED ^ ForceInversion;
             _textblock.Opacity = (_checkbox.IsChecked ?? false) ? 1 : 0.7;
+            UpdateStateLabel();
             _checkbox.IsEnabled = true;
         }
     }
@@ -77,9 +81,17 @@ public SecureCheckboxCard()
     {
         _checkbox = new ToggleSwitch
         {
+            // OnContent/OffContent intentionally left null — the state label is
+            // a sibling TextBlock placed to the LEFT of the knob below.
+            OnContent = null,
+            OffContent = null,
+            VerticalAlignment = VerticalAlignment.Center,
+        };
+        _stateLabel = new TextBlock
+        {
+            Text = DisabledLabel,
+            VerticalAlignment = VerticalAlignment.Center,
             Margin = new Thickness(0, 0, 8, 0),
-            OnContent = new TextBlock { Text = CoreTools.Translate("Enabled") },
-            OffContent = new TextBlock { Text = CoreTools.Translate("Disabled") },
         };
         _loading = new ProgressBar
         {
@@ -108,7 +120,8 @@ public SecureCheckboxCard()
         {
             Spacing = 4,
             Orientation = Orientation.Horizontal,
-            Children = { _loading, _checkbox },
+            VerticalAlignment = VerticalAlignment.Center,
+            Children = { _loading, _stateLabel, _checkbox },
         };
         Header = new StackPanel
         {
@@ -150,6 +163,7 @@ await SecureSettings.TrySet(
                 cmd.Execute(null);
             _textblock.Opacity = (_checkbox.IsChecked ?? false) ? 1 : 0.7;
             _checkbox.IsChecked = SecureSettings.Get(setting_name) ^ IS_INVERTED ^ ForceInversion;
+            UpdateStateLabel();
             if (_textblock.Text is not null)
             {
                 AccessibilityAnnouncementService.AnnounceToggle(_textblock.Text, _checkbox.IsChecked ?? false);
@@ -161,8 +175,14 @@ await SecureSettings.TrySet(
         {
             Logger.Warn(ex);
             _checkbox.IsChecked = SecureSettings.Get(setting_name) ^ IS_INVERTED ^ ForceInversion;
+            UpdateStateLabel();
             _loading.IsVisible = false;
             _checkbox.IsEnabled = true;
         }
     }
+
+    private void UpdateStateLabel()
+    {
+        _stateLabel.Text = (_checkbox.IsChecked ?? false) ? EnabledLabel : DisabledLabel;
+    }
 }
diff --git a/src/UniGetUI.Avalonia/Views/MainWindow.axaml b/src/UniGetUI.Avalonia/Views/MainWindow.axaml
index c9c8d0d9d..b29a07b81 100644
--- a/src/UniGetUI.Avalonia/Views/MainWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/MainWindow.axaml
@@ -310,7 +310,8 @@
                         VerticalAlignment="Center"
                         Orientation="Horizontal"
                         Margin="65,0,8,0"
-                        Spacing="8">
+                        Spacing="8"
+                        Opacity="0.6">
                 <Button Width="32" Height="32"
                         Padding="4"
                         Background="Transparent"
@@ -323,7 +324,7 @@
                               automation:AutomationProperties.AccessibilityView="Raw"
                               Data="M1,1 H15 V3 H1 Z M1,7 H15 V9 H1 Z M1,13 H15 V15 H1 Z"/>
                 </Button>
-                <TextBlock Text="UniGetUI"
+                <TextBlock Text="{Binding TitleBarText}"
                            FontSize="13"
                            FontWeight="SemiBold"
                            VerticalAlignment="Center"/>
@@ -334,7 +335,8 @@
                         VerticalAlignment="Center"
                         automation:AutomationProperties.AccessibilityView="Control"
                         Orientation="Horizontal"
-                        Spacing="0">
+                        Spacing="0"
+                        Opacity="0.6">
                 <TextBox x:Name="GlobalSearchBox"
                          Width="300"
                          MinHeight="20"
@@ -365,13 +367,14 @@
             <!-- Right column: Linux window buttons on the far right -->
             <Panel Grid.Column="2">
 
-                <!-- Linux only: min / max / close (IsVisible set in code-behind) -->
+                <!-- Custom min / max / close (shown on Windows, macOS, and Linux without native decorations; IsVisible set in code-behind) -->
                 <StackPanel x:Name="LinuxWindowButtons"
                             Orientation="Horizontal"
                             HorizontalAlignment="Right"
                             VerticalAlignment="Center"
                             Margin="0,0,4,0"
                             Spacing="0"
+                            Opacity="0.55"
                             IsVisible="False">
                     <!-- Minimize: horizontal line -->
                     <Button Width="46" Height="32" Padding="0"
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
index 9ef79172c..e1e45baa7 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
@@ -36,9 +36,6 @@
          <Setter Property="Background" Value="Transparent"/>
          <Setter Property="BorderThickness" Value="0"/>
       </Style>
-      <Style Selector="#ToolbarRow ToggleButton:checked">
-         <Setter Property="Background" Value="{DynamicResource SystemAccentColor}"/>
-      </Style>
       <!-- Main action button: card background with border -->
       <Style Selector="Button#MainToolbarButton">
          <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}"/>
@@ -48,6 +45,12 @@
          <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}"/>
          <Setter Property="BorderThickness" Value="1"/>
       </Style>
+      <!-- Render the three-state "Select all" checkbox's indeterminate glyph as a dash instead of a square -->
+      <Style Selector="CheckBox:indeterminate /template/ Path#CheckGlyph">
+         <Setter Property="Data" Value="M0,0 H10 V2 H0 Z"/>
+         <Setter Property="Width" Value="10"/>
+         <Setter Property="Height" Value="2"/>
+      </Style>
    </UserControl.Styles>
 
    <Grid RowDefinitions="Auto,Auto,*,Auto" Margin="8,8,8,8">
@@ -96,17 +99,50 @@
               ColumnSpacing="4"
               Margin="0">
 
-            <!-- Filters toggle — MinWidth tracks the filter pane so action buttons stay aligned with the package list -->
+            <!-- Filters toggle — MinWidth tracks the filter pane width so action buttons stay aligned
+                 with the package list when the pane is open, and collapse next to the Filters button when closed. -->
             <StackPanel Grid.Column="0" Orientation="Horizontal" Margin="0,0,8,0"
                         MinWidth="{Binding FilterPaneColumnWidth}">
                 <ToggleButton x:Name="ToggleFiltersButton"
-                              Height="36"
-                              Padding="8,4"
+                              Height="40"
+                              Padding="10,4"
                               CornerRadius="4"
                               automation:AutomationProperties.Name="{t:Translate Filters}"
                               IsChecked="{Binding IsFilterPaneOpen, Mode=TwoWay}">
-                    <StackPanel Orientation="Horizontal" Spacing="8">
-                        <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/Filter.svg" Width="16" Height="16" VerticalAlignment="Center"/>
+                    <ToggleButton.Resources>
+                        <ResourceDictionary>
+                            <ResourceDictionary.ThemeDictionaries>
+                                <ResourceDictionary x:Key="Light">
+                                    <SolidColorBrush x:Key="ToggleButtonBackgroundChecked" Color="#FBFBFB"/>
+                                    <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver" Color="#F6F6F6"/>
+                                    <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed" Color="#EDEDED"/>
+                                    <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedDisabled" Color="#FBFBFB"/>
+                                    <SolidColorBrush x:Key="ToggleButtonBorderBrushChecked" Color="#ECECEC"/>
+                                    <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPointerOver" Color="#ECECEC"/>
+                                    <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPressed" Color="#ECECEC"/>
+                                    <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedDisabled" Color="#ECECEC"/>
+                                    <SolidColorBrush x:Key="ToggleButtonForegroundChecked" Color="Black"/>
+                                    <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPointerOver" Color="Black"/>
+                                    <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPressed" Color="Black"/>
+                                </ResourceDictionary>
+                                <ResourceDictionary x:Key="Dark">
+                                    <SolidColorBrush x:Key="ToggleButtonBackgroundChecked" Color="#2D2D2D"/>
+                                    <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver" Color="#323232"/>
+                                    <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed" Color="#3C3C3C"/>
+                                    <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedDisabled" Color="#2D2D2D"/>
+                                    <SolidColorBrush x:Key="ToggleButtonBorderBrushChecked" Color="#393939"/>
+                                    <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPointerOver" Color="#393939"/>
+                                    <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPressed" Color="#393939"/>
+                                    <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedDisabled" Color="#393939"/>
+                                    <SolidColorBrush x:Key="ToggleButtonForegroundChecked" Color="White"/>
+                                    <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPointerOver" Color="White"/>
+                                    <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPressed" Color="White"/>
+                                </ResourceDictionary>
+                            </ResourceDictionary.ThemeDictionaries>
+                        </ResourceDictionary>
+                    </ToggleButton.Resources>
+                    <StackPanel Orientation="Horizontal" Spacing="6">
+                        <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/Filter.svg" Width="20" Height="20" VerticalAlignment="Center"/>
                         <TextBlock Text="{t:Translate Filters}" FontSize="12" FontWeight="Medium" VerticalAlignment="Center"/>
                     </StackPanel>
                 </ToggleButton>
@@ -115,12 +151,12 @@
             <!-- Main action button + dropdown -->
             <StackPanel Grid.Column="1" Orientation="Horizontal">
                 <Button x:Name="MainToolbarButton"
-                        Height="36"
+                        Height="40"
                         Margin="-9,0,1,0"
                         CornerRadius="4,0,0,4">
-                    <StackPanel Orientation="Horizontal" Spacing="4">
+                    <StackPanel Orientation="Horizontal" Spacing="6">
                         <controls:SvgIcon x:Name="MainToolbarButtonIcon"
-                                          Width="16" Height="16"
+                                          Width="20" Height="20"
                                           VerticalAlignment="Center"/>
                         <TextBlock x:Name="MainToolbarButtonText"
                                    FontSize="12"
@@ -129,13 +165,18 @@
                     </StackPanel>
                 </Button>
                 <Button x:Name="MainToolbarButtonDropdown"
-                        Width="30"
-                        Height="36"
+                        Width="32"
+                        Height="40"
                         Padding="4"
                         automation:AutomationProperties.Name="{t:Translate More}"
                         CornerRadius="0,4,4,0">
-                    <TextBlock Text="▾" FontSize="20" HorizontalAlignment="Center"
-                               automation:AutomationProperties.AccessibilityView="Raw"/>
+                    <Path Data="M 0,0 L 4,4 L 8,0"
+                          Stroke="{DynamicResource TextFillColorPrimaryBrush}"
+                          StrokeThickness="1.5"
+                          StrokeJoin="Miter"
+                          Fill="Transparent"
+                          HorizontalAlignment="Center" VerticalAlignment="Center"
+                          automation:AutomationProperties.AccessibilityView="Raw"/>
                 </Button>
             </StackPanel>
 
@@ -209,7 +250,8 @@
                                             Padding="2"
                                             Background="Transparent"
                                             BorderThickness="0">
-                                        <TextBlock Text="{t:Translate Select all}" FontSize="12" FontWeight="SemiBold"/>
+                                        <TextBlock Text="{t:Translate Select all}" FontSize="12" FontWeight="SemiBold"
+                                                   Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}"/>
                                     </Button>
                                     <Button x:Name="ClearSourceSelectionButton"
                                             Grid.Column="1"
@@ -220,7 +262,8 @@
                                             Padding="2"
                                             Background="Transparent"
                                             BorderThickness="0">
-                                        <TextBlock Text="{t:Translate Clear selection}" FontSize="12" FontWeight="SemiBold"/>
+                                        <TextBlock Text="{t:Translate Clear selection}" FontSize="12" FontWeight="SemiBold"
+                                                   Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}"/>
                                     </Button>
                                     <ItemsControl x:Name="SourcesTreeView"
                                               Grid.Row="1"
@@ -232,10 +275,84 @@
                                             <DataTemplate x:DataType="vm:SourceTreeNode">
                                                 <StackPanel>
                                                     <CheckBox IsChecked="{Binding IsSelected, Mode=TwoWay}"
-                                                              Content="{Binding PackageName}"/>
-                                                    <!-- Child sources, indented, shown when manager has custom sources -->
+                                                              VerticalAlignment="Center">
+                                                        <CheckBox.Content>
+                                                            <StackPanel Orientation="Horizontal" Spacing="4">
+                                                        <ToggleButton IsChecked="{Binding IsExpanded, Mode=TwoWay}"
+                                                                      IsVisible="{Binding HasChildren}"
+                                                                      BorderThickness="0"
+                                                                      Width="20" Height="20"
+                                                                      Padding="0"
+                                                                      Opacity="0.55"
+                                                                      VerticalAlignment="Center"
+                                                                      automation:AutomationProperties.Name="{t:Translate Expand}">
+                                                            <ToggleButton.Resources>
+                                                                <ResourceDictionary>
+                                                                    <ResourceDictionary.ThemeDictionaries>
+                                                                        <ResourceDictionary x:Key="Light">
+                                                                            <SolidColorBrush x:Key="ToggleButtonBackground"               Color="Transparent"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBackgroundPointerOver"    Color="#0F000000"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBackgroundPressed"        Color="#1A000000"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBackgroundChecked"        Color="Transparent"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver" Color="#0F000000"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed" Color="#1A000000"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrush"               Color="Transparent"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrushPointerOver"    Color="Transparent"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrushPressed"        Color="Transparent"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrushChecked"        Color="Transparent"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPointerOver" Color="Transparent"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPressed" Color="Transparent"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonForegroundChecked"             Color="Black"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPointerOver" Color="Black"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPressed"     Color="Black"/>
+                                                                        </ResourceDictionary>
+                                                                        <ResourceDictionary x:Key="Dark">
+                                                                            <SolidColorBrush x:Key="ToggleButtonBackground"               Color="Transparent"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBackgroundPointerOver"    Color="#15FFFFFF"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBackgroundPressed"        Color="#20FFFFFF"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBackgroundChecked"        Color="Transparent"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver" Color="#15FFFFFF"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed" Color="#20FFFFFF"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrush"               Color="Transparent"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrushPointerOver"    Color="Transparent"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrushPressed"        Color="Transparent"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrushChecked"        Color="Transparent"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPointerOver" Color="Transparent"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPressed" Color="Transparent"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonForegroundChecked"             Color="White"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPointerOver" Color="White"/>
+                                                                            <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPressed"     Color="White"/>
+                                                                        </ResourceDictionary>
+                                                                    </ResourceDictionary.ThemeDictionaries>
+                                                                </ResourceDictionary>
+                                                            </ToggleButton.Resources>
+                                                            <Grid>
+                                                                <!-- Collapsed: chevron points right (>) -->
+                                                                <Path Data="M 0,0 L 4,4 L 0,8"
+                                                                      Stroke="{DynamicResource TextFillColorPrimaryBrush}"
+                                                                      StrokeThickness="1.5"
+                                                                      StrokeJoin="Miter"
+                                                                      Fill="Transparent"
+                                                                      HorizontalAlignment="Center" VerticalAlignment="Center"
+                                                                      IsVisible="{Binding !IsExpanded}"/>
+                                                                <!-- Expanded: chevron points down (v) -->
+                                                                <Path Data="M 0,0 L 4,4 L 8,0"
+                                                                      Stroke="{DynamicResource TextFillColorPrimaryBrush}"
+                                                                      StrokeThickness="1.5"
+                                                                      StrokeJoin="Miter"
+                                                                      Fill="Transparent"
+                                                                      HorizontalAlignment="Center" VerticalAlignment="Center"
+                                                                      IsVisible="{Binding IsExpanded}"/>
+                                                            </Grid>
+                                                        </ToggleButton>
+                                                                <TextBlock Text="{Binding PackageName}" VerticalAlignment="Center"/>
+                                                            </StackPanel>
+                                                        </CheckBox.Content>
+                                                    </CheckBox>
+                                                    <!-- Child sources, indented, only shown when parent is expanded -->
                                                     <ItemsControl ItemsSource="{Binding Children}"
-                                                                  Margin="20,0,0,0">
+                                                                  IsVisible="{Binding IsExpanded}"
+                                                                  Margin="24,0,0,0">
                                                         <ItemsControl.ItemTemplate>
                                                             <DataTemplate x:DataType="vm:SourceTreeNode">
                                                                 <CheckBox IsChecked="{Binding IsSelected, Mode=TwoWay}"
@@ -398,7 +515,7 @@
                                   CanUserResizeColumns="True"
                                   CanUserSortColumns="True"
                                   SelectionMode="Extended"
-                                  GridLinesVisibility="Horizontal">
+                                  GridLinesVisibility="None">
                             <DataGrid.Columns>
                                 <DataGridTemplateColumn Width="40">
                                     <DataGridTemplateColumn.CellTemplate>
@@ -693,7 +810,10 @@
         </Grid>
 
     <!-- ==================== FOOTER STATUS BAR ==================== -->
-    <Border Grid.Row="3" Margin="0,4,0,-8" VerticalAlignment="Center">
+    <Border Grid.Row="3" Margin="0,-4,0,-8" VerticalAlignment="Center"
+            BorderThickness="0,1,0,0"
+            BorderBrush="{DynamicResource AppBorderBrush}"
+            Padding="0,4,0,0">
         <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Spacing="8" VerticalAlignment="Center">
 
             <!-- Order by -->
@@ -703,7 +823,7 @@
                         VerticalAlignment="Center">
                 <TextBlock x:Name="OrderByLabel" Text="{t:Translate Order by:}" FontSize="13" VerticalAlignment="Center"/>
                 <Button x:Name="OrderByButton"
-                        Padding="10,6"
+                        Padding="8,3"
                         CornerRadius="4"
                         Background="Transparent"
                         BorderThickness="1"
@@ -711,8 +831,13 @@
                         automation:AutomationProperties.LabeledBy="{Binding #OrderByLabel}">
                     <StackPanel Orientation="Horizontal" Spacing="6">
                         <TextBlock Text="{Binding SortFieldName}" VerticalAlignment="Center" FontSize="13"/>
-                        <TextBlock Text="▾" VerticalAlignment="Center" FontSize="19" Opacity="0.7"
-                                   automation:AutomationProperties.AccessibilityView="Raw"/>
+                        <Path Data="M 0,0 L 4,4 L 8,0"
+                              Stroke="{DynamicResource TextFillColorPrimaryBrush}"
+                              StrokeThickness="1.5"
+                              StrokeJoin="Miter"
+                              Fill="Transparent"
+                              VerticalAlignment="Center"
+                              automation:AutomationProperties.AccessibilityView="Raw"/>
                     </StackPanel>
                     <Button.Flyout>
                         <MenuFlyout Placement="TopEdgeAlignedRight">
@@ -748,17 +873,45 @@
                             <StackPanel Orientation="Horizontal"/>
                         </ItemsPanelTemplate>
                     </ListBox.ItemsPanel>
-                    <ListBoxItem x:Name="Selector_List" Padding="10,6" ToolTip.Tip="List"
+                    <ListBoxItem x:Name="Selector_List" Padding="8,3" ToolTip.Tip="List"
                                  automation:AutomationProperties.Name="List">
-                        <TextBlock Text="☰" FontSize="19" automation:AutomationProperties.AccessibilityView="Raw"/>
+                        <Grid Width="16" Height="16"
+                              automation:AutomationProperties.AccessibilityView="Raw">
+                            <!-- bullets -->
+                            <Path Data="M 3,3 m -1.2,0 a 1.2,1.2 0 1,0 2.4,0 a 1.2,1.2 0 1,0 -2.4,0
+                                        M 3,8 m -1.2,0 a 1.2,1.2 0 1,0 2.4,0 a 1.2,1.2 0 1,0 -2.4,0
+                                        M 3,13 m -1.2,0 a 1.2,1.2 0 1,0 2.4,0 a 1.2,1.2 0 1,0 -2.4,0"
+                                  Fill="{DynamicResource TextFillColorPrimaryBrush}"/>
+                            <!-- lines -->
+                            <Path Data="M 6,3 H 14 M 6,8 H 14 M 6,13 H 14"
+                                  Stroke="{DynamicResource TextFillColorPrimaryBrush}"
+                                  StrokeThickness="1.5"
+                                  StrokeLineCap="Round"
+                                  Fill="Transparent"/>
+                        </Grid>
                     </ListBoxItem>
-                    <ListBoxItem x:Name="Selector_Grid" Padding="10,6" ToolTip.Tip="Grid"
+                    <ListBoxItem x:Name="Selector_Grid" Padding="8,3" ToolTip.Tip="Grid"
                                  automation:AutomationProperties.Name="Grid">
-                        <TextBlock Text="⊞" FontSize="19" automation:AutomationProperties.AccessibilityView="Raw"/>
+                        <!-- Two rows: open "[" bracket on the left + two stacked lines on the right -->
+                        <Path Width="16" Height="16"
+                              Data="M 4,2 H 2 V 6 H 4   M 6,3 H 14   M 6,5 H 14
+                                    M 4,10 H 2 V 14 H 4 M 6,11 H 14  M 6,13 H 14"
+                              Stroke="{DynamicResource TextFillColorPrimaryBrush}"
+                              StrokeThickness="1"
+                              StrokeLineCap="Round"
+                              StrokeJoin="Miter"
+                              Fill="Transparent"
+                              automation:AutomationProperties.AccessibilityView="Raw"/>
                     </ListBoxItem>
-                    <ListBoxItem x:Name="Selector_Icons" Padding="10,6" ToolTip.Tip="Icons"
+                    <ListBoxItem x:Name="Selector_Icons" Padding="8,3" ToolTip.Tip="Icons"
                                  automation:AutomationProperties.Name="Icons">
-                        <TextBlock Text="⊟" FontSize="19" automation:AutomationProperties.AccessibilityView="Raw"/>
+                        <!-- 2x2 hollow squares (WinUI IconView) with extra gap between -->
+                        <Path Width="16" Height="16"
+                              Data="M 2,2 H 6 V 6 H 2 Z M 10,2 H 14 V 6 H 10 Z M 2,10 H 6 V 14 H 2 Z M 10,10 H 14 V 14 H 10 Z"
+                              Stroke="{DynamicResource TextFillColorPrimaryBrush}"
+                              StrokeThickness="1.3"
+                              Fill="Transparent"
+                              automation:AutomationProperties.AccessibilityView="Raw"/>
                     </ListBoxItem>
                 </ListBox>
             </StackPanel>
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
index 815388bce..b490a9e40 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
@@ -95,11 +95,13 @@ or nameof(PackagesPageViewModel.SortAscending))
                 if (width.IsAbsolute && width.Value >= 100)
                 {
                     _savedFilterPaneWidth = width.Value;
+                    ViewModel.TrackedFilterPaneWidth = width.Value;
                     Settings.SetDictionaryItem(Settings.K.SidepanelWidths, ViewModel.PageName, (int)width.Value);
                 }
                 else if (width.IsAbsolute && width.Value < 100)
                 {
                     _savedFilterPaneWidth = 220;
+                    ViewModel.TrackedFilterPaneWidth = 220;
                     ViewModel.IsFilterPaneOpen = false;
                 }
             });
@@ -126,6 +128,7 @@ or nameof(PackagesPageViewModel.SortAscending))
         // Restore per-page filter pane width from settings.
         var savedWidth = Settings.GetDictionaryItem<string, int>(Settings.K.SidepanelWidths, ViewModel.PageName);
         if (savedWidth >= 100) _savedFilterPaneWidth = savedWidth;
+        ViewModel.TrackedFilterPaneWidth = _savedFilterPaneWidth;
 
         // Apply the initial filter-pane state (AXAML defaults to 220px open).
         UpdateFilterPaneColumn(ViewModel.IsFilterPaneOpen);

From 967ae2548ff3f42783aa1024db52ff301d5a4b65 Mon Sep 17 00:00:00 2001
From: Gabriel Dufresne <gabrielduf@hotmail.com>
Date: Wed, 20 May 2026 14:07:34 -0400
Subject: [PATCH 2/3] Fix build Linux

---
 .../UniGetUI.Interface.IpcApi.csproj           |  3 ++-
 .../generate-secrets.sh                        | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100755 src/UniGetUI.Interface.IpcApi/generate-secrets.sh

diff --git a/src/UniGetUI.Interface.IpcApi/UniGetUI.Interface.IpcApi.csproj b/src/UniGetUI.Interface.IpcApi/UniGetUI.Interface.IpcApi.csproj
index 88db87634..968ac0ebd 100644
--- a/src/UniGetUI.Interface.IpcApi/UniGetUI.Interface.IpcApi.csproj
+++ b/src/UniGetUI.Interface.IpcApi/UniGetUI.Interface.IpcApi.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <Target Name="GenerateBuildInfo" BeforeTargets="BeforeBuild">
-        <Exec Command="pwsh -File generate-secrets.ps1 $(IntermediateOutputPath)" />
+        <Exec Command="pwsh -File generate-secrets.ps1 $(IntermediateOutputPath)" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
+        <Exec Command="bash generate-secrets.sh $(IntermediateOutputPath)" Condition="!$([MSBuild]::IsOSPlatform('Windows'))" />
         <ItemGroup>
             <Compile Include="$(IntermediateOutputPath)Generated Files\Secrets.Generated.cs" />
         </ItemGroup>
diff --git a/src/UniGetUI.Interface.IpcApi/generate-secrets.sh b/src/UniGetUI.Interface.IpcApi/generate-secrets.sh
new file mode 100755
index 000000000..8e939cb6b
--- /dev/null
+++ b/src/UniGetUI.Interface.IpcApi/generate-secrets.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+OUTPUT_PATH="${1:-obj/}"
+
+if [ ! -d "${OUTPUT_PATH}Generated Files" ]; then mkdir -p "${OUTPUT_PATH}Generated Files"; fi
+
+CLIENT_ID="${UNIGETUI_GITHUB_CLIENT_ID}"
+if [ -z "$CLIENT_ID" ]; then CLIENT_ID="CLIENT_ID_UNSET"; fi
+
+cat > "${OUTPUT_PATH}Generated Files/Secrets.Generated.cs" << CSEOF
+// Auto-generated file - do not modify
+namespace UniGetUI.Interface
+{
+    internal static partial class Secrets
+    {
+        public static partial string GetGitHubClientId() => "$CLIENT_ID";
+    }
+}
+CSEOF

From 652fdb470d6f47f3f125d3e50aa21328ca0a15f1 Mon Sep 17 00:00:00 2001
From: Gabriel Dufresne <gabrielduf@hotmail.com>
Date: Thu, 21 May 2026 08:51:58 -0400
Subject: [PATCH 3/3] deplace resource to styles.axaml

---
 .../Assets/Styles/Styles.Common.axaml         | 80 +++++++++++++++++++
 src/UniGetUI.Avalonia/Views/MainWindow.axaml  |  4 +-
 .../Views/MainWindow.axaml.cs                 |  4 +-
 .../SoftwarePages/AbstractPackagesPage.axaml  | 74 +----------------
 4 files changed, 86 insertions(+), 76 deletions(-)

diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
index 3e5f04a7d..65ab004ad 100644
--- a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
+++ b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
@@ -190,4 +190,84 @@
         <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
     </Style>
 
+    <!-- Filters toolbar toggle: card-like fill (matches SettingsCard) when checked -->
+    <Style Selector="ToggleButton.filter-toggle">
+        <Style.Resources>
+            <ResourceDictionary>
+                <ResourceDictionary.ThemeDictionaries>
+                    <ResourceDictionary x:Key="Light">
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundChecked"             Color="#FBFBFB"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver"  Color="#F6F6F6"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed"      Color="#EDEDED"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedDisabled"     Color="#FBFBFB"/>
+                        <SolidColorBrush x:Key="ToggleButtonBorderBrushChecked"            Color="#ECECEC"/>
+                        <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPointerOver" Color="#ECECEC"/>
+                        <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPressed"     Color="#ECECEC"/>
+                        <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedDisabled"    Color="#ECECEC"/>
+                        <SolidColorBrush x:Key="ToggleButtonForegroundChecked"             Color="Black"/>
+                        <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPointerOver"  Color="Black"/>
+                        <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPressed"      Color="Black"/>
+                    </ResourceDictionary>
+                    <ResourceDictionary x:Key="Dark">
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundChecked"             Color="#2D2D2D"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver"  Color="#323232"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed"      Color="#3C3C3C"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedDisabled"     Color="#2D2D2D"/>
+                        <SolidColorBrush x:Key="ToggleButtonBorderBrushChecked"            Color="#393939"/>
+                        <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPointerOver" Color="#393939"/>
+                        <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPressed"     Color="#393939"/>
+                        <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedDisabled"    Color="#393939"/>
+                        <SolidColorBrush x:Key="ToggleButtonForegroundChecked"             Color="White"/>
+                        <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPointerOver"  Color="White"/>
+                        <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPressed"      Color="White"/>
+                    </ResourceDictionary>
+                </ResourceDictionary.ThemeDictionaries>
+            </ResourceDictionary>
+        </Style.Resources>
+    </Style>
+
+    <!-- Source-tree expand chevron: transparent background, subtle overlay on hover/press -->
+    <Style Selector="ToggleButton.tree-chevron">
+        <Style.Resources>
+            <ResourceDictionary>
+                <ResourceDictionary.ThemeDictionaries>
+                    <ResourceDictionary x:Key="Light">
+                        <SolidColorBrush x:Key="ToggleButtonBackground"                    Color="Transparent"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundPointerOver"         Color="#0F000000"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundPressed"             Color="#1A000000"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundChecked"             Color="Transparent"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver"  Color="#0F000000"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed"      Color="#1A000000"/>
+                        <SolidColorBrush x:Key="ToggleButtonBorderBrush"                   Color="Transparent"/>
+                        <SolidColorBrush x:Key="ToggleButtonBorderBrushPointerOver"        Color="Transparent"/>
+                        <SolidColorBrush x:Key="ToggleButtonBorderBrushPressed"            Color="Transparent"/>
+                        <SolidColorBrush x:Key="ToggleButtonBorderBrushChecked"            Color="Transparent"/>
+                        <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPointerOver" Color="Transparent"/>
+                        <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPressed"     Color="Transparent"/>
+                        <SolidColorBrush x:Key="ToggleButtonForegroundChecked"             Color="Black"/>
+                        <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPointerOver"  Color="Black"/>
+                        <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPressed"      Color="Black"/>
+                    </ResourceDictionary>
+                    <ResourceDictionary x:Key="Dark">
+                        <SolidColorBrush x:Key="ToggleButtonBackground"                    Color="Transparent"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundPointerOver"         Color="#15FFFFFF"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundPressed"             Color="#20FFFFFF"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundChecked"             Color="Transparent"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver"  Color="#15FFFFFF"/>
+                        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed"      Color="#20FFFFFF"/>
+                        <SolidColorBrush x:Key="ToggleButtonBorderBrush"                   Color="Transparent"/>
+                        <SolidColorBrush x:Key="ToggleButtonBorderBrushPointerOver"        Color="Transparent"/>
+                        <SolidColorBrush x:Key="ToggleButtonBorderBrushPressed"            Color="Transparent"/>
+                        <SolidColorBrush x:Key="ToggleButtonBorderBrushChecked"            Color="Transparent"/>
+                        <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPointerOver" Color="Transparent"/>
+                        <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPressed"     Color="Transparent"/>
+                        <SolidColorBrush x:Key="ToggleButtonForegroundChecked"             Color="White"/>
+                        <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPointerOver"  Color="White"/>
+                        <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPressed"      Color="White"/>
+                    </ResourceDictionary>
+                </ResourceDictionary.ThemeDictionaries>
+            </ResourceDictionary>
+        </Style.Resources>
+    </Style>
+
 </Styles>
diff --git a/src/UniGetUI.Avalonia/Views/MainWindow.axaml b/src/UniGetUI.Avalonia/Views/MainWindow.axaml
index b29a07b81..4044c15d8 100644
--- a/src/UniGetUI.Avalonia/Views/MainWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/MainWindow.axaml
@@ -367,8 +367,8 @@
             <!-- Right column: Linux window buttons on the far right -->
             <Panel Grid.Column="2">
 
-                <!-- Custom min / max / close (shown on Windows, macOS, and Linux without native decorations; IsVisible set in code-behind) -->
-                <StackPanel x:Name="LinuxWindowButtons"
+                <!-- Custom min / max / close (shown on Windows, and Linux without native decorations; IsVisible set in code-behind) -->
+                <StackPanel x:Name="WindowButtons"
                             Orientation="Horizontal"
                             HorizontalAlignment="Right"
                             VerticalAlignment="Center"
diff --git a/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs b/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
index 776f17ae8..be74dee11 100644
--- a/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
@@ -242,7 +242,7 @@ private void SetupTitleBar()
             TitleBarGrid.ClearValue(HeightProperty);
             TitleBarGrid.Height = 44;
             HamburgerPanel.Margin = new Thickness(10, 0, 8, 0);
-            LinuxWindowButtons.IsVisible = true;
+            WindowButtons.IsVisible = true;
             MainContentGrid.Margin = new Thickness(0, 44, 0, 0);
             this.GetObservable(WindowStateProperty).Subscribe(state =>
             {
@@ -259,7 +259,7 @@ private void SetupTitleBar()
             TitleBarGrid.ClearValue(HeightProperty);
             TitleBarGrid.Height = 44;
             HamburgerPanel.Margin = new Thickness(10, 0, 8, 0);
-            LinuxWindowButtons.IsVisible = !useNativeDecorations;
+            WindowButtons.IsVisible = !useNativeDecorations;
             MainContentGrid.Margin = new Thickness(0, 44, 0, 0);
             // Keep maximize icon in sync with window state
             this.GetObservable(WindowStateProperty).Subscribe(state =>
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
index e1e45baa7..a5ac09b29 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
@@ -104,43 +104,12 @@
             <StackPanel Grid.Column="0" Orientation="Horizontal" Margin="0,0,8,0"
                         MinWidth="{Binding FilterPaneColumnWidth}">
                 <ToggleButton x:Name="ToggleFiltersButton"
+                              Classes="filter-toggle"
                               Height="40"
                               Padding="10,4"
                               CornerRadius="4"
                               automation:AutomationProperties.Name="{t:Translate Filters}"
                               IsChecked="{Binding IsFilterPaneOpen, Mode=TwoWay}">
-                    <ToggleButton.Resources>
-                        <ResourceDictionary>
-                            <ResourceDictionary.ThemeDictionaries>
-                                <ResourceDictionary x:Key="Light">
-                                    <SolidColorBrush x:Key="ToggleButtonBackgroundChecked" Color="#FBFBFB"/>
-                                    <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver" Color="#F6F6F6"/>
-                                    <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed" Color="#EDEDED"/>
-                                    <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedDisabled" Color="#FBFBFB"/>
-                                    <SolidColorBrush x:Key="ToggleButtonBorderBrushChecked" Color="#ECECEC"/>
-                                    <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPointerOver" Color="#ECECEC"/>
-                                    <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPressed" Color="#ECECEC"/>
-                                    <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedDisabled" Color="#ECECEC"/>
-                                    <SolidColorBrush x:Key="ToggleButtonForegroundChecked" Color="Black"/>
-                                    <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPointerOver" Color="Black"/>
-                                    <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPressed" Color="Black"/>
-                                </ResourceDictionary>
-                                <ResourceDictionary x:Key="Dark">
-                                    <SolidColorBrush x:Key="ToggleButtonBackgroundChecked" Color="#2D2D2D"/>
-                                    <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver" Color="#323232"/>
-                                    <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed" Color="#3C3C3C"/>
-                                    <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedDisabled" Color="#2D2D2D"/>
-                                    <SolidColorBrush x:Key="ToggleButtonBorderBrushChecked" Color="#393939"/>
-                                    <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPointerOver" Color="#393939"/>
-                                    <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPressed" Color="#393939"/>
-                                    <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedDisabled" Color="#393939"/>
-                                    <SolidColorBrush x:Key="ToggleButtonForegroundChecked" Color="White"/>
-                                    <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPointerOver" Color="White"/>
-                                    <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPressed" Color="White"/>
-                                </ResourceDictionary>
-                            </ResourceDictionary.ThemeDictionaries>
-                        </ResourceDictionary>
-                    </ToggleButton.Resources>
                     <StackPanel Orientation="Horizontal" Spacing="6">
                         <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/Filter.svg" Width="20" Height="20" VerticalAlignment="Center"/>
                         <TextBlock Text="{t:Translate Filters}" FontSize="12" FontWeight="Medium" VerticalAlignment="Center"/>
@@ -280,52 +249,13 @@
                                                             <StackPanel Orientation="Horizontal" Spacing="4">
                                                         <ToggleButton IsChecked="{Binding IsExpanded, Mode=TwoWay}"
                                                                       IsVisible="{Binding HasChildren}"
+                                                                      Classes="tree-chevron"
                                                                       BorderThickness="0"
                                                                       Width="20" Height="20"
                                                                       Padding="0"
                                                                       Opacity="0.55"
                                                                       VerticalAlignment="Center"
                                                                       automation:AutomationProperties.Name="{t:Translate Expand}">
-                                                            <ToggleButton.Resources>
-                                                                <ResourceDictionary>
-                                                                    <ResourceDictionary.ThemeDictionaries>
-                                                                        <ResourceDictionary x:Key="Light">
-                                                                            <SolidColorBrush x:Key="ToggleButtonBackground"               Color="Transparent"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBackgroundPointerOver"    Color="#0F000000"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBackgroundPressed"        Color="#1A000000"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBackgroundChecked"        Color="Transparent"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver" Color="#0F000000"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed" Color="#1A000000"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrush"               Color="Transparent"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrushPointerOver"    Color="Transparent"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrushPressed"        Color="Transparent"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrushChecked"        Color="Transparent"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPointerOver" Color="Transparent"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPressed" Color="Transparent"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonForegroundChecked"             Color="Black"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPointerOver" Color="Black"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPressed"     Color="Black"/>
-                                                                        </ResourceDictionary>
-                                                                        <ResourceDictionary x:Key="Dark">
-                                                                            <SolidColorBrush x:Key="ToggleButtonBackground"               Color="Transparent"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBackgroundPointerOver"    Color="#15FFFFFF"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBackgroundPressed"        Color="#20FFFFFF"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBackgroundChecked"        Color="Transparent"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver" Color="#15FFFFFF"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed" Color="#20FFFFFF"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrush"               Color="Transparent"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrushPointerOver"    Color="Transparent"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrushPressed"        Color="Transparent"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrushChecked"        Color="Transparent"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPointerOver" Color="Transparent"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPressed" Color="Transparent"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonForegroundChecked"             Color="White"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPointerOver" Color="White"/>
-                                                                            <SolidColorBrush x:Key="ToggleButtonForegroundCheckedPressed"     Color="White"/>
-                                                                        </ResourceDictionary>
-                                                                    </ResourceDictionary.ThemeDictionaries>
-                                                                </ResourceDictionary>
-                                                            </ToggleButton.Resources>
                                                             <Grid>
                                                                 <!-- Collapsed: chevron points right (>) -->
                                                                 <Path Data="M 0,0 L 4,4 L 0,8"