From f020866b46f2e966cdca182d2068ee46cbeff941 Mon Sep 17 00:00:00 2001
From: Alberto Medina Gutierrez <almedina@microsoft.com>
Date: Thu, 22 Apr 2021 15:38:14 -0700
Subject: [PATCH 1/8] Update spacing on edges

---
 .../ScrollBar_themeresources.xaml             | 62 +++++++++++++++++--
 1 file changed, 56 insertions(+), 6 deletions(-)

diff --git a/dev/CommonStyles/ScrollBar_themeresources.xaml b/dev/CommonStyles/ScrollBar_themeresources.xaml
index f4900325f5..9591561656 100755
--- a/dev/CommonStyles/ScrollBar_themeresources.xaml
+++ b/dev/CommonStyles/ScrollBar_themeresources.xaml
@@ -207,6 +207,11 @@
     <primitives:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter2x" Filter="TopLeftValue" Scale="2"/>
     <primitives:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter2x" Filter="BottomRightValue" Scale="2"/>
 
+    <Thickness x:Key="ScrollBarHorizontalDecreaseMargin">1,0,0,0</Thickness>
+    <Thickness x:Key="ScrollBarHorizontalIncreaseMargin">0,0,1,0</Thickness>
+    <Thickness x:Key="ScrollBarVerticalDecreaseMargin">0,1,0,0</Thickness>
+    <Thickness x:Key="ScrollBarVerticalIncreaseMargin">0,0,0,1</Thickness>
+
     <Style TargetType="ScrollBar" BasedOn="{StaticResource DefaultScrollBarStyle}" />
 
     <Style x:Key="DefaultScrollBarStyle" TargetType="ScrollBar">
@@ -681,7 +686,16 @@
                                        contract7NotPresent:RadiusX="{Binding Source={ThemeResource ScrollBarCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter2x}}"
                                        contract7NotPresent:RadiusY="{Binding Source={ThemeResource ScrollBarCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter2x}}"
                                        Opacity="0" Grid.ColumnSpan="5" Margin="0" StrokeThickness="{ThemeResource ScrollBarTrackBorderThemeThickness}" Fill="{ThemeResource ScrollBarTrackFill}" Stroke="{ThemeResource ScrollBarTrackStroke}" />
-                            <RepeatButton x:Name="HorizontalSmallDecrease" Opacity="0" Grid.Column="0" MinHeight="{StaticResource ScrollBarSize}" IsTabStop="False" Interval="50" Margin="0" Template="{StaticResource HorizontalDecrementTemplate}" Width="{StaticResource ScrollBarSize}" AllowFocusOnInteraction="False" VerticalAlignment="Center" />
+                            <RepeatButton
+                                x:Name="HorizontalSmallDecrease"
+                                Opacity="0"
+                                Grid.Column="0" MinHeight="{StaticResource ScrollBarSize}"
+                                IsTabStop="False"
+                                Interval="50"
+                                Margin="{ThemeResource ScrollBarHorizontalDecreaseMargin}"
+                                Template="{StaticResource HorizontalDecrementTemplate}"
+                                Width="{StaticResource ScrollBarSize}"
+                                AllowFocusOnInteraction="False" VerticalAlignment="Center" />
                             <RepeatButton x:Name="HorizontalLargeDecrease" Opacity="0" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsTabStop="False" Interval="50" Template="{StaticResource RepeatButtonTemplate}" Width="0" AllowFocusOnInteraction="False" />
                             <Thumb x:Name="HorizontalThumb"
                                    Opacity="0"
@@ -700,12 +714,22 @@
                             </Thumb>
 
                             <RepeatButton x:Name="HorizontalLargeIncrease" Opacity="0" Grid.Column="3" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsTabStop="False" Interval="50" AllowFocusOnInteraction="False" Template="{StaticResource RepeatButtonTemplate}" />
-                            <RepeatButton x:Name="HorizontalSmallIncrease" Opacity="0" Grid.Column="4" MinHeight="{StaticResource ScrollBarSize}" IsTabStop="False" Interval="50" Margin="0" Template="{StaticResource HorizontalIncrementTemplate}" Width="{StaticResource ScrollBarSize}" AllowFocusOnInteraction="False" VerticalAlignment="Center" />
+                            <RepeatButton
+                                x:Name="HorizontalSmallIncrease"
+                                Opacity="0"
+                                Grid.Column="4"
+                                MinHeight="{StaticResource ScrollBarSize}"
+                                IsTabStop="False"
+                                Interval="50"
+                                Margin="{ThemeResource ScrollBarHorizontalIncreaseMargin}" Template="{StaticResource HorizontalIncrementTemplate}" Width="{StaticResource ScrollBarSize}" AllowFocusOnInteraction="False" VerticalAlignment="Center" />
                         </Grid>
                         <Grid x:Name="HorizontalPanningRoot" MinWidth="24" Visibility="Collapsed" Opacity="0" contract7Present:CornerRadius="{TemplateBinding CornerRadius}">
                             <Border x:Name="HorizontalPanningThumb" VerticalAlignment="Bottom" HorizontalAlignment="Left" Background="{ThemeResource ScrollBarPanningThumbBackground}" BorderThickness="0" Height="2" MinWidth="32" Margin="0,2,0,2"/>
                         </Grid>
-                        <Grid x:Name="VerticalRoot" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" IsHitTestVisible="False">
+                        <Grid x:Name="VerticalRoot"
+                              Background="{TemplateBinding Background}"
+                              BorderBrush="{TemplateBinding BorderBrush}"
+                              IsHitTestVisible="False">
 
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
@@ -720,8 +744,28 @@
                                        contract7NotPresent:RadiusX="{Binding Source={ThemeResource ScrollBarCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter2x}}"
                                        contract7NotPresent:RadiusY="{Binding Source={ThemeResource ScrollBarCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter2x}}"
                                        Opacity="0" Grid.RowSpan="5" Margin="0" StrokeThickness="{ThemeResource ScrollBarTrackBorderThemeThickness}" Fill="{ThemeResource ScrollBarTrackFill}" Stroke="{ThemeResource ScrollBarTrackStroke}" />
-                            <RepeatButton x:Name="VerticalSmallDecrease" Opacity="0" Height="{StaticResource ScrollBarSize}" MinWidth="{StaticResource ScrollBarSize}" IsTabStop="False" Interval="50" Margin="0" Grid.Row="0" Template="{StaticResource VerticalDecrementTemplate}" HorizontalAlignment="Center" />
-                            <RepeatButton x:Name="VerticalLargeDecrease" Opacity="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Height="0" IsTabStop="False" Interval="50" Grid.Row="1" AllowFocusOnInteraction="False" Template="{StaticResource RepeatButtonTemplate}" />
+                            <RepeatButton
+                                x:Name="VerticalSmallDecrease"
+                                Opacity="0"
+                                Height="{StaticResource ScrollBarSize}"
+                                MinWidth="{StaticResource ScrollBarSize}"
+                                IsTabStop="False"
+                                Interval="50"
+                                Margin="{ThemeResource ScrollBarVerticalDecreaseMargin}"
+                                Grid.Row="0"
+                                Template="{StaticResource VerticalDecrementTemplate}"
+                                HorizontalAlignment="Center" />
+                            <RepeatButton
+                                x:Name="VerticalLargeDecrease"
+                                Opacity="0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Height="0"
+                                IsTabStop="False"
+                                Interval="50"
+                                Grid.Row="1"
+                                AllowFocusOnInteraction="False"
+                                Template="{StaticResource RepeatButtonTemplate}" />
                             <Thumb x:Name="VerticalThumb"
                                    Opacity="0"
                                    Grid.Row="2"
@@ -739,7 +783,13 @@
                             </Thumb>
 
                             <RepeatButton x:Name="VerticalLargeIncrease" Opacity="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsTabStop="False" Interval="50" Grid.Row="3" AllowFocusOnInteraction="False" Template="{StaticResource RepeatButtonTemplate}" />
