diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
index ad73738f7c..d8c151aca4 100644
--- a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
+++ b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
@@ -13,6 +13,10 @@
     <Style Selector="Border.settings-card-clickable:pointerover">
         <Setter Property="Background"   Value="{DynamicResource SettingsCardHoverBackground}"/>
     </Style>
+    <Style Selector="Border.settings-card-focused">
+        <Setter Property="BorderBrush"     Value="{DynamicResource SystemAccentColor}"/>
+        <Setter Property="BorderThickness" Value="2"/>
+    </Style>
 
     <!-- Setting warning subtext (amber, both themes) -->
     <Style Selector="TextBlock.setting-warning-text">
diff --git a/src/UniGetUI.Avalonia/Infrastructure/AccessibilityAnnouncementService.cs b/src/UniGetUI.Avalonia/Infrastructure/AccessibilityAnnouncementService.cs
new file mode 100644
index 0000000000..ede14d3a9c
--- /dev/null
+++ b/src/UniGetUI.Avalonia/Infrastructure/AccessibilityAnnouncementService.cs
@@ -0,0 +1,26 @@
+using Avalonia.Automation;
+using Avalonia.Threading;
+
+namespace UniGetUI.Avalonia.Infrastructure;
+
+public sealed record AccessibilityAnnouncement(
+    string Message,
+    AutomationLiveSetting LiveSetting = AutomationLiveSetting.Polite);
+
+public static class AccessibilityAnnouncementService
+{
+    public static event EventHandler<AccessibilityAnnouncement>? AnnouncementRequested;
+
+    public static void Announce(
+        string? message,
+        AutomationLiveSetting liveSetting = AutomationLiveSetting.Polite)
+    {
+        if (string.IsNullOrWhiteSpace(message))
+            return;
+
+        Dispatcher.UIThread.Post(() =>
+            AnnouncementRequested?.Invoke(
+                null,
+                new AccessibilityAnnouncement(message, liveSetting)));
+    }
+}
diff --git a/src/UniGetUI.Avalonia/Infrastructure/AvaloniaOperationRegistry.cs b/src/UniGetUI.Avalonia/Infrastructure/AvaloniaOperationRegistry.cs
index c9f87837b1..0f9a9aecfe 100644
--- a/src/UniGetUI.Avalonia/Infrastructure/AvaloniaOperationRegistry.cs
+++ b/src/UniGetUI.Avalonia/Infrastructure/AvaloniaOperationRegistry.cs
@@ -1,5 +1,6 @@
 using System.Collections.ObjectModel;
 using Avalonia;
+using Avalonia.Automation;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
@@ -113,6 +114,18 @@ private static void ShowOperationProgressNotification(AbstractOperation op)
         if (Settings.AreProgressNotificationsDisabled())
             return;
 
+        string title = op.Metadata.Title.Length > 0
+            ? op.Metadata.Title
+            : CoreTools.Translate("Operation in progress");
+
+        string message = op.Metadata.Status.Length > 0
+            ? op.Metadata.Status
+            : CoreTools.Translate("Please wait...");
+
+        AccessibilityAnnouncementService.Announce(
+            $"{title}. {message}",
+            AutomationLiveSetting.Polite);
+
         if (WindowsAppNotificationBridge.ShowProgress(op))
             return;
 
@@ -122,14 +135,6 @@ private static void ShowOperationProgressNotification(AbstractOperation op)
         if (TryGetMainWindow() is not { } mainWindow)
             return;
 
-        string title = op.Metadata.Title.Length > 0
-            ? op.Metadata.Title
-            : CoreTools.Translate("Operation in progress");
-
-        string message = op.Metadata.Status.Length > 0
-            ? op.Metadata.Status
-            : CoreTools.Translate("Please wait...");
-
         mainWindow.ShowRuntimeNotification(
             title,
             message,
@@ -141,6 +146,18 @@ private static void ShowOperationSuccessNotification(AbstractOperation op)
         if (Settings.AreSuccessNotificationsDisabled())
             return;
 
+        string title = op.Metadata.SuccessTitle.Length > 0
+            ? op.Metadata.SuccessTitle
+            : CoreTools.Translate("Success!");
+
+        string message = op.Metadata.SuccessMessage.Length > 0
+            ? op.Metadata.SuccessMessage
+            : CoreTools.Translate("Success!");
+
+        AccessibilityAnnouncementService.Announce(
+            $"{title}. {message}",
+            AutomationLiveSetting.Polite);
+
         WindowsAppNotificationBridge.RemoveProgress(op);
 
         if (WindowsAppNotificationBridge.ShowSuccess(op))
@@ -152,14 +169,6 @@ private static void ShowOperationSuccessNotification(AbstractOperation op)
         if (TryGetMainWindow() is not { } mainWindow)
             return;
 
-        string title = op.Metadata.SuccessTitle.Length > 0
-            ? op.Metadata.SuccessTitle
-            : CoreTools.Translate("Success!");
-
-        string message = op.Metadata.SuccessMessage.Length > 0
-            ? op.Metadata.SuccessMessage
-            : CoreTools.Translate("Success!");
-
         mainWindow.ShowRuntimeNotification(
             title,
             message,
@@ -171,6 +180,18 @@ private static void ShowOperationFailureNotification(AbstractOperation op)
         if (Settings.AreErrorNotificationsDisabled())
             return;
 
+        string title = op.Metadata.FailureTitle.Length > 0
+            ? op.Metadata.FailureTitle
+            : CoreTools.Translate("Failed");
+
+        string message = op.Metadata.FailureMessage.Length > 0
+            ? op.Metadata.FailureMessage
+            : CoreTools.Translate("An error occurred while processing this package");
+
+        AccessibilityAnnouncementService.Announce(
+            $"{title}. {message}",
+            AutomationLiveSetting.Assertive);
+
         WindowsAppNotificationBridge.RemoveProgress(op);
 
         if (WindowsAppNotificationBridge.ShowError(op))
@@ -182,14 +203,6 @@ private static void ShowOperationFailureNotification(AbstractOperation op)
         if (TryGetMainWindow() is not { } mainWindow)
             return;
 
-        string title = op.Metadata.FailureTitle.Length > 0
-            ? op.Metadata.FailureTitle
-            : CoreTools.Translate("Failed");
-
-        string message = op.Metadata.FailureMessage.Length > 0
-            ? op.Metadata.FailureMessage
-            : CoreTools.Translate("An error occurred while processing this package");
-
         mainWindow.ShowRuntimeNotification(
             title,
             message,
diff --git a/src/UniGetUI.Avalonia/ViewModels/DialogPages/ManageIgnoredUpdatesViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/DialogPages/ManageIgnoredUpdatesViewModel.cs
index 5a740ddaf2..187600e13b 100644
--- a/src/UniGetUI.Avalonia/ViewModels/DialogPages/ManageIgnoredUpdatesViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/DialogPages/ManageIgnoredUpdatesViewModel.cs
@@ -139,6 +139,8 @@ public partial class IgnoredPackageEntryViewModel : ObservableObject
     public string ManagerIconPath { get; }
     public string VersionDisplay { get; }
     public string NewVersion { get; }
+    public string AutomationName { get; }
+    public string RemoveAutomationName { get; }
 
     private readonly string _ignoredId;
 
@@ -154,6 +156,10 @@ public IgnoredPackageEntryViewModel(
         ManagerIconPath = managerIconPath;
         VersionDisplay = versionDisplay;
         NewVersion = newVersion;
+        AutomationName = CoreTools.Translate("Package {name} from {manager}")
+            .Replace("{name}", Name)
+            .Replace("{manager}", Manager);
+        RemoveAutomationName = CoreTools.Translate("Remove {0} from ignored updates", Name);
     }
 
     [RelayCommand]
diff --git a/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs
index 18c57e0cf0..9c8aa670e1 100644
--- a/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs
@@ -1,5 +1,6 @@
 using System.Collections.Specialized;
 using Avalonia;
+using Avalonia.Automation;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
@@ -50,6 +51,12 @@ public partial class MainWindowViewModel : ViewModelBase
     public event EventHandler<bool>? CanGoBackChanged;
     public event EventHandler<PageType>? CurrentPageChanged;
 
+    [ObservableProperty]
+    private string _announcementText = "";
+
+    [ObservableProperty]
+    private AutomationLiveSetting _announcementLiveSetting = AutomationLiveSetting.Polite;
+
     // ─── Operations panel ─────────────────────────────────────────────────────
     public AvaloniaList<OperationViewModel> Operations => AvaloniaOperationRegistry.OperationViewModels;
 
@@ -113,6 +120,8 @@ private void OnPageViewModelPropertyChanged(object? sender, System.ComponentMode
 
     public MainWindowViewModel()
     {
+        AccessibilityAnnouncementService.AnnouncementRequested += OnAnnouncementRequested;
+
         DiscoverPage = new DiscoverSoftwarePage();
         UpdatesPage = new SoftwareUpdatesPage();
         InstalledPage = new InstalledPackagesPage();
@@ -203,6 +212,15 @@ public MainWindowViewModel()
         LoadDefaultPage();
     }
 
+    private void OnAnnouncementRequested(object? _, AccessibilityAnnouncement announcement)
+    {
+        AnnouncementLiveSetting = announcement.LiveSetting;
+        AnnouncementText = string.Empty;
+        Dispatcher.UIThread.Post(
+            () => AnnouncementText = announcement.Message,
+            DispatcherPriority.Background);
+    }
+
     // ─── Navigation ──────────────────────────────────────────────────────────
     public void LoadDefaultPage()
     {
@@ -265,9 +283,14 @@ public void NavigateTo(PageType newPage_t, bool toHistory = true)
         if (newPage_t is PageType.About) { _ = ShowAboutDialog(); return; }
         if (newPage_t is PageType.Quit) { (Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.Shutdown(); return; }
 
-        Sidebar.SelectNavButtonForPage(newPage_t);
+        if (_currentPage == newPage_t)
+        {
+            // Re-focus the primary control even when we're already on the page
+            (CurrentPageContent as AbstractPackagesPage)?.FocusPackageList();
+            return;
+        }
 
-        if (_currentPage == newPage_t) return;
+        Sidebar.SelectNavButtonForPage(newPage_t);
 
         var newPage = GetPageForType(newPage_t);
         var oldPage = CurrentPageContent as Control;
@@ -286,7 +309,6 @@ public void NavigateTo(PageType newPage_t, bool toHistory = true)
             CanGoBackChanged?.Invoke(this, true);
         }
 
-        (newPage as AbstractPackagesPage)?.FocusPackageList();
         (newPage as AbstractPackagesPage)?.FilterPackages();
         (newPage as IEnterLeaveListener)?.OnEnter();
 
@@ -305,9 +327,29 @@ public void NavigateTo(PageType newPage_t, bool toHistory = true)
             GlobalSearchEnabled = false;
         }
 
+        // Focus after search state is restored so MegaQueryVisible is already correct
+        (newPage as AbstractPackagesPage)?.FocusPackageList();
+
+        AccessibilityAnnouncementService.Announce(GetPageAnnouncement(newPage_t));
         CurrentPageChanged?.Invoke(this, newPage_t);
     }
 
+    private static string GetPageAnnouncement(PageType pageType) => pageType switch
+    {
+        PageType.Discover => CoreTools.Translate("Discover Packages"),
+        PageType.Updates => CoreTools.Translate("Software Updates"),
+        PageType.Installed => CoreTools.Translate("Installed Packages"),
+        PageType.Bundles => CoreTools.Translate("Package Bundles"),
+        PageType.Settings => CoreTools.Translate("Settings"),
+        PageType.Managers => CoreTools.Translate("Package Managers"),
+        PageType.OwnLog => CoreTools.Translate("UniGetUI Log"),
+        PageType.ManagerLog => CoreTools.Translate("Package Manager logs"),
+        PageType.OperationHistory => CoreTools.Translate("Operation history"),
+        PageType.Help => CoreTools.Translate("Help"),
+        PageType.ReleaseNotes => CoreTools.Translate("Release notes"),
+        _ => CoreTools.Translate("UniGetUI"),
+    };
+
     public void NavigateBack()
     {
         if (CurrentPageContent is IInnerNavigationPage navPage && navPage.CanGoBack())
diff --git a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/GeneralViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/GeneralViewModel.cs
index 7223f7e920..e7de8814bf 100644
--- a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/GeneralViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/GeneralViewModel.cs
@@ -1,8 +1,11 @@
+using System.IO;
+using Avalonia.Automation;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using global::Avalonia;
 using global::Avalonia.Controls;
 using global::Avalonia.Platform.Storage;
+using UniGetUI.Avalonia.Infrastructure;
 using UniGetUI.Avalonia.ViewModels;
 using UniGetUI.Avalonia.Views.DialogPages;
 using UniGetUI.Avalonia.Views.Pages.SettingsPages;
@@ -37,6 +40,9 @@ private async Task ImportSettings(Visual? visual)
         var path = file.TryGetLocalPath();
         if (path is null) return;
         await Task.Run(() => CoreSettings.ImportFromFile_JSON(path));
+        AccessibilityAnnouncementService.Announce(
+            CoreTools.Translate("Settings imported from {0}", Path.GetFileName(path)),
+            AutomationLiveSetting.Polite);
         OnRestartRequired();
     }
 
@@ -52,7 +58,13 @@ private static async Task ExportSettings(Visual? visual)
         if (file is null) return;
         var path = file.TryGetLocalPath();
         if (path is null) return;
-        try { await Task.Run(() => CoreSettings.ExportToFile_JSON(path)); }
+        try
+        {
+            await Task.Run(() => CoreSettings.ExportToFile_JSON(path));
+            AccessibilityAnnouncementService.Announce(
+                CoreTools.Translate("Settings exported to {0}", Path.GetFileName(path)),
+                AutomationLiveSetting.Polite);
+        }
         catch (Exception ex) { Logger.Error(ex); }
     }
 
@@ -61,6 +73,9 @@ private void ResetSettings(Visual? _)
     {
         try { CoreSettings.ResetSettings(); }
         catch (Exception ex) { Logger.Error(ex); }
+        AccessibilityAnnouncementService.Announce(
+            CoreTools.Translate("UniGetUI settings were reset"),
+            AutomationLiveSetting.Assertive);
         OnRestartRequired();
     }
 
diff --git a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
index 6af392f7ee..2c0a380e4c 100644
--- a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
@@ -3,6 +3,7 @@
 using System.ComponentModel;
 using System.Globalization;
 using Avalonia;
+using Avalonia.Automation;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Layout;
@@ -260,6 +261,7 @@ public Button AddToolbarButton(string svgName, string label, Action onClick, boo
             Content = content,
         };
         ToolTip.SetTip(btn, label);
+        AutomationProperties.SetName(btn, label);
         btn.Click += (_, _) => onClick();
         ToolBarItems.Add(btn);
         return btn;
@@ -268,14 +270,16 @@ public Button AddToolbarButton(string svgName, string label, Action onClick, boo
     /// <summary>Adds a thin vertical separator to the toolbar.</summary>
     public void AddToolbarSeparator()
     {
-        ToolBarItems.Add(new Separator
+        var sep = new Separator
         {
             Width = 1,
             Height = 30,
             Margin = new Thickness(4, 4),
             Background = Application.Current?.FindResource("AppBorderBrush") as IBrush
                          ?? new SolidColorBrush(Color.FromArgb(60, 255, 255, 255)),
-        });
+        };
+        AutomationProperties.SetAccessibilityView(sep, AccessibilityView.Raw);
+        ToolBarItems.Add(sep);
     }
 
     public async Task ShowInfoDialog(Window owner, string title, string message)
@@ -759,11 +763,15 @@ public void ToggleSelectAll()
         {
             AllPackagesChecked = true;
             FilteredPackages.SelectAll();
+            AccessibilityAnnouncementService.Announce(
+                CoreTools.Translate("All packages selected"));
         }
         else
         {
             AllPackagesChecked = false;
             FilteredPackages.ClearSelection();
+            AccessibilityAnnouncementService.Announce(
+                CoreTools.Translate("Package selection cleared"));
         }
     }
 
diff --git a/src/UniGetUI.Avalonia/Views/Controls/InfoBar.axaml b/src/UniGetUI.Avalonia/Views/Controls/InfoBar.axaml
index 31380bb5e2..518d3dd273 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/InfoBar.axaml
+++ b/src/UniGetUI.Avalonia/Views/Controls/InfoBar.axaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Controls.InfoBar"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels"
              xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
              x:DataType="vm:InfoBarViewModel">
@@ -8,6 +9,9 @@
     <Border x:Name="BodyBorder"
             IsVisible="{Binding IsOpen}"
             BorderThickness="0,1,0,1"
+            automation:AutomationProperties.AccessibilityView="Control"
+            automation:AutomationProperties.Name="{Binding Title}"
+            automation:AutomationProperties.HelpText="{Binding Message}"
             Padding="0">
         <Grid ColumnDefinitions="5,Auto,*,Auto,Auto">
 
@@ -18,6 +22,7 @@
             <Border Grid.Column="1"
                     Width="20" Height="20"
                     Margin="12,0,4,0"
+                    automation:AutomationProperties.AccessibilityView="Raw"
                     VerticalAlignment="Center">
                 <PathIcon x:Name="SeverityIcon"
                           Width="16" Height="16"
@@ -46,6 +51,7 @@
                     Content="{Binding ActionButtonText}"
                     Command="{Binding ActionButtonCommand}"
                     IsVisible="{Binding ActionButtonText, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                    automation:AutomationProperties.Name="{Binding ActionButtonText}"
                     Margin="8,0"
                     Padding="12,6"
                     VerticalAlignment="Center"/>
@@ -54,6 +60,7 @@
             <Button Grid.Column="4"
                     IsVisible="{Binding IsClosable}"
                     Command="{Binding CloseCommand}"
+                    automation:AutomationProperties.Name="Close"
                     VerticalAlignment="Center"
                     Margin="4,0,8,0"
                     Padding="6"
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/ButtonCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/ButtonCard.cs
index ea9b24a3d7..bb3f8c8dbb 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/ButtonCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/ButtonCard.cs
@@ -11,12 +11,20 @@ public sealed partial class ButtonCard : SettingsCard
 
     public string ButtonText
     {
-        set => _button.Content = value;
+        set
+        {
+            _button.Content = value;
+            ApplyAutomationMetadata(_button, GetAutomationNameText(), value);
+        }
     }
 
     public string Text
     {
-        set => Header = value;
+        set
+        {
+            Header = value;
+            ApplyAutomationMetadata(_button, value);
+        }
     }
 
     public new event EventHandler<EventArgs>? Click;
@@ -26,6 +34,7 @@ public ButtonCard()
         _button.MinWidth = 200;
         _button.Click += (_, _) => Click?.Invoke(this, EventArgs.Empty);
         Content = _button;
+        ApplyAutomationMetadata(_button);
     }
 
     protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxButtonCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxButtonCard.cs
index b384d88968..f98bbf7ff7 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxButtonCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxButtonCard.cs
@@ -1,8 +1,10 @@
 using Avalonia;
+using Avalonia.Automation;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Media;
+using UniGetUI.Avalonia.Infrastructure;
 using UniGetUI.Core.Tools;
 using CoreSettings = global::UniGetUI.Core.SettingsEngine.Settings;
 
@@ -36,12 +38,21 @@ public CoreSettings.K SettingName
 
     public string CheckboxText
     {
-        set => _textblock.Text = value;
+        set
+        {
+            _textblock.Text = value;
+            ApplyAutomationMetadata(_checkbox, value);
+            ApplyAutomationMetadata(Button, value);
+        }
     }
 
     public string ButtonText
     {
-        set => Button.Content = value;
+        set
+        {
+            Button.Content = value;
+            ApplyAutomationMetadata(Button, _textblock.Text, value);
+        }
     }
 
     private bool _buttonAlwaysOn;
@@ -71,6 +82,7 @@ public CheckboxButtonCard()
             FontWeight = FontWeight.Medium,
         };
         IS_INVERTED = false;
+        AutomationProperties.SetAccessibilityView(Button, AccessibilityView.Control);
 
         Content = _checkbox;
         Header = _textblock;
@@ -82,7 +94,12 @@ public CheckboxButtonCard()
             StateChanged?.Invoke(this, EventArgs.Empty);
             Button.IsEnabled = (_checkbox.IsChecked ?? false) ? true : _buttonAlwaysOn;
             _textblock.Opacity = (_checkbox.IsChecked ?? false) ? 1 : 0.7;
+            AccessibilityAnnouncementService.Announce(
+                CoreTools.Translate("{0} is now {1}", _textblock.Text, (_checkbox.IsChecked ?? false)
+                    ? CoreTools.Translate("Enabled")
+                    : CoreTools.Translate("Disabled")));
         };
         Button.Click += (s, e) => Click?.Invoke(s, e);
