diff --git a/src/Wpf.Ui.Demo/Views/Windows/ExperimentalWindow.xaml b/src/Wpf.Ui.Demo/Views/Windows/ExperimentalWindow.xaml
index f8b8688ca..65cfe0489 100644
--- a/src/Wpf.Ui.Demo/Views/Windows/ExperimentalWindow.xaml
+++ b/src/Wpf.Ui.Demo/Views/Windows/ExperimentalWindow.xaml
@@ -24,18 +24,20 @@
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
 
-        <ui:NavigationCompact
+        <ui:NavigationFluent
             x:Name="RootNavigation"
             Grid.Column="0"
             Frame="{Binding ElementName=RootFrame}"
+            IsExpandButtonVisible="True"
+            IsExpanded="False"
             Precache="True">
-            <ui:NavigationCompact.Footer>
+            <ui:NavigationFluent.Footer>
                 <ui:NavigationItem
                     Click="NavigationButtonTheme_OnClick"
                     Content="Theme"
                     Icon="DarkTheme24" />
-            </ui:NavigationCompact.Footer>
-        </ui:NavigationCompact>
+            </ui:NavigationFluent.Footer>
+        </ui:NavigationFluent>
 
         <ui:TitleBar
             Title="WPF UI - Experimental Page"
diff --git a/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml b/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml
index 19b3063ce..3e7b72c4d 100644
--- a/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml
+++ b/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml
@@ -3,14 +3,13 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:Wpf.Ui.Demo.Views.Windows"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:pages="clr-namespace:Wpf.Ui.Demo.Views.Pages"
     xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+    xmlns:viewModels="clr-namespace:Wpf.Ui.Demo.ViewModels"
     Title="WPF UI - MS Store Window"
     Width="1200"
     Height="654"
-    d:DataContext="{d:DesignInstance local:TaskManagerWindow,
+    d:DataContext="{d:DesignInstance viewModels:TaskManagerViewModel,
                                      IsDesignTimeCreatable=True}"
     d:DesignHeight="650"
     d:DesignWidth="900"
@@ -21,50 +20,24 @@
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
-
-        <ui:NavigationCompact
-            x:Name="RootNavigation"
-            Grid.Column="0"
-            Footer="{Binding ViewModel.NavigationFooter, Mode=OneWay}"
-            Frame="{Binding ElementName=RootFrame, Mode=OneWay}"
-            Items="{Binding ViewModel.NavigationItems, Mode=OneWay}" />
+        <ui:NavigationView
+            FrameBorderMargin="0, 46, 0, 0"
+            FramePadding="20, 0"
+            IsBackButtonVisible="True"
+            IsBreadcrumbVisible="True">
+            <ui:NavigationView.Navigation>
+                <ui:NavigationFluent
+                    Grid.Column="0"
+                    Footer="{Binding NavigationFooter, Mode=OneTime}"
+                    IsExpandButtonVisible="True"
+                    IsExpanded="False"
+                    Items="{Binding NavigationItems, Mode=OneTime}" />
+            </ui:NavigationView.Navigation>
+        </ui:NavigationView>
 
         <ui:TitleBar
             Title="WPF UI - Compact navigation"
-            Grid.Row="0"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
             Margin="42,0,0,0"
             Icon="pack://application:,,,/Resources/wpfui.png" />
-
-        <Grid Grid.Column="1">
-            <Border
-                Margin="0,46,0,0"
-                Background="{DynamicResource ControlFillColorDefaultBrush}"
-                CornerRadius="8,0,0,0">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*" />
-                    </Grid.RowDefinitions>
-                    <ui:Breadcrumb
-                        Grid.Row="0"
-                        Margin="38"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        FontSize="26"
-                        FontWeight="Bold"
-                        Navigation="{Binding ElementName=RootNavigation, Mode=OneWay}" />
-                    <Frame
-                        x:Name="RootFrame"
-                        Grid.Row="1"
-                        Margin="38,0" />
-                </Grid>
-            </Border>
-        </Grid>
     </Grid>
 </ui:UiWindow>
