diff --git a/ModernWpf.Controls/CommandBar/CommandBar.xaml b/ModernWpf.Controls/CommandBar/CommandBar.xaml
index 8ca9c18a..2b7b19a7 100644
--- a/ModernWpf.Controls/CommandBar/CommandBar.xaml
+++ b/ModernWpf.Controls/CommandBar/CommandBar.xaml
@@ -243,7 +243,7 @@
     <Style TargetType="local:CommandBar">
         <Setter Property="Background" Value="{DynamicResource CommandBarBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource CommandBarForeground}" />
-        <Setter Property="Padding" Value="9,0,0,0" />
+        <Setter Property="Padding" Value="4,0,0,0" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
diff --git a/ModernWpf/Styles/CommandBar.xaml b/ModernWpf/Styles/CommandBar.xaml
index 13dcfdd2..57a66b0f 100644
--- a/ModernWpf/Styles/CommandBar.xaml
+++ b/ModernWpf/Styles/CommandBar.xaml
@@ -15,17 +15,17 @@
     <sys:Double x:Key="AppBarButtonContentHeight">16</sys:Double>
     <sys:Double x:Key="AppBarThemeMinHeight">64</sys:Double>
     <sys:Double x:Key="AppBarThemeCompactHeight">48</sys:Double>
-    <Thickness x:Key="AppBarEllipsisButtonInnerBorderMargin">0,9,9,9</Thickness>
+    <Thickness x:Key="AppBarEllipsisButtonInnerBorderMargin">2,6,6,6</Thickness>
 
     <Thickness x:Key="AppBarButtonContentViewboxMargin">12,16,0,10</Thickness>
     <Thickness x:Key="AppBarButtonContentViewboxCompactMargin">0,12,0,12</Thickness>
-    <Thickness x:Key="AppBarButtonContentViewboxCollapsedMargin">0,16,0,4</Thickness>
+    <Thickness x:Key="AppBarButtonContentViewboxCollapsedMargin">0,16,0,2</Thickness>
     <Thickness x:Key="AppBarButtonOverflowTextTouchMargin">0,9,0,12</Thickness>
     <Thickness x:Key="AppBarButtonOverflowTextLabelPadding">0,5,0,8</Thickness>
     <Thickness x:Key="AppBarButtonTextLabelMargin">2,0,2,8</Thickness>
     <Thickness x:Key="AppBarButtonTextLabelOnRightMargin">8,16,12,10</Thickness>
-    <Thickness x:Key="AppBarButtonInnerBorderMargin">0,9,0,9</Thickness>
-    <Thickness x:Key="AppBarButtonInnerBorderCompactMargin">0,9,0,25</Thickness>
+    <Thickness x:Key="AppBarButtonInnerBorderMargin">2,6,2,6</Thickness>
+    <Thickness x:Key="AppBarButtonInnerBorderCompactMargin">2,6,2,22</Thickness>
     <Thickness x:Key="AppBarButtonInnerBorderOverflowMargin">4,0,4,0</Thickness>
 
     <Thickness x:Key="AppBarToggleButtonOverflowTextTouchMargin">0,9,0,12</Thickness>
diff --git a/test/ModernWpfTestApp/CommandBarPage.xaml b/test/ModernWpfTestApp/CommandBarPage.xaml
index 0ef2cb7e..f182ea27 100644
--- a/test/ModernWpfTestApp/CommandBarPage.xaml
+++ b/test/ModernWpfTestApp/CommandBarPage.xaml
@@ -26,7 +26,7 @@
                 <AppBarButton Icon="Add" Label="Add"/>
                 <AppBarButton Icon="Remove" Label="Remove" LabelPosition="Collapsed"/>
                 <AppBarSeparator/>
-                <AppBarButton Icon="Save" Label="Save"/>
+                <AppBarButton Icon="Save" Label="Save And Quit"/>
                 <AppBarToggleButton Icon="Add" Label="Toggle"/>
                 <CommandBar.SecondaryCommands>
                     <AppBarButton Icon="Add" Label="Add"/>