diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ScrollContainer.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ScrollContainer.xaml
index c649c677ea..ef1e65a01f 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ScrollContainer.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ScrollContainer.xaml
@@ -141,10 +141,10 @@
             Grid.Column="1">
             <ScrollViewer
                 x:Name="scroller"
-                HorizontalScrollBarVisibility="Hidden"
+                HorizontalScrollBarVisibility="Disabled"
                 HorizontalScrollMode="Enabled"
                 SizeChanged="Scroller_SizeChanged"
-                VerticalScrollBarVisibility="Hidden"
+                VerticalScrollBarVisibility="Disabled"
                 VerticalScrollMode="Disabled"
                 ViewChanging="Scroller_ViewChanging">
                 <Grid x:Name="ContentGrid">
@@ -188,9 +188,9 @@
             <VisualStateGroup x:Name="OrientationStates">
                 <VisualState x:Name="HorizontalState">
                     <VisualState.Setters>
-                        <Setter Target="scroller.HorizontalScrollBarVisibility" Value="Hidden" />
+                        <Setter Target="scroller.HorizontalScrollBarVisibility" Value="Disabled" />
                         <Setter Target="scroller.HorizontalScrollMode" Value="Enabled" />
-                        <Setter Target="scroller.VerticalScrollBarVisibility" Value="Hidden" />
+                        <Setter Target="scroller.VerticalScrollBarVisibility" Value="Disabled" />
                         <Setter Target="scroller.VerticalScrollMode" Value="Disabled" />
                         <Setter Target="ScrollBackBtn.Padding" Value="4,12,4,12" />
                         <Setter Target="ScrollBackBtn.Margin" Value="8,0,0,0" />
@@ -210,9 +210,9 @@
                 </VisualState>
                 <VisualState x:Name="VerticalState">
                     <VisualState.Setters>
-                        <Setter Target="scroller.HorizontalScrollBarVisibility" Value="Hidden" />
+                        <Setter Target="scroller.HorizontalScrollBarVisibility" Value="Disabled" />
                         <Setter Target="scroller.HorizontalScrollMode" Value="Disabled" />
-                        <Setter Target="scroller.VerticalScrollBarVisibility" Value="Hidden" />
+                        <Setter Target="scroller.VerticalScrollBarVisibility" Value="Disabled" />
                         <Setter Target="scroller.VerticalScrollMode" Value="Enabled" />
                         <Setter Target="ScrollBackBtn.Padding" Value="12,4,12,4" />
                         <Setter Target="ScrollBackBtn.Margin" Value="0,8,0,0" />
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
index 48d29a2df2..738ee5f05f 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
@@ -386,8 +386,8 @@
                         <Setter Target="EndScroller.(Grid.ColumnSpan)" Value="3" />
                         <Setter Target="EndScroller.HorizontalAlignment" Value="Stretch" />
                         <Setter Target="EndScroller.VerticalAlignment" Value="Bottom" />
-                        <Setter Target="ContentGrid.Margin" Value="0,4,4,4" />
-                        <Setter Target="ContentGrid.Padding" Value="0,8,4,8" />
+                        <Setter Target="ContentGrid.Margin" Value="0,0,4,4" />
+                        <Setter Target="ContentGrid.Padding" Value="0,0,4,8" />
                         <Setter Target="RootGrid.BorderThickness" Value="0,0,1,0" />
 
                         <Setter Target="StartListView.ItemsPanel" Value="{StaticResource VerticalItemsPanel}" />
@@ -425,8 +425,8 @@
                         <Setter Target="EndScroller.(Grid.ColumnSpan)" Value="3" />
                         <Setter Target="EndScroller.HorizontalAlignment" Value="Stretch" />
                         <Setter Target="EndScroller.VerticalAlignment" Value="Bottom" />
-                        <Setter Target="ContentGrid.Margin" Value="4,4,0,4" />
-                        <Setter Target="ContentGrid.Padding" Value="4,8,0,8" />
+                        <Setter Target="ContentGrid.Margin" Value="4,0,0,4" />
+                        <Setter Target="ContentGrid.Padding" Value="4,0,0,8" />
                         <Setter Target="RootGrid.BorderThickness" Value="1,0,0,0" />
 
                         <Setter Target="StartListView.ItemsPanel" Value="{StaticResource VerticalItemsPanel}" />
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml
index 18957f82ab..9c595762d9 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml
@@ -66,6 +66,8 @@
                             ToolTipService.ToolTip="{TemplateBinding ToolTip}">
                             <Grid
                                 x:Name="PART_RootGrid"
+                                MinWidth="32"
+                                MinHeight="30"
                                 Margin="{TemplateBinding InnerMargin}"
                                 Padding="{TemplateBinding Padding}"
                                 VerticalAlignment="Stretch"
@@ -80,7 +82,7 @@
                                     ColumnSpacing="8">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
                                     </Grid.ColumnDefinitions>
 
                                     <!--  Icon  -->
@@ -164,6 +166,7 @@
                                     <VisualState x:Name="TextHidden">
                                         <VisualState.Setters>
                                             <Setter Target="ContentGrid.ColumnSpacing" Value="0" />
+                                            <Setter Target="ContentGrid.HorizontalAlignment" Value="Center" />
                                             <Setter Target="TextPanel.Visibility" Value="Collapsed" />
                                         </VisualState.Setters>
                                     </VisualState>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml.cs
index 527b2bd834..aa61325603 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml.cs
@@ -170,7 +170,7 @@ public sealed partial class DockItemControl : Control
             }
         }
 
-        HorizontalAlignment = HorizontalAlignment.Center;
+        HorizontalAlignment = HorizontalAlignment.Stretch;
     }
 
     private void UpdateAllVisibility()
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 e40c0b05b0..24c415c470 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
@@ -796,9 +796,6 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="DockAppearance_ColorizationMode.Header" xml:space="preserve">
     <value>Colorization mode</value>
   </data>
-  <data name="DockAppearance_NoBackground_SettingsCard.Header" xml:space="preserve">
-    <value>No background</value>
-  </data>
   <data name="DockAppearance_NoBackground_DescriptionTextBlock.Text" xml:space="preserve">
     <value>No settings</value>
   </data>