diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/FluentIcons/FluentIconsSettings.png b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/FluentIcons/FluentIconsSettings.png
new file mode 100644
index 0000000000..bf6a6c2d80
Binary files /dev/null and b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/FluentIcons/FluentIconsSettings.png differ
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
index c163aae3ad..79adec003a 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
@@ -111,7 +111,7 @@
     <Compile Include="Controls\SettingsPageControl\SettingsPageControl.xaml.cs">
       <DependentUpon>SettingsPageControl.xaml</DependentUpon>
     </Compile>
- <Compile Include="Controls\OOBEPageControl\OOBEPageControl.xaml.cs">
+    <Compile Include="Controls\OOBEPageControl\OOBEPageControl.xaml.cs">
       <DependentUpon>OOBEPageControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="Controls\SettingsPageControl\SidePanelLink.cs" />
@@ -231,6 +231,7 @@
     <Content Include="Assets\FluentIcons\FluentIconsPowerRename.png" />
     <Content Include="Assets\FluentIcons\FluentIconsPowerToys.png" />
     <Content Include="Assets\FluentIcons\FluentIconsPowerToysRun.png" />
+    <Content Include="Assets\FluentIcons\FluentIconsSettings.png" />
     <Content Include="Assets\FluentIcons\FluentIconsShortcutGuide.png" />
     <Content Include="Assets\FluentIcons\FluentIconsVideoConferenceMute.png" />
     <Content Include="Assets\Logo.scale-200.png" />
@@ -336,7 +337,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-<Page Include="Controls\OOBEPageControl\OOBEPageControl.xaml">
+    <Page Include="Controls\OOBEPageControl\OOBEPageControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
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 1deb7dff3d..cb77e00b7e 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
@@ -8,63 +8,32 @@
       xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
       mc:Ignorable="d">
 
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="280" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
+    <controls:OOBEPageControl ModuleTitle="{x:Bind ViewModel.ModuleName}"
+                                  ModuleImageSource="{x:Bind ViewModel.PreviewImageSource}"
+                                  ModuleDescription="{x:Bind ViewModel.Description}">
 
-        <Image Stretch="UniformToFill"
-               Source="{x:Bind ViewModel.PreviewImageSource}" />
-
-        <ScrollViewer Grid.Row="1"
-                      VerticalScrollBarVisibility="Auto">
-            <StackPanel Orientation="Vertical"
-                        Margin="{StaticResource OobePageContentMargin}"
-                        VerticalAlignment="Top">
-                <TextBlock Text="{x:Bind ViewModel.ModuleName}"
-                           AutomationProperties.HeadingLevel="Level2"
-                           Style="{StaticResource PageTitleStyle}" />
-                <TextBlock TextWrapping="Wrap"
-                           Margin="0,4,0,0"
-                           Text="{x:Bind ViewModel.Description}" />
-
-                <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
-                                 Margin="-12,0,0,4">
-                    <TextBlock>
-                                <Run x:Uid="Oobe_LearnMore" />
-                                <Run Text="{x:Bind ViewModel.ModuleName}" />
-                    </TextBlock>
-                </HyperlinkButton>
+        <controls:OOBEPageControl.ModuleContent>
+            <StackPanel Orientation="Vertical">
 
                 <TextBlock x:Uid="Oobe_HowToUse"
-                           AutomationProperties.HeadingLevel="Level3"
-                           Style="{StaticResource OobeSubtitleStyle}" />
-
+                           Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <controls:ShortcutTextControl x:Uid="Oobe_FancyZones_HowToUse" />
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks"
-                           AutomationProperties.HeadingLevel="Level3"
-                           Style="{StaticResource OobeSubtitleStyle}" />
+                           Style="{ThemeResource OobeSubtitleStyle}"/>
 
                 <controls:ShortcutTextControl x:Uid="Oobe_FancyZones_TipsAndTricks" />
 
