diff --git a/Wino.Mail/App.xaml b/Wino.Mail/App.xaml
index 57476ef1..aa413e2b 100644
--- a/Wino.Mail/App.xaml
+++ b/Wino.Mail/App.xaml
@@ -3,10 +3,10 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Wino.Controls"
-    xmlns:selectors="using:Wino.Selectors"
-    xmlns:wino="using:Wino"
     xmlns:dialogs="using:Wino.Core.Domain.Models.Dialogs"
-    xmlns:styles="using:Wino.Styles">
+    xmlns:selectors="using:Wino.Selectors"
+    xmlns:styles="using:Wino.Styles"
+    xmlns:wino="using:Wino">
 
     <Application.Resources>
         <ResourceDictionary>
@@ -44,7 +44,7 @@
                     </Style>
 
                     <!--  Border style for each page's root border for separation of zones.  -->
-                    <Style TargetType="Border" x:Key="PageRootBorderStyle">
+                    <Style x:Key="PageRootBorderStyle" TargetType="Border">
                         <Setter Property="Margin" Value="7,0,7,7" />
                         <Setter Property="Background" Value="{ThemeResource WinoContentZoneBackgroud}" />
                         <Setter Property="BorderBrush" Value="{StaticResource CardStrokeColorDefaultBrush}" />
@@ -53,7 +53,7 @@
                     </Style>
 
                     <!--  Custom Grid style for info panels.  -->
-                    <Style TargetType="Grid" x:Key="InformationAreaGridStyle">
+                    <Style x:Key="InformationAreaGridStyle" TargetType="Grid">
                         <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
                         <Setter Property="BorderBrush" Value="{ThemeResource DividerStrokeColorDefaultBrush}" />
                         <Setter Property="CornerRadius" Value="8" />
diff --git a/Wino.Mail/AppShell.xaml b/Wino.Mail/AppShell.xaml
index 4f20d8f1..e622196c 100644
--- a/Wino.Mail/AppShell.xaml
+++ b/Wino.Mail/AppShell.xaml
@@ -1,23 +1,24 @@
-<abstract:AppShellAbstract x:Class="Wino.Views.AppShell"
-                           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                           xmlns:abstract="using:Wino.Views.Abstract"
-                           xmlns:advanced="using:Wino.Controls.Advanced"
-                           xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
-                           xmlns:animations="using:CommunityToolkit.WinUI.Animations"
-                           xmlns:controls="using:Wino.Controls"
-                           xmlns:controls1="using:CommunityToolkit.WinUI.Controls"
-                           xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                           xmlns:domain="using:Wino.Core.Domain"
-                           xmlns:enums="using:Wino.Core.Domain.Enums"
-                           xmlns:helpers="using:Wino.Helpers"
-                           xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                           xmlns:menu="using:Wino.Core.MenuItems"
-                           xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-                           xmlns:selectors="using:Wino.Selectors"
-                           x:Name="Root"
-                           muxc:BackdropMaterial.ApplyToRootOrPageBackground="{ThemeResource UseMica}"
-                           mc:Ignorable="d">
+<abstract:AppShellAbstract
+    x:Class="Wino.Views.AppShell"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Views.Abstract"
+    xmlns:advanced="using:Wino.Controls.Advanced"
+    xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
+    xmlns:animations="using:CommunityToolkit.WinUI.Animations"
+    xmlns:controls="using:Wino.Controls"
+    xmlns:controls1="using:CommunityToolkit.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:enums="using:Wino.Core.Domain.Enums"
+    xmlns:helpers="using:Wino.Helpers"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:menu="using:Wino.Core.MenuItems"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    xmlns:selectors="using:Wino.Selectors"
+    x:Name="Root"
+    muxc:BackdropMaterial.ApplyToRootOrPageBackground="{ThemeResource UseMica}"
+    mc:Ignorable="d">
 
     <Page.Resources>
 
@@ -31,15 +32,16 @@
 
         <!--  Clickable New Style Account Template  -->
         <DataTemplate x:Key="ClickableAccountMenuTemplate" x:DataType="menu:AccountMenuItem">
-            <controls:AccountNavigationItem x:Name="AccountItem"
-                                            BindingData="{x:Bind}"
-                                            HorizontalContentAlignment="Stretch"
-                                            VerticalContentAlignment="Stretch"
-                                            DataContext="{x:Bind}"
-                                            IsActiveAccount="{x:Bind IsSelected, Mode=OneWay}"
-                                            IsExpanded="{x:Bind IsExpanded, Mode=TwoWay}"
-                                            SelectsOnInvoked="False"
-                                            Style="{StaticResource SingleAccountNavigationViewItemTemplate}">
+            <controls:AccountNavigationItem
+                x:Name="AccountItem"
+                HorizontalContentAlignment="Stretch"
+                VerticalContentAlignment="Stretch"
+                BindingData="{x:Bind}"
+                DataContext="{x:Bind}"
+                IsActiveAccount="{x:Bind IsSelected, Mode=OneWay}"
+                IsExpanded="{x:Bind IsExpanded, Mode=TwoWay}"
+                SelectsOnInvoked="False"
+                Style="{StaticResource SingleAccountNavigationViewItemTemplate}">
                 <controls:WinoNavigationViewItem.ContentTransitions>
                     <TransitionCollection>
                         <EdgeUIThemeTransition Edge="Top" />
@@ -49,15 +51,17 @@
                     <controls:WinoFontIcon FontSize="12" Icon="{x:Bind helpers:XamlHelpers.GetProviderIcon(Parameter.ProviderType)}" />
                 </muxc:NavigationViewItem.Icon>
                 <muxc:NavigationViewItem.InfoBadge>
-                    <muxc:InfoBadge Background="{ThemeResource SystemAccentColor}"
-                                    Foreground="White"
-                                    Visibility="{x:Bind helpers:XamlHelpers.CountToVisibilityConverter(UnreadItemCount), Mode=OneWay}"
-                                    Value="{x:Bind UnreadItemCount, Mode=OneWay}" />
+                    <muxc:InfoBadge
+                        Background="{ThemeResource SystemAccentColor}"
+                        Foreground="White"
+                        Visibility="{x:Bind helpers:XamlHelpers.CountToVisibilityConverter(UnreadItemCount), Mode=OneWay}"
+                        Value="{x:Bind UnreadItemCount, Mode=OneWay}" />
                 </muxc:NavigationViewItem.InfoBadge>
 
-                <Grid MaxHeight="70"
-                      Margin="0,8"
-                      RowSpacing="6">
+                <Grid
+                    MaxHeight="70"
+                    Margin="0,8"
+                    RowSpacing="6">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" />
                         <ColumnDefinition Width="Auto" />
@@ -68,39 +72,43 @@
                         <RowDefinition Height="2" />
                     </Grid.RowDefinitions>
                     <StackPanel VerticalAlignment="Center">
-                        <TextBlock x:Name="AccountNameTextblock"
-                                   FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightByChildSelectedState(IsSelected), Mode=OneWay}"
-                                   MaxLines="1"
-                                   Style="{StaticResource BodyTextBlockStyle}"
-                                   Text="{x:Bind AccountName, Mode=OneWay}"
-                                   TextTrimming="CharacterEllipsis" />
+                        <TextBlock
+                            x:Name="AccountNameTextblock"
+                            FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightByChildSelectedState(IsSelected), Mode=OneWay}"
+                            MaxLines="1"
+                            Style="{StaticResource BodyTextBlockStyle}"
+                            Text="{x:Bind AccountName, Mode=OneWay}"
+                            TextTrimming="CharacterEllipsis" />
 
-                        <TextBlock FontSize="13"
-                                   FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightByChildSelectedState(IsSelected), Mode=OneWay}"
-                                   MaxLines="1"
-                                   Style="{StaticResource CaptionTextBlockStyle}"
-                                   Text="{x:Bind Parameter.Address, Mode=OneWay}"
-                                   TextTrimming="CharacterEllipsis" />
+                        <TextBlock
+                            FontSize="13"
+                            FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightByChildSelectedState(IsSelected), Mode=OneWay}"
+                            MaxLines="1"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{x:Bind Parameter.Address, Mode=OneWay}"
+                            TextTrimming="CharacterEllipsis" />
                     </StackPanel>
 
-                    <PathIcon x:Name="AttentionIcon"
-                              Grid.Row="0"
-                              Grid.RowSpan="2"
-                              Grid.Column="2"
-                              HorizontalAlignment="Center"
-                              VerticalAlignment="Center"
-                              x:Load="{x:Bind IsAttentionRequired, Mode=OneWay}"
-                              Data="F1 M 2.021484 18.769531 C 1.767578 18.769531 1.52832 18.720703 1.303711 18.623047 C 1.079102 18.525391 0.880534 18.391928 0.708008 18.222656 C 0.535482 18.053385 0.398763 17.856445 0.297852 17.631836 C 0.19694 17.407227 0.146484 17.167969 0.146484 16.914062 C 0.146484 16.614584 0.211589 16.328125 0.341797 16.054688 L 7.695312 1.347656 C 7.851562 1.035156 8.082682 0.784506 8.388672 0.595703 C 8.694661 0.406902 9.023438 0.3125 9.375 0.3125 C 9.726562 0.3125 10.055338 0.406902 10.361328 0.595703 C 10.667317 0.784506 10.898438 1.035156 11.054688 1.347656 L 18.408203 16.054688 C 18.53841 16.328125 18.603516 16.614584 18.603516 16.914062 C 18.603516 17.167969 18.553059 17.407227 18.452148 17.631836 C 18.351236 17.856445 18.216145 18.053385 18.046875 18.222656 C 17.877604 18.391928 17.679035 18.525391 17.451172 18.623047 C 17.223307 18.720703 16.982422 18.769531 16.728516 18.769531 Z M 16.728516 17.519531 C 16.884766 17.519531 17.027994 17.460938 17.158203 17.34375 C 17.28841 17.226562 17.353516 17.086588 17.353516 16.923828 C 17.353516 16.806641 17.330729 16.702475 17.285156 16.611328 L 9.931641 1.904297 C 9.879557 1.793621 9.80306 1.708984 9.702148 1.650391 C 9.601236 1.591797 9.492188 1.5625 9.375 1.5625 C 9.257812 1.5625 9.148763 1.593426 9.047852 1.655273 C 8.946939 1.717123 8.870442 1.800131 8.818359 1.904297 L 1.464844 16.611328 C 1.419271 16.702475 1.396484 16.803387 1.396484 16.914062 C 1.396484 17.083334 1.459961 17.226562 1.586914 17.34375 C 1.713867 17.460938 1.858724 17.519531 2.021484 17.519531 Z M 8.75 11.875 L 8.75 6.875 C 8.75 6.705729 8.811849 6.559245 8.935547 6.435547 C 9.059244 6.31185 9.205729 6.25 9.375 6.25 C 9.544271 6.25 9.690755 6.31185 9.814453 6.435547 C 9.93815 6.559245 10 6.705729 10 6.875 L 10 11.875 C 10 12.044271 9.93815 12.190756 9.814453 12.314453 C 9.690755 12.438151 9.544271 12.5 9.375 12.5 C 9.205729 12.5 9.059244 12.438151 8.935547 12.314453 C 8.811849 12.190756 8.75 12.044271 8.75 11.875 Z M 8.4375 14.375 C 8.4375 14.114584 8.528646 13.893229 8.710938 13.710938 C 8.893229 13.528646 9.114583 13.4375 9.375 13.4375 C 9.635416 13.4375 9.856771 13.528646 10.039062 13.710938 C 10.221354 13.893229 10.3125 14.114584 10.3125 14.375 C 10.3125 14.635417 10.221354 14.856771 10.039062 15.039062 C 9.856771 15.221354 9.635416 15.3125 9.375 15.3125 C 9.114583 15.3125 8.893229 15.221354 8.710938 15.039062 C 8.528646 14.856771 8.4375 14.635417 8.4375 14.375 Z "
-                              Foreground="{ThemeResource InfoBarWarningSeverityIconBackground}" />
+                    <PathIcon
+                        x:Name="AttentionIcon"
+                        Grid.Row="0"
+                        Grid.RowSpan="2"
+                        Grid.Column="2"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        x:Load="{x:Bind IsAttentionRequired, Mode=OneWay}"
+                        Data="F1 M 2.021484 18.769531 C 1.767578 18.769531 1.52832 18.720703 1.303711 18.623047 C 1.079102 18.525391 0.880534 18.391928 0.708008 18.222656 C 0.535482 18.053385 0.398763 17.856445 0.297852 17.631836 C 0.19694 17.407227 0.146484 17.167969 0.146484 16.914062 C 0.146484 16.614584 0.211589 16.328125 0.341797 16.054688 L 7.695312 1.347656 C 7.851562 1.035156 8.082682 0.784506 8.388672 0.595703 C 8.694661 0.406902 9.023438 0.3125 9.375 0.3125 C 9.726562 0.3125 10.055338 0.406902 10.361328 0.595703 C 10.667317 0.784506 10.898438 1.035156 11.054688 1.347656 L 18.408203 16.054688 C 18.53841 16.328125 18.603516 16.614584 18.603516 16.914062 C 18.603516 17.167969 18.553059 17.407227 18.452148 17.631836 C 18.351236 17.856445 18.216145 18.053385 18.046875 18.222656 C 17.877604 18.391928 17.679035 18.525391 17.451172 18.623047 C 17.223307 18.720703 16.982422 18.769531 16.728516 18.769531 Z M 16.728516 17.519531 C 16.884766 17.519531 17.027994 17.460938 17.158203 17.34375 C 17.28841 17.226562 17.353516 17.086588 17.353516 16.923828 C 17.353516 16.806641 17.330729 16.702475 17.285156 16.611328 L 9.931641 1.904297 C 9.879557 1.793621 9.80306 1.708984 9.702148 1.650391 C 9.601236 1.591797 9.492188 1.5625 9.375 1.5625 C 9.257812 1.5625 9.148763 1.593426 9.047852 1.655273 C 8.946939 1.717123 8.870442 1.800131 8.818359 1.904297 L 1.464844 16.611328 C 1.419271 16.702475 1.396484 16.803387 1.396484 16.914062 C 1.396484 17.083334 1.459961 17.226562 1.586914 17.34375 C 1.713867 17.460938 1.858724 17.519531 2.021484 17.519531 Z M 8.75 11.875 L 8.75 6.875 C 8.75 6.705729 8.811849 6.559245 8.935547 6.435547 C 9.059244 6.31185 9.205729 6.25 9.375 6.25 C 9.544271 6.25 9.690755 6.31185 9.814453 6.435547 C 9.93815 6.559245 10 6.705729 10 6.875 L 10 11.875 C 10 12.044271 9.93815 12.190756 9.814453 12.314453 C 9.690755 12.438151 9.544271 12.5 9.375 12.5 C 9.205729 12.5 9.059244 12.438151 8.935547 12.314453 C 8.811849 12.190756 8.75 12.044271 8.75 11.875 Z M 8.4375 14.375 C 8.4375 14.114584 8.528646 13.893229 8.710938 13.710938 C 8.893229 13.528646 9.114583 13.4375 9.375 13.4375 C 9.635416 13.4375 9.856771 13.528646 10.039062 13.710938 C 10.221354 13.893229 10.3125 14.114584 10.3125 14.375 C 10.3125 14.635417 10.221354 14.856771 10.039062 15.039062 C 9.856771 15.221354 9.635416 15.3125 9.375 15.3125 C 9.114583 15.3125 8.893229 15.221354 8.710938 15.039062 C 8.528646 14.856771 8.4375 14.635417 8.4375 14.375 Z "
+                        Foreground="{ThemeResource InfoBarWarningSeverityIconBackground}" />
 
