From 7d75c1156fedf28fed6a12a341bf5bf3b8aae308 Mon Sep 17 00:00:00 2001
From: Peter Pham <peturpham@gmail.com>
Date: Tue, 17 Mar 2026 23:12:39 -0700
Subject: [PATCH 1/3] Add show quick launch on all taskbars option

---
 RetroBar/Languages/English.xaml |  1 +
 RetroBar/PropertiesWindow.xaml  |  5 +++++
 RetroBar/Taskbar.xaml.cs        | 30 ++++++++++++++++++++++--------
 RetroBar/Utilities/Settings.cs  |  7 +++++++
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/RetroBar/Languages/English.xaml b/RetroBar/Languages/English.xaml
index 76415dd6..44e6265a 100644
--- a/RetroBar/Languages/English.xaml
+++ b/RetroBar/Languages/English.xaml
@@ -30,6 +30,7 @@
     <s:String x:Key="show_clock">Show the cloc_k</s:String>
     <s:String x:Key="show_multi_mon">Show on _multiple displays</s:String>
     <s:String x:Key="show_start_button_multi_mon">Show _Start button on all taskbars</s:String>
+    <s:String x:Key="show_quick_launch_multi_mon">Show _Quick Launch on all taskbars</s:String>
     <s:String x:Key="show_quick_launch">Show _Quick Launch</s:String>
     <s:String x:Key="select_location">_Select location...</s:String>
     <s:String x:Key="quick_launch_folder">Quick Launch - Choose a folder</s:String>
diff --git a/RetroBar/PropertiesWindow.xaml b/RetroBar/PropertiesWindow.xaml
index 27c78bfe..98d414fb 100644
--- a/RetroBar/PropertiesWindow.xaml
+++ b/RetroBar/PropertiesWindow.xaml
@@ -432,6 +432,11 @@
                                       IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowStartButtonMultiMon, UpdateSourceTrigger=PropertyChanged}">
                                 <Label Content="{DynamicResource show_start_button_multi_mon}" />
                             </CheckBox>
+                            <CheckBox x:Name="cbShowQuickLaunchMultiMon"
+                                      IsEnabled="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowMultiMon, UpdateSourceTrigger=PropertyChanged}"
+                                      IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowQuickLaunchMultiMon, UpdateSourceTrigger=PropertyChanged}">
+                                <Label Content="{DynamicResource show_quick_launch_multi_mon}" />
+                            </CheckBox>
                             <DockPanel>
                                 <Label VerticalAlignment="Center"
                                        Target="{Binding ElementName=cboMultiMonMode}">
diff --git a/RetroBar/Taskbar.xaml.cs b/RetroBar/Taskbar.xaml.cs
index 3d354732..1f86cfb7 100644
--- a/RetroBar/Taskbar.xaml.cs
+++ b/RetroBar/Taskbar.xaml.cs
@@ -79,6 +79,7 @@ public Taskbar(WindowManager windowManager, DictionaryManager dictionaryManager,
             }
 
             UpdateStartButton();
+            UpdateQuickLaunch();
 
             AutoHideElement = TaskbarContentControl;
 