-                <StackPanel Orientation="Horizontal"
-                            Spacing="4"
-                            Margin="0,32,0,0">
-                    <Button Click="SettingsLaunchButton_Click"
-                            AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}">
-                        <StackPanel Orientation="Horizontal"
-                                    Spacing="8">
-                            <TextBlock Text="&#xE115;"
-                                       Margin="0,3,0,0"
-                                       FontFamily="Segoe MDL2 Assets" />
-                            <TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel" />
-                        </StackPanel>
-                    </Button>
+                <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}">
+                        <TextBlock x:Uid="LearnMore_FancyZones"
+                               TextWrapping="Wrap" />
+                    </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </ScrollViewer>
-    </Grid>
-</Page>
+        </controls:OOBEPageControl.ModuleContent>
+    </controls:OOBEPageControl>
+</Page>
\ No newline at end of file
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 3744f347ef..fe0da965c3 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
@@ -7,59 +7,27 @@
       xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
       mc:Ignorable="d">
 
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="280" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
+    <controls:OOBEPageControl ModuleTitle="{x:Bind ViewModel.ModuleName}"
+                                  ModuleImageSource="{x:Bind ViewModel.PreviewImageSource}"
+                                  ModuleDescription="{x:Bind ViewModel.Description}">
 
-        <Image Stretch="UniformToFill"
-               Source="{x:Bind ViewModel.PreviewImageSource}" />
-
-        <ScrollViewer Grid.Row="1"
-                      VerticalScrollBarVisibility="Auto">
-            <StackPanel Orientation="Vertical"
-                        Margin="{StaticResource OobePageContentMargin}"
-                        VerticalAlignment="Top">
-
-                <TextBlock Text="{x:Bind ViewModel.ModuleName}"
-                           AutomationProperties.HeadingLevel="Level2"
-                           Style="{StaticResource PageTitleStyle}" />
-
-                <TextBlock Margin="0,4,0,0"
-                           TextWrapping="Wrap"
-                           Text="{x:Bind ViewModel.Description}" />
-
-                <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
-                                 Margin="-12,0,0,4">
-                    <TextBlock>
-                                <Run x:Uid="Oobe_LearnMore" />
-                                <Run Text="{x:Bind ViewModel.ModuleName}" />
-                    </TextBlock>
-                </HyperlinkButton>
+        <controls:OOBEPageControl.ModuleContent>
+            <StackPanel Orientation="Vertical">
 
                 <TextBlock x:Uid="Oobe_HowToEnable"
-                           AutomationProperties.HeadingLevel="Level3"
-                           Style="{StaticResource OobeSubtitleStyle}" />
+                           Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <controls:ShortcutTextControl x:Uid="Oobe_FileExplorer_HowToEnable" />
-                
-                <StackPanel Orientation="Horizontal"
-                            Spacing="4"
-                            Margin="0,32,0,0">
 
-                    <Button Click="SettingsLaunchButton_Click"
-                            AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}">
-                        <StackPanel Orientation="Horizontal"
-                                    Spacing="8">
-                            <TextBlock Text="&#xE115;"
-                                       Margin="0,3,0,0"
-                                       FontFamily="Segoe MDL2 Assets" />
-                            <TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel" />
-                        </StackPanel>
-                    </Button>
+                <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}">
+                        <TextBlock x:Uid="LearnMore_PowerPreview"
+                               TextWrapping="Wrap" />
+                    </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </ScrollViewer>
-    </Grid>
+        </controls:OOBEPageControl.ModuleContent>
+    </controls:OOBEPageControl>
 </Page>
\ No newline at end of file
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 9591e2e96f..78b051934d 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
@@ -8,64 +8,32 @@
       xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
       mc:Ignorable="d">
 
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="280" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
+    <controls:OOBEPageControl ModuleTitle="{x:Bind ViewModel.ModuleName}"
+                                  ModuleImageSource="{x:Bind ViewModel.PreviewImageSource}"
+                                  ModuleDescription="{x:Bind ViewModel.Description}">
 
