diff --git a/Wallet.Avalonia/ItemCategoryNavigationCollectionView.axaml b/Wallet.Avalonia/ItemCategoryNavigationCollectionView.axaml
index 77febf3..a11d77d 100644
--- a/Wallet.Avalonia/ItemCategoryNavigationCollectionView.axaml
+++ b/Wallet.Avalonia/ItemCategoryNavigationCollectionView.axaml
@@ -4,17 +4,17 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Wallet"
     x:DataType="vm:ItemCategoryNavigationCollectionViewModel">
-    <ListBox
+    <ListView
         Margin="2,-1,0,0"
         AutoScrollToSelectedItem="True"
-        ItemTemplate="{ReflectionBinding Template}"
+        ItemContainerTemplateSelector="{ReflectionBinding Template}"
         ItemsSource="{Binding}"
         SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
         SelectionMode="Single">
-        <ListBox.Styles>
-            <Style Selector="ListBoxItem">
+        <ListView.Styles>
+            <Style Selector="ListViewItem">
                 <Setter Property="IsSelected" Value="{ReflectionBinding Selected, Mode=TwoWay}" />
             </Style>
-        </ListBox.Styles>
-    </ListBox>
+        </ListView.Styles>
+    </ListView>
 </UserControl>
diff --git a/Wallet.Avalonia/ItemCategoryNavigationView.axaml b/Wallet.Avalonia/ItemCategoryNavigationView.axaml
index 221edf9..60b1011 100644
--- a/Wallet.Avalonia/ItemCategoryNavigationView.axaml
+++ b/Wallet.Avalonia/ItemCategoryNavigationView.axaml
@@ -1,4 +1,4 @@
-<ListBoxItem
+<ListViewItem
     x:Class="Wallet.Avalonia.ItemCategoryNavigationView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -25,4 +25,4 @@
             VerticalAlignment="Center"
             Text="{Binding Name}" />
     </Grid>
-</ListBoxItem>
+</ListViewItem>
diff --git a/Wallet.Avalonia/ItemCategoryNavigationView.axaml.cs b/Wallet.Avalonia/ItemCategoryNavigationView.axaml.cs
index 7a547be..e645425 100644
--- a/Wallet.Avalonia/ItemCategoryNavigationView.axaml.cs
+++ b/Wallet.Avalonia/ItemCategoryNavigationView.axaml.cs
@@ -1,8 +1,9 @@
-using Avalonia.Controls;
+using Toolkit.UI.Controls.Avalonia;
 
 namespace Wallet.Avalonia;
 
-public partial class ItemCategoryNavigationView : ListBoxItem
+public partial class ItemCategoryNavigationView :
+    ListViewItem
 {
     public ItemCategoryNavigationView() =>
         InitializeComponent();
diff --git a/Wallet.Avalonia/ItemNavigationCollectionView.axaml b/Wallet.Avalonia/ItemNavigationCollectionView.axaml
index cf02255..f79cc5d 100644
--- a/Wallet.Avalonia/ItemNavigationCollectionView.axaml
+++ b/Wallet.Avalonia/ItemNavigationCollectionView.axaml
@@ -25,10 +25,10 @@
             <NavigateAction Region="{Binding Named, StringFormat='{}{0}:Content'}" Route="EmptyItemCollection" />
         </DataTriggerBehavior>
     </Interaction.Behaviors>
-    <TemplateListBox
+	<ListView
         Margin="2,-1,0,0"
         AutoScrollToSelectedItem="True"
-        ItemTemplate="{ReflectionBinding Template}"
+        ItemContainerTemplateSelector="{ReflectionBinding Template}"
         ItemsSource="{Binding}"
         SelectedItem="{Binding SelectedItem}"
         SelectionMode="Single" />
diff --git a/Wallet.Avalonia/ItemNavigationView.axaml b/Wallet.Avalonia/ItemNavigationView.axaml
index 4664364..20cf012 100644
--- a/Wallet.Avalonia/ItemNavigationView.axaml
+++ b/Wallet.Avalonia/ItemNavigationView.axaml
@@ -1,14 +1,13 @@
-<ListBoxItem
+<ListViewItem
     x:Class="Wallet.Avalonia.ItemNavigationView"
     xmlns="https://github.com/avaloniaui"
     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>
+    <ListViewItem.Resources>
         <SolidColorBrush x:Key="StarredIconForegroundBrush" Color="#FFEDB120" />
-    </ListBoxItem.Resources>
+    </ListViewItem.Resources>
     <Interaction.Behaviors>
         <AttachedEventTriggerBehaviour RoutedEvent="{x:Static ListBoxExtension.ItemInvokedEvent}">
             <NavigateAction
@@ -52,4 +51,4 @@
             <TextBlock Opacity="0.7" Text="{Binding Name}" />
         </StackPanel>
     </Grid>
-</ListBoxItem>
+</ListViewItem>
diff --git a/Wallet.Avalonia/ItemNavigationView.axaml.cs b/Wallet.Avalonia/ItemNavigationView.axaml.cs
index d86a520..a40d35c 100644
--- a/Wallet.Avalonia/ItemNavigationView.axaml.cs
+++ b/Wallet.Avalonia/ItemNavigationView.axaml.cs
@@ -1,14 +1,10 @@
-using Avalonia.Controls;
-using System;
+using Toolkit.UI.Controls.Avalonia;
 
 namespace Wallet.Avalonia;
 
 public partial class ItemNavigationView :
-    ListBoxItem
+    ListViewItem
 {
     public ItemNavigationView() =>
         InitializeComponent();
-
-    protected override Type StyleKeyOverride =>
-        typeof(ListBoxItem);
 }
\ No newline at end of file
diff --git a/Wallet.Avalonia/WalletNavigationCollectionView.axaml b/Wallet.Avalonia/WalletNavigationCollectionView.axaml
index 058ec8b..073d96e 100644
--- a/Wallet.Avalonia/WalletNavigationCollectionView.axaml
+++ b/Wallet.Avalonia/WalletNavigationCollectionView.axaml
@@ -6,7 +6,7 @@
     x:DataType="vm:WalletNavigationCollectionViewModel">
     <Overflow
         HorizontalAlignment="Center"
-        ItemTemplate="{ReflectionBinding Template}"
+        ItemContainerTemplateSelector="{ReflectionBinding Template}"
         ItemsSource="{Binding}"
         SelectedItem="{Binding SelectedItem, Mode=TwoWay}">
         <Overflow.Styles>
diff --git a/Wallet.Avalonia/WalletNavigationView.axaml b/Wallet.Avalonia/WalletNavigationView.axaml
index b988352..9ce1dc2 100644
--- a/Wallet.Avalonia/WalletNavigationView.axaml
+++ b/Wallet.Avalonia/WalletNavigationView.axaml
@@ -9,7 +9,6 @@
     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="{Binding IsOpened}"
     ListBoxExtension.IsItemInvokedEnabled="True"