diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/Setting/Setting.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/Setting/Setting.cs
index acca823774..c2a9a7d69d 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/Setting/Setting.cs
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/Setting/Setting.cs
@@ -3,7 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System.ComponentModel;
+using Windows.UI.Accessibility;
 using Windows.UI.Xaml;
+using Windows.UI.Xaml.Automation;
 using Windows.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Controls
@@ -29,7 +31,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
            "Header",
            typeof(string),
            typeof(Setting),
-           new PropertyMetadata(default(string)));
+           new PropertyMetadata(default(string), OnHeaderChanged));
 
         public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register(
             "Description",
@@ -87,6 +89,11 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             base.OnApplyTemplate();
         }
 
+        private static void OnHeaderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((Setting)d).Update();
+        }
+
         private static void OnIconChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             ((Setting)d).Update();
@@ -114,6 +121,14 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
                 return;
             }
 
+            if (_setting.ActionContent != null)
+            {
+                if (!string.IsNullOrEmpty(_setting.Header))
+                {
+                    AutomationProperties.SetName((UIElement)_setting.ActionContent, _setting.Header);
+                }
+            }
+
             if (_setting._iconPresenter != null)
             {
                 if (_setting.Icon == null)
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SettingExpander/SettingExpander.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SettingExpander/SettingExpander.cs
new file mode 100644
index 0000000000..4d8aabcbd9
--- /dev/null
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SettingExpander/SettingExpander.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml.Controls;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Automation;
+
+namespace Microsoft.PowerToys.Settings.UI.Controls
+{
+    public partial class SettingExpander : Expander
+    {
+        public SettingExpander()
+        {
+            DefaultStyleKey = typeof(Expander);
+            this.Style = (Style)App.Current.Resources["SettingExpanderStyle"];
+            this.RegisterPropertyChangedCallback(Expander.HeaderProperty, OnHeaderChanged);
+        }
+
+        private static void OnHeaderChanged(DependencyObject d, DependencyProperty dp)
+        {
+            SettingExpander self = (SettingExpander)d;
+            if (self.Header != null)
+            {
+                if (self.Header.GetType() == typeof(Setting))
+                {
+                    Setting selfSetting = (Setting)self.Header;
+                    selfSetting.Style = (Style)App.Current.Resources["ExpanderHeaderSettingStyle"];
+
+                    if (!string.IsNullOrEmpty(selfSetting.Header))
+                    {
+                        AutomationProperties.SetName(self, selfSetting.Header);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
index bd4c70e2ef..8360224979 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
@@ -99,6 +99,7 @@
       <DependentUpon>HotkeySettingsControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="Controls\KeyVisual\KeyVisual.cs" />
+    <Compile Include="Controls\SettingExpander\SettingExpander.cs" />
     <Compile Include="Controls\SettingsGroup\SettingsGroup.cs" />
     <Compile Include="Controls\Setting\Setting.cs" />
     <Compile Include="Controls\ShortcutTextControl.xaml.cs">
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Themes/SettingsExpanderStyles.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Themes/SettingsExpanderStyles.xaml
index 85d4b558fd..a8ee04e2b1 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Themes/SettingsExpanderStyles.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Themes/SettingsExpanderStyles.xaml
@@ -32,7 +32,8 @@
     </Style>
 
     <!-- Setting expander style -->
-    <Style TargetType="muxc:Expander">
+
+    <Style x:Key="SettingExpanderStyle" TargetType="muxc:Expander">
         <Setter Property="Background" Value="{ThemeResource CardBackgroundBrush}" />
         <Setter Property="BorderThickness" Value="{ThemeResource CardBorderThickness}" />
         <Setter Property="BorderBrush" Value="{ThemeResource CardBorderBrush}" />
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/AwakePage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/AwakePage.xaml
index 7ea4262f97..5b9e5c6c25 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/AwakePage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/AwakePage.xaml
@@ -7,7 +7,6 @@
     xmlns:c="using:Microsoft.PowerToys.Settings.UI.Converters"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:toolkitcontrols="using:Microsoft.Toolkit.Uwp.UI.Controls"
     mc:Ignorable="d"
     AutomationProperties.LandmarkType="Main">
 
@@ -15,7 +14,7 @@
         <c:AwakeModeToBoolConverter x:Key="AwakeModeToBoolConverter" />
     </Page.Resources>
 
-    <controls:SettingsPageControl x:Uid="Awake"
+    <controls:SettingsPageControl x:Uid="Awake" IsTabStop="False"
                                   ModuleImageSource="ms-appx:///Assets/Modules/Awake.png"
                                   ModuleImageLink="https://aka.ms/PowerToysOverview_Awake">
         <controls:SettingsPageControl.ModuleContent>
@@ -30,9 +29,6 @@
                     </controls:Setting.ActionContent>
                 </controls:Setting>
 
-
-
-
                 <controls:SettingsGroup x:Uid="Awake_Behavior_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
                     <controls:Setting x:Uid="Awake_EnableDisplayKeepAwake" Icon="&#xE7FB;">
                         <controls:Setting.ActionContent>
@@ -40,11 +36,11 @@
                         </controls:Setting.ActionContent>
                     </controls:Setting>
 
-                    <muxc:Expander IsExpanded="True">
-                        <muxc:Expander.Header>
+                    <controls:SettingExpander IsExpanded="True">
+                        <controls:SettingExpander.Header>
                             <controls:Setting x:Uid="Awake_Mode" Icon="&#xEC4E;" Style="{StaticResource ExpanderHeaderSettingStyle}" />
-                        </muxc:Expander.Header>
-                        <muxc:Expander.Content>
+                        </controls:SettingExpander.Header>
+                        <controls:SettingExpander.Content>
                             <StackPanel Padding="56,16,16,24" Spacing="12">
                                 <RadioButton x:Uid="Awake_NoKeepAwake"
                                     IsChecked="{x:Bind Path=ViewModel.Mode, Mode=TwoWay, Converter={StaticResource AwakeModeToBoolConverter}, ConverterParameter=0}">
@@ -103,8 +99,8 @@
                                     </StackPanel>
                                 </StackPanel>
                             </StackPanel>
-                        </muxc:Expander.Content>
-                    </muxc:Expander>
+                        </controls:SettingExpander.Content>
+                    </controls:SettingExpander>
                 </controls:SettingsGroup>
             </StackPanel>
         </controls:SettingsPageControl.ModuleContent>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
index e6345fb805..e3460ed582 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
@@ -43,11 +43,11 @@
 
 
 
-                <muxc:Expander IsExpanded="True" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <muxc:Expander.Header>
+                <controls:SettingExpander IsExpanded="True" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <controls:SettingExpander.Header>
                         <controls:Setting x:Uid="ColorPicker_ActivationAction" Icon="&#xEC4E;" Style="{StaticResource ExpanderHeaderSettingStyle}" />
-                    </muxc:Expander.Header>
-                    <muxc:Expander.Content>
+                    </controls:SettingExpander.Header>
+                    <controls:SettingExpander.Content>
                         <StackPanel Padding="56,16,16,24" Spacing="12">
                                 <RadioButton IsChecked="{Binding ActivationOpensColorPickerAndEditor, Mode=TwoWay}" GroupName="ColorPickerActivationAction">
                                 <RadioButton.Content>
@@ -76,13 +76,13 @@
                                 </RadioButton.Content>
                             </RadioButton>
                         </StackPanel>
-                    </muxc:Expander.Content>
-                </muxc:Expander>
+                    </controls:SettingExpander.Content>
+                </controls:SettingExpander>
 
 
                 <controls:SettingsGroup x:Uid="ColorFormats" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <muxc:Expander IsExpanded="True">
-                        <muxc:Expander.Header>
+                    <controls:SettingExpander IsExpanded="True">
+                        <controls:SettingExpander.Header>
                             <controls:Setting x:Uid="ColorPicker_CopiedColorRepresentation" Icon="&#xEF3C;" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.ActionContent>
                                     <ComboBox MinWidth="240"
@@ -95,13 +95,13 @@
                                               SelectedValuePath="Key" />    
                                 </controls:Setting.ActionContent>
                             </controls:Setting>
-                        </muxc:Expander.Header>
-                        <muxc:Expander.Content>
+                        </controls:SettingExpander.Header>
+                        <controls:SettingExpander.Content>
                             <CheckBox x:Uid="ColorPicker_ShowColorName"
                                 IsChecked="{Binding ShowColorName, Mode=TwoWay}"
                                 Margin="{StaticResource ExpanderSettingMargin}" />
-                        </muxc:Expander.Content>
-                    </muxc:Expander>
+                        </controls:SettingExpander.Content>
+                    </controls:SettingExpander>
 
                     <!--
             Disabling this until we have a safer way to reset cursor as 
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
index a6c3130cde..38388942da 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
@@ -44,8 +44,8 @@
 
 
 
-                    <muxc:Expander IsExpanded="True">
-                        <muxc:Expander.Header>
+                    <controls:SettingExpander IsExpanded="True">
+                        <controls:SettingExpander.Header>
                             <controls:Setting x:Uid="Activation_Shortcut" Icon="&#xEDA7;" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.Description>
                                     <TextBlock>
@@ -57,9 +57,9 @@
                                     <controls:HotkeySettingsControl Width="240" HotkeySettings="{x:Bind Path=ViewModel.EditorHotkey, Mode=TwoWay}" Keys="Win, Ctrl, Alt, Shift"/>
                                 </controls:Setting.ActionContent>
                             </controls:Setting>
-                        </muxc:Expander.Header>
+                        </controls:SettingExpander.Header>
 
-                        <muxc:Expander.Content>
+                        <controls:SettingExpander.Content>
                             <StackPanel>
                                 <controls:Setting x:Uid="FancyZones_UseCursorPosEditorStartupScreen" Style="{StaticResource ExpanderContentSettingStyle}">
                                     <controls:Setting.ActionContent>
@@ -67,17 +67,17 @@
                                     </controls:Setting.ActionContent>
                                 </controls:Setting>
                             </StackPanel>
-                        </muxc:Expander.Content>
-                    </muxc:Expander>
+                        </controls:SettingExpander.Content>
+                    </controls:SettingExpander>
                 </controls:SettingsGroup>
 
 
                 <controls:SettingsGroup x:Uid="FancyZones_Zones" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <muxc:Expander IsExpanded="True">
-                        <muxc:Expander.Header>
+                    <controls:SettingExpander IsExpanded="True">
+                        <controls:SettingExpander.Header>
                             <controls:Setting x:Uid="FancyZones_ZoneBehavior_GroupSettings" Icon="&#xE620;" Style="{StaticResource ExpanderHeaderSettingStyle}" />
-                        </muxc:Expander.Header>
-                        <muxc:Expander.Content>
+                        </controls:SettingExpander.Header>
+                        <controls:SettingExpander.Content>
                             <StackPanel>
 
                                 <CheckBox x:Uid="FancyZones_ShiftDragCheckBoxControl_Header" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.ShiftDrag}" Margin="{StaticResource ExpanderSettingMargin}"  />
@@ -180,18 +180,18 @@
                                 </controls:Setting>
 
                             </StackPanel>
-                        </muxc:Expander.Content>
-                    </muxc:Expander>
+                        </controls:SettingExpander.Content>
+                    </controls:SettingExpander>
                 </controls:SettingsGroup>
 
                 
                 <controls:SettingsGroup x:Uid="FancyZones_Windows" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
 
-                    <muxc:Expander IsExpanded="True">
-                        <muxc:Expander.Header>
+                    <controls:SettingExpander IsExpanded="True">
+                        <controls:SettingExpander.Header>
                             <controls:Setting x:Uid="FancyZones_WindowBehavior_GroupSettings" Icon="&#xE737;" Style="{StaticResource ExpanderHeaderSettingStyle}" />
-                        </muxc:Expander.Header>
-                        <muxc:Expander.Content>
+                        </controls:SettingExpander.Header>
+                        <controls:SettingExpander.Content>
                             <StackPanel>
                                 <CheckBox x:Uid="FancyZones_DisplayChangeMoveWindowsCheckBoxControl" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.DisplayChangeMoveWindows}" Margin="{StaticResource ExpanderSettingMargin}"/>
                                 <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
@@ -206,19 +206,19 @@
                                 <CheckBox x:Uid="FancyZones_MakeDraggedWindowTransparentCheckBoxControl" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.MakeDraggedWindowsTransparent}" Margin="{StaticResource ExpanderSettingMargin}"/>
                             </StackPanel>
 
-                        </muxc:Expander.Content>
-                    </muxc:Expander>
+                        </controls:SettingExpander.Content>
+                    </controls:SettingExpander>
 
-                    <muxc:Expander IsExpanded="True">
-                        <muxc:Expander.Header>
+                    <controls:SettingExpander IsExpanded="True">
+                        <controls:SettingExpander.Header>
                             <controls:Setting x:Uid="FancyZones_OverrideSnapHotkeys" Icon="&#xE145;" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.ActionContent>
                                     <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.OverrideSnapHotkeys}" FlowDirection="RightToLeft" />
                                 </controls:Setting.ActionContent>
                             </controls:Setting>
-                        </muxc:Expander.Header>
+                        </controls:SettingExpander.Header>
 
-                        <muxc:Expander.Content>
+                        <controls:SettingExpander.Content>
                             <StackPanel>
                                 <RadioButton x:Uid="FancyZones_MoveWindowLeftRightBasedOnZoneIndex" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.MoveWindowsBasedOnZoneIndex}" GroupName="OverrideSnapGroup" Margin="{StaticResource ExpanderSettingMargin}"/>
                                 <RadioButton x:Uid="FancyZones_MoveWindowBasedOnRelativePosition" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.MoveWindowsBasedOnPosition}" GroupName="OverrideSnapGroup" Margin="{StaticResource ExpanderSettingMargin}"/>
@@ -227,26 +227,26 @@
                                               IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.MoveWindowsAcrossMonitors}"
                                               IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SnapHotkeysCategoryEnabled}"/>
                             </StackPanel>
