diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/Setting/Setting.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/Setting/Setting.xaml
index 411b3a1465..029c66a11e 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/Setting/Setting.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/Setting/Setting.xaml
@@ -9,7 +9,7 @@
         <Setter Property="BorderThickness" Value="{ThemeResource CardBorderThickness}" />
         <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
         <Setter Property="Padding" Value="16" />
-        <Setter Property="Margin" Value="0,0,0,2"/>
+        <Setter Property="Margin" Value="0,0,0,0"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:Setting">
@@ -74,7 +74,7 @@
                                 FontSize="{StaticResource SecondaryTextFontSize}"
                                 Foreground="{ThemeResource TextFillColorSecondaryBrush}">
                                 <ContentPresenter.Resources>
-                                    <Style TargetType="TextBlock"  BasedOn="{StaticResource CaptionTextBlockStyle}">
+                                    <Style TargetType="TextBlock" BasedOn="{StaticResource CaptionTextBlockStyle}">
                                         <Style.Setters>
                                             <Setter Property="TextWrapping" Value="WrapWholeWords"/>
                                         </Style.Setters>
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
deleted file mode 100644
index 181f93a1ae..0000000000
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SettingExpander/SettingExpander.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// 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;
-
-namespace Microsoft.PowerToys.Settings.UI.Controls
-{
-    public class SettingExpander : Expander
-    {
-        public SettingExpander()
-        {
-            DefaultStyleKey = typeof(SettingExpander);
-        }
-    }
-}
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SettingExpander/SettingExpander.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SettingExpander/SettingExpander.xaml
deleted file mode 100644
index 682dbbd063..0000000000
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SettingExpander/SettingExpander.xaml
+++ /dev/null
@@ -1,15 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
-
-    <Style TargetType="controls:SettingExpander" BasedOn="{StaticResource DefaultExpanderStyle}" >
-        <Setter Property="Background" Value="{ThemeResource CardBackgroundBrush}" />
-        <Setter Property="BorderThickness" Value="{ThemeResource CardBorderThickness}" />
-        <Setter Property="BorderBrush" Value="{ThemeResource CardBorderBrush}" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    </Style>
-    
-</ResourceDictionary>
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 7b772038ae..5547f5b4a2 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,7 +99,6 @@
       <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">
@@ -282,7 +281,7 @@
       <Version>6.1.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.6.1-prerelease.210709001</Version>
+      <Version>2.6.0-prerelease.210623001</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
       <Version>2.0.1</Version>
@@ -313,10 +312,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Controls\SettingExpander\SettingExpander.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Controls\SettingsGroup\SettingsGroup.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
index 20a41fb297..eb384a11c2 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
@@ -268,19 +268,15 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
     <value>Select the profile to display the active key remap and shortcuts</value>
     <comment>Keyboard Manager configuration dropdown description</comment>
   </data>
-  <data name="KeyboardManager_RemapKeyboardButton.Content" xml:space="preserve">
+  <data name="KeyboardManager_RemapKeyboardButton.Header" xml:space="preserve">
     <value>Remap a key</value>
     <comment>Keyboard Manager remap keyboard button content</comment>
-  </data>
-  <data name="KeyboardManager_RemapKeys.Header" xml:space="preserve">
-    <value>Remap keys</value>
-    <comment>Keyboard Manager remap keyboard header</comment>
   </data>
 	<data name="KeyboardManager_Keys.Header" xml:space="preserve">
     <value>Keys</value>
     <comment>Keyboard Manager remap keyboard header</comment>
   </data>
-  <data name="KeyboardManager_RemapShortcutsButton.Content" xml:space="preserve">
+  <data name="KeyboardManager_RemapShortcutsButton.Header" xml:space="preserve">
     <value>Remap a shortcut</value>
     <comment>Keyboard Manager remap shortcuts button</comment>
   </data>
@@ -288,10 +284,6 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
     <value>Shortcuts</value>
     <comment>Keyboard Manager remap keyboard header</comment>
   </data>
-  <data name="KeyboardManager_RemapShortcuts.Header" xml:space="preserve">
-    <value>Remap shortcuts</value>
-    <comment>Keyboard Manager remap shortcuts header</comment>
-  </data>
   <data name="RemapKeysList.AutomationProperties.Name" xml:space="preserve">
     <value>Current Key Remappings</value>
   </data>
@@ -836,10 +828,10 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
   <data name="Encoding.Header" xml:space="preserve">
     <value>Encoding</value>
   </data>
-  <data name="KeyboardManager_RemapKeys.Description" xml:space="preserve">
+  <data name="KeyboardManager_RemapKeyboardButton.Description" xml:space="preserve">
     <value>Remap keys to other keys or shortcuts.</value>
   </data>
-  <data name="KeyboardManager_RemapShortcuts.Description" xml:space="preserve">
+  <data name="KeyboardManager_RemapShortcutsButton.Description" xml:space="preserve">
     <value>Remap shortcuts to other shortcuts or keys. Additionally, mappings can be targeted to specific applications as well.</value>
   </data>
   <data name="General.ModuleDescription" xml:space="preserve">
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Themes/Generic.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Themes/Generic.xaml
index 0760974b1f..c1f16179e8 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Themes/Generic.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Themes/Generic.xaml
@@ -5,6 +5,5 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="ms-appx:///Controls/Setting/Setting.xaml" />
         <ResourceDictionary Source="ms-appx:///Controls/SettingsGroup/SettingsGroup.xaml" />
