diff --git a/Wallet.Avalonia/ArchiveItemActionView.axaml b/Wallet.Avalonia/ArchiveItemActionView.axaml
index 461a74e..2f7ee9f 100644
--- a/Wallet.Avalonia/ArchiveItemActionView.axaml
+++ b/Wallet.Avalonia/ArchiveItemActionView.axaml
@@ -11,11 +11,11 @@
         Command="{Binding InvokeCommand}"
         HotKey="Delete"
         ToolTip.Tip="Archive">
-        <TextBlock
-            Margin="0,3,0,0"
-            VerticalAlignment="Center"
-            FontFamily="{DynamicResource FluentThemeFontFamily}"
-            FontSize="18"
-            Text="&#xE073;" />
+        <Viewbox Width="14" Height="14">
+            <PathIcon
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                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 " />
+        </Viewbox>
     </Button>
 </UserControl>
diff --git a/Wallet.Avalonia/ConfirmItemActionView.axaml b/Wallet.Avalonia/ConfirmItemActionView.axaml
index 1072fa5..3238f19 100644
--- a/Wallet.Avalonia/ConfirmItemActionView.axaml
+++ b/Wallet.Avalonia/ConfirmItemActionView.axaml
@@ -10,11 +10,11 @@
         VerticalAlignment="Center"
         Command="{Binding InvokeCommand}"
         ToolTip.Tip="Save">
-        <TextBlock
-            Margin="0,3,0,0"
-            VerticalAlignment="Center"
-            FontFamily="{DynamicResource FluentThemeFontFamily}"
-            FontSize="18"
-            Text="&#xE3EA;" />
+        <Viewbox Width="14" Height="14">
+            <PathIcon
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Data="F1 M 3.36 11.959999 C 3.28 11.853333 3.173333 11.799999 3.04 11.799999 C 2.906667 11.799999 2.786666 11.846666 2.68 11.94 C 2.573333 12.033334 2.513333 12.146667 2.5 12.28 C 2.486667 12.413334 2.533333 12.533333 2.64 12.639999 L 6.64 17.119999 C 6.719999 17.226665 6.833333 17.286667 6.98 17.299999 C 7.126667 17.313332 7.253333 17.266666 7.36 17.16 L 17.84 6.639999 C 17.946667 6.56 18 6.446667 18 6.299999 C 18 6.153334 17.953331 6.033334 17.859999 5.94 C 17.766666 5.846666 17.646666 5.799999 17.5 5.799999 C 17.353333 5.799999 17.239998 5.853333 17.16 5.96 L 7.04 16.08 Z " />
+        </Viewbox>
     </Button>
 </UserControl>
diff --git a/Wallet.Avalonia/DeleteItemActionView.axaml b/Wallet.Avalonia/DeleteItemActionView.axaml
index 919d5a1..f7942b1 100644
--- a/Wallet.Avalonia/DeleteItemActionView.axaml
+++ b/Wallet.Avalonia/DeleteItemActionView.axaml
@@ -10,11 +10,11 @@
         VerticalAlignment="Center"
         Command="{Binding InvokeCommand}"
         ToolTip.Tip="Delete">
