diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/App.xaml.Navigation.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/App.xaml.Navigation.cs
index f410cc88c..db767d260 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/App.xaml.Navigation.cs
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/App.xaml.Navigation.cs
@@ -87,7 +87,7 @@ private Shell BuildShell()
 			AddNavigationItems(nv);
 
 			// landing navigation
-			ShellNavigateTo<RuntimeTestRunner>(
+			ShellNavigateTo<NavigationBarSamplePage>(
 #if WINDOWS_UWP
 				// note: on uwp, NavigationView.SelectedItem MUST be set on launch to avoid entering compact-mode
 				trySynchronizeCurrentItem: true
diff --git a/src/Uno.Toolkit.UI/Assets/BackIcon.scale-100.png b/src/Uno.Toolkit.UI/Assets/BackIcon.scale-100.png
new file mode 100644
index 000000000..66d08576f
Binary files /dev/null and b/src/Uno.Toolkit.UI/Assets/BackIcon.scale-100.png differ
diff --git a/src/Uno.Toolkit.UI/Assets/BackIcon.scale-150.png b/src/Uno.Toolkit.UI/Assets/BackIcon.scale-150.png
new file mode 100644
index 000000000..0c57081d2
Binary files /dev/null and b/src/Uno.Toolkit.UI/Assets/BackIcon.scale-150.png differ
diff --git a/src/Uno.Toolkit.UI/Assets/BackIcon.scale-200.png b/src/Uno.Toolkit.UI/Assets/BackIcon.scale-200.png
new file mode 100644
index 000000000..56b4640bb
Binary files /dev/null and b/src/Uno.Toolkit.UI/Assets/BackIcon.scale-200.png differ
diff --git a/src/Uno.Toolkit.UI/Assets/BackIcon.scale-300.png b/src/Uno.Toolkit.UI/Assets/BackIcon.scale-300.png
new file mode 100644
index 000000000..235e5fce8
Binary files /dev/null and b/src/Uno.Toolkit.UI/Assets/BackIcon.scale-300.png differ
diff --git a/src/Uno.Toolkit.UI/Assets/BackIcon.scale-400.png b/src/Uno.Toolkit.UI/Assets/BackIcon.scale-400.png
new file mode 100644
index 000000000..9b1418b5f
Binary files /dev/null and b/src/Uno.Toolkit.UI/Assets/BackIcon.scale-400.png differ
diff --git a/src/Uno.Toolkit.UI/Controls/NavigationBar/NavigationBar.xaml b/src/Uno.Toolkit.UI/Controls/NavigationBar/NavigationBar.xaml
index d7751426a..5685d7efd 100644
--- a/src/Uno.Toolkit.UI/Controls/NavigationBar/NavigationBar.xaml
+++ b/src/Uno.Toolkit.UI/Controls/NavigationBar/NavigationBar.xaml
@@ -1,26 +1,36 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-					xmlns:utu="using:Uno.Toolkit.UI"
-					xmlns:toolkit="using:Uno.UI.Toolkit"
-					xmlns:ios="http://uno.ui/ios"
 					xmlns:android="http://uno.ui/android"
-					xmlns:mobile="http://uno.ui/mobile"
-					xmlns:not_mobile="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-					xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:contract12NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,12)"
+					xmlns:contract12Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,12)"
 					xmlns:contract4Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,4)"
+					xmlns:contract5NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,5)"
+					xmlns:contract6NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,6)"
 					xmlns:contract6Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,6)"
-					xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
 					xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
+					xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
 					xmlns:contract8Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,8)"
-					xmlns:contract12Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,12)"
-					xmlns:contract12NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,12)"
-					xmlns:contract6NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,6)"
-					xmlns:contract5NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,5)"
+					xmlns:ios="http://uno.ui/ios"
+					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+					xmlns:mobile="http://uno.ui/mobile"
+					xmlns:not_mobile="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:toolkit="using:Uno.UI.Toolkit"
+					xmlns:utu="using:Uno.Toolkit.UI"
+					xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					mc:Ignorable="android ios mobile">
 
 
-	<Style x:Key="XamlNavigationBarPresenter" TargetType="utu:NavigationBarPresenter">
+	<Style x:Key="DefaultMainCommandStyle"
+		   TargetType="AppBarButton">
+		<not_mobile:Setter Property="Icon">
+			<not_mobile:Setter.Value>
+				<BitmapIcon UriSource="{StaticResource BackButtonUriSource}" />
+			</not_mobile:Setter.Value>
+		</not_mobile:Setter>
+	</Style>
+
+	<Style x:Key="XamlNavigationBarPresenter"
+		   TargetType="utu:NavigationBarPresenter">
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="utu:NavigationBarPresenter">
@@ -34,32 +44,20 @@
 
 	<Style x:Key="NavigationBarCommandBar"
 		   TargetType="CommandBar">
-		<Setter Property="Background"
-				Value="{ThemeResource CommandBarBackground}" />
-		<Setter Property="Foreground"
-				Value="{ThemeResource CommandBarForeground}" />
-		<Setter Property="Padding"
-				Value="4,0,0,0" />
-		<Setter Property="IsTabStop"
-				Value="False" />
-		<Setter Property="VerticalAlignment"
-				Value="Top" />
-		<Setter Property="HorizontalAlignment"
-				Value="Stretch" />
-		<Setter Property="HorizontalContentAlignment"
-				Value="Left" />
-		<Setter Property="VerticalContentAlignment"
-				Value="Top" />
-		<Setter Property="ClosedDisplayMode"
-				Value="Compact" />
-		<Setter Property="ExitDisplayModeOnAccessKeyInvoked"
-				Value="False" />
-		<Setter Property="CornerRadius"
-				Value="{ThemeResource ControlCornerRadius}" />
+		<Setter Property="Background" Value="{ThemeResource CommandBarBackground}" />
+		<Setter Property="Foreground" Value="{ThemeResource CommandBarForeground}" />
+		<Setter Property="Padding" Value="4,0,0,0" />
+		<Setter Property="IsTabStop" Value="False" />
+		<Setter Property="VerticalAlignment" Value="Top" />
+		<Setter Property="HorizontalAlignment" Value="Stretch" />
+		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="VerticalContentAlignment" Value="Top" />
+		<Setter Property="ClosedDisplayMode" Value="Compact" />
+		<Setter Property="ExitDisplayModeOnAccessKeyInvoked" Value="False" />
+		<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
 
-		 <!--Workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/6388--> 
-		<Setter Property="utu:CommandBarExtensions.MainCommand"
-				Value="{x:Null}" />
+		<!-- Workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/6388 -->
+		<Setter Property="utu:CommandBarExtensions.MainCommand" Value="{x:Null}" />
 
 		<Setter Property="Template">
 			<Setter.Value>
@@ -71,8 +69,8 @@
 								<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity">
 									<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 															Value="0" />
-									<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-														  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+									<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+														  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 														  Value="1" />
 								</DoubleAnimationUsingKeyFrames>
 							</Storyboard>
@@ -80,16 +78,170 @@
 								<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity">
 									<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 															Value="1" />
-									<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-														  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+									<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+														  KeyTime="{StaticResource ControlFastAnimationDuration}"
 														  Value="0" />
 								</DoubleAnimationUsingKeyFrames>
 							</Storyboard>
-							<Style TargetType="SplitButton"
-								   BasedOn="{StaticResource SplitButtonCommandBarStyle}" />
-							<Style TargetType="ToggleSplitButton"
-								   BasedOn="{StaticResource SplitButtonCommandBarStyle}" />
+							<Style BasedOn="{StaticResource SplitButtonCommandBarStyle}"
+								   TargetType="SplitButton" />
+							<Style BasedOn="{StaticResource SplitButtonCommandBarStyle}"
+								   TargetType="ToggleSplitButton" />
 						</Grid.Resources>
+						<Grid.Clip>
+							<RectangleGeometry Rect="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClipRect}">
+								<RectangleGeometry.Transform>
+									<TranslateTransform x:Name="ClipGeometryTransform" Y="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.CompactVerticalDelta}" />
+								</RectangleGeometry.Transform>
+							</RectangleGeometry>
+						</Grid.Clip>
+						<Grid x:Name="ContentRoot"
+							  Height="{TemplateBinding Height}"
+							  MinHeight="{ThemeResource AppBarThemeCompactHeight}"
+							  VerticalAlignment="Top"
+							  Background="{TemplateBinding Background}"
+							  XYFocusKeyboardNavigation="Enabled">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="*" />
+								<ColumnDefinition Width="Auto"
+												  MinWidth="6" />
+							</Grid.ColumnDefinitions>
+							<Grid.RenderTransform>
+								<TranslateTransform x:Name="ContentTransform" />
+							</Grid.RenderTransform>
+							<Grid>
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition x:Name="MainCommandColumnDefinition"
+													  Width="Auto" />
+									<ColumnDefinition x:Name="ContentControlColumnDefinition"
+													  Width="*" />
+									<ColumnDefinition x:Name="PrimaryItemsControlColumnDefinition"
+													  Width="Auto" />
+								</Grid.ColumnDefinitions>
+								<ContentPresenter x:Name="MainCommandPresenter"
+												  Margin="{TemplateBinding Padding}"
+												  Content="{Binding Path=(utu:CommandBarExtensions.MainCommand), RelativeSource={RelativeSource TemplatedParent}}" />
+
+
+								<!--
+									Use a ContentControl rather than a ContentPresenter so that IsEnabled can be set to false
+									in the Minimal/HiddenClosed states to remove it from being a tab-stop candidate.
+								-->
+
+
+								<ContentControl x:Name="ContentControl"
+												Grid.Column="1"
+												HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+												VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+												HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+												VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+												Content="{TemplateBinding Content}"
+												ContentTemplate="{TemplateBinding ContentTemplate}"
+												ContentTransitions="{TemplateBinding ContentTransitions}"
+												Foreground="{TemplateBinding Foreground}"
+												IsTabStop="False" />
+								<ItemsControl x:Name="PrimaryItemsControl"
+											  Grid.Column="2"
+											  MinHeight="{ThemeResource AppBarThemeCompactHeight}"
+											  HorizontalAlignment="Center"
+											  IsTabStop="False">
+									<ItemsControl.ItemsPanel>
+										<ItemsPanelTemplate>
+											<StackPanel Orientation="Horizontal" />
+										</ItemsPanelTemplate>
+									</ItemsControl.ItemsPanel>
+								</ItemsControl>
+							</Grid>
+							<Button x:Name="MoreButton"
+									Grid.Column="2"
+									MinHeight="{ThemeResource AppBarThemeCompactHeight}"
+									Padding="{ThemeResource CommandBarMoreButtonMargin}"
+									VerticalAlignment="Top"
+									Control.IsTemplateKeyTipTarget="True"
+									Foreground="{TemplateBinding Foreground}"
+									IsAccessKeyScope="True"
+									Style="{StaticResource EllipsisButton}"
+									Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.EffectiveOverflowButtonVisibility}">
+								<FontIcon x:Name="EllipsisIcon"
+										  Height="20"
+										  VerticalAlignment="Center"
+										  FontFamily="{ThemeResource SymbolThemeFontFamily}"
+										  FontSize="20"
+										  Glyph="&#xe712;" />
+							</Button>
+							<!-- UNO WORKAROUND: Added IsHitTestVisible="False". The Rectangle was blocking pointer events -->
+							<Rectangle x:Name="HighContrastBorder"
+									   Grid.ColumnSpan="3"
+									   VerticalAlignment="Stretch"
+									   x:DeferLoadStrategy="Lazy"
+									   IsHitTestVisible="False"
+									   Stroke="{ThemeResource CommandBarHighContrastBorder}"
+									   StrokeThickness="1"
+									   Visibility="Collapsed" />
+							<Border x:Name="OpenBorder"
+									Grid.ColumnSpan="3"
+									VerticalAlignment="Stretch"
+									contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}"
+									contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
+									Visibility="Collapsed" />
+						</Grid>
+						<!-- UNO WORKAROUND: Added IsTabStop="False". Navigation focus with keyboard was erroneously focusing on the Popup instead of the SecondaryCommands -->
+						<Popup x:Name="OverflowPopup">
+							<Popup.RenderTransform>
+								<TransformGroup>
+									<TranslateTransform x:Name="OverflowContentRootMarginOffsetTransform" />
+									<TranslateTransform x:Name="OverflowContentRootTransform" X="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentHorizontalOffset}" />
+								</TransformGroup>
+							</Popup.RenderTransform>
+							<Grid x:Name="OverflowContentRoot"
+								  MinWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentMinWidth}"
+								  MaxWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentMaxWidth}"
+								  MaxHeight="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentMaxHeight}"
+								  Opacity="0">
+								<Grid.RowDefinitions>
+									<RowDefinition />
+									<RowDefinition Height="Auto" />
+								</Grid.RowDefinitions>
+								<!-- For 21H1 and up, we'll need to wrap the clip and presenter in a Grid which will host the Drop Shadow. -->
+								<Grid x:Name="SecondaryItemsControlShadowWrapper"
+									  contract7NotPresent:CornerRadius="{ThemeResource OverlayCornerRadius}"
+									  contract7Present:CornerRadius="{ThemeResource OverlayCornerRadius}">
+									<Grid.Clip>
+										<RectangleGeometry Rect="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentClipRect}">
+											<RectangleGeometry.Transform>
+												<TransformGroup>
+													<TranslateTransform x:Name="OverflowContentRootClipTransform" />
+												</TransformGroup>
+											</RectangleGeometry.Transform>
+										</RectangleGeometry>
+									</Grid.Clip>
+									<CommandBarOverflowPresenter x:Name="SecondaryItemsControl"
+																 IsTabStop="False"
+																 Style="{TemplateBinding CommandBarOverflowPresenterStyle}">
+										<CommandBarOverflowPresenter.RenderTransform>
+											<TranslateTransform x:Name="OverflowContentTransform" />
+										</CommandBarOverflowPresenter.RenderTransform>
+										<CommandBarOverflowPresenter.ItemContainerStyle>
+											<Style TargetType="FrameworkElement">
+												<Setter Property="HorizontalAlignment" Value="Stretch" />
+												<Setter Property="Width" Value="NaN" />
+											</Style>
+										</CommandBarOverflowPresenter.ItemContainerStyle>
+									</CommandBarOverflowPresenter>
+								</Grid>
+
+
+								<!--
+									In order to give us extra space in the windowed popup to translate things down,
+									we add a rectangle to make the HWND taller than it otherwise would be.
+								-->
+
+
+								<Rectangle x:Name="WindowedPopupPadding"
+										   Grid.Row="1"
+										   Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.ContentHeight}" />
+							</Grid>
+						</Popup>
 						<VisualStateManager.VisualStateGroups>
 							<VisualStateGroup x:Name="CommonStates">
 								<VisualState x:Name="Normal" />