-                    <muxc:ProgressBar x:Name="SynchronizationProgressBar"
-                                      Grid.Row="1"
-                                      Grid.ColumnSpan="3"
-                                      HorizontalAlignment="Stretch"
-                                      Background="{ThemeResource AppBarItemBackgroundThemeBrush}"
-                                      Foreground="{ThemeResource AppBarItemForegroundThemeBrush}"
-                                      Visibility="{x:Bind IsSynchronizationProgressVisible, Mode=OneWay}"
-                                      Value="{x:Bind SynchronizationProgress, Mode=OneWay}" />
+                    <muxc:ProgressBar
+                        x:Name="SynchronizationProgressBar"
+                        Grid.Row="1"
+                        Grid.ColumnSpan="3"
+                        HorizontalAlignment="Stretch"
+                        Background="{ThemeResource AppBarItemBackgroundThemeBrush}"
+                        Foreground="{ThemeResource AppBarItemForegroundThemeBrush}"
+                        Visibility="{x:Bind IsSynchronizationProgressVisible, Mode=OneWay}"
+                        Value="{x:Bind SynchronizationProgress, Mode=OneWay}" />
 
 
                 </Grid>
@@ -112,10 +120,11 @@
         <DataTemplate x:Key="FixAuthenticationIssueTemplate" x:DataType="menu:FixAccountIssuesMenuItem">
             <controls:WinoNavigationViewItem SelectsOnInvoked="False">
                 <controls:WinoNavigationViewItem.Content>
-                    <TextBlock Margin="0,10"
-                               Foreground="{ThemeResource InfoBarWarningSeverityIconBackground}"
-                               HorizontalTextAlignment="Center"
-                               TextWrapping="WrapWholeWords">
+                    <TextBlock
+                        Margin="0,10"
+                        Foreground="{ThemeResource InfoBarWarningSeverityIconBackground}"
+                        HorizontalTextAlignment="Center"
+                        TextWrapping="WrapWholeWords">
                         <Run Text="Account credentials can not be verified." /><LineBreak /><Run Text="Click here to fix it." />
                     </TextBlock>
                 </controls:WinoNavigationViewItem.Content>
@@ -126,10 +135,11 @@
         <DataTemplate x:Key="FixMissingFolderConfig" x:DataType="menu:FixAccountIssuesMenuItem">
             <controls:WinoNavigationViewItem SelectsOnInvoked="False">
                 <controls:WinoNavigationViewItem.Content>
-                    <TextBlock Margin="0,10"
-                               Foreground="{ThemeResource InfoBarWarningSeverityIconBackground}"
-                               HorizontalTextAlignment="Center"
-                               TextWrapping="WrapWholeWords">
+                    <TextBlock
+                        Margin="0,10"
+                        Foreground="{ThemeResource InfoBarWarningSeverityIconBackground}"
+                        HorizontalTextAlignment="Center"
+                        TextWrapping="WrapWholeWords">
                         <Run Text="Account is missing system folder configuration." /><LineBreak /><LineBreak /><Run Text="Click here to fix it." />
                     </TextBlock>
                 </controls:WinoNavigationViewItem.Content>
@@ -140,43 +150,47 @@
         <DataTemplate x:Key="ManageAccountsTemplate" x:DataType="menu:ManageAccountsMenuItem">
             <controls:WinoNavigationViewItem Content="{x:Bind domain:Translator.MenuManageAccounts}" DataContext="{x:Bind}">
                 <muxc:NavigationViewItem.Icon>
