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 029c66a11e..f22885ad80 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
@@ -72,6 +72,7 @@
                                 x:Name="DescriptionPresenter"
                                 Content="{TemplateBinding Description}"
                                 FontSize="{StaticResource SecondaryTextFontSize}"
+                                TextWrapping="WrapWholeWords"
                                 Foreground="{ThemeResource TextFillColorSecondaryBrush}">
                                 <ContentPresenter.Resources>
                                     <Style TargetType="TextBlock" BasedOn="{StaticResource CaptionTextBlockStyle}">
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 eb384a11c2..845649a249 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
@@ -254,7 +254,7 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
     <comment>Keyboard Manager current configuration header</comment>
   </data>
   <data name="KeyboardManager.ModuleDescription" xml:space="preserve">
-    <value>Reconfigure your keyboard by remapping keys and shortcuts.</value>
+    <value>Reconfigure your keyboard by remapping keys and shortcuts</value>
     <comment>Keyboard Manager page description</comment>
   </data>
   <data name="KeyboardManager_EnableToggle.Header" xml:space="preserve">
@@ -406,11 +406,11 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
     <value>Enable FancyZones</value>
     <comment>do not loc the Product name.  Do you want this feature on / off</comment>
   </data>
-  <data name="FancyZones_ExcludeApps.Text" xml:space="preserve">
+  <data name="FancyZones_ExcludeApps.Header" xml:space="preserve">
     <value>Excluded apps</value>
   </data>
-  <data name="FancyZones_ExcludeApps_TextBoxControl.Header" xml:space="preserve">
-    <value>To exclude an application from snapping to zones add its name here (one per line). These apps will react only to Windows Snap.</value>
+  <data name="FancyZones_ExcludeApps.Description" xml:space="preserve">
+    <value>Excludes an application from snappting to zones and will only react to Windows Snap. Add one application name per line.</value>
   </data>
   <data name="FancyZones_HighlightOpacity.Header" xml:space="preserve">
     <value>Zone opacity</value>
@@ -425,10 +425,14 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
   <data name="SettingsPage_SetShortcut_Glyph.AutomationProperties.Name" xml:space="preserve">
     <value>Information Symbol</value>
   </data>
-  <data name="FancyZones_LaunchEditorButtonControl.Text" xml:space="preserve">
+  <data name="FancyZones_LaunchEditorButtonControl.Header" xml:space="preserve">
     <value>Launch layout editor</value>
     <comment>launches the FancyZones layout editor application</comment>
   </data>
+  <data name="FancyZones_LaunchEditorButtonControl.Description" xml:space="preserve">
+    <value>Set and manage your layouts</value>
+    <comment>launches the FancyZones layout editor application</comment>
+  </data>
   <data name="FancyZones_MakeDraggedWindowTransparentCheckBoxControl.Content" xml:space="preserve">
     <value>Make dragged window transparent</value>
   </data>
@@ -438,8 +442,11 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
   <data name="FancyZones_MoveWindowsAcrossAllMonitorsCheckBoxControl.Content" xml:space="preserve">
     <value>Move windows between zones across all monitors</value>
   </data>
-  <data name="FancyZones_OverrideSnapHotkeysCheckBoxControl.Content" xml:space="preserve">
-    <value>Override Windows Snap shortcut (Win + Arrow) to move windows between zones</value>
+  <data name="FancyZones_OverrideSnapHotkeys.Header" xml:space="preserve">
+    <value>Override Windows Snap</value>
+  </data>
+  <data name="FancyZones_OverrideSnapHotkeys.Description" xml:space="preserve">
+    <value>This overrides the Windows Snap shortcut (Win + arrow) to move windows between zones</value>
   </data>
   <data name="FancyZones_ShiftDragCheckBoxControl_Header.Content" xml:space="preserve">
     <value>Hold Shift key to activate zones while dragging</value>
@@ -452,15 +459,24 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
     <comment>windows refers to application windows</comment>
   </data>
   <data name="FancyZones_OpenWindowOnActiveMonitor.Content" xml:space="preserve">
-    <value>Move newly created windows to the current active monitor (EXPERIMENTAL)</value>
+    <value>Move newly created windows to the current active monitor (Experimental)</value>
   </data>
-  <data name="FancyZones_UseCursorPosEditorStartupScreen.Content" xml:space="preserve">
-    <value>Follow mouse cursor instead of focus when launching editor in a multi screen environment</value>
+  <data name="FancyZones_UseCursorPosEditorStartupScreen.Header" xml:space="preserve">
+    <value>Launch editor where mouse cursor is</value>
   </data>
-  <data name="FancyZones_ZoneBehavior_GroupSettings.Text" xml:space="preserve">
+  <data name="FancyZones_UseCursorPosEditorStartupScreen.Description" xml:space="preserve">
+    <value>When using multiple screens, the editor will launch on the screen where the mouse cursor is</value>
+  </data>
+  <data name="FancyZones_ZoneBehavior_GroupSettings.Header" xml:space="preserve">
     <value>Zone behavior</value>
   </data>