-                        </muxc:Expander.Content>
-                    </muxc:Expander>
+                        </controls:SettingExpander.Content>
+                    </controls:SettingExpander>
                 </controls:SettingsGroup>
 
                 <controls:SettingsGroup x:Uid="FancyZones_Layouts" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <muxc:Expander IsExpanded="True">
-                        <muxc:Expander.Header>
+                    <controls:SettingExpander IsExpanded="True">
+                        <controls:SettingExpander.Header>
                             <controls:Setting x:Uid="FancyZones_QuickLayoutSwitch" Icon="&#xE737;" Style="{StaticResource ExpanderHeaderSettingStyle}" >
                                 <controls:Setting.ActionContent>
                                     <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.QuickLayoutSwitch}" FlowDirection="RightToLeft" />
                                 </controls:Setting.ActionContent>
                             </controls:Setting>
-                        </muxc:Expander.Header>
+                        </controls:SettingExpander.Header>
 
-                        <muxc:Expander.Content>
+                        <controls:SettingExpander.Content>
                             <StackPanel>
                                 <CheckBox x:Uid="FancyZones_FlashZonesOnQuickSwitch" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.FlashZonesOnQuickSwitch}" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.QuickSwitchEnabled}" Margin="{StaticResource ExpanderSettingMargin}"/>
                             </StackPanel>
