diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/FancyZones.gif b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/FancyZones.gif
index 6395240d4f..4aff05b304 100644
Binary files a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/FancyZones.gif and b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/FancyZones.gif differ
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/ImageResizer.gif b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/ImageResizer.gif
index 530bde6396..d16ec075cb 100644
Binary files a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/ImageResizer.gif and b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/ImageResizer.gif differ
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/KBM.gif b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/KBM.gif
index 719ca4436f..5eccb90b20 100644
Binary files a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/KBM.gif and b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/KBM.gif differ
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/PowerRename.gif b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/PowerRename.gif
index 417c776503..25dcbcb299 100644
Binary files a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/PowerRename.gif and b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/PowerRename.gif differ
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/KeyVisual/KeyVisual.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/KeyVisual/KeyVisual.xaml
index 3237b7f7c2..df88c48728 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/KeyVisual/KeyVisual.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/KeyVisual/KeyVisual.xaml
@@ -25,10 +25,10 @@
                                 <VisualState x:Name="Normal"/>
                                 <VisualState x:Name="Disabled">
                                     <VisualState.Setters>
-                                        <!--<Setter Target="ContentHolder.Fill" Value="{ThemeResource AccentButtonBackgroundDisabled}" />
+                                        <Setter Target="ContentHolder.Fill" Value="{ThemeResource AccentButtonBackgroundDisabled}" />
                                         <Setter Target="KeyPresenter.Foreground" Value="{ThemeResource AccentButtonForegroundDisabled}" />
                                         <Setter Target="ContentHolder.Stroke" Value="{ThemeResource AccentButtonBorderBrushDisabled}" />
-                                        <Setter Target="ContentHolder.StrokeThickness" Value="{TemplateBinding BorderThickness}" />-->
+                                        <!--<Setter Target="ContentHolder.StrokeThickness" Value="{TemplateBinding BorderThickness}" />-->
                                     </VisualState.Setters>
                                 </VisualState>
                             </VisualStateGroup>
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 49c4122c0f..6cf6e60b8e 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
@@ -82,11 +82,9 @@
                                             <Setter Property="TextWrapping" Value="WrapWholeWords"/>
                                         </Style.Setters>
                                     </Style>
-                                    <Style TargetType="HyperlinkButton" BasedOn="{StaticResource TextBlockButtonStyle}">
+                                    <Style TargetType="HyperlinkButton" BasedOn="{StaticResource TextButtonStyle}">
                                         <Style.Setters>
-                                            <Setter Property="FontWeight" Value="SemiBold"/>
                                             <Setter Property="FontSize" Value="12"/>
-                                            <Setter Property="Margin" Value="0"/>
                                             <Setter Property="Padding" Value="0,0,0,0"/>
                                         </Style.Setters>
                                     </Style>
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
index 4d8aabcbd9..7b4ae00c50 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SettingExpander/SettingExpander.cs
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SettingExpander/SettingExpander.cs
@@ -10,6 +10,7 @@ using System.Threading.Tasks;
 using Microsoft.UI.Xaml.Controls;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Automation;