-  <data name="FancyZones_ZoneHighlightColor.Text" xml:space="preserve">
+  <data name="FancyZones_ZoneBehavior_GroupSettings.Description" xml:space="preserve">
+    <value>Manage how zones behave when using FancyZones</value>
+  </data>
+  <data name="FancyZones_Zones.Header" xml:space="preserve">
+    <value>Zones</value>
+  </data>
+  <data name="FancyZones_ZoneHighlightColor.Header" xml:space="preserve">
     <value>Zone highlight color</value>
   </data>
   <data name="FancyZones_ZoneSetChangeMoveWindows.Content" xml:space="preserve">
@@ -557,10 +573,10 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
   <data name="PowerRename_Toggle_AutoComplete.Header" xml:space="preserve">
     <value>Enable autocomplete for the search and replace fields</value>
   </data>
-  <data name="FancyZones_BorderColor.Text" xml:space="preserve">
+  <data name="FancyZones_BorderColor.Header" xml:space="preserve">
     <value>Zone border color</value>
   </data>
-  <data name="FancyZones_InActiveColor.Text" xml:space="preserve">
+  <data name="FancyZones_InActiveColor.Header" xml:space="preserve">
     <value>Zone inactive color</value>
   </data>
   <data name="ShortcutGuide.ModuleDescription" xml:space="preserve">
@@ -829,10 +845,10 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
     <value>Encoding</value>
   </data>
   <data name="KeyboardManager_RemapKeyboardButton.Description" xml:space="preserve">
-    <value>Remap keys to other keys or shortcuts.</value>
+    <value>Remap keys to other keys or shortcuts</value>
   </data>
   <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>
+    <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">
     <value>Microsoft PowerToys is a set of utilities for power users to tune and streamline their Windows experience for greater productivity.
@@ -938,13 +954,21 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
     <value>Learn more about remapping limitations</value>
     <comment>This is a link that will discuss what is and is not possible for Keyboard manager to remap</comment>
   </data>
-  <data name="FancyZones_Editor_GroupSettings.Text" xml:space="preserve">
+  <data name="FancyZones_Editor_GroupSettings.Header" xml:space="preserve">
     <value>Editor</value>
     <comment>refers to the FancyZone editor</comment>
   </data>
-  <data name="FancyZones_WindowBehavior_GroupSettings.Text" xml:space="preserve">
+  <data name="FancyZones_WindowBehavior_GroupSettings.Header" xml:space="preserve">
     <value>Window behavior</value>
   </data>
+  <data name="FancyZones_WindowBehavior_GroupSettings.Description" xml:space="preserve">
+    <value>Manage how windows behave when using FancyZones</value>
+  </data>
+  <data name="FancyZones_Windows.Header" xml:space="preserve">
+    <value>Windows</value>
+     <comment>refers to a set of windows, not the product name</comment>
+  </data>
+  
   <data name="PowerRename_BehaviorHeader.Header" xml:space="preserve">
     <value>Behavior</value>
   </data>
@@ -1022,7 +1046,7 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
     <value>Activate the smallest zone by area</value>
   </data>
   <data name="FancyZones_OverlappingZones.Header" xml:space="preserve">
-    <value>When multiple zones overlap:</value>
+    <value>When multiple zones overlap</value>
   </data>
   <data name="PowerLauncher_Plugins.Text" xml:space="preserve">
     <value>Plugins</value>
@@ -1083,9 +1107,16 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
   <data name="FancyZones_FlashZonesOnQuickSwitch.Content" xml:space="preserve">
     <value>Flash zones when switching layout</value>
   </data>
-  <data name="FancyZones_QuickLayoutSwitch.Content" xml:space="preserve">
+  <data name="FancyZones_Layouts.Header" xml:space="preserve">
+    <value>Layouts</value>
+  </data>
+  <data name="FancyZones_QuickLayoutSwitch.Header" xml:space="preserve">
     <value>Enable quick layout switch</value>
   </data>
+  <data name="FancyZones_QuickLayoutSwitch.Description" xml:space="preserve">
+    <value>You can configure layout-specific shortcuts in the editor</value>
+  </data>
+  
   <data name="FancyZones_QuickLayoutSwitch_GroupSettings.Text" xml:space="preserve">
     <value>Quick layout switch</value>
   </data>
@@ -1391,6 +1422,9 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and
     <value>See what's new</value>
   </data>
   <data name="Awake_Mode.Description" xml:space="preserve">
-    <value>Set the preferred state of your computer</value>
+    <value>Set the preferred behaviour or Awake</value>
+  </data>
+  <data name="ExcludedApps.Header" xml:space="preserve">
+    <value>Excluded apps</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/Button.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/Button.xaml
index 0416382a05..24fb1f8fb2 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/Button.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/Button.xaml
@@ -2,11 +2,5 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <!--<Style x:Key="SettingButtonStyle" TargetType="Button" BasedOn="{StaticResource DefaultButtonStyle}" >
-        <Setter Property="BorderBrush" Value="{ThemeResource CardBorderBrush}" />
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-        <Setter Property="Padding" Value="16,0,16,0" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-    </Style>-->
+
 </ResourceDictionary>
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 d0f4b37fed..85d4b558fd 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Themes/SettingsExpanderStyles.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Themes/SettingsExpanderStyles.xaml
@@ -6,7 +6,7 @@
 
     <!-- Thickness -->
     <Thickness x:Key="ExpanderContentPadding">0</Thickness>
