diff --git a/Toolkit b/Toolkit
index 4a33a19..f993e1d 160000
--- a/Toolkit
+++ b/Toolkit
@@ -1 +1 @@
-Subproject commit 4a33a1931f68adc5f33e23f4a56c50b0c5b17c98
+Subproject commit f993e1d44b286ddba44b4f3578171b40d86f5177
diff --git a/Wallet.Avalonia/App.axaml.cs b/Wallet.Avalonia/App.axaml.cs
index 8d2a5e3..cc80b97 100644
--- a/Wallet.Avalonia/App.axaml.cs
+++ b/Wallet.Avalonia/App.axaml.cs
@@ -105,6 +105,7 @@ public partial class App : Application
                         services.AddHandler<QueryWalletHandler>();
                         services.AddHandler<RequestItemHandler>();
                         services.AddHandler<CreateItemHandler>();
+                        services.AddHandler<DeleteItemHandler>();
                         services.AddHandler<UpdateItemHander>();
                         services.AddHandler<UpdateItemStateHandler>();
                         services.AddHandler<CountCategoriesHandler>();
@@ -181,7 +182,8 @@ public partial class App : Application
 
                         services.AddHandler<ConfirmUpdateItemHandler>(nameof(ItemState.Write));
                         services.AddHandler<ConfirmCreateItemHandler>(nameof(ItemState.New));
-
+                        services.AddHandler<ConfirmDeleteItemHandler>();
+    
                         services.AddHandler<HyperlinkHandler>();
 
                         services.AddHandler<ItemChangedHandler>(ServiceLifetime.Singleton);
diff --git a/Wallet.Avalonia/ArchiveItemActionView.axaml b/Wallet.Avalonia/ArchiveItemActionView.axaml
index 3a27141..ce460f2 100644
--- a/Wallet.Avalonia/ArchiveItemActionView.axaml
+++ b/Wallet.Avalonia/ArchiveItemActionView.axaml
@@ -16,7 +16,7 @@
             Margin="0,3,0,0"
             VerticalAlignment="Center"
             FontFamily="{DynamicResource FluentThemeFontFamily}"
-            FontSize="16"
+            FontSize="18"
             Foreground="{DynamicResource IconForegroundBrush}"
             Text="&#xE073;" />
     </Button>
diff --git a/Wallet.Avalonia/ConfirmItemActionView.axaml b/Wallet.Avalonia/ConfirmItemActionView.axaml
index 5709e48..93b31d4 100644
--- a/Wallet.Avalonia/ConfirmItemActionView.axaml
+++ b/Wallet.Avalonia/ConfirmItemActionView.axaml
@@ -15,7 +15,7 @@
             Margin="0,3,0,0"
             VerticalAlignment="Center"
             FontFamily="{DynamicResource FluentThemeFontFamily}"
-            FontSize="16"
+            FontSize="18"
             Foreground="{DynamicResource IconForegroundBrush}"
             Text="&#xE3EA;" />
     </Button>
diff --git a/Wallet.Avalonia/DeleteItemActionView.axaml b/Wallet.Avalonia/DeleteItemActionView.axaml
index bcbc00b..3f59f04 100644
--- a/Wallet.Avalonia/DeleteItemActionView.axaml
+++ b/Wallet.Avalonia/DeleteItemActionView.axaml
@@ -14,9 +14,9 @@
         <TextBlock
             Margin="0,3,0,0"
             VerticalAlignment="Center"
-            FontFamily="{DynamicResource SymbolThemeFontFamily}"
-            FontSize="16"
+            FontFamily="{DynamicResource FluentThemeFontFamily}"
+            FontSize="18"
             Foreground="{DynamicResource IconForegroundBrush}"
-            Text="&#xE107;" />
+            Text="&#xE5B9;" />
     </Button>
 </UserControl>