-                        </muxc:Expander.Content>
-                    </muxc:Expander>
+                        </controls:SettingExpander.Content>
+                    </controls:SettingExpander>
                 </controls:SettingsGroup>
 
 
@@ -255,11 +255,11 @@
 
 
                 <controls:SettingsGroup x:Uid="ExcludedApps" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <muxc:Expander IsExpanded="True">
-                        <muxc:Expander.Header>
+                    <controls:SettingExpander IsExpanded="True">
+                        <controls:SettingExpander.Header>
                             <controls:Setting x:Uid="FancyZones_ExcludeApps" Icon="&#xE103;" Style="{StaticResource ExpanderHeaderSettingStyle}"/>
-                        </muxc:Expander.Header>
-                        <muxc:Expander.Content>
+                        </controls:SettingExpander.Header>
+                        <controls:SettingExpander.Content>
                             <TextBox x:Uid="FancyZones_ExcludeApps_TextBoxControl"
                                  Margin="{StaticResource ExpanderSettingMargin}"
                                          Text="{x:Bind Mode=TwoWay, Path=ViewModel.ExcludedApps, UpdateSourceTrigger=PropertyChanged}"
@@ -270,8 +270,8 @@
                                          AcceptsReturn="True"
                                          MinWidth="240"
                                          MinHeight="160" />