-    <Thickness x:Key="ExpanderSettingMargin">56, 12, 40, 12</Thickness>
+    <Thickness x:Key="ExpanderSettingMargin">56, 8, 40, 8</Thickness>
 
     <!-- Styles -->
     <!-- Setting used in a Expander header -->
@@ -39,4 +39,9 @@
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     </Style>
+
+    <Style x:Key="ExpanderSeparatorStyle" TargetType="Rectangle">
+        <Setter Property="Height" Value="1"/>
+        <Setter Property="Stroke" Value="{ThemeResource CardBorderBrush}" />
+    </Style>
 </ResourceDictionary>
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 cbc79c09bd..bb11ef9cef 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
@@ -30,289 +30,251 @@
                 </controls:Setting>
 
 
-
-            <TextBlock x:Uid="FancyZones_Editor_GroupSettings"
-                       Style="{StaticResource SettingsGroupTitleStyle}"
-                       Opacity="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
-
-            <Button Margin="{StaticResource SmallTopMargin}"
-                    Style="{StaticResource AccentButtonStyle}"
-                    Command = "{x:Bind ViewModel.LaunchEditorEventHandler}"
-                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
-                    AutomationProperties.LabeledBy="{Binding ElementName=FancyZones_LaunchEditorButtonControl}">
-                <StackPanel Orientation="Horizontal">
-                    <Viewbox Height="14" Width="14" Margin="-1,1,0,0">
-                        <PathIcon Data="M45,48H25.5V45H45V25.5H25.5v-3H45V3H25.5V0H48V48ZM22.5,48H3V45H22.5V3H3V0H25.5V48ZM0,48V0H3V48Z"/>
-                    </Viewbox>
-                    <TextBlock Margin="8,0,0,0"
-                               Name="FancyZones_LaunchEditorButtonControl"
-                               x:Uid="FancyZones_LaunchEditorButtonControl"/>
-                </StackPanel>
-            </Button>
-            
-            <controls:HotkeySettingsControl 
-                x:Uid="FancyZones_HotkeyEditorControl"
-                Margin="{StaticResource SmallTopMargin}"
-                HotkeySettings="{x:Bind Path=ViewModel.EditorHotkey, Mode=TwoWay}"
-                Keys="Win, Ctrl, Alt, Shift"
-                Enabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
-                HorizontalAlignment="Left"
-                MinWidth="240"
-                />
+                <controls:SettingsGroup x:Uid="FancyZones_Editor_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <Button Style="{StaticResource SettingButtonStyle}" Command="{x:Bind ViewModel.LaunchEditorEventHandler}">
+                        <controls:Setting x:Uid="FancyZones_LaunchEditorButtonControl" Style="{StaticResource ExpanderHeaderSettingStyle}" Icon="&#xF246;">
+                            <!--<controls:Setting.Icon>
+                                <PathIcon Data="M45,48H25.5V45H45V25.5H25.5v-3H45V3H25.5V0H48V48ZM22.5,48H3V45H22.5V3H3V0H25.5V48ZM0,48V0H3V48Z"/>
+                            </controls:Setting.Icon>-->
+                            <controls:Setting.ActionContent>
+                                <FontIcon Glyph="&#xE2B4;" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
+                            </controls:Setting.ActionContent>
+                        </controls:Setting>
+                    </Button>
 
 
 
-            <CheckBox x:Uid="FancyZones_UseCursorPosEditorStartupScreen"
-                      IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.UseCursorPosEditorStartupScreen}"
-                      Margin="{StaticResource SmallTopMargin}"
-                      IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"/>
+                    <muxc:Expander IsExpanded="True">
+                        <muxc:Expander.Header>
+                            <controls:Setting x:Uid="Activation_Shortcut" Icon="&#xEDA7;" Style="{StaticResource ExpanderHeaderSettingStyle}">
+                                <controls:Setting.Description>
+                                    <TextBlock>
+                                        <Run x:Uid="ShortcutWarningLabel"/>
+                                        <Run Text="Win, Ctrl, Alt, Shift"/>
+                                    </TextBlock>
+                                </controls:Setting.Description>
+                                <controls:Setting.ActionContent>
+                                    <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>
 
