diff --git a/Wallet.Avalonia/AllNavigationView.axaml b/Wallet.Avalonia/AllNavigationView.axaml
index 9176701..a105091 100644
--- a/Wallet.Avalonia/AllNavigationView.axaml
+++ b/Wallet.Avalonia/AllNavigationView.axaml
@@ -33,6 +33,9 @@
             </ConditionAction>
         </DataTriggerBehavior>
     </Interaction.Behaviors>
+    <NavigationViewItem.IconSource>
+        <PathIconSource Data="F1 M 6 7.28 C 6 7.146667 6.046666 7.033333 6.14 6.94 C 6.233333 6.846666 6.346666 6.8 6.48 6.799999 L 13.52 6.799999 C 13.653332 6.8 13.766665 6.846666 13.86 6.94 C 13.953333 7.033333 14 7.153334 14 7.299999 C 14 7.446667 13.953333 7.566667 13.86 7.66 C 13.766665 7.753333 13.653332 7.799999 13.52 7.799999 L 6.52 7.799999 C 6.36 7.799999 6.233333 7.753333 6.14 7.66 C 6.046666 7.566667 6 7.453333 6 7.32 Z M 6.52 8.799999 C 6.36 8.799999 6.233333 8.846666 6.14 8.94 C 6.046666 9.033334 6 9.153334 6 9.299999 C 6 9.446667 6.046666 9.566668 6.14 9.66 C 6.233333 9.753333 6.346666 9.799999 6.48 9.799999 L 13.52 9.799999 C 13.653332 9.799999 13.766665 9.753333 13.86 9.66 C 13.953333 9.566668 14 9.446667 14 9.299999 C 14 9.153334 13.953333 9.033334 13.86 8.94 C 13.766665 8.846666 13.653332 8.799999 13.52 8.799999 Z M 6 4.799999 C 5.173333 4.799999 4.466666 5.093334 3.88 5.68 C 3.293333 6.266667 3 6.973333 3 7.799999 L 3 15.799999 C 3 16.626667 3.293333 17.333332 3.88 17.92 C 4.466666 18.506666 5.173333 18.799999 6 18.799999 L 14 18.799999 C 14.826666 18.799999 15.533332 18.506666 16.119999 17.92 C 16.706665 17.333332 17 16.626667 17 15.799999 L 17 7.799999 C 17 6.973333 16.706665 6.266667 16.119999 5.68 C 15.533332 5.093334 14.826666 4.799999 14 4.799999 Z M 16 11.799999 L 12.52 11.799999 C 12.359999 11.799999 12.233332 11.846666 12.139999 11.94 C 12.046666 12.033334 12 12.146667 12 12.28 L 12 12.36 C 11.973333 12.706667 11.893332 13.02 11.759999 13.299999 C 11.626666 13.58 11.426666 13.813334 11.16 14 C 10.866666 14.186666 10.48 14.28 10 14.279999 C 9.52 14.28 9.133333 14.186666 8.84 14 C 8.573333 13.813334 8.373333 13.573333 8.24 13.28 C 8.106667 12.986667 8.026667 12.666666 8 12.32 L 8 12.28 C 8 12.146667 7.953333 12.033334 7.86 11.94 C 7.766666 11.846666 7.653333 11.799999 7.52 11.799999 L 4 11.799999 L 4 7.799999 C 4 7.24 4.193333 6.766666 4.58 6.379999 C 4.966666 5.993333 5.44 5.799999 6 5.799999 L 14 5.799999 C 14.559999 5.799999 15.033333 5.993333 15.42 6.379999 C 15.806666 6.766666 16 7.24 16 7.799999 Z M 4 12.799999 L 7.04 12.799999 C 7.12 13.146667 7.226666 13.466666 7.36 13.759999 C 7.573333 14.213333 7.879999 14.573333 8.28 14.839999 C 8.759999 15.133333 9.333333 15.28 10 15.279999 C 10.666666 15.28 11.24 15.133333 11.719999 14.839999 C 12.119999 14.573333 12.426665 14.213333 12.639999 13.759999 C 12.773333 13.466666 12.879999 13.146667 12.96 12.799999 L 16 12.799999 L 16 15.799999 C 16 16.360001 15.806666 16.833332 15.42 17.219999 C 15.033333 17.606667 14.559999 17.799999 14 17.799999 L 6 17.799999 C 5.44 17.799999 4.966666 17.606667 4.58 17.219999 C 4.193333 16.833332 4 16.360001 4 15.799999 Z " />
+    </NavigationViewItem.IconSource>
     <NavigationViewItem.InfoBadge>
         <InfoBadge Value="{Binding Key}" />
     </NavigationViewItem.InfoBadge>
