diff --git a/Wallet.Avalonia.Desktop/Wallet.Avalonia.Desktop.csproj b/Wallet.Avalonia.Desktop/Wallet.Avalonia.Desktop.csproj
index 6dcb4f0..4bf02f7 100644
--- a/Wallet.Avalonia.Desktop/Wallet.Avalonia.Desktop.csproj
+++ b/Wallet.Avalonia.Desktop/Wallet.Avalonia.Desktop.csproj
@@ -20,7 +20,7 @@
 	  <Content Include="Icon.ico" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Avalonia.Desktop" Version="11.1.0-rc1" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.1.0-rc2" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\Wallet.Avalonia\Wallet.Avalonia.csproj" />
diff --git a/Wallet.Avalonia/ItemNavigationCollectionView.axaml b/Wallet.Avalonia/ItemNavigationCollectionView.axaml
index cd4b07f..cf02255 100644
--- a/Wallet.Avalonia/ItemNavigationCollectionView.axaml
+++ b/Wallet.Avalonia/ItemNavigationCollectionView.axaml
@@ -25,8 +25,7 @@
             <NavigateAction Region="{Binding Named, StringFormat='{}{0}:Content'}" Route="EmptyItemCollection" />
         </DataTriggerBehavior>
     </Interaction.Behaviors>
-    <ListBox
-        x:Name="foo"
+    <TemplateListBox
         Margin="2,-1,0,0"
         AutoScrollToSelectedItem="True"
         ItemTemplate="{ReflectionBinding Template}"
diff --git a/Wallet.Avalonia/ItemNavigationView.axaml b/Wallet.Avalonia/ItemNavigationView.axaml
index 8360aaa..4664364 100644
--- a/Wallet.Avalonia/ItemNavigationView.axaml
+++ b/Wallet.Avalonia/ItemNavigationView.axaml
@@ -4,6 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Wallet"
     x:DataType="vm:ItemNavigationViewModel"
+    ContentTemplate="{x:Null}"
     ListBoxExtension.IsItemInvokedEnabled="True">
     <ListBoxItem.Resources>
         <SolidColorBrush x:Key="StarredIconForegroundBrush" Color="#FFEDB120" />
@@ -38,7 +39,8 @@
             <ContentBadge
                 BadgePath="F1 M 4.21875 19.53125 C 4.049479 19.53125 3.902995 19.467773 3.779297 19.34082 C 3.655599 19.213867 3.59375 19.065756 3.59375 18.896484 C 3.59375 18.850912 3.597005 18.815104 3.603516 18.789062 L 4.648438 12.675781 L 0.205078 8.349609 C 0.08138 8.225912 0.019531 8.079428 0.019531 7.910156 C 0.019531 7.760417 0.071615 7.623698 0.175781 7.5 C 0.279948 7.376303 0.406901 7.301434 0.556641 7.275391 L 6.689453 6.386719 L 9.443359 0.820312 C 9.495442 0.716146 9.571939 0.633139 9.672852 0.571289 C 9.773763 0.509441 9.879557 0.478516 9.990234 0.478516 C 10.107422 0.478516 10.218099 0.507812 10.322266 0.566406 C 10.426432 0.625 10.504557 0.709637 10.556641 0.820312 L 13.310547 6.386719 L 19.443359 7.275391 C 19.599609 7.301434 19.728189 7.373048 19.829102 7.490234 C 19.930012 7.607423 19.980469 7.744142 19.980469 7.900391 C 19.980469 8.082683 19.918619 8.232422 19.794922 8.349609 L 15.351562 12.675781 L 16.396484 18.789062 C 16.402994 18.815104 16.40625 18.850912 16.40625 18.896484 C 16.40625 19.065756 16.3444 19.21224 16.220703 19.335938 C 16.097004 19.459635 15.950521 19.521484 15.78125 19.521484 C 15.670572 19.521484 15.572916 19.498697 15.488281 19.453125 L 10 16.5625 L 4.511719 19.453125 C 4.420573 19.505209 4.322917 19.53125 4.21875 19.53125 Z "
                 BadgeSize="12"
-                Foreground="{DynamicResource StarredIconForegroundBrush}">
+                Foreground="{DynamicResource StarredIconForegroundBrush}"
+                IsBadgeVisible="{Binding IsFavourite}">
                 <PersonPicture
                     Height="40"
                     DisplayName="{Binding Name}"
diff --git a/Wallet.Avalonia/ItemNavigationView.axaml.cs b/Wallet.Avalonia/ItemNavigationView.axaml.cs
index 2c4fd09..bf5d52d 100644
--- a/Wallet.Avalonia/ItemNavigationView.axaml.cs
+++ b/Wallet.Avalonia/ItemNavigationView.axaml.cs
@@ -1,8 +1,14 @@
 using Avalonia.Controls;
+using System;
 
 namespace Wallet.Avalonia;
 
-public partial class ItemNavigationView : ListBoxItem
+public partial class ItemNavigationView : 
+    ListBoxItem
 {
-    public ItemNavigationView() => InitializeComponent();
+    public ItemNavigationView() => 
+        InitializeComponent();
+
+    protected override Type StyleKeyOverride =>
+        typeof(ListBoxItem);
 }