-            <TextBlock x:Uid="FancyZones_ZoneBehavior_GroupSettings"
-                       Style="{StaticResource SettingsGroupTitleStyle}"
-                       Opacity="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
-
-            <CheckBox x:Uid="FancyZones_ShiftDragCheckBoxControl_Header"
-                      IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.ShiftDrag}"
-                      Margin="{StaticResource XSmallTopMargin}"
-                      IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
-                      />
-
-            <CheckBox x:Uid="FancyZones_MouseDragCheckBoxControl_Header"
-                      IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.MouseSwitch}"
-                      Margin="{StaticResource XSmallTopMargin}"
-                      IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
-                      />
-            
-            <CheckBox x:Uid="FancyZones_ShowZonesOnAllMonitorsCheckBoxControl"
-                      IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.ShowOnAllMonitors}"
-                      Margin="{StaticResource XSmallTopMargin}"
-                      IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"/>
-
-            <CheckBox x:Uid="FancyZones_SpanZonesAcrossMonitorsCheckBoxControl"
-                      IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.SpanZonesAcrossMonitors}"
-                      Margin="{StaticResource XSmallTopMargin}"
-                      IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}" />
-
-            <ComboBox x:Uid="FancyZones_OverlappingZones"
-                      SelectedIndex="{x:Bind Path=ViewModel.OverlappingZonesAlgorithmIndex, Mode=TwoWay}"
-                      IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
-                      VerticalAlignment="Center"
-                      Width="{StaticResource MaxComboBoxWidth}"
-                      Margin="{StaticResource SmallTopMargin}">
-                <ComboBoxItem x:Uid="FancyZones_OverlappingZonesSmallest" />
-                <ComboBoxItem x:Uid="FancyZones_OverlappingZonesLargest" />
-                <ComboBoxItem x:Uid="FancyZones_OverlappingZonesPositional" />
-                <ComboBoxItem x:Uid="FancyZones_OverlappingZonesClosestCenter" />
-            </ComboBox>
-
-            <TextBlock x:Uid="FancyZones_WindowBehavior_GroupSettings"
-                       Style="{StaticResource SettingsGroupTitleStyle}"
-                       Opacity="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
-
-            <CheckBox x:Uid="FancyZones_OverrideSnapHotkeysCheckBoxControl"
-                      IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.OverrideSnapHotkeys}"
-                      Margin="{StaticResource XSmallTopMargin}"
-                      IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"/>
-
-            <RadioButton x:Uid="FancyZones_MoveWindowLeftRightBasedOnZoneIndex"
-                         GroupName="FancyZones_MoveWindowGroup"
-                         IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.MoveWindowsBasedOnZoneIndex}"
-                         Margin="24,8,0,0"
-                         IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SnapHotkeysCategoryEnabled}"/>
-
-            <RadioButton x:Uid="FancyZones_MoveWindowBasedOnRelativePosition"
-                         GroupName="FancyZones_MoveWindowGroup"
-                         IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.MoveWindowsBasedOnPosition}"
-                         Margin="24,8,0,0"
-                         IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SnapHotkeysCategoryEnabled}"/>
-
-            <CheckBox x:Uid="FancyZones_MoveWindowsAcrossAllMonitorsCheckBoxControl"
-                      IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.MoveWindowsAcrossMonitors}"
-                      Margin="24,8,0,0"
-                      IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SnapHotkeysCategoryEnabled}"/>
-            
-            <CheckBox x:Uid="FancyZones_DisplayChangeMoveWindowsCheckBoxControl"
-                      IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.DisplayChangeMoveWindows}"
-                      Margin="{StaticResource XSmallTopMargin}"
-                      IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
-                      />
-
-            <CheckBox x:Uid="FancyZones_ZoneSetChangeMoveWindows"
-                      IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.ZoneSetChangeMoveWindows}"
-                      Margin="{StaticResource XSmallTopMargin}"
-                      IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"/>
-
-            <CheckBox x:Uid="FancyZones_AppLastZoneMoveWindows"
-                      IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.AppLastZoneMoveWindows}"
-                      Margin="{StaticResource XSmallTopMargin}"
-                      IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"/>
-
-            <CheckBox x:Uid="FancyZones_OpenWindowOnActiveMonitor"
-                      IsChecked="{ Binding Mode=TwoWay, Path=OpenWindowOnActiveMonitor}"
-                      Margin="{StaticResource XSmallTopMargin}"
-                      IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}"/>
-
-            <CheckBox x:Uid="FancyZones_RestoreSize"
-                      IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.RestoreSize}"
-                      Margin="{StaticResource XSmallTopMargin}"
-                      IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"/>
+                        <muxc:Expander.Content>
+                            <StackPanel>
+                                <controls:Setting x:Uid="FancyZones_UseCursorPosEditorStartupScreen" Style="{StaticResource ExpanderContentSettingStyle}">
+                                    <controls:Setting.ActionContent>
+                                        <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.UseCursorPosEditorStartupScreen}" FlowDirection="RightToLeft" />
+                                    </controls:Setting.ActionContent>
+                                </controls:Setting>
+                            </StackPanel>
+                        </muxc:Expander.Content>
+                    </muxc:Expander>
+                </controls:SettingsGroup>
 
 
-            <TextBlock x:Uid="FancyZones_QuickLayoutSwitch_GroupSettings"
-                       Style="{StaticResource SettingsGroupTitleStyle}"
-                       Opacity="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
+                <controls:SettingsGroup x:Uid="FancyZones_Zones" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <muxc:Expander IsExpanded="True">
+                        <muxc:Expander.Header>
+                            <controls:Setting x:Uid="FancyZones_ZoneBehavior_GroupSettings" Icon="&#xE620;" Style="{StaticResource ExpanderHeaderSettingStyle}" />
+                        </muxc:Expander.Header>
+                        <muxc:Expander.Content>
+                            <StackPanel>
 