-        <Image Stretch="UniformToFill"
-               Source="{x:Bind ViewModel.PreviewImageSource}" />
-
-        <ScrollViewer Grid.Row="1"
-                      VerticalScrollBarVisibility="Auto">
-            <StackPanel Orientation="Vertical"
-                        Margin="{StaticResource OobePageContentMargin}"
-                        VerticalAlignment="Top">
-
-                <TextBlock Text="{x:Bind ViewModel.ModuleName}"
-                           AutomationProperties.HeadingLevel="Level2"
-                           Style="{StaticResource PageTitleStyle}" />
-
-                <TextBlock Margin="0,4,0,0"
-                           TextWrapping="Wrap"
-                           Text="{x:Bind ViewModel.Description}" />
-
-                <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
-                                 Margin="-12,0,0,4">
-                    <TextBlock>
-                                <Run x:Uid="Oobe_LearnMore" />
-                                <Run Text="{x:Bind ViewModel.ModuleName}" />
-                    </TextBlock>
-                </HyperlinkButton>
+        <controls:OOBEPageControl.ModuleContent>
+            <StackPanel Orientation="Vertical">
 
                 <TextBlock x:Uid="Oobe_HowToLaunch"
-                           AutomationProperties.HeadingLevel="Level3"
-                           Style="{StaticResource OobeSubtitleStyle}" />
+                           Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <controls:ShortcutTextControl x:Uid="Oobe_ImageResizer_HowToLaunch" />
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks"
-                           AutomationProperties.HeadingLevel="Level3"
-                           Style="{StaticResource OobeSubtitleStyle}" />
+                           Style="{ThemeResource OobeSubtitleStyle}"/>
 
                 <controls:ShortcutTextControl x:Uid="Oobe_ImageResizer_TipsAndTricks" />
 
-                <StackPanel Orientation="Horizontal"
-                            Spacing="4"
-                            Margin="0,32,0,0">
-                    <Button Click="SettingsLaunchButton_Click"
-                            AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}">
-                        <StackPanel Orientation="Horizontal"
-                                    Spacing="8">
-                            <TextBlock Text="&#xE115;"
-                                       Margin="0,3,0,0"
-                                       FontFamily="Segoe MDL2 Assets" />
-                            <TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel"/>
-                        </StackPanel>
-                    </Button>
+                <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}">
+                        <TextBlock x:Uid="LearnMore_ImageResizer"
+                               TextWrapping="Wrap" />
+                    </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </ScrollViewer>
-    </Grid>
-</Page>
+        </controls:OOBEPageControl.ModuleContent>
+    </controls:OOBEPageControl>
+</Page>
\ No newline at end of file
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 97d2e9a1d3..f5c5d4546c 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
@@ -1,70 +1,37 @@
 <Page x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeKBM"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
       mc:Ignorable="d">
 
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="280" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
+    <controls:OOBEPageControl ModuleTitle="{x:Bind ViewModel.ModuleName}"
+                                  ModuleImageSource="{x:Bind ViewModel.PreviewImageSource}"
+                                  ModuleDescription="{x:Bind ViewModel.Description}">
 
-        <Image Stretch="UniformToFill"
-               Source="{x:Bind ViewModel.PreviewImageSource}" />
-
-        <ScrollViewer Grid.Row="1"
-                      VerticalScrollBarVisibility="Auto">
-            <StackPanel Orientation="Vertical"
-                        Margin="{StaticResource OobePageContentMargin}"
-                        VerticalAlignment="Top">
-
-                <TextBlock Text="{x:Bind ViewModel.ModuleName}"
-                           AutomationProperties.HeadingLevel="Level2"
-                           Style="{StaticResource PageTitleStyle}" />
-
-                <TextBlock Margin="0,4,0,0"
-                           TextWrapping="Wrap"
-                           Text="{x:Bind ViewModel.Description}" />
-
-                <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
-                                 Margin="-12,0,0,4">
-                    <TextBlock>
-                                <Run x:Uid="Oobe_LearnMore" />
-                                <Run Text="{x:Bind ViewModel.ModuleName}" />
-                    </TextBlock>
-                </HyperlinkButton>
+        <controls:OOBEPageControl.ModuleContent>
+            <StackPanel Orientation="Vertical">
 
                 <TextBlock x:Uid="Oobe_HowToCreateMappings"
