From 143d110e66cc4b42b70679f79ac588fd0ba21240 Mon Sep 17 00:00:00 2001
From: Yimeng Wu <me@kinnara.cn>
Date: Sat, 4 Nov 2023 22:29:48 +0000
Subject: [PATCH] Port microsoft/microsoft-ui-xaml#4277 (#595)

---
 .../DropDownButton/DropDownButton.xaml        |  6 +-
 .../NavigationView/NavigationView.xaml        | 26 +++++-
 ModernWpf/Styles/AutoSuggestBox.xaml          |  8 +-
 ModernWpf/Styles/CheckBox.xaml                | 91 +++++++++++--------
 ModernWpf/Styles/NavigationView.xaml          | 17 ++--
 test/ModernWpfTestApp/AutoSuggestBoxPage.xaml | 16 ++--
 test/ModernWpfTestApp/CheckBoxPage.xaml       | 29 ++----
 test/ModernWpfTestApp/CheckBoxPage.xaml.cs    | 16 ++++
 ...vigationViewCompactPaneLengthTestPage.xaml |  6 +-
 9 files changed, 128 insertions(+), 87 deletions(-)

diff --git a/ModernWpf.Controls/DropDownButton/DropDownButton.xaml b/ModernWpf.Controls/DropDownButton/DropDownButton.xaml
index 6948735a..8bc7bdf8 100644
--- a/ModernWpf.Controls/DropDownButton/DropDownButton.xaml
+++ b/ModernWpf.Controls/DropDownButton/DropDownButton.xaml
@@ -51,7 +51,7 @@
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 
                             <ui:FontIconFallback
-                                x:Name="ChevronTextBlock"
+                                x:Name="ChevronIcon"
                                 Grid.Column="1"
                                 FontFamily="{DynamicResource SymbolThemeFontFamily}"
                                 FontSize="8"
@@ -74,13 +74,13 @@
                             <Setter TargetName="RootBorder" Property="Background" Value="{DynamicResource ButtonBackgroundPressed}" />
                             <Setter TargetName="RootBorder" Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" />
                             <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundPressed}" />
-                            <Setter TargetName="ChevronTextBlock" Property="Foreground" Value="{DynamicResource DropDownButtonForegroundSecondaryPressed}" />
+                            <Setter TargetName="ChevronIcon" Property="Foreground" Value="{DynamicResource DropDownButtonForegroundSecondaryPressed}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter TargetName="RootBorder" Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}" />
                             <Setter TargetName="RootBorder" Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}" />
                             <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
-                            <Setter TargetName="ChevronTextBlock" Property="Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
+                            <Setter TargetName="ChevronIcon" Property="Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/ModernWpf.Controls/NavigationView/NavigationView.xaml b/ModernWpf.Controls/NavigationView/NavigationView.xaml
index 8ab3af3c..1d2db22f 100644
--- a/ModernWpf.Controls/NavigationView/NavigationView.xaml
+++ b/ModernWpf.Controls/NavigationView/NavigationView.xaml
@@ -225,6 +225,9 @@
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron" Storyboard.TargetProperty="Visibility">
                                                 <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
                                             </ObjectAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle">
+                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="180" />
+                                            </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
                                     <VisualState x:Name="ChevronVisibleClosed">
@@ -232,6 +235,9 @@
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron" Storyboard.TargetProperty="Visibility">
                                                 <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
                                             </ObjectAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle">
+                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
+                                            </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
                                 </VisualStateGroup>
@@ -302,7 +308,10 @@
                                         Margin="{DynamicResource NavigationViewItemExpandChevronMargin}"
                                         Background="Transparent">
                                         <ui:FontIconFallback
+                                            Width="12"
+                                            Height="12"
                                             RenderTransformOrigin="0.5, 0.5"
+                                            x:Name="ExpandCollapseChevronIcon"
                                             Foreground="{DynamicResource NavigationViewItemForeground}"
                                             FontSize="{DynamicResource NavigationViewItemExpandedGlyphFontSize}"
                                             Data="{DynamicResource NavigationViewItemExpandedPath}"
@@ -516,6 +525,9 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron" Storyboard.TargetProperty="Visibility">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
                                         </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle">