-        <TextBlock
-            Margin="0,3,0,0"
-            VerticalAlignment="Center"
-            FontFamily="{DynamicResource FluentThemeFontFamily}"
-            FontSize="18"
-            Text="&#xE5B9;" />
+        <Viewbox Width="14" Height="14">
+            <PathIcon
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Data="F1 M 8.52 5.799999 L 11.52 5.799999 C 11.52 5.373333 11.373333 5.013332 11.08 4.719999 C 10.786666 4.426666 10.426666 4.286667 10 4.299999 C 9.573333 4.313334 9.219999 4.459999 8.94 4.74 C 8.66 5.02 8.52 5.373333 8.52 5.799999 Z M 7.52 5.799999 C 7.52 5.106667 7.759999 4.52 8.24 4.039999 C 8.719999 3.560001 9.306666 3.313334 10 3.299999 C 10.693333 3.286667 11.28 3.526667 11.759999 4.02 C 12.239999 4.513334 12.479999 5.106667 12.48 5.799999 L 17.52 5.799999 C 17.653332 5.799999 17.766666 5.846666 17.859999 5.94 C 17.953331 6.033334 18 6.153334 18 6.299999 C 18 6.446667 17.953331 6.566668 17.859999 6.66 C 17.766666 6.753334 17.653332 6.8 17.52 6.799999 L 16.440001 6.799999 L 15.24 17.16 C 15.159999 17.906666 14.833332 18.533333 14.259999 19.039999 C 13.686666 19.546665 13.026666 19.799999 12.28 19.799999 L 7.72 19.799999 C 6.973333 19.799999 6.313333 19.546665 5.74 19.039999 C 5.166667 18.533333 4.84 17.906666 4.76 17.16 L 3.56 6.799999 L 2.52 6.799999 C 2.36 6.8 2.233333 6.753334 2.14 6.66 C 2.046667 6.566668 2 6.446667 2 6.299999 C 2 6.153334 2.046667 6.033334 2.14 5.94 C 2.233333 5.846666 2.36 5.799999 2.52 5.799999 Z M 5.76 17.039999 C 5.813333 17.546665 6.026666 17.966665 6.4 18.299999 C 6.773333 18.633333 7.213333 18.799999 7.72 18.799999 L 12.28 18.799999 C 12.786666 18.799999 13.226665 18.633333 13.599999 18.299999 C 13.973333 17.966665 14.186666 17.546665 14.24 17.039999 L 15.44 6.799999 L 4.56 6.799999 Z M 8.52 9.28 C 8.653333 9.306667 8.766666 9.366667 8.86 9.459999 C 8.953333 9.553333 9 9.666667 9 9.799999 L 9 15.799999 C 9 15.933332 8.953333 16.053333 8.86 16.16 C 8.766666 16.266666 8.646667 16.313332 8.5 16.299999 C 8.353333 16.286667 8.233333 16.233334 8.139999 16.139999 C 8.046666 16.046665 8 15.933332 8 15.799999 L 8 9.799999 C 8 9.666667 8.046666 9.546667 8.139999 9.44 C 8.233333 9.333334 8.346666 9.280001 8.48 9.28 Z M 12 9.799999 C 12 9.666667 11.953333 9.546667 11.86 9.44 C 11.766666 9.333334 11.646666 9.280001 11.5 9.28 C 11.353333 9.280001 11.233333 9.333334 11.139999 9.44 C 11.046666 9.546667 11 9.666667 11 9.799999 L 11 15.799999 C 11 15.933332 11.046666 16.046665 11.139999 16.139999 C 11.233333 16.233334 11.353333 16.286667 11.5 16.299999 C 11.646666 16.313332 11.766666 16.266666 11.86 16.16 C 11.953333 16.053333 12 15.933332 12 15.799999 Z " />
+        </Viewbox>
     </Button>
 </UserControl>
diff --git a/Wallet.Avalonia/DismissItemActionView.axaml b/Wallet.Avalonia/DismissItemActionView.axaml
index 0549ee2..35384b6 100644
--- a/Wallet.Avalonia/DismissItemActionView.axaml
+++ b/Wallet.Avalonia/DismissItemActionView.axaml
@@ -10,11 +10,11 @@
         VerticalAlignment="Center"
         Command="{Binding InvokeCommand}"
         ToolTip.Tip="Cancel">