-                           AutomationProperties.HeadingLevel="Level3"
-                           Style="{StaticResource OobeSubtitleStyle}" />
+                           Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <controls:ShortcutTextControl x:Uid="Oobe_KBM_HowToCreateMappings" />
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks"
-                           AutomationProperties.HeadingLevel="Level3"
-                           Style="{StaticResource OobeSubtitleStyle}" />
+                           Style="{ThemeResource OobeSubtitleStyle}"/>
 
                 <controls:ShortcutTextControl x:Uid="Oobe_KBM_TipsAndTricks" />
 
-                <StackPanel Orientation="Horizontal"
-                            Spacing="4"
-                            Margin="0,32,0,0">
-                    <Button Click="SettingsLaunchButton_Click"
-                            AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}">
-                        <StackPanel Orientation="Horizontal"
-                                    Spacing="8">
-                            <TextBlock Text="&#xE115;"
-                                       Margin="0,3,0,0"
-                                       FontFamily="Segoe MDL2 Assets" />
-                            <TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel" />
-                        </StackPanel>
-                    </Button>
+                <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}">
+                        <TextBlock x:Uid="LearnMore_KBM"
+                               TextWrapping="Wrap" />
+                    </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </ScrollViewer>
-    </Grid>
+        </controls:OOBEPageControl.ModuleContent>
+    </controls:OOBEPageControl>
 </Page>
\ No newline at end of file
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 dc97410862..977d0bbe44 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
@@ -4,56 +4,33 @@
       xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
       mc:Ignorable="d">
 
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="280" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
+    <controls:OOBEPageControl ModuleTitle="{x:Bind ViewModel.ModuleName}"
+                                  ModuleImageSource="{x:Bind ViewModel.PreviewImageSource}">
 
-        <Image Stretch="UniformToFill"
-               Source="{x:Bind ViewModel.PreviewImageSource}" />
-
-        <ScrollViewer Grid.Row="1"
-                      VerticalScrollBarVisibility="Auto">
-            <StackPanel Orientation="Vertical"
-                        Margin="{StaticResource OobePageContentMargin}"
-                        VerticalAlignment="Top">
-
-                <TextBlock Text="{x:Bind ViewModel.ModuleName}"
-                           AutomationProperties.HeadingLevel="Level2"
-                           Style="{StaticResource PageTitleStyle}" />
+        <controls:OOBEPageControl.ModuleContent>
+            <StackPanel Orientation="Vertical">
 
                 <TextBlock Margin="0,4,0,0"
-                           TextWrapping="Wrap">
-                    <Run x:Uid="Oobe_Overview_Description" />
-                    <Hyperlink NavigateUri="{x:Bind ViewModel.DescriptionLink}">
-                        <Run x:Uid="Oobe_Overview_DescriptionLinkText" />
-                    </Hyperlink><Run Text="." />
-                </TextBlock>
+                           x:Uid="Oobe_Overview_Description"
+                           TextWrapping="Wrap"/>
+                <HyperlinkButton NavigateUri="{x:Bind ViewModel.DescriptionLink}" Style="{StaticResource HyperlinkButtonStyle}">
+                    <TextBlock x:Uid="Oobe_Overview_DescriptionLinkText"
+                               TextWrapping="Wrap" />
+                </HyperlinkButton>
 
-                <TextBlock Margin="0,32,0,0"
-                           TextWrapping="Wrap">
-                <Run x:Uid="Oobe_Overview_CheckoutLatestVersion" />
-                <Hyperlink NavigateUri="{x:Bind ViewModel.Link}">
-                    <Run x:Uid="Oobe_Overview_LatestVersionLink" />
-                </Hyperlink><Run Text="." />
-                </TextBlock>
+                <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource HyperlinkButtonStyle}">
+                    <TextBlock x:Uid="Oobe_Overview_LatestVersionLink"
+                               TextWrapping="Wrap" />
+                </HyperlinkButton>
 