+using Windows.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Controls
 {
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SettingsPageControl/SettingsPageControl.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SettingsPageControl/SettingsPageControl.xaml
index a4c606f286..0e2f465ac2 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SettingsPageControl/SettingsPageControl.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SettingsPageControl/SettingsPageControl.xaml
@@ -10,12 +10,6 @@
 
     <UserControl.Resources>
         <converters:DoubleToVisibilityConverter x:Name="doubleToVisibilityConverter" GreaterThan="0" TrueValue="Visible" FalseValue="Collapsed" />
-        <Style TargetType="HyperlinkButton" BasedOn="{StaticResource TextBlockButtonStyle}">
-            <Style.Setters>
-                <Setter Property="FontWeight" Value="SemiBold"/>
-                <Setter Property="Margin" Value="0,0,16,0"/>
-            </Style.Setters>
-        </Style>
     </UserControl.Resources>
 
     <Grid RowSpacing="24" Padding="20,0,0,0">
@@ -67,14 +61,14 @@
                         <ItemsControl ItemsSource="{x:Bind PrimaryLinks}" Margin="0,8,0,0">
                             <ItemsControl.ItemTemplate>
                                 <DataTemplate x:DataType="local:PageLink">
-                                    <HyperlinkButton NavigateUri="{x:Bind Link}">
+                                    <HyperlinkButton NavigateUri="{x:Bind Link}" Style="{StaticResource TextButtonStyle}">
                                         <TextBlock Text="{x:Bind Text}" TextWrapping="Wrap" />
                                     </HyperlinkButton>
                                 </DataTemplate>
                             </ItemsControl.ItemTemplate>
                             <ItemsControl.ItemsPanel>
                                 <ItemsPanelTemplate>
-                                    <controls:WrapPanel Orientation="Horizontal" HorizontalSpacing="8"/>
+                                    <controls:WrapPanel Orientation="Horizontal" HorizontalSpacing="24"/>
                                 </ItemsPanelTemplate>
                             </ItemsControl.ItemsPanel>
                         </ItemsControl>
@@ -103,14 +97,14 @@
                     <ItemsControl x:Name="SecondaryLinksItemControl" Margin="2,0,0,0" ItemsSource="{x:Bind SecondaryLinks}">
                         <ItemsControl.ItemTemplate>
                             <DataTemplate x:DataType="local:PageLink">
-                                <HyperlinkButton NavigateUri="{x:Bind Link}">
+                                <HyperlinkButton NavigateUri="{x:Bind Link}" Style="{StaticResource TextButtonStyle}">
                                     <TextBlock Text="{x:Bind Text}" TextWrapping="Wrap" />
                                 </HyperlinkButton>
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
                         <ItemsControl.ItemsPanel>
                             <ItemsPanelTemplate>
-                                <controls:WrapPanel Orientation="Horizontal" HorizontalSpacing="8"/>
+                                <controls:WrapPanel Orientation="Horizontal" HorizontalSpacing="24"/>
                             </ItemsPanelTemplate>
                         </ItemsControl.ItemsPanel>
                     </ItemsControl>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
index 9796a39d7a..c501117fb4 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
@@ -68,26 +68,17 @@
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="*" />
                     </Grid.ColumnDefinitions>
-                    <!-- To do: replace with InfoBadge once we move towards WinUI 2.7 -->
-                    <Grid VerticalAlignment="Center" Margin="2,0,12,0" AutomationProperties.AccessibilityView="Raw">
-                        <TextBlock x:Name="IconBackground"
-                                                                        VerticalAlignment="Center"
-                                                                       FontSize="{StaticResource InfoBarIconFontSize}"
-                                                                       Text="{StaticResource InfoBarIconBackgroundGlyph}"
-                                                                       Foreground="{ThemeResource InfoBarErrorSeverityIconBackground}"
-                                                                       FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                                                       AutomationProperties.AccessibilityView="Raw" />
-
-                        <TextBlock x:Name="StandardIcon"
-                                                                       FontSize="{StaticResource InfoBarIconFontSize}"
-                                                                       Text="{StaticResource InfoBarErrorIconGlyph}"
-                                                                       Foreground="{ThemeResource InfoBarErrorSeverityIconForeground}"
-                                                                       FontFamily="{ThemeResource SymbolThemeFontFamily}"/>
-                    </Grid>
 
+                        <muxc:InfoBadge AutomationProperties.AccessibilityView="Raw"
+                                        Margin="2,0,12,0"
+                                        Style="{StaticResource CriticalIconInfoBadgeStyle}" />
+                    
+                        
 
                     <TextBlock x:Name="InvalidShortcutWarningLabel"
                                x:Uid="InvalidShortcut"
+                               VerticalAlignment="Center"
+                               Margin="0,-1,0,0"
                                Foreground="{ThemeResource InfoBarTitleForeground}"
                                FontWeight="{ThemeResource InfoBarTitleFontWeight}"
                                Grid.Column="1" />
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeAwake.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeAwake.xaml
index a40da244ed..340e3efa6b 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeAwake.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeAwake.xaml
@@ -27,9 +27,10 @@
                 <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
                     <Button x:Uid="OOBE_Settings"
                             Click="SettingsLaunchButton_Click"/>
-                    <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource HyperlinkButtonStyle}">
+                    <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
+                                     Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_Awake"
-                               TextWrapping="Wrap" />
+                                   TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeColorPicker.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeColorPicker.xaml
index cd0cfa4b74..7d108a56a4 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeColorPicker.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeColorPicker.xaml
@@ -30,7 +30,7 @@
                     <Button x:Uid="Launch_ColorPicker" Style="{StaticResource AccentButtonStyle}" Click="Start_ColorPicker_Click"/>
                     <Button x:Uid="OOBE_Settings"
                             Click="SettingsLaunchButton_Click"/>
-                    <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource HyperlinkButtonStyle}">
+                    <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_ColorPicker"
                                TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFancyZones.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFancyZones.xaml
index 8e15723866..ed41a0c739 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFancyZones.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFancyZones.xaml
@@ -29,7 +29,7 @@
                 <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
                     <Button x:Uid="OOBE_Settings"
                             Click="SettingsLaunchButton_Click"/>
-                    <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource HyperlinkButtonStyle}">
+                    <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_FancyZones"
                                TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFileExplorer.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFileExplorer.xaml
index 7e5962726a..6484fa1bc4 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFileExplorer.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFileExplorer.xaml
@@ -22,7 +22,7 @@
                 <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
                     <Button x:Uid="OOBE_Settings"
                             Click="SettingsLaunchButton_Click"/>
-                    <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource HyperlinkButtonStyle}">
+                    <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_PowerPreview"
                                TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeImageResizer.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeImageResizer.xaml
index f236c70c6b..482c825550 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeImageResizer.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeImageResizer.xaml
@@ -28,7 +28,7 @@
                 <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
                     <Button x:Uid="OOBE_Settings"
                             Click="SettingsLaunchButton_Click"/>
-                    <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource HyperlinkButtonStyle}">
+                    <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_ImageResizer"
                                TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeKBM.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeKBM.xaml
index 65f1096f76..c44c3c6245 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeKBM.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeKBM.xaml
@@ -25,7 +25,7 @@
                 <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
                     <Button x:Uid="OOBE_Settings"
                             Click="SettingsLaunchButton_Click"/>
-                    <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource HyperlinkButtonStyle}">
+                    <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_KBM"
                                TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeOverview.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeOverview.xaml
index f98508ddab..bcf55670e9 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeOverview.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeOverview.xaml
@@ -15,12 +15,12 @@
                 <TextBlock Margin="0,4,0,8"
                            x:Uid="Oobe_Overview_Description"
                            TextWrapping="Wrap"/>
-                <HyperlinkButton NavigateUri="{x:Bind ViewModel.DescriptionLink}" Style="{StaticResource HyperlinkButtonStyle}">
+                <HyperlinkButton NavigateUri="{x:Bind ViewModel.DescriptionLink}" Style="{StaticResource TextButtonStyle}">
                     <TextBlock x:Uid="Oobe_Overview_DescriptionLinkText"
                                TextWrapping="Wrap" />
                 </HyperlinkButton>
 
-                <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource HyperlinkButtonStyle}">
+                <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource TextButtonStyle}">
                     <TextBlock x:Uid="Oobe_Overview_LatestVersionLink"
                                TextWrapping="Wrap" />
                 </HyperlinkButton>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobePowerRename.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobePowerRename.xaml