@@ -105,10 +257,10 @@
 							</VisualStateGroup>
 							<VisualStateGroup x:Name="DisplayModeStates">
 								<contract8Present:VisualStateGroup.Transitions>
-									 <!--UNO WORKAROUND: Use literal value of ControlNormalAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception--> 
-									<VisualTransition From="CompactClosed"
-													  To="CompactOpenUp"
-													  GeneratedDuration="00:00:00.250">
+									<!-- UNO WORKAROUND: Use literal value of ControlNormalAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception -->
+									<VisualTransition GeneratedDuration="00:00:00.250"
+													  From="CompactClosed"
+													  To="CompactOpenUp">
 										<Storyboard>
 											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentRoot"
 																		   Storyboard.TargetProperty="Background">
@@ -159,32 +311,32 @@
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.CompactVerticalDelta}" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentRootClipTransform"
 																		   Storyboard.TargetProperty="Y">
 												<contract8Present:DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																						 Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.NegativeCompactVerticalDelta}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentHeight}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 										</Storyboard>
 									</VisualTransition>
-									 <!--UNO WORKAROUND: Use literal value of ControlFastAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception--> 
-									<VisualTransition From="CompactOpenUp"
-													  To="CompactClosed"
-													  GeneratedDuration="00:00:00.167">
+									<!-- UNO WORKAROUND: Use literal value of ControlFastAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception -->
+									<VisualTransition GeneratedDuration="00:00:00.167"
+													  From="CompactOpenUp"
+													  To="CompactClosed">
 										<Storyboard>
 											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="MoreButton"
 																		   Storyboard.TargetProperty="VerticalAlignment">
@@ -217,32 +369,32 @@
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.CompactVerticalDelta}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentRootClipTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<contract8Present:SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																					   KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<contract8Present:SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																					   KeyTime="{StaticResource ControlFastAnimationDuration}"
 																					   Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.NegativeCompactVerticalDelta}" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentHeight}" />
 											</DoubleAnimationUsingKeyFrames>
 										</Storyboard>
 									</VisualTransition>
-									 <!--UNO WORKAROUND: Use literal value of ControlNormalAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception--> 
-									<VisualTransition From="CompactClosed"
-													  To="CompactOpenDown"
-													  GeneratedDuration="00:00:00.250">
+									<!-- UNO WORKAROUND: Use literal value of ControlNormalAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception -->
+									<VisualTransition GeneratedDuration="00:00:00.250"
+													  From="CompactClosed"
+													  To="CompactOpenDown">
 										<Storyboard>
 											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentRoot"
 																		   Storyboard.TargetProperty="Background">
@@ -279,37 +431,37 @@
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="1" />
 											</DoubleAnimationUsingKeyFrames>
-											 <!--UNO WORKAROUND: ClipGeometryTransform.Y not being set to final value of the SplineDoubleKeyFrame--> 
+											<!-- UNO WORKAROUND: ClipGeometryTransform.Y not being set to final value of the SplineDoubleKeyFrame -->
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ClipGeometryTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentRootTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{ThemeResource AppBarThemeCompactHeight}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.ContentHeight}" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.NegativeOverflowContentHeight}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 										</Storyboard>
 									</VisualTransition>
-									 <!--UNO WORKAROUND: Use literal value of ControlFastAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception--> 
-									<VisualTransition From="CompactOpenDown"
-													  To="CompactClosed"
-													  GeneratedDuration="00:00:00.167">
+									<!-- UNO WORKAROUND: Use literal value of ControlFastAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception -->
+									<VisualTransition GeneratedDuration="00:00:00.167"
+													  From="CompactOpenDown"
+													  To="CompactClosed">
 										<Storyboard>
 											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="MoreButton"
 																		   Storyboard.TargetProperty="VerticalAlignment">
@@ -328,37 +480,37 @@
 												<DiscreteDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
 																		Value="0" />
 											</DoubleAnimationUsingKeyFrames>
-											 <!--UNO WORKAROUND: ClipGeometryTransform.Y not being set to final value of the SplineDoubleKeyFrame--> 
+											<!-- UNO WORKAROUND: ClipGeometryTransform.Y not being set to final value of the SplineDoubleKeyFrame -->
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ClipGeometryTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.CompactVerticalDelta}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.CompactVerticalDelta}" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentRootTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.ContentHeight}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="{ThemeResource AppBarThemeCompactHeight}" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.NegativeOverflowContentHeight}" />
 											</DoubleAnimationUsingKeyFrames>
 										</Storyboard>
 									</VisualTransition>
-									 <!--UNO WORKAROUND: Use literal value of ControlNormalAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception--> 
-									<VisualTransition From="MinimalClosed"
-													  To="MinimalOpenUp"
-													  GeneratedDuration="00:00:00.250">
+									<!-- UNO WORKAROUND: Use literal value of ControlNormalAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception -->
+									<VisualTransition GeneratedDuration="00:00:00.250"
+													  From="MinimalClosed"
+													  To="MinimalOpenUp">
 										<Storyboard>
 											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="MoreButton"
 																		   Storyboard.TargetProperty="Padding">
@@ -404,48 +556,48 @@
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.MinimalVerticalDelta}" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ContentControl"
 																		   Storyboard.TargetProperty="Opacity">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="1" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="PrimaryItemsControl"
 																		   Storyboard.TargetProperty="Opacity">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="1" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentRootClipTransform"
 																		   Storyboard.TargetProperty="Y">
 												<contract8Present:DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																						 Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.NegativeMinimalVerticalDelta}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentHeight}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 										</Storyboard>
 									</VisualTransition>
-									 <!--UNO WORKAROUND: Use literal value of ControlFastAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception--> 
-									<VisualTransition From="MinimalOpenUp"
-													  To="MinimalClosed"
-													  GeneratedDuration="00:00:00.167">
+									<!-- UNO WORKAROUND: Use literal value of ControlFastAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception -->
+									<VisualTransition GeneratedDuration="00:00:00.167"
+													  From="MinimalOpenUp"
+													  To="MinimalClosed">
 										<Storyboard>
 											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="MoreButton"
 																		   Storyboard.TargetProperty="Padding">
@@ -493,48 +645,48 @@
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.MinimalVerticalDelta}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ContentControl"
 																		   Storyboard.TargetProperty="Opacity">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="1" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="PrimaryItemsControl"
 																		   Storyboard.TargetProperty="Opacity">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="1" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentRootClipTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<contract8Present:SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																					   KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<contract8Present:SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																					   KeyTime="{StaticResource ControlFastAnimationDuration}"
 																					   Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.NegativeMinimalVerticalDelta}" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentHeight}" />
 											</DoubleAnimationUsingKeyFrames>
 										</Storyboard>
 									</VisualTransition>
-									 <!--UNO WORKAROUND: Use literal value of ControlNormalAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception--> 
-									<VisualTransition From="MinimalClosed"
-													  To="MinimalOpenDown"
-													  GeneratedDuration="00:00:00.250">
+									<!-- UNO WORKAROUND: Use literal value of ControlNormalAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception -->
+									<VisualTransition GeneratedDuration="00:00:00.250"
+													  From="MinimalClosed"
+													  To="MinimalOpenDown">
 										<Storyboard>
 											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="MoreButton"
 																		   Storyboard.TargetProperty="Padding">
@@ -565,48 +717,48 @@
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.MinimalVerticalDelta}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ContentControl"
 																		   Storyboard.TargetProperty="Opacity">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="1" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="PrimaryItemsControl"
 																		   Storyboard.TargetProperty="Opacity">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="1" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentRootTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{ThemeResource AppBarThemeMinimalHeight}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.ContentHeight}" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.NegativeOverflowContentHeight}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 										</Storyboard>
 									</VisualTransition>
-									 <!--UNO WORKAROUND: Use literal value of ControlFastAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception--> 
-									<VisualTransition From="MinimalOpenDown"
-													  To="MinimalClosed"
-													  GeneratedDuration="00:00:00.167">
+									<!-- UNO WORKAROUND: Use literal value of ControlFastAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception -->
+									<VisualTransition GeneratedDuration="00:00:00.167"
+													  From="MinimalOpenDown"
+													  To="MinimalClosed">
 										<Storyboard>
 											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="MoreButton"
 																		   Storyboard.TargetProperty="Padding">