-                    <PathIcon HorizontalAlignment="Center"
-                              VerticalAlignment="Center"
-                              Data="F1 M 2.5 3.75 L 2.5 3.671875 C 2.5 3.164062 2.600911 2.687176 2.802734 2.241211 C 3.004557 1.795248 3.277995 1.40625 3.623047 1.074219 C 3.968099 0.742188 4.366862 0.480145 4.819336 0.288086 C 5.27181 0.096029 5.748698 0 6.25 0 C 6.770833 0 7.259114 0.097656 7.714844 0.292969 C 8.170572 0.488281 8.567708 0.755209 8.90625 1.09375 C 9.244791 1.432293 9.511719 1.829428 9.707031 2.285156 C 9.902344 2.740887 10 3.229168 10 3.75 C 10 4.270834 9.902344 4.759115 9.707031 5.214844 C 9.511719 5.670573 9.244791 6.067709 8.90625 6.40625 C 8.567708 6.744792 8.170572 7.011719 7.714844 7.207031 C 7.259114 7.402344 6.770833 7.5 6.25 7.5 C 5.729167 7.5 5.240885 7.402344 4.785156 7.207031 C 4.329427 7.011719 3.932292 6.744792 3.59375 6.40625 C 3.255208 6.067709 2.988281 5.670573 2.792969 5.214844 C 2.597656 4.759115 2.5 4.270834 2.5 3.75 Z M 8.75 3.75 L 8.75 3.701172 C 8.75 3.362631 8.681641 3.045248 8.544922 2.749023 C 8.408203 2.452801 8.225911 2.194012 7.998047 1.972656 C 7.770182 1.751303 7.504883 1.575521 7.202148 1.445312 C 6.899414 1.315105 6.582031 1.25 6.25 1.25 C 5.904948 1.25 5.581055 1.316732 5.27832 1.450195 C 4.975586 1.58366 4.711914 1.762695 4.487305 1.987305 C 4.262695 2.211914 4.083659 2.477215 3.950195 2.783203 C 3.816731 3.089193 3.75 3.411459 3.75 3.75 C 3.75 4.095053 3.816731 4.418946 3.950195 4.72168 C 4.083659 5.024415 4.262695 5.288087 4.487305 5.512695 C 4.711914 5.737306 4.975586 5.916342 5.27832 6.049805 C 5.581055 6.183269 5.904948 6.25 6.25 6.25 C 6.588542 6.25 6.910807 6.183269 7.216797 6.049805 C 7.522786 5.916342 7.788085 5.737306 8.012695 5.512695 C 8.237305 5.288087 8.416341 5.024415 8.549805 4.72168 C 8.683268 4.418946 8.75 4.095053 8.75 3.75 Z M 12.5 6.201172 C 12.5 5.862631 12.568359 5.545248 12.705078 5.249023 C 12.841797 4.9528 13.024088 4.694011 13.251953 4.472656 C 13.479816 4.251303 13.745116 4.075521 14.047852 3.945312 C 14.350585 3.815105 14.667968 3.75 15 3.75 C 15.338541 3.75 15.660807 3.816732 15.966797 3.950195 C 16.272785 4.08366 16.538086 4.262696 16.762695 4.487305 C 16.987305 4.711915 17.16634 4.977215 17.299805 5.283203 C 17.433268 5.589193 17.5 5.911459 17.5 6.25 C 17.5 6.582031 17.434895 6.899414 17.304688 7.202148 C 17.174479 7.504883 16.998697 7.770183 16.777344 7.998047 C 16.555988 8.225912 16.297199 8.408203 16.000977 8.544922 C 15.704752 8.681641 15.387369 8.75 15.048828 8.75 C 14.684244 8.75 14.34733 8.684896 14.038086 8.554688 C 13.728841 8.424479 13.460286 8.245443 13.232422 8.017578 C 13.004557 7.789714 12.82552 7.521159 12.695312 7.211914 C 12.565104 6.90267 12.5 6.565756 12.5 6.201172 Z M 16.25 6.25 C 16.25 6.08073 16.217447 5.919598 16.152344 5.766602 C 16.087238 5.613607 15.997721 5.480144 15.883789 5.366211 C 15.769856 5.252279 15.636393 5.162761 15.483398 5.097656 C 15.330403 5.032553 15.169271 5.000001 15 5 C 14.824218 5.000001 14.661457 5.032553 14.511719 5.097656 C 14.361979 5.162761 14.230143 5.252279 14.116211 5.366211 C 14.002277 5.480144 13.91276 5.611979 13.847656 5.761719 C 13.782552 5.911459 13.75 6.074219 13.75 6.25 C 13.75 6.425781 13.782552 6.59017 13.847656 6.743164 C 13.91276 6.896159 14.00065 7.027995 14.111328 7.138672 C 14.222005 7.24935 14.353841 7.33724 14.506836 7.402344 C 14.65983 7.467448 14.824218 7.5 15 7.5 C 15.17578 7.5 15.338541 7.467448 15.488281 7.402344 C 15.638021 7.33724 15.769856 7.247722 15.883789 7.133789 C 15.997721 7.019857 16.087238 6.888021 16.152344 6.738281 C 16.217447 6.588542 16.25 6.425781 16.25 6.25 Z M 10.048828 7.5 C 10.387369 7.5 10.704752 7.568359 11.000977 7.705078 C 11.2972 7.841797 11.555989 8.024089 11.777344 8.251953 C 11.998697 8.479818 12.174479 8.745117 12.304688 9.047852 C 12.434896 9.350586 12.5 9.667969 12.5 10 C 12.5 10.345053 12.434896 10.670573 12.304688 10.976562 C 12.174479 11.282553 11.99707 11.547852 11.772461 11.772461 C 11.547852 11.99707 11.282552 12.174479 10.976562 12.304688 C 10.670572 12.434896 10.345052 12.5 10 12.5 C 9.667969 12.5 9.350586 12.434896 9.047852 12.304688 C 8.745117 12.174479 8.479817 11.998698 8.251953 11.777344 C 8.024088 11.55599 7.841796 11.297201 7.705078 11.000977 C 7.568359 10.704753 7.5 10.38737 7.5 10.048828 C 7.5 9.684245 7.565104 9.347331 7.695312 9.038086 C 7.825521 8.728842 8.004557 8.460287 8.232422 8.232422 C 8.460286 8.004558 8.728841 7.825521 9.038086 7.695312 C 9.34733 7.565104 9.684244 7.5 10.048828 7.5 Z M 1.875 8.75 L 6.464844 8.75 C 6.321614 9.140625 6.25 9.557292 6.25 10 L 1.875 10 C 1.731771 10 1.617839 10.02767 1.533203 10.083008 C 1.448568 10.138347 1.385091 10.209961 1.342773 10.297852 C 1.300456 10.385742 1.272786 10.483398 1.259766 10.59082 C 1.246745 10.698242 1.240234 10.807292 1.240234 10.917969 C 1.240234 10.976562 1.241862 11.033529 1.245117 11.088867 C 1.248372 11.144206 1.25 11.197917 1.25 11.25 C 1.25 11.640625 1.32487 12.010092 1.474609 12.358398 C 1.624349 12.706706 1.822917 13.024089 2.070312 13.310547 C 2.317708 13.597006 2.602539 13.849284 2.924805 14.067383 C 3.24707 14.285482 3.580729 14.462891 3.925781 14.599609 C 3.854167 14.807943 3.806966 15.014648 3.78418 15.219727 C 3.761393 15.424805 3.75 15.638021 3.75 15.859375 C 3.261719 15.703125 2.791341 15.478516 2.338867 15.185547 C 1.886393 14.892578 1.48763 14.549154 1.142578 14.155273 C 0.797526 13.761394 0.520833 13.323568 0.3125 12.841797 C 0.104167 12.360026 0 11.848959 0 11.308594 L 0 10.625 C 0 10.371094 0.048828 10.130209 0.146484 9.902344 C 0.244141 9.674479 0.379232 9.474284 0.551758 9.301758 C 0.724284 9.129232 0.924479 8.994141 1.152344 8.896484 C 1.380208 8.798828 1.621094 8.75 1.875 8.75 Z M 10.107422 11.25 C 10.263672 11.25 10.411783 11.212565 10.551758 11.137695 C 10.691731 11.062826 10.813802 10.966797 10.917969 10.849609 C 11.022135 10.732422 11.103516 10.598959 11.162109 10.449219 C 11.220703 10.299479 11.25 10.14974 11.25 10 C 11.25 9.830729 11.217447 9.669597 11.152344 9.516602 C 11.087239 9.363607 10.997721 9.230144 10.883789 9.116211 C 10.769856 9.002279 10.636393 8.912761 10.483398 8.847656 C 10.330403 8.782553 10.169271 8.75 10 8.75 C 9.824219 8.75 9.661458 8.782553 9.511719 8.847656 C 9.361979 8.912761 9.230143 9.002279 9.116211 9.116211 C 9.002278 9.230144 8.91276 9.361979 8.847656 9.511719 C 8.782552 9.661459 8.75 9.824219 8.75 10 C 8.75 10.201823 8.785807 10.379232 8.857422 10.532227 C 8.929036 10.685222 9.025064 10.81543 9.145508 10.922852 C 9.26595 11.030273 9.40918 11.111654 9.575195 11.166992 C 9.741211 11.222331 9.918619 11.25 10.107422 11.25 Z M 16.25 15.625 C 16.25 15.371094 16.220703 15.120443 16.162109 14.873047 C 16.546223 14.794922 16.897785 14.669597 17.216797 14.49707 C 17.535807 14.324545 17.809244 14.111328 18.037109 13.857422 C 18.264973 13.603516 18.440754 13.310547 18.564453 12.978516 C 18.68815 12.646484 18.75 12.278646 18.75 11.875 C 18.75 11.705729 18.68815 11.559245 18.564453 11.435547 C 18.440754 11.31185 18.29427 11.25 18.125 11.25 L 13.535156 11.25 C 13.678385 10.859375 13.75 10.442709 13.75 10 L 18.125 10 C 18.378906 10 18.619791 10.048828 18.847656 10.146484 C 19.07552 10.244141 19.275715 10.379232 19.448242 10.551758 C 19.620768 10.724284 19.755859 10.924479 19.853516 11.152344 C 19.951172 11.380209 20 11.621094 20 11.875 C 20 12.460938 19.907227 12.991537 19.72168 13.466797 C 19.536133 13.942058 19.277344 14.360352 18.945312 14.72168 C 18.613281 15.083008 18.216145 15.382487 17.753906 15.620117 C 17.291666 15.857748 16.783854 16.0319 16.230469 16.142578 C 16.236979 16.051432 16.241861 15.96517 16.245117 15.883789 C 16.248371 15.802409 16.25 15.716146 16.25 15.625 Z M 5 15.625 C 5 15.364584 5.048828 15.120443 5.146484 14.892578 C 5.244141 14.664714 5.377604 14.466146 5.546875 14.296875 C 5.716146 14.127604 5.914713 13.994141 6.142578 13.896484 C 6.370442 13.798828 6.614583 13.75 6.875 13.75 L 13.125 13.75 C 13.385416 13.75 13.629557 13.798828 13.857422 13.896484 C 14.085286 13.994141 14.283854 14.127604 14.453125 14.296875 C 14.622395 14.466146 14.755858 14.664714 14.853516 14.892578 C 14.951171 15.120443 14.999999 15.364584 15 15.625 C 14.999999 16.341146 14.86328 16.971029 14.589844 17.514648 C 14.316405 18.058268 13.950194 18.513998 13.491211 18.881836 C 13.032226 19.249674 12.501627 19.527994 11.899414 19.716797 C 11.2972 19.9056 10.664062 20 10 20 C 9.335938 20 8.701172 19.907227 8.095703 19.72168 C 7.490234 19.536133 6.958008 19.259439 6.499023 18.891602 C 6.040039 18.523764 5.675456 18.066406 5.405273 17.519531 C 5.135091 16.972656 5 16.341146 5 15.625 Z M 13.75 15.625 C 13.75 15.455729 13.68815 15.309245 13.564453 15.185547 C 13.440755 15.06185 13.294271 15 13.125 15 L 6.875 15 C 6.705729 15 6.559244 15.06185 6.435547 15.185547 C 6.311849 15.309245 6.25 15.455729 6.25 15.625 C 6.25 16.165365 6.354167 16.632486 6.5625 17.026367 C 6.770833 17.420248 7.049153 17.744141 7.397461 17.998047 C 7.745768 18.251953 8.144531 18.440756 8.59375 18.564453 C 9.042969 18.68815 9.511719 18.75 10 18.75 C 10.488281 18.75 10.957031 18.68815 11.40625 18.564453 C 11.855469 18.440756 12.254231 18.251953 12.602539 17.998047 C 12.950846 17.744141 13.229166 17.420248 13.4375 17.026367 C 13.645833 16.632486 13.75 16.165365 13.75 15.625 Z " />
+                    <PathIcon
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Data="F1 M 2.5 3.75 L 2.5 3.671875 C 2.5 3.164062 2.600911 2.687176 2.802734 2.241211 C 3.004557 1.795248 3.277995 1.40625 3.623047 1.074219 C 3.968099 0.742188 4.366862 0.480145 4.819336 0.288086 C 5.27181 0.096029 5.748698 0 6.25 0 C 6.770833 0 7.259114 0.097656 7.714844 0.292969 C 8.170572 0.488281 8.567708 0.755209 8.90625 1.09375 C 9.244791 1.432293 9.511719 1.829428 9.707031 2.285156 C 9.902344 2.740887 10 3.229168 10 3.75 C 10 4.270834 9.902344 4.759115 9.707031 5.214844 C 9.511719 5.670573 9.244791 6.067709 8.90625 6.40625 C 8.567708 6.744792 8.170572 7.011719 7.714844 7.207031 C 7.259114 7.402344 6.770833 7.5 6.25 7.5 C 5.729167 7.5 5.240885 7.402344 4.785156 7.207031 C 4.329427 7.011719 3.932292 6.744792 3.59375 6.40625 C 3.255208 6.067709 2.988281 5.670573 2.792969 5.214844 C 2.597656 4.759115 2.5 4.270834 2.5 3.75 Z M 8.75 3.75 L 8.75 3.701172 C 8.75 3.362631 8.681641 3.045248 8.544922 2.749023 C 8.408203 2.452801 8.225911 2.194012 7.998047 1.972656 C 7.770182 1.751303 7.504883 1.575521 7.202148 1.445312 C 6.899414 1.315105 6.582031 1.25 6.25 1.25 C 5.904948 1.25 5.581055 1.316732 5.27832 1.450195 C 4.975586 1.58366 4.711914 1.762695 4.487305 1.987305 C 4.262695 2.211914 4.083659 2.477215 3.950195 2.783203 C 3.816731 3.089193 3.75 3.411459 3.75 3.75 C 3.75 4.095053 3.816731 4.418946 3.950195 4.72168 C 4.083659 5.024415 4.262695 5.288087 4.487305 5.512695 C 4.711914 5.737306 4.975586 5.916342 5.27832 6.049805 C 5.581055 6.183269 5.904948 6.25 6.25 6.25 C 6.588542 6.25 6.910807 6.183269 7.216797 6.049805 C 7.522786 5.916342 7.788085 5.737306 8.012695 5.512695 C 8.237305 5.288087 8.416341 5.024415 8.549805 4.72168 C 8.683268 4.418946 8.75 4.095053 8.75 3.75 Z M 12.5 6.201172 C 12.5 5.862631 12.568359 5.545248 12.705078 5.249023 C 12.841797 4.9528 13.024088 4.694011 13.251953 4.472656 C 13.479816 4.251303 13.745116 4.075521 14.047852 3.945312 C 14.350585 3.815105 14.667968 3.75 15 3.75 C 15.338541 3.75 15.660807 3.816732 15.966797 3.950195 C 16.272785 4.08366 16.538086 4.262696 16.762695 4.487305 C 16.987305 4.711915 17.16634 4.977215 17.299805 5.283203 C 17.433268 5.589193 17.5 5.911459 17.5 6.25 C 17.5 6.582031 17.434895 6.899414 17.304688 7.202148 C 17.174479 7.504883 16.998697 7.770183 16.777344 7.998047 C 16.555988 8.225912 16.297199 8.408203 16.000977 8.544922 C 15.704752 8.681641 15.387369 8.75 15.048828 8.75 C 14.684244 8.75 14.34733 8.684896 14.038086 8.554688 C 13.728841 8.424479 13.460286 8.245443 13.232422 8.017578 C 13.004557 7.789714 12.82552 7.521159 12.695312 7.211914 C 12.565104 6.90267 12.5 6.565756 12.5 6.201172 Z M 16.25 6.25 C 16.25 6.08073 16.217447 5.919598 16.152344 5.766602 C 16.087238 5.613607 15.997721 5.480144 15.883789 5.366211 C 15.769856 5.252279 15.636393 5.162761 15.483398 5.097656 C 15.330403 5.032553 15.169271 5.000001 15 5 C 14.824218 5.000001 14.661457 5.032553 14.511719 5.097656 C 14.361979 5.162761 14.230143 5.252279 14.116211 5.366211 C 14.002277 5.480144 13.91276 5.611979 13.847656 5.761719 C 13.782552 5.911459 13.75 6.074219 13.75 6.25 C 13.75 6.425781 13.782552 6.59017 13.847656 6.743164 C 13.91276 6.896159 14.00065 7.027995 14.111328 7.138672 C 14.222005 7.24935 14.353841 7.33724 14.506836 7.402344 C 14.65983 7.467448 14.824218 7.5 15 7.5 C 15.17578 7.5 15.338541 7.467448 15.488281 7.402344 C 15.638021 7.33724 15.769856 7.247722 15.883789 7.133789 C 15.997721 7.019857 16.087238 6.888021 16.152344 6.738281 C 16.217447 6.588542 16.25 6.425781 16.25 6.25 Z M 10.048828 7.5 C 10.387369 7.5 10.704752 7.568359 11.000977 7.705078 C 11.2972 7.841797 11.555989 8.024089 11.777344 8.251953 C 11.998697 8.479818 12.174479 8.745117 12.304688 9.047852 C 12.434896 9.350586 12.5 9.667969 12.5 10 C 12.5 10.345053 12.434896 10.670573 12.304688 10.976562 C 12.174479 11.282553 11.99707 11.547852 11.772461 11.772461 C 11.547852 11.99707 11.282552 12.174479 10.976562 12.304688 C 10.670572 12.434896 10.345052 12.5 10 12.5 C 9.667969 12.5 9.350586 12.434896 9.047852 12.304688 C 8.745117 12.174479 8.479817 11.998698 8.251953 11.777344 C 8.024088 11.55599 7.841796 11.297201 7.705078 11.000977 C 7.568359 10.704753 7.5 10.38737 7.5 10.048828 C 7.5 9.684245 7.565104 9.347331 7.695312 9.038086 C 7.825521 8.728842 8.004557 8.460287 8.232422 8.232422 C 8.460286 8.004558 8.728841 7.825521 9.038086 7.695312 C 9.34733 7.565104 9.684244 7.5 10.048828 7.5 Z M 1.875 8.75 L 6.464844 8.75 C 6.321614 9.140625 6.25 9.557292 6.25 10 L 1.875 10 C 1.731771 10 1.617839 10.02767 1.533203 10.083008 C 1.448568 10.138347 1.385091 10.209961 1.342773 10.297852 C 1.300456 10.385742 1.272786 10.483398 1.259766 10.59082 C 1.246745 10.698242 1.240234 10.807292 1.240234 10.917969 C 1.240234 10.976562 1.241862 11.033529 1.245117 11.088867 C 1.248372 11.144206 1.25 11.197917 1.25 11.25 C 1.25 11.640625 1.32487 12.010092 1.474609 12.358398 C 1.624349 12.706706 1.822917 13.024089 2.070312 13.310547 C 2.317708 13.597006 2.602539 13.849284 2.924805 14.067383 C 3.24707 14.285482 3.580729 14.462891 3.925781 14.599609 C 3.854167 14.807943 3.806966 15.014648 3.78418 15.219727 C 3.761393 15.424805 3.75 15.638021 3.75 15.859375 C 3.261719 15.703125 2.791341 15.478516 2.338867 15.185547 C 1.886393 14.892578 1.48763 14.549154 1.142578 14.155273 C 0.797526 13.761394 0.520833 13.323568 0.3125 12.841797 C 0.104167 12.360026 0 11.848959 0 11.308594 L 0 10.625 C 0 10.371094 0.048828 10.130209 0.146484 9.902344 C 0.244141 9.674479 0.379232 9.474284 0.551758 9.301758 C 0.724284 9.129232 0.924479 8.994141 1.152344 8.896484 C 1.380208 8.798828 1.621094 8.75 1.875 8.75 Z M 10.107422 11.25 C 10.263672 11.25 10.411783 11.212565 10.551758 11.137695 C 10.691731 11.062826 10.813802 10.966797 10.917969 10.849609 C 11.022135 10.732422 11.103516 10.598959 11.162109 10.449219 C 11.220703 10.299479 11.25 10.14974 11.25 10 C 11.25 9.830729 11.217447 9.669597 11.152344 9.516602 C 11.087239 9.363607 10.997721 9.230144 10.883789 9.116211 C 10.769856 9.002279 10.636393 8.912761 10.483398 8.847656 C 10.330403 8.782553 10.169271 8.75 10 8.75 C 9.824219 8.75 9.661458 8.782553 9.511719 8.847656 C 9.361979 8.912761 9.230143 9.002279 9.116211 9.116211 C 9.002278 9.230144 8.91276 9.361979 8.847656 9.511719 C 8.782552 9.661459 8.75 9.824219 8.75 10 C 8.75 10.201823 8.785807 10.379232 8.857422 10.532227 C 8.929036 10.685222 9.025064 10.81543 9.145508 10.922852 C 9.26595 11.030273 9.40918 11.111654 9.575195 11.166992 C 9.741211 11.222331 9.918619 11.25 10.107422 11.25 Z M 16.25 15.625 C 16.25 15.371094 16.220703 15.120443 16.162109 14.873047 C 16.546223 14.794922 16.897785 14.669597 17.216797 14.49707 C 17.535807 14.324545 17.809244 14.111328 18.037109 13.857422 C 18.264973 13.603516 18.440754 13.310547 18.564453 12.978516 C 18.68815 12.646484 18.75 12.278646 18.75 11.875 C 18.75 11.705729 18.68815 11.559245 18.564453 11.435547 C 18.440754 11.31185 18.29427 11.25 18.125 11.25 L 13.535156 11.25 C 13.678385 10.859375 13.75 10.442709 13.75 10 L 18.125 10 C 18.378906 10 18.619791 10.048828 18.847656 10.146484 C 19.07552 10.244141 19.275715 10.379232 19.448242 10.551758 C 19.620768 10.724284 19.755859 10.924479 19.853516 11.152344 C 19.951172 11.380209 20 11.621094 20 11.875 C 20 12.460938 19.907227 12.991537 19.72168 13.466797 C 19.536133 13.942058 19.277344 14.360352 18.945312 14.72168 C 18.613281 15.083008 18.216145 15.382487 17.753906 15.620117 C 17.291666 15.857748 16.783854 16.0319 16.230469 16.142578 C 16.236979 16.051432 16.241861 15.96517 16.245117 15.883789 C 16.248371 15.802409 16.25 15.716146 16.25 15.625 Z M 5 15.625 C 5 15.364584 5.048828 15.120443 5.146484 14.892578 C 5.244141 14.664714 5.377604 14.466146 5.546875 14.296875 C 5.716146 14.127604 5.914713 13.994141 6.142578 13.896484 C 6.370442 13.798828 6.614583 13.75 6.875 13.75 L 13.125 13.75 C 13.385416 13.75 13.629557 13.798828 13.857422 13.896484 C 14.085286 13.994141 14.283854 14.127604 14.453125 14.296875 C 14.622395 14.466146 14.755858 14.664714 14.853516 14.892578 C 14.951171 15.120443 14.999999 15.364584 15 15.625 C 14.999999 16.341146 14.86328 16.971029 14.589844 17.514648 C 14.316405 18.058268 13.950194 18.513998 13.491211 18.881836 C 13.032226 19.249674 12.501627 19.527994 11.899414 19.716797 C 11.2972 19.9056 10.664062 20 10 20 C 9.335938 20 8.701172 19.907227 8.095703 19.72168 C 7.490234 19.536133 6.958008 19.259439 6.499023 18.891602 C 6.040039 18.523764 5.675456 18.066406 5.405273 17.519531 C 5.135091 16.972656 5 16.341146 5 15.625 Z M 13.75 15.625 C 13.75 15.455729 13.68815 15.309245 13.564453 15.185547 C 13.440755 15.06185 13.294271 15 13.125 15 L 6.875 15 C 6.705729 15 6.559244 15.06185 6.435547 15.185547 C 6.311849 15.309245 6.25 15.455729 6.25 15.625 C 6.25 16.165365 6.354167 16.632486 6.5625 17.026367 C 6.770833 17.420248 7.049153 17.744141 7.397461 17.998047 C 7.745768 18.251953 8.144531 18.440756 8.59375 18.564453 C 9.042969 18.68815 9.511719 18.75 10 18.75 C 10.488281 18.75 10.957031 18.68815 11.40625 18.564453 C 11.855469 18.440756 12.254231 18.251953 12.602539 17.998047 C 12.950846 17.744141 13.229166 17.420248 13.4375 17.026367 C 13.645833 16.632486 13.75 16.165365 13.75 15.625 Z " />
                 </muxc:NavigationViewItem.Icon>
             </controls:WinoNavigationViewItem>
         </DataTemplate>
 
         <!--  New Mail  -->
         <DataTemplate x:Key="CreateNewMailTemplate" x:DataType="menu:NewMailMenuItem">
-            <controls:WinoNavigationViewItem Height="50"
-                                             DataContext="{x:Bind}"
-                                             SelectsOnInvoked="False">
+            <controls:WinoNavigationViewItem
+                Height="50"
+                DataContext="{x:Bind}"
+                SelectsOnInvoked="False">
                 <muxc:NavigationViewItem.Icon>
                     <controls:WinoFontIcon Icon="NewMail" />
                 </muxc:NavigationViewItem.Icon>
-                <TextBlock VerticalAlignment="Center"
-                           FontSize="16"
-                           Style="{StaticResource FlyoutPickerTitleTextBlockStyle}"
-                           Text="{x:Bind domain:Translator.MenuNewMail}" />
+                <TextBlock
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Style="{StaticResource FlyoutPickerTitleTextBlockStyle}"
+                    Text="{x:Bind domain:Translator.MenuNewMail}" />
             </controls:WinoNavigationViewItem>
         </DataTemplate>
 
         <!--  Inbox or any other folders.  -->
         <DataTemplate x:Key="FolderMenuTemplate" x:DataType="menu:FolderMenuItem">
-            <controls:WinoNavigationViewItem MinHeight="30"
-                                             AllowDrop="True"
-                                             ContextRequested="MenuItemContextRequested"
-                                             DataContext="{x:Bind}"
-                                             DragEnter="ItemDragEnterOnFolder"
-                                             DragLeave="ItemDragLeaveFromFolder"
-                                             Drop="ItemDroppedOnFolder"
-                                             FontSize="50"
-                                             FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightByChildSelectedState(IsSelected), Mode=OneWay}"
-                                             IsExpanded="{x:Bind IsExpanded, Mode=TwoWay}"
-                                             IsSelected="{x:Bind IsSelected, Mode=TwoWay}"
-                                             MenuItemsSource="{x:Bind SubMenuItems, Mode=OneWay}"
-                                             SelectsOnInvoked="{x:Bind IsMoveTarget, Mode=OneWay}">
+            <controls:WinoNavigationViewItem
+                MinHeight="30"
+                AllowDrop="True"
+                ContextRequested="MenuItemContextRequested"
+                DataContext="{x:Bind}"
+                DragEnter="ItemDragEnterOnFolder"
+                DragLeave="ItemDragLeaveFromFolder"
+                Drop="ItemDroppedOnFolder"
+                FontSize="50"
+                FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightByChildSelectedState(IsSelected), Mode=OneWay}"
+                IsExpanded="{x:Bind IsExpanded, Mode=TwoWay}"
+                IsSelected="{x:Bind IsSelected, Mode=TwoWay}"
+                MenuItemsSource="{x:Bind SubMenuItems, Mode=OneWay}"
+                SelectsOnInvoked="{x:Bind IsMoveTarget, Mode=OneWay}">
                 <animations:Implicit.Animations>
                     <animations:ScaleAnimation Duration="0:0:0.5" />
                 </animations:Implicit.Animations>