+                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="180" />
+                                        </DoubleAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="ChevronVisibleClosed">
@@ -523,6 +535,9 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron" Storyboard.TargetProperty="Visibility">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
                                         </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle">
+                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
+                                        </DoubleAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
@@ -569,15 +584,18 @@
                                 Margin="{DynamicResource TopNavigationViewItemExpandChevronMargin}"
                                 Background="Transparent">
                                 <ui:FontIconFallback
+                                    Width="12"
+                                    Height="12"
                                     Foreground="{DynamicResource NavigationViewItemForeground}"
                                     RenderTransformOrigin="0.5, 0.5"
+                                    x:Name="ExpandCollapseChevronIcon"
                                     FontSize="{DynamicResource NavigationViewItemExpandedGlyphFontSize}"
                                     Data="{DynamicResource NavigationViewItemExpandedPath}"
                                     FontFamily="{DynamicResource SymbolThemeFontFamily}"
                                     VerticalAlignment="Center"
                                     HorizontalAlignment="Center">
                                     <ui:FontIconFallback.RenderTransform>
-                                        <RotateTransform x:Name="ExpandCollapseChevronRotateTransform"/>
+                                        <RotateTransform x:Name="ExpandCollapseChevronRotateTransform" Angle="0"/>
                                     </ui:FontIconFallback.RenderTransform>
                                 </ui:FontIconFallback>
                             </Grid>
@@ -776,15 +794,17 @@
                                     <Border Padding="{DynamicResource TopNavigationViewItemOnOverflowExpandChevronPadding}">
                                         <ui:FontIconFallback
                                             Foreground="{DynamicResource NavigationViewItemForeground}"
-                                            Width="12" Height="12"
+                                            Width="12"
+                                            Height="12"
                                             RenderTransformOrigin="0.5, 0.5"
+                                            x:Name="ExpandCollapseChevronIcon"
                                             FontSize="{DynamicResource NavigationViewItemExpandedGlyphFontSize}"
                                             Data="{DynamicResource NavigationViewItemExpandedPath}"
                                             FontFamily="{DynamicResource SymbolThemeFontFamily}"
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center">
                                             <ui:FontIconFallback.RenderTransform>
-                                                <RotateTransform x:Name="ExpandCollapseChevronRotateTransform"/>
+                                                <RotateTransform x:Name="ExpandCollapseChevronRotateTransform" Angle="0"/>
                                             </ui:FontIconFallback.RenderTransform>
                                         </ui:FontIconFallback>
                                     </Border>
diff --git a/ModernWpf/Styles/AutoSuggestBox.xaml b/ModernWpf/Styles/AutoSuggestBox.xaml
index 7ff6a507..764530bf 100644
--- a/ModernWpf/Styles/AutoSuggestBox.xaml
+++ b/ModernWpf/Styles/AutoSuggestBox.xaml
@@ -11,7 +11,8 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Thickness x:Key="AutoSuggestBoxTopHeaderMargin">0,0,0,8</Thickness>
-    <Thickness x:Key="AutoSuggestBoxInnerButtonMargin">0,4,0,4</Thickness>
+    <Thickness x:Key="AutoSuggestBoxInnerButtonMargin">0,3</Thickness>
+    <Thickness x:Key="AutoSuggestBoxQueryButtonPadding">3,2</Thickness>
     <sys:Double x:Key="AutoSuggestBoxRightButtonMargin">4</sys:Double>
 
     <Style TargetType="TextBox" x:Key="AutoSuggestBoxTextBoxStyle">
@@ -224,7 +225,7 @@
                             Grid.Column="1"
                             Visibility="Collapsed"
                             FontSize="{TemplateBinding FontSize}"
-                            Width="30"
+                            Width="32"
                             VerticalAlignment="Stretch"
                             primitives:TextBoxHelper.IsDeleteButton="True" />
                         <Button
@@ -237,7 +238,8 @@
                             Focusable="False"
                             Grid.Column="2"
                             FontSize="{TemplateBinding FontSize}"
-                            Width="30"
+                            Width="32"
+                            Height="28"
                             VerticalAlignment="Stretch" />
                         <ContentPresenter
                             x:Name="DescriptionPresenter"