@@ -639,48 +791,48 @@
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.MinimalVerticalDelta}" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ContentControl"
 																		   Storyboard.TargetProperty="Opacity">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="1" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="PrimaryItemsControl"
 																		   Storyboard.TargetProperty="Opacity">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="1" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentRootTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.ContentHeight}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="{ThemeResource AppBarThemeMinimalHeight}" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.NegativeOverflowContentHeight}" />
 											</DoubleAnimationUsingKeyFrames>
 										</Storyboard>
 									</VisualTransition>
-									 <!--UNO WORKAROUND: Use literal value of ControlNormalAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception--> 
-									<VisualTransition From="HiddenClosed"
-													  To="HiddenOpenUp"
-													  GeneratedDuration="00:00:00.250">
+									<!-- UNO WORKAROUND: Use literal value of ControlNormalAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception -->
+									<VisualTransition GeneratedDuration="00:00:00.250"
+													  From="HiddenClosed"
+													  To="HiddenOpenUp">
 										<Storyboard>
 											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="MoreButton"
 																		   Storyboard.TargetProperty="VerticalAlignment">
@@ -716,32 +868,32 @@
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HiddenVerticalDelta}" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentRootClipTransform"
 																		   Storyboard.TargetProperty="Y">
 												<contract8Present:DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																						 Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.NegativeHiddenVerticalDelta}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentHeight}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 										</Storyboard>
 									</VisualTransition>
-									 <!--UNO WORKAROUND: Use literal value of ControlFastAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception--> 
-									<VisualTransition From="HiddenOpenUp"
-													  To="HiddenClosed"
-													  GeneratedDuration="00:00:00.167">
+									<!-- UNO WORKAROUND: Use literal value of ControlFastAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception -->
+									<VisualTransition GeneratedDuration="00:00:00.167"
+													  From="HiddenOpenUp"
+													  To="HiddenClosed">
 										<Storyboard>
 											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="MoreButton"
 																		   Storyboard.TargetProperty="VerticalAlignment">
@@ -779,32 +931,32 @@
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HiddenVerticalDelta}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentRootClipTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<contract8Present:SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																					   KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<contract8Present:SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																					   KeyTime="{StaticResource ControlFastAnimationDuration}"
 																					   Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.NegativeHiddenVerticalDelta}" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentHeight}" />
 											</DoubleAnimationUsingKeyFrames>
 										</Storyboard>
 									</VisualTransition>
-									 <!--UNO WORKAROUND: Use literal value of ControlNormalAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception--> 
-									<VisualTransition From="HiddenClosed"
-													  To="HiddenOpenDown"
-													  GeneratedDuration="00:00:00.250">
+									<!-- UNO WORKAROUND: Use literal value of ControlNormalAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception -->
+									<VisualTransition GeneratedDuration="00:00:00.250"
+													  From="HiddenClosed"
+													  To="HiddenOpenDown">
 										<Storyboard>
 											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="MoreButton"
 																		   Storyboard.TargetProperty="VerticalAlignment">
@@ -825,32 +977,32 @@
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HiddenVerticalDelta}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentRootTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.ContentHeight}" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.NegativeOverflowContentHeight}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 										</Storyboard>
 									</VisualTransition>
-									 <!--UNO WORKAROUND: Use literal value of ControlFastAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception--> 
-									<VisualTransition From="HiddenOpenDown"
-													  To="HiddenClosed"
-													  GeneratedDuration="00:00:00.167">
+									<!-- UNO WORKAROUND: Use literal value of ControlFastAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception -->
+									<VisualTransition GeneratedDuration="00:00:00.167"
+													  From="HiddenOpenDown"
+													  To="HiddenClosed">
 										<Storyboard>
 											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="MoreButton"
 																		   Storyboard.TargetProperty="VerticalAlignment">
@@ -873,24 +1025,24 @@
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HiddenVerticalDelta}" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentRootTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.ContentHeight}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.NegativeOverflowContentHeight}" />
 											</DoubleAnimationUsingKeyFrames>
 										</Storyboard>
@@ -1255,166 +1407,12 @@
 								<VisualState x:Name="DynamicOverflowDisabled" />
 								<VisualState x:Name="DynamicOverflowEnabled">
 									<VisualState.Setters>
-										<Setter Target="ContentControlColumnDefinition.Width"
-												Value="Auto" />
-										<Setter Target="PrimaryItemsControlColumnDefinition.Width"
-												Value="*" />
+										<Setter Target="ContentControlColumnDefinition.Width" Value="Auto" />
+										<Setter Target="PrimaryItemsControlColumnDefinition.Width" Value="*" />
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
-						<Grid.Clip>
-							<RectangleGeometry Rect="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClipRect}">
-								<RectangleGeometry.Transform>
-									<TranslateTransform x:Name="ClipGeometryTransform"
-														Y="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.CompactVerticalDelta}" />
-								</RectangleGeometry.Transform>
-							</RectangleGeometry>
-						</Grid.Clip>
-						<Grid x:Name="ContentRoot"
-							  VerticalAlignment="Top"
-							  Height="{TemplateBinding Height}"
-							  MinHeight="{ThemeResource AppBarThemeCompactHeight}"
-							  Background="{TemplateBinding Background}"
-							  XYFocusKeyboardNavigation="Enabled">
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="*" />
-								<ColumnDefinition Width="Auto"
-												  MinWidth="6" />
-							</Grid.ColumnDefinitions>
-							<Grid.RenderTransform>
-								<TranslateTransform x:Name="ContentTransform" />
-							</Grid.RenderTransform>
-							<Grid>
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition x:Name="MainCommandColumnDefinition"
-													  Width="Auto" />
-									<ColumnDefinition x:Name="ContentControlColumnDefinition"
-													  Width="*" />
-									<ColumnDefinition x:Name="PrimaryItemsControlColumnDefinition"
-													  Width="Auto" />
-								</Grid.ColumnDefinitions>
-								<ContentPresenter x:Name="MainCommandPresenter"
-                                                  Margin="{TemplateBinding Padding}"
-												  Content="{Binding Path=(utu:CommandBarExtensions.MainCommand), RelativeSource={RelativeSource TemplatedParent}}" />
-
-								
-									<!--Use a ContentControl rather than a ContentPresenter so that IsEnabled can be set to false
-									in the Minimal/HiddenClosed states to remove it from being a tab-stop candidate.-->
-								
-
-								<ContentControl x:Name="ContentControl"
-												Grid.Column="1"
-												Content="{TemplateBinding Content}"
-												ContentTemplate="{TemplateBinding ContentTemplate}"
-												ContentTransitions="{TemplateBinding ContentTransitions}"
-												Foreground="{TemplateBinding Foreground}"
-												HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-												VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-												HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-												VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-												IsTabStop="False" />
-								<ItemsControl x:Name="PrimaryItemsControl"
-											  HorizontalAlignment="Center"
-											  MinHeight="{ThemeResource AppBarThemeCompactHeight}"
-											  IsTabStop="False"
-											  Grid.Column="2">
-									<ItemsControl.ItemsPanel>
-										<ItemsPanelTemplate>
-											<StackPanel Orientation="Horizontal" />
-										</ItemsPanelTemplate>
-									</ItemsControl.ItemsPanel>
-								</ItemsControl>
-							</Grid>
-							<Button x:Name="MoreButton"
-									Foreground="{TemplateBinding Foreground}"
-									Style="{StaticResource EllipsisButton}"
-									Padding="{ThemeResource CommandBarMoreButtonMargin}"
-									MinHeight="{ThemeResource AppBarThemeCompactHeight}"
-									VerticalAlignment="Top"
-									Grid.Column="2"
-									Control.IsTemplateKeyTipTarget="True"
-									IsAccessKeyScope="True"
-									Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.EffectiveOverflowButtonVisibility}">
-								<FontIcon x:Name="EllipsisIcon"
-										  VerticalAlignment="Center"
-										  FontFamily="{ThemeResource SymbolThemeFontFamily}"
-										  FontSize="20"
-										  Glyph="&#xe712;"
-										  Height="20" />
-							</Button>
-							 <!--UNO WORKAROUND: Added IsHitTestVisible="False". The Rectangle was blocking pointer events--> 
-							<Rectangle x:Name="HighContrastBorder"
-									   x:DeferLoadStrategy="Lazy"
-									   Grid.ColumnSpan="3"
-									   Visibility="Collapsed"
-									   IsHitTestVisible="False"
-									   VerticalAlignment="Stretch"
-									   Stroke="{ThemeResource CommandBarHighContrastBorder}"
-									   StrokeThickness="1" />
-							<Border x:Name="OpenBorder"
-									Grid.ColumnSpan="3"
-									Visibility="Collapsed"
-									VerticalAlignment="Stretch"
-									contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
-									contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}" />
-						</Grid>
-						 <!--UNO WORKAROUND: Added IsTabStop="False". Navigation focus with keyboard was erroneously focusing on the Popup instead of the SecondaryCommands--> 
-						<Popup x:Name="OverflowPopup">
-							<Popup.RenderTransform>
-								<TransformGroup>
-									<TranslateTransform x:Name="OverflowContentRootMarginOffsetTransform" />
-									<TranslateTransform x:Name="OverflowContentRootTransform"
-														X="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentHorizontalOffset}" />
-								</TransformGroup>
-							</Popup.RenderTransform>
-							<Grid x:Name="OverflowContentRoot"
-								  Opacity="0"
-								  MinWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentMinWidth}"
-								  MaxWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentMaxWidth}"
-								  MaxHeight="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentMaxHeight}">
-								<Grid.RowDefinitions>
-									<RowDefinition />
-									<RowDefinition Height="Auto" />
-								</Grid.RowDefinitions>
-								 <!--For 21H1 and up, we'll need to wrap the clip and presenter in a Grid which will host the Drop Shadow.--> 
-								<Grid x:Name="SecondaryItemsControlShadowWrapper"
-									  contract7Present:CornerRadius="{ThemeResource OverlayCornerRadius}"
-									  contract7NotPresent:CornerRadius="{ThemeResource OverlayCornerRadius}">
-									<Grid.Clip>
-										<RectangleGeometry Rect="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentClipRect}">
-											<RectangleGeometry.Transform>
-												<TransformGroup>
-													<TranslateTransform x:Name="OverflowContentRootClipTransform" />
-												</TransformGroup>
-											</RectangleGeometry.Transform>
-										</RectangleGeometry>
-									</Grid.Clip>
-									<CommandBarOverflowPresenter x:Name="SecondaryItemsControl"
-																 Style="{TemplateBinding CommandBarOverflowPresenterStyle}"
-																 IsTabStop="False">
-										<CommandBarOverflowPresenter.RenderTransform>
-											<TranslateTransform x:Name="OverflowContentTransform" />
-										</CommandBarOverflowPresenter.RenderTransform>
-										<CommandBarOverflowPresenter.ItemContainerStyle>
-											<Style TargetType="FrameworkElement">
-												<Setter Property="HorizontalAlignment" Value="Stretch" />
-												<Setter Property="Width" Value="NaN" />
-											</Style>
-										</CommandBarOverflowPresenter.ItemContainerStyle>
-									</CommandBarOverflowPresenter>
-								</Grid>
-
-								
-									<!--In order to give us extra space in the windowed popup to translate things down,
-									we add a rectangle to make the HWND taller than it otherwise would be.-->
-								
-
-								<Rectangle x:Name="WindowedPopupPadding"
-										   Grid.Row="1"
-										   Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.ContentHeight}" />
-							</Grid>
-						</Popup>
 					</Grid>
 				</ControlTemplate>
 			</Setter.Value>