+        ApplyAutomationMetadata(_checkbox, _textblock.Text);
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxCard.cs
index 73af7686df..1124326f6d 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxCard.cs
@@ -1,9 +1,12 @@
 using System.Windows.Input;
 using Avalonia;
+using Avalonia.Automation;
+using Avalonia.Automation.Peers;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Media;
+using UniGetUI.Avalonia.Infrastructure;
 using UniGetUI.Core.Tools;
 using CoreSettings = global::UniGetUI.Core.SettingsEngine.Settings;
 
@@ -36,6 +39,7 @@ public CoreSettings.K SettingName
             _checkbox.IsChecked = CoreSettings.Get(setting_name) ^ IS_INVERTED ^ ForceInversion;
             _textblock.Opacity = (_checkbox.IsChecked ?? false) ? 1 : 0.7;
             _checkbox.IsCheckedChanged += _checkbox_Toggled;
+            SyncToggleItemStatus();
         }
     }
 
@@ -47,7 +51,11 @@ public CoreSettings.K SettingName
 
     public string Text
     {
-        set => _textblock.Text = value;
+        set
+        {
+            _textblock.Text = value;
+            ApplyAutomationMetadata(_checkbox, value, _warningBlock.IsVisible ? _warningBlock.Text : null);
+        }
     }
 
     public string WarningText
@@ -56,6 +64,7 @@ public string WarningText
         {
             _warningBlock.Text = value;
             _warningBlock.IsVisible = value.Any();
+            ApplyAutomationMetadata(_checkbox, _textblock.Text, _warningBlock.IsVisible ? value : null);
         }
     }
 
@@ -72,6 +81,8 @@ public CheckboxCard()
             OnContent = new TextBlock { Text = CoreTools.Translate("Enabled") },
             OffContent = new TextBlock { Text = CoreTools.Translate("Disabled") },
         };
+        // Force CheckBox role so macOS VoiceOver exposes checked/unchecked state
+        AutomationProperties.SetControlTypeOverride(_checkbox, AutomationControlType.CheckBox);
         _textblock = new TextBlock
         {
             VerticalAlignment = VerticalAlignment.Center,
@@ -87,6 +98,7 @@ public CheckboxCard()
         };
         _warningBlock.Classes.Add("setting-warning-text");
         IS_INVERTED = false;
+        AutomationProperties.SetAccessibilityView(_warningBlock, AccessibilityView.Raw);
 
         Content = _checkbox;
         Header = new StackPanel
@@ -97,6 +109,7 @@ public CheckboxCard()
         };
 
         _checkbox.IsCheckedChanged += _checkbox_Toggled;
+        ApplyAutomationMetadata(_checkbox, _textblock.Text);
     }
 
     protected virtual void _checkbox_Toggled(object? sender, RoutedEventArgs e)
@@ -104,10 +117,29 @@ 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;
+        SyncToggleItemStatus();
+        AccessibilityAnnouncementService.Announce(
+            CoreTools.Translate("{0} is now {1}", _textblock.Text, (_checkbox.IsChecked ?? false)
+                ? CoreTools.Translate("Enabled")
+                : CoreTools.Translate("Disabled")));
         var cmd = StateChangedCommand;
         if (cmd?.CanExecute(null) == true)
             cmd.Execute(null);
     }
+
+    protected void SyncToggleItemStatus()
+    {
+        string state = (_checkbox.IsChecked ?? false)
+            ? CoreTools.Translate("Enabled")
+            : CoreTools.Translate("Disabled");
+        // ItemStatus: some screen readers read this separately
+        AutomationProperties.SetItemStatus(_checkbox, state);
+        // Name with state suffix: guarantees VoiceOver announces state on macOS
+        // where ToggleSwitch AX role may not expose IsChecked natively
+        string baseName = _textblock.Text;
+        if (!string.IsNullOrEmpty(baseName))
+            AutomationProperties.SetName(_checkbox, $"{baseName}, {state}");
+    }
 }
 
 public partial class CheckboxCard_Dict : CheckboxCard
@@ -132,6 +164,7 @@ public string KeyName
                     ^ ForceInversion;
                 _textblock.Opacity = (_checkbox.IsChecked ?? false) ? 1 : 0.7;
                 _disableStateChangedEvent = false;
+                SyncToggleItemStatus();
             }
         }
     }
@@ -149,6 +182,7 @@ public CoreSettings.K DictionaryName
                     ^ IS_INVERTED
                     ^ ForceInversion;
                 _textblock.Opacity = (_checkbox.IsChecked ?? false) ? 1 : 0.7;
+                SyncToggleItemStatus();
             }
         }
     }
@@ -165,5 +199,10 @@ protected override void _checkbox_Toggled(object? sender, RoutedEventArgs e)
         );
         StateChanged?.Invoke(this, EventArgs.Empty);
         _textblock.Opacity = (_checkbox.IsChecked ?? false) ? 1 : 0.7;
+        SyncToggleItemStatus();
+        AccessibilityAnnouncementService.Announce(
+            CoreTools.Translate("{0} is now {1}", _textblock.Text, (_checkbox.IsChecked ?? false)
+                ? CoreTools.Translate("Enabled")
+                : CoreTools.Translate("Disabled")));
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/ComboboxCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/ComboboxCard.cs
index 25f545d040..0dcc120c9d 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/ComboboxCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/ComboboxCard.cs
@@ -2,6 +2,7 @@
 using System.Windows.Input;
 using Avalonia;
 using Avalonia.Controls;
+using UniGetUI.Avalonia.Infrastructure;
 using UniGetUI.Core.Logging;
 using UniGetUI.Core.Tools;
 using CoreSettings = global::UniGetUI.Core.SettingsEngine.Settings;
@@ -32,7 +33,11 @@ public CoreSettings.K SettingName
 
     public string Text
     {
-        set => Header = value;
+        set
+        {
+            Header = value;
+            ApplyAutomationMetadata(_combobox, value);
+        }
     }
 
     public event EventHandler<EventArgs>? ValueChanged;
@@ -42,6 +47,7 @@ public ComboboxCard()
         _combobox.MinWidth = 200;
         _combobox.ItemsSource = _elements;
         Content = _combobox;
+        ApplyAutomationMetadata(_combobox);
     }
 
     public void AddItem(string name, string value) => AddItem(name, value, true);
@@ -69,14 +75,19 @@ public void ShowAddedItems()
         {
             try
             {
+                string selectedName = _combobox.SelectedItem?.ToString() ?? "";
                 CoreSettings.SetValue(
                     settings_name,
-                    _values_ref[_combobox.SelectedItem?.ToString() ?? ""]
+                    _values_ref[selectedName]
                 );
                 ValueChanged?.Invoke(this, EventArgs.Empty);
                 var cmd = ValueChangedCommand;
                 if (cmd?.CanExecute(null) == true)
                     cmd.Execute(null);
+                string headerText = Header?.ToString() ?? "";
+                if (!string.IsNullOrEmpty(headerText) && !string.IsNullOrEmpty(selectedName))
+                    AccessibilityAnnouncementService.Announce(
+                        CoreTools.Translate("{0}: {1}", headerText, selectedName));
             }
             catch (Exception ex)
             {
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs
index 12971e1f50..363a7bfecb 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs
@@ -3,6 +3,7 @@
 using Avalonia.Controls;
 using Avalonia.Layout;
 using Avalonia.Media;
+using UniGetUI.Avalonia.Infrastructure;
 using UniGetUI.Core.Logging;
 using UniGetUI.Core.SettingsEngine.SecureSettings;
 using UniGetUI.Core.Tools;
@@ -149,6 +150,10 @@ await SecureSettings.TrySet(
                 cmd.Execute(null);
             _textblock.Opacity = (_checkbox.IsChecked ?? false) ? 1 : 0.7;
             _checkbox.IsChecked = SecureSettings.Get(setting_name) ^ IS_INVERTED ^ ForceInversion;
+            AccessibilityAnnouncementService.Announce(
+                CoreTools.Translate("{0} is now {1}", _textblock.Text, (_checkbox.IsChecked ?? false)
+                    ? CoreTools.Translate("Enabled")
+                    : CoreTools.Translate("Disabled")));
             _loading.IsVisible = false;
             _checkbox.IsEnabled = true;
         }
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsCard.cs
index 8d3d09eedd..fbbdb57818 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsCard.cs
@@ -1,5 +1,7 @@
 using System.Windows.Input;
 using Avalonia;
+using Avalonia.Automation;
+using Avalonia.Automation.Peers;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -99,6 +101,7 @@ public bool IsClickEnabled
         set
         {
             _isClickEnabled = value;
+            Focusable = value;
             Cursor = value ? new Cursor(StandardCursorType.Hand) : Cursor.Default;
             _chevron.IsVisible = value;
             if (value)
@@ -132,6 +135,7 @@ public SettingsCard()
             Width = 24,
             Height = 24,
         };
+        AutomationProperties.SetAccessibilityView(_iconPresenter, AccessibilityView.Raw);
 
         _headerPresenter = new ContentControl
         {
@@ -183,6 +187,7 @@ public SettingsCard()
             Margin = new Thickness(8, 0, 0, 0),
             IsVisible = false,
         };
+        AutomationProperties.SetAccessibilityView(_chevron, AccessibilityView.Raw);
 
         var grid = new Grid
         {
@@ -208,6 +213,10 @@ public SettingsCard()
         base.Content = _border;
 
         PointerPressed += OnPointerPressed;
+        KeyDown += OnKeyDown;
+        GotFocus += (_, _) => { if (_isClickEnabled) _border.Classes.Add("settings-card-focused"); };
+        LostFocus += (_, _) => _border.Classes.Remove("settings-card-focused");
+        SyncAutomationProperties();
     }
 
     protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
@@ -224,6 +233,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
                     VerticalAlignment = VerticalAlignment.Center,
                 }
                 : value;
+            SyncAutomationProperties();
         }
         else if (change.Property == DescriptionProperty)
         {
@@ -231,6 +241,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
             if (value is null)
             {
                 _descriptionRow.IsVisible = false;
+                SyncAutomationProperties();
                 return;
             }
             _descriptionPresenter.Content = value is string s
@@ -244,15 +255,73 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
                 }
                 : value;
             _descriptionRow.IsVisible = true;
+            SyncAutomationProperties();
         }
     }
 
+    protected string? GetAutomationNameText() => ExtractAutomationText(Header);
+
+    protected string? GetAutomationHelpText() => ExtractAutomationText(Description);
+
+    protected void ApplyAutomationMetadata(Control control, string? name = null, string? helpText = null)
+    {
+        name ??= GetAutomationNameText();
+        helpText ??= GetAutomationHelpText();
+
+        if (!string.IsNullOrWhiteSpace(name))
+            AutomationProperties.SetName(control, name);
+
+        if (!string.IsNullOrWhiteSpace(helpText))
+            AutomationProperties.SetHelpText(control, helpText);
+    }
+
+    private static string? ExtractAutomationText(object? value) => value switch
+    {
+        string s when !string.IsNullOrWhiteSpace(s) => s,
+        TextBlock tb when !string.IsNullOrWhiteSpace(tb.Text) => tb.Text,
+        SelectableTextBlock stb when !string.IsNullOrWhiteSpace(stb.Text) => stb.Text,
+        ContentControl cc when cc.Content is not null => ExtractAutomationText(cc.Content),
+        _ => null,
+    };
+
+    private void SyncAutomationProperties()
+    {
+        string? name = GetAutomationNameText();
+        string? help = GetAutomationHelpText();
+        ApplyAutomationMetadata(this, name, help);
+        // Also propagate to _border: on macOS, Avalonia may surface the Border element
+        // rather than the UserControl wrapper, so set the name on both.
+        if (!string.IsNullOrWhiteSpace(name))
+            AutomationProperties.SetName(_border, name);
+        if (!string.IsNullOrWhiteSpace(help))
+            AutomationProperties.SetHelpText(_border, help);
+        var type = IsClickEnabled ? (AutomationControlType?)AutomationControlType.Button : null;
+        AutomationProperties.SetControlTypeOverride(this, type);
+        if (type.HasValue)
+            AutomationProperties.SetControlTypeOverride(_border, type);
+    }
+
     private void OnPointerPressed(object? sender, PointerPressedEventArgs e)
     {
         if (!_isClickEnabled) return;
         if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) return;
 
+        InvokeClick();
+        e.Handled = true;
+    }
+
+    private void OnKeyDown(object? sender, KeyEventArgs e)
+    {
+        if (!_isClickEnabled) return;
+        if (e.Source != this) return;   // only when the card itself has focus, not a child
+        if (e.Key is not (Key.Enter or Key.Space)) return;
+
+        InvokeClick();
         e.Handled = true;
+    }
+
+    private void InvokeClick()
+    {
         Click?.Invoke(this, new RoutedEventArgs());
         var cmd = Command;
         var param = CommandParameter;
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsPageButton.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsPageButton.cs
index fa65be12d5..46c6a96a2e 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsPageButton.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsPageButton.cs
@@ -8,12 +8,20 @@ public partial class SettingsPageButton : SettingsCard
 {
     public string Text
     {
-        set => Header = value;
+        set
+        {
+            Header = value;
+            ApplyAutomationMetadata(this, value, GetAutomationHelpText());
+        }
     }
 
     public string UnderText
     {
-        set => Description = value;
+        set
+        {
+            Description = value;
+            ApplyAutomationMetadata(this, GetAutomationNameText(), value);
+        }
     }
 
     public IconType Icon
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/TextboxCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/TextboxCard.cs
index d4880b833c..a5e1d1991d 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/TextboxCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/TextboxCard.cs
@@ -39,12 +39,20 @@ public CoreSettings.K SettingName
 
     public string Placeholder
     {
-        set => _textbox.Watermark = value;
+        set
+        {
+            _textbox.Watermark = value;
+            ApplyAutomationMetadata(_textbox, GetAutomationNameText() ?? value);
+        }
     }
 
     public string Text
     {
-        set => Header = value;
+        set
+        {
+            Header = value;
+            ApplyAutomationMetadata(_textbox, value);
+        }
     }
 
     public Uri HelpUrl
@@ -54,6 +62,7 @@ public Uri HelpUrl
             _helpUri = value;
             _helpbutton.IsVisible = true;
             _helpbutton.Content = CoreTools.Translate("More info");
+            ApplyAutomationMetadata(_helpbutton, CoreTools.Translate("More info"), GetAutomationNameText());
         }
     }
 
@@ -79,6 +88,7 @@ public TextboxCard()
         s.Children.Add(_textbox);
 
         Content = s;
+        ApplyAutomationMetadata(_textbox);
     }
 
     public void SaveValue()
diff --git a/src/UniGetUI.Avalonia/Views/Controls/SvgIcon.cs b/src/UniGetUI.Avalonia/Views/Controls/SvgIcon.cs
index 001b3bc0d4..0440dc9786 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/SvgIcon.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/SvgIcon.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Xml.Linq;
 using Avalonia;
+using Avalonia.Automation;
 using Avalonia.Controls;
 using Avalonia.Media;
 using Avalonia.Platform;
@@ -16,6 +17,11 @@ namespace UniGetUI.Avalonia.Views.Controls;
 /// </summary>
 public class SvgIcon : Control
 {
+    public SvgIcon()
+    {
+        AutomationProperties.SetAccessibilityView(this, AccessibilityView.Raw);
+    }
+
     public static readonly StyledProperty<string?> PathProperty =
         AvaloniaProperty.Register<SvgIcon, string?>(nameof(Path));
 
diff --git a/src/UniGetUI.Avalonia/Views/Controls/UserAvatarControl.axaml b/src/UniGetUI.Avalonia/Views/Controls/UserAvatarControl.axaml
index 93e3f2cdb3..71c2e151f6 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/UserAvatarControl.axaml
+++ b/src/UniGetUI.Avalonia/Views/Controls/UserAvatarControl.axaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Controls.UserAvatarControl"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Controls"
              xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -14,7 +15,8 @@
             Background="Transparent"
             BorderThickness="0"
             Cursor="Hand"
-            ToolTip.Tip="{t:Translate GitHub account}">
+            ToolTip.Tip="{t:Translate GitHub account}"
+            automation:AutomationProperties.Name="{t:Translate GitHub account}">
 
         <Button.Flyout>
             <Flyout Placement="BottomEdgeAlignedRight">
@@ -42,11 +44,13 @@
                                 BorderThickness="0"
                                 Foreground="{DynamicResource SystemAccentColor}"
                                 FontSize="11"
-                                Cursor="Hand"/>
+                                Cursor="Hand"
+                                automation:AutomationProperties.Name="{t:Translate More details}"/>
                         <Button Content="{t:Translate Log in}"
                                 Command="{Binding LoginCommand}"
                                 HorizontalAlignment="Stretch"
-                                HorizontalContentAlignment="Center"/>
+                                HorizontalContentAlignment="Center"
+                                automation:AutomationProperties.Name="{t:Translate Log in}"/>
                     </StackPanel>
 
                     <!-- Logged in -->
@@ -65,7 +69,8 @@
                                 HorizontalContentAlignment="Center"
                                 Background="#CC2222"
                                 Foreground="White"
-                                BorderThickness="0"/>
+                                BorderThickness="0"
+                                automation:AutomationProperties.Name="{t:Translate Log out}"/>
                         <Button Content="{t:Translate Text='More details'}"
                                 Command="{Binding MoreDetailsCommand}"
                                 HorizontalAlignment="Left"
@@ -74,7 +79,8 @@
                                 BorderThickness="0"
                                 Foreground="{DynamicResource SystemAccentColor}"
                                 FontSize="11"
-                                Cursor="Hand"/>
+                                Cursor="Hand"
+                                automation:AutomationProperties.Name="{t:Translate More details}"/>
                     </StackPanel>
 
                 </StackPanel>
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/AboutWindow.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/AboutWindow.axaml
index 7f13a4a448..8e048a709b 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/AboutWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/AboutWindow.axaml
@@ -11,7 +11,7 @@
         Background="{DynamicResource AppDialogBackground}"
         WindowStartupLocation="CenterOwner">
 
-    <TabControl Margin="8">
+    <TabControl x:Name="MainTabControl" Margin="8">
 
         <TabItem Header="{t:Translate About}">
             <about:AboutPage/>
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/AboutWindow.axaml.cs b/src/UniGetUI.Avalonia/Views/DialogPages/AboutWindow.axaml.cs
index 9cb63f1bc6..a2b8b8b2e9 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/AboutWindow.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/AboutWindow.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Threading;
 
 namespace UniGetUI.Avalonia.Views.DialogPages;
 
@@ -8,4 +9,10 @@ public AboutWindow()
     {
         InitializeComponent();
     }
+
+    protected override void OnOpened(EventArgs e)
+    {
+        base.OnOpened(e);
+        Dispatcher.UIThread.Post(() => MainTabControl.Focus(), DispatcherPriority.Background);
+    }
 }
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/InstallOptionsWindow.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/InstallOptionsWindow.axaml
index 3b28b01a80..71cce24136 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/InstallOptionsWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/InstallOptionsWindow.axaml
@@ -1,5 +1,6 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
         xmlns:vm="using:UniGetUI.Avalonia.ViewModels"
         x:Class="UniGetUI.Avalonia.Views.InstallOptionsWindow"
         x:DataType="vm:InstallOptionsViewModel"
@@ -9,6 +10,10 @@
         Background="{DynamicResource AppDialogBackground}"
         Title="{Binding DialogTitle}">
 
+    <Window.KeyBindings>
+        <KeyBinding Gesture="Ctrl+S" Command="{Binding SaveCommand}"/>
+    </Window.KeyBindings>
+
     <ScrollViewer MaxHeight="820"
                   VerticalScrollBarVisibility="Auto"
                   HorizontalScrollBarVisibility="Disabled">
@@ -19,19 +24,24 @@
 
                 <Image Source="{Binding PackageIcon}"
                        Width="32" Height="32"
+                       automation:AutomationProperties.AccessibilityView="Raw"
                        VerticalAlignment="Center"/>
 
                 <TextBlock Grid.Column="1"
+                           automation:AutomationProperties.Name="{Binding DialogTitle}"
                            Text="{Binding DialogTitle}"
                            FontSize="18" FontWeight="Bold"
                            TextWrapping="Wrap"
                            VerticalAlignment="Center"/>
 
                 <StackPanel Grid.Column="2" Spacing="3" VerticalAlignment="Center">
-                    <TextBlock Text="{Binding ProfileLabel}"
+                    <TextBlock x:Name="ProfileLabelBlock"
+                               Text="{Binding ProfileLabel}"
                                FontSize="11" Opacity="0.7"/>
-                    <ComboBox ItemsSource="{Binding ProfileOptions}"
+                    <ComboBox x:Name="ProfileSelectorComboBox"
+                              ItemsSource="{Binding ProfileOptions}"
                               SelectedItem="{Binding SelectedProfile}"