diff --git a/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml.cs b/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml.cs
index 0a1df2013..ffa70d476 100644
--- a/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml.cs
+++ b/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml.cs
@@ -12,15 +12,9 @@ namespace Wpf.Ui.Demo.Views.Windows;
 /// </summary>
 public partial class TaskManagerWindow
 {
-    public TaskManagerViewModel ViewModel
-    {
-        get;
-    }
-
     public TaskManagerWindow(TaskManagerViewModel viewModel)
     {
-        ViewModel = viewModel;
-        DataContext = this;
+        DataContext = viewModel;
 
         InitializeComponent();
     }
diff --git a/src/Wpf.Ui/Controls/NavigationCompact.cs b/src/Wpf.Ui/Controls/NavigationCompact.cs
deleted file mode 100644
index e81ea10c1..000000000
--- a/src/Wpf.Ui/Controls/NavigationCompact.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
-// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
-// All Rights Reserved.
-
-using System;
-using System.ComponentModel;
-using System.Drawing;
-using System.Windows;
-
-namespace Wpf.Ui.Controls;
-
-/// <summary>
-/// Modern navigation styled similar to the Task Manager in Windows 11.
-/// </summary>
-[ToolboxItem(true)]
-[ToolboxBitmap(typeof(NavigationCompact), "NavigationCompact.bmp")]
-public class NavigationCompact : Wpf.Ui.Controls.Navigation.NavigationBase
-{
-    /// <summary>
-    /// Property for <see cref="IsExpanded"/>.
-    /// </summary>
-    public static readonly DependencyProperty IsExpandedProperty = DependencyProperty.Register(
-        nameof(IsExpanded),
-        typeof(bool), typeof(NavigationCompact),
-        new PropertyMetadata(false));
-
-    /// <summary>
-    /// Property for <see cref="TemplateButtonCommand"/>.
-    /// </summary>
-    public static readonly DependencyProperty TemplateButtonCommandProperty =
-        DependencyProperty.Register(nameof(TemplateButtonCommand),
-            typeof(Common.IRelayCommand), typeof(NavigationCompact), new PropertyMetadata(null));
-
-    /// <summary>
-    /// Gets or sets a value indicating whether the menu is expanded.
-    /// </summary>
-    public bool IsExpanded
-    {
-        get => (bool)GetValue(IsExpandedProperty);
-        set => SetValue(IsExpandedProperty, value);
-    }
-
-    /// <summary>
-    /// Command triggered after clicking the button.
-    /// </summary>
-    public Common.IRelayCommand TemplateButtonCommand => (Common.IRelayCommand)GetValue(TemplateButtonCommandProperty);
-
-    /// <summary>
-    /// Creates new instance and sets default <see cref="TemplateButtonCommandProperty"/>.
-    /// </summary>
-    public NavigationCompact() : base() =>
-        SetValue(TemplateButtonCommandProperty, new Common.RelayCommand(o => Button_OnClick(this, o)));
-
-    private void Button_OnClick(object sender, object parameter)
-    {
-        if (parameter == null)
-            return;
-
-        string param = parameter as string ?? String.Empty;
-
-#if DEBUG
-        System.Diagnostics.Debug.WriteLine($"INFO: {typeof(NavigationCompact)} button clicked with param: {param}", "Wpf.Ui.NavigationCompact");
-#endif
-        if (param == "hamburger")
-            IsExpanded = !IsExpanded;
-    }
-}
diff --git a/src/Wpf.Ui/Controls/NavigationFluent.bmp b/src/Wpf.Ui/Controls/NavigationFluent.bmp
deleted file mode 100644
index 930c735ad..000000000
Binary files a/src/Wpf.Ui/Controls/NavigationFluent.bmp and /dev/null differ
diff --git a/src/Wpf.Ui/Controls/NavigationFluent.cs b/src/Wpf.Ui/Controls/NavigationFluent.cs
index eb7c88a87..44d9364dc 100644
--- a/src/Wpf.Ui/Controls/NavigationFluent.cs
+++ b/src/Wpf.Ui/Controls/NavigationFluent.cs
@@ -3,8 +3,10 @@
 // Copyright (C) Leszek Pomianowski and WPF UI Contributors.
 // All Rights Reserved.
 
+using System;
 using System.ComponentModel;
 using System.Drawing;
+using System.Windows;
 
 namespace Wpf.Ui.Controls;
 
@@ -15,5 +17,69 @@ namespace Wpf.Ui.Controls;
 [ToolboxBitmap(typeof(NavigationFluent), "NavigationFluent.bmp")]
 public class NavigationFluent : Wpf.Ui.Controls.Navigation.NavigationBase
 {
-    // XAML
+    /// <summary>
+    /// Property for <see cref="IsExpanded"/>.
+    /// </summary>
+    public static readonly DependencyProperty IsExpandedProperty = DependencyProperty.Register(
+        nameof(IsExpanded),
+        typeof(bool), typeof(NavigationFluent),
+        new PropertyMetadata(true));
+
+    /// <summary>
+    /// Property for <see cref="IsExpandButtonVisible"/>.
+    /// </summary>
+    public static readonly DependencyProperty IsExpandButtonVisibleProperty = DependencyProperty.Register(
+        nameof(IsExpandButtonVisible),
+        typeof(bool), typeof(NavigationFluent),
+        new PropertyMetadata(false));
+
+    /// <summary>
+    /// Property for <see cref="TemplateButtonCommand"/>.
+    /// </summary>
+    public static readonly DependencyProperty TemplateButtonCommandProperty =
+        DependencyProperty.Register(nameof(TemplateButtonCommand),
+            typeof(Common.IRelayCommand), typeof(NavigationFluent), new PropertyMetadata(null));
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the menu is expanded.
+    /// </summary>
+    public bool IsExpanded
+    {
+        get => (bool)GetValue(IsExpandedProperty);
+        set => SetValue(IsExpandedProperty, value);
+    }
+
+    /// <summary>
+    /// TODO
+    /// </summary>
+    public bool IsExpandButtonVisible
+    {
+        get => (bool)GetValue(IsExpandButtonVisibleProperty);
+        set => SetValue(IsExpandButtonVisibleProperty, value);
+    }
+
+    /// <summary>
+    /// Command triggered after clicking the button.
+    /// </summary>
+    public Common.IRelayCommand TemplateButtonCommand => (Common.IRelayCommand)GetValue(TemplateButtonCommandProperty);
+
+    /// <summary>
+    /// Creates new instance and sets default <see cref="TemplateButtonCommandProperty"/>.
+    /// </summary>
+    public NavigationFluent() : base() =>
+        SetValue(TemplateButtonCommandProperty, new Common.RelayCommand(o => Button_OnClick(this, o)));
+
+    private void Button_OnClick(object sender, object parameter)
+    {
+        if (parameter == null)
+            return;
+
+        string param = parameter as string ?? String.Empty;
+
+#if DEBUG
+        System.Diagnostics.Debug.WriteLine($"INFO: {typeof(NavigationFluent)} button clicked with param: {param}", "Wpf.Ui.NavigationFluent");
+#endif
+        if (param == "hamburger")
+            IsExpanded = !IsExpanded;
+    }
 }
diff --git a/src/Wpf.Ui/Controls/NavigationView.cs b/src/Wpf.Ui/Controls/NavigationView.cs
index 855dddee4..3cc508e5b 100644
--- a/src/Wpf.Ui/Controls/NavigationView.cs
+++ b/src/Wpf.Ui/Controls/NavigationView.cs
@@ -3,68 +3,114 @@
 // Copyright (C) Leszek Pomianowski and WPF UI Contributors.
 // All Rights Reserved.
 
+#nullable enable
 using System.Windows;
 using System.Windows.Controls;
-using Wpf.Ui.Common;
 using Wpf.Ui.Controls.Interfaces;
+using Wpf.Ui.Controls.Navigation;
 
 namespace Wpf.Ui.Controls;
 
 /// <summary>
 /// Ready navigation that includes a <see cref="INavigation"/> control, <see cref="System.Windows.Controls.Frame"/> and <see cref="Wpf.Ui.Controls.Breadcrumb"/>.
 /// </summary>
-[TemplatePart(Name = "PART_Navigation", Type = typeof(Wpf.Ui.Controls.Navigation.NavigationBase))]
-[TemplatePart(Name = "PART_Breadcrumb", Type = typeof(Wpf.Ui.Controls.Breadcrumb))]
-[TemplatePart(Name = "PART_Frame", Type = typeof(System.Windows.Controls.Frame))]
+[TemplatePart(Name = "PART_BackButton", Type = typeof(NavigationBackButton))]
+[TemplatePart(Name = "PART_Breadcrumb", Type = typeof(Breadcrumb))]
+[TemplatePart(Name = "PART_Frame", Type = typeof(Frame))]
 public class NavigationView : System.Windows.Controls.Control
 {
-    /// <summary>
-    /// Template element represented by the <c>PART_Popup</c> name.
-    /// </summary>
-    private const string ElementNavigation = "PART_Navigation";
+    public static readonly DependencyProperty NavigationProperty = DependencyProperty.Register(nameof(Navigation),
+        typeof(INavigation), typeof(NavigationView),
+        new PropertyMetadata(null));
 
-    /// <summary>
-    /// Template element represented by the <c>PART_Popup</c> name.
-    /// </summary>
-    private const string ElementBreadcrumb = "PART_Breadcrumb";
+    public static readonly DependencyProperty BreadcrumbMarginProperty = DependencyProperty.Register(nameof(BreadcrumbMargin),
+        typeof(Thickness), typeof(NavigationView),
+        new PropertyMetadata(new Thickness(18, 18, 18, 18)));
 
-    /// <summary>
-    /// Template element represented by the <c>PART_Popup</c> name.
-    /// </summary>
-    private const string ElementFrame = "PART_Frame";
+    public static readonly DependencyProperty FrameBorderMarginProperty = DependencyProperty.Register(nameof(FrameBorderMargin),
+        typeof(Thickness), typeof(NavigationView),
+        new PropertyMetadata(new Thickness(0, 0, 0, 0)));
 
-    public static readonly DependencyProperty TypeProperty = DependencyProperty.Register(nameof(Type),
-        typeof(NavigationType), typeof(NavigationView),
-        new PropertyMetadata(NavigationType.Compact));
+    public static readonly DependencyProperty FramePaddingProperty = DependencyProperty.Register(nameof(FramePadding),
+        typeof(Thickness), typeof(NavigationView),
+        new PropertyMetadata(new Thickness(0, 0, 0, 0)));
 
-    /// <summary>
-    /// Navigation control.
-    /// </summary>
-    public INavigation Navigation { get; protected set; }
+    public static readonly DependencyProperty IsBackButtonVisibleProperty = DependencyProperty.Register(nameof(IsBackButtonVisible),
+        typeof(bool), typeof(NavigationView),
+        new PropertyMetadata(false));
+
+    public static readonly DependencyProperty IsBreadcrumbVisibleProperty = DependencyProperty.Register(nameof(IsBreadcrumbVisible),
+        typeof(bool), typeof(NavigationView),
+        new PropertyMetadata(false));
+
+    public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(nameof(Content),
+        typeof(object), typeof(NavigationView),
+        new PropertyMetadata(null));
+
+    public INavigation Navigation
+    {
+        get => (INavigation)GetValue(NavigationProperty);
+        set => SetValue(NavigationProperty, value);
+    }
+
+    public Thickness BreadcrumbMargin
+    {
+        get => (Thickness)GetValue(BreadcrumbMarginProperty);
+        set => SetValue(BreadcrumbMarginProperty, value);
+    }
+
+    public Thickness FrameBorderMargin
+    {
+        get => (Thickness)GetValue(FrameBorderMarginProperty);
+        set => SetValue(FrameBorderMarginProperty, value);
+    }
+
+    public Thickness FramePadding
+    {
+        get => (Thickness)GetValue(FramePaddingProperty);
+        set => SetValue(FramePaddingProperty, value);
+    }
+
+    public bool IsBackButtonVisible
+    {
+        get => (bool)GetValue(IsBackButtonVisibleProperty);
+        set => SetValue(IsBackButtonVisibleProperty, value);
+    }
+
+    public bool IsBreadcrumbVisible
+    {
+        get => (bool)GetValue(IsBreadcrumbVisibleProperty);
+        set => SetValue(IsBreadcrumbVisibleProperty, value);
+    }
+
+    public object? Content
+    {
+        get => GetValue(ContentProperty);
+        set => SetValue(ContentProperty, value);
+    }
 
     /// <summary>
-    /// Navigation breadcrumb.
+    /// Back button
     /// </summary>
-    public Breadcrumb Breadcrumb { get; protected set; }
+    public NavigationBackButton BackButton { get; private set; } = null!;
 
     /// <summary>
     /// Navigation frame
     /// </summary>
-    public Frame Frame { get; protected set; }
+    public Frame Frame { get; protected set; } = null!;
 
-    public NavigationType Type
-    {
-        get => (NavigationType)GetValue(TypeProperty);
-        set => SetValue(TypeProperty, value);
-    }
+    /// <summary>
+    /// Breadcrumb
+    /// </summary>
+    public Breadcrumb Breadcrumb { get; private set; } = null!;
 
-    /// <inheritdoc />
     public override void OnApplyTemplate()
     {
         base.OnApplyTemplate();
+        BackButton = (NavigationBackButton)GetTemplateChild("PART_BackButton")!;
+        Frame = (Frame)GetTemplateChild("PART_Frame")!;
+        Breadcrumb = (Breadcrumb)GetTemplateChild("PART_Breadcrumb")!;
 
-        Navigation = GetTemplateChild(ElementNavigation) as INavigation;
-        Breadcrumb = GetTemplateChild(ElementBreadcrumb) as Breadcrumb;
-        Frame = GetTemplateChild(ElementFrame) as Frame;
+        Navigation.Frame = Frame;
     }
 }
diff --git a/src/Wpf.Ui/Styles/Controls/NavigationCompact.xaml b/src/Wpf.Ui/Styles/Controls/NavigationCompact.xaml
deleted file mode 100644
index 9f25a1c0e..000000000
--- a/src/Wpf.Ui/Styles/Controls/NavigationCompact.xaml
+++ /dev/null
@@ -1,408 +0,0 @@
-<!--
-    This Source Code Form is subject to the terms of the MIT License.
-    If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
-    Copyright (C) Leszek Pomianowski and WPF UI Contributors.
-    All Rights Reserved.
--->
-
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:navigation="clr-namespace:Wpf.Ui.Controls.Navigation">
-
-    <Style x:Key="HamburgerButton" TargetType="{x:Type controls:Button}">
-        <Setter Property="Foreground">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorSecondary}" />
-            </Setter.Value>
-        </Setter>
-        <Setter Property="IconForeground">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorSecondary}" />
-            </Setter.Value>
-        </Setter>
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
-        <Setter Property="Margin" Value="0,0,0,4" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="IconFilled" Value="False" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="Width" Value="40" />
-        <Setter Property="Height" Value="38" />
-        <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
-        <Setter Property="Focusable" Value="True" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:Button}">
-                    <Border
-                        x:Name="MainBorder"
-                        Margin="0"
-                        Padding="0"
-                        HorizontalAlignment="Stretch"
-                        Background="Transparent"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="1"
-                        CornerRadius="4">
-                        <controls:SymbolIcon
-                            x:Name="ElementIcon"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Filled="{TemplateBinding IconFilled}"
-                            FontSize="18"
-                            Foreground="{TemplateBinding IconForeground}"
-                            RenderTransformOrigin="0.5, 0.5"
-                            Symbol="LineHorizontal320">
-                            <controls:SymbolIcon.RenderTransform>
-                                <ScaleTransform x:Name="IconScaleTransform" ScaleX="1.0" ScaleY="1.0" />
-                            </controls:SymbolIcon.RenderTransform>
-                        </controls:SymbolIcon>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="MainBorder" Property="Background">
-                                <Setter.Value>
-                                    <SolidColorBrush Opacity="0.5" Color="{DynamicResource ControlFillColorDefault}" />
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
-                        <EventTrigger RoutedEvent="Button.PreviewMouseLeftButtonDown">
-                            <BeginStoryboard>
-                                <Storyboard>
-                                    <DoubleAnimation
-                                        Storyboard.TargetName="IconScaleTransform"
-                                        Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
-                                        From="1.0"
-                                        To="0.6"
-                                        Duration="0:0:0.08" />
-                                </Storyboard>
-                            </BeginStoryboard>
-                        </EventTrigger>
-                        <EventTrigger RoutedEvent="Button.PreviewMouseLeftButtonUp">
-                            <BeginStoryboard>
-                                <Storyboard>
-                                    <DoubleAnimation
-                                        Storyboard.TargetName="IconScaleTransform"
-                                        Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
-                                        From="0.6"
-                                        To="1.0"
-                                        Duration="0:0:0.08" />
-                                </Storyboard>
-                            </BeginStoryboard>
-                        </EventTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="NavigationCompactHeader" TargetType="{x:Type navigation:NavigationHeader}">
-        <Setter Property="Foreground">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorTertiary}" />
-            </Setter.Value>
-        </Setter>
-        <Setter Property="IconForeground">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorTertiary}" />
-            </Setter.Value>
-        </Setter>
-        <Setter Property="FontSize" Value="12" />
-        <Setter Property="IconSize" Value="10" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Margin" Value="20,4,4,4" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type navigation:NavigationHeader}">
-                    <Grid
-                        Margin="{TemplateBinding Margin}"
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-                        <controls:SymbolIcon
-                            x:Name="SymbolIcon"
-                            Grid.Column="0"
-                            Margin="0,0,4,0"
-                            VerticalAlignment="Center"
-                            Filled="{TemplateBinding IconFilled}"
-                            FontSize="{TemplateBinding IconSize}"
-                            Foreground="{TemplateBinding IconForeground}"
-                            Symbol="{TemplateBinding Icon}" />
-                        <TextBlock
-                            Grid.Column="1"
-                            FontSize="{TemplateBinding FontSize}"
-                            Foreground="{TemplateBinding Foreground}"
-                            Text="{TemplateBinding Text}" />
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="Icon" Value="Empty">
-                            <Setter TargetName="SymbolIcon" Property="Margin" Value="0" />
-                            <Setter TargetName="SymbolIcon" Property="Visibility" Value="Collapsed" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="NavigationCompactItem" TargetType="{x:Type controls:NavigationItem}">
-        <Setter Property="Height" Value="40" />
-        <Setter Property="Margin" Value="0,0,0,4" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="IconSize" Value="18" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="Background">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}" />
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Foreground">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
-            </Setter.Value>
-        </Setter>
-        <Setter Property="IconForeground">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
-            </Setter.Value>
-        </Setter>
-        <Setter Property="BorderBrush">
-            <Setter.Value>
-                <SolidColorBrush Opacity="0.0" Color="{DynamicResource ControlStrokeColorDefault}" />
-            </Setter.Value>
-        </Setter>
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
-        <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
-        <Setter Property="Focusable" Value="True" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:NavigationItem}">
-                    <Border
-                        x:Name="MainBorder"
-                        Margin="0"
-                        Padding="0"
-                        Background="Transparent"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="1"
-                        CornerRadius="4">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="40" />
-                                <ColumnDefinition Width="*" MinWidth="180" />
-                            </Grid.ColumnDefinitions>
-
-                            <Grid Grid.Column="0">
-                                <controls:SymbolIcon
-                                    x:Name="ElementIcon"
-                                    Margin="-1,0,0,0"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Filled="{TemplateBinding IconFilled}"
-                                    FontSize="{TemplateBinding IconSize}"
-                                    Foreground="{TemplateBinding IconForeground}"
-                                    Symbol="{TemplateBinding Icon}" />
-
-                                <Image
-                                    x:Name="ElementImage"
-                                    Width="18"
-                                    Margin="-1,0,0,0"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    RenderOptions.BitmapScalingMode="HighQuality"
-                                    Source="{TemplateBinding Image}" />
-                            </Grid>
-
-                            <Rectangle
-                                x:Name="ActiveRectangle"
-                                Grid.Column="0"
-                                Width="3"
-                                Height="16"
-                                Margin="0"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Opacity="0.0"
-                                RadiusX="2"
-                                RadiusY="2">
-                                <Rectangle.Fill>
-                                    <SolidColorBrush Color="{DynamicResource SystemAccentColorSecondary}" />
-                                </Rectangle.Fill>
-                            </Rectangle>
-
-                            <Grid
-                                x:Name="ContentGrid"
-                                Grid.Column="1"
-                                VerticalAlignment="Center">
-
-                                <ContentPresenter
-                                    x:Name="ElementContentPresenter"
-                                    HorizontalAlignment="Left"
-                                    Content="{TemplateBinding Content}"
-                                    TextElement.FontSize="14"
-                                    TextElement.Foreground="{TemplateBinding Foreground}" />
-                            </Grid>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsActive" Value="True">
-                            <Setter TargetName="ActiveRectangle" Property="Opacity" Value="1.0" />
-                            <Setter TargetName="MainBorder" Property="Background">
-                                <Setter.Value>
-                                    <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}" />
-                                </Setter.Value>
-                            </Setter>
-                            <!--<Setter TargetName="ElementIcon" Property="Filled" Value="True" /> -->
-                            <!--<Setter TargetName="ElementIcon" Property="Foreground" Value="{DynamicResource SystemAccentBrush}" />-->
-                        </Trigger>
-                        <Trigger Property="Icon" Value="Empty">
-                            <Setter TargetName="ElementIcon" Property="Visibility" Value="Collapsed" />
-                        </Trigger>
-                        <Trigger Property="Image" Value="{x:Null}">
-                            <Setter TargetName="ElementImage" Property="Visibility" Value="Collapsed" />
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="MainBorder" Property="Background">
-                                <Setter.Value>
-                                    <SolidColorBrush Opacity="0.5" Color="{DynamicResource ControlFillColorDefault}" />
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                                <Condition Property="IsActive" Value="False" />
-                            </MultiTrigger.Conditions>
-                            <MultiTrigger.Setters>
-                                <Setter TargetName="ElementIcon" Property="Foreground">
-                                    <Setter.Value>
-                                        <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
-                                    </Setter.Value>
-                                </Setter>
-                                <Setter TargetName="ElementContentPresenter" Property="TextElement.Foreground">
-                                    <Setter.Value>
-                                        <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
-                                    </Setter.Value>
-                                </Setter>
-                            </MultiTrigger.Setters>
-                        </MultiTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type controls:NavigationCompact}">
-        <!--<Setter Property="ItemStyle" Value="{StaticResource UiNavigationCompactItemStyle}" />-->
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Margin" Value="4" />
-        <Setter Property="Width" Value="40" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:NavigationCompact}">
-                    <controls:DynamicScrollViewer
-                        Margin="0"
-                        Padding="0"
-                        HorizontalScrollBarVisibility="Disabled">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-
-                            <Border
-                                x:Name="ButtonBorder"
-                                HorizontalAlignment="Left"
-                                Focusable="False"
-                                KeyboardNavigation.IsTabStop="False">
-                                <controls:Button
-                                    x:Name="HamburgerButton"
-                                    Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                    CommandParameter="hamburger"
-                                    Style="{StaticResource HamburgerButton}" />
-                            </Border>
-
-                            <ItemsControl
-                                x:Name="ItemsItemsControl"
-                                Grid.Row="1"
-                                Focusable="False"
-                                ItemsSource="{TemplateBinding Items}"
-                                KeyboardNavigation.DirectionalNavigation="Contained"
-                                ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                ScrollViewer.VerticalScrollBarVisibility="Disabled">
-                                <ItemsControl.ItemsPanel>
-                                    <ItemsPanelTemplate>
-                                        <StackPanel Margin="0" IsItemsHost="True" />
-                                    </ItemsPanelTemplate>
-                                </ItemsControl.ItemsPanel>
-                            </ItemsControl>
-
-                            <ItemsControl
-                                x:Name="FooterItemsControl"
-                                Grid.Row="2"
-                                Focusable="False"
-                                ItemsSource="{TemplateBinding Footer}"
-                                KeyboardNavigation.DirectionalNavigation="Contained"
-                                ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                ScrollViewer.VerticalScrollBarVisibility="Disabled">
-                                <ItemsControl.ItemsPanel>
-                                    <ItemsPanelTemplate>
-                                        <StackPanel Margin="0" IsItemsHost="True" />
-                                    </ItemsPanelTemplate>
-                                </ItemsControl.ItemsPanel>
-                            </ItemsControl>
-                        </Grid>
-                    </controls:DynamicScrollViewer>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsExpanded" Value="True">
-                            <Trigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation
-                                            AccelerationRatio="0.4"
-                                            Storyboard.TargetProperty="Width"
-                                            From="40"
-                                            To="250"
-                                            Duration="0:0:.16" />
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </Trigger.EnterActions>
-                            <Trigger.ExitActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation
-                                            AccelerationRatio="0.4"
-                                            Storyboard.TargetProperty="Width"
-                                            From="250"
-                                            To="40"
-                                            Duration="0:0:.16" />
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </Trigger.ExitActions>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Resources>
-            <Style BasedOn="{StaticResource NavigationCompactItem}" TargetType="{x:Type controls:NavigationItem}" />
-            <Style BasedOn="{StaticResource NavigationCompactHeader}" TargetType="{x:Type navigation:NavigationHeader}" />
-        </Style.Resources>
-    </Style>
-
-</ResourceDictionary>
diff --git a/src/Wpf.Ui/Styles/Controls/NavigationFluent.xaml b/src/Wpf.Ui/Styles/Controls/NavigationFluent.xaml
index 2105adc07..56ecc1de1 100644
--- a/src/Wpf.Ui/Styles/Controls/NavigationFluent.xaml
+++ b/src/Wpf.Ui/Styles/Controls/NavigationFluent.xaml
@@ -8,16 +8,160 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:common="clr-namespace:Wpf.Ui.Common"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+    xmlns:navigation="clr-namespace:Wpf.Ui.Controls.Navigation">
 