-                        </muxc:Expander.Content>
-                    </muxc:Expander>
+                        </controls:SettingExpander.Content>
+                    </controls:SettingExpander>
                 </controls:SettingsGroup>
             </StackPanel>
 
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
index be9afaddc8..bfbf2f02eb 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
@@ -181,8 +181,8 @@
 
 
                 <controls:SettingsGroup x:Uid="Admin_Mode">
-                    <muxc:Expander IsExpanded="True">
-                        <muxc:Expander.Header>
+                    <controls:SettingExpander IsExpanded="True">
+                        <controls:SettingExpander.Header>
                             <controls:Setting x:Uid="Admin_Mode" Icon="&#xE1A7;" Description="{Binding Mode=TwoWay, Path=RunningAsText}" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.ActionContent>
                                     <Button x:Uid="GeneralPage_RestartAsAdmin_Button"
@@ -190,8 +190,8 @@
                                             IsEnabled="{Binding Mode=TwoWay, Path=IsAdminButtonEnabled}"/>
                                 </controls:Setting.ActionContent>
                             </controls:Setting>
-                        </muxc:Expander.Header>
-                        <muxc:Expander.Content>
+                        </controls:SettingExpander.Header>
+                        <controls:SettingExpander.Content>
                             <StackPanel Orientation="Vertical">
                                 <controls:Setting x:Uid="GeneralSettings_AlwaysRunAsAdminText" IsEnabled="{Binding Mode=TwoWay, Path=IsElevated}" Style="{StaticResource ExpanderContentSettingStyle}">
                                     <controls:Setting.Description>