-                <Button Click="SettingsLaunchButton_Click"
-                        AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}"
-                        Margin="0,32,0,0">
-                    <StackPanel Orientation="Horizontal"
-                                Spacing="8">
-                        <TextBlock Text="&#xE115;"
-                                   Margin="0,3,0,0"
-                                   FontFamily="Segoe MDL2 Assets" />
-                        <TextBlock 
-                                   Name="SettingsLabel" />
-                    </StackPanel>
-                </Button>
+                <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
+                    <Button x:Uid="OOBE_Settings"
+                            Click="SettingsLaunchButton_Click"/>
+                </StackPanel>
             </StackPanel>
-        </ScrollViewer>
-    </Grid>
+        </controls:OOBEPageControl.ModuleContent>
+    </controls:OOBEPageControl>
 </Page>
\ No newline at end of file
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 28d6bfb79c..50cff8cf84 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
@@ -7,67 +7,32 @@
       xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
       mc:Ignorable="d">
 
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="280" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-
-        <Image Stretch="UniformToFill"
-               Source="{x:Bind ViewModel.PreviewImageSource}" />
-
-        <ScrollViewer Grid.Row="1"
-                      VerticalScrollBarVisibility="Auto">
-            <StackPanel Orientation="Vertical"
-                        Margin="{StaticResource OobePageContentMargin}"
-                        VerticalAlignment="Top">
-
-                <TextBlock Text="{x:Bind ViewModel.ModuleName}"
-                           AutomationProperties.HeadingLevel="Level2"
-                           Style="{StaticResource PageTitleStyle}" />
-
-                <TextBlock Margin="0,4,0,0"
-                           TextWrapping="Wrap"
-                           Text="{x:Bind ViewModel.Description}" />
-
-                <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
-                                 Margin="-12,0,0,4">
-                    <TextBlock>
-                                <Run x:Uid="Oobe_LearnMore" />
-                                <Run Text="{x:Bind ViewModel.ModuleName}" />
-                    </TextBlock>
-                </HyperlinkButton>
+    <controls:OOBEPageControl ModuleTitle="{x:Bind ViewModel.ModuleName}"
+                                  ModuleImageSource="{x:Bind ViewModel.PreviewImageSource}"
+                                  ModuleDescription="{x:Bind ViewModel.Description}">
 
+        <controls:OOBEPageControl.ModuleContent>
+            <StackPanel Orientation="Vertical">
 
                 <TextBlock x:Uid="Oobe_HowToUse"
-                           AutomationProperties.HeadingLevel="Level3"
-                           Style="{StaticResource OobeSubtitleStyle}" />
+                           Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <controls:ShortcutTextControl x:Uid="Oobe_PowerRename_HowToUse" />
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks"
-                           AutomationProperties.HeadingLevel="Level3"
-                           Style="{StaticResource OobeSubtitleStyle}" />
+                           Style="{ThemeResource OobeSubtitleStyle}"/>
 
-                <TextBlock x:Uid="Oobe_PowerRename_TipsAndTricks"
-                           TextWrapping="Wrap" />
+                <controls:ShortcutTextControl x:Uid="Oobe_PowerRename_TipsAndTricks" />
 
-                <StackPanel Orientation="Horizontal"
-                            Spacing="4"
-                            Margin="0,32,0,0">
-
-                    <Button Click="SettingsLaunchButton_Click"
-                            AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}">
-                        <StackPanel Orientation="Horizontal"
-                                    Spacing="8">
-                            <TextBlock Text="&#xE115;"
-                                       Margin="0,3,0,0"
-                                       FontFamily="Segoe MDL2 Assets" />
-                            <TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel" />
-                        </StackPanel>
-                    </Button>
+                <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}">
+                        <TextBlock x:Uid="LearnMore_PowerRename"
+                               TextWrapping="Wrap" />
+                    </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </ScrollViewer>
-    </Grid>
+        </controls:OOBEPageControl.ModuleContent>
+    </controls:OOBEPageControl>
 </Page>