-    <Style x:Key="NavigationFluentItem" TargetType="{x:Type controls:NavigationItem}">
+    <Style x:Key="HamburgerButton" TargetType="{x:Type controls:Button}">
+        <Setter Property="Foreground">
+            <Setter.Value>
+                <SolidColorBrush Color="{DynamicResource TextFillColorSecondary}" />
+            </Setter.Value>
+        </Setter>
+        <Setter Property="IconForeground">
+            <Setter.Value>
+                <SolidColorBrush Color="{DynamicResource TextFillColorSecondary}" />
+            </Setter.Value>
+        </Setter>
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
         <Setter Property="Margin" Value="0,0,0,4" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="IconFilled" Value="False" />
         <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Width" Value="40" />
+        <Setter Property="Height" Value="38" />
+        <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
+        <Setter Property="Focusable" Value="True" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:Button}">
+                    <Border
+                        x:Name="MainBorder"
+                        Margin="0"
+                        Padding="0"
+                        HorizontalAlignment="Stretch"
+                        Background="Transparent"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="1"
+                        CornerRadius="4">
+                        <controls:SymbolIcon
+                            x:Name="ElementIcon"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Filled="{TemplateBinding IconFilled}"
+                            FontSize="18"
+                            Foreground="{TemplateBinding IconForeground}"
+                            RenderTransformOrigin="0.5, 0.5"
+                            Symbol="LineHorizontal320">
+                            <controls:SymbolIcon.RenderTransform>
+                                <ScaleTransform x:Name="IconScaleTransform" ScaleX="1.0" ScaleY="1.0" />
+                            </controls:SymbolIcon.RenderTransform>
+                        </controls:SymbolIcon>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="MainBorder" Property="Background">
+                                <Setter.Value>
+                                    <SolidColorBrush Opacity="0.5" Color="{DynamicResource ControlFillColorDefault}" />
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <EventTrigger RoutedEvent="Button.PreviewMouseLeftButtonDown">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <DoubleAnimation
+                                        Storyboard.TargetName="IconScaleTransform"
+                                        Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
+                                        From="1.0"
+                                        To="0.6"
+                                        Duration="0:0:0.08" />
+                                </Storyboard>
+                            </BeginStoryboard>
+                        </EventTrigger>
+                        <EventTrigger RoutedEvent="Button.PreviewMouseLeftButtonUp">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <DoubleAnimation
+                                        Storyboard.TargetName="IconScaleTransform"
+                                        Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
+                                        From="0.6"
+                                        To="1.0"
+                                        Duration="0:0:0.08" />
+                                </Storyboard>
+                            </BeginStoryboard>
+                        </EventTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="NavigationCompactHeader" TargetType="{x:Type navigation:NavigationHeader}">
+        <Setter Property="Foreground">
+            <Setter.Value>
+                <SolidColorBrush Color="{DynamicResource TextFillColorTertiary}" />
+            </Setter.Value>
+        </Setter>
+        <Setter Property="IconForeground">
+            <Setter.Value>
+                <SolidColorBrush Color="{DynamicResource TextFillColorTertiary}" />
+            </Setter.Value>
+        </Setter>
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="IconSize" Value="10" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Margin" Value="20,4,4,4" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type navigation:NavigationHeader}">
+                    <Grid
+                        Margin="{TemplateBinding Margin}"
+                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                        VerticalAlignment="{TemplateBinding VerticalAlignment}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <controls:SymbolIcon
+                            x:Name="SymbolIcon"
+                            Grid.Column="0"
+                            Margin="0,0,4,0"
+                            VerticalAlignment="Center"
+                            Filled="{TemplateBinding IconFilled}"
+                            FontSize="{TemplateBinding IconSize}"
+                            Foreground="{TemplateBinding IconForeground}"
+                            Symbol="{TemplateBinding Icon}" />
+                        <TextBlock
+                            Grid.Column="1"
+                            FontSize="{TemplateBinding FontSize}"
+                            Foreground="{TemplateBinding Foreground}"
+                            Text="{TemplateBinding Text}" />
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="Icon" Value="Empty">
+                            <Setter TargetName="SymbolIcon" Property="Margin" Value="0" />
+                            <Setter TargetName="SymbolIcon" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="NavigationCompactItem" TargetType="{x:Type controls:NavigationItem}">
+        <Setter Property="Height" Value="40" />
+        <Setter Property="Margin" Value="0,0,0,4" />
+        <Setter Property="Padding" Value="0" />
         <Setter Property="IconSize" Value="18" />