index 2a43a2190f..5add2efb2e 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobePowerRename.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobePowerRename.xaml
@@ -26,7 +26,7 @@
                 <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
                     <Button x:Uid="OOBE_Settings"
                             Click="SettingsLaunchButton_Click"/>
-                    <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource HyperlinkButtonStyle}">
+                    <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_PowerRename"
                                TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeRun.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeRun.xaml
index 5853ace56a..4f169c1aba 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeRun.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeRun.xaml
@@ -28,7 +28,7 @@
                     <Button x:Uid="Launch_Run" Style="{StaticResource AccentButtonStyle}" Click="Start_Run_Click"/>
                     <Button x:Uid="OOBE_Settings"
                             Click="SettingsLaunchButton_Click"/>
-                    <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource HyperlinkButtonStyle}">
+                    <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_Run"
                                TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShortcutGuide.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShortcutGuide.xaml
index 62835deff5..ff90e31d1e 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShortcutGuide.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShortcutGuide.xaml
@@ -23,7 +23,7 @@
                     <Button x:Uid="Launch_ShortcutGuide" Style="{StaticResource AccentButtonStyle}" Click="Start_ShortcutGuide_Click"/>
                     <Button x:Uid="OOBE_Settings"
                             Click="SettingsLaunchButton_Click"/>
-                    <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource HyperlinkButtonStyle}">
+                    <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_ShortcutGuide"
                                TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeVideoConference.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeVideoConference.xaml
index 5b65d26ff6..ba60ae686e 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeVideoConference.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeVideoConference.xaml
@@ -27,7 +27,7 @@
                 <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
                     <Button x:Uid="OOBE_Settings"
                             Click="SettingsLaunchButton_Click"/>
-                    <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource HyperlinkButtonStyle}">
+                    <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_VCM"
                                TextWrapping="Wrap" />
                     </HyperlinkButton>
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 09e1f3aba8..42d9c3ad1b 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
@@ -609,7 +609,7 @@
     <value>Zone inactive color</value>
   </data>
   <data name="ShortcutGuide.ModuleDescription" xml:space="preserve">
-    <value>Shows a help overlay with Windows shortcuts when the Windows key is pressed.</value>
+    <value>Shows a help overlay with Windows shortcuts.</value>
   </data>
   <data name="ShortcutGuide_PressTime.Header" xml:space="preserve">
     <value>Press duration before showing (ms)</value>
@@ -638,6 +638,15 @@
   <data name="ImageResizer_CustomSizes.Header" xml:space="preserve">
     <value>Image sizes</value>
   </data>
+  <data name="ImageResizer_Presets.Header" xml:space="preserve">
+    <value>Presets</value>
+  </data>
+  <data name="ImageResizer_Presets.Description" xml:space="preserve">
+    <value>Manage preset sizes that can be used in the editor</value>
+  </data>
+  <data name="ImageResizer_FilenameFormatHeader.Description" xml:space="preserve">
+    <value>This format is used as the filename for resized images</value>
+  </data>
   <data name="ImageResizer.ModuleDescription" xml:space="preserve">
     <value>Lets you resize images by right-clicking.</value>
   </data>
@@ -863,8 +872,11 @@
   <data name="ImageResizer_FilenameFormatHeader.Header" xml:space="preserve">
     <value>Filename format</value>
   </data>
-  <data name="ImageResizer_UseOriginalDate.Content" xml:space="preserve">
+  <data name="ImageResizer_UseOriginalDate.Header" xml:space="preserve">
     <value>Use original date modified</value>
+  </data>
+    <data name="ImageResizer_UseOriginalDate.Description" xml:space="preserve">
+    <value>Keep the original modified date of the file (instead of the resize date)</value>
   </data>
   <data name="Encoding.Header" xml:space="preserve">
     <value>Encoding</value>
@@ -934,7 +946,7 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
     <value>Example: %1 (%2)</value>
   </data>
   <data name="ColorModeHeader.Header" xml:space="preserve">
-    <value>Choose a mode</value>
+    <value>App theme</value>
   </data>
   <data name="Radio_Theme_Dark.Content" xml:space="preserve">
     <value>Dark</value>
@@ -1096,9 +1108,12 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
     <value>Authored by</value>
     <comment>example: Authored by Microsoft</comment>
   </data>
-  <data name="PowerLauncher_IncludeInGlobalResult.Content" xml:space="preserve">
+  <data name="PowerLauncher_IncludeInGlobalResultTitle.Text" xml:space="preserve">
     <value>Include in global result</value>
   </data>
+  <data name="PowerLauncher_IncludeInGlobalResultDescription.Text" xml:space="preserve">
+    <value>Show results on queries without direct activation command</value>
+  </data>
   <data name="PowerLauncher_EnablePluginToggle.AutomationProperties.Name" xml:space="preserve">
     <value>Enable plugin</value>
   </data>
@@ -1192,7 +1207,7 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
     <value>Learn more about</value>
   </data>
   <data name="Oobe_ColorPicker_Description" xml:space="preserve">
-    <value>Color Picker is a system-wide color selection tool for Windows 10 that enables you to pick colors from any currently running application and automatically copies it in a configurable format to your clipboard.</value>
+    <value>Color Picker is a system-wide color selection tool for Windows that enables you to pick colors from any currently running application and automatically copies it in a configurable format to your clipboard.</value>
   </data>
   <data name="Oobe_FancyZones_Description" xml:space="preserve">
     <value>FancyZones is a window manager that makes it easy to create complex window layouts and quickly position windows into those layouts.</value>
@@ -1219,7 +1234,7 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
     <value>Video Conference Mute allows users to quickly mute the microphone and turn off the camera while on a conference call with a single keystroke, regardless of what application has focus on your computer.</value>
   </data>
   <data name="Oobe_Overview_Description.Text" xml:space="preserve">