-                            <RepeatButton x:Name="VerticalSmallIncrease" Opacity="0" Height="{StaticResource ScrollBarSize}" MinWidth="{StaticResource ScrollBarSize}" IsTabStop="False" Interval="50" Margin="0" Grid.Row="4" Template="{StaticResource VerticalIncrementTemplate}" HorizontalAlignment="Center" />
+                            <RepeatButton x:Name="VerticalSmallIncrease"
+                                Opacity="0"
+                                Height="{StaticResource ScrollBarSize}"
+                                          MinWidth="{StaticResource ScrollBarSize}"
+                                          IsTabStop="False"
+                                          Interval="50"
+                                          Margin="{ThemeResource ScrollBarVerticalIncreaseMargin}" Grid.Row="4" Template="{StaticResource VerticalIncrementTemplate}" HorizontalAlignment="Center" />
                         </Grid>
                         <Grid x:Name="VerticalPanningRoot" MinHeight="24" Visibility="Collapsed" Opacity="0" contract7Present:CornerRadius="{TemplateBinding CornerRadius}">
                             <Border x:Name="VerticalPanningThumb" VerticalAlignment="Top" HorizontalAlignment="Right" Background="{ThemeResource ScrollBarPanningThumbBackground}" BorderThickness="0" Width="2" MinHeight="32" Margin="2,0,2,0" />

From a50a4e4edc086e8c7e8fe4a5c24b5a9880fc98b7 Mon Sep 17 00:00:00 2001
From: Alberto Medina Gutierrez <almedina@microsoft.com>
Date: Fri, 23 Apr 2021 14:10:22 -0700
Subject: [PATCH 2/8] Clean code to remove changes

---
 .../ScrollBar_themeresources.xaml             | 52 ++-----------------
 1 file changed, 5 insertions(+), 47 deletions(-)

diff --git a/dev/CommonStyles/ScrollBar_themeresources.xaml b/dev/CommonStyles/ScrollBar_themeresources.xaml
index 9591561656..64213527b5 100755
--- a/dev/CommonStyles/ScrollBar_themeresources.xaml
+++ b/dev/CommonStyles/ScrollBar_themeresources.xaml
@@ -686,16 +686,7 @@
                                        contract7NotPresent:RadiusX="{Binding Source={ThemeResource ScrollBarCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter2x}}"
                                        contract7NotPresent:RadiusY="{Binding Source={ThemeResource ScrollBarCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter2x}}"
                                        Opacity="0" Grid.ColumnSpan="5" Margin="0" StrokeThickness="{ThemeResource ScrollBarTrackBorderThemeThickness}" Fill="{ThemeResource ScrollBarTrackFill}" Stroke="{ThemeResource ScrollBarTrackStroke}" />
-                            <RepeatButton
-                                x:Name="HorizontalSmallDecrease"
-                                Opacity="0"
-                                Grid.Column="0" MinHeight="{StaticResource ScrollBarSize}"
-                                IsTabStop="False"
-                                Interval="50"
-                                Margin="{ThemeResource ScrollBarHorizontalDecreaseMargin}"
-                                Template="{StaticResource HorizontalDecrementTemplate}"
-                                Width="{StaticResource ScrollBarSize}"
-                                AllowFocusOnInteraction="False" VerticalAlignment="Center" />
+                            <RepeatButton x:Name="HorizontalSmallDecrease" Opacity="0" Grid.Column="0" MinHeight="{StaticResource ScrollBarSize}" IsTabStop="False" Interval="50" Margin="{ThemeResource ScrollBarHorizontalDecreaseMargin}" Template="{StaticResource HorizontalDecrementTemplate}" Width="{StaticResource ScrollBarSize}" AllowFocusOnInteraction="False" VerticalAlignment="Center" />
                             <RepeatButton x:Name="HorizontalLargeDecrease" Opacity="0" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsTabStop="False" Interval="50" Template="{StaticResource RepeatButtonTemplate}" Width="0" AllowFocusOnInteraction="False" />
                             <Thumb x:Name="HorizontalThumb"
                                    Opacity="0"
@@ -714,14 +705,7 @@
                             </Thumb>
 
                             <RepeatButton x:Name="HorizontalLargeIncrease" Opacity="0" Grid.Column="3" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsTabStop="False" Interval="50" AllowFocusOnInteraction="False" Template="{StaticResource RepeatButtonTemplate}" />
-                            <RepeatButton
-                                x:Name="HorizontalSmallIncrease"
-                                Opacity="0"
-                                Grid.Column="4"
-                                MinHeight="{StaticResource ScrollBarSize}"
-                                IsTabStop="False"
-                                Interval="50"
-                                Margin="{ThemeResource ScrollBarHorizontalIncreaseMargin}" Template="{StaticResource HorizontalIncrementTemplate}" Width="{StaticResource ScrollBarSize}" AllowFocusOnInteraction="False" VerticalAlignment="Center" />
+                            <RepeatButton x:Name="HorizontalSmallIncrease" Opacity="0" Grid.Column="4" MinHeight="{StaticResource ScrollBarSize}" IsTabStop="False" Interval="50" Margin="{ThemeResource ScrollBarHorizontalIncreaseMargin}" Template="{StaticResource HorizontalIncrementTemplate}" Width="{StaticResource ScrollBarSize}" AllowFocusOnInteraction="False" VerticalAlignment="Center" />
                         </Grid>
                         <Grid x:Name="HorizontalPanningRoot" MinWidth="24" Visibility="Collapsed" Opacity="0" contract7Present:CornerRadius="{TemplateBinding CornerRadius}">
                             <Border x:Name="HorizontalPanningThumb" VerticalAlignment="Bottom" HorizontalAlignment="Left" Background="{ThemeResource ScrollBarPanningThumbBackground}" BorderThickness="0" Height="2" MinWidth="32" Margin="0,2,0,2"/>
@@ -744,28 +728,8 @@
                                        contract7NotPresent:RadiusX="{Binding Source={ThemeResource ScrollBarCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter2x}}"
                                        contract7NotPresent:RadiusY="{Binding Source={ThemeResource ScrollBarCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter2x}}"
                                        Opacity="0" Grid.RowSpan="5" Margin="0" StrokeThickness="{ThemeResource ScrollBarTrackBorderThemeThickness}" Fill="{ThemeResource ScrollBarTrackFill}" Stroke="{ThemeResource ScrollBarTrackStroke}" />
-                            <RepeatButton
-                                x:Name="VerticalSmallDecrease"
-                                Opacity="0"
-                                Height="{StaticResource ScrollBarSize}"
-                                MinWidth="{StaticResource ScrollBarSize}"
-                                IsTabStop="False"
-                                Interval="50"
-                                Margin="{ThemeResource ScrollBarVerticalDecreaseMargin}"
-                                Grid.Row="0"
-                                Template="{StaticResource VerticalDecrementTemplate}"
-                                HorizontalAlignment="Center" />
-                            <RepeatButton
-                                x:Name="VerticalLargeDecrease"
-                                Opacity="0"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                Height="0"
-                                IsTabStop="False"
-                                Interval="50"
-                                Grid.Row="1"
-                                AllowFocusOnInteraction="False"
-                                Template="{StaticResource RepeatButtonTemplate}" />
+                            <RepeatButton x:Name="VerticalSmallDecrease" Opacity="0" Height="{StaticResource ScrollBarSize}" MinWidth="{StaticResource ScrollBarSize}" IsTabStop="False" Interval="50" Margin="{ThemeResource ScrollBarVerticalDecreaseMargin}" Grid.Row="0" Template="{StaticResource VerticalDecrementTemplate}" HorizontalAlignment="Center" />
+                            <RepeatButton x:Name="VerticalLargeDecrease" Opacity="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Height="0" IsTabStop="False" Interval="50" Grid.Row="1" AllowFocusOnInteraction="False" Template="{StaticResource RepeatButtonTemplate}" />
                             <Thumb x:Name="VerticalThumb"
                                    Opacity="0"
                                    Grid.Row="2"
@@ -783,13 +747,7 @@
                             </Thumb>
 
                             <RepeatButton x:Name="VerticalLargeIncrease" Opacity="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsTabStop="False" Interval="50" Grid.Row="3" AllowFocusOnInteraction="False" Template="{StaticResource RepeatButtonTemplate}" />