@@ -184,40 +198,45 @@
                     <controls:WinoFontIcon FontSize="64" Icon="{x:Bind helpers:XamlHelpers.GetSpecialFolderPathIconGeometry(Parameter.SpecialFolderType)}" />
                 </controls:WinoNavigationViewItem.Icon>
                 <muxc:NavigationViewItem.InfoBadge>
-                    <muxc:InfoBadge x:Name="FolderInfoBadge"
-                                    Background="{StaticResource SystemAccentColor}"
-                                    Foreground="White"
-                                    Visibility="{x:Bind helpers:XamlHelpers.CountToVisibilityConverter(UnreadItemCount), Mode=OneWay}"
-                                    Value="{x:Bind UnreadItemCount, Mode=OneWay}" />
+                    <muxc:InfoBadge
+                        x:Name="FolderInfoBadge"
+                        Background="{StaticResource SystemAccentColor}"
+                        Foreground="White"
+                        Visibility="{x:Bind helpers:XamlHelpers.CountToVisibilityConverter(UnreadItemCount), Mode=OneWay}"
+                        Value="{x:Bind UnreadItemCount, Mode=OneWay}" />
                 </muxc:NavigationViewItem.InfoBadge>
                 <muxc:NavigationViewItem.Content>
-                    <Grid x:Name="FolderBackgroundGrid"
-                          Padding="2"
-                          VerticalAlignment="Center">
+                    <Grid
+                        x:Name="FolderBackgroundGrid"
+                        Padding="2"
+                        VerticalAlignment="Center">
                         <ToolTipService.ToolTip>
                             <ToolTip Content="{x:Bind FolderName, Mode=OneWay}" />
                         </ToolTipService.ToolTip>
-                        <Grid x:Name="BackgroundColorGrid"
-                              x:Load="{x:Bind HasTextColor, Mode=OneWay}"
-                              Background="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(Parameter.BackgroundColorHex), Mode=OneWay}"
-                              CornerRadius="3">
-                            <TextBlock x:Name="CustomColorTitle"
-                                       Margin="4,0,0,0"
-                                       VerticalAlignment="Center"
-                                       FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightBySyncState(IsSelected), Mode=OneWay}"
-                                       Foreground="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(Parameter.TextColorHex), Mode=OneWay}"
-                                       Style="{StaticResource BodyTextBlockStyle}"
-                                       Text="{x:Bind FolderName, Mode=OneWay}"
-                                       TextWrapping="WrapWholeWords" />
+                        <Grid
+                            x:Name="BackgroundColorGrid"
+                            x:Load="{x:Bind HasTextColor, Mode=OneWay}"
+                            Background="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(Parameter.BackgroundColorHex), Mode=OneWay}"
+                            CornerRadius="3">
+                            <TextBlock
+                                x:Name="CustomColorTitle"
+                                Margin="4,0,0,0"
+                                VerticalAlignment="Center"
+                                FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightBySyncState(IsSelected), Mode=OneWay}"
+                                Foreground="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(Parameter.TextColorHex), Mode=OneWay}"
+                                Style="{StaticResource BodyTextBlockStyle}"
+                                Text="{x:Bind FolderName, Mode=OneWay}"
+                                TextWrapping="WrapWholeWords" />
                         </Grid>
 
-                        <TextBlock x:Name="NormalTitle"
-                                   VerticalAlignment="Center"
-                                   x:Load="{x:Bind HasTextColor, Converter={StaticResource ReverseBooleanConverter}}"
-                                   FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightBySyncState(IsSelected), Mode=OneWay}"
-                                   Style="{StaticResource BodyTextBlockStyle}"
-                                   Text="{x:Bind FolderName, Mode=OneWay}"
-                                   TextWrapping="WrapWholeWords" />
+                        <TextBlock
+                            x:Name="NormalTitle"
+                            VerticalAlignment="Center"
+                            x:Load="{x:Bind HasTextColor, Converter={StaticResource ReverseBooleanConverter}}"
+                            FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightBySyncState(IsSelected), Mode=OneWay}"
+                            Style="{StaticResource BodyTextBlockStyle}"
+                            Text="{x:Bind FolderName, Mode=OneWay}"
+                            TextWrapping="WrapWholeWords" />
                     </Grid>
                 </muxc:NavigationViewItem.Content>
             </controls:WinoNavigationViewItem>
@@ -225,22 +244,24 @@
 
         <!--  Merged Inbox  -->
         <DataTemplate x:Key="MergedAccountTemplate" x:DataType="menu:MergedAccountMenuItem">
-            <controls:AccountNavigationItem x:Name="AccountItem"
-                                            BindingData="{x:Bind}"
-                                            HorizontalContentAlignment="Stretch"
-                                            VerticalContentAlignment="Stretch"
-                                            DataContext="{x:Bind}"
-                                            IsActiveAccount="{x:Bind IsSelected, Mode=TwoWay}"
-                                            IsExpanded="{x:Bind IsExpanded, Mode=TwoWay}"
-                                            MenuItemsSource="{x:Bind SubMenuItems}"
-                                            Style="{StaticResource SingleAccountNavigationViewItemTemplate}"
-                                            SelectsOnInvoked="False">
+            <controls:AccountNavigationItem
+                x:Name="AccountItem"
+                HorizontalContentAlignment="Stretch"
+                VerticalContentAlignment="Stretch"
+                BindingData="{x:Bind}"
+                DataContext="{x:Bind}"
+                IsActiveAccount="{x:Bind IsSelected, Mode=TwoWay}"
+                IsExpanded="{x:Bind IsExpanded, Mode=TwoWay}"
+                MenuItemsSource="{x:Bind SubMenuItems}"
+                SelectsOnInvoked="False"
+                Style="{StaticResource SingleAccountNavigationViewItemTemplate}">
                 <muxc:NavigationViewItem.InfoBadge>
-                    <muxc:InfoBadge x:Name="FolderInfoBadge"
-                                    Background="{StaticResource SystemAccentColor}"
-                                    Foreground="White"
-                                    Visibility="{x:Bind helpers:XamlHelpers.CountToVisibilityConverter(UnreadItemCount), Mode=OneWay}"
-                                    Value="{x:Bind UnreadItemCount, Mode=OneWay}" />
+                    <muxc:InfoBadge
+                        x:Name="FolderInfoBadge"
+                        Background="{StaticResource SystemAccentColor}"
+                        Foreground="White"
+                        Visibility="{x:Bind helpers:XamlHelpers.CountToVisibilityConverter(UnreadItemCount), Mode=OneWay}"
+                        Value="{x:Bind UnreadItemCount, Mode=OneWay}" />
                 </muxc:NavigationViewItem.InfoBadge>
                 <controls:WinoNavigationViewItem.ContentTransitions>
                     <TransitionCollection>
@@ -253,17 +274,19 @@
 
                 <Grid MinHeight="50">
                     <StackPanel VerticalAlignment="Center" Spacing="0">
-                        <TextBlock x:Name="AccountNameTextblock"
-                                   FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightByChildSelectedState(IsChildSelected), Mode=OneWay}"
-                                   MaxLines="1"
-                                   Style="{StaticResource BodyTextBlockStyle}"
-                                   Text="{x:Bind MergedAccountName, Mode=OneWay}"
-                                   TextTrimming="CharacterEllipsis" />
+                        <TextBlock
+                            x:Name="AccountNameTextblock"
+                            FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightByChildSelectedState(IsChildSelected), Mode=OneWay}"
+                            MaxLines="1"
+                            Style="{StaticResource BodyTextBlockStyle}"
+                            Text="{x:Bind MergedAccountName, Mode=OneWay}"
+                            TextTrimming="CharacterEllipsis" />
 
-                        <TextBlock FontSize="12"
-                                   MaxLines="1"
-                                   Style="{StaticResource CaptionTextBlockStyle}"
-                                   TextTrimming="CharacterEllipsis">
+                        <TextBlock
+                            FontSize="12"
+                            MaxLines="1"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            TextTrimming="CharacterEllipsis">
                             <Run Text="{x:Bind MergedAccountCount}" /><Run Text="{x:Bind domain:Translator.MenuMergedAccountItemAccountsSuffix}" />
                         </TextBlock>
                     </StackPanel>
@@ -273,18 +296,19 @@
 
         <!--  Merged Account Common Folder Item  -->
         <DataTemplate x:Key="MergedAccountFolderMenuItemTemplate" x:DataType="menu:MergedAccountFolderMenuItem">
-            <controls:WinoNavigationViewItem MinHeight="30"
-                                             AllowDrop="True"
-                                             ContextRequested="MenuItemContextRequested"
-                                             DataContext="{x:Bind}"
-                                             DragEnter="ItemDragEnterOnFolder"
-                                             DragLeave="ItemDragLeaveFromFolder"
-                                             Drop="ItemDroppedOnFolder"
-                                             FontSize="50"
-                                             FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightByChildSelectedState(IsSelected), Mode=OneWay}"
-                                             IsExpanded="{x:Bind IsExpanded, Mode=TwoWay}"
-                                             IsSelected="{x:Bind IsSelected, Mode=TwoWay}"
-                                             SelectsOnInvoked="True">
+            <controls:WinoNavigationViewItem
+                MinHeight="30"
+                AllowDrop="True"
+                ContextRequested="MenuItemContextRequested"
+                DataContext="{x:Bind}"
+                DragEnter="ItemDragEnterOnFolder"
+                DragLeave="ItemDragLeaveFromFolder"
+                Drop="ItemDroppedOnFolder"
+                FontSize="50"
+                FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightByChildSelectedState(IsSelected), Mode=OneWay}"
+                IsExpanded="{x:Bind IsExpanded, Mode=TwoWay}"
+                IsSelected="{x:Bind IsSelected, Mode=TwoWay}"
+                SelectsOnInvoked="True">
                 <animations:Implicit.Animations>
                     <animations:ScaleAnimation Duration="0:0:0.5" />
                 </animations:Implicit.Animations>
@@ -292,37 +316,41 @@
                     <controls:WinoFontIcon FontSize="64" Icon="{x:Bind helpers:XamlHelpers.GetSpecialFolderPathIconGeometry(FolderType)}" />
                 </controls:WinoNavigationViewItem.Icon>
                 <muxc:NavigationViewItem.InfoBadge>
-                    <muxc:InfoBadge x:Name="FolderInfoBadge"
-                                    Background="{StaticResource SystemAccentColor}"
-                                    Foreground="White"
-                                    Visibility="{x:Bind helpers:XamlHelpers.CountToVisibilityConverter(UnreadItemCount), Mode=OneWay}"
-                                    Value="{x:Bind UnreadItemCount, Mode=OneWay}" />
+                    <muxc:InfoBadge
+                        x:Name="FolderInfoBadge"
+                        Background="{StaticResource SystemAccentColor}"
+                        Foreground="White"
+                        Visibility="{x:Bind helpers:XamlHelpers.CountToVisibilityConverter(UnreadItemCount), Mode=OneWay}"
+                        Value="{x:Bind UnreadItemCount, Mode=OneWay}" />
                 </muxc:NavigationViewItem.InfoBadge>
-                <Grid x:Name="FolderBackgroundGrid"
-                      Padding="2"
-                      VerticalAlignment="Center">
+                <Grid
+                    x:Name="FolderBackgroundGrid"
+                    Padding="2"
+                    VerticalAlignment="Center">
                     <ToolTipService.ToolTip>
                         <ToolTip Content="{x:Bind FolderName, Mode=OneWay}" />
                     </ToolTipService.ToolTip>
-                    <TextBlock x:Name="NormalTitle"
-                               VerticalAlignment="Center"
-                               FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightBySyncState(IsSelected), Mode=OneWay}"
-                               Style="{StaticResource BodyTextBlockStyle}"
-                               Text="{x:Bind FolderName, Mode=OneWay}"
-                               TextWrapping="WrapWholeWords" />
+                    <TextBlock
+                        x:Name="NormalTitle"
+                        VerticalAlignment="Center"
+                        FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightBySyncState(IsSelected), Mode=OneWay}"
+                        Style="{StaticResource BodyTextBlockStyle}"
+                        Text="{x:Bind FolderName, Mode=OneWay}"
+                        TextWrapping="WrapWholeWords" />
                 </Grid>
             </controls:WinoNavigationViewItem>
         </DataTemplate>
 
         <!--  Merged Account More Expansion Item  -->
         <DataTemplate x:Key="MergedAccountMoreFolderItemTemplate" x:DataType="menu:MergedAccountMoreFolderMenuItem">
-            <controls:WinoNavigationViewItem MinHeight="30"
-                                             Content="{x:Bind domain:Translator.More}"
-                                             FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightByChildSelectedState(IsSelected), Mode=OneWay}"
-                                             IsExpanded="{x:Bind IsExpanded, Mode=TwoWay}"
-                                             IsSelected="{x:Bind IsSelected, Mode=TwoWay}"
-                                             MenuItemsSource="{x:Bind SubMenuItems, Mode=OneWay}"
-                                             SelectsOnInvoked="True">
+            <controls:WinoNavigationViewItem
+                MinHeight="30"
+                Content="{x:Bind domain:Translator.More}"
+                FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightByChildSelectedState(IsSelected), Mode=OneWay}"
+                IsExpanded="{x:Bind IsExpanded, Mode=TwoWay}"
+                IsSelected="{x:Bind IsSelected, Mode=TwoWay}"
+                MenuItemsSource="{x:Bind SubMenuItems, Mode=OneWay}"
+                SelectsOnInvoked="True">
                 <animations:Implicit.Animations>
                     <animations:ScaleAnimation Duration="0:0:0.5" />
                 </animations:Implicit.Animations>
@@ -350,38 +378,42 @@
 
         <!--  Rating Item  -->
         <DataTemplate x:Key="RatingItemTemplate" x:DataType="menu:RateMenuItem">
-            <controls:WinoNavigationViewItem Content="{x:Bind domain:Translator.MenuRate}"
-                                             DataContext="{x:Bind}"
-                                             SelectsOnInvoked="False">
+            <controls:WinoNavigationViewItem
+                Content="{x:Bind domain:Translator.MenuRate}"
+                DataContext="{x:Bind}"
+                SelectsOnInvoked="False">
                 <muxc:NavigationViewItem.Icon>