@@ -144,14 +145,7 @@ private void Settings_PropertyChanged(object sender, PropertyChangedEventArgs e)
             }
             else if (e.PropertyName == nameof(Settings.ShowQuickLaunch))
             {
-                if (Settings.Instance.ShowQuickLaunch)
-                {
-                    QuickLaunchToolbar.Visibility = Visibility.Visible;
-                }
-                else
-                {
-                    QuickLaunchToolbar.Visibility = Visibility.Collapsed;
-                }
+                UpdateQuickLaunch();
             }
             else if (e.PropertyName == nameof(Settings.Edge))
             {
@@ -223,6 +217,10 @@ private void Settings_PropertyChanged(object sender, PropertyChangedEventArgs e)
             {
                 UpdateStartButton();
             }
+            else if (e.PropertyName == nameof(Settings.ShowQuickLaunchMultiMon))
+            {
+                UpdateQuickLaunch();
+            }
             else if (e.PropertyName == nameof(Settings.AutoHideTransparent))
             {
                 PeekDuringAutoHide();
@@ -508,6 +506,22 @@ private void UpdateStartButton()
             StartButton.Visibility = Visibility.Visible;
         }
 
+        private void UpdateQuickLaunch()
+        {
+            if (Screen.Primary)
+            {
+                QuickLaunchToolbar.Visibility = Settings.Instance.ShowQuickLaunch ? Visibility.Visible : Visibility.Collapsed;
+                return;
+            }
+            if (!Screen.Primary && !Settings.Instance.ShowQuickLaunchMultiMon)
+            {
+                QuickLaunchToolbar.Visibility = Visibility.Collapsed;
+                return;
+            }
+
+            QuickLaunchToolbar.Visibility = Visibility.Visible;
+        }
+
         private bool HasFullScreenApp()
         {
             bool hasFullScreenApp = false;
diff --git a/RetroBar/Utilities/Settings.cs b/RetroBar/Utilities/Settings.cs
index f3da2fa0..e3b0b90d 100644
--- a/RetroBar/Utilities/Settings.cs
+++ b/RetroBar/Utilities/Settings.cs
@@ -348,6 +348,13 @@ public bool ShowStartButtonMultiMon
             set => Set(ref _showStartButtonMultiMon, value);
         }
 
+        private bool _showQuickLaunchMultiMon = true;
+        public bool ShowQuickLaunchMultiMon
+        {
+            get => _showQuickLaunchMultiMon;
+            set => Set(ref _showQuickLaunchMultiMon, value);
+        }
+
         private bool _autoHideTransparent = false;
         public bool AutoHideTransparent
         {

From f874ddc994386f0dbf313799421b49c1df7305fb Mon Sep 17 00:00:00 2001
From: Peter Pham <peturpham@gmail.com>
Date: Thu, 19 Mar 2026 01:25:47 -0700
Subject: [PATCH 2/3] Add customize multi mon quick launch

---
 RetroBar/Controls/Toolbar.xaml.cs             |  12 ++
 RetroBar/Converters/BoolAndConverter.cs       |  25 ++++
 .../Extensions/QuickLaunchIconExtensions.cs   |  74 ++++++++++
 RetroBar/Languages/English.xaml               |   3 +
 RetroBar/PropertiesWindow.xaml                |  24 ++-
 RetroBar/PropertiesWindow.xaml.cs             |   9 ++
 RetroBar/QuickLaunchPropertiesWindow.xaml     |  74 ++++++++++
 RetroBar/QuickLaunchPropertiesWindow.xaml.cs  | 137 ++++++++++++++++++
 RetroBar/Utilities/Settings.cs                |  13 ++
 9 files changed, 366 insertions(+), 5 deletions(-)
 create mode 100644 RetroBar/Converters/BoolAndConverter.cs
 create mode 100644 RetroBar/Extensions/QuickLaunchIconExtensions.cs
 create mode 100644 RetroBar/QuickLaunchPropertiesWindow.xaml
 create mode 100644 RetroBar/QuickLaunchPropertiesWindow.xaml.cs

diff --git a/RetroBar/Controls/Toolbar.xaml.cs b/RetroBar/Controls/Toolbar.xaml.cs
index 35286403..55c7ddc5 100644
--- a/RetroBar/Controls/Toolbar.xaml.cs
+++ b/RetroBar/Controls/Toolbar.xaml.cs
@@ -10,6 +10,7 @@
 using ManagedShell.Common.Logging;
 using ManagedShell.ShellFolders;
 using ManagedShell.ShellFolders.Enums;
+using RetroBar.Extensions;
 using RetroBar.Utilities;
 
 namespace RetroBar.Controls
@@ -84,6 +85,10 @@ private void Settings_PropertyChanged(object sender, System.ComponentModel.Prope
             {
                 Refresh();
             }
+            else if (e.PropertyName == nameof(Settings.QuickLaunchIconSettings))
+            {
+                Refresh();
+            }
         }
 
         private void Refresh()
@@ -116,9 +121,16 @@ private void SetItemsSource()
                 ToolbarItems.ItemsSource = Folder.Files;
                 ListCollectionView cvs = (ListCollectionView)CollectionViewSource.GetDefaultView(Folder.Files);
                 cvs.CustomSort = new ToolbarSorter(this);
+                cvs.Filter = ShouldShowIcon;
             }
         }
 