-                            <RepeatButton x:Name="VerticalSmallIncrease"
-                                Opacity="0"
-                                Height="{StaticResource ScrollBarSize}"
-                                          MinWidth="{StaticResource ScrollBarSize}"
-                                          IsTabStop="False"
-                                          Interval="50"
-                                          Margin="{ThemeResource ScrollBarVerticalIncreaseMargin}" Grid.Row="4" Template="{StaticResource VerticalIncrementTemplate}" HorizontalAlignment="Center" />
+                            <RepeatButton x:Name="VerticalSmallIncrease" Opacity="0" Height="{StaticResource ScrollBarSize}" MinWidth="{StaticResource ScrollBarSize}" IsTabStop="False" Interval="50" Margin="{ThemeResource ScrollBarVerticalIncreaseMargin}" Grid.Row="4" Template="{StaticResource VerticalIncrementTemplate}" HorizontalAlignment="Center" />
                         </Grid>
                         <Grid x:Name="VerticalPanningRoot" MinHeight="24" Visibility="Collapsed" Opacity="0" contract7Present:CornerRadius="{TemplateBinding CornerRadius}">
                             <Border x:Name="VerticalPanningThumb" VerticalAlignment="Top" HorizontalAlignment="Right" Background="{ThemeResource ScrollBarPanningThumbBackground}" BorderThickness="0" Width="2" MinHeight="32" Margin="2,0,2,0" />

From 74a09e43764d85fcb8977eef319fef1f08e73b37 Mon Sep 17 00:00:00 2001
From: Alberto Medina Gutierrez <almedina@microsoft.com>
Date: Fri, 23 Apr 2021 14:13:15 -0700
Subject: [PATCH 3/8] Small change reverted

---
 dev/CommonStyles/ScrollBar_themeresources.xaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dev/CommonStyles/ScrollBar_themeresources.xaml b/dev/CommonStyles/ScrollBar_themeresources.xaml
index 64213527b5..6a87078d34 100755
--- a/dev/CommonStyles/ScrollBar_themeresources.xaml
+++ b/dev/CommonStyles/ScrollBar_themeresources.xaml
@@ -710,10 +710,7 @@
                         <Grid x:Name="HorizontalPanningRoot" MinWidth="24" Visibility="Collapsed" Opacity="0" contract7Present:CornerRadius="{TemplateBinding CornerRadius}">
                             <Border x:Name="HorizontalPanningThumb" VerticalAlignment="Bottom" HorizontalAlignment="Left" Background="{ThemeResource ScrollBarPanningThumbBackground}" BorderThickness="0" Height="2" MinWidth="32" Margin="0,2,0,2"/>
                         </Grid>
-                        <Grid x:Name="VerticalRoot"
-                              Background="{TemplateBinding Background}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              IsHitTestVisible="False">
+                        <Grid x:Name="VerticalRoot" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" IsHitTestVisible="False">
 
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />

From af6633c1563a8165821e14b12502f3608d1b6f1f Mon Sep 17 00:00:00 2001
From: Alberto Medina Gutierrez <almedina@microsoft.com>
Date: Mon, 26 Apr 2021 10:15:26 -0700
Subject: [PATCH 4/8] Udpate expected result

---
 .../verification/NavigationViewScrolling-8.xml       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/MUXControlsTestApp/verification/NavigationViewScrolling-8.xml b/test/MUXControlsTestApp/verification/NavigationViewScrolling-8.xml
index d50ea19dac..579b219d48 100755
--- a/test/MUXControlsTestApp/verification/NavigationViewScrolling-8.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewScrolling-8.xml
@@ -3934,7 +3934,7 @@
                                       Width=12
                                       Name=HorizontalSmallDecrease
                                       MinHeight=12
-                                      Margin=0,0,0,0
+                                      Margin=1,0,0,0
                                       FocusVisualSecondaryThickness=1,1,1,1
                                       FocusVisualSecondaryBrush=#B3FFFFFF
                                       FocusVisualPrimaryThickness=2,2,2,2
@@ -3999,7 +3999,7 @@
                                       Width=12
                                       Name=HorizontalSmallIncrease
                                       MinHeight=12
-                                      Margin=0,0,0,0
+                                      Margin=0,0,1,0
                                       FocusVisualSecondaryThickness=1,1,1,1
                                       FocusVisualSecondaryBrush=#B3FFFFFF
                                       FocusVisualPrimaryThickness=2,2,2,2
@@ -4070,7 +4070,7 @@
                                       CornerRadius=4,4,4,4
                                       Name=VerticalSmallDecrease
                                       MinWidth=12
-                                      Margin=0,0,0,0
+                                      Margin=0,1,0,0
                                       Height=12
                                       FocusVisualSecondaryThickness=1,1,1,1
                                       FocusVisualSecondaryBrush=#B3FFFFFF
@@ -4186,7 +4186,7 @@
                                       FocusVisualPrimaryThickness=2,2,2,2
                                       FocusVisualPrimaryBrush=#E4000000
                                       Visibility=Visible
-                                      RenderSize=12,14
+                                      RenderSize=12,12
                                     [Windows.UI.Xaml.Controls.Grid]
                                         Padding=0,0,0,0
                                         CornerRadius=0,0,0,0
@@ -4200,7 +4200,7 @@
                                         FocusVisualPrimaryThickness=2,2,2,2
                                         FocusVisualPrimaryBrush=#E4000000
                                         Visibility=Visible
-                                        RenderSize=12,14
+                                        RenderSize=12,12
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
                                       Padding=11,5,11,6
                                       Foreground=#E4000000
@@ -4210,7 +4210,7 @@
                                       CornerRadius=4,4,4,4
                                       Name=VerticalSmallIncrease
                                       MinWidth=12
-                                      Margin=0,0,0,0
+                                      Margin=0,0,0,1
                                       Height=12
                                       FocusVisualSecondaryThickness=1,1,1,1
                                       FocusVisualSecondaryBrush=#B3FFFFFF

From 20983e71bf4d372deaadda067f7004a60f0313da Mon Sep 17 00:00:00 2001
From: Alberto Medina Gutierrez <almedina@microsoft.com>
Date: Mon, 26 Apr 2021 13:51:54 -0700
Subject: [PATCH 5/8] Force failure for expected results

---
 dev/TreeView/APITests/TreeViewTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/TreeView/APITests/TreeViewTests.cs b/dev/TreeView/APITests/TreeViewTests.cs
index 197de0ca83..067070988b 100644
--- a/dev/TreeView/APITests/TreeViewTests.cs
+++ b/dev/TreeView/APITests/TreeViewTests.cs
@@ -494,7 +494,7 @@ public void VerifyVisualTree()
             TreeView treeView = null;
             RunOnUIThread.Execute(() =>
             {
-                treeView = new TreeView() { Width = 400, Height = 400 };
+                treeView = new TreeView() { Width = 400, Height = 300 };
                 var node1 = new TreeViewNode() { Content = "Node1" };
                 treeView.RootNodes.Add(node1);
             });

From fbd42418d8bf2e4dd6dc885987a1b6f8078229ed Mon Sep 17 00:00:00 2001
From: Alberto Medina Gutierrez <almedina@microsoft.com>
Date: Tue, 27 Apr 2021 15:50:45 -0700
Subject: [PATCH 6/8] Fix carat to edge spacing with no test error

---
 .../ScrollBar_themeresources.xaml             | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/dev/CommonStyles/ScrollBar_themeresources.xaml b/dev/CommonStyles/ScrollBar_themeresources.xaml
index 6a87078d34..815af7c57e 100755
--- a/dev/CommonStyles/ScrollBar_themeresources.xaml
+++ b/dev/CommonStyles/ScrollBar_themeresources.xaml
@@ -207,10 +207,10 @@
     <primitives:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter2x" Filter="TopLeftValue" Scale="2"/>
     <primitives:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter2x" Filter="BottomRightValue" Scale="2"/>
 
-    <Thickness x:Key="ScrollBarHorizontalDecreaseMargin">1,0,0,0</Thickness>
-    <Thickness x:Key="ScrollBarHorizontalIncreaseMargin">0,0,1,0</Thickness>
-    <Thickness x:Key="ScrollBarVerticalDecreaseMargin">0,1,0,0</Thickness>
-    <Thickness x:Key="ScrollBarVerticalIncreaseMargin">0,0,0,1</Thickness>
+    <Thickness x:Key="ScrollBarHorizontalDecreaseMargin">4,0,0,0</Thickness>
+    <Thickness x:Key="ScrollBarHorizontalIncreaseMargin">0,0,4,0</Thickness>
+    <Thickness x:Key="ScrollBarVerticalDecreaseMargin">0,4,0,0</Thickness>
+    <Thickness x:Key="ScrollBarVerticalIncreaseMargin">0,0,0,4</Thickness>
 
     <Style TargetType="ScrollBar" BasedOn="{StaticResource DefaultScrollBarStyle}" />
 