+        <Setter Property="Cursor" Value="Hand" />
         <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="Background">
             <Setter.Value>
                 <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}" />
@@ -33,7 +177,11 @@
                 <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
             </Setter.Value>
         </Setter>
-        <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentBrush}" />
+        <Setter Property="BorderBrush">
+            <Setter.Value>
+                <SolidColorBrush Opacity="0.0" Color="{DynamicResource ControlStrokeColorDefault}" />
+            </Setter.Value>
+        </Setter>
         <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
         <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
         <Setter Property="Focusable" Value="True" />
@@ -44,34 +192,22 @@
                 <ControlTemplate TargetType="{x:Type controls:NavigationItem}">
                     <Border
                         x:Name="MainBorder"
-                        Padding="{TemplateBinding Padding}"
-                        Background="{TemplateBinding Background}"
+                        Margin="0"
+                        Padding="0"
+                        Background="Transparent"
+                        BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="1"
                         CornerRadius="4">
                         <Grid>
-                            <Rectangle
-                                x:Name="ActiveRectangle"
-                                Width="0"
-                                Height="18"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Opacity="0.0"
-                                RadiusX="2"
-                                RadiusY="2">
-                                <Rectangle.Fill>
-                                    <SolidColorBrush Color="{DynamicResource SystemAccentColorSecondary}" />
-                                </Rectangle.Fill>
-                            </Rectangle>
-                            <Grid Margin="16,8" HorizontalAlignment="Left">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="40" />
+                                <ColumnDefinition Width="*" MinWidth="180" />
+                            </Grid.ColumnDefinitions>
+
+                            <Grid Grid.Column="0">
                                 <controls:SymbolIcon