+        private bool ShouldShowIcon(object item)
+        {
+            ShellFile file = item as ShellFile;
+            return file.IsEnabledOnDisplay(Host.Screen.DeviceName);
+        }
+
         public void SaveItemOrder()
         {
             List<string> itemPaths = new List<string>();
diff --git a/RetroBar/Converters/BoolAndConverter.cs b/RetroBar/Converters/BoolAndConverter.cs
new file mode 100644
index 00000000..93ed3ab5
--- /dev/null
+++ b/RetroBar/Converters/BoolAndConverter.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Windows.Data;
+
+namespace RetroBar.Converters
+{
+    public class BoolAndConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            foreach (object value in values)
+            {
+                if ((value is bool) && (bool)value == false)
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, System.Globalization.CultureInfo culture)
+        {
+            throw new NotSupportedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/RetroBar/Extensions/QuickLaunchIconExtensions.cs b/RetroBar/Extensions/QuickLaunchIconExtensions.cs
new file mode 100644
index 00000000..f88d1f58
--- /dev/null
+++ b/RetroBar/Extensions/QuickLaunchIconExtensions.cs
@@ -0,0 +1,74 @@
+using ManagedShell.ShellFolders;
+using RetroBar.Utilities;
+using System.Collections.Generic;
+
+namespace RetroBar.Extensions
+{
+    public static class QuickLaunchIconExtensions
+    {
+        public static bool IsEnabledOnDisplay(this ShellFile file, string deviceName)
+        {
+            var setting = Settings.Instance.QuickLaunchIconSettings.Find(s => s.Path == file.Path);
+
+            // No setting means show everywhere (default)
+            if (setting.Path == null)
+            {
+                return true;
+            }
+
+            return setting.DisabledOnDisplays == null || !setting.DisabledOnDisplays.Contains(deviceName);
+        }
+
+        public static void SetEnabledOnDisplay(this ShellFile file, string deviceName, bool enabled)
+        {
+            var settings = new List<QuickLaunchIconSetting>(Settings.Instance.QuickLaunchIconSettings);
+            var currentSettingIndex = settings.FindIndex(s => s.Path == file.Path);
+
+            if (currentSettingIndex >= 0)
+            {
+                var disabledDisplays = new List<string>(settings[currentSettingIndex].DisabledOnDisplays ?? new List<string>());
+
+                if (!enabled && !disabledDisplays.Contains(deviceName))
+                {
+                    disabledDisplays.Add(deviceName);
+                }
+                else if (enabled)
+                {
+                    disabledDisplays.Remove(deviceName);
+                }
+
+                if (disabledDisplays.Count == 0)
+                {
+                    // Back to default (show everywhere) — remove the entry entirely
+                    settings.RemoveAt(currentSettingIndex);
+                }
+                else
+                {
+                    settings[currentSettingIndex] = new QuickLaunchIconSetting
+                    {
+                        Path = file.Path,
+                        DisabledOnDisplays = disabledDisplays
+                    };
+                }
+            }
+            else
+            {
+                if (!enabled)
+                {
+                    settings.Add(new QuickLaunchIconSetting
+                    {
+                        Path = file.Path,
+                        DisabledOnDisplays = new List<string> { deviceName }
+                    });
+                }
+                else
+                {
+                    // Enabling on a display when no setting exists — already shown everywhere, nothing to do
+                    return;
+                }
+            }
+
+            Settings.Instance.QuickLaunchIconSettings = settings;
+        }
+    }
+}
\ No newline at end of file
diff --git a/RetroBar/Languages/English.xaml b/RetroBar/Languages/English.xaml
index 44e6265a..2fb126aa 100644
--- a/RetroBar/Languages/English.xaml
+++ b/RetroBar/Languages/English.xaml
@@ -102,6 +102,9 @@
     <s:String x:Key="behavior_heading">Behavior</s:String>
     <s:String x:Key="invert_heading">Invert</s:String>
 
+    <s:String x:Key="customize_quick_launch">Customize Quick Launch</s:String>
+    <s:String x:Key="customize_quick_launch_instruction">Select which icons to show on each taskbar per display.</s:String>
+
     <s:String x:Key="start_text">Start</s:String>
     <s:String x:Key="start_text_xp">start</s:String>
     <s:String x:Key="start_button_tip_98">Click here to begin.</s:String>
diff --git a/RetroBar/PropertiesWindow.xaml b/RetroBar/PropertiesWindow.xaml
index 98d414fb..820a9e54 100644
--- a/RetroBar/PropertiesWindow.xaml
+++ b/RetroBar/PropertiesWindow.xaml
@@ -25,6 +25,7 @@
             <converters:DoubleToPercentConverter x:Key="doubleToPercentConverter" />
             <converters:EnumConverter x:Key="enumConverter" />
             <converters:EdgeOrientationVisibilityConverter x:Key="edgeOrientationVisibilityConverter" />
+            <converters:BoolAndConverter x:Key="boolAndConverter" />
             <Style TargetType="{x:Type TextBlock}">
                 <Setter Property="VerticalAlignment"
                         Value="Center" />
@@ -432,11 +433,24 @@
                                       IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowStartButtonMultiMon, UpdateSourceTrigger=PropertyChanged}">
                                 <Label Content="{DynamicResource show_start_button_multi_mon}" />
                             </CheckBox>
-                            <CheckBox x:Name="cbShowQuickLaunchMultiMon"
-                                      IsEnabled="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowMultiMon, UpdateSourceTrigger=PropertyChanged}"
-                                      IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowQuickLaunchMultiMon, UpdateSourceTrigger=PropertyChanged}">
-                                <Label Content="{DynamicResource show_quick_launch_multi_mon}" />
-                            </CheckBox>
+                            <DockPanel>
+                                <CheckBox x:Name="cbShowQuickLaunchMultiMon"
+                                        IsEnabled="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowMultiMon, UpdateSourceTrigger=PropertyChanged}"
+                                        IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowQuickLaunchMultiMon, UpdateSourceTrigger=PropertyChanged}">
+                                    <Label Content="{DynamicResource show_quick_launch_multi_mon}" />
+                                </CheckBox>
+                                <Button HorizontalAlignment="Right"
+                                    Content="{DynamicResource customize}"
+                                    Click="CustomizeQuickLaunch_OnClick"
+                                >
+                                    <Button.IsEnabled>
+                                        <MultiBinding Converter="{StaticResource boolAndConverter}">
+                                            <Binding Source="{x:Static Settings:Settings.Instance}" Path="ShowMultiMon" UpdateSourceTrigger="PropertyChanged"/>
+                                            <Binding Source="{x:Static Settings:Settings.Instance}" Path="ShowQuickLaunchMultiMon" UpdateSourceTrigger="PropertyChanged"/>
+                                        </MultiBinding>
+                                    </Button.IsEnabled>
+                                </Button>
+                            </DockPanel>
                             <DockPanel>
                                 <Label VerticalAlignment="Center"
                                        Target="{Binding ElementName=cboMultiMonMode}">