@@ -237,7 +237,7 @@
                                 </Grid>
                             </ControlTemplate>
                             <ControlTemplate x:Key="HorizontalIncrementTemplate" TargetType="RepeatButton">
-                                <Grid x:Name="Root" Background="{ThemeResource ScrollBarButtonBackground}" BorderBrush="{ThemeResource ScrollBarButtonBorderBrush}">
+                                <Grid x:Name="Root" Background="{ThemeResource ScrollBarButtonBackground}" BorderBrush="{ThemeResource ScrollBarButtonBorderBrush}" Padding="{ThemeResource ScrollBarHorizontalIncreaseMargin}">
                                     <VisualStateManager.VisualStateGroups>
                                         <VisualStateGroup x:Name="CommonStates">
                                             <VisualState x:Name="Normal" />
@@ -268,7 +268,7 @@
                                 </Grid>
                             </ControlTemplate>
                             <ControlTemplate x:Key="HorizontalDecrementTemplate" TargetType="RepeatButton">
-                                <Grid x:Name="Root" Background="{ThemeResource ScrollBarButtonBackground}" BorderBrush="{ThemeResource ScrollBarButtonBorderBrush}">
+                                <Grid x:Name="Root" Background="{ThemeResource ScrollBarButtonBackground}" BorderBrush="{ThemeResource ScrollBarButtonBorderBrush}" Padding="{ThemeResource ScrollBarHorizontalDecreaseMargin}">
                                     <VisualStateManager.VisualStateGroups>
                                         <VisualStateGroup x:Name="CommonStates">
                                             <VisualState x:Name="Normal" />
@@ -299,7 +299,7 @@
                                 </Grid>
                             </ControlTemplate>
                             <ControlTemplate x:Key="VerticalIncrementTemplate" TargetType="RepeatButton">
-                                <Grid x:Name="Root" Background="{ThemeResource ScrollBarButtonBackground}" BorderBrush="{ThemeResource ScrollBarButtonBorderBrush}">
+                                <Grid x:Name="Root" Background="{ThemeResource ScrollBarButtonBackground}" BorderBrush="{ThemeResource ScrollBarButtonBorderBrush}" Padding="{ThemeResource ScrollBarVerticalIncreaseMargin}">
                                     <VisualStateManager.VisualStateGroups>
                                         <VisualStateGroup x:Name="CommonStates">
                                             <VisualState x:Name="Normal" />
@@ -330,7 +330,7 @@
                                 </Grid>
                             </ControlTemplate>
                             <ControlTemplate x:Key="VerticalDecrementTemplate" TargetType="RepeatButton">
-                                <Grid x:Name="Root" Background="{ThemeResource ScrollBarButtonBackground}" BorderBrush="{ThemeResource ScrollBarButtonBorderBrush}">
+                                <Grid x:Name="Root" Background="{ThemeResource ScrollBarButtonBackground}" BorderBrush="{ThemeResource ScrollBarButtonBorderBrush}" Padding="{ThemeResource ScrollBarVerticalDecreaseMargin}">
                                     <VisualStateManager.VisualStateGroups>
                                         <VisualStateGroup x:Name="CommonStates">
                                             <VisualState x:Name="Normal" />
@@ -686,7 +686,7 @@
                                        contract7NotPresent:RadiusX="{Binding Source={ThemeResource ScrollBarCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter2x}}"
                                        contract7NotPresent:RadiusY="{Binding Source={ThemeResource ScrollBarCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter2x}}"
                                        Opacity="0" Grid.ColumnSpan="5" Margin="0" StrokeThickness="{ThemeResource ScrollBarTrackBorderThemeThickness}" Fill="{ThemeResource ScrollBarTrackFill}" Stroke="{ThemeResource ScrollBarTrackStroke}" />
-                            <RepeatButton x:Name="HorizontalSmallDecrease" Opacity="0" Grid.Column="0" MinHeight="{StaticResource ScrollBarSize}" IsTabStop="False" Interval="50" Margin="{ThemeResource ScrollBarHorizontalDecreaseMargin}" Template="{StaticResource HorizontalDecrementTemplate}" Width="{StaticResource ScrollBarSize}" AllowFocusOnInteraction="False" VerticalAlignment="Center" />
+                            <RepeatButton x:Name="HorizontalSmallDecrease" Grid.Column="0" Opacity="0" MinHeight="{StaticResource ScrollBarSize}" IsTabStop="False" Interval="50" Padding="{ThemeResource ScrollBarHorizontalDecreaseMargin}" Template="{StaticResource HorizontalDecrementTemplate}" Width="{StaticResource ScrollBarSize}" AllowFocusOnInteraction="False" VerticalAlignment="Center" />
                             <RepeatButton x:Name="HorizontalLargeDecrease" Opacity="0" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsTabStop="False" Interval="50" Template="{StaticResource RepeatButtonTemplate}" Width="0" AllowFocusOnInteraction="False" />
                             <Thumb x:Name="HorizontalThumb"
                                    Opacity="0"
@@ -705,7 +705,7 @@
                             </Thumb>
 
                             <RepeatButton x:Name="HorizontalLargeIncrease" Opacity="0" Grid.Column="3" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsTabStop="False" Interval="50" AllowFocusOnInteraction="False" Template="{StaticResource RepeatButtonTemplate}" />
-                            <RepeatButton x:Name="HorizontalSmallIncrease" Opacity="0" Grid.Column="4" MinHeight="{StaticResource ScrollBarSize}" IsTabStop="False" Interval="50" Margin="{ThemeResource ScrollBarHorizontalIncreaseMargin}" Template="{StaticResource HorizontalIncrementTemplate}" Width="{StaticResource ScrollBarSize}" AllowFocusOnInteraction="False" VerticalAlignment="Center" />
+                            <RepeatButton x:Name="HorizontalSmallIncrease" Grid.Column="4" Opacity="0" MinHeight="{StaticResource ScrollBarSize}" IsTabStop="False" Interval="50" Padding="{ThemeResource ScrollBarHorizontalIncreaseMargin}" Template="{StaticResource HorizontalIncrementTemplate}" Width="{StaticResource ScrollBarSize}" AllowFocusOnInteraction="False" VerticalAlignment="Center" />
                         </Grid>
                         <Grid x:Name="HorizontalPanningRoot" MinWidth="24" Visibility="Collapsed" Opacity="0" contract7Present:CornerRadius="{TemplateBinding CornerRadius}">
                             <Border x:Name="HorizontalPanningThumb" VerticalAlignment="Bottom" HorizontalAlignment="Left" Background="{ThemeResource ScrollBarPanningThumbBackground}" BorderThickness="0" Height="2" MinWidth="32" Margin="0,2,0,2"/>
@@ -725,7 +725,7 @@
                                        contract7NotPresent:RadiusX="{Binding Source={ThemeResource ScrollBarCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter2x}}"
                                        contract7NotPresent:RadiusY="{Binding Source={ThemeResource ScrollBarCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter2x}}"
                                        Opacity="0" Grid.RowSpan="5" Margin="0" StrokeThickness="{ThemeResource ScrollBarTrackBorderThemeThickness}" Fill="{ThemeResource ScrollBarTrackFill}" Stroke="{ThemeResource ScrollBarTrackStroke}" />
-                            <RepeatButton x:Name="VerticalSmallDecrease" Opacity="0" Height="{StaticResource ScrollBarSize}" MinWidth="{StaticResource ScrollBarSize}" IsTabStop="False" Interval="50" Margin="{ThemeResource ScrollBarVerticalDecreaseMargin}" Grid.Row="0" Template="{StaticResource VerticalDecrementTemplate}" HorizontalAlignment="Center" />
+                            <RepeatButton x:Name="VerticalSmallDecrease" Grid.Row="0" Opacity="0" Height="{StaticResource ScrollBarSize}" MinWidth="{StaticResource ScrollBarSize}" IsTabStop="False" Interval="50" Padding="{ThemeResource ScrollBarVerticalDecreaseMargin}" Template="{StaticResource VerticalDecrementTemplate}" HorizontalAlignment="Center" />
                             <RepeatButton x:Name="VerticalLargeDecrease" Opacity="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Height="0" IsTabStop="False" Interval="50" Grid.Row="1" AllowFocusOnInteraction="False" Template="{StaticResource RepeatButtonTemplate}" />
                             <Thumb x:Name="VerticalThumb"
                                    Opacity="0"