-                                    x:Name="ItemIcon"
-                                    Grid.Column="0"
-                                    Width="18"
-                                    Margin="0,0,14,0"
+                                    x:Name="ElementIcon"
+                                    Margin="-1,0,0,0"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     Filled="{TemplateBinding IconFilled}"
@@ -80,176 +216,87 @@
                                     Symbol="{TemplateBinding Icon}" />
 
                                 <Image
-                                    x:Name="ItemImage"
-                                    Grid.Column="0"
+                                    x:Name="ElementImage"
                                     Width="18"
-                                    Margin="0,0,14,0"
+                                    Margin="-1,0,0,0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
                                     RenderOptions.BitmapScalingMode="HighQuality"
                                     Source="{TemplateBinding Image}" />
+                            </Grid>
+
+                            <Rectangle
+                                x:Name="ActiveRectangle"
+                                Grid.Column="0"
+                                Width="3"
+                                Height="16"
+                                Margin="0"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                Opacity="0.0"
+                                RadiusX="2"
+                                RadiusY="2">
+                                <Rectangle.Fill>
+                                    <SolidColorBrush Color="{DynamicResource SystemAccentColorSecondary}" />
+                                </Rectangle.Fill>
+                            </Rectangle>
+
+                            <Grid
+                                x:Name="ContentGrid"
+                                Grid.Column="1"
+                                VerticalAlignment="Center">
 
                                 <ContentPresenter