@@ -209,15 +209,15 @@
                                           IsOpen="True"
                                           Visibility="{Binding Mode=TwoWay, Path=IsElevated, Converter={StaticResource BoolToVisibilityConverter}}"/>
                             </StackPanel>
-                        </muxc:Expander.Content>
-                    </muxc:Expander>
+                        </controls:SettingExpander.Content>
+                    </controls:SettingExpander>
                 </controls:SettingsGroup>
 
 
 
                     <controls:SettingsGroup IsEnabled="True" x:Uid="ShortcutGuide_Appearance_Behavior">
-                    <muxc:Expander IsExpanded="True">
-                        <muxc:Expander.Header>
+                    <controls:SettingExpander IsExpanded="True">
+                        <controls:SettingExpander.Header>
                             <controls:Setting x:Uid="ColorModeHeader" Icon="&#xE771;" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.Description>
                                     <HyperlinkButton Click="OpenColorsSettings_Click"
@@ -231,8 +231,8 @@
                                     </ComboBox>
                                 </controls:Setting.ActionContent>
                             </controls:Setting>
-                        </muxc:Expander.Header>
-                        <muxc:Expander.Content>
+                        </controls:SettingExpander.Header>
+                        <controls:SettingExpander.Content>
                             <StackPanel Orientation="Vertical">
                                 <controls:Setting x:Uid="GeneralPage_RunAtStartUp" Style="{StaticResource ExpanderContentSettingStyle}">
                                     <controls:Setting.ActionContent>