\ No newline at end of file
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 a5e8beba9a..3ef45b1a4b 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
@@ -8,73 +8,33 @@
       xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
       mc:Ignorable="d">
 
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="280" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
+    <controls:OOBEPageControl ModuleTitle="{x:Bind ViewModel.ModuleName}"
+                                  ModuleImageSource="{x:Bind ViewModel.PreviewImageSource}"
+                                  ModuleDescription="{x:Bind ViewModel.Description}">
 
-        <Image Stretch="UniformToFill"
-               Source="{x:Bind ViewModel.PreviewImageSource}" />
-
-        <ScrollViewer Grid.Row="1"
-                      VerticalScrollBarVisibility="Auto">
-            <StackPanel Orientation="Vertical"
-                        Margin="{StaticResource OobePageContentMargin}"
-                        VerticalAlignment="Top">
-
-                <TextBlock Text="{x:Bind ViewModel.ModuleName}"
-                           AutomationProperties.HeadingLevel="Level2"
-                           Style="{StaticResource PageTitleStyle}" />
-
-                <TextBlock Margin="0,4,0,0"
-                           TextWrapping="Wrap"
-                           Text="{x:Bind ViewModel.Description}" />
-
-                <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
-                                 Margin="-12,0,0,4">
-                    <TextBlock>
-                                <Run x:Uid="Oobe_LearnMore" />
-                                <Run Text="{x:Bind ViewModel.ModuleName}" />
-                    </TextBlock>
-
-                </HyperlinkButton>
+        <controls:OOBEPageControl.ModuleContent>
+            <StackPanel Orientation="Vertical">
 
                 <TextBlock x:Uid="Oobe_HowToLaunch"
-                           AutomationProperties.HeadingLevel="Level3"
-                           Style="{StaticResource OobeSubtitleStyle}" />
+                           Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <controls:ShortcutTextControl x:Uid="Oobe_Run_HowToLaunch" />
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks"
-                           AutomationProperties.HeadingLevel="Level3"
-                           Style="{StaticResource OobeSubtitleStyle}" />
+                           Style="{ThemeResource OobeSubtitleStyle}"/>
 
                 <controls:ShortcutTextControl x:Uid="Oobe_Run_TipsAndTricks" />
 
-                <StackPanel Orientation="Horizontal"
-                            Margin="0,32,0,0"
-                            Spacing="4">
-
-                    <Button Click="Start_Run_Click" Style="{StaticResource AccentButtonStyle}">
-                        <TextBlock>
-                        <Run x:Uid="Oobe_Launch" />
-                        <Run Text="{x:Bind ViewModel.ModuleName}" />
-                        </TextBlock>
-                    </Button>
-
-                    <Button Click="SettingsLaunchButton_Click"
-                            AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}">
-                        <StackPanel Orientation="Horizontal"
-                                    Spacing="8">
-                            <TextBlock Text="&#xE115;"
-                                       Margin="0,3,0,0"
-                                       FontFamily="Segoe MDL2 Assets" />
-                            <TextBlock  x:Uid="OOBE_Settings" Name="SettingsLabel" />
-                        </StackPanel>
-                    </Button>
+                <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
+                    <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}">
+                        <TextBlock x:Uid="LearnMore_Run"
+                               TextWrapping="Wrap" />
+                    </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </ScrollViewer>
-    </Grid>
-</Page>
+        </controls:OOBEPageControl.ModuleContent>
+    </controls:OOBEPageControl>
+</Page>
\ No newline at end of file
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 0f7328a555..6ef696af96 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
@@ -8,65 +8,29 @@
       xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
       mc:Ignorable="d">
 
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="280" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
 
-        <Image Stretch="UniformToFill"
-               Source="{x:Bind ViewModel.PreviewImageSource}" />
+    <controls:OOBEPageControl ModuleTitle="{x:Bind ViewModel.ModuleName}"
+                                  ModuleImageSource="{x:Bind ViewModel.PreviewImageSource}"
+                                  ModuleDescription="{x:Bind ViewModel.Description}">
 