@@ -744,7 +744,7 @@
                             </Thumb>
 
                             <RepeatButton x:Name="VerticalLargeIncrease" Opacity="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsTabStop="False" Interval="50" Grid.Row="3" AllowFocusOnInteraction="False" Template="{StaticResource RepeatButtonTemplate}" />
-                            <RepeatButton x:Name="VerticalSmallIncrease" Opacity="0" Height="{StaticResource ScrollBarSize}" MinWidth="{StaticResource ScrollBarSize}" IsTabStop="False" Interval="50" Margin="{ThemeResource ScrollBarVerticalIncreaseMargin}" Grid.Row="4" Template="{StaticResource VerticalIncrementTemplate}" HorizontalAlignment="Center" />
+                            <RepeatButton x:Name="VerticalSmallIncrease" Grid.Row="4" Opacity="0" Height="{StaticResource ScrollBarSize}" MinWidth="{StaticResource ScrollBarSize}" IsTabStop="False" Interval="50" Padding="{ThemeResource ScrollBarVerticalIncreaseMargin}" Template="{StaticResource VerticalIncrementTemplate}" HorizontalAlignment="Center" />
                         </Grid>
                         <Grid x:Name="VerticalPanningRoot" MinHeight="24" Visibility="Collapsed" Opacity="0" contract7Present:CornerRadius="{TemplateBinding CornerRadius}">
                             <Border x:Name="VerticalPanningThumb" VerticalAlignment="Top" HorizontalAlignment="Right" Background="{ThemeResource ScrollBarPanningThumbBackground}" BorderThickness="0" Width="2" MinHeight="32" Margin="2,0,2,0" />

From c2813b7f3d12a1b74d1e07eb4bfa6329880c6091 Mon Sep 17 00:00:00 2001
From: Alberto Medina Gutierrez <almedina@microsoft.com>
Date: Wed, 28 Apr 2021 09:30:19 -0700
Subject: [PATCH 7/8] Revert tree view tests failures

---
 dev/TreeView/APITests/TreeViewTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/TreeView/APITests/TreeViewTests.cs b/dev/TreeView/APITests/TreeViewTests.cs
index 067070988b..197de0ca83 100644
--- a/dev/TreeView/APITests/TreeViewTests.cs
+++ b/dev/TreeView/APITests/TreeViewTests.cs
@@ -494,7 +494,7 @@ public void VerifyVisualTree()
             TreeView treeView = null;
             RunOnUIThread.Execute(() =>
             {
-                treeView = new TreeView() { Width = 400, Height = 300 };
+                treeView = new TreeView() { Width = 400, Height = 400 };
                 var node1 = new TreeViewNode() { Content = "Node1" };
                 treeView.RootNodes.Add(node1);
             });

From b18c62cd3469db56834638fb376c02e1ea64a19e Mon Sep 17 00:00:00 2001
From: Alberto Medina Gutierrez <almedina@microsoft.com>
Date: Wed, 28 Apr 2021 09:38:45 -0700
Subject: [PATCH 8/8] Update verification files

---
 .../verification/NavigationViewAuto-4.xml     | 12 +++----
 .../verification/NavigationViewAuto-5.xml     | 12 +++----
 .../verification/NavigationViewAuto-6.xml     | 12 +++----
 .../verification/NavigationViewAuto-7.xml     | 12 +++----
 .../verification/NavigationViewAuto-8.xml     | 12 +++----
 .../NavigationViewLeftCompact-4.xml           | 12 +++----
 .../NavigationViewLeftCompact-5.xml           | 12 +++----
 .../NavigationViewLeftCompact-6.xml           | 12 +++----
 .../NavigationViewLeftCompact-7.xml           | 12 +++----
 .../NavigationViewLeftCompact-8.xml           | 12 +++----
 .../NavigationViewLeftMinimal-4.xml           | 12 +++----
 .../NavigationViewLeftMinimal-5.xml           | 12 +++----
 .../NavigationViewLeftMinimal-6.xml           | 12 +++----
 .../NavigationViewLeftMinimal-7.xml           | 12 +++----
 .../NavigationViewLeftMinimal-8.xml           | 12 +++----
 .../NavigationViewLeftPaneContent-4.xml       | 18 +++++------
 .../NavigationViewLeftPaneContent-5.xml       | 18 +++++------
 .../NavigationViewLeftPaneContent-6.xml       | 18 +++++------
 .../NavigationViewLeftPaneContent-7.xml       | 18 +++++------
 .../NavigationViewLeftPaneContent-8.xml       | 18 +++++------
 .../NavigationViewScrolling-4.xml             | 20 ++++++------
 .../NavigationViewScrolling-5.xml             | 20 ++++++------
 .../NavigationViewScrolling-6.xml             | 20 ++++++------
 .../NavigationViewScrolling-7.xml             | 20 ++++++------
 .../NavigationViewScrolling-8.xml             | 32 +++++++++----------
 25 files changed, 191 insertions(+), 191 deletions(-)

diff --git a/test/MUXControlsTestApp/verification/NavigationViewAuto-4.xml b/test/MUXControlsTestApp/verification/NavigationViewAuto-4.xml
index cba9cd8139..33608c20bc 100755
--- a/test/MUXControlsTestApp/verification/NavigationViewAuto-4.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewAuto-4.xml
@@ -1507,7 +1507,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1568,7 +1568,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1639,7 +1639,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1655,7 +1655,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -1775,7 +1775,7 @@
                                         Visibility=Visible
                                         RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1791,7 +1791,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewAuto-5.xml b/test/MUXControlsTestApp/verification/NavigationViewAuto-5.xml
index cba9cd8139..33608c20bc 100644
--- a/test/MUXControlsTestApp/verification/NavigationViewAuto-5.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewAuto-5.xml
@@ -1507,7 +1507,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1568,7 +1568,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1639,7 +1639,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1655,7 +1655,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -1775,7 +1775,7 @@
                                         Visibility=Visible
                                         RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1791,7 +1791,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewAuto-6.xml b/test/MUXControlsTestApp/verification/NavigationViewAuto-6.xml
index cba9cd8139..33608c20bc 100644
--- a/test/MUXControlsTestApp/verification/NavigationViewAuto-6.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewAuto-6.xml
@@ -1507,7 +1507,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1568,7 +1568,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1639,7 +1639,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1655,7 +1655,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -1775,7 +1775,7 @@
                                         Visibility=Visible
                                         RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1791,7 +1791,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewAuto-7.xml b/test/MUXControlsTestApp/verification/NavigationViewAuto-7.xml
index b5329901c1..407df525b8 100755
--- a/test/MUXControlsTestApp/verification/NavigationViewAuto-7.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewAuto-7.xml
@@ -1457,7 +1457,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1522,7 +1522,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1594,7 +1594,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1611,7 +1611,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -1734,7 +1734,7 @@
                                         Visibility=Visible
                                         RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1751,7 +1751,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewAuto-8.xml b/test/MUXControlsTestApp/verification/NavigationViewAuto-8.xml
index 3a9437ae36..413ffa24ad 100755
--- a/test/MUXControlsTestApp/verification/NavigationViewAuto-8.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewAuto-8.xml
@@ -1457,7 +1457,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1522,7 +1522,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1594,7 +1594,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1611,7 +1611,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -1734,7 +1734,7 @@
                                         Visibility=Visible
                                         RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1751,7 +1751,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-4.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-4.xml
index 1652e8febe..f4e9128517 100755
--- a/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-4.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-4.xml
@@ -1451,7 +1451,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1512,7 +1512,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1583,7 +1583,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1599,7 +1599,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -1719,7 +1719,7 @@
                                         Visibility=Visible
                                         RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1735,7 +1735,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-5.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-5.xml
index 63e380c115..c50090bb08 100755
--- a/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-5.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-5.xml
@@ -1451,7 +1451,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1512,7 +1512,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1583,7 +1583,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1599,7 +1599,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -1719,7 +1719,7 @@
                                         Visibility=Visible
                                         RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1735,7 +1735,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-6.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-6.xml