+                              automation:AutomationProperties.LabeledBy="{Binding #ProfileLabelBlock}"
                               MinWidth="110"/>
                 </StackPanel>
             </Grid>
@@ -39,11 +49,13 @@
             <!-- ── Follow-global-options card ── -->
             <Border Background="{DynamicResource AppDialogPanelBackground}" CornerRadius="8" Padding="16,8">
                 <Grid ColumnDefinitions="*,Auto" ColumnSpacing="8">
-                    <TextBlock Text="{Binding FollowGlobalLabel}"
+                    <TextBlock x:Name="FollowGlobalLabelBlock"
+                               Text="{Binding FollowGlobalLabel}"
                                TextWrapping="Wrap"
                                VerticalAlignment="Center"/>
                     <ToggleSwitch Grid.Column="1"
                                   IsChecked="{Binding FollowGlobal}"
+                                  automation:AutomationProperties.LabeledBy="{Binding #FollowGlobalLabelBlock}"
                                   OnContent="" OffContent=""
                                   VerticalAlignment="Center"/>
                 </Grid>
@@ -68,42 +80,52 @@
                                           IsChecked="{Binding AdminChecked}"
                                           IsEnabled="{Binding CanRunAsAdmin}"
                                           IsVisible="{Binding CanRunAsAdmin}"
+                                          automation:AutomationProperties.Name="{Binding AdminCheckBox_Content}"
                                           Margin="0,0,16,4"/>
                                 <CheckBox Content="{Binding InteractiveCheckBox_Content, FallbackValue='Interactive installation'}"
                                           IsChecked="{Binding InteractiveChecked}"
                                           IsEnabled="{Binding CanRunInteractively}"
+                                          automation:AutomationProperties.Name="{Binding InteractiveCheckBox_Content}"
                                           Margin="0,0,16,4"/>
                                 <CheckBox Content="{Binding SkipHashCheckBox_Content, FallbackValue='Skip hash check'}"
                                           IsChecked="{Binding SkipHashChecked}"
                                           IsEnabled="{Binding SkipHashEnabled}"
+                                          automation:AutomationProperties.Name="{Binding SkipHashCheckBox_Content}"
                                           Margin="0,0,16,4"/>
                                 <CheckBox Content="{Binding UninstallPrevCheckBox_Content, FallbackValue='Uninstall previous versions when updated'}"
                                           IsChecked="{Binding UninstallPrevChecked}"
                                           IsEnabled="{Binding CanUninstallPrev}"
                                           IsVisible="{Binding CanUninstallPrev}"
+                                          automation:AutomationProperties.Name="{Binding UninstallPrevCheckBox_Content}"
                                           Margin="0,0,16,4"/>
                             </WrapPanel>
 
-                            <Border Height="1" Background="{DynamicResource AppBorderBrush}"/>
+                            <Border Height="1" Background="{DynamicResource AppBorderBrush}"
+                                    automation:AutomationProperties.AccessibilityView="Raw"/>
 
                             <Grid ColumnDefinitions="*,*" ColumnSpacing="8">
-                                <TextBlock Text="{Binding VersionLabel}"
+                                <TextBlock x:Name="VersionLabelBlock"
+                                           Text="{Binding VersionLabel}"
                                            VerticalAlignment="Center"/>
                                 <ComboBox Grid.Column="1"
                                           ItemsSource="{Binding VersionOptions}"
                                           SelectedItem="{Binding SelectedVersion}"
                                           IsEnabled="{Binding VersionEnabled}"
+                                          automation:AutomationProperties.LabeledBy="{Binding #VersionLabelBlock}"
                                           HorizontalAlignment="Stretch"/>
                             </Grid>
 
-                            <Border Height="1" Background="{DynamicResource AppBorderBrush}"/>
+                            <Border Height="1" Background="{DynamicResource AppBorderBrush}"
+                                    automation:AutomationProperties.AccessibilityView="Raw"/>
 
                             <WrapPanel Orientation="Horizontal">
                                 <CheckBox Content="{Binding SkipMinorCheckBox_Content, FallbackValue='Skip minor updates'}"
                                           IsChecked="{Binding SkipMinorChecked}"
+                                          automation:AutomationProperties.Name="{Binding SkipMinorCheckBox_Content}"
                                           Margin="0,0,16,4"/>
                                 <CheckBox Content="{Binding AutoUpdateCheckBox_Content, FallbackValue='Auto-update this package'}"
                                           IsChecked="{Binding AutoUpdateChecked}"
+                                          automation:AutomationProperties.Name="{Binding AutoUpdateCheckBox_Content}"
                                           Margin="0,0,16,4"/>
                             </WrapPanel>
 
@@ -117,36 +139,44 @@
                         <StackPanel Spacing="8">
 
                             <Grid ColumnDefinitions="*,*" ColumnSpacing="8">
-                                <TextBlock Text="{Binding ArchLabel}" VerticalAlignment="Center"/>
+                                <TextBlock x:Name="ArchLabelBlock" Text="{Binding ArchLabel}" VerticalAlignment="Center"/>
                                 <ComboBox Grid.Column="1"
                                           ItemsSource="{Binding ArchOptions}"
                                           SelectedItem="{Binding SelectedArch}"
                                           IsEnabled="{Binding ArchEnabled}"
+                                          automation:AutomationProperties.LabeledBy="{Binding #ArchLabelBlock}"
                                           HorizontalAlignment="Stretch"/>
                             </Grid>
 
-                            <Border Height="1" Background="{DynamicResource AppBorderBrush}"/>
+                            <Border Height="1" Background="{DynamicResource AppBorderBrush}"
+                                    automation:AutomationProperties.AccessibilityView="Raw"/>
 
                             <Grid ColumnDefinitions="*,*" ColumnSpacing="8">
-                                <TextBlock Text="{Binding ScopeLabel}" VerticalAlignment="Center"/>
+                                <TextBlock x:Name="ScopeLabelBlock" Text="{Binding ScopeLabel}" VerticalAlignment="Center"/>
                                 <ComboBox Grid.Column="1"
                                           ItemsSource="{Binding ScopeOptions}"
                                           SelectedItem="{Binding SelectedScope}"
                                           IsEnabled="{Binding ScopeEnabled}"
+                                          automation:AutomationProperties.LabeledBy="{Binding #ScopeLabelBlock}"
                                           HorizontalAlignment="Stretch"/>
                             </Grid>
 
-                            <Border Height="1" Background="{DynamicResource AppBorderBrush}"/>
+                            <Border Height="1" Background="{DynamicResource AppBorderBrush}"
+                                    automation:AutomationProperties.AccessibilityView="Raw"/>
 
                             <Grid ColumnDefinitions="*,Auto,Auto" ColumnSpacing="6">
-                                <TextBlock Text="{Binding LocationLabel}" VerticalAlignment="Center"/>
+                                <TextBlock x:Name="LocationLabelBlock" Text="{Binding LocationLabel}" VerticalAlignment="Center"/>
                                 <Button Grid.Column="1"
                                         Content="{Binding SelectDirLabel}"
+                                    automation:AutomationProperties.Name="{Binding SelectDirLabel}"
+                                    automation:AutomationProperties.HelpText="{Binding LocationLabel}"
                                         IsEnabled="{Binding HasCustomLocations}"
                                         Padding="8,3" CornerRadius="4"
                                         Click="SelectDir_Click"/>
                                 <Button Grid.Column="2"
                                         Content="{Binding ResetDirLabel}"
+                                    automation:AutomationProperties.Name="{Binding ResetDirLabel}"
+                                    automation:AutomationProperties.HelpText="{Binding LocationLabel}"
                                         IsEnabled="{Binding HasCustomLocations}"
                                         Padding="8,3" CornerRadius="4"
                                         Command="{Binding ResetLocationCommand}"/>
@@ -154,6 +184,7 @@
 
                             <TextBox Text="{Binding LocationText}"
                                      IsEnabled="{Binding LocationEnabled}"
+                                     automation:AutomationProperties.LabeledBy="{Binding #LocationLabelBlock}"
                                      FontFamily="Cascadia Mono,Consolas,Menlo,monospace"
                                      HorizontalAlignment="Stretch"/>
 
@@ -168,24 +199,27 @@
                               RowDefinitions="Auto,Auto,Auto"
                               ColumnSpacing="8" RowSpacing="8">
 
-                            <TextBlock Text="{Binding ParamsInstallLabel}"
+                                                        <TextBlock x:Name="ParamsInstallLabelBlock" Text="{Binding ParamsInstallLabel}"
                                        VerticalAlignment="Center"/>
                             <TextBox Grid.Column="1"
                                      Text="{Binding ParamsInstall}"
+                                                                         automation:AutomationProperties.LabeledBy="{Binding #ParamsInstallLabelBlock}"
                                      FontFamily="Cascadia Mono,Consolas,Menlo,monospace"/>
 
-                            <TextBlock Grid.Row="1"
-                                       Text="{Binding ParamsUpdateLabel}"
+                                                        <TextBlock x:Name="ParamsUpdateLabelBlock" Grid.Row="1"
+                                                                             Text="{Binding ParamsUpdateLabel}"
                                        VerticalAlignment="Center"/>
                             <TextBox Grid.Row="1" Grid.Column="1"
                                      Text="{Binding ParamsUpdate}"
+                                                                         automation:AutomationProperties.LabeledBy="{Binding #ParamsUpdateLabelBlock}"
                                      FontFamily="Cascadia Mono,Consolas,Menlo,monospace"/>
 
-                            <TextBlock Grid.Row="2"
-                                       Text="{Binding ParamsUninstallLabel}"
+                                                        <TextBlock x:Name="ParamsUninstallLabelBlock" Grid.Row="2"
+                                                                             Text="{Binding ParamsUninstallLabel}"
                                        VerticalAlignment="Center"/>
                             <TextBox Grid.Row="2" Grid.Column="1"
                                      Text="{Binding ParamsUninstall}"
+                                                                         automation:AutomationProperties.LabeledBy="{Binding #ParamsUninstallLabelBlock}"
                                      FontFamily="Cascadia Mono,Consolas,Menlo,monospace"/>
 
                         </Grid>
@@ -201,63 +235,74 @@
                             <Grid ColumnDefinitions="*,*"
                                   RowDefinitions="Auto,80,Auto"
                                   ColumnSpacing="8" RowSpacing="4">
-                                <TextBlock Text="{Binding PreInstallLabel}"  FontSize="12"/>
-                                <TextBlock Grid.Column="1"
+                                <TextBlock x:Name="PreInstallLabelBlock" Text="{Binding PreInstallLabel}"  FontSize="12"/>
+                                <TextBlock x:Name="PostInstallLabelBlock" Grid.Column="1"
                                            Text="{Binding PostInstallLabel}" FontSize="12"/>
                                 <TextBox Grid.Row="1"
                                          Text="{Binding PreInstallText}"
                                          AcceptsReturn="True"
+                                         automation:AutomationProperties.LabeledBy="{Binding #PreInstallLabelBlock}"
                                          FontFamily="Cascadia Mono,Consolas,Menlo,monospace"/>
                                 <TextBox Grid.Row="1" Grid.Column="1"
                                          Text="{Binding PostInstallText}"
                                          AcceptsReturn="True"
+                                         automation:AutomationProperties.LabeledBy="{Binding #PostInstallLabelBlock}"
                                          FontFamily="Cascadia Mono,Consolas,Menlo,monospace"/>
                                 <CheckBox Grid.Row="2" Grid.ColumnSpan="2"
                                           Content="{Binding AbortInstallLabel}"
+                                          automation:AutomationProperties.Name="{Binding AbortInstallLabel}"
                                           IsChecked="{Binding AbortInstall}"/>
                             </Grid>
 
-                            <Border Height="1" Background="{DynamicResource AppBorderBrush}"/>
+                            <Border Height="1" Background="{DynamicResource AppBorderBrush}"
+                                    automation:AutomationProperties.AccessibilityView="Raw"/>
 
                             <!-- Update -->
                             <Grid ColumnDefinitions="*,*"
                                   RowDefinitions="Auto,80,Auto"
                                   ColumnSpacing="8" RowSpacing="4">
-                                <TextBlock Text="{Binding PreUpdateLabel}"  FontSize="12"/>
-                                <TextBlock Grid.Column="1"
+                                <TextBlock x:Name="PreUpdateLabelBlock" Text="{Binding PreUpdateLabel}"  FontSize="12"/>
+                                <TextBlock x:Name="PostUpdateLabelBlock" Grid.Column="1"
                                            Text="{Binding PostUpdateLabel}" FontSize="12"/>
                                 <TextBox Grid.Row="1"
                                          Text="{Binding PreUpdateText}"
                                          AcceptsReturn="True"
+                                         automation:AutomationProperties.LabeledBy="{Binding #PreUpdateLabelBlock}"
                                          FontFamily="Cascadia Mono,Consolas,Menlo,monospace"/>
                                 <TextBox Grid.Row="1" Grid.Column="1"
                                          Text="{Binding PostUpdateText}"
                                          AcceptsReturn="True"
+                                         automation:AutomationProperties.LabeledBy="{Binding #PostUpdateLabelBlock}"
                                          FontFamily="Cascadia Mono,Consolas,Menlo,monospace"/>
                                 <CheckBox Grid.Row="2" Grid.ColumnSpan="2"
                                           Content="{Binding AbortUpdateLabel}"
+                                          automation:AutomationProperties.Name="{Binding AbortUpdateLabel}"
                                           IsChecked="{Binding AbortUpdate}"/>
                             </Grid>
 
-                            <Border Height="1" Background="{DynamicResource AppBorderBrush}"/>
+                            <Border Height="1" Background="{DynamicResource AppBorderBrush}"
+                                    automation:AutomationProperties.AccessibilityView="Raw"/>
 
                             <!-- Uninstall -->
                             <Grid ColumnDefinitions="*,*"
                                   RowDefinitions="Auto,80,Auto"
                                   ColumnSpacing="8" RowSpacing="4">
-                                <TextBlock Text="{Binding PreUninstallLabel}"  FontSize="12"/>
-                                <TextBlock Grid.Column="1"
+                                <TextBlock x:Name="PreUninstallLabelBlock" Text="{Binding PreUninstallLabel}"  FontSize="12"/>
+                                <TextBlock x:Name="PostUninstallLabelBlock" Grid.Column="1"
                                            Text="{Binding PostUninstallLabel}" FontSize="12"/>
                                 <TextBox Grid.Row="1"
                                          Text="{Binding PreUninstallText}"
                                          AcceptsReturn="True"
+                                         automation:AutomationProperties.LabeledBy="{Binding #PreUninstallLabelBlock}"
                                          FontFamily="Cascadia Mono,Consolas,Menlo,monospace"/>
                                 <TextBox Grid.Row="1" Grid.Column="1"
                                          Text="{Binding PostUninstallText}"
                                          AcceptsReturn="True"
+                                         automation:AutomationProperties.LabeledBy="{Binding #PostUninstallLabelBlock}"
                                          FontFamily="Cascadia Mono,Consolas,Menlo,monospace"/>
                                 <CheckBox Grid.Row="2" Grid.ColumnSpan="2"
                                           Content="{Binding AbortUninstallLabel}"
+                                          automation:AutomationProperties.Name="{Binding AbortUninstallLabel}"
                                           IsChecked="{Binding AbortUninstall}"/>
                             </Grid>
 
@@ -273,6 +318,7 @@
                     <TextBlock Text="{Binding CommandPreviewLabel}" Opacity="0.7"/>
                     <Border Background="{DynamicResource AppDialogDarkBackground}" CornerRadius="4" Padding="8">
                         <TextBlock Text="{Binding CommandPreview}"
+                                   automation:AutomationProperties.Name="{Binding CommandPreviewLabel}"
                                    FontFamily="Cascadia Mono,Consolas,Menlo,monospace"
                                    FontSize="12"
                                    TextWrapping="Wrap"/>
@@ -282,11 +328,14 @@
 
             <!-- ── Buttons ── -->
             <Grid ColumnDefinitions="*,Auto" ColumnSpacing="8">
-                <Button Content="{Binding SaveLabel}"
+                <Button x:Name="SaveButton"
+                    Content="{Binding SaveLabel}"
+                    automation:AutomationProperties.AcceleratorKey="Ctrl+S"
                         Padding="12,5" CornerRadius="4"
                         HorizontalAlignment="Left"
                         Command="{Binding SaveCommand}"/>
-                <Button Grid.Column="1"
+                <Button x:Name="ProceedButton"
+                    Grid.Column="1"
                         Content="{Binding ProceedButtonLabel}"
                         Padding="12,5" CornerRadius="4"
                         Command="{Binding ProceedCommand}"/>
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/InstallOptionsWindow.axaml.cs b/src/UniGetUI.Avalonia/Views/DialogPages/InstallOptionsWindow.axaml.cs
index 4d2fc4042c..0cd0fd1946 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/InstallOptionsWindow.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/InstallOptionsWindow.axaml.cs
@@ -1,6 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 using UniGetUI.Avalonia.ViewModels;
 using UniGetUI.PackageEngine.Enums;
 using UniGetUI.PackageEngine.Interfaces;
@@ -21,6 +22,12 @@ public InstallOptionsWindow(IPackage package, OperationType operation, InstallOp
         vm.CloseRequested += (_, _) => Close();
     }
 