diff --git a/ModernWpf/Styles/CheckBox.xaml b/ModernWpf/Styles/CheckBox.xaml
index aedc2395..35c2e9e4 100644
--- a/ModernWpf/Styles/CheckBox.xaml
+++ b/ModernWpf/Styles/CheckBox.xaml
@@ -3,28 +3,39 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:ModernWpf.Controls"
-    xmlns:primitives="clr-namespace:ModernWpf.Controls.Primitives">
+    xmlns:primitives="clr-namespace:ModernWpf.Controls.Primitives"
+    xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
     <primitives:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
     <primitives:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
 
+    <sys:Double x:Key="CheckBoxBorderThickness">1</sys:Double>
+    <sys:Double x:Key="CheckBoxSize">20</sys:Double>
+    <sys:Double x:Key="CheckBoxGlyphSize">16</sys:Double>
+    <sys:Double x:Key="CheckBoxHeight">32</sys:Double>
+    <sys:Double x:Key="CheckBoxMinWidth">120</sys:Double>
+    <Thickness x:Key="CheckBoxPadding">8,5,0,0</Thickness>
+    <Thickness x:Key="CheckBoxFocusVisualMargin">-7,-3,-7,-3</Thickness>
+    <sys:String x:Key="CheckBoxCheckedGlyph">&#xE001;</sys:String>
+    <sys:String x:Key="CheckBoxIndeterminateGlyph">&#xE9AE;</sys:String>
+
     <Style x:Key="DefaultCheckBoxStyle" TargetType="CheckBox">
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUnchecked}" />
         <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUnchecked}" />
         <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUnchecked}" />
-        <Setter Property="Padding" Value="8,0,0,0" />
+        <Setter Property="Padding" Value="{StaticResource CheckBoxPadding}" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="VerticalContentAlignment" Value="Top" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="MinWidth" Value="120" />
-        <Setter Property="MinHeight" Value="32" />
+        <Setter Property="MinWidth" Value="{StaticResource CheckBoxMinWidth}" />
+        <Setter Property="MinHeight" Value="{StaticResource CheckBoxHeight}" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
         <Setter Property="primitives:FocusVisualHelper.UseSystemFocusVisuals" Value="{DynamicResource UseSystemFocusVisuals}" />
-        <Setter Property="primitives:FocusVisualHelper.FocusVisualMargin" Value="-7,-3,-7,-3" />
+        <Setter Property="primitives:FocusVisualHelper.FocusVisualMargin" Value="{StaticResource CheckBoxFocusVisualMargin}" />
         <Setter Property="primitives:ControlHelper.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="Stylus.IsPressAndHoldEnabled" Value="False" />
         <Setter Property="Template">
@@ -34,43 +45,45 @@
                         <StreamGeometry x:Key="CheckMark">M 17.939453 5.439453 L 7.5 15.888672 L 2.060547 10.439453 L 2.939453 9.560547 L 7.5 14.111328 L 17.060547 4.560547 Z</StreamGeometry>
                         <StreamGeometry x:Key="CheckboxIndeterminate">M 15 5 L 15 15 L 5 15 L 5 5 Z</StreamGeometry>
                     </ControlTemplate.Resources>
-                    <Border
-                        x:Name="RootGrid"
+                    <Border x:Name="RootGrid"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding primitives:ControlHelper.CornerRadius}"
                         SnapsToDevicePixels="True">
+                        
                         <Grid VerticalAlignment="Center">
+                            
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="20" />
+                                <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="*" />
                             </Grid.ColumnDefinitions>
-                            <Grid VerticalAlignment="Top">
+
+                            <Grid Grid.Column="0" VerticalAlignment="Center" Height="{DynamicResource CheckBoxSize}" Width="{StaticResource CheckBoxSize}">
                                 <Rectangle
                                     x:Name="NormalRectangle"
                                     Fill="{DynamicResource CheckBoxCheckBackgroundFillUnchecked}"
                                     Stroke="{DynamicResource CheckBoxCheckBackgroundStrokeUnchecked}"