-            <CheckBox x:Uid="FancyZones_QuickLayoutSwitch"
-                      IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.QuickLayoutSwitch}"
-                      Margin="{StaticResource XSmallTopMargin}"
-                      IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"/>
+                                <CheckBox x:Uid="FancyZones_ShiftDragCheckBoxControl_Header" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.ShiftDrag}" Margin="{StaticResource ExpanderSettingMargin}"  />
+                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
+                                <CheckBox x:Uid="FancyZones_MouseDragCheckBoxControl_Header" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.MouseSwitch}" Margin="{StaticResource ExpanderSettingMargin}"  />
+                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
+                                <CheckBox x:Uid="FancyZones_ShowZonesOnAllMonitorsCheckBoxControl" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.ShowOnAllMonitors}" Margin="{StaticResource ExpanderSettingMargin}"  />
+                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
+                                <CheckBox x:Uid="FancyZones_SpanZonesAcrossMonitorsCheckBoxControl" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.SpanZonesAcrossMonitors}" Margin="{StaticResource ExpanderSettingMargin}"  />
+                               
+                                <controls:Setting  x:Uid="FancyZones_OverlappingZones" Style="{StaticResource ExpanderContentSettingStyle}">
+                                    <controls:Setting.ActionContent>
+                                        <ComboBox SelectedIndex="{x:Bind Path=ViewModel.OverlappingZonesAlgorithmIndex, Mode=TwoWay}">
+                                            <ComboBoxItem x:Uid="FancyZones_OverlappingZonesSmallest" />
+                                            <ComboBoxItem x:Uid="FancyZones_OverlappingZonesLargest" />
+                                            <ComboBoxItem x:Uid="FancyZones_OverlappingZonesPositional" />
+                                            <ComboBoxItem x:Uid="FancyZones_OverlappingZonesClosestCenter" />
+                                        </ComboBox>
+                                    </controls:Setting.ActionContent>
+                                </controls:Setting>
 
-            <CheckBox x:Uid="FancyZones_FlashZonesOnQuickSwitch"
-                      IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.FlashZonesOnQuickSwitch}"
-                      Margin="24,8,0,0"
-                      IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.QuickSwitchEnabled}"/>
+                                <controls:Setting x:Uid="FancyZones_HighlightOpacity" Style="{StaticResource ExpanderContentSettingStyle}">
+                                    <controls:Setting.ActionContent>
+                                        <Slider Minimum="0"
+                                            Maximum="100"
+                                            Width="240"
+                                            Value="{x:Bind Mode=TwoWay, Path=ViewModel.HighlightOpacity}"
+                                            HorizontalAlignment="Right"/>
+                                    </controls:Setting.ActionContent>
+                                </controls:Setting>
 
-            <TextBlock x:Uid="Appearance_GroupSettings"
-                       Style="{StaticResource SettingsGroupTitleStyle}"
-                       Opacity="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
+                                <controls:Setting  x:Uid="FancyZones_ZoneHighlightColor" Style="{StaticResource ExpanderContentSettingStyle}">
+                                    <controls:Setting.ActionContent>
+                                        <muxc:DropDownButton Padding="4,4,8,4">
+                                            <Border Width="48" CornerRadius="2" Height="24">
+                                                <Border.Background>
+                                                    <SolidColorBrush Color="{x:Bind Path=ViewModel.ZoneHighlightColor, Mode=TwoWay}"/>
+                                                </Border.Background>
+                                            </Border>
+                                            <muxc:DropDownButton.Flyout>
+                                                <Flyout>
+                                                    <muxc:ColorPicker IsColorSliderVisible="True"
+                                                                      IsColorChannelTextInputVisible="True"
+                                                                      IsHexInputVisible="True"
+                                                                      IsAlphaEnabled="False"
+                                                                      IsAlphaSliderVisible="False"
+                                                                      IsAlphaTextInputVisible="False"
+                                                                      Color="{x:Bind Path=ViewModel.ZoneHighlightColor, Mode=TwoWay}" />
+                                                </Flyout>
+                                            </muxc:DropDownButton.Flyout>
+                                        </muxc:DropDownButton>
+                                    </controls:Setting.ActionContent>
+                                </controls:Setting>
 
-            <CheckBox x:Uid="FancyZones_MakeDraggedWindowTransparentCheckBoxControl"
-                      IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.MakeDraggedWindowsTransparent}"
-                      Margin="{StaticResource XSmallTopMargin}"
-                      IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"/>
-            
-            <StackPanel Orientation="Horizontal" Margin="{StaticResource SmallTopMargin}" Spacing="12">
-                <Slider x:Uid="FancyZones_HighlightOpacity"
-                    Minimum="0"
-                    Maximum="100"
-                    MinWidth="240"
-                    IsThumbToolTipEnabled="False"
-                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.HighlightOpacity}"
-                    HorizontalAlignment="Left"
-                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"/>
 