-    <value>Microsoft PowerToys is a set of utilities for power users to tune and streamline their Windows 10 experience for greater productivity.
+    <value>Microsoft PowerToys is a set of utilities for power users to tune and streamline their Windows experience for greater productivity.
     
 Take a moment to preview the various utilities listed or view our comprehensive documentation.</value>
   </data>
@@ -1480,7 +1495,7 @@ From there, simply click on a Markdown file, PDF file or SVG icon in the File Ex
     <value>See what's new</value>
   </data>
   <data name="Awake_Mode.Description" xml:space="preserve">
-    <value>Set the preferred behaviour or Awake</value>
+    <value>Set the preferred behaviour of Awake</value>
   </data>
   <data name="ExcludedApps.Header" xml:space="preserve">
     <value>Excluded apps</value>
@@ -1603,6 +1618,6 @@ From there, simply click on a Markdown file, PDF file or SVG icon in the File Ex
     <value>Only shortcuts that start with **Windows key**, **Ctrl**, **Alt** or **Shift** are valid.</value>
   </data>
   <data name="FancyZones_SpanZonesAcrossMonitorsPrerequisites.Text" xml:space="preserve">
-    <value>All monitors must have the same DPI scaling and will be treated as one large combined rectangle which contains all monitors.</value>
+    <value>All monitors must have the same DPI scaling and will be treated as one large combined rectangle which contains all monitors</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 dc5ac5d8d4..7b3b846466 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/Button.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/Button.xaml
@@ -12,11 +12,84 @@
         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
     </Style>
 
-    <Style x:Key="HyperlinkButtonStyle" TargetType="HyperlinkButton" BasedOn="{StaticResource TextBlockButtonStyle}">
-        <Style.Setters>
-            <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="Margin" Value="0,0,0,0"/>
-        </Style.Setters>
+    <Style x:Key="HyperlinkButtonStyle" TargetType="HyperlinkButton" >
+    </Style>
+
+    <Style x:Key="TextButtonStyle" TargetType="ButtonBase">
+        <Setter Property="Background" Value="{ThemeResource HyperlinkButtonBackground}" />
+        <Setter Property="Foreground" Value="{ThemeResource HyperlinkButtonForeground}" />
+        <Setter Property="MinWidth" Value="0" />
+        <Setter Property="MinHeight" Value="0" />
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ButtonBase">
+                    <Grid Margin="{TemplateBinding Padding}" CornerRadius="4" Background="{TemplateBinding Background}">
+                        <ContentPresenter x:Name="Text"
+                                          Content="{TemplateBinding Content}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          FontWeight="SemiBold"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+
+                                <VisualState x:Name="PointerOver">
+
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonForegroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBackgroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBorderBrushPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="Pressed">
+
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonForegroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBackgroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBorderBrushPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="Disabled">
+
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBackgroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBorderBrushDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+
+                            </VisualStateGroup>
+
+                        </VisualStateManager.VisualStateGroups>
+
+                    </Grid>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
     </Style>
 
     <!-- This style overrides the default style so that all ToggleSwitches are right aligned, with the label on the left -->
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 0200fbdca0..f562d8cd32 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
@@ -44,8 +44,11 @@
                                 <RadioButton.Content>
                                     <StackPanel>
                                         <TextBlock x:Uid="ColorPickerFirst"/>
-                                        <TextBlock x:Uid="ColorPickerFirst_Description" Style="{StaticResource SecondaryTextStyle}"/>
-                                    </StackPanel>
+                                            <controls:TextBlockControl x:Uid="ColorPickerFirst_Description" 
+                                                                       FontSize="{StaticResource SecondaryTextFontSize}"
+                                                                       EnabledForeground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                                       DisabledForeground="{ThemeResource TextFillColorDisabledBrush}"/>
+                                        </StackPanel>
                                 </RadioButton.Content>
                             </RadioButton>
 
@@ -53,7 +56,10 @@
                                 <RadioButton.Content>
                                     <StackPanel>
                                         <TextBlock x:Uid="EditorFirst"/>
-                                        <TextBlock x:Uid="EditorFirst_Description" Style="{StaticResource SecondaryTextStyle}"/>
+                                            <controls:TextBlockControl x:Uid="EditorFirst_Description" 
+                                                                       FontSize="{StaticResource SecondaryTextFontSize}"
+                                                                       EnabledForeground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                                       DisabledForeground="{ThemeResource TextFillColorDisabledBrush}"/>
                                     </StackPanel>
                                 </RadioButton.Content>
                             </RadioButton>
@@ -61,9 +67,12 @@
                             <RadioButton x:Uid="ColorPickerOnly_Accessible" IsChecked="{Binding ActivationOpensColorPickerOnly, Mode=TwoWay}" GroupName="ColorPickerActivationAction">
                                 <RadioButton.Content>
                                     <StackPanel>
-                                        <TextBlock x:Uid="ColorPickerOnly"/>
-                                        <TextBlock x:Uid="ColorPickerOnly_Description" Style="{StaticResource SecondaryTextStyle}"/>
-                                    </StackPanel>
+                                            <TextBlock x:Uid="ColorPickerOnly"/>
+                                            <controls:TextBlockControl x:Uid="ColorPickerOnly_Description" 
+                                                                       FontSize="{StaticResource SecondaryTextFontSize}"
+                                                                       EnabledForeground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                                       DisabledForeground="{ThemeResource TextFillColorDisabledBrush}"/>
+                                        </StackPanel>
                                 </RadioButton.Content>
                             </RadioButton>
                         </StackPanel>
@@ -72,7 +81,7 @@
                 </controls:SettingsGroup>
 
                 <controls:SettingsGroup x:Uid="ColorFormats" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:Setting x:Uid="ColorPicker_CopiedColorRepresentation" Icon="&#xEF3C;">