+    protected override void OnOpened(EventArgs e)
+    {
+        base.OnOpened(e);
+        Dispatcher.UIThread.Post(() => ProfileSelectorComboBox.Focus(), DispatcherPriority.Background);
+    }
+
     private async void SelectDir_Click(object? sender, RoutedEventArgs e)
     {
         var results = await StorageProvider.OpenFolderPickerAsync(
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/ManageDesktopShortcutsWindow.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/ManageDesktopShortcutsWindow.axaml
index aa58eaf1ba..bbd878834c 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/ManageDesktopShortcutsWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/ManageDesktopShortcutsWindow.axaml
@@ -1,5 +1,6 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
         xmlns:vm="using:UniGetUI.Avalonia.ViewModels"
         xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
         xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
@@ -31,7 +32,8 @@
                    Text="{t:Translate Text='Manage shortcuts'}"
                    FontSize="20"
                    FontWeight="SemiBold"
-                   Margin="0,0,0,4"/>
+                   Margin="0,0,0,4"
+                   automation:AutomationProperties.HeadingLevel="1"/>
 
         <!-- ── Header: description + Reset list button ── -->
         <Grid Grid.Row="1" ColumnDefinitions="*,Auto" ColumnSpacing="8">
@@ -47,8 +49,10 @@
                 </TextBlock>
             </StackPanel>
 
-            <Button x:Name="ResetButton" Grid.Column="1" VerticalAlignment="Center">
-                <TextBlock Text="{t:Translate Text='Reset list'}"/>
+            <Button x:Name="ResetButton" Grid.Column="1" VerticalAlignment="Center"
+                    automation:AutomationProperties.Name="{t:Translate Text='Reset list'}">
+                <TextBlock Text="{t:Translate Text='Reset list'}"
+                           automation:AutomationProperties.AccessibilityView="Raw"/>
                 <Button.Flyout>
                     <Flyout Placement="Bottom">
                         <Flyout.FlyoutPresenterTheme>
@@ -70,10 +74,12 @@
                                        TextWrapping="Wrap"/>
                             <Button Grid.Row="1" Grid.Column="0"
                                     Content="{t:Translate Text='Yes'}"
+                                    automation:AutomationProperties.Name="{t:Translate Text='Yes'}"
                                     HorizontalAlignment="Stretch"
                                     Click="ResetYes_Click"/>
                             <Button Grid.Row="1" Grid.Column="1"
                                     Content="{t:Translate Text='No'}"
+                                    automation:AutomationProperties.Name="{t:Translate Text='No'}"
                                     HorizontalAlignment="Stretch"
                                     Classes="accent"
                                     Click="ResetNo_Click"/>
@@ -90,14 +96,17 @@
                 BorderThickness="1"
                 BorderBrush="{DynamicResource AppBorderBrush}"
                 Margin="0,4,0,0">
-            <DataGrid ItemsSource="{Binding Entries}"
+            <DataGrid x:Name="ShortcutsGrid"
+                      ItemsSource="{Binding Entries}"
                       AutoGenerateColumns="False"
                       CanUserReorderColumns="True"
                       CanUserResizeColumns="True"
                       CanUserSortColumns="False"
                       SelectionMode="Single"
                       HeadersVisibility="None"
-                      GridLinesVisibility="Horizontal">
+                      GridLinesVisibility="Horizontal"
+                      automation:AutomationProperties.Name="{t:Translate Text='Manage shortcuts'}"
+                      automation:AutomationProperties.HelpText="{t:Translate Desktop shortcuts list}">
                     <DataGrid.Columns>
 
                         <!-- Delete? checkbox -->
@@ -106,7 +115,8 @@
                                 <DataTemplate x:DataType="vm:ShortcutEntryViewModel">
                                     <CheckBox IsChecked="{Binding IsDeletable}"
                                               HorizontalAlignment="Center"
-                                              VerticalAlignment="Center"/>
+                                              VerticalAlignment="Center"
+                                              automation:AutomationProperties.Name="{Binding Name}"/>
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
@@ -153,7 +163,8 @@
                                             VerticalAlignment="Center"
                                             IsEnabled="{Binding ExistsOnDisk}"
                                             Command="{Binding OpenCommand}"
-                                            ToolTip.Tip="{t:Translate Text='Open in explorer'}">
+                                            ToolTip.Tip="{t:Translate Text='Open in explorer'}"
+                                            automation:AutomationProperties.Name="{t:Translate Text='Open in explorer'}">
                                         <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/launch.svg"
                                                           Width="16" Height="16"/>
                                     </Button>
@@ -170,7 +181,8 @@
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
                                             Command="{Binding RemoveCommand}"
-                                            ToolTip.Tip="{t:Translate Text='Remove from list'}">
+                                            ToolTip.Tip="{t:Translate Text='Remove from list'}"
+                                            automation:AutomationProperties.Name="{t:Translate Text='Remove from list'}">
                                         <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/delete.svg"
                                                           Width="16" Height="16"/>
                                     </Button>
@@ -188,8 +200,10 @@
             <StackPanel Orientation="Horizontal" Spacing="8" VerticalAlignment="Center">
                 <ToggleSwitch IsChecked="{Binding AutoDelete}"
                               OnContent="" OffContent=""
-                              VerticalAlignment="Center"/>
-                <TextBlock Text="{t:Translate Text='When new shortcuts are detected, delete them automatically instead of showing this dialog.'}"
+                              VerticalAlignment="Center"
+                              automation:AutomationProperties.LabeledBy="{Binding #AutoDeleteLabel}"/>
+                <TextBlock x:Name="AutoDeleteLabel"
+                           Text="{t:Translate Text='When new shortcuts are detected, delete them automatically instead of showing this dialog.'}"
                            TextWrapping="Wrap"
                            VerticalAlignment="Center"
                            MaxWidth="600"
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/ManageDesktopShortcutsWindow.axaml.cs b/src/UniGetUI.Avalonia/Views/DialogPages/ManageDesktopShortcutsWindow.axaml.cs
index 6990d7c0c1..a347181cfd 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/ManageDesktopShortcutsWindow.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/ManageDesktopShortcutsWindow.axaml.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Avalonia.Threading;
 using UniGetUI.Avalonia.ViewModels;
 
 namespace UniGetUI.Avalonia.Views;
@@ -14,6 +15,12 @@ public ManageDesktopShortcutsWindow(System.Collections.Generic.IReadOnlyList<str
         vm.CloseRequested += (_, _) => Close();
     }
 
+    protected override void OnOpened(EventArgs e)
+    {
+        base.OnOpened(e);
+        Dispatcher.UIThread.Post(() => ShortcutsGrid.Focus(), DispatcherPriority.Background);
+    }
+
     private void ResetYes_Click(object? sender, RoutedEventArgs e)
     {
         ((ManageDesktopShortcutsViewModel)DataContext!).ResetAllCommand.Execute(null);
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml
index c99ad473cd..c7e8182267 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml
@@ -1,5 +1,6 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
         xmlns:vm="using:UniGetUI.Avalonia.ViewModels"
         xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
         xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
@@ -31,7 +32,8 @@
                    Text="{Binding Title}"
                    FontSize="20"
                    FontWeight="SemiBold"
-                   Margin="0,0,0,4"/>
+                   Margin="0,0,0,4"
+                   automation:AutomationProperties.HeadingLevel="1"/>
 
         <!-- ── Header: description + Reset list button ── -->
         <Grid Grid.Row="1" ColumnDefinitions="*,Auto" ColumnSpacing="8">
@@ -41,7 +43,8 @@
                        VerticalAlignment="Center"
                        Opacity="0.75"/>
 
-            <Button x:Name="ResetButton" Grid.Column="1" VerticalAlignment="Center">
+            <Button x:Name="ResetButton" Grid.Column="1" VerticalAlignment="Center"
+                    automation:AutomationProperties.Name="{Binding ResetLabel}">
                 <TextBlock Text="{Binding ResetLabel}"/>
                 <Button.Flyout>
                     <Flyout Placement="Bottom">
@@ -64,10 +67,12 @@
                                        TextWrapping="Wrap"/>
                             <Button Grid.Row="1" Grid.Column="0"
                                     Content="{Binding ResetYes}"
+                                    automation:AutomationProperties.Name="{Binding ResetYes}"
                                     HorizontalAlignment="Stretch"
                                     Click="ResetYes_Click"/>
                             <Button Grid.Row="1" Grid.Column="1"
                                     Content="{Binding ResetNo}"
+                                    automation:AutomationProperties.Name="{Binding ResetNo}"
                                     HorizontalAlignment="Stretch"
                                     Classes="accent"
                                     Click="ResetNo_Click"/>
@@ -96,12 +101,15 @@
                            Opacity="0.5"/>
 
                 <DataGrid ItemsSource="{Binding Entries}"
+                          x:Name="IgnoredUpdatesGrid"
                           AutoGenerateColumns="False"
                           CanUserReorderColumns="True"
                           CanUserResizeColumns="True"
                           CanUserSortColumns="True"
                           SelectionMode="Single"
                           GridLinesVisibility="Horizontal"
+                          automation:AutomationProperties.Name="{Binding Title}"
+                          automation:AutomationProperties.HelpText="{Binding Description}"
                           IsVisible="{Binding HasEntries}">
                     <DataGrid.Columns>
 
@@ -110,6 +118,7 @@
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate x:DataType="vm:IgnoredPackageEntryViewModel">
                                     <StackPanel Orientation="Horizontal" Spacing="6"
+                                                automation:AutomationProperties.Name="{Binding AutomationName}"
                                                 VerticalAlignment="Center" Margin="0,0,4,0">
                                         <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/package.svg"
                                                           Width="16" Height="16" VerticalAlignment="Center"/>
@@ -125,6 +134,7 @@
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate x:DataType="vm:IgnoredPackageEntryViewModel">
                                     <StackPanel Orientation="Horizontal" Spacing="6"
+                                                automation:AutomationProperties.Name="{Binding Id}"
                                                 VerticalAlignment="Center" Margin="0,0,4,0">
                                         <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/id.svg"
                                                           Width="16" Height="16" VerticalAlignment="Center"/>
@@ -140,6 +150,7 @@
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate x:DataType="vm:IgnoredPackageEntryViewModel">
                                     <StackPanel Orientation="Horizontal" Spacing="6"
+                                                automation:AutomationProperties.Name="{Binding VersionDisplay}"
                                                 VerticalAlignment="Center" Margin="0,0,4,0">
                                         <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/version.svg"
                                                           Width="16" Height="16" VerticalAlignment="Center"/>
@@ -155,6 +166,7 @@
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate x:DataType="vm:IgnoredPackageEntryViewModel">
                                     <StackPanel Orientation="Horizontal" Spacing="6"
+                                                automation:AutomationProperties.Name="{Binding NewVersion}"
                                                 VerticalAlignment="Center" Margin="0,0,4,0">
                                         <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/upgradable.svg"
                                                           Width="16" Height="16" VerticalAlignment="Center"/>
@@ -170,6 +182,7 @@
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate x:DataType="vm:IgnoredPackageEntryViewModel">
                                     <StackPanel Orientation="Horizontal" Spacing="6"
+                                                automation:AutomationProperties.Name="{Binding Manager}"
                                                 VerticalAlignment="Center" Margin="0,0,4,0">
                                         <controls:SvgIcon Path="{Binding ManagerIconPath}"
                                                           Width="16" Height="16"
@@ -191,6 +204,7 @@
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
                                             Command="{Binding RemoveCommand}"
+                                            automation:AutomationProperties.Name="{Binding RemoveAutomationName}"
                                             ToolTip.Tip="{t:Translate Text='Remove from list'}">
                                         <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/delete.svg"
                                                           Width="16" Height="16"/>
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml.cs b/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml.cs
index e9ed49210d..dffda0ed6e 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Avalonia.Threading;
 using UniGetUI.Avalonia.ViewModels;
 
 namespace UniGetUI.Avalonia.Views;
@@ -14,6 +15,18 @@ public ManageIgnoredUpdatesWindow()
         vm.CloseRequested += (_, _) => Close();
     }
 
+    protected override void OnOpened(EventArgs e)
+    {
+        base.OnOpened(e);
+        Dispatcher.UIThread.Post(() =>
+        {
+            if (IgnoredUpdatesGrid.IsVisible)
+                IgnoredUpdatesGrid.Focus();
+            else
+                ResetButton.Focus();
+        }, DispatcherPriority.Background);
+    }
+
     private void ResetYes_Click(object? sender, RoutedEventArgs e)
     {
         ((ManageIgnoredUpdatesViewModel)DataContext!).ResetAllCommand.Execute(null);
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.axaml
index db8fdc66d6..5f0752d627 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.axaml
@@ -1,5 +1,6 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
         xmlns:vm="using:UniGetUI.Avalonia.ViewModels.DialogPages"
         x:Class="UniGetUI.Avalonia.Views.DialogPages.OperationOutputWindow"
         x:DataType="vm:OperationOutputViewModel"
@@ -15,7 +16,8 @@
                   Margin="8"
                   HorizontalScrollBarVisibility="Auto"
                   VerticalScrollBarVisibility="Auto">
-        <TextBox Text="{Binding OutputText}"
+        <TextBox x:Name="OutputTextBox"
+                 Text="{Binding OutputText}"
                  IsReadOnly="True"
                  AcceptsReturn="True"
                  TextWrapping="Wrap"
@@ -23,7 +25,8 @@
                  FontSize="12"
                  Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"
                  Background="Transparent"
-                 BorderThickness="0"/>
+                 BorderThickness="0"
+                 automation:AutomationProperties.Name="{Binding Title}"/>
     </ScrollViewer>
 
 </Window>
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.axaml.cs b/src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.axaml.cs
index 3c1efabbe1..5f519e39cc 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Threading;
 using UniGetUI.Avalonia.ViewModels.DialogPages;
 using UniGetUI.PackageOperations;
 
@@ -16,5 +17,6 @@ protected override void OnOpened(EventArgs e)
     {
         base.OnOpened(e);
         OutputScroll.ScrollToEnd();
+        Dispatcher.UIThread.Post(() => OutputTextBox.Focus(), DispatcherPriority.Background);
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml
index a801e73983..d5788cbb5c 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml
@@ -1,5 +1,6 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
         xmlns:vm="using:UniGetUI.Avalonia.ViewModels"
         xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
         x:Class="UniGetUI.Avalonia.Views.PackageDetailsWindow"
@@ -24,6 +25,7 @@
         <ProgressBar Grid.Row="0"
                      IsIndeterminate="True"
                      IsVisible="{Binding IsLoading}"
+                     automation:AutomationProperties.Name="{Binding PackageName}"
                      Height="3"/>
 
         <!-- ── Scrollable body ── -->
@@ -40,6 +42,7 @@
                             Background="{DynamicResource AppDialogPanelBackground}"
                             ClipToBounds="True">
                         <Image Source="{Binding PackageIcon}"
+                               automation:AutomationProperties.AccessibilityView="Raw"
                                Stretch="Uniform"
                                RenderOptions.BitmapInterpolationMode="HighQuality"/>
                     </Border>
@@ -49,7 +52,8 @@
                                 Spacing="4">
                         <TextBlock Text="{Binding PackageName}"
                                    FontSize="22" FontWeight="Bold"
-                                   TextWrapping="Wrap"/>
+                                   TextWrapping="Wrap"
+                                   automation:AutomationProperties.HeadingLevel="1"/>
                         <TextBlock Text="{Binding SourceDisplay}"
                                    FontSize="13" Opacity="0.65"/>
                     </StackPanel>
@@ -110,6 +114,7 @@
                                     IsVisible="{Binding HasHomepageUrl}"
                                     Command="{Binding OpenUrlCommand}"
                                     CommandParameter="{Binding HomepageText}"
+                                    automation:AutomationProperties.Name="{Binding LabelHomepage}"
                                     Padding="8,3" Margin="8,0,0,0"/>
                         </Grid>
 
@@ -148,6 +153,7 @@
                                     IsVisible="{Binding HasLicenseUrl}"
                                     Command="{Binding OpenUrlCommand}"
                                     CommandParameter="{Binding LicenseText}"
+                                    automation:AutomationProperties.Name="{Binding LabelLicense}"
                                     Padding="8,3" Margin="8,0,0,0"/>
                         </Grid>
 
@@ -159,6 +165,7 @@
                     <Grid ColumnDefinitions="*,Auto" ColumnSpacing="4">
                         <Button x:Name="MainActionButton"
                                 Content="{Binding MainActionLabel}"
+                                automation:AutomationProperties.Name="{Binding MainActionLabel}"
                                 HorizontalAlignment="Stretch"
                                 HorizontalContentAlignment="Center"
                                 Classes="accent"
@@ -166,6 +173,8 @@
                         <Button x:Name="ActionVariantsButton"
                                 Grid.Column="1"
                                 Content="▾"
+                            automation:AutomationProperties.Name="{Binding MainActionLabel}"
+                            automation:AutomationProperties.HelpText="{Binding HeaderDetails}"
                                 Width="30"
                                 Height="30"
                                 FontSize="30"
@@ -210,11 +219,13 @@
                                            Opacity="0.65" VerticalAlignment="Center"/>
                                 <TextBlock Grid.Column="1"
                                            Text="{Binding ManifestText}"
+                                       automation:AutomationProperties.Name="{Binding LabelManifest}"
                                            TextTrimming="CharacterEllipsis"
                                            VerticalAlignment="Center"
                                            ToolTip.Tip="{Binding ManifestText}"/>
                                 <Button Grid.Column="2"
                                         Content="{Binding LabelOpen}"
+                                    automation:AutomationProperties.Name="{Binding LabelManifest}"
                                         IsVisible="{Binding HasManifestUrl}"
                                         Command="{Binding OpenUrlCommand}"
                                         CommandParameter="{Binding ManifestText}"
@@ -228,6 +239,8 @@
                                            Opacity="0.65" VerticalAlignment="Top"/>
                                 <TextBlock Grid.Column="1"
                                            Text="{Binding InstallerHash}"
+                                           automation:AutomationProperties.Name="{Binding InstallerHashLabel}"
+                                           automation:AutomationProperties.HelpText="{Binding InstallerHash}"
                                            TextWrapping="Wrap"
                                            FontSize="11"/>
                             </Grid>
@@ -249,11 +262,13 @@
                                            Opacity="0.65" VerticalAlignment="Center"/>
                                 <TextBlock Grid.Column="1"
                                            Text="{Binding InstallerUrlText}"
+                                       automation:AutomationProperties.Name="{Binding LabelInstallerUrl}"
                                            TextTrimming="CharacterEllipsis"
                                            VerticalAlignment="Center"
                                            ToolTip.Tip="{Binding InstallerUrlText}"/>
                                 <Button Grid.Column="2"
                                         Content="{Binding LabelOpen}"
+                                    automation:AutomationProperties.Name="{Binding LabelInstallerUrl}"
                                         IsVisible="{Binding HasInstallerUrl}"
                                         Command="{Binding OpenUrlCommand}"
                                         CommandParameter="{Binding InstallerUrlText}"
@@ -350,11 +365,13 @@
                                            Opacity="0.65" VerticalAlignment="Center"/>
                                 <TextBlock Grid.Column="1"
                                            Text="{Binding ReleaseNotesUrlText}"
+                                       automation:AutomationProperties.Name="{Binding LabelReleaseNotesUrl}"
                                            TextTrimming="CharacterEllipsis"
                                            VerticalAlignment="Center"
                                            ToolTip.Tip="{Binding ReleaseNotesUrlText}"/>
                                 <Button Grid.Column="2"
                                         Content="{Binding LabelOpen}"
+                                    automation:AutomationProperties.Name="{Binding LabelReleaseNotesUrl}"
                                         IsVisible="{Binding HasReleaseNotesUrl}"
                                         Command="{Binding OpenUrlCommand}"
                                         CommandParameter="{Binding ReleaseNotesUrlText}"
@@ -373,6 +390,7 @@
                 BorderThickness="0,1,0,0"
                 Padding="16,10">
             <Button Content="{Binding LabelClose}"
+                    automation:AutomationProperties.Name="{Binding LabelClose}"
                     Command="{Binding RequestCloseCommand}"
                     HorizontalAlignment="Right"
                     Padding="16,6"/>
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml.cs b/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml.cs
index fb6a764a4c..117a99b44f 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Threading;
 using UniGetUI.Avalonia.Infrastructure;
 using UniGetUI.Avalonia.ViewModels;
 using UniGetUI.Interface.Telemetry;
@@ -35,6 +36,7 @@ public PackageDetailsWindow(IPackage package, OperationType operation)
     protected override void OnOpened(EventArgs e)
     {
         base.OnOpened(e);
+        Dispatcher.UIThread.Post(() => MainActionButton.Focus(), DispatcherPriority.Background);
         _ = _vm.LoadDetailsAsync();
         TelemetryHandler.PackageDetails(_vm.Package, _vm.OperationRole.ToString());
     }
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml
index 3adab7913a..af167392a5 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml
@@ -1,5 +1,6 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
         xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
         x:Class="UniGetUI.Avalonia.Views.DialogPages.TelemetryDialog"
         Title="{t:Translate Share anonymous usage data}"
@@ -19,7 +20,8 @@
         <TextBlock Grid.Row="0"
                    Text="{t:Translate Share anonymous usage data}"
                    FontSize="18"
-                   FontWeight="SemiBold"/>
+                   FontWeight="SemiBold"
+                   automation:AutomationProperties.HeadingLevel="1"/>
 
         <!-- Body -->
         <StackPanel Grid.Row="1" Spacing="8">
@@ -30,7 +32,9 @@
                        Text="{t:Translate More details about the shared data and how it will be processed}"
                        TextDecorations="Underline"
                        Cursor="Hand"
-                       Opacity="0.9"/>
+                       Opacity="0.9"
+                       automation:AutomationProperties.Name="{t:Translate More details about the shared data and how it will be processed}"
+                       automation:AutomationProperties.ControlTypeOverride="Hyperlink"/>
             <TextBlock Text="{t:Translate Text='Do you accept that UniGetUI collects and sends anonymous usage statistics, with the sole purpose of understanding and improving the user experience?'}"
                        TextWrapping="Wrap" Opacity="0.85"/>
         </StackPanel>
@@ -41,8 +45,10 @@
                     HorizontalAlignment="Right"
                     Spacing="8"
                     Margin="0,4,0,0">
-            <Button x:Name="DeclineButton" Content="{t:Translate Decline}" MinWidth="100"/>
-            <Button x:Name="AcceptButton"  Content="{t:Translate Accept}" MinWidth="100" Classes="accent"/>
+            <Button x:Name="DeclineButton" Content="{t:Translate Decline}" MinWidth="100"
+                    automation:AutomationProperties.Name="{t:Translate Decline}"/>
+            <Button x:Name="AcceptButton"  Content="{t:Translate Accept}" MinWidth="100" Classes="accent"
+                    automation:AutomationProperties.Name="{t:Translate Accept}"/>
         </StackPanel>
 
     </Grid>
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml.cs b/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml.cs
index 2b162f5640..64f838d882 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Threading;
 using UniGetUI.Core.Tools;
 
 namespace UniGetUI.Avalonia.Views.DialogPages;
@@ -25,4 +26,10 @@ public TelemetryDialog()
         DeclineButton.Click += (_, _) => { Result = false; Close(); };
         AcceptButton.Click += (_, _) => { Result = true; Close(); };
     }
+
+    protected override void OnOpened(EventArgs e)
+    {
+        base.OnOpened(e);
+        Dispatcher.UIThread.Post(() => AcceptButton.Focus(), DispatcherPriority.Background);
+    }
 }
diff --git a/src/UniGetUI.Avalonia/Views/MainWindow.axaml b/src/UniGetUI.Avalonia/Views/MainWindow.axaml
index 9d8e2f9eef..d745933a02 100644
--- a/src/UniGetUI.Avalonia/Views/MainWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/MainWindow.axaml
@@ -1,5 +1,7 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
+    xmlns:peers="clr-namespace:Avalonia.Automation.Peers;assembly=Avalonia.Controls"
         xmlns:views="using:UniGetUI.Avalonia.Views"
         xmlns:vm="using:UniGetUI.Avalonia.ViewModels"
         xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
@@ -25,6 +27,9 @@
             <ContentControl Grid.Column="0" Grid.RowSpan="3"
                             Width="{Binding Sidebar.PaneWidth}"
                             Content="{Binding Sidebar}"
+                            automation:AutomationProperties.AccessibilityView="Control"
+                            automation:AutomationProperties.Name="{t:Translate Navigation panel}"
+                            automation:AutomationProperties.LandmarkType="{x:Static peers:AutomationLandmarkType.Navigation}"
                             HorizontalContentAlignment="Stretch"
                             VerticalContentAlignment="Stretch">
                 <ContentControl.DataTemplates>
@@ -38,12 +43,15 @@
             <Border Grid.Column="0" Grid.RowSpan="3"
                     Width="1"
                     HorizontalAlignment="Right"
+                    automation:AutomationProperties.AccessibilityView="Raw"
                     Opacity="0.2"
                     Background="{DynamicResource SystemBaseMediumColor}"/>
 
             <!-- ── Banners + page content ── -->
             <Grid Grid.Column="1" Grid.Row="0" RowDefinitions="Auto,*" Margin="0,10">
-                <StackPanel Grid.Row="0" Spacing="0">
+                <StackPanel Grid.Row="0"
+                            Spacing="0"
+                            automation:AutomationProperties.AccessibilityView="Control">
                     <StackPanel.DataTemplates>
                         <DataTemplate DataType="vm:InfoBarViewModel">
                             <controls:InfoBar/>
@@ -56,6 +64,8 @@
                 </StackPanel>
                 <ContentControl Grid.Row="1"
                                 Content="{Binding CurrentPageContent}"
+                                automation:AutomationProperties.AccessibilityView="Control"
+                                automation:AutomationProperties.LandmarkType="{x:Static peers:AutomationLandmarkType.Main}"
                                 HorizontalContentAlignment="Stretch"
                                 VerticalContentAlignment="Stretch"/>
             </Grid>
@@ -65,6 +75,7 @@
                           HorizontalAlignment="Stretch"
                           VerticalAlignment="Stretch"
                           IsVisible="{Binding OperationsPanelVisible}"
+                          automation:AutomationProperties.AccessibilityView="Raw"
                           Background="{DynamicResource AppSplitterBackground}"
                           Opacity="0.8"/>
 
@@ -73,6 +84,9 @@
                     IsVisible="{Binding OperationsPanelVisible}"
                     BorderThickness="0,1,0,0"
                     BorderBrush="{DynamicResource AppBorderBrush}"
+                    automation:AutomationProperties.AccessibilityView="Control"
+                    automation:AutomationProperties.Name="{t:Translate Operations}"
+                    automation:AutomationProperties.LandmarkType="{x:Static peers:AutomationLandmarkType.Region}"
                     Background="{DynamicResource AppOperationsPanelBackground}">
                 <ScrollViewer MaxHeight="220"
                               HorizontalScrollBarVisibility="Disabled"
@@ -92,6 +106,7 @@
                                                Source="{Binding PackageIcon}"
                                                Width="32" Height="24"
                                                Margin="0,0,10,0"
+                                                 automation:AutomationProperties.AccessibilityView="Raw"
                                                VerticalAlignment="Center"
                                                Stretch="Uniform"/>
 
@@ -108,6 +123,7 @@
 
                                             <Button Content="{Binding LiveLine}"
                                                     Command="{Binding ShowDetailsCommand}"
+                                                    automation:AutomationProperties.HelpText="{Binding Title}"
                                                     FontSize="11"
                                                     Opacity="0.65"
                                                     HorizontalAlignment="Left"
@@ -119,6 +135,8 @@
 
                                             <ProgressBar IsIndeterminate="{Binding ProgressIndeterminate}"
                                                          Value="{Binding ProgressValue}"
+                                                         automation:AutomationProperties.Name="{Binding Title}"
+                                                         automation:AutomationProperties.ItemStatus="{Binding LiveLine}"
                                                          Minimum="0" Maximum="100"
                                                          Height="3"
                                                          CornerRadius="2"
@@ -137,6 +155,8 @@
                                                                 BorderThickness="0"
                                                                 CornerRadius="4"
                                                                 Padding="5,2"
+                                                                automation:AutomationProperties.Name="{Binding Label}"
+                                                                automation:AutomationProperties.HelpText="{Binding Primary}"
                                                                 ToolTip.Tip="{Binding Primary}">
                                                             <StackPanel Orientation="Horizontal" Spacing="4">
                                                                 <controls:SvgIcon Path="{Binding IconPath}"
@@ -177,18 +197,22 @@
                                             <StackPanel Orientation="Horizontal">
                                                 <Button Content="{Binding ButtonText}"
                                                         Command="{Binding ButtonCommand}"
+                                                        automation:AutomationProperties.Name="{Binding ButtonText}"
                                                         Padding="12,6"
                                                         CornerRadius="0"
                                                         FontSize="12"/>
                                                 <Border Width="1"
                                                         VerticalAlignment="Stretch"
+                                                    automation:AutomationProperties.AccessibilityView="Raw"
                                                         Background="{DynamicResource AppBorderBrush}"
                                                         Opacity="0.3"/>
                                                 <Button Width="32"
                                                         Padding="4"
                                                         CornerRadius="0"
+                                                    automation:AutomationProperties.Name="{t:Translate More}"
                                                         Flyout="{Binding OpMenu}">
-                                                    <TextBlock Text="⋯" FontSize="14"/>
+                                                    <TextBlock Text="⋯" FontSize="14"
+                                                               automation:AutomationProperties.AccessibilityView="Raw"/>
                                                 </Button>
                                             </StackPanel>
                                         </Border>
@@ -203,6 +227,18 @@
 
         </Grid>
 
+        <TextBlock x:Name="LiveAnnouncementHost"
+               Width="1"
+               Height="1"
+               HorizontalAlignment="Left"
+               VerticalAlignment="Bottom"
+               Opacity="0"
+               IsHitTestVisible="False"
+               Text="{Binding AnnouncementText}"
+               automation:AutomationProperties.AccessibilityView="Control"
+               automation:AutomationProperties.Name="{Binding AnnouncementText}"
+               automation:AutomationProperties.LiveSetting="{Binding AnnouncementLiveSetting}"/>
+
         <!-- ── Title bar: drag area + search box ── -->
         <Grid x:Name="TitleBarGrid"
               Height="{Binding $parent[Window].WindowDecorationMargin.Top}"
@@ -212,6 +248,7 @@
             <!-- Drag area — sits behind everything so interactive controls still work -->
             <Border Grid.Column="0" Grid.ColumnSpan="3"
                     Background="{DynamicResource AppTitleBarBackground}"
+                    automation:AutomationProperties.AccessibilityView="Raw"
                     IsHitTestVisible="True"
                     PointerPressed="TitleBar_PointerPressed"/>
 
@@ -228,9 +265,11 @@
                         Background="Transparent"
                         BorderThickness="0"
                         CornerRadius="4"
+                        automation:AutomationProperties.Name="{t:Translate Toggle navigation panel}"
                         ToolTip.Tip="{t:Translate Toggle navigation panel}"
                         Command="{Binding ToggleSidebarCommand}">
                     <PathIcon Width="14" Height="14"
+                              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"
@@ -242,6 +281,7 @@
             <!-- Centre: search box — vertically centred, no platform-specific margin -->
             <StackPanel Grid.Column="1"
                         VerticalAlignment="Center"
+                        automation:AutomationProperties.AccessibilityView="Control"
                         Orientation="Horizontal"
                         Spacing="0">
                 <TextBox Width="300"
@@ -252,6 +292,8 @@
                          CornerRadius="4,0,0,4"
                          Watermark="{Binding GlobalSearchPlaceholder}"
                          IsEnabled="{Binding GlobalSearchEnabled}"
+                         automation:AutomationProperties.Name="{Binding GlobalSearchPlaceholder}"
+                         automation:AutomationProperties.AcceleratorKey="Ctrl+F"
                          Text="{Binding GlobalSearchText}"
                          KeyDown="SearchBox_KeyDown"/>
                 <Button Height="30"
@@ -260,6 +302,7 @@
                         Margin="0,5,0,0"
                         CornerRadius="0,4,4,0"
                         IsEnabled="{Binding GlobalSearchEnabled}"
+                        automation:AutomationProperties.Name="{Binding GlobalSearchPlaceholder}"
                         Command="{Binding SubmitGlobalSearchCommand}">
                     <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/search.svg"
                                       Width="18"
@@ -286,11 +329,13 @@
                     <!-- Minimize: horizontal line -->
                     <Button Width="46" Height="32" Padding="0"
                             Background="Transparent" BorderThickness="0" CornerRadius="0"
+                                                        automation:AutomationProperties.Name="{t:Translate Minimize}"
                             ToolTip.Tip="{t:Translate Minimize}"
                             Click="MinimizeButton_Click">
                         <Path Stroke="{DynamicResource SystemBaseHighColor}"
                               StrokeThickness="1.5"
                               StrokeLineCap="Round"
+                                                            automation:AutomationProperties.AccessibilityView="Raw"
                               Data="M2,0 H10"
                               Width="12" Height="2"
                               HorizontalAlignment="Center" VerticalAlignment="Center"/>
@@ -299,12 +344,14 @@
                     <Button x:Name="MaximizeButton"
                             Width="46" Height="32" Padding="0"
                             Background="Transparent" BorderThickness="0" CornerRadius="0"
+                                                        automation:AutomationProperties.Name="{t:Translate Maximize}"
                             ToolTip.Tip="{t:Translate Maximize}"
                             Click="MaximizeButton_Click">
                         <Path x:Name="MaximizeIcon"
                               Stroke="{DynamicResource SystemBaseHighColor}"
                               StrokeThickness="1.5"
                               StrokeLineCap="Round"
+                                                            automation:AutomationProperties.AccessibilityView="Raw"
 
                               Data="M0,0 H10 V10 H0 Z"
                               Width="12" Height="12"
@@ -313,11 +360,13 @@
                     <!-- Close: X -->
                     <Button Width="46" Height="32" Padding="0"
                             Background="Transparent" BorderThickness="0" CornerRadius="0"
+                                                        automation:AutomationProperties.Name="{t:Translate Close}"
                             ToolTip.Tip="{t:Translate Close}"
                             Click="CloseButton_Click">
                         <Path Stroke="{DynamicResource SystemBaseHighColor}"
                               StrokeThickness="1.5"
                               StrokeLineCap="Round"
+                                                            automation:AutomationProperties.AccessibilityView="Raw"
                               Data="M0,0 L10,10 M10,0 L0,10"
                               Width="12" Height="12"
                               HorizontalAlignment="Center" VerticalAlignment="Center"/>
diff --git a/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs b/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
index 8c7274f69c..621cd0b33c 100644
--- a/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
@@ -5,6 +5,8 @@
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Media;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
 using UniGetUI.Avalonia.ViewModels;
 using UniGetUI.Avalonia.Views.Pages;
 using UniGetUI.Core.Logging;
@@ -33,6 +35,8 @@ public enum PageType
 
 public partial class MainWindow : Window
 {
+    private bool _focusSidebarSelectionOnNextPageChange;
+
     public enum RuntimeNotificationLevel
     {
         Progress,
@@ -52,6 +56,7 @@ public MainWindow()
         SetupTitleBar();
 
         KeyDown += Window_KeyDown;
+        ViewModel.CurrentPageChanged += OnCurrentPageChanged;
     }
 
     private void Window_KeyDown(object? sender, KeyEventArgs e)
@@ -61,6 +66,7 @@ private void Window_KeyDown(object? sender, KeyEventArgs e)
 
         if (e.Key == Key.Tab && isCtrl)
         {
+            _focusSidebarSelectionOnNextPageChange = true;
             ViewModel.NavigateTo(isShift
                 ? MainWindowViewModel.GetPreviousPage(ViewModel.CurrentPage_t)
                 : MainWindowViewModel.GetNextPage(ViewModel.CurrentPage_t));
@@ -85,6 +91,38 @@ private void Window_KeyDown(object? sender, KeyEventArgs e)
         {
             (ViewModel.CurrentPageContent as IKeyboardShortcutListener)?.SelectAllTriggered();
         }
+        else if (isCtrl && !isShift && e.Key is Key.D1 or Key.D2 or Key.D3 or Key.D4 or Key.D5 or Key.D6)
+        {
+            _focusSidebarSelectionOnNextPageChange = true;
+            ViewModel.NavigateTo(e.Key switch
+            {
+                Key.D1 => PageType.Discover,
+                Key.D2 => PageType.Updates,
+                Key.D3 => PageType.Installed,
+                Key.D4 => PageType.Bundles,
+                Key.D5 => PageType.Settings,
+                _ => PageType.Managers,
+            });
+            e.Handled = true;
+        }
+        else if (isCtrl && !isShift && e.Key == Key.D)
+        {
+            (ViewModel.CurrentPageContent as IKeyboardShortcutListener)?.DetailsTriggered();
+            e.Handled = true;
+        }
+    }
+
+    private void OnCurrentPageChanged(object? sender, PageType pageType)
+    {
+        if (!_focusSidebarSelectionOnNextPageChange)
+            return;
+
+        _focusSidebarSelectionOnNextPageChange = false;
+        Dispatcher.UIThread.Post(() =>
+        {
+            var sidebar = this.GetVisualDescendants().OfType<SidebarView>().FirstOrDefault();
+            sidebar?.FocusSelectedItem();
+        }, DispatcherPriority.Background);
     }
 
     private void SetupTitleBar()
diff --git a/src/UniGetUI.Avalonia/Views/Pages/AboutPages/AboutPage.axaml b/src/UniGetUI.Avalonia/Views/Pages/AboutPages/AboutPage.axaml
index f9b84bc73d..b82b8719bf 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/AboutPages/AboutPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/AboutPages/AboutPage.axaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Pages.AboutPages.AboutPage"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.AboutPages"
              xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -61,27 +62,33 @@
                     Background="Transparent"
                     BorderThickness="0"
                     Padding="0"
-                    HorizontalAlignment="Center">
+                    HorizontalAlignment="Center"
+                    automation:AutomationProperties.Name="{t:Translate UniGetUI Homepage}">
                 <TextBlock Classes="hyperlink"
-                           Text="{t:Translate UniGetUI Homepage}"/>
+                           Text="{t:Translate UniGetUI Homepage}"
+                           automation:AutomationProperties.AccessibilityView="Raw"/>
             </Button>
 
             <Button Command="{Binding OpenIssuesCommand}"
                     Background="Transparent"
                     BorderThickness="0"
                     Padding="0"
-                    HorizontalAlignment="Center">
+                    HorizontalAlignment="Center"
+                    automation:AutomationProperties.Name="{t:Translate Report an issue or submit a feature request}">
                 <TextBlock Classes="hyperlink"
-                           Text="{t:Translate Report an issue or submit a feature request}"/>
+                           Text="{t:Translate Report an issue or submit a feature request}"
+                           automation:AutomationProperties.AccessibilityView="Raw"/>
             </Button>
 
             <Button Command="{Binding OpenRepositoryCommand}"
                     Background="Transparent"
                     BorderThickness="0"
                     Padding="0"
-                    HorizontalAlignment="Center">
+                    HorizontalAlignment="Center"
+                    automation:AutomationProperties.Name="{t:Translate UniGetUI Repository}">
                 <TextBlock Classes="hyperlink"
-                           Text="{t:Translate UniGetUI Repository}"/>
+                           Text="{t:Translate UniGetUI Repository}"
+                           automation:AutomationProperties.AccessibilityView="Raw"/>
             </Button>
 
         </StackPanel>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/AboutPages/Contributors.axaml b/src/UniGetUI.Avalonia/Views/Pages/AboutPages/Contributors.axaml
index 1944116594..a414289923 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/AboutPages/Contributors.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/AboutPages/Contributors.axaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Pages.AboutPages.Contributors"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.AboutPages"
              xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -48,9 +49,11 @@
                                     Click="GitHubButton_Click"
                                     Background="Transparent"
                                     BorderThickness="0"
-                                    Padding="4,0">
+                                    Padding="4,0"
+                                    automation:AutomationProperties.Name="{Binding Name}">
                                 <TextBlock Classes="hyperlink"
-                                           Text="{t:Translate View GitHub Profile}"/>
+                                           Text="{t:Translate View GitHub Profile}"
+                                           automation:AutomationProperties.AccessibilityView="Raw"/>
                             </Button>
                         </Grid>
                     </DataTemplate>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/AboutPages/ThirdPartyLicenses.axaml b/src/UniGetUI.Avalonia/Views/Pages/AboutPages/ThirdPartyLicenses.axaml
index 8fb4a16ab1..f7613aa8d7 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/AboutPages/ThirdPartyLicenses.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/AboutPages/ThirdPartyLicenses.axaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Pages.AboutPages.ThirdPartyLicenses"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.AboutPages"
              xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -41,9 +42,11 @@
                                     Background="Transparent"
                                     BorderThickness="0"
                                     Padding="4,0"
-                                    HorizontalAlignment="Center">
+                                    HorizontalAlignment="Center"
+                                    automation:AutomationProperties.Name="{Binding License}">
                                 <TextBlock Classes="hyperlink"
-                                           Text="{Binding License}"/>
+                                           Text="{Binding License}"
+                                           automation:AutomationProperties.AccessibilityView="Raw"/>
                             </Button>
                             <Button Grid.Column="2"
                                     Tag="{Binding HomepageUrl}"
@@ -51,9 +54,11 @@
                                     Background="Transparent"
                                     BorderThickness="0"
                                     Padding="4,0"
-                                    HorizontalAlignment="Right">
+                                    HorizontalAlignment="Right"
+                                    automation:AutomationProperties.Name="{Binding HomepageText}">
                                 <TextBlock Classes="hyperlink"
-                                           Text="{Binding HomepageText}"/>
+                                           Text="{Binding HomepageText}"
+                                           automation:AutomationProperties.AccessibilityView="Raw"/>
                             </Button>
                         </Grid>
                     </DataTemplate>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/AboutPages/Translators.axaml b/src/UniGetUI.Avalonia/Views/Pages/AboutPages/Translators.axaml
index b30c3c5158..380492408c 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/AboutPages/Translators.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/AboutPages/Translators.axaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Pages.AboutPages.Translators"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.AboutPages"
              xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -23,9 +24,11 @@
                     BorderThickness="0"
                     Padding="0"
                     HorizontalAlignment="Left"
-                    Margin="0,4,0,8">
+                    Margin="0,4,0,8"
+                    automation:AutomationProperties.Name="{t:Translate Become a translator}">
                 <TextBlock Classes="hyperlink"
-                           Text="{t:Translate Become a translator}"/>
+                           Text="{t:Translate Become a translator}"
+                           automation:AutomationProperties.AccessibilityView="Raw"/>
             </Button>
 
             <ItemsControl ItemsSource="{Binding TranslatorList}">
@@ -61,9 +64,11 @@
                                     Click="GitHubButton_Click"
                                     Background="Transparent"
                                     BorderThickness="0"
-                                    Padding="4,0">
+                                    Padding="4,0"
+                                    automation:AutomationProperties.Name="{Binding Name}">
                                 <TextBlock Classes="hyperlink"
-                                           Text="GitHub"/>
+                                           Text="GitHub"
+                                           automation:AutomationProperties.AccessibilityView="Raw"/>
                             </Button>
                         </Grid>
                     </DataTemplate>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/HelpPage.axaml b/src/UniGetUI.Avalonia/Views/Pages/HelpPage.axaml
index a2cf70ce5d..0578f663e4 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/HelpPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/HelpPage.axaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Pages.HelpPage"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages"
              xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
              xmlns:wv="using:Avalonia.Controls"
@@ -19,6 +20,7 @@
                     x:Name="BackButton"
                     Width="35" Height="35" Padding="6"
                     CornerRadius="4,0,0,4"
+                    automation:AutomationProperties.Name="{t:Translate Go back}"
                     Click="BackButton_Click">
                 <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/backward.svg"
                                   Foreground="White" Width="16" Height="16"/>
@@ -28,6 +30,7 @@
                     x:Name="ForwardButton"
                     Width="35" Height="35" Padding="6"
                     CornerRadius="0"
+                    automation:AutomationProperties.Name="{t:Translate Go forward}"
                     Click="ForwardButton_Click">
                 <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/forward.svg"
                                   Foreground="White" Width="16" Height="16"/>
@@ -36,6 +39,7 @@
             <Button Grid.Column="2"
                     Width="35" Height="35" Padding="6"
                     CornerRadius="0"
+                    automation:AutomationProperties.Name="{t:Translate Go to home page}"
                     Click="HomeButton_Click">
                 <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/home.svg"
                                   Foreground="White" Width="16" Height="16"/>
@@ -44,6 +48,7 @@
             <Button Grid.Column="3"
                     Width="35" Height="35" Padding="6"
                     CornerRadius="0,4,4,0"
+                    automation:AutomationProperties.Name="{t:Translate Reload page}"
                     Click="ReloadButton_Click">
                 <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/reload.svg"
                                   Foreground="White" Width="16" Height="16"/>
@@ -51,8 +56,10 @@
 
             <Button Grid.Column="5"
                     Height="35"
-                    Command="{Binding OpenInBrowserCommand}">
-                <TextBlock Text="{t:Translate View page on browser}"/>
+                    Command="{Binding OpenInBrowserCommand}"
+                    automation:AutomationProperties.Name="{t:Translate View page on browser}">
+                <TextBlock Text="{t:Translate View page on browser}"
+                           automation:AutomationProperties.AccessibilityView="Raw"/>
             </Button>
 
         </Grid>
@@ -63,7 +70,8 @@
                      IsIndeterminate="True"
                      IsVisible="False"
                      Height="2"
-                     CornerRadius="0"/>
+                     CornerRadius="0"
+                     automation:AutomationProperties.AccessibilityView="Raw"/>
 
         <!-- WebView -->
         <Border Grid.Row="2" CornerRadius="6" ClipToBounds="True">
diff --git a/src/UniGetUI.Avalonia/Views/Pages/LogPages/BaseLogPage.axaml b/src/UniGetUI.Avalonia/Views/Pages/LogPages/BaseLogPage.axaml
index 4ec47e5288..8d58446cf2 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/LogPages/BaseLogPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/LogPages/BaseLogPage.axaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Pages.LogPages.BaseLogPage"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.LogPages"
              xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -14,13 +15,17 @@
         <Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,*,Auto,*,Auto">
             <Button Grid.Column="0"
                     Command="{Binding CopyCommand}"
-                    CornerRadius="6,0,0,6">
-                <TextBlock Text="{t:Translate Copy to clipboard}"/>
+                    CornerRadius="6,0,0,6"
+                    automation:AutomationProperties.Name="{t:Translate Copy to clipboard}">
+                <TextBlock Text="{t:Translate Copy to clipboard}"
+                           automation:AutomationProperties.AccessibilityView="Raw"/>
             </Button>
             <Button Grid.Column="1"
                     Command="{Binding ExportCommand}"
-                    CornerRadius="0,6,6,0">
-                <TextBlock Text="{t:Translate Export to a file}"/>
+                    CornerRadius="0,6,6,0"
+                    automation:AutomationProperties.Name="{t:Translate Export to a file}">
+                <TextBlock Text="{t:Translate Export to a file}"
+                           automation:AutomationProperties.AccessibilityView="Raw"/>
             </Button>
 
             <StackPanel Grid.Column="3"
@@ -28,17 +33,21 @@
                         Spacing="10"
                         IsVisible="{Binding LogLevelVisible}"
                         VerticalAlignment="Center">
-                <TextBlock Text="{t:Translate Log level:}"
+                <TextBlock x:Name="LogLevelLabel"
+                           Text="{t:Translate Log level:}"
                            VerticalAlignment="Center"/>
                 <ComboBox Width="250"
                           CornerRadius="6"
                           ItemsSource="{Binding LogLevelItems}"
-                          SelectedIndex="{Binding SelectedLogLevelIndex}"/>
+                          SelectedIndex="{Binding SelectedLogLevelIndex}"
+                          automation:AutomationProperties.LabeledBy="{Binding #LogLevelLabel}"/>
             </StackPanel>
 
             <Button Grid.Column="5"
-                    Command="{Binding ReloadCommand}">
-                <TextBlock Text="{t:Translate Reload log}"/>
+                    Command="{Binding ReloadCommand}"
+                    automation:AutomationProperties.Name="{t:Translate Reload log}">
+                <TextBlock Text="{t:Translate Reload log}"
+                           automation:AutomationProperties.AccessibilityView="Raw"/>
             </Button>
         </Grid>
 
diff --git a/src/UniGetUI.Avalonia/Views/Pages/LogPages/BaseLogPage.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/LogPages/BaseLogPage.axaml.cs
index b9d3fa70f8..fac4698924 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/LogPages/BaseLogPage.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/LogPages/BaseLogPage.axaml.cs
@@ -66,4 +66,6 @@ private void OnScrollToBottomRequested(object? sender, EventArgs e)
     public void SelectAllTriggered() { }
 
     public void SearchTriggered() { }
+
+    public void DetailsTriggered() { }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Pages/ReleaseNotesPage.axaml b/src/UniGetUI.Avalonia/Views/Pages/ReleaseNotesPage.axaml
index e20ef4c90c..33db9f7280 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/ReleaseNotesPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/ReleaseNotesPage.axaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Pages.ReleaseNotesPage"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages"
              xmlns:wv="using:Avalonia.Controls"
              xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
@@ -16,8 +17,10 @@
 
             <Button Grid.Column="1"
                     Height="35"
-                    Command="{Binding OpenInBrowserCommand}">
-                <TextBlock Text="{t:Translate View page on browser}"/>
+                    Command="{Binding OpenInBrowserCommand}"
+                    automation:AutomationProperties.Name="{t:Translate View page on browser}">
+                <TextBlock Text="{t:Translate View page on browser}"
+                           automation:AutomationProperties.AccessibilityView="Raw"/>
             </Button>
 
         </Grid>
@@ -28,7 +31,8 @@
                      IsIndeterminate="True"
                      IsVisible="False"
                      Height="2"
-                     CornerRadius="0"/>
+                     CornerRadius="0"
+                     automation:AutomationProperties.AccessibilityView="Raw"/>
 
         <!-- WebView -->
         <Border Grid.Row="2" CornerRadius="6" ClipToBounds="True">
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Administrator.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Administrator.axaml
index 63cb666ccb..8f740e58ed 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Administrator.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Administrator.axaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Pages.SettingsPages.Administrator"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:settings="using:UniGetUI.Avalonia.Views.Controls.Settings"
              xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
@@ -52,7 +53,8 @@
             <StackPanel Orientation="Vertical" IsVisible="{Binding IsWindows}">
                 <settings:TranslatedTextBlock Text="Change how operations request administrator rights"
                                               FontWeight="SemiBold"
-                                              Margin="44,32,4,8"/>
+                                              Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
                 <settings:CheckboxCard SettingName="DoCacheAdminRightsForBatches"
                                        Text="{t:Translate Ask for administrator privileges once for each batch of operations}"
@@ -78,7 +80,8 @@
 
             <settings:TranslatedTextBlock Text="Restrictions on package operations"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:SecureCheckboxCard SettingName="AllowCLIArguments"
                                          Text="{t:Translate Allow custom command-line arguments}"
@@ -95,7 +98,8 @@
 
             <settings:TranslatedTextBlock Text="Restrictions on package managers"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:SecureCheckboxCard SettingName="AllowCustomManagerPaths"
                                          Text="{t:Translate Allow changing the paths for package manager executables}"
@@ -105,7 +109,8 @@
 
             <settings:TranslatedTextBlock Text="Restrictions when importing package bundles"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:SecureCheckboxCard SettingName="AllowImportingCLIArguments"
                                          Text="{t:Translate Allow importing custom command-line arguments when importing packages from a bundle}"
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Backup.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Backup.axaml
index cde479e01b..6428470f8a 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Backup.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Backup.axaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Pages.SettingsPages.Backup"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:settings="using:UniGetUI.Avalonia.Views.Controls.Settings"
              xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
@@ -14,7 +15,8 @@
 
             <settings:TranslatedTextBlock Text="Package backup"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:SettingsCard CornerRadius="8">
                 <settings:SettingsCard.Description>
@@ -32,7 +34,8 @@
             <settings:TranslatedTextBlock Text="Cloud package backup"
                                           FontSize="16"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <!-- GitHub identity card -->
             <Border BorderBrush="{DynamicResource AppBorderBrush}"
@@ -72,6 +75,7 @@
                             IsEnabled="{Binding IsLoginButtonEnabled}"
                             Command="{Binding LoginCommand}"
                             VerticalAlignment="Center"
+                            automation:AutomationProperties.Name="{t:Translate Log in with GitHub}"
                             Content="{t:Translate Log in with GitHub}"/>
 
                     <!-- Log out button (shown when logged in) -->
@@ -80,17 +84,20 @@
                             IsEnabled="{Binding IsLoginButtonEnabled}"
                             Command="{Binding LogoutCommand}"
                             VerticalAlignment="Center"
+                            automation:AutomationProperties.Name="{t:Translate Log out from GitHub}"
                             Content="{t:Translate Log out from GitHub}"/>
 
                     <!-- More details -->
                     <Button Grid.Column="3"
                             Command="{Binding MoreDetailsCommand}"
                             VerticalAlignment="Center"
+                            automation:AutomationProperties.Name="{t:Translate More details}"
                             Background="Transparent"
                             BorderThickness="0"
                             Padding="0">
                         <TextBlock Classes="hyperlink"
-                                   Text="{t:Translate More details}"/>
+                                   Text="{t:Translate More details}"
+                                   automation:AutomationProperties.AccessibilityView="Raw"/>
                     </Button>
 
                 </Grid>
@@ -130,7 +137,8 @@
             <settings:TranslatedTextBlock Text="Local package backup"
                                           FontSize="16"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:CheckboxCard SettingName="EnablePackageBackup_LOCAL"
                                    Text="{t:Translate Periodically perform a local backup of the installed packages}"
@@ -158,7 +166,8 @@
 
             <settings:TranslatedTextBlock Text="Local backup advanced options"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:TextboxCard SettingName="ChangeBackupFileName"
                                   Text="{t:Translate Set a custom backup file name}"
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml
index e4ae8ce547..2405ae7aee 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Pages.SettingsPages.General"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:settings="using:UniGetUI.Avalonia.Views.Controls.Settings"
              xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
@@ -14,14 +15,16 @@
 
             <settings:TranslatedTextBlock Text="Language"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:ComboboxCard x:Name="LanguageSelector"
                                    CornerRadius="8"/>
 
             <settings:TranslatedTextBlock Text="UniGetUI updater"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:CheckboxButtonCard SettingName="DisableAutoUpdateWingetUI"
                                          CheckboxText="{t:Translate Update UniGetUI automatically}"
@@ -36,7 +39,8 @@
 
             <settings:TranslatedTextBlock Text="Telemetry"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:ButtonCard CornerRadius="8"
                                  Text="{t:Translate Manage telemetry settings}"
@@ -46,7 +50,8 @@
 
             <settings:TranslatedTextBlock Text="Manage UniGetUI settings"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:ButtonCard CornerRadius="8,8,0,0"
                                  Text="{t:Translate Import settings from a local file}"
@@ -69,7 +74,8 @@
 
             <settings:TranslatedTextBlock Text="Related settings"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:SettingsPageButton CornerRadius="8"
                                          Margin="0,0,0,20"
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/InstallOptionsPanel.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/InstallOptionsPanel.axaml
index 52b5906327..f3e94db8cc 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/InstallOptionsPanel.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/InstallOptionsPanel.axaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Pages.SettingsPages.InstallOptionsPanel"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -24,12 +25,14 @@
                     <Button x:Name="ResetButton"
                             Grid.Column="1"
                             Content="{Binding ResetLabel}"
+                            automation:AutomationProperties.Name="{Binding ResetLabel}"
                             Command="{Binding ResetOptionsCommand}"
                             IsEnabled="{Binding !IsLoading}"
                             Margin="4,0"/>
                     <Button x:Name="ApplyButton"
                             Grid.Column="2"
                             Content="{Binding ApplyLabel}"
+                            automation:AutomationProperties.Name="{Binding ApplyLabel}"
                             Command="{Binding SaveOptionsCommand}"
                             IsEnabled="{Binding !IsLoading}"
                             Margin="4,0,0,0"/>
@@ -54,28 +57,34 @@
                                   IsEnabled="{Binding AdminEnabled}"
                                   IsVisible="{Binding AdminEnabled}"
                                   Content="{Binding AdminLabel}"
+                                  automation:AutomationProperties.Name="{Binding AdminLabel}"
                                   Margin="8,0"/>
                         <CheckBox IsChecked="{Binding InteractiveChecked}"
                                   IsEnabled="{Binding InteractiveEnabled}"
                                   Content="{Binding InteractiveLabel}"
+                                  automation:AutomationProperties.Name="{Binding InteractiveLabel}"
                                   Margin="8,0"/>
                         <CheckBox IsChecked="{Binding SkipHashChecked}"
                                   IsEnabled="{Binding SkipHashEnabled}"
                                   Content="{Binding SkipHashLabel}"
+                                  automation:AutomationProperties.Name="{Binding SkipHashLabel}"
                                   Margin="8,0"/>
                         <CheckBox IsChecked="{Binding PreReleaseChecked}"
                                   IsEnabled="{Binding PreReleaseEnabled}"
                                   Content="{Binding PreReleaseLabel}"
+                                  automation:AutomationProperties.Name="{Binding PreReleaseLabel}"
                                   Margin="8,0"/>
                         <CheckBox IsChecked="{Binding UninstallPreviousChecked}"
                                   IsEnabled="{Binding UninstallPreviousEnabled}"
                                   Content="{Binding UninstallPrevLabel}"
+                                  automation:AutomationProperties.Name="{Binding UninstallPrevLabel}"
                                   Margin="8,0"/>
                     </WrapPanel>
 
                     <!-- Architecture: always shown, disabled when not supported -->
                     <Grid ColumnDefinitions="*,*">
-                        <TextBlock Grid.Column="0"
+                        <TextBlock x:Name="ArchLabelBlock"
+                                   Grid.Column="0"
                                    Text="{Binding ArchLabel}"
                                    VerticalAlignment="Center"
                                    Opacity="{Binding ArchOpacity}"/>
@@ -84,12 +93,14 @@
                                   SelectedItem="{Binding SelectedArchitecture}"
                                   IsEnabled="{Binding ArchitectureEnabled}"
                                   HorizontalAlignment="Stretch"
-                                  MaxWidth="200"/>
+                                  MaxWidth="200"
+                                  automation:AutomationProperties.LabeledBy="{Binding #ArchLabelBlock}"/>
                     </Grid>
 
                     <!-- Scope: always shown, disabled when not supported -->
                     <Grid ColumnDefinitions="*,*">
-                        <TextBlock Grid.Column="0"
+                        <TextBlock x:Name="ScopeLabelBlock"
+                                   Grid.Column="0"
                                    Text="{Binding ScopeLabel}"
                                    VerticalAlignment="Center"
                                    Opacity="{Binding ScopeOpacity}"/>
@@ -98,7 +109,8 @@
                                   SelectedItem="{Binding SelectedScope}"
                                   IsEnabled="{Binding ScopeEnabled}"
                                   HorizontalAlignment="Stretch"
-                                  MaxWidth="200"/>
+                                  MaxWidth="200"
+                                  automation:AutomationProperties.LabeledBy="{Binding #ScopeLabelBlock}"/>
                     </Grid>
 
                     <!-- Location: always shown, select disabled when not supported -->
@@ -110,10 +122,12 @@
                         <Button x:Name="SelectDirButton"
                                 Grid.Column="1"
                                 Content="{Binding SelectDirLabel}"
+                                automation:AutomationProperties.Name="{Binding SelectDirLabel}"
                                 IsEnabled="{Binding LocationSelectEnabled}"
                                 Margin="4,0"/>
                         <Button Grid.Column="2"
                                 Content="{Binding ResetDirLabel}"
+                                automation:AutomationProperties.Name="{Binding ResetDirLabel}"
                                 Command="{Binding ResetLocationCommand}"
                                 IsEnabled="{Binding LocationResetEnabled}"/>
                     </Grid>
@@ -131,10 +145,12 @@
                     <Button IsVisible="{Binding CliDisabledWarningVisible}"
                             HorizontalAlignment="Center"
                             Command="{Binding NavigateToAdministratorCommand}"
+                            automation:AutomationProperties.Name="{Binding GoToSecurityLabel}"
                             Background="Transparent"
                             BorderThickness="0"
                             Padding="0">
-                        <TextBlock Text="{Binding GoToSecurityLabel}" Classes="hyperlink"/>
+                        <TextBlock Text="{Binding GoToSecurityLabel}" Classes="hyperlink"
+                                   automation:AutomationProperties.AccessibilityView="Raw"/>
                     </Button>
 
                     <!-- CLI arguments: always shown, disabled by security setting -->
@@ -143,7 +159,8 @@
                           RowSpacing="8"
                           ColumnSpacing="8"
                           Margin="0,8,0,0">
-                        <TextBlock Grid.Row="0" Grid.Column="0"
+                        <TextBlock x:Name="InstallArgsLabelBlock"
+                                   Grid.Row="0" Grid.Column="0"
                                    Text="{Binding InstallArgsLabel}"
                                    VerticalAlignment="Center"
                                    Opacity="{Binding CliOpacity}"/>
@@ -151,9 +168,11 @@
                                    Text="{Binding CustomInstall}"
                                    IsEnabled="{Binding CliSectionEnabled}"
                                    FontFamily="Courier New"
-                                   x:Name="CustomInstallBox"/>
+                                   x:Name="CustomInstallBox"
+                                   automation:AutomationProperties.LabeledBy="{Binding #InstallArgsLabelBlock}"/>
 
-                        <TextBlock Grid.Row="1" Grid.Column="0"
+                        <TextBlock x:Name="UpdateArgsLabelBlock"
+                                   Grid.Row="1" Grid.Column="0"
                                    Text="{Binding UpdateArgsLabel}"
                                    VerticalAlignment="Center"
                                    Opacity="{Binding CliOpacity}"/>
@@ -161,9 +180,11 @@
                                    Text="{Binding CustomUpdate}"
                                    IsEnabled="{Binding CliSectionEnabled}"
                                    FontFamily="Courier New"
-                                   x:Name="CustomUpdateBox"/>
+                                   x:Name="CustomUpdateBox"
+                                   automation:AutomationProperties.LabeledBy="{Binding #UpdateArgsLabelBlock}"/>
 
-                        <TextBlock Grid.Row="2" Grid.Column="0"
+                        <TextBlock x:Name="UninstallArgsLabelBlock"
+                                   Grid.Row="2" Grid.Column="0"
                                    Text="{Binding UninstallArgsLabel}"
                                    VerticalAlignment="Center"
                                    Opacity="{Binding CliOpacity}"/>
@@ -171,7 +192,8 @@
                                    Text="{Binding CustomUninstall}"
                                    IsEnabled="{Binding CliSectionEnabled}"
                                    FontFamily="Courier New"
-                                   x:Name="CustomUninstallBox"/>
+                                   x:Name="CustomUninstallBox"
+                                   automation:AutomationProperties.LabeledBy="{Binding #UninstallArgsLabelBlock}"/>
                     </Grid>
 
                 </StackPanel>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml
index 6cc7e1249b..0781ca8145 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Pages.SettingsPages.Interface_P"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:settings="using:UniGetUI.Avalonia.Views.Controls.Settings"
              xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
@@ -14,7 +15,8 @@
 
             <settings:TranslatedTextBlock Text="Appearance"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:ComboboxCard x:Name="ThemeSelector"
                                    CornerRadius="8,8,0,0"/>
@@ -26,7 +28,8 @@
             <StackPanel x:Name="SystemTraySection" Orientation="Vertical" IsVisible="{Binding IsWindows}">
                 <settings:TranslatedTextBlock Text="UniGetUI on the background and system tray"
                                               FontWeight="SemiBold"
-                                              Margin="44,32,4,8"/>
+                                              Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
                 <settings:CheckboxCard SettingName="DisableSystemTray"
                                        Text="{t:Translate Close UniGetUI to the system tray}"
@@ -42,7 +45,8 @@
 
             <settings:TranslatedTextBlock Text="Package lists"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:CheckboxCard SettingName="DisableIconsOnPackageLists"
                                    Text="{t:Translate Show package icons on package lists}"
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Internet.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Internet.axaml
index 13baa7eaa8..5b465128d9 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Internet.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Internet.axaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Pages.SettingsPages.Internet"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:settings="using:UniGetUI.Avalonia.Views.Controls.Settings"
              xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
@@ -13,7 +14,8 @@
 
             <settings:TranslatedTextBlock Text="Proxy settings"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:CheckboxCard SettingName="EnableProxy"
                                    Text="{t:Translate Connect the internet using a custom proxy}"
@@ -47,7 +49,8 @@
 
             <settings:TranslatedTextBlock Text="Other settings"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:CheckboxCard SettingName="DisableWaitForInternetConnection"
                                    Text="{t:Translate Wait for the device to be connected to the internet before attempting to do tasks that require internet connectivity.}"
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/ManagersHomepage.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/ManagersHomepage.axaml.cs
index 8cae92f5df..7cc15b9e92 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/ManagersHomepage.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/ManagersHomepage.axaml.cs
@@ -1,7 +1,9 @@
 using Avalonia;
+using Avalonia.Automation;
 using Avalonia.Controls;
 using Avalonia.Layout;
 using Avalonia.Media;
+using UniGetUI.Avalonia.Infrastructure;
 using UniGetUI.Avalonia.ViewModels.Pages.SettingsPages;
 using UniGetUI.Avalonia.Views.Controls.Settings;
 using UniGetUI.Core.Tools;
@@ -41,19 +43,21 @@ public ManagersHomepage()
                                 : new CornerRadius(0);
             var thickness = isFirst ? new Thickness(1) : new Thickness(1, 0, 1, 1);
 
-            // ── Status badge ─────────────────────────────────────────────────
+            // ── Status badge (decorative — status surfaced via toggle HelpText) ─
             var badgeText = new TextBlock
             {
                 FontSize = 12,
                 FontWeight = FontWeight.SemiBold,
                 VerticalAlignment = VerticalAlignment.Center,
             };
+            AutomationProperties.SetAccessibilityView(badgeText, AccessibilityView.Raw);
             var badge = new Border
             {
                 CornerRadius = new CornerRadius(4),
                 Padding = new Thickness(6, 3, 6, 3),
                 Child = badgeText,
             };
+            AutomationProperties.SetAccessibilityView(badge, AccessibilityView.Raw);
 
             // ── Enable/disable toggle ────────────────────────────────────────
             var toggle = new ToggleSwitch
@@ -62,19 +66,24 @@ public ManagersHomepage()
                 OffContent = "",
                 VerticalAlignment = VerticalAlignment.Center,
             };
+            AutomationProperties.SetName(toggle, manager.DisplayName);
             toggle.Loaded += (_, _) =>
             {
                 _isLoadingToggles = true;
                 toggle.IsChecked = manager.IsEnabled();
                 _isLoadingToggles = false;
-                ApplyStatusBadge(manager, badge, badgeText);
+                ApplyStatusBadge(manager, toggle, badge, badgeText);
             };
             toggle.IsCheckedChanged += async (_, _) =>
             {
                 if (_isLoadingToggles) return;
                 CoreSettings.SetDictionaryItem(CoreSettings.K.DisabledManagers, manager.Name, toggle.IsChecked != true);
                 await Task.Run(manager.Initialize);
-                ApplyStatusBadge(manager, badge, badgeText);
+                ApplyStatusBadge(manager, toggle, badge, badgeText);
+                AccessibilityAnnouncementService.Announce(
+                    CoreTools.Translate("{0} is now {1}", manager.DisplayName, toggle.IsChecked == true
+                        ? CoreTools.Translate("Enabled")
+                        : CoreTools.Translate("Disabled")));
             };
 
             var toggleAndBadge = new StackPanel
@@ -113,12 +122,12 @@ public void RefreshToggles()
         foreach (var (toggle, manager, badge, badgeText) in _rows)
         {
             toggle.IsChecked = manager.IsEnabled();
-            ApplyStatusBadge(manager, badge, badgeText);
+            ApplyStatusBadge(manager, toggle, badge, badgeText);
         }
         _isLoadingToggles = false;
     }
 
-    private void ApplyStatusBadge(IPackageManager manager, Border badge, TextBlock text)
+    private void ApplyStatusBadge(IPackageManager manager, ToggleSwitch toggle, Border badge, TextBlock text)
     {
         string bgKey, fgKey, label;
         if (!manager.IsEnabled())
@@ -142,6 +151,9 @@ private void ApplyStatusBadge(IPackageManager manager, Border badge, TextBlock t
         badge.Background = LookupBrush(bgKey);
         text.Foreground = LookupBrush(fgKey);
         text.Text = label;
+        // Bake state into Name so VoiceOver always announces it on macOS
+        AutomationProperties.SetName(toggle, $"{manager.DisplayName}, {label}");
+        AutomationProperties.SetItemStatus(toggle, label);
     }
 
     private IBrush LookupBrush(string key)
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Notifications.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Notifications.axaml
index b33890c849..ae8d97bb3c 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Notifications.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Notifications.axaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Pages.SettingsPages.Notifications"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:settings="using:UniGetUI.Avalonia.Views.Controls.Settings"
              xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
@@ -14,7 +15,8 @@
 
             <settings:TranslatedTextBlock Text="Notification preferences"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <!-- Warning shown when system tray is disabled (Windows-only) -->
             <TextBlock Text="{t:Translate The system tray icon must be enabled in order for notifications to work}"
@@ -31,7 +33,8 @@
 
             <settings:TranslatedTextBlock Text="Notification types"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:CheckboxCard SettingName="DisableUpdatesNotifications"
                                    Text="{t:Translate Show a notification when there are available updates}"
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Operations.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Operations.axaml
index 8649bad5f1..f1c2a194af 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Operations.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Operations.axaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Pages.SettingsPages.Operations"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:settings="using:UniGetUI.Avalonia.Views.Controls.Settings"
              xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
@@ -14,7 +15,8 @@
 
             <settings:TranslatedTextBlock Text="Concurrency and execution"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:ComboboxCard x:Name="ParallelOperationCount"
                                    SettingName="ParallelOperationCount"
@@ -38,7 +40,8 @@
 
             <settings:TranslatedTextBlock Text="Automatic desktop shortcut remover"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:CheckboxButtonCard x:Name="AskToDeleteNewDesktopShortcuts"
                                          SettingName="AskToDeleteNewDesktopShortcuts"
@@ -48,7 +51,8 @@
 
             <settings:TranslatedTextBlock Text="Related settings"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:SettingsCard CornerRadius="8,8,0,0"
                                    IsClickEnabled="True"
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/PackageManagerPage.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/PackageManagerPage.axaml
index 0a9603d14b..ce4ba782c3 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/PackageManagerPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/PackageManagerPage.axaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Pages.SettingsPages.PackageManagerPage"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:settings="using:UniGetUI.Avalonia.Views.Controls.Settings"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -55,8 +56,10 @@
                     <Button IsVisible="{Binding ShowVersionVisible}"
                             Command="{Binding ShowVersionCommand}"
                             HorizontalAlignment="Left"
-                            Padding="0">
-                        <TextBlock Text="{Binding ShowVersionLabel}" Classes="hyperlink"/>
+                            Padding="0"
+                            automation:AutomationProperties.Name="{Binding ShowVersionLabel}">
+                        <TextBlock Text="{Binding ShowVersionLabel}" Classes="hyperlink"
+                                   automation:AutomationProperties.AccessibilityView="Raw"/>
                     </Button>
                     <TextBlock Text="{Binding VersionText}"
                                IsVisible="{Binding VersionTextVisible}"
@@ -87,7 +90,8 @@
             <!-- Related settings -->
             <settings:TranslatedTextBlock Text="Related settings"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <!-- Logs link card -->
             <settings:SettingsPageButton x:Name="ManagerLogs" CornerRadius="8,8,0,0"/>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/PackageManagerPage.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/PackageManagerPage.axaml.cs
index 128bc4097b..3947d61ca3 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/PackageManagerPage.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/PackageManagerPage.axaml.cs
@@ -1,3 +1,4 @@
+using Avalonia.Automation;
 using Avalonia.Controls;
 using Avalonia.Input.Platform;
 using Avalonia.Layout;
@@ -88,6 +89,7 @@ private void BuildPage()
         execGrid.Children.Add(execHint);
 
         var execCombo = new ComboBox { HorizontalAlignment = HorizontalAlignment.Stretch };
+        AutomationProperties.SetName(execCombo, CoreTools.Translate("Select the executable to be used. The following list shows the executables found by UniGetUI"));
         foreach (var path in manager.FindCandidateExecutableFiles())
             execCombo.Items.Add(path);
 
@@ -159,6 +161,7 @@ private void BuildPage()
             Background = Brushes.Transparent,
             BorderThickness = new Thickness(0),
         };
+        AutomationProperties.SetName(copyBtn, CoreTools.Translate("Copy path"));
         var pathCard = new SettingsCard
         {
             BorderThickness = new Thickness(1, 0, 1, 1),
@@ -221,6 +224,7 @@ private void BuildPage()
         ];
 
         var ageCombo = new ComboBox { MinWidth = 200 };
+        AutomationProperties.SetName(ageCombo, CoreTools.Translate("Minimum age for updates"));
         foreach (var (label, _) in ageItems)
             ageCombo.Items.Add(label);
 
@@ -233,6 +237,7 @@ private void BuildPage()
         {
             MinWidth = 200,
             Watermark = CoreTools.Translate("e.g. 10"),
+            [AutomationProperties.NameProperty] = CoreTools.Translate("Custom minimum age (days)"),
             Text = CoreSettings.GetDictionaryItem<string, string>(
                 CoreSettings.K.PerManagerMinimumUpdateAgeCustom, manager.Name) ?? "",
         };
@@ -488,12 +493,14 @@ private ButtonCard BuildVcpkgRootCard()
             IsEnabled = ViewModel.IsCustomVcpkgRootSet,
             Margin = new Thickness(4, 0),
         };