-                                    Grid.Column="1"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center" />
+                                    x:Name="ElementContentPresenter"
+                                    HorizontalAlignment="Left"
+                                    Content="{TemplateBinding Content}"
+                                    TextElement.FontSize="14"
+                                    TextElement.Foreground="{TemplateBinding Foreground}" />
                             </Grid>
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsActive" Value="False">
+                        <Trigger Property="IsActive" Value="True">
+                            <Setter TargetName="ActiveRectangle" Property="Opacity" Value="1.0" />
                             <Setter TargetName="MainBorder" Property="Background">
                                 <Setter.Value>
-                                    <SolidColorBrush Opacity="0" />
+                                    <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}" />
                                 </Setter.Value>
                             </Setter>
+                            <!--<Setter TargetName="ElementIcon" Property="Filled" Value="True" /> -->
+                            <!--<Setter TargetName="ElementIcon" Property="Foreground" Value="{DynamicResource SystemAccentBrush}" />-->
                         </Trigger>
-                        <Trigger Property="IsActive" Value="True">
-                            <Trigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ActiveRectangle"
-                                            Storyboard.TargetProperty="(Rectangle.Width)"
-                                            From="0"
-                                            To="4"
-                                            Duration="00:00:00.167" />
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ActiveRectangle"
-                                            Storyboard.TargetProperty="(Rectangle.Opacity)"
-                                            From="0.0"
-                                            To="1.0"
-                                            Duration="00:00:00.167" />
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </Trigger.EnterActions>
-                            <Trigger.ExitActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ActiveRectangle"
-                                            Storyboard.TargetProperty="(Rectangle.Width)"
-                                            From="4"
-                                            To="0"
-                                            Duration="00:00:00.167" />
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ActiveRectangle"
-                                            Storyboard.TargetProperty="(Rectangle.Opacity)"
-                                            From="1.0"
-                                            To="0.0"
-                                            Duration="00:00:00.167" />
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </Trigger.ExitActions>
+                        <Trigger Property="Icon" Value="Empty">
+                            <Setter TargetName="ElementIcon" Property="Visibility" Value="Collapsed" />
                         </Trigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsMouseOver" Value="True" />