-                    <PathIcon HorizontalAlignment="Center"
-                              VerticalAlignment="Center"
-                              Data="F1 M 0 6.689453 C 0 5.940756 0.139974 5.237631 0.419922 4.580078 C 0.69987 3.922527 1.082357 3.346355 1.567383 2.851562 C 2.052409 2.356771 2.62207 1.966146 3.276367 1.679688 C 3.930664 1.39323 4.635417 1.25 5.390625 1.25 C 6.119792 1.25 6.814778 1.389975 7.475586 1.669922 C 8.136393 1.949871 8.723958 2.347006 9.238281 2.861328 C 9.368489 2.991537 9.493814 3.11849 9.614258 3.242188 C 9.7347 3.365887 9.860025 3.49284 9.990234 3.623047 C 10.113932 3.49284 10.236002 3.365887 10.356445 3.242188 C 10.476888 3.11849 10.602213 2.994793 10.732422 2.871094 C 11.240234 2.363281 11.822916 1.971029 12.480469 1.694336 C 13.138021 1.417645 13.828125 1.279297 14.550781 1.279297 C 15.305989 1.279297 16.015625 1.424154 16.679688 1.713867 C 17.34375 2.003582 17.921549 2.397461 18.413086 2.895508 C 18.904621 3.393555 19.291992 3.974609 19.575195 4.638672 C 19.858398 5.302734 20 6.01237 20 6.767578 C 20 7.483725 19.864908 8.178712 19.594727 8.852539 C 19.324543 9.526367 18.935547 10.117188 18.427734 10.625 L 10.625 18.505859 C 10.462239 18.668619 10.263672 18.75 10.029297 18.75 C 9.801432 18.75 9.606119 18.668619 9.443359 18.505859 L 1.591797 10.576172 C 1.077474 10.055339 0.683594 9.459636 0.410156 8.789062 C 0.136719 8.11849 0 7.418621 0 6.689453 Z M 18.75 6.767578 C 18.75 6.188151 18.640949 5.641276 18.422852 5.126953 C 18.204752 4.612631 17.905273 4.163412 17.524414 3.779297 C 17.143555 3.395184 16.699219 3.09082 16.191406 2.866211 C 15.683594 2.641602 15.136719 2.529297 14.550781 2.529297 C 13.997396 2.529297 13.468424 2.635092 12.963867 2.84668 C 12.45931 3.05827 12.011719 3.359375 11.621094 3.75 C 11.497396 3.873699 11.375325 4.000651 11.254883 4.130859 C 11.134439 4.261068 11.009114 4.384767 10.878906 4.501953 C 10.748697 4.625651 10.613606 4.716797 10.473633 4.775391 C 10.333658 4.833984 10.172525 4.863281 9.990234 4.863281 C 9.814453 4.863281 9.654947 4.832357 9.511719 4.770508 C 9.368489 4.70866 9.231771 4.619142 9.101562 4.501953 C 8.971354 4.378256 8.846028 4.25293 8.725586 4.125977 C 8.605143 3.999023 8.479817 3.870443 8.349609 3.740234 C 7.945963 3.3431 7.495117 3.037109 6.99707 2.822266 C 6.499023 2.607422 5.963542 2.5 5.390625 2.5 C 4.811198 2.5 4.269206 2.610678 3.764648 2.832031 C 3.260091 3.053387 2.822266 3.352865 2.451172 3.730469 C 2.080078 4.108074 1.787109 4.55241 1.572266 5.063477 C 1.357422 5.574545 1.25 6.116537 1.25 6.689453 C 1.25 7.24935 1.357422 7.791342 1.572266 8.31543 C 1.787109 8.839519 2.089844 9.300131 2.480469 9.697266 L 10.029297 17.324219 L 17.539062 9.746094 C 17.929688 9.348959 18.229166 8.891602 18.4375 8.374023 C 18.645832 7.856445 18.75 7.320964 18.75 6.767578 Z " />
+                    <PathIcon
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Data="F1 M 0 6.689453 C 0 5.940756 0.139974 5.237631 0.419922 4.580078 C 0.69987 3.922527 1.082357 3.346355 1.567383 2.851562 C 2.052409 2.356771 2.62207 1.966146 3.276367 1.679688 C 3.930664 1.39323 4.635417 1.25 5.390625 1.25 C 6.119792 1.25 6.814778 1.389975 7.475586 1.669922 C 8.136393 1.949871 8.723958 2.347006 9.238281 2.861328 C 9.368489 2.991537 9.493814 3.11849 9.614258 3.242188 C 9.7347 3.365887 9.860025 3.49284 9.990234 3.623047 C 10.113932 3.49284 10.236002 3.365887 10.356445 3.242188 C 10.476888 3.11849 10.602213 2.994793 10.732422 2.871094 C 11.240234 2.363281 11.822916 1.971029 12.480469 1.694336 C 13.138021 1.417645 13.828125 1.279297 14.550781 1.279297 C 15.305989 1.279297 16.015625 1.424154 16.679688 1.713867 C 17.34375 2.003582 17.921549 2.397461 18.413086 2.895508 C 18.904621 3.393555 19.291992 3.974609 19.575195 4.638672 C 19.858398 5.302734 20 6.01237 20 6.767578 C 20 7.483725 19.864908 8.178712 19.594727 8.852539 C 19.324543 9.526367 18.935547 10.117188 18.427734 10.625 L 10.625 18.505859 C 10.462239 18.668619 10.263672 18.75 10.029297 18.75 C 9.801432 18.75 9.606119 18.668619 9.443359 18.505859 L 1.591797 10.576172 C 1.077474 10.055339 0.683594 9.459636 0.410156 8.789062 C 0.136719 8.11849 0 7.418621 0 6.689453 Z M 18.75 6.767578 C 18.75 6.188151 18.640949 5.641276 18.422852 5.126953 C 18.204752 4.612631 17.905273 4.163412 17.524414 3.779297 C 17.143555 3.395184 16.699219 3.09082 16.191406 2.866211 C 15.683594 2.641602 15.136719 2.529297 14.550781 2.529297 C 13.997396 2.529297 13.468424 2.635092 12.963867 2.84668 C 12.45931 3.05827 12.011719 3.359375 11.621094 3.75 C 11.497396 3.873699 11.375325 4.000651 11.254883 4.130859 C 11.134439 4.261068 11.009114 4.384767 10.878906 4.501953 C 10.748697 4.625651 10.613606 4.716797 10.473633 4.775391 C 10.333658 4.833984 10.172525 4.863281 9.990234 4.863281 C 9.814453 4.863281 9.654947 4.832357 9.511719 4.770508 C 9.368489 4.70866 9.231771 4.619142 9.101562 4.501953 C 8.971354 4.378256 8.846028 4.25293 8.725586 4.125977 C 8.605143 3.999023 8.479817 3.870443 8.349609 3.740234 C 7.945963 3.3431 7.495117 3.037109 6.99707 2.822266 C 6.499023 2.607422 5.963542 2.5 5.390625 2.5 C 4.811198 2.5 4.269206 2.610678 3.764648 2.832031 C 3.260091 3.053387 2.822266 3.352865 2.451172 3.730469 C 2.080078 4.108074 1.787109 4.55241 1.572266 5.063477 C 1.357422 5.574545 1.25 6.116537 1.25 6.689453 C 1.25 7.24935 1.357422 7.791342 1.572266 8.31543 C 1.787109 8.839519 2.089844 9.300131 2.480469 9.697266 L 10.029297 17.324219 L 17.539062 9.746094 C 17.929688 9.348959 18.229166 8.891602 18.4375 8.374023 C 18.645832 7.856445 18.75 7.320964 18.75 6.767578 Z " />
                 </muxc:NavigationViewItem.Icon>
             </controls:WinoNavigationViewItem>
         </DataTemplate>
 
-        <selectors:NavigationMenuTemplateSelector x:Key="NavigationMenuTemplateSelector"
-                                                  AccountManagementTemplate="{StaticResource ManageAccountsTemplate}"
-                                                  ClickableAccountMenuTemplate="{StaticResource ClickableAccountMenuTemplate}"
-                                                  FixAuthenticationIssueTemplate="{StaticResource FixAuthenticationIssueTemplate}"
-                                                  FixMissingFolderConfigTemplate="{StaticResource FixMissingFolderConfig}"
-                                                  FolderMenuTemplate="{StaticResource FolderMenuTemplate}"
-                                                  MergedAccountFolderTemplate="{StaticResource MergedAccountFolderMenuItemTemplate}"
-                                                  MergedAccountMoreExpansionItemTemplate="{StaticResource MergedAccountMoreFolderItemTemplate}"
-                                                  MergedAccountTemplate="{StaticResource MergedAccountTemplate}"
-                                                  NewMailTemplate="{StaticResource CreateNewMailTemplate}"
-                                                  RatingItemTemplate="{StaticResource RatingItemTemplate}"
-                                                  SeperatorTemplate="{StaticResource SeperatorTemplate}"
-                                                  SettingsItemTemplate="{StaticResource SettingsItemTemplate}" />
+        <selectors:NavigationMenuTemplateSelector
+            x:Key="NavigationMenuTemplateSelector"
+            AccountManagementTemplate="{StaticResource ManageAccountsTemplate}"
+            ClickableAccountMenuTemplate="{StaticResource ClickableAccountMenuTemplate}"
+            FixAuthenticationIssueTemplate="{StaticResource FixAuthenticationIssueTemplate}"
+            FixMissingFolderConfigTemplate="{StaticResource FixMissingFolderConfig}"
+            FolderMenuTemplate="{StaticResource FolderMenuTemplate}"
+            MergedAccountFolderTemplate="{StaticResource MergedAccountFolderMenuItemTemplate}"
+            MergedAccountMoreExpansionItemTemplate="{StaticResource MergedAccountMoreFolderItemTemplate}"
+            MergedAccountTemplate="{StaticResource MergedAccountTemplate}"
+            NewMailTemplate="{StaticResource CreateNewMailTemplate}"
+            RatingItemTemplate="{StaticResource RatingItemTemplate}"
+            SeperatorTemplate="{StaticResource SeperatorTemplate}"
+            SettingsItemTemplate="{StaticResource SettingsItemTemplate}" />
 
 
     </Page.Resources>
 
-    <Grid x:Name="RootGrid"
-          Padding="0"
-          ColumnSpacing="0"
-          RowSpacing="0">
+    <Grid
+        x:Name="RootGrid"
+        Padding="0"
+        ColumnSpacing="0"
+        RowSpacing="0">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="48" />
             <ColumnDefinition Width="*" />
@@ -391,33 +423,35 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
-        <Grid Grid.RowSpan="2"
-              Grid.ColumnSpan="2"
-              Background="{ThemeResource WinoApplicationBackgroundColor}"
-              IsHitTestVisible="False" />
+        <Grid
+            Grid.RowSpan="2"
+            Grid.ColumnSpan="2"
+            Background="{ThemeResource WinoApplicationBackgroundColor}"
+            IsHitTestVisible="False" />
 
-        <muxc:NavigationView x:Name="navigationView"
-                             Grid.Row="1"
-                             Grid.ColumnSpan="3"
-                             HorizontalContentAlignment="Stretch"
-                             VerticalContentAlignment="Stretch"
-                             AlwaysShowHeader="True"
-                             FooterMenuItemsSource="{x:Bind ViewModel.FooterItems, Mode=OneWay}"
-                             IsBackButtonVisible="Collapsed"
-                             IsPaneOpen="{x:Bind ViewModel.PreferencesService.IsNavigationPaneOpened, Mode=TwoWay}"
-                             IsPaneToggleButtonVisible="False"
-                             IsSettingsVisible="False"
-                             IsTabStop="True"
-                             IsTitleBarAutoPaddingEnabled="False"
-                             ItemInvoked="NavigationViewItemInvoked"
-                             MenuItemTemplateSelector="{StaticResource NavigationMenuTemplateSelector}"
-                             MenuItemsSource="{x:Bind ViewModel.MenuItems, Mode=OneWay}"
-                             OpenPaneLength="{x:Bind ViewModel.StatePersistenceService.OpenPaneLength, Mode=TwoWay}"
-                             PaneDisplayMode="Auto"
-                             PaneOpening="NavigationPaneOpening"
-                             ScrollViewer.VerticalScrollBarVisibility="Hidden"
-                             SelectedItem="{x:Bind ViewModel.SelectedMenuItem, Mode=TwoWay}"
-                             SelectionChanged="MenuSelectionChanged">
+        <muxc:NavigationView
+            x:Name="navigationView"
+            Grid.Row="1"
+            Grid.ColumnSpan="3"
+            HorizontalContentAlignment="Stretch"
+            VerticalContentAlignment="Stretch"
+            AlwaysShowHeader="True"
+            FooterMenuItemsSource="{x:Bind ViewModel.FooterItems, Mode=OneWay}"
+            IsBackButtonVisible="Collapsed"
+            IsPaneOpen="{x:Bind ViewModel.PreferencesService.IsNavigationPaneOpened, Mode=TwoWay}"
+            IsPaneToggleButtonVisible="False"
+            IsSettingsVisible="False"
+            IsTabStop="True"
+            IsTitleBarAutoPaddingEnabled="False"
+            ItemInvoked="NavigationViewItemInvoked"
+            MenuItemTemplateSelector="{StaticResource NavigationMenuTemplateSelector}"
+            MenuItemsSource="{x:Bind ViewModel.MenuItems, Mode=OneWay}"
+            OpenPaneLength="{x:Bind ViewModel.StatePersistenceService.OpenPaneLength, Mode=TwoWay}"
+            PaneDisplayMode="Auto"
+            PaneOpening="NavigationPaneOpening"
+            ScrollViewer.VerticalScrollBarVisibility="Hidden"
+            SelectedItem="{x:Bind ViewModel.SelectedMenuItem, Mode=TwoWay}"
+            SelectionChanged="MenuSelectionChanged">
             <muxc:NavigationView.ContentTransitions>
                 <TransitionCollection>
                     <AddDeleteThemeTransition />
@@ -437,23 +471,25 @@
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
 
-                <controls1:PropertySizer Width="1"
-                                         HorizontalAlignment="Left"
-                                         Background="Transparent"
-                                         Binding="{x:Bind ViewModel.StatePersistenceService.OpenPaneLength, Mode=TwoWay}"
-                                         Canvas.ZIndex="20"
-                                         Foreground="Transparent"
-                                         IsHitTestVisible="{x:Bind navigationView.IsPaneOpen, Mode=OneWay}"
-                                         IsTabStop="False"
-                                         Maximum="1000"
-                                         Minimum="116" />
+                <controls1:PropertySizer
+                    Width="1"
+                    HorizontalAlignment="Left"
+                    Background="Transparent"
+                    Binding="{x:Bind ViewModel.StatePersistenceService.OpenPaneLength, Mode=TwoWay}"
+                    Canvas.ZIndex="20"
+                    Foreground="Transparent"
+                    IsHitTestVisible="{x:Bind navigationView.IsPaneOpen, Mode=OneWay}"
+                    IsTabStop="False"
+                    Maximum="1000"
+                    Minimum="116" />
 
                 <!--  Main Content  -->
-                <Frame x:Name="ShellFrame"
-                       Grid.Column="1"
-                       Margin="-8,0,0,0"
-                       IsNavigationStackEnabled="False"
-                       Navigated="ShellFrameContentNavigated">
+                <Frame
+                    x:Name="ShellFrame"
+                    Grid.Column="1"
+                    Margin="-8,0,0,0"
+                    IsNavigationStackEnabled="False"
+                    Navigated="ShellFrameContentNavigated">
                     <Frame.ContentTransitions>
                         <TransitionCollection>
                             <PopupThemeTransition />
@@ -462,37 +498,40 @@
                 </Frame>
 
                 <!--  InfoBar  -->
-                <controls:WinoInfoBar x:Name="ShellInfoBar"
-                                      Grid.Column="1"
-                                      MaxWidth="700"
-                                      Margin="0,60,25,0"
-                                      HorizontalAlignment="Right"
-                                      VerticalAlignment="Top"
-                                      IsClosable="False"
-                                      IsOpen="False" />
+                <controls:WinoInfoBar
+                    x:Name="ShellInfoBar"
+                    Grid.Column="1"
+                    MaxWidth="700"
+                    Margin="0,60,25,0"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    IsClosable="False"
+                    IsOpen="False" />
 
                 <!--  Teaching Tip  -->