+        AutomationProperties.SetName(resetBtn, CoreTools.Translate("Reset vcpkg root location"));
         var openBtn = new Button
         {
             Content = CoreTools.Translate("Open"),
             IsEnabled = ViewModel.IsCustomVcpkgRootSet,
             Margin = new Thickness(4, 0),
         };
+        AutomationProperties.SetName(openBtn, CoreTools.Translate("Open vcpkg root location"));
 
         ViewModel.PropertyChanged += (_, e) =>
         {
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsBasePage.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsBasePage.axaml
index edc2eaa130..b61b73d3a0 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsBasePage.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsBasePage.axaml
@@ -1,11 +1,13 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Pages.SettingsPages.SettingsBasePage"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
              xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
+             xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
              x:DataType="vm:SettingsBasePageViewModel">
 
     <Grid RowDefinitions="Auto,Auto,*">
@@ -19,14 +21,16 @@
                     Margin="0,0,12,0"
                     Padding="4"
                     Background="Transparent"
-                    BorderThickness="0">
+                    BorderThickness="0"
+                    automation:AutomationProperties.Name="{t:Translate Go back}">
                 <controls:SvgIcon Width="24" Height="24"
                                   Path="avares://UniGetUI.Avalonia/Assets/Symbols/backward.svg"/>
             </Button>
             <TextBlock Text="{Binding Title}"
                        FontSize="26"
                        FontWeight="SemiBold"
-                       VerticalAlignment="Center"/>
+                       VerticalAlignment="Center"
+                       automation:AutomationProperties.HeadingLevel="1"/>
         </StackPanel>
 
         <!-- Row 1: Restart-required banner -->
@@ -43,6 +47,7 @@
                            VerticalAlignment="Center"
                            Margin="0,0,16,0"/>
                 <Button Content="{Binding RestartButtonText}"
+                        automation:AutomationProperties.Name="{Binding RestartButtonText}"
                         Command="{Binding RestartAppCommand}"
                         HorizontalAlignment="Right"/>
             </StackPanel>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SourceManagerCard.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SourceManagerCard.axaml
index e601156de5..f792a17f6e 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SourceManagerCard.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SourceManagerCard.axaml
@@ -1,9 +1,12 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Pages.SettingsPages.SourceManagerCard"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
+             xmlns:peers="clr-namespace:Avalonia.Automation.Peers;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:interfaces="using:UniGetUI.PackageEngine.Interfaces"
              xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
+             xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
@@ -25,6 +28,7 @@
                        FontSize="15"/>
             <Button Grid.Column="1"
                     Content="{Binding AddLabel}"
+                    automation:AutomationProperties.Name="{Binding AddLabel}"
                     Command="{Binding ShowAddSourceCommand}"
                     IsVisible="{Binding !ShowAddForm}"
                     IsEnabled="{Binding !IsLoading}"
@@ -33,7 +37,8 @@
                     Command="{Binding ReloadSourcesCommand}"
                     IsEnabled="{Binding !IsLoading}"
                     Padding="6"
-                    ToolTip.Tip="Reload">
+                    ToolTip.Tip="{t:Translate Reload sources}"
+                    automation:AutomationProperties.Name="{t:Translate Reload sources}">
                 <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/reload.svg"
                                   Width="16" Height="16"
                                   Foreground="{DynamicResource TextControlForeground}"/>
@@ -89,6 +94,7 @@
                                 VerticalAlignment="Center"
                                 Background="Transparent"
                                 BorderThickness="0"
+                                automation:AutomationProperties.Name="{t:Translate Delete source}"
                                 Command="{Binding #Root.((vm:SourceManagerCardViewModel)DataContext).DeleteSourceCommand}"
                                 CommandParameter="{Binding}">
                             <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/delete.svg"
@@ -105,26 +111,33 @@
         <StackPanel IsVisible="{Binding ShowAddForm}"
                     Orientation="Vertical"
                     Spacing="8"
-                    Margin="0,4,0,0">
+                    Margin="0,4,0,0"
+                    automation:AutomationProperties.LandmarkType="{x:Static peers:AutomationLandmarkType.Form}"
+                    automation:AutomationProperties.Name="{t:Translate Add source}">
             <ComboBox ItemsSource="{Binding KnownSourceNames}"
                       SelectedItem="{Binding SelectedKnownSource}"
-                      HorizontalAlignment="Stretch"/>
+                      HorizontalAlignment="Stretch"
+                      automation:AutomationProperties.Name="{t:Translate Known sources}"/>
             <Grid ColumnDefinitions="*,2*" ColumnSpacing="8">
                 <TextBox Grid.Column="0"
                          Watermark="{Binding NameHint}"
                          Text="{Binding NewSourceName}"
                          IsEnabled="{Binding NameUrlEditable}"
-                         FontFamily="Courier New"/>
+                         FontFamily="Courier New"
+                         automation:AutomationProperties.Name="{Binding NameHint}"/>
                 <TextBox Grid.Column="1"
                          Watermark="{Binding UrlHint}"
                          Text="{Binding NewSourceUrl}"
                          IsEnabled="{Binding NameUrlEditable}"
-                         FontFamily="Courier New"/>
+                         FontFamily="Courier New"
+                         automation:AutomationProperties.Name="{Binding UrlHint}"/>
             </Grid>
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Spacing="4">
                 <Button Content="{Binding CancelLabel}"
+                        automation:AutomationProperties.Name="{Binding CancelLabel}"
                         Command="{Binding CancelAddSourceCommand}"/>
                 <Button Content="{Binding AddConfirmLabel}"
+                        automation:AutomationProperties.Name="{Binding AddConfirmLabel}"
                         Command="{Binding ConfirmAddSourceCommand}"
                         Classes="accent"/>
             </StackPanel>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Updates.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Updates.axaml
index 5e396e7680..f2d6fd0640 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Updates.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Updates.axaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Pages.SettingsPages.Updates"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:settings="using:UniGetUI.Avalonia.Views.Controls.Settings"
              xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
@@ -14,7 +15,8 @@
 
             <settings:TranslatedTextBlock Text="Update checking"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:CheckboxCard SettingName="DisableAutoCheckforUpdates"
                                    Text="{t:Translate Check for package updates periodically}"
@@ -31,7 +33,8 @@
 
             <settings:TranslatedTextBlock Text="Automatic updates"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:CheckboxCard SettingName="AutomaticallyUpdatePackages"
                                    Text="{t:Translate Install available updates automatically}"
@@ -60,7 +63,8 @@
 
             <settings:TranslatedTextBlock Text="Update security"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:ComboboxCard x:Name="MinimumUpdateAgeSelector"
                                    SettingName="MinimumUpdateAge"
@@ -82,7 +86,8 @@
 
             <settings:TranslatedTextBlock Text="Related settings"
                                           FontWeight="SemiBold"
-                                          Margin="44,32,4,8"/>
+                                          Margin="44,32,4,8"
+                                          automation:AutomationProperties.HeadingLevel="2"/>
 
             <settings:SettingsCard BorderThickness="1,1,1,0"
                                    CornerRadius="8,8,0,0"
diff --git a/src/UniGetUI.Avalonia/Views/SidebarView.axaml b/src/UniGetUI.Avalonia/Views/SidebarView.axaml
index e30b20a789..a92b7b2aef 100644
--- a/src/UniGetUI.Avalonia/Views/SidebarView.axaml
+++ b/src/UniGetUI.Avalonia/Views/SidebarView.axaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.SidebarView"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels"
              xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
              xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
@@ -19,10 +20,14 @@
                  SelectionChanged="NavListBox_SelectionChanged"
                  Background="Transparent"
                  BorderThickness="0"
+                 automation:AutomationProperties.AccessibilityView="Control"
+                 automation:AutomationProperties.Name="{t:Translate Navigation}"
                  Padding="8,10,8,0">
 
             <!-- Discover Packages -->
             <ListBoxItem x:Name="DiscoverNavBtn" Tag="Discover" Padding="4,2" CornerRadius="6"
+                         automation:AutomationProperties.Name="{t:Translate Discover Packages}"
+                         automation:AutomationProperties.AcceleratorKey="Ctrl+1"
                          ToolTip.Tip="{t:Translate Discover Packages}">
                 <Panel>
                     <StackPanel Orientation="Horizontal" Spacing="12" Margin="8,6">
@@ -43,6 +48,8 @@
 
             <!-- Software Updates -->
             <ListBoxItem x:Name="UpdatesNavBtn" Tag="Updates" Padding="4,2" CornerRadius="6"
+                         automation:AutomationProperties.Name="{t:Translate Software Updates}"
+                         automation:AutomationProperties.AcceleratorKey="Ctrl+2"
                          ToolTip.Tip="{t:Translate Software Updates}">
                 <Panel>
                     <StackPanel Orientation="Horizontal" Spacing="12" Margin="8,6">
@@ -91,6 +98,8 @@
 
             <!-- Installed Packages -->
             <ListBoxItem x:Name="InstalledNavBtn" Tag="Installed" Padding="4,2" CornerRadius="6"
+                         automation:AutomationProperties.Name="{t:Translate Installed Packages}"
+                         automation:AutomationProperties.AcceleratorKey="Ctrl+3"
                          ToolTip.Tip="{t:Translate Installed Packages}">
                 <Panel>
                     <StackPanel Orientation="Horizontal" Spacing="12" Margin="8,6">
@@ -111,6 +120,8 @@
 
             <!-- Package Bundles -->
             <ListBoxItem x:Name="BundlesNavBtn" Tag="Bundles" Padding="4,2" CornerRadius="6"
+                         automation:AutomationProperties.Name="{t:Translate Package Bundles}"
+                         automation:AutomationProperties.AcceleratorKey="Ctrl+4"
                          ToolTip.Tip="{t:Translate Package Bundles}">
                 <Panel>
                     <StackPanel Orientation="Horizontal" Spacing="12" Margin="8,6">
@@ -160,6 +171,8 @@
                     BorderThickness="0"
                     Padding="12,8"
                     CornerRadius="6"
+                    automation:AutomationProperties.Name="{t:Translate Settings}"
+                    automation:AutomationProperties.AcceleratorKey="Ctrl+5"
                     ToolTip.Tip="{t:Translate Settings}">
                 <StackPanel Orientation="Horizontal" Spacing="12">
                     <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/settings.svg" Width="24" Height="24" VerticalAlignment="Center"/>
@@ -176,6 +189,8 @@
                     BorderThickness="0"
                     Padding="12,8"
                     CornerRadius="6"
+                    automation:AutomationProperties.Name="{t:Translate Package Managers}"
+                    automation:AutomationProperties.AcceleratorKey="Ctrl+6"
                     ToolTip.Tip="{t:Translate Package Managers}">
                 <StackPanel Orientation="Horizontal" Spacing="12">
                     <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/clipboard_list.svg" Width="24" Height="24" VerticalAlignment="Center"/>
@@ -190,9 +205,11 @@
                     BorderThickness="0"
                     Padding="12,8"
                     CornerRadius="6"
+                    automation:AutomationProperties.Name="{t:Translate More}"
                     ToolTip.Tip="{t:Translate More}">
                 <StackPanel Orientation="Horizontal" Spacing="12">
-                    <TextBlock Text="···" FontSize="20" Width="24" HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Center"/>
+                    <TextBlock Text="···" FontSize="20" Width="24" HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Center"
+                               automation:AutomationProperties.AccessibilityView="Raw"/>
                     <TextBlock Text="{t:Translate More}" FontSize="16" VerticalAlignment="Center"
                                IsVisible="{Binding IsPaneOpen}"/>
                 </StackPanel>
diff --git a/src/UniGetUI.Avalonia/Views/SidebarView.axaml.cs b/src/UniGetUI.Avalonia/Views/SidebarView.axaml.cs
index 4d73c5d76d..2963ab9ef0 100644
--- a/src/UniGetUI.Avalonia/Views/SidebarView.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/SidebarView.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Input;
 using UniGetUI.Avalonia.ViewModels;
 
 namespace UniGetUI.Avalonia.Views;
@@ -44,4 +45,12 @@ private void NavListBox_SelectionChanged(object? sender, SelectionChangedEventAr
             && Enum.TryParse<PageType>(tag, out var pageType))
             ViewModel?.RequestNavigation(pageType.ToString());
     }