index 63e380c115..c50090bb08 100644
--- a/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-6.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-6.xml
@@ -1451,7 +1451,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1512,7 +1512,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1583,7 +1583,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1599,7 +1599,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -1719,7 +1719,7 @@
                                         Visibility=Visible
                                         RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1735,7 +1735,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-7.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-7.xml
index a86e9dfba9..96db1a60aa 100755
--- a/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-7.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-7.xml
@@ -1410,7 +1410,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1475,7 +1475,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1547,7 +1547,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1564,7 +1564,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -1687,7 +1687,7 @@
                                         Visibility=Visible
                                         RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1704,7 +1704,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-8.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-8.xml
index e8d1baa8a3..37baca5c64 100755
--- a/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-8.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-8.xml
@@ -1410,7 +1410,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1475,7 +1475,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1547,7 +1547,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1564,7 +1564,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -1687,7 +1687,7 @@
                                         Visibility=Visible
                                         RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1704,7 +1704,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-4.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-4.xml
index ece3cc0ecd..00e980f62b 100755
--- a/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-4.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-4.xml
@@ -1507,7 +1507,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1568,7 +1568,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1639,7 +1639,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1655,7 +1655,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -1775,7 +1775,7 @@
                                         Visibility=Visible
                                         RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1791,7 +1791,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-5.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-5.xml
index ece3cc0ecd..00e980f62b 100755
--- a/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-5.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-5.xml
@@ -1507,7 +1507,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1568,7 +1568,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1639,7 +1639,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1655,7 +1655,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -1775,7 +1775,7 @@
                                         Visibility=Visible
                                         RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1791,7 +1791,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-6.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-6.xml
index ece3cc0ecd..00e980f62b 100644
--- a/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-6.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-6.xml
@@ -1507,7 +1507,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1568,7 +1568,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1639,7 +1639,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1655,7 +1655,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -1775,7 +1775,7 @@
                                         Visibility=Visible
                                         RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1791,7 +1791,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-7.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-7.xml
index 5290264f07..af488e043c 100755
--- a/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-7.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-7.xml
@@ -1457,7 +1457,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1522,7 +1522,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1594,7 +1594,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1611,7 +1611,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -1734,7 +1734,7 @@
                                         Visibility=Visible
                                         RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1751,7 +1751,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-8.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-8.xml
index 958c10b917..7b1dd885ac 100755
--- a/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-8.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-8.xml
@@ -1457,7 +1457,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1522,7 +1522,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1594,7 +1594,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1611,7 +1611,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -1734,7 +1734,7 @@
                                         Visibility=Visible
                                         RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1751,7 +1751,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-4.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-4.xml
index 16758a8120..936e2944d6 100755
--- a/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-4.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-4.xml
@@ -1044,7 +1044,7 @@
                                   Background=#B3FFFFFF
                                   Width=32
                                   Name=QueryButton
-                                  Margin=0,0,0,0
+                                  Margin=2,0,0,0
                                   Height=28
                                   FocusVisualSecondaryThickness=1,1,1,1
                                   FocusVisualSecondaryBrush=#B3FFFFFF
@@ -1060,13 +1060,13 @@
                                     BorderBrush=#00FFFFFF
                                     Background=#00FFFFFF
                                     Name=ContentPresenter
-                                    Margin=0,3,0,3
+                                    Margin=1,3,1,3
                                     FocusVisualSecondaryThickness=1,1,1,1
                                     FocusVisualSecondaryBrush=#B3FFFFFF
                                     FocusVisualPrimaryThickness=2,2,2,2
                                     FocusVisualPrimaryBrush=#E4000000
                                     Visibility=Visible
-                                    RenderSize=32,22
+                                    RenderSize=30,22
                           [Windows.UI.Xaml.Controls.Primitives.Popup]
                               Name=SuggestionsPopup
                               Margin=0,0,0,0
@@ -1804,7 +1804,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1865,7 +1865,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1936,7 +1936,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1952,7 +1952,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -2072,7 +2072,7 @@
                                         Visibility=Visible
                                         RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -2088,7 +2088,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-5.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-5.xml
index 16758a8120..936e2944d6 100644
--- a/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-5.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-5.xml
@@ -1044,7 +1044,7 @@
                                   Background=#B3FFFFFF
                                   Width=32
                                   Name=QueryButton
-                                  Margin=0,0,0,0
+                                  Margin=2,0,0,0
                                   Height=28
                                   FocusVisualSecondaryThickness=1,1,1,1
                                   FocusVisualSecondaryBrush=#B3FFFFFF
@@ -1060,13 +1060,13 @@
                                     BorderBrush=#00FFFFFF
                                     Background=#00FFFFFF
                                     Name=ContentPresenter
-                                    Margin=0,3,0,3
+                                    Margin=1,3,1,3
                                     FocusVisualSecondaryThickness=1,1,1,1
                                     FocusVisualSecondaryBrush=#B3FFFFFF
                                     FocusVisualPrimaryThickness=2,2,2,2
                                     FocusVisualPrimaryBrush=#E4000000
                                     Visibility=Visible
-                                    RenderSize=32,22
+                                    RenderSize=30,22
                           [Windows.UI.Xaml.Controls.Primitives.Popup]
                               Name=SuggestionsPopup
                               Margin=0,0,0,0
@@ -1804,7 +1804,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1865,7 +1865,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1936,7 +1936,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1952,7 +1952,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -2072,7 +2072,7 @@
                                         Visibility=Visible
                                         RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -2088,7 +2088,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-6.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-6.xml
index 16758a8120..936e2944d6 100644
--- a/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-6.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-6.xml
@@ -1044,7 +1044,7 @@
                                   Background=#B3FFFFFF
                                   Width=32
                                   Name=QueryButton
-                                  Margin=0,0,0,0
+                                  Margin=2,0,0,0
                                   Height=28
                                   FocusVisualSecondaryThickness=1,1,1,1
                                   FocusVisualSecondaryBrush=#B3FFFFFF
@@ -1060,13 +1060,13 @@
                                     BorderBrush=#00FFFFFF
                                     Background=#00FFFFFF
                                     Name=ContentPresenter
-                                    Margin=0,3,0,3
+                                    Margin=1,3,1,3
                                     FocusVisualSecondaryThickness=1,1,1,1
                                     FocusVisualSecondaryBrush=#B3FFFFFF
                                     FocusVisualPrimaryThickness=2,2,2,2
                                     FocusVisualPrimaryBrush=#E4000000
                                     Visibility=Visible
-                                    RenderSize=32,22
+                                    RenderSize=30,22
                           [Windows.UI.Xaml.Controls.Primitives.Popup]
                               Name=SuggestionsPopup
                               Margin=0,0,0,0
@@ -1804,7 +1804,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1865,7 +1865,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1936,7 +1936,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1952,7 +1952,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -2072,7 +2072,7 @@
                                         Visibility=Visible
                                         RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -2088,7 +2088,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-7.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-7.xml
index 3efddc47d8..d6d2101da4 100755
--- a/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-7.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-7.xml
@@ -1004,7 +1004,7 @@
                                   CornerRadius=4,4,4,4
                                   Width=32
                                   Name=QueryButton
-                                  Margin=0,0,0,0
+                                  Margin=2,0,0,0
                                   Height=28
                                   FocusVisualSecondaryThickness=1,1,1,1
                                   FocusVisualSecondaryBrush=#B3FFFFFF
@@ -1020,13 +1020,13 @@
                                     BorderBrush=#00FFFFFF
                                     Background=#00FFFFFF
                                     Name=ContentPresenter
-                                    Margin=0,3,0,3
+                                    Margin=1,3,1,3
                                     FocusVisualSecondaryThickness=1,1,1,1
                                     FocusVisualSecondaryBrush=#B3FFFFFF
                                     FocusVisualPrimaryThickness=2,2,2,2
                                     FocusVisualPrimaryBrush=#E4000000
                                     Visibility=Visible
-                                    RenderSize=32,22
+                                    RenderSize=30,22
                               [Windows.UI.Xaml.Controls.ContentPresenter]
                                   Foreground=#99000000
                                   Padding=0,0,0,0
@@ -1787,7 +1787,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1852,7 +1852,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1924,7 +1924,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1941,7 +1941,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -2064,7 +2064,7 @@
                                         Visibility=Visible
                                         RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -2081,7 +2081,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-8.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-8.xml