-                <muxc:TeachingTip x:Name="ShellTip"
-                                  Grid.Column="1"
-                                  IsOpen="False"
-                                  PreferredPlacement="Bottom"
-                                  Target="{x:Bind ShellInfoBar}" />
+                <muxc:TeachingTip
+                    x:Name="ShellTip"
+                    Grid.Column="1"
+                    IsOpen="False"
+                    PreferredPlacement="Bottom"
+                    Target="{x:Bind ShellInfoBar}" />
             </Grid>
         </muxc:NavigationView>
 
-        <advanced:WinoAppTitleBar x:Name="RealAppBar"
-                                  Grid.ColumnSpan="2"
-                                  BackButtonClicked="BackButtonClicked"
-                                  Canvas.ZIndex="150"
-                                  ReconnectCommand="{x:Bind ViewModel.ReconnectServerCommand}"
-                                  ConnectionStatus="{x:Bind ViewModel.ActiveConnectionStatus, Mode=OneWay}"
-                                  CoreWindowText="{x:Bind ViewModel.StatePersistenceService.CoreWindowTitle, Mode=OneWay}"
-                                  IsBackButtonVisible="{x:Bind ViewModel.StatePersistenceService.IsBackButtonVisible, Mode=OneWay}"
-                                  IsNavigationPaneOpen="{x:Bind navigationView.IsPaneOpen, Mode=TwoWay}"
-                                  IsReaderNarrowed="{x:Bind ViewModel.StatePersistenceService.IsReaderNarrowed, Mode=OneWay}"
-                                  NavigationViewDisplayMode="{x:Bind navigationView.DisplayMode, Mode=OneWay}"
-                                  OpenPaneLength="{x:Bind ViewModel.StatePersistenceService.OpenPaneLength, Mode=OneWay}"
-                                  ReadingPaneLength="{x:Bind ViewModel.StatePersistenceService.MailListPaneLength, Mode=OneWay}"
-                                  SystemReserved="180" />
+        <advanced:WinoAppTitleBar
+            x:Name="RealAppBar"
+            Grid.ColumnSpan="2"
+            BackButtonClicked="BackButtonClicked"
+            Canvas.ZIndex="150"
+            ConnectionStatus="{x:Bind ViewModel.ActiveConnectionStatus, Mode=OneWay}"
+            CoreWindowText="{x:Bind ViewModel.StatePersistenceService.CoreWindowTitle, Mode=OneWay}"
+            IsBackButtonVisible="{x:Bind ViewModel.StatePersistenceService.IsBackButtonVisible, Mode=OneWay}"
+            IsNavigationPaneOpen="{x:Bind navigationView.IsPaneOpen, Mode=TwoWay}"
+            IsReaderNarrowed="{x:Bind ViewModel.StatePersistenceService.IsReaderNarrowed, Mode=OneWay}"
+            NavigationViewDisplayMode="{x:Bind navigationView.DisplayMode, Mode=OneWay}"
+            OpenPaneLength="{x:Bind ViewModel.StatePersistenceService.OpenPaneLength, Mode=OneWay}"
+            ReadingPaneLength="{x:Bind ViewModel.StatePersistenceService.MailListPaneLength, Mode=OneWay}"
+            ReconnectCommand="{x:Bind ViewModel.ReconnectServerCommand}"
+            SystemReserved="180" />
     </Grid>
 </abstract:AppShellAbstract>
diff --git a/Wino.Mail/Styles/CommandBarItems.xaml b/Wino.Mail/Styles/CommandBarItems.xaml
index dd596d20..9c2f54ee 100644
--- a/Wino.Mail/Styles/CommandBarItems.xaml
+++ b/Wino.Mail/Styles/CommandBarItems.xaml
@@ -1,9 +1,9 @@
 <ResourceDictionary
+    x:Class="Wino.Styles.CommandBarItems"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:domain="using:Wino.Core.Domain"
-    x:Class="Wino.Styles.CommandBarItems"
-    xmlns:controls="using:Wino.Controls">
+    xmlns:controls="using:Wino.Controls"
+    xmlns:domain="using:Wino.Core.Domain">
 
     <!--  TODO: Localize  -->
 
diff --git a/Wino.Mail/Styles/CustomMessageDialogStyles.xaml b/Wino.Mail/Styles/CustomMessageDialogStyles.xaml
index e63faf6f..4fa75c5f 100644
--- a/Wino.Mail/Styles/CustomMessageDialogStyles.xaml
+++ b/Wino.Mail/Styles/CustomMessageDialogStyles.xaml
@@ -1,56 +1,56 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ResourceDictionary
+    x:Class="Wino.Styles.CustomMessageDialogStyles"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Wino.Styles"
-    x:Class="Wino.Styles.CustomMessageDialogStyles"
     xmlns:dialogs="using:Wino.Dialogs"
     xmlns:domain="using:Wino.Core.Domain"
+    xmlns:local="using:Wino.Styles"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     xmlns:selectors="using:Wino.Selectors">
 
     <!--  Icon templates  -->
     <DataTemplate x:Key="WinoCustomMessageDialogInformationIconTemplate">
         <Path
-            Fill="#0f80d7"
-            Data="F1 M 0 9.375 C 0 8.509115 0.110677 7.677409 0.332031 6.879883 C 0.553385 6.082357 0.867513 5.335287 1.274414 4.638672 C 1.681315 3.942059 2.169596 3.30892 2.739258 2.739258 C 3.308919 2.169598 3.942057 1.681316 4.638672 1.274414 C 5.335286 0.867514 6.082356 0.553387 6.879883 0.332031 C 7.677409 0.110678 8.509114 0 9.375 0 C 10.240885 0 11.072591 0.110678 11.870117 0.332031 C 12.667643 0.553387 13.414713 0.867514 14.111328 1.274414 C 14.807942 1.681316 15.44108 2.169598 16.010742 2.739258 C 16.580402 3.30892 17.068684 3.942059 17.475586 4.638672 C 17.882486 5.335287 18.196613 6.082357 18.417969 6.879883 C 18.639322 7.677409 18.75 8.509115 18.75 9.375 C 18.75 10.240886 18.637695 11.072592 18.413086 11.870117 C 18.188477 12.667644 17.872721 13.413086 17.46582 14.106445 C 17.058918 14.799805 16.570637 15.431315 16.000977 16.000977 C 15.431314 16.570639 14.799804 17.05892 14.106445 17.46582 C 13.413085 17.872721 12.666015 18.188477 11.865234 18.413086 C 11.064453 18.637695 10.234375 18.75 9.375 18.75 C 8.509114 18.75 7.675781 18.639322 6.875 18.417969 C 6.074219 18.196615 5.327148 17.882486 4.633789 17.475586 C 3.94043 17.068686 3.308919 16.580404 2.739258 16.010742 C 2.169596 15.441081 1.681315 14.80957 1.274414 14.116211 C 0.867513 13.422852 0.553385 12.675781 0.332031 11.875 C 0.110677 11.074219 0 10.240886 0 9.375 Z M 17.5 9.375 C 17.5 8.626303 17.403971 7.905273 17.211914 7.211914 C 17.019855 6.518556 16.746418 5.87077 16.391602 5.268555 C 16.036783 4.666342 15.613606 4.119467 15.12207 3.62793 C 14.630533 3.136395 14.083658 2.713217 13.481445 2.358398 C 12.879231 2.003582 12.231445 1.730145 11.538086 1.538086 C 10.844727 1.346029 10.123697 1.25 9.375 1.25 C 8.626302 1.25 7.905273 1.346029 7.211914 1.538086 C 6.518555 1.730145 5.870768 2.003582 5.268555 2.358398 C 4.666341 2.713217 4.119466 3.136395 3.62793 3.62793 C 3.136393 4.119467 2.713216 4.666342 2.358398 5.268555 C 2.003581 5.87077 1.730143 6.518556 1.538086 7.211914 C 1.346029 7.905273 1.25 8.626303 1.25 9.375 C 1.25 10.123698 1.346029 10.844727 1.538086 11.538086 C 1.730143 12.231445 2.001953 12.879232 2.353516 13.481445 C 2.705078 14.083659 3.128255 14.632162 3.623047 15.126953 C 4.117838 15.621745 4.666341 16.044922 5.268555 16.396484 C 5.870768 16.748047 6.518555 17.019857 7.211914 17.211914 C 7.905273 17.403971 8.626302 17.5 9.375 17.5 C 10.123697 17.5 10.844727 17.403971 11.538086 17.211914 C 12.231445 17.019857 12.879231 16.748047 13.481445 16.396484 C 14.083658 16.044922 14.63216 15.621745 15.126953 15.126953 C 15.621744 14.632162 16.044922 14.083659 16.396484 13.481445 C 16.748047 12.879232 17.019855 12.231445 17.211914 11.538086 C 17.403971 10.844727 17.5 10.123698 17.5 9.375 Z M 8.4375 5.625 C 8.4375 5.364584 8.528646 5.14323 8.710938 4.960938 C 8.893229 4.778646 9.114583 4.6875 9.375 4.6875 C 9.635416 4.6875 9.856771 4.778646 10.039062 4.960938 C 10.221354 5.14323 10.3125 5.364584 10.3125 5.625 C 10.3125 5.885417 10.221354 6.106771 10.039062 6.289062 C 9.856771 6.471354 9.635416 6.5625 9.375 6.5625 C 9.114583 6.5625 8.893229 6.471354 8.710938 6.289062 C 8.528646 6.106771 8.4375 5.885417 8.4375 5.625 Z M 8.75 13.125 L 8.75 8.125 C 8.75 7.95573 8.811849 7.809246 8.935547 7.685547 C 9.059244 7.56185 9.205729 7.5 9.375 7.5 C 9.544271 7.5 9.690755 7.56185 9.814453 7.685547 C 9.93815 7.809246 10 7.95573 10 8.125 L 10 13.125 C 10 13.294271 9.93815 13.440756 9.814453 13.564453 C 9.690755 13.688151 9.544271 13.75 9.375 13.75 C 9.205729 13.75 9.059244 13.688151 8.935547 13.564453 C 8.811849 13.440756 8.75 13.294271 8.75 13.125 Z "
+            HorizontalAlignment="Center"
             VerticalAlignment="Center"
-            HorizontalAlignment="Center" />
+            Data="F1 M 0 9.375 C 0 8.509115 0.110677 7.677409 0.332031 6.879883 C 0.553385 6.082357 0.867513 5.335287 1.274414 4.638672 C 1.681315 3.942059 2.169596 3.30892 2.739258 2.739258 C 3.308919 2.169598 3.942057 1.681316 4.638672 1.274414 C 5.335286 0.867514 6.082356 0.553387 6.879883 0.332031 C 7.677409 0.110678 8.509114 0 9.375 0 C 10.240885 0 11.072591 0.110678 11.870117 0.332031 C 12.667643 0.553387 13.414713 0.867514 14.111328 1.274414 C 14.807942 1.681316 15.44108 2.169598 16.010742 2.739258 C 16.580402 3.30892 17.068684 3.942059 17.475586 4.638672 C 17.882486 5.335287 18.196613 6.082357 18.417969 6.879883 C 18.639322 7.677409 18.75 8.509115 18.75 9.375 C 18.75 10.240886 18.637695 11.072592 18.413086 11.870117 C 18.188477 12.667644 17.872721 13.413086 17.46582 14.106445 C 17.058918 14.799805 16.570637 15.431315 16.000977 16.000977 C 15.431314 16.570639 14.799804 17.05892 14.106445 17.46582 C 13.413085 17.872721 12.666015 18.188477 11.865234 18.413086 C 11.064453 18.637695 10.234375 18.75 9.375 18.75 C 8.509114 18.75 7.675781 18.639322 6.875 18.417969 C 6.074219 18.196615 5.327148 17.882486 4.633789 17.475586 C 3.94043 17.068686 3.308919 16.580404 2.739258 16.010742 C 2.169596 15.441081 1.681315 14.80957 1.274414 14.116211 C 0.867513 13.422852 0.553385 12.675781 0.332031 11.875 C 0.110677 11.074219 0 10.240886 0 9.375 Z M 17.5 9.375 C 17.5 8.626303 17.403971 7.905273 17.211914 7.211914 C 17.019855 6.518556 16.746418 5.87077 16.391602 5.268555 C 16.036783 4.666342 15.613606 4.119467 15.12207 3.62793 C 14.630533 3.136395 14.083658 2.713217 13.481445 2.358398 C 12.879231 2.003582 12.231445 1.730145 11.538086 1.538086 C 10.844727 1.346029 10.123697 1.25 9.375 1.25 C 8.626302 1.25 7.905273 1.346029 7.211914 1.538086 C 6.518555 1.730145 5.870768 2.003582 5.268555 2.358398 C 4.666341 2.713217 4.119466 3.136395 3.62793 3.62793 C 3.136393 4.119467 2.713216 4.666342 2.358398 5.268555 C 2.003581 5.87077 1.730143 6.518556 1.538086 7.211914 C 1.346029 7.905273 1.25 8.626303 1.25 9.375 C 1.25 10.123698 1.346029 10.844727 1.538086 11.538086 C 1.730143 12.231445 2.001953 12.879232 2.353516 13.481445 C 2.705078 14.083659 3.128255 14.632162 3.623047 15.126953 C 4.117838 15.621745 4.666341 16.044922 5.268555 16.396484 C 5.870768 16.748047 6.518555 17.019857 7.211914 17.211914 C 7.905273 17.403971 8.626302 17.5 9.375 17.5 C 10.123697 17.5 10.844727 17.403971 11.538086 17.211914 C 12.231445 17.019857 12.879231 16.748047 13.481445 16.396484 C 14.083658 16.044922 14.63216 15.621745 15.126953 15.126953 C 15.621744 14.632162 16.044922 14.083659 16.396484 13.481445 C 16.748047 12.879232 17.019855 12.231445 17.211914 11.538086 C 17.403971 10.844727 17.5 10.123698 17.5 9.375 Z M 8.4375 5.625 C 8.4375 5.364584 8.528646 5.14323 8.710938 4.960938 C 8.893229 4.778646 9.114583 4.6875 9.375 4.6875 C 9.635416 4.6875 9.856771 4.778646 10.039062 4.960938 C 10.221354 5.14323 10.3125 5.364584 10.3125 5.625 C 10.3125 5.885417 10.221354 6.106771 10.039062 6.289062 C 9.856771 6.471354 9.635416 6.5625 9.375 6.5625 C 9.114583 6.5625 8.893229 6.471354 8.710938 6.289062 C 8.528646 6.106771 8.4375 5.885417 8.4375 5.625 Z M 8.75 13.125 L 8.75 8.125 C 8.75 7.95573 8.811849 7.809246 8.935547 7.685547 C 9.059244 7.56185 9.205729 7.5 9.375 7.5 C 9.544271 7.5 9.690755 7.56185 9.814453 7.685547 C 9.93815 7.809246 10 7.95573 10 8.125 L 10 13.125 C 10 13.294271 9.93815 13.440756 9.814453 13.564453 C 9.690755 13.688151 9.544271 13.75 9.375 13.75 C 9.205729 13.75 9.059244 13.688151 8.935547 13.564453 C 8.811849 13.440756 8.75 13.294271 8.75 13.125 Z "
+            Fill="#0f80d7" />
     </DataTemplate>
     <DataTemplate x:Key="WinoCustomMessageDialogQuestionIconTemplate">
         <Path