-                <TextBlock
-                       Text="{x:Bind Mode=OneWay, Path=ViewModel.HighlightOpacity, Converter={StaticResource StringFormatConverter}, ConverterParameter=' {0}%' }"
-                       VerticalAlignment="Center"
-                       FontWeight="SemiBold"
-                       FontSize="16"
-                       Margin="0,16,0,0"
-                       Opacity="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
+                                <controls:Setting  x:Uid="FancyZones_InActiveColor" Style="{StaticResource ExpanderContentSettingStyle}">
+                                    <controls:Setting.ActionContent>
+                                        <muxc:DropDownButton Padding="4,4,8,4">
+                                            <Border Width="48" CornerRadius="2" Height="24">
+                                                <Border.Background>
+                                                    <SolidColorBrush Color="{x:Bind Path=ViewModel.ZoneInActiveColor, Mode=TwoWay}"/>
+                                                </Border.Background>
+                                            </Border>
+                                            <muxc:DropDownButton.Flyout>
+                                                <Flyout>
+                                                    <muxc:ColorPicker IsColorSliderVisible="True"
+                                                                      IsColorChannelTextInputVisible="True"
+                                                                      IsHexInputVisible="True"
+                                                                      IsAlphaEnabled="False"
+                                                                      IsAlphaSliderVisible="False"
+                                                                      IsAlphaTextInputVisible="False"
+                                                                      Color="{x:Bind Path=ViewModel.ZoneInActiveColor, Mode=TwoWay}" />
+                                                </Flyout>
+                                            </muxc:DropDownButton.Flyout>
+                                        </muxc:DropDownButton>
+                                    </controls:Setting.ActionContent>
+                                </controls:Setting>
 
+                                <controls:Setting  x:Uid="FancyZones_BorderColor" Style="{StaticResource ExpanderContentSettingStyle}">
+                                    <controls:Setting.ActionContent>
+                                        <muxc:DropDownButton Padding="4,4,8,4">
+                                            <Border Width="48" CornerRadius="2" Height="24">
+                                                <Border.Background>
+                                                    <SolidColorBrush Color="{x:Bind Path=ViewModel.ZoneBorderColor, Mode=TwoWay}"/>
+                                                </Border.Background>
+                                            </Border>
+                                            <muxc:DropDownButton.Flyout>
+                                                <Flyout>
+                                                    <muxc:ColorPicker IsColorSliderVisible="True"
+                                                                      IsColorChannelTextInputVisible="True"
+                                                                      IsHexInputVisible="True"
+                                                                      IsAlphaEnabled="False"
+                                                                      IsAlphaSliderVisible="False"
+                                                                      IsAlphaTextInputVisible="False"
+                                                                      Color="{x:Bind Path=ViewModel.ZoneBorderColor, Mode=TwoWay}" />
+                                                </Flyout>
+                                            </muxc:DropDownButton.Flyout>
+                                        </muxc:DropDownButton>
+                                    </controls:Setting.ActionContent>
+                                </controls:Setting>
+
+                            </StackPanel>
+                        </muxc:Expander.Content>
+                    </muxc:Expander>
+                </controls:SettingsGroup>
+
+                
+                <controls:SettingsGroup x:Uid="FancyZones_Windows" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+
+                    <muxc:Expander IsExpanded="True">
+                        <muxc:Expander.Header>
+                            <controls:Setting x:Uid="FancyZones_WindowBehavior_GroupSettings" Icon="&#xE737;" Style="{StaticResource ExpanderHeaderSettingStyle}" />
+                        </muxc:Expander.Header>
+                        <muxc:Expander.Content>
+                            <StackPanel>
+                                <CheckBox x:Uid="FancyZones_DisplayChangeMoveWindowsCheckBoxControl" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.DisplayChangeMoveWindows}" Margin="{StaticResource ExpanderSettingMargin}"/>
+                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
+                                <CheckBox x:Uid="FancyZones_ZoneSetChangeMoveWindows" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.ZoneSetChangeMoveWindows}" Margin="{StaticResource ExpanderSettingMargin}"/>
+                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
+                                <CheckBox x:Uid="FancyZones_AppLastZoneMoveWindows" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.AppLastZoneMoveWindows}" Margin="{StaticResource ExpanderSettingMargin}"/>
+                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
+                                <CheckBox x:Uid="FancyZones_OpenWindowOnActiveMonitor" IsChecked="{ Binding Mode=TwoWay, Path=OpenWindowOnActiveMonitor}" Margin="{StaticResource ExpanderSettingMargin}"/>
+                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
+                                <CheckBox x:Uid="FancyZones_RestoreSize" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.RestoreSize}" Margin="{StaticResource ExpanderSettingMargin}"/>
+                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
+                                <CheckBox x:Uid="FancyZones_MakeDraggedWindowTransparentCheckBoxControl" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.MakeDraggedWindowsTransparent}"/>
+                            </StackPanel>
+
+                        </muxc:Expander.Content>
+                    </muxc:Expander>
+
+                    <muxc:Expander IsExpanded="True">
+                        <muxc:Expander.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>
+
+                        <muxc:Expander.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}"/>
+                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
+                                <CheckBox x:Uid="FancyZones_MoveWindowsAcrossAllMonitorsCheckBoxControl" Margin="56,8,16,8"
+                                              IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.MoveWindowsAcrossMonitors}"
+                                              IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SnapHotkeysCategoryEnabled}"/>
+                            </StackPanel>
+                        </muxc:Expander.Content>
+                    </muxc:Expander>
+                </controls:SettingsGroup>
+
+                <controls:SettingsGroup x:Uid="FancyZones_Layouts" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <muxc:Expander IsExpanded="True">
+                        <muxc:Expander.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>
+
+                        <muxc:Expander.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:SettingsGroup>
+
+
+
+
+
+
+                <controls:SettingsGroup x:Uid="ExcludedApps" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <muxc:Expander IsExpanded="True">
+                        <muxc:Expander.Header>
+                            <controls:Setting x:Uid="FancyZones_ExcludeApps" Icon="&#xE103;" Style="{StaticResource ExpanderHeaderSettingStyle}"/>
+                        </muxc:Expander.Header>
+                        <muxc:Expander.Content>
+                            <TextBox x:Uid="FancyZones_ExcludeApps_TextBoxControl"
+                                 Margin="{StaticResource ExpanderSettingMargin}"
+                                         Text="{x:Bind Mode=TwoWay, Path=ViewModel.ExcludedApps, UpdateSourceTrigger=PropertyChanged}"
+                                         ScrollViewer.VerticalScrollBarVisibility ="Visible"
+                                         ScrollViewer.VerticalScrollMode="Enabled"
+                                         ScrollViewer.IsVerticalRailEnabled="True"
+                                         TextWrapping="Wrap"
+                                         AcceptsReturn="True"
+                                         MinWidth="240"
+                                         MinHeight="160" />
+                        </muxc:Expander.Content>
+                    </muxc:Expander>
+                </controls:SettingsGroup>
             </StackPanel>
 