index 63c6374fa5..094d514026 100755
--- a/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-8.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-8.xml
@@ -1004,7 +1004,7 @@
                                   CornerRadius=4,4,4,4
                                   Width=32
                                   Name=QueryButton
-                                  Margin=0,0,0,0
+                                  Margin=2,0,0,0
                                   Height=28
                                   FocusVisualSecondaryThickness=1,1,1,1
                                   FocusVisualSecondaryBrush=#B3FFFFFF
@@ -1020,13 +1020,13 @@
                                     BorderBrush=#00FFFFFF
                                     Background=#00FFFFFF
                                     Name=ContentPresenter
-                                    Margin=0,3,0,3
+                                    Margin=1,3,1,3
                                     FocusVisualSecondaryThickness=1,1,1,1
                                     FocusVisualSecondaryBrush=#B3FFFFFF
                                     FocusVisualPrimaryThickness=2,2,2,2
                                     FocusVisualPrimaryBrush=#E4000000
                                     Visibility=Visible
-                                    RenderSize=32,22
+                                    RenderSize=30,22
                               [Windows.UI.Xaml.Controls.ContentPresenter]
                                   Foreground=#99000000
                                   Padding=0,0,0,0
@@ -1787,7 +1787,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1852,7 +1852,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1924,7 +1924,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -1941,7 +1941,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -2064,7 +2064,7 @@
                                         Visibility=Visible
                                         RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -2081,7 +2081,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
diff --git a/test/MUXControlsTestApp/verification/NavigationViewScrolling-4.xml b/test/MUXControlsTestApp/verification/NavigationViewScrolling-4.xml
index a47c5bd143..3a61f45a8d 100755
--- a/test/MUXControlsTestApp/verification/NavigationViewScrolling-4.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewScrolling-4.xml
@@ -3945,7 +3945,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -4006,7 +4006,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -4077,7 +4077,7 @@
                                       Visibility=Visible
                                       RenderSize=12,61
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -4093,7 +4093,7 @@
                                       Visibility=Visible
                                       RenderSize=12,12
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -4115,7 +4115,7 @@
                                           FocusVisualPrimaryThickness=2,2,2,2
                                           FocusVisualPrimaryBrush=#E4000000
                                           Visibility=Visible
-                                          RenderSize=12,12
+                                          RenderSize=12,8
                                         [Windows.UI.Xaml.Controls.Grid]
                                             Padding=0,0,0,0
                                             CornerRadius=0,0,0,0
@@ -4128,7 +4128,7 @@
                                             FocusVisualPrimaryThickness=2,2,2,2
                                             FocusVisualPrimaryBrush=#E4000000
                                             Visibility=Visible
-                                            RenderSize=12,12
+                                            RenderSize=12,8
                                           [Windows.UI.Xaml.Controls.TextBlock]
                                               Padding=0,0,0,0
                                               Foreground=#72000000
@@ -4224,7 +4224,7 @@
                                         Visibility=Visible
                                         RenderSize=12,7
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -4240,7 +4240,7 @@
                                       Visibility=Visible
                                       RenderSize=12,12
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -4262,7 +4262,7 @@
                                           FocusVisualPrimaryThickness=2,2,2,2
                                           FocusVisualPrimaryBrush=#E4000000
                                           Visibility=Visible
-                                          RenderSize=12,12
+                                          RenderSize=12,8
                                         [Windows.UI.Xaml.Controls.Grid]
                                             Padding=0,0,0,0
                                             CornerRadius=0,0,0,0
@@ -4275,7 +4275,7 @@
                                             FocusVisualPrimaryThickness=2,2,2,2
                                             FocusVisualPrimaryBrush=#E4000000
                                             Visibility=Visible
-                                            RenderSize=12,12
+                                            RenderSize=12,8
                                           [Windows.UI.Xaml.Controls.TextBlock]
                                               Padding=0,0,0,0
                                               Foreground=#72000000
diff --git a/test/MUXControlsTestApp/verification/NavigationViewScrolling-5.xml b/test/MUXControlsTestApp/verification/NavigationViewScrolling-5.xml
index a47c5bd143..3a61f45a8d 100644
--- a/test/MUXControlsTestApp/verification/NavigationViewScrolling-5.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewScrolling-5.xml
@@ -3945,7 +3945,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -4006,7 +4006,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -4077,7 +4077,7 @@
                                       Visibility=Visible
                                       RenderSize=12,61
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -4093,7 +4093,7 @@
                                       Visibility=Visible
                                       RenderSize=12,12
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -4115,7 +4115,7 @@
                                           FocusVisualPrimaryThickness=2,2,2,2
                                           FocusVisualPrimaryBrush=#E4000000
                                           Visibility=Visible
-                                          RenderSize=12,12
+                                          RenderSize=12,8
                                         [Windows.UI.Xaml.Controls.Grid]
                                             Padding=0,0,0,0
                                             CornerRadius=0,0,0,0
@@ -4128,7 +4128,7 @@
                                             FocusVisualPrimaryThickness=2,2,2,2
                                             FocusVisualPrimaryBrush=#E4000000
                                             Visibility=Visible
-                                            RenderSize=12,12
+                                            RenderSize=12,8
                                           [Windows.UI.Xaml.Controls.TextBlock]
                                               Padding=0,0,0,0
                                               Foreground=#72000000
@@ -4224,7 +4224,7 @@
                                         Visibility=Visible
                                         RenderSize=12,7
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -4240,7 +4240,7 @@
                                       Visibility=Visible
                                       RenderSize=12,12
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -4262,7 +4262,7 @@
                                           FocusVisualPrimaryThickness=2,2,2,2
                                           FocusVisualPrimaryBrush=#E4000000
                                           Visibility=Visible
-                                          RenderSize=12,12
+                                          RenderSize=12,8
                                         [Windows.UI.Xaml.Controls.Grid]
                                             Padding=0,0,0,0
                                             CornerRadius=0,0,0,0
@@ -4275,7 +4275,7 @@
                                             FocusVisualPrimaryThickness=2,2,2,2
                                             FocusVisualPrimaryBrush=#E4000000
                                             Visibility=Visible
-                                            RenderSize=12,12
+                                            RenderSize=12,8
                                           [Windows.UI.Xaml.Controls.TextBlock]
                                               Padding=0,0,0,0
                                               Foreground=#72000000
diff --git a/test/MUXControlsTestApp/verification/NavigationViewScrolling-6.xml b/test/MUXControlsTestApp/verification/NavigationViewScrolling-6.xml
index a47c5bd143..3a61f45a8d 100644
--- a/test/MUXControlsTestApp/verification/NavigationViewScrolling-6.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewScrolling-6.xml
@@ -3945,7 +3945,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -4006,7 +4006,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -4077,7 +4077,7 @@
                                       Visibility=Visible
                                       RenderSize=12,61
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -4093,7 +4093,7 @@
                                       Visibility=Visible
                                       RenderSize=12,12
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -4115,7 +4115,7 @@
                                           FocusVisualPrimaryThickness=2,2,2,2
                                           FocusVisualPrimaryBrush=#E4000000
                                           Visibility=Visible
-                                          RenderSize=12,12
+                                          RenderSize=12,8
                                         [Windows.UI.Xaml.Controls.Grid]
                                             Padding=0,0,0,0
                                             CornerRadius=0,0,0,0
@@ -4128,7 +4128,7 @@
                                             FocusVisualPrimaryThickness=2,2,2,2
                                             FocusVisualPrimaryBrush=#E4000000
                                             Visibility=Visible
-                                            RenderSize=12,12
+                                            RenderSize=12,8
                                           [Windows.UI.Xaml.Controls.TextBlock]
                                               Padding=0,0,0,0
                                               Foreground=#72000000
@@ -4224,7 +4224,7 @@
                                         Visibility=Visible
                                         RenderSize=12,7
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,5
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -4240,7 +4240,7 @@
                                       Visibility=Visible
                                       RenderSize=12,12
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -4262,7 +4262,7 @@
                                           FocusVisualPrimaryThickness=2,2,2,2
                                           FocusVisualPrimaryBrush=#E4000000
                                           Visibility=Visible
-                                          RenderSize=12,12
+                                          RenderSize=12,8
                                         [Windows.UI.Xaml.Controls.Grid]
                                             Padding=0,0,0,0
                                             CornerRadius=0,0,0,0