-                                    StrokeThickness="{DynamicResource CheckBoxBorderThemeThickness}"
+                                    StrokeThickness="{StaticResource CheckBoxBorderThickness}"
                                     UseLayoutRounding="False"
-                                    Height="20"
-                                    Width="20"
+                                    Height="{StaticResource CheckBoxSize}"
+                                    Width="{StaticResource CheckBoxSize}"
                                     RadiusX="{TemplateBinding primitives:ControlHelper.CornerRadius, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
                                     RadiusY="{TemplateBinding primitives:ControlHelper.CornerRadius, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
                                 <local:FontIconFallback
-                                    x:Name="CheckGlyph"
+                                    x:Name="DownLevelCheckGlyph"
                                     FontFamily="{DynamicResource SymbolThemeFontFamily}"
                                     Data="{StaticResource CheckMark}"
-                                    FontSize="16"
+                                    FontSize="{StaticResource CheckBoxGlyphSize}"
                                     Foreground="{DynamicResource CheckBoxCheckGlyphForegroundUnchecked}"
                                     Opacity="0" />
                             </Grid>
                             <local:ContentPresenterEx
                                 x:Name="ContentPresenter"
+                                Grid.Column="1"
                                 Margin="{TemplateBinding Padding}"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Grid.Column="1"
                                 TextWrapping="Wrap"
                                 Focusable="False"
                                 RecognizesAccessKey="True"
@@ -91,7 +104,7 @@
                             <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUnchecked}" />
                             <Setter TargetName="NormalRectangle" Property="Stroke" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUnchecked}" />
                             <Setter TargetName="NormalRectangle" Property="Fill" Value="{DynamicResource CheckBoxCheckBackgroundFillUnchecked}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundUnchecked}" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundUnchecked}" />
                         </MultiTrigger>
                         <!-- UncheckedPointerOver -->
                         <MultiTrigger>
@@ -104,7 +117,7 @@
                             <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPointerOver}" />
                             <Setter TargetName="NormalRectangle" Property="Stroke" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPointerOver}" />
                             <Setter TargetName="NormalRectangle" Property="Fill" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPointerOver}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPointerOver}" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPointerOver}" />
                         </MultiTrigger>
                         <!-- UncheckedPressed -->
                         <MultiTrigger>
@@ -117,7 +130,7 @@
                             <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPressed}" />
                             <Setter TargetName="NormalRectangle" Property="Stroke" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPressed}" />
                             <Setter TargetName="NormalRectangle" Property="Fill" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPressed}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPressed}" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPressed}" />
                         </MultiTrigger>
                         <!-- UncheckedDisabled -->
                         <MultiTrigger>
@@ -130,7 +143,7 @@
                             <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedDisabled}" />
                             <Setter TargetName="NormalRectangle" Property="Stroke" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedDisabled}" />
                             <Setter TargetName="NormalRectangle" Property="Fill" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedDisabled}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedDisabled}" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedDisabled}" />
                         </MultiTrigger>
                         <!-- CheckedNormal -->
                         <MultiTrigger>
@@ -145,9 +158,9 @@
                             <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushChecked}" />
                             <Setter TargetName="NormalRectangle" Property="Stroke" Value="{DynamicResource CheckBoxCheckBackgroundStrokeChecked}" />
                             <Setter TargetName="NormalRectangle" Property="Fill" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundChecked}" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundChecked}" />
                             <Setter TargetName="NormalRectangle" Property="StrokeThickness" Value="{DynamicResource CheckBoxCheckedStrokeThickness}" />
-                            <Setter TargetName="CheckGlyph" Property="Opacity" Value="1" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Opacity" Value="1" />
                         </MultiTrigger>
                         <!-- CheckedPointerOver -->
                         <MultiTrigger>
@@ -160,8 +173,8 @@
                             <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPointerOver}" />
                             <Setter TargetName="NormalRectangle" Property="Stroke" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPointerOver}" />
                             <Setter TargetName="NormalRectangle" Property="Fill" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPointerOver}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPointerOver}" />
-                            <Setter TargetName="CheckGlyph" Property="Opacity" Value="1" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPointerOver}" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Opacity" Value="1" />
                         </MultiTrigger>
                         <!-- CheckedPressed -->
                         <MultiTrigger>