+                    <controls:Setting x:Uid="ColorPicker_CopiedColorRepresentation" Icon="&#xF0E3;">
                                 <controls:Setting.ActionContent>
                                     <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}"
                                               x:Name="ColorPicker_ComboBox"
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 fd7d0b1a06..172a33f151 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
@@ -31,7 +31,7 @@
 
                 <controls:SettingsGroup x:Uid="FancyZones_Editor_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
                     <Button Style="{StaticResource SettingButtonStyle}" x:Uid="FancyZones_LaunchEditorButton_Accessible" Command="{x:Bind ViewModel.LaunchEditorEventHandler}">
-                        <controls:Setting x:Uid="FancyZones_LaunchEditorButtonControl" Style="{StaticResource ExpanderHeaderSettingStyle}" Icon="&#xF246;">
+                        <controls:Setting x:Uid="FancyZones_LaunchEditorButtonControl" Style="{StaticResource ExpanderHeaderSettingStyle}" Icon="&#xEB3C;">
                             <!--<controls:Setting.Icon>
                                 <PathIcon Data="M45,48H25.5V45H45V25.5H25.5v-3H45V3H25.5V0H48V48ZM22.5,48H3V45H22.5V3H3V0H25.5V48ZM0,48V0H3V48Z"/>
                             </controls:Setting.Icon>-->
@@ -81,19 +81,20 @@
                                 <CheckBox x:Uid="FancyZones_ShowZonesOnAllMonitorsCheckBoxControl" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.ShowOnAllMonitors}" Margin="{StaticResource ExpanderSettingMargin}"  />
                                 <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
                                 <CheckBox IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.SpanZonesAcrossMonitors}" 
-                                          Margin="{StaticResource ExpanderSettingMargin}"
+                                          Margin="56, 0, 40, 16"
                                           AutomationProperties.Name="{Binding ElementName=SpanZonesAcrossMonitorsPrerequisitesTitle, Path=Text}">
                                     <StackPanel Orientation="Vertical">
-                                        <TextBlock x:Name="SpanZonesAcrossMonitorsPrerequisitesTitle" x:Uid="FancyZones_SpanZonesAcrossMonitorsCheckBoxControl" />
+                                        <TextBlock x:Name="SpanZonesAcrossMonitorsPrerequisitesTitle"
+                                                   Margin="0,10,0,0"
+                                                   x:Uid="FancyZones_SpanZonesAcrossMonitorsCheckBoxControl" />
                                         <controls:TextBlockControl x:Uid="FancyZones_SpanZonesAcrossMonitorsPrerequisites"
                                             FontSize="{StaticResource SecondaryTextFontSize}"
                                             EnabledForeground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            DisabledForeground="{ThemeResource TextFillColorDisabledBrush}"
-                                            IsEnabled="{Binding ElementName=ZonesSettingsGroup, Path=IsEnabled, Mode=OneWay}"/>
+                                            DisabledForeground="{ThemeResource TextFillColorDisabledBrush}"/>
                                     </StackPanel>
                                 </CheckBox>
                             
-                                <controls:Setting  x:Uid="FancyZones_OverlappingZones" Style="{StaticResource ExpanderContentSettingStyle}">
+                                <controls:Setting x:Uid="FancyZones_OverlappingZones" Style="{StaticResource ExpanderContentSettingStyle}">
                                     <controls:Setting.ActionContent>
                                         <ComboBox SelectedIndex="{x:Bind Path=ViewModel.OverlappingZonesAlgorithmIndex, Mode=TwoWay}" MinWidth="{StaticResource SettingActionControlMinWidth}">
                                             <ComboBoxItem x:Uid="FancyZones_OverlappingZonesSmallest" />
@@ -271,7 +272,7 @@
                 <controls:SettingsGroup x:Uid="ExcludedApps" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
                     <controls:SettingExpander IsExpanded="True">
                         <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="FancyZones_ExcludeApps" Icon="&#xE103;" Style="{StaticResource ExpanderHeaderSettingStyle}"/>
+                            <controls:Setting x:Uid="FancyZones_ExcludeApps" Icon="&#xECE4;" Style="{StaticResource ExpanderHeaderSettingStyle}"/>
                         </controls:SettingExpander.Header>
                         <controls:SettingExpander.Content>
                             <TextBox x:Uid="FancyZones_ExcludeApps_TextBoxControl"
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 f7af3a758f..3342988ab7 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
@@ -91,7 +91,7 @@
                         </muxc:InfoBar.Content>
                         <muxc:InfoBar.ActionButton>
                             <HyperlinkButton x:Uid="SeeWhatsNew"
-                                             Style="{StaticResource HyperlinkButtonStyle}"
+                                             Style="{StaticResource TextButtonStyle}"
                                              NavigateUri="{Binding PowerToysNewAvailableVersionLink}"
                                              HorizontalAlignment="Right" />
                         </muxc:InfoBar.ActionButton>
@@ -114,7 +114,7 @@
                         </muxc:InfoBar.Content>
                         <muxc:InfoBar.ActionButton>
                             <HyperlinkButton x:Uid="SeeWhatsNew"
-                                             Style="{StaticResource HyperlinkButtonStyle}"
+                                             Style="{StaticResource TextButtonStyle}"
                                              NavigateUri="{Binding PowerToysNewAvailableVersionLink}"
                                              HorizontalAlignment="Right" />
                         </muxc:InfoBar.ActionButton>
@@ -152,7 +152,7 @@
                             <HyperlinkButton x:Uid="SeeWhatsNew"
                                                  NavigateUri="{Binding PowerToysNewAvailableVersionLink}"
                                                  HorizontalAlignment="Right"
-                                             Style="{StaticResource HyperlinkButtonStyle}"/>
+                                             Style="{StaticResource TextButtonStyle}"/>
                         </muxc:InfoBar.ActionButton>
                     </muxc:InfoBar>
 