-        <ResourceDictionary Source="ms-appx:///Controls/SettingExpander/SettingExpander.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
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 12c3287c4b..7ea4262f97 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/AwakePage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/AwakePage.xaml
@@ -40,7 +40,7 @@
                         </controls:Setting.ActionContent>
                     </controls:Setting>
 
-                    <muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}">
+                    <muxc:Expander IsExpanded="True">
                         <muxc:Expander.Header>
                             <controls:Setting x:Uid="Awake_Mode" Icon="&#xEC4E;" Style="{StaticResource ExpanderHeaderSettingStyle}" />
                         </muxc:Expander.Header>
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 865f2018fd..e6345fb805 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
@@ -43,7 +43,7 @@
 
 
 
-                <muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                <muxc:Expander IsExpanded="True" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
                     <muxc:Expander.Header>
                         <controls:Setting x:Uid="ColorPicker_ActivationAction" Icon="&#xEC4E;" Style="{StaticResource ExpanderHeaderSettingStyle}" />
                     </muxc:Expander.Header>
@@ -81,7 +81,7 @@
 
 
                 <controls:SettingsGroup x:Uid="ColorFormats" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}">
+                    <muxc:Expander IsExpanded="True">
                         <muxc:Expander.Header>
                             <controls:Setting x:Uid="ColorPicker_CopiedColorRepresentation" Icon="&#xEF3C;" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.ActionContent>
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 d6538f14aa..094f59594b 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
@@ -29,6 +29,7 @@
             <StackPanel Orientation="Vertical">
 
                 <toolkitcontrols:HeaderedItemsControl x:Uid="General_Version">
+                  
                     <controls:Setting Header="{Binding PowerToysVersion}" Icon="&#xE117;">
                         <controls:Setting.Description>
                             <TextBlock Style="{StaticResource SecondaryTextStyle}">
@@ -180,7 +181,7 @@
 
 
                 <toolkitcontrols:HeaderedItemsControl x:Uid="Admin_Mode">
-                    <muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}">
+                    <muxc:Expander IsExpanded="True">
                         <muxc:Expander.Header>
                             <controls:Setting x:Uid="Admin_Mode" Icon="&#xE1A7;" Description="{Binding Mode=TwoWay, Path=RunningAsText}" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.ActionContent>
@@ -215,7 +216,7 @@
 
 
                 <toolkitcontrols:HeaderedItemsControl IsEnabled="True" x:Uid="ShortcutGuide_Appearance_Behavior">
-                    <muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}">
+                    <muxc:Expander IsExpanded="True">
                         <muxc:Expander.Header>
                             <controls:Setting x:Uid="ColorModeHeader" Icon="&#xE771;" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.Description>
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 322b84faa6..60d19a6d84 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
@@ -219,7 +219,7 @@
 
 
                 <controls:SettingsGroup x:Uid="File" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}">
+                    <muxc:Expander IsExpanded="True">
                         <muxc:Expander.Header>
                             <controls:Setting x:Uid="ImageResizer_FilenameFormatHeader" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.ActionContent>
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 a16bb5a80e..b21021eb9e 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
@@ -27,7 +27,7 @@
                 </controls:Setting>
 
                 <controls:SettingsGroup x:Uid="PowerRename_ShellIntegration">
-                    <muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}">
+                    <muxc:Expander IsExpanded="True">
                         <muxc:Expander.Header>
                             <controls:Setting x:Uid="PowerRename_Toggle_EnableOnContextMenu" Icon="&#xE14C;" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.ActionContent>
@@ -44,7 +44,7 @@
                 </controls:SettingsGroup>
 
                 <controls:SettingsGroup x:Uid="PowerRename_AutoCompleteHeader">
-                    <muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}">
+                    <muxc:Expander IsExpanded="True">
                         <muxc:Expander.Header>
                             <controls:Setting x:Uid="PowerRename_Toggle_AutoComplete" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.ActionContent>
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 28a7c77393..4656c5668f 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
@@ -48,7 +48,7 @@
                 </controls:Setting>
 
                 <controls:SettingsGroup x:Uid="ShortcutGuide_Appearance_Behavior" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}">
+                    <muxc:Expander IsExpanded="True">
                         <muxc:Expander.Header>
                             <controls:Setting x:Uid="ColorModeHeader" Icon="&#xE771;" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.Description>
@@ -77,7 +77,7 @@
                             </StackPanel>
                         </muxc:Expander.Content>
                     </muxc:Expander>
-                    <muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}">
+                    <muxc:Expander IsExpanded="True">
                         <muxc:Expander.Header>
                             <controls:Setting x:Uid="ShortcutGuide_DisabledApps" Style="{StaticResource ExpanderHeaderSettingStyle}"/>
                         </muxc:Expander.Header>