-            <TextBlock Name="FancyZones_ZoneHighlightColor"
-                x:Uid="FancyZones_ZoneHighlightColor"
-                Margin="{StaticResource SmallTopMargin}"
-                Opacity="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
-
-            <muxc:DropDownButton Margin="0,4,0,0"
-                                 IsEnabled="{x:Bind Mode=TwoWay, Path=ViewModel.IsEnabled}"
-                                 Padding="4,4,8,4"
-                                 AutomationProperties.LabeledBy="{Binding ElementName=FancyZones_ZoneHighlightColor}">
-                <Border Width="48"
-                        CornerRadius="2"
-                        Height="24">
-                    <Border.Background>
-                        <SolidColorBrush Color="{x:Bind Path=ViewModel.ZoneHighlightColor, Mode=TwoWay}"/>
-                    </Border.Background>
-                </Border>
-                <muxc:DropDownButton.Flyout>
-                    <Flyout>
-                        <muxc:ColorPicker x:Name="FancyZones_ZoneHighlightColorPicker"
-                              Margin="0,6,0,0"
-                              HorizontalAlignment="Left"
-                              IsColorSliderVisible="True"
-                              IsColorChannelTextInputVisible="True"
-                              IsHexInputVisible="True"
-                              IsAlphaEnabled="False"
-                              IsAlphaSliderVisible="False"
-                              IsAlphaTextInputVisible="False"
-                              Color="{x:Bind Path=ViewModel.ZoneHighlightColor, Mode=TwoWay}"
-                              />
-                    </Flyout>
-                </muxc:DropDownButton.Flyout>
-
-            </muxc:DropDownButton>
-
-            <TextBlock Name="FancyZones_InActiveColor"
-                x:Uid="FancyZones_InActiveColor"
-                Margin="{StaticResource SmallTopMargin}"
-                Opacity="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
-
-            <muxc:DropDownButton Margin="0,4,0,0"
-                                 IsEnabled="{x:Bind Mode=TwoWay, Path=ViewModel.IsEnabled}"
-                                 Padding="4,4,8,4"
-                                 AutomationProperties.LabeledBy="{Binding ElementName=FancyZones_InActiveColor}">
-                <Border Width="48" CornerRadius="2" Height="24">
-                    <Border.Background>
-                        <SolidColorBrush Color="{x:Bind Path=ViewModel.ZoneInActiveColor, Mode=TwoWay}"/>
-                    </Border.Background>
-                </Border>
-                <muxc:DropDownButton.Flyout>
-                    <Flyout>
-                        <muxc:ColorPicker x:Name="FancyZones_InActiveColorPicker"
-                              Margin="0,6,0,0"
-                              IsColorSliderVisible="True"
-                              IsColorChannelTextInputVisible="True"
-                              IsHexInputVisible="True"
-                              IsAlphaEnabled="False"
-                              IsAlphaSliderVisible="False"
-                              IsAlphaTextInputVisible="False"
-                              Color="{x:Bind Path=ViewModel.ZoneInActiveColor, Mode=TwoWay}"/>
-                    </Flyout>
-                </muxc:DropDownButton.Flyout>
-            </muxc:DropDownButton>
-
-            <TextBlock Name="FancyZones_BorderColor"
-                x:Uid="FancyZones_BorderColor"
-                Margin="{StaticResource SmallTopMargin}"
-                Opacity="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
-
-            <muxc:DropDownButton Margin="0,4,0,0"
-                                 IsEnabled="{x:Bind Mode=TwoWay, Path=ViewModel.IsEnabled}"
-                                 Padding="4,4,8,4"
-                                 AutomationProperties.LabeledBy="{Binding ElementName=FancyZones_BorderColor}">
-                <Border Width="48" CornerRadius="2" Height="24">
-                    <Border.Background>
-                        <SolidColorBrush Color="{x:Bind Path=ViewModel.ZoneBorderColor, Mode=TwoWay}"/>
-                    </Border.Background>
-                </Border>
-                <muxc:DropDownButton.Flyout>
-                    <Flyout>
-                        <muxc:ColorPicker x:Name="FancyZones_BorderColorPicker"
-                              Margin="0,6,0,0"
-                              HorizontalAlignment="Left"
-                              IsColorSliderVisible="True"                             
-                              IsColorChannelTextInputVisible="True"
-                              IsHexInputVisible="True"
-                              IsAlphaEnabled="False"
-                              IsAlphaSliderVisible="False"
-                              IsAlphaTextInputVisible="False"
-                              Color="{x:Bind  Path=ViewModel.ZoneBorderColor, Mode=TwoWay}"
-                              IsEnabled="{x:Bind Mode=TwoWay, Path=ViewModel.IsEnabled}"/>
-                    </Flyout>
-                </muxc:DropDownButton.Flyout>
-            </muxc:DropDownButton>
-
-            <TextBlock x:Uid="FancyZones_ExcludeApps"
-                       Style="{StaticResource SettingsGroupTitleStyle}"
-                       Opacity="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
-
-            <TextBox x:Uid="FancyZones_ExcludeApps_TextBoxControl"
-                     Margin="{StaticResource SmallTopMargin}"
-                     Text="{x:Bind Mode=TwoWay, Path=ViewModel.ExcludedApps, UpdateSourceTrigger=PropertyChanged}"
-                     IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
-                     ScrollViewer.VerticalScrollBarVisibility ="Visible"
-                     ScrollViewer.VerticalScrollMode="Enabled"
-                     ScrollViewer.IsVerticalRailEnabled="True"
-                     TextWrapping="Wrap"
-                     AcceptsReturn="True"
-                     HorizontalAlignment="Left"
-                     MinWidth="240"
-                     MinHeight="160" />
-        </StackPanel>
-
         
 </controls:SettingsPageControl.ModuleContent>
 
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
index 9e2feb8385..0afeea0b5a 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
@@ -96,7 +96,7 @@
                     <Button Style="{StaticResource SettingButtonStyle}" Command="{Binding Path=RemapKeyboardCommand}">
                         <controls:Setting x:Uid="KeyboardManager_RemapKeyboardButton" Style="{StaticResource ExpanderHeaderSettingStyle}" Icon="&#xE92E;">
                             <controls:Setting.ActionContent>
