diff --git a/src/settings-ui/Settings.UI/SettingsXAML/App.xaml b/src/settings-ui/Settings.UI/SettingsXAML/App.xaml
index 365c592d27..c1a5392bdc 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/App.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/App.xaml
@@ -39,6 +39,7 @@
 
             <tkconverters:StringFormatConverter x:Key="StringFormatConverter" />
             <tkconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
+            <x:Double x:Key="SettingsCardSpacing">2</x:Double>
 
             <!--  Overrides  -->
             <Thickness x:Key="InfoBarIconMargin">6,16,16,16</Thickness>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroup.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroup.xaml
index d3462c6655..912211d9c4 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroup.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroup.xaml
@@ -10,7 +10,7 @@
                     <StackPanel
                         ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
                         Orientation="Vertical"
-                        Spacing="2" />
+                        Spacing="{StaticResource SettingsCardSpacing}" />
                 </ItemsPanelTemplate>
             </Setter.Value>
         </Setter>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
index 548533051f..13d6ee5c8f 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
@@ -406,10 +406,11 @@
                     </InfoBar>
                 </controls:SettingsGroup>
                 <controls:SettingsGroup x:Uid="General_DiagnosticsAndFeedback" Visibility="Visible">
-                    <StackPanel>
+                    <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
                         <HyperlinkButton
                             x:Uid="GeneralPage_DiagnosticsAndFeedback_Link"
-                            Margin="-8,0,0,0"
+                            Margin="0,0,0,8"
+                            Padding="0"
                             NavigateUri="https://aka.ms/powertoys-data-and-privacy-documentation" />
                         <tkcontrols:SettingsCard
                             x:Uid="GeneralPage_EnableDataDiagnostics"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml
index 0ac0bea248..b339852ca5 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml
@@ -73,15 +73,15 @@
             </StackPanel>
             <StackPanel
                 Grid.Column="1"
-                Margin="0,-15,140,0"
+                Margin="0,0,148,0"
                 HorizontalAlignment="Right"
                 Orientation="Horizontal">
                 <Button
                     x:Name="ShutDownBtn"
-                    Background="Transparent"
-                    BorderBrush="Transparent"
-                    Click="ExitPTItem_Tapped">
-                    <FontIcon FontSize="14" Glyph="&#xE7E8;" />
+                    Height="48"
+                    Click="ExitPTItem_Tapped"
+                    Style="{StaticResource SubtleButtonStyle}">
+                    <FontIcon FontSize="16" Glyph="&#xE7E8;" />
                     <ToolTipService.ToolTip>
                         <ToolTip>
                             <TextBlock x:Uid="AppTitleBarShutDown_Tooltip" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml.cs
index e32664cc00..ca2b0e2412 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml.cs
@@ -9,6 +9,7 @@ using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Services;
 using Microsoft.PowerToys.Settings.UI.ViewModels;
+using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Automation.Peers;
 using Microsoft.UI.Xaml.Controls;
@@ -422,6 +423,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                 // A custom title bar is required for full window theme and Mica support.
                 // https://docs.microsoft.com/windows/apps/develop/title-bar?tabs=winui3#full-customization
                 u.ExtendsContentIntoTitleBar = true;
+                u.AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Tall;
                 WindowHelpers.ForceTopBorder1PixelInsetOnWindows10(WindowNative.GetWindowHandle(u));
                 u.SetTitleBar(AppTitleBar);
                 var loader = ResourceLoaderInstance.ResourceLoader;