-            Fill="#0984e3"
-            Data="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8m8-6.5a6.5 6.5 0 1 0 0 13a6.5 6.5 0 0 0 0-13M6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.76 2.76 0 0 1 1.637.525c.503.377.863.965.863 1.725c0 .448-.115.83-.329 1.15c-.205.307-.47.513-.692.662c-.109.072-.22.138-.313.195l-.006.004a6 6 0 0 0-.26.16a1 1 0 0 0-.276.245a.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661q.154-.1.313-.195l.007-.004c.1-.061.182-.11.258-.161a1 1 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.61.61 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1 1 0 0 0-.34.398M9 11a1 1 0 1 1-2 0a1 1 0 0 1 2 0"
+            HorizontalAlignment="Center"
             VerticalAlignment="Center"
-            HorizontalAlignment="Center" />
+            Data="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8m8-6.5a6.5 6.5 0 1 0 0 13a6.5 6.5 0 0 0 0-13M6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.76 2.76 0 0 1 1.637.525c.503.377.863.965.863 1.725c0 .448-.115.83-.329 1.15c-.205.307-.47.513-.692.662c-.109.072-.22.138-.313.195l-.006.004a6 6 0 0 0-.26.16a1 1 0 0 0-.276.245a.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661q.154-.1.313-.195l.007-.004c.1-.061.182-.11.258-.161a1 1 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.61.61 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1 1 0 0 0-.34.398M9 11a1 1 0 1 1-2 0a1 1 0 0 1 2 0"
+            Fill="#0984e3" />
     </DataTemplate>
     <DataTemplate x:Key="WinoCustomMessageDialogWarningIconTemplate">
         <Path
-            Fill="#fdcb6e"
-            Data="F1 M 2.021484 18.769531 C 1.767578 18.769531 1.52832 18.720703 1.303711 18.623047 C 1.079102 18.525391 0.880534 18.391928 0.708008 18.222656 C 0.535482 18.053385 0.398763 17.856445 0.297852 17.631836 C 0.19694 17.407227 0.146484 17.167969 0.146484 16.914062 C 0.146484 16.614584 0.211589 16.328125 0.341797 16.054688 L 7.695312 1.347656 C 7.851562 1.035156 8.082682 0.784506 8.388672 0.595703 C 8.694661 0.406902 9.023438 0.3125 9.375 0.3125 C 9.726562 0.3125 10.055338 0.406902 10.361328 0.595703 C 10.667317 0.784506 10.898438 1.035156 11.054688 1.347656 L 18.408203 16.054688 C 18.53841 16.328125 18.603516 16.614584 18.603516 16.914062 C 18.603516 17.167969 18.553059 17.407227 18.452148 17.631836 C 18.351236 17.856445 18.216145 18.053385 18.046875 18.222656 C 17.877604 18.391928 17.679035 18.525391 17.451172 18.623047 C 17.223307 18.720703 16.982422 18.769531 16.728516 18.769531 Z M 16.728516 17.519531 C 16.884766 17.519531 17.027994 17.460938 17.158203 17.34375 C 17.28841 17.226562 17.353516 17.086588 17.353516 16.923828 C 17.353516 16.806641 17.330729 16.702475 17.285156 16.611328 L 9.931641 1.904297 C 9.879557 1.793621 9.80306 1.708984 9.702148 1.650391 C 9.601236 1.591797 9.492188 1.5625 9.375 1.5625 C 9.257812 1.5625 9.148763 1.593426 9.047852 1.655273 C 8.946939 1.717123 8.870442 1.800131 8.818359 1.904297 L 1.464844 16.611328 C 1.419271 16.702475 1.396484 16.803387 1.396484 16.914062 C 1.396484 17.083334 1.459961 17.226562 1.586914 17.34375 C 1.713867 17.460938 1.858724 17.519531 2.021484 17.519531 Z M 8.75 11.875 L 8.75 6.875 C 8.75 6.705729 8.811849 6.559245 8.935547 6.435547 C 9.059244 6.31185 9.205729 6.25 9.375 6.25 C 9.544271 6.25 9.690755 6.31185 9.814453 6.435547 C 9.93815 6.559245 10 6.705729 10 6.875 L 10 11.875 C 10 12.044271 9.93815 12.190756 9.814453 12.314453 C 9.690755 12.438151 9.544271 12.5 9.375 12.5 C 9.205729 12.5 9.059244 12.438151 8.935547 12.314453 C 8.811849 12.190756 8.75 12.044271 8.75 11.875 Z M 8.4375 14.375 C 8.4375 14.114584 8.528646 13.893229 8.710938 13.710938 C 8.893229 13.528646 9.114583 13.4375 9.375 13.4375 C 9.635416 13.4375 9.856771 13.528646 10.039062 13.710938 C 10.221354 13.893229 10.3125 14.114584 10.3125 14.375 C 10.3125 14.635417 10.221354 14.856771 10.039062 15.039062 C 9.856771 15.221354 9.635416 15.3125 9.375 15.3125 C 9.114583 15.3125 8.893229 15.221354 8.710938 15.039062 C 8.528646 14.856771 8.4375 14.635417 8.4375 14.375 Z "
+            HorizontalAlignment="Center"
             VerticalAlignment="Center"
-            HorizontalAlignment="Center" />
+            Data="F1 M 2.021484 18.769531 C 1.767578 18.769531 1.52832 18.720703 1.303711 18.623047 C 1.079102 18.525391 0.880534 18.391928 0.708008 18.222656 C 0.535482 18.053385 0.398763 17.856445 0.297852 17.631836 C 0.19694 17.407227 0.146484 17.167969 0.146484 16.914062 C 0.146484 16.614584 0.211589 16.328125 0.341797 16.054688 L 7.695312 1.347656 C 7.851562 1.035156 8.082682 0.784506 8.388672 0.595703 C 8.694661 0.406902 9.023438 0.3125 9.375 0.3125 C 9.726562 0.3125 10.055338 0.406902 10.361328 0.595703 C 10.667317 0.784506 10.898438 1.035156 11.054688 1.347656 L 18.408203 16.054688 C 18.53841 16.328125 18.603516 16.614584 18.603516 16.914062 C 18.603516 17.167969 18.553059 17.407227 18.452148 17.631836 C 18.351236 17.856445 18.216145 18.053385 18.046875 18.222656 C 17.877604 18.391928 17.679035 18.525391 17.451172 18.623047 C 17.223307 18.720703 16.982422 18.769531 16.728516 18.769531 Z M 16.728516 17.519531 C 16.884766 17.519531 17.027994 17.460938 17.158203 17.34375 C 17.28841 17.226562 17.353516 17.086588 17.353516 16.923828 C 17.353516 16.806641 17.330729 16.702475 17.285156 16.611328 L 9.931641 1.904297 C 9.879557 1.793621 9.80306 1.708984 9.702148 1.650391 C 9.601236 1.591797 9.492188 1.5625 9.375 1.5625 C 9.257812 1.5625 9.148763 1.593426 9.047852 1.655273 C 8.946939 1.717123 8.870442 1.800131 8.818359 1.904297 L 1.464844 16.611328 C 1.419271 16.702475 1.396484 16.803387 1.396484 16.914062 C 1.396484 17.083334 1.459961 17.226562 1.586914 17.34375 C 1.713867 17.460938 1.858724 17.519531 2.021484 17.519531 Z M 8.75 11.875 L 8.75 6.875 C 8.75 6.705729 8.811849 6.559245 8.935547 6.435547 C 9.059244 6.31185 9.205729 6.25 9.375 6.25 C 9.544271 6.25 9.690755 6.31185 9.814453 6.435547 C 9.93815 6.559245 10 6.705729 10 6.875 L 10 11.875 C 10 12.044271 9.93815 12.190756 9.814453 12.314453 C 9.690755 12.438151 9.544271 12.5 9.375 12.5 C 9.205729 12.5 9.059244 12.438151 8.935547 12.314453 C 8.811849 12.190756 8.75 12.044271 8.75 11.875 Z M 8.4375 14.375 C 8.4375 14.114584 8.528646 13.893229 8.710938 13.710938 C 8.893229 13.528646 9.114583 13.4375 9.375 13.4375 C 9.635416 13.4375 9.856771 13.528646 10.039062 13.710938 C 10.221354 13.893229 10.3125 14.114584 10.3125 14.375 C 10.3125 14.635417 10.221354 14.856771 10.039062 15.039062 C 9.856771 15.221354 9.635416 15.3125 9.375 15.3125 C 9.114583 15.3125 8.893229 15.221354 8.710938 15.039062 C 8.528646 14.856771 8.4375 14.635417 8.4375 14.375 Z "
+            Fill="#fdcb6e" />
     </DataTemplate>
     <DataTemplate x:Key="WinoCustomMessageDialogErrorIconTemplate">
         <Path
-            Fill="#d63031"
-            Data="F1 M 18.75 9.375 C 18.75 10.240886 18.639322 11.072592 18.417969 11.870117 C 18.196613 12.667644 17.882486 13.414714 17.475586 14.111328 C 17.068684 14.807943 16.580402 15.441081 16.010742 16.010742 C 15.44108 16.580404 14.807942 17.068686 14.111328 17.475586 C 13.414713 17.882486 12.667643 18.196615 11.870117 18.417969 C 11.072591 18.639322 10.240885 18.75 9.375 18.75 C 8.509114 18.75 7.675781 18.639322 6.875 18.417969 C 6.074219 18.196615 5.327148 17.882486 4.633789 17.475586 C 3.94043 17.068686 3.308919 16.580404 2.739258 16.010742 C 2.169596 15.441081 1.681315 14.80957 1.274414 14.116211 C 0.867513 13.422852 0.553385 12.675781 0.332031 11.875 C 0.110677 11.074219 0 10.240886 0 9.375 C 0 8.509115 0.110677 7.677409 0.332031 6.879883 C 0.553385 6.082357 0.867513 5.335287 1.274414 4.638672 C 1.681315 3.942059 2.169596 3.30892 2.739258 2.739258 C 3.308919 2.169598 3.942057 1.681316 4.638672 1.274414 C 5.335286 0.867514 6.082356 0.553387 6.879883 0.332031 C 7.677409 0.110678 8.509114 0 9.375 0 C 10.234375 0 11.062825 0.112305 11.860352 0.336914 C 12.657877 0.561523 13.404947 0.877279 14.101562 1.28418 C 14.798176 1.691082 15.431314 2.179363 16.000977 2.749023 C 16.570637 3.318686 17.058918 3.951824 17.46582 4.648438 C 17.872721 5.345053 18.188477 6.092123 18.413086 6.889648 C 18.637695 7.687175 18.75 8.515625 18.75 9.375 Z M 17.5 9.375 C 17.5 8.626303 17.403971 7.905273 17.211914 7.211914 C 17.019855 6.518556 16.746418 5.87077 16.391602 5.268555 C 16.036783 4.666342 15.613606 4.119467 15.12207 3.62793 C 14.630533 3.136395 14.083658 2.713217 13.481445 2.358398 C 12.879231 2.003582 12.231445 1.730145 11.538086 1.538086 C 10.844727 1.346029 10.123697 1.25 9.375 1.25 C 8.626302 1.25 7.905273 1.346029 7.211914 1.538086 C 6.518555 1.730145 5.870768 2.003582 5.268555 2.358398 C 4.666341 2.713217 4.119466 3.136395 3.62793 3.62793 C 3.136393 4.119467 2.713216 4.666342 2.358398 5.268555 C 2.003581 5.87077 1.730143 6.518556 1.538086 7.211914 C 1.346029 7.905273 1.25 8.626303 1.25 9.375 C 1.25 10.123698 1.346029 10.844727 1.538086 11.538086 C 1.730143 12.231445 2.001953 12.879232 2.353516 13.481445 C 2.705078 14.083659 3.128255 14.632162 3.623047 15.126953 C 4.117838 15.621745 4.666341 16.044922 5.268555 16.396484 C 5.870768 16.748047 6.518555 17.019857 7.211914 17.211914 C 7.905273 17.403971 8.626302 17.5 9.375 17.5 C 10.123697 17.5 10.844727 17.403971 11.538086 17.211914 C 12.231445 17.019857 12.879231 16.74642 13.481445 16.391602 C 14.083658 16.036783 14.630533 15.613607 15.12207 15.12207 C 15.613606 14.630534 16.036783 14.083659 16.391602 13.481445 C 16.746418 12.879232 17.019855 12.231445 17.211914 11.538086 C 17.403971 10.844727 17.5 10.123698 17.5 9.375 Z M 13.4375 5.9375 C 13.4375 6.106771 13.37565 6.253256 13.251953 6.376953 L 10.253906 9.375 L 13.251953 12.373047 C 13.37565 12.496745 13.4375 12.643229 13.4375 12.8125 C 13.4375 12.981771 13.37565 13.128256 13.251953 13.251953 C 13.128254 13.375651 12.98177 13.4375 12.8125 13.4375 C 12.643229 13.4375 12.496744 13.375651 12.373047 13.251953 L 9.375 10.253906 L 6.376953 13.251953 C 6.253255 13.375651 6.106771 13.4375 5.9375 13.4375 C 5.768229 13.4375 5.621745 13.375651 5.498047 13.251953 C 5.374349 13.128256 5.3125 12.981771 5.3125 12.8125 C 5.3125 12.643229 5.374349 12.496745 5.498047 12.373047 L 8.496094 9.375 L 5.498047 6.376953 C 5.374349 6.253256 5.3125 6.106771 5.3125 5.9375 C 5.3125 5.768229 5.374349 5.621745 5.498047 5.498047 C 5.621745 5.37435 5.768229 5.3125 5.9375 5.3125 C 6.106771 5.3125 6.253255 5.37435 6.376953 5.498047 L 9.375 8.496094 L 12.373047 5.498047 C 12.496744 5.37435 12.643229 5.3125 12.8125 5.3125 C 12.98177 5.3125 13.128254 5.37435 13.251953 5.498047 C 13.37565 5.621745 13.4375 5.768229 13.4375 5.9375 Z "
+            HorizontalAlignment="Center"
             VerticalAlignment="Center"