-        <ScrollViewer Grid.Row="1"
-                      VerticalScrollBarVisibility="Auto">
-            <StackPanel Orientation="Vertical"
-                        Margin="{StaticResource OobePageContentMargin}"
-                        VerticalAlignment="Top">
-
-                <TextBlock Text="{x:Bind ViewModel.ModuleName}"
-                           AutomationProperties.HeadingLevel="Level2"
-                           Style="{StaticResource PageTitleStyle}" />
-
-                <TextBlock Margin="0,4,0,0"
-                           TextWrapping="Wrap"
-                           Text="{x:Bind ViewModel.Description}" />
-
-                <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
-                                 Margin="-12,0,0,4">
-
-                    <TextBlock>
-                                <Run x:Uid="Oobe_LearnMore" />
-                                <Run Text="{x:Bind ViewModel.ModuleName}" />
-                    </TextBlock>
-                </HyperlinkButton>
+        <controls:OOBEPageControl.ModuleContent>
+            <StackPanel Orientation="Vertical">
 
                 <TextBlock x:Uid="Oobe_HowToLaunch"
-                           AutomationProperties.HeadingLevel="Level3"
-                           Style="{StaticResource OobeSubtitleStyle}" />
+                           Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <controls:ShortcutTextControl x:Uid="Oobe_ShortcutGuide_HowToLaunch" />
-                
-                <StackPanel Orientation="Horizontal"
-                            Margin="0,32,0,0"
-                            Spacing="8">
-                    <Button Click="Start_ShortcutGuide_Click" Style="{StaticResource AccentButtonStyle}">
-                        <TextBlock>
-                        <Run x:Uid="Oobe_Launch" />
-                        <Run Text="{x:Bind ViewModel.ModuleName}" />
-                        </TextBlock>
-                    </Button>
-                    <Button Click="SettingsLaunchButton_Click"
-                            AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}">
-                        <StackPanel Orientation="Horizontal"
-                                    Spacing="8">
-                            <TextBlock Text="&#xE115;"
-                                       Margin="0,3,0,0"
-                                       FontFamily="Segoe MDL2 Assets" />
-                            <TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel" />
-                        </StackPanel>
-                    </Button>
+
+                <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
+                    <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}">
+                        <TextBlock x:Uid="LearnMore_ShortcutGuide"
+                               TextWrapping="Wrap" />
+                    </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </ScrollViewer>
-    </Grid>
-</Page>
+        </controls:OOBEPageControl.ModuleContent>
+    </controls:OOBEPageControl>
+</Page>
\ No newline at end of file
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 f84456cbfa..4ea415ae03 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
@@ -8,58 +8,27 @@
       xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
       mc:Ignorable="d">
 
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="280" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
+    <controls:OOBEPageControl ModuleTitle="{x:Bind ViewModel.ModuleName}"
+                                  ModuleImageSource="{x:Bind ViewModel.PreviewImageSource}"
+                                  ModuleDescription="{x:Bind ViewModel.Description}">
 
-        <Image Stretch="UniformToFill"
-               Source="{x:Bind ViewModel.PreviewImageSource}" />
-
-        <ScrollViewer Grid.Row="1"
-                      VerticalScrollBarVisibility="Auto">
-            <StackPanel Orientation="Vertical"
-                        Margin="{StaticResource OobePageContentMargin}"
-                        VerticalAlignment="Top">
-
-                <TextBlock Text="{x:Bind ViewModel.ModuleName}"
-                           AutomationProperties.HeadingLevel="Level2"
-                           Style="{StaticResource PageTitleStyle}" />
-
-                <TextBlock TextWrapping="Wrap"
-                           Margin="0,4,0,0"
-                           Text="{x:Bind ViewModel.Description}" />
-
-                <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
-                                 Margin="-12,0,0,4">
-                    <TextBlock>
-                                <Run x:Uid="Oobe_LearnMore" />
-                                <Run Text="{x:Bind ViewModel.ModuleName}" />
-                    </TextBlock>
-                </HyperlinkButton>
+        <controls:OOBEPageControl.ModuleContent>
+            <StackPanel Orientation="Vertical">
 
                 <TextBlock x:Uid="Oobe_HowToLaunch"