-                            </MultiTrigger.Conditions>
+                        <Trigger Property="Image" Value="{x:Null}">
+                            <Setter TargetName="ElementImage" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
                             <Setter TargetName="MainBorder" Property="Background">
                                 <Setter.Value>
                                     <SolidColorBrush Opacity="0.5" Color="{DynamicResource ControlFillColorDefault}" />
                                 </Setter.Value>
                             </Setter>
-                        </MultiTrigger>
-                        <!--
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsActive" Value="True" />
-                                <Condition Property="IsMouseOver" Value="False" />
-                            </MultiTrigger.Conditions>
-                            <MultiTrigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="MainBorder"
-                                            Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
-                                            From="0.0"
-                                            To="0.03"
-                                            Duration="0:0:.16" />
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.EnterActions>
-                            <MultiTrigger.ExitActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="MainBorder"
-                                            Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
-                                            From="0.03"
-                                            To="0.0"
-                                            Duration="0:0:.16" />
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.ExitActions>
-                        </MultiTrigger>
+                        </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsActive" Value="False" />
                                 <Condition Property="IsMouseOver" Value="True" />
+                                <Condition Property="IsActive" Value="False" />
                             </MultiTrigger.Conditions>
-                            <MultiTrigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="MainBorder"
-                                            Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
-                                            From="0.0"
-                                            To="0.1"
-                                            Duration="0:0:.16" />
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.EnterActions>
-                            <MultiTrigger.ExitActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="MainBorder"
-                                            Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
-                                            From="0.1"
-                                            To="0.0"
-                                            Duration="0:0:.16" />
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.ExitActions>
+                            <MultiTrigger.Setters>
+                                <Setter TargetName="ElementIcon" Property="Foreground">
+                                    <Setter.Value>
+                                        <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
+                                    </Setter.Value>
+                                </Setter>
+                                <Setter TargetName="ElementContentPresenter" Property="TextElement.Foreground">
+                                    <Setter.Value>
+                                        <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
+                                    </Setter.Value>
+                                </Setter>
+                            </MultiTrigger.Setters>
                         </MultiTrigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsActive" Value="True" />
-                                <Condition Property="IsMouseOver" Value="True" />
-                            </MultiTrigger.Conditions>
-                            <MultiTrigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="MainBorder"
-                                            Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
-                                            From="0.03"
-                                            To="0.1"
-                                            Duration="0:0:.16" />
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.EnterActions>
-                            <MultiTrigger.ExitActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="MainBorder"
-                                            Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Opacity)"
-                                            From="0.1"
-                                            To="0.03"
-                                            Duration="0:0:.16" />
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.ExitActions>
-                        </MultiTrigger>-->
-                        <Trigger Property="Icon" Value="Empty">
-                            <Setter TargetName="ItemIcon" Property="Width" Value="0" />
-                            <Setter TargetName="ItemIcon" Property="Margin" Value="0" />
-                        </Trigger>
-                        <Trigger Property="Image" Value="{x:Null}">
-                            <Setter TargetName="ItemImage" Property="Width" Value="0" />
-                            <Setter TargetName="ItemImage" Property="Margin" Value="0" />
-                            <Setter TargetName="ItemImage" Property="Visibility" Value="Collapsed" />
-                        </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
@@ -257,8 +304,10 @@
     </Style>
 
     <Style TargetType="{x:Type controls:NavigationFluent}">
-        <!--<Setter Property="ItemStyle" Value="{StaticResource UiFluentNavigationItemStyle}" />-->
+        <!--<Setter Property="ItemStyle" Value="{StaticResource UiNavigationCompactItemStyle}" />-->
         <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Margin" Value="4" />
+        <Setter Property="Width" Value="40" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
@@ -269,15 +318,28 @@
                         Margin="0"
                         Padding="0"
                         HorizontalScrollBarVisibility="Disabled">
-                        <Grid Width="250" HorizontalAlignment="Left">
+                        <Grid>
                             <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
                                 <RowDefinition Height="*" />
                                 <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
 
+                            <Border
+                                x:Name="ButtonBorder"
+                                HorizontalAlignment="Left"
+                                Focusable="False"
+                                KeyboardNavigation.IsTabStop="False">
+                                <controls:Button
+                                    x:Name="HamburgerButton"
+                                    Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                    CommandParameter="hamburger"
+                                    Style="{StaticResource HamburgerButton}" />
+                            </Border>
+
                             <ItemsControl
-                                Grid.Row="0"
-                                Width="250"
+                                x:Name="ItemsItemsControl"
+                                Grid.Row="1"
                                 Focusable="False"
                                 ItemsSource="{TemplateBinding Items}"
                                 KeyboardNavigation.DirectionalNavigation="Contained"
@@ -291,7 +353,8 @@
                             </ItemsControl>
 
                             <ItemsControl
-                                Grid.Row="1"
+                                x:Name="FooterItemsControl"
+                                Grid.Row="2"
                                 Focusable="False"
                                 ItemsSource="{TemplateBinding Footer}"
                                 KeyboardNavigation.DirectionalNavigation="Contained"
@@ -305,11 +368,43 @@
                             </ItemsControl>
                         </Grid>
                     </controls:DynamicScrollViewer>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsExpandButtonVisible" Value="False">
+                            <Setter TargetName="ButtonBorder" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
+                        <Trigger Property="IsExpanded" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            AccelerationRatio="0.4"
+                                            Storyboard.TargetProperty="Width"
+                                            From="40"
+                                            To="250"
+                                            Duration="0:0:.16" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            AccelerationRatio="0.4"
+                                            Storyboard.TargetProperty="Width"
+                                            From="250"
+                                            To="40"
+                                            Duration="0:0:.16" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.ExitActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
         <Style.Resources>