@@ -1422,19 +1420,14 @@
 	</Style>
 
 	<Style x:Key="DefaultNavigationBar"
-			   TargetType="utu:NavigationBar">
-		<Setter Property="Background"
-				Value="{x:Null}" />
-		<Setter Property="Foreground"
-				Value="{x:Null}" />
-		<Setter Property="HorizontalAlignment"
-				Value="Stretch" />
-		<Setter Property="VerticalAlignment"
-				Value="Top" />
-		<Setter Property="OverflowButtonVisibility"
-				Value="Collapsed" />
-		<Setter Property="IsDynamicOverflowEnabled"
-				Value="False" />
+		   TargetType="utu:NavigationBar">
+		<Setter Property="Background" Value="{x:Null}" />
+		<Setter Property="Foreground" Value="{x:Null}" />
+		<Setter Property="HorizontalAlignment" Value="Stretch" />
+		<Setter Property="VerticalAlignment" Value="Top" />
+		<Setter Property="OverflowButtonVisibility" Value="Collapsed" />
+		<Setter Property="IsDynamicOverflowEnabled" Value="False" />
+		<Setter Property="MainCommandStyle" Value="{StaticResource DefaultMainCommandStyle}" />
 		<mobile:Setter Property="utu:SafeArea.Insets"
 					   Value="Top" />
 		<mobile:Setter Property="Template"
@@ -1466,34 +1459,37 @@
 		</Setter>
 	</android:Style>
 
-	<ios:ControlTemplate x:Key="NativeNavigationBarTemplate"  TargetType="utu:NavigationBar">
+	<ios:ControlTemplate x:Key="NativeNavigationBarTemplate"
+						 TargetType="utu:NavigationBar">
 		<Border BorderThickness="{TemplateBinding Padding}">
 			<utu:NativeNavigationBarPresenter x:Name="NavigationBarPresenter"
-														  Height="44" />
-			 <!--TODO: 1px line--> 
+											  Height="44" />
+			<!-- TODO: 1px line -->
 		</Border>
 	</ios:ControlTemplate>
 
-	<android:ControlTemplate x:Key="NativeNavigationBarTemplate" TargetType="utu:NavigationBar">
+	<android:ControlTemplate x:Key="NativeNavigationBarTemplate"
+							 TargetType="utu:NavigationBar">
 		<utu:NativeNavigationBarPresenter x:Name="NavigationBarPresenter" />
 	</android:ControlTemplate>
 
-	<ControlTemplate x:Key="XamlNavigationBarTemplate" TargetType="utu:NavigationBar">
+	<ControlTemplate x:Key="XamlNavigationBarTemplate"
+					 TargetType="utu:NavigationBar">
 		<utu:NavigationBarPresenter x:Name="NavigationBarPresenter"
-									Style="{StaticResource XamlNavigationBarPresenter}"
-									Content="{TemplateBinding Content}"/>
+									Content="{TemplateBinding Content}"
+									Style="{StaticResource XamlNavigationBarPresenter}" />
 	</ControlTemplate>
 
-	 <!--Default native NavigationBar styles--> 
-	<Style TargetType="utu:NavigationBar"
-			   BasedOn="{StaticResource DefaultNavigationBar}" />
-	
-	 <!--Default native Frame styles--> 
-	<ios:Style TargetType="Frame"
-			   ios:IsNativeStyle="True"
-			   BasedOn="{StaticResource NativeDefaultToolkitFrame}" />
+	<!-- Default native NavigationBar styles -->
+	<Style BasedOn="{StaticResource DefaultNavigationBar}"
+		   TargetType="utu:NavigationBar" />
+
+	<!-- Default native Frame styles -->
+	<ios:Style ios:IsNativeStyle="True"
+			   BasedOn="{StaticResource NativeDefaultToolkitFrame}"
+			   TargetType="Frame" />
 
-	<android:Style TargetType="Frame"
-				   android:IsNativeStyle="True"
-				   BasedOn="{StaticResource NativeDefaultToolkitFrame}" />
+	<android:Style android:IsNativeStyle="True"
+				   BasedOn="{StaticResource NativeDefaultToolkitFrame}"
+				   TargetType="Frame" />
 </ResourceDictionary>
diff --git a/src/Uno.Toolkit.UI/Resources/AssetCatalog.UWP.xaml b/src/Uno.Toolkit.UI/Resources/AssetCatalog.UWP.xaml
new file mode 100644
index 000000000..0b1e70ad0
--- /dev/null
+++ b/src/Uno.Toolkit.UI/Resources/AssetCatalog.UWP.xaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+	<x:String x:Key="BackButtonUriSource">ms-appx:///Uno.Toolkit.UI/Assets/BackIcon.png</x:String>
+</ResourceDictionary>
diff --git a/src/Uno.Toolkit.UI/Resources/AssetCatalog.WinUI.xaml b/src/Uno.Toolkit.UI/Resources/AssetCatalog.WinUI.xaml
new file mode 100644
index 000000000..65e2ecb4a
--- /dev/null
+++ b/src/Uno.Toolkit.UI/Resources/AssetCatalog.WinUI.xaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+	<x:String x:Key="BackButtonUriSource">ms-appx:///Uno.Toolkit.WinUI/Assets/BackIcon.png</x:String>
+</ResourceDictionary>
diff --git a/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj b/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj
index de8e63ccf..495b7c7ca 100644
--- a/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj
+++ b/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="MSBuild.Sdk.Extras/3.0.38">
 	<!--
 	Adding project references to this project requires some manual adjustments.
@@ -48,6 +48,7 @@
 
 	<ItemGroup>
 		<UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
+		<Content Include="Assets\**\*.png" />
 	</ItemGroup>
 
 	<Import Project="xamlmerge-toolkit.props" />
diff --git a/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj b/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj
index 4dbfa96e9..4a008a990 100644
--- a/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj
+++ b/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj
@@ -36,6 +36,7 @@
 
 	<ItemGroup>
 		<UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
+		<Content Include="Assets\**\*.png" />
 	</ItemGroup>
 
 	<Import Project="..\winappsdk-workaround.targets" />
diff --git a/src/Uno.Toolkit.UI/xamlmerge-toolkit.props b/src/Uno.Toolkit.UI/xamlmerge-toolkit.props
index 433bc03fe..0eb457819 100644
--- a/src/Uno.Toolkit.UI/xamlmerge-toolkit.props
+++ b/src/Uno.Toolkit.UI/xamlmerge-toolkit.props
@@ -6,6 +6,7 @@
 	<ItemGroup>
 		<XamlMergeInput Include="Controls\**\*.xaml" />
 		<XamlMergeInput Include="Behaviors\**\*.xaml" />
+		<XamlMergeInput Include="Resources\AssetCatalog.$(FrameworkLineage).xaml" />
 	</ItemGroup>
 
 	<Import Project="..\xamlmerge.props" />
diff --git a/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-100.png b/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-100.png
new file mode 100644
index 000000000..74435a88c
Binary files /dev/null and b/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-100.png differ
diff --git a/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-150.png b/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-150.png
new file mode 100644
index 000000000..523e0b6eb
Binary files /dev/null and b/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-150.png differ
diff --git a/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-200.png b/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-200.png
new file mode 100644
index 000000000..5b6efea09
Binary files /dev/null and b/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-200.png differ
diff --git a/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-300.png b/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-300.png
new file mode 100644
index 000000000..470b9c5c5
Binary files /dev/null and b/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-300.png differ
diff --git a/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-400.png b/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-400.png
new file mode 100644
index 000000000..16ee84f80
Binary files /dev/null and b/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-400.png differ
diff --git a/src/library/Uno.Toolkit.Material/Resources/AssetCatalog.UWP.xaml b/src/library/Uno.Toolkit.Material/Resources/AssetCatalog.UWP.xaml
new file mode 100644
index 000000000..7627fda10
--- /dev/null
+++ b/src/library/Uno.Toolkit.Material/Resources/AssetCatalog.UWP.xaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+	<x:String x:Key="MaterialBackButtonUriSource">ms-appx:///Uno.Toolkit.UI.Material/Assets/MaterialBackIcon.png</x:String>
+</ResourceDictionary>
diff --git a/src/library/Uno.Toolkit.Material/Resources/AssetCatalog.WinUI.xaml b/src/library/Uno.Toolkit.Material/Resources/AssetCatalog.WinUI.xaml
new file mode 100644
index 000000000..8346fca0c
--- /dev/null
+++ b/src/library/Uno.Toolkit.Material/Resources/AssetCatalog.WinUI.xaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+	<x:String x:Key="MaterialBackButtonUriSource">ms-appx:///Uno.Toolkit.WinUI.Material/Assets/MaterialBackIcon.png</x:String>
+</ResourceDictionary>
diff --git a/src/library/Uno.Toolkit.Material/Styles/Controls/v2/NavigationBar.xaml b/src/library/Uno.Toolkit.Material/Styles/Controls/v2/NavigationBar.xaml
index c17e9064b..9d7a5495d 100644
--- a/src/library/Uno.Toolkit.Material/Styles/Controls/v2/NavigationBar.xaml
+++ b/src/library/Uno.Toolkit.Material/Styles/Controls/v2/NavigationBar.xaml
@@ -1,23 +1,23 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 					xmlns:android="http://uno.ui/android"
+					xmlns:contract12NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,12)"
+					xmlns:contract12Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,12)"
+					xmlns:contract4Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,4)"
+					xmlns:contract5NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,5)"
+					xmlns:contract6NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,6)"
+					xmlns:contract6Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,6)"
+					xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
+					xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
+					xmlns:contract8Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,8)"
 					xmlns:ios="http://uno.ui/ios"
+					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 					xmlns:mobile="http://uno.ui/mobile"
 					xmlns:not_mobile="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-					xmlns:utu="using:Uno.Toolkit.UI"
-					xmlns:toolkit="using:Uno.UI.Toolkit"
-					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 					xmlns:not_win="http://uno.ui/not_win"
+					xmlns:toolkit="using:Uno.UI.Toolkit"
 					xmlns:um="using:Uno.Material"
-					xmlns:contract4Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,4)"
-					xmlns:contract6Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,6)"
-					xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
-					xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
-					xmlns:contract8Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,8)"
-					xmlns:contract12Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,12)"
-					xmlns:contract12NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,12)"
-					xmlns:contract6NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,6)"
-					xmlns:contract5NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,5)"
+					xmlns:utu="using:Uno.Toolkit.UI"
 					mc:Ignorable="android ios not_win mobile">
 
 	<x:Double x:Key="MaterialNavigationBarElevation">4</x:Double>
@@ -28,13 +28,13 @@
 
 	<Style x:Key="BaseMaterialNavigationBarStyle"
 		   TargetType="utu:NavigationBar">
-		<!--  Setting content to empty to avoid getting the datacontext  -->
+		<!-- Setting content to empty to avoid getting the datacontext -->
 		<Setter Property="Content" Value="" />
 		<Setter Property="ContentTemplate">
 			<Setter.Value>
 				<DataTemplate>