+
+    public void FocusSelectedItem()
+    {
+        if (NavListBox.SelectedItem is InputElement item)
+            item.Focus();
+        else
+            NavListBox.Focus();
+    }
 }
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
index fd222103e6..5882aa0ed9 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
@@ -1,6 +1,8 @@
 <UserControl x:Class="UniGetUI.Avalonia.Views.Pages.AbstractPackagesPage"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
+             xmlns:peers="clr-namespace:Avalonia.Automation.Peers;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages"
              xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
              xmlns:pkg="using:UniGetUI.PackageEngine.PackageClasses"
@@ -62,6 +64,7 @@
                               Width="40"
                               Height="40"
                               Margin="0,0,4,0"
+                              automation:AutomationProperties.AccessibilityView="Raw"
                               VerticalAlignment="Center"
                               HorizontalAlignment="Center"
                               Path="{Binding PageIconPath}"/>
@@ -99,11 +102,15 @@
                             Orientation="Horizontal"
                             Spacing="4"
                             VerticalAlignment="Center">
-                    <TextBlock Text="{t:Translate Order by:}" VerticalAlignment="Center"/>
-                    <Button x:Name="OrderByButton" Padding="8,4" CornerRadius="4">
+                    <TextBlock x:Name="OrderByLabel" Text="{t:Translate Order by:}" VerticalAlignment="Center"/>
+                    <Button x:Name="OrderByButton"
+                            Padding="8,4"
+                            CornerRadius="4"
+                            automation:AutomationProperties.LabeledBy="{Binding #OrderByLabel}">
                         <StackPanel Orientation="Horizontal" Spacing="6">
                             <TextBlock Text="{Binding SortFieldName}" VerticalAlignment="Center" FontSize="12"/>