-                           AutomationProperties.HeadingLevel="Level3"
-                           Style="{StaticResource OobeSubtitleStyle}" />
+                           Style="{ThemeResource OobeSubtitleStyle}" />
 
                 <controls:ShortcutTextControl x:Uid="Oobe_VideoConference_HowToLaunch" />
 
-                <StackPanel Orientation="Horizontal"
-                            Margin="0,32,0,0"
-                            Spacing="8">
-                    <Button Click="SettingsLaunchButton_Click"
-                            AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}"> 
-                        <StackPanel Orientation="Horizontal"
-                                    Spacing="8">
-                            <TextBlock Text="&#xE115;"
-                                       Margin="0,3,0,0"
-                                       FontFamily="Segoe MDL2 Assets" />
-                            <TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel"/>
-                        </StackPanel>
-                    </Button>
+                <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}">
+                        <TextBlock x:Uid="LearnMore_VCM"
+                               TextWrapping="Wrap" />
+                    </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </ScrollViewer>
-    </Grid>
-</Page>
+        </controls:OOBEPageControl.ModuleContent>
+    </controls:OOBEPageControl>
+</Page>
\ No newline at end of file
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 6dd47c2665..0695e4a1d7 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
@@ -1170,7 +1170,7 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
     <value>Launch</value>
   </data>
   <data name="Launch_ColorPicker.Content" xml:space="preserve">
-    <value>Launch ColorPicker</value>
+    <value>Launch Color Picker</value>
   </data>
   <data name="Oobe_LearnMore.Text" xml:space="preserve">
     <value>Learn more about</value>
@@ -1202,18 +1202,16 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
   <data name="Oobe_VideoConference_Description" xml:space="preserve">
     <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_CheckoutLatestVersion.Text" xml:space="preserve">
-    <value>For returning users, check out what is new in our</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.
-Take a moment to preview the various utilities listed or view our comprehensive documentation on</value>
+    
+Take a moment to preview the various utilities listed or view our comprehensive documentation.</value>
   </data>
   <data name="Oobe_Overview_DescriptionLinkText.Text" xml:space="preserve">
-    <value>Microsoft Docs</value>
+    <value>Check out documentation on Microsoft Docs</value>
   </data>
   <data name="Oobe_Overview_LatestVersionLink.Text" xml:space="preserve">
-    <value>release notes</value>
+    <value>Check out what's new in our release notes</value>
   </data>
   <data name="Oobe_ColorPicker_HowToUse.Text" xml:space="preserve">
     <value>{Win} + {Shift} + {C} to open Color Picker.</value>
@@ -1517,4 +1515,10 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and
     <value>File Explorer add-ons</value>
     <comment>Do not localize this string</comment>
   </data>
+  <data name="Launch_Run.Content" xml:space="preserve">
+    <value>Launch PowerToys Run</value>
+  </data>
+  <data name="Launch_ShortcutGuide.Content" xml:space="preserve">
+    <value>Launch Shortcut Guide</value>
+  </data>
 </root>
\ No newline at end of file
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 31c7ca61cb..00cddc8f2a 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
@@ -43,7 +43,7 @@
             <winui:NavigationView.MenuItems>
                 <winui:NavigationViewItem x:Uid="Shell_General" helpers:NavHelper.NavigateTo="views:GeneralPage" AutomationProperties.HeadingLevel="Level1">
                     <winui:NavigationViewItem.Icon>
-                        <FontIcon Glyph="&#xE713;"/>
+                        <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsSettings.png" ShowAsMonochrome="False"/>
                     </winui:NavigationViewItem.Icon>
                 </winui:NavigationViewItem>