@@ -174,8 +187,8 @@
                             <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPressed}" />
                             <Setter TargetName="NormalRectangle" Property="Stroke" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPressed}" />
                             <Setter TargetName="NormalRectangle" Property="Fill" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPressed}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPressed}" />
-                            <Setter TargetName="CheckGlyph" Property="Opacity" Value="1" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPressed}" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Opacity" Value="1" />
                         </MultiTrigger>
                         <!-- CheckedDisabled -->
                         <MultiTrigger>
@@ -188,8 +201,8 @@
                             <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedDisabled}" />
                             <Setter TargetName="NormalRectangle" Property="Stroke" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedDisabled}" />
                             <Setter TargetName="NormalRectangle" Property="Fill" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedDisabled}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedDisabled}" />
-                            <Setter TargetName="CheckGlyph" Property="Opacity" Value="1" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedDisabled}" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Opacity" Value="1" />
                         </MultiTrigger>
                         <!-- IndeterminateNormal -->
                         <MultiTrigger>
@@ -204,9 +217,9 @@
                             <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminate}" />
                             <Setter TargetName="NormalRectangle" Property="Stroke" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminate}" />
                             <Setter TargetName="NormalRectangle" Property="Fill" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminate}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminate}" />
-                            <Setter TargetName="CheckGlyph" Property="Data" Value="{StaticResource CheckboxIndeterminate}" />
-                            <Setter TargetName="CheckGlyph" Property="Opacity" Value="1" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminate}" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Data" Value="{StaticResource CheckboxIndeterminate}" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Opacity" Value="1" />
                         </MultiTrigger>
                         <!-- IndeterminatePointerOver -->
                         <MultiTrigger>
@@ -219,9 +232,9 @@
                             <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePointerOver}" />
                             <Setter TargetName="NormalRectangle" Property="Stroke" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePointerOver}" />
                             <Setter TargetName="NormalRectangle" Property="Fill" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePointerOver}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePointerOver}" />
-                            <Setter TargetName="CheckGlyph" Property="Data" Value="{StaticResource CheckboxIndeterminate}" />
-                            <Setter TargetName="CheckGlyph" Property="Opacity" Value="1" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePointerOver}" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Data" Value="{StaticResource CheckboxIndeterminate}" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Opacity" Value="1" />
                         </MultiTrigger>
                         <!-- IndeterminatePressed -->
                         <MultiTrigger>
@@ -234,9 +247,9 @@
                             <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePressed}" />
                             <Setter TargetName="NormalRectangle" Property="Stroke" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePressed}" />
                             <Setter TargetName="NormalRectangle" Property="Fill" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePressed}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePressed}" />
-                            <Setter TargetName="CheckGlyph" Property="Data" Value="{StaticResource CheckboxIndeterminate}" />
-                            <Setter TargetName="CheckGlyph" Property="Opacity" Value="1" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePressed}" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Data" Value="{StaticResource CheckboxIndeterminate}" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Opacity" Value="1" />
                         </MultiTrigger>
                         <!-- IndeterminateDisabled -->
                         <MultiTrigger>
@@ -249,9 +262,9 @@
                             <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminateDisabled}" />
                             <Setter TargetName="NormalRectangle" Property="Stroke" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminateDisabled}" />
                             <Setter TargetName="NormalRectangle" Property="Fill" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminateDisabled}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminateDisabled}" />
-                            <Setter TargetName="CheckGlyph" Property="Data" Value="{StaticResource CheckboxIndeterminate}" />
-                            <Setter TargetName="CheckGlyph" Property="Opacity" Value="1" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminateDisabled}" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Data" Value="{StaticResource CheckboxIndeterminate}" />
+                            <Setter TargetName="DownLevelCheckGlyph" Property="Opacity" Value="1" />
                         </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/ModernWpf/Styles/NavigationView.xaml b/ModernWpf/Styles/NavigationView.xaml