-            HorizontalAlignment="Center" />
+            Data="F1 M 18.75 9.375 C 18.75 10.240886 18.639322 11.072592 18.417969 11.870117 C 18.196613 12.667644 17.882486 13.414714 17.475586 14.111328 C 17.068684 14.807943 16.580402 15.441081 16.010742 16.010742 C 15.44108 16.580404 14.807942 17.068686 14.111328 17.475586 C 13.414713 17.882486 12.667643 18.196615 11.870117 18.417969 C 11.072591 18.639322 10.240885 18.75 9.375 18.75 C 8.509114 18.75 7.675781 18.639322 6.875 18.417969 C 6.074219 18.196615 5.327148 17.882486 4.633789 17.475586 C 3.94043 17.068686 3.308919 16.580404 2.739258 16.010742 C 2.169596 15.441081 1.681315 14.80957 1.274414 14.116211 C 0.867513 13.422852 0.553385 12.675781 0.332031 11.875 C 0.110677 11.074219 0 10.240886 0 9.375 C 0 8.509115 0.110677 7.677409 0.332031 6.879883 C 0.553385 6.082357 0.867513 5.335287 1.274414 4.638672 C 1.681315 3.942059 2.169596 3.30892 2.739258 2.739258 C 3.308919 2.169598 3.942057 1.681316 4.638672 1.274414 C 5.335286 0.867514 6.082356 0.553387 6.879883 0.332031 C 7.677409 0.110678 8.509114 0 9.375 0 C 10.234375 0 11.062825 0.112305 11.860352 0.336914 C 12.657877 0.561523 13.404947 0.877279 14.101562 1.28418 C 14.798176 1.691082 15.431314 2.179363 16.000977 2.749023 C 16.570637 3.318686 17.058918 3.951824 17.46582 4.648438 C 17.872721 5.345053 18.188477 6.092123 18.413086 6.889648 C 18.637695 7.687175 18.75 8.515625 18.75 9.375 Z M 17.5 9.375 C 17.5 8.626303 17.403971 7.905273 17.211914 7.211914 C 17.019855 6.518556 16.746418 5.87077 16.391602 5.268555 C 16.036783 4.666342 15.613606 4.119467 15.12207 3.62793 C 14.630533 3.136395 14.083658 2.713217 13.481445 2.358398 C 12.879231 2.003582 12.231445 1.730145 11.538086 1.538086 C 10.844727 1.346029 10.123697 1.25 9.375 1.25 C 8.626302 1.25 7.905273 1.346029 7.211914 1.538086 C 6.518555 1.730145 5.870768 2.003582 5.268555 2.358398 C 4.666341 2.713217 4.119466 3.136395 3.62793 3.62793 C 3.136393 4.119467 2.713216 4.666342 2.358398 5.268555 C 2.003581 5.87077 1.730143 6.518556 1.538086 7.211914 C 1.346029 7.905273 1.25 8.626303 1.25 9.375 C 1.25 10.123698 1.346029 10.844727 1.538086 11.538086 C 1.730143 12.231445 2.001953 12.879232 2.353516 13.481445 C 2.705078 14.083659 3.128255 14.632162 3.623047 15.126953 C 4.117838 15.621745 4.666341 16.044922 5.268555 16.396484 C 5.870768 16.748047 6.518555 17.019857 7.211914 17.211914 C 7.905273 17.403971 8.626302 17.5 9.375 17.5 C 10.123697 17.5 10.844727 17.403971 11.538086 17.211914 C 12.231445 17.019857 12.879231 16.74642 13.481445 16.391602 C 14.083658 16.036783 14.630533 15.613607 15.12207 15.12207 C 15.613606 14.630534 16.036783 14.083659 16.391602 13.481445 C 16.746418 12.879232 17.019855 12.231445 17.211914 11.538086 C 17.403971 10.844727 17.5 10.123698 17.5 9.375 Z M 13.4375 5.9375 C 13.4375 6.106771 13.37565 6.253256 13.251953 6.376953 L 10.253906 9.375 L 13.251953 12.373047 C 13.37565 12.496745 13.4375 12.643229 13.4375 12.8125 C 13.4375 12.981771 13.37565 13.128256 13.251953 13.251953 C 13.128254 13.375651 12.98177 13.4375 12.8125 13.4375 C 12.643229 13.4375 12.496744 13.375651 12.373047 13.251953 L 9.375 10.253906 L 6.376953 13.251953 C 6.253255 13.375651 6.106771 13.4375 5.9375 13.4375 C 5.768229 13.4375 5.621745 13.375651 5.498047 13.251953 C 5.374349 13.128256 5.3125 12.981771 5.3125 12.8125 C 5.3125 12.643229 5.374349 12.496745 5.498047 12.373047 L 8.496094 9.375 L 5.498047 6.376953 C 5.374349 6.253256 5.3125 6.106771 5.3125 5.9375 C 5.3125 5.768229 5.374349 5.621745 5.498047 5.498047 C 5.621745 5.37435 5.768229 5.3125 5.9375 5.3125 C 6.106771 5.3125 6.253255 5.37435 6.376953 5.498047 L 9.375 8.496094 L 12.373047 5.498047 C 12.496744 5.37435 12.643229 5.3125 12.8125 5.3125 C 12.98177 5.3125 13.128254 5.37435 13.251953 5.498047 C 13.37565 5.621745 13.4375 5.768229 13.4375 5.9375 Z "
+            Fill="#d63031" />
     </DataTemplate>
 
     <selectors:CustomWinoMessageDialogIconSelector
         x:Key="CustomWinoMessageDialogIconSelector"
+        ErrorIconTemplate="{StaticResource WinoCustomMessageDialogErrorIconTemplate}"
         InfoIconTemplate="{StaticResource WinoCustomMessageDialogInformationIconTemplate}"
         QuestionIconTemplate="{StaticResource WinoCustomMessageDialogQuestionIconTemplate}"
-        WarningIconTemplate="{StaticResource WinoCustomMessageDialogWarningIconTemplate}"
-        ErrorIconTemplate="{StaticResource WinoCustomMessageDialogErrorIconTemplate}" />
+        WarningIconTemplate="{StaticResource WinoCustomMessageDialogWarningIconTemplate}" />
 
-    <DataTemplate x:DataType="dialogs:CustomMessageDialogInformationContainer" x:Key="CustomWinoContentDialogTitleTemplate">
+    <DataTemplate x:Key="CustomWinoContentDialogTitleTemplate" x:DataType="dialogs:CustomMessageDialogInformationContainer">
         <Grid />
     </DataTemplate>
 
-    <DataTemplate x:DataType="dialogs:CustomMessageDialogInformationContainer" x:Key="CustomWinoContentDialogContentTemplate">
+    <DataTemplate x:Key="CustomWinoContentDialogContentTemplate" x:DataType="dialogs:CustomMessageDialogInformationContainer">
         <Grid RowSpacing="12">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
@@ -61,27 +61,27 @@
             <!--  Title  -->
             <StackPanel Orientation="Horizontal" Spacing="12">
                 <Viewbox Width="28" HorizontalAlignment="Left">
-                    <ContentControl ContentTemplateSelector="{StaticResource CustomWinoMessageDialogIconSelector}" Content="{x:Bind Icon}" />
+                    <ContentControl Content="{x:Bind Icon}" ContentTemplateSelector="{StaticResource CustomWinoMessageDialogIconSelector}" />
                 </Viewbox>
 
                 <TextBlock
-                    Text="{x:Bind Title}"
                     HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
                     Style="{StaticResource SubtitleTextBlockStyle}"
-                    VerticalAlignment="Center" />
+                    Text="{x:Bind Title}" />
             </StackPanel>
 
             <!--  Description  -->
             <TextBlock
-                Text="{x:Bind Description}"
                 Grid.Row="1"
+                Text="{x:Bind Description}"
                 TextWrapping="WrapWholeWords" />
 
             <CheckBox
                 Grid.Row="2"
                 Content="{x:Bind domain:Translator.Dialog_DontAskAgain}"
-                Visibility="{x:Bind IsDontAskAgainEnabled}"
-                IsChecked="{x:Bind IsDontAskChecked, Mode=TwoWay}" />
+                IsChecked="{x:Bind IsDontAskChecked, Mode=TwoWay}"
+                Visibility="{x:Bind IsDontAskAgainEnabled}" />
         </Grid>
     </DataTemplate>
 
diff --git a/Wino.Mail/Styles/ItemContainerStyles.xaml b/Wino.Mail/Styles/ItemContainerStyles.xaml
index 9b85d77b..76da07df 100644
--- a/Wino.Mail/Styles/ItemContainerStyles.xaml
+++ b/Wino.Mail/Styles/ItemContainerStyles.xaml
@@ -1,9 +1,9 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives"
-    xmlns:winoControls="using:Wino.Controls"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
+    xmlns:winoControls="using:Wino.Controls">
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Light">
             <SolidColorBrush x:Key="MailItemFlaggedBackgroundBrush" Color="#ffffcc" />
@@ -172,24 +172,24 @@
                         </Grid.RowDefinitions>
                         <primitives:NavigationViewItemPresenter
                             x:Name="NavigationViewItemPresenter"
-                            Icon="{TemplateBinding Icon}"
-                            InfoBadge="{TemplateBinding InfoBadge}"
-                            ContentTransitions="{TemplateBinding ContentTransitions}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
                             Padding="{TemplateBinding Padding}"
-                            Foreground="{TemplateBinding Foreground}"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            UseSystemFocusVisuals="{TemplateBinding UseSystemFocusVisuals}"
-                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
                             ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                            ContentTransitions="{TemplateBinding ContentTransitions}"
+                            Control.IsTemplateFocusTarget="True"
                             CornerRadius="4"
+                            Foreground="{TemplateBinding Foreground}"
+                            Icon="{TemplateBinding Icon}"
+                            InfoBadge="{TemplateBinding InfoBadge}"
                             IsTabStop="false"
-                            Control.IsTemplateFocusTarget="True">
+                            UseSystemFocusVisuals="{TemplateBinding UseSystemFocusVisuals}">
                             <Grid>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="Auto" />
@@ -198,26 +198,26 @@
                                 <Rectangle
                                     x:Name="CustomSelectionIndicator"
                                     Width="3"
-                                    Opacity="1"
                                     HorizontalAlignment="Left"
-                                    Visibility="Collapsed"
-                                    Scale="0,0,0"
                                     Fill="{ThemeResource NavigationViewSelectionIndicatorForeground}"
+                                    Opacity="1"
                                     RadiusX="2"
-                                    RadiusY="2">
+                                    RadiusY="2"
+                                    Scale="0,0,0"
+                                    Visibility="Collapsed">
                                     <Rectangle.ScaleTransition>
                                         <Vector3Transition />
                                     </Rectangle.ScaleTransition>
                                 </Rectangle>
-                                <ContentPresenter Content="{TemplateBinding Content}" Grid.Column="1" />
+                                <ContentPresenter Grid.Column="1" Content="{TemplateBinding Content}" />
                             </Grid>
                         </primitives:NavigationViewItemPresenter>
 
                         <muxc:ItemsRepeater
-                            x:Load="False"
+                            x:Name="NavigationViewItemMenuItemsHost"
                             Grid.Row="1"
-                            Visibility="Collapsed"
-                            x:Name="NavigationViewItemMenuItemsHost">
+                            x:Load="False"
+                            Visibility="Collapsed">
                             <muxc:ItemsRepeater.Layout>
                                 <muxc:StackLayout Orientation="Vertical" />
                             </muxc:ItemsRepeater.Layout>
@@ -245,23 +245,23 @@
                                                 <ControlTemplate TargetType="FlyoutPresenter">
                                                     <ScrollViewer
                                                         x:Name="ScrollViewer"
-                                                        ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}"
-                                                        HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
+                                                        AutomationProperties.AccessibilityView="Raw"
                                                         HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                                                        VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
+                                                        HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
                                                         VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
-                                                        AutomationProperties.AccessibilityView="Raw">
+                                                        VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
+                                                        ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}">
                                                         <ContentPresenter
                                                             x:Name="ContentPresenter"
+                                                            Padding="{TemplateBinding Padding}"
+                                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                                             Background="{TemplateBinding Background}"
                                                             BorderBrush="{TemplateBinding BorderBrush}"
                                                             BorderThickness="{TemplateBinding BorderThickness}"
                                                             Content="{TemplateBinding Content}"
                                                             ContentTemplate="{TemplateBinding ContentTemplate}"
                                                             ContentTransitions="{TemplateBinding ContentTransitions}"
-                                                            Padding="{TemplateBinding Padding}"
-                                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                                             CornerRadius="{TemplateBinding CornerRadius}" />
                                                     </ScrollViewer>
                                                 </ControlTemplate>
diff --git a/Wino.Mail/Views/ComposePage.xaml b/Wino.Mail/Views/ComposePage.xaml
index e0a7c1e6..9f6121c7 100644
--- a/Wino.Mail/Views/ComposePage.xaml
+++ b/Wino.Mail/Views/ComposePage.xaml
@@ -39,9 +39,9 @@
 
                 <Viewbox Width="24">
                     <controls:ImagePreviewControl
-                        SenderContactPicture="{x:Bind Base64ContactPicture}"
                         FromAddress="{x:Bind Address}"
-                        FromName="{x:Bind Name}" />
+                        FromName="{x:Bind Name}"
+                        SenderContactPicture="{x:Bind Base64ContactPicture}" />
                 </Viewbox>
 
                 <TextBlock
@@ -456,9 +456,9 @@
                     <ComboBox
                         x:Name="AccountsComboBox"
                         Grid.Column="1"
+                        DisplayMemberPath="AliasAddress"
                         IsEditable="False"
                         ItemsSource="{x:Bind ViewModel.AvailableAliases, Mode=OneWay}"
-                        DisplayMemberPath="AliasAddress"
                         SelectedItem="{x:Bind ViewModel.SelectedAlias, Mode=TwoWay}" />
 
                     <!--  To  -->
diff --git a/Wino.Mail/Views/MailListPage.xaml.cs b/Wino.Mail/Views/MailListPage.xaml.cs
index 74364cdd..f1f4f515 100644
--- a/Wino.Mail/Views/MailListPage.xaml.cs
+++ b/Wino.Mail/Views/MailListPage.xaml.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.AppCenter.Analytics;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.UI.Xaml.Controls;
 using MoreLinq;
@@ -352,9 +351,6 @@ namespace Wino.Views
                     }
 
                 }
-
-                if (!isSelected)
-                    Analytics.TrackEvent("Mail Selection Failed");
             });
         }
 
diff --git a/Wino.Mail/Views/MailRenderingPage.xaml b/Wino.Mail/Views/MailRenderingPage.xaml
index c38a6765..3c20baf7 100644
--- a/Wino.Mail/Views/MailRenderingPage.xaml
+++ b/Wino.Mail/Views/MailRenderingPage.xaml
@@ -31,8 +31,8 @@
 
         <DataTemplate x:Key="InternetAddressTemplate" x:DataType="entities:AccountContact">
             <HyperlinkButton
-                Padding="4,2"
                 Margin="-2,-2"
+                Padding="4,2"
                 Command="{Binding ElementName=root, Path=ViewModel.CopyClipboardCommand}"
                 CommandParameter="{x:Bind Address}"
                 Content="{x:Bind DisplayName}" />
@@ -229,9 +229,9 @@
                                 Width="36"
                                 Height="36"
                                 FontSize="16"
-                                SenderContactPicture="{x:Bind ViewModel.ContactPicture, Mode=OneWay}"
                                 FromAddress="{x:Bind ViewModel.FromAddress, Mode=OneWay}"
-                                FromName="{x:Bind ViewModel.FromName, Mode=OneWay}" />
+                                FromName="{x:Bind ViewModel.FromName, Mode=OneWay}"
+                                SenderContactPicture="{x:Bind ViewModel.ContactPicture, Mode=OneWay}" />
 
                             <Grid
                                 Grid.Column="1"
@@ -239,8 +239,8 @@
                                 VerticalAlignment="Center">
                                 <StackPanel Spacing="1">
                                     <HyperlinkButton
-                                        Padding="4,2"
                                         Margin="-6,-2"
+                                        Padding="4,2"
                                         Command="{Binding ElementName=root, Path=ViewModel.CopyClipboardCommand}"
                                         CommandParameter="{x:Bind ViewModel.FromAddress, Mode=OneWay}"
                                         FontWeight="SemiBold">
@@ -291,7 +291,7 @@
                             </ItemsControl.ItemsPanel>
                         </ItemsControl>
                     </Grid>
-                    <Grid ColumnSpacing="6" Grid.Row="1">
+                    <Grid Grid.Row="1" ColumnSpacing="6">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="*" />
@@ -363,11 +363,11 @@
                     </ListView>
 
                     <HyperlinkButton
-                        Content="{x:Bind domain:Translator.Reader_SaveAllAttachmentButtonText}"
-                        Command="{x:Bind ViewModel.SaveAllAttachmentsCommand}"
-                        Visibility="{x:Bind ViewModel.HasMultipleAttachments, Mode=OneWay}"
                         Grid.Column="1"
-                        VerticalAlignment="Center" />
+                        VerticalAlignment="Center"
+                        Command="{x:Bind ViewModel.SaveAllAttachmentsCommand}"
+                        Content="{x:Bind domain:Translator.Reader_SaveAllAttachmentButtonText}"
+                        Visibility="{x:Bind ViewModel.HasMultipleAttachments, Mode=OneWay}" />
                 </Grid>