-					<TextBlock Text="{Binding}"
-							   Style="{StaticResource TitleLarge}" />
+					<TextBlock Style="{StaticResource TitleLarge}"
+							   Text="{Binding}" />
 				</DataTemplate>
 			</Setter.Value>
 		</Setter>
@@ -61,9 +61,13 @@
 
 	<!--#region Default Material NavigationBar-->
 	<Style x:Key="MaterialMainCommandStyle"
-		   TargetType="AppBarButton"
-		   BasedOn="{StaticResource MaterialAppBarButtonStyle}">
-		<Setter Property="Foreground" Value="{ThemeResource OnSurfaceBrush}" />
+		   BasedOn="{StaticResource MaterialAppBarButtonStyle}"
+		   TargetType="AppBarButton">
+		<not_mobile:Setter Property="Icon">
+			<not_mobile:Setter.Value>
+				<BitmapIcon UriSource="{StaticResource MaterialBackButtonUriSource}" />
+			</not_mobile:Setter.Value>
+		</not_mobile:Setter>
 	</Style>
 
 	<Style x:Key="MaterialNavigationBarStyle"
@@ -72,7 +76,6 @@
 		<Setter Property="Background" Value="{ThemeResource SurfaceBrush}" />
 		<Setter Property="Foreground" Value="{ThemeResource OnSurfaceBrush}" />
 		<Setter Property="MainCommandStyle" Value="{StaticResource MaterialMainCommandStyle}" />
-
 	</Style>
 
 	<Style x:Key="MaterialNavigationBarPresenter"
@@ -115,8 +118,8 @@
 								<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity">
 									<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 															Value="0" />
-									<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-														  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+									<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+														  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 														  Value="1" />
 								</DoubleAnimationUsingKeyFrames>
 							</Storyboard>
@@ -124,22 +127,176 @@
 								<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity">
 									<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 															Value="1" />
-									<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-														  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+									<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+														  KeyTime="{StaticResource ControlFastAnimationDuration}"
 														  Value="0" />
 								</DoubleAnimationUsingKeyFrames>
 							</Storyboard>
 							<x:Double x:Key="MaterialAppBarButtonContentHeight">24</x:Double>
 							<x:Double x:Key="AppBarThemeCompactHeight">56</x:Double>
-							<Style TargetType="SplitButton"
-								   BasedOn="{StaticResource SplitButtonCommandBarStyle}" />
-							<Style TargetType="ToggleSplitButton"
-								   BasedOn="{StaticResource SplitButtonCommandBarStyle}" />
-							<Style TargetType="AppBarButton"
-								   BasedOn="{StaticResource MaterialAppBarButtonStyle}">
+							<Style BasedOn="{StaticResource SplitButtonCommandBarStyle}"
+								   TargetType="SplitButton" />
+							<Style BasedOn="{StaticResource SplitButtonCommandBarStyle}"
+								   TargetType="ToggleSplitButton" />
+							<Style BasedOn="{StaticResource MaterialAppBarButtonStyle}"
+								   TargetType="AppBarButton">
 								<Setter Property="Padding" Value="12,16,12,16" />
 							</Style>
 						</Grid.Resources>
+						<Grid x:Name="ContentRoot"
+							  Height="{TemplateBinding Height}"
+							  MinHeight="{ThemeResource AppBarThemeCompactHeight}"
+							  VerticalAlignment="Center"
+							  Background="{TemplateBinding Background}"
+							  XYFocusKeyboardNavigation="Enabled">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="*" />
+								<ColumnDefinition Width="Auto"
+												  MinWidth="6" />
+							</Grid.ColumnDefinitions>
+							<Grid.RenderTransform>
+								<TranslateTransform x:Name="ContentTransform" />
+							</Grid.RenderTransform>
+							<Grid>
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition x:Name="MainCommandColumnDefinition"
+													  Width="Auto" />
+									<ColumnDefinition x:Name="ContentControlColumnDefinition"
+													  Width="*" />
+									<ColumnDefinition x:Name="PrimaryItemsControlColumnDefinition"
+													  Width="Auto" />
+								</Grid.ColumnDefinitions>
+								<ContentPresenter x:Name="MainCommandPresenter"
+												  Margin="{TemplateBinding Padding}"
+												  Content="{Binding Path=(utu:CommandBarExtensions.MainCommand), RelativeSource={RelativeSource TemplatedParent}}">
+									<ContentPresenter.Resources>
+										<x:Double x:Key="MaterialAppBarButtonContentHeight">16</x:Double>
+									</ContentPresenter.Resources>
+								</ContentPresenter>
+
+								<!--
+									Use a ContentControl rather than a ContentPresenter so that IsEnabled can be set to false
+									in the Minimal/HiddenClosed states to remove it from being a tab-stop candidate.
+								-->
+
+								<ContentControl x:Name="ContentControl"
+												Grid.Column="1"
+												Margin="{StaticResource MaterialNavigationBarContentMargin}"
+												HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+												VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+												HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+												VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+												Content="{TemplateBinding Content}"
+												ContentTemplate="{TemplateBinding ContentTemplate}"
+												ContentTransitions="{TemplateBinding ContentTransitions}"
+												FontFamily="{ThemeResource MaterialRegularFontFamily}"
+												FontSize="{ThemeResource TitleLargeFontSize}"
+												FontWeight="{ThemeResource TitleLargeFontWeight}"
+												Foreground="{TemplateBinding Foreground}"
+												IsTabStop="False" />
+								<ItemsControl x:Name="PrimaryItemsControl"
+											  Grid.Column="2"
+											  MinHeight="{ThemeResource AppBarThemeCompactHeight}"
+											  HorizontalAlignment="Center"
+											  IsTabStop="False">
+									<ItemsControl.ItemsPanel>
+										<ItemsPanelTemplate>
+											<StackPanel Orientation="Horizontal" />
+										</ItemsPanelTemplate>
+									</ItemsControl.ItemsPanel>
+								</ItemsControl>
+							</Grid>
+							<Button x:Name="MoreButton"
+									Grid.Column="2"
+									MinHeight="{ThemeResource AppBarThemeCompactHeight}"
+									Padding="{ThemeResource CommandBarMoreButtonMargin}"
+									VerticalAlignment="Top"
+									Control.IsTemplateKeyTipTarget="True"
+									Foreground="{TemplateBinding Foreground}"
+									IsAccessKeyScope="True"
+									Style="{StaticResource MaterialEllipsisButton}">
+								<FontIcon x:Name="EllipsisIcon"
+										  Height="20"
+										  VerticalAlignment="Center"
+										  FontFamily="{ThemeResource SymbolThemeFontFamily}"
+										  FontSize="20"
+										  Glyph="&#xe712;"
+										  RenderTransformOrigin="0.5, 0.5">
+									<FontIcon.RenderTransform>
+										<RotateTransform Angle="90" />
+									</FontIcon.RenderTransform>
+								</FontIcon>
+							</Button>
+							<!-- UNO WORKAROUND: Added IsHitTestVisible="False". The Rectangle was blocking pointer events -->
+							<Rectangle x:Name="HighContrastBorder"
+									   Grid.ColumnSpan="3"
+									   VerticalAlignment="Stretch"
+									   x:DeferLoadStrategy="Lazy"
+									   IsHitTestVisible="False"
+									   StrokeThickness="1"
+									   Visibility="Collapsed" />
+							<Border x:Name="OpenBorder"
+									Grid.ColumnSpan="3"
+									VerticalAlignment="Stretch"
+									contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}"
+									contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
+									Visibility="Collapsed" />
+						</Grid>
+						<!-- UNO WORKAROUND: Added IsTabStop="False". Navigation focus with keyboard was erroneously focusing on the Popup instead of the SecondaryCommands -->
+						<Popup x:Name="OverflowPopup">
+							<Popup.RenderTransform>
+								<TransformGroup>
+									<TranslateTransform x:Name="OverflowContentRootMarginOffsetTransform" />
+									<TranslateTransform x:Name="OverflowContentRootTransform" X="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentHorizontalOffset}" />
+								</TransformGroup>
+							</Popup.RenderTransform>
+							<Grid x:Name="OverflowContentRoot"
+								  MinWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentMinWidth}"
+								  MaxWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentMaxWidth}"
+								  MaxHeight="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentMaxHeight}"
+								  Opacity="0">
+								<Grid.RowDefinitions>
+									<RowDefinition />
+									<RowDefinition Height="Auto" />
+								</Grid.RowDefinitions>
+								<!-- For 21H1 and up, we'll need to wrap the clip and presenter in a Grid which will host the Drop Shadow. -->
+								<Grid x:Name="SecondaryItemsControlShadowWrapper"
+									  contract7NotPresent:CornerRadius="{ThemeResource OverlayCornerRadius}"
+									  contract7Present:CornerRadius="{ThemeResource OverlayCornerRadius}">
+									<Grid.Clip>
+										<RectangleGeometry Rect="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentClipRect}">
+											<RectangleGeometry.Transform>
+												<TransformGroup>
+													<TranslateTransform x:Name="OverflowContentRootClipTransform" />
+												</TransformGroup>
+											</RectangleGeometry.Transform>
+										</RectangleGeometry>
+									</Grid.Clip>
+									<CommandBarOverflowPresenter x:Name="SecondaryItemsControl"
+																 IsTabStop="False"
+																 Style="{TemplateBinding CommandBarOverflowPresenterStyle}">
+										<CommandBarOverflowPresenter.RenderTransform>
+											<TranslateTransform x:Name="OverflowContentTransform" />
+										</CommandBarOverflowPresenter.RenderTransform>
+										<CommandBarOverflowPresenter.ItemContainerStyle>
+											<Style TargetType="FrameworkElement">
+												<Setter Property="HorizontalAlignment" Value="Stretch" />
+												<Setter Property="Width" Value="NaN" />
+											</Style>
+										</CommandBarOverflowPresenter.ItemContainerStyle>
+									</CommandBarOverflowPresenter>
+								</Grid>
+
+								<!--
+									In order to give us extra space in the windowed popup to translate things down,
+									we add a rectangle to make the HWND taller than it otherwise would be.
+								-->
+
+								<Rectangle x:Name="WindowedPopupPadding"
+										   Grid.Row="1"
+										   Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.ContentHeight}" />
+							</Grid>
+						</Popup>
 						<VisualStateManager.VisualStateGroups>
 							<VisualStateGroup x:Name="CommonStates">
 								<VisualState x:Name="Normal" />
@@ -155,10 +312,10 @@
 							</VisualStateGroup>
 							<VisualStateGroup x:Name="DisplayModeStates">
 								<contract8Present:VisualStateGroup.Transitions>
-									<!--  UNO WORKAROUND: Use literal value of ControlNormalAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception  -->
-									<VisualTransition From="CompactClosed"
-													  To="CompactOpenDown"
-													  GeneratedDuration="00:00:00.250">
+									<!-- UNO WORKAROUND: Use literal value of ControlNormalAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception -->
+									<VisualTransition GeneratedDuration="00:00:00.250"
+													  From="CompactClosed"
+													  To="CompactOpenDown">
 										<Storyboard>
 											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="OpenBorder"
 																		   Storyboard.TargetProperty="Visibility">
@@ -184,24 +341,24 @@
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{ThemeResource AppBarThemeCompactHeight}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.ContentHeight}" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.NegativeOverflowContentHeight}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 										</Storyboard>
 									</VisualTransition>