diff --git a/RetroBar/PropertiesWindow.xaml.cs b/RetroBar/PropertiesWindow.xaml.cs
index d156b814..9100aaad 100644
--- a/RetroBar/PropertiesWindow.xaml.cs
+++ b/RetroBar/PropertiesWindow.xaml.cs
@@ -8,6 +8,7 @@
 using ManagedShell.Common.Logging;
 using Microsoft.Win32;
 using ManagedShell.AppBar;
+using ManagedShell.ShellFolders;
 using System.Windows.Forms;
 using ManagedShell.WindowsTray;
 using System.Runtime.CompilerServices;
@@ -319,6 +320,14 @@ private void SetQuickLaunchLocation_OnClick(object sender, RoutedEventArgs e)
             }
         }
 
+        private void CustomizeQuickLaunch_OnClick(object sender, RoutedEventArgs e)
+        {
+            QuickLaunchPropertiesWindow.Open(
+                new ShellFolder(Environment.ExpandEnvironmentVariables(Settings.Instance.QuickLaunchPath), IntPtr.Zero, true), 
+                AppBarScreen.FromAllScreens(), 
+                new Point(Left, Top));
+        }
+
         private void PropertiesWindow_OnClosing(object sender, CancelEventArgs e)
         {
             _instance = null;
diff --git a/RetroBar/QuickLaunchPropertiesWindow.xaml b/RetroBar/QuickLaunchPropertiesWindow.xaml
new file mode 100644
index 00000000..e3e50916
--- /dev/null
+++ b/RetroBar/QuickLaunchPropertiesWindow.xaml
@@ -0,0 +1,74 @@
+<Window x:Class="RetroBar.QuickLaunchPropertiesWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:converters="clr-namespace:RetroBar.Converters"
+        xmlns:Settings="clr-namespace:RetroBar.Utilities"
+        Title="{DynamicResource customize_quick_launch}"
+        Height="406"
+        Width="Auto"
+        MinWidth="300"
+        SizeToContent="Width"
+        ResizeMode="NoResize"
+        FlowDirection="{DynamicResource flow_direction}"
+        Style="{DynamicResource PropertiesWindow}"
+        Closing="Window_Closing">
+    <Window.Resources>
+        <ResourceDictionary>
+            <Style TargetType="{x:Type Button}">
+                <Setter Property="MinHeight"
+                        Value="21" />
+                <Setter Property="MinWidth"
+                        Value="73" />
+                <Setter Property="Padding"
+                        Value="10,0" />
+                <Setter Property="VerticalAlignment"
+                        Value="Center" />
+            </Style>
+        </ResourceDictionary>
+    </Window.Resources>
+    <Grid Margin="9,12">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <TextBlock Grid.Row="0"
+                   Text="{DynamicResource customize_quick_launch_instruction}"
+                   TextWrapping="Wrap"
+                   Margin="0,0,0,3" />
+        <ListView x:Name="QuickLaunchListView"
+                  Grid.Row="1"
+                  VerticalAlignment="Stretch">
+            <ListView.View>
+                <GridView x:Name="QuickLaunchGridView">
+                    <GridViewColumn Header="{DynamicResource name_heading}"
+                                    Width="160">
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <DockPanel>
+                                    <Image Source="{Binding SmallIcon}"
+                                           Width="16"
+                                           Height="16"
+                                           Margin="0,0,3,0"
+                                           VerticalAlignment="Center"
+                                           DockPanel.Dock="Left" />
+                                    <TextBlock Text="{Binding DisplayName}"
+                                               VerticalAlignment="Center"
+                                               TextTrimming="CharacterEllipsis"
+                                               DockPanel.Dock="Left" />
+                                </DockPanel>
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
+                </GridView>
+            </ListView.View>
+        </ListView>
+        <StackPanel Orientation="Horizontal"
+                    HorizontalAlignment="Right"
+                    Grid.Row="2"
+                    Margin="0,12,0,0">
+            <Button Content="{DynamicResource ok_dialog}"
+                    Click="OK_OnClick" />
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/RetroBar/QuickLaunchPropertiesWindow.xaml.cs b/RetroBar/QuickLaunchPropertiesWindow.xaml.cs
new file mode 100644
index 00000000..8ddb6e30
--- /dev/null
+++ b/RetroBar/QuickLaunchPropertiesWindow.xaml.cs
@@ -0,0 +1,137 @@
+using ManagedShell.AppBar;
+using ManagedShell.ShellFolders;
+using RetroBar.Extensions;
+using RetroBar.Utilities;
+using System.Collections;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+
+namespace RetroBar
+{
+    /// <summary>
+    /// Interaction logic for QuickLaunchPropertiesWindow.xaml
+    /// </summary>
+    public partial class QuickLaunchPropertiesWindow : Window
+    {
+        private static QuickLaunchPropertiesWindow _instance;
+
+        private readonly ShellFolder _quickLaunchFolder;
+        private readonly List<AppBarScreen> _screens;
+
+        private QuickLaunchPropertiesWindow(ShellFolder quickLaunchFolder, List<AppBarScreen> screens)
+        {
+            _quickLaunchFolder = quickLaunchFolder;
+            _screens = screens;
+
+            InitializeComponent();
+
+            AddDisplayColumns();
+            QuickLaunchListView.ItemsSource = _quickLaunchFolder.Files;
+
+            ListCollectionView cvs = (ListCollectionView)CollectionViewSource.GetDefaultView(_quickLaunchFolder.Files);
+            cvs.CustomSort = new QuickLaunchPropertySorter();
+        }
+
+        // Dynamically adds one checkbox column per connected display.
+        private void AddDisplayColumns()
+        {
+            for (int i = 0; i < _screens.Count; i++)
+            {
+                var screen = _screens[i];
+
+                var column = new GridViewColumn
+                {
+                    Header = screen.DeviceName,
+                    Width = 70
+                };
+
+                var factory = new FrameworkElementFactory(typeof(CheckBox));
+                factory.SetValue(FrameworkElement.HorizontalAlignmentProperty, HorizontalAlignment.Center);
+
+                int capturedIndex = i;
+
+                factory.AddHandler(FrameworkElement.LoadedEvent,
+                    new RoutedEventHandler((sender, e) => DisplayCheckBox_Loaded(sender, capturedIndex)));
+
+                factory.AddHandler(
+                    System.Windows.Controls.Primitives.ToggleButton.CheckedEvent,
+                    new RoutedEventHandler((sender, e) => DisplayCheckBox_Changed(sender, capturedIndex, true)));
+                factory.AddHandler(
+                    System.Windows.Controls.Primitives.ToggleButton.UncheckedEvent,
+                    new RoutedEventHandler((sender, e) => DisplayCheckBox_Changed(sender, capturedIndex, false)));
+
+                column.CellTemplate = new DataTemplate { VisualTree = factory };
+                QuickLaunchGridView.Columns.Add(column);
+            }
+        }
+
+        private void DisplayCheckBox_Loaded(object sender, int displayIndex)
+        {
+            var checkBox = sender as CheckBox;
+            var file = checkBox?.DataContext as ShellFile;
+
+            if (file == null) return;
+
+            checkBox.IsChecked = file.IsEnabledOnDisplay(_screens[displayIndex].DeviceName);
+        }
+
+        private void DisplayCheckBox_Changed(object sender, int displayIndex, bool isEnabled)
+        {
+            var checkBox = sender as CheckBox;
+            var file = checkBox?.DataContext as ShellFile;
+
+            if (file == null) return;
+
+            file.SetEnabledOnDisplay(_screens[displayIndex].DeviceName, isEnabled);
+        }
+
+        public static void Open(ShellFolder quickLaunchFolder, List<AppBarScreen> screens, Point position)
+        {
+            if (_instance == null)
+            {
+                _instance = new QuickLaunchPropertiesWindow(quickLaunchFolder, screens);
+                _instance.Left = position.X + 10;
+                _instance.Top = position.Y + 10;
+                _instance.Show();
+            }
+            else
+            {
+                _instance.Activate();
+            }
+        }
+
+        private void OK_OnClick(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+
+        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            _instance = null;
+        }
+    }
+
+    public class QuickLaunchPropertySorter : IComparer
+    {
+        public int Compare(object x, object y)
+        {
+            if (x is ShellItem a && y is ShellItem b)
+            {
+                List<string> desiredSort = Settings.Instance.QuickLaunchOrder;
+
+                bool hasA = desiredSort.Contains(a.Path);
+                bool hasB = desiredSort.Contains(b.Path);
+
+                if (!hasA && !hasB) return 0;
+                if (!hasA) return 1;
+                if (!hasB) return -1;
+
+                return desiredSort.IndexOf(a.Path).CompareTo(desiredSort.IndexOf(b.Path));
+            }
+
+            return 0;
+        }
+    }
+}
diff --git a/RetroBar/Utilities/Settings.cs b/RetroBar/Utilities/Settings.cs
index e3b0b90d..2387614c 100644
--- a/RetroBar/Utilities/Settings.cs
+++ b/RetroBar/Utilities/Settings.cs
@@ -185,6 +185,13 @@ public List<NotifyIconBehaviorSetting> NotifyIconBehaviors
             set => Set(ref _notifyIconBehaviors, value);
         }
 