index fcf4c001..e31efaa4 100644
--- a/ModernWpf/Styles/NavigationView.xaml
+++ b/ModernWpf/Styles/NavigationView.xaml
@@ -59,7 +59,7 @@
 
     <!-- The resource below must be defined at the app level in order to affect the expand/collapse chevron font size
     used in the Top NavigationView's Overflow menu. -->
-    <sys:Double x:Key="NavigationViewItemExpandedGlyphFontSize">12.0</sys:Double>
+    <sys:Double x:Key="NavigationViewItemExpandedGlyphFontSize">8</sys:Double>
     <sys:String x:Key="NavigationViewItemExpandedGlyph">&#xE70D;</sys:String>
     <StreamGeometry x:Key="NavigationViewItemExpandedPath">M 18.935547 4.560547 L 19.814453 5.439453 L 10 15.253906 L 0.185547 5.439453 L 1.064453 4.560547 L 10 13.496094 Z</StreamGeometry>
 
@@ -99,17 +99,14 @@
                             </Grid.RowDefinitions>
 
                             <Border Width="{TemplateBinding MinWidth}">
-                                <Viewbox
-                                    x:Name="IconHost"
+                                <local:FontIconFallback
+                                    x:Name="Icon"
                                     Width="16"
                                     Height="16"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                                    <local:FontIconFallback
-                                        x:Name="Icon"
-                                        Data="M 20 6.25 L 0 6.25 L 0 5 L 20 5 L 20 6.25 Z M 20 16.25 L 0 16.25 L 0 15 L 20 15 L 20 16.25 Z M 20 11.25 L 0 11.25 L 0 10 L 20 10 L 20 11.25 Z"
-                                        FontSize="{TemplateBinding FontSize}" />
-                                </Viewbox>
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Data="M 20 6.25 L 0 6.25 L 0 5 L 20 5 L 20 6.25 Z M 20 16.25 L 0 16.25 L 0 15 L 20 15 L 20 16.25 Z M 20 11.25 L 0 11.25 L 0 10 L 20 10 L 20 11.25 Z"
+                                    FontSize="{TemplateBinding FontSize}" />
                             </Border>
 
                             <ContentPresenter
diff --git a/test/ModernWpfTestApp/AutoSuggestBoxPage.xaml b/test/ModernWpfTestApp/AutoSuggestBoxPage.xaml
index 0c9f9e3d..712babba 100644
--- a/test/ModernWpfTestApp/AutoSuggestBoxPage.xaml
+++ b/test/ModernWpfTestApp/AutoSuggestBoxPage.xaml
@@ -11,14 +11,14 @@
     Background="{DynamicResource SystemControlPageBackgroundAltHighBrush}">
 
     <StackPanel Margin="12">
-        <TextBlock
-            Text="Sample AutoSuggestBoxes"
-            Style="{DynamicResource StandardGroupHeader}" />
-        <controls:AutoSuggestBox />
-        <controls:AutoSuggestBox Header="AutoSuggestBox with header" />
-        <controls:AutoSuggestBox
-            Header="AutoSuggestBox with suggestions"
-            QuerySubmitted="AutoSuggestBox_QuerySubmitted" />
+        <TextBlock Text="Sample AutoSuggestBoxes" Style="{DynamicResource StandardGroupHeader}" />
+        <controls:AutoSuggestBox QueryIcon="Find" />
+        <controls:AutoSuggestBox Header="AutoSuggestBox with header" FontSize="12">
+            <controls:AutoSuggestBox.QueryIcon>
+                <controls:FontIcon Glyph="&#xE11A;" FontSize="12" />
+            </controls:AutoSuggestBox.QueryIcon>
+        </controls:AutoSuggestBox>
+        <controls:AutoSuggestBox Header="AutoSuggestBox with suggestions" QuerySubmitted="AutoSuggestBox_QuerySubmitted" />
     </StackPanel>
 
 </local:TestPage>
diff --git a/test/ModernWpfTestApp/CheckBoxPage.xaml b/test/ModernWpfTestApp/CheckBoxPage.xaml
index 2168d0c5..0bbf9bdb 100644
--- a/test/ModernWpfTestApp/CheckBoxPage.xaml
+++ b/test/ModernWpfTestApp/CheckBoxPage.xaml
@@ -10,26 +10,15 @@
     Background="{DynamicResource SystemControlPageBackgroundAltHighBrush}">
 
     <StackPanel Margin="12">