diff --git a/Wallet.Avalonia/App.axaml.cs b/Wallet.Avalonia/App.axaml.cs
index cc80b97..9aba7e2 100644
--- a/Wallet.Avalonia/App.axaml.cs
+++ b/Wallet.Avalonia/App.axaml.cs
@@ -59,7 +59,7 @@ public partial class App : Application
                 }
 
                 services.AddHandler<WalletActivatedHandler>();
-                services.AddTransient<IWalletComponent>(provider => Component.Create<WalletComponent>(provider, args =>
+                services.AddTransient<IWalletComponent>(provider => Component.Register<WalletComponent>(provider, args =>
                 {
                     args.AddServices(services =>
                     {
diff --git a/Wallet.Avalonia/ArchiveNavigationView.axaml b/Wallet.Avalonia/ArchiveNavigationView.axaml
index f827b2a..3ad062d 100644
--- a/Wallet.Avalonia/ArchiveNavigationView.axaml
+++ b/Wallet.Avalonia/ArchiveNavigationView.axaml
@@ -33,6 +33,9 @@
             </ConditionAction>
         </DataTriggerBehavior>
     </Interaction.Behaviors>
+    <NavigationViewItem.IconSource>
+        <PathIconSource Data="F1 M 8.52 11.799999 C 8.36 11.799999 8.233333 11.846666 8.139999 11.94 C 8.046666 12.033334 8 12.153334 8 12.299999 C 8 12.446667 8.046666 12.566667 8.139999 12.66 C 8.233333 12.753333 8.346666 12.799999 8.48 12.799999 L 11.52 12.799999 C 11.653333 12.799999 11.766666 12.753333 11.86 12.66 C 11.953333 12.566667 12 12.446667 12 12.299999 C 12 12.153334 11.953333 12.033334 11.86 11.94 C 11.766666 11.846666 11.653333 11.799999 11.52 11.799999 Z M 2 6.559999 C 2 6.08 2.173333 5.666666 2.52 5.32 C 2.866666 4.973333 3.28 4.799999 3.76 4.799999 L 16.24 4.799999 C 16.719999 4.799999 17.133331 4.973333 17.48 5.32 C 17.826666 5.666666 18 6.08 18 6.559999 L 18 8.04 C 18 8.386667 17.906666 8.7 17.719999 8.98 C 17.533333 9.26 17.293333 9.48 17 9.639999 L 17 15.799999 C 17 16.626667 16.706665 17.333332 16.119999 17.92 C 15.533332 18.506666 14.826666 18.799999 14 18.799999 L 6 18.799999 C 5.173333 18.799999 4.466666 18.506666 3.88 17.92 C 3.293333 17.333332 3 16.626667 3 15.799999 L 3 9.639999 C 2.706666 9.48 2.466666 9.26 2.28 8.98 C 2.093333 8.7 2 8.386667 2 8.04 Z M 3.76 5.799999 C 3.546666 5.799999 3.366666 5.873333 3.22 6.02 C 3.073333 6.166667 3 6.346667 3 6.559999 L 3 8.04 C 3 8.253334 3.073333 8.433333 3.22 8.58 C 3.366666 8.726666 3.546666 8.799999 3.76 8.799999 L 16.24 8.799999 C 16.453333 8.799999 16.633331 8.726666 16.779999 8.58 C 16.926666 8.433333 17 8.253334 17 8.04 L 17 6.559999 C 17 6.346667 16.926666 6.166667 16.779999 6.02 C 16.633331 5.873333 16.453333 5.799999 16.24 5.799999 Z M 4 9.799999 L 4 15.799999 C 4 16.360001 4.193333 16.833332 4.58 17.219999 C 4.966666 17.606667 5.44 17.799999 6 17.799999 L 14 17.799999 C 14.559999 17.799999 15.033333 17.606667 15.42 17.219999 C 15.806666 16.833332 16 16.360001 16 15.799999 L 16 9.799999 Z " />
+    </NavigationViewItem.IconSource>
     <NavigationViewItem.InfoBadge>
         <InfoBadge Value="{Binding Key}" />
     </NavigationViewItem.InfoBadge>
diff --git a/Wallet.Avalonia/CategoriesNavigationView.axaml b/Wallet.Avalonia/CategoriesNavigationView.axaml
index 196962b..2409814 100644
--- a/Wallet.Avalonia/CategoriesNavigationView.axaml
+++ b/Wallet.Avalonia/CategoriesNavigationView.axaml
@@ -6,4 +6,8 @@
     x:DataType="vm:CategoriesNavigationViewModel"
     Content="Categories"
     MenuItemsSource="{Binding}"
-    SelectsOnInvoked="False" />
+    SelectsOnInvoked="False">
+    <NavigationViewItem.IconSource>
+        <PathIconSource Data="F1 M 7 11.799999 C 7 12.066667 6.9 12.3 6.7 12.499999 C 6.499999 12.7 6.266666 12.799999 6 12.799999 C 5.733333 12.799999 5.5 12.7 5.3 12.499999 C 5.099999 12.3 5 12.066667 5 11.799999 C 5 11.533333 5.099999 11.3 5.3 11.099999 C 5.5 10.9 5.733333 10.799999 6 10.799999 C 6.266666 10.799999 6.499999 10.9 6.7 11.099999 C 6.9 11.3 7 11.533333 7 11.799999 Z M 11 11.799999 C 11 12.066667 10.9 12.3 10.7 12.499999 C 10.499999 12.7 10.266666 12.799999 10 12.799999 C 9.733333 12.799999 9.499999 12.7 9.3 12.499999 C 9.099999 12.3 9 12.066667 9 11.799999 C 9 11.533333 9.099999 11.3 9.3 11.099999 C 9.499999 10.9 9.733333 10.799999 10 10.799999 C 10.266666 10.799999 10.499999 10.9 10.7 11.099999 C 10.9 11.3 11 11.533333 11 11.799999 Z M 15 11.799999 C 14.999999 12.066667 14.9 12.3 14.7 12.499999 C 14.5 12.7 14.266666 12.799999 14 12.799999 C 13.733333 12.799999 13.499999 12.7 13.299999 12.499999 C 13.099999 12.3 13 12.066667 13 11.799999 C 13 11.533333 13.099999 11.3 13.299999 11.099999 C 13.499999 10.9 13.733333 10.799999 14 10.799999 C 14.266666 10.799999 14.5 10.9 14.7 11.099999 C 14.9 11.3 14.999999 11.533333 15 11.799999 Z M 10 3.799999 C 8.559999 3.799999 7.226666 4.16 6 4.879999 C 4.773333 5.6 3.8 6.573334 3.08 7.799999 C 2.36 9.026667 2 10.360001 2 11.799999 C 2 13.24 2.36 14.573334 3.08 15.799999 C 3.8 17.026667 4.773333 18 6 18.719999 C 7.226666 19.439999 8.559999 19.799999 10 19.799999 C 11.439999 19.799999 12.773333 19.439999 14 18.719999 C 15.226665 18 16.199999 17.026667 16.92 15.799999 C 17.639999 14.573334 18 13.24 18 11.799999 C 18 10.360001 17.639999 9.026667 16.92 7.799999 C 16.199999 6.573334 15.226665 5.6 14 4.879999 C 12.773333 4.16 11.439999 3.799999 10 3.799999 Z M 3 11.799999 C 3 10.52 3.313333 9.346666 3.94 8.28 C 4.566667 7.213333 5.413333 6.366667 6.48 5.74 C 7.546666 5.113333 8.719999 4.799999 10 4.799999 C 11.28 4.799999 12.453333 5.113333 13.52 5.74 C 14.586666 6.366667 15.433332 7.213333 16.059999 8.28 C 16.686666 9.346666 17 10.52 17 11.799999 C 17 13.08 16.686666 14.253333 16.059999 15.32 C 15.433332 16.386665 14.586666 17.233334 13.52 17.859999 C 12.453333 18.486666 11.28 18.799999 10 18.799999 C 8.719999 18.799999 7.546666 18.486666 6.48 17.859999 C 5.413333 17.233334 4.566667 16.386665 3.94 15.32 C 3.313333 14.253333 3 13.08 3 11.799999 Z " />
+    </NavigationViewItem.IconSource>
+</NavigationViewItem>
diff --git a/Wallet.Avalonia/FavouritesNavigationView.axaml b/Wallet.Avalonia/FavouritesNavigationView.axaml
index 4f655a7..f91faa0 100644
--- a/Wallet.Avalonia/FavouritesNavigationView.axaml
+++ b/Wallet.Avalonia/FavouritesNavigationView.axaml
@@ -33,6 +33,9 @@
             </ConditionAction>
         </DataTriggerBehavior>
     </Interaction.Behaviors>
+    <NavigationViewItem.IconSource>
+        <PathIconSource Data="F1 M 9.12 4.68 C 9.199999 4.52 9.32 4.393333 9.48 4.299999 C 9.639999 4.206667 9.813333 4.16 10 4.16 C 10.186666 4.16 10.359999 4.206667 10.52 4.299999 C 10.68 4.393333 10.8 4.52 10.88 4.68 L 12.84 8.599999 L 17.16 9.24 C 17.346666 9.266667 17.513332 9.34 17.66 9.459999 C 17.806665 9.58 17.906666 9.733334 17.959999 9.919999 C 18.013332 10.106667 18.019999 10.293333 17.98 10.48 C 17.939999 10.666666 17.84 10.826666 17.68 10.959999 L 14.559999 14 L 15.32 18.279999 C 15.346665 18.466665 15.326666 18.646666 15.259999 18.82 C 15.193333 18.993332 15.079999 19.139999 14.92 19.259998 C 14.759999 19.379999 14.586666 19.446667 14.4 19.459999 C 14.213333 19.473333 14.04 19.439999 13.88 19.359999 L 10 17.32 L 6.12 19.359999 C 5.96 19.439999 5.786666 19.473333 5.6 19.459999 C 5.413333 19.446667 5.24 19.379999 5.08 19.259998 C 4.92 19.139999 4.806666 18.993332 4.74 18.82 C 4.673333 18.646666 4.653333 18.466665 4.68 18.279999 L 5.44 14 L 2.32 10.959999 C 2.16 10.826666 2.06 10.666666 2.02 10.48 C 1.98 10.293333 1.986666 10.106667 2.04 9.919999 C 2.093333 9.733334 2.193333 9.58 2.34 9.459999 C 2.486666 9.34 2.653333 9.266667 2.84 9.24 L 7.16 8.599999 Z M 10 5.16 L 8.08 9.04 C 7.919999 9.360001 7.666666 9.546667 7.32 9.599999 L 3 10.24 L 6.12 13.28 C 6.386666 13.52 6.48 13.813334 6.4 14.16 L 5.68 18.439999 L 9.52 16.439999 C 9.839999 16.279999 10.16 16.279999 10.48 16.439999 L 14.32 18.439999 L 13.599999 14.16 C 13.519999 13.813334 13.613333 13.52 13.88 13.28 L 17 10.24 L 12.679999 9.599999 C 12.333332 9.546667 12.079999 9.360001 11.92 9.04 Z " />
+    </NavigationViewItem.IconSource>
     <NavigationViewItem.InfoBadge>
         <InfoBadge Value="{Binding Key}" />
     </NavigationViewItem.InfoBadge>
diff --git a/Wallet.Avalonia/MainView.axaml b/Wallet.Avalonia/MainView.axaml
index d07544a..19b5e21 100644
--- a/Wallet.Avalonia/MainView.axaml
+++ b/Wallet.Avalonia/MainView.axaml
@@ -8,9 +8,27 @@
         FooterMenuItemsSource="{Binding Footer}"
         IsSettingsVisible="False"
         MenuItemTemplate="{Binding Template}"
-        MenuItemsSource="{Binding}"
-        SelectedItem="{Binding SelectedItem}"
+        MenuItemsSource="{Binding SelectedItem, Mode=TwoWay}"
         SelectionFollowsFocus="True">
+        <NavigationView.PaneCustomContent>
+            <Grid RowDefinitions="*,Auto">
+                <ListBox
+                    Grid.Row="0"
+                    Margin="1,0,1,0"
+                    HorizontalAlignment="Stretch"
+                    ItemTemplate="{ReflectionBinding Template}"
+                    ItemsSource="{Binding}"
+                    SelectedItem="{Binding SelectedItem}">
+                    <ListBox.Styles>
+                        <Style Selector="ListBoxItem">
+                            <Setter Property="MinWidth" Value="0" />
+                            <Setter Property="Margin" Value="2,0,2,0" />
+                        </Style>
+                    </ListBox.Styles>
+                </ListBox>
+                <NavigationViewItemSeparator Grid.Row="1" />
+            </Grid>
+        </NavigationView.PaneCustomContent>
         <NavigationView.Resources>
             <CornerRadius x:Key="NavigationViewContentGridCornerRadius">0</CornerRadius>
             <Thickness x:Key="NavigationViewContentGridBorderThickness">1,0,0,0</Thickness>
diff --git a/Wallet.Avalonia/MainWindow.axaml b/Wallet.Avalonia/MainWindow.axaml
index d5a4856..811c20b 100644
--- a/Wallet.Avalonia/MainWindow.axaml
+++ b/Wallet.Avalonia/MainWindow.axaml
@@ -4,7 +4,9 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Wallet"
     xmlns:windowing="using:FluentAvalonia.UI.Windowing"
-    x:DataType="vm:MainWindowViewModel">
+    x:DataType="vm:MainWindowViewModel"
+    Background="Transparent"
+    TransparencyLevelHint="Mica">
     <ContentControl>
         <Interaction.Behaviors>
             <AttachedBehaviour>
diff --git a/Wallet.Avalonia/WalletNavigationView.axaml b/Wallet.Avalonia/WalletNavigationView.axaml
index 1f8b67a..b4c7ef7 100644
--- a/Wallet.Avalonia/WalletNavigationView.axaml
+++ b/Wallet.Avalonia/WalletNavigationView.axaml
@@ -1,17 +1,12 @@
-<NavigationViewItem
+<ListBoxItem
     x:Class="Wallet.Avalonia.WalletNavigationView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ui="using:FluentAvalonia.UI.Controls"
     xmlns:vm="using:Wallet"
-    x:Name="NavigationViewItem"
     x:DataType="vm:WalletNavigationViewModel"
     Content="{Binding Name}"
-    IsExpanded="{Binding IsExpanded}"
-    IsSelected="{Binding IsSelected}"
-    MenuItemsSource="{Binding}"
-    NavigationViewExtension.IsItemInvokedEnabled="True"
-    SelectsOnInvoked="True">
+    ListBoxExtension.IsItemInvokedEnabled="True">
     <Interaction.Behaviors>
         <DataTriggerBehavior Binding="{Binding IsOpened}" Value="False">
             <ConditionAction>
@@ -23,50 +18,9 @@
                 <NavigateAction Region="Main" Route="OpenWallet">
                     <Parameter Key="Name" Value="{Binding Name}" />
                 </NavigateAction>
-                <ChangePropertyAction
-                    PropertyName="SelectsOnInvoked"
-                    TargetObject="{Binding #NavigationViewItem}"
-                    Value="True" />
             </ConditionAction>
         </DataTriggerBehavior>
-        <DataTriggerBehavior Binding="{Binding IsOpened}" Value="True">
-            <ConditionAction>
-                <ConditionAction.Condition>
-                    <ConditionalExpression ForwardChaining="And">
-                        <ComparisonCondition LeftOperand="{Binding IsSelected}" RightOperand="True" />
-                    </ConditionalExpression>
-                </ConditionAction.Condition>
-                <ChangePropertyAction
-                    PropertyName="SelectsOnInvoked"
-                    TargetObject="{Binding #NavigationViewItem}"
-                    Value="False" />
-                <InvokeNavigationViewItemAction />
-            </ConditionAction>
-        </DataTriggerBehavior>
-        <AttachedBehaviour>
-            <ConditionAction>
-                <ConditionAction.Condition>
-                    <ConditionalExpression ForwardChaining="And">
-                        <ComparisonCondition LeftOperand="{Binding IsOpened}" RightOperand="False" />
-                        <ComparisonCondition LeftOperand="{Binding IsSelected}" RightOperand="True" />
-                    </ConditionalExpression>
-                </ConditionAction.Condition>
-                <NavigateAction Region="Main" Route="OpenWallet">
-                    <Parameter Key="Name" Value="{Binding Name}" />
-                </NavigateAction>
-            </ConditionAction>
-            <ConditionAction>
-                <ConditionAction.Condition>
-                    <ConditionalExpression ForwardChaining="And">
-                        <ComparisonCondition LeftOperand="{Binding IsOpened}" RightOperand="True" />
-                        <ComparisonCondition LeftOperand="{Binding IsActivated}" RightOperand="False" />
-                    </ConditionalExpression>
-                </ConditionAction.Condition>
-                <NavigateAction Region="Main" Route="Wallet" />
-                <InvokeNavigationViewItemAction />
-            </ConditionAction>
-        </AttachedBehaviour>
-        <AttachedEventTriggerBehaviour RoutedEvent="{x:Static NavigationViewExtension.ItemInvokedEvent}">
+        <AttachedEventTriggerBehaviour RoutedEvent="{x:Static ListBoxExtension.ItemInvokedEvent}">
             <ConditionAction>
                 <ConditionAction.Condition>
                     <ConditionalExpression ForwardChaining="And">
@@ -77,39 +31,6 @@
                     <Parameter Key="Name" Value="{Binding Name}" />
                 </NavigateAction>
             </ConditionAction>
-            <ConditionAction>
-                <ConditionAction.Condition>
-                    <ConditionalExpression ForwardChaining="And">
-                        <ComparisonCondition LeftOperand="{Binding IsOpened}" RightOperand="True" />
-                        <ComparisonCondition LeftOperand="{Binding IsActivated}" RightOperand="False" />
-                    </ConditionalExpression>
-                </ConditionAction.Condition>
-                <InvokeNavigationViewItemAction />
-            </ConditionAction>
         </AttachedEventTriggerBehaviour>
-        <DataTriggerBehavior Binding="{Binding IsOpened}" Value="False">
-            <RemoveClassAction ClassName="Closed" />
-            <AddClassAction ClassName="Closed" RemoveIfExists="True" />
-        </DataTriggerBehavior>
-        <DataTriggerBehavior Binding="{Binding IsOpened}" Value="True">
-            <RemoveClassAction ClassName="Opened" />
-            <AddClassAction ClassName="Opened" RemoveIfExists="True" />
-        </DataTriggerBehavior>
     </Interaction.Behaviors>
-    <NavigationViewItem.Styles>
-        <Style Selector="ui|NavigationViewItem.Closed">
-            <Setter Property="IconSource">
-                <Setter.Value>
-                    <PathIconSource Data="M512,757.76C525.653,757.76 537.6,752.64 547.84,742.4C558.08,732.16 563.2,720.213 563.2,706.56C563.2,692.907 558.08,680.96 547.84,670.72C537.6,660.48 525.653,655.36 512,655.36C498.347,655.36 486.4,660.48 476.16,670.72C465.92,680.96 460.8,692.907 460.8,706.56C460.8,720.213 465.92,732.16 476.16,742.4C486.4,752.64 498.347,757.76 512,757.76ZM307.2,399.36L358.4,399.36L358.4,348.16C358.4,305.835 373.419,269.653 403.456,239.616C433.493,209.579 469.675,194.56 512,194.56C554.325,194.56 590.507,209.579 620.544,239.616C650.581,269.653 665.6,305.835 665.6,348.16L665.6,399.36L716.8,399.36C759.125,399.36 795.307,414.379 825.344,444.416C855.381,474.453 870.4,510.635 870.4,552.96L870.4,860.16C870.4,902.485 855.381,938.667 825.344,968.704C795.307,998.741 759.125,1013.76 716.8,1013.76L307.2,1013.76C264.875,1013.76 228.693,998.741 198.656,968.704C168.619,938.667 153.6,902.485 153.6,860.16L153.6,552.96C153.6,510.635 168.619,474.453 198.656,444.416C228.693,414.379 264.875,399.36 307.2,399.36ZM512,245.76C483.328,245.76 459.093,255.659 439.296,275.456C419.499,295.253 409.6,319.488 409.6,348.16L409.6,399.36L614.4,399.36L614.4,348.16C614.4,319.488 604.501,295.253 584.704,275.456C564.907,255.659 540.672,245.76 512,245.76ZM819.2,552.96C819.2,524.288 809.301,500.053 789.504,480.256C769.707,460.459 745.472,450.56 716.8,450.56L307.2,450.56C278.528,450.56 254.293,460.459 234.496,480.256C214.699,500.053 204.8,524.288 204.8,552.96L204.8,860.16C204.8,888.832 214.699,913.067 234.496,932.864C254.293,952.661 278.528,962.56 307.2,962.56L716.8,962.56C745.472,962.56 769.707,952.661 789.504,932.864C809.301,913.067 819.2,888.832 819.2,860.16Z" />
-                </Setter.Value>
-            </Setter>
-        </Style>
-        <Style Selector="ui|NavigationViewItem.Opened">
-            <Setter Property="IconSource">
-                <Setter.Value>
-                    <PathIconSource Data="M512,757.76C525.653,757.76 537.6,752.64 547.84,742.4C558.08,732.16 563.2,720.213 563.2,706.56C563.2,692.907 558.08,680.96 547.84,670.72C537.6,660.48 525.653,655.36 512,655.36C498.347,655.36 486.4,660.48 476.16,670.72C465.92,680.96 460.8,692.907 460.8,706.56C460.8,720.213 465.92,732.16 476.16,742.4C486.4,752.64 498.347,757.76 512,757.76ZM768,194.56C739.328,194.56 715.093,204.459 695.296,224.256C675.499,244.053 665.6,268.288 665.6,296.96L665.6,399.36L716.8,399.36C759.125,399.36 795.307,414.379 825.344,444.416C855.381,474.453 870.4,510.635 870.4,552.96L870.4,860.16C870.4,902.485 855.381,938.667 825.344,968.704C795.307,998.741 759.125,1013.76 716.8,1013.76L307.2,1013.76C264.875,1013.76 228.693,998.741 198.656,968.704C168.619,938.667 153.6,902.485 153.6,860.16L153.6,552.96C153.6,510.635 168.619,474.453 198.656,444.416C228.693,414.379 264.875,399.36 307.2,399.36L614.4,399.36L614.4,296.96C614.4,254.635 629.419,218.453 659.456,188.416C689.493,158.379 725.675,143.36 768,143.36C810.325,143.36 846.507,158.379 876.544,188.416C906.581,218.453 921.6,254.635 921.6,296.96L921.6,321.536C921.6,329.728 919.211,336.213 914.432,340.992C909.653,345.771 903.509,348.16 896,348.16C888.491,348.16 882.347,345.771 877.568,340.992C872.789,336.213 870.4,330.411 870.4,323.584L870.4,296.96C870.4,268.288 860.501,244.053 840.704,224.256C820.907,204.459 796.672,194.56 768,194.56ZM716.8,450.56L307.2,450.56C278.528,450.56 254.293,460.459 234.496,480.256C214.699,500.053 204.8,524.288 204.8,552.96L204.8,860.16C204.8,888.832 214.699,913.067 234.496,932.864C254.293,952.661 278.528,962.56 307.2,962.56L716.8,962.56C745.472,962.56 769.707,952.661 789.504,932.864C809.301,913.067 819.2,888.832 819.2,860.16L819.2,552.96C819.2,524.288 809.301,500.053 789.504,480.256C769.707,460.459 745.472,450.56 716.8,450.56Z" />
-                </Setter.Value>
-            </Setter>
-        </Style>
-    </NavigationViewItem.Styles>
-</NavigationViewItem>
+</ListBoxItem>
diff --git a/Wallet.Avalonia/WalletNavigationView.axaml.cs b/Wallet.Avalonia/WalletNavigationView.axaml.cs
index 20a0c63..4924657 100644
--- a/Wallet.Avalonia/WalletNavigationView.axaml.cs
+++ b/Wallet.Avalonia/WalletNavigationView.axaml.cs
@@ -1,8 +1,9 @@
+using Avalonia.Controls;
 using Toolkit.UI.Controls.Avalonia;
 
 namespace Wallet.Avalonia;
 
-public partial class WalletNavigationView : NavigationViewItem
+public partial class WalletNavigationView : ListBoxItem
 {
     public WalletNavigationView() => 
         InitializeComponent();