-        <TextBlock
-            Margin="0,3,0,0"
-            VerticalAlignment="Center"
-            FontFamily="{DynamicResource FluentThemeFontFamily}"
-            FontSize="18"
-            Text="&#xE607;" />
+        <Viewbox Width="10" Height="10">
+            <PathIcon
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Data="F1 M 4.08 6 L 4.16 5.96 C 4.24 5.853333 4.34 5.799999 4.46 5.799999 C 4.58 5.799999 4.693333 5.826666 4.8 5.879999 L 10 11.08 L 15.16 5.96 C 15.239999 5.853333 15.339999 5.799999 15.46 5.799999 C 15.579999 5.799999 15.693332 5.826666 15.799999 5.879999 L 15.839999 5.96 C 15.946666 6.040001 16 6.14 16 6.259999 C 16 6.38 15.973333 6.493334 15.92 6.599999 L 10.719999 11.799999 L 15.839999 16.959999 C 15.946666 17.040001 16 17.139999 16 17.259998 C 16 17.379999 15.973333 17.493332 15.92 17.599998 L 15.839999 17.639999 C 15.759998 17.746666 15.659999 17.799999 15.54 17.799999 C 15.419999 17.799999 15.306665 17.773333 15.2 17.719999 L 10 12.52 L 4.84 17.639999 C 4.759999 17.746666 4.66 17.799999 4.54 17.799999 C 4.42 17.799999 4.306666 17.773333 4.2 17.719999 L 4.16 17.639999 C 4.053333 17.559999 4 17.459999 4 17.34 C 4 17.219999 4.026667 17.106667 4.08 17 L 9.28 11.799999 L 4.16 6.639999 C 4.053333 6.56 4 6.46 4 6.339999 C 4 6.22 4.026667 6.106668 4.08 6 L 4.16 5.96 Z " />
+        </Viewbox>
     </Button>
 </UserControl>
diff --git a/Wallet.Avalonia/EditItemActionView.axaml b/Wallet.Avalonia/EditItemActionView.axaml
index 8238324..d520197 100644
--- a/Wallet.Avalonia/EditItemActionView.axaml
+++ b/Wallet.Avalonia/EditItemActionView.axaml
@@ -10,11 +10,11 @@
         VerticalAlignment="Center"
         Command="{Binding InvokeCommand}"
         ToolTip.Tip="Edit">
-        <TextBlock
-            Margin="0,3,0,0"
-            VerticalAlignment="Center"
-            FontFamily="{DynamicResource FluentThemeFontFamily}"
-            FontSize="18"
-            Text="&#xE759;" />
+        <Viewbox Width="14" Height="14">
+            <PathIcon
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Data="F1 M 17.199999 4.719999 C 16.613333 4.106667 15.9 3.799999 15.059999 3.799999 C 14.219999 3.799999 13.506666 4.093334 12.92 4.68 L 3.56 14.039999 C 3.213333 14.386666 2.986666 14.786666 2.88 15.24 L 2 19.199999 C 1.973333 19.359999 2.026666 19.506666 2.16 19.639999 C 2.293333 19.773333 2.44 19.826666 2.6 19.799999 L 6.52 18.92 C 7 18.813334 7.413333 18.586666 7.76 18.24 L 17.119999 8.879999 C 17.706665 8.32 18 7.633333 18 6.82 C 18 6.006668 17.733332 5.306667 17.199999 4.719999 Z M 13.639999 5.359999 C 13.879999 5.119999 14.173333 4.953333 14.52 4.859999 C 14.866666 4.766666 15.206666 4.766666 15.54 4.859999 C 15.873332 4.953333 16.166664 5.126667 16.42 5.379999 C 16.673332 5.633335 16.846666 5.926667 16.940001 6.259999 C 17.033333 6.593333 17.033333 6.933333 16.940001 7.28 C 16.846666 7.626666 16.68 7.92 16.440001 8.16 L 15.759999 8.839999 L 12.96 6.04 Z M 12.24 6.759999 L 15.04 9.559999 L 7.08 17.52 C 6.866666 17.733334 6.613333 17.879999 6.32 17.959999 L 3.16 18.639999 L 3.88 15.44 C 3.933333 15.173333 4.053333 14.946667 4.24 14.759999 Z " />
+        </Viewbox>
     </Button>
 </UserControl>
diff --git a/Wallet.Avalonia/FavouriteItemActionView.axaml b/Wallet.Avalonia/FavouriteItemActionView.axaml
index 0ec8ef4..38b1251 100644
--- a/Wallet.Avalonia/FavouriteItemActionView.axaml
+++ b/Wallet.Avalonia/FavouriteItemActionView.axaml
@@ -11,18 +11,24 @@
         Command="{Binding InvokeCommand}"
         ToolTip.Tip="Edit">
         <Grid>
