From 2d361bc0da2f14af6ce932060e816ea642e13309 Mon Sep 17 00:00:00 2001
From: Jay <65828559+Jay-o-Way@users.noreply.github.com>
Date: Wed, 3 Jan 2024 14:42:12 +0100
Subject: [PATCH] Welcome: UI improvements (#30684)

* UI improvements

* buttons back on one line

* fix Styler

* adjust margin in OOBE page

* Update src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml

---------

Co-authored-by: Niels Laute <niels.laute@live.nl>
---
 .../OOBEPageControl/OOBEPageControl.xaml      | 16 +++++++++-------
 .../ShortcutWithTextLabelControl.xaml         |  2 +-
 .../OOBE/Views/OobeAlwaysOnTop.xaml           |  8 +++-----
 .../SettingsXAML/OOBE/Views/OobeAwake.xaml    | 11 ++++-------
 .../OOBE/Views/OobeColorPicker.xaml           | 11 ++++-------
 .../OOBE/Views/OobeCropAndLock.xaml           |  8 +++-----
 .../OOBE/Views/OobeEnvironmentVariables.xaml  |  8 +++-----
 .../OOBE/Views/OobeFancyZones.xaml            | 11 ++++-------
 .../OOBE/Views/OobeFileExplorer.xaml          | 11 ++++-------
 .../OOBE/Views/OobeFileLocksmith.xaml         | 13 +++++--------
 .../SettingsXAML/OOBE/Views/OobeHosts.xaml    |  8 +++-----
 .../OOBE/Views/OobeImageResizer.xaml          | 11 ++++-------
 .../SettingsXAML/OOBE/Views/OobeKBM.xaml      | 11 ++++-------
 .../OOBE/Views/OobeMeasureTool.xaml           |  9 +++------
 .../OOBE/Views/OobeMouseUtils.xaml            | 10 +++-------
 .../OOBE/Views/OobeMouseWithoutBorders.xaml   | 10 ++++------
 .../SettingsXAML/OOBE/Views/OobeOverview.xaml | 17 ++++++-----------
 .../OOBE/Views/OobeOverviewAlternate.xaml     |  4 ++--
 .../OOBE/Views/OobeOverviewPlaceholder.xaml   | 14 ++++++--------
 .../OOBE/Views/OobePastePlain.xaml            | 11 ++++-------
 .../SettingsXAML/OOBE/Views/OobePeek.xaml     | 15 ++++-----------
 .../OOBE/Views/OobePowerAccent.xaml           |  9 +++------
 .../SettingsXAML/OOBE/Views/OobePowerOCR.xaml |  9 +++------
 .../OOBE/Views/OobePowerRename.xaml           | 13 +++++--------
 .../OOBE/Views/OobeRegistryPreview.xaml       | 11 ++++-------
 .../SettingsXAML/OOBE/Views/OobeRun.xaml      |  9 +++------
 .../OOBE/Views/OobeShellPage.xaml             | 15 ++++++++-------
 .../OOBE/Views/OobeShortcutGuide.xaml         | 13 ++++++-------
 .../OOBE/Views/OobeVideoConference.xaml       | 19 +++++++++----------
 .../SettingsXAML/OOBE/Views/OobeWhatsNew.xaml |  9 ++++-----
 .../SettingsXAML/Styles/TextBlock.xaml        |  2 +-
 31 files changed, 129 insertions(+), 199 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/OOBEPageControl/OOBEPageControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/OOBEPageControl/OOBEPageControl.xaml
index 98877bd01c..b9a05b1d45 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/OOBEPageControl/OOBEPageControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/OOBEPageControl/OOBEPageControl.xaml
@@ -17,14 +17,17 @@
         <Image
             x:Name="HeaderImage"
             Height="{x:Bind HeroImageHeight}"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
             Source="{x:Bind HeroImage}"
             Stretch="UniformToFill" />
 
-        <ScrollViewer
-            Grid.Row="1"
-            Padding="32,24,32,24"
-            VerticalScrollBarVisibility="Auto">
-            <StackPanel VerticalAlignment="Top" Orientation="Vertical">
+        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
+            <StackPanel
+                Margin="32,24"
+                VerticalAlignment="Top"
+                Orientation="Vertical"
+                Spacing="12">
 
                 <TextBlock
                     x:Name="TitleTxt"
@@ -34,14 +37,13 @@
 
                 <TextBlock
                     x:Name="DescriptionTxt"
-                    Margin="0,8,0,0"
                     Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                     Text="{x:Bind Description}"
                     TextWrapping="Wrap" />
 
                 <ContentPresenter
                     x:Name="ModuleContentPresenter"
-                    Margin="0,12,0,0"
+                    Margin="0,8"
                     HorizontalAlignment="Stretch"
                     HorizontalContentAlignment="Stretch"
                     Content="{x:Bind PageContent}" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
index 1f1fc9e071..307b4fe911 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
@@ -11,7 +11,7 @@
     d:DesignWidth="400"
     mc:Ignorable="d">
 
-    <Grid>
+    <Grid ColumnSpacing="8">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="*" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAlwaysOnTop.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAlwaysOnTop.xaml
index ac731446d8..2eee7a4160 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAlwaysOnTop.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAlwaysOnTop.xaml
@@ -11,7 +11,7 @@
 
     <custom:OOBEPageControl x:Uid="Oobe_AlwaysOnTop" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/AlwaysOnTop.png">
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_AlwaysOnTop_HowToUse" />
@@ -20,11 +20,9 @@
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_AlwaysOnTop_TipsAndTricks" Background="Transparent" />
 
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_AlwaysOnTop" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_AlwaysOnTop" TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAwake.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAwake.xaml
index c83785f70f..5d1b68722b 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAwake.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAwake.xaml
@@ -9,9 +9,8 @@
     mc:Ignorable="d">
 
     <custom:OOBEPageControl x:Uid="Oobe_Awake" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Awake.png">
-
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_Awake_HowToUse" Background="Transparent" />
@@ -20,11 +19,9 @@
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_Awake_TipsAndTricks" Background="Transparent" />
 
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_Awake" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_Awake" TextWrapping="Wrap" />
                     </HyperlinkButton>
@@ -32,4 +29,4 @@
             </StackPanel>
         </custom:OOBEPageControl.PageContent>
     </custom:OOBEPageControl>
-</Page>
\ No newline at end of file
+</Page>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeColorPicker.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeColorPicker.xaml
index 273e8e35dd..08e1db803f 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeColorPicker.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeColorPicker.xaml
@@ -10,9 +10,8 @@
     mc:Ignorable="d">
 
     <custom:OOBEPageControl x:Uid="Oobe_ColorPicker" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ColorPicker.gif">
-
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_ColorPicker_HowToUse" />
@@ -21,15 +20,13 @@
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_ColorPicker_TipsAndTricks" Background="Transparent" />
 
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button
                         x:Uid="Launch_ColorPicker"
                         Click="Start_ColorPicker_Click"
                         Style="{StaticResource AccentButtonStyle}" />
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_ColorPicker" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_ColorPicker" TextWrapping="Wrap" />
                     </HyperlinkButton>
@@ -37,4 +34,4 @@
             </StackPanel>
         </custom:OOBEPageControl.PageContent>
     </custom:OOBEPageControl>
-</Page>
\ No newline at end of file
+</Page>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCropAndLock.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCropAndLock.xaml
index 8d9c53e58f..6d7101d95d 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCropAndLock.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCropAndLock.xaml
@@ -11,18 +11,16 @@
 
     <custom:OOBEPageControl x:Uid="Oobe_CropAndLock" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/CropAndLock.gif">
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <custom:ShortcutWithTextLabelControl x:Name="ThumbnailHotkeyControl" x:Uid="Oobe_CropAndLock_HowToUse_Thumbnail" />
 
                 <custom:ShortcutWithTextLabelControl x:Name="ReparentHotkeyControl" x:Uid="Oobe_CropAndLock_HowToUse_Reparent" />
 
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_CropAndLock" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_CropAndLock" TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeEnvironmentVariables.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeEnvironmentVariables.xaml
index 4a8ee0e2c2..f217a390ce 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeEnvironmentVariables.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeEnvironmentVariables.xaml
@@ -11,16 +11,14 @@
 
     <controls:OOBEPageControl x:Uid="Oobe_EnvironmentVariables" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/EnvironmentVariables.png">
         <controls:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+            <StackPanel Orientation="Vertical" Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button
                         x:Uid="Launch_EnvironmentVariables"
                         Click="Launch_EnvironmentVariables_Click"
                         Style="{StaticResource AccentButtonStyle}" />
                     <Button x:Uid="OOBE_Settings" Click="Launch_Settings_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_EnvironmentVariables" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_EnvironmentVariables" TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFancyZones.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFancyZones.xaml
index 9d4fbb763e..899780cd63 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFancyZones.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFancyZones.xaml
@@ -9,9 +9,8 @@
     mc:Ignorable="d">
 
     <custom:OOBEPageControl x:Uid="Oobe_FancyZones" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FancyZones.gif">
-
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_FancyZones_HowToUse" Background="Transparent" />
@@ -21,11 +20,9 @@
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_FancyZones_TipsAndTricks" Background="Transparent" />
 
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_FancyZones" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_FancyZones" TextWrapping="Wrap" />
                     </HyperlinkButton>
@@ -33,4 +30,4 @@
             </StackPanel>
         </custom:OOBEPageControl.PageContent>
     </custom:OOBEPageControl>
-</Page>
\ No newline at end of file
+</Page>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileExplorer.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileExplorer.xaml
index 3d9bfaa4ad..e237c3eba1 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileExplorer.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileExplorer.xaml
@@ -10,18 +10,15 @@
     mc:Ignorable="d">
 
     <custom:OOBEPageControl x:Uid="Oobe_FileExplorer" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FileExplorer.png">
-
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToEnable" Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_FileExplorer_HowToEnable" Background="Transparent" />
 
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_FileExplorerAddOns" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_PowerPreview" TextWrapping="Wrap" />
                     </HyperlinkButton>
@@ -29,4 +26,4 @@
             </StackPanel>
         </custom:OOBEPageControl.PageContent>
     </custom:OOBEPageControl>
-</Page>
\ No newline at end of file
+</Page>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileLocksmith.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileLocksmith.xaml
index aeb05beb0d..43dd245be4 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileLocksmith.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileLocksmith.xaml
@@ -8,11 +8,10 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
+
     <custom:OOBEPageControl x:Uid="Oobe_FileLocksmith" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FileLocksmith.gif">
-
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
-
+            <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_FileLocksmith_HowToUse" Background="Transparent" />
@@ -21,11 +20,9 @@
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_FileLocksmith_TipsAndTricks" Background="Transparent" />
 
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_FileLocksmith" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_FileLocksmith" TextWrapping="Wrap" />
                     </HyperlinkButton>
@@ -33,4 +30,4 @@
             </StackPanel>
         </custom:OOBEPageControl.PageContent>
     </custom:OOBEPageControl>
-</Page>
\ No newline at end of file
+</Page>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeHosts.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeHosts.xaml
index 9fa8503774..9d23f5d71f 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeHosts.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeHosts.xaml
@@ -11,16 +11,14 @@
 
     <custom:OOBEPageControl x:Uid="Oobe_Hosts" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/HostsFileEditor.png">
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+            <StackPanel Orientation="Vertical" Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button
                         x:Uid="Launch_Hosts"
                         Click="Launch_Hosts_Click"
                         Style="{StaticResource AccentButtonStyle}" />
                     <Button x:Uid="OOBE_Settings" Click="Launch_Settings_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_HostsFileEditor" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_Hosts" TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeImageResizer.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeImageResizer.xaml
index 342f7e3fa9..3fb1989afa 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeImageResizer.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeImageResizer.xaml
@@ -10,9 +10,8 @@
     mc:Ignorable="d">
 
     <custom:OOBEPageControl x:Uid="Oobe_ImageResizer" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ImageResizer.gif">
-
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToLaunch" Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_ImageResizer_HowToLaunch" Background="Transparent" />
@@ -21,11 +20,9 @@
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_ImageResizer_TipsAndTricks" Background="Transparent" />
 
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_ImageResizer" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_ImageResizer" TextWrapping="Wrap" />
                     </HyperlinkButton>
@@ -33,4 +30,4 @@
             </StackPanel>
         </custom:OOBEPageControl.PageContent>
     </custom:OOBEPageControl>
-</Page>
\ No newline at end of file
+</Page>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeKBM.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeKBM.xaml
index f61a0ee8c7..b329cfe683 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeKBM.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeKBM.xaml
@@ -7,11 +7,10 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
+
     <custom:OOBEPageControl x:Uid="Oobe_KBM" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/KBM.gif">
-
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
-
+            <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToCreateMappings" Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_KBM_HowToCreateMappings" Background="Transparent" />
@@ -20,11 +19,9 @@
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_KBM_TipsAndTricks" Background="Transparent" />
 
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_KeyboardManager" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_KBM" TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMeasureTool.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMeasureTool.xaml
index d02e29507f..5713ec8e7b 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMeasureTool.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMeasureTool.xaml
@@ -10,20 +10,17 @@
     mc:Ignorable="d">
 
     <custom:OOBEPageControl x:Uid="Oobe_MeasureTool" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ScreenRuler.gif">
-
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToLaunch" Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <custom:ShortcutWithTextLabelControl x:Name="HotkeyActivation" x:Uid="Oobe_MeasureTool_Activation" />
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_MeasureTool_HowToLaunch" Background="Transparent" />
 
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_ScreenRuler" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_MeasureTool" TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseUtils.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseUtils.xaml
index ab7006234c..841f11d2a2 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseUtils.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseUtils.xaml
@@ -9,9 +9,8 @@
     mc:Ignorable="d">
 
     <custom:OOBEPageControl x:Uid="Oobe_MouseUtils" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/MouseUtils.gif">
-
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_MouseUtils_FindMyMouse" Style="{ThemeResource OobeSubtitleStyle}" />
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_MouseUtils_FindMyMouse_Description" Background="Transparent" />
 
@@ -24,16 +23,13 @@
                 <TextBlock x:Uid="Oobe_MouseUtils_MouseJump" Style="{ThemeResource OobeSubtitleStyle}" />
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_MouseUtils_MouseJump_Description" Background="Transparent" />
 
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_MouseUtilities" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_MouseUtils" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
-
             </StackPanel>
         </custom:OOBEPageControl.PageContent>
     </custom:OOBEPageControl>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseWithoutBorders.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseWithoutBorders.xaml
index 9065e0399d..4326efd5cd 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseWithoutBorders.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseWithoutBorders.xaml
@@ -8,10 +8,10 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
-    <custom:OOBEPageControl x:Uid="Oobe_MouseWithoutBorders" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/MouseWithoutBorders.png">
 
+    <custom:OOBEPageControl x:Uid="Oobe_MouseWithoutBorders" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/MouseWithoutBorders.png">
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Vertical" Spacing="12">
 
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
@@ -21,11 +21,9 @@
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_MouseWithoutBorders_TipsAndTricks" Background="Transparent" />
 
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_MouseWithoutBorders" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_MouseWithoutBorders" TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml
index fa25b7dc5c..e6a3be94cd 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml
@@ -9,20 +9,15 @@
     mc:Ignorable="d">
 
     <custom:OOBEPageControl x:Uid="Oobe_Overview" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/OOBEPTHero.png">
-
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
-                <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
+            <StackPanel Orientation="Vertical" Spacing="12">
 
-                <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview" Style="{StaticResource TextButtonStyle}">
-                    <TextBlock x:Uid="Oobe_Overview_DescriptionLinkText" TextWrapping="Wrap" />
-                </HyperlinkButton>
-
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="Oobe_Overview_DescriptionLinkText" TextWrapping="Wrap" />
+                    </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
         </custom:OOBEPageControl.PageContent>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewAlternate.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewAlternate.xaml
index 13a56d9a5b..117ecd2d16 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewAlternate.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewAlternate.xaml
@@ -14,12 +14,12 @@
         HeroImageHeight="120">
 
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock
                     x:Uid="Alternate_OOBE_Description"
                     Margin="0,24,0,12"
                     FontWeight="SemiBold" />
-                <GridView Margin="-8,0,0,0" SelectionMode="None">
+                <GridView SelectionMode="None">
                     <GridViewItem>
                         <Grid
                             Width="280"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewPlaceholder.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewPlaceholder.xaml
index 9842853702..50391c37b0 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewPlaceholder.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewPlaceholder.xaml
@@ -12,12 +12,10 @@
     Loaded="Page_Loaded"
     mc:Ignorable="d">
 
-    <Grid Margin="0,24,0,0">
-        <ProgressRing
-            x:Name="LoadingProgressRing"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            IsIndeterminate="True"
-            Visibility="Visible" />
-    </Grid>
+    <ProgressRing
+        x:Name="LoadingProgressRing"
+        HorizontalAlignment="Center"
+        VerticalAlignment="Center"
+        IsIndeterminate="True"
+        Visibility="Visible" />
 </Page>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePastePlain.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePastePlain.xaml
index ecfe958853..063a88e8c8 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePastePlain.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePastePlain.xaml
@@ -10,18 +10,15 @@
     mc:Ignorable="d">
 
     <custom:OOBEPageControl x:Uid="Oobe_PastePlain" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PastePlain.gif">
-
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_PastePlain_HowToUse" />
 
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_PastePlain" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_PastePlain" TextWrapping="Wrap" />
                     </HyperlinkButton>
@@ -29,4 +26,4 @@
             </StackPanel>
         </custom:OOBEPageControl.PageContent>
     </custom:OOBEPageControl>
-</Page>
\ No newline at end of file
+</Page>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePeek.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePeek.xaml
index 58f37dd223..760765984d 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePeek.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePeek.xaml
@@ -1,7 +1,4 @@
-<!--  Copyright (c) Microsoft Corporation and Contributors.  -->
-<!--  Licensed under the MIT License.  -->
-
-<Page
+<Page
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobePeek"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -10,22 +7,18 @@
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
     mc:Ignorable="d">
 
     <custom:OOBEPageControl x:Uid="Oobe_Peek" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Peek.gif">
-
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_Peek_HowToUse" />
 
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_Peek" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_Peek" TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml
index fea0fb4c09..27afdf5225 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml
@@ -10,18 +10,15 @@
     mc:Ignorable="d">
 
     <custom:OOBEPageControl x:Uid="Oobe_QuickAccent" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerAccent.gif">
-
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_QuickAccent_HowToUse" Background="Transparent" />
 
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_QuickAccent" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_QuickAccent" TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml
index 700be92f1a..655e565302 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml
@@ -10,9 +10,8 @@
     mc:Ignorable="d">
 
     <custom:OOBEPageControl x:Uid="Oobe_TextExtractor" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerOCR.gif">
-
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_TextExtractor_HowToUse" />
@@ -21,11 +20,9 @@
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_TextExtractor_TipsAndTricks" Background="Transparent" />
 
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_TextExtractor" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_TextExtractor" TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerRename.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerRename.xaml
index 68f4c4a0e9..4482e62f03 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerRename.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerRename.xaml
@@ -8,11 +8,10 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
+
     <custom:OOBEPageControl x:Uid="Oobe_PowerRename" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerRename.gif">
-
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
-
+            <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_PowerRename_HowToUse" Background="Transparent" />
@@ -21,11 +20,9 @@
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_PowerRename_TipsAndTricks" Background="Transparent" />
 
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
-                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_PowerRename" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_PowerRename" TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRegistryPreview.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRegistryPreview.xaml
index 5bb7497143..e9f86d00dd 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRegistryPreview.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRegistryPreview.xaml
@@ -8,11 +8,10 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
+
     <custom:OOBEPageControl x:Uid="Oobe_RegistryPreview" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/RegistryPreview.png">
-
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
-
+            <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_RegistryPreview_HowToUse" Background="Transparent" />
@@ -21,15 +20,13 @@
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_RegistryPreview_TipsAndTricks" Background="Transparent" />
 
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button
                         x:Uid="Launch_RegistryPreview"
                         Click="Launch_RegistryPreview_Click"
                         Style="{StaticResource AccentButtonStyle}" />
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_RegistryPreview" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_RegistryPreview" TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRun.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRun.xaml
index b4e13d6dc1..fa2c7a8f13 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRun.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRun.xaml
@@ -10,9 +10,8 @@
     mc:Ignorable="d">
 
     <custom:OOBEPageControl x:Uid="Oobe_Run" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Run.gif">
-
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToLaunch" Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_Run_HowToLaunch" />
@@ -21,15 +20,13 @@
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_Run_TipsAndTricks" Background="Transparent" />
 
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button
                         x:Uid="Launch_Run"
                         Click="Start_Run_Click"
                         Style="{StaticResource AccentButtonStyle}" />
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_PowerToysRun" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_Run" TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml
index 8b38d7466f..85e765091d 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml
@@ -9,9 +9,10 @@
     HighContrastAdjustment="None"
     Loaded="ShellPage_Loaded"
     mc:Ignorable="d">
+
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="48" />
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <Button
@@ -23,9 +24,9 @@
             Style="{StaticResource PaneToggleButtonStyle}" />
         <Grid
             x:Name="AppTitleBar"
-            Height="{Binding ElementName=navigationView, Path=CompactPaneLength}"
+            Height="48"
             Margin="48,0,0,0"
-            VerticalAlignment="Top"
+            VerticalAlignment="Center"
             IsHitTestVisible="True">
             <animations:Implicit.Animations>
                 <animations:OffsetAnimation Duration="0:0:0.3" />
@@ -34,17 +35,16 @@
                 <Image
                     Width="16"
                     Height="16"
-                    HorizontalAlignment="Left"
                     Source="/Assets/Settings/icon.ico" />
                 <TextBlock
                     x:Name="AppTitleBarText"
                     x:Uid="OobeWindow_TitleTxt"
-                    Margin="12,0,0,0"
                     VerticalAlignment="Center"
                     Style="{StaticResource CaptionTextBlockStyle}"
                     TextWrapping="NoWrap" />
             </StackPanel>
         </Grid>
+
         <NavigationView
             x:Name="navigationView"
             Grid.Row="1"
@@ -157,13 +157,14 @@
             <NavigationView.FooterMenuItems>
                 <NavigationViewItem
                     x:Uid="Shell_WhatsNew"
-                    Icon="{ui:FontIcon Glyph=&#xF133;}"
+                    Icon="{ui:FontIcon Glyph=&#xE789;}"
                     Tag="WhatsNew" />
             </NavigationView.FooterMenuItems>
             <NavigationView.Content>
                 <Frame x:Name="NavigationFrame" />
             </NavigationView.Content>
         </NavigationView>
+
         <VisualStateManager.VisualStateGroups>
             <VisualStateGroup x:Name="LayoutVisualStates">
                 <VisualState x:Name="WideLayout">
@@ -183,4 +184,4 @@
             </VisualStateGroup>
         </VisualStateManager.VisualStateGroups>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShortcutGuide.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShortcutGuide.xaml
index 59799686f2..d23fcfba8c 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShortcutGuide.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShortcutGuide.xaml
@@ -8,22 +8,21 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
+
     <custom:OOBEPageControl x:Uid="Oobe_ShortcutGuide" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/OOBEShortcutGuide.png">
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
-
+            <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToLaunch" Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_ShortcutGuide_HowToLaunch" />
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button
                         x:Uid="Launch_ShortcutGuide"
                         Click="Start_ShortcutGuide_Click"
                         Style="{StaticResource AccentButtonStyle}" />
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_ShortcutGuide" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_ShortcutGuide" TextWrapping="Wrap" />
                     </HyperlinkButton>
@@ -31,4 +30,4 @@
             </StackPanel>
         </custom:OOBEPageControl.PageContent>
     </custom:OOBEPageControl>
-</Page>
\ No newline at end of file
+</Page>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeVideoConference.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeVideoConference.xaml
index d80042df92..9b912c1212 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeVideoConference.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeVideoConference.xaml
@@ -10,23 +10,22 @@
     mc:Ignorable="d">
 
     <custom:OOBEPageControl x:Uid="Oobe_VideoConference" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/VideoConferenceMute.png">
-
         <custom:OOBEPageControl.PageContent>
-            <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToLaunch" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <custom:ShortcutWithTextLabelControl x:Name="HotkeyMicVidControl" x:Uid="Oobe_VideoConference_ToggleMicVid" />
-                <custom:ShortcutWithTextLabelControl x:Name="HotkeyMicControl" x:Uid="Oobe_VideoConference_ToggleMic" />
-                <custom:ShortcutWithTextLabelControl x:Name="HotkeyPushToTalkControl" x:Uid="Oobe_VideoConference_PushToTalkMic" />
-                <custom:ShortcutWithTextLabelControl x:Name="HotkeyVidControl" x:Uid="Oobe_VideoConference_ToggleVid" />
+                <StackPanel>
+                    <custom:ShortcutWithTextLabelControl x:Name="HotkeyMicVidControl" x:Uid="Oobe_VideoConference_ToggleMicVid" />
+                    <custom:ShortcutWithTextLabelControl x:Name="HotkeyMicControl" x:Uid="Oobe_VideoConference_ToggleMic" />
+                    <custom:ShortcutWithTextLabelControl x:Name="HotkeyPushToTalkControl" x:Uid="Oobe_VideoConference_PushToTalkMic" />
+                    <custom:ShortcutWithTextLabelControl x:Name="HotkeyVidControl" x:Uid="Oobe_VideoConference_ToggleVid" />
+                </StackPanel>
 
                 <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_VideoConference_HowToLaunch" Background="Transparent" />
 
-                <StackPanel
-                    Margin="0,24,0,0"
-                    Orientation="Horizontal"
-                    Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
                     <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_VideoConference" Style="{StaticResource TextButtonStyle}">
                         <TextBlock x:Uid="LearnMore_VCM" TextWrapping="Wrap" />
                     </HyperlinkButton>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml
index a197367f9e..15fada50a3 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml
@@ -19,20 +19,18 @@
 
         <StackPanel
             Grid.Row="0"
-            Margin="32,0,0,0"
+            Margin="32,0,0,16"
             VerticalAlignment="Top"
             Orientation="Vertical">
             <TextBlock
                 x:Uid="Oobe_WhatsNew"
                 AutomationProperties.HeadingLevel="Level1"
                 Style="{StaticResource TitleTextBlockStyle}" />
-            <HyperlinkButton
-                Margin="0,0,0,16"
-                NavigateUri="https://github.com/microsoft/PowerToys/releases"
-                Style="{StaticResource TextButtonStyle}">
+            <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/releases" Style="{StaticResource TextButtonStyle}">
                 <TextBlock x:Uid="Oobe_WhatsNew_DetailedReleaseNotesLink" TextWrapping="Wrap" />
             </HyperlinkButton>
         </StackPanel>
+
         <InfoBar
             x:Name="ErrorInfoBar"
             x:Uid="Oobe_WhatsNew_LoadingError"
@@ -51,6 +49,7 @@
             IsOpen="False"
             IsTabStop="True"
             Severity="Warning" />
+
         <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
             <Grid Margin="32,24,32,24">
                 <ProgressRing
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Styles/TextBlock.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Styles/TextBlock.xaml
index 1b490901e7..1872581498 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Styles/TextBlock.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Styles/TextBlock.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style x:Key="OobeSubtitleStyle" TargetType="TextBlock">
-        <Setter Property="Margin" Value="0,16,0,0" />
+        <Setter Property="Margin" Value="0,0,0,-12" />
         <Setter Property="Foreground" Value="{ThemeResource DefaultTextForegroundThemeBrush}" />
         <Setter Property="AutomationProperties.HeadingLevel" Value="Level3" />
         <Setter Property="FontFamily" Value="XamlAutoFontFamily" />