-                            <TextBlock Text="▾" VerticalAlignment="Center" FontSize="10" Opacity="0.7"/>
+                            <TextBlock Text="▾" VerticalAlignment="Center" FontSize="10" Opacity="0.7"
+                                       automation:AutomationProperties.AccessibilityView="Raw"/>
                         </StackPanel>
                         <Button.Flyout>
                             <MenuFlyout Placement="BottomEdgeAlignedLeft">
@@ -129,6 +136,8 @@
                         HorizontalAlignment="Right"
                         VerticalAlignment="Center"
                         Command="{Binding ReloadCommand}"
+                        automation:AutomationProperties.Name="{t:Translate Reload}"
+                        automation:AutomationProperties.AcceleratorKey="F5"
                         IsVisible="{Binding ReloadButtonVisible}">
                     <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/reload.svg" Width="16" Height="16"/>
                 </Button>
@@ -139,13 +148,14 @@
                             Orientation="Horizontal"
                             Spacing="4"
                             VerticalAlignment="Center">
-                    <TextBlock Text="{t:Translate View mode:}" VerticalAlignment="Center"/>
+                    <TextBlock x:Name="ViewModeLabel" Text="{t:Translate View mode:}" VerticalAlignment="Center"/>
                     <ListBox x:Name="ViewModeSelector"
                              SelectionMode="Single"
                              SelectedIndex="{Binding ViewModeIndex, Mode=TwoWay}"
                              Background="Transparent"
                              BorderThickness="1"
                              CornerRadius="4"