-									<!--  UNO WORKAROUND: Use literal value of ControlFastAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception  -->
-									<VisualTransition From="CompactOpenDown"
-													  To="CompactClosed"
-													  GeneratedDuration="00:00:00.167">
+									<!-- UNO WORKAROUND: Use literal value of ControlFastAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception -->
+									<VisualTransition GeneratedDuration="00:00:00.167"
+													  From="CompactOpenDown"
+													  To="CompactClosed">
 										<Storyboard>
 											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="MoreButton"
 																		   Storyboard.TargetProperty="VerticalAlignment">
@@ -224,16 +381,16 @@
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.ContentHeight}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="{ThemeResource AppBarThemeCompactHeight}" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.NegativeOverflowContentHeight}" />
 											</DoubleAnimationUsingKeyFrames>
 										</Storyboard>
@@ -340,10 +497,115 @@
 								</VisualState>
 							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<!--#endregion-->
+
+	<!--#region Default Modal Material NavigationBar-->
+	<Style x:Key="MaterialModalNavigationBarStyle"
+		   BasedOn="{StaticResource MaterialNavigationBarStyle}"
+		   TargetType="utu:NavigationBar">
+		<Setter Property="MainCommandStyle" Value="{StaticResource MaterialModalMainCommandStyle}" />
+		<Setter Property="Background" Value="{ThemeResource SurfaceBrush}" />
+		<Setter Property="Foreground" Value="{ThemeResource OnSurfaceBrush}" />
+	</Style>
+
+	<Style x:Key="MaterialModalMainCommandStyle"
+		   BasedOn="{StaticResource MaterialMainCommandStyle}"
+		   TargetType="AppBarButton">
+		<Setter Property="Foreground" Value="{ThemeResource OnSurfaceBrush}" />
+	</Style>
+	<!--#endregion-->
+
+	<!--#region Primary Material NavigationBar-->
+	<Style x:Key="MaterialPrimaryMainCommandStyle"
+		   BasedOn="{StaticResource MaterialMainCommandStyle}"
+		   TargetType="AppBarButton">
+		<Setter Property="Foreground" Value="{ThemeResource OnPrimaryBrush}" />
+	</Style>
+
+	<Style x:Key="MaterialPrimaryNavigationBarStyle"
+		   BasedOn="{StaticResource MaterialNavigationBarStyle}"
+		   TargetType="utu:NavigationBar">
+		<Setter Property="Background" Value="{ThemeResource PrimaryBrush}" />
+		<Setter Property="Foreground" Value="{ThemeResource OnPrimaryBrush}" />
+		<Setter Property="MainCommandStyle" Value="{StaticResource MaterialPrimaryMainCommandStyle}" />
+		<not_mobile:Setter Property="Template"
+						   Value="{StaticResource XamlMaterialPrimaryNavigationBarTemplate}" />
+	</Style>
+
+	<Style x:Key="MaterialPrimaryNavigationBarPresenter"
+		   TargetType="utu:NavigationBarPresenter">
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="utu:NavigationBarPresenter">
+					<CommandBar x:Name="XamlNavigationBarCommandBar"
+								Content="{TemplateBinding Content}"
+								Style="{StaticResource MaterialPrimaryNavigationBarCommandBar}" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style x:Key="MaterialPrimaryNavigationBarCommandBar"
+		   TargetType="CommandBar">
+		<Setter Property="Background" Value="{ThemeResource PrimaryBrush}" />
+		<Setter Property="Foreground" Value="{ThemeResource OnPrimaryBrush}" />
+		<Setter Property="Padding" Value="4,0,0,0" />
+		<Setter Property="IsTabStop" Value="False" />
+		<Setter Property="VerticalAlignment" Value="Top" />
+		<Setter Property="HorizontalAlignment" Value="Stretch" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Top" />
+		<Setter Property="ClosedDisplayMode" Value="Compact" />
+		<Setter Property="ExitDisplayModeOnAccessKeyInvoked" Value="False" />
+		<not_win:Setter Property="CornerRadius"
+						Value="{ThemeResource ControlCornerRadius}" />
+
+		<Setter Property="utu:CommandBarExtensions.MainCommand" Value="{x:Null}" />
+
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="CommandBar">
+					<Grid x:Name="LayoutRoot">
+						<Grid.Resources>
+							<Visibility x:Key="AppBarButtonHasFlyoutChevronVisibility">Collapsed</Visibility>
+							<Storyboard x:Key="OverlayOpeningAnimation">
+								<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity">
+									<DiscreteDoubleKeyFrame KeyTime="0:0:0"
+															Value="0" />
+									<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+														  KeyTime="{StaticResource ControlNormalAnimationDuration}"
+														  Value="1" />
+								</DoubleAnimationUsingKeyFrames>
+							</Storyboard>
+							<Storyboard x:Key="OverlayClosingAnimation">
+								<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity">
+									<DiscreteDoubleKeyFrame KeyTime="0:0:0"
+															Value="1" />
+									<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+														  KeyTime="{StaticResource ControlFastAnimationDuration}"
+														  Value="0" />
+								</DoubleAnimationUsingKeyFrames>
+							</Storyboard>
+							<x:Double x:Key="MaterialAppBarButtonContentHeight">24</x:Double>
+							<x:Double x:Key="AppBarThemeCompactHeight">56</x:Double>
+							<Style BasedOn="{StaticResource SplitButtonCommandBarStyle}"
+								   TargetType="SplitButton" />
+							<Style BasedOn="{StaticResource SplitButtonCommandBarStyle}"
+								   TargetType="ToggleSplitButton" />
+							<Style BasedOn="{StaticResource MaterialPrimaryAppBarButtonStyle}"
+								   TargetType="AppBarButton">
+								<Setter Property="Padding" Value="12,16,12,16" />
+							</Style>
+						</Grid.Resources>
 						<Grid x:Name="ContentRoot"
-							  VerticalAlignment="Center"
 							  Height="{TemplateBinding Height}"
 							  MinHeight="{ThemeResource AppBarThemeCompactHeight}"
+							  VerticalAlignment="Center"
 							  Background="{TemplateBinding Background}"
 							  XYFocusKeyboardNavigation="Enabled">
 							<Grid.ColumnDefinitions>
@@ -379,23 +641,23 @@
 								<ContentControl x:Name="ContentControl"
 												Grid.Column="1"
 												Margin="{StaticResource MaterialNavigationBarContentMargin}"
+												HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+												VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+												HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+												VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
 												Content="{TemplateBinding Content}"
 												ContentTemplate="{TemplateBinding ContentTemplate}"
 												ContentTransitions="{TemplateBinding ContentTransitions}"
-												Foreground="{TemplateBinding Foreground}"
 												FontFamily="{ThemeResource MaterialRegularFontFamily}"
 												FontSize="{ThemeResource TitleLargeFontSize}"
 												FontWeight="{ThemeResource TitleLargeFontWeight}"
-												HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-												VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-												HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-												VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+												Foreground="{TemplateBinding Foreground}"
 												IsTabStop="False" />
 								<ItemsControl x:Name="PrimaryItemsControl"
-											  HorizontalAlignment="Center"
+											  Grid.Column="2"
 											  MinHeight="{ThemeResource AppBarThemeCompactHeight}"
-											  IsTabStop="False"
-											  Grid.Column="2">
+											  HorizontalAlignment="Center"
+											  IsTabStop="False">
 									<ItemsControl.ItemsPanel>
 										<ItemsPanelTemplate>
 											<StackPanel Orientation="Horizontal" />
@@ -404,42 +666,42 @@
 								</ItemsControl>
 							</Grid>
 							<Button x:Name="MoreButton"
-									Foreground="{TemplateBinding Foreground}"
-									Style="{StaticResource MaterialEllipsisButton}"
-									Padding="{ThemeResource CommandBarMoreButtonMargin}"
+									Grid.Column="2"
 									MinHeight="{ThemeResource AppBarThemeCompactHeight}"
+									Padding="{ThemeResource CommandBarMoreButtonMargin}"
 									VerticalAlignment="Top"
-									Grid.Column="2"
 									Control.IsTemplateKeyTipTarget="True"
-									IsAccessKeyScope="True">
+									Foreground="{TemplateBinding Foreground}"
+									IsAccessKeyScope="True"
+									Style="{StaticResource MaterialEllipsisButton}">
 								<FontIcon x:Name="EllipsisIcon"
+										  Height="20"
 										  VerticalAlignment="Center"
 										  FontFamily="{ThemeResource SymbolThemeFontFamily}"
 										  FontSize="20"
 										  Glyph="&#xe712;"
-										  Height="20"
 										  RenderTransformOrigin="0.5, 0.5">
 									<FontIcon.RenderTransform>
 										<RotateTransform Angle="90" />
 									</FontIcon.RenderTransform>
 								</FontIcon>
 							</Button>
-							<!--  UNO WORKAROUND: Added IsHitTestVisible="False". The Rectangle was blocking pointer events  -->
+							<!-- UNO WORKAROUND: Added IsHitTestVisible="False". The Rectangle was blocking pointer events -->
 							<Rectangle x:Name="HighContrastBorder"
-									   x:DeferLoadStrategy="Lazy"
 									   Grid.ColumnSpan="3"
-									   Visibility="Collapsed"
-									   IsHitTestVisible="False"
 									   VerticalAlignment="Stretch"
-									   StrokeThickness="1" />
+									   x:DeferLoadStrategy="Lazy"
+									   IsHitTestVisible="False"
+									   StrokeThickness="1"
+									   Visibility="Collapsed" />
 							<Border x:Name="OpenBorder"
 									Grid.ColumnSpan="3"
-									Visibility="Collapsed"
 									VerticalAlignment="Stretch"
+									contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}"
 									contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
-									contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}" />
+									Visibility="Collapsed" />
 						</Grid>
-						<!--  UNO WORKAROUND: Added IsTabStop="False". Navigation focus with keyboard was erroneously focusing on the Popup instead of the SecondaryCommands  -->
+						<!-- UNO WORKAROUND: Added IsTabStop="False". Navigation focus with keyboard was erroneously focusing on the Popup instead of the SecondaryCommands -->
 						<Popup x:Name="OverflowPopup">
 							<Popup.RenderTransform>
 								<TransformGroup>
@@ -448,18 +710,18 @@
 								</TransformGroup>
 							</Popup.RenderTransform>
 							<Grid x:Name="OverflowContentRoot"
-								  Opacity="0"
 								  MinWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentMinWidth}"
 								  MaxWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentMaxWidth}"
-								  MaxHeight="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentMaxHeight}">
+								  MaxHeight="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentMaxHeight}"
+								  Opacity="0">
 								<Grid.RowDefinitions>
 									<RowDefinition />
 									<RowDefinition Height="Auto" />
 								</Grid.RowDefinitions>
-								<!--  For 21H1 and up, we'll need to wrap the clip and presenter in a Grid which will host the Drop Shadow.  -->
+								<!-- For 21H1 and up, we'll need to wrap the clip and presenter in a Grid which will host the Drop Shadow. -->
 								<Grid x:Name="SecondaryItemsControlShadowWrapper"
-									  contract7Present:CornerRadius="{ThemeResource OverlayCornerRadius}"
-									  contract7NotPresent:CornerRadius="{ThemeResource OverlayCornerRadius}">
+									  contract7NotPresent:CornerRadius="{ThemeResource OverlayCornerRadius}"
+									  contract7Present:CornerRadius="{ThemeResource OverlayCornerRadius}">
 									<Grid.Clip>
 										<RectangleGeometry Rect="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentClipRect}">
 											<RectangleGeometry.Transform>