-            <Style BasedOn="{StaticResource NavigationFluentItem}" TargetType="{x:Type controls:NavigationItem}" />
+            <Style BasedOn="{StaticResource NavigationCompactItem}" TargetType="{x:Type controls:NavigationItem}" />
+            <Style BasedOn="{StaticResource NavigationCompactHeader}" TargetType="{x:Type navigation:NavigationHeader}" />
         </Style.Resources>
     </Style>
 
diff --git a/src/Wpf.Ui/Styles/Controls/NavigationView.xaml b/src/Wpf.Ui/Styles/Controls/NavigationView.xaml
index 7453eb9a9..4fe225a48 100644
--- a/src/Wpf.Ui/Styles/Controls/NavigationView.xaml
+++ b/src/Wpf.Ui/Styles/Controls/NavigationView.xaml
@@ -8,84 +8,73 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+    xmlns:navigation="clr-namespace:Wpf.Ui.Controls.Navigation">
 
     <Style TargetType="{x:Type controls:NavigationView}">
-        <Style.Triggers>
-            <Trigger Property="Type" Value="Compact">
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type controls:NavigationView}">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:NavigationView}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-                                <controls:NavigationCompact
-                                    x:Name="PART_Navigation"
-                                    Grid.Column="0"
-                                    Frame="{Binding ElementName=PART_Frame, Mode=OneWay}" />
+                        <Grid Grid.Column="0">
+                            <navigation:NavigationBackButton
+                                x:Name="PART_BackButton"
+                                Margin="5,5,0,4"
+                                Navigation="{TemplateBinding Navigation}"
+                                Visibility="Collapsed" />
+                            <ContentControl x:Name="Navigation" Content="{TemplateBinding Navigation}" />
+                        </Grid>
 
-                                <controls:TitleBar
-                                    Title="WPF UI - Compact navigation"
-                                    Grid.Row="0"
-                                    Grid.Column="0"
-                                    Grid.ColumnSpan="2"
-                                    Margin="42,0,0,0" />
+                        <Grid Grid.Column="1">
+                            <Border
+                                Margin="{TemplateBinding FrameBorderMargin}"
+                                Background="{DynamicResource ControlFillColorDefaultBrush}"
+                                CornerRadius="8,0,0,0">
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="*" />
+                                    </Grid.RowDefinitions>
 
-                                <Grid Grid.Column="1">
-                                    <Border
-                                        Margin="0,46,0,0"
-                                        Background="{DynamicResource ControlFillColorDefaultBrush}"
-                                        CornerRadius="8,0,0,0">
-                                        <Grid>
-                                            <Grid.RowDefinitions>
-                                                <RowDefinition Height="Auto" />
-                                                <RowDefinition Height="*" />
-                                            </Grid.RowDefinitions>
+                                    <Frame
+                                        x:Name="PART_Frame"
+                                        Grid.Row="1"
+                                        Padding="{TemplateBinding FramePadding}" />
 
-                                            <controls:Breadcrumb
-                                                x:Name="PART_Breadcrumb"
-                                                Grid.Row="0"
-                                                Margin="38"
-                                                HorizontalAlignment="Left"
-                                                VerticalAlignment="Top"
-                                                FontSize="26"
-                                                FontWeight="Bold"
-                                                Navigation="{Binding ElementName=PART_Navigation, Mode=OneWay}" />
+                                    <controls:Breadcrumb
+                                        x:Name="PART_Breadcrumb"
+                                        Grid.Row="0"
+                                        Margin="{TemplateBinding BreadcrumbMargin}"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Top"
+                                        FontSize="26"
+                                        FontWeight="Bold"
+                                        Navigation="{TemplateBinding Navigation}"
+                                        Visibility="Collapsed" />
 
-                                            <Frame
-                                                x:Name="PART_Frame"
-                                                Grid.Row="1"
-                                                Margin="38,0" />
-                                        </Grid>
-                                    </Border>
+                                    <ContentControl Grid.Row="1" Content="{TemplateBinding Content}" />
                                 </Grid>
-                            </Grid>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Trigger>
-            <Trigger Property="Type" Value="Fluent">
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type controls:NavigationView}">
-                            <Border Background="Black" />
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Trigger>
-            <Trigger Property="Type" Value="Store">
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type controls:NavigationView}">
-                            <Border Background="Blue" />
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Trigger>
-        </Style.Triggers>
+                            </Border>
+                        </Grid>
+                    </Grid>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsBackButtonVisible" Value="True">
+                            <Setter TargetName="Navigation" Property="Margin" Value="0,40,0,0" />
+                            <Setter TargetName="PART_BackButton" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="IsBreadcrumbVisible" Value="True">
+                            <Setter TargetName="PART_Breadcrumb" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Wpf.Ui/Styles/Wpf.Ui.xaml b/src/Wpf.Ui/Styles/Wpf.Ui.xaml
index f1258ed10..ed5d3a8b1 100644
--- a/src/Wpf.Ui/Styles/Wpf.Ui.xaml
+++ b/src/Wpf.Ui/Styles/Wpf.Ui.xaml
@@ -29,7 +29,6 @@
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/NavigationSeparator.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/NavigationFluent.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/NavigationStore.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/NavigationCompact.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/NavigationView.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/NavigationBackButton.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Styles/Controls/Breadcrumb.xaml" />
diff --git a/src/Wpf.Ui/Wpf.Ui.csproj b/src/Wpf.Ui/Wpf.Ui.csproj
index c723d1d40..6de2d93f0 100644
--- a/src/Wpf.Ui/Wpf.Ui.csproj
+++ b/src/Wpf.Ui/Wpf.Ui.csproj
@@ -86,7 +86,6 @@
     <None Remove="Controls\FontIcon.bmp" />
     <None Remove="Controls\MessageBox.bmp" />
     <None Remove="Controls\NavigationCompact.bmp" />
-    <None Remove="Controls\NavigationFluent.bmp" />
     <None Remove="Controls\NavigationHeader.bmp" />
     <None Remove="Controls\NavigationItem.bmp" />
     <None Remove="Controls\NavigationSeparator.bmp" />
@@ -124,7 +123,6 @@
     <EmbeddedResource Include="Controls\Navigation\NavigationSeparator.bmp" />
     <EmbeddedResource Include="Controls\NavigationItem.bmp" />
     <EmbeddedResource Include="Controls\Navigation\NavigationHeader.bmp" />
-    <EmbeddedResource Include="Controls\NavigationFluent.bmp" />
     <EmbeddedResource Include="Controls\NavigationStore.bmp" />
     <EmbeddedResource Include="Controls\NotifyIcon.bmp" />
     <EmbeddedResource Include="Controls\NumberBox.bmp" />