@@ -202,7 +202,7 @@
 
 
                 <controls:SettingsGroup IsEnabled="True" x:Uid="ShortcutGuide_Appearance_Behavior">
-                    <controls:Setting x:Uid="ColorModeHeader" Icon="&#xE771;">
+                    <controls:Setting x:Uid="ColorModeHeader" Icon="&#xE790;">
                                 <controls:Setting.Description>
                                     <HyperlinkButton Click="OpenColorsSettings_Click"
                                                      x:Uid="Windows_Color_Settings"/>
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 6a34028a04..141d29d28b 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
@@ -33,7 +33,7 @@
 
 
                 <controls:SettingsGroup x:Uid="ImageResizer_CustomSizes" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:Setting x:Uid="ImageResizer_CustomSizes" Icon="&#xE2B2;">
+                    <controls:Setting x:Uid="ImageResizer_Presets" Icon="&#xE2B2;">
                         <controls:Setting.ActionContent>
                             <Button x:Uid="ImageResizer_AddSizeButton" Click="AddSizeButton_Click" Style="{ThemeResource AccentButtonStyle}" />
                         </controls:Setting.ActionContent>
@@ -180,12 +180,12 @@
                     <controls:Setting x:Uid="ImageResizer_Encoding">
                         <controls:Setting.ActionContent>
                             <muxc:NumberBox
-                            Minimum="0"
-                            Maximum="100"
-                            Value="{x:Bind Mode=TwoWay, Path=ViewModel.JPEGQualityLevel}"
-                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                            SpinButtonPlacementMode="Compact"
-                            HorizontalAlignment="Right"
+                                Minimum="0"
+                                Maximum="100"
+                                Value="{x:Bind Mode=TwoWay, Path=ViewModel.JPEGQualityLevel}"
+                                MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                SpinButtonPlacementMode="Compact"
+                                HorizontalAlignment="Right"
                             />
                         </controls:Setting.ActionContent>
                     </controls:Setting>
@@ -218,19 +218,18 @@
 
 
                 <controls:SettingsGroup x:Uid="File" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="ImageResizer_FilenameFormatHeader" Style="{StaticResource ExpanderHeaderSettingStyle}">
-                                <controls:Setting.ActionContent>
-                                    <StackPanel Spacing="4" Orientation="Horizontal">
-                                        <TextBox Text="{x:Bind Mode=TwoWay, Path=ViewModel.FileName}"
+
+                    <controls:Setting x:Uid="ImageResizer_FilenameFormatHeader">
+                        <controls:Setting.ActionContent>
+                            <StackPanel Spacing="4" Orientation="Horizontal">
+                                <TextBox Text="{x:Bind Mode=TwoWay, Path=ViewModel.FileName}"
                                          HorizontalAlignment="Right"
                                          MinWidth="{StaticResource SettingActionControlMinWidth}"
                                          x:Uid="ImageResizer_FilenameFormatPlaceholder"/>
-                                        <Button Content="&#xE946;" FontFamily="{ThemeResource SymbolThemeFontFamily}">
-                                            <Button.Flyout>
-                                                <Flyout>
-                                                    <TextBlock x:Name="FileFormatTextBlock">
+                                <Button Content="&#xE946;" Height="32" FontFamily="{ThemeResource SymbolThemeFontFamily}">
+                                    <Button.Flyout>
+                                        <Flyout>
+                                            <TextBlock x:Name="FileFormatTextBlock">
                                                 <Run x:Uid="ImageResizer_FileFormatDescription"/>
                                                 <LineBreak/>
                                                 <LineBreak/>
@@ -257,26 +256,20 @@
                                                 <Run Text="%6" FontWeight="Bold" />
                                                 <Run Text=" - "/>
                                                 <Run x:Uid="ImageResizer_Formatting_ActualHeight"/>
-                                                    </TextBlock>
-                                                </Flyout>
-                                            </Button.Flyout>
-                                        </Button>
-                                    </StackPanel>
+                                            </TextBlock>
+                                        </Flyout>
+                                    </Button.Flyout>
+                                </Button>
+                            </StackPanel>
+                        </controls:Setting.ActionContent>
+                    </controls:Setting>
 
-                                </controls:Setting.ActionContent>
-
-                            </controls:Setting>
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-
-                            <CheckBox x:Uid="ImageResizer_UseOriginalDate"
-                                      IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.KeepDateModified}"
-                                      Margin="16,8,0,8" />
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
+                    <controls:Setting x:Uid="ImageResizer_UseOriginalDate">
+                        <controls:Setting.ActionContent>
+                            <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.KeepDateModified}" />
+                        </controls:Setting.ActionContent>
+                    </controls:Setting>
                 </controls:SettingsGroup>
-
-
             </StackPanel>
 
         </controls:SettingsPageControl.ModuleContent>
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 392fc112c1..f2b3755280 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
@@ -136,7 +136,7 @@
                         </controls:Setting.ActionContent>
                     </controls:Setting>
 
-                    <controls:Setting x:Uid="ColorModeHeader" Icon="&#xE771;">
+                    <controls:Setting x:Uid="ColorModeHeader" Icon="&#xE790;">
                         <controls:Setting.Description>
                             <HyperlinkButton Click="OpenColorsSettings_Click"
                                              x:Uid="Windows_Color_Settings"/>
@@ -191,25 +191,11 @@
                                                 </controls:Setting.Icon>
                                                 <controls:Setting.ActionContent>
                                                     <StackPanel Orientation="Horizontal" Spacing="16">