@@ -4275,7 +4275,7 @@
                                             FocusVisualPrimaryThickness=2,2,2,2
                                             FocusVisualPrimaryBrush=#E4000000
                                             Visibility=Visible
-                                            RenderSize=12,12
+                                            RenderSize=12,8
                                           [Windows.UI.Xaml.Controls.TextBlock]
                                               Padding=0,0,0,0
                                               Foreground=#72000000
diff --git a/test/MUXControlsTestApp/verification/NavigationViewScrolling-7.xml b/test/MUXControlsTestApp/verification/NavigationViewScrolling-7.xml
index 8773f41eb8..09b7c88c67 100755
--- a/test/MUXControlsTestApp/verification/NavigationViewScrolling-7.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewScrolling-7.xml
@@ -3926,7 +3926,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -3991,7 +3991,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -4063,7 +4063,7 @@
                                       Visibility=Visible
                                       RenderSize=12,61
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -4080,7 +4080,7 @@
                                       Visibility=Visible
                                       RenderSize=12,12
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -4102,7 +4102,7 @@
                                           FocusVisualPrimaryThickness=2,2,2,2
                                           FocusVisualPrimaryBrush=#E4000000
                                           Visibility=Visible
-                                          RenderSize=12,12
+                                          RenderSize=12,8
                                         [Windows.UI.Xaml.Controls.Grid]
                                             Padding=0,0,0,0
                                             CornerRadius=0,0,0,0
@@ -4115,7 +4115,7 @@
                                             FocusVisualPrimaryThickness=2,2,2,2
                                             FocusVisualPrimaryBrush=#E4000000
                                             Visibility=Visible
-                                            RenderSize=12,12
+                                            RenderSize=12,8
                                           [Windows.UI.Xaml.Controls.TextBlock]
                                               Padding=0,0,0,0
                                               Foreground=#72000000
@@ -4214,7 +4214,7 @@
                                         Visibility=Visible
                                         RenderSize=12,7
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -4231,7 +4231,7 @@
                                       Visibility=Visible
                                       RenderSize=12,12
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -4253,7 +4253,7 @@
                                           FocusVisualPrimaryThickness=2,2,2,2
                                           FocusVisualPrimaryBrush=#E4000000
                                           Visibility=Visible
-                                          RenderSize=12,12
+                                          RenderSize=12,8
                                         [Windows.UI.Xaml.Controls.Grid]
                                             Padding=0,0,0,0
                                             CornerRadius=0,0,0,0
@@ -4266,7 +4266,7 @@
                                             FocusVisualPrimaryThickness=2,2,2,2
                                             FocusVisualPrimaryBrush=#E4000000
                                             Visibility=Visible
-                                            RenderSize=12,12
+                                            RenderSize=12,8
                                           [Windows.UI.Xaml.Controls.TextBlock]
                                               Padding=0,0,0,0
                                               Foreground=#72000000
diff --git a/test/MUXControlsTestApp/verification/NavigationViewScrolling-8.xml b/test/MUXControlsTestApp/verification/NavigationViewScrolling-8.xml
index a420be66ee..f3074c4676 100755
--- a/test/MUXControlsTestApp/verification/NavigationViewScrolling-8.xml
+++ b/test/MUXControlsTestApp/verification/NavigationViewScrolling-8.xml
@@ -3926,7 +3926,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=4,0,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -3935,7 +3935,7 @@
                                       Width=12
                                       Name=HorizontalSmallDecrease
                                       MinHeight=12
-                                      Margin=1,0,0,0
+                                      Margin=0,0,0,0
                                       FocusVisualSecondaryThickness=1,1,1,1
                                       FocusVisualSecondaryBrush=#B3FFFFFF
                                       FocusVisualPrimaryThickness=2,2,2,2
@@ -3991,7 +3991,7 @@
                                       Visibility=Visible
                                       RenderSize=0,0
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,0,4,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -4000,7 +4000,7 @@
                                       Width=12
                                       Name=HorizontalSmallIncrease
                                       MinHeight=12
-                                      Margin=0,0,1,0
+                                      Margin=0,0,0,0
                                       FocusVisualSecondaryThickness=1,1,1,1
                                       FocusVisualSecondaryBrush=#B3FFFFFF
                                       FocusVisualPrimaryThickness=2,2,2,2
@@ -4063,7 +4063,7 @@
                                       Visibility=Visible
                                       RenderSize=12,61
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,4,0,0
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -4071,7 +4071,7 @@
                                       CornerRadius=4,4,4,4
                                       Name=VerticalSmallDecrease
                                       MinWidth=12
-                                      Margin=0,1,0,0
+                                      Margin=0,0,0,0
                                       Height=12
                                       FocusVisualSecondaryThickness=1,1,1,1
                                       FocusVisualSecondaryBrush=#B3FFFFFF
@@ -4080,7 +4080,7 @@
                                       Visibility=Visible
                                       RenderSize=12,12
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,4,0,0
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -4102,7 +4102,7 @@
                                           FocusVisualPrimaryThickness=2,2,2,2
                                           FocusVisualPrimaryBrush=#E4000000
                                           Visibility=Visible
-                                          RenderSize=12,12
+                                          RenderSize=12,8
                                         [Windows.UI.Xaml.Controls.Grid]
                                             Padding=0,0,0,0
                                             CornerRadius=0,0,0,0
@@ -4115,7 +4115,7 @@
                                             FocusVisualPrimaryThickness=2,2,2,2
                                             FocusVisualPrimaryBrush=#E4000000
                                             Visibility=Visible
-                                            RenderSize=12,12
+                                            RenderSize=12,8
                                           [Windows.UI.Xaml.Controls.TextBlock]
                                               Padding=0,0,0,0
                                               Foreground=#72000000
@@ -4198,7 +4198,7 @@
                                       FocusVisualPrimaryThickness=2,2,2,2
                                       FocusVisualPrimaryBrush=#E4000000
                                       Visibility=Visible
-                                      RenderSize=12,5
+                                      RenderSize=12,7
                                     [Windows.UI.Xaml.Controls.Grid]
                                         Padding=0,0,0,0
                                         CornerRadius=0,0,0,0
@@ -4212,9 +4212,9 @@
                                         FocusVisualPrimaryThickness=2,2,2,2
                                         FocusVisualPrimaryBrush=#E4000000
                                         Visibility=Visible
-                                        RenderSize=12,5
+                                        RenderSize=12,7
                                   [Windows.UI.Xaml.Controls.Primitives.RepeatButton]
-                                      Padding=11,5,11,6
+                                      Padding=0,0,0,4
                                       Foreground=#E4000000
                                       BorderThickness=1,1,1,1
                                       BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
@@ -4222,7 +4222,7 @@
                                       CornerRadius=4,4,4,4
                                       Name=VerticalSmallIncrease
                                       MinWidth=12
-                                      Margin=0,0,0,1
+                                      Margin=0,0,0,0
                                       Height=12
                                       FocusVisualSecondaryThickness=1,1,1,1
                                       FocusVisualSecondaryBrush=#B3FFFFFF
@@ -4231,7 +4231,7 @@
                                       Visibility=Visible
                                       RenderSize=12,12
                                     [Windows.UI.Xaml.Controls.Grid]
-                                        Padding=0,0,0,0
+                                        Padding=0,0,0,4
                                         CornerRadius=0,0,0,0
                                         BorderThickness=0,0,0,0
                                         BorderBrush=#00FFFFFF
@@ -4253,7 +4253,7 @@
                                           FocusVisualPrimaryThickness=2,2,2,2
                                           FocusVisualPrimaryBrush=#E4000000
                                           Visibility=Visible
-                                          RenderSize=12,12
+                                          RenderSize=12,8
                                         [Windows.UI.Xaml.Controls.Grid]
                                             Padding=0,0,0,0
                                             CornerRadius=0,0,0,0
@@ -4266,7 +4266,7 @@
                                             FocusVisualPrimaryThickness=2,2,2,2
                                             FocusVisualPrimaryBrush=#E4000000
                                             Visibility=Visible
-                                            RenderSize=12,12
+                                            RenderSize=12,8
                                           [Windows.UI.Xaml.Controls.TextBlock]
                                               Padding=0,0,0,0
                                               Foreground=#72000000