diff --git a/Wallet.Avalonia/DismissItemActionView.axaml b/Wallet.Avalonia/DismissItemActionView.axaml
index ebbae31..78038b6 100644
--- a/Wallet.Avalonia/DismissItemActionView.axaml
+++ b/Wallet.Avalonia/DismissItemActionView.axaml
@@ -15,7 +15,7 @@
             Margin="0,3,0,0"
             VerticalAlignment="Center"
             FontFamily="{DynamicResource FluentThemeFontFamily}"
-            FontSize="16"
+            FontSize="18"
             Foreground="{DynamicResource IconForegroundBrush}"
             Text="&#xE607;" />
     </Button>
diff --git a/Wallet.Avalonia/EditItemActionView.axaml b/Wallet.Avalonia/EditItemActionView.axaml
index f48925d..212ffc4 100644
--- a/Wallet.Avalonia/EditItemActionView.axaml
+++ b/Wallet.Avalonia/EditItemActionView.axaml
@@ -15,7 +15,7 @@
             Margin="0,3,0,0"
             VerticalAlignment="Center"
             FontFamily="{DynamicResource FluentThemeFontFamily}"
-            FontSize="16"
+            FontSize="18"
             Foreground="{DynamicResource IconForegroundBrush}"
             Text="&#xE759;" />
     </Button>
diff --git a/Wallet.Avalonia/FavouriteItemActionView.axaml b/Wallet.Avalonia/FavouriteItemActionView.axaml
index 17e0cba..62cd12d 100644
--- a/Wallet.Avalonia/FavouriteItemActionView.axaml
+++ b/Wallet.Avalonia/FavouriteItemActionView.axaml
@@ -14,14 +14,14 @@
             <TextBlock
                 VerticalAlignment="Center"
                 FontFamily="{DynamicResource FluentThemeFontFamily}"
-                FontSize="16"
+                FontSize="18"
                 Foreground="{DynamicResource IconForegroundBrush}"
                 IsVisible="{Binding !Value}"
                 Text="&#xEF61;" />
             <TextBlock
                 VerticalAlignment="Center"
                 FontFamily="{DynamicResource FluentThemeFontFamily}"
-                FontSize="16"
+                FontSize="18"
                 Foreground="{DynamicResource IconForegroundBrush}"
                 IsVisible="{Binding Value}"
                 Text="&#xEF60;" />
diff --git a/Wallet.Avalonia/ItemSectionView.axaml b/Wallet.Avalonia/ItemSectionView.axaml
index f781299..df6ce06 100644
--- a/Wallet.Avalonia/ItemSectionView.axaml
+++ b/Wallet.Avalonia/ItemSectionView.axaml
@@ -5,6 +5,11 @@
     xmlns:vm="using:Wallet"
     x:DataType="vm:ItemSectionViewModel">
     <ItemsControl ItemTemplate="{ReflectionBinding Template}" ItemsSource="{Binding}">
+        <ItemsControl.Styles>
+            <Style Selector="ContentPresenter">
+                <Setter Property="IsTabStop" Value="False" />
+            </Style>
+        </ItemsControl.Styles>
         <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
                 <StackPanel Orientation="Vertical" Spacing="4" />
diff --git a/Wallet.Avalonia/ItemView.axaml b/Wallet.Avalonia/ItemView.axaml
index ff60ec4..4b1cce7 100644
--- a/Wallet.Avalonia/ItemView.axaml
+++ b/Wallet.Avalonia/ItemView.axaml
@@ -2,8 +2,15 @@
     x:Class="Wallet.Avalonia.ItemView"
     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:ItemViewModel">
+    <UserControl.Styles>
+        <Style Selector="ui|SettingsExpander">
+            <Setter Property="IsTabStop" Value="False" />
+            <Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
+        </Style>
+    </UserControl.Styles>
     <Interaction.Behaviors>
         <AttachedBehaviour>
             <NavigateAction