-                                                        <!-- To do: replace with InfoBadge once we move towards WinUI 2.7 -->
-                                                        <Grid VerticalAlignment="Center"
-                                                              AutomationProperties.AccessibilityView="Raw"
-                                                              Visibility="{x:Bind ShowNotAccessibleWarning}">
-                                                            <TextBlock x:Name="IconBackground"
-                                                                        VerticalAlignment="Center"
-                                                                       FontSize="{StaticResource InfoBarIconFontSize}"
-                                                                       Text="{StaticResource InfoBarIconBackgroundGlyph}"
-                                                                       Foreground="{ThemeResource InfoBarErrorSeverityIconBackground}"
-                                                                       FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                                                       AutomationProperties.AccessibilityView="Raw" />
-                                                            
-                                                            <TextBlock x:Name="StandardIcon"
-                                                                       FontSize="{StaticResource InfoBarIconFontSize}"
-                                                                       Text="{StaticResource InfoBarErrorIconGlyph}"
-                                                                       Foreground="{ThemeResource InfoBarErrorSeverityIconForeground}"
-                                                                       FontFamily="{ThemeResource SymbolThemeFontFamily}"/>
-                                                        </Grid>
 
+                                                        <muxc:InfoBadge AutomationProperties.AccessibilityView="Raw"
+                                                                        Visibility="{x:Bind ShowNotAccessibleWarning}"
+                                                                        Style="{StaticResource CriticalIconInfoBadgeStyle}" />
+                                                     
                                                         <ToggleSwitch x:Uid="PowerLauncher_EnablePluginToggle"
                                                                       IsOn="{x:Bind Path=Disabled, Converter={StaticResource BoolNegationConverter}, Mode=TwoWay}"/>
                                                     </StackPanel>
@@ -233,10 +219,21 @@
                                                               IsOpen="{x:Bind ShowNotAllowedKeywordWarning}"
                                                               IsClosable="False" />
                                                 <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
-                                                <CheckBox x:Uid="PowerLauncher_IncludeInGlobalResult"
+                                                <CheckBox 
+                                                           AutomationProperties.Name="{Binding ElementName=IncludeInGlobalResultTitle, Path=Text}"
                                                           IsChecked="{x:Bind Path=IsGlobal, Mode=TwoWay}"
                                                           IsEnabled="{x:Bind Enabled, Mode=OneWay}"
-                                                          Margin="{StaticResource ExpanderSettingMargin}"/>
+                                                            Margin="56, 0, 40, 16">
+                                                    <StackPanel Orientation="Vertical">
+                                                        <TextBlock x:Name="IncludeInGlobalResultTitle"
+                                                                   Margin="0,10,0,0"
+                                                                   x:Uid="PowerLauncher_IncludeInGlobalResultTitle" />
+                                                        <controls:TextBlockControl x:Uid="PowerLauncher_IncludeInGlobalResultDescription" 
+                                                                                   FontSize="{StaticResource SecondaryTextFontSize}" 
+                                                                                   EnabledForeground="{ThemeResource TextFillColorSecondaryBrush}" 
+                                                                                   DisabledForeground="{ThemeResource TextFillColorDisabledBrush}" />
+                                                    </StackPanel>
+                                                </CheckBox>
                                                
                                                 <ListView ItemsSource="{x:Bind Path=AdditionalOptions}"
                                                           SelectionMode="None"
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
index 6bf5be0c50..cacefb2b50 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
@@ -27,7 +27,6 @@
                              IsBackEnabled="{x:Bind ViewModel.IsBackEnabled, Mode=OneWay}"
                              SelectedItem="{x:Bind ViewModel.Selected, Mode=OneWay}"
                              IsSettingsVisible="False"
-                             OpenPaneLength="288"
                              CompactModeThresholdWidth="1007"
                              ExpandedModeThresholdWidth="1007"
                              PaneOpened="NavigationView_PaneOpened"
@@ -41,8 +40,7 @@
             </muxc:NavigationView.Resources>
             <muxc:NavigationView.MenuItems>
                 <muxc:NavigationViewItem x:Uid="Shell_General"
-                                         helpers:NavHelper.NavigateTo="views:GeneralPage"
-                                         Margin="0,0,12,0">
+                                         helpers:NavHelper.NavigateTo="views:GeneralPage">
                     <muxc:NavigationViewItem.Icon>
                         <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsSettings.png"
                                     ShowAsMonochrome="False" />
@@ -50,8 +48,7 @@
                 </muxc:NavigationViewItem>
 
                 <muxc:NavigationViewItem x:Uid="Shell_Awake"
-                                         helpers:NavHelper.NavigateTo="views:AwakePage"
-                                         Margin="0,0,12,0">
+                                         helpers:NavHelper.NavigateTo="views:AwakePage">
                     <muxc:NavigationViewItem.Icon>
                         <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsAwake.png"
                                     ShowAsMonochrome="False" />
@@ -59,8 +56,7 @@
                 </muxc:NavigationViewItem>
 
                 <muxc:NavigationViewItem x:Uid="Shell_ColorPicker"
-                                         helpers:NavHelper.NavigateTo="views:ColorPickerPage"
-                                         Margin="0,0,12,0">
+                                         helpers:NavHelper.NavigateTo="views:ColorPickerPage">
                     <muxc:NavigationViewItem.Icon>
                         <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsColorPicker.png"
                                     ShowAsMonochrome="False" />
@@ -68,8 +64,7 @@
                 </muxc:NavigationViewItem>
 
                 <muxc:NavigationViewItem x:Uid="Shell_FancyZones"
-                                         helpers:NavHelper.NavigateTo="views:FancyZonesPage"
-                                         Margin="0,0,12,0">
+                                         helpers:NavHelper.NavigateTo="views:FancyZonesPage">
                     <muxc:NavigationViewItem.Icon>
                         <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsFancyZones.png"
                                     ShowAsMonochrome="False" />
@@ -77,8 +72,7 @@
                 </muxc:NavigationViewItem>
 
                 <muxc:NavigationViewItem x:Uid="Shell_PowerPreview"