@@ -470,8 +732,8 @@
 										</RectangleGeometry>
 									</Grid.Clip>
 									<CommandBarOverflowPresenter x:Name="SecondaryItemsControl"
-																 Style="{TemplateBinding CommandBarOverflowPresenterStyle}"
-																 IsTabStop="False">
+																 IsTabStop="False"
+																 Style="{TemplateBinding CommandBarOverflowPresenterStyle}">
 										<CommandBarOverflowPresenter.RenderTransform>
 											<TranslateTransform x:Name="OverflowContentTransform" />
 										</CommandBarOverflowPresenter.RenderTransform>
@@ -494,111 +756,6 @@
 										   Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.ContentHeight}" />
 							</Grid>
 						</Popup>
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<!--#endregion-->
-
-	<!--#region Default Modal Material NavigationBar-->
-	<Style x:Key="MaterialModalNavigationBarStyle"
-		   BasedOn="{StaticResource MaterialNavigationBarStyle}"
-		   TargetType="utu:NavigationBar">
-		<Setter Property="MainCommandStyle" Value="{StaticResource MaterialModalMainCommandStyle}" />
-		<Setter Property="Background" Value="{ThemeResource SurfaceBrush}" />
-		<Setter Property="Foreground" Value="{ThemeResource OnSurfaceBrush}" />
-	</Style>
-
-	<Style x:Key="MaterialModalMainCommandStyle"
-		   TargetType="AppBarButton"
-		   BasedOn="{StaticResource MaterialMainCommandStyle}">
-		<Setter Property="Foreground" Value="{ThemeResource OnSurfaceBrush}" />
-	</Style>
-	<!--#endregion-->
-
-	<!--#region Primary Material NavigationBar-->
-	<Style x:Key="MaterialPrimaryMainCommandStyle"
-		   TargetType="AppBarButton"
-		   BasedOn="{StaticResource MaterialMainCommandStyle}">
-		<Setter Property="Foreground" Value="{ThemeResource OnPrimaryBrush}" />
-	</Style>
-
-	<Style x:Key="MaterialPrimaryNavigationBarStyle"
-		   BasedOn="{StaticResource MaterialNavigationBarStyle}"
-		   TargetType="utu:NavigationBar">
-		<Setter Property="Background" Value="{ThemeResource PrimaryBrush}" />
-		<Setter Property="Foreground" Value="{ThemeResource OnPrimaryBrush}" />
-		<Setter Property="MainCommandStyle" Value="{StaticResource MaterialPrimaryMainCommandStyle}" />
-		<not_mobile:Setter Property="Template"
-						   Value="{StaticResource XamlMaterialPrimaryNavigationBarTemplate}" />
-	</Style>
-
-	<Style x:Key="MaterialPrimaryNavigationBarPresenter"
-		   TargetType="utu:NavigationBarPresenter">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="utu:NavigationBarPresenter">
-					<CommandBar x:Name="XamlNavigationBarCommandBar"
-								Content="{TemplateBinding Content}"
-								Style="{StaticResource MaterialPrimaryNavigationBarCommandBar}" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
-	<Style x:Key="MaterialPrimaryNavigationBarCommandBar"
-		   TargetType="CommandBar">
-		<Setter Property="Background" Value="{ThemeResource PrimaryBrush}" />
-		<Setter Property="Foreground" Value="{ThemeResource OnPrimaryBrush}" />
-		<Setter Property="Padding" Value="4,0,0,0" />
-		<Setter Property="IsTabStop" Value="False" />
-		<Setter Property="VerticalAlignment" Value="Top" />
-		<Setter Property="HorizontalAlignment" Value="Stretch" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Top" />
-		<Setter Property="ClosedDisplayMode" Value="Compact" />
-		<Setter Property="ExitDisplayModeOnAccessKeyInvoked" Value="False" />
-		<not_win:Setter Property="CornerRadius"
-						Value="{ThemeResource ControlCornerRadius}" />
-
-		<Setter Property="utu:CommandBarExtensions.MainCommand" Value="{x:Null}" />
-
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="CommandBar">
-					<Grid x:Name="LayoutRoot">
-						<Grid.Resources>
-							<Visibility x:Key="AppBarButtonHasFlyoutChevronVisibility">Collapsed</Visibility>
-							<Storyboard x:Key="OverlayOpeningAnimation">
-								<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity">
-									<DiscreteDoubleKeyFrame KeyTime="0:0:0"
-															Value="0" />
-									<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-														  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-														  Value="1" />
-								</DoubleAnimationUsingKeyFrames>
-							</Storyboard>
-							<Storyboard x:Key="OverlayClosingAnimation">
-								<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity">
-									<DiscreteDoubleKeyFrame KeyTime="0:0:0"
-															Value="1" />
-									<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-														  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-														  Value="0" />
-								</DoubleAnimationUsingKeyFrames>
-							</Storyboard>
-							<x:Double x:Key="MaterialAppBarButtonContentHeight">24</x:Double>
-							<x:Double x:Key="AppBarThemeCompactHeight">56</x:Double>
-							<Style TargetType="SplitButton"
-								   BasedOn="{StaticResource SplitButtonCommandBarStyle}" />
-							<Style TargetType="ToggleSplitButton"
-								   BasedOn="{StaticResource SplitButtonCommandBarStyle}" />
-							<Style TargetType="AppBarButton"
-								   BasedOn="{StaticResource MaterialPrimaryAppBarButtonStyle}">
-								<Setter Property="Padding" Value="12,16,12,16" />
-							</Style>
-						</Grid.Resources>
 						<VisualStateManager.VisualStateGroups>
 							<VisualStateGroup x:Name="CommonStates">
 								<VisualState x:Name="Normal" />
@@ -614,10 +771,10 @@
 							</VisualStateGroup>
 							<VisualStateGroup x:Name="DisplayModeStates">
 								<contract8Present:VisualStateGroup.Transitions>
-									<!--  UNO WORKAROUND: Use literal value of ControlNormalAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception  -->
-									<VisualTransition From="CompactClosed"
-													  To="CompactOpenDown"
-													  GeneratedDuration="00:00:00.250">
+									<!-- UNO WORKAROUND: Use literal value of ControlNormalAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception -->
+									<VisualTransition GeneratedDuration="00:00:00.250"
+													  From="CompactClosed"
+													  To="CompactOpenDown">
 										<Storyboard>
 											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="OpenBorder"
 																		   Storyboard.TargetProperty="Visibility">
@@ -643,24 +800,24 @@
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{ThemeResource AppBarThemeCompactHeight}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.ContentHeight}" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.NegativeOverflowContentHeight}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlNormalAnimationDuration}"
 																	  Value="0" />
 											</DoubleAnimationUsingKeyFrames>
 										</Storyboard>
 									</VisualTransition>
-									<!--  UNO WORKAROUND: Use literal value of ControlFastAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception  -->
-									<VisualTransition From="CompactOpenDown"
-													  To="CompactClosed"
-													  GeneratedDuration="00:00:00.167">
+									<!-- UNO WORKAROUND: Use literal value of ControlFastAnimationDuration. Resolving a StaticResource string to a string non-DP causes an exception -->
+									<VisualTransition GeneratedDuration="00:00:00.167"
+													  From="CompactOpenDown"
+													  To="CompactClosed">
 										<Storyboard>
 											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="MoreButton"
 																		   Storyboard.TargetProperty="VerticalAlignment">
@@ -683,16 +840,16 @@
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.ContentHeight}" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="{ThemeResource AppBarThemeCompactHeight}" />
 											</DoubleAnimationUsingKeyFrames>
 											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OverflowContentTransform"
 																		   Storyboard.TargetProperty="Y">
 												<DiscreteDoubleKeyFrame KeyTime="0:0:0"
 																		Value="0" />
-												<SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}"
-																	  KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+												<SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+																	  KeyTime="{StaticResource ControlFastAnimationDuration}"
 																	  Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.NegativeOverflowContentHeight}" />
 											</DoubleAnimationUsingKeyFrames>
 										</Storyboard>
@@ -799,160 +956,6 @@
 								</VisualState>
 							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