@@ -240,9 +240,8 @@
                                     </controls:Setting.ActionContent>
                                 </controls:Setting>
                             </StackPanel>
-                        </muxc:Expander.Content>
-                    </muxc:Expander>
-
+                        </controls:SettingExpander.Content>
+                    </controls:SettingExpander>
                 </controls:SettingsGroup>
             </StackPanel>
                
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
index 60d19a6d84..2c567a3988 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
@@ -219,8 +219,8 @@
 
 
                 <controls:SettingsGroup x:Uid="File" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <muxc:Expander IsExpanded="True">
-                        <muxc:Expander.Header>
+                    <controls:SettingExpander IsExpanded="True">
+                        <controls:SettingExpander.Header>
                             <controls:Setting x:Uid="ImageResizer_FilenameFormatHeader" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.ActionContent>
                                     <StackPanel Spacing="4" Orientation="Horizontal">
@@ -267,14 +267,14 @@
                                 </controls:Setting.ActionContent>
 
                             </controls:Setting>
-                        </muxc:Expander.Header>
-                        <muxc:Expander.Content>
+                        </controls:SettingExpander.Header>
+                        <controls:SettingExpander.Content>
 
                             <CheckBox x:Uid="ImageResizer_UseOriginalDate"
-                      IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.KeepDateModified}"
-                                        Margin="16,0,0,0" />
-                        </muxc:Expander.Content>
-                    </muxc:Expander>
+                                      IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.KeepDateModified}"
+                                      Margin="16,8,0,8" />
+                        </controls:SettingExpander.Content>
+                    </controls:SettingExpander>
                 </controls:SettingsGroup>
 
 
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
index 7e91316a79..8586771005 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
@@ -34,8 +34,8 @@
 
 
                 <controls:SettingsGroup x:Uid="Shortcuts" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}">
-                    <muxc:Expander IsExpanded="True">
-                        <muxc:Expander.Header>
+                    <controls:SettingExpander IsExpanded="True">
+                        <controls:SettingExpander.Header>
                             <controls:Setting x:Uid="Activation_Shortcut" Icon="&#xEDA7;" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.Description>
                                     <TextBlock>
@@ -47,13 +47,13 @@
                                     <controls:HotkeySettingsControl Width="240" HotkeySettings="{x:Bind Path=ViewModel.OpenPowerLauncher, Mode=TwoWay}" Keys="Win, Ctrl, Alt, Shift"/>
                                 </controls:Setting.ActionContent>
                             </controls:Setting>
-                        </muxc:Expander.Header>
-                        <muxc:Expander.Content>
+                        </controls:SettingExpander.Header>
+                        <controls:SettingExpander.Content>
                             <StackPanel>
                                 <CheckBox x:Uid="PowerLauncher_IgnoreHotkeysInFullScreen" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.IgnoreHotkeysInFullScreen}" Margin="{StaticResource ExpanderSettingMargin}" />
                             </StackPanel>
-                        </muxc:Expander.Content>
-                    </muxc:Expander>
+                        </controls:SettingExpander.Content>
+                    </controls:SettingExpander>
                 </controls:SettingsGroup>
 
 
@@ -93,8 +93,8 @@
 
 
                 <controls:SettingsGroup x:Uid="PowerLauncher_SearchResults" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}">
-                    <muxc:Expander IsExpanded="True">
-                        <muxc:Expander.Header>
+                    <controls:SettingExpander IsExpanded="True">
+                        <controls:SettingExpander.Header>
                             <controls:Setting x:Uid="PowerLauncher_MaximumNumberOfResults" Icon="&#xE721;" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.ActionContent>
                                     <muxc:NumberBox Value="{Binding Mode=TwoWay, Path=MaximumNumberOfResults}"