+                         automation:AutomationProperties.LabeledBy="{Binding #ViewModeLabel}"
                              Padding="0">
                         <ListBox.ItemsPanel>
                             <ItemsPanelTemplate>
@@ -153,16 +163,19 @@
                             </ItemsPanelTemplate>
                         </ListBox.ItemsPanel>
                         <!-- List -->
-                        <ListBoxItem x:Name="Selector_List" Padding="6,4" ToolTip.Tip="List">
-                            <TextBlock Text="☰" FontSize="16"/>
+                        <ListBoxItem x:Name="Selector_List" Padding="6,4" ToolTip.Tip="List"
+                                     automation:AutomationProperties.Name="List">
+                            <TextBlock Text="☰" FontSize="16" automation:AutomationProperties.AccessibilityView="Raw"/>
                         </ListBoxItem>
                         <!-- Grid -->
-                        <ListBoxItem x:Name="Selector_Grid" Padding="6,4" ToolTip.Tip="Grid">
-                            <TextBlock Text="⊞" FontSize="16"/>
+                        <ListBoxItem x:Name="Selector_Grid" Padding="6,4" ToolTip.Tip="Grid"
+                                     automation:AutomationProperties.Name="Grid">
+                            <TextBlock Text="⊞" FontSize="16" automation:AutomationProperties.AccessibilityView="Raw"/>
                         </ListBoxItem>
                         <!-- Icons -->
-                        <ListBoxItem x:Name="Selector_Icons" Padding="6,4" ToolTip.Tip="Icons">
-                            <TextBlock Text="⊟" FontSize="16"/>
+                        <ListBoxItem x:Name="Selector_Icons" Padding="6,4" ToolTip.Tip="Icons"
+                                     automation:AutomationProperties.Name="Icons">
+                            <TextBlock Text="⊟" FontSize="16" automation:AutomationProperties.AccessibilityView="Raw"/>
                         </ListBoxItem>
                     </ListBox>
                 </StackPanel>
@@ -184,6 +197,7 @@
                               Height="36"
                               Padding="8,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"/>
@@ -212,8 +226,10 @@
                         Width="30"
                         Height="36"
                         Padding="4"
+                        automation:AutomationProperties.Name="{t:Translate More}"
                         CornerRadius="0,4,4,0">
-                    <TextBlock Text="▾" FontSize="20" HorizontalAlignment="Center"/>
+                    <TextBlock Text="▾" FontSize="20" HorizontalAlignment="Center"
+                               automation:AutomationProperties.AccessibilityView="Raw"/>
                 </Button>
             </StackPanel>
 
@@ -246,6 +262,9 @@
                 <ScrollViewer x:Name="SidePanel"
                               HorizontalScrollBarVisibility="Disabled"
                               Padding="0,0,4,0"
+                              automation:AutomationProperties.AccessibilityView="Control"
+                              automation:AutomationProperties.Name="{t:Translate Filters}"
+                              automation:AutomationProperties.LandmarkType="{x:Static peers:AutomationLandmarkType.Search}"
                               Background="{DynamicResource AppWindowBackground}">
                     <StackPanel x:Name="SidePanelGrid" Spacing="8" Margin="0,0,0,8">
 
@@ -284,6 +303,7 @@
                                             HorizontalAlignment="Stretch"
                                             HorizontalContentAlignment="Center"
                                             Command="{Binding SelectAllSources_CmdCommand}"
+                                            automation:AutomationProperties.Name="{t:Translate Select all}"
                                             Padding="2"
                                             Background="Transparent"
                                             BorderThickness="0">
@@ -294,6 +314,7 @@
                                             HorizontalAlignment="Stretch"
                                             HorizontalContentAlignment="Center"
                                             Command="{Binding ClearSourceSelection_CmdCommand}"
+                                            automation:AutomationProperties.Name="{t:Translate Clear selection}"
                                             Padding="2"
                                             Background="Transparent"
                                             BorderThickness="0">
@@ -331,15 +352,18 @@
                             </Expander.Header>
                             <StackPanel HorizontalAlignment="Stretch" Orientation="Vertical" Spacing="0">
                                 <CheckBox x:Name="InstantSearchCheckbox"
-                                          IsChecked="{Binding InstantSearch, Mode=TwoWay}">
+                                          IsChecked="{Binding InstantSearch, Mode=TwoWay}"
+                                          automation:AutomationProperties.Name="{t:Translate Instant search}">
                                     <TextBlock Text="{t:Translate Instant search}" TextWrapping="Wrap"/>
                                 </CheckBox>
                                 <CheckBox x:Name="UpperLowerCaseCheckbox"
-                                          IsChecked="{Binding UpperLowerCase, Mode=TwoWay}">
+                                          IsChecked="{Binding UpperLowerCase, Mode=TwoWay}"
+                                          automation:AutomationProperties.Name="{t:Translate Distinguish between uppercase and lowercase}">
                                     <TextBlock Text="{t:Translate Distinguish between uppercase and lowercase}" TextWrapping="Wrap"/>
                                 </CheckBox>
                                 <CheckBox x:Name="IgnoreSpecialCharsCheckbox"
-                                          IsChecked="{Binding IgnoreSpecialChars, Mode=TwoWay}">
+                                          IsChecked="{Binding IgnoreSpecialChars, Mode=TwoWay}"
+                                          automation:AutomationProperties.Name="{t:Translate Ignore special characters}">
                                     <TextBlock Text="{t:Translate Ignore special characters}" TextWrapping="Wrap"/>
                                 </CheckBox>
                             </StackPanel>
@@ -361,28 +385,33 @@
                             <StackPanel HorizontalAlignment="Stretch" Orientation="Vertical" Spacing="0">
                                 <RadioButton Height="30"
                                              Margin="0,-2,0,-2"
-                                             IsChecked="{Binding SearchMode_Name, Mode=TwoWay}">
+                                             IsChecked="{Binding SearchMode_Name, Mode=TwoWay}"
+                                             automation:AutomationProperties.Name="{t:Translate Package Name}">
                                     <TextBlock Text="{t:Translate Package Name}" TextWrapping="Wrap"/>
                                 </RadioButton>
                                 <RadioButton Height="30"
                                              Margin="0,-2,0,-2"
-                                             IsChecked="{Binding SearchMode_Id, Mode=TwoWay}">
+                                             IsChecked="{Binding SearchMode_Id, Mode=TwoWay}"
+                                             automation:AutomationProperties.Name="{t:Translate Package ID}">
                                     <TextBlock Text="{t:Translate Package ID}" TextWrapping="Wrap"/>
                                 </RadioButton>
                                 <RadioButton Height="30"
                                              Margin="0,-2,0,-2"
-                                             IsChecked="{Binding SearchMode_Both, Mode=TwoWay}">
+                                             IsChecked="{Binding SearchMode_Both, Mode=TwoWay}"
+                                             automation:AutomationProperties.Name="{t:Translate Both}">
                                     <TextBlock Text="{t:Translate Both}" TextWrapping="Wrap"/>
                                 </RadioButton>
                                 <RadioButton Height="30"
                                              Margin="0,-2,0,-2"
-                                             IsChecked="{Binding SearchMode_Exact, Mode=TwoWay}">
+                                             IsChecked="{Binding SearchMode_Exact, Mode=TwoWay}"
+                                             automation:AutomationProperties.Name="{t:Translate Exact match}">
                                     <TextBlock Text="{t:Translate Exact match}" TextWrapping="Wrap"/>
                                 </RadioButton>
                                 <RadioButton Height="30"
                                              Margin="0,-2,0,-2"
                                              IsChecked="{Binding SearchMode_Similar, Mode=TwoWay}"
-                                             IsEnabled="{Binding SimilarSearchEnabled}">
+                                             IsEnabled="{Binding SimilarSearchEnabled}"
+                                             automation:AutomationProperties.Name="{t:Translate Show similar packages}">
                                     <TextBlock Text="{t:Translate Show similar packages}" TextWrapping="Wrap"/>
                                 </RadioButton>
                             </StackPanel>
@@ -399,6 +428,7 @@
                 <ProgressBar x:Name="LoadingProgressBar"
                              IsIndeterminate="True"
                              IsVisible="{Binding IsLoading}"
+                             automation:AutomationProperties.Name="{t:Translate Loading}"
                              Height="4"
                              VerticalAlignment="Top"
                              HorizontalAlignment="Stretch"
@@ -430,6 +460,9 @@
                                   HorizontalAlignment="Stretch"
                                   VerticalAlignment="Stretch"
                                   ItemsSource="{Binding FilteredPackages}"
+                                  automation:AutomationProperties.AccessibilityView="Control"
+                                  automation:AutomationProperties.Name="{Binding PageTitle}"
+                                  automation:AutomationProperties.HelpText="{Binding Subtitle}"
                                   AutoGenerateColumns="False"
                                   CanUserReorderColumns="True"
                                   CanUserResizeColumns="True"
@@ -441,6 +474,7 @@
                                     <DataGridTemplateColumn.CellTemplate>
                                         <DataTemplate x:DataType="pkg:PackageWrapper">
                                             <CheckBox IsChecked="{Binding IsChecked}"
+                                                      automation:AutomationProperties.Name="{Binding Package.AutomationName}"
                                                       HorizontalAlignment="Center"
                                                       VerticalAlignment="Center"
                                                       Margin="5,0,0,0"/>
@@ -452,7 +486,9 @@
                                                         Width="2*">
                                     <DataGridTemplateColumn.CellTemplate>
                                         <DataTemplate x:DataType="pkg:PackageWrapper">
-                                            <StackPanel Orientation="Horizontal" Spacing="6" VerticalAlignment="Center" Margin="4,0">
+                                            <StackPanel Orientation="Horizontal" Spacing="6" VerticalAlignment="Center" Margin="4,0"
+                                                        automation:AutomationProperties.Name="{Binding Package.AutomationName}"
+                                                        automation:AutomationProperties.ItemType="{t:Translate Package}">
                                                 <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/package.svg"
                                                                   Width="16" Height="16" VerticalAlignment="Center"/>
                                                 <TextBlock Text="{Binding Package.Name}" VerticalAlignment="Center"/>
@@ -520,6 +556,7 @@
                         <CheckBox IsChecked="{Binding AllPackagesChecked, Mode=TwoWay}"
                                   IsVisible="{Binding IsListViewMode}"
                                   Width="40" Height="32"
+                                  automation:AutomationProperties.Name="{t:Translate Select all}"
                                   HorizontalAlignment="Left"
                                   VerticalAlignment="Top"
                                   Margin="8,0,0,0"
@@ -537,6 +574,8 @@
                                 <ItemsControl.ItemTemplate>
                                     <DataTemplate x:DataType="pkg:PackageWrapper">
                                         <Border CornerRadius="4" Margin="4" Width="275" Height="56"
+                                            automation:AutomationProperties.Name="{Binding Package.AutomationName}"
+                                            automation:AutomationProperties.ItemType="{t:Translate Package}"
                                                 Background="{DynamicResource AppBorderBrush}" Padding="4">
                                             <Grid ColumnDefinitions="48,*,24" ColumnSpacing="4">
                                                 <controls:SvgIcon Grid.Column="0"
@@ -557,6 +596,7 @@
                                                 </StackPanel>
                                                 <CheckBox Grid.Column="2"
                                                           IsChecked="{Binding IsChecked, Mode=TwoWay}"
+                                                          automation:AutomationProperties.Name="{Binding Package.AutomationName}"
                                                           VerticalAlignment="Center"
                                                           HorizontalAlignment="Center"/>
                                             </Grid>
@@ -578,10 +618,13 @@
                                 <ItemsControl.ItemTemplate>
                                     <DataTemplate x:DataType="pkg:PackageWrapper">
                                         <Border CornerRadius="4" Margin="4" Width="128" Height="134"
+                                            automation:AutomationProperties.Name="{Binding Package.AutomationName}"
+                                            automation:AutomationProperties.ItemType="{t:Translate Package}"
                                                 Background="{DynamicResource AppBorderBrush}" Padding="4">
                                             <Grid RowDefinitions="22,60,30,15">
                                                 <CheckBox Grid.Row="0"
                                                           IsChecked="{Binding IsChecked, Mode=TwoWay}"
+                                                          automation:AutomationProperties.Name="{Binding Package.AutomationName}"
                                                           HorizontalAlignment="Left"
                                                           VerticalAlignment="Top"
                                                           Padding="0" Margin="-4,0,0,0"/>
@@ -638,6 +681,7 @@
                              FontSize="40"
                              Watermark="{t:Translate Search for packages}"
                              Background="{DynamicResource AppWindowBackground}"
+                             automation:AutomationProperties.Name="{t:Translate Search for packages}"
                              Text="{Binding MegaQueryText, Mode=TwoWay}"
                              KeyDown="MegaQueryBlock_KeyDown"/>
                     <Button x:Name="MegaFindButton"
@@ -646,6 +690,7 @@
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
                             CornerRadius="0,8,8,0"
+                            automation:AutomationProperties.Name="{t:Translate Search for packages}"
                             Command="{Binding SubmitSearch}">
                         <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/search.svg" Width="40" Height="40"/>
                     </Button>
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
index 2558f294f6..a649845266 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Automation;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
@@ -59,8 +60,15 @@ await ViewModel.ShowInfoDialog(win,
         {
             if (args.PropertyName is nameof(PackagesPageViewModel.SortFieldIndex)
                                   or nameof(PackagesPageViewModel.SortAscending))
+            {
                 UpdateSortMenuChecks();
+                SyncOrderByButtonName();
+            }
+            if (args.PropertyName is nameof(PackagesPageViewModel.IsFilterPaneOpen))
+                SyncFiltersButtonName();
         };
+        SyncFiltersButtonName();
+        SyncOrderByButtonName();
 
         // Build the toolbar now that both AXAML controls and the ViewModel are ready
         GenerateToolBar(ViewModel);
@@ -90,7 +98,11 @@ or nameof(PackagesPageViewModel.SortAscending))
     public void FocusPackageList()
     {
         if (ViewModel.MegaQueryBoxEnabled)
-            Dispatcher.UIThread.Post(() => MegaQueryBlock.Focus(), DispatcherPriority.Background);
+            Dispatcher.UIThread.Post(() =>
+            {
+                if (!ViewModel.MegaQueryVisible) return;
+                MegaQueryBlock.Focus();
+            }, DispatcherPriority.ApplicationIdle);
         else
             ViewModel.RequestFocusList();
     }
@@ -125,6 +137,7 @@ protected void SetMainButton(string svgName, string label, Action onClick)
     {
         MainToolbarButtonIcon.Path = $"avares://UniGetUI.Avalonia/Assets/Symbols/{svgName}.svg";
         MainToolbarButtonText.Text = label;
+        AutomationProperties.SetName(MainToolbarButton, label);
         MainToolbarButton.Click += (_, _) => onClick();
     }
 
@@ -166,6 +179,24 @@ protected static Task LaunchInstall(
     private static TextBlock? Check(bool show) =>
         show ? new TextBlock { Text = "✓", FontSize = 12 } : null;
 
+    private void SyncFiltersButtonName()
+    {
+        bool open = ViewModel.IsFilterPaneOpen;
+        string state = open ? CoreTools.Translate("Open") : CoreTools.Translate("Closed");
+        string label = CoreTools.Translate("Filters");
+        AutomationProperties.SetName(ToggleFiltersButton, $"{label}, {state}");
+    }
+
+    private void SyncOrderByButtonName()
+    {
+        string direction = ViewModel.SortAscending
+            ? CoreTools.Translate("Ascending")
+            : CoreTools.Translate("Descending");
+        AutomationProperties.SetName(
+            OrderByButton,
+            CoreTools.Translate("{0}: {1}, {2}", CoreTools.Translate("Order by"), ViewModel.SortFieldName, direction));
+    }
+
     private void UpdateSortMenuChecks()
     {
         OrderByName_Menu.Icon = Check(ViewModel.SortFieldIndex == 0);
@@ -185,6 +216,7 @@ public void SearchTriggered()
 
     public void ReloadTriggered() => ViewModel.TriggerReload();
     public void SelectAllTriggered() => ViewModel.ToggleSelectAll();
+    public void DetailsTriggered() { if (SelectedItem is { } pkg) _ = ShowDetailsForPackage(pkg); }
 
     // ─── IEnterLeaveListener ──────────────────────────────────────────────────
     public virtual void OnEnter() { }
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/InstalledPackagesPage.cs b/src/UniGetUI.Avalonia/Views/SoftwarePages/InstalledPackagesPage.cs
index 04b28814c3..3ea7e4ba6b 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/InstalledPackagesPage.cs
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/InstalledPackagesPage.cs
@@ -360,11 +360,17 @@ private static async Task ToggleIgnoreUpdatesAsync(IPackage? package)
     {
         if (package is null || package.Source.IsVirtualManager) return;
         if (await package.HasUpdatesIgnoredAsync())
+        {
             await package.RemoveFromIgnoredUpdatesAsync();
+            AccessibilityAnnouncementService.Announce(
+                CoreTools.Translate("Updates will no longer be ignored for {0}", package.Name));
+        }
         else
         {
             await package.AddToIgnoredUpdatesAsync();
             UpgradablePackagesLoader.Instance.Remove(package);
+            AccessibilityAnnouncementService.Announce(
+                CoreTools.Translate("Updates are now ignored for {0}", package.Name));
         }
     }
 
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/Interfaces/PageInterfaces.cs b/src/UniGetUI.Avalonia/Views/SoftwarePages/Interfaces/PageInterfaces.cs
index 9b59c50e82..0a013ff9b4 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/Interfaces/PageInterfaces.cs
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/Interfaces/PageInterfaces.cs
@@ -9,6 +9,7 @@ public interface IKeyboardShortcutListener
     void SearchTriggered();
     void ReloadTriggered();
     void SelectAllTriggered();
+    void DetailsTriggered();
 }
 
 /// <summary>