-            <TextBlock
-                VerticalAlignment="Center"
-                FontFamily="{DynamicResource FluentThemeFontFamily}"
-                FontSize="18"
-                IsVisible="{Binding !Value}"
-                Text="&#xEF61;" />
-            <TextBlock
-                VerticalAlignment="Center"
-                FontFamily="{DynamicResource FluentThemeFontFamily}"
-                FontSize="18"
-                IsVisible="{Binding Value}"
-                Text="&#xEF60;" />
+            <Viewbox
+                Width="14"
+                Height="14"
+                IsVisible="{Binding !Value}">
+                <PathIcon
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    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 " />
+            </Viewbox>
+            <Viewbox
+                Width="14"
+                Height="14"
+                IsVisible="{Binding Value}">
+                <PathIcon
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    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 " />
+            </Viewbox>
         </Grid>
     </Button>
 </UserControl>
diff --git a/Wallet.Avalonia/ItemCommandHeaderView.axaml b/Wallet.Avalonia/ItemCommandHeaderView.axaml
index 61bece5..2b7fcf6 100644
--- a/Wallet.Avalonia/ItemCommandHeaderView.axaml
+++ b/Wallet.Avalonia/ItemCommandHeaderView.axaml
@@ -6,7 +6,7 @@
     x:DataType="vm:ItemCommandHeaderViewModel">
     <UserControl.Resources>
         <ResourceDictionary>
-            <x:Double x:Key="ButtonWidth">40</x:Double>
+            <x:Double x:Key="ButtonWidth">36</x:Double>
             <x:Double x:Key="ButtonHeight">36</x:Double>
             <SolidColorBrush x:Key="ButtonBackground" Color="{DynamicResource SubtleFillColorTransparent}" />
             <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{DynamicResource SubtleFillColorSecondary}" />
@@ -21,7 +21,7 @@
         ItemsSource="{Binding}">
         <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
-                <StackPanel Orientation="Horizontal" Spacing="4" />
+                <StackPanel Orientation="Horizontal" Spacing="6" />
             </ItemsPanelTemplate>
         </ItemsControl.ItemsPanel>
     </ItemsControl>
diff --git a/Wallet.Avalonia/PasswordEntryView.axaml b/Wallet.Avalonia/PasswordEntryView.axaml
index 23c0527..7ffa355 100644
--- a/Wallet.Avalonia/PasswordEntryView.axaml
+++ b/Wallet.Avalonia/PasswordEntryView.axaml
@@ -10,6 +10,20 @@
         <Thickness x:Key="TextControlThemePadding">10,5,6,6</Thickness>
         <Thickness x:Key="TextControlCompactThemePadding">0</Thickness>
     </SettingsExpander.Resources>