-                                <FontIcon Glyph="&#xE8A7;" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
+                                <FontIcon Glyph="&#xE2B4;" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
                             </controls:Setting.ActionContent>
                         </controls:Setting>
                     </Button>
@@ -154,7 +154,7 @@
                     <Button Style="{StaticResource SettingButtonStyle}" Command="{Binding Path=EditShortcutCommand}">
                         <controls:Setting x:Uid="KeyboardManager_RemapShortcutsButton" Style="{StaticResource ExpanderHeaderSettingStyle}" Icon="&#xE92E;">
                             <controls:Setting.ActionContent>
-                                <FontIcon Glyph="&#xE8A7;" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
+                                <FontIcon Glyph="&#xE2B4;" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
                             </controls:Setting.ActionContent>
                         </controls:Setting>
                     </Button>
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 4656c5668f..cc1d773d22 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
@@ -77,12 +77,16 @@
                             </StackPanel>
                         </muxc:Expander.Content>
                     </muxc:Expander>
+                </controls:SettingsGroup>
+
+                <controls:SettingsGroup x:Uid="ExcludedApps" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
                     <muxc:Expander IsExpanded="True">
                         <muxc:Expander.Header>
-                            <controls:Setting x:Uid="ShortcutGuide_DisabledApps" Style="{StaticResource ExpanderHeaderSettingStyle}"/>
+                            <controls:Setting x:Uid="ShortcutGuide_DisabledApps" Icon="&#xE103;" Style="{StaticResource ExpanderHeaderSettingStyle}"/>
                         </muxc:Expander.Header>
                         <muxc:Expander.Content>
                             <TextBox x:Uid="ShortcutGuide_DisabledApps_TextBoxControl"
+                                     Margin="{StaticResource ExpanderSettingMargin}"
                                          Text="{x:Bind Mode=TwoWay, Path=ViewModel.DisabledApps, UpdateSourceTrigger=PropertyChanged}"
                                          ScrollViewer.VerticalScrollBarVisibility ="Visible"
                                          ScrollViewer.VerticalScrollMode="Enabled"