-						<Grid x:Name="ContentRoot"
-							  VerticalAlignment="Center"
-							  Height="{TemplateBinding Height}"
-							  MinHeight="{ThemeResource AppBarThemeCompactHeight}"
-							  Background="{TemplateBinding Background}"
-							  XYFocusKeyboardNavigation="Enabled">
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="*" />
-								<ColumnDefinition Width="Auto"
-												  MinWidth="6" />
-							</Grid.ColumnDefinitions>
-							<Grid.RenderTransform>
-								<TranslateTransform x:Name="ContentTransform" />
-							</Grid.RenderTransform>
-							<Grid>
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition x:Name="MainCommandColumnDefinition"
-													  Width="Auto" />
-									<ColumnDefinition x:Name="ContentControlColumnDefinition"
-													  Width="*" />
-									<ColumnDefinition x:Name="PrimaryItemsControlColumnDefinition"
-													  Width="Auto" />
-								</Grid.ColumnDefinitions>
-								<ContentPresenter x:Name="MainCommandPresenter"
-												  Margin="{TemplateBinding Padding}"
-												  Content="{Binding Path=(utu:CommandBarExtensions.MainCommand), RelativeSource={RelativeSource TemplatedParent}}">
-									<ContentPresenter.Resources>
-										<x:Double x:Key="MaterialAppBarButtonContentHeight">16</x:Double>
-									</ContentPresenter.Resources>
-								</ContentPresenter>
-
-								<!--
-									Use a ContentControl rather than a ContentPresenter so that IsEnabled can be set to false
-									in the Minimal/HiddenClosed states to remove it from being a tab-stop candidate.
-								-->
-
-								<ContentControl x:Name="ContentControl"
-												Grid.Column="1"
-												Margin="{StaticResource MaterialNavigationBarContentMargin}"
-												Content="{TemplateBinding Content}"
-												ContentTemplate="{TemplateBinding ContentTemplate}"
-												ContentTransitions="{TemplateBinding ContentTransitions}"
-												Foreground="{TemplateBinding Foreground}"
-												FontFamily="{ThemeResource MaterialRegularFontFamily}"
-												FontSize="{ThemeResource TitleLargeFontSize}"
-												FontWeight="{ThemeResource TitleLargeFontWeight}"
-												HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-												VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-												HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-												VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-												IsTabStop="False" />
-								<ItemsControl x:Name="PrimaryItemsControl"
-											  HorizontalAlignment="Center"
-											  MinHeight="{ThemeResource AppBarThemeCompactHeight}"
-											  IsTabStop="False"
-											  Grid.Column="2">
-									<ItemsControl.ItemsPanel>
-										<ItemsPanelTemplate>
-											<StackPanel Orientation="Horizontal" />
-										</ItemsPanelTemplate>
-									</ItemsControl.ItemsPanel>
-								</ItemsControl>
-							</Grid>
-							<Button x:Name="MoreButton"
-									Foreground="{TemplateBinding Foreground}"
-									Style="{StaticResource MaterialEllipsisButton}"
-									Padding="{ThemeResource CommandBarMoreButtonMargin}"
-									MinHeight="{ThemeResource AppBarThemeCompactHeight}"
-									VerticalAlignment="Top"
-									Grid.Column="2"
-									Control.IsTemplateKeyTipTarget="True"
-									IsAccessKeyScope="True">
-								<FontIcon x:Name="EllipsisIcon"
-										  VerticalAlignment="Center"
-										  FontFamily="{ThemeResource SymbolThemeFontFamily}"
-										  FontSize="20"
-										  Glyph="&#xe712;"
-										  Height="20"
-										  RenderTransformOrigin="0.5, 0.5">
-									<FontIcon.RenderTransform>
-										<RotateTransform Angle="90" />
-									</FontIcon.RenderTransform>
-								</FontIcon>
-							</Button>
-							<!--  UNO WORKAROUND: Added IsHitTestVisible="False". The Rectangle was blocking pointer events  -->
-							<Rectangle x:Name="HighContrastBorder"
-									   x:DeferLoadStrategy="Lazy"
-									   Grid.ColumnSpan="3"
-									   Visibility="Collapsed"
-									   IsHitTestVisible="False"
-									   VerticalAlignment="Stretch"
-									   StrokeThickness="1" />
-							<Border x:Name="OpenBorder"
-									Grid.ColumnSpan="3"
-									Visibility="Collapsed"
-									VerticalAlignment="Stretch"
-									contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
-									contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}" />
-						</Grid>
-						<!--  UNO WORKAROUND: Added IsTabStop="False". Navigation focus with keyboard was erroneously focusing on the Popup instead of the SecondaryCommands  -->
-						<Popup x:Name="OverflowPopup">
-							<Popup.RenderTransform>
-								<TransformGroup>
-									<TranslateTransform x:Name="OverflowContentRootMarginOffsetTransform" />
-									<TranslateTransform x:Name="OverflowContentRootTransform" X="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentHorizontalOffset}" />
-								</TransformGroup>
-							</Popup.RenderTransform>
-							<Grid x:Name="OverflowContentRoot"
-								  Opacity="0"
-								  MinWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentMinWidth}"
-								  MaxWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentMaxWidth}"
-								  MaxHeight="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentMaxHeight}">
-								<Grid.RowDefinitions>
-									<RowDefinition />
-									<RowDefinition Height="Auto" />
-								</Grid.RowDefinitions>
-								<!--  For 21H1 and up, we'll need to wrap the clip and presenter in a Grid which will host the Drop Shadow.  -->
-								<Grid x:Name="SecondaryItemsControlShadowWrapper"
-									  contract7Present:CornerRadius="{ThemeResource OverlayCornerRadius}"
-									  contract7NotPresent:CornerRadius="{ThemeResource OverlayCornerRadius}">
-									<Grid.Clip>
-										<RectangleGeometry Rect="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.OverflowContentClipRect}">
-											<RectangleGeometry.Transform>
-												<TransformGroup>
-													<TranslateTransform x:Name="OverflowContentRootClipTransform" />
-												</TransformGroup>
-											</RectangleGeometry.Transform>
-										</RectangleGeometry>
-									</Grid.Clip>
-									<CommandBarOverflowPresenter x:Name="SecondaryItemsControl"
-																 Style="{TemplateBinding CommandBarOverflowPresenterStyle}"
-																 IsTabStop="False">
-										<CommandBarOverflowPresenter.RenderTransform>
-											<TranslateTransform x:Name="OverflowContentTransform" />
-										</CommandBarOverflowPresenter.RenderTransform>
-										<CommandBarOverflowPresenter.ItemContainerStyle>
-											<Style TargetType="FrameworkElement">
-												<Setter Property="HorizontalAlignment" Value="Stretch" />
-												<Setter Property="Width" Value="NaN" />
-											</Style>
-										</CommandBarOverflowPresenter.ItemContainerStyle>
-									</CommandBarOverflowPresenter>
-								</Grid>
-
-								<!--
-									In order to give us extra space in the windowed popup to translate things down,
-									we add a rectangle to make the HWND taller than it otherwise would be.
-								-->
-
-								<Rectangle x:Name="WindowedPopupPadding"
-										   Grid.Row="1"
-										   Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.ContentHeight}" />
-							</Grid>
-						</Popup>
 					</Grid>
 				</ControlTemplate>
 			</Setter.Value>
@@ -970,16 +973,16 @@
 	</Style>
 
 	<Style x:Key="MaterialPrimaryModalMainCommandStyle"
-		   TargetType="AppBarButton"
-		   BasedOn="{StaticResource MaterialPrimaryMainCommandStyle}">
+		   BasedOn="{StaticResource MaterialPrimaryMainCommandStyle}"
+		   TargetType="AppBarButton">
 		<Setter Property="Foreground" Value="{ThemeResource OnPrimaryBrush}" />
 	</Style>
 	<!--#endregion-->
 
 	<!--#region NavigationBar Buttons-->
 	<Style x:Key="MaterialAppBarButtonOverflowStyle"
-		   TargetType="AppBarButton"
-		   BasedOn="{StaticResource AppBarButtonOverflowStyle}">
+		   BasedOn="{StaticResource AppBarButtonOverflowStyle}"
+		   TargetType="AppBarButton">
 		<Setter Property="Background" Value="Transparent" />
 		<Setter Property="Foreground" Value="{ThemeResource OnSurfaceBrush}" />
 	</Style>
@@ -1008,18 +1011,18 @@
 						<um:Ripple Feedback="{TemplateBinding Foreground}"
 								   FeedbackOpacity="{StaticResource PressedOpacity}">
 							<ContentPresenter x:Name="ContentPresenter"
-											  Background="{TemplateBinding Background}"
-											  BorderBrush="{TemplateBinding BorderBrush}"
-											  BorderThickness="{TemplateBinding BorderThickness}"
-											  contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
-											  ContentTransitions="{TemplateBinding ContentTransitions}"
-											  ContentTemplate="{TemplateBinding ContentTemplate}"
-											  Content="{TemplateBinding Content}"
 											  Margin="{StaticResource MaterialAppBarEllipsisButtonInnerBorderMargin}"
 											  Padding="0"
 											  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
 											  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+											  contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
 											  AutomationProperties.AccessibilityView="Raw"
+											  Background="{TemplateBinding Background}"
+											  BorderBrush="{TemplateBinding BorderBrush}"
+											  BorderThickness="{TemplateBinding BorderThickness}"
+											  Content="{TemplateBinding Content}"
+											  ContentTemplate="{TemplateBinding ContentTemplate}"
+											  ContentTransitions="{TemplateBinding ContentTransitions}"
 											  Control.IsTemplateFocusTarget="True" />
 						</um:Ripple>
 
@@ -1031,8 +1034,8 @@
 	</Style>
 
 	<Style x:Key="MaterialPrimaryAppBarButtonStyle"
-		   TargetType="AppBarButton"
-		   BasedOn="{StaticResource MaterialAppBarButtonStyle}">
+		   BasedOn="{StaticResource MaterialAppBarButtonStyle}"
+		   TargetType="AppBarButton">
 		<Setter Property="Foreground" Value="{ThemeResource OnPrimaryBrush}" />
 	</Style>
 
@@ -1042,8 +1045,8 @@
 	<ios:ControlTemplate x:Key="MaterialNativeNavigationBarTemplate"
 						 TargetType="utu:NavigationBar">
 		<Border BorderThickness="{TemplateBinding Padding}">
-			<utu:NativeNavigationBarPresenter Height="44"
-											  x:Name="NavigationBarPresenter" />
+			<utu:NativeNavigationBarPresenter x:Name="NavigationBarPresenter"
+											  Height="44" />
 		</Border>
 	</ios:ControlTemplate>
 
@@ -1054,15 +1057,15 @@
 
 	<ControlTemplate x:Key="XamlMaterialNavigationBarTemplate"
 					 TargetType="utu:NavigationBar">
-		<utu:NavigationBarPresenter Style="{StaticResource MaterialNavigationBarPresenter}"
+		<utu:NavigationBarPresenter x:Name="NavigationBarPresenter"
 									Content="{TemplateBinding Content}"
-									x:Name="NavigationBarPresenter" />
+									Style="{StaticResource MaterialNavigationBarPresenter}" />
 	</ControlTemplate>
 
 	<ControlTemplate x:Key="XamlMaterialPrimaryNavigationBarTemplate"
 					 TargetType="utu:NavigationBar">
-		<utu:NavigationBarPresenter Style="{StaticResource MaterialPrimaryNavigationBarPresenter}"
+		<utu:NavigationBarPresenter x:Name="NavigationBarPresenter"
 									Content="{TemplateBinding Content}"
-									x:Name="NavigationBarPresenter" />
+									Style="{StaticResource MaterialPrimaryNavigationBarPresenter}" />
 	</ControlTemplate>
 </ResourceDictionary>
diff --git a/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj b/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj
index 77d6dc5dc..d700b94c3 100644
--- a/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj
+++ b/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj
@@ -19,7 +19,6 @@
 
 		<UnoXamlResourcesTrimming Condition="'$(OS)'=='Windows_NT' or '$(MSBuildRuntimeType)'=='Core'">true</UnoXamlResourcesTrimming>
 	</PropertyGroup>
-
 	<ItemGroup>
 		<PackageReference Include="Uno.Material" />
 		<PackageReference Include="Uno.UI" />
@@ -31,6 +30,7 @@
 
 	<ItemGroup>
 		<UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
+		<Content Include="Assets\**\*.png" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$(IsXamarinIOS) or $(IsMonoAndroid) or $(IsXamarinMac)">
diff --git a/src/library/Uno.Toolkit.Material/Uno.Toolkit.WinUI.Material.csproj b/src/library/Uno.Toolkit.Material/Uno.Toolkit.WinUI.Material.csproj
index 5424001ec..03ef28520 100644
--- a/src/library/Uno.Toolkit.Material/Uno.Toolkit.WinUI.Material.csproj
+++ b/src/library/Uno.Toolkit.Material/Uno.Toolkit.WinUI.Material.csproj
@@ -18,7 +18,10 @@
 		<FrameworkLineage>WinUI</FrameworkLineage>
 		<UnoXamlResourcesTrimming Condition="'$(OS)'=='Windows_NT' or '$(MSBuildRuntimeType)'=='Core'">true</UnoXamlResourcesTrimming>
 	</PropertyGroup>
-
+	<ItemGroup>
+		<ExcludeXamlNamespaces Include="uwp_navbar" />
+		<IncludeXamlNamespaces Include="winui_navbar" />
+	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Uno.Material.WinUI" />
 		<PackageReference Include="Uno.WinUI" />
@@ -40,6 +43,7 @@
 		
 	<ItemGroup>
 		<UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
+		<Content Include="Assets\**\*.png" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Uno.Toolkit.UI\Uno.Toolkit.WinUI.csproj" />
diff --git a/src/library/Uno.Toolkit.Material/xamlmerge-material.props b/src/library/Uno.Toolkit.Material/xamlmerge-material.props
index d76a314e1..280f4fbb6 100644
--- a/src/library/Uno.Toolkit.Material/xamlmerge-material.props
+++ b/src/library/Uno.Toolkit.Material/xamlmerge-material.props
@@ -6,6 +6,7 @@
 
 		<XamlMergeInput Include="Styles\Controls\v1\**\*.xaml" MergeFile="mergedpages.$(FrameworkLineage).v1.xaml" />
 		<XamlMergeInput Include="Styles\Controls\v2\**\*.xaml" MergeFile="mergedpages.$(FrameworkLineage).v2.xaml" />
+		<XamlMergeInput Include="Resources\AssetCatalog.$(FrameworkLineage).xaml" MergeFile="mergedpages.$(FrameworkLineage).v2.xaml" />
 	</ItemGroup>
 	<Import Project="..\..\xamlmerge.props" />
 </Project>