-                                         helpers:NavHelper.NavigateTo="views:PowerPreviewPage"
-                                         Margin="0,0,12,0">
+                                         helpers:NavHelper.NavigateTo="views:PowerPreviewPage">
                     <muxc:NavigationViewItem.Icon>
                         <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsFileExplorerPreview.png"
                                     ShowAsMonochrome="False" />
@@ -86,8 +80,7 @@
                 </muxc:NavigationViewItem>
 
                 <muxc:NavigationViewItem x:Uid="Shell_ImageResizer"
-                                         helpers:NavHelper.NavigateTo="views:ImageResizerPage"
-                                         Margin="0,0,12,0">
+                                         helpers:NavHelper.NavigateTo="views:ImageResizerPage">
                     <muxc:NavigationViewItem.Icon>
                         <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsImageResizer.png"
                                     ShowAsMonochrome="False" />
@@ -95,8 +88,7 @@
                 </muxc:NavigationViewItem>
 
                 <muxc:NavigationViewItem x:Uid="Shell_KeyboardManager"
-                                         helpers:NavHelper.NavigateTo="views:KeyboardManagerPage"
-                                         Margin="0,0,12,0">
+                                         helpers:NavHelper.NavigateTo="views:KeyboardManagerPage">
                     <muxc:NavigationViewItem.Icon>
                         <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsKeyboardManager.png"
                                     ShowAsMonochrome="False" />
@@ -104,8 +96,7 @@
                 </muxc:NavigationViewItem>
 
                 <muxc:NavigationViewItem x:Uid="Shell_PowerRename"
-                                         helpers:NavHelper.NavigateTo="views:PowerRenamePage"
-                                         Margin="0,0,12,0">
+                                         helpers:NavHelper.NavigateTo="views:PowerRenamePage">
                     <muxc:NavigationViewItem.Icon>
                         <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerRename.png"
                                     ShowAsMonochrome="False" />
@@ -113,8 +104,7 @@
                 </muxc:NavigationViewItem>
 
                 <muxc:NavigationViewItem x:Uid="Shell_PowerLauncher"
-                                         helpers:NavHelper.NavigateTo="views:PowerLauncherPage"
-                                         Margin="0,0,12,0">
+                                         helpers:NavHelper.NavigateTo="views:PowerLauncherPage">
                     <muxc:NavigationViewItem.Icon>
                         <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerToysRun.png"
                                     ShowAsMonochrome="False" />
@@ -122,8 +112,7 @@
                 </muxc:NavigationViewItem>
 
                 <muxc:NavigationViewItem x:Uid="Shell_ShortcutGuide"
-                                         helpers:NavHelper.NavigateTo="views:ShortcutGuidePage"
-                                         Margin="0,0,12,0">
+                                         helpers:NavHelper.NavigateTo="views:ShortcutGuidePage">
                     <muxc:NavigationViewItem.Icon>
                         <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsShortcutGuide.png"
                                     ShowAsMonochrome="False" />
@@ -133,8 +122,7 @@
                 <!--TODO(yuyoyuppe): uncomment when VCM should be enabled-->
                 <!--<muxc:NavigationViewItem x:Uid="Shell_VideoConference"
                                          helpers:NavHelper.NavigateTo="views:VideoConferencePage"
-                                         IsEnabled="{x:Bind ViewModel.IsVideoConferenceBuild, Mode=OneWay}"
-                                         Margin="0,0,12,0">
+                                         IsEnabled="{x:Bind ViewModel.IsVideoConferenceBuild, Mode=OneWay}">
                     <muxc:NavigationViewItem.Icon>
                         <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsVideoConferenceMute.png"
                                     ShowAsMonochrome="False" />
@@ -145,15 +133,13 @@
             <muxc:NavigationView.PaneFooter>
                 <StackPanel Orientation="Vertical">
                     <muxc:NavigationViewItem x:Uid="OOBE_NavViewItem"
-                                             Tapped="OOBEItem_Tapped"
-                                             Margin="0,0,12,0">
+                                             Tapped="OOBEItem_Tapped">
                         <muxc:NavigationViewItem.Icon>
                             <FontIcon Glyph="&#xF133;"/>
                         </muxc:NavigationViewItem.Icon>
                     </muxc:NavigationViewItem>
                     <muxc:NavigationViewItem x:Uid="Feedback_NavViewItem"
-                                             Tapped="FeedbackItem_Tapped"
-                                             Margin="0,0,12,0">
+                                             Tapped="FeedbackItem_Tapped">
                         <muxc:NavigationViewItem.Icon>
                             <FontIcon Glyph="&#xED15;"/>
                         </muxc:NavigationViewItem.Icon>
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 3e0cb6a65e..aa9e4a4eb9 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
@@ -39,7 +39,7 @@
 
                 <controls:SettingsGroup x:Uid="ShortcutGuide_Appearance_Behavior" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
 
-                            <controls:Setting x:Uid="ColorModeHeader" Icon="&#xE771;">
+                    <controls:Setting x:Uid="ColorModeHeader" Icon="&#xE790;">
                                 <controls:Setting.Description>
                                     <HyperlinkButton Click="OpenColorsSettings_Click"
                                                      x:Uid="Windows_Color_Settings"/>
@@ -67,7 +67,7 @@
                 <controls:SettingsGroup x:Uid="ExcludedApps" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
                     <controls:SettingExpander IsExpanded="True">
                         <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="ShortcutGuide_DisabledApps" Icon="&#xE103;" Style="{StaticResource ExpanderHeaderSettingStyle}"/>
+                            <controls:Setting x:Uid="ShortcutGuide_DisabledApps" Icon="&#xECE4;" Style="{StaticResource ExpanderHeaderSettingStyle}"/>
                         </controls:SettingExpander.Header>
                         <controls:SettingExpander.Content>
                             <TextBox x:Uid="ShortcutGuide_DisabledApps_TextBoxControl"