+        private List<QuickLaunchIconSetting> _quickLaunchIconSettings = new List<QuickLaunchIconSetting>();
+        public List<QuickLaunchIconSetting> QuickLaunchIconSettings
+        {
+            get => _quickLaunchIconSettings;
+            set => Set(ref _quickLaunchIconSettings, value);
+        }
+
         private bool _allowFontSmoothing = false;
         public bool AllowFontSmoothing
         {
@@ -485,5 +492,11 @@ public struct NotifyIconBehaviorSetting
         public string Identifier {  get; set; }
         public NotifyIconBehavior Behavior { get; set; }
     }
+
+    public struct QuickLaunchIconSetting
+    {
+        public string Path { get; set; }
+        public List<string> DisabledOnDisplays { get; set; }
+    }
     #endregion
 }
\ No newline at end of file

From 84f5e16d692d3041c5d493d37e28a5b5e26d64e4 Mon Sep 17 00:00:00 2001
From: Peter Pham <peturpham@gmail.com>
Date: Thu, 19 Mar 2026 01:34:28 -0700
Subject: [PATCH 3/3] Condense advanced tab a little

---
 RetroBar/PropertiesWindow.xaml | 48 ++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/RetroBar/PropertiesWindow.xaml b/RetroBar/PropertiesWindow.xaml