+    <SettingsExpander.Action>
+        <Button
+            Grid.Column="1"
+            Width="{StaticResource ButtonWidth}"
+            Height="{StaticResource ButtonHeight}"
+            Theme="{StaticResource TransparentButton}">
+            <Viewbox Width="14" Height="14">
+                <PathIcon
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Data="F1 M 3.28 13.4 C 3.493333 12.333333 3.926666 11.373333 4.58 10.52 C 5.233333 9.666667 6.033333 9 6.98 8.52 C 7.926666 8.039999 8.933332 7.799999 10 7.799999 C 11.066666 7.799999 12.073333 8.039999 13.02 8.52 C 13.966666 9 14.766666 9.666667 15.42 10.52 C 16.073334 11.373333 16.52 12.333333 16.76 13.4 C 16.786667 13.533333 16.853333 13.639999 16.959999 13.719999 C 17.066666 13.799999 17.186665 13.826666 17.32 13.799999 C 17.453333 13.773333 17.559999 13.699999 17.639999 13.579999 C 17.719999 13.459999 17.746666 13.333333 17.719999 13.2 C 17.453333 11.973333 16.946667 10.873333 16.199999 9.9 C 15.453332 8.926666 14.539999 8.166667 13.46 7.62 C 12.379999 7.073334 11.226666 6.8 10 6.799999 C 8.773333 6.8 7.62 7.073334 6.54 7.62 C 5.46 8.166667 4.546667 8.926666 3.8 9.9 C 3.053333 10.873333 2.546666 11.973333 2.28 13.2 C 2.253333 13.333333 2.28 13.459999 2.36 13.579999 C 2.44 13.699999 2.546667 13.773333 2.68 13.799999 C 2.813333 13.826666 2.933333 13.799999 3.04 13.719999 C 3.146666 13.639999 3.226666 13.533333 3.28 13.4 Z M 10 9.799999 C 9.039999 9.799999 8.213333 10.139999 7.52 10.82 C 6.826666 11.5 6.486667 12.326666 6.5 13.299999 C 6.513333 14.273333 6.86 15.099999 7.54 15.779999 C 8.219999 16.459999 9.039999 16.799999 10 16.799999 C 10.959999 16.799999 11.786666 16.459999 12.48 15.779999 C 13.173332 15.099999 13.519999 14.273333 13.52 13.299999 C 13.519999 12.326666 13.173332 11.5 12.48 10.82 C 11.786666 10.139999 10.959999 9.799999 10 9.799999 Z M 7.52 13.28 C 7.493333 12.613334 7.726666 12.033333 8.22 11.539999 C 8.713333 11.046666 9.306666 10.799999 10 10.799999 C 10.693333 10.799999 11.28 11.046666 11.759999 11.539999 C 12.239999 12.033333 12.486666 12.62 12.5 13.299999 C 12.513332 13.98 12.273333 14.566667 11.78 15.059999 C 11.286667 15.553333 10.693333 15.799999 10 15.799999 C 9.306666 15.799999 8.719999 15.553333 8.24 15.059999 C 7.759999 14.566667 7.52 13.973333 7.52 13.28 Z " />
+            </Viewbox>
+        </Button>
+    </SettingsExpander.Action>
     <SettingsExpander.Footer>
         <TextBox
             Classes="revealPasswordButton"
diff --git a/Wallet.Avalonia/UnarchiveItemActionView.axaml b/Wallet.Avalonia/UnarchiveItemActionView.axaml
index 3b13de0..1d3d3dd 100644
--- a/Wallet.Avalonia/UnarchiveItemActionView.axaml
+++ b/Wallet.Avalonia/UnarchiveItemActionView.axaml
@@ -10,10 +10,14 @@
         VerticalAlignment="Center"
         Command="{Binding InvokeCommand}"
         ToolTip.Tip="Restore">
-        <TextBlock
-            VerticalAlignment="Center"
-            FontFamily="{DynamicResource FluentThemeFontFamily}"
-            FontSize="18"
-            Text="&#xE075;" />
+        <Viewbox
+            Width="16"
+            Height="16"
+            Margin="0,2,0,0">
+            <PathIcon
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                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 10.24 12.799999 C 10.559999 12.426666 10.919999 12.093333 11.32 11.799999 Z M 6 17.799999 L 9.2 17.799999 C 9.306665 18.146666 9.439999 18.48 9.599999 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 L 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 11.4 C 16.68 11.24 16.346666 11.106667 16 10.999999 L 16 9.799999 L 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 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 14.52 20.799999 C 15.319999 20.799999 16.066666 20.599998 16.76 20.199999 C 17.453333 19.799999 18 19.253332 18.4 18.559999 C 18.799999 17.866667 19 17.113333 19 16.299999 C 19 15.486666 18.799999 14.733334 18.4 14.039999 C 18 13.346666 17.453333 12.799999 16.76 12.4 C 16.066666 12 15.313332 11.799999 14.5 11.799999 C 13.686666 11.799999 12.933332 12 12.24 12.4 C 11.546666 12.799999 11 13.346666 10.599999 14.039999 C 10.199999 14.733334 10 15.486666 10 16.299999 C 10 17.113333 10.199999 17.866667 10.599999 18.559999 C 11 19.253332 11.546666 19.799999 12.24 20.199999 C 12.933332 20.599998 13.679999 20.799999 14.48 20.799999 Z M 13.599999 14.4 L 12.719999 15.279999 L 14.24 15.279999 C 15.013332 15.306666 15.666665 15.586666 16.199999 16.119999 C 16.733334 16.653332 17 17.293333 17 18.039999 L 17 18.279999 C 17 18.439999 16.953333 18.566666 16.859999 18.66 C 16.766666 18.753332 16.646666 18.799999 16.5 18.799999 C 16.353333 18.799999 16.233332 18.753332 16.139999 18.66 C 16.046665 18.566666 16 18.439999 16 18.279999 L 16 18.039999 C 16 17.559999 15.826666 17.146666 15.48 16.799999 C 15.133332 16.453333 14.719999 16.279999 14.24 16.279999 L 12.719999 16.279999 L 13.599999 17.199999 C 13.706665 17.306667 13.759998 17.426666 13.759999 17.559999 C 13.759998 17.693333 13.706665 17.806665 13.599999 17.9 C 13.493332 17.993332 13.373333 18.039999 13.24 18.039999 C 13.106667 18.039999 12.986666 18 12.88 17.92 L 11.16 16.16 C 11.053333 16.053333 11 15.933332 11 15.799999 C 11 15.666666 11.053333 15.546667 11.16 15.44 L 12.88 13.679999 C 12.986666 13.599999 13.106667 13.559999 13.24 13.559999 C 13.373333 13.559999 13.493332 13.606667 13.599999 13.7 C 13.706665 13.793333 13.759998 13.906666 13.759999 14.039999 C 13.759998 14.173333 13.706665 14.293333 13.599999 14.4 Z " />
+        </Viewbox>
     </Button>
 </UserControl>
