diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml
index 83bc636817..cba3cafd71 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml
@@ -47,7 +47,7 @@
         <Style.Setters>
             <Setter Property="Background" Value="{ThemeResource DockItemBackground}" />
             <Setter Property="BorderBrush" Value="{ThemeResource DockItemBorderBrush}" />
-            <Setter Property="Padding" Value="8,2,8,2" />
+            <Setter Property="Padding" Value="4,0,4,0" />
             <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
             <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
             <Setter Property="Template">
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
index ffe989d064..f305f4de70 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
@@ -30,7 +30,7 @@
   </PropertyGroup>
 
   <!-- For debugging purposes, uncomment this block to enable AOT builds -->
-  <!-- <PropertyGroup>
+  <PropertyGroup>
     <EnableCmdPalAOT>true</EnableCmdPalAOT>
     <GeneratePackageLocally>true</GeneratePackageLocally>
   </PropertyGroup>
@@ -40,7 +40,7 @@
     <PublishSingleFile>false</PublishSingleFile>
     <DisableRuntimeMarshalling>false</DisableRuntimeMarshalling>
     <PublishAot>true</PublishAot>
-  </PropertyGroup> -->
+  </PropertyGroup>
 
   <PropertyGroup Condition="'$(CIBuild)' == 'true' or '$(GeneratePackageLocally)' == 'true'">
     <GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockSettingsPage.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockSettingsPage.xaml
index 973dbf7e45..06c078b6ca 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockSettingsPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockSettingsPage.xaml
@@ -45,28 +45,16 @@
                     <TextBlock x:Uid="DockAppearanceSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
                     <!--  Dock Size  -->
-                    <controls:SettingsCard Header="Dock Size">
-                        <controls:SettingsCard.Description>
-                            Choose the size of your dock
-                        </controls:SettingsCard.Description>
-                        <ComboBox
-                            x:Name="DockSizeComboBox"
-                            MinWidth="120"
-                            SelectedIndex="{x:Bind SelectedDockSizeIndex, Mode=TwoWay}">
-                            <ComboBoxItem Content="Small" />
-                            <ComboBoxItem Content="Medium" />
-                            <ComboBoxItem Content="Large" />
-                        </ComboBox>
-                    </controls:SettingsCard>
+
 
                     <!--  Dock Position  -->
-                    <controls:SettingsCard Header="Dock Position">
-                        <controls:SettingsCard.HeaderIcon>
+                    <controls:SettingsExpander
+                        Description="Choose where the dock appears on your screen"
+                        Header="Dock position and appearnce"
+                        IsExpanded="True">
+                        <controls:SettingsExpander.HeaderIcon>
                             <SymbolIcon Symbol="MoveToFolder" />
-                        </controls:SettingsCard.HeaderIcon>
-                        <controls:SettingsCard.Description>
-                            Choose where the dock appears on your screen
-                        </controls:SettingsCard.Description>
+                        </controls:SettingsExpander.HeaderIcon>
                         <ComboBox
                             x:Name="DockPositionComboBox"
                             MinWidth="120"
@@ -76,35 +64,28 @@
                             <ComboBoxItem Content="Right" />
                             <ComboBoxItem Content="Bottom" />
                         </ComboBox>
-                    </controls:SettingsCard>
+                        <controls:SettingsExpander.Items>
 
-                    <!--  Backdrop Style  -->
-                    <controls:SettingsCard Header="Background Style">
-                        <controls:SettingsCard.Description>
-                            Choose the background effect for your dock
-                        </controls:SettingsCard.Description>
-                        <ComboBox
-                            x:Name="BackdropComboBox"
-                            MinWidth="120"
-                            SelectedIndex="{x:Bind SelectedBackdropIndex, Mode=TwoWay}">
-                            <ComboBoxItem Content="Mica" />
-                            <ComboBoxItem Content="Transparent" />
-                            <ComboBoxItem Content="Acrylic" />
-                        </ComboBox>
-                    </controls:SettingsCard>
+                            <controls:SettingsCard Description="Choose the background effect" Header="Background style">
+                                <ComboBox
+                                    x:Name="BackdropComboBox"
+                                    MinWidth="120"
+                                    SelectedIndex="{x:Bind SelectedBackdropIndex, Mode=TwoWay}">
+                                    <ComboBoxItem Content="Mica" />
+                                    <ComboBoxItem Content="Transparent" />
+                                    <ComboBoxItem Content="Acrylic" />
+                                </ComboBox>
+                            </controls:SettingsCard>
 
-                    <!--  Show Labels  -->
-                    <controls:SettingsCard Header="Show Labels">
-                        <controls:SettingsCard.Description>
-                            Choose whether to show labels for dock items by default.
-                        </controls:SettingsCard.Description>
+                            <controls:SettingsCard ContentAlignment="Vertical">
+                                <cpControls:CheckBoxWithDescriptionControl
+                                    Content="Show labels"
+                                    Description="Choose whether to show labels for dock items by default"
+                                    IsChecked="{x:Bind ShowLabels, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
 
-                        <ToggleSwitch
-                            IsOn="{x:Bind ShowLabels, Mode=TwoWay}"
-                            OffContent="Hide labels"
-                            OnContent="Show Labels" />
-
-                    </controls:SettingsCard>
 
                     <!--  Bands Section  -->
                     <TextBlock x:Uid="DockBandsSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockSettingsPage.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockSettingsPage.xaml.cs
index f981581570..b29049db3b 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockSettingsPage.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/DockSettingsPage.xaml.cs
@@ -36,7 +36,6 @@ public sealed partial class DockSettingsPage : Page
     private void InitializeSettings()
     {
         // Initialize UI controls to match current settings
-        DockSizeComboBox.SelectedIndex = SelectedDockSizeIndex;
         DockPositionComboBox.SelectedIndex = SelectedSideIndex;
         BackdropComboBox.SelectedIndex = SelectedBackdropIndex;
     }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw b/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
index 0225677f54..32dc829468 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
@@ -423,7 +423,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <value>Disable animations when switching between pages</value>
   </data>
     <data name="Settings_GeneralPage_EnableDock_SettingsCard.Header" xml:space="preserve">
-    <value>Enable dock</value>
+    <value>Enable Dock</value>
   </data>
   <data name="Settings_GeneralPage_EnableDock_SettingsCard.Description" xml:space="preserve">
     <value>Enable a toolbar with quick access to commands</value>