@@ -103,13 +103,11 @@
                                                     Minimum="1"/>
                                 </controls:Setting.ActionContent>
                             </controls:Setting>
-                        </muxc:Expander.Header>
-                        <muxc:Expander.Content>
+                        </controls:SettingExpander.Header>
+                        <controls:SettingExpander.Content>
                             <CheckBox x:Uid="PowerLauncher_ClearInputOnLaunch" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.ClearInputOnLaunch}" Margin="{StaticResource ExpanderSettingMargin}" />
-                        </muxc:Expander.Content>
-                    </muxc:Expander>
-
-
+                        </controls:SettingExpander.Content>
+                    </controls:SettingExpander>
                 </controls:SettingsGroup>
 
                 <!--<ComboBox x:Uid="PowerLauncher_SearchResultPreference"
@@ -176,8 +174,8 @@
                     
                     <DataTemplate x:DataType="ViewModels:PowerLauncherPluginViewModel" x:DefaultBindMode="OneWay">
                                 <Grid>
-                                    <muxc:Expander>
-                                        <muxc:Expander.Header>
+                                    <controls:SettingExpander>
+                                        <controls:SettingExpander.Header>
                                             <controls:Setting Header="{x:Bind Path=Name}" Description="{x:Bind Description}" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                                 <controls:Setting.Icon>
                                                     <Image Source="{x:Bind IconPath}"
@@ -191,8 +189,8 @@
                                                                   FlowDirection="RightToLeft"/>
                                                 </controls:Setting.ActionContent>
                                             </controls:Setting>
-                                        </muxc:Expander.Header>
-                                        <muxc:Expander.Content>
+                                        </controls:SettingExpander.Header>
+                                        <controls:SettingExpander.Content>
                                             <StackPanel>
                                                 <controls:Setting x:Uid="PowerLauncher_ActionKeyword" Style="{StaticResource ExpanderContentSettingStyle}">
                                                     <controls:Setting.ActionContent>
@@ -246,8 +244,8 @@
                                         Visibility="{x:Bind ShowNotAllowedKeywordWarning, Converter={StaticResource BoolToVisibilityConverter}}"
                                         TextWrapping="Wrap" />-->
                                            
-                                        </muxc:Expander.Content>
-                                    </muxc:Expander>
+                                        </controls:SettingExpander.Content>
+                                    </controls:SettingExpander>
                                 </Grid>
                             </DataTemplate>
                 </ListView.ItemTemplate>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
index b21021eb9e..e9dd292a27 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
@@ -27,32 +27,32 @@
                 </controls:Setting>
 
                 <controls:SettingsGroup x:Uid="PowerRename_ShellIntegration">
-                    <muxc:Expander IsExpanded="True">
-                        <muxc:Expander.Header>
+                    <controls:SettingExpander IsExpanded="True">
+                        <controls:SettingExpander.Header>
                             <controls:Setting x:Uid="PowerRename_Toggle_EnableOnContextMenu" Icon="&#xE14C;" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.ActionContent>
                                     <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.EnabledOnContextMenu}" FlowDirection="RightToLeft" />
                                 </controls:Setting.ActionContent>
                             </controls:Setting>
-                        </muxc:Expander.Header>
-                        <muxc:Expander.Content>
+                        </controls:SettingExpander.Header>
+                        <controls:SettingExpander.Content>
                             <CheckBox x:Uid="PowerRename_Toggle_EnableOnExtendedContextMenu"
                                 IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.EnabledOnContextExtendedMenu}"
                                 Margin="{StaticResource ExpanderSettingMargin}" />
-                        </muxc:Expander.Content>
-                    </muxc:Expander>
+                        </controls:SettingExpander.Content>
+                    </controls:SettingExpander>
                 </controls:SettingsGroup>
 
                 <controls:SettingsGroup x:Uid="PowerRename_AutoCompleteHeader">