diff --git a/Wallet.Avalonia/UnarchiveItemActionView.axaml b/Wallet.Avalonia/UnarchiveItemActionView.axaml
index b1b4a87..887a39b 100644
--- a/Wallet.Avalonia/UnarchiveItemActionView.axaml
+++ b/Wallet.Avalonia/UnarchiveItemActionView.axaml
@@ -10,12 +10,12 @@
         VerticalAlignment="Center"
         Command="{Binding InvokeCommand}"
         Foreground="{DynamicResource IconForegroundBrush}"
-        ToolTip.Tip="Unarchive">
+        ToolTip.Tip="Restore">
         <TextBlock
             VerticalAlignment="Center"
             FontFamily="{DynamicResource FluentThemeFontFamily}"
-            FontSize="16"
+            FontSize="18"
             Foreground="{DynamicResource IconForegroundBrush}"
-            Text="&#xF1A0;" />
+            Text="&#xE075;" />
     </Button>
 </UserControl>
diff --git a/Wallet.Data/LockerContext.cs b/Wallet.Data/LockerContext.cs
index 94aea17..7f2ee40 100644
--- a/Wallet.Data/LockerContext.cs
+++ b/Wallet.Data/LockerContext.cs
@@ -15,10 +15,12 @@ public class WalletContext(DbContextOptions<WalletContext> options) :
     {
         modelBuilder.Entity<ItemEntry>()
             .HasMany(x => x.Tags)
-            .WithOne();
+            .WithOne()
+            .OnDelete(DeleteBehavior.Cascade);
 
         modelBuilder.Entity<ItemEntry>()
             .HasMany(x => x.Blobs)
-            .WithOne();
+            .WithOne()
+            .OnDelete(DeleteBehavior.Cascade);
     }
 }