diff --git a/Wallet.Avalonia/WalletNavigationView.axaml b/Wallet.Avalonia/WalletNavigationView.axaml
index 0bc755c..536de48 100644
--- a/Wallet.Avalonia/WalletNavigationView.axaml
+++ b/Wallet.Avalonia/WalletNavigationView.axaml
@@ -10,7 +10,6 @@
     <ListBoxItem.Resources>
         <x:Double x:Key="IconSize">40</x:Double>
         <CornerRadius x:Key="IconCornerRadius">40</CornerRadius>
-
     </ListBoxItem.Resources>
     <Interaction.Behaviors>
         <DataTriggerBehavior Binding="{Binding IsOpened}" Value="False">
diff --git a/Wallet/Closed.cs b/Wallet/Closed.cs
index 20820fb..d2e21ff 100644
--- a/Wallet/Closed.cs
+++ b/Wallet/Closed.cs
@@ -4,7 +4,7 @@ namespace Wallet;
 
 public record Closed
 {
-    public static ChangedEventArgs<TValue> As<TValue>(TValue value) => new(value);
+    public static ClosedEventArgs<TValue> As<TValue>(TValue value) => new(value);
 
-    public static ChangedEventArgs<TValue> As<TValue>() where TValue : new() => new(new TValue());
+    public static ClosedEventArgs<TValue> As<TValue>() where TValue : new() => new(new TValue());
 }
\ No newline at end of file
diff --git a/Wallet/WalletNavigationViewModel.cs b/Wallet/WalletNavigationViewModel.cs
index cb125ec..9ae02c8 100644
--- a/Wallet/WalletNavigationViewModel.cs
+++ b/Wallet/WalletNavigationViewModel.cs
@@ -57,8 +57,8 @@ public partial class WalletNavigationViewModel :
         Add<FavouritesNavigationViewModel>("Favourites", 0);
         Add<ArchiveNavigationViewModel>("Archive", 0);
         Add<CategoriesNavigationViewModel>("Categories", 0);
-        IsOpened = true;
 
+        IsOpened = true;
         Publisher.Publish(Changed.As<Item>());
 
         return Task.CompletedTask;
@@ -66,7 +66,7 @@ public partial class WalletNavigationViewModel :
 
     public Task Handle(ClosedEventArgs<Wallet> args)
     {
-        IsOpened = true;
+        IsOpened = false;
         Clear();
 
         return Task.CompletedTask;
@@ -83,7 +83,7 @@ public partial class WalletNavigationViewModel :
     {
         if (await Mediator.Handle<CloseEventArgs<Wallet>, bool>(Close.As<Wallet>()))
         {
-            IsOpened = false;
+            Publisher.Publish(Closed.As<Wallet>());
         }
     }