-                    <muxc:Expander IsExpanded="True">
-                        <muxc:Expander.Header>
+                    <controls:SettingExpander IsExpanded="True">
+                        <controls:SettingExpander.Header>
                             <controls:Setting x:Uid="PowerRename_Toggle_AutoComplete" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.ActionContent>
                                     <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.MRUEnabled}" FlowDirection="RightToLeft" />
                                 </controls:Setting.ActionContent>
                             </controls:Setting>
-                        </muxc:Expander.Header>
-                        <muxc:Expander.Content>
+                        </controls:SettingExpander.Header>
+                        <controls:SettingExpander.Content>
                             <StackPanel HorizontalAlignment="Stretch">
                                 <CheckBox x:Uid="PowerRename_Toggle_RestoreFlagsOnLaunch"
                                 IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.RestoreFlagsOnLaunch}"
@@ -70,8 +70,8 @@
                                     </controls:Setting.ActionContent>
                                 </controls:Setting>
                             </StackPanel>
-                        </muxc:Expander.Content>
-                    </muxc:Expander>
+                        </controls:SettingExpander.Content>
+                    </controls:SettingExpander>
                 </controls:SettingsGroup>
 
 
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
index cc1d773d22..b3c79741e8 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
@@ -48,8 +48,8 @@
                 </controls:Setting>
 
                 <controls:SettingsGroup x:Uid="ShortcutGuide_Appearance_Behavior" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <muxc:Expander IsExpanded="True">
-                        <muxc:Expander.Header>
+                    <controls:SettingExpander IsExpanded="True">
+                        <controls:SettingExpander.Header>
                             <controls:Setting x:Uid="ColorModeHeader" Icon="&#xE771;" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.Description>
                                     <HyperlinkButton Click="OpenColorsSettings_Click"
@@ -63,8 +63,8 @@
                                     </ComboBox>
                                 </controls:Setting.ActionContent>
                             </controls:Setting>
-                        </muxc:Expander.Header>
-                        <muxc:Expander.Content>
+                        </controls:SettingExpander.Header>
+                        <controls:SettingExpander.Content>
                             <StackPanel Orientation="Vertical">
                                 <controls:Setting x:Uid="ShortcutGuide_OverlayOpacity" Style="{StaticResource ExpanderContentSettingStyle}">
                                     <controls:Setting.ActionContent>
@@ -75,16 +75,16 @@
                                     </controls:Setting.ActionContent>
                                 </controls:Setting>
                             </StackPanel>
-                        </muxc:Expander.Content>
-                    </muxc:Expander>
+                        </controls:SettingExpander.Content>
+                    </controls:SettingExpander>
                 </controls:SettingsGroup>
 
                 <controls:SettingsGroup x:Uid="ExcludedApps" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <muxc:Expander IsExpanded="True">
-                        <muxc:Expander.Header>
+                    <controls:SettingExpander IsExpanded="True">
+                        <controls:SettingExpander.Header>
                             <controls:Setting x:Uid="ShortcutGuide_DisabledApps" Icon="&#xE103;" Style="{StaticResource ExpanderHeaderSettingStyle}"/>
-                        </muxc:Expander.Header>
-                        <muxc:Expander.Content>
+                        </controls:SettingExpander.Header>
+                        <controls:SettingExpander.Content>
                             <TextBox x:Uid="ShortcutGuide_DisabledApps_TextBoxControl"
                                      Margin="{StaticResource ExpanderSettingMargin}"
                                          Text="{x:Bind Mode=TwoWay, Path=ViewModel.DisabledApps, UpdateSourceTrigger=PropertyChanged}"
@@ -95,8 +95,8 @@
                                          AcceptsReturn="True"
                                          MinWidth="240"
                                          MinHeight="160" />
-                        </muxc:Expander.Content>
-                    </muxc:Expander>
+                        </controls:SettingExpander.Content>
+                    </controls:SettingExpander>
                 </controls:SettingsGroup>
             </StackPanel>
         </controls:SettingsPageControl.ModuleContent>