\ No newline at end of file
diff --git a/Wallet/ConfirmDeleteItemHandler.cs b/Wallet/ConfirmDeleteItemHandler.cs
new file mode 100644
index 0000000..9581191
--- /dev/null
+++ b/Wallet/ConfirmDeleteItemHandler.cs
@@ -0,0 +1,30 @@
+using Toolkit.Foundation;
+
+namespace Wallet;
+
+public class ConfirmDeleteItemHandler(IDecoratorService<Item<(Guid, string)>> decoratorService,
+    ICache<Item<(Guid, string)>> cache,
+    IMediator mediator,
+    IPublisher publisher) :
+    INotificationHandler<DeleteEventArgs<Item>>
+{
+    public async Task Handle(DeleteEventArgs<Item> args)
+    {
+        try
+        {
+            if (decoratorService.Service is Item<(Guid, string)> item)
+            {
+                (Guid id, string name) = item.Value;
+
+                await mediator.Handle<DeleteEventArgs<Item<Guid>>,
+                    bool>(new DeleteEventArgs<Item<Guid>>(new Item<Guid>(id)));
+
+                cache.Add(item);
+                publisher.Publish(Changed.As<Item>());
+            }
+        }
+        catch
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/Wallet/DeleteItemHandler.cs b/Wallet/DeleteItemHandler.cs
new file mode 100644
index 0000000..3bdc87e
--- /dev/null
+++ b/Wallet/DeleteItemHandler.cs
@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore;
+using Toolkit.Foundation;
+using Wallet.Data;
+
+namespace Wallet;
+
+public class DeleteItemHandler(IDbContextFactory<WalletContext> dbContextFactory) :
+    IHandler<DeleteEventArgs<Item<Guid>>, bool>
+{
+    public async Task<bool> Handle(DeleteEventArgs<Item<Guid>> args,
+        CancellationToken cancellationToken)
+    {
+        if (args.Sender is Item<Guid> item)
+        {
+            Guid id = item.Value;
+
+            using WalletContext context = await dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (await context.FindAsync<ItemEntry>(id) is ItemEntry result)
+            {
+                context.Items.Remove(result);
+                await context.SaveChangesAsync(cancellationToken);
+            }
+        }
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/Wallet/ItemNavigationViewModel.cs b/Wallet/ItemNavigationViewModel.cs
index 5bcf900..3b5dc7c 100644
--- a/Wallet/ItemNavigationViewModel.cs
+++ b/Wallet/ItemNavigationViewModel.cs
@@ -23,6 +23,7 @@ public partial class ItemNavigationViewModel(IServiceProvider provider,
     INotificationHandler<UnarchiveEventArgs<Item>>,
     INotificationHandler<FavouriteEventArgs<Item>>,
     INotificationHandler<UnfavouriteEventArgs<Item>>,
+    INotificationHandler<DeleteEventArgs<Item>>,
     INotificationHandler<NotifyEventArgs<ItemHeader<string>>>,
     IKeyed<Guid>,
     ISelectable,
@@ -43,15 +44,14 @@ public partial class ItemNavigationViewModel(IServiceProvider provider,
     [ObservableProperty]
     private Guid id = id;
 
+    [ObservableProperty]
+    private bool isSelected = isSelected;
+
     [ObservableProperty]
     private string? name = name;
 
     [ObservableProperty]
     private string named = $"{named}";
-
-    [ObservableProperty]
-    private bool isSelected = isSelected;
-
     public IContentTemplate Template { get; set; } = template;
 
     public Task Handle(ArchiveEventArgs<Item> args) =>
@@ -75,4 +75,7 @@ public partial class ItemNavigationViewModel(IServiceProvider provider,
 
         return Task.CompletedTask;
     }
+
+    public Task Handle(DeleteEventArgs<Item> args) =>
+        Task.Run(Dispose);
 }
\ No newline at end of file
diff --git a/Wallet/ItemViewModel.cs b/Wallet/ItemViewModel.cs
index 3b77fe7..4e2fcb9 100644
--- a/Wallet/ItemViewModel.cs
+++ b/Wallet/ItemViewModel.cs
@@ -108,6 +108,7 @@ public partial class ItemViewModel :
             Publisher.Publish(Notify.As(Factory.Create<ItemCommandHeaderCollection>(new List<IDisposable>
             {
                 Factory.Create<UnarchiveItemActionViewModel>(),
+                Factory.Create<DeleteItemActionViewModel>(),
             })));
         }
         else
diff --git a/Wallet/UpdateItemHander.cs b/Wallet/UpdateItemHander.cs
index 0f0ac7b..8b680c3 100644
--- a/Wallet/UpdateItemHander.cs
+++ b/Wallet/UpdateItemHander.cs
@@ -12,7 +12,7 @@ public class UpdateItemHander(IDbContextFactory<WalletContext> dbContextFactory)
     public async Task<bool> Handle(UpdateEventArgs<Item<(Guid, string, ItemConfiguration)>> args,
         CancellationToken cancellationToken)
     {
-        if (args.Value is Item<(Guid, string, ItemConfiguration)> item)
+        if (args.Sender is Item<(Guid, string, ItemConfiguration)> item)
         {
             (Guid id, string name, ItemConfiguration configuration) = item.Value;
 
diff --git a/Wallet/UpdateItemStateHandler.cs b/Wallet/UpdateItemStateHandler.cs
index 9ef4641..c5dd8af 100644
--- a/Wallet/UpdateItemStateHandler.cs
+++ b/Wallet/UpdateItemStateHandler.cs
@@ -10,7 +10,7 @@ public class UpdateItemStateHandler(IDbContextFactory<WalletContext> dbContextFa
     public async Task<bool> Handle(UpdateEventArgs<(Guid, int)> args, 
         CancellationToken cancellationToken)
     {
-        if (args.Value is (Guid id, int state))
+        if (args.Sender is (Guid id, int state))
         {
             using WalletContext context = await dbContextFactory.CreateDbContextAsync(cancellationToken);
             if (await context.FindAsync<ItemEntry>(id) is ItemEntry result)