index 820a9e54..cfa9dc7f 100644
--- a/RetroBar/PropertiesWindow.xaml
+++ b/RetroBar/PropertiesWindow.xaml
@@ -344,23 +344,37 @@
                             Margin="10">
                     <StackPanel Orientation="Vertical"
                                 Margin="0,0,0,10">
-                        <CheckBox x:Name="cbAutoStart"
-                                  Checked="CbAutoStart_OnChecked"
-                                  Unchecked="CbAutoStart_OnChecked">
-                            <Label Content="{DynamicResource autostart}" />
-                        </CheckBox>
-                        <CheckBox x:Name="cbUseSoftwareRendering"
-                                  IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=UseSoftwareRendering, UpdateSourceTrigger=PropertyChanged}">
-                            <Label Content="{DynamicResource use_software_rendering}" />
-                        </CheckBox>
-                        <CheckBox x:Name="cbDebugLogging"
-                                  IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=DebugLogging, UpdateSourceTrigger=PropertyChanged}">
-                            <Label Content="{DynamicResource debug_logging}" />
-                        </CheckBox>
-                        <CheckBox x:Name="cbCheckForUpdates"
-                                  IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=CheckForUpdates, UpdateSourceTrigger=PropertyChanged}">
-                            <Label Content="{DynamicResource check_for_updates}" />
-                        </CheckBox>
+                        <Grid IsSharedSizeScope="True">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="FirstCheckBox" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <CheckBox x:Name="cbAutoStart"
+                                    Grid.Row="0" Grid.Column="0"
+                                    Checked="CbAutoStart_OnChecked"
+                                    Unchecked="CbAutoStart_OnChecked">
+                                <Label Content="{DynamicResource autostart}" />
+                            </CheckBox>
+                            <CheckBox x:Name="cbUseSoftwareRendering"
+                                    Grid.Row="0" Grid.Column="1"
+                                    IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=UseSoftwareRendering, UpdateSourceTrigger=PropertyChanged}">
+                                <Label Content="{DynamicResource use_software_rendering}" />
+                            </CheckBox>
+                            <CheckBox x:Name="cbCheckForUpdates"
+                                    Grid.Row="1" Grid.Column="0"
+                                    IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=CheckForUpdates, UpdateSourceTrigger=PropertyChanged}">
+                                <Label Content="{DynamicResource check_for_updates}" />
+                            </CheckBox>
+                            <CheckBox x:Name="cbDebugLogging"
+                                    Grid.Row="1" Grid.Column="1"
+                                    IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=DebugLogging, UpdateSourceTrigger=PropertyChanged}">
+                                <Label Content="{DynamicResource debug_logging}" />
+                            </CheckBox>
+                        </Grid>
                         <CheckBox x:Name="cbAutoHideTransparent"
                                   IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=AutoHideTransparent, UpdateSourceTrigger=PropertyChanged}">
                             <Label Content="{DynamicResource auto_hide_transparent}" />