\ No newline at end of file
diff --git a/Wallet.Avalonia/Wallet.Avalonia.csproj b/Wallet.Avalonia/Wallet.Avalonia.csproj
index 1740305..92c2dbc 100644
--- a/Wallet.Avalonia/Wallet.Avalonia.csproj
+++ b/Wallet.Avalonia/Wallet.Avalonia.csproj
@@ -19,22 +19,22 @@
 	  <Content Include="Assets\Icon.ico" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="Avalonia.Markup.Xaml.Loader" Version="11.1.0-rc1" />
+		<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="Avalonia.Markup.Xaml.Loader" Version="11.1.0-rc2" />
 		<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="HotAvalonia" Version="1.1.1" />
 		<PackageReference Include="HotAvalonia.Extensions" Version="1.1.1" PrivateAssets="All" />
-		<PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.0-rc1" />
+		<PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.0-rc2" />
 		<PackageReference Include="Avalonia.Labs.Controls" Version="11.0.10.1" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
 		<PackageReference Include="FluentAvaloniaUI" Version="2.1.0-preview6" />
 		<PackageReference Include="System.Reactive" Version="6.0.1" />
-		<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.1.0-rc1" />
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-preview.5.24306.7" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0-preview.5.24306.3">
+		<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.1.0-rc2" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-preview.6.24327.7" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0-preview.6.24327.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.0-rc1" />
+		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.0-rc2" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\Toolkit\Toolkit.Avalonia\Toolkit.Avalonia.csproj" />
diff --git a/Wallet.Avalonia/WalletNavigationView.axaml b/Wallet.Avalonia/WalletNavigationView.axaml
index fc1008a..b1dd90d 100644
--- a/Wallet.Avalonia/WalletNavigationView.axaml
+++ b/Wallet.Avalonia/WalletNavigationView.axaml
@@ -1,16 +1,22 @@
-<ListBoxItem
+<OverflowItem
     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:DataType="vm:WalletNavigationViewModel"
+    BadgePath="F1 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 "
+    BadgePlacement="BottomRight"
+    BadgeSize="10"
+    ContentTemplate="{x:Null}"
+    Foreground="#4CAF50"
+    IsBadgeVisible="True"
     ListBoxExtension.IsItemInvokedEnabled="True"
     ToolTip.Tip="{Binding Name}">
-    <ListBoxItem.Resources>
+    <OverflowItem.Resources>
         <x:Double x:Key="IconSize">40</x:Double>
         <CornerRadius x:Key="IconCornerRadius">40</CornerRadius>
-    </ListBoxItem.Resources>
+    </OverflowItem.Resources>
     <Interaction.Behaviors>
         <AttachedEventTriggerBehaviour RoutedEvent="{x:Static ListBoxExtension.ItemInvokedEvent}">
             <ConditionAction>
@@ -72,4 +78,4 @@
             </Button>
         </Grid>
     </Grid>
-</ListBoxItem>
\ No newline at end of file
+</OverflowItem>
\ No newline at end of file
diff --git a/Wallet.Avalonia/WalletNavigationView.axaml.cs b/Wallet.Avalonia/WalletNavigationView.axaml.cs
index fa9a36d..225423c 100644
--- a/Wallet.Avalonia/WalletNavigationView.axaml.cs
+++ b/Wallet.Avalonia/WalletNavigationView.axaml.cs
@@ -1,9 +1,15 @@
 using Avalonia.Controls;
+using System;
+using Toolkit.UI.Controls.Avalonia;
 
 namespace Wallet.Avalonia;
 
-public partial class WalletNavigationView : ListBoxItem
+public partial class WalletNavigationView :
+    OverflowItem
 {
     public WalletNavigationView() => 
         InitializeComponent();
+
+    protected override Type StyleKeyOverride =>
+        typeof(OverflowItem);
 }
\ No newline at end of file
diff --git a/Wallet.Data/Wallet.Data.csproj b/Wallet.Data/Wallet.Data.csproj
index 8f9d51d..ce61d6f 100644
--- a/Wallet.Data/Wallet.Data.csproj
+++ b/Wallet.Data/Wallet.Data.csproj
@@ -5,13 +5,13 @@
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0-preview.5.24306.3" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0-preview.5.24306.3">
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0-preview.6.24327.4" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0-preview.6.24327.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="9.0.0-preview.5.24306.3" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0-preview.5.24306.3">
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="9.0.0-preview.6.24327.4" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0-preview.6.24327.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
diff --git a/Wallet/Wallet.csproj b/Wallet/Wallet.csproj
index 302e079..c132040 100644
--- a/Wallet/Wallet.csproj
+++ b/Wallet/Wallet.csproj
@@ -7,13 +7,13 @@
 	<ItemGroup>
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
 		<PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" Version="8.1.5" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0-preview.5.24306.3" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0-preview.5.24306.3">
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0-preview.6.24327.4" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0-preview.6.24327.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="9.0.0-preview.5.24306.3" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0-preview.5.24306.3">
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="9.0.0-preview.6.24327.4" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0-preview.6.24327.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>