-        <TextBlock
-            Text="Sample CheckBoxes"
-            Style="{DynamicResource StandardGroupHeader}" />
-        <CheckBox Content="Two-state CheckBox" />
-        <CheckBox
-            Content="Three-state CheckBox"
-            IsThreeState="True" />
-        <CheckBox
-            Content="Disabled CheckBox Unchecked"
-            IsEnabled="False" />
-        <CheckBox
-            Content="Disabled CheckBox Indetermintate"
-            IsThreeState="True"
-            IsChecked="{x:Null}"
-            IsEnabled="False" />
-        <CheckBox
-            Content="Disabled CheckBox Checked"
-            IsThreeState="True"
-            IsChecked="True"
-            IsEnabled="False" />
+        <TextBlock Text="Sample CheckBoxes" Style="{DynamicResource StandardGroupHeader}"/>
+        <CheckBox Content="Two-state CheckBox"/>
+        <StackPanel Orientation="Horizontal">
+            <CheckBox x:Name="ThreeStateCheckbox" Content="Three-state CheckBox" IsThreeState="True"/>
+            <Button Content="Reverse Order" Click="OnReverseButtonClicked" Margin="10,0,10,0"/>
+        </StackPanel>
+        <CheckBox Content="Disabled CheckBox Unchecked" IsEnabled="False"/>
+        <CheckBox Content="Disabled CheckBox Indetermintate" IsThreeState="True" IsChecked="{x:Null}" IsEnabled="False"/>
+        <CheckBox Content="Disabled CheckBox Checked" IsThreeState="True" IsChecked="True" IsEnabled="False"/>
     </StackPanel>
 
 </local:TestPage>
diff --git a/test/ModernWpfTestApp/CheckBoxPage.xaml.cs b/test/ModernWpfTestApp/CheckBoxPage.xaml.cs
index c8783bf4..1235a9d8 100644
--- a/test/ModernWpfTestApp/CheckBoxPage.xaml.cs
+++ b/test/ModernWpfTestApp/CheckBoxPage.xaml.cs
@@ -10,5 +10,21 @@ public CheckBoxPage()
         {
             this.InitializeComponent();
         }
+        public void OnReverseButtonClicked(object sender, object args)
+        {
+            var isChecked = ThreeStateCheckbox.IsChecked;
+            if (isChecked.HasValue && isChecked.Value)
+            {
+                ThreeStateCheckbox.IsChecked = false;
+            }
+            else if (isChecked.HasValue && !isChecked.Value)
+            {
+                ThreeStateCheckbox.IsChecked = null;
+            }
+            else if (!isChecked.HasValue)
+            {
+                ThreeStateCheckbox.IsChecked = true;
+            }
+        }
     }
 }
diff --git a/test/NavigationView_TestUI/Common/NavigationViewCompactPaneLengthTestPage.xaml b/test/NavigationView_TestUI/Common/NavigationViewCompactPaneLengthTestPage.xaml
index ed35af69..e4313b73 100644
--- a/test/NavigationView_TestUI/Common/NavigationViewCompactPaneLengthTestPage.xaml
+++ b/test/NavigationView_TestUI/Common/NavigationViewCompactPaneLengthTestPage.xaml
@@ -33,7 +33,11 @@
             </muxc:NavigationView.MenuItems>
 
             <muxc:NavigationView.AutoSuggestBox>
-                <muxc:AutoSuggestBox QueryIcon="Find" AutomationProperties.Name="PaneAutoSuggestBox"/>
+                <muxc:AutoSuggestBox AutomationProperties.Name="PaneAutoSuggestBox">
+                    <muxc:AutoSuggestBox.QueryIcon>
+                        <muxc:FontIcon Glyph="&#xE11A;" FontSize="12" FontFamily="{ThemeResource SymbolThemeFontFamily}"/>
+                    </muxc:AutoSuggestBox.QueryIcon>
+                </muxc:AutoSuggestBox>
             </muxc:NavigationView.AutoSuggestBox>
 
             <muxc:NavigationView.PaneFooter>