diff --git a/GingerCommon/Crypto/Random/RandomExtensions.cs b/GingerCommon/Crypto/Random/RandomExtensions.cs
index 34cd6d6ea2..e670106ae6 100644
--- a/GingerCommon/Crypto/Random/RandomExtensions.cs
+++ b/GingerCommon/Crypto/Random/RandomExtensions.cs
@@ -1,8 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace GingerCommon.Crypto.Random;
 
diff --git a/GingerCommon/Static/HttpUtils.cs b/GingerCommon/Static/HttpUtils.cs
index 05d971a42f..20937a2cd4 100644
--- a/GingerCommon/Static/HttpUtils.cs
+++ b/GingerCommon/Static/HttpUtils.cs
@@ -1,10 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http.Headers;
 using System.Net.Http;
-using System.Text;
-using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Net;
diff --git a/GingerCommon/Static/JsonUtils.cs b/GingerCommon/Static/JsonUtils.cs
index d01f0fdeef..77c63a031d 100644
--- a/GingerCommon/Static/JsonUtils.cs
+++ b/GingerCommon/Static/JsonUtils.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Text.Json;
-using System.Threading.Tasks;
 
 namespace GingerCommon.Static;
 
diff --git a/GingerCommon/Static/TypeUtils.cs b/GingerCommon/Static/TypeUtils.cs
index 8f75a8f858..7dc31ae9f2 100644
--- a/GingerCommon/Static/TypeUtils.cs
+++ b/GingerCommon/Static/TypeUtils.cs
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace GingerCommon.Static;
 
diff --git a/WalletWasabi.Backend/Extensions.cs b/WalletWasabi.Backend/Extensions.cs
index ab7b1a6714..993ea1ebd5 100644
--- a/WalletWasabi.Backend/Extensions.cs
+++ b/WalletWasabi.Backend/Extensions.cs
@@ -1,4 +1,3 @@
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using System.Linq;
diff --git a/WalletWasabi.Backend/Global.cs b/WalletWasabi.Backend/Global.cs
index a77f4ff83c..c257684fdb 100644
--- a/WalletWasabi.Backend/Global.cs
+++ b/WalletWasabi.Backend/Global.cs
@@ -1,7 +1,6 @@
 using GingerCommon.Logging;
 using Microsoft.Extensions.Logging;
 using NBitcoin;
-using NBitcoin.Secp256k1;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
@@ -21,7 +20,6 @@
 using WalletWasabi.WabiSabi;
 using WalletWasabi.WabiSabi.Backend;
 using WalletWasabi.WabiSabi.Backend.Banning;
-using WalletWasabi.WabiSabi.Backend.Rounds;
 using WalletWasabi.WabiSabi.Backend.Rounds.CoinJoinStorage;
 using WalletWasabi.WabiSabi.Backend.Statistics;
 using WalletWasabi.WabiSabi.Recommendation;
diff --git a/WalletWasabi.Daemon/BuySell/BuySellClient.cs b/WalletWasabi.Daemon/BuySell/BuySellClient.cs
index 9229e5b11e..3164323629 100644
--- a/WalletWasabi.Daemon/BuySell/BuySellClient.cs
+++ b/WalletWasabi.Daemon/BuySell/BuySellClient.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Net.Http;
 using System.Text;
 using System.Text.Json;
diff --git a/WalletWasabi.Daemon/FeeRateProviders/FeeRateProvider.cs b/WalletWasabi.Daemon/FeeRateProviders/FeeRateProvider.cs
index 7ade825529..ce40d567d1 100644
--- a/WalletWasabi.Daemon/FeeRateProviders/FeeRateProvider.cs
+++ b/WalletWasabi.Daemon/FeeRateProviders/FeeRateProvider.cs
@@ -82,6 +82,7 @@ public void Initialize(RpcFeeRateProvider? rpcFeeRateProvider)
 	/// </summary>
 	public FeeRateProvider(WasabiHttpClientFactory httpClientFactory, Network network) : this(httpClientFactory, FeeRateProviderSource.BlockstreamInfo, network)
 	{
+		Initialize(null);
 	}
 
 	public AllFeeEstimate GetAllFeeEstimate()
diff --git a/WalletWasabi.Daemon/PersistentConfig.cs b/WalletWasabi.Daemon/PersistentConfig.cs
index 1ab95b09e5..31167e6c23 100644
--- a/WalletWasabi.Daemon/PersistentConfig.cs
+++ b/WalletWasabi.Daemon/PersistentConfig.cs
@@ -252,6 +252,16 @@ static public bool Migrate(bool readFromWasabi, [NotNullWhen(true)] ref Persiste
 			};
 		}
 
+		// Previous imports from Wasabi could increase this to 100. We do want to check and change this, even if we are not readFromWasabi.
+		if (config.AbsoluteMinInputCount > Constants.DefaultAbsoluteMinInputCount)
+		{
+			hasChanged = true;
+			config = config with
+			{
+				AbsoluteMinInputCount = Constants.DefaultAbsoluteMinInputCount
+			};
+		}
+
 		if (readFromWasabi)
 		{
 			var torMode = Config.ObjectToTorMode(config.UseTor);
diff --git a/WalletWasabi.Fluent/AddWallet/ViewModels/AdvancedRecoveryOptionsViewModel.cs b/WalletWasabi.Fluent/AddWallet/ViewModels/AdvancedRecoveryOptionsViewModel.cs
index 01cecbd5da..77b4419b91 100644
--- a/WalletWasabi.Fluent/AddWallet/ViewModels/AdvancedRecoveryOptionsViewModel.cs
+++ b/WalletWasabi.Fluent/AddWallet/ViewModels/AdvancedRecoveryOptionsViewModel.cs
@@ -32,7 +32,7 @@ public AdvancedRecoveryOptionsViewModel(int minGapLimit)
 	private void ValidateMinGapLimit(IValidationErrors errors)
 	{
 		if (!int.TryParse(MinGapLimit, out var minGapLimit) ||
-			minGapLimit is < KeyManager.AbsoluteMinGapLimit or > KeyManager.MaxGapLimit)
+		    minGapLimit is < KeyManager.AbsoluteMinGapLimit or > KeyManager.MaxGapLimit)
 		{
 			errors.Add(
 				ErrorSeverity.Error,
diff --git a/WalletWasabi.Fluent/AddWallet/ViewModels/Create/ConfirmRecoveryWordsViewModel.cs b/WalletWasabi.Fluent/AddWallet/ViewModels/Create/ConfirmRecoveryWordsViewModel.cs
index aa69788d82..39e7ad88a8 100644
--- a/WalletWasabi.Fluent/AddWallet/ViewModels/Create/ConfirmRecoveryWordsViewModel.cs
+++ b/WalletWasabi.Fluent/AddWallet/ViewModels/Create/ConfirmRecoveryWordsViewModel.cs
@@ -55,9 +55,9 @@ protected override void OnNavigatedTo(bool isInHistory, CompositeDisposable disp
 
 		var nextCommandCanExecute =
 			confirmationWordsSourceList
-			.Connect()
-			.WhenValueChanged(x => x.IsConfirmed)
-			.Select(_ => confirmationWordsSourceList.Items.All(x => x.IsConfirmed));
+				.Connect()
+				.WhenValueChanged(x => x.IsConfirmed)
+				.Select(_ => confirmationWordsSourceList.Items.All(x => x.IsConfirmed));
 
 		NextCommand = ReactiveCommand.CreateFromTask(OnNextAsync, nextCommandCanExecute);
 
diff --git a/WalletWasabi.Fluent/AddWallet/ViewModels/CreatePasswordDialogViewModel.cs b/WalletWasabi.Fluent/AddWallet/ViewModels/CreatePasswordDialogViewModel.cs
index 47d387cf38..e3acfe95a8 100644
--- a/WalletWasabi.Fluent/AddWallet/ViewModels/CreatePasswordDialogViewModel.cs
+++ b/WalletWasabi.Fluent/AddWallet/ViewModels/CreatePasswordDialogViewModel.cs
@@ -41,10 +41,10 @@ public CreatePasswordDialogViewModel(string title, string caption = "", bool ena
 					this.RaisePropertyChanged(nameof(ConfirmPassword));
 
 					return IsDialogOpen &&
-						   ((enableEmpty && string.IsNullOrEmpty(Password) &&
-							 string.IsNullOrEmpty(ConfirmPassword)) ||
-							(!string.IsNullOrEmpty(Password) && !string.IsNullOrEmpty(ConfirmPassword) &&
-							 !Validations.Any));
+					       ((enableEmpty && string.IsNullOrEmpty(Password) &&
+					         string.IsNullOrEmpty(ConfirmPassword)) ||
+					        (!string.IsNullOrEmpty(Password) && !string.IsNullOrEmpty(ConfirmPassword) &&
+					         !Validations.Any));
 				})
 			.ObserveOn(RxApp.MainThreadScheduler);
 
diff --git a/WalletWasabi.Fluent/AddWallet/ViewModels/WelcomePageViewModel.cs b/WalletWasabi.Fluent/AddWallet/ViewModels/WelcomePageViewModel.cs
index 4c1e5f1f0d..30637f6882 100644
--- a/WalletWasabi.Fluent/AddWallet/ViewModels/WelcomePageViewModel.cs
+++ b/WalletWasabi.Fluent/AddWallet/ViewModels/WelcomePageViewModel.cs
@@ -35,12 +35,11 @@ public WelcomePageViewModel()
 		_selectedDisplayLanguage = Settings.SelectedDisplayLanguage;
 
 		this.WhenAnyValue(x => x.SelectedIndex)
-			.Subscribe(
-				x =>
-				{
-					NextLabel = x < NumberOfPages - 1 ? Resources.Continue : Resources.GetStarted;
-					EnableNextKey = x < NumberOfPages - 1;
-				});
+			.Subscribe(x =>
+			{
+				NextLabel = x < NumberOfPages - 1 ? Resources.Continue : Resources.GetStarted;
+				EnableNextKey = x < NumberOfPages - 1;
+			});
 
 		this.WhenAnyValue(x => x.IsActive)
 			.Skip(1)
diff --git a/WalletWasabi.Fluent/AddWallet/Views/AddWalletPageView.axaml b/WalletWasabi.Fluent/AddWallet/Views/AddWalletPageView.axaml
index 14db3a19cb..6078f6f3d7 100644
--- a/WalletWasabi.Fluent/AddWallet/Views/AddWalletPageView.axaml
+++ b/WalletWasabi.Fluent/AddWallet/Views/AddWalletPageView.axaml
@@ -16,16 +16,16 @@
                EnableNext="False">
     <Grid VerticalAlignment="Stretch" MaxHeight="320">
       <Grid.RowDefinitions>
-        <RowDefinition Height="*" MaxHeight="80" MinHeight="60"/>
-        <RowDefinition Height="*" MaxHeight="80" MinHeight="60"/>
-        <RowDefinition Height="*" MaxHeight="80" MinHeight="60"/>
-        <RowDefinition Height="*" MaxHeight="80" MinHeight="60"/>
+        <RowDefinition Height="*" MaxHeight="80" MinHeight="60" />
+        <RowDefinition Height="*" MaxHeight="80" MinHeight="60" />
+        <RowDefinition Height="*" MaxHeight="80" MinHeight="60" />
+        <RowDefinition Height="*" MaxHeight="80" MinHeight="60" />
       </Grid.RowDefinitions>
       <Grid.Styles>
         <Style Selector="TileButton">
           <Setter Property="Cursor" Value="Hand" />
           <Setter Property="Margin" Value="0 5 0 5" />
-          <Setter Property="Width" Value="400"/>
+          <Setter Property="Width" Value="400" />
           <Setter Property="Height">
             <Setter.Value>
               <system:Double>NaN</system:Double>
@@ -49,14 +49,14 @@
                               Height="{TemplateBinding IconSize}"
                               HorizontalAlignment="Center"
                               VerticalAlignment="Center"
-                              Margin="0"/>
+                              Margin="0" />
                   </Panel>
                   <TextBlock x:Name="PART_Text"
                              VerticalAlignment="Center"
                              HorizontalAlignment="Left"
                              Text="{TemplateBinding Text}"
                              Foreground="{TemplateBinding Foreground}"
-                             Margin="0"/>
+                             Margin="0" />
                 </DockPanel>
 
               </Border>
diff --git a/WalletWasabi.Fluent/AddWallet/Views/AddedWalletPageView.axaml b/WalletWasabi.Fluent/AddWallet/Views/AddedWalletPageView.axaml
index 77692c3db8..84d2d10d55 100644
--- a/WalletWasabi.Fluent/AddWallet/Views/AddedWalletPageView.axaml
+++ b/WalletWasabi.Fluent/AddWallet/Views/AddedWalletPageView.axaml
@@ -9,7 +9,7 @@
              x:CompileBindings="True"
              x:Class="WalletWasabi.Fluent.AddWallet.Views.AddedWalletPageView">
   <ContentArea EnableNext="False"
-                 ScrollViewer.VerticalScrollBarVisibility="Disabled">
+               ScrollViewer.VerticalScrollBarVisibility="Disabled">
     <views1:SuccessAnimationView VerticalAlignment="Center" />
   </ContentArea>
 </UserControl>
diff --git a/WalletWasabi.Fluent/AddWallet/Views/AdvancedRecoveryOptionsView.axaml b/WalletWasabi.Fluent/AddWallet/Views/AdvancedRecoveryOptionsView.axaml
index facc236b90..bf0e6b9139 100644
--- a/WalletWasabi.Fluent/AddWallet/Views/AdvancedRecoveryOptionsView.axaml
+++ b/WalletWasabi.Fluent/AddWallet/Views/AdvancedRecoveryOptionsView.axaml
@@ -14,10 +14,10 @@
     </Style>
   </UserControl.Styles>
   <ContentArea Title="{Binding Title}"
-                 CancelContent="{x:Static lang:Resources.Cancel}"
-                 EnableCancel="{Binding EnableCancel}"
-                 EnableBack="{Binding EnableBack}"
-                 EnableNext="True" NextContent="OK">
+               CancelContent="{x:Static lang:Resources.Cancel}"
+               EnableCancel="{Binding EnableCancel}"
+               EnableBack="{Binding EnableBack}"
+               EnableNext="True" NextContent="OK">
     <StackPanel HorizontalAlignment="Center" Spacing="20" MinWidth="380">
       <Label Content="{x:Static lang:Resources.AdvancedRecoveryOptionsViewModelMinimumGapLimit}" Target="TbGapLimit" />
       <TextBox Name="TbGapLimit" Watermark="e.g., 63"
diff --git a/WalletWasabi.Fluent/AddWallet/Views/Create/ConfirmRecoveryWordsView.axaml b/WalletWasabi.Fluent/AddWallet/Views/Create/ConfirmRecoveryWordsView.axaml
index 76ac6e4c4a..c1f2414ea4 100644
--- a/WalletWasabi.Fluent/AddWallet/Views/Create/ConfirmRecoveryWordsView.axaml
+++ b/WalletWasabi.Fluent/AddWallet/Views/Create/ConfirmRecoveryWordsView.axaml
@@ -9,15 +9,15 @@
              xmlns:create="clr-namespace:WalletWasabi.Fluent.AddWallet.ViewModels.Create"
              x:Class="WalletWasabi.Fluent.AddWallet.Views.Create.ConfirmRecoveryWordsView">
   <ContentArea Title="{Binding Title}"
-                 Caption="{Binding CurrentWord.Index, StringFormat='{x:Static lang:Resources.ConfirmRecoveryWordsViewModelClickRecovery}', FallbackValue=' '}"
-                 EnableCancel="{Binding EnableCancel}"
-                 EnableBack="{Binding EnableBack}"
-                 EnableNext="True"
-                 NextContent="{x:Static lang:Resources.Continue}"
-                 EnableSkip="{Binding IsSkipEnabled}"
-                 IsBusy="{Binding IsBusy}"
-                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                 ScrollViewer.VerticalScrollBarVisibility="Disabled">
+               Caption="{Binding CurrentWord.Index, StringFormat='{x:Static lang:Resources.ConfirmRecoveryWordsViewModelClickRecovery}', FallbackValue=' '}"
+               EnableCancel="{Binding EnableCancel}"
+               EnableBack="{Binding EnableBack}"
+               EnableNext="True"
+               NextContent="{x:Static lang:Resources.Continue}"
+               EnableSkip="{Binding IsSkipEnabled}"
+               IsBusy="{Binding IsBusy}"
+               ScrollViewer.HorizontalScrollBarVisibility="Auto"
+               ScrollViewer.VerticalScrollBarVisibility="Disabled">
     <Grid x:Name="Layout">
       <Grid.RowDefinitions>
         <RowDefinition MinHeight="70" Height="*" />
@@ -80,7 +80,8 @@
           <ItemsControl.ItemTemplate>
             <DataTemplate>
               <StackPanel Orientation="Horizontal" Margin="50 0 50 0" Width="80">
-                <TextBlock Text="{Binding Index, Mode=OneWay, StringFormat={}{0}.}" Opacity="0.5" FontSize="{DynamicResource FontSizeH6}" Height="42" />
+                <TextBlock Text="{Binding Index, Mode=OneWay, StringFormat={}{0}.}" Opacity="0.5"
+                           FontSize="{DynamicResource FontSizeH6}" Height="42" />
                 <TextBlock Text="{Binding SelectedWord}" FontWeight="SemiBold" Margin="5 0 0 0"
                            Classes.error="{Binding !IsConfirmed}" FontSize="{DynamicResource FontSizeH6}" Height="42" />
               </StackPanel>
diff --git a/WalletWasabi.Fluent/AddWallet/Views/Create/RecoveryWordsView.axaml b/WalletWasabi.Fluent/AddWallet/Views/Create/RecoveryWordsView.axaml
index 0046acc08e..07672172b3 100644
--- a/WalletWasabi.Fluent/AddWallet/Views/Create/RecoveryWordsView.axaml
+++ b/WalletWasabi.Fluent/AddWallet/Views/Create/RecoveryWordsView.axaml
@@ -9,12 +9,12 @@
              xmlns:create="clr-namespace:WalletWasabi.Fluent.AddWallet.ViewModels.Create"
              x:Class="WalletWasabi.Fluent.AddWallet.Views.Create.RecoveryWordsView">
   <ContentArea Title="{Binding Title}"
-                 Caption="{x:Static lang:Resources.RecoveryWordsViewCaption}"
-                 CancelContent="{x:Static lang:Resources.Cancel}"
-                 EnableCancel="{Binding EnableCancel}"
-                 EnableBack="{Binding EnableBack}"
-                 EnableNext="True" NextContent="{x:Static lang:Resources.Continue}" FocusNext="True"
-                 ScrollViewer.HorizontalScrollBarVisibility="Auto">
+               Caption="{x:Static lang:Resources.RecoveryWordsViewCaption}"
+               CancelContent="{x:Static lang:Resources.Cancel}"
+               EnableCancel="{Binding EnableCancel}"
+               EnableBack="{Binding EnableBack}"
+               EnableNext="True" NextContent="{x:Static lang:Resources.Continue}" FocusNext="True"
+               ScrollViewer.HorizontalScrollBarVisibility="Auto">
     <Grid>
       <Grid.RowDefinitions>
         <RowDefinition MinHeight="70" Height="*" />
@@ -64,8 +64,8 @@
       </Panel>
 
       <InfoMessage Opacity="0.5"
-                     HorizontalAlignment="Center"
-                     Grid.Row="4">
+                   HorizontalAlignment="Center"
+                   Grid.Row="4">
         <TextBlock Text="{x:Static lang:Resources.RecoveryWordsViewNotSeeAfter}" />
       </InfoMessage>
     </Grid>
diff --git a/WalletWasabi.Fluent/AddWallet/Views/CreatePasswordDialogView.axaml b/WalletWasabi.Fluent/AddWallet/Views/CreatePasswordDialogView.axaml
index fe1a5f2b4b..d18a95d647 100644
--- a/WalletWasabi.Fluent/AddWallet/Views/CreatePasswordDialogView.axaml
+++ b/WalletWasabi.Fluent/AddWallet/Views/CreatePasswordDialogView.axaml
@@ -9,19 +9,25 @@
              xmlns:viewModels="clr-namespace:WalletWasabi.Fluent.AddWallet.ViewModels"
              x:Class="WalletWasabi.Fluent.AddWallet.Views.CreatePasswordDialogView">
   <ContentArea Title="{Binding Title}"
-                 Caption="{Binding Caption}"
-                 CancelContent="{x:Static lang:Resources.Cancel}"
-                 EnableCancel="{Binding EnableCancel}"
-                 EnableBack="{Binding EnableBack}"
-                 EnableNext="True" NextContent="{x:Static lang:Resources.Continue}"
-                 Width="450">
+               Caption="{Binding Caption}"
+               CancelContent="{x:Static lang:Resources.Cancel}"
+               EnableCancel="{Binding EnableCancel}"
+               EnableBack="{Binding EnableBack}"
+               EnableNext="True" NextContent="{x:Static lang:Resources.Continue}"
+               Width="450">
     <StackPanel HorizontalAlignment="Stretch" Spacing="10">
-      <CopyablePasswordTextBox Name="TbPassword" Watermark="{x:Static lang:Resources.CreatePasswordDialogTypePassphrase}" Text="{Binding Password}" PasswordChar="•" Classes="revealPasswordButton hasCheckMark copyablePasswordTextBox">
+      <CopyablePasswordTextBox Name="TbPassword"
+                               Watermark="{x:Static lang:Resources.CreatePasswordDialogTypePassphrase}"
+                               Text="{Binding Password}" PasswordChar="•"
+                               Classes="revealPasswordButton hasCheckMark copyablePasswordTextBox">
         <Interaction.Behaviors>
           <FocusOnAttachedBehavior />
         </Interaction.Behaviors>
       </CopyablePasswordTextBox>
-      <CopyablePasswordTextBox Name="TbConfirmPassword" Watermark="{x:Static lang:Resources.CreatePasswordDialogConfirmPassphrase}" Text="{Binding ConfirmPassword}" PasswordChar="•" Classes="revealPasswordButton hasCheckMark copyablePasswordTextBox" />
+      <CopyablePasswordTextBox Name="TbConfirmPassword"
+                               Watermark="{x:Static lang:Resources.CreatePasswordDialogConfirmPassphrase}"
+                               Text="{Binding ConfirmPassword}" PasswordChar="•"
+                               Classes="revealPasswordButton hasCheckMark copyablePasswordTextBox" />
     </StackPanel>
   </ContentArea>
 </UserControl>
diff --git a/WalletWasabi.Fluent/AddWallet/Views/RecoverWalletView.axaml b/WalletWasabi.Fluent/AddWallet/Views/RecoverWalletView.axaml
index fef5f62edb..61f4af71dd 100644
--- a/WalletWasabi.Fluent/AddWallet/Views/RecoverWalletView.axaml
+++ b/WalletWasabi.Fluent/AddWallet/Views/RecoverWalletView.axaml
@@ -9,12 +9,12 @@
              xmlns:viewModels="clr-namespace:WalletWasabi.Fluent.AddWallet.ViewModels"
              x:Class="WalletWasabi.Fluent.AddWallet.Views.RecoverWalletView">
   <ContentArea x:Name="RecoveryPageRoot"
-                 Title="{Binding Title}"
-                 CancelContent="{x:Static lang:Resources.Cancel}"
-                 EnableCancel="{Binding EnableCancel}"
-                 EnableBack="{Binding EnableBack}"
-                 EnableNext="True" NextContent="{x:Static lang:Resources.Continue}"
-                 IsBusy="{Binding IsBusy}">
+               Title="{Binding Title}"
+               CancelContent="{x:Static lang:Resources.Cancel}"
+               EnableCancel="{Binding EnableCancel}"
+               EnableBack="{Binding EnableBack}"
+               EnableNext="True" NextContent="{x:Static lang:Resources.Continue}"
+               IsBusy="{Binding IsBusy}">
     <DockPanel>
       <DockPanel DockPanel.Dock="Top">
         <PathIcon Name="IconCheckmark"
@@ -24,15 +24,15 @@
                   DockPanel.Dock="Right"
                   Opacity="{Binding IsMnemonicsValid}" />
         <TagsBox DockPanel.Dock="Left"
-                   ItemCountLimit="24"
-                   SuggestionsAreCaseSensitive="False"
-                   RestrictInputToSuggestions="True"
-                   Items="{Binding Mnemonics}"
-                   Suggestions="{Binding Suggestions}"
-                   Watermark="{x:Static lang:Resources.TypeInYourRecoveryWords}"
-                   AllowDuplication="True"
-                   EnableCounter="True"
-                   EnableDelete="False">
+                 ItemCountLimit="24"
+                 SuggestionsAreCaseSensitive="False"
+                 RestrictInputToSuggestions="True"
+                 Items="{Binding Mnemonics}"
+                 Suggestions="{Binding Suggestions}"
+                 Watermark="{x:Static lang:Resources.TypeInYourRecoveryWords}"
+                 AllowDuplication="True"
+                 EnableCounter="True"
+                 EnableDelete="False">
           <TagsBox.Styles>
             <Style Selector="TagsBox AutoCompleteBox">
               <Setter Property="MinimumPrefixLength" Value="0" />
diff --git a/WalletWasabi.Fluent/AddWallet/Views/WalletNamePageView.axaml b/WalletWasabi.Fluent/AddWallet/Views/WalletNamePageView.axaml
index c79d5ac447..1fd313b81b 100644
--- a/WalletWasabi.Fluent/AddWallet/Views/WalletNamePageView.axaml
+++ b/WalletWasabi.Fluent/AddWallet/Views/WalletNamePageView.axaml
@@ -9,12 +9,13 @@
              xmlns:viewModels="clr-namespace:WalletWasabi.Fluent.AddWallet.ViewModels"
              x:Class="WalletWasabi.Fluent.AddWallet.Views.WalletNamePageView">
   <ContentArea Title="{Binding Title}"
-                 EnableCancel="{Binding EnableCancel}"
-                 EnableBack="{Binding EnableBack}"
-                 IsBusy="{Binding IsBusy}"
-                 EnableNext="True" NextContent="{x:Static lang:Resources.Continue}">
+               EnableCancel="{Binding EnableCancel}"
+               EnableBack="{Binding EnableBack}"
+               IsBusy="{Binding IsBusy}"
+               EnableNext="True" NextContent="{x:Static lang:Resources.Continue}">
     <StackPanel DockPanel.Dock="Top">
-      <TextBox MaxLength="{StaticResource WalletNameMaxLength}" Text="{Binding WalletName}" Watermark="{x:Static lang:Resources.TypeInWalletName}">
+      <TextBox MaxLength="{StaticResource WalletNameMaxLength}" Text="{Binding WalletName}"
+               Watermark="{x:Static lang:Resources.TypeInWalletName}">
         <Interaction.Behaviors>
           <FocusOnAttachedBehavior />
           <TextBoxSelectAllTextBehavior />
diff --git a/WalletWasabi.Fluent/AddWallet/Views/WelcomePageView.axaml b/WalletWasabi.Fluent/AddWallet/Views/WelcomePageView.axaml
index 59d5c43e49..a682ae8b58 100644
--- a/WalletWasabi.Fluent/AddWallet/Views/WelcomePageView.axaml
+++ b/WalletWasabi.Fluent/AddWallet/Views/WelcomePageView.axaml
@@ -86,10 +86,10 @@
         <DockPanel Grid.Row="1" VerticalAlignment="Center">
           <TextBlock Text="{x:Static lang:Resources.WelcomeToGingerWallet}" FontSize="30" HorizontalAlignment="Center"
                      FontWeight="Bold"
-                     DockPanel.Dock="Top"/>
+                     DockPanel.Dock="Top" />
           <TextBlock Margin="0 20 0 10" TextAlignment="Center" HorizontalAlignment="Center"
                      Text="{x:Static lang:Resources.SelectPreferredLanguage}"
-                     DockPanel.Dock="Top"/>
+                     DockPanel.Dock="Top" />
           <ListBox MaxWidth="300" DockPanel.Dock="Bottom" HorizontalAlignment="Stretch"
                    ItemsSource="{Binding DisplayLanguagesList}"
                    SelectedItem="{Binding SelectedDisplayLanguage}">
diff --git a/WalletWasabi.Fluent/Announcement/Views/AnnouncementIcon.axaml b/WalletWasabi.Fluent/Announcement/Views/AnnouncementIcon.axaml
index 0f062909a4..4265602498 100644
--- a/WalletWasabi.Fluent/Announcement/Views/AnnouncementIcon.axaml
+++ b/WalletWasabi.Fluent/Announcement/Views/AnnouncementIcon.axaml
@@ -99,10 +99,11 @@
                     ToolTip.Tip="{x:Static lang:Resources.MarkAllAsRead}"
                     IsVisible="{Binding Announcements.HasUnreadAnnouncements^}"
                     Command="{Binding MarkAllAsReadCommand}">
-              <PathIcon Data="{StaticResource mark_all_read}" Opacity="0.6" Height="15" VerticalAlignment="Center"/>
+              <PathIcon Data="{StaticResource mark_all_read}" Opacity="0.6" Height="15" VerticalAlignment="Center" />
             </Button>
           </Grid>
-          <ListBox ItemsSource="{Binding Announcements.List}" SelectedItem="{Binding SelectedAnnouncement}" MaxHeight="400" Width="350" Margin="0 0 0 10">
+          <ListBox ItemsSource="{Binding Announcements.List}" SelectedItem="{Binding SelectedAnnouncement}"
+                   MaxHeight="400" Width="350" Margin="0 0 0 10">
             <ListBox.DataTemplates>
 
               <DataTemplate DataType="{x:Type models1:AnnouncementModel}">
diff --git a/WalletWasabi.Fluent/App.axaml b/WalletWasabi.Fluent/App.axaml
index 23b28a4776..6798d696f7 100644
--- a/WalletWasabi.Fluent/App.axaml
+++ b/WalletWasabi.Fluent/App.axaml
@@ -12,7 +12,8 @@
   <Application.DataTemplates>
     <local:ViewLocator />
     <DataTemplate DataType="models:ErrorDescriptor" x:DataType="models:ErrorDescriptor">
-      <TextBlock x:CompileBindings="True" Text="{Binding Message}" Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}" TextWrapping="Wrap" />
+      <TextBlock x:CompileBindings="True" Text="{Binding Message}"
+                 Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}" TextWrapping="Wrap" />
     </DataTemplate>
   </Application.DataTemplates>
 
@@ -20,10 +21,12 @@
 
     <x:Double x:Key="ToggleSwitchThemeMinWidth">0</x:Double>
 
-    <converters:BoolStringConverter x:Key="ShowHideBoolConverter" True="{x:Static lang:Resources.Hide}" False="{x:Static lang:Resources.Show}" />
+    <converters:BoolStringConverter x:Key="ShowHideBoolConverter" True="{x:Static lang:Resources.Hide}"
+                                    False="{x:Static lang:Resources.Show}" />
 
     <NativeMenu x:Key="DefaultNativeMenu">
-      <NativeMenuItem Header="{Binding IsMainWindowShown, Converter={StaticResource ShowHideBoolConverter}}" Command="{Binding ShowHideCommand}" />
+      <NativeMenuItem Header="{Binding IsMainWindowShown, Converter={StaticResource ShowHideBoolConverter}}"
+                      Command="{Binding ShowHideCommand}" />
       <NativeMenuItemSeparator />
       <NativeMenuItem Header="{x:Static lang:Resources.Quit}" Command="{Binding QuitCommand}" />
     </NativeMenu>
@@ -32,7 +35,7 @@
 
   <Application.Styles>
     <FluentTheme />
-    <StyleInclude Source="avares://Avalonia.Controls.TreeDataGrid/Themes/Fluent.axaml"/>
+    <StyleInclude Source="avares://Avalonia.Controls.TreeDataGrid/Themes/Fluent.axaml" />
     <StyleInclude Source="avares://WalletWasabi.Fluent/Styles/Themes/Fluent.axaml" />
     <StyleInclude Source="avares://WalletWasabi.Fluent/Icons/Icons.axaml" />
     <StyleInclude Source="avares://WalletWasabi.Fluent/Styles/Styles.axaml" />
diff --git a/WalletWasabi.Fluent/App.axaml.cs b/WalletWasabi.Fluent/App.axaml.cs
index f26cf2fc4a..ef63239703 100644
--- a/WalletWasabi.Fluent/App.axaml.cs
+++ b/WalletWasabi.Fluent/App.axaml.cs
@@ -60,13 +60,12 @@ public override void OnFrameworkInitializationCompleted()
 					uiContext.HealthMonitor.Dispose();
 				};
 
-				RxApp.MainThreadScheduler.Schedule(
-					async () =>
-					{
-						await _backendInitialiseAsync!(); // Guaranteed not to be null when not in designer.
+				RxApp.MainThreadScheduler.Schedule(async () =>
+				{
+					await _backendInitialiseAsync!(); // Guaranteed not to be null when not in designer.
 
-						MainViewModel.Instance.Initialize();
-					});
+					MainViewModel.Instance.Initialize();
+				});
 
 				InitializeTrayIcons();
 			}
diff --git a/WalletWasabi.Fluent/ApplicationStateManager.cs b/WalletWasabi.Fluent/ApplicationStateManager.cs
index 4c5db1ed73..4b6acc55fc 100644
--- a/WalletWasabi.Fluent/ApplicationStateManager.cs
+++ b/WalletWasabi.Fluent/ApplicationStateManager.cs
@@ -125,6 +125,7 @@ private void OnExitPowerSavingMode()
 			{
 				return;
 			}
+
 			_isPowerSavingModeActive = false;
 
 			/*
@@ -144,6 +145,7 @@ private void OnEnterPowerSavingMode()
 			{
 				return;
 			}
+
 			_isPowerSavingModeActive = true;
 
 			/*
@@ -205,6 +207,7 @@ private void ActivatableLifetimeOnActivated(object? sender, ActivatedEventArgs e
 				{
 					service.Show();
 				}
+
 				break;
 		}
 	}
@@ -221,6 +224,7 @@ private void ActivatableLifetimeOnDeactivated(object? sender, ActivatedEventArgs
 						service.Hide();
 					}
 				}
+
 				break;
 		}
 	}
diff --git a/WalletWasabi.Fluent/Behaviors/FocusNextItemBehavior.cs b/WalletWasabi.Fluent/Behaviors/FocusNextItemBehavior.cs
index 5a87612f3c..33a5f8a494 100644
--- a/WalletWasabi.Fluent/Behaviors/FocusNextItemBehavior.cs
+++ b/WalletWasabi.Fluent/Behaviors/FocusNextItemBehavior.cs
@@ -23,25 +23,24 @@ protected override void OnAttached(CompositeDisposable disposables)
 	{
 		this.WhenAnyValue(x => x.IsFocused)
 			.Where(x => x == false)
-			.Subscribe(
-				_ =>
-				{
-					var parentControl = AssociatedObject.FindLogicalAncestorOfType<ItemsControl>();
+			.Subscribe(_ =>
+			{
+				var parentControl = AssociatedObject.FindLogicalAncestorOfType<ItemsControl>();
 
-					if (parentControl is { })
+				if (parentControl is { })
+				{
+					foreach (var item in parentControl.GetLogicalChildren())
 					{
-						foreach (var item in parentControl.GetLogicalChildren())
+						if (item.FindLogicalDescendantOfType<TextBox>() is { IsEnabled: true } nextToFocus)
 						{
-							if (item.FindLogicalDescendantOfType<TextBox>() is { IsEnabled: true } nextToFocus)
-							{
-								nextToFocus.Focus();
-								return;
-							}
+							nextToFocus.Focus();
+							return;
 						}
-
-						parentControl.Focus();
 					}
-				})
+
+					parentControl.Focus();
+				}
+			})
 			.DisposeWith(disposables);
 	}
 }
diff --git a/WalletWasabi.Fluent/Behaviors/FocusNextWhenValidBehavior.cs b/WalletWasabi.Fluent/Behaviors/FocusNextWhenValidBehavior.cs
index 08b62bb7d6..e130f6ac7e 100644
--- a/WalletWasabi.Fluent/Behaviors/FocusNextWhenValidBehavior.cs
+++ b/WalletWasabi.Fluent/Behaviors/FocusNextWhenValidBehavior.cs
@@ -28,10 +28,10 @@ protected override void OnAttachedToVisualTree(CompositeDisposable disposables)
 			.Subscribe(_ =>
 			{
 				if (AssociatedObject is { } &&
-					!DataValidationErrors.GetHasErrors(AssociatedObject) &&
-					!string.IsNullOrEmpty(AssociatedObject.Text) &&
-					KeyboardNavigationHandler.GetNext(AssociatedObject, NavigationDirection.Next) is
-					{ } nextFocus)
+				    !DataValidationErrors.GetHasErrors(AssociatedObject) &&
+				    !string.IsNullOrEmpty(AssociatedObject.Text) &&
+				    KeyboardNavigationHandler.GetNext(AssociatedObject, NavigationDirection.Next) is
+					    { } nextFocus)
 				{
 					nextFocus.Focus();
 				}
diff --git a/WalletWasabi.Fluent/Behaviors/HideFlyoutOnClickBehavior.cs b/WalletWasabi.Fluent/Behaviors/HideFlyoutOnClickBehavior.cs
index 392587783a..89dec72303 100644
--- a/WalletWasabi.Fluent/Behaviors/HideFlyoutOnClickBehavior.cs
+++ b/WalletWasabi.Fluent/Behaviors/HideFlyoutOnClickBehavior.cs
@@ -19,14 +19,14 @@ protected override void OnAttachedToVisualTree()
 		{
 			return;
 		}
-        
+
 		var fp = AssociatedObject.FindAncestorOfType<FlyoutPresenter>();
 
 		if (fp?.Parent is not Popup popup)
 		{
 			return;
 		}
-        
+
 		_subscription = Observable
 			.FromEventPattern<RoutedEventArgs>(handler => AssociatedObject.Click += handler, handler => AssociatedObject.Click -= handler)
 			.Do(_ =>
@@ -36,6 +36,7 @@ protected override void OnAttachedToVisualTree()
 				{
 					AssociatedObject.Command.Execute(AssociatedObject.CommandParameter);
 				}
+
 				popup.Close();
 			})
 			.Subscribe();
diff --git a/WalletWasabi.Fluent/Behaviors/HistoryItemTypeClassBehavior.cs b/WalletWasabi.Fluent/Behaviors/HistoryItemTypeClassBehavior.cs
index 643baf4995..f028ccde89 100644
--- a/WalletWasabi.Fluent/Behaviors/HistoryItemTypeClassBehavior.cs
+++ b/WalletWasabi.Fluent/Behaviors/HistoryItemTypeClassBehavior.cs
@@ -53,6 +53,7 @@ private void AddClasses(TreeDataGridRow row)
 				row.Classes.Add(PositiveAmountClass);
 			}
 		}
+
 		switch (row.DataContext)
 		{
 			case TransactionHistoryItemViewModel:
diff --git a/WalletWasabi.Fluent/Behaviors/PasteButtonFlashBehavior.cs b/WalletWasabi.Fluent/Behaviors/PasteButtonFlashBehavior.cs
index 2bd98ce1fb..064f552c6e 100644
--- a/WalletWasabi.Fluent/Behaviors/PasteButtonFlashBehavior.cs
+++ b/WalletWasabi.Fluent/Behaviors/PasteButtonFlashBehavior.cs
@@ -100,8 +100,8 @@ private async Task CheckClipboardForValidAddressAsync(bool forceCheck = false)
 		// ClipboardValue might not match CurrentAddress, but it might be a PayJoin address pointing to the CurrentAddress
 		// Hence we need to compare both string value and parse result
 		if (clipboardValue != CurrentAddress &&
-			AddressStringParser.TryParse(clipboardValue, Services.WalletManager.Network, out var address) &&
-			address?.Address?.ToString() != CurrentAddress)
+		    AddressStringParser.TryParse(clipboardValue, Services.WalletManager.Network, out var address) &&
+		    address?.Address?.ToString() != CurrentAddress)
 		{
 			AssociatedObject.Classes.Add(FlashAnimation);
 			_lastFlashedOn = clipboardValue;
diff --git a/WalletWasabi.Fluent/Behaviors/SelectingItemsControlBehavior.cs b/WalletWasabi.Fluent/Behaviors/SelectingItemsControlBehavior.cs
index a071a84db3..9e54ba5c08 100644
--- a/WalletWasabi.Fluent/Behaviors/SelectingItemsControlBehavior.cs
+++ b/WalletWasabi.Fluent/Behaviors/SelectingItemsControlBehavior.cs
@@ -1,4 +1,5 @@
 // Based on code: https://github.com/adirh3/Avalonia.ListBoxAnimation.Samples
+
 using System.Linq;
 using System.Numerics;
 using Avalonia;
@@ -12,128 +13,128 @@ namespace WalletWasabi.Fluent.Behaviors;
 
 public class SelectingItemsControlBehavior
 {
-    public static readonly AttachedProperty<bool> EnableSelectionAnimationProperty =
-        AvaloniaProperty.RegisterAttached<SelectingItemsControl, bool>("EnableSelectionAnimation", typeof(SelectingItemsControlBehavior));
-
-    static SelectingItemsControlBehavior()
-    {
-        EnableSelectionAnimationProperty.Changed.AddClassHandler<Control>(OnEnableSelectionAnimation);
-    }
-
-    private static void OnEnableSelectionAnimation(Control control, AvaloniaPropertyChangedEventArgs args)
-    {
-        if (control is SelectingItemsControl listBox)
-        {
-            if (args.NewValue is true)
-            {
-                listBox.PropertyChanged += SelectingItemsControlPropertyChanged;
-            }
-            else
-            {
-                listBox.PropertyChanged -= SelectingItemsControlPropertyChanged;
-            }
-        }
-    }
-
-    private static void SelectingItemsControlPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs args)
-    {
-        if (sender is not SelectingItemsControl selectingItemsControl ||
-            args.Property != SelectingItemsControl.SelectedIndexProperty ||
-            args.OldValue is not int oldIndex || args.NewValue is not int newIndex)
-        {
-	        return;
-        }
-
-        if (selectingItemsControl.ContainerFromIndex(newIndex) is not TemplatedControl newSelection
-            || selectingItemsControl.ContainerFromIndex(oldIndex) is not TemplatedControl oldSelection)
-        {
-	        return;
-        }
-
-        StartOffsetAnimation(newSelection, oldSelection);
-    }
-
-    private static void StartOffsetAnimation(TemplatedControl newSelection, TemplatedControl oldSelection)
-    {
-        // Find the indicator border
+	public static readonly AttachedProperty<bool> EnableSelectionAnimationProperty =
+		AvaloniaProperty.RegisterAttached<SelectingItemsControl, bool>("EnableSelectionAnimation", typeof(SelectingItemsControlBehavior));
+
+	static SelectingItemsControlBehavior()
+	{
+		EnableSelectionAnimationProperty.Changed.AddClassHandler<Control>(OnEnableSelectionAnimation);
+	}
+
+	private static void OnEnableSelectionAnimation(Control control, AvaloniaPropertyChangedEventArgs args)
+	{
+		if (control is SelectingItemsControl listBox)
+		{
+			if (args.NewValue is true)
+			{
+				listBox.PropertyChanged += SelectingItemsControlPropertyChanged;
+			}
+			else
+			{
+				listBox.PropertyChanged -= SelectingItemsControlPropertyChanged;
+			}
+		}
+	}
+
+	private static void SelectingItemsControlPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs args)
+	{
+		if (sender is not SelectingItemsControl selectingItemsControl ||
+		    args.Property != SelectingItemsControl.SelectedIndexProperty ||
+		    args.OldValue is not int oldIndex || args.NewValue is not int newIndex)
+		{
+			return;
+		}
+
+		if (selectingItemsControl.ContainerFromIndex(newIndex) is not TemplatedControl newSelection
+		    || selectingItemsControl.ContainerFromIndex(oldIndex) is not TemplatedControl oldSelection)
+		{
+			return;
+		}
+
+		StartOffsetAnimation(newSelection, oldSelection);
+	}
+
+	private static void StartOffsetAnimation(TemplatedControl newSelection, TemplatedControl oldSelection)
+	{
+		// Find the indicator border
 		// NOTE:
 		// The original required putting PART_SelectedPipe in template (e.g. ListBox > ListBoxItem)
 		// and used GetTemplateChildren() instead of GetVisualDescendants()
-        if (newSelection.GetVisualDescendants().FirstOrDefault(s => s.Name == "PART_SelectedPipe") is not { } borderPipe
-            || oldSelection.GetVisualDescendants().FirstOrDefault(s => s.Name == "PART_SelectedPipe") is not { } oldPipe)
-        {
-	        return;
-        }
-
-        // Clear old implicit animations if any
-        ElementComposition.GetElementVisual(oldPipe)?.ImplicitAnimations?.Clear();
-
-        // Get the composition visuals for all controls
-        var pipeVisual = ElementComposition.GetElementVisual(borderPipe);
-        var newSelectionVisual = ElementComposition.GetElementVisual(newSelection);
-        var oldSelectionVisual = ElementComposition.GetElementVisual(oldSelection);
-        if (pipeVisual == null || newSelectionVisual == null || oldSelectionVisual == null)
-        {
-	        return;
-        }
-
-        // Calculate the offset between old and new selections
-        var selectionOffset = oldSelectionVisual.Offset - newSelectionVisual.Offset;
-
-        // Check whether the offset is vertical (e.g. ListBox) or horizontal (e.g. TabControl)
-        // Note this code assumes the items are aligned in the SelectingItemsControl
-        var isVerticalOffset = selectionOffset.Y != 0;
-        var offset = isVerticalOffset ? selectionOffset.Y : selectionOffset.X;
-        var compositor = pipeVisual.Compositor;
-
-
-        // Create new offset animation between old selection position to the current position
-        var offsetAnimation = compositor.CreateVector3KeyFrameAnimation();
-        offsetAnimation.Target = "Offset";
-        var expression = (offset > 0 ? "+" : "-") + Math.Abs(offset);
-        offsetAnimation.InsertExpressionKeyFrame(
-	        0f,
-	        isVerticalOffset
-		        ? $"Vector3(this.FinalValue.X, this.FinalValue.Y{expression}, 0)"
-		        : $"Vector3(this.FinalValue.X{expression}, this.FinalValue.Y, 0)");
-        offsetAnimation.InsertExpressionKeyFrame(1f, "this.FinalValue");
-        offsetAnimation.Duration = TimeSpan.FromMilliseconds(250);
-
-        // Create small scale animation so the pipe will "stretch" while it's moving
-        var quadraticEaseIn = new QuadraticEaseOut();
-        var scaleAnimation = compositor.CreateVector3KeyFrameAnimation();
-        scaleAnimation.Target = "Scale";
-        scaleAnimation.InsertKeyFrame(0f, Vector3.One, quadraticEaseIn);
-        scaleAnimation.InsertKeyFrame(0.5f, new Vector3(1f + (!isVerticalOffset ? 0.75f : 0f), 1f + (isVerticalOffset ? 0.75f : 0f), 1f), quadraticEaseIn);
-        scaleAnimation.InsertKeyFrame(1f, Vector3.One, quadraticEaseIn);
-        scaleAnimation.Duration = TimeSpan.FromMilliseconds(250);
-
-        var compositionAnimationGroup = compositor.CreateAnimationGroup();
-        compositionAnimationGroup.Add(offsetAnimation);
-        compositionAnimationGroup.Add(scaleAnimation);
-        var pipeVisualImplicitAnimations = compositor.CreateImplicitAnimationCollection();
-        var currentOffset = isVerticalOffset ? pipeVisual.Offset.Y : pipeVisual.Offset.X;
-        if (currentOffset == 0)
-        {
-	        // Visual first shown, offset not calculated, lets trigger using Offset
-	        pipeVisualImplicitAnimations["Offset"] = compositionAnimationGroup;
-        }
-        else
-        {
-	        // Visual already shown, we can't trigger on Offset as it won't change
-	        pipeVisualImplicitAnimations["Visible"] = compositionAnimationGroup;
-        }
-
-        pipeVisual.ImplicitAnimations = pipeVisualImplicitAnimations;
-    }
-
-    public static bool GetEnableSelectionAnimation(SelectingItemsControl element)
-    {
-        return element.GetValue(EnableSelectionAnimationProperty);
-    }
-
-    public static void SetEnableSelectionAnimation(SelectingItemsControl element, bool value)
-    {
-        element.SetValue(EnableSelectionAnimationProperty, value);
-    }
+		if (newSelection.GetVisualDescendants().FirstOrDefault(s => s.Name == "PART_SelectedPipe") is not { } borderPipe
+		    || oldSelection.GetVisualDescendants().FirstOrDefault(s => s.Name == "PART_SelectedPipe") is not { } oldPipe)
+		{
+			return;
+		}
+
+		// Clear old implicit animations if any
+		ElementComposition.GetElementVisual(oldPipe)?.ImplicitAnimations?.Clear();
+
+		// Get the composition visuals for all controls
+		var pipeVisual = ElementComposition.GetElementVisual(borderPipe);
+		var newSelectionVisual = ElementComposition.GetElementVisual(newSelection);
+		var oldSelectionVisual = ElementComposition.GetElementVisual(oldSelection);
+		if (pipeVisual == null || newSelectionVisual == null || oldSelectionVisual == null)
+		{
+			return;
+		}
+
+		// Calculate the offset between old and new selections
+		var selectionOffset = oldSelectionVisual.Offset - newSelectionVisual.Offset;
+
+		// Check whether the offset is vertical (e.g. ListBox) or horizontal (e.g. TabControl)
+		// Note this code assumes the items are aligned in the SelectingItemsControl
+		var isVerticalOffset = selectionOffset.Y != 0;
+		var offset = isVerticalOffset ? selectionOffset.Y : selectionOffset.X;
+		var compositor = pipeVisual.Compositor;
+
+
+		// Create new offset animation between old selection position to the current position
+		var offsetAnimation = compositor.CreateVector3KeyFrameAnimation();
+		offsetAnimation.Target = "Offset";
+		var expression = (offset > 0 ? "+" : "-") + Math.Abs(offset);
+		offsetAnimation.InsertExpressionKeyFrame(
+			0f,
+			isVerticalOffset
+				? $"Vector3(this.FinalValue.X, this.FinalValue.Y{expression}, 0)"
+				: $"Vector3(this.FinalValue.X{expression}, this.FinalValue.Y, 0)");
+		offsetAnimation.InsertExpressionKeyFrame(1f, "this.FinalValue");
+		offsetAnimation.Duration = TimeSpan.FromMilliseconds(250);
+
+		// Create small scale animation so the pipe will "stretch" while it's moving
+		var quadraticEaseIn = new QuadraticEaseOut();
+		var scaleAnimation = compositor.CreateVector3KeyFrameAnimation();
+		scaleAnimation.Target = "Scale";
+		scaleAnimation.InsertKeyFrame(0f, Vector3.One, quadraticEaseIn);
+		scaleAnimation.InsertKeyFrame(0.5f, new Vector3(1f + (!isVerticalOffset ? 0.75f : 0f), 1f + (isVerticalOffset ? 0.75f : 0f), 1f), quadraticEaseIn);
+		scaleAnimation.InsertKeyFrame(1f, Vector3.One, quadraticEaseIn);
+		scaleAnimation.Duration = TimeSpan.FromMilliseconds(250);
+
+		var compositionAnimationGroup = compositor.CreateAnimationGroup();
+		compositionAnimationGroup.Add(offsetAnimation);
+		compositionAnimationGroup.Add(scaleAnimation);
+		var pipeVisualImplicitAnimations = compositor.CreateImplicitAnimationCollection();
+		var currentOffset = isVerticalOffset ? pipeVisual.Offset.Y : pipeVisual.Offset.X;
+		if (currentOffset == 0)
+		{
+			// Visual first shown, offset not calculated, lets trigger using Offset
+			pipeVisualImplicitAnimations["Offset"] = compositionAnimationGroup;
+		}
+		else
+		{
+			// Visual already shown, we can't trigger on Offset as it won't change
+			pipeVisualImplicitAnimations["Visible"] = compositionAnimationGroup;
+		}
+
+		pipeVisual.ImplicitAnimations = pipeVisualImplicitAnimations;
+	}
+
+	public static bool GetEnableSelectionAnimation(SelectingItemsControl element)
+	{
+		return element.GetValue(EnableSelectionAnimationProperty);
+	}
+
+	public static void SetEnableSelectionAnimation(SelectingItemsControl element, bool value)
+	{
+		element.SetValue(EnableSelectionAnimationProperty, value);
+	}
 }
diff --git a/WalletWasabi.Fluent/CoinList/ViewModels/CoinDetailsViewModel.cs b/WalletWasabi.Fluent/CoinList/ViewModels/CoinDetailsViewModel.cs
index 035e2448e9..c0a0f5ad79 100644
--- a/WalletWasabi.Fluent/CoinList/ViewModels/CoinDetailsViewModel.cs
+++ b/WalletWasabi.Fluent/CoinList/ViewModels/CoinDetailsViewModel.cs
@@ -1,4 +1,7 @@
+using System.Reactive.Disposables;
+using System.Reactive.Linq;
 using NBitcoin;
+using ReactiveUI;
 using WalletWasabi.Fluent.Models.Wallets;
 using WalletWasabi.Fluent.Navigation.ViewModels;
 using WalletWasabi.Lang;
@@ -8,8 +11,14 @@ namespace WalletWasabi.Fluent.CoinList.ViewModels;
 [NavigationMetaData(NavigationTarget = NavigationTarget.DialogScreen)]
 public partial class CoinDetailsViewModel : RoutableViewModel
 {
+	private readonly CoinModel _coin;
+
+	[AutoNotify] private string? _bannedTimeText;
+	[AutoNotify] private string? _bannedReasonText;
+
 	public CoinDetailsViewModel(CoinModel coin)
 	{
+		_coin = coin;
 		Title = Resources.CoinDetails;
 		EnableBack = true;
 		SetupCancel(enableCancel: false, enableCancelOnEscape: true, enableCancelOnPressed: true);
@@ -24,4 +33,21 @@ public CoinDetailsViewModel(CoinModel coin)
 	public string Address { get; }
 	public int Index { get; }
 	public uint256 TransactionId { get; }
+
+	protected override void OnNavigatedTo(bool isInHistory, CompositeDisposable disposables)
+	{
+		base.OnNavigatedTo(isInHistory, disposables);
+
+		_coin.SubscribeToCoinChanges(disposables);
+
+		this.WhenAnyValue(x => x._coin.BannedUntilUtc)
+			.Select(x => x is { } time ? Resources.CantParticipateInCoinjoinUntil.SafeInject(time.ToString("g", Resources.Culture)) : null)
+			.BindTo(this, x => x.BannedTimeText)
+			.DisposeWith(disposables);
+
+		this.WhenAnyValue(x => x._coin.BanReason)
+			.Select(x => x is { } reason ? Resources.Reason.SafeInject(reason) : null)
+			.BindTo(this, x => x.BannedReasonText)
+			.DisposeWith(disposables);
+	}
 }
diff --git a/WalletWasabi.Fluent/CoinList/ViewModels/CoinListViewModel.cs b/WalletWasabi.Fluent/CoinList/ViewModels/CoinListViewModel.cs
index 04003415f3..aa3a0fbc50 100644
--- a/WalletWasabi.Fluent/CoinList/ViewModels/CoinListViewModel.cs
+++ b/WalletWasabi.Fluent/CoinList/ViewModels/CoinListViewModel.cs
@@ -39,17 +39,16 @@ public CoinListViewModel(CoinListModel availableCoins, IList<CoinModel> initialC
 		var changes = viewModels.Connect();
 
 		var coinItems = changes
-			.TransformMany(
-				item =>
+			.TransformMany(item =>
+			{
+				// When root item is a coin item
+				if (item is CoinViewModel c)
 				{
-					// When root item is a coin item
-					if (item is CoinViewModel c)
-					{
-						return new[] { c };
-					}
-
-					return item.Children;
-				})
+					return new[] { c };
+				}
+
+				return item.Children;
+			})
 			.AddKey(model => model.Coin.Key);
 
 		coinItems.OnItemAdded(model => model.Coin.SubscribeToCoinChanges(_disposables))
@@ -80,15 +79,14 @@ public CoinListViewModel(CoinListModel availableCoins, IList<CoinModel> initialC
 		availableCoins.Pockets
 			.Connect(suppressEmptyChangeSets: false)
 			.ToCollection()
-			.Do(
-				pockets =>
-				{
-					IList<CoinModel> oldSelection = Selection.ToArray();
-					var oldExpandedItemsLabel = _itemsCollection.Where(x => x.IsExpanded).Select(x => x.Labels).ToArray();
-					Rebuild(viewModels, pockets, availableCoins);
-					UpdateSelection(coinItemsCollection, oldSelection);
-					RestoreExpandedRows(oldExpandedItemsLabel);
-				})
+			.Do(pockets =>
+			{
+				IList<CoinModel> oldSelection = Selection.ToArray();
+				var oldExpandedItemsLabel = _itemsCollection.Where(x => x.IsExpanded).Select(x => x.Labels).ToArray();
+				Rebuild(viewModels, pockets, availableCoins);
+				UpdateSelection(coinItemsCollection, oldSelection);
+				RestoreExpandedRows(oldExpandedItemsLabel);
+			})
 			.Subscribe()
 			.DisposeWith(_disposables);
 
@@ -96,14 +94,13 @@ public CoinListViewModel(CoinListModel availableCoins, IList<CoinModel> initialC
 		TreeDataGridSource.DisposeWith(_disposables);
 		CoinItems = coinItemsCollection;
 
-		ExpandAllCommand = ReactiveCommand.Create(
-			() =>
+		ExpandAllCommand = ReactiveCommand.Create(() =>
+		{
+			foreach (var item in _itemsCollection)
 			{
-				foreach (var item in _itemsCollection)
-				{
-					item.IsExpanded = true;
-				}
-			});
+				item.IsExpanded = true;
+			}
+		});
 
 		Sortables =
 		[
diff --git a/WalletWasabi.Fluent/CoinList/ViewModels/CoinViewModel.cs b/WalletWasabi.Fluent/CoinList/ViewModels/CoinViewModel.cs
index ce3506ed44..48162dc1d9 100644
--- a/WalletWasabi.Fluent/CoinList/ViewModels/CoinViewModel.cs
+++ b/WalletWasabi.Fluent/CoinList/ViewModels/CoinViewModel.cs
@@ -34,12 +34,12 @@ public CoinViewModel(LabelsArray labels, CoinModel coin, bool canSelectWhenCoinj
 			.Do(_ => IsSelected = false)
 			.Subscribe();
 
-        if (!canSelectWhenCoinjoining)
-        {
-            this.WhenAnyValue(x => x.Coin.IsCoinJoinInProgress, b => !b).BindTo(this, x => x.CanBeSelected).DisposeWith(_disposables);
-        }
+		if (!canSelectWhenCoinjoining)
+		{
+			this.WhenAnyValue(x => x.Coin.IsCoinJoinInProgress, b => !b).BindTo(this, x => x.CanBeSelected).DisposeWith(_disposables);
+		}
 
-        ShowDetailsCommand = ReactiveCommand.Create(() => UiContext.Navigate().To().CoinDetails(coin));
+		ShowDetailsCommand = ReactiveCommand.Create(() => UiContext.Navigate().To().CoinDetails(coin));
 	}
 
 	public CoinModel Coin { get; }
diff --git a/WalletWasabi.Fluent/CoinList/Views/CoinDetailsView.axaml b/WalletWasabi.Fluent/CoinList/Views/CoinDetailsView.axaml
index 5129cc1282..865168129e 100644
--- a/WalletWasabi.Fluent/CoinList/Views/CoinDetailsView.axaml
+++ b/WalletWasabi.Fluent/CoinList/Views/CoinDetailsView.axaml
@@ -10,50 +10,88 @@
              x:Class="WalletWasabi.Fluent.CoinList.Views.CoinDetailsView">
   <ContentArea Title="{Binding Title}"
                EnableBack="{Binding EnableBack}"
-               NextContent="{x:Static lang:Resources.Done}" EnableNext="True"
+               NextContent="{x:Static lang:Resources.Done}" EnableNext="False"
                EnableCancel="{Binding EnableCancel}">
 
-    <StackPanel Spacing="15">
+    <DockPanel>
+      <StackPanel Spacing="15" DockPanel.Dock="Top">
+        <StackPanel.Styles>
+          <Style Selector="PreviewItem.warning /template/ PathIcon#PART_Icon">
+            <Setter Property="Foreground" Value="{DynamicResource WarningMessageForeground}" />
+          </Style>
+        </StackPanel.Styles>
 
-      <!-- Amount -->
-      <PreviewItem Icon="{StaticResource btc_logo}"
+        <!-- Amount -->
+        <PreviewItem Icon="{StaticResource btc_logo}"
                      Label="{x:Static lang:Resources.Amount}"
                      CopyableContent="{Binding Amount.Btc}">
-        <PrivacyContentControl>
-          <AmountControl Amount="{Binding Amount}" />
-        </PrivacyContentControl>
-      </PreviewItem>
-
-      <Separator />
-
-      <!-- Transaction ID -->
-      <PreviewItem Icon="{StaticResource transaction_id}"
-                   Label="{x:Static lang:Resources.TransactionID}"
-                   CopyableContent="{Binding TransactionId}">
-        <PrivacyContentControl>
-          <TextBlock Text="{Binding TransactionId}" Classes="monoSpaced" />
-        </PrivacyContentControl>
-      </PreviewItem>
-      <Separator />
-
-      <!-- Destination Address -->
-      <PreviewItem Icon="{StaticResource transceive_regular}"
-                   CopyableContent="{Binding Address}"
-                   Label="{x:Static lang:Resources.Address}">
-        <PrivacyContentControl>
-          <TextBlock Text="{Binding Address}" />
-        </PrivacyContentControl>
-      </PreviewItem>
-
-      <Separator />
-
-      <!-- Index -->
-      <PreviewItem Icon="{StaticResource index}"
-                   Label="{x:Static lang:Resources.Index}"
-                   CopyableContent="{Binding Index}">
-        <TextBlock Text="{Binding Index}" />
-      </PreviewItem>
-
-    </StackPanel>
+          <PrivacyContentControl>
+            <AmountControl Amount="{Binding Amount}" />
+          </PrivacyContentControl>
+        </PreviewItem>
+
+        <Separator />
+
+        <!-- Transaction ID -->
+        <PreviewItem Icon="{StaticResource transaction_id}"
+                     Label="{x:Static lang:Resources.TransactionID}"
+                     CopyableContent="{Binding TransactionId}">
+          <PrivacyContentControl>
+            <TextBlock Text="{Binding TransactionId}" Classes="monoSpaced" />
+          </PrivacyContentControl>
+        </PreviewItem>
+        <Separator />
+
+        <!-- Destination Address -->
+        <PreviewItem Icon="{StaticResource transceive_regular}"
+                     CopyableContent="{Binding Address}"
+                     Label="{x:Static lang:Resources.Address}">
+          <PrivacyContentControl>
+            <TextBlock Text="{Binding Address}" />
+          </PrivacyContentControl>
+        </PreviewItem>
+
+        <Separator />
+
+        <!-- Index -->
+        <PreviewItem Icon="{StaticResource index}"
+                     Label="{x:Static lang:Resources.Index}"
+                     CopyableContent="{Binding Index}">
+          <TextBlock Text="{Binding Index}" />
+        </PreviewItem>
+
+      </StackPanel>
+      <Border IsVisible="{Binding BannedTimeText, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+              HorizontalAlignment="Center" VerticalAlignment="Bottom" DockPanel.Dock="Bottom" Margin="0 0 0 10"
+              BorderThickness="2"
+              CornerRadius="20"
+              Padding="30 10"
+              MaxWidth="450"
+              BorderBrush="{DynamicResource WarningMessageForeground}"
+              Background="{DynamicResource Layer1BackgroundBrush}">
+        <StackPanel Spacing="10">
+          <PathIcon Data="{StaticResource warning_filled}"
+                    Foreground="{DynamicResource WarningMessageForeground}"
+                    HorizontalAlignment="Center"
+                    Width="35"
+                    Height="35" />
+
+          <CopyableItem ContentToCopy="{Binding BannedTimeText}"
+                        HorizontalAlignment="Center">
+            <TextBlock TextAlignment="Center" TextWrapping="Wrap"
+                       Text="{Binding BannedTimeText}" />
+          </CopyableItem>
+
+          <CopyableItem ContentToCopy="{Binding BannedReasonText}"
+                        IsVisible="{Binding BannedReasonText, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                        HorizontalAlignment="Center">
+            <TextBlock TextAlignment="Center" TextWrapping="Wrap"
+                       Text="{Binding BannedReasonText}" />
+          </CopyableItem>
+
+        </StackPanel>
+      </Border>
+    </DockPanel>
+
   </ContentArea>
 </UserControl>
diff --git a/WalletWasabi.Fluent/CoinList/Views/CoinListView.axaml.cs b/WalletWasabi.Fluent/CoinList/Views/CoinListView.axaml.cs
index 425bee1010..20a1a07faf 100644
--- a/WalletWasabi.Fluent/CoinList/Views/CoinListView.axaml.cs
+++ b/WalletWasabi.Fluent/CoinList/Views/CoinListView.axaml.cs
@@ -2,6 +2,7 @@
 using Avalonia.Markup.Xaml;
 
 namespace WalletWasabi.Fluent.CoinList.Views;
+
 public class CoinListView : UserControl
 {
 	public CoinListView()
diff --git a/WalletWasabi.Fluent/CoinList/Views/Core/Cells/AnonymityScoreCellView.axaml b/WalletWasabi.Fluent/CoinList/Views/Core/Cells/AnonymityScoreCellView.axaml
index d74bc134ed..88b52447cf 100644
--- a/WalletWasabi.Fluent/CoinList/Views/Core/Cells/AnonymityScoreCellView.axaml
+++ b/WalletWasabi.Fluent/CoinList/Views/Core/Cells/AnonymityScoreCellView.axaml
@@ -8,7 +8,8 @@
              x:DataType="viewModels:CoinListItem"
              x:CompileBindings="True"
              x:Class="WalletWasabi.Fluent.CoinList.Views.Core.Cells.AnonymityScoreCellView">
-  <InvalidatingStackPanel IsVisible="{Binding !!AnonymityScore}" Orientation="Horizontal" Margin="20 0" Spacing="2" HorizontalAlignment="Left" ToolTip.Tip="{x:Static lang:Resources.AnonymityScore}">
+  <InvalidatingStackPanel IsVisible="{Binding !!AnonymityScore}" Orientation="Horizontal" Margin="20 0" Spacing="2"
+                          HorizontalAlignment="Left" ToolTip.Tip="{x:Static lang:Resources.AnonymityScore}">
     <PathIcon Data="{StaticResource anonscore}" VerticalAlignment="Center" Opacity="0.6" Height="15" />
     <TextBlock Text="{Binding AnonymityScore}" VerticalAlignment="Center" FontWeight="Bold" />
   </InvalidatingStackPanel>
diff --git a/WalletWasabi.Fluent/CoinList/Views/Core/Cells/IndicatorsCellView.axaml b/WalletWasabi.Fluent/CoinList/Views/Core/Cells/IndicatorsCellView.axaml
index f8ae14adfa..37a6fb7ccb 100644
--- a/WalletWasabi.Fluent/CoinList/Views/Core/Cells/IndicatorsCellView.axaml
+++ b/WalletWasabi.Fluent/CoinList/Views/Core/Cells/IndicatorsCellView.axaml
@@ -31,8 +31,8 @@
       <!-- CJ active -->
       <Panel.IsVisible>
         <MultiBinding Converter="{x:Static BoolConverters.And}">
-          <Binding Path="!IsBanned"/>
-          <Binding Path="!IsExcludedFromCoinJoin"/>
+          <Binding Path="!IsBanned" />
+          <Binding Path="!IsExcludedFromCoinJoin" />
         </MultiBinding>
       </Panel.IsVisible>
       <PathIcon IsVisible="{Binding IsCoinjoining}"
@@ -57,8 +57,8 @@
               ToolTip.Tip="{Binding BannedUntilUtcToolTip}">
       <PathIcon.IsVisible>
         <MultiBinding Converter="{x:Static BoolConverters.And}">
-          <Binding Path="IsBanned"/>
-          <Binding Path="!IsExcludedFromCoinJoin"/>
+          <Binding Path="IsBanned" />
+          <Binding Path="!IsExcludedFromCoinJoin" />
         </MultiBinding>
       </PathIcon.IsVisible>
     </PathIcon>
diff --git a/WalletWasabi.Fluent/CoinList/Views/Core/Cells/SelectionCellView.axaml b/WalletWasabi.Fluent/CoinList/Views/Core/Cells/SelectionCellView.axaml
index e1f6944ac4..05aa08f02a 100644
--- a/WalletWasabi.Fluent/CoinList/Views/Core/Cells/SelectionCellView.axaml
+++ b/WalletWasabi.Fluent/CoinList/Views/Core/Cells/SelectionCellView.axaml
@@ -19,8 +19,8 @@
   <Border CornerRadius="30" HorizontalAlignment="Right" Margin="0 0 2 0">
     <Border.IsVisible>
       <MultiBinding Converter="{x:Static BoolConverters.Or}">
-        <Binding Path="AllowSelection"/>
-        <Binding Path="ShowDetailsCommand" Converter="{x:Static ObjectConverters.IsNotNull}"/>
+        <Binding Path="AllowSelection" />
+        <Binding Path="ShowDetailsCommand" Converter="{x:Static ObjectConverters.IsNotNull}" />
       </MultiBinding>
     </Border.IsVisible>
     <Classes.transparent>
@@ -37,12 +37,14 @@
       </InvalidatingStackPanel.Styles>
 
       <!-- Details -->
-      <Button IsVisible="{Binding !!ShowDetailsCommand}" Classes="plain" ToolTip.Tip="{x:Static lang:Resources.ShowDetails}"
+      <Button IsVisible="{Binding !!ShowDetailsCommand}" Classes="plain"
+              ToolTip.Tip="{x:Static lang:Resources.ShowDetails}"
               Command="{Binding ShowDetailsCommand}">
         <PathIcon Data="{StaticResource details_regular}" Height="16" />
       </Button>
 
-      <CheckBox Padding="0" IsVisible="{Binding AllowSelection}" IsChecked="{Binding IsSelected}" IsEnabled="{Binding CanBeSelected}" />
+      <CheckBox Padding="0" IsVisible="{Binding AllowSelection}" IsChecked="{Binding IsSelected}"
+                IsEnabled="{Binding CanBeSelected}" />
 
     </InvalidatingStackPanel>
   </Border>
diff --git a/WalletWasabi.Fluent/CoinList/Views/SelectCoinsDialogView.axaml b/WalletWasabi.Fluent/CoinList/Views/SelectCoinsDialogView.axaml
index 50e51eb80e..b5f8128cfd 100644
--- a/WalletWasabi.Fluent/CoinList/Views/SelectCoinsDialogView.axaml
+++ b/WalletWasabi.Fluent/CoinList/Views/SelectCoinsDialogView.axaml
@@ -18,7 +18,8 @@
                IsBusy="{Binding IsBusy}"
                ScrollViewer.VerticalScrollBarVisibility="Disabled">
     <ContentArea.TopContent>
-      <Button DockPanel.Dock="Right" Theme="{StaticResource DialogSortButton}" ToolTip.Tip="{x:Static lang:Resources.Sorting}">
+      <Button DockPanel.Dock="Right" Theme="{StaticResource DialogSortButton}"
+              ToolTip.Tip="{x:Static lang:Resources.Sorting}">
         <Button.Flyout>
           <Flyout Placement="BottomEdgeAlignedRight">
             <sorting:SortControl Sortables="{Binding CoinList.Sortables}" />
diff --git a/WalletWasabi.Fluent/Common/ViewModels/ApplicationViewModel.cs b/WalletWasabi.Fluent/Common/ViewModels/ApplicationViewModel.cs
index 150d24ba69..78fa0615b7 100644
--- a/WalletWasabi.Fluent/Common/ViewModels/ApplicationViewModel.cs
+++ b/WalletWasabi.Fluent/Common/ViewModels/ApplicationViewModel.cs
@@ -106,6 +106,6 @@ public bool MainViewCanShutdown()
 		// - no open dialog
 		// - or no wallets available
 		return !MainViewModel.Instance.IsDialogOpen()
-			   || !MainViewModel.Instance.NavBar.Wallets.Any();
+		       || !MainViewModel.Instance.NavBar.Wallets.Any();
 	}
 }
diff --git a/WalletWasabi.Fluent/Common/ViewModels/DialogBase/DialogScreenViewModel.cs b/WalletWasabi.Fluent/Common/ViewModels/DialogBase/DialogScreenViewModel.cs
index b6fd07d776..53d844f5cb 100644
--- a/WalletWasabi.Fluent/Common/ViewModels/DialogBase/DialogScreenViewModel.cs
+++ b/WalletWasabi.Fluent/Common/ViewModels/DialogBase/DialogScreenViewModel.cs
@@ -18,14 +18,13 @@ public DialogScreenViewModel(NavigationTarget navigationTarget = NavigationTarge
 		this.WhenAnyValue(x => x.IsDialogOpen)
 			.Skip(1) // Skip the initial value change (which is false).
 			.DistinctUntilChanged()
-			.Subscribe(
-				x =>
+			.Subscribe(x =>
+			{
+				if (!x)
 				{
-					if (!x)
-					{
-						CloseScreen();
-					}
-				});
+					CloseScreen();
+				}
+			});
 	}
 
 	protected override void OnNavigated(RoutableViewModel? oldPage, bool oldInStack, RoutableViewModel? newPage, bool newInStack)
diff --git a/WalletWasabi.Fluent/Common/ViewModels/DialogBase/DialogViewModelBaseOfTResult.cs b/WalletWasabi.Fluent/Common/ViewModels/DialogBase/DialogViewModelBaseOfTResult.cs
index c735a6293a..6e956a6ffa 100644
--- a/WalletWasabi.Fluent/Common/ViewModels/DialogBase/DialogViewModelBaseOfTResult.cs
+++ b/WalletWasabi.Fluent/Common/ViewModels/DialogBase/DialogViewModelBaseOfTResult.cs
@@ -26,10 +26,7 @@ protected DialogViewModelBase()
 
 		BackCommand = ReactiveCommand.Create(() => Close(DialogResultKind.Back));
 
-		CancelCommand = ReactiveCommand.Create(() =>
-		{
-			UiContext.Navigate(CurrentTarget).Clear();
-		});
+		CancelCommand = ReactiveCommand.Create(() => { UiContext.Navigate(CurrentTarget).Clear(); });
 	}
 
 	protected override void OnNavigatedFrom(bool isInHistory)
diff --git a/WalletWasabi.Fluent/Common/ViewModels/MainViewModel.cs b/WalletWasabi.Fluent/Common/ViewModels/MainViewModel.cs
index 54ce08aca3..33e8358e4f 100644
--- a/WalletWasabi.Fluent/Common/ViewModels/MainViewModel.cs
+++ b/WalletWasabi.Fluent/Common/ViewModels/MainViewModel.cs
@@ -77,8 +77,8 @@ public MainViewModel()
 
 		NetworkBadgeName =
 			UiContext.ApplicationSettings.Network == Network.Main
-			? ""
-			: UiContext.ApplicationSettings.Network.Name;
+				? ""
+				: UiContext.ApplicationSettings.Network.Name;
 
 		RxApp.MainThreadScheduler.Schedule(async () =>
 		{
diff --git a/WalletWasabi.Fluent/Common/ViewModels/ShuttingDownViewModel.cs b/WalletWasabi.Fluent/Common/ViewModels/ShuttingDownViewModel.cs
index 035b858c4e..53528a01a0 100644
--- a/WalletWasabi.Fluent/Common/ViewModels/ShuttingDownViewModel.cs
+++ b/WalletWasabi.Fluent/Common/ViewModels/ShuttingDownViewModel.cs
@@ -20,12 +20,11 @@ public ShuttingDownViewModel(ApplicationViewModel applicationViewModel, bool res
 		_applicationViewModel = applicationViewModel;
 		_restart = restart;
 
-		NextCommand = ReactiveCommand.CreateFromTask(
-			async () =>
-			{
-				await UiContext.CoinjoinModel.RestartAbortedCoinjoinsAsync();
-				UiContext.Navigate(CurrentTarget).Clear();
-			});
+		NextCommand = ReactiveCommand.CreateFromTask(async () =>
+		{
+			await UiContext.CoinjoinModel.RestartAbortedCoinjoinsAsync();
+			UiContext.Navigate(CurrentTarget).Clear();
+		});
 	}
 
 	protected override void OnNavigatedTo(bool isInHistory, CompositeDisposable disposables)
@@ -33,15 +32,15 @@ protected override void OnNavigatedTo(bool isInHistory, CompositeDisposable disp
 		RxApp.MainThreadScheduler.Schedule(async () => await UiContext.CoinjoinModel.SignalToStopCoinjoinsAsync());
 
 		Observable.Interval(TimeSpan.FromSeconds(3))
-				  .ObserveOn(RxApp.MainThreadScheduler)
-				  .Subscribe(_ =>
-				  {
-					  if (UiContext.CoinjoinModel.CanShutdown())
-					  {
-						  UiContext.Navigate(CurrentTarget).Clear();
-						  _applicationViewModel.Shutdown(_restart);
-					  }
-				  })
-				  .DisposeWith(disposables);
+			.ObserveOn(RxApp.MainThreadScheduler)
+			.Subscribe(_ =>
+			{
+				if (UiContext.CoinjoinModel.CanShutdown())
+				{
+					UiContext.Navigate(CurrentTarget).Clear();
+					_applicationViewModel.Shutdown(_restart);
+				}
+			})
+			.DisposeWith(disposables);
 	}
 }
diff --git a/WalletWasabi.Fluent/Common/Views/Shell/Dialogs.axaml b/WalletWasabi.Fluent/Common/Views/Shell/Dialogs.axaml
index 56894f3571..2b3cafef04 100644
--- a/WalletWasabi.Fluent/Common/Views/Shell/Dialogs.axaml
+++ b/WalletWasabi.Fluent/Common/Views/Shell/Dialogs.axaml
@@ -9,7 +9,8 @@
              x:CompileBindings="False"
              x:Class="WalletWasabi.Fluent.Common.Views.Shell.Dialogs">
   <Panel>
-    <ExperimentalAcrylicBorder x:Name="OobeBackground" IsHitTestVisible="False" IsVisible="{Binding IsOobeBackgroundVisible, FallbackValue=False}">
+    <ExperimentalAcrylicBorder x:Name="OobeBackground" IsHitTestVisible="False"
+                               IsVisible="{Binding IsOobeBackgroundVisible, FallbackValue=False}">
       <ExperimentalAcrylicBorder.Material>
         <ExperimentalAcrylicMaterial BackgroundSource="Digger"
                                      TintColor="{DynamicResource SystemAltHighColor}"
@@ -22,30 +23,30 @@
       </Viewbox>
     </ExperimentalAcrylicBorder>
     <Dialog DataContext="{Binding DialogScreen}"
-              IsDialogOpen="{Binding IsDialogOpen, Mode=TwoWay}"
-              ShowAlert="{Binding ShowAlert, Mode=TwoWay}"
-              IsActive="{Binding CurrentPage.IsActive}"
-              IsBusy="{Binding CurrentPage.IsBusy, FallbackValue=False}"
-              IsBackEnabled="{Binding CurrentPage.EnableBack, FallbackValue=False}"
-              IsCancelEnabled="{Binding CurrentPage.EnableCancel, FallbackValue=False}"
-              EnableCancelOnPressed="{Binding CurrentPage.EnableCancelOnPressed, FallbackValue=True}"
-              EnableCancelOnEscape="{Binding CurrentPage.EnableCancelOnEscape, FallbackValue=True}"
-              HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-              HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
-              MaxContentWidth="800" MaxContentHeight="700"
-              IncreasedWidthThreshold="740" IncreasedHeightThreshold="580" FullScreenHeightThreshold="580">
+            IsDialogOpen="{Binding IsDialogOpen, Mode=TwoWay}"
+            ShowAlert="{Binding ShowAlert, Mode=TwoWay}"
+            IsActive="{Binding CurrentPage.IsActive}"
+            IsBusy="{Binding CurrentPage.IsBusy, FallbackValue=False}"
+            IsBackEnabled="{Binding CurrentPage.EnableBack, FallbackValue=False}"
+            IsCancelEnabled="{Binding CurrentPage.EnableCancel, FallbackValue=False}"
+            EnableCancelOnPressed="{Binding CurrentPage.EnableCancelOnPressed, FallbackValue=True}"
+            EnableCancelOnEscape="{Binding CurrentPage.EnableCancelOnEscape, FallbackValue=True}"
+            HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+            HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
+            MaxContentWidth="800" MaxContentHeight="700"
+            IncreasedWidthThreshold="740" IncreasedHeightThreshold="580" FullScreenHeightThreshold="580">
       <ContentControl Content="{Binding CurrentPage}" />
     </Dialog>
     <Dialog DataContext="{Binding CompactDialogScreen}"
-              IsDialogOpen="{Binding IsDialogOpen, Mode=TwoWay}"
-              ShowAlert="{Binding ShowAlert, Mode=TwoWay}"
-              IsActive="{Binding CurrentPage.IsActive}"
-              IsBusy="{Binding CurrentPage.IsBusy, FallbackValue=False}"
-              IsBackEnabled="{Binding CurrentPage.EnableBack, FallbackValue=False}"
-              IsCancelEnabled="{Binding CurrentPage.EnableCancel, FallbackValue=False}"
-              EnableCancelOnPressed="{Binding CurrentPage.EnableCancelOnPressed, FallbackValue=True}"
-              EnableCancelOnEscape="{Binding CurrentPage.EnableCancelOnEscape, FallbackValue=True}"
-              HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+            IsDialogOpen="{Binding IsDialogOpen, Mode=TwoWay}"
+            ShowAlert="{Binding ShowAlert, Mode=TwoWay}"
+            IsActive="{Binding CurrentPage.IsActive}"
+            IsBusy="{Binding CurrentPage.IsBusy, FallbackValue=False}"
+            IsBackEnabled="{Binding CurrentPage.EnableBack, FallbackValue=False}"
+            IsCancelEnabled="{Binding CurrentPage.EnableCancel, FallbackValue=False}"
+            EnableCancelOnPressed="{Binding CurrentPage.EnableCancelOnPressed, FallbackValue=True}"
+            EnableCancelOnEscape="{Binding CurrentPage.EnableCancelOnEscape, FallbackValue=True}"
+            HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
       <ContentControl Content="{Binding CurrentPage}" />
     </Dialog>
   </Panel>
diff --git a/WalletWasabi.Fluent/Common/Views/Shell/MainScreen.axaml b/WalletWasabi.Fluent/Common/Views/Shell/MainScreen.axaml
index 45e30c97d1..4bbf387685 100644
--- a/WalletWasabi.Fluent/Common/Views/Shell/MainScreen.axaml
+++ b/WalletWasabi.Fluent/Common/Views/Shell/MainScreen.axaml
@@ -13,7 +13,8 @@
     <shell1:TitleBar Height="42" DockPanel.Dock="Top" />
     <DockPanel>
       <views:NavBar DockPanel.Dock="Left" DataContext="{Binding NavBar}" />
-      <Border x:Name="ContentPart" CornerRadius="10 0 0 0" ClipToBounds="True" Background="{DynamicResource RegionColor}">
+      <Border x:Name="ContentPart" CornerRadius="10 0 0 0" ClipToBounds="True"
+              Background="{DynamicResource RegionColor}">
         <Border.Effect>
           <DynamicResource ResourceKey="MainAreaDropShadowEffect" />
         </Border.Effect>
@@ -25,7 +26,8 @@
               <SpectrumControl.IsDockEffectVisible>
                 <MultiBinding Converter="{x:Static BoolConverters.And}">
                   <Binding Path="CurrentWallet^.IsMusicBoxVisible^" FallbackValue="False" />
-                  <Binding Path="CurrentWallet^.CoinjoinPlayerViewModel.AreAllCoinsPrivate" FallbackValue="False" Converter="{x:Static BoolConverters.Not}" />
+                  <Binding Path="CurrentWallet^.CoinjoinPlayerViewModel.AreAllCoinsPrivate" FallbackValue="False"
+                           Converter="{x:Static BoolConverters.Not}" />
                 </MultiBinding>
               </SpectrumControl.IsDockEffectVisible>
               <SpectrumControl.Styles>
@@ -54,7 +56,7 @@
               </Style>
             </DockPanel.Styles>
             <view:CoinjoinPlayerControlView DockPanel.Dock="Bottom" DataContext="{Binding CurrentWallet^}"
-                                       HorizontalAlignment="Center" Height="66" />
+                                            HorizontalAlignment="Center" Height="66" />
 
             <!-- Main content -->
             <ContentControl ClipToBounds="False" Content="{Binding MainScreen.CurrentPage}">
diff --git a/WalletWasabi.Fluent/Common/Views/Shell/Shell.axaml b/WalletWasabi.Fluent/Common/Views/Shell/Shell.axaml
index 23d35228fb..f685a11d46 100644
--- a/WalletWasabi.Fluent/Common/Views/Shell/Shell.axaml
+++ b/WalletWasabi.Fluent/Common/Views/Shell/Shell.axaml
@@ -13,7 +13,7 @@
   </Interaction.Behaviors>
   <Panel>
     <shell1:MainScreen x:CompileBindings="False"
-                      IsHitTestVisible="{Binding $parent.DataContext.IsMainContentEnabled^, FallbackValue=True}">
+                       IsHitTestVisible="{Binding $parent.DataContext.IsMainContentEnabled^, FallbackValue=True}">
       <shell1:MainScreen.Transitions>
         <Transitions>
           <EffectTransition Property="Effect"
diff --git a/WalletWasabi.Fluent/Common/Views/Shell/TitleBar.axaml b/WalletWasabi.Fluent/Common/Views/Shell/TitleBar.axaml
index 51b1841209..a96f4fb1dd 100644
--- a/WalletWasabi.Fluent/Common/Views/Shell/TitleBar.axaml
+++ b/WalletWasabi.Fluent/Common/Views/Shell/TitleBar.axaml
@@ -15,23 +15,25 @@
   <UserControl.Resources>
 
     <DataTemplate x:Key="StatusIcon">
-      <views2:StatusIcon Foreground="{DynamicResource AcrylicTrimForeground}" DataContext="{Binding #UserControl.DataContext.StatusIcon}" />
+      <views2:StatusIcon Foreground="{DynamicResource AcrylicTrimForeground}"
+                         DataContext="{Binding #UserControl.DataContext.StatusIcon}" />
     </DataTemplate>
 
     <DataTemplate x:Key="WasabiLogo">
-      <StackPanel Orientation="Horizontal" Spacing="3" VerticalAlignment="Center" HorizontalAlignment="Center" IsHitTestVisible="False">
+      <StackPanel Orientation="Horizontal" Spacing="3" VerticalAlignment="Center" HorizontalAlignment="Center"
+                  IsHitTestVisible="False">
         <Viewbox Height="18" Width="18" IsHitTestVisible="False" Margin="0 -1 4 0">
           <ThemeImage Source="{DynamicResource GingerWalletLogo}" />
         </Viewbox>
-        <TextBlock Text="Ginger"  FontFamily="{StaticResource PoppinsFont}" />
+        <TextBlock Text="Ginger" FontFamily="{StaticResource PoppinsFont}" />
         <TextBlock Text="Wallet" FontWeight="Bold" FontFamily="{StaticResource PoppinsFont}" />
       </StackPanel>
     </DataTemplate>
 
     <DataTemplate x:Key="SearchBar">
       <views:SearchBar DataContext="{Binding #UserControl.DataContext.SearchBar}"
-                           VerticalAlignment="Stretch"
-                           x:Name="SearchBarControl">
+                       VerticalAlignment="Stretch"
+                       x:Name="SearchBarControl">
         <Interaction.Behaviors>
           <SearchBarWidthBehavior />
         </Interaction.Behaviors>
@@ -59,7 +61,8 @@
           <ColumnDefinition Width="140" />
         </Grid.ColumnDefinitions>
 
-        <StackPanel Grid.Column="0" Grid.ColumnSpan="2" ClipToBounds="False" Margin="31 0 0 0" Spacing="30" Orientation="Horizontal">
+        <StackPanel Grid.Column="0" Grid.ColumnSpan="2" ClipToBounds="False" Margin="31 0 0 0" Spacing="30"
+                    Orientation="Horizontal">
           <ContentControl ContentTemplate="{StaticResource StatusIcon}" />
           <ContentControl ContentTemplate="{StaticResource SearchBar}" />
           <ContentControl ContentTemplate="{StaticResource AnnouncementIcon}" ClipToBounds="False" />
@@ -67,7 +70,8 @@
 
         <ContentControl Grid.Column="2" ContentTemplate="{StaticResource WasabiLogo}" />
 
-        <StackPanel Spacing="20" Orientation="Horizontal" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0 0 8 0">
+        <StackPanel Spacing="20" Orientation="Horizontal" Grid.Column="3" VerticalAlignment="Center"
+                    HorizontalAlignment="Right" Margin="0 0 8 0">
           <shell1:NetworkBadge />
         </StackPanel>
       </Grid>
@@ -83,7 +87,8 @@
           <ColumnDefinition Width="3*" />
         </Grid.ColumnDefinitions>
 
-        <StackPanel Grid.Column="0" Grid.ColumnSpan="2" ClipToBounds="False" Margin="30 0 0 0" Spacing="30" Orientation="Horizontal">
+        <StackPanel Grid.Column="0" Grid.ColumnSpan="2" ClipToBounds="False" Margin="30 0 0 0" Spacing="30"
+                    Orientation="Horizontal">
           <ContentControl ContentTemplate="{StaticResource StatusIcon}" />
           <ContentControl ContentTemplate="{StaticResource SearchBar}" />
           <ContentControl ContentTemplate="{StaticResource AnnouncementIcon}" ClipToBounds="False" />
@@ -91,7 +96,8 @@
 
         <ContentControl Grid.Column="2" ContentTemplate="{StaticResource WasabiLogo}" />
 
-        <StackPanel Spacing="20" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0 0 8 0" Grid.Column="3">
+        <StackPanel Spacing="20" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right"
+                    Margin="0 0 8 0" Grid.Column="3">
           <shell1:NetworkBadge />
         </StackPanel>
       </Grid>
@@ -114,7 +120,8 @@
 
         <ContentControl Grid.Column="2" ContentTemplate="{StaticResource WasabiLogo}" />
 
-        <StackPanel Spacing="18" Orientation="Horizontal" HorizontalAlignment="Right" Margin="10,0,10,0" Grid.Column="3">
+        <StackPanel Spacing="18" Orientation="Horizontal" HorizontalAlignment="Right" Margin="10,0,10,0"
+                    Grid.Column="3">
           <shell1:NetworkBadge />
           <ContentControl ContentTemplate="{StaticResource StatusIcon}" />
         </StackPanel>
diff --git a/WalletWasabi.Fluent/Common/Views/Shell/WelcomeBg.axaml b/WalletWasabi.Fluent/Common/Views/Shell/WelcomeBg.axaml
index c5ac756ec6..32e96cbbee 100644
--- a/WalletWasabi.Fluent/Common/Views/Shell/WelcomeBg.axaml
+++ b/WalletWasabi.Fluent/Common/Views/Shell/WelcomeBg.axaml
@@ -238,4 +238,3 @@
     </Panel>
   </Panel>
 </UserControl>
-
diff --git a/WalletWasabi.Fluent/Common/Views/ShowErrorDialogView.axaml b/WalletWasabi.Fluent/Common/Views/ShowErrorDialogView.axaml
index 6b7f9a2c27..b28f93c976 100644
--- a/WalletWasabi.Fluent/Common/Views/ShowErrorDialogView.axaml
+++ b/WalletWasabi.Fluent/Common/Views/ShowErrorDialogView.axaml
@@ -8,11 +8,12 @@
              x:CompileBindings="True"
              x:Class="WalletWasabi.Fluent.Common.Views.ShowErrorDialogView">
   <ContentArea Title="{Binding Title}"
-                 Caption="{Binding Caption}"
-                 EnableNext="True" NextContent="OK"
-                 ScrollViewer.VerticalScrollBarVisibility="Disabled">
+               Caption="{Binding Caption}"
+               EnableNext="True" NextContent="OK"
+               ScrollViewer.VerticalScrollBarVisibility="Disabled">
     <DockPanel VerticalAlignment="Center">
-      <TextBlock Text="{Binding Message}" DockPanel.Dock="Bottom" TextAlignment="Center" TextWrapping="Wrap" MaxWidth="500" Margin="20 0" />
+      <TextBlock Text="{Binding Message}" DockPanel.Dock="Bottom" TextAlignment="Center" TextWrapping="Wrap"
+                 MaxWidth="500" Margin="20 0" />
       <Viewbox MaxHeight="150" Margin="40">
         <PathIcon Data="{StaticResource warning_regular}" />
       </Viewbox>
diff --git a/WalletWasabi.Fluent/Common/Views/SuccessAnimationView.axaml b/WalletWasabi.Fluent/Common/Views/SuccessAnimationView.axaml
index f96565d145..b7a8c30a7a 100644
--- a/WalletWasabi.Fluent/Common/Views/SuccessAnimationView.axaml
+++ b/WalletWasabi.Fluent/Common/Views/SuccessAnimationView.axaml
@@ -19,7 +19,7 @@
         </Style.Animations>
       </Style>
     </Viewbox.Styles>
-    <PathIcon Data="{StaticResource copy_confirmed}" Opacity="0.6" Foreground="{DynamicResource SystemAccentColor}" Classes="fadeIn" />
+    <PathIcon Data="{StaticResource copy_confirmed}" Opacity="0.6" Foreground="{DynamicResource SystemAccentColor}"
+              Classes="fadeIn" />
   </Viewbox>
 </UserControl>
-
diff --git a/WalletWasabi.Fluent/Controls/AdorningContentControl.axaml b/WalletWasabi.Fluent/Controls/AdorningContentControl.axaml
index 547a1fcb4c..b55777f429 100644
--- a/WalletWasabi.Fluent/Controls/AdorningContentControl.axaml
+++ b/WalletWasabi.Fluent/Controls/AdorningContentControl.axaml
@@ -1,5 +1,5 @@
-<ResourceDictionary  xmlns="https://github.com/avaloniaui"
-                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <AdorningContentControl />
   </Design.PreviewWith>
diff --git a/WalletWasabi.Fluent/Controls/AmountControl.axaml b/WalletWasabi.Fluent/Controls/AmountControl.axaml
index 3ae90545b9..47fa13587b 100644
--- a/WalletWasabi.Fluent/Controls/AmountControl.axaml
+++ b/WalletWasabi.Fluent/Controls/AmountControl.axaml
@@ -6,7 +6,8 @@
 
     <Setter Property="Template">
       <ControlTemplate>
-        <TextBlock DataContext="{Binding Path=Amount, RelativeSource={RelativeSource TemplatedParent}}" Classes="monoSpaced" TextWrapping="Wrap"
+        <TextBlock DataContext="{Binding Path=Amount, RelativeSource={RelativeSource TemplatedParent}}"
+                   Classes="monoSpaced" TextWrapping="Wrap"
                    IsVisible="{Binding Path=Amount, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}">
           <TextBlock.Text>
             <MultiBinding StringFormat="{}{0} {1}">
@@ -21,7 +22,8 @@
     <Style Selector="^.Fee">
       <Setter Property="Template">
         <ControlTemplate>
-          <TextBlock DataContext="{Binding Path=Amount, RelativeSource={RelativeSource TemplatedParent}}" Classes="monoSpaced" TextWrapping="Wrap"
+          <TextBlock DataContext="{Binding Path=Amount, RelativeSource={RelativeSource TemplatedParent}}"
+                     Classes="monoSpaced" TextWrapping="Wrap"
                      IsVisible="{Binding Path=Amount, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}">
             <TextBlock.Text>
               <MultiBinding StringFormat="{}{0} {1}">
@@ -43,11 +45,11 @@
                   IsVisible="{Binding Path=Amount, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}">
             <StackPanel Orientation="Horizontal" Spacing="10">
               <TextBlock Classes="monoSpaced" TextWrapping="Wrap"
-                         Text="{Binding Btc, Converter={x:Static converters:MoneyConverters.ToBtc}}"/>
+                         Text="{Binding Btc, Converter={x:Static converters:MoneyConverters.ToBtc}}" />
               <TextBlock Classes="monoSpaced" TextWrapping="Wrap"
                          Text="{Binding Fiat^, Converter={x:Static converters:MoneyConverters.ToFiatFormatted}}"
                          IsVisible="{Binding HasFiatBalance^}"
-                         Opacity="0.6"/>
+                         Opacity="0.6" />
             </StackPanel>
           </Border>
         </ControlTemplate>
diff --git a/WalletWasabi.Fluent/Controls/AnimatedButton.axaml b/WalletWasabi.Fluent/Controls/AnimatedButton.axaml
index 6e1db40315..621ef10676 100644
--- a/WalletWasabi.Fluent/Controls/AnimatedButton.axaml
+++ b/WalletWasabi.Fluent/Controls/AnimatedButton.axaml
@@ -16,8 +16,10 @@
                 Classes="plain">
           <Interaction.Behaviors>
             <EventTriggerBehavior EventName="Click">
-              <ChangePropertyAction TargetObject="{Binding RelativeSource={RelativeSource TemplatedParent}}" PropertyName="AnimateIcon" Value="False" />
-              <ChangePropertyAction TargetObject="{Binding RelativeSource={RelativeSource TemplatedParent}}" PropertyName="AnimateIcon" Value="True" />
+              <ChangePropertyAction TargetObject="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                    PropertyName="AnimateIcon" Value="False" />
+              <ChangePropertyAction TargetObject="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                    PropertyName="AnimateIcon" Value="True" />
             </EventTriggerBehavior>
           </Interaction.Behaviors>
           <Panel>
@@ -45,7 +47,8 @@
       <Style.Animations>
         <Animation Duration="0:0:1.4" Easing="{StaticResource FluentEasing}">
           <KeyFrame KeyTime="0:0:0.0">
-            <Setter Property="Opacity" Value="{Binding PointerOverOpacity, RelativeSource={RelativeSource TemplatedParent}}" />
+            <Setter Property="Opacity"
+                    Value="{Binding PointerOverOpacity, RelativeSource={RelativeSource TemplatedParent}}" />
           </KeyFrame>
           <KeyFrame KeyTime="0:0:0.2">
             <Setter Property="Opacity" Value="0.0" />
@@ -56,7 +59,8 @@
             <Setter Property="IsVisible" Value="True" />
           </KeyFrame>
           <KeyFrame KeyTime="0:0:1.4">
-            <Setter Property="Opacity" Value="{Binding PointerOverOpacity, RelativeSource={RelativeSource TemplatedParent}}" />
+            <Setter Property="Opacity"
+                    Value="{Binding PointerOverOpacity, RelativeSource={RelativeSource TemplatedParent}}" />
           </KeyFrame>
         </Animation>
       </Style.Animations>
@@ -69,10 +73,12 @@
             <Setter Property="IsVisible" Value="True" />
           </KeyFrame>
           <KeyFrame KeyTime="0:0:0.2">
-            <Setter Property="Opacity" Value="{Binding PointerOverOpacity, RelativeSource={RelativeSource TemplatedParent}}" />
+            <Setter Property="Opacity"
+                    Value="{Binding PointerOverOpacity, RelativeSource={RelativeSource TemplatedParent}}" />
           </KeyFrame>
           <KeyFrame KeyTime="0:0:0.8">
-            <Setter Property="Opacity" Value="{Binding PointerOverOpacity, RelativeSource={RelativeSource TemplatedParent}}" />
+            <Setter Property="Opacity"
+                    Value="{Binding PointerOverOpacity, RelativeSource={RelativeSource TemplatedParent}}" />
           </KeyFrame>
           <KeyFrame KeyTime="0:0:1.0">
             <Setter Property="Opacity" Value="0.0" />
diff --git a/WalletWasabi.Fluent/Controls/Button.axaml b/WalletWasabi.Fluent/Controls/Button.axaml
index 1d72f199bc..3924aad007 100644
--- a/WalletWasabi.Fluent/Controls/Button.axaml
+++ b/WalletWasabi.Fluent/Controls/Button.axaml
@@ -58,7 +58,8 @@
     <Setter Property="ContentTemplate">
       <Setter.Value>
         <DataTemplate>
-          <PathIcon Height="11" Opacity="0.6" Foreground="{DynamicResource AcrylicTrimForeground}" Data="{StaticResource sorting}" />
+          <PathIcon Height="11" Opacity="0.6" Foreground="{DynamicResource AcrylicTrimForeground}"
+                    Data="{StaticResource sorting}" />
         </DataTemplate>
       </Setter.Value>
     </Setter>
@@ -95,7 +96,8 @@
       <Setter Property="ContentTemplate">
         <Setter.Value>
           <DataTemplate>
-            <PathIcon Height="13" Foreground="{DynamicResource AcrylicTrimForeground}" Data="{StaticResource select_all}" />
+            <PathIcon Height="13" Foreground="{DynamicResource AcrylicTrimForeground}"
+                      Data="{StaticResource select_all}" />
           </DataTemplate>
         </Setter.Value>
       </Setter>
@@ -105,7 +107,8 @@
       <Setter Property="ContentTemplate">
         <Setter.Value>
           <DataTemplate>
-            <PathIcon Height="13" Foreground="{DynamicResource AcrylicTrimForeground}" Data="{StaticResource select_none}" />
+            <PathIcon Height="13" Foreground="{DynamicResource AcrylicTrimForeground}"
+                      Data="{StaticResource select_none}" />
           </DataTemplate>
         </Setter.Value>
       </Setter>
diff --git a/WalletWasabi.Fluent/Controls/CaptionButtons.axaml b/WalletWasabi.Fluent/Controls/CaptionButtons.axaml
index 395ce02ba4..27b3568718 100644
--- a/WalletWasabi.Fluent/Controls/CaptionButtons.axaml
+++ b/WalletWasabi.Fluent/Controls/CaptionButtons.axaml
@@ -5,7 +5,7 @@
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="20">
-        <CaptionButtons Height="30"/>
+        <CaptionButtons Height="30" />
       </StackPanel>
     </Border>
   </Design.PreviewWith>
@@ -14,13 +14,13 @@
     <Setter Property="Background" Value="{DynamicResource ButtonBackground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrush}" />
     <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
-    <Setter Property="Width" Value="45"/>
-    <Setter Property="VerticalAlignment" Value="Stretch"/>
+    <Setter Property="Width" Value="45" />
+    <Setter Property="VerticalAlignment" Value="Stretch" />
     <Setter Property="Template">
       <ControlTemplate>
         <ContentPresenter Name="PART_ContentPresenter"
                           Background="Transparent"
-                          Content="{TemplateBinding Content}"/>
+                          Content="{TemplateBinding Content}" />
       </ControlTemplate>
     </Setter>
 
@@ -67,7 +67,7 @@
               <Path Name="RestoreButtonPath"
                     Stretch="UniformToFill"
                     Fill="{TemplateBinding Foreground}"
-                    Data="M2048 2048v-2048h-2048v2048h2048zM1843 1843h-1638v-1638h1638v1638z"/>
+                    Data="M2048 2048v-2048h-2048v2048h2048zM1843 1843h-1638v-1638h1638v1638z" />
             </Viewbox>
           </Button>
           <Button x:Name="PART_CloseButton"
@@ -85,11 +85,13 @@
       </ControlTemplate>
     </Setter>
     <Style Selector="^:maximized /template/ Path#RestoreButtonPath">
-      <Setter Property="Data" Value="M2048 410h-410v-410h-1638v1638h410v410h1638v-1638zM1434 1434h-1229v-1229h1229v1229zM1843 1843h-1229v-205h1024v-1024h205v1229z" />
+      <Setter Property="Data"
+              Value="M2048 410h-410v-410h-1638v1638h410v410h1638v-1638zM1434 1434h-1229v-1229h1229v1229zM1843 1843h-1229v-205h1024v-1024h205v1229z" />
     </Style>
     <Style Selector="^:fullscreen /template/ Path#FullScreenButtonPath">
       <Setter Property="IsVisible" Value="True" />
-      <Setter Property="Data" Value="M205 1024h819v-819h-205v469l-674 -674l-145 145l674 674h-469v205zM1374 1229h469v-205h-819v819h205v-469l674 674l145 -145z" />
+      <Setter Property="Data"
+              Value="M205 1024h819v-819h-205v469l-674 -674l-145 145l674 674h-469v205zM1374 1229h469v-205h-819v819h205v-469l674 674l145 -145z" />
     </Style>
     <Style Selector="^:fullscreen /template/ Button#PART_RestoreButton">
       <Setter Property="IsVisible" Value="False" />
@@ -98,7 +100,7 @@
       <Setter Property="IsVisible" Value="False" />
     </Style>
     <Style Selector="^ /template/ Button#PART_RestoreButton:disabled">
-      <Setter Property="Opacity" Value="0.2"/>
+      <Setter Property="Opacity" Value="0.2" />
     </Style>
   </ControlTheme>
 </ResourceDictionary>
diff --git a/WalletWasabi.Fluent/Controls/ChatTextBox.cs b/WalletWasabi.Fluent/Controls/ChatTextBox.cs
index 52b95c2257..3e1471afc8 100644
--- a/WalletWasabi.Fluent/Controls/ChatTextBox.cs
+++ b/WalletWasabi.Fluent/Controls/ChatTextBox.cs
@@ -3,7 +3,7 @@
 
 namespace WalletWasabi.Fluent.Controls;
 
-public class ChatTextBox: TextBox
+public class ChatTextBox : TextBox
 {
 	protected override Type StyleKeyOverride => typeof(TextBox);
 
diff --git a/WalletWasabi.Fluent/Controls/ClipboardCopyButton.axaml b/WalletWasabi.Fluent/Controls/ClipboardCopyButton.axaml
index d13e1f0d80..56c87b1f3f 100644
--- a/WalletWasabi.Fluent/Controls/ClipboardCopyButton.axaml
+++ b/WalletWasabi.Fluent/Controls/ClipboardCopyButton.axaml
@@ -8,11 +8,13 @@
   <ControlTheme x:Key="{x:Type ClipboardCopyButton}" TargetType="ClipboardCopyButton">
 
     <Setter Property="RenderTransform" Value="scale(0.8,0.8)" />
-    <Setter Property="Opacity" Value="{Binding $self.ShowCopyButton, Converter={x:Static converters:BoolOpacityConverters.BoolToOpacity}}"/>
+    <Setter Property="Opacity"
+            Value="{Binding $self.ShowCopyButton, Converter={x:Static converters:BoolOpacityConverters.BoolToOpacity}}" />
     <Setter Property="Transitions">
       <Transitions>
-        <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.135" Easing="{StaticResource FluentEasing}" />
-        <DoubleTransition Property="Opacity" Duration="0:0:0.135" Easing="{StaticResource FluentEasing}"/>
+        <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.135"
+                                       Easing="{StaticResource FluentEasing}" />
+        <DoubleTransition Property="Opacity" Duration="0:0:0.135" Easing="{StaticResource FluentEasing}" />
       </Transitions>
     </Setter>
 
diff --git a/WalletWasabi.Fluent/Controls/ContentArea.axaml.cs b/WalletWasabi.Fluent/Controls/ContentArea.axaml.cs
index b138edecaa..59e816b974 100644
--- a/WalletWasabi.Fluent/Controls/ContentArea.axaml.cs
+++ b/WalletWasabi.Fluent/Controls/ContentArea.axaml.cs
@@ -1,7 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
-using Avalonia.Data;
 using Avalonia.Media;
 
 namespace WalletWasabi.Fluent.Controls;
diff --git a/WalletWasabi.Fluent/Controls/CurrencyEntryBox.axaml b/WalletWasabi.Fluent/Controls/CurrencyEntryBox.axaml
index 3dd82c0645..302c73f826 100644
--- a/WalletWasabi.Fluent/Controls/CurrencyEntryBox.axaml
+++ b/WalletWasabi.Fluent/Controls/CurrencyEntryBox.axaml
@@ -4,7 +4,7 @@
   <Design.PreviewWith>
     <StackPanel Spacing="4" Width="300">
 
-      <CurrencyEntryBox Text="{Binding $self.Bounds.Height}"/>
+      <CurrencyEntryBox Text="{Binding $self.Bounds.Height}" />
       <CurrencyEntryBox Watermark="{Binding $self.Bounds.Height}" />
       <CurrencyEntryBox Classes="standalone" Text="{Binding $self.Bounds.Height}" CurrencyCode="BTC" />
 
@@ -36,9 +36,13 @@
 
     <Setter Property="ContextFlyout">
       <MenuFlyout>
-        <MenuItem Header="{x:Static lang:Resources.Cut}" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
-        <MenuItem Header="{x:Static lang:Resources.Copy}" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
-        <MenuItem Header="{x:Static lang:Resources.Paste}" Command="{Binding $parent[CurrencyEntryBox].ModifiedPasteAsync}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
+        <MenuItem Header="{x:Static lang:Resources.Cut}" Command="{Binding $parent[TextBox].Cut}"
+                  IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
+        <MenuItem Header="{x:Static lang:Resources.Copy}" Command="{Binding $parent[TextBox].Copy}"
+                  IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}" />
+        <MenuItem Header="{x:Static lang:Resources.Paste}"
+                  Command="{Binding $parent[CurrencyEntryBox].ModifiedPasteAsync}"
+                  IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}" />
       </MenuFlyout>
     </Setter>
 
@@ -171,7 +175,7 @@
                                      SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
                                      CaretBrush="{TemplateBinding CaretBrush}"
                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
                       <TextBlock Margin="5 0 0 0"
                                  Text="{TemplateBinding CurrencyCode}"
                                  IsVisible="{TemplateBinding Text, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
diff --git a/WalletWasabi.Fluent/Controls/CurrencyEntryBox.axaml.cs b/WalletWasabi.Fluent/Controls/CurrencyEntryBox.axaml.cs
index 4b8f7688da..9a552a97ee 100644
--- a/WalletWasabi.Fluent/Controls/CurrencyEntryBox.axaml.cs
+++ b/WalletWasabi.Fluent/Controls/CurrencyEntryBox.axaml.cs
@@ -376,8 +376,8 @@ private string PreComposeText(string input)
 		var selectionEnd = SelectionEnd;
 
 		if (!string.IsNullOrEmpty(input) && (MaxLength == 0 ||
-											 input.Length + preComposedText.Length -
-											 Math.Abs(selectionStart - selectionEnd) <= MaxLength))
+		                                     input.Length + preComposedText.Length -
+		                                     Math.Abs(selectionStart - selectionEnd) <= MaxLength))
 		{
 			if (selectionStart != selectionEnd)
 			{
diff --git a/WalletWasabi.Fluent/Controls/Dialog.axaml.cs b/WalletWasabi.Fluent/Controls/Dialog.axaml.cs
index 14e0886be0..33fd50f732 100644
--- a/WalletWasabi.Fluent/Controls/Dialog.axaml.cs
+++ b/WalletWasabi.Fluent/Controls/Dialog.axaml.cs
@@ -89,11 +89,11 @@ public Dialog()
 				var increasedHeightThreshold = IncreasedHeightThreshold;
 				var fullScreenHeightThreshold = FullScreenHeightThreshold;
 				var canIncreasedWidth = !double.IsNaN(increasedWidthThreshold)
-										&& width < increasedWidthThreshold;
+				                        && width < increasedWidthThreshold;
 				var canIncreasedHeight = !double.IsNaN(increasedHeightThreshold)
-										 && height < increasedHeightThreshold;
+				                         && height < increasedHeightThreshold;
 				var canGoToFullScreen = !double.IsNaN(fullScreenHeightThreshold)
-										&& height < fullScreenHeightThreshold;
+				                        && height < fullScreenHeightThreshold;
 				IncreasedWidthEnabled = canIncreasedWidth && !canIncreasedHeight;
 				IncreasedHeightEnabled = !canIncreasedWidth && canIncreasedHeight;
 				IncreasedSizeEnabled = canIncreasedWidth && canIncreasedHeight;
@@ -334,13 +334,13 @@ private void CancelPointerPressed(object? sender, PointerPressedEventArgs e)
 		}
 
 		if (IsDialogOpen
-			&& IsActive
-			&& EnableCancelOnPressed
-			&& !IsBusy
-			&& _dismissPanel is { }
-			&& _overlayPanel is { }
-			&& _canCancelOpenedOnPointerPressed
-			&& _canCancelActivatedOnPointerPressed)
+		    && IsActive
+		    && EnableCancelOnPressed
+		    && !IsBusy
+		    && _dismissPanel is { }
+		    && _overlayPanel is { }
+		    && _canCancelOpenedOnPointerPressed
+		    && _canCancelActivatedOnPointerPressed)
 		{
 			var point = e.GetPosition(_dismissPanel);
 			var isPressedOnTitleBar = e.GetPosition(_overlayPanel).Y < 30;
diff --git a/WalletWasabi.Fluent/Controls/DummyRowsControl.axaml b/WalletWasabi.Fluent/Controls/DummyRowsControl.axaml
index 480bbb3a01..002ee2f505 100644
--- a/WalletWasabi.Fluent/Controls/DummyRowsControl.axaml
+++ b/WalletWasabi.Fluent/Controls/DummyRowsControl.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
   <ControlTheme x:Key="{x:Type DummyRowsControl}" TargetType="DummyRowsControl">
     <Setter Property="Template">
@@ -8,8 +8,8 @@
           <ItemsControl.OpacityMask>
             <LinearGradientBrush StartPoint="0%,0%" EndPoint="0%,100%">
               <LinearGradientBrush.GradientStops>
-                <GradientStop Offset="0" Color="Black"/>
-                <GradientStop Offset="1" Color="Transparent"/>
+                <GradientStop Offset="0" Color="Black" />
+                <GradientStop Offset="1" Color="Transparent" />
               </LinearGradientBrush.GradientStops>
             </LinearGradientBrush>
           </ItemsControl.OpacityMask>
@@ -17,8 +17,8 @@
           <ItemsControl.ItemTemplate>
             <DataTemplate>
               <TemplatedControl
-                  Height="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=DummyRowsControl}, Path=RowHeight}"
-                  Template="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=DummyRowsControl}, Path=RowTemplate}" />
+                Height="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=DummyRowsControl}, Path=RowHeight}"
+                Template="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=DummyRowsControl}, Path=RowTemplate}" />
             </DataTemplate>
           </ItemsControl.ItemTemplate>
         </ItemsControl>
diff --git a/WalletWasabi.Fluent/Controls/DummyRowsControl.axaml.cs b/WalletWasabi.Fluent/Controls/DummyRowsControl.axaml.cs
index 475f74fe70..58a338a7d3 100644
--- a/WalletWasabi.Fluent/Controls/DummyRowsControl.axaml.cs
+++ b/WalletWasabi.Fluent/Controls/DummyRowsControl.axaml.cs
@@ -44,5 +44,5 @@ public ControlTemplate RowTemplate
 		set => SetValue(RowTemplateProperty, value);
 	}
 
-	private static IEnumerable<int> GenerateItems(double rowHeight, Rect bounds) => Enumerable.Range(0, (int) Math.Ceiling(bounds.Height / rowHeight));
+	private static IEnumerable<int> GenerateItems(double rowHeight, Rect bounds) => Enumerable.Range(0, (int)Math.Ceiling(bounds.Height / rowHeight));
 }
diff --git a/WalletWasabi.Fluent/Controls/FadeOutTextControl.axaml b/WalletWasabi.Fluent/Controls/FadeOutTextControl.axaml
index 5598e96630..5133b293c7 100644
--- a/WalletWasabi.Fluent/Controls/FadeOutTextControl.axaml
+++ b/WalletWasabi.Fluent/Controls/FadeOutTextControl.axaml
@@ -22,10 +22,10 @@
                      FontSize="{TemplateBinding FontSize}"
                      Opacity="0" />
           <FadeOutTextBlock Name="PART_NoTrimTextBlock"
-                              TextAlignment="{TemplateBinding HorizontalAlignment}"
-                              FontSize="{TemplateBinding FontSize}"
-                              Text="{TemplateBinding Text}"
-                              TextTrimming="None" />
+                            TextAlignment="{TemplateBinding HorizontalAlignment}"
+                            FontSize="{TemplateBinding FontSize}"
+                            Text="{TemplateBinding Text}"
+                            TextTrimming="None" />
         </Panel>
       </ControlTemplate>
     </Setter>
@@ -33,4 +33,3 @@
   </ControlTheme>
 
 </ResourceDictionary>
-
diff --git a/WalletWasabi.Fluent/Controls/LabelsItemsPresenter.axaml b/WalletWasabi.Fluent/Controls/LabelsItemsPresenter.axaml
index f05dcfe7e6..a2cbbe337d 100644
--- a/WalletWasabi.Fluent/Controls/LabelsItemsPresenter.axaml
+++ b/WalletWasabi.Fluent/Controls/LabelsItemsPresenter.axaml
@@ -33,7 +33,7 @@
                 HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                 VerticalAlignment="{TemplateBinding VerticalAlignment}">
           <ItemsPresenter Name="PART_ItemsPresenter"
-                          ItemsPanel="{TemplateBinding ItemsPanel}"/>
+                          ItemsPanel="{TemplateBinding ItemsPanel}" />
         </Border>
       </ControlTemplate>
     </Setter>
@@ -58,8 +58,9 @@
 
     <Setter Property="ItemsPanel">
       <ItemsPanelTemplate>
-        <LabelsPanel HorizontalAlignment="{Binding HorizontalAlignment, RelativeSource={RelativeSource AncestorType={x:Type LabelsItemsPresenter}}}"
-                       InfiniteWidthMeasure="{Binding InfiniteWidthMeasure, RelativeSource={RelativeSource AncestorType={x:Type LabelsItemsPresenter}}}">
+        <LabelsPanel
+          HorizontalAlignment="{Binding HorizontalAlignment, RelativeSource={RelativeSource AncestorType={x:Type LabelsItemsPresenter}}}"
+          InfiniteWidthMeasure="{Binding InfiniteWidthMeasure, RelativeSource={RelativeSource AncestorType={x:Type LabelsItemsPresenter}}}">
           <LabelsPanel.EllipsisControl>
             <Panel Margin="0 0 0 0">
               <Border Theme="{StaticResource LabelBorder}"
diff --git a/WalletWasabi.Fluent/Controls/LabelsPanel.cs b/WalletWasabi.Fluent/Controls/LabelsPanel.cs
index bcb46a8749..a777caa8fa 100644
--- a/WalletWasabi.Fluent/Controls/LabelsPanel.cs
+++ b/WalletWasabi.Fluent/Controls/LabelsPanel.cs
@@ -119,6 +119,7 @@ private Size MeasureOverridePanel(Size availableSize)
 				num2 = Math.Max(num2, layoutable.DesiredSize.Height);
 			}
 		}
+
 		return new Size(num1, num2);
 	}
 
diff --git a/WalletWasabi.Fluent/Controls/LineChart.cs b/WalletWasabi.Fluent/Controls/LineChart.cs
index 6334718301..a14e2f0ec5 100644
--- a/WalletWasabi.Fluent/Controls/LineChart.cs
+++ b/WalletWasabi.Fluent/Controls/LineChart.cs
@@ -407,11 +407,11 @@ private void DrawAreaFill(DrawingContext context, LineChartState state)
 	{
 		var brush = AreaFill;
 		if (brush is null
-			|| state.Points is null
-			|| state.AreaWidth <= 0
-			|| state.AreaHeight <= 0
-			|| state.AreaWidth < AreaMinViableWidth
-			|| state.AreaHeight < AreaMinViableHeight)
+		    || state.Points is null
+		    || state.AreaWidth <= 0
+		    || state.AreaHeight <= 0
+		    || state.AreaWidth < AreaMinViableWidth
+		    || state.AreaHeight < AreaMinViableHeight)
 		{
 			return;
 		}
@@ -430,11 +430,11 @@ private void DrawAreaStroke(DrawingContext context, LineChartState state)
 	{
 		var brush = AreaStroke;
 		if (brush is null
-			|| state.Points is null
-			|| state.AreaWidth <= 0
-			|| state.AreaHeight <= 0
-			|| state.AreaWidth < AreaMinViableWidth
-			|| state.AreaHeight < AreaMinViableHeight)
+		    || state.Points is null
+		    || state.AreaWidth <= 0
+		    || state.AreaHeight <= 0
+		    || state.AreaWidth < AreaMinViableWidth
+		    || state.AreaHeight < AreaMinViableHeight)
 		{
 			return;
 		}
@@ -459,11 +459,11 @@ private void DrawCursor(DrawingContext context, LineChartState state)
 	{
 		var brush = CursorStroke;
 		if (brush is null
-			|| double.IsNaN(state.XAxisCursorPosition)
-			|| state.AreaWidth <= 0
-			|| state.AreaHeight <= 0
-			|| state.AreaWidth < AreaMinViableWidth
-			|| state.AreaHeight < AreaMinViableHeight)
+		    || double.IsNaN(state.XAxisCursorPosition)
+		    || state.AreaWidth <= 0
+		    || state.AreaHeight <= 0
+		    || state.AreaWidth < AreaMinViableWidth
+		    || state.AreaHeight < AreaMinViableHeight)
 		{
 			return;
 		}
@@ -489,10 +489,10 @@ private void DrawXAxis(DrawingContext context, LineChartState state)
 	{
 		var brush = XAxisStroke;
 		if (brush is null
-			|| state.AreaWidth <= 0
-			|| state.AreaHeight <= 0
-			|| state.AreaWidth < XAxisMinViableWidth
-			|| state.AreaHeight < XAxisMinViableHeight)
+		    || state.AreaWidth <= 0
+		    || state.AreaHeight <= 0
+		    || state.AreaWidth < XAxisMinViableWidth
+		    || state.AreaHeight < XAxisMinViableHeight)
 		{
 			return;
 		}
@@ -543,11 +543,11 @@ private void DrawXAxisLabels(DrawingContext context, LineChartState state)
 	{
 		var foreground = XAxisLabelForeground;
 		if (foreground is null
-			|| state.XAxisLabels is null
-			|| double.IsNaN(state.XAxisLabelStep)
-			|| state.ChartWidth <= 0
-			|| state.ChartHeight <= 0
-			|| state.ChartHeight - state.AreaMargin.Top < state.AreaMargin.Bottom)
+		    || state.XAxisLabels is null
+		    || double.IsNaN(state.XAxisLabelStep)
+		    || state.ChartWidth <= 0
+		    || state.ChartHeight <= 0
+		    || state.ChartHeight - state.AreaMargin.Top < state.AreaMargin.Bottom)
 		{
 			return;
 		}
@@ -594,8 +594,8 @@ private void DrawXAxisLabels(DrawingContext context, LineChartState state)
 			var xPosition = origin.X + (constraintMax.Width / 2);
 			var yPosition = origin.Y + (constraintMax.Height / 2);
 			var matrix = Matrix.CreateTranslation(-xPosition, -yPosition)
-						 * Matrix.CreateRotation(angleRadians)
-						 * Matrix.CreateTranslation(xPosition, yPosition);
+			             * Matrix.CreateRotation(angleRadians)
+			             * Matrix.CreateTranslation(xPosition, yPosition);
 			var labelTransform = context.PushTransform(matrix);
 			var opacityState = context.PushOpacity(opacity);
 			formattedTextLabels[i].SetForegroundBrush(foreground);
@@ -616,9 +616,9 @@ private void DrawXAxisTitle(DrawingContext context, LineChartState state)
 		}
 
 		if (state.AreaWidth <= 0
-			|| state.AreaHeight <= 0
-			|| state.AreaWidth < XAxisMinViableWidth
-			|| state.AreaHeight < XAxisMinViableHeight)
+		    || state.AreaHeight <= 0
+		    || state.AreaWidth < XAxisMinViableWidth
+		    || state.AreaHeight < XAxisMinViableHeight)
 		{
 			return;
 		}
@@ -640,8 +640,8 @@ private void DrawXAxisTitle(DrawingContext context, LineChartState state)
 		var yPosition = origin.Y + (size.Height / 2);
 
 		var matrix = Matrix.CreateTranslation(-xPosition, -yPosition)
-					 * Matrix.CreateRotation(angleRadians)
-					 * Matrix.CreateTranslation(xPosition, yPosition);
+		             * Matrix.CreateRotation(angleRadians)
+		             * Matrix.CreateTranslation(xPosition, yPosition);
 		var labelTransform = context.PushTransform(matrix);
 		var offsetCenter = new Point(0, 0);
 		var opacityState = context.PushOpacity(opacity);
@@ -656,10 +656,10 @@ private void DrawYAxis(DrawingContext context, LineChartState state)
 	{
 		var brush = YAxisStroke;
 		if (brush is null
-			|| state.AreaWidth <= 0
-			|| state.AreaHeight <= 0
-			|| state.AreaWidth < YAxisMinViableWidth
-			|| state.AreaHeight < YAxisMinViableHeight)
+		    || state.AreaWidth <= 0
+		    || state.AreaHeight <= 0
+		    || state.AreaWidth < YAxisMinViableWidth
+		    || state.AreaHeight < YAxisMinViableHeight)
 		{
 			return;
 		}
@@ -722,11 +722,11 @@ private void DrawYAxisLabels(DrawingContext context, LineChartState state)
 	{
 		var foreground = YAxisLabelForeground;
 		if (foreground is null
-			|| state.YAxisLabels is null
-			|| double.IsNaN(state.YAxisLabelStep)
-			|| state.ChartWidth <= 0
-			|| state.ChartWidth - state.AreaMargin.Right < state.AreaMargin.Left
-			|| state.ChartHeight <= 0)
+		    || state.YAxisLabels is null
+		    || double.IsNaN(state.YAxisLabelStep)
+		    || state.ChartWidth <= 0
+		    || state.ChartWidth - state.AreaMargin.Right < state.AreaMargin.Left
+		    || state.ChartHeight <= 0)
 		{
 			return;
 		}
@@ -777,8 +777,8 @@ private void DrawYAxisLabels(DrawingContext context, LineChartState state)
 			var xPosition = origin.X + (constraintMax.Width / 2);
 			var yPosition = origin.Y + (constraintMax.Height / 2);
 			var matrix = Matrix.CreateTranslation(-xPosition, -yPosition)
-						 * Matrix.CreateRotation(angleRadians)
-						 * Matrix.CreateTranslation(xPosition, yPosition);
+			             * Matrix.CreateRotation(angleRadians)
+			             * Matrix.CreateTranslation(xPosition, yPosition);
 			var labelTransform = context.PushTransform(matrix);
 			var opacityState = context.PushOpacity(opacity);
 			formattedTextLabels[i].SetForegroundBrush(foreground);
@@ -799,9 +799,9 @@ private void DrawYAxisTitle(DrawingContext context, LineChartState state)
 		}
 
 		if (state.AreaWidth <= 0
-			|| state.AreaHeight <= 0
-			|| state.AreaWidth < YAxisMinViableWidth
-			|| state.AreaHeight < YAxisMinViableHeight)
+		    || state.AreaHeight <= 0
+		    || state.AreaWidth < YAxisMinViableWidth
+		    || state.AreaHeight < YAxisMinViableHeight)
 		{
 			return;
 		}
@@ -822,8 +822,8 @@ private void DrawYAxisTitle(DrawingContext context, LineChartState state)
 		var xPosition = origin.X + (size.Width / 2);
 		var yPosition = origin.Y + (size.Height / 2);
 		var matrix = Matrix.CreateTranslation(-xPosition, -yPosition)
-					 * Matrix.CreateRotation(angleRadians)
-					 * Matrix.CreateTranslation(xPosition, yPosition);
+		             * Matrix.CreateRotation(angleRadians)
+		             * Matrix.CreateTranslation(xPosition, yPosition);
 		var labelTransform = context.PushTransform(matrix);
 		var offsetCenter = new Point(0, (size.Height / 2) - (formattedText.Height / 2));
 		var opacityState = context.PushOpacity(opacity);
@@ -878,7 +878,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
 		base.OnPropertyChanged(change);
 
 		if (change.Property == XAxisValuesProperty || change.Property == YAxisValuesProperty ||
-			change.Property == XAxisLabelsProperty || change.Property == YAxisLabelsProperty)
+		    change.Property == XAxisLabelsProperty || change.Property == YAxisLabelsProperty)
 		{
 			var oldINCC = change.OldValue as INotifyCollectionChanged;
 			var newINCC = change.NewValue as INotifyCollectionChanged;
diff --git a/WalletWasabi.Fluent/Controls/LoadingContentControl.axaml b/WalletWasabi.Fluent/Controls/LoadingContentControl.axaml
index 65e4be3195..fda37f4143 100644
--- a/WalletWasabi.Fluent/Controls/LoadingContentControl.axaml
+++ b/WalletWasabi.Fluent/Controls/LoadingContentControl.axaml
@@ -2,7 +2,6 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
 
-
   <Design.PreviewWith>
     <Border Padding="10" Background="#1F1F1F" Width="200" Height="200">
       <StackPanel Spacing="10">
diff --git a/WalletWasabi.Fluent/Controls/NotificationCard.axaml b/WalletWasabi.Fluent/Controls/NotificationCard.axaml
index f639d69ad0..a414a36ba3 100644
--- a/WalletWasabi.Fluent/Controls/NotificationCard.axaml
+++ b/WalletWasabi.Fluent/Controls/NotificationCard.axaml
@@ -25,37 +25,37 @@
                     BorderThickness="2"
                     CornerRadius="{TemplateBinding CornerRadius}"
                     ClipToBounds="True">
-                <Panel>
+              <Panel>
 
-                  <!-- Content -->
-                  <ContentPresenter Name="PART_ContentPresenter" MinHeight="64" Content="{TemplateBinding Content}" />
+                <!-- Content -->
+                <ContentPresenter Name="PART_ContentPresenter" MinHeight="64" Content="{TemplateBinding Content}" />
 
-                  <!-- WARNING: corner radius must be original -1 for perfect rendering -->
-                  <Border CornerRadius="9"
-                          BorderThickness="0"
-                          ClipToBounds="True">
-                    <Panel>
+                <!-- WARNING: corner radius must be original -1 for perfect rendering -->
+                <Border CornerRadius="9"
+                        BorderThickness="0"
+                        ClipToBounds="True">
+                  <Panel>
 
-                      <!-- Close button -->
-                      <Button Theme="{StaticResource TransparentFunction}"
-                              CornerRadius="0 0 0 5"
-                              BorderThickness="0"
-                              Padding="0 4"
-                              HorizontalAlignment="Right" VerticalAlignment="Top">
-                        <Interaction.Behaviors>
-                          <NotificationCloseBehavior />
-                        </Interaction.Behaviors>
-                        <PathIcon Height="8" Opacity="0.4" Data="{StaticResource dismiss_light}" />
-                      </Button>
+                    <!-- Close button -->
+                    <Button Theme="{StaticResource TransparentFunction}"
+                            CornerRadius="0 0 0 5"
+                            BorderThickness="0"
+                            Padding="0 4"
+                            HorizontalAlignment="Right" VerticalAlignment="Top">
+                      <Interaction.Behaviors>
+                        <NotificationCloseBehavior />
+                      </Interaction.Behaviors>
+                      <PathIcon Height="8" Opacity="0.4" Data="{StaticResource dismiss_light}" />
+                    </Button>
 
-                      <!-- Timer bar -->
-                      <Panel x:Name="PART_TimerBar"
-                             Height="4"
-                             VerticalAlignment="Bottom"
-                             Background="{DynamicResource Layer2BackgroundBrushLight1}" />
-                    </Panel>
-                  </Border>
-                </Panel>
+                    <!-- Timer bar -->
+                    <Panel x:Name="PART_TimerBar"
+                           Height="4"
+                           VerticalAlignment="Bottom"
+                           Background="{DynamicResource Layer2BackgroundBrushLight1}" />
+                  </Panel>
+                </Border>
+              </Panel>
             </Border>
           </Border>
         </LayoutTransformControl>
diff --git a/WalletWasabi.Fluent/Controls/PreviewItem.axaml b/WalletWasabi.Fluent/Controls/PreviewItem.axaml
index 744e8829be..8d781ecb92 100644
--- a/WalletWasabi.Fluent/Controls/PreviewItem.axaml
+++ b/WalletWasabi.Fluent/Controls/PreviewItem.axaml
@@ -6,7 +6,7 @@
   <Design.PreviewWith>
     <Border Width="200">
       <PreviewItem Label="Transaction ID" Icon="{DynamicResource tor_icon}"
-                     CopyableContent="Text to copy" />
+                   CopyableContent="Text to copy" />
     </Border>
   </Design.PreviewWith>
 
@@ -19,17 +19,18 @@
                     Data="{TemplateBinding Icon}"
                     Margin="0 0 20 0"
                     Foreground="{DynamicResource SystemAccentCustomColorLight}"
-                    DockPanel.Dock="Left" IsVisible="{TemplateBinding Icon, Converter={x:Static ObjectConverters.IsNotNull}}" />
+                    DockPanel.Dock="Left"
+                    IsVisible="{TemplateBinding Icon, Converter={x:Static ObjectConverters.IsNotNull}}" />
           <DockPanel>
             <TextBlock Name="PART_Text" Text="{TemplateBinding Label}" DockPanel.Dock="Top" Margin="0 0 0 5"
                        Opacity="0.6"
-                       IsVisible="{Binding !!$self.Text}"/>
+                       IsVisible="{Binding !!$self.Text}" />
             <DockPanel HorizontalAlignment="Left" DockPanel.Dock="Bottom">
               <ClipboardCopyButton x:Name="PART_ClipboardCopyButton"
-                                     ToolTip.Tip="{x:Static lang:Resources.Copy}"
-                                     DockPanel.Dock="Right" Width="30"
-                                     Text="{Binding Path=CopyableContent, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static conv:StringConverters.AsString}}"
-                                     ShowCopyButton="{TemplateBinding IsCopyButtonVisible}" />
+                                   ToolTip.Tip="{x:Static lang:Resources.Copy}"
+                                   DockPanel.Dock="Right" Width="30"
+                                   Text="{Binding Path=CopyableContent, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static conv:StringConverters.AsString}}"
+                                   ShowCopyButton="{TemplateBinding IsCopyButtonVisible}" />
               <Panel>
                 <ContentPresenter Name="PART_ContentPresenter" Content="{TemplateBinding Content}"
                                   ContentTemplate="{TemplateBinding ContentTemplate}"
diff --git a/WalletWasabi.Fluent/Controls/PreviewMessageItem.axaml b/WalletWasabi.Fluent/Controls/PreviewMessageItem.axaml
index 8652719721..0623ddf3ab 100644
--- a/WalletWasabi.Fluent/Controls/PreviewMessageItem.axaml
+++ b/WalletWasabi.Fluent/Controls/PreviewMessageItem.axaml
@@ -1,12 +1,12 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:conv="using:WalletWasabi.Fluent.Converters"
-        xmlns:lang="clr-namespace:WalletWasabi.Lang;assembly=WalletWasabi">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:conv="using:WalletWasabi.Fluent.Converters"
+                    xmlns:lang="clr-namespace:WalletWasabi.Lang;assembly=WalletWasabi">
 
   <Design.PreviewWith>
     <Border Width="200">
       <PreviewMessageItem Label="Transaction ID" Icon="{DynamicResource tor_icon}"
-                     CopyableContent="Text to copy" />
+                          CopyableContent="Text to copy" />
     </Border>
   </Design.PreviewWith>
 
@@ -16,13 +16,13 @@
         <DockPanel Background="Transparent"
                    Margin="{TemplateBinding Margin}">
           <ClipboardCopyButton x:Name="PART_ClipboardCopyButton"
-                                 ToolTip.Tip="{x:Static lang:Resources.Copy}"
-                                 DockPanel.Dock="{TemplateBinding CopyButtonPlacement}"
-                                 Width="30"
-                                 Text="{Binding Path=CopyableContent, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static conv:StringConverters.AsString}}"
-                                 ShowCopyButton="{TemplateBinding IsCopyButtonVisible}"
-                                 VerticalAlignment="Center"
-                                 HorizontalAlignment="Center"/>
+                               ToolTip.Tip="{x:Static lang:Resources.Copy}"
+                               DockPanel.Dock="{TemplateBinding CopyButtonPlacement}"
+                               Width="30"
+                               Text="{Binding Path=CopyableContent, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static conv:StringConverters.AsString}}"
+                               ShowCopyButton="{TemplateBinding IsCopyButtonVisible}"
+                               VerticalAlignment="Center"
+                               HorizontalAlignment="Center" />
           <Button Classes="plain"
                   ToolTip.Tip="{x:Static lang:Resources.Edit}"
                   Command="{TemplateBinding EditCommand}"
@@ -83,7 +83,8 @@
     </Style>
 
     <!-- Transitions -->
-    <Style Selector="^/template/ ContentPresenter#PART_ContentPresenter,
+    <Style
+      Selector="^/template/ ContentPresenter#PART_ContentPresenter,
                    ^/template/ TextBlock#PART_ContentReplacementTextBlock">
       <Setter Property="Transitions">
         <Transitions>
@@ -91,11 +92,13 @@
         </Transitions>
       </Setter>
     </Style>
-    <Style Selector="^/template/ TextBlock#PART_ContentReplacementTextBlock[IsVisible=True],
+    <Style
+      Selector="^/template/ TextBlock#PART_ContentReplacementTextBlock[IsVisible=True],
                    ^/template/ ContentPresenter#PART_ContentPresenter[IsVisible=True]">
       <Setter Property="Opacity" Value="1" />
     </Style>
-    <Style Selector="^/template/ TextBlock#PART_ContentReplacementTextBlock[IsVisible=False],
+    <Style
+      Selector="^/template/ TextBlock#PART_ContentReplacementTextBlock[IsVisible=False],
                    ^/template/ ContentPresenter#PART_ContentPresenter[IsVisible=False]">
       <Setter Property="Opacity" Value="0" />
     </Style>
diff --git a/WalletWasabi.Fluent/Controls/PreviewMessageItem.axaml.cs b/WalletWasabi.Fluent/Controls/PreviewMessageItem.axaml.cs
index 430b171dbe..d1108ba4d6 100644
--- a/WalletWasabi.Fluent/Controls/PreviewMessageItem.axaml.cs
+++ b/WalletWasabi.Fluent/Controls/PreviewMessageItem.axaml.cs
@@ -117,9 +117,9 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
 		{
 			var isCopyButtonVisible =
 				button.CopyCommand
-				      .IsExecuting
-				      .CombineLatest(this.WhenAnyValue(x => x.IsPointerOver, x => x.CopyableContent, (a, b) => a && !string.IsNullOrWhiteSpace(b?.ToString())))
-				      .Select(x => x.First || x.Second);
+					.IsExecuting
+					.CombineLatest(this.WhenAnyValue(x => x.IsPointerOver, x => x.CopyableContent, (a, b) => a && !string.IsNullOrWhiteSpace(b?.ToString())))
+					.Select(x => x.First || x.Second);
 
 			Bind(IsCopyButtonVisibleProperty, isCopyButtonVisible);
 		}
diff --git a/WalletWasabi.Fluent/Controls/PrivacyBar.axaml b/WalletWasabi.Fluent/Controls/PrivacyBar.axaml
index df3aacfc68..9775d4f7d8 100644
--- a/WalletWasabi.Fluent/Controls/PrivacyBar.axaml
+++ b/WalletWasabi.Fluent/Controls/PrivacyBar.axaml
@@ -11,7 +11,7 @@
                 CornerRadius="{TemplateBinding CornerRadius}"
                 Padding="{TemplateBinding Padding}">
           <ItemsPresenter Name="PART_ItemsPresenter"
-                          ItemsPanel="{TemplateBinding ItemsPanel}"/>
+                          ItemsPanel="{TemplateBinding ItemsPanel}" />
         </Border>
       </ControlTemplate>
     </Setter>
diff --git a/WalletWasabi.Fluent/Controls/PrivacyContentControl.axaml b/WalletWasabi.Fluent/Controls/PrivacyContentControl.axaml
index d27e488fae..fec692c5bf 100644
--- a/WalletWasabi.Fluent/Controls/PrivacyContentControl.axaml
+++ b/WalletWasabi.Fluent/Controls/PrivacyContentControl.axaml
@@ -19,7 +19,8 @@
                             HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                             Background="Transparent" />
 
-          <Panel Name="PART_PrivacyReplacement" IsVisible="{Binding !IsContentRevealed^, RelativeSource={RelativeSource Mode=TemplatedParent}}"
+          <Panel Name="PART_PrivacyReplacement"
+                 IsVisible="{Binding !IsContentRevealed^, RelativeSource={RelativeSource Mode=TemplatedParent}}"
                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                  HorizontalAlignment="Stretch"
                  Background="Transparent">
@@ -27,7 +28,7 @@
               <PathIcon Data="{StaticResource eye_hide_regular}" />
             </Viewbox>
             <PrivacyTextPresenter Name="PART_PrivacyText"
-                                           MaxPrivacyChars="{TemplateBinding MaxPrivacyChars}"/>
+                                  MaxPrivacyChars="{TemplateBinding MaxPrivacyChars}" />
           </Panel>
         </Panel>
       </ControlTemplate>
@@ -56,14 +57,18 @@
 
     <!-- UseOpacity = true -->
     <Style Selector="^[UseOpacity=True] /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="Opacity" Value="{Binding IsContentRevealed^, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static conv:BoolOpacityConverters.BoolToOpacity}}" />
-      <Setter Property="IsEnabled" Value="{Binding IsContentRevealed^, RelativeSource={RelativeSource TemplatedParent}}" />
-      <Setter Property="IsHitTestVisible" Value="{Binding IsContentRevealed^, RelativeSource={RelativeSource TemplatedParent}}" />
+      <Setter Property="Opacity"
+              Value="{Binding IsContentRevealed^, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static conv:BoolOpacityConverters.BoolToOpacity}}" />
+      <Setter Property="IsEnabled"
+              Value="{Binding IsContentRevealed^, RelativeSource={RelativeSource TemplatedParent}}" />
+      <Setter Property="IsHitTestVisible"
+              Value="{Binding IsContentRevealed^, RelativeSource={RelativeSource TemplatedParent}}" />
     </Style>
 
     <!-- UseOpacity = false -->
     <Style Selector="^[UseOpacity=False] /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="IsVisible" Value="{Binding IsContentRevealed^, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
+      <Setter Property="IsVisible"
+              Value="{Binding IsContentRevealed^, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
     </Style>
 
   </ControlTheme>
diff --git a/WalletWasabi.Fluent/Controls/PrivacyContentControl.axaml.cs b/WalletWasabi.Fluent/Controls/PrivacyContentControl.axaml.cs
index 6a6b010399..5a2e6d6c28 100644
--- a/WalletWasabi.Fluent/Controls/PrivacyContentControl.axaml.cs
+++ b/WalletWasabi.Fluent/Controls/PrivacyContentControl.axaml.cs
@@ -4,7 +4,6 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using ReactiveUI;
-using WalletWasabi.Daemon;
 using WalletWasabi.Fluent.Helpers;
 using WalletWasabi.Fluent.Models.UI;
 
diff --git a/WalletWasabi.Fluent/Controls/ProgressRingArc.axaml.cs b/WalletWasabi.Fluent/Controls/ProgressRingArc.axaml.cs
index fe5dbe25e9..8f30b16248 100644
--- a/WalletWasabi.Fluent/Controls/ProgressRingArc.axaml.cs
+++ b/WalletWasabi.Fluent/Controls/ProgressRingArc.axaml.cs
@@ -177,10 +177,10 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs e)
 		base.OnPropertyChanged(e);
 
 		if (e.Property == SegmentColorProperty ||
-			e.Property == StrokeThicknessProperty ||
-			e.Property == PercentageProperty ||
-			e.Property == StrokeBorderThicknessProperty ||
-			e.Property == PercentageProperty)
+		    e.Property == StrokeThicknessProperty ||
+		    e.Property == PercentageProperty ||
+		    e.Property == StrokeBorderThicknessProperty ||
+		    e.Property == PercentageProperty)
 		{
 			ShowArc = Percentage > 0;
 			ShowSegmentBorder = StrokeBorderThickness != 0;
@@ -221,7 +221,7 @@ private void RenderArc()
 		PathFigureStartPoint = startPoint;
 
 		if (Math.Abs(startPoint.X - Math.Round(endPoint.X)) < 0.01 &&
-			Math.Abs(startPoint.Y - Math.Round(endPoint.Y)) < 0.01)
+		    Math.Abs(startPoint.Y - Math.Round(endPoint.Y)) < 0.01)
 		{
 			endPoint -= new Point(0.01, 0);
 		}
diff --git a/WalletWasabi.Fluent/Controls/ScrollBar.axaml b/WalletWasabi.Fluent/Controls/ScrollBar.axaml
index 62a41b0d32..940ac825df 100644
--- a/WalletWasabi.Fluent/Controls/ScrollBar.axaml
+++ b/WalletWasabi.Fluent/Controls/ScrollBar.axaml
@@ -10,26 +10,30 @@
     <Border Padding="20">
       <StackPanel Orientation="Horizontal" Spacing="20">
         <StackPanel Spacing="20">
-          <ScrollBar Orientation="Horizontal" AllowAutoHide="False" VerticalAlignment="Center" Width="150"/>
-          <ScrollBar Orientation="Horizontal" AllowAutoHide="False" VerticalAlignment="Center" Width="150" IsEnabled="False"/>
-          <ScrollBar Orientation="Horizontal" AllowAutoHide="True" VerticalAlignment="Center" Width="150"/>
-          <ScrollBar Orientation="Horizontal" AllowAutoHide="True" VerticalAlignment="Center" Width="150" IsEnabled="False"/>
+          <ScrollBar Orientation="Horizontal" AllowAutoHide="False" VerticalAlignment="Center" Width="150" />
+          <ScrollBar Orientation="Horizontal" AllowAutoHide="False" VerticalAlignment="Center" Width="150"
+                     IsEnabled="False" />
+          <ScrollBar Orientation="Horizontal" AllowAutoHide="True" VerticalAlignment="Center" Width="150" />
+          <ScrollBar Orientation="Horizontal" AllowAutoHide="True" VerticalAlignment="Center" Width="150"
+                     IsEnabled="False" />
         </StackPanel>
-        <ScrollBar Orientation="Vertical" AllowAutoHide="False" HorizontalAlignment="Center" Height="150"/>
-        <ScrollBar Orientation="Vertical" AllowAutoHide="False" HorizontalAlignment="Center" Height="150" IsEnabled="False"/>
-        <ScrollBar Orientation="Vertical" AllowAutoHide="True" HorizontalAlignment="Center" Height="150"/>
-        <ScrollBar Orientation="Vertical" AllowAutoHide="True" HorizontalAlignment="Center" Height="150" IsEnabled="False"/>
+        <ScrollBar Orientation="Vertical" AllowAutoHide="False" HorizontalAlignment="Center" Height="150" />
+        <ScrollBar Orientation="Vertical" AllowAutoHide="False" HorizontalAlignment="Center" Height="150"
+                   IsEnabled="False" />
+        <ScrollBar Orientation="Vertical" AllowAutoHide="True" HorizontalAlignment="Center" Height="150" />
+        <ScrollBar Orientation="Vertical" AllowAutoHide="True" HorizontalAlignment="Center" Height="150"
+                   IsEnabled="False" />
       </StackPanel>
     </Border>
   </Design.PreviewWith>
 
   <ControlTheme x:Key="FluentScrollBarThumb" TargetType="Thumb">
-    <Setter Property="Background" Value="{DynamicResource ScrollBarPanningThumbBackground}"/>
+    <Setter Property="Background" Value="{DynamicResource ScrollBarPanningThumbBackground}" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate>
           <Border Background="{TemplateBinding Background}"
-							CornerRadius="{TemplateBinding CornerRadius}"/>
+                  CornerRadius="{TemplateBinding CornerRadius}" />
         </ControlTemplate>
       </Setter.Value>
     </Setter>
@@ -65,13 +69,13 @@
 
   <ControlTheme x:Key="FluentScrollBarLineButton" TargetType="RepeatButton">
     <Setter Property="Opacity" Value="0" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource ScrollBarButtonArrowForeground}"/>
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource ScrollBarButtonArrowForeground}" />
     <Setter Property="Template">
       <ControlTemplate>
         <ContentPresenter x:Name="PART_ContentPresenter"
-								  Background="{DynamicResource ScrollBarButtonBackground}"
-								  BorderBrush="{DynamicResource ScrollBarButtonBorderBrush}"
-								  Content="{TemplateBinding Content}"/>
+                          Background="{DynamicResource ScrollBarButtonBackground}"
+                          BorderBrush="{DynamicResource ScrollBarButtonBorderBrush}"
+                          Content="{TemplateBinding Content}" />
       </ControlTemplate>
     </Setter>
     <Setter Property="Transitions">
@@ -81,27 +85,27 @@
     </Setter>
 
     <Style Selector="^:pointerover">
-      <Setter Property="TextElement.Foreground" Value="{DynamicResource ScrollBarButtonArrowForegroundPointerOver}"/>
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource ScrollBarButtonArrowForegroundPointerOver}" />
 
-      <Style Selector="^ /template/ ContentPresenter" >
+      <Style Selector="^ /template/ ContentPresenter">
         <Setter Property="Background" Value="{DynamicResource ScrollBarButtonBackgroundPointerOver}" />
         <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarButtonBorderBrushPointerOver}" />
       </Style>
     </Style>
 
     <Style Selector="^:pressed">
-      <Setter Property="TextElement.Foreground" Value="{DynamicResource ScrollBarButtonArrowForegroundPressed}"/>
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource ScrollBarButtonArrowForegroundPressed}" />
 
-      <Style Selector="^ /template/ ContentPresenter" >
+      <Style Selector="^ /template/ ContentPresenter">
         <Setter Property="Background" Value="{DynamicResource ScrollBarButtonBackgroundPressed}" />
         <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarButtonBorderBrushPressed}" />
       </Style>
     </Style>
 
     <Style Selector="^:disabled">
-      <Setter Property="TextElement.Foreground" Value="{DynamicResource ScrollBarButtonArrowForegroundDisabled}"/>
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource ScrollBarButtonArrowForegroundDisabled}" />
 
-      <Style Selector="^ /template/ ContentPresenter" >
+      <Style Selector="^ /template/ ContentPresenter">
         <Setter Property="Background" Value="{DynamicResource ScrollBarButtonBackgroundDisabled}" />
         <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarButtonBorderBrushDisabled}" />
       </Style>
@@ -120,7 +124,7 @@
       <Setter Property="Template">
         <ControlTemplate>
           <Panel ClipToBounds="False">
-            <Border x:Name="Hitbox" Margin="-4" Background="Transparent"/>
+            <Border x:Name="Hitbox" Margin="-4" Background="Transparent" />
             <Grid x:Name="Root">
               <Border x:Name="VerticalRoot"
                       Background="{TemplateBinding Background}"
@@ -203,7 +207,7 @@
       <Setter Property="Template">
         <ControlTemplate>
           <Panel>
-            <Border x:Name="Hitbox" Margin="-4" Background="Transparent"/>
+            <Border x:Name="Hitbox" Margin="-4" Background="Transparent" />
             <Grid x:Name="Root">
               <Border x:Name="HorizontalRoot"
                       Background="{TemplateBinding Background}"
diff --git a/WalletWasabi.Fluent/Controls/SearchBarPopup.cs b/WalletWasabi.Fluent/Controls/SearchBarPopup.cs
index 12b4627c07..0f10be0663 100644
--- a/WalletWasabi.Fluent/Controls/SearchBarPopup.cs
+++ b/WalletWasabi.Fluent/Controls/SearchBarPopup.cs
@@ -6,121 +6,121 @@
 
 namespace WalletWasabi.Fluent.Controls
 {
-    public class SearchBarPopup : Popup
-    {
-        public static readonly StyledProperty<bool> IsCustomOpenProperty =
-            AvaloniaProperty.Register<SearchBarPopup, bool>(nameof(IsCustomOpen));
+	public class SearchBarPopup : Popup
+	{
+		public static readonly StyledProperty<bool> IsCustomOpenProperty =
+			AvaloniaProperty.Register<SearchBarPopup, bool>(nameof(IsCustomOpen));
 
-        public bool IsCustomOpen
-        {
-            get => GetValue(IsCustomOpenProperty);
-            set => SetValue(IsCustomOpenProperty, value);
-        }
+		public bool IsCustomOpen
+		{
+			get => GetValue(IsCustomOpenProperty);
+			set => SetValue(IsCustomOpenProperty, value);
+		}
 
-        private const double AllowedMaxHeight = 512;
-        private const double AllowedMaxWidth = 456;
+		private const double AllowedMaxHeight = 512;
+		private const double AllowedMaxWidth = 456;
 
-        private Animation? _expandAnimation = new()
-        {
-            Easing = Easing.Parse("0.4,0,0.6,1"),
-            Duration = TimeSpan.FromMilliseconds(200),
-            Children =
-            {
-                new KeyFrame
-                {
-                    Setters =
-                    {
-                        new Setter(MaxHeightProperty, 0.0),
-                        new Setter(MaxWidthProperty, 0.0),
-                    },
-                    Cue = new Cue(0)
-                },
-                new KeyFrame
-                {
-	                Setters =
-	                {
-		                new Setter(MaxHeightProperty, AllowedMaxHeight * 0.75),
-		                new Setter(MaxWidthProperty, AllowedMaxWidth * 0.75),
-	                },
-	                Cue = new Cue(0.1)
-                },
-                new KeyFrame
-                {
-                    Setters =
-                    {
-                        new Setter(MaxHeightProperty, AllowedMaxHeight),
-                        new Setter(MaxWidthProperty, AllowedMaxWidth),
-                    },
-                    Cue = new Cue(1)
-                },
-            }
-        };
+		private Animation? _expandAnimation = new()
+		{
+			Easing = Easing.Parse("0.4,0,0.6,1"),
+			Duration = TimeSpan.FromMilliseconds(200),
+			Children =
+			{
+				new KeyFrame
+				{
+					Setters =
+					{
+						new Setter(MaxHeightProperty, 0.0),
+						new Setter(MaxWidthProperty, 0.0),
+					},
+					Cue = new Cue(0)
+				},
+				new KeyFrame
+				{
+					Setters =
+					{
+						new Setter(MaxHeightProperty, AllowedMaxHeight * 0.75),
+						new Setter(MaxWidthProperty, AllowedMaxWidth * 0.75),
+					},
+					Cue = new Cue(0.1)
+				},
+				new KeyFrame
+				{
+					Setters =
+					{
+						new Setter(MaxHeightProperty, AllowedMaxHeight),
+						new Setter(MaxWidthProperty, AllowedMaxWidth),
+					},
+					Cue = new Cue(1)
+				},
+			}
+		};
 
-        private Animation? _collapseAnimation = new()
-        {
-            Easing = Easing.Parse("0.4,0,0.6,1"),
-            Duration = TimeSpan.FromMilliseconds(200),
-            Children =
-            {
-                new KeyFrame
-                {
-                    Setters =
-                    {
-                        new Setter(MaxHeightProperty, AllowedMaxHeight),
-                        new Setter(MaxWidthProperty, AllowedMaxWidth),
-                    },
-                    Cue = new Cue(0)
-                },
-                new KeyFrame
-                {
-	                Setters =
-	                {
-		                new Setter(MaxHeightProperty, AllowedMaxHeight * 0.25),
-		                new Setter(MaxWidthProperty, AllowedMaxWidth * 0.25),
-	                },
-	                Cue = new Cue(0.9)
-                },
-                new KeyFrame
-                {
-                    Setters =
-                    {
-                        new Setter(MaxHeightProperty, 0.0),
-                        new Setter(MaxWidthProperty, 0.0),
-                    },
-                    Cue = new Cue(1)
-                },
-            }
-        };
+		private Animation? _collapseAnimation = new()
+		{
+			Easing = Easing.Parse("0.4,0,0.6,1"),
+			Duration = TimeSpan.FromMilliseconds(200),
+			Children =
+			{
+				new KeyFrame
+				{
+					Setters =
+					{
+						new Setter(MaxHeightProperty, AllowedMaxHeight),
+						new Setter(MaxWidthProperty, AllowedMaxWidth),
+					},
+					Cue = new Cue(0)
+				},
+				new KeyFrame
+				{
+					Setters =
+					{
+						new Setter(MaxHeightProperty, AllowedMaxHeight * 0.25),
+						new Setter(MaxWidthProperty, AllowedMaxWidth * 0.25),
+					},
+					Cue = new Cue(0.9)
+				},
+				new KeyFrame
+				{
+					Setters =
+					{
+						new Setter(MaxHeightProperty, 0.0),
+						new Setter(MaxWidthProperty, 0.0),
+					},
+					Cue = new Cue(1)
+				},
+			}
+		};
 
-        protected async override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
-        {
-            base.OnPropertyChanged(change);
+		protected async override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+		{
+			base.OnPropertyChanged(change);
 
-            if (change.Property == IsCustomOpenProperty && change.NewValue is bool isCustomOpen)
-            {
-                if (isCustomOpen)
-                {
-                    IsOpen = true;
+			if (change.Property == IsCustomOpenProperty && change.NewValue is bool isCustomOpen)
+			{
+				if (isCustomOpen)
+				{
+					IsOpen = true;
 
-                    if (_expandAnimation != null)
-                    {
-                        await _expandAnimation.RunAsync(this);
-                        MaxHeight = AllowedMaxHeight;
-                        MaxWidth = AllowedMaxWidth;
-                    }
-                }
-                else
-                {
-                    if (_collapseAnimation != null)
-                    {
-                        await _collapseAnimation.RunAsync(this);
-                        MaxHeight = 0;
-                        MaxWidth = 0;
-                    }
+					if (_expandAnimation != null)
+					{
+						await _expandAnimation.RunAsync(this);
+						MaxHeight = AllowedMaxHeight;
+						MaxWidth = AllowedMaxWidth;
+					}
+				}
+				else
+				{
+					if (_collapseAnimation != null)
+					{
+						await _collapseAnimation.RunAsync(this);
+						MaxHeight = 0;
+						MaxWidth = 0;
+					}
 
-                    IsOpen = false;
-                }
-            }
-        }
-    }
+					IsOpen = false;
+				}
+			}
+		}
+	}
 }
diff --git a/WalletWasabi.Fluent/Controls/Sorting/SortControl.axaml b/WalletWasabi.Fluent/Controls/Sorting/SortControl.axaml
index 1a13c02006..c2907a110d 100644
--- a/WalletWasabi.Fluent/Controls/Sorting/SortControl.axaml
+++ b/WalletWasabi.Fluent/Controls/Sorting/SortControl.axaml
@@ -1,8 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:behaviors="clr-namespace:WalletWasabi.Fluent.Behaviors"
-        xmlns:generic="clr-namespace:System.Collections.Generic;assembly=System.Collections"
-        xmlns:sorting="clr-namespace:WalletWasabi.Fluent.Controls.Sorting">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:behaviors="clr-namespace:WalletWasabi.Fluent.Behaviors"
+                    xmlns:generic="clr-namespace:System.Collections.Generic;assembly=System.Collections"
+                    xmlns:sorting="clr-namespace:WalletWasabi.Fluent.Controls.Sorting">
   <Design.PreviewWith>
     <sorting:SortControl Width="110">
       <sorting:SortControl.Sortables>
diff --git a/WalletWasabi.Fluent/Controls/Spectrum/SpectrumControl.cs b/WalletWasabi.Fluent/Controls/Spectrum/SpectrumControl.cs
index 457e2d9450..812a3cecee 100644
--- a/WalletWasabi.Fluent/Controls/Spectrum/SpectrumControl.cs
+++ b/WalletWasabi.Fluent/Controls/Spectrum/SpectrumControl.cs
@@ -81,62 +81,62 @@ public override void Render(DrawingContext context)
 		_state.Render(context);
 	}
 #else
-    protected override void OnLoaded(RoutedEventArgs routedEventArgs)
-    {
-        base.OnLoaded(routedEventArgs);
-
-        var elemVisual = ElementComposition.GetElementVisual(this);
-        var compositor = elemVisual?.Compositor;
-        if (compositor is null)
-        {
-            return;
-        }
-
-        _customVisual = compositor.CreateCustomVisual(new DrawCompositionCustomVisualHandler());
-        ElementComposition.SetElementChildVisual(this, _customVisual);
-
-        LayoutUpdated += OnLayoutUpdated;
-
-        _customVisual.Size = new Vector2((float)Bounds.Size.Width, (float)Bounds.Size.Height);
-        _customVisual.SendHandlerMessage(new DrawPayload(HandlerCommand.Update, _spectrumDrawHandler));
-
-        // TODO: Start();
-    }
-
-    protected override void OnUnloaded(RoutedEventArgs routedEventArgs)
-    {
-        base.OnUnloaded(routedEventArgs);
-
-        LayoutUpdated -= OnLayoutUpdated;
-
-        Stop();
-        DisposeImpl();
-    }
-
-    private void OnLayoutUpdated(object? sender, EventArgs e)
-    {
-        if (_customVisual == null)
-        {
-            return;
-        }
-
-        _customVisual.Size = new Vector2((float)Bounds.Size.Width, (float)Bounds.Size.Height);
-        _customVisual.SendHandlerMessage(new DrawPayload(HandlerCommand.Update, _spectrumDrawHandler, Bounds));
-    }
-
-    public void Start()
-    {
-        _customVisual?.SendHandlerMessage(new DrawPayload(HandlerCommand.Start, _spectrumDrawHandler, Bounds));
-    }
-
-    public void Stop()
-    {
-        _customVisual?.SendHandlerMessage(new DrawPayload(HandlerCommand.Stop));
-    }
-
-    private void DisposeImpl()
-    {
-        _customVisual?.SendHandlerMessage(new DrawPayload(HandlerCommand.Dispose));
-    }
+	protected override void OnLoaded(RoutedEventArgs routedEventArgs)
+	{
+		base.OnLoaded(routedEventArgs);
+
+		var elemVisual = ElementComposition.GetElementVisual(this);
+		var compositor = elemVisual?.Compositor;
+		if (compositor is null)
+		{
+			return;
+		}
+
+		_customVisual = compositor.CreateCustomVisual(new DrawCompositionCustomVisualHandler());
+		ElementComposition.SetElementChildVisual(this, _customVisual);
+
+		LayoutUpdated += OnLayoutUpdated;
+
+		_customVisual.Size = new Vector2((float)Bounds.Size.Width, (float)Bounds.Size.Height);
+		_customVisual.SendHandlerMessage(new DrawPayload(HandlerCommand.Update, _spectrumDrawHandler));
+
+		// TODO: Start();
+	}
+
+	protected override void OnUnloaded(RoutedEventArgs routedEventArgs)
+	{
+		base.OnUnloaded(routedEventArgs);
+
+		LayoutUpdated -= OnLayoutUpdated;
+
+		Stop();
+		DisposeImpl();
+	}
+
+	private void OnLayoutUpdated(object? sender, EventArgs e)
+	{
+		if (_customVisual == null)
+		{
+			return;
+		}
+
+		_customVisual.Size = new Vector2((float)Bounds.Size.Width, (float)Bounds.Size.Height);
+		_customVisual.SendHandlerMessage(new DrawPayload(HandlerCommand.Update, _spectrumDrawHandler, Bounds));
+	}
+
+	public void Start()
+	{
+		_customVisual?.SendHandlerMessage(new DrawPayload(HandlerCommand.Start, _spectrumDrawHandler, Bounds));
+	}
+
+	public void Stop()
+	{
+		_customVisual?.SendHandlerMessage(new DrawPayload(HandlerCommand.Stop));
+	}
+
+	private void DisposeImpl()
+	{
+		_customVisual?.SendHandlerMessage(new DrawPayload(HandlerCommand.Dispose));
+	}
 #endif
 }
diff --git a/WalletWasabi.Fluent/Controls/Spectrum/SpectrumDrawHandler.cs b/WalletWasabi.Fluent/Controls/Spectrum/SpectrumDrawHandler.cs
index 5142aab767..a1e5fb1327 100644
--- a/WalletWasabi.Fluent/Controls/Spectrum/SpectrumDrawHandler.cs
+++ b/WalletWasabi.Fluent/Controls/Spectrum/SpectrumDrawHandler.cs
@@ -1,6 +1,5 @@
 using System.Linq;
 using Avalonia;
-using Avalonia.Media;
 using Avalonia.Skia;
 using Avalonia.Threading;
 using SkiaSharp;
diff --git a/WalletWasabi.Fluent/Controls/Spectrum/SpectrumDrawOperation.cs b/WalletWasabi.Fluent/Controls/Spectrum/SpectrumDrawOperation.cs
index ac25fb0953..492c996389 100644
--- a/WalletWasabi.Fluent/Controls/Spectrum/SpectrumDrawOperation.cs
+++ b/WalletWasabi.Fluent/Controls/Spectrum/SpectrumDrawOperation.cs
@@ -34,6 +34,7 @@ void ICustomDrawOperation.Render(ImmediateDrawingContext context)
 		{
 			return;
 		}
+
 		_draw(skia, Bounds);
 	}
 }
diff --git a/WalletWasabi.Fluent/Controls/SplitButton.axaml b/WalletWasabi.Fluent/Controls/SplitButton.axaml
index a1478a7073..e66a460666 100644
--- a/WalletWasabi.Fluent/Controls/SplitButton.axaml
+++ b/WalletWasabi.Fluent/Controls/SplitButton.axaml
@@ -1,15 +1,17 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:converters="using:Avalonia.Controls.Converters"
-      x:ClassModifier="internal">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="using:Avalonia.Controls.Converters"
+                    x:ClassModifier="internal">
 
   <x:Double x:Key="SplitButtonPrimaryButtonSize">24</x:Double>
   <x:Double x:Key="SplitButtonSecondaryButtonSize">20</x:Double>
   <x:Double x:Key="SplitButtonSeparatorWidth">1</x:Double>
   <x:Double x:Key="SplitButtonMinHeight">32</x:Double>
 
-  <converters:MarginMultiplierConverter x:Key="PrimaryButtonBorderMultiplier" Left="True" Top="True" Bottom="True" Indent="0" />
-  <converters:MarginMultiplierConverter x:Key="SecondaryButtonBorderMultiplier" Right="True" Top="True" Bottom="True" Indent="0" />
+  <converters:MarginMultiplierConverter x:Key="PrimaryButtonBorderMultiplier" Left="True" Top="True" Bottom="True"
+                                        Indent="0" />
+  <converters:MarginMultiplierConverter x:Key="SecondaryButtonBorderMultiplier" Right="True" Top="True" Bottom="True"
+                                        Indent="0" />
   <converters:MarginMultiplierConverter x:Key="SeparatorBorderMultiplier" Top="True" Bottom="True" Indent="0" />
 
   <ControlTheme x:Key="{x:Type SplitButton}" TargetType="SplitButton">
@@ -133,7 +135,7 @@
             <Flyout>Hello</Flyout>
           </ToggleSplitButton.Flyout>
         </ToggleSplitButton>
-        <ToggleSplitButton Content="Checked Disabled" IsChecked="True" IsEnabled="False"/>
+        <ToggleSplitButton Content="Checked Disabled" IsChecked="True" IsEnabled="False" />
         <SplitButton Content="ActionSplitButton" Theme="{StaticResource FunctionSplitButton}">
           <SplitButton.Flyout>
             <Flyout>
diff --git a/WalletWasabi.Fluent/Controls/StatusItem.axaml b/WalletWasabi.Fluent/Controls/StatusItem.axaml
index 628458b37e..45992d9525 100644
--- a/WalletWasabi.Fluent/Controls/StatusItem.axaml
+++ b/WalletWasabi.Fluent/Controls/StatusItem.axaml
@@ -18,7 +18,8 @@
       <ControlTemplate>
         <Grid ColumnDefinitions="Auto,*"
               RowDefinitions="Auto,Auto">
-          <Viewbox Stretch="UniformToFill" Height="13" Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0 0 8 0">
+          <Viewbox Stretch="UniformToFill" Height="13" Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left"
+                   VerticalAlignment="Center" Margin="0 0 8 0">
             <ContentPresenter Content="{TemplateBinding Icon}" />
           </Viewbox>
           <TextBlock Grid.Column="1" Grid.Row="0" Text="{TemplateBinding Title}" VerticalAlignment="Center" />
diff --git a/WalletWasabi.Fluent/Controls/SubActionButton.axaml b/WalletWasabi.Fluent/Controls/SubActionButton.axaml
index f2efe9f099..212ef59c62 100644
--- a/WalletWasabi.Fluent/Controls/SubActionButton.axaml
+++ b/WalletWasabi.Fluent/Controls/SubActionButton.axaml
@@ -66,7 +66,9 @@
             <SplitButton.ContentTemplate>
               <DataTemplate>
                 <DockPanel>
-                  <PathIcon Foreground="{Binding $parent[SubActionButton].Foreground}" x:Name="PART_Icon" Margin="0 0 10 0" Data="{Binding $parent[SubActionButton].Icon}" IsVisible="{Binding !!$parent[SubActionButton].Icon}" />
+                  <PathIcon Foreground="{Binding $parent[SubActionButton].Foreground}" x:Name="PART_Icon"
+                            Margin="0 0 10 0" Data="{Binding $parent[SubActionButton].Icon}"
+                            IsVisible="{Binding !!$parent[SubActionButton].Icon}" />
                   <ContentControl VerticalAlignment="Center" Content="{Binding $parent[SubActionButton].Content}" />
                 </DockPanel>
               </DataTemplate>
diff --git a/WalletWasabi.Fluent/Controls/SuggestionItem.axaml b/WalletWasabi.Fluent/Controls/SuggestionItem.axaml
index b8c52cbb9d..b9b2c90160 100644
--- a/WalletWasabi.Fluent/Controls/SuggestionItem.axaml
+++ b/WalletWasabi.Fluent/Controls/SuggestionItem.axaml
@@ -29,14 +29,14 @@
           </Border>
           <Border Name="PART_MainContentBorder">
             <ContentPresenter Name="PART_ContentPresenter"
-                            ClipToBounds="{TemplateBinding ClipToBounds}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            Padding="{TemplateBinding Padding}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                              ClipToBounds="{TemplateBinding ClipToBounds}"
+                              BorderBrush="{TemplateBinding BorderBrush}"
+                              BorderThickness="{TemplateBinding BorderThickness}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Content="{TemplateBinding Content}"
+                              Padding="{TemplateBinding Padding}"
+                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
           </Border>
         </Panel>
       </ControlTemplate>
diff --git a/WalletWasabi.Fluent/Controls/TagControl.axaml b/WalletWasabi.Fluent/Controls/TagControl.axaml
index d65c07c111..154d4f6228 100644
--- a/WalletWasabi.Fluent/Controls/TagControl.axaml
+++ b/WalletWasabi.Fluent/Controls/TagControl.axaml
@@ -54,7 +54,8 @@
             <Button.Transitions>
               <Transitions>
                 <DoubleTransition Property="Opacity" Duration="0:0:0.135" Easing="{StaticResource FluentEasing}" />
-                <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.135" Easing="{StaticResource FluentEasing}" />
+                <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.135"
+                                               Easing="{StaticResource FluentEasing}" />
               </Transitions>
             </Button.Transitions>
           </Button>
diff --git a/WalletWasabi.Fluent/Controls/TagsBox.axaml b/WalletWasabi.Fluent/Controls/TagsBox.axaml
index 723fbef825..cb6032d12a 100644
--- a/WalletWasabi.Fluent/Controls/TagsBox.axaml
+++ b/WalletWasabi.Fluent/Controls/TagsBox.axaml
@@ -1,8 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:generic="clr-namespace:System.Collections.Generic;assembly=System.Collections"
-        xmlns:system="clr-namespace:System;assembly=System.Runtime"
-        >
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:generic="clr-namespace:System.Collections.Generic;assembly=System.Collections"
+                    xmlns:system="clr-namespace:System;assembly=System.Runtime">
 
   <Design.PreviewWith>
     <StackPanel Spacing="4" Width="300">
@@ -16,7 +15,7 @@
         </TagsBox.Items>
       </TagsBox>
 
-      <TextBox Text="{Binding $self.Bounds.Height}"/>
+      <TextBox Text="{Binding $self.Bounds.Height}" />
       <TagsBox Watermark="{Binding $self.Bounds.Height}" />
 
       <TagsBox Watermark="Test watermark" />
@@ -40,71 +39,71 @@
     <Setter Property="IsTabStop" Value="False" />
     <Setter Property="Template">
       <ControlTemplate>
-          <DockPanel x:Name="PART_DockPanel">
-            <DataValidationErrors DockPanel.Dock="Bottom" />
-            <ItemsControl ItemsSource="{TemplateBinding TopItems}"
-                          IsVisible="{TemplateBinding TopItems, Converter={x:Static ObjectConverters.IsNotNull}}"
-                          ClipToBounds="False"
-                          Margin="15,2,0,0"
-                          DockPanel.Dock="Bottom">
-              <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                  <WrapPanel Orientation="Horizontal" />
-                </ItemsPanelTemplate>
-              </ItemsControl.ItemsPanel>
-              <ItemsControl.ItemTemplate>
-                <DataTemplate>
-                  <PrivacyContentControl Margin="0,0,6,0">
-                    <Button Classes="activeHyperLink"
-                            Focusable="False"
-                            Content="{Binding}"
-                            Command="{Binding $parent[TagsBox].AddTag}"
-                            CommandParameter="{Binding }"
-                            x:CompileBindings="False" />
-                  </PrivacyContentControl>
-                </DataTemplate>
-              </ItemsControl.ItemTemplate>
-            </ItemsControl>
-            <Border x:Name="PART_Border" Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Padding="{TemplateBinding Padding}"
-                    CornerRadius="{TemplateBinding CornerRadius}">
-              <Panel>
-                <TextBlock Name="PART_Watermark"
-                           Opacity="0.5"
-                           VerticalAlignment="Center"
-                           Margin="0"
-                           Text="{TemplateBinding Watermark}" />
-                <ItemsControl Name="PART_ItemsPresenter"
-                              ItemsSource="{TemplateBinding Items}"
-                              ClipToBounds="False"
-                              Focusable="False">
-                  <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                      <ConcatenatingWrapPanel Focusable="False" VerticalAlignment="Center"
-                                              Margin="0 3 0 0">
-                        <ConcatenatingWrapPanel.ConcatenatedChildren>
-                          <TagsBoxAutoCompleteBox x:Name="PART_AutoCompleteBox"
-                                                    ItemsSource="{Binding $parent[TagsBox].Suggestions}"
-                                                    FilterMode="StartsWith" Theme="{StaticResource TagsBoxAutoCompleteBox}"
-                                                    Margin="0 -4 0 -3"
-                                                    Padding="0 10 0 8"/>
-                        </ConcatenatingWrapPanel.ConcatenatedChildren>
-                      </ConcatenatingWrapPanel>
-                    </ItemsPanelTemplate>
-                  </ItemsControl.ItemsPanel>
-                  <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                      <TagControl Content="{Binding .}"
-                                    EnableCounter="{Binding $parent[TagsBox].EnableCounter}"
-                                    EnableDelete="{Binding $parent[TagsBox].EnableDelete}" />
-                    </DataTemplate>
-                  </ItemsControl.ItemTemplate>
-                </ItemsControl>
-              </Panel>
-            </Border>
-          </DockPanel>
+        <DockPanel x:Name="PART_DockPanel">
+          <DataValidationErrors DockPanel.Dock="Bottom" />
+          <ItemsControl ItemsSource="{TemplateBinding TopItems}"
+                        IsVisible="{TemplateBinding TopItems, Converter={x:Static ObjectConverters.IsNotNull}}"
+                        ClipToBounds="False"
+                        Margin="15,2,0,0"
+                        DockPanel.Dock="Bottom">
+            <ItemsControl.ItemsPanel>
+              <ItemsPanelTemplate>
+                <WrapPanel Orientation="Horizontal" />
+              </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ItemsControl.ItemTemplate>
+              <DataTemplate>
+                <PrivacyContentControl Margin="0,0,6,0">
+                  <Button Classes="activeHyperLink"
+                          Focusable="False"
+                          Content="{Binding}"
+                          Command="{Binding $parent[TagsBox].AddTag}"
+                          CommandParameter="{Binding }"
+                          x:CompileBindings="False" />
+                </PrivacyContentControl>
+              </DataTemplate>
+            </ItemsControl.ItemTemplate>
+          </ItemsControl>
+          <Border x:Name="PART_Border" Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  Padding="{TemplateBinding Padding}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Panel>
+              <TextBlock Name="PART_Watermark"
+                         Opacity="0.5"
+                         VerticalAlignment="Center"
+                         Margin="0"
+                         Text="{TemplateBinding Watermark}" />
+              <ItemsControl Name="PART_ItemsPresenter"
+                            ItemsSource="{TemplateBinding Items}"
+                            ClipToBounds="False"
+                            Focusable="False">
+                <ItemsControl.ItemsPanel>
+                  <ItemsPanelTemplate>
+                    <ConcatenatingWrapPanel Focusable="False" VerticalAlignment="Center"
+                                            Margin="0 3 0 0">
+                      <ConcatenatingWrapPanel.ConcatenatedChildren>
+                        <TagsBoxAutoCompleteBox x:Name="PART_AutoCompleteBox"
+                                                ItemsSource="{Binding $parent[TagsBox].Suggestions}"
+                                                FilterMode="StartsWith" Theme="{StaticResource TagsBoxAutoCompleteBox}"
+                                                Margin="0 -4 0 -3"
+                                                Padding="0 10 0 8" />
+                      </ConcatenatingWrapPanel.ConcatenatedChildren>
+                    </ConcatenatingWrapPanel>
+                  </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+                <ItemsControl.ItemTemplate>
+                  <DataTemplate>
+                    <TagControl Content="{Binding .}"
+                                EnableCounter="{Binding $parent[TagsBox].EnableCounter}"
+                                EnableDelete="{Binding $parent[TagsBox].EnableDelete}" />
+                  </DataTemplate>
+                </ItemsControl.ItemTemplate>
+              </ItemsControl>
+            </Panel>
+          </Border>
+        </DockPanel>
       </ControlTemplate>
     </Setter>
 
@@ -116,7 +115,8 @@
       <Setter Property="RenderTransformOrigin" Value="0.5,0" />
       <Setter Property="Transitions">
         <Transitions>
-          <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.1" Delay="0:0:0.1" Easing="{StaticResource FluentEasing}" />
+          <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.1" Delay="0:0:0.1"
+                                         Easing="{StaticResource FluentEasing}" />
           <ThicknessTransition Property="Margin" Duration="0:0:0.1" Easing="{StaticResource FluentEasing}" />
         </Transitions>
       </Setter>
@@ -127,18 +127,18 @@
     </Style>
 
     <Style Selector="^:pointerover /template/ Border#PART_Border">
-      <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushPointerOver}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushPointerOver}" />
     </Style>
 
     <Style Selector="^:pointerover /template/ TextBlock#PART_Watermark">
-      <Setter Property="Opacity" Value="0.3"/>
+      <Setter Property="Opacity" Value="0.3" />
     </Style>
     <Style Selector="^:focus-within /template/ TextBlock#PART_Watermark">
-      <Setter Property="Opacity" Value="0.2"/>
+      <Setter Property="Opacity" Value="0.2" />
     </Style>
 
     <Style Selector="^:focus-within /template/ Border#PART_Border">
-      <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushFocused}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushFocused}" />
     </Style>
   </ControlTheme>
 
diff --git a/WalletWasabi.Fluent/Controls/TagsBox.axaml.cs b/WalletWasabi.Fluent/Controls/TagsBox.axaml.cs
index 798ecbb481..66038b25cf 100644
--- a/WalletWasabi.Fluent/Controls/TagsBox.axaml.cs
+++ b/WalletWasabi.Fluent/Controls/TagsBox.axaml.cs
@@ -13,7 +13,6 @@
 using Avalonia.Metadata;
 using Avalonia.Threading;
 using Avalonia.VisualTree;
-using Microsoft.Net.Http.Headers;
 using ReactiveUI;
 using WalletWasabi.Fluent.Extensions;
 using WalletWasabi.Fluent.Helpers;
@@ -229,9 +228,9 @@ private void Initialize()
 		}
 
 		_autoCompleteBox.InternalTextBox.WhenAnyValue(x => x.IsFocused)
-					.Where(isFocused => isFocused == false)
-					.Subscribe(_ => RequestAdd = true)
-					.DisposeWith(_compositeDisposable);
+			.Where(isFocused => isFocused == false)
+			.Subscribe(_ => RequestAdd = true)
+			.DisposeWith(_compositeDisposable);
 
 		if (_autoCompleteBox.SuggestionListBox is not null)
 		{
diff --git a/WalletWasabi.Fluent/Controls/TagsBoxAutoCompleteBox.axaml b/WalletWasabi.Fluent/Controls/TagsBoxAutoCompleteBox.axaml
index 1259cb6279..d97527715a 100644
--- a/WalletWasabi.Fluent/Controls/TagsBoxAutoCompleteBox.axaml
+++ b/WalletWasabi.Fluent/Controls/TagsBoxAutoCompleteBox.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:lang="clr-namespace:WalletWasabi.Lang;assembly=WalletWasabi">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:lang="clr-namespace:WalletWasabi.Lang;assembly=WalletWasabi">
 
   <Design.PreviewWith>
     <StackPanel Spacing="10" Background="Gray">
@@ -10,80 +10,81 @@
   </Design.PreviewWith>
 
   <ControlTheme TargetType="TextBox" x:Key="AutoCompleteBoxTextBox" BasedOn="{StaticResource TextBoxTheme}">
-      <Setter Property="Padding" Value="0" />
-      <Setter Property="Margin" Value="0" />
-      <Setter Property="Focusable" Value="True" />
-      <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
-      <Setter Property="MaxLength" Value="{Binding Path=MaxTextLength, RelativeSource={RelativeSource AncestorType={x:Type TagsBox}}}" />
-      <Setter Property="ContextMenu">
-        <ContextMenu>
-          <MenuItem Header="{x:Static lang:Resources.Paste}" Command="{Binding $parent[TextBox].Paste}"
-                    IsEnabled="{Binding $parent[TextBox].CanPaste}"
-                    InputGesture="{x:Static TextBox.PasteGesture}" />
-        </ContextMenu>
-      </Setter>
-      <Style Selector="^ /template/ DataValidationErrors">
-        <Setter Property="IsVisible" Value="False" />
-      </Style>
-      <Style Selector="^ /template/ Border#PART_BorderElement">
-        <Setter Property="IsVisible" Value="False" />
-      </Style>
-    </ControlTheme>
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="Margin" Value="0" />
+    <Setter Property="Focusable" Value="True" />
+    <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
+    <Setter Property="MaxLength"
+            Value="{Binding Path=MaxTextLength, RelativeSource={RelativeSource AncestorType={x:Type TagsBox}}}" />
+    <Setter Property="ContextMenu">
+      <ContextMenu>
+        <MenuItem Header="{x:Static lang:Resources.Paste}" Command="{Binding $parent[TextBox].Paste}"
+                  IsEnabled="{Binding $parent[TextBox].CanPaste}"
+                  InputGesture="{x:Static TextBox.PasteGesture}" />
+      </ContextMenu>
+    </Setter>
+    <Style Selector="^ /template/ DataValidationErrors">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^ /template/ Border#PART_BorderElement">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+  </ControlTheme>
 
-    <ControlTheme x:Key="TagsBoxAutoCompleteBox" TargetType="AutoCompleteBox">
-      <Setter Property="VerticalAlignment" Value="Top" />
-      <Setter Property="Background" Value="{x:Null}" />
-      <Setter Property="Padding" Value="15 10 15 8" />
-      <Setter Property="Margin" Value="0 0 0 2" />
-      <Setter Property="MaxDropDownHeight" Value="90" />
-      <Setter Property="MinimumPrefixLength" Value="1" />
-      <Setter Property="Focusable" Value="False" />
-      <Setter Property="IsTextCompletionEnabled" Value="{Binding $parent[TagsBox].RestrictInputToSuggestions}" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Grid x:Name="PART_LayoutRoot">
-            <TextBox x:Name="PART_TextBox"
-                     Watermark="{TemplateBinding Watermark}"
-                     Width="{TemplateBinding Width}"
-                     Foreground="{TemplateBinding Foreground}"
-                     Background="{TemplateBinding Background}"
-                     BorderBrush="{TemplateBinding BorderBrush}"
-                     BorderThickness="{TemplateBinding BorderThickness}"
-                     CornerRadius="{TemplateBinding CornerRadius}"
-                     FontSize="{TemplateBinding FontSize}"
-                     FontFamily="{TemplateBinding FontFamily}"
-                     FontWeight="{TemplateBinding FontWeight}"
-                     Padding="{TemplateBinding Padding}"
-                     Margin="0"
-                     DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
-                     Theme="{StaticResource AutoCompleteBoxTextBox}" />
-            <Popup x:Name="PART_Popup"
-                   WindowManagerAddShadowHint="False"
-                   MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
-                   MaxHeight="120"
-                   IsLightDismissEnabled="True"
-                   PlacementTarget="{TemplateBinding}">
-              <Border x:Name="PART_SuggestionsContainer"
-                      Padding="{DynamicResource AutoCompleteListMargin}"
-                      BorderThickness="{DynamicResource AutoCompleteListBorderThemeThickness}"
-                      BorderBrush="{DynamicResource AutoCompleteBoxSuggestionsListBorderBrush}"
-                      Background="{DynamicResource AutoCompleteBoxSuggestionsListBackground}"
-                      CornerRadius="{DynamicResource OverlayCornerRadius}">
-                <ListBox x:Name="PART_SelectingItemsControl"
-                         BorderThickness="0"
-                         Background="Transparent"
-                         ItemTemplate="{TemplateBinding ItemTemplate}"
-                         Margin="{DynamicResource AutoCompleteListPadding}" />
-              </Border>
-            </Popup>
-          </Grid>
-        </ControlTemplate>
+  <ControlTheme x:Key="TagsBoxAutoCompleteBox" TargetType="AutoCompleteBox">
+    <Setter Property="VerticalAlignment" Value="Top" />
+    <Setter Property="Background" Value="{x:Null}" />
+    <Setter Property="Padding" Value="15 10 15 8" />
+    <Setter Property="Margin" Value="0 0 0 2" />
+    <Setter Property="MaxDropDownHeight" Value="90" />
+    <Setter Property="MinimumPrefixLength" Value="1" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="IsTextCompletionEnabled" Value="{Binding $parent[TagsBox].RestrictInputToSuggestions}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid x:Name="PART_LayoutRoot">
+          <TextBox x:Name="PART_TextBox"
+                   Watermark="{TemplateBinding Watermark}"
+                   Width="{TemplateBinding Width}"
+                   Foreground="{TemplateBinding Foreground}"
+                   Background="{TemplateBinding Background}"
+                   BorderBrush="{TemplateBinding BorderBrush}"
+                   BorderThickness="{TemplateBinding BorderThickness}"
+                   CornerRadius="{TemplateBinding CornerRadius}"
+                   FontSize="{TemplateBinding FontSize}"
+                   FontFamily="{TemplateBinding FontFamily}"
+                   FontWeight="{TemplateBinding FontWeight}"
+                   Padding="{TemplateBinding Padding}"
+                   Margin="0"
+                   DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
+                   Theme="{StaticResource AutoCompleteBoxTextBox}" />
+          <Popup x:Name="PART_Popup"
+                 WindowManagerAddShadowHint="False"
+                 MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
+                 MaxHeight="120"
+                 IsLightDismissEnabled="True"
+                 PlacementTarget="{TemplateBinding}">
+            <Border x:Name="PART_SuggestionsContainer"
+                    Padding="{DynamicResource AutoCompleteListMargin}"
+                    BorderThickness="{DynamicResource AutoCompleteListBorderThemeThickness}"
+                    BorderBrush="{DynamicResource AutoCompleteBoxSuggestionsListBorderBrush}"
+                    Background="{DynamicResource AutoCompleteBoxSuggestionsListBackground}"
+                    CornerRadius="{DynamicResource OverlayCornerRadius}">
+              <ListBox x:Name="PART_SelectingItemsControl"
+                       BorderThickness="0"
+                       Background="Transparent"
+                       ItemTemplate="{TemplateBinding ItemTemplate}"
+                       Margin="{DynamicResource AutoCompleteListPadding}" />
+            </Border>
+          </Popup>
+        </Grid>
+      </ControlTemplate>
 
-      </Setter>
+    </Setter>
 
-      <Style Selector="^ /template/ ListBox#PART_SelectingItemsControl">
-        <Setter Property="MinWidth" Value="286" />
-      </Style>
+    <Style Selector="^ /template/ ListBox#PART_SelectingItemsControl">
+      <Setter Property="MinWidth" Value="286" />
+    </Style>
 
-    </ControlTheme>
+  </ControlTheme>
 </ResourceDictionary>
diff --git a/WalletWasabi.Fluent/Controls/TextBox.axaml b/WalletWasabi.Fluent/Controls/TextBox.axaml
index 03fa5fbb4a..2a6cca5be6 100644
--- a/WalletWasabi.Fluent/Controls/TextBox.axaml
+++ b/WalletWasabi.Fluent/Controls/TextBox.axaml
@@ -9,7 +9,7 @@
   <Design.PreviewWith>
     <StackPanel Spacing="4" Width="300">
 
-      <TextBox Text="{Binding $self.Bounds.Height}"/>
+      <TextBox Text="{Binding $self.Bounds.Height}" />
       <TextBox Watermark="{Binding $self.Bounds.Height}" />
     </StackPanel>
   </Design.PreviewWith>
@@ -18,9 +18,12 @@
 
     <Setter Property="ContextMenu">
       <ContextMenu>
-        <MenuItem Header="{x:Static lang:Resources.Cut}" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
-        <MenuItem Header="{x:Static lang:Resources.Copy}" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
-        <MenuItem Header="{x:Static lang:Resources.Paste}" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
+        <MenuItem Header="{x:Static lang:Resources.Cut}" Command="{Binding $parent[TextBox].Cut}"
+                  IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
+        <MenuItem Header="{x:Static lang:Resources.Copy}" Command="{Binding $parent[TextBox].Copy}"
+                  IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}" />
+        <MenuItem Header="{x:Static lang:Resources.Paste}" Command="{Binding $parent[TextBox].Paste}"
+                  IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}" />
       </ContextMenu>
     </Setter>
 
@@ -51,15 +54,17 @@
             <Border Margin="{TemplateBinding BorderThickness}">
               <Grid ColumnDefinitions="Auto,*,Auto">
                 <ContentPresenter Grid.Column="0" Grid.ColumnSpan="1" Content="{TemplateBinding InnerLeftContent}" />
-                <DockPanel x:Name="PART_InnerDockPanel" Grid.Column="1" Grid.ColumnSpan="1" Margin="{TemplateBinding Padding}">
+                <DockPanel x:Name="PART_InnerDockPanel" Grid.Column="1" Grid.ColumnSpan="1"
+                           Margin="{TemplateBinding Padding}">
                   <TextBlock Name="PART_FloatingWatermark"
                              Foreground="{DynamicResource SystemAccentColor}"
                              FontSize="{TemplateBinding FontSize}"
                              Text="{TemplateBinding Watermark}"
                              IsVisible="{TemplateBinding UseFloatingWatermark}"
                              DockPanel.Dock="Top" />
-                  <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
-                                VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+                  <ScrollViewer
+                    HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                    VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
                     <Panel>
                       <TextBlock Name="PART_Watermark"
                                  Opacity="0.5"
@@ -95,14 +100,14 @@
                 </DockPanel>
                 <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="10">
                   <Panel x:Name="CheckmarkHost">
-                    <PathIcon  Classes="checkMark" VerticalAlignment="Center">
+                    <PathIcon Classes="checkMark" VerticalAlignment="Center">
                       <Interaction.Behaviors>
                         <CheckMarkVisibilityBehavior />
                       </Interaction.Behaviors>
                     </PathIcon>
                   </Panel>
-                    <ContentPresenter Content="{TemplateBinding InnerRightContent}" />
-                  </StackPanel>
+                  <ContentPresenter Content="{TemplateBinding InnerRightContent}" />
+                </StackPanel>
               </Grid>
             </Border>
           </Panel>
@@ -124,7 +129,8 @@
       <Setter Property="RenderTransformOrigin" Value="0.5,0" />
       <Setter Property="Transitions">
         <Transitions>
-          <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.1" Delay="0:0:0.1" Easing="{StaticResource FluentEasing}" />
+          <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.1" Delay="0:0:0.1"
+                                         Easing="{StaticResource FluentEasing}" />
           <ThicknessTransition Property="Margin" Duration="0:0:0.1" Easing="{StaticResource FluentEasing}" />
         </Transitions>
       </Setter>
@@ -143,10 +149,10 @@
             <Panel>
               <PathIcon Data="{StaticResource PasswordBoxRevealButtonData}"
                         Height="8" Width="12"
-                        IsVisible="{Binding !$parent[ToggleButton].IsChecked}"/>
+                        IsVisible="{Binding !$parent[ToggleButton].IsChecked}" />
               <PathIcon Data="{StaticResource PasswordBoxHideButtonData}"
                         Height="12" Width="12"
-                        IsVisible="{Binding $parent[ToggleButton].IsChecked}"/>
+                        IsVisible="{Binding $parent[ToggleButton].IsChecked}" />
             </Panel>
           </ToggleButton>
         </Template>
@@ -155,50 +161,51 @@
 
   </ControlTheme>
 
-  <ControlTheme  x:Key="SelectableTextBlockTextBox" TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
+  <ControlTheme x:Key="SelectableTextBlockTextBox" TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
 
-      <Setter Property="IsReadOnly" Value="True" />
-      <Setter Property="Margin" Value="0" />
-      <Setter Property="Padding" Value="0" />
-      <Setter Property="Background" Value="Transparent" />
-      <Setter Property="BorderThickness" Value="0" />
-      <Setter Property="MinHeight" Value="0" />
-      <Setter Property="MinWidth" Value="0" />
-      <Setter Property="CaretBrush" Value="Transparent" />
-      <Setter Property="TextWrapping" Value="Wrap" />
-
-      <Setter Property="ContextMenu">
-        <ContextMenu>
-          <MenuItem Header="{x:Static lang:Resources.Copy}" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}" />
-        </ContextMenu>
-      </Setter>
+    <Setter Property="IsReadOnly" Value="True" />
+    <Setter Property="Margin" Value="0" />
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="MinHeight" Value="0" />
+    <Setter Property="MinWidth" Value="0" />
+    <Setter Property="CaretBrush" Value="Transparent" />
+    <Setter Property="TextWrapping" Value="Wrap" />
 
-      <Setter Property="Template">
-        <ControlTemplate>
-          <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
-                        VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
-            <TextPresenter Name="PART_TextPresenter"
-                           Text="{TemplateBinding Text, Mode=TwoWay}"
-                           CaretIndex="{TemplateBinding CaretIndex}"
-                           SelectionStart="{TemplateBinding SelectionStart}"
-                           SelectionEnd="{TemplateBinding SelectionEnd}"
-                           TextAlignment="{TemplateBinding TextAlignment}"
-                           TextWrapping="{TemplateBinding TextWrapping}"
-                           PasswordChar="{TemplateBinding PasswordChar}"
-                           RevealPassword="{TemplateBinding RevealPassword}"
-                           SelectionBrush="{TemplateBinding SelectionBrush}"
-                           SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
-                           CaretBrush="{TemplateBinding CaretBrush}"
-                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-            <ScrollViewer.Styles>
-              <Style Selector="ScrollContentPresenter#PART_ContentPresenter">
-                <Setter Property="Cursor" Value="IBeam" />
-              </Style>
-            </ScrollViewer.Styles>
-          </ScrollViewer>
-        </ControlTemplate>
-      </Setter>
+    <Setter Property="ContextMenu">
+      <ContextMenu>
+        <MenuItem Header="{x:Static lang:Resources.Copy}" Command="{Binding $parent[TextBox].Copy}"
+                  IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}" />
+      </ContextMenu>
+    </Setter>
+
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                      VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+          <TextPresenter Name="PART_TextPresenter"
+                         Text="{TemplateBinding Text, Mode=TwoWay}"
+                         CaretIndex="{TemplateBinding CaretIndex}"
+                         SelectionStart="{TemplateBinding SelectionStart}"
+                         SelectionEnd="{TemplateBinding SelectionEnd}"
+                         TextAlignment="{TemplateBinding TextAlignment}"
+                         TextWrapping="{TemplateBinding TextWrapping}"
+                         PasswordChar="{TemplateBinding PasswordChar}"
+                         RevealPassword="{TemplateBinding RevealPassword}"
+                         SelectionBrush="{TemplateBinding SelectionBrush}"
+                         SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
+                         CaretBrush="{TemplateBinding CaretBrush}"
+                         HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+          <ScrollViewer.Styles>
+            <Style Selector="ScrollContentPresenter#PART_ContentPresenter">
+              <Setter Property="Cursor" Value="IBeam" />
+            </Style>
+          </ScrollViewer.Styles>
+        </ScrollViewer>
+      </ControlTemplate>
+    </Setter>
 
   </ControlTheme>
 
diff --git a/WalletWasabi.Fluent/Controls/ThemeImage.cs b/WalletWasabi.Fluent/Controls/ThemeImage.cs
index ff77a89948..7b07138025 100644
--- a/WalletWasabi.Fluent/Controls/ThemeImage.cs
+++ b/WalletWasabi.Fluent/Controls/ThemeImage.cs
@@ -3,7 +3,7 @@
 
 namespace WalletWasabi.Fluent.Controls;
 
-public class ThemeImage: Image
+public class ThemeImage : Image
 {
 	protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
 	{
@@ -12,11 +12,11 @@ protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
 
 	protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
 	{
-		ActualThemeVariantChanged -= OnThemeVariantChanged;	
+		ActualThemeVariantChanged -= OnThemeVariantChanged;
 	}
 
 	private void OnThemeVariantChanged(object? sender, EventArgs e)
 	{
 		InvalidateVisual();
-	}	
+	}
 }
diff --git a/WalletWasabi.Fluent/Controls/TileControl.axaml b/WalletWasabi.Fluent/Controls/TileControl.axaml
index c692b3b1e8..803826d193 100644
--- a/WalletWasabi.Fluent/Controls/TileControl.axaml
+++ b/WalletWasabi.Fluent/Controls/TileControl.axaml
@@ -22,7 +22,8 @@
           </Border.Effect>
           <DockPanel>
             <TextBlock Text="{TemplateBinding Title}" Opacity="0.6" FontWeight="Bold" DockPanel.Dock="Top" Classes="h8" />
-            <ContentPresenter Content="{TemplateBinding BottomContent}" DockPanel.Dock="Bottom" IsVisible="{TemplateBinding IsBottomContentVisible}" />
+            <ContentPresenter Content="{TemplateBinding BottomContent}" DockPanel.Dock="Bottom"
+                              IsVisible="{TemplateBinding IsBottomContentVisible}" />
             <ContentPresenter Name="PART_Content" Content="{TemplateBinding Content}" />
           </DockPanel>
         </Border>
diff --git a/WalletWasabi.Fluent/Controls/ToggleRadioButton.axaml b/WalletWasabi.Fluent/Controls/ToggleRadioButton.axaml
index 4a2180e810..8f3d558cd6 100644
--- a/WalletWasabi.Fluent/Controls/ToggleRadioButton.axaml
+++ b/WalletWasabi.Fluent/Controls/ToggleRadioButton.axaml
@@ -16,7 +16,8 @@
   <SolidColorBrush x:Key="ToggleButtonBackgroundPressed" Color="{DynamicResource Layer2BackgroundBrushLight1}" />
   <SolidColorBrush x:Key="ToggleButtonBackgroundChecked" Color="{DynamicResource Layer2BackgroundBrushLight2}" />
   <SolidColorBrush x:Key="ToggleButtonBackgroundPointerOver" Color="{DynamicResource Layer2BackgroundBrushLight2}" />
-  <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver" Color="{DynamicResource Layer2BackgroundBrushLight2}" />
+  <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver"
+                   Color="{DynamicResource Layer2BackgroundBrushLight2}" />
 
   <ControlTheme x:Key="ToggleRadioButton" TargetType="RadioButton" BasedOn="{StaticResource {x:Type ToggleButton}}" />
 
diff --git a/WalletWasabi.Fluent/Controls/TreeDataGrid.axaml b/WalletWasabi.Fluent/Controls/TreeDataGrid.axaml
index 6b28ebb35e..b72225ee51 100644
--- a/WalletWasabi.Fluent/Controls/TreeDataGrid.axaml
+++ b/WalletWasabi.Fluent/Controls/TreeDataGrid.axaml
@@ -33,7 +33,7 @@
       <ControlTemplate>
         <Border x:Name="PART_SelectionIndicator">
           <Panel>
-            <Border Name="BackgroundRectangle" Margin="{StaticResource TreeDataGridMarginFix}"/>
+            <Border Name="BackgroundRectangle" Margin="{StaticResource TreeDataGridMarginFix}" />
             <TreeDataGridCellsPresenter Name="PART_CellsPresenter"
                                         ElementFactory="{TemplateBinding ElementFactory}"
                                         Items="{TemplateBinding Columns}"
@@ -134,7 +134,8 @@
 
   <!-- TreeDataGridExpanderCell: HistoryTable.axaml -->
 
-  <ControlTheme x:Key="HistoryTableTreeDataGridRow" TargetType="TreeDataGridRow" BasedOn="{StaticResource GenericTreeDataGridRow}">
+  <ControlTheme x:Key="HistoryTableTreeDataGridRow" TargetType="TreeDataGridRow"
+                BasedOn="{StaticResource GenericTreeDataGridRow}">
 
     <Setter Property="Focusable" Value="False" />
 
@@ -173,7 +174,7 @@
                     Classes.isChild="{Binding IsChild}"
                     Classes.isLastChild="{Binding IsLastChild}"
                     IsHitTestVisible="False"
-                    Margin="{StaticResource TreeDataGridMarginFix}"/>
+                    Margin="{StaticResource TreeDataGridMarginFix}" />
           </Panel>
         </Border>
       </ControlTemplate>
@@ -267,7 +268,8 @@
 
   <!-- TreeDataGridRow: SelectCoinsDialogView.axaml -->
 
-  <ControlTheme x:Key="SelectCoinsDialogViewTreeDataGridRow" TargetType="TreeDataGridRow" BasedOn="{StaticResource GenericTreeDataGridRow}">
+  <ControlTheme x:Key="SelectCoinsDialogViewTreeDataGridRow" TargetType="TreeDataGridRow"
+                BasedOn="{StaticResource GenericTreeDataGridRow}">
     <Setter Property="Focusable" Value="False" />
 
     <Setter Property="Template">
@@ -306,7 +308,8 @@
 
   <!-- TreeDataGridRow: ReceiveAddressesView.axaml -->
 
-  <ControlTheme x:Key="ReceiveAddressesViewTreeDataGridRow" TargetType="TreeDataGridRow" BasedOn="{StaticResource GenericTreeDataGridRow}">
+  <ControlTheme x:Key="ReceiveAddressesViewTreeDataGridRow" TargetType="TreeDataGridRow"
+                BasedOn="{StaticResource GenericTreeDataGridRow}">
 
     <Setter Property="Focusable" Value="False" />
 
@@ -330,7 +333,8 @@
     </Setter>
   </ControlTheme>
 
-  <ControlTheme x:Key="OrdersViewTreeDataGridRow" TargetType="TreeDataGridRow" BasedOn="{StaticResource GenericTreeDataGridRow}">
+  <ControlTheme x:Key="OrdersViewTreeDataGridRow" TargetType="TreeDataGridRow"
+                BasedOn="{StaticResource GenericTreeDataGridRow}">
 
     <Setter Property="Focusable" Value="False" />
 
@@ -342,7 +346,7 @@
           <!--   <ExecuteCommandOnDoubleTappedBehavior Command="{Binding NavigateCommand, Mode=OneWay}" /> -->
           <!-- </i:Interaction.Behaviors> -->
           <Panel>
-            <Border Name="BackgroundRectangle" Margin="{StaticResource TreeDataGridMarginFix}"/>
+            <Border Name="BackgroundRectangle" Margin="{StaticResource TreeDataGridMarginFix}" />
             <TreeDataGridCellsPresenter Name="PART_CellsPresenter"
                                         ElementFactory="{TemplateBinding ElementFactory}"
                                         Items="{TemplateBinding Columns}"
diff --git a/WalletWasabi.Fluent/Controls/WalletIconControl.axaml b/WalletWasabi.Fluent/Controls/WalletIconControl.axaml
index fb3509aaa3..d1a5f28c88 100644
--- a/WalletWasabi.Fluent/Controls/WalletIconControl.axaml
+++ b/WalletWasabi.Fluent/Controls/WalletIconControl.axaml
@@ -1,10 +1,10 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <WalletIconControl />
   </Design.PreviewWith>
 
-  <ControlTheme x:Key="{x:Type WalletIconControl}" TargetType="WalletIconControl" >
+  <ControlTheme x:Key="{x:Type WalletIconControl}" TargetType="WalletIconControl">
     <!-- Set Defaults -->
     <Setter Property="Template">
       <ControlTemplate>
diff --git a/WalletWasabi.Fluent/Converters/MoneyConverters.cs b/WalletWasabi.Fluent/Converters/MoneyConverters.cs
index 86da760bb0..9b2ca0525b 100644
--- a/WalletWasabi.Fluent/Converters/MoneyConverters.cs
+++ b/WalletWasabi.Fluent/Converters/MoneyConverters.cs
@@ -32,5 +32,5 @@ public static class MoneyConverters
 		new FuncValueConverter<Money?, string?>(n => n?.ToFeeDisplayUnitRawString());
 
 	public static readonly IValueConverter PercentageDifferenceConverter =
-			new FuncValueConverter<double, string>(TextHelpers.FormatPercentageDiff );
+		new FuncValueConverter<double, string>(TextHelpers.FormatPercentageDiff);
 }
diff --git a/WalletWasabi.Fluent/Converters/TextToInlineCollectionConverter.cs b/WalletWasabi.Fluent/Converters/TextToInlineCollectionConverter.cs
index e2125225c1..d0daf4e4f0 100644
--- a/WalletWasabi.Fluent/Converters/TextToInlineCollectionConverter.cs
+++ b/WalletWasabi.Fluent/Converters/TextToInlineCollectionConverter.cs
@@ -11,83 +11,83 @@ namespace WalletWasabi.Fluent.Converters;
 
 public class TextToInlineCollectionConverter
 {
-    public static readonly FuncValueConverter<string, InlineCollection> Instance = new(ToInlineCollection);
+	public static readonly FuncValueConverter<string, InlineCollection> Instance = new(ToInlineCollection);
 
-    // This regular expression will handle detecting URLs, **bold** text, and markdown links [text](url).
-    private static readonly Regex Regex = new(@"(\*\*(.*?)\*\*)|(\b(?:https?://|www\.)\S+\b)|(\[(.*?)\]\((http[s]?:\/\/.*?)\))", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline);
+	// This regular expression will handle detecting URLs, **bold** text, and markdown links [text](url).
+	private static readonly Regex Regex = new(@"(\*\*(.*?)\*\*)|(\b(?:https?://|www\.)\S+\b)|(\[(.*?)\]\((http[s]?:\/\/.*?)\))", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline);
 
-    private static InlineCollection ToInlineCollection(string? str)
-    {
-        if (string.IsNullOrEmpty(str))
-        {
-            return new InlineCollection { new Run { Text = string.Empty } }; // Returns an empty Run if there's no text.
-        }
+	private static InlineCollection ToInlineCollection(string? str)
+	{
+		if (string.IsNullOrEmpty(str))
+		{
+			return new InlineCollection { new Run { Text = string.Empty } }; // Returns an empty Run if there's no text.
+		}
 
-        var inlines = new List<Inline>();
-        var lastIndex = 0;
+		var inlines = new List<Inline>();
+		var lastIndex = 0;
 
-        foreach (Match match in Regex.Matches(str))
-        {
-            // Add normal text before the found match.
-            if (match.Index > lastIndex)
-            {
-                inlines.Add(new Run { Text = str[lastIndex..match.Index], BaselineAlignment = BaselineAlignment.Center });
-            }
+		foreach (Match match in Regex.Matches(str))
+		{
+			// Add normal text before the found match.
+			if (match.Index > lastIndex)
+			{
+				inlines.Add(new Run { Text = str[lastIndex..match.Index], BaselineAlignment = BaselineAlignment.Center });
+			}
 
-            // Check if the match is a URL, bold text, or a markdown link.
-            if (match.Value.StartsWith("**") && match.Value.EndsWith("**"))
-            {
-                // Extract the text inside the **bold** tags.
-                var boldText = match.Groups[2].Value; // Uses the captured group for the bold text.
-                inlines.Add(new Run { Text = boldText, FontWeight = FontWeight.Bold });
-            }
-            else if (!string.IsNullOrEmpty(match.Groups[3].Value)) // It's a URL.
-            {
-                var url = match.Groups[3].Value;
-                var hyperlink = new InlineUIContainer(
-                    new ContentControl
-                    {
-                        Content = new LinkViewModel()
-                        {
-                            IsClickable = true,
-                            Description = url,
-                            Link = url
-                        }
-                    });
+			// Check if the match is a URL, bold text, or a markdown link.
+			if (match.Value.StartsWith("**") && match.Value.EndsWith("**"))
+			{
+				// Extract the text inside the **bold** tags.
+				var boldText = match.Groups[2].Value; // Uses the captured group for the bold text.
+				inlines.Add(new Run { Text = boldText, FontWeight = FontWeight.Bold });
+			}
+			else if (!string.IsNullOrEmpty(match.Groups[3].Value)) // It's a URL.
+			{
+				var url = match.Groups[3].Value;
+				var hyperlink = new InlineUIContainer(
+					new ContentControl
+					{
+						Content = new LinkViewModel()
+						{
+							IsClickable = true,
+							Description = url,
+							Link = url
+						}
+					});
 
-                hyperlink.BaselineAlignment = BaselineAlignment.Center;
-                inlines.Add(hyperlink);
-            }
-            else if (!string.IsNullOrEmpty(match.Groups[5].Value) && !string.IsNullOrEmpty(match.Groups[6].Value)) // It's a markdown link.
-            {
-                var linkText = match.Groups[5].Value;
-                var url = match.Groups[6].Value;
-                var hyperlink = new InlineUIContainer(
-                    new ContentControl
-                    {
-                        Content = new LinkViewModel()
-                        {
-                            IsClickable = true,
-                            Description = linkText, // Uses the visible text of the markdown link.
-                            Link = url
-                        }
-                    });
+				hyperlink.BaselineAlignment = BaselineAlignment.Center;
+				inlines.Add(hyperlink);
+			}
+			else if (!string.IsNullOrEmpty(match.Groups[5].Value) && !string.IsNullOrEmpty(match.Groups[6].Value)) // It's a markdown link.
+			{
+				var linkText = match.Groups[5].Value;
+				var url = match.Groups[6].Value;
+				var hyperlink = new InlineUIContainer(
+					new ContentControl
+					{
+						Content = new LinkViewModel()
+						{
+							IsClickable = true,
+							Description = linkText, // Uses the visible text of the markdown link.
+							Link = url
+						}
+					});
 
-                hyperlink.BaselineAlignment = BaselineAlignment.Center;
-                inlines.Add(hyperlink);
-            }
+				hyperlink.BaselineAlignment = BaselineAlignment.Center;
+				inlines.Add(hyperlink);
+			}
 
-            lastIndex = match.Index + match.Length;
-        }
+			lastIndex = match.Index + match.Length;
+		}
 
-        // Add any remaining text after the last match.
-        if (lastIndex < str.Length)
-        {
-            inlines.Add(new Run { Text = str[lastIndex..], BaselineAlignment = BaselineAlignment.Center });
-        }
+		// Add any remaining text after the last match.
+		if (lastIndex < str.Length)
+		{
+			inlines.Add(new Run { Text = str[lastIndex..], BaselineAlignment = BaselineAlignment.Center });
+		}
 
-        var inlineCollection = new InlineCollection();
-        inlineCollection.AddRange(inlines);
-        return inlineCollection;
-    }
+		var inlineCollection = new InlineCollection();
+		inlineCollection.AddRange(inlines);
+		return inlineCollection;
+	}
 }
diff --git a/WalletWasabi.Fluent/CrashReport/ViewModels/CrashReportWindowViewModel.cs b/WalletWasabi.Fluent/CrashReport/ViewModels/CrashReportWindowViewModel.cs
index f2991abe78..e9c3deba90 100644
--- a/WalletWasabi.Fluent/CrashReport/ViewModels/CrashReportWindowViewModel.cs
+++ b/WalletWasabi.Fluent/CrashReport/ViewModels/CrashReportWindowViewModel.cs
@@ -17,10 +17,7 @@ public CrashReportWindowViewModel(SerializableException serializedException)
 
 		OpenGitHubRepoCommand = ReactiveCommand.CreateFromTask(async () => await WebBrowserService.Instance.OpenUrlInPreferredBrowserAsync(Link));
 
-		CopyTraceCommand = ReactiveCommand.CreateFromTask(async () =>
-		{
-			await ApplicationHelper.SetTextAsync(Trace);
-		});
+		CopyTraceCommand = ReactiveCommand.CreateFromTask(async () => { await ApplicationHelper.SetTextAsync(Trace); });
 	}
 
 	public SerializableException SerializedException { get; }
diff --git a/WalletWasabi.Fluent/CrashReport/Views/CrashReportWindow.axaml b/WalletWasabi.Fluent/CrashReport/Views/CrashReportWindow.axaml
index 3caa7e4df0..8a5911474f 100644
--- a/WalletWasabi.Fluent/CrashReport/Views/CrashReportWindow.axaml
+++ b/WalletWasabi.Fluent/CrashReport/Views/CrashReportWindow.axaml
@@ -13,14 +13,14 @@
         x:DataType="vm:CrashReportWindowViewModel">
   <Panel Margin="{Binding #CrashReporterWindow.OffScreenMargin}">
     <ContentArea EnableNext="True"
-                          EnableCancel="True"
-                          NextContent="Exit"
-                          CancelContent="Restart Ginger Wallet"
-                          FocusNext="True"
-                          Title="{Binding Title}"
-                          Caption="{Binding Caption}"
-                          ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                          ScrollViewer.VerticalScrollBarVisibility="Disabled">
+                 EnableCancel="True"
+                 NextContent="Exit"
+                 CancelContent="Restart Ginger Wallet"
+                 FocusNext="True"
+                 Title="{Binding Title}"
+                 Caption="{Binding Caption}"
+                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                 ScrollViewer.VerticalScrollBarVisibility="Disabled">
       <ContentArea.Styles>
         <Style Selector="ContentArea /template/ DockPanel#MainDockPanel">
           <Setter Property="Margin" Value="0 36 0 0" />
@@ -28,16 +28,16 @@
       </ContentArea.Styles>
       <DockPanel LastChildFill="True">
         <InfoMessage DockPanel.Dock="Bottom" VerticalAlignment="Center" HorizontalAlignment="Center"
-                              Margin="0 20 0 0">
+                     Margin="0 20 0 0">
           <Panel>
             <WrapPanel>
               <TextBlock Text="You can click this icon" />
               <AnimatedButton Margin="5 0"
-                                       ToolTip.Tip="Copy Log"
-                                       Command="{Binding CopyTraceCommand}"
-                                       NormalIcon="{StaticResource copy_regular}"
-                                       ClickIcon="{StaticResource copy_confirmed}"
-                                       InitialOpacity="1.0" />
+                              ToolTip.Tip="Copy Log"
+                              Command="{Binding CopyTraceCommand}"
+                              NormalIcon="{StaticResource copy_regular}"
+                              ClickIcon="{StaticResource copy_confirmed}"
+                              InitialOpacity="1.0" />
               <TextBlock Text="to copy the above text and post an issue tracker on our" />
               <Button Margin="5 0" Classes="activeHyperLink" Content="GitHub repo here"
                       Command="{Binding OpenGitHubRepoCommand}" ToolTip.Tip="{Binding Link}" />
diff --git a/WalletWasabi.Fluent/Diagnostics/DiagnosticsWindow.axaml b/WalletWasabi.Fluent/Diagnostics/DiagnosticsWindow.axaml
index 281cd45b98..6e19d0a3dc 100644
--- a/WalletWasabi.Fluent/Diagnostics/DiagnosticsWindow.axaml
+++ b/WalletWasabi.Fluent/Diagnostics/DiagnosticsWindow.axaml
@@ -30,9 +30,9 @@
           <Panel Width="{Binding $parent[Control].Bounds.Width}"
                  Height="{Binding $parent[Control].Bounds.Height}">
             <StackPanel Orientation="Horizontal" Margin="0,-14,0,0">
-              <TextBlock Text="{Binding $parent[Control].Bounds.Width}" Foreground="Red" FontSize="12"/>
-              <TextBlock Text=" x " Foreground="Red" FontSize="12"/>
-              <TextBlock Text="{Binding $parent[Control].Bounds.Height}" Foreground="Red" FontSize="12"/>
+              <TextBlock Text="{Binding $parent[Control].Bounds.Width}" Foreground="Red" FontSize="12" />
+              <TextBlock Text=" x " Foreground="Red" FontSize="12" />
+              <TextBlock Text="{Binding $parent[Control].Bounds.Height}" Foreground="Red" FontSize="12" />
               <!--
               <TextBlock Text=" (" Foreground="Red" FontSize="12"/>
               <TextBlock Text="{Binding $parent[Control].DataContext}" Foreground="Red" FontSize="12"/>
diff --git a/WalletWasabi.Fluent/Extensions/CurrencyExtensions.cs b/WalletWasabi.Fluent/Extensions/CurrencyExtensions.cs
index 9ac86d5389..6a1abdcfad 100644
--- a/WalletWasabi.Fluent/Extensions/CurrencyExtensions.cs
+++ b/WalletWasabi.Fluent/Extensions/CurrencyExtensions.cs
@@ -68,7 +68,7 @@ public static string ToFormattedFiat(this decimal n, string? currencyString = nu
 
 	public static decimal WithFriendlyDecimals(this double n)
 	{
-		return WithFriendlyDecimals((decimal) n);
+		return WithFriendlyDecimals((decimal)n);
 	}
 
 	public static decimal WithFriendlyDecimals(this decimal n)
diff --git a/WalletWasabi.Fluent/Extensions/EnumerableExtension.cs b/WalletWasabi.Fluent/Extensions/EnumerableExtension.cs
index 2062d6cf0a..7bd6156be6 100644
--- a/WalletWasabi.Fluent/Extensions/EnumerableExtension.cs
+++ b/WalletWasabi.Fluent/Extensions/EnumerableExtension.cs
@@ -16,7 +16,7 @@ public static IEnumerable<T> Delimit<T>(this IEnumerable<T> source, T delimiter)
 		{
 			yield return item;
 		}
-		
+
 		foreach (T item in source.Skip(1))
 		{
 			yield return delimiter;
diff --git a/WalletWasabi.Fluent/Extensions/ObservableExtensions.cs b/WalletWasabi.Fluent/Extensions/ObservableExtensions.cs
index 1a4f610264..07c14dba98 100644
--- a/WalletWasabi.Fluent/Extensions/ObservableExtensions.cs
+++ b/WalletWasabi.Fluent/Extensions/ObservableExtensions.cs
@@ -31,15 +31,15 @@ public static IObservable<T> ReplayLastActive<T>(this IObservable<T> observable)
 	}
 
 	public static IObservable<(T1, T2, T3, T4, T5, T6, T7, T8)> WhenAnyValue<TSender, T1, T2, T3, T4, T5, T6, T7, T8>(
-			this TSender sender,
-						Expression<Func<TSender, T1>> property1,
-						Expression<Func<TSender, T2>> property2,
-						Expression<Func<TSender, T3>> property3,
-						Expression<Func<TSender, T4>> property4,
-						Expression<Func<TSender, T5>> property5,
-						Expression<Func<TSender, T6>> property6,
-						Expression<Func<TSender, T7>> property7,
-						Expression<Func<TSender, T8>> property8)
+		this TSender sender,
+		Expression<Func<TSender, T1>> property1,
+		Expression<Func<TSender, T2>> property2,
+		Expression<Func<TSender, T3>> property3,
+		Expression<Func<TSender, T4>> property4,
+		Expression<Func<TSender, T5>> property5,
+		Expression<Func<TSender, T6>> property6,
+		Expression<Func<TSender, T7>> property7,
+		Expression<Func<TSender, T8>> property8)
 	{
 		return sender.WhenAny(
 			property1,
@@ -54,16 +54,16 @@ public static IObservable<T> ReplayLastActive<T>(this IObservable<T> observable)
 	}
 
 	public static IObservable<(T1, T2, T3, T4, T5, T6, T7, T8, T9)> WhenAnyValue<TSender, T1, T2, T3, T4, T5, T6, T7, T8, T9>(
-			this TSender sender,
-						Expression<Func<TSender, T1>> property1,
-						Expression<Func<TSender, T2>> property2,
-						Expression<Func<TSender, T3>> property3,
-						Expression<Func<TSender, T4>> property4,
-						Expression<Func<TSender, T5>> property5,
-						Expression<Func<TSender, T6>> property6,
-						Expression<Func<TSender, T7>> property7,
-						Expression<Func<TSender, T8>> property8,
-						Expression<Func<TSender, T9>> property9)
+		this TSender sender,
+		Expression<Func<TSender, T1>> property1,
+		Expression<Func<TSender, T2>> property2,
+		Expression<Func<TSender, T3>> property3,
+		Expression<Func<TSender, T4>> property4,
+		Expression<Func<TSender, T5>> property5,
+		Expression<Func<TSender, T6>> property6,
+		Expression<Func<TSender, T7>> property7,
+		Expression<Func<TSender, T8>> property8,
+		Expression<Func<TSender, T9>> property9)
 	{
 		return sender.WhenAny(
 			property1,
@@ -79,17 +79,17 @@ public static IObservable<T> ReplayLastActive<T>(this IObservable<T> observable)
 	}
 
 	public static IObservable<(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10)> WhenAnyValue<TSender, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
-			this TSender sender,
-						Expression<Func<TSender, T1>> property1,
-						Expression<Func<TSender, T2>> property2,
-						Expression<Func<TSender, T3>> property3,
-						Expression<Func<TSender, T4>> property4,
-						Expression<Func<TSender, T5>> property5,
-						Expression<Func<TSender, T6>> property6,
-						Expression<Func<TSender, T7>> property7,
-						Expression<Func<TSender, T8>> property8,
-						Expression<Func<TSender, T9>> property9,
-						Expression<Func<TSender, T10>> property10)
+		this TSender sender,
+		Expression<Func<TSender, T1>> property1,
+		Expression<Func<TSender, T2>> property2,
+		Expression<Func<TSender, T3>> property3,
+		Expression<Func<TSender, T4>> property4,
+		Expression<Func<TSender, T5>> property5,
+		Expression<Func<TSender, T6>> property6,
+		Expression<Func<TSender, T7>> property7,
+		Expression<Func<TSender, T8>> property8,
+		Expression<Func<TSender, T9>> property9,
+		Expression<Func<TSender, T10>> property10)
 	{
 		return sender.WhenAny(
 			property1,
@@ -112,8 +112,8 @@ public static IObservableCache<TObject, TKey> Fetch<TObject, TKey>(this IObserva
 		where TKey : notnull where TObject : notnull
 	{
 		return signal.Select(_ => source())
-					 .EditDiff(keySelector, equalityComparer)
-					 .DisposeMany()
-					 .AsObservableCache();
+			.EditDiff(keySelector, equalityComparer)
+			.DisposeMany()
+			.AsObservableCache();
 	}
 }
diff --git a/WalletWasabi.Fluent/HelpAndSupport/ViewModels/AboutViewModel.cs b/WalletWasabi.Fluent/HelpAndSupport/ViewModels/AboutViewModel.cs
index ec4a4664d3..64d6b88395 100644
--- a/WalletWasabi.Fluent/HelpAndSupport/ViewModels/AboutViewModel.cs
+++ b/WalletWasabi.Fluent/HelpAndSupport/ViewModels/AboutViewModel.cs
@@ -24,50 +24,50 @@ public AboutViewModel(bool navigateBack = false)
 		EnableBack = navigateBack;
 
 		Links = new List<ViewModelBase>()
+		{
+			new LinkViewModel()
+			{
+				Link = SourceCodeLink,
+				Description = Resources.SourceCodeGitHub,
+				IsClickable = true
+			},
+			new SeparatorViewModel(),
+			new LinkViewModel()
+			{
+				Link = ClearnetLink,
+				Description = Resources.WebsiteClearnet,
+				IsClickable = true
+			},
+			// Remove for now
+			/*new SeparatorViewModel(),
+			new LinkViewModel(UiContext)
+			{
+				Link = TorLink,
+				Description = "Website (Tor)",
+				IsClickable = false
+			},*/
+			new SeparatorViewModel(),
+			new LinkViewModel()
 			{
-				new LinkViewModel()
-				{
-					Link = SourceCodeLink,
-					Description = Resources.SourceCodeGitHub,
-					IsClickable = true
-				},
-				new SeparatorViewModel(),
-				new LinkViewModel()
-				{
-					Link = ClearnetLink,
-					Description = Resources.WebsiteClearnet,
-					IsClickable = true
-				},
-				// Remove for now
-				/*new SeparatorViewModel(),
-				new LinkViewModel(UiContext)
-				{
-					Link = TorLink,
-					Description = "Website (Tor)",
-					IsClickable = false
-				},*/
-				new SeparatorViewModel(),
-				new LinkViewModel()
-				{
-					Link = UserSupportLink,
-					Description = Resources.UserSupportViewModelTitle,
-					IsClickable = true
-				},
-				new SeparatorViewModel(),
-				new LinkViewModel()
-				{
-					Link = BugReportLink,
-					Description = Resources.BugReport,
-					IsClickable = true
-				},
-				new SeparatorViewModel(),
-				new LinkViewModel()
-				{
-					Link = FAQLink,
-					Description = Resources.FAQ,
-					IsClickable = true
-				},
-			};
+				Link = UserSupportLink,
+				Description = Resources.UserSupportViewModelTitle,
+				IsClickable = true
+			},
+			new SeparatorViewModel(),
+			new LinkViewModel()
+			{
+				Link = BugReportLink,
+				Description = Resources.BugReport,
+				IsClickable = true
+			},
+			new SeparatorViewModel(),
+			new LinkViewModel()
+			{
+				Link = FAQLink,
+				Description = Resources.FAQ,
+				IsClickable = true
+			},
+		};
 
 		License = new LinkViewModel()
 		{
@@ -99,25 +99,17 @@ public AboutViewModel(bool navigateBack = false)
 
 	public Version ClientVersion => Constants.ClientVersion;
 
-	[Localizable(false)]
-	public static string ClearnetLink => "https://gingerwallet.io/";
-
-	[Localizable(false)]
-	public static string TorLink => "http://wasabiukrxmkdgve5kynjztuovbg43uxcbcxn6y2okcrsg7gb6jdmbad.onion";
+	[Localizable(false)] public static string ClearnetLink => "https://gingerwallet.io/";
 
-	[Localizable(false)]
-	public static string SourceCodeLink => "https://github.com/GingerPrivacy/GingerWallet";
+	[Localizable(false)] public static string TorLink => "http://wasabiukrxmkdgve5kynjztuovbg43uxcbcxn6y2okcrsg7gb6jdmbad.onion";
 
-	[Localizable(false)]
-	public static string UserSupportLink => "https://github.com/GingerPrivacy/GingerWallet/discussions";
+	[Localizable(false)] public static string SourceCodeLink => "https://github.com/GingerPrivacy/GingerWallet";
 
-	[Localizable(false)]
+	[Localizable(false)] public static string UserSupportLink => "https://github.com/GingerPrivacy/GingerWallet/discussions";
 
-	public static string BugReportLink => "https://github.com/GingerPrivacy/GingerWallet/issues/new?template=bug-report.md";
+	[Localizable(false)] public static string BugReportLink => "https://github.com/GingerPrivacy/GingerWallet/issues/new?template=bug-report.md";
 
-	[Localizable(false)]
-	public static string FAQLink => "https://gingerwallet.io/#help";
+	[Localizable(false)] public static string FAQLink => "https://gingerwallet.io/#help";
 
-	[Localizable(false)]
-	public static string LicenseLink => "https://github.com/GingerPrivacy/GingerWallet/blob/master/LICENSE.md";
+	[Localizable(false)] public static string LicenseLink => "https://github.com/GingerPrivacy/GingerWallet/blob/master/LICENSE.md";
 }
diff --git a/WalletWasabi.Fluent/HelpAndSupport/Views/LinkView.axaml b/WalletWasabi.Fluent/HelpAndSupport/Views/LinkView.axaml
index 5f94e0119b..38c6216d0a 100644
--- a/WalletWasabi.Fluent/HelpAndSupport/Views/LinkView.axaml
+++ b/WalletWasabi.Fluent/HelpAndSupport/Views/LinkView.axaml
@@ -17,9 +17,9 @@
             IsEnabled="{Binding IsClickable}" />
 
     <AnimatedButton ToolTip.Tip="{x:Static lang:Resources.CopyLink}"
-                             Command="{Binding CopyLinkCommand}"
-                             CommandParameter="{Binding Link}"
-                             NormalIcon="{StaticResource copy_regular}"
-                             ClickIcon="{StaticResource copy_confirmed}" />
+                    Command="{Binding CopyLinkCommand}"
+                    CommandParameter="{Binding Link}"
+                    NormalIcon="{StaticResource copy_regular}"
+                    ClickIcon="{StaticResource copy_confirmed}" />
   </StackPanel>
 </UserControl>
diff --git a/WalletWasabi.Fluent/Helpers/ApplicationHelper.cs b/WalletWasabi.Fluent/Helpers/ApplicationHelper.cs
index 09e7c7e4b5..76728c3a68 100644
--- a/WalletWasabi.Fluent/Helpers/ApplicationHelper.cs
+++ b/WalletWasabi.Fluent/Helpers/ApplicationHelper.cs
@@ -62,7 +62,7 @@ public static async Task SetTextAsync(string? text)
 		}
 	}
 
-	public static async Task ClearAsync()
+	public static async Task ClearClipboardAsync()
 	{
 		if (GetClipboard() is { } clipboard)
 		{
diff --git a/WalletWasabi.Fluent/Helpers/LambdaComparer.cs b/WalletWasabi.Fluent/Helpers/LambdaComparer.cs
index d9a272754b..be2bc3fb27 100644
--- a/WalletWasabi.Fluent/Helpers/LambdaComparer.cs
+++ b/WalletWasabi.Fluent/Helpers/LambdaComparer.cs
@@ -3,29 +3,29 @@ namespace WalletWasabi.Fluent.Helpers;
 using System;
 using System.Collections.Generic;
 
-	public class LambdaComparer<T> : IEqualityComparer<T>
-	{
-		private readonly Func<T?, T?, bool> _lambdaComparer;
-		private readonly Func<T?, int> _lambdaHash;
+public class LambdaComparer<T> : IEqualityComparer<T>
+{
+	private readonly Func<T?, T?, bool> _lambdaComparer;
+	private readonly Func<T?, int> _lambdaHash;
 
-		public LambdaComparer(Func<T?, T?, bool> lambdaComparer) :
-			this(lambdaComparer, _ => 0)
-		{
-		}
+	public LambdaComparer(Func<T?, T?, bool> lambdaComparer) :
+		this(lambdaComparer, _ => 0)
+	{
+	}
 
-		public LambdaComparer(Func<T?, T?, bool> lambdaComparer, Func<T?, int> lambdaHash)
-		{
-			_lambdaComparer = lambdaComparer ?? throw new ArgumentNullException("lambdaComparer");
-			_lambdaHash = lambdaHash ?? throw new ArgumentNullException("lambdaHash");
-		}
+	public LambdaComparer(Func<T?, T?, bool> lambdaComparer, Func<T?, int> lambdaHash)
+	{
+		_lambdaComparer = lambdaComparer ?? throw new ArgumentNullException("lambdaComparer");
+		_lambdaHash = lambdaHash ?? throw new ArgumentNullException("lambdaHash");
+	}
 
-		public bool Equals(T? x, T? y)
-		{
-			return _lambdaComparer(x, y);
-		}
+	public bool Equals(T? x, T? y)
+	{
+		return _lambdaComparer(x, y);
+	}
 
-		public int GetHashCode(T obj)
-		{
-			return _lambdaHash(obj);
-		}
+	public int GetHashCode(T obj)
+	{
+		return _lambdaHash(obj);
 	}
+}
diff --git a/WalletWasabi.Fluent/Helpers/MacOsStartupHelper.cs b/WalletWasabi.Fluent/Helpers/MacOsStartupHelper.cs
index a88dd9b760..5e8495934e 100644
--- a/WalletWasabi.Fluent/Helpers/MacOsStartupHelper.cs
+++ b/WalletWasabi.Fluent/Helpers/MacOsStartupHelper.cs
@@ -12,22 +12,22 @@ public static class MacOsStartupHelper
 
 	private static readonly string PlistContent =
 		$"""
-		<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-		<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-		<plist version=\"1.0\">
-		<dict>
-		    <key>Label</key>
-		    <string>com.gingerwallet.startup</string>
-			<key>ProgramArguments</key>
-			<array>
-				<string>{EnvironmentHelpers.GetExecutablePath()}</string>
-				<string>{StartupHelper.SilentArgument}</string>
-			</array>
-			<key>RunAtLoad</key>
-			<true/>
-		</dict>
-		</plist>
-		""";
+		 <?xml version=\"1.0\" encoding=\"UTF-8\"?>
+		 <!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
+		 <plist version=\"1.0\">
+		 <dict>
+		     <key>Label</key>
+		     <string>com.gingerwallet.startup</string>
+		 	<key>ProgramArguments</key>
+		 	<array>
+		 		<string>{EnvironmentHelpers.GetExecutablePath()}</string>
+		 		<string>{StartupHelper.SilentArgument}</string>
+		 	</array>
+		 	<key>RunAtLoad</key>
+		 	<true/>
+		 </dict>
+		 </plist>
+		 """;
 
 	public static async Task AddOrRemoveStartupItemAsync(bool runOnSystemStartup)
 	{
diff --git a/WalletWasabi.Fluent/Helpers/TransactionFeeHelper.cs b/WalletWasabi.Fluent/Helpers/TransactionFeeHelper.cs
index f128de8211..ea1e5c7763 100644
--- a/WalletWasabi.Fluent/Helpers/TransactionFeeHelper.cs
+++ b/WalletWasabi.Fluent/Helpers/TransactionFeeHelper.cs
@@ -88,6 +88,7 @@ public static bool TryGetFeeEstimates(IWalletFeeRateProvider feeProvider, Networ
 		catch
 		{
 		}
+
 		return false;
 	}
 
diff --git a/WalletWasabi.Fluent/Helpers/TransactionHelpers.cs b/WalletWasabi.Fluent/Helpers/TransactionHelpers.cs
index 30c1991bc6..1b47194fb3 100644
--- a/WalletWasabi.Fluent/Helpers/TransactionHelpers.cs
+++ b/WalletWasabi.Fluent/Helpers/TransactionHelpers.cs
@@ -68,7 +68,7 @@ public static bool TryBuildTransactionWithoutPrevTx(
 			var network = keyManager.GetNetwork();
 			var builder = new TransactionFactory(network, keyManager, allCoins, new EmptyTransactionStore(network), password);
 
-			TransactionParameters parameters = new (
+			TransactionParameters parameters = new(
 				intent,
 				transactionInfo.FeeRate,
 				AllowUnconfirmed: true,
@@ -150,6 +150,7 @@ public static async Task<bool> ExportTransactionToBinaryAsync(BuildTransactionRe
 			{
 				filePath = $"{filePath}.{psbtExtension}";
 			}
+
 			await File.WriteAllBytesAsync(filePath, transaction.Psbt.ToBytes());
 
 			return true;
diff --git a/WalletWasabi.Fluent/Helpers/WalletHelpers.cs b/WalletWasabi.Fluent/Helpers/WalletHelpers.cs
index aa754751f2..b950870066 100644
--- a/WalletWasabi.Fluent/Helpers/WalletHelpers.cs
+++ b/WalletWasabi.Fluent/Helpers/WalletHelpers.cs
@@ -10,8 +10,8 @@ public static class WalletHelpers
 	public static WalletType GetType(KeyManager keyManager)
 	{
 		if (keyManager.Icon is { } icon &&
-			Enum.TryParse(typeof(WalletType), icon, true, out var type) &&
-			type is { })
+		    Enum.TryParse(typeof(WalletType), icon, true, out var type) &&
+		    type is { })
 		{
 			return (WalletType)type;
 		}
diff --git a/WalletWasabi.Fluent/HomeScreen/BuySell/Controls/OffersView.axaml b/WalletWasabi.Fluent/HomeScreen/BuySell/Controls/OffersView.axaml
index 71a3973667..9cdf8e3024 100644
--- a/WalletWasabi.Fluent/HomeScreen/BuySell/Controls/OffersView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/BuySell/Controls/OffersView.axaml
@@ -87,7 +87,8 @@
 
                     <!-- Amount and labels -->
                     <DockPanel DockPanel.Dock="Left" Margin="10 0 10 0" VerticalAlignment="Center">
-                      <StackPanel Orientation="Horizontal" Spacing="10" DockPanel.Dock="Bottom" HorizontalAlignment="Center">
+                      <StackPanel Orientation="Horizontal" Spacing="10" DockPanel.Dock="Bottom"
+                                  HorizontalAlignment="Center">
                         <StackPanel.Styles>
                           <Style Selector="Border">
                             <Setter Property="Padding" Value="8 2" />
@@ -119,18 +120,20 @@
                           </Style>
                         </StackPanel.Styles>
                         <Border>
-                          <StackPanel >
-                            <TextBlock Name="PaymentTb" Classes="title" Text="{x:Static lang:Resources.Payment}" ToolTip.Tip="{Binding #PaymentTb.Text}" />
+                          <StackPanel>
+                            <TextBlock Name="PaymentTb" Classes="title" Text="{x:Static lang:Resources.Payment}"
+                                       ToolTip.Tip="{Binding #PaymentTb.Text}" />
                             <TextBlock Classes="value" Text="{Binding Offer.MethodName}" />
                           </StackPanel>
                         </Border>
 
                         <Border>
-                          <StackPanel >
+                          <StackPanel>
                             <TextBlock Name="FeeTb" Classes="title" Text="{x:Static lang:Resources.Fee}" />
                             <TextBlock Classes="value" Text="{Binding Fee}" ToolTip.Tip="{Binding #FeeTb.Text}" />
                             <Viewbox Width="15" Height="15" Margin="0 -1 0 0" ClipToBounds="False">
-                              <PathIcon Opacity="0.6" Height="20" Width="20" Data="{StaticResource question_circle}" ToolTip.Tip="{Binding FeeToolTip}"/>
+                              <PathIcon Opacity="0.6" Height="20" Width="20" Data="{StaticResource question_circle}"
+                                        ToolTip.Tip="{Binding FeeToolTip}" />
                             </Viewbox>
                           </StackPanel>
                         </Border>
@@ -138,8 +141,9 @@
                       </StackPanel>
 
                       <!-- Amounts -->
-                      <CopyableItem ContentToCopy="{Binding Offer.AmountTo}" VerticalAlignment="Bottom" HorizontalAlignment="Center" DockPanel.Dock="Top">
-                        <TextBlock Text="{Binding Amount}" FontWeight="Bold" FontSize="20"  />
+                      <CopyableItem ContentToCopy="{Binding Offer.AmountTo}" VerticalAlignment="Bottom"
+                                    HorizontalAlignment="Center" DockPanel.Dock="Top">
+                        <TextBlock Text="{Binding Amount}" FontWeight="Bold" FontSize="20" />
                       </CopyableItem>
 
                     </DockPanel>
diff --git a/WalletWasabi.Fluent/HomeScreen/BuySell/Models/BuySellModel.cs b/WalletWasabi.Fluent/HomeScreen/BuySell/Models/BuySellModel.cs
index 0775533511..be821514ed 100644
--- a/WalletWasabi.Fluent/HomeScreen/BuySell/Models/BuySellModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/BuySell/Models/BuySellModel.cs
@@ -10,7 +10,6 @@
 using WalletWasabi.Daemon.BuySell;
 using WalletWasabi.Fluent.Extensions;
 using WalletWasabi.Fluent.HomeScreen.BuySell.Extensions;
-using WalletWasabi.Fluent.Infrastructure;
 using WalletWasabi.Logging;
 using WalletWasabi.Wallets;
 
diff --git a/WalletWasabi.Fluent/HomeScreen/BuySell/ViewModels/BuyOffersViewModel.cs b/WalletWasabi.Fluent/HomeScreen/BuySell/ViewModels/BuyOffersViewModel.cs
index f579086a9a..49027693d6 100644
--- a/WalletWasabi.Fluent/HomeScreen/BuySell/ViewModels/BuyOffersViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/BuySell/ViewModels/BuyOffersViewModel.cs
@@ -15,7 +15,6 @@ public partial class BuyOffersViewModel : OffersViewModel
 {
 	public BuyOffersViewModel(WalletModel wallet, IEnumerable<OfferModel> offers) : base(wallet, offers)
 	{
-
 	}
 
 	protected override OfferViewModel CreateOfferViewModel(OfferModel model)
diff --git a/WalletWasabi.Fluent/HomeScreen/BuySell/ViewModels/BuyViewModel.cs b/WalletWasabi.Fluent/HomeScreen/BuySell/ViewModels/BuyViewModel.cs
index a49877a09d..bbc5a487c2 100644
--- a/WalletWasabi.Fluent/HomeScreen/BuySell/ViewModels/BuyViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/BuySell/ViewModels/BuyViewModel.cs
@@ -130,7 +130,7 @@ private void ValidateAmount(IValidationErrors errors)
 
 		if (decimalAmount > MaxAmount)
 		{
-			errors.Add(ErrorSeverity.Error,Resources.AmountCannotExceed.SafeInject(MaxAmount.ToFormattedFiat(SelectedCurrency?.Ticker)));
+			errors.Add(ErrorSeverity.Error, Resources.AmountCannotExceed.SafeInject(MaxAmount.ToFormattedFiat(SelectedCurrency?.Ticker)));
 		}
 		else if (decimalAmount < MinAmount)
 		{
@@ -212,7 +212,6 @@ private async Task SetLimitsAsync()
 
 			MinAmount = min;
 			MaxAmount = max;
-
 		}
 		catch (Exception ex)
 		{
diff --git a/WalletWasabi.Fluent/HomeScreen/BuySell/ViewModels/OffersViewModel.cs b/WalletWasabi.Fluent/HomeScreen/BuySell/ViewModels/OffersViewModel.cs
index 4f17c62385..5fcdcf9e04 100644
--- a/WalletWasabi.Fluent/HomeScreen/BuySell/ViewModels/OffersViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/BuySell/ViewModels/OffersViewModel.cs
@@ -29,7 +29,7 @@ protected OffersViewModel(WalletModel wallet, IEnumerable<OfferModel> offers)
 		Title = Resources.Offers;
 		_wallet = wallet;
 
-		PaymentMethods = new []{_allText}.Concat(offers.Select(x => x.MethodName).Order()).Distinct();
+		PaymentMethods = new[] { _allText }.Concat(offers.Select(x => x.MethodName).Order()).Distinct();
 
 		_selectedPaymentMethod = UiContext.ApplicationSettings.BuySellConfiguration.BuyPaymentMethod ?? "";
 		if (string.IsNullOrEmpty(_selectedPaymentMethod) || !PaymentMethods.Contains(_selectedPaymentMethod))
diff --git a/WalletWasabi.Fluent/HomeScreen/BuySell/ViewModels/OrdersViewModel.cs b/WalletWasabi.Fluent/HomeScreen/BuySell/ViewModels/OrdersViewModel.cs
index fad2b9b0f8..a53a63aad1 100644
--- a/WalletWasabi.Fluent/HomeScreen/BuySell/ViewModels/OrdersViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/BuySell/ViewModels/OrdersViewModel.cs
@@ -63,23 +63,23 @@ protected override void OnNavigatedTo(bool isInHistory, CompositeDisposable disp
 		[
 			new SortableItem(Resources.Status)
 			{
-				SortByAscendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource) Source).SortBy(Source.Columns[0], ListSortDirection.Ascending)),
-				SortByDescendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource) Source).SortBy(Source.Columns[0], ListSortDirection.Descending))
+				SortByAscendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource)Source).SortBy(Source.Columns[0], ListSortDirection.Ascending)),
+				SortByDescendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource)Source).SortBy(Source.Columns[0], ListSortDirection.Descending))
 			},
 			new SortableItem(Resources.Date)
 			{
-				SortByAscendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource) Source).SortBy(Source.Columns[1], ListSortDirection.Ascending)),
-				SortByDescendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource) Source).SortBy(Source.Columns[1], ListSortDirection.Descending))
+				SortByAscendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource)Source).SortBy(Source.Columns[1], ListSortDirection.Ascending)),
+				SortByDescendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource)Source).SortBy(Source.Columns[1], ListSortDirection.Descending))
 			},
 			new SortableItem(Resources.Amount)
 			{
-				SortByAscendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource) Source).SortBy(Source.Columns[2], ListSortDirection.Ascending)),
-				SortByDescendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource) Source).SortBy(Source.Columns[2], ListSortDirection.Descending))
+				SortByAscendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource)Source).SortBy(Source.Columns[2], ListSortDirection.Ascending)),
+				SortByDescendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource)Source).SortBy(Source.Columns[2], ListSortDirection.Descending))
 			},
 			new SortableItem(Resources.Provider)
 			{
-				SortByAscendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource) Source).SortBy(Source.Columns[3], ListSortDirection.Ascending)),
-				SortByDescendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource) Source).SortBy(Source.Columns[3], ListSortDirection.Descending))
+				SortByAscendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource)Source).SortBy(Source.Columns[3], ListSortDirection.Ascending)),
+				SortByDescendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource)Source).SortBy(Source.Columns[3], ListSortDirection.Descending))
 			},
 		];
 	}
diff --git a/WalletWasabi.Fluent/HomeScreen/BuySell/Views/BuyView.axaml b/WalletWasabi.Fluent/HomeScreen/BuySell/Views/BuyView.axaml
index 75a3d3716d..94ac04e12b 100644
--- a/WalletWasabi.Fluent/HomeScreen/BuySell/Views/BuyView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/BuySell/Views/BuyView.axaml
@@ -29,7 +29,7 @@
               Theme="{StaticResource OutlineButton}">
         <StackPanel Orientation="Horizontal">
           <TextBlock Opacity="0.8" FontSize="12" Text="{Binding SelectedCountry.StateName, StringFormat='{}{0}, '}"
-                     IsVisible="{Binding SelectedCountry.StateName, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
+                     IsVisible="{Binding SelectedCountry.StateName, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
           <TextBlock Opacity="0.8" FontSize="12" Text="{Binding SelectedCountry.CountryName}" />
         </StackPanel>
       </Button>
diff --git a/WalletWasabi.Fluent/HomeScreen/BuySell/Views/Columns/OrderActionsColumnView.axaml b/WalletWasabi.Fluent/HomeScreen/BuySell/Views/Columns/OrderActionsColumnView.axaml
index c630b04e7b..78ad1da1db 100644
--- a/WalletWasabi.Fluent/HomeScreen/BuySell/Views/Columns/OrderActionsColumnView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/BuySell/Views/Columns/OrderActionsColumnView.axaml
@@ -8,7 +8,8 @@
              x:DataType="viewModels:OrderViewModel"
              x:CompileBindings="True"
              x:Class="WalletWasabi.Fluent.HomeScreen.BuySell.Views.Columns.OrderActionsColumnView">
-  <Border CornerRadius="30" HorizontalAlignment="Right" Margin="0 0 2 0" Background="{DynamicResource Layer2BackgroundBrush}">
+  <Border CornerRadius="30" HorizontalAlignment="Right" Margin="0 0 2 0"
+          Background="{DynamicResource Layer2BackgroundBrush}">
     <Border.Styles>
       <Style Selector="AnimatedButton /template/ PathIcon">
         <Setter Property="Height" Value="15" />
diff --git a/WalletWasabi.Fluent/HomeScreen/BuySell/Views/OrderDetailsView.axaml b/WalletWasabi.Fluent/HomeScreen/BuySell/Views/OrderDetailsView.axaml
index 0854c0c2df..3da3416758 100644
--- a/WalletWasabi.Fluent/HomeScreen/BuySell/Views/OrderDetailsView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/BuySell/Views/OrderDetailsView.axaml
@@ -28,7 +28,7 @@
       <PreviewItem Icon="{StaticResource btc_logo}"
                    Label="{x:Static lang:Resources.Amount}"
                    CopyableContent="{Binding Amount}">
-        <PrivacyContentControl Content="{Binding Amount}"/>
+        <PrivacyContentControl Content="{Binding Amount}" />
       </PreviewItem>
 
       <Separator />
@@ -36,7 +36,7 @@
       <!-- Status -->
       <PreviewItem Icon="{StaticResource copy_confirmed}"
                    Label="{x:Static lang:Resources.Status}">
-        <PrivacyContentControl Content="{Binding Status}"/>
+        <PrivacyContentControl Content="{Binding Status}" />
       </PreviewItem>
 
       <Separator />
@@ -56,7 +56,7 @@
       <PreviewItem Icon="{StaticResource entities_regular}"
                    Label="Provider"
                    CopyableContent="{Binding Provider}">
-        <PrivacyContentControl Content="{Binding Provider}"/>
+        <PrivacyContentControl Content="{Binding Provider}" />
       </PreviewItem>
 
     </StackPanel>
diff --git a/WalletWasabi.Fluent/HomeScreen/BuySell/Views/OrdersView.axaml b/WalletWasabi.Fluent/HomeScreen/BuySell/Views/OrdersView.axaml
index b042b343c2..b9ff7322bf 100644
--- a/WalletWasabi.Fluent/HomeScreen/BuySell/Views/OrdersView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/BuySell/Views/OrdersView.axaml
@@ -16,7 +16,8 @@
                EnableBack="{Binding EnableBack}"
                ScrollViewer.VerticalScrollBarVisibility="Disabled">
     <ContentArea.TopContent>
-      <Button DockPanel.Dock="Right" Theme="{StaticResource DialogSortButton}" ToolTip.Tip="{x:Static lang:Resources.Sorting}">
+      <Button DockPanel.Dock="Right" Theme="{StaticResource DialogSortButton}"
+              ToolTip.Tip="{x:Static lang:Resources.Sorting}">
         <Button.Flyout>
           <Flyout Placement="BottomEdgeAlignedRight">
             <sorting:SortControl Sortables="{Binding Sortables}" />
diff --git a/WalletWasabi.Fluent/HomeScreen/BuySell/Views/SelectCountryView.axaml b/WalletWasabi.Fluent/HomeScreen/BuySell/Views/SelectCountryView.axaml
index 44beda119c..4db52fd93d 100644
--- a/WalletWasabi.Fluent/HomeScreen/BuySell/Views/SelectCountryView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/BuySell/Views/SelectCountryView.axaml
@@ -21,7 +21,7 @@
     <StackPanel Spacing="15" VerticalAlignment="Center">
       <StackPanel.Styles>
         <Style Selector="DockPanel > TextBlock">
-          <Setter Property="MinWidth" Value="80"/>
+          <Setter Property="MinWidth" Value="80" />
         </Style>
       </StackPanel.Styles>
 
diff --git a/WalletWasabi.Fluent/HomeScreen/BuySell/Views/SellSuccessView.axaml b/WalletWasabi.Fluent/HomeScreen/BuySell/Views/SellSuccessView.axaml
index 71c0501fb5..b117dd9a03 100644
--- a/WalletWasabi.Fluent/HomeScreen/BuySell/Views/SellSuccessView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/BuySell/Views/SellSuccessView.axaml
@@ -34,11 +34,14 @@
 
     <DockPanel VerticalAlignment="Center">
 
-      <TextBlock Margin="80 40" DockPanel.Dock="Bottom" HorizontalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap">
+      <TextBlock Margin="80 40" DockPanel.Dock="Bottom" HorizontalAlignment="Center" TextAlignment="Center"
+                 TextWrapping="Wrap">
         <Run Text="{x:Static lang:Resources.SellSuccessText1}" />
-        <Run Text="{x:Static lang:Resources.SellSuccessText2}" FontWeight="Bold" Foreground="{DynamicResource SystemAccentCustomColorLight}" />
+        <Run Text="{x:Static lang:Resources.SellSuccessText2}" FontWeight="Bold"
+             Foreground="{DynamicResource SystemAccentCustomColorLight}" />
         <Run Text="{x:Static lang:Resources.SellSuccessText3}" />
-        <Run Text="{x:Static lang:Resources.SellSuccessText4}" FontWeight="Bold" Foreground="{DynamicResource SystemAccentCustomColorLight}"/>
+        <Run Text="{x:Static lang:Resources.SellSuccessText4}" FontWeight="Bold"
+             Foreground="{DynamicResource SystemAccentCustomColorLight}" />
         <Run Text="{x:Static lang:Resources.SellSuccessText5}" />
       </TextBlock>
 
@@ -47,7 +50,7 @@
                    FontWeight="Bold"
                    Text="{Binding Provider}"
                    Foreground="{DynamicResource SystemAccentCustomColorDark}"
-                   Opacity="0.8"/>
+                   Opacity="0.8" />
       </Viewbox>
 
     </DockPanel>
@@ -55,4 +58,3 @@
 
   </ContentArea>
 </UserControl>
-
diff --git a/WalletWasabi.Fluent/HomeScreen/BuySell/Views/SellSuccessView.axaml.cs b/WalletWasabi.Fluent/HomeScreen/BuySell/Views/SellSuccessView.axaml.cs
index f3ebba2faa..c1a45303b0 100644
--- a/WalletWasabi.Fluent/HomeScreen/BuySell/Views/SellSuccessView.axaml.cs
+++ b/WalletWasabi.Fluent/HomeScreen/BuySell/Views/SellSuccessView.axaml.cs
@@ -15,4 +15,3 @@ private void InitializeComponent()
 		AvaloniaXamlLoader.Load(this);
 	}
 }
-
diff --git a/WalletWasabi.Fluent/HomeScreen/BuySell/Views/SellView.axaml b/WalletWasabi.Fluent/HomeScreen/BuySell/Views/SellView.axaml
index 1c62140d68..449aeceb20 100644
--- a/WalletWasabi.Fluent/HomeScreen/BuySell/Views/SellView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/BuySell/Views/SellView.axaml
@@ -23,7 +23,7 @@
               Theme="{StaticResource OutlineButton}">
         <StackPanel Orientation="Horizontal">
           <TextBlock Opacity="0.8" FontSize="12" Text="{Binding SelectedCountry.StateName, StringFormat='{}{0}, '}"
-                     IsVisible="{Binding SelectedCountry.StateName, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
+                     IsVisible="{Binding SelectedCountry.StateName, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
           <TextBlock Opacity="0.8" FontSize="12" Text="{Binding SelectedCountry.CountryName}" />
         </StackPanel>
       </Button>
@@ -55,7 +55,8 @@
 
         <!-- Amount -->
         <Label Grid.Row="0" Grid.Column="0"
-               Margin="0 8 0 0" VerticalAlignment="Top" Content="{x:Static lang:Resources.AmountWithColom}" Target="amountTb" />
+               Margin="0 8 0 0" VerticalAlignment="Top" Content="{x:Static lang:Resources.AmountWithColom}"
+               Target="amountTb" />
         <DualCurrencyEntryBox Grid.Row="0" Grid.Column="2"
                               x:Name="amountTb"
                               AmountBtc="{Binding Amount}"
@@ -96,7 +97,8 @@
             </ComboBox.ItemTemplate>
           </ComboBox>
 
-          <Viewbox Margin="5 0 0 0" DockPanel.Dock="Left" HorizontalAlignment="Left" VerticalAlignment="Center" Height="25" IsVisible="{Binding FetchingLimits}">
+          <Viewbox Margin="5 0 0 0" DockPanel.Dock="Left" HorizontalAlignment="Left" VerticalAlignment="Center"
+                   Height="25" IsVisible="{Binding FetchingLimits}">
             <ProgressRing Height="46" Width="46" Margin="10 0" IsIndeterminate="{Binding FetchingLimits}" />
           </Viewbox>
 
diff --git a/WalletWasabi.Fluent/HomeScreen/CoinjoinPlayer/View/CoinjoinPlayerControlView.axaml b/WalletWasabi.Fluent/HomeScreen/CoinjoinPlayer/View/CoinjoinPlayerControlView.axaml
index 6438e7cd5a..e0b8e5cd64 100644
--- a/WalletWasabi.Fluent/HomeScreen/CoinjoinPlayer/View/CoinjoinPlayerControlView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/CoinjoinPlayer/View/CoinjoinPlayerControlView.axaml
@@ -63,7 +63,8 @@
           <StackPanel Spacing="5">
             <TransitioningContentControl MinWidth="350" MaxWidth="350" MinHeight="18" Content="{Binding CurrentStatus}">
               <TransitioningContentControl.PageTransition>
-                <PageSlide Duration="0:0:0.125" Orientation="Vertical" SlideInEasing="0.4,0,0.6,1" SlideOutEasing="0.4,0,0.6,1" />
+                <PageSlide Duration="0:0:0.125" Orientation="Vertical" SlideInEasing="0.4,0,0.6,1"
+                           SlideOutEasing="0.4,0,0.6,1" />
               </TransitioningContentControl.PageTransition>
               <TransitioningContentControl.DataTemplates>
                 <DataTemplate DataType="x:String">
@@ -72,7 +73,8 @@
               </TransitioningContentControl.DataTemplates>
             </TransitioningContentControl>
 
-            <ProgressBar Minimum="0" Maximum="100" IsIndeterminate="{Binding IsCountDownDelayHappening}" Value="{Binding ProgressValue}">
+            <ProgressBar Minimum="0" Maximum="100" IsIndeterminate="{Binding IsCountDownDelayHappening}"
+                         Value="{Binding ProgressValue}">
               <ProgressBar.Foreground>
                 <SolidColorBrush Color="{DynamicResource SystemAccentColorLight3}" Opacity="0.8" />
               </ProgressBar.Foreground>
@@ -110,12 +112,14 @@
           <Button Classes="plain" IsVisible="{Binding CanNavigateToCoinjoinSettings^}">
             <Button.Flyout>
               <MenuFlyout Placement="Top">
-                <MenuItem Header="{x:Static lang:Resources.CoinjoinSettings}" Command="{Binding NavigateToSettingsCommand}">
+                <MenuItem Header="{x:Static lang:Resources.CoinjoinSettings}"
+                          Command="{Binding NavigateToSettingsCommand}">
                   <MenuItem.Icon>
                     <PathIcon Data="{StaticResource settings_general_regular}" />
                   </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem Header="{x:Static lang:Resources.ExcludedCoinsViewModelTitle}" Command="{Binding NavigateToExcludedCoinsCommand}">
+                <MenuItem Header="{x:Static lang:Resources.ExcludedCoinsViewModelTitle}"
+                          Command="{Binding NavigateToExcludedCoinsCommand}">
                   <MenuItem.Icon>
                     <PathIcon Data="{StaticResource exclude_coins}" />
                   </MenuItem.Icon>
diff --git a/WalletWasabi.Fluent/HomeScreen/CoinjoinPlayer/View/ExcludedCoinsView.axaml b/WalletWasabi.Fluent/HomeScreen/CoinjoinPlayer/View/ExcludedCoinsView.axaml
index 55345c63a0..6aafa482f9 100644
--- a/WalletWasabi.Fluent/HomeScreen/CoinjoinPlayer/View/ExcludedCoinsView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/CoinjoinPlayer/View/ExcludedCoinsView.axaml
@@ -20,7 +20,8 @@
                ScrollViewer.VerticalScrollBarVisibility="Disabled">
     <ContentArea.TopContent>
       <StackPanel Orientation="Horizontal" Spacing="4">
-        <Button DockPanel.Dock="Right" Theme="{StaticResource DialogSortButton}" ToolTip.Tip="{x:Static lang:Resources.Sorting}">
+        <Button DockPanel.Dock="Right" Theme="{StaticResource DialogSortButton}"
+                ToolTip.Tip="{x:Static lang:Resources.Sorting}">
           <Button.Flyout>
             <Flyout Placement="BottomEdgeAlignedRight">
               <sorting:SortControl Sortables="{Binding CoinList.Sortables}" />
diff --git a/WalletWasabi.Fluent/HomeScreen/CoinjoinPlayer/ViewModel/CoinjoinPlayerViewModel.cs b/WalletWasabi.Fluent/HomeScreen/CoinjoinPlayer/ViewModel/CoinjoinPlayerViewModel.cs
index 2fafd9051a..4f221a737d 100644
--- a/WalletWasabi.Fluent/HomeScreen/CoinjoinPlayer/ViewModel/CoinjoinPlayerViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/CoinjoinPlayer/ViewModel/CoinjoinPlayerViewModel.cs
@@ -77,16 +77,16 @@ public CoinjoinPlayerViewModel(WalletModel wallet, WalletSettingsViewModel setti
 		_wallet = wallet;
 
 		wallet.Coinjoin.StatusUpdated
-					   .Do(ProcessStatusChange)
-					   .Subscribe();
+			.Do(ProcessStatusChange)
+			.Subscribe();
 
 		wallet.Privacy.IsWalletPrivate
-					  .BindTo(this, x => x.AreAllCoinsPrivate);
+			.BindTo(this, x => x.AreAllCoinsPrivate);
 
 		var initialState =
 			wallet.Settings.AutoCoinjoin
-			? State.WaitingForAutoStart
-			: State.StoppedOrPaused;
+				? State.WaitingForAutoStart
+				: State.StoppedOrPaused;
 
 		if (wallet.IsHardwareWallet || wallet.IsWatchOnlyWallet)
 		{
@@ -103,8 +103,8 @@ public CoinjoinPlayerViewModel(WalletModel wallet, WalletSettingsViewModel setti
 		ConfigureStateMachine();
 
 		wallet.Balances
-			  .Do(_ => _stateMachine.Fire(Trigger.BalanceChanged))
-			  .Subscribe();
+			.Do(_ => _stateMachine.Fire(Trigger.BalanceChanged))
+			.Subscribe();
 
 		this.WhenAnyValue(x => x.AreAllCoinsPrivate)
 			.Do(_ => _stateMachine.Fire(Trigger.AreAllCoinsPrivateChanged))
@@ -133,12 +133,12 @@ public CoinjoinPlayerViewModel(WalletModel wallet, WalletSettingsViewModel setti
 			.Subscribe();
 
 		wallet.Settings.WhenAnyValue(x => x.PlebStopThreshold)
-					   .SubscribeAsync(async _ =>
-					   {
-						   // Hack: we take the value from KeyManager but it is saved later.
-						   await Task.Delay(1500);
-						   _stateMachine.Fire(Trigger.PlebStopChanged);
-					   });
+			.SubscribeAsync(async _ =>
+			{
+				// Hack: we take the value from KeyManager but it is saved later.
+				await Task.Delay(1500);
+				_stateMachine.Fire(Trigger.PlebStopChanged);
+			});
 
 		_autoCoinJoinStartTimer = new DispatcherTimer { Interval = TimeSpan.FromMinutes(Random.Shared.Next(5, 16)) };
 		_autoCoinJoinStartTimer.Tick += async (_, _) =>
@@ -405,6 +405,7 @@ private void OnCoinJoinPhaseChanged(CoinJoinProgressEventArgs coinJoinProgress)
 					};
 					StopCountDown();
 				}
+
 				break;
 
 			case EnteringOutputRegistrationPhase outputRegPhase:
@@ -435,8 +436,8 @@ private void OnCoinJoinPhaseChanged(CoinJoinProgressEventArgs coinJoinProgress)
 
 				var startTime = confirmationPhase.TimeoutAt - confirmationPhase.RoundState.CoinjoinState.Parameters.ConnectionConfirmationTimeout;
 				var totalEndTime = confirmationPhase.TimeoutAt +
-								   confirmationPhase.RoundState.CoinjoinState.Parameters.OutputRegistrationTimeout +
-								   confirmationPhase.RoundState.CoinjoinState.Parameters.TransactionSigningTimeout;
+				                   confirmationPhase.RoundState.CoinjoinState.Parameters.OutputRegistrationTimeout +
+				                   confirmationPhase.RoundState.CoinjoinState.Parameters.TransactionSigningTimeout;
 
 				StartCountDown(
 					message: CoinJoinInProgress,
diff --git a/WalletWasabi.Fluent/HomeScreen/History/ViewModels/Actions/CoinJoinDetailsViewModel.cs b/WalletWasabi.Fluent/HomeScreen/History/ViewModels/Actions/CoinJoinDetailsViewModel.cs
index e821db632c..c78368c414 100644
--- a/WalletWasabi.Fluent/HomeScreen/History/ViewModels/Actions/CoinJoinDetailsViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/History/ViewModels/Actions/CoinJoinDetailsViewModel.cs
@@ -37,9 +37,9 @@ protected override void OnNavigatedTo(bool isInHistory, CompositeDisposable disp
 		base.OnNavigatedTo(isInHistory, disposables);
 
 		_wallet.Transactions.Cache
-							.Connect()
-							.Subscribe(_ => Update())
-							.DisposeWith(disposables);
+			.Connect()
+			.Subscribe(_ => Update())
+			.DisposeWith(disposables);
 	}
 
 	private void Update()
diff --git a/WalletWasabi.Fluent/HomeScreen/History/ViewModels/Actions/CoinJoinsDetailsViewModel.cs b/WalletWasabi.Fluent/HomeScreen/History/ViewModels/Actions/CoinJoinsDetailsViewModel.cs
index 5612656908..87be34ca92 100644
--- a/WalletWasabi.Fluent/HomeScreen/History/ViewModels/Actions/CoinJoinsDetailsViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/History/ViewModels/Actions/CoinJoinsDetailsViewModel.cs
@@ -46,10 +46,10 @@ protected override void OnNavigatedTo(bool isInHistory, CompositeDisposable disp
 		base.OnNavigatedTo(isInHistory, disposables);
 
 		_wallet.Transactions.Cache
-			                .Connect()
-							.Do(_ => Update())
-							.Subscribe()
-							.DisposeWith(disposables);
+			.Connect()
+			.Do(_ => Update())
+			.Subscribe()
+			.DisposeWith(disposables);
 	}
 
 	private void Update()
diff --git a/WalletWasabi.Fluent/HomeScreen/History/ViewModels/Actions/TransactionDetailsViewModel.cs b/WalletWasabi.Fluent/HomeScreen/History/ViewModels/Actions/TransactionDetailsViewModel.cs
index e70eee79a6..531bf301ac 100644
--- a/WalletWasabi.Fluent/HomeScreen/History/ViewModels/Actions/TransactionDetailsViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/History/ViewModels/Actions/TransactionDetailsViewModel.cs
@@ -101,10 +101,10 @@ protected override void OnNavigatedTo(bool isInHistory, CompositeDisposable disp
 		base.OnNavigatedTo(isInHistory, disposables);
 
 		_wallet.Transactions.Cache
-							.Connect()
-							.Do(_ => UpdateCurrentTransaction())
-							.Subscribe()
-							.DisposeWith(disposables);
+			.Connect()
+			.Do(_ => UpdateCurrentTransaction())
+			.Subscribe()
+			.DisposeWith(disposables);
 	}
 
 	private void UpdateCurrentTransaction()
diff --git a/WalletWasabi.Fluent/HomeScreen/History/Views/Actions/TransactionDetailsView.axaml b/WalletWasabi.Fluent/HomeScreen/History/Views/Actions/TransactionDetailsView.axaml
index b08d7fa4c5..54dd354ec5 100644
--- a/WalletWasabi.Fluent/HomeScreen/History/Views/Actions/TransactionDetailsView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/History/Views/Actions/TransactionDetailsView.axaml
@@ -38,7 +38,8 @@
       <!-- Destination Address -->
       <PreviewItem Name="DestinationSection" Icon="{StaticResource transceive_regular}"
                    CopyableContent="{Binding SingleAddress}"
-                   Label="{x:Static lang:Resources.DestinationAddresses}" IsVisible="{Binding !!DestinationAddresses.Count}">
+                   Label="{x:Static lang:Resources.DestinationAddresses}"
+                   IsVisible="{Binding !!DestinationAddresses.Count}">
         <ItemsControl ItemsSource="{Binding DestinationAddresses}">
           <ItemsControl.ItemTemplate>
             <DataTemplate>
diff --git a/WalletWasabi.Fluent/HomeScreen/History/Views/Columns/IndicatorsColumnView.axaml b/WalletWasabi.Fluent/HomeScreen/History/Views/Columns/IndicatorsColumnView.axaml
index 2288ebf8af..59fb3cf688 100644
--- a/WalletWasabi.Fluent/HomeScreen/History/Views/Columns/IndicatorsColumnView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/History/Views/Columns/IndicatorsColumnView.axaml
@@ -13,10 +13,11 @@
   <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Spacing="10" Margin="0 0 20 0">
 
     <!--First icon (Confirmation Status) -->
-    <PathIcon Classes.Confirmed="{Binding Transaction.Status, ConverterParameter={x:Static model:TransactionStatus.Confirmed}, Converter={x:Static converters:EnumToBoolConverter.Instance}}"
-              Classes.Pending="{Binding Transaction.Status, ConverterParameter={x:Static model:TransactionStatus.Pending}, Converter={x:Static converters:EnumToBoolConverter.Instance}}"
-              ToolTip.Tip="{Binding Transaction.ConfirmedTooltip}"
-              Opacity="0.6">
+    <PathIcon
+      Classes.Confirmed="{Binding Transaction.Status, ConverterParameter={x:Static model:TransactionStatus.Confirmed}, Converter={x:Static converters:EnumToBoolConverter.Instance}}"
+      Classes.Pending="{Binding Transaction.Status, ConverterParameter={x:Static model:TransactionStatus.Pending}, Converter={x:Static converters:EnumToBoolConverter.Instance}}"
+      ToolTip.Tip="{Binding Transaction.ConfirmedTooltip}"
+      Opacity="0.6">
       <PathIcon.Styles>
         <Style Selector="PathIcon.Confirmed">
           <Setter Property="Data" Value="{StaticResource checkmark_filled}" />
diff --git a/WalletWasabi.Fluent/HomeScreen/Others/Views/WalletCoinsView.axaml b/WalletWasabi.Fluent/HomeScreen/Others/Views/WalletCoinsView.axaml
index 0d42ba9238..b70d2d64d1 100644
--- a/WalletWasabi.Fluent/HomeScreen/Others/Views/WalletCoinsView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/Others/Views/WalletCoinsView.axaml
@@ -18,7 +18,8 @@
                ScrollViewer.VerticalScrollBarVisibility="Disabled"
                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
     <ContentArea.TopContent>
-      <Button DockPanel.Dock="Right" Theme="{StaticResource DialogSortButton}"  ToolTip.Tip="{x:Static lang:Resources.Sorting}">
+      <Button DockPanel.Dock="Right" Theme="{StaticResource DialogSortButton}"
+              ToolTip.Tip="{x:Static lang:Resources.Sorting}">
         <Button.Flyout>
           <Flyout Placement="BottomEdgeAlignedRight">
             <sorting:SortControl Sortables="{Binding CoinList.Sortables}" />
diff --git a/WalletWasabi.Fluent/HomeScreen/Receive/ViewModels/ReceiveAddressViewModel.cs b/WalletWasabi.Fluent/HomeScreen/Receive/ViewModels/ReceiveAddressViewModel.cs
index e2b6db8bb1..ca278bc2c3 100644
--- a/WalletWasabi.Fluent/HomeScreen/Receive/ViewModels/ReceiveAddressViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/Receive/ViewModels/ReceiveAddressViewModel.cs
@@ -65,14 +65,13 @@ protected override void OnNavigatedTo(bool isInHistory, CompositeDisposable disp
 		_wallet.Addresses.Unused
 			.ToObservableChangeSet()
 			.ObserveOn(RxApp.MainThreadScheduler)
-			.OnItemRemoved(
-				address =>
+			.OnItemRemoved(address =>
+			{
+				if (Equals(address, Model))
 				{
-					if (Equals(address, Model))
-					{
-						UiContext.Navigate(CurrentTarget).BackTo<ReceiveViewModel>();
-					}
-				})
+					UiContext.Navigate(CurrentTarget).BackTo<ReceiveViewModel>();
+				}
+			})
 			.Subscribe()
 			.DisposeWith(disposables);
 
diff --git a/WalletWasabi.Fluent/HomeScreen/Receive/ViewModels/ReceiveAddressesDataGridSource.cs b/WalletWasabi.Fluent/HomeScreen/Receive/ViewModels/ReceiveAddressesDataGridSource.cs
index 8107925c5c..c614611185 100644
--- a/WalletWasabi.Fluent/HomeScreen/Receive/ViewModels/ReceiveAddressesDataGridSource.cs
+++ b/WalletWasabi.Fluent/HomeScreen/Receive/ViewModels/ReceiveAddressesDataGridSource.cs
@@ -35,7 +35,6 @@ private static IColumn<AddressViewModel> TypeColumn()
 				CanUserSortColumn = true,
 				CompareAscending = Sort<AddressViewModel>.Ascending(x => x.Type),
 				CompareDescending = Sort<AddressViewModel>.Descending(x => x.Type)
-
 			},
 			width: new GridLength(0, GridUnitType.Auto));
 	}
diff --git a/WalletWasabi.Fluent/HomeScreen/Receive/ViewModels/ReceiveAddressesViewModel.cs b/WalletWasabi.Fluent/HomeScreen/Receive/ViewModels/ReceiveAddressesViewModel.cs
index 4fc401c3cf..fc6bbd333f 100644
--- a/WalletWasabi.Fluent/HomeScreen/Receive/ViewModels/ReceiveAddressesViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/Receive/ViewModels/ReceiveAddressesViewModel.cs
@@ -50,9 +50,9 @@ protected override void OnNavigatedTo(bool isInHistory, CompositeDisposable disp
 
 		Sortables =
 		[
-			new SortableItem(Resources.Type) { SortByAscendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource) Source).SortBy(Source.Columns[0], ListSortDirection.Ascending)), SortByDescendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource) Source).SortBy(Source.Columns[0], ListSortDirection.Descending)) },
-			new SortableItem(Resources.Address) { SortByAscendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource) Source).SortBy(Source.Columns[1], ListSortDirection.Ascending)), SortByDescendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource) Source).SortBy(Source.Columns[1], ListSortDirection.Descending)) },
-			new SortableItem(Resources.Label) { SortByAscendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource) Source).SortBy(Source.Columns[2], ListSortDirection.Ascending)), SortByDescendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource) Source).SortBy(Source.Columns[2], ListSortDirection.Descending)) }
+			new SortableItem(Resources.Type) { SortByAscendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource)Source).SortBy(Source.Columns[0], ListSortDirection.Ascending)), SortByDescendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource)Source).SortBy(Source.Columns[0], ListSortDirection.Descending)) },
+			new SortableItem(Resources.Address) { SortByAscendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource)Source).SortBy(Source.Columns[1], ListSortDirection.Ascending)), SortByDescendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource)Source).SortBy(Source.Columns[1], ListSortDirection.Descending)) },
+			new SortableItem(Resources.Label) { SortByAscendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource)Source).SortBy(Source.Columns[2], ListSortDirection.Ascending)), SortByDescendingCommand = ReactiveCommand.Create(() => ((ITreeDataGridSource)Source).SortBy(Source.Columns[2], ListSortDirection.Descending)) }
 		];
 
 		base.OnNavigatedTo(isInHistory, disposables);
diff --git a/WalletWasabi.Fluent/HomeScreen/Receive/Views/AddressLabelEditView.axaml b/WalletWasabi.Fluent/HomeScreen/Receive/Views/AddressLabelEditView.axaml
index 391909a21b..00ffba1cab 100644
--- a/WalletWasabi.Fluent/HomeScreen/Receive/Views/AddressLabelEditView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/Receive/Views/AddressLabelEditView.axaml
@@ -9,22 +9,22 @@
              x:CompileBindings="True"
              x:Class="WalletWasabi.Fluent.HomeScreen.Receive.Views.AddressLabelEditView">
   <ContentArea Title="{Binding Title}"
-                 Caption="{x:Static lang:Resources.EditSelectedAddressLabels}"
-                 EnableBack="{Binding EnableBack}"
-                 EnableCancel="{Binding EnableCancel}"
-                 EnableNext="True" NextContent="{x:Static lang:Resources.Save}"
-                 Height="280">
+               Caption="{x:Static lang:Resources.EditSelectedAddressLabels}"
+               EnableBack="{Binding EnableBack}"
+               EnableCancel="{Binding EnableCancel}"
+               EnableNext="True" NextContent="{x:Static lang:Resources.Save}"
+               Height="280">
     <TagsBox x:Name="LabelTagBox"
-               TagSeparator=","
-               Items="{Binding SuggestionLabels.Labels}"
-               Suggestions="{Binding SuggestionLabels.Suggestions}"
-               TopItems="{Binding SuggestionLabels.TopSuggestions}"
-               SuggestionsAreCaseSensitive="True"
-               RestrictInputToSuggestions="False"
-               VerticalAlignment="Top"
-               MaxWidth="320"
-               IsCurrentTextValid="{Binding IsCurrentTextValid, Mode=OneWayToSource}"
-               MaxTextLength="{StaticResource MaxLabelLength}">
+             TagSeparator=","
+             Items="{Binding SuggestionLabels.Labels}"
+             Suggestions="{Binding SuggestionLabels.Suggestions}"
+             TopItems="{Binding SuggestionLabels.TopSuggestions}"
+             SuggestionsAreCaseSensitive="True"
+             RestrictInputToSuggestions="False"
+             VerticalAlignment="Top"
+             MaxWidth="320"
+             IsCurrentTextValid="{Binding IsCurrentTextValid, Mode=OneWayToSource}"
+             MaxTextLength="{StaticResource MaxLabelLength}">
       <Interaction.Behaviors>
         <FocusOnAttachedBehavior />
       </Interaction.Behaviors>
diff --git a/WalletWasabi.Fluent/HomeScreen/Receive/Views/Columns/ActionsColumnView.axaml b/WalletWasabi.Fluent/HomeScreen/Receive/Views/Columns/ActionsColumnView.axaml
index 724e5fa200..5872493c99 100644
--- a/WalletWasabi.Fluent/HomeScreen/Receive/Views/Columns/ActionsColumnView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/Receive/Views/Columns/ActionsColumnView.axaml
@@ -8,7 +8,8 @@
              x:DataType="viewModels:AddressViewModel"
              x:CompileBindings="True"
              x:Class="WalletWasabi.Fluent.HomeScreen.Receive.Views.Columns.ActionsColumnView">
-  <Border CornerRadius="30" HorizontalAlignment="Right" Margin="0 0 2 0" Background="{DynamicResource Layer2BackgroundBrush}">
+  <Border CornerRadius="30" HorizontalAlignment="Right" Margin="0 0 2 0"
+          Background="{DynamicResource Layer2BackgroundBrush}">
     <Border.Styles>
       <Style Selector="AnimatedButton /template/ PathIcon">
         <Setter Property="Height" Value="15" />
diff --git a/WalletWasabi.Fluent/HomeScreen/Receive/Views/Columns/AddressColumnView.axaml b/WalletWasabi.Fluent/HomeScreen/Receive/Views/Columns/AddressColumnView.axaml
index f57f288b68..ef54e6efe8 100644
--- a/WalletWasabi.Fluent/HomeScreen/Receive/Views/Columns/AddressColumnView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/Receive/Views/Columns/AddressColumnView.axaml
@@ -13,7 +13,7 @@
                            Classes="monoSpaced bold"
                            UseOpacity="True"
                            MaxWidth="390">
-      <TextBlock Text="{Binding AddressText}" ToolTip.Tip="{Binding AddressText}" TextTrimming="CharacterEllipsis"/>
+      <TextBlock Text="{Binding AddressText}" ToolTip.Tip="{Binding AddressText}" TextTrimming="CharacterEllipsis" />
     </PrivacyContentControl>
   </DockPanel>
 </UserControl>
diff --git a/WalletWasabi.Fluent/HomeScreen/Receive/Views/Columns/TypeColumnView.axaml b/WalletWasabi.Fluent/HomeScreen/Receive/Views/Columns/TypeColumnView.axaml
index e394418ef4..5a0c37c6a9 100644
--- a/WalletWasabi.Fluent/HomeScreen/Receive/Views/Columns/TypeColumnView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/Receive/Views/Columns/TypeColumnView.axaml
@@ -18,7 +18,7 @@
         <TextBlock FontSize="9"
                    HorizontalAlignment="Center"
                    Text="{Binding ShortType}"
-                   ToolTip.Tip="{Binding Type}"/>
+                   ToolTip.Tip="{Binding Type}" />
       </Border>
     </PrivacyContentControl>
   </DockPanel>
diff --git a/WalletWasabi.Fluent/HomeScreen/Receive/Views/ConfirmHideAddressView.axaml b/WalletWasabi.Fluent/HomeScreen/Receive/Views/ConfirmHideAddressView.axaml
index 29c8420e51..64fe229c11 100644
--- a/WalletWasabi.Fluent/HomeScreen/Receive/Views/ConfirmHideAddressView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/Receive/Views/ConfirmHideAddressView.axaml
@@ -9,17 +9,18 @@
              x:CompileBindings="True"
              x:Class="WalletWasabi.Fluent.HomeScreen.Receive.Views.ConfirmHideAddressView">
   <ContentArea Title="{Binding Title}"
-                 ScrollViewer.VerticalScrollBarVisibility="Disabled">
+               ScrollViewer.VerticalScrollBarVisibility="Disabled">
     <QuestionControl YesCommand="{Binding NextCommand}"
-                       NoCommand="{Binding CancelCommand}"
-                       HighlightButton="YesButton">
+                     NoCommand="{Binding CancelCommand}"
+                     HighlightButton="YesButton">
       <QuestionControl.IconContent>
         <Viewbox MaxHeight="150" Margin="40">
           <PathIcon Data="{StaticResource delete_regular}" Opacity="0.6" />
         </Viewbox>
       </QuestionControl.IconContent>
       <StackPanel Spacing="10">
-        <TextBlock HorizontalAlignment="Center" TextWrapping="Wrap" Text="{x:Static lang:Resources.WishToHideAddressWithLabels}" />
+        <TextBlock HorizontalAlignment="Center" TextWrapping="Wrap"
+                   Text="{x:Static lang:Resources.WishToHideAddressWithLabels}" />
         <LabelsItemsPresenter HorizontalAlignment="Center" ItemsSource="{Binding Labels}" />
         <TextBlock HorizontalAlignment="Center" TextWrapping="Wrap" Text="{x:Static lang:Resources.ThisCannotBeUndone}" />
       </StackPanel>
diff --git a/WalletWasabi.Fluent/HomeScreen/Receive/Views/ReceiveAddressView.axaml b/WalletWasabi.Fluent/HomeScreen/Receive/Views/ReceiveAddressView.axaml
index f6b32e65ff..016e752ce7 100644
--- a/WalletWasabi.Fluent/HomeScreen/Receive/Views/ReceiveAddressView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/Receive/Views/ReceiveAddressView.axaml
@@ -46,7 +46,7 @@
       <DockPanel VerticalAlignment="Center">
 
         <TextBlock DockPanel.Dock="Top" HorizontalAlignment="Center" FontSize="18" FontWeight="Bold"
-                   Opacity="0.8" Text="{Binding Type}"/>
+                   Opacity="0.8" Text="{Binding Type}" />
 
         <AdorningContentControl HorizontalAlignment="Center" VerticalAlignment="Center" ClipToBounds="False">
           <AdorningContentControl.Adornment>
diff --git a/WalletWasabi.Fluent/HomeScreen/Receive/Views/ReceiveAddressesView.axaml b/WalletWasabi.Fluent/HomeScreen/Receive/Views/ReceiveAddressesView.axaml
index 1ba6f307e2..302fef0b1e 100644
--- a/WalletWasabi.Fluent/HomeScreen/Receive/Views/ReceiveAddressesView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/Receive/Views/ReceiveAddressesView.axaml
@@ -15,7 +15,8 @@
                EnableBack="{Binding EnableBack}"
                ScrollViewer.VerticalScrollBarVisibility="Disabled">
     <ContentArea.TopContent>
-      <Button DockPanel.Dock="Right" Theme="{StaticResource DialogSortButton}" ToolTip.Tip="{x:Static lang:Resources.Sorting}">
+      <Button DockPanel.Dock="Right" Theme="{StaticResource DialogSortButton}"
+              ToolTip.Tip="{x:Static lang:Resources.Sorting}">
         <Button.Flyout>
           <Flyout Placement="BottomEdgeAlignedRight">
             <sorting:SortControl Sortables="{Binding Sortables}" />
diff --git a/WalletWasabi.Fluent/HomeScreen/Receive/Views/ReceiveView.axaml b/WalletWasabi.Fluent/HomeScreen/Receive/Views/ReceiveView.axaml
index ab0bd7f98e..e38ec5bed9 100644
--- a/WalletWasabi.Fluent/HomeScreen/Receive/Views/ReceiveView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/Receive/Views/ReceiveView.axaml
@@ -20,10 +20,11 @@
             <UICommand.Icon>
               <Border BorderThickness="1"
                       VerticalAlignment="Center"
-                      BorderBrush="{DynamicResource TextControlForeground}" Opacity="0.6" CornerRadius="4" Padding="2 3">
+                      BorderBrush="{DynamicResource TextControlForeground}" Opacity="0.6" CornerRadius="4"
+                      Padding="2 3">
                 <TextBlock FontSize="9"
                            Text="{Binding ShortName, Source={x:Static wallets:ScriptType.SegWit}}"
-                           ToolTip.Tip="{Binding Name, Source={x:Static wallets:ScriptType.SegWit}}"/>
+                           ToolTip.Tip="{Binding Name, Source={x:Static wallets:ScriptType.SegWit}}" />
               </Border>
             </UICommand.Icon>
           </UICommand>
@@ -36,7 +37,7 @@
                       BorderBrush="{DynamicResource TextControlForeground}" Opacity="0.6" CornerRadius="4" Padding="2">
                 <TextBlock FontSize="9"
                            Text="{Binding ShortName, Source={x:Static wallets:ScriptType.Taproot}}"
-                           ToolTip.Tip="{Binding Name, Source={x:Static wallets:ScriptType.Taproot}}"/>
+                           ToolTip.Tip="{Binding Name, Source={x:Static wallets:ScriptType.Taproot}}" />
               </Border>
             </UICommand.Icon>
           </UICommand>
diff --git a/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/FeeChartViewModel.cs b/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/FeeChartViewModel.cs
index 1cda37593f..5c8aa23c67 100644
--- a/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/FeeChartViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/FeeChartViewModel.cs
@@ -218,8 +218,8 @@ private int GetSliderValue(double x, double[] xs)
 	public void UpdateFeeEstimates(IEnumerable<(TimeSpan timeSpan, FeeRate feeRate)> wildFeeEstimates, FeeRate? maxFee = null)
 	{
 		Dictionary<int, double> feeEstimates = wildFeeEstimates.ToDictionary(
-				x => (int)x.timeSpan.TotalMinutes / 10,
-				x => Math.Round((double)x.feeRate.SatoshiPerByte, 3));
+			x => (int)x.timeSpan.TotalMinutes / 10,
+			x => Math.Round((double)x.feeRate.SatoshiPerByte, 3));
 
 		var enableCursor = true;
 		var areAllValuesEqual = AreEstimatedFeeRatesEqual(feeEstimates);
diff --git a/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/ManualControlDialogViewModel.cs b/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/ManualControlDialogViewModel.cs
index 6a7401468b..e60c2019f8 100644
--- a/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/ManualControlDialogViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/ManualControlDialogViewModel.cs
@@ -39,17 +39,17 @@ public ManualControlDialogViewModel(WalletModel walletModel, Wallet wallet, Labe
 
 		var nextCommandCanExecute =
 			CoinList.Selection
-					.ToObservableChangeSet()
-					.ToCollection()
-					.Select(c => c.Count > 0);
+				.ToObservableChangeSet()
+				.ToCollection()
+				.Select(c => c.Count > 0);
 
 		NextCommand = ReactiveCommand.Create(OnNext, nextCommandCanExecute);
 
 		SelectedAmount =
 			CoinList.Selection
-					.ToObservableChangeSet()
-					.ToCollection()
-					.Select(c => c.Any() ? walletModel.AmountProvider.Create(c.TotalAmount()) : null);
+				.ToObservableChangeSet()
+				.ToCollection()
+				.Select(c => c.Any() ? walletModel.AmountProvider.Create(c.TotalAmount()) : null);
 
 		ToggleSelectionCommand = ReactiveCommand.Create(() => SelectAll(!CoinList.Selection.Any()));
 
@@ -69,11 +69,11 @@ public ManualControlDialogViewModel(WalletModel walletModel, Wallet wallet, Labe
 	protected override void OnNavigatedTo(bool isInHistory, CompositeDisposable disposables)
 	{
 		CoinList.CoinItems
-				.ToObservableChangeSet()
-				.WhenPropertyChanged(x => x.IsSelected)
-				.Select(_ => CoinList.Selection.Count > 0)
-				.BindTo(this, x => x.HasSelection)
-				.DisposeWith(disposables);
+			.ToObservableChangeSet()
+			.WhenPropertyChanged(x => x.IsSelected)
+			.Select(_ => CoinList.Selection.Count > 0)
+			.BindTo(this, x => x.HasSelection)
+			.DisposeWith(disposables);
 	}
 
 	protected override void OnNavigatedFrom(bool isInHistory)
diff --git a/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/PrivacySuggestionsFlyoutViewModel.cs b/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/PrivacySuggestionsFlyoutViewModel.cs
index 300d70b8e6..596600f163 100644
--- a/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/PrivacySuggestionsFlyoutViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/PrivacySuggestionsFlyoutViewModel.cs
@@ -74,6 +74,7 @@ public async Task BuildPrivacySuggestionsAsync(TransactionInfo info, BuildTransa
 			{
 				Warnings.Add(warning);
 			}
+
 			if (item is PrivacySuggestion suggestion)
 			{
 				Suggestions.Add(suggestion);
diff --git a/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/SendViewModel.cs b/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/SendViewModel.cs
index c608678c68..cde1bc2d07 100644
--- a/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/SendViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/SendViewModel.cs
@@ -60,7 +60,9 @@ public partial class SendViewModel : RoutableViewModel
 	[AutoNotify] private bool _isPayJoin;
 	[AutoNotify] private string? _payJoinEndPoint;
 	[AutoNotify] private bool _conversionReversed;
-	[AutoNotify(SetterModifier = AccessModifier.Private)] private SuggestionLabelsViewModel _suggestionLabels;
+
+	[AutoNotify(SetterModifier = AccessModifier.Private)]
+	private SuggestionLabelsViewModel _suggestionLabels;
 
 	public SendViewModel(WalletModel walletModel, SendFlowModel parameters, LabelsArray? preLabel = null, bool continueWithFixedAmount = false)
 	{
@@ -79,8 +81,8 @@ public SendViewModel(WalletModel walletModel, SendFlowModel parameters, LabelsAr
 
 		Balance =
 			_parameters.IsManual
-			? Observable.Return(_walletModel.AmountProvider.Create(_parameters.AvailableAmount))
-			: _walletModel.Balances;
+				? Observable.Return(_walletModel.AmountProvider.Create(_parameters.AvailableAmount))
+				: _walletModel.Balances;
 
 		_suggestionLabels = new SuggestionLabelsViewModel(_walletModel, Intent.Send, 3, preLabel);
 
@@ -200,7 +202,7 @@ private async Task OnPasteAsync(bool pasteIfInvalid = true)
 	private IPayjoinClient? GetPayjoinClient(string? endPoint)
 	{
 		if (!string.IsNullOrWhiteSpace(endPoint) &&
-			Uri.IsWellFormedUriString(endPoint, UriKind.Absolute))
+		    Uri.IsWellFormedUriString(endPoint, UriKind.Absolute))
 		{
 			var payjoinEndPointUri = new Uri(endPoint);
 			if (Services.Config.UseTor != TorMode.Disabled)
@@ -320,10 +322,10 @@ private bool TryParseUrl(string? text)
 			if (parserResult.Label is { } parsedLabel)
 			{
 				SuggestionLabels = new SuggestionLabelsViewModel(
-				_walletModel,
-				Intent.Send,
-				3,
-				[parsedLabel]);
+					_walletModel,
+					Intent.Send,
+					3,
+					[parsedLabel]);
 			}
 		}
 		else
@@ -354,8 +356,8 @@ protected override void OnNavigatedTo(bool inHistory, CompositeDisposable dispos
 		_suggestionLabels.Activate(disposables);
 
 		_walletModel.AmountProvider.ExchangeRateObservable
-								   .BindTo(this, x => x.ExchangeRate)
-								   .DisposeWith(disposables);
+			.BindTo(this, x => x.ExchangeRate)
+			.DisposeWith(disposables);
 
 		RxApp.MainThreadScheduler.Schedule(async () => await OnAutoPasteAsync());
 
diff --git a/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/ShowQrCameraDialogViewModel.cs b/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/ShowQrCameraDialogViewModel.cs
index 7b4b00f4aa..4d843ce3ea 100644
--- a/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/ShowQrCameraDialogViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/ShowQrCameraDialogViewModel.cs
@@ -63,10 +63,10 @@ protected override void OnNavigatedTo(bool isInHistory, CompositeDisposable disp
 					}
 				},
 				onError: error => Dispatcher.UIThread.Post(async () =>
-					{
-						Close();
-						await ShowErrorAsync(Title, error.Message, "", NavigationTarget.CompactDialogScreen);
-					}))
+				{
+					Close();
+					await ShowErrorAsync(Title, error.Message, "", NavigationTarget.CompactDialogScreen);
+				}))
 			.DisposeWith(disposables);
 	}
 }
diff --git a/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/TransactionPreviewViewModel.cs b/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/TransactionPreviewViewModel.cs
index 8acadbea48..277dec0cc8 100644
--- a/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/TransactionPreviewViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/Send/ViewModels/TransactionPreviewViewModel.cs
@@ -85,16 +85,15 @@ public TransactionPreviewViewModel(WalletModel walletModel, SendFlowModel sendFl
 
 		AdjustFeeCommand = ReactiveCommand.CreateFromTask(OnAdjustFeeAsync);
 
-		UndoCommand = ReactiveCommand.Create(
-				() =>
-				{
-					if (_undoHistory.TryPop(out var previous))
-					{
-						_info = previous.Item2;
-						UpdateTransaction(CurrentTransactionSummary, previous.Item1, false);
-						CanUndo = _undoHistory.Count != 0;
-					}
-				});
+		UndoCommand = ReactiveCommand.Create(() =>
+		{
+			if (_undoHistory.TryPop(out var previous))
+			{
+				_info = previous.Item2;
+				UpdateTransaction(CurrentTransactionSummary, previous.Item1, false);
+				CanUndo = _undoHistory.Count != 0;
+			}
+		});
 
 		ChangeCoinsCommand = ReactiveCommand.CreateFromTask(OnChangeCoinsAsync);
 	}
@@ -305,52 +304,48 @@ protected override void OnNavigatedTo(bool isInHistory, CompositeDisposable disp
 		base.OnNavigatedTo(isInHistory, disposables);
 
 		PrivacySuggestions.WhenAnyValue(x => x.PreviewSuggestion)
-			.DoAsync(
-				async x =>
+			.DoAsync(async x =>
+			{
+				if (x?.Transaction is { } transaction)
 				{
-					if (x?.Transaction is { } transaction)
-					{
-						UpdateTransaction(PreviewTransactionSummary, transaction);
-						await PrivacySuggestions.UpdatePreviewWarningsAsync(_info, transaction, _cancellationTokenSource.Token);
-					}
-					else
-					{
-						DisplayedTransactionSummary = CurrentTransactionSummary;
-						PrivacySuggestions.ClearPreviewWarnings();
-					}
-				})
+					UpdateTransaction(PreviewTransactionSummary, transaction);
+					await PrivacySuggestions.UpdatePreviewWarningsAsync(_info, transaction, _cancellationTokenSource.Token);
+				}
+				else
+				{
+					DisplayedTransactionSummary = CurrentTransactionSummary;
+					PrivacySuggestions.ClearPreviewWarnings();
+				}
+			})
 			.Subscribe()
 			.DisposeWith(disposables);
 
 		PrivacySuggestions.WhenAnyValue(x => x.SelectedSuggestion)
-			.SubscribeAsync(
-				async suggestion =>
-				{
-					PrivacySuggestions.SelectedSuggestion = null;
+			.SubscribeAsync(async suggestion =>
+			{
+				PrivacySuggestions.SelectedSuggestion = null;
 
-					if (suggestion is { })
-					{
-						await ApplyPrivacySuggestionAsync(suggestion);
-					}
-				})
+				if (suggestion is { })
+				{
+					await ApplyPrivacySuggestionAsync(suggestion);
+				}
+			})
 			.DisposeWith(disposables);
 
 		this.WhenAnyValue(x => x.Transaction)
 			.WhereNotNull()
 			.Throttle(TimeSpan.FromMilliseconds(100))
 			.ObserveOn(RxApp.MainThreadScheduler)
-			.Do(
-				_ =>
-				{
-					_cancellationTokenSource.Cancel();
-					_cancellationTokenSource = new();
-				})
-			.DoAsync(
-				async transaction =>
-				{
-					await CheckChangePocketAvailableAsync(transaction);
-					await PrivacySuggestions.BuildPrivacySuggestionsAsync(_info, transaction, _cancellationTokenSource.Token);
-				})
+			.Do(_ =>
+			{
+				_cancellationTokenSource.Cancel();
+				_cancellationTokenSource = new();
+			})
+			.DoAsync(async transaction =>
+			{
+				await CheckChangePocketAvailableAsync(transaction);
+				await PrivacySuggestions.BuildPrivacySuggestionsAsync(_info, transaction, _cancellationTokenSource.Token);
+			})
 			.Subscribe()
 			.DisposeWith(disposables);
 
@@ -476,48 +471,48 @@ private async Task ApplyPrivacySuggestionAsync(PrivacySuggestion suggestion)
 		switch (suggestion)
 		{
 			case LabelManagementSuggestion:
+			{
+				var newCoins = await UiContext.Navigate().To().PrivacyControl(_wallet, _sendFlow, _info, Transaction?.SpentCoins, false).GetResultAsync();
+				if (newCoins is not null)
 				{
-					var newCoins = await UiContext.Navigate().To().PrivacyControl(_wallet, _sendFlow, _info, Transaction?.SpentCoins, false).GetResultAsync();
-					if (newCoins is not null)
-					{
-						_info.Coins = newCoins;
-						await BuildAndUpdateAsync();
-					}
-
-					break;
+					_info.Coins = newCoins;
+					await BuildAndUpdateAsync();
 				}
 
+				break;
+			}
+
 			case ChangeAvoidanceSuggestion { Transaction: { } txn }:
 				_info.ChangelessCoins = txn.SpentCoins;
 				break;
 
 			case FullPrivacySuggestion fullPrivacySuggestion:
+			{
+				if (fullPrivacySuggestion.IsChangeless)
+				{
+					_info.ChangelessCoins = fullPrivacySuggestion.Coins;
+				}
+				else
 				{
-					if (fullPrivacySuggestion.IsChangeless)
-					{
-						_info.ChangelessCoins = fullPrivacySuggestion.Coins;
-					}
-					else
-					{
-						_info.Coins = fullPrivacySuggestion.Coins;
-					}
-
-					break;
+					_info.Coins = fullPrivacySuggestion.Coins;
 				}
 
+				break;
+			}
+
 			case BetterPrivacySuggestion betterPrivacySuggestion:
+			{
+				if (betterPrivacySuggestion.IsChangeless)
+				{
+					_info.ChangelessCoins = betterPrivacySuggestion.Coins;
+				}
+				else
 				{
-					if (betterPrivacySuggestion.IsChangeless)
-					{
-						_info.ChangelessCoins = betterPrivacySuggestion.Coins;
-					}
-					else
-					{
-						_info.Coins = betterPrivacySuggestion.Coins;
-					}
-
-					break;
+					_info.Coins = betterPrivacySuggestion.Coins;
 				}
+
+				break;
+			}
 		}
 
 		if (suggestion.Transaction is { } transaction)
diff --git a/WalletWasabi.Fluent/HomeScreen/Send/Views/ManualControlDialogView.axaml b/WalletWasabi.Fluent/HomeScreen/Send/Views/ManualControlDialogView.axaml
index 7f53f6e3ec..dd91f852d0 100644
--- a/WalletWasabi.Fluent/HomeScreen/Send/Views/ManualControlDialogView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/Send/Views/ManualControlDialogView.axaml
@@ -17,7 +17,7 @@
                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
     <ContentArea.TopContent>
       <StackPanel Orientation="Horizontal" Spacing="5" HorizontalAlignment="Right">
-        <Button Theme="{StaticResource DialogSortButton}"  ToolTip.Tip="{x:Static lang:Resources.Sorting}">
+        <Button Theme="{StaticResource DialogSortButton}" ToolTip.Tip="{x:Static lang:Resources.Sorting}">
           <Button.Flyout>
             <Flyout Placement="BottomEdgeAlignedRight">
               <sorting:SortControl Sortables="{Binding CoinList.Sortables}" />
diff --git a/WalletWasabi.Fluent/HomeScreen/Send/Views/PrivacyWarningsView.axaml b/WalletWasabi.Fluent/HomeScreen/Send/Views/PrivacyWarningsView.axaml
index c027a71d38..d7b884ed74 100644
--- a/WalletWasabi.Fluent/HomeScreen/Send/Views/PrivacyWarningsView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/Send/Views/PrivacyWarningsView.axaml
@@ -191,8 +191,9 @@
           <Border Classes="warning">
             <DockPanel>
               <PathIcon />
-              <TextBlock Text="{Binding CoinCount, StringFormat={x:Static lang:Resources.TransactionConsolidatesCoins}}"
-                         ToolTip.Tip="{x:Static lang:Resources.ReducePrivacyOfTransaction}" />
+              <TextBlock
+                Text="{Binding CoinCount, StringFormat={x:Static lang:Resources.TransactionConsolidatesCoins}}"
+                ToolTip.Tip="{x:Static lang:Resources.ReducePrivacyOfTransaction}" />
             </DockPanel>
           </Border>
         </DataTemplate>
@@ -255,7 +256,8 @@
                   <TextBlock Text="{x:Static lang:Resources.SendSuggestion}" />
                   <TextBlock Text="{Binding DifferenceText}"
                              Foreground="{DynamicResource SystemAccentColor}" />
-                  <TextBlock Text="{Binding DifferenceAmountText, StringFormat={x:Static lang:Resources.ByAmount}}" IsVisible="{Binding !IsSameAmount}" />
+                  <TextBlock Text="{Binding DifferenceAmountText, StringFormat={x:Static lang:Resources.ByAmount}}"
+                             IsVisible="{Binding !IsSameAmount}" />
                 </StackPanel>
               </StackPanel>
             </DockPanel>
@@ -273,7 +275,8 @@
                   <TextBlock Text="{x:Static lang:Resources.SendSuggestion}" />
                   <TextBlock Text="{Binding DifferenceText}"
                              Foreground="{DynamicResource SystemAccentColor}" />
-                  <TextBlock Text="{Binding DifferenceAmountText, StringFormat={x:Static lang:Resources.ByAmount}}" IsVisible="{Binding !IsSameAmount}" />
+                  <TextBlock Text="{Binding DifferenceAmountText, StringFormat={x:Static lang:Resources.ByAmount}}"
+                             IsVisible="{Binding !IsSameAmount}" />
                 </StackPanel>
               </StackPanel>
             </DockPanel>
@@ -303,7 +306,8 @@
                   <TextBlock Text="{x:Static lang:Resources.SendSuggestion}" />
                   <TextBlock Text="{Binding DifferenceText}"
                              Foreground="{DynamicResource SystemAccentColor}" />
-                  <TextBlock Text="{Binding DifferenceAmountText, StringFormat={x:Static lang:Resources.ByAmount}}" IsVisible="{Binding !IsSameAmount}" />
+                  <TextBlock Text="{Binding DifferenceAmountText, StringFormat={x:Static lang:Resources.ByAmount}}"
+                             IsVisible="{Binding !IsSameAmount}" />
                 </StackPanel>
               </StackPanel>
             </DockPanel>
diff --git a/WalletWasabi.Fluent/HomeScreen/Send/Views/SendFeeView.axaml b/WalletWasabi.Fluent/HomeScreen/Send/Views/SendFeeView.axaml
index 75007e30ce..047555fb9c 100644
--- a/WalletWasabi.Fluent/HomeScreen/Send/Views/SendFeeView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/Send/Views/SendFeeView.axaml
@@ -223,7 +223,8 @@
                 <Setter Property="FontSize" Value="{StaticResource FontSizeH8}" />
               </Style>
             </StackPanel.Styles>
-            <TextBlock Text="{Binding CurrentSatoshiPerByte, Mode=OneWay, StringFormat={x:Static lang:Resources.FeeRateFormatted}}" />
+            <TextBlock
+              Text="{Binding CurrentSatoshiPerByte, Mode=OneWay, StringFormat={x:Static lang:Resources.FeeRateFormatted}}" />
             <TextBlock
               Text="{Binding CurrentConfirmationTargetString, Mode=OneWay, StringFormat={x:Static lang:Resources.EstimatedConfirmationTimeWithValue}}" />
           </StackPanel>
diff --git a/WalletWasabi.Fluent/HomeScreen/Send/Views/SendSuccessView.axaml b/WalletWasabi.Fluent/HomeScreen/Send/Views/SendSuccessView.axaml
index 28714f095f..59b8c03742 100644
--- a/WalletWasabi.Fluent/HomeScreen/Send/Views/SendSuccessView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/Send/Views/SendSuccessView.axaml
@@ -9,8 +9,8 @@
              x:CompileBindings="True"
              x:Class="WalletWasabi.Fluent.HomeScreen.Send.Views.SendSuccessView">
   <ContentArea EnableNext="False"
-                 ScrollViewer.VerticalScrollBarVisibility="Disabled"
-                 MinWidth="500">
+               ScrollViewer.VerticalScrollBarVisibility="Disabled"
+               MinWidth="500">
     <views1:SuccessAnimationView VerticalAlignment="Center" />
   </ContentArea>
 </UserControl>
diff --git a/WalletWasabi.Fluent/HomeScreen/Send/Views/SendView.axaml b/WalletWasabi.Fluent/HomeScreen/Send/Views/SendView.axaml
index 8fb4866198..cf25f9d496 100644
--- a/WalletWasabi.Fluent/HomeScreen/Send/Views/SendView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/Send/Views/SendView.axaml
@@ -169,7 +169,7 @@
       </DockPanel>
 
       <!-- Recipient -->
-      <Label Grid.Row="4" Grid.Column="0" Content="{x:Static lang:Resources.RecipientWithColon}" Target="LabelTagBox"/>
+      <Label Grid.Row="4" Grid.Column="0" Content="{x:Static lang:Resources.RecipientWithColon}" Target="LabelTagBox" />
       <TagsBox Grid.Row="4" Grid.Column="2" x:Name="LabelTagBox"
                VerticalAlignment="Top"
                Watermark="{x:Static lang:Resources.LabelsWatermarkText}"
diff --git a/WalletWasabi.Fluent/HomeScreen/Send/Views/TransactionPreviewView.axaml b/WalletWasabi.Fluent/HomeScreen/Send/Views/TransactionPreviewView.axaml
index f8bd478dc3..1e6424839a 100644
--- a/WalletWasabi.Fluent/HomeScreen/Send/Views/TransactionPreviewView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/Send/Views/TransactionPreviewView.axaml
@@ -113,7 +113,8 @@
     <Carousel ItemsSource="{Binding TransactionSummaries}"
               SelectedItem="{Binding DisplayedTransactionSummary}">
       <Carousel.PageTransition>
-        <CrossFade Duration="0:0:0.3" FadeInEasing="{StaticResource FluentEasing}" FadeOutEasing="{StaticResource FluentEasing}"/>
+        <CrossFade Duration="0:0:0.3" FadeInEasing="{StaticResource FluentEasing}"
+                   FadeOutEasing="{StaticResource FluentEasing}" />
       </Carousel.PageTransition>
       <Carousel.ItemTemplate>
         <DataTemplate>
diff --git a/WalletWasabi.Fluent/HomeScreen/Tiles/PrivacyRing/ViewModels/PrivacyRingItemViewModel.cs b/WalletWasabi.Fluent/HomeScreen/Tiles/PrivacyRing/ViewModels/PrivacyRingItemViewModel.cs
index 3c2554e1e8..ec64188a8a 100644
--- a/WalletWasabi.Fluent/HomeScreen/Tiles/PrivacyRing/ViewModels/PrivacyRingItemViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/Tiles/PrivacyRing/ViewModels/PrivacyRingItemViewModel.cs
@@ -83,8 +83,8 @@ private PathGeometry CreateGeometry(double start, double end, double outerRadius
 
 		var margin =
 			end - start == 1.0
-			? 0.01d
-			: 2d;
+				? 0.01d
+				: 2d;
 
 		var startAngle = ((TotalAngle * start) - UprightAngle);
 		var endAngle = ((TotalAngle * end) - UprightAngle);
diff --git a/WalletWasabi.Fluent/HomeScreen/Tiles/PrivacyRing/ViewModels/PrivacyRingViewModel.cs b/WalletWasabi.Fluent/HomeScreen/Tiles/PrivacyRing/ViewModels/PrivacyRingViewModel.cs
index 6e2ed9918c..0b645283a3 100644
--- a/WalletWasabi.Fluent/HomeScreen/Tiles/PrivacyRing/ViewModels/PrivacyRingViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/Tiles/PrivacyRing/ViewModels/PrivacyRingViewModel.cs
@@ -76,18 +76,18 @@ protected override void OnNavigatedTo(bool isInHistory, CompositeDisposable disp
 
 		var coinsList =
 			_wallet.Coins.List
-						 .Connect(suppressEmptyChangeSets: false)
-						 .OnItemAdded(c => c.SubscribeToCoinChanges(disposables)) // Subscribe to SmartCoin changes for dynamic updates
-						 .ToCollection()
-						 .Select(x => x.Distinct());
+				.Connect(suppressEmptyChangeSets: false)
+				.OnItemAdded(c => c.SubscribeToCoinChanges(disposables)) // Subscribe to SmartCoin changes for dynamic updates
+				.ToCollection()
+				.Select(x => x.Distinct());
 
 		_wallet.Privacy.ProgressUpdated
-					   .Merge(sizeTrigger)
-					   .WithLatestFrom(coinsList)
-					   .ObserveOn(RxApp.MainThreadScheduler)
-					   .Do(t => RenderRing(itemsSourceList, t.Second))
-					   .Subscribe()
-					   .DisposeWith(disposables);
+			.Merge(sizeTrigger)
+			.WithLatestFrom(coinsList)
+			.ObserveOn(RxApp.MainThreadScheduler)
+			.Do(t => RenderRing(itemsSourceList, t.Second))
+			.Subscribe()
+			.DisposeWith(disposables);
 
 		PrivacyTile.Activate(disposables);
 	}
@@ -116,8 +116,8 @@ private void CreateSegments(IExtendedList<PrivacyRingItemViewModel> list, IEnume
 
 		var result =
 			shouldCreateSegmentsByCoin
-			? CreateSegmentsByCoin(coins)
-			: CreateSegmentsByPrivacyLevel(coins);
+				? CreateSegmentsByCoin(coins)
+				: CreateSegmentsByPrivacyLevel(coins);
 
 		list.AddRange(result);
 	}
@@ -126,8 +126,8 @@ private IEnumerable<PrivacyRingItemViewModel> CreateSegmentsByCoin(IEnumerable<C
 	{
 		var groupsByPrivacy =
 			coins.GroupBy(x => x.PrivacyLevel)
-				 .OrderBy(x => (int)x.Key)
-				 .ToList();
+				.OrderBy(x => (int)x.Key)
+				.ToList();
 
 		var total = coins.TotalBtcAmount();
 		var start = 0.0m;
@@ -156,8 +156,8 @@ private IEnumerable<PrivacyRingItemViewModel> CreateSegmentsByPrivacyLevel(IEnum
 
 		var groupsByPrivacy =
 			coins.GroupBy(x => x.PrivacyLevel)
-				 .OrderBy(x => (int)x.Key)
-				 .ToList();
+				.OrderBy(x => (int)x.Key)
+				.ToList();
 
 		foreach (var group in groupsByPrivacy)
 		{
@@ -171,8 +171,8 @@ private IEnumerable<PrivacyRingItemViewModel> CreateSegmentsByPrivacyLevel(IEnum
 
 			var anonScoreText =
 				maxAnonScore == minAnonScore
-				? $"{minAnonScore}"
-				: $"{minAnonScore}-{maxAnonScore}";
+					? $"{minAnonScore}"
+					: $"{minAnonScore}-{maxAnonScore}";
 
 			var item = new PrivacyRingItemViewModel(this, group.Key, new Money(groupAmount, MoneyUnit.BTC), (double)start, (double)end, anonScoreText);
 
diff --git a/WalletWasabi.Fluent/HomeScreen/Tiles/PrivacyRing/Views/PrivacyRingDetailsView.axaml b/WalletWasabi.Fluent/HomeScreen/Tiles/PrivacyRing/Views/PrivacyRingDetailsView.axaml
index 4fdd76173c..5b573458e0 100644
--- a/WalletWasabi.Fluent/HomeScreen/Tiles/PrivacyRing/Views/PrivacyRingDetailsView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/Tiles/PrivacyRing/Views/PrivacyRingDetailsView.axaml
@@ -22,7 +22,8 @@
     <StackPanel DockPanel.Dock="Bottom" Spacing="8" IsVisible="{Binding HasPrivateBalance}">
       <Interaction.Behaviors>
         <AdaptiveBehavior>
-          <AdaptiveClassSetter MinWidth="0" MaxWidth="190" MaxWidthOperator="LessThanOrEqual" ClassName="small" TargetControl="{Binding #Balance}" />
+          <AdaptiveClassSetter MinWidth="0" MaxWidth="190" MaxWidthOperator="LessThanOrEqual" ClassName="small"
+                               TargetControl="{Binding #Balance}" />
         </AdaptiveBehavior>
       </Interaction.Behaviors>
 
@@ -32,12 +33,13 @@
 
         <Border VerticalAlignment="Center" BorderThickness="1" CornerRadius="2"
                 BorderBrush="{DynamicResource ButtonForeground}" HorizontalAlignment="Center">
-          <TextBlock Text="{x:Static lang:Resources.Private}" Classes="bold" Margin="4 2 " VerticalAlignment="Center" HorizontalAlignment="Center" />
+          <TextBlock Text="{x:Static lang:Resources.Private}" Classes="bold" Margin="4 2 " VerticalAlignment="Center"
+                     HorizontalAlignment="Center" />
         </Border>
         <PrivacyContentControl Classes="bold"
-                                        VerticalAlignment="Center" HorizontalAlignment="Center"
-                                        VerticalContentAlignment="Center" HorizontalContentAlignment="Center"
-                                        Content="{Binding PrivateAmount^.Btc, Converter={x:Static converters:MoneyConverters.ToBtc}}" />
+                               VerticalAlignment="Center" HorizontalAlignment="Center"
+                               VerticalContentAlignment="Center" HorizontalContentAlignment="Center"
+                               Content="{Binding PrivateAmount^.Btc, Converter={x:Static converters:MoneyConverters.ToBtc}}" />
       </StackPanel>
     </StackPanel>
 
diff --git a/WalletWasabi.Fluent/HomeScreen/Tiles/PrivacyRing/Views/PrivacyRingItemDetailsView.axaml b/WalletWasabi.Fluent/HomeScreen/Tiles/PrivacyRing/Views/PrivacyRingItemDetailsView.axaml
index eaa54412e2..396ac51a2e 100644
--- a/WalletWasabi.Fluent/HomeScreen/Tiles/PrivacyRing/Views/PrivacyRingItemDetailsView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/Tiles/PrivacyRing/Views/PrivacyRingItemDetailsView.axaml
@@ -29,19 +29,23 @@
     <StackPanel Spacing="8">
       <Interaction.Behaviors>
         <AdaptiveBehavior>
-          <AdaptiveClassSetter MinWidth="0" MaxWidth="190" MaxWidthOperator="LessThanOrEqual" ClassName="small" TargetControl="{Binding #PrivacyLevel}" />
+          <AdaptiveClassSetter MinWidth="0" MaxWidth="190" MaxWidthOperator="LessThanOrEqual" ClassName="small"
+                               TargetControl="{Binding #PrivacyLevel}" />
         </AdaptiveBehavior>
       </Interaction.Behaviors>
 
       <StackPanel IsVisible="{Binding !IsNonPrivate}" MinHeight="42">
         <Separator Margin="0 3 0 9" />
-        <StackPanel Opacity="0.8" IsVisible="{Binding !IsNonPrivate}" Classes="privacyLevel" x:Name="PrivacyLevel" HorizontalAlignment="Center">
+        <StackPanel Opacity="0.8" IsVisible="{Binding !IsNonPrivate}" Classes="privacyLevel" x:Name="PrivacyLevel"
+                    HorizontalAlignment="Center">
           <Border VerticalAlignment="Center" BorderThickness="1" CornerRadius="2"
                   BorderBrush="{DynamicResource ButtonForeground}">
             <TextBlock
-              Text="{Binding PrivacyLevelText, Converter={x:Static conv:StringConverters.ToUpperCase}}" Classes="bold" Margin="4 2 " VerticalAlignment="Center" HorizontalAlignment="Center" />
+              Text="{Binding PrivacyLevelText, Converter={x:Static conv:StringConverters.ToUpperCase}}" Classes="bold"
+              Margin="4 2 " VerticalAlignment="Center" HorizontalAlignment="Center" />
           </Border>
-          <TextBlock Text="{Binding AnonScoreText, StringFormat='Anonymity Score: {0}'}" Classes="h8" VerticalAlignment="Center" HorizontalAlignment="Center" />
+          <TextBlock Text="{Binding AnonScoreText, StringFormat='Anonymity Score: {0}'}" Classes="h8"
+                     VerticalAlignment="Center" HorizontalAlignment="Center" />
         </StackPanel>
       </StackPanel>
 
diff --git a/WalletWasabi.Fluent/HomeScreen/Tiles/Views/BtcPriceTileView.axaml b/WalletWasabi.Fluent/HomeScreen/Tiles/Views/BtcPriceTileView.axaml
index 9ded05ee9b..8d45773866 100644
--- a/WalletWasabi.Fluent/HomeScreen/Tiles/Views/BtcPriceTileView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/Tiles/Views/BtcPriceTileView.axaml
@@ -11,11 +11,11 @@
   <TileControl Title="{x:Static lang:Resources.WalletExchangeRate}" IsBottomContentVisible="False">
     <TileControl.Styles>
       <Style Selector="Viewbox">
-        <Setter Property="MaxHeight" Value="40"/>
+        <Setter Property="MaxHeight" Value="40" />
       </Style>
       <Style Selector="Viewbox.small">
-        <Setter Property="MaxHeight" Value="25"/>
-        <Setter Property="Opacity" Value="0.3"/>
+        <Setter Property="MaxHeight" Value="25" />
+        <Setter Property="Opacity" Value="0.3" />
       </Style>
       <Style Selector="Viewbox.correctedHeight">
         <Setter Property="MaxHeight" Value="40" />
diff --git a/WalletWasabi.Fluent/HomeScreen/Tiles/Views/PrivacyControlTileView.axaml b/WalletWasabi.Fluent/HomeScreen/Tiles/Views/PrivacyControlTileView.axaml
index 7b1b4354e6..679c4d33a0 100644
--- a/WalletWasabi.Fluent/HomeScreen/Tiles/Views/PrivacyControlTileView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/Tiles/Views/PrivacyControlTileView.axaml
@@ -118,7 +118,8 @@
                                            Content="{Binding PrivateAmount^.Btc, Converter={x:Static converters:MoneyConverters.ToBtc}}" />
                   </Viewbox>
                 </CopyableItem>
-                <CopyableItem ContentToCopy="{Binding PrivateAmount^.Fiat^, Converter={x:Static converters:MoneyConverters.ToFiatAmountFormattedWithoutSpaces}}">
+                <CopyableItem
+                  ContentToCopy="{Binding PrivateAmount^.Fiat^, Converter={x:Static converters:MoneyConverters.ToFiatAmountFormattedWithoutSpaces}}">
                   <Viewbox Classes="usd">
                     <PrivacyContentControl Classes="usd monoSpaced"
                                            Content="{Binding PrivateAmount^.Fiat^, Converter={x:Static converters:MoneyConverters.ToFiatApprox}}" />
@@ -139,7 +140,8 @@
                                            Content="{Binding SemiPrivateAmount^.Btc, Converter={x:Static converters:MoneyConverters.ToBtc}}" />
                   </Viewbox>
                 </CopyableItem>
-                <CopyableItem ContentToCopy="{Binding SemiPrivateAmount^.Fiat^, Converter={x:Static converters:MoneyConverters.ToFiatAmountFormattedWithoutSpaces}}">
+                <CopyableItem
+                  ContentToCopy="{Binding SemiPrivateAmount^.Fiat^, Converter={x:Static converters:MoneyConverters.ToFiatAmountFormattedWithoutSpaces}}">
                   <Viewbox Classes="usd">
                     <PrivacyContentControl Classes="usd monoSpaced"
                                            Content="{Binding SemiPrivateAmount^.Fiat^, Converter={x:Static converters:MoneyConverters.ToFiatApprox}}" />
diff --git a/WalletWasabi.Fluent/HomeScreen/WalletSettings/ViewModels/CoinjoinCoinSelectorSettingsViewModel.cs b/WalletWasabi.Fluent/HomeScreen/WalletSettings/ViewModels/CoinjoinCoinSelectorSettingsViewModel.cs
index 8a8d92574b..c59b3d4c53 100644
--- a/WalletWasabi.Fluent/HomeScreen/WalletSettings/ViewModels/CoinjoinCoinSelectorSettingsViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/WalletSettings/ViewModels/CoinjoinCoinSelectorSettingsViewModel.cs
@@ -104,6 +104,7 @@ private void ValidateDouble(IValidationErrors errors, string value, double min,
 			errors.Add(ErrorSeverity.Error, Resources.ValidationErrorNotNumber);
 			return;
 		}
+
 		if (result < min || result > max)
 		{
 			errors.Add(ErrorSeverity.Error, error: Resources.ValidationErrorNotInRange.SafeInject(min, max));
diff --git a/WalletWasabi.Fluent/HomeScreen/WalletSettings/ViewModels/WalletCoinJoinSettingsViewModel.cs b/WalletWasabi.Fluent/HomeScreen/WalletSettings/ViewModels/WalletCoinJoinSettingsViewModel.cs
index 81cf7f0a21..20b12842d5 100644
--- a/WalletWasabi.Fluent/HomeScreen/WalletSettings/ViewModels/WalletCoinJoinSettingsViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/WalletSettings/ViewModels/WalletCoinJoinSettingsViewModel.cs
@@ -174,10 +174,7 @@ public WalletCoinJoinSettingsViewModel(WalletModel walletModel)
 		this.WhenAnyValue(x => x.SelectedTimeFrame)
 			.Skip(1)
 			.ObserveOn(RxApp.TaskpoolScheduler)
-			.Subscribe(x =>
-			{
-				IgnoreCostOptimizationVisible = x.Value != 0;
-			});
+			.Subscribe(x => { IgnoreCostOptimizationVisible = x.Value != 0; });
 
 		this.WhenAnyValue(x => x.SelectedSkipFactors)
 			.Skip(1)
@@ -213,9 +210,10 @@ private void ValidateInteger(IValidationErrors errors, string value, int min, in
 			errors.Add(ErrorSeverity.Error, Resources.ValidationErrorNotNumber);
 			return;
 		}
+
 		if (result < min || result > max)
 		{
-			errors.Add(ErrorSeverity.Error, error:Resources.ValidationErrorNotInRange.SafeInject(min, max));
+			errors.Add(ErrorSeverity.Error, error: Resources.ValidationErrorNotInRange.SafeInject(min, max));
 			return;
 		}
 	}
diff --git a/WalletWasabi.Fluent/HomeScreen/WalletSettings/ViewModels/WalletSettingsViewModel.cs b/WalletWasabi.Fluent/HomeScreen/WalletSettings/ViewModels/WalletSettingsViewModel.cs
index 66a08d85cc..b7f01e91ce 100644
--- a/WalletWasabi.Fluent/HomeScreen/WalletSettings/ViewModels/WalletSettingsViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/WalletSettings/ViewModels/WalletSettingsViewModel.cs
@@ -3,7 +3,6 @@
 using System.Threading.Tasks;
 using System.Windows.Input;
 using ReactiveUI;
-using WalletWasabi.Fluent.Extensions;
 using WalletWasabi.Fluent.Helpers;
 using WalletWasabi.Fluent.Infrastructure;
 using WalletWasabi.Fluent.Models;
diff --git a/WalletWasabi.Fluent/HomeScreen/WalletSettings/Views/ConfirmCoinjoinSettingsView.axaml b/WalletWasabi.Fluent/HomeScreen/WalletSettings/Views/ConfirmCoinjoinSettingsView.axaml
index 309b362735..7773ef4658 100644
--- a/WalletWasabi.Fluent/HomeScreen/WalletSettings/Views/ConfirmCoinjoinSettingsView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/WalletSettings/Views/ConfirmCoinjoinSettingsView.axaml
@@ -18,8 +18,9 @@
         </Viewbox>
       </QuestionControl.IconContent>
       <StackPanel Spacing="10">
-        <TextBlock TextWrapping="Wrap" TextAlignment="Center" Text="{x:Static lang:Resources.CoinJoinProfilesCaption}"/>
-        <TextBlock TextWrapping="Wrap" TextAlignment="Center" Text="{x:Static lang:Resources.WouldYouLikeToPersonalizeIt}"/>
+        <TextBlock TextWrapping="Wrap" TextAlignment="Center" Text="{x:Static lang:Resources.CoinJoinProfilesCaption}" />
+        <TextBlock TextWrapping="Wrap" TextAlignment="Center"
+                   Text="{x:Static lang:Resources.WouldYouLikeToPersonalizeIt}" />
       </StackPanel>
     </QuestionControl>
   </ContentArea>
diff --git a/WalletWasabi.Fluent/HomeScreen/WalletSettings/Views/ResyncWalletView.axaml b/WalletWasabi.Fluent/HomeScreen/WalletSettings/Views/ResyncWalletView.axaml
index 6374a9a001..4fae17c616 100644
--- a/WalletWasabi.Fluent/HomeScreen/WalletSettings/Views/ResyncWalletView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/WalletSettings/Views/ResyncWalletView.axaml
@@ -18,8 +18,8 @@
         </Viewbox>
       </QuestionControl.IconContent>
       <StackPanel Spacing="10">
-        <TextBlock TextWrapping="Wrap" TextAlignment="Center" Text="{x:Static lang:Resources.ApplicationRestartRescan}"/>
-        <TextBlock TextWrapping="Wrap" TextAlignment="Center" Text="{x:Static lang:Resources.ProceedConfirmation}"/>
+        <TextBlock TextWrapping="Wrap" TextAlignment="Center" Text="{x:Static lang:Resources.ApplicationRestartRescan}" />
+        <TextBlock TextWrapping="Wrap" TextAlignment="Center" Text="{x:Static lang:Resources.ProceedConfirmation}" />
       </StackPanel>
     </QuestionControl>
   </ContentArea>
diff --git a/WalletWasabi.Fluent/HomeScreen/WalletSettings/Views/WalletCoinJoinSettingsView.axaml b/WalletWasabi.Fluent/HomeScreen/WalletSettings/Views/WalletCoinJoinSettingsView.axaml
index 8426532672..7195ef5a34 100644
--- a/WalletWasabi.Fluent/HomeScreen/WalletSettings/Views/WalletCoinJoinSettingsView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/WalletSettings/Views/WalletCoinJoinSettingsView.axaml
@@ -31,7 +31,8 @@
           </DataTemplate>
         </ComboBox.ItemTemplate>
       </ComboBox>
-      <PathIcon DockPanel.Dock="Right" HorizontalAlignment="Right" Margin="0 0 10 0" Data="{StaticResource warning_regular}"
+      <PathIcon DockPanel.Dock="Right" HorizontalAlignment="Right" Margin="0 0 10 0"
+                Data="{StaticResource warning_regular}"
                 Foreground="{DynamicResource WarningMessageForeground}" Height="17">
         <ToolTip.Tip>
           <TextBlock>
@@ -70,7 +71,8 @@
       <ComboBox ItemsSource="{Binding TimeFrames}" SelectedItem="{Binding SelectedTimeFrame}" />
     </DockPanel>
 
-    <DockPanel IsVisible="{Binding IgnoreCostOptimizationVisible}" ToolTip.Tip="{x:Static lang:Resources.SafeFeeToolTip}">
+    <DockPanel IsVisible="{Binding IgnoreCostOptimizationVisible}"
+               ToolTip.Tip="{x:Static lang:Resources.SafeFeeToolTip}">
       <TextBlock Text="{x:Static lang:Resources.SafeFeeText}" />
       <CurrencyEntryBox Text="{Binding SafeMiningFeeRate}" CurrencyCode="sat/vByte"
                         MaxDecimals="2" Classes="standalone hideValidations" Watermark="1 sat/vByte" />
@@ -80,8 +82,10 @@
 
     <DockPanel>
       <TextBlock Text="{x:Static lang:Resources.ExperimentalCoinJoinCoinSelector}" />
-      <ToggleSwitch IsChecked="{Binding UseExperimentalCoinSelector}" DockPanel.Dock="Right"/>
-      <Button Classes="plain" IsVisible="{Binding UseExperimentalCoinSelector}" Command="{Binding CoinjoinConfigurationCommand}" DockPanel.Dock="Right" HorizontalAlignment="Right" Margin="0 0 10 0" ToolTip.Tip="{x:Static lang:Resources.Configuration}">
+      <ToggleSwitch IsChecked="{Binding UseExperimentalCoinSelector}" DockPanel.Dock="Right" />
+      <Button Classes="plain" IsVisible="{Binding UseExperimentalCoinSelector}"
+              Command="{Binding CoinjoinConfigurationCommand}" DockPanel.Dock="Right" HorizontalAlignment="Right"
+              Margin="0 0 10 0" ToolTip.Tip="{x:Static lang:Resources.Configuration}">
         <PathIcon Data="{StaticResource nav_settings_24_regular}" Opacity="0.6" />
       </Button>
     </DockPanel>
diff --git a/WalletWasabi.Fluent/HomeScreen/WalletSettings/Views/WalletGeneralSettingsView.axaml b/WalletWasabi.Fluent/HomeScreen/WalletSettings/Views/WalletGeneralSettingsView.axaml
index c57d23d8d4..18c8a3ba90 100644
--- a/WalletWasabi.Fluent/HomeScreen/WalletSettings/Views/WalletGeneralSettingsView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/WalletSettings/Views/WalletGeneralSettingsView.axaml
@@ -21,7 +21,8 @@
           <DockPanel>
             <PathIcon Foreground="{DynamicResource AccentButtonForegroundColor}" Margin="8 0 0 0"
                       DockPanel.Dock="Right" Data="{StaticResource edit_regular}" />
-            <TextBlock TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" VerticalAlignment="Center" Text="{Binding WalletName, FallbackValue='Wallet name'}" />
+            <TextBlock TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" VerticalAlignment="Center"
+                       Text="{Binding WalletName, FallbackValue='Wallet name'}" />
           </DockPanel>
         </Button.Content>
       </Button>
diff --git a/WalletWasabi.Fluent/HomeScreen/WalletSettings/Views/WalletVerifyRecoveryWordsView.axaml b/WalletWasabi.Fluent/HomeScreen/WalletSettings/Views/WalletVerifyRecoveryWordsView.axaml
index d3fd7181ae..8b704b91e2 100644
--- a/WalletWasabi.Fluent/HomeScreen/WalletSettings/Views/WalletVerifyRecoveryWordsView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/WalletSettings/Views/WalletVerifyRecoveryWordsView.axaml
@@ -12,15 +12,15 @@
                NextContent="Verify" EnableNext="True" EnableBack="True" EnableCancel="True">
     <DockPanel VerticalAlignment="Top">
       <TagsBox DockPanel.Dock="Left"
-                        ItemCountLimit="24"
-                        SuggestionsAreCaseSensitive="False"
-                        RestrictInputToSuggestions="True"
-                        Items="{Binding Mnemonics}"
-                        Suggestions="{Binding Suggestions}"
-                        Watermark="{x:Static lang:Resources.TypeInYourRecoveryWords}"
-                        AllowDuplication="True"
-                        EnableCounter="True"
-                        EnableDelete="False">
+               ItemCountLimit="24"
+               SuggestionsAreCaseSensitive="False"
+               RestrictInputToSuggestions="True"
+               Items="{Binding Mnemonics}"
+               Suggestions="{Binding Suggestions}"
+               Watermark="{x:Static lang:Resources.TypeInYourRecoveryWords}"
+               AllowDuplication="True"
+               EnableCounter="True"
+               EnableDelete="False">
         <Interaction.Behaviors>
           <FocusOnAttachedBehavior />
         </Interaction.Behaviors>
diff --git a/WalletWasabi.Fluent/HomeScreen/Wallets/ViewModels/WalletPageViewModel.cs b/WalletWasabi.Fluent/HomeScreen/Wallets/ViewModels/WalletPageViewModel.cs
index c286d93af5..3815c396c5 100644
--- a/WalletWasabi.Fluent/HomeScreen/Wallets/ViewModels/WalletPageViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/Wallets/ViewModels/WalletPageViewModel.cs
@@ -1,15 +1,11 @@
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
-using System.Threading.Tasks;
 using ReactiveUI;
 using WalletWasabi.Fluent.Common.ViewModels;
-using WalletWasabi.Fluent.Extensions;
-using WalletWasabi.Fluent.HomeScreen.Loading.ViewModels;
 using WalletWasabi.Fluent.Login.ViewModels;
 using WalletWasabi.Fluent.Models.Wallets;
 using WalletWasabi.Fluent.Navigation.Models;
 using WalletWasabi.Fluent.Navigation.ViewModels;
-using WalletWasabi.Services;
 using WalletWasabi.Wallets;
 
 namespace WalletWasabi.Fluent.HomeScreen.Wallets.ViewModels;
@@ -86,8 +82,8 @@ private void ShowWallet()
 	{
 		WalletViewModel =
 			WalletModel.IsHardwareWallet
-			? new HardwareWalletViewModel(WalletModel, Wallet)
-			: new WalletViewModel(WalletModel, Wallet);
+				? new HardwareWalletViewModel(WalletModel, Wallet)
+				: new WalletViewModel(WalletModel, Wallet);
 
 		this.WhenAnyValue(x => x.WalletModel.Loader.IsLoading)
 			.BindTo(this, x => x.IsLoading)
diff --git a/WalletWasabi.Fluent/HomeScreen/Wallets/ViewModels/WalletViewModel.cs b/WalletWasabi.Fluent/HomeScreen/Wallets/ViewModels/WalletViewModel.cs
index 8d106bbd07..d4cdf045e6 100644
--- a/WalletWasabi.Fluent/HomeScreen/Wallets/ViewModels/WalletViewModel.cs
+++ b/WalletWasabi.Fluent/HomeScreen/Wallets/ViewModels/WalletViewModel.cs
@@ -30,16 +30,22 @@ namespace WalletWasabi.Fluent.HomeScreen.Wallets.ViewModels;
 [NavigationMetaData(NavigationTarget = NavigationTarget.HomeScreen)]
 public partial class WalletViewModel : RoutableViewModel
 {
-	[AutoNotify(SetterModifier = AccessModifier.Protected)] private bool _isCoinJoining;
+	[AutoNotify(SetterModifier = AccessModifier.Protected)]
+	private bool _isCoinJoining;
 
 	[AutoNotify] private bool _isPointerOver;
 	[AutoNotify] private bool _isSelected;
 	[AutoNotify] private bool _hasBuyOrderOnHold;
 	[AutoNotify] private bool _hasSellOrderOnHold;
-	[AutoNotify(SetterModifier = AccessModifier.Private)] private bool _isSendButtonVisible;
 
-	[AutoNotify(SetterModifier = AccessModifier.Private)] private bool _isWalletBalanceZero;
-	[AutoNotify(SetterModifier = AccessModifier.Protected)] private WalletState _walletState;
+	[AutoNotify(SetterModifier = AccessModifier.Private)]
+	private bool _isSendButtonVisible;
+
+	[AutoNotify(SetterModifier = AccessModifier.Private)]
+	private bool _isWalletBalanceZero;
+
+	[AutoNotify(SetterModifier = AccessModifier.Protected)]
+	private WalletState _walletState;
 
 	public WalletViewModel(WalletModel walletModel, Wallet wallet)
 	{
@@ -123,6 +129,8 @@ public WalletViewModel(WalletModel walletModel, Wallet wallet)
 
 		WalletCoinsCommand = ReactiveCommand.Create(() => UiContext.Navigate().To().WalletCoins(WalletModel), isNotRecovering);
 
+		SignMessageCommand = ReactiveCommand.Create(() => UiContext.Navigate().To().SignMessage(WalletModel));
+
 		CoinjoinPlayerViewModel = new CoinjoinPlayerViewModel(WalletModel, Settings);
 
 		Tiles = GetTiles().ToList();
@@ -169,6 +177,8 @@ public WalletViewModel(WalletModel walletModel, Wallet wallet)
 
 	public ICommand WalletInfoCommand { get; private set; }
 
+	public ICommand SignMessageCommand { get; private set; }
+
 	public ICommand WalletSettingsCommand { get; private set; }
 
 	public ICommand WalletStatsCommand { get; private set; }
@@ -224,19 +234,51 @@ private ISearchItem[] CreateSearchItems()
 	{
 		return new ISearchItem[]
 		{
-			new ActionableItem(Resources.ReceiveViewModelTitle, Resources.ReceiveViewModelCaption, () => { ReceiveCommand.ExecuteIfCan(); return Task.CompletedTask; }, Resources.Wallet, Resources.ReceiveViewModelKeywords.ToKeywords()) { Icon = "wallet_action_receive", IsDefault = true, Priority = 2 },
-			new ActionableItem(Resources.CoinjoinSettings, Resources.WalletCoinJoinSettingsViewModelCaption, () => { CoinJoinSettingsCommand.ExecuteIfCan(); return Task.CompletedTask; }, Resources.Wallet, Resources.WalletSettingsKeywords.ToKeywords()) { Icon = "wallet_action_coinjoin", IsDefault = true, Priority = 3 },
-			new ActionableItem(Resources.WalletSettings, Resources.WalletSettingsViewModelCaption, () => { WalletSettingsCommand.ExecuteIfCan(); return Task.CompletedTask; }, Resources.Wallet, Resources.WalletSettingsKeywords.ToKeywords()) { Icon = "settings_wallet_regular", IsDefault = true, Priority = 4 },
-			new ActionableItem(Resources.ExcludedCoinsViewModelTitle, Resources.ExcludedCoinsViewModelCaption, () => { CoinjoinPlayerViewModel.NavigateToExcludedCoinsCommand.ExecuteIfCan(); return Task.CompletedTask; }, Resources.Wallet, Resources.ExcludedCoinsViewModelKeywords.ToKeywords()) { Icon = "exclude_coins", IsDefault = true, Priority = 5 },
-			new ActionableItem(Resources.WalletCoinsViewModelTitle, Resources.WalletCoinsViewModelCaption, () => { WalletCoinsCommand.ExecuteIfCan(); return Task.CompletedTask; }, Resources.Wallet, Resources.WalletCoinsViewModelKeywords.ToKeywords()) { Icon = "wallet_coins", IsDefault = true, Priority = 6 },
-			new ActionableItem(Resources.WalletStatsViewModelTitle, Resources.WalletStatsViewModelCaption, () => { WalletStatsCommand.ExecuteIfCan(); return Task.CompletedTask; }, Resources.Wallet, Resources.WalletStatsViewModelKeywords.ToKeywords()) { Icon = "stats_wallet_regular", IsDefault = true, Priority = 7 },
-			new ActionableItem(Resources.WalletInfoViewModelTitle, Resources.WalletInfoViewModelCaption, () => { WalletInfoCommand.ExecuteIfCan(); return Task.CompletedTask; }, Resources.Wallet, Resources.WalletInfoViewModelKeywords.ToKeywords()) { Icon = "info_regular", IsDefault = true, Priority = 8 },
+			new ActionableItem(Resources.ReceiveViewModelTitle, Resources.ReceiveViewModelCaption, () =>
+			{
+				ReceiveCommand.ExecuteIfCan();
+				return Task.CompletedTask;
+			}, Resources.Wallet, Resources.ReceiveViewModelKeywords.ToKeywords()) { Icon = "wallet_action_receive", IsDefault = true, Priority = 2 },
+			new ActionableItem(Resources.CoinjoinSettings, Resources.WalletCoinJoinSettingsViewModelCaption, () =>
+			{
+				CoinJoinSettingsCommand.ExecuteIfCan();
+				return Task.CompletedTask;
+			}, Resources.Wallet, Resources.WalletSettingsKeywords.ToKeywords()) { Icon = "wallet_action_coinjoin", IsDefault = true, Priority = 3 },
+			new ActionableItem(Resources.WalletSettings, Resources.WalletSettingsViewModelCaption, () =>
+			{
+				WalletSettingsCommand.ExecuteIfCan();
+				return Task.CompletedTask;
+			}, Resources.Wallet, Resources.WalletSettingsKeywords.ToKeywords()) { Icon = "settings_wallet_regular", IsDefault = true, Priority = 4 },
+			new ActionableItem(Resources.ExcludedCoinsViewModelTitle, Resources.ExcludedCoinsViewModelCaption, () =>
+			{
+				CoinjoinPlayerViewModel.NavigateToExcludedCoinsCommand.ExecuteIfCan();
+				return Task.CompletedTask;
+			}, Resources.Wallet, Resources.ExcludedCoinsViewModelKeywords.ToKeywords()) { Icon = "exclude_coins", IsDefault = true, Priority = 5 },
+			new ActionableItem(Resources.WalletCoinsViewModelTitle, Resources.WalletCoinsViewModelCaption, () =>
+			{
+				WalletCoinsCommand.ExecuteIfCan();
+				return Task.CompletedTask;
+			}, Resources.Wallet, Resources.WalletCoinsViewModelKeywords.ToKeywords()) { Icon = "wallet_coins", IsDefault = true, Priority = 6 },
+			new ActionableItem(Resources.WalletStatsViewModelTitle, Resources.WalletStatsViewModelCaption, () =>
+			{
+				WalletStatsCommand.ExecuteIfCan();
+				return Task.CompletedTask;
+			}, Resources.Wallet, Resources.WalletStatsViewModelKeywords.ToKeywords()) { Icon = "stats_wallet_regular", IsDefault = true, Priority = 7 },
+			new ActionableItem(Resources.WalletInfoViewModelTitle, Resources.WalletInfoViewModelCaption, () =>
+			{
+				WalletInfoCommand.ExecuteIfCan();
+				return Task.CompletedTask;
+			}, Resources.Wallet, Resources.WalletInfoViewModelKeywords.ToKeywords()) { Icon = "info_regular", IsDefault = true, Priority = 8 },
 		};
 	}
 
 	private ISearchItem CreateSendItem()
 	{
-		return new ActionableItem(Resources.SendViewModelTitle, Resources.SendViewModelCaption, () => { SendCommand.ExecuteIfCan(); return Task.CompletedTask; }, Resources.Wallet, Resources.AboutViewModelKeywords.ToKeywords()) { Icon = "wallet_action_send", IsDefault = true, Priority = 1 };
+		return new ActionableItem(Resources.SendViewModelTitle, Resources.SendViewModelCaption, () =>
+		{
+			SendCommand.ExecuteIfCan();
+			return Task.CompletedTask;
+		}, Resources.Wallet, Resources.AboutViewModelKeywords.ToKeywords()) { Icon = "wallet_action_send", IsDefault = true, Priority = 1 };
 	}
 
 	private IEnumerable<ActivatableViewModel> GetTiles()
diff --git a/WalletWasabi.Fluent/HomeScreen/Wallets/Views/WalletView.axaml b/WalletWasabi.Fluent/HomeScreen/Wallets/Views/WalletView.axaml
index 1f325cbc4e..9162eec3a0 100644
--- a/WalletWasabi.Fluent/HomeScreen/Wallets/Views/WalletView.axaml
+++ b/WalletWasabi.Fluent/HomeScreen/Wallets/Views/WalletView.axaml
@@ -44,6 +44,26 @@
                   <PathIcon Data="{StaticResource info_regular}" />
                 </MenuItem.Icon>
               </MenuItem>
+              <Separator Margin="0 2">
+                <Separator.IsVisible>
+                  <MultiBinding Converter="{x:Static BoolConverters.Or}">
+                    <Binding Path="WalletModel.IsWatchOnlyWallet" Converter="{x:Static BoolConverters.Not}" />
+                    <Binding Path="WalletModel.IsHardwareWallet" />
+                  </MultiBinding>
+                </Separator.IsVisible>
+              </Separator>
+              <MenuItem Header="{x:Static lang:Resources.SignMessage}"
+                        Command="{Binding SignMessageCommand}">
+                <MenuItem.IsVisible>
+                  <MultiBinding Converter="{x:Static BoolConverters.Or}">
+                    <Binding Path="WalletModel.IsWatchOnlyWallet" Converter="{x:Static BoolConverters.Not}" />
+                    <Binding Path="WalletModel.IsHardwareWallet" />
+                  </MultiBinding>
+                </MenuItem.IsVisible>
+                <MenuItem.Icon>
+                  <PathIcon Data="{StaticResource signature}" />
+                </MenuItem.Icon>
+              </MenuItem>
             </MenuFlyout>
           </Button.Flyout>
           <PathIcon Data="{StaticResource more_regular}" Opacity="0.6" />
diff --git a/WalletWasabi.Fluent/Icons/Icons.axaml b/WalletWasabi.Fluent/Icons/Icons.axaml
index b1a199cdd1..d15aa58713 100644
--- a/WalletWasabi.Fluent/Icons/Icons.axaml
+++ b/WalletWasabi.Fluent/Icons/Icons.axaml
@@ -218,17 +218,15 @@
       <StreamGeometry x:Key="news">M22 5.75V20.5C22 20.7761 22.2239 21 22.5 21C22.7455 21 22.9496 20.8231 22.9919 20.5899L23 20.5V7H24.25C25.1682 7 25.9212 7.70711 25.9942 8.60647L26 8.75V20.75C26 22.483 24.6435 23.8992 22.9344 23.9949L22.75 24H5.25C3.51697 24 2.10075 22.6435 2.00514 20.9344L2 20.75V5.75C2 4.83183 2.70711 4.07881 3.60647 4.0058L3.75 4H20.25C21.1682 4 21.9212 4.70711 21.9942 5.60647L22 5.75V20.5V5.75ZM9.74653 13.0035H7.25C6.33183 13.0035 5.57881 13.7106 5.5058 14.6099L5.5 14.7535V17.25C5.5 18.1682 6.20711 18.9212 7.10647 18.9942L7.25 19H9.74653C10.6647 19 11.4177 18.2929 11.4907 17.3935L11.4965 17.25V14.7535C11.4965 13.8353 10.7894 13.0823 9.89005 13.0093L9.74653 13.0035ZM17.75 17.5H14.25L14.1482 17.5068C13.7822 17.5565 13.5 17.8703 13.5 18.25C13.5 18.6297 13.7822 18.9435 14.1482 18.9932L14.25 19H17.75L17.8518 18.9932C18.2178 18.9435 18.5 18.6297 18.5 18.25C18.5 17.8703 18.2178 17.5565 17.8518 17.5068L17.75 17.5ZM7.25 14.5035H9.74653C9.86487 14.5035 9.96401 14.5857 9.98992 14.6961L9.99653 14.7535V17.25C9.99653 17.3683 9.91429 17.4675 9.80385 17.4934L9.74653 17.5H7.25C7.13165 17.5 7.03251 17.4178 7.0066 17.3073L7 17.25V14.7535C7 14.6351 7.08223 14.536 7.19268 14.5101L7.25 14.5035H9.74653H7.25ZM17.75 13.0035H14.25L14.1482 13.0103C13.7822 13.06 13.5 13.3738 13.5 13.7535C13.5 14.1332 13.7822 14.447 14.1482 14.4966L14.25 14.5035H17.75L17.8518 14.4966C18.2178 14.447 18.5 14.1332 18.5 13.7535C18.5 13.3738 18.2178 13.06 17.8518 13.0103L17.75 13.0035ZM17.75 8.49666H6.25L6.14823 8.5035C5.78215 8.55317 5.5 8.86696 5.5 9.24666C5.5 9.62635 5.78215 9.94015 6.14823 9.98981L6.25 9.99666H17.75L17.8518 9.98981C18.2178 9.94015 18.5 9.62635 18.5 9.24666C18.5 8.86696 18.2178 8.55317 17.8518 8.5035L17.75 8.49666Z</StreamGeometry>
       <StreamGeometry x:Key="mark_all_read">M13.3483 2.68577C13.1302 2.57142 12.8698 2.57142 12.6517 2.68577L4.19881 7.11784C3.46176 7.50429 3 8.26778 3 9.1V17.75C3 19.5449 4.45507 21 6.25 21H19.75C21.5449 21 23 19.5449 23 17.75V9.1C23 8.26778 22.5382 7.50429 21.8012 7.11784L13.3483 2.68577ZM4.89535 8.44631L13 4.19685L21.1046 8.44631C21.2226 8.50818 21.3193 8.59935 21.3874 8.7082L13 13.1513L4.61257 8.7082C4.68075 8.59935 4.77735 8.50818 4.89535 8.44631ZM13.3511 14.6628L21.5 10.346V17.75C21.5 18.7165 20.7165 19.5 19.75 19.5H6.25C5.2835 19.5 4.5 18.7165 4.5 17.75V10.346L12.6489 14.6628C12.8685 14.7791 13.1315 14.7791 13.3511 14.6628ZM6.01172 22C6.58925 22.9021 7.6002 23.5 8.75081 23.5H20.2508C23.1503 23.5 25.5008 21.1495 25.5008 18.25V10.75C25.5008 9.59941 24.9029 8.58846 24.0008 8.01093V18.25C24.0008 20.3211 22.3219 22 20.2508 22H6.01172Z</StreamGeometry>
       <StreamGeometry x:Key="question_circle">M24 4C35.0457 4 44 12.9543 44 24C44 35.0457 35.0457 44 24 44C12.9543 44 4 35.0457 4 24C4 12.9543 12.9543 4 24 4ZM24 6.5C14.335 6.5 6.5 14.335 6.5 24C6.5 33.665 14.335 41.5 24 41.5C33.665 41.5 41.5 33.665 41.5 24C41.5 14.335 33.665 6.5 24 6.5ZM24.25 32C25.0784 32 25.75 32.6716 25.75 33.5C25.75 34.3284 25.0784 35 24.25 35C23.4216 35 22.75 34.3284 22.75 33.5C22.75 32.6716 23.4216 32 24.25 32ZM24.25 13C27.6147 13 30.5 15.8821 30.5 19.2488C30.502 21.3691 29.7314 22.7192 27.8216 24.7772L26.8066 25.8638C25.7842 27.0028 25.3794 27.7252 25.3409 28.5793L25.3379 28.7411L25.3323 28.8689L25.3143 28.9932C25.2018 29.5636 24.7009 29.9957 24.0968 30.0001C23.4065 30.0049 22.8428 29.4493 22.8379 28.7589C22.8251 26.9703 23.5147 25.7467 25.1461 23.9739L26.1734 22.8762C27.5312 21.3837 28.0012 20.503 28 19.25C28 17.2634 26.2346 15.5 24.25 15.5C22.3307 15.5 20.6142 17.1536 20.5055 19.0587L20.4935 19.3778C20.4295 20.0081 19.8972 20.5 19.25 20.5C18.5596 20.5 18 19.9404 18 19.25C18 15.8846 20.8864 13 24.25 13Z</StreamGeometry>
-
       <StreamGeometry x:Key="order_created">M12 7C12.4142 7 12.75 7.33579 12.75 7.75V11.25H16.25C16.6642 11.25 17 11.5858 17 12C17 12.4142 16.6642 12.75 16.25 12.75H12.75V16.25C12.75 16.6642 12.4142 17 12 17C11.5858 17 11.25 16.6642 11.25 16.25V12.75H7.75C7.33579 12.75 7 12.4142 7 12C7 11.5858 7.33579 11.25 7.75 11.25H11.25V7.75C11.25 7.33579 11.5858 7 12 7ZM3 6.25C3 4.45507 4.45507 3 6.25 3H17.75C19.5449 3 21 4.45507 21 6.25V17.75C21 19.5449 19.5449 21 17.75 21H6.25C4.45507 21 3 19.5449 3 17.75V6.25ZM6.25 4.5C5.2835 4.5 4.5 5.2835 4.5 6.25V17.75C4.5 18.7165 5.2835 19.5 6.25 19.5H17.75C18.7165 19.5 19.5 18.7165 19.5 17.75V6.25C19.5 5.2835 18.7165 4.5 17.75 4.5H6.25Z</StreamGeometry>
       <StreamGeometry x:Key="order_refunded">M12 3C16.9706 3 21 7.02944 21 12C21 15.0777 19.4407 17.865 16.9769 19.5009L18.75 19.5C19.1642 19.5 19.5 19.8358 19.5 20.25C19.5 20.6297 19.2178 20.9435 18.8518 20.9932L18.75 21H14.75C14.3703 21 14.0565 20.7178 14.0068 20.3518L14 20.25V16.25C14 15.8358 14.3358 15.5 14.75 15.5C15.1297 15.5 15.4435 15.7822 15.4932 16.1482L15.5 16.25L15.501 18.635C17.9241 17.3557 19.5 14.8247 19.5 12C19.5 7.85786 16.1421 4.5 12 4.5C7.85786 4.5 4.5 7.85786 4.5 12C4.5 12.4142 4.16421 12.75 3.75 12.75C3.33579 12.75 3 12.4142 3 12C3 7.02944 7.02944 3 12 3ZM12 9.25C13.5188 9.25 14.75 10.4812 14.75 12C14.75 13.5188 13.5188 14.75 12 14.75C10.4812 14.75 9.25 13.5188 9.25 12C9.25 10.4812 10.4812 9.25 12 9.25ZM12 10.75C11.3096 10.75 10.75 11.3096 10.75 12C10.75 12.6904 11.3096 13.25 12 13.25C12.6904 13.25 13.25 12.6904 13.25 12C13.25 11.3096 12.6904 10.75 12 10.75Z</StreamGeometry>
       <StreamGeometry x:Key="order_expired">M6.5 12C9.53757 12 12 14.4624 12 17.5C12 20.5376 9.53757 23 6.5 23C3.46243 23 1 20.5376 1 17.5C1 14.4624 3.46243 12 6.5 12ZM13 1C18.523 1 23 5.478 23 11C23 16.522 18.523 21 13 21C12.6652 21 12.3342 20.9835 12.0079 20.9514C12.3225 20.452 12.5697 19.9075 12.7389 19.3297L13 19.333C17.595 19.333 21.333 15.595 21.333 11C21.333 6.405 17.595 2.667 13 2.667C8.405 2.667 4.667 6.405 4.667 11L4.67104 11.2614C4.09237 11.4303 3.54782 11.6776 3.04884 11.9909C3.01645 11.6657 3 11.3347 3 11C3 5.478 7.477 1 13 1ZM3.71569 14.5886L3.64645 14.6464L3.58859 14.7157C3.47047 14.8862 3.47047 15.1138 3.58859 15.2843L3.64645 15.3536L5.793 17.5L3.64645 19.6464L3.58859 19.7157C3.47047 19.8862 3.47047 20.1138 3.58859 20.2843L3.64645 20.3536L3.71569 20.4114C3.8862 20.5295 4.1138 20.5295 4.28431 20.4114L4.35355 20.3536L6.5 18.207L8.64645 20.3536L8.71569 20.4114C8.8862 20.5295 9.1138 20.5295 9.28431 20.4114L9.35355 20.3536L9.41141 20.2843C9.52953 20.1138 9.52953 19.8862 9.41141 19.7157L9.35355 19.6464L7.207 17.5L9.35355 15.3536L9.41141 15.2843C9.52953 15.1138 9.52953 14.8862 9.41141 14.7157L9.35355 14.6464L9.28431 14.5886C9.1138 14.4705 8.8862 14.4705 8.71569 14.5886L8.64645 14.6464L6.5 16.793L4.35355 14.6464L4.28431 14.5886C4.13815 14.4873 3.95007 14.4729 3.79193 14.5452L3.71569 14.5886ZM12.25 5C12.6295 5 12.9435 5.28233 12.9931 5.64827L13 5.75V11H16.25C16.664 11 17 11.336 17 11.75C17 12.1295 16.7177 12.4435 16.3517 12.4931L16.25 12.5H12.25C11.8705 12.5 11.5565 12.2177 11.5069 11.8517L11.5 11.75V5.75C11.5 5.336 11.836 5 12.25 5Z</StreamGeometry>
       <StreamGeometry x:Key="order_failed">M24 4C35.0457 4 44 12.9543 44 24C44 35.0457 35.0457 44 24 44C12.9543 44 4 35.0457 4 24C4 12.9543 12.9543 4 24 4ZM24 6.5C14.335 6.5 6.5 14.335 6.5 24C6.5 33.665 14.335 41.5 24 41.5C33.665 41.5 41.5 33.665 41.5 24C41.5 14.335 33.665 6.5 24 6.5ZM17.7824 16.025L17.8839 16.1161L24 22.233L30.1161 16.1161C30.5717 15.6605 31.2915 15.6301 31.7824 16.025L31.8839 16.1161C32.3395 16.5717 32.3699 17.2915 31.975 17.7824L31.8839 17.8839L25.767 24L31.8839 30.1161C32.3395 30.5717 32.3699 31.2915 31.975 31.7824L31.8839 31.8839C31.4283 32.3395 30.7085 32.3699 30.2176 31.975L30.1161 31.8839L24 25.767L17.8839 31.8839C17.4283 32.3395 16.7085 32.3699 16.2176 31.975L16.1161 31.8839C15.6605 31.4283 15.6301 30.7085 16.025 30.2176L16.1161 30.1161L22.233 24L16.1161 17.8839C15.6605 17.4283 15.6301 16.7085 16.025 16.2176L16.1161 16.1161C16.5717 15.6605 17.2915 15.6301 17.7824 16.025Z</StreamGeometry>
-
       <StreamGeometry x:Key="privacy_progress_private">M13.3064 8.0771C13.5561 7.83875 13.5653 7.44315 13.327 7.19345C13.0886 6.94375 12.693 6.93455 12.4433 7.1729L7.38505 12.0013L5.5668 10.183C5.32275 9.939 4.927 9.939 4.68295 10.183C4.43885 10.4271 4.43885 10.8228 4.68295 11.0669L6.93295 13.3169C7.173 13.557 7.56085 13.5615 7.80645 13.3271L13.3064 8.0771ZM9.4323 0.673756C9.19055 0.442081 8.8092 0.442081 8.56745 0.673756C7.1881 1.99564 5.2251 2.7127 3.54895 3.09367C2.71945 3.28219 1.97949 3.38414 1.44776 3.43882C1.18226 3.46613 0.96966 3.48155 0.824935 3.4901C0.752595 3.49438 0.697295 3.49693 0.660905 3.4984C0.642715 3.49913 0.629255 3.49959 0.62077 3.49986L0.6118 3.50015L0.6101 3.5002C0.270845 3.50825 -4.99993e-06 3.78565 0 4.12505V8.875C0 11.2935 0.621345 13.7041 2.04885 15.7624C3.4796 17.8254 5.6943 19.4968 8.81345 20.4715C8.93485 20.5095 9.0649 20.5095 9.1863 20.4715C15.4703 18.5078 18 13.7484 18 9V4.125C18 3.78555 17.7288 3.5082 17.3895 3.50015H17.3882L17.3792 3.49986C17.3708 3.49959 17.3573 3.49913 17.3391 3.4984C17.3027 3.49693 17.2474 3.49438 17.1751 3.4901C17.0303 3.48155 16.8177 3.46613 16.5522 3.43882C16.0205 3.38414 15.2805 3.28219 14.451 3.09366C12.7747 2.71271 10.8116 1.99563 9.4323 0.673756ZM1.25 8.875L1.25001 4.71265C1.34845 4.70445 1.45736 4.69445 1.57564 4.68225C2.14545 4.62365 2.9367 4.5147 3.82595 4.3126C5.4352 3.94685 7.43115 3.26166 8.9999 1.96143C10.5687 3.26166 12.5647 3.94685 14.174 4.3126C15.0632 4.5147 15.8545 4.62365 16.4244 4.68225C16.5427 4.69445 16.6516 4.70445 16.75 4.71265V9C16.75 13.2051 14.5778 17.3994 8.9999 19.2189C6.2201 18.3122 4.3054 16.8227 3.076 15.05C1.8161 13.2334 1.25001 11.0814 1.25 8.875Z</StreamGeometry>
       <StreamGeometry x:Key="privacy_progress_semiprivate">M17.25 3.5C14.5866 3.5 11.992 2.55652 9.45 0.65C9.1833 0.45 8.8167 0.45 8.55 0.65C6.00797 2.55652 3.41341 3.5 0.75 3.5C0.33579 3.5 0 3.83579 0 4.25V9.5C0 14.5012 2.95756 18.1757 8.7251 20.4478C8.9018 20.5174 9.0982 20.5174 9.2749 20.4478C15.0424 18.1757 18 14.5012 18 9.5V4.25C18 3.83579 17.6642 3.5 17.25 3.5ZM1.5 4.97793C4.07735 4.82585 6.58084 3.88829 9 2.17782C11.4192 3.88829 13.9227 4.82585 16.5 4.97793V9.5C16.5 13.7556 14.0466 16.8789 9 18.9419C3.95337 16.8789 1.5 13.7556 1.5 9.5V4.97793ZM9.7432 6.15179C9.6935 5.78572 9.3797 5.50356 9 5.50356C8.5858 5.50356 8.25 5.83935 8.25 6.25356V12.7523L8.2568 12.8541C8.3065 13.2201 8.6203 13.5023 9 13.5023C9.4142 13.5023 9.75 13.1665 9.75 12.7523V6.25356L9.7432 6.15179ZM9 16.5C9.5523 16.5 10 16.0523 10 15.5C10 14.9477 9.5523 14.5 9 14.5C8.4477 14.5 8 14.9477 8 15.5C8 16.0523 8.4477 16.5 9 16.5Z</StreamGeometry>
-
       <StreamGeometry x:Key="shield_little_checkmark">M23.1349 4.34751C23.6184 3.88416 24.3811 3.88416 24.8646 4.34751C27.6233 6.99126 31.5494 8.42541 34.9019 9.18733C36.5609 9.56438 38.0409 9.76829 39.1044 9.87765C39.6354 9.93226 40.0606 9.9631 40.3501 9.98021C40.4948 9.98876 40.6054 9.99387 40.6782 9.9968C40.7146 9.99827 40.7415 9.99919 40.7585 9.99973L40.7764 10.0003L40.7791 10.0003C41.4577 10.0164 42 10.5711 42 11.25V21C42 21.9818 41.9459 22.9638 41.8351 23.9398C41.0825 23.4737 40.2789 23.0823 39.4344 22.7759C39.4784 22.1852 39.5 21.5926 39.5 21V12.4253C39.3031 12.4089 39.0853 12.3889 38.8487 12.3645C37.709 12.2473 36.1264 12.0294 34.3479 11.6252C31.1293 10.8937 27.1373 9.52333 23.9998 6.92285C20.8623 9.52333 16.8704 10.8937 13.6519 11.6252C11.8734 12.0294 10.2909 12.2473 9.15128 12.3645C8.91472 12.3889 8.6969 12.4089 8.50002 12.4253L8.5 20.75C8.50001 25.1629 9.6322 29.4668 12.152 33.1001C14.5567 36.5674 18.2722 39.4929 23.6349 41.3163C24.1008 42.1528 24.6564 42.9325 25.2886 43.6425C24.9878 43.746 24.6825 43.8463 24.3726 43.9431C24.1298 44.019 23.8697 44.019 23.6269 43.9431C17.3886 41.9936 12.9592 38.6508 10.0977 34.5249C7.24269 30.4082 6 25.587 6 20.75V11.2501C5.99999 10.5713 6.54169 10.0165 7.2202 10.0004L7.2236 10.0003L7.24154 9.99973C7.25851 9.99919 7.28543 9.99827 7.32181 9.9968C7.39459 9.99387 7.50519 9.98876 7.64987 9.98021C7.93932 9.9631 8.36453 9.93226 8.89553 9.87765C9.95899 9.76829 11.4389 9.56438 13.0979 9.18734C16.4502 8.42541 20.3762 6.99127 23.1349 4.34751ZM46 35C46 28.9249 41.0751 24 35 24C28.9249 24 24 28.9249 24 35C24 41.0751 28.9249 46 35 46C41.0751 46 46 41.0751 46 35ZM41.7071 30.2929C42.0976 30.6834 42.0976 31.3166 41.7071 31.7071L33.7071 39.7071C33.3166 40.0976 32.6834 40.0976 32.2929 39.7071L28.2929 35.7071C27.9024 35.3166 27.9024 34.6834 28.2929 34.2929C28.6834 33.9024 29.3166 33.9024 29.7071 34.2929L33 37.5858L40.2929 30.2929C40.6834 29.9024 41.3166 29.9024 41.7071 30.2929Z</StreamGeometry>
       <StreamGeometry x:Key="star">M21.803 6.08544C22.7017 4.26449 25.2983 4.26448 26.197 6.08544L31.0493 15.9174L41.8996 17.494C43.9091 17.786 44.7115 20.2556 43.2574 21.673L35.4061 29.3261L37.2595 40.1325C37.6028 42.1339 35.5021 43.6602 33.7047 42.7152L24 37.6132L14.2952 42.7152C12.4978 43.6602 10.3971 42.1339 10.7404 40.1325L12.5938 29.3261L4.74255 21.673C3.28843 20.2556 4.09083 17.786 6.10037 17.494L16.9506 15.9174L21.803 6.08544ZM24 7.2827L19.1808 17.0474C18.8239 17.7705 18.1341 18.2717 17.3361 18.3877L6.56012 19.9535L14.3577 27.5542C14.9351 28.1171 15.1986 28.9281 15.0623 29.7228L13.2216 40.4553L22.8599 35.3881C23.5736 35.0128 24.4263 35.0129 25.1401 35.3881L34.7784 40.4553L32.9376 29.7228C32.8013 28.9281 33.0648 28.1171 33.6422 27.5542L41.4398 19.9535L30.6638 18.3877C29.8658 18.2717 29.176 17.7705 28.8191 17.0474L24 7.2827Z</StreamGeometry>
+      <StreamGeometry x:Key="signature">M16.4795 21.0018L16.7496 20.9999C17.9698 20.9999 18.6108 21.5057 19.4017 22.704L19.7954 23.3123C20.1024 23.7668 20.294 23.9572 20.5354 24.0567C20.9681 24.235 21.3267 24.1473 22.6437 23.5132L23.0469 23.3169C23.8706 22.9125 24.4326 22.681 25.0677 22.5223C25.4695 22.4218 25.8767 22.6661 25.9772 23.068C26.0777 23.4698 25.8333 23.877 25.4315 23.9775C25.0368 24.0762 24.6585 24.2177 24.1637 24.4458L23.0051 25.0031C21.4372 25.7436 20.9055 25.8316 19.9638 25.4435C19.3387 25.1859 18.9833 24.8132 18.4632 24.0179L18.2685 23.7139C17.7067 22.8287 17.4054 22.5383 16.8684 22.5035L16.7496 22.4999C16.2013 22.4999 16.0929 22.5683 14.0089 24.1149C12.2666 25.4078 10.9379 26.0254 9.24824 26.0254C7.18832 26.0254 5.24733 25.6469 3.43105 24.8904L6.31337 24.224C7.25729 24.4249 8.23527 24.5254 9.24824 24.5254C10.5389 24.5254 11.6087 24.0281 13.115 22.9103L14.275 22.0544C15.5464 21.1304 15.8292 21.0159 16.4795 21.0018ZM22.7767 3.22195C24.4503 4.89558 24.4504 7.60902 22.7768 9.28268L21.7413 10.3183C22.8932 11.7198 22.8517 13.2052 21.7807 14.2794L18.7797 17.2805C18.4866 17.5732 18.0118 17.573 17.719 17.2799C17.4263 16.9869 17.4265 16.512 17.7195 16.2193L20.7185 13.2203C21.2036 12.7338 21.2596 12.1299 20.6785 11.3818L10.0841 21.976C9.78595 22.2742 9.40996 22.4826 8.99904 22.5774L2.91824 23.9807C2.37819 24.1053 1.89417 23.6213 2.0188 23.0812L3.42207 17.0004C3.51689 16.5895 3.72526 16.2135 4.02342 15.9154L16.7161 3.22204C18.3896 1.54842 21.103 1.54837 22.7767 3.22195ZM17.7768 4.28268L5.08411 16.976C4.98472 17.0754 4.91527 17.2007 4.88366 17.3377L3.75022 22.2492L8.66175 21.1158C8.79872 21.0842 8.92406 21.0147 9.02345 20.9153L21.7161 8.22204C22.8039 7.13418 22.8039 5.37047 21.7161 4.28263C20.6282 3.19483 18.8645 3.19486 17.7768 4.28268Z</StreamGeometry>
 
       <ControlTemplate x:Key="wasabi_logo_text_dynamic">
         <StackPanel Margin="0,0,0,-5" TextElement.FontFamily="{StaticResource WasabiLogoTextFont}"
diff --git a/WalletWasabi.Fluent/Login/Views/LoginView.axaml b/WalletWasabi.Fluent/Login/Views/LoginView.axaml
index c15b7a3a70..d8fa3c96aa 100644
--- a/WalletWasabi.Fluent/Login/Views/LoginView.axaml
+++ b/WalletWasabi.Fluent/Login/Views/LoginView.axaml
@@ -51,7 +51,8 @@
           <DockPanel DockPanel.Dock="Top"
                      VerticalAlignment="Bottom"
                      IsVisible="{Binding IsPasswordNeeded}">
-            <CopyablePasswordTextBox DockPanel.Dock="Top" Text="{Binding Password}" Watermark="{x:Static lang:Resources.OpenPasswordBoxWatermark}" PasswordChar="•"
+            <CopyablePasswordTextBox DockPanel.Dock="Top" Text="{Binding Password}"
+                                     Watermark="{x:Static lang:Resources.OpenPasswordBoxWatermark}" PasswordChar="•"
                                      Classes="revealPasswordButton copyablePasswordTextBox"
                                      x:Name="Password">
               <Interaction.Behaviors>
@@ -67,10 +68,10 @@
                     <Panel>
                       <PathIcon Data="{StaticResource PasswordBoxRevealButtonData}"
                                 Height="8" Width="12"
-                                IsVisible="{Binding !$parent[ToggleButton].IsChecked}"/>
+                                IsVisible="{Binding !$parent[ToggleButton].IsChecked}" />
                       <PathIcon Data="{StaticResource PasswordBoxHideButtonData}"
                                 Height="12" Width="12"
-                                IsVisible="{Binding $parent[ToggleButton].IsChecked}"/>
+                                IsVisible="{Binding $parent[ToggleButton].IsChecked}" />
                     </Panel>
                   </ToggleButton>
 
@@ -100,7 +101,8 @@
           </DockPanel>
 
           <!-- Hardware & Watch only wallet -->
-          <Button Content="{x:Static lang:Resources.Open}" IsVisible="{Binding !IsPasswordNeeded}" HorizontalAlignment="Center" Classes="action" Command="{Binding NextCommand}">
+          <Button Content="{x:Static lang:Resources.Open}" IsVisible="{Binding !IsPasswordNeeded}"
+                  HorizontalAlignment="Center" Classes="action" Command="{Binding NextCommand}">
             <Button.IsDefault>
               <MultiBinding Converter="{x:Static BoolConverters.And}">
                 <Binding Path="ErrorMessage" Converter="{x:Static StringConverters.IsNullOrEmpty}" />
@@ -117,7 +119,8 @@
                     VerticalAlignment="Bottom"
                     Classes="fadeAnimation">
           <TextBlock Text="{Binding ErrorMessage}" HorizontalAlignment="Center" />
-          <Button Content="{x:Static lang:Resources.Ok}" Focusable="False" Classes="action" HorizontalAlignment="Center" Command="{Binding OkCommand}">
+          <Button Content="{x:Static lang:Resources.Ok}" Focusable="False" Classes="action"
+                  HorizontalAlignment="Center" Command="{Binding OkCommand}">
             <Button.IsDefault>
               <MultiBinding Converter="{x:Static BoolConverters.And}">
                 <Binding Path="ErrorMessage" Converter="{x:Static StringConverters.IsNotNullOrEmpty}" />
diff --git a/WalletWasabi.Fluent/MathNet/CubicSpline.cs b/WalletWasabi.Fluent/MathNet/CubicSpline.cs
index b1d4b8a06c..87f1580b47 100644
--- a/WalletWasabi.Fluent/MathNet/CubicSpline.cs
+++ b/WalletWasabi.Fluent/MathNet/CubicSpline.cs
@@ -231,8 +231,8 @@ public static CubicSpline InterpolateBoundariesSorted(
 
 		// normalize special cases
 		if ((n == 2)
-			&& (leftBoundaryCondition == SplineBoundaryCondition.ParabolicallyTerminated)
-			&& (rightBoundaryCondition == SplineBoundaryCondition.ParabolicallyTerminated))
+		    && (leftBoundaryCondition == SplineBoundaryCondition.ParabolicallyTerminated)
+		    && (rightBoundaryCondition == SplineBoundaryCondition.ParabolicallyTerminated))
 		{
 			leftBoundaryCondition = SplineBoundaryCondition.SecondDerivative;
 			leftBoundary = 0d;
@@ -471,4 +471,4 @@ private int LeftSegmentIndex(double t)
 
 		return Math.Min(Math.Max(index, 0), _x.Length - 2);
 	}
-}
+}
\ No newline at end of file
diff --git a/WalletWasabi.Fluent/MathNet/Precision.Equality.cs b/WalletWasabi.Fluent/MathNet/Precision.Equality.cs
index 1bb03dae17..bd71f0a4e7 100644
--- a/WalletWasabi.Fluent/MathNet/Precision.Equality.cs
+++ b/WalletWasabi.Fluent/MathNet/Precision.Equality.cs
@@ -43,4 +43,4 @@ public static bool AlmostEqual(this double a, double b)
 	{
 		return AlmostEqualNorm(a, b, a - b, DefaultDoubleAccuracy);
 	}
-}
+}
\ No newline at end of file
diff --git a/WalletWasabi.Fluent/MathNet/Precision.cs b/WalletWasabi.Fluent/MathNet/Precision.cs
index 45b3854d01..61fb980489 100644
--- a/WalletWasabi.Fluent/MathNet/Precision.cs
+++ b/WalletWasabi.Fluent/MathNet/Precision.cs
@@ -37,4 +37,4 @@ public static partial class Precision
 	/// Value representing 10 * 2^(-53) = 1.11022302462516E-15
 	/// </summary>
 	private static readonly double DefaultDoubleAccuracy = DoublePrecision * 10;
-}
+}
\ No newline at end of file
diff --git a/WalletWasabi.Fluent/MathNet/SplineBoundaryCondition.cs b/WalletWasabi.Fluent/MathNet/SplineBoundaryCondition.cs
index 5b2be56d85..43c6d2b2e3 100644
--- a/WalletWasabi.Fluent/MathNet/SplineBoundaryCondition.cs
+++ b/WalletWasabi.Fluent/MathNet/SplineBoundaryCondition.cs
@@ -26,4 +26,4 @@ public enum SplineBoundaryCondition
 	/// Fixed second derivative at the boundary.
 	/// </summary>
 	SecondDerivative
-}
+}
\ No newline at end of file
diff --git a/WalletWasabi.Fluent/Models/BrowserTypeDropdownListEnum.cs b/WalletWasabi.Fluent/Models/BrowserTypeDropdownListEnum.cs
index 7bb282a06c..68368ce992 100644
--- a/WalletWasabi.Fluent/Models/BrowserTypeDropdownListEnum.cs
+++ b/WalletWasabi.Fluent/Models/BrowserTypeDropdownListEnum.cs
@@ -4,8 +4,7 @@ namespace WalletWasabi.Fluent.Models;
 
 public enum BrowserTypeDropdownListEnum
 {
-	[FriendlyName(isLocalized: true)]
-	SystemDefault,
+	[FriendlyName(isLocalized: true)] SystemDefault,
 
 	Tor,
 	Brave,
@@ -13,11 +12,9 @@ public enum BrowserTypeDropdownListEnum
 	Chrome,
 	Opera,
 
-	[FriendlyName("Internet Explorer")]
-	InternetExplorer,
+	[FriendlyName("Internet Explorer")] InternetExplorer,
 
 	Safari,
 
-	[FriendlyName(isLocalized: true)]
-	Custom
+	[FriendlyName(isLocalized: true)] Custom
 }
diff --git a/WalletWasabi.Fluent/Models/FeeDisplayUnit.cs b/WalletWasabi.Fluent/Models/FeeDisplayUnit.cs
index f8707ea671..723ce48792 100644
--- a/WalletWasabi.Fluent/Models/FeeDisplayUnit.cs
+++ b/WalletWasabi.Fluent/Models/FeeDisplayUnit.cs
@@ -6,6 +6,5 @@ public enum FeeDisplayUnit
 {
 	BTC,
 
-	[FriendlyName("sats")]
-	Satoshis,
+	[FriendlyName("sats")] Satoshis,
 }
diff --git a/WalletWasabi.Fluent/Models/TransactionBroadcasterModel.cs b/WalletWasabi.Fluent/Models/TransactionBroadcasterModel.cs
index ea07d5121f..9e55d99838 100644
--- a/WalletWasabi.Fluent/Models/TransactionBroadcasterModel.cs
+++ b/WalletWasabi.Fluent/Models/TransactionBroadcasterModel.cs
@@ -69,25 +69,25 @@ TxOut GetOutput(OutPoint outpoint) =>
 		var inputCount = inputAddressAmount.Length;
 		var totalInputValue =
 			inputAddressAmount.Any(x => x.Value == nullMoney)
-			? null
-			: inputAddressAmount.Select(x => x.Value).Sum();
+				? null
+				: inputAddressAmount.Select(x => x.Value).Sum();
 
 		var inputAmountString =
 			totalInputValue is null
-			? Resources.Unknown
-			: $"{totalInputValue.ToFormattedString()} BTC";
+				? Resources.Unknown
+				: $"{totalInputValue.ToFormattedString()} BTC";
 
 		var outputCount = outputAddressAmount.Length;
 
 		var totalOutputValue =
 			outputAddressAmount.Any(x => x.Value == nullMoney)
-			? null
-			: outputAddressAmount.Select(x => x.Value).Sum();
+				? null
+				: outputAddressAmount.Select(x => x.Value).Sum();
 
 		var outputAmountString =
 			totalOutputValue is null
-			? Resources.Unknown
-			: $"{totalOutputValue.ToFormattedString()} BTC";
+				? Resources.Unknown
+				: $"{totalOutputValue.ToFormattedString()} BTC";
 
 		var networkFee = totalInputValue is null || totalOutputValue is null
 			? null
diff --git a/WalletWasabi.Fluent/Models/Transactions/PrivacySuggestion.cs b/WalletWasabi.Fluent/Models/Transactions/PrivacySuggestion.cs
index 4e1e7bf4db..5877a43229 100644
--- a/WalletWasabi.Fluent/Models/Transactions/PrivacySuggestion.cs
+++ b/WalletWasabi.Fluent/Models/Transactions/PrivacySuggestion.cs
@@ -16,17 +16,17 @@ public record LabelManagementSuggestion(BuildTransactionResult? Transaction = nu
 
 public record FullPrivacySuggestion(BuildTransactionResult Transaction, decimal Difference, string DifferenceText, string DifferenceAmountText, IEnumerable<SmartCoin> Coins, bool IsChangeless, bool IsMore, bool IsLess) : PrivacySuggestion(Transaction)
 {
-    public bool IsSameAmount => !IsMore && !IsLess;
+	public bool IsSameAmount => !IsMore && !IsLess;
 }
 
 public record BetterPrivacySuggestion(BuildTransactionResult Transaction, string DifferenceText, string DifferenceAmountText, IEnumerable<SmartCoin> Coins, bool IsChangeless, bool IsMore, bool IsLess) : PrivacySuggestion(Transaction)
 {
-    public bool IsSameAmount => !IsMore && !IsLess;
+	public bool IsSameAmount => !IsMore && !IsLess;
 }
 
 public record ChangeAvoidanceSuggestion(BuildTransactionResult Transaction, decimal Difference, string DifferenceText, string DifferenceAmountText, bool IsMore, bool IsLess) : PrivacySuggestion(Transaction)
 {
-    public Money GetAmount(BitcoinAddress destination) => Transaction!.CalculateDestinationAmount(destination);
+	public Money GetAmount(BitcoinAddress destination) => Transaction!.CalculateDestinationAmount(destination);
 
-    public bool IsSameAmount => !IsMore && !IsLess;
+	public bool IsSameAmount => !IsMore && !IsLess;
 }
diff --git a/WalletWasabi.Fluent/Models/Transactions/PrivacySuggestionsModel.cs b/WalletWasabi.Fluent/Models/Transactions/PrivacySuggestionsModel.cs
index 96beebb67c..6bb561b367 100644
--- a/WalletWasabi.Fluent/Models/Transactions/PrivacySuggestionsModel.cs
+++ b/WalletWasabi.Fluent/Models/Transactions/PrivacySuggestionsModel.cs
@@ -81,10 +81,12 @@ public async IAsyncEnumerable<PrivacyItem> BuildPrivacySuggestionsAsync(Transact
 			{
 				yield return item;
 			}
+
 			await foreach (var item in VerifyChangeAsync(parameters, _linkedCancellationTokenSource).ConfigureAwait(false))
 			{
 				yield return item;
 			}
+
 			lock (_lock)
 			{
 				_singleRunCancellationTokenSource = null;
@@ -140,7 +142,7 @@ private IEnumerable<PrivacyItem> VerifyPrivacyLevel(Parameters parameters)
 			parameters.TransactionInfo.Recipient.Equals(new LabelsArray(transactionLabels), StringComparer.OrdinalIgnoreCase);
 
 		var foundNonPrivate = !onlyKnownByRecipient &&
-							  parameters.Transaction.SpentCoins.Any(x => x.GetPrivacyLevel(_wallet.AnonScoreTarget) == PrivacyLevel.NonPrivate);
+		                      parameters.Transaction.SpentCoins.Any(x => x.GetPrivacyLevel(_wallet.AnonScoreTarget) == PrivacyLevel.NonPrivate);
 
 		var foundSemiPrivate =
 			parameters.Transaction.SpentCoins.Any(x => x.GetPrivacyLevel(_wallet.AnonScoreTarget) == PrivacyLevel.SemiPrivate);
@@ -174,8 +176,8 @@ private IEnumerable<PrivacyItem> VerifyPrivacyLevel(Parameters parameters)
 		var onlyKnownByTheRecipientCoins = availableCoins.Where(x => parameters.TransactionInfo.Recipient.Equals(x.GetLabels(_wallet.AnonScoreTarget), StringComparer.OrdinalIgnoreCase)).ToArray();
 		var allSemiPrivateCoin =
 			availableCoins.Where(x => x.GetPrivacyLevel(_wallet.AnonScoreTarget) == PrivacyLevel.SemiPrivate)
-						  .Union(onlyKnownByTheRecipientCoins)
-						  .ToArray();
+				.Union(onlyKnownByTheRecipientCoins)
+				.ToArray();
 
 		allSemiPrivateCoin = wasCoinjoiningCoinUsed ? allSemiPrivateCoin : allSemiPrivateCoin.Except(coinsToExclude).ToArray();
 
@@ -184,7 +186,7 @@ private IEnumerable<PrivacyItem> VerifyPrivacyLevel(Parameters parameters)
 		FullPrivacySuggestion? fullPrivacySuggestion = null;
 
 		if ((foundNonPrivate || foundSemiPrivate) && allPrivateCoin.Length != 0 &&
-			TryCreateTransaction(parameters.TransactionInfo, allPrivateCoin, out var newTransaction, out var isChangeless))
+		    TryCreateTransaction(parameters.TransactionInfo, allPrivateCoin, out var newTransaction, out var isChangeless))
 		{
 			var amountDifference = totalAmount - newTransaction.CalculateDestinationAmount(parameters.TransactionInfo.Destination).ToDecimal(MoneyUnit.BTC);
 			var amountDifferencePercentage = amountDifference / totalAmount;
@@ -210,7 +212,7 @@ private IEnumerable<PrivacyItem> VerifyPrivacyLevel(Parameters parameters)
 
 		var coins = allPrivateCoin.Union(allSemiPrivateCoin).ToArray();
 		if (foundNonPrivate && allSemiPrivateCoin.Length != 0 &&
-			TryCreateTransaction(parameters.TransactionInfo, coins, out newTransaction, out isChangeless))
+		    TryCreateTransaction(parameters.TransactionInfo, coins, out newTransaction, out isChangeless))
 		{
 			var amountDifference = totalAmount - newTransaction.CalculateDestinationAmount(parameters.TransactionInfo.Destination).ToDecimal(MoneyUnit.BTC);
 			var amountDifferencePercentage = amountDifference / totalAmount;
@@ -326,6 +328,7 @@ private async Task<List<ChangeAvoidanceSuggestion>> CreateChangeAvoidanceSuggest
 					result.Remove(existingSuggestion);
 					result.Add(suggestion);
 				}
+
 				return result;
 			}
 
diff --git a/WalletWasabi.Fluent/Models/Transactions/SendFlowModel.cs b/WalletWasabi.Fluent/Models/Transactions/SendFlowModel.cs
index 17162155cd..b8d54726af 100644
--- a/WalletWasabi.Fluent/Models/Transactions/SendFlowModel.cs
+++ b/WalletWasabi.Fluent/Models/Transactions/SendFlowModel.cs
@@ -20,13 +20,13 @@ private SendFlowModel(Wallet wallet, ICoinsView availableCoins, CoinListModel co
 	}
 
 	/// <summary>Regular Send Flow. Uses all wallet coins</summary>
-	public SendFlowModel(Wallet wallet, WalletModel walletModel):
+	public SendFlowModel(Wallet wallet, WalletModel walletModel) :
 		this(wallet, wallet.Coins, walletModel.Coins, walletModel)
 	{
 	}
 
 	/// <summary>Manual Control Send Flow. Uses only the specified coins.</summary>
-	public SendFlowModel(Wallet wallet, WalletModel walletModel, IEnumerable<SmartCoin> coins):
+	public SendFlowModel(Wallet wallet, WalletModel walletModel, IEnumerable<SmartCoin> coins) :
 		this(wallet, new CoinsView(coins), new UserSelectionCoinListModel(wallet, walletModel, coins.ToArray()), walletModel)
 	{
 	}
@@ -49,6 +49,6 @@ public SendFlowModel(Wallet wallet, WalletModel walletModel, IEnumerable<SmartCo
 
 	public Pocket[] GetPockets() =>
 		AvailableCoins.GetPockets(Wallet.AnonScoreTarget)
-					  .Select(x => new Pocket(x))
-		              .ToArray();
+			.Select(x => new Pocket(x))
+			.ToArray();
 }
diff --git a/WalletWasabi.Fluent/Models/UI/ApplicationSettings.cs b/WalletWasabi.Fluent/Models/UI/ApplicationSettings.cs
index 3aefeecc82..fb135938e9 100644
--- a/WalletWasabi.Fluent/Models/UI/ApplicationSettings.cs
+++ b/WalletWasabi.Fluent/Models/UI/ApplicationSettings.cs
@@ -12,7 +12,6 @@
 using WalletWasabi.Exceptions;
 using WalletWasabi.Fluent.Extensions;
 using WalletWasabi.Fluent.Helpers;
-using WalletWasabi.Fluent.HomeScreen.BuySell.Models;
 using WalletWasabi.Fluent.Infrastructure;
 using WalletWasabi.Fluent.Models.Wallets;
 using WalletWasabi.Helpers;
@@ -268,22 +267,21 @@ public TorMode GetTorStartupMode()
 
 	private void Save()
 	{
-		RxApp.MainThreadScheduler.Schedule(
-			() =>
+		RxApp.MainThreadScheduler.Schedule(() =>
+		{
+			try
 			{
-				try
-				{
-					PersistentConfig currentConfig = ConfigManagerNg.LoadFile<PersistentConfig>(_persistentConfigFilePath);
-					PersistentConfig newConfig = ApplyChanges(currentConfig);
-					ConfigManagerNg.ToFile(_persistentConfigFilePath, newConfig);
+				PersistentConfig currentConfig = ConfigManagerNg.LoadFile<PersistentConfig>(_persistentConfigFilePath);
+				PersistentConfig newConfig = ApplyChanges(currentConfig);
+				ConfigManagerNg.ToFile(_persistentConfigFilePath, newConfig);
 
-					_isRestartNeeded.OnNext(CheckIfRestartIsNeeded(newConfig));
-				}
-				catch (Exception ex)
-				{
-					Logger.LogDebug(ex);
-				}
-			});
+				_isRestartNeeded.OnNext(CheckIfRestartIsNeeded(newConfig));
+			}
+			catch (Exception ex)
+			{
+				Logger.LogDebug(ex);
+			}
+		});
 	}
 
 	private PersistentConfig ApplyChanges(PersistentConfig config)
diff --git a/WalletWasabi.Fluent/Models/UI/QrCodeReader.cs b/WalletWasabi.Fluent/Models/UI/QrCodeReader.cs
index 868c6ce7d9..6098d67531 100644
--- a/WalletWasabi.Fluent/Models/UI/QrCodeReader.cs
+++ b/WalletWasabi.Fluent/Models/UI/QrCodeReader.cs
@@ -25,36 +25,35 @@ public class QrCodeReader
 
 	public IObservable<(string decoded, Bitmap bitmap)> Read()
 	{
-		return Observable.Create(
-			async (IObserver<(string, Bitmap)> result, CancellationToken ct) =>
-			{
-				var devices = new CaptureDevices();
-				var device = devices
-					.EnumerateDescriptors()
-					.Where(static d => d is not VideoForWindowsDeviceDescriptor)
-					.SelectMany(static d => d.Characteristics, static (d, c) => new { d, c })
-					.FirstOrDefault() ?? throw new InvalidOperationException("Could not find a device.");
+		return Observable.Create(async (IObserver<(string, Bitmap)> result, CancellationToken ct) =>
+		{
+			var devices = new CaptureDevices();
+			var device = devices
+				.EnumerateDescriptors()
+				.Where(static d => d is not VideoForWindowsDeviceDescriptor)
+				.SelectMany(static d => d.Characteristics, static (d, c) => new { d, c })
+				.FirstOrDefault() ?? throw new InvalidOperationException("Could not find a device.");
 
-				await using var capture = await device.d
-					.OpenAsync(
-						device.c,
-						ct: ct,
-						pixelBufferArrived: scope =>
-						{
-							var decoded = Decode(scope);
-							var bitmap = new Bitmap(scope.Buffer.ReferImage().AsStream());
+			await using var capture = await device.d
+				.OpenAsync(
+					device.c,
+					ct: ct,
+					pixelBufferArrived: scope =>
+					{
+						var decoded = Decode(scope);
+						var bitmap = new Bitmap(scope.Buffer.ReferImage().AsStream());
 
-							result.OnNext((decoded, bitmap));
-						})
-					.ConfigureAwait(false);
+						result.OnNext((decoded, bitmap));
+					})
+				.ConfigureAwait(false);
 
-				var tcs = new TaskCompletionSource<object?>();
+			var tcs = new TaskCompletionSource<object?>();
 
-				ct.Register(() => tcs.TrySetResult(default));
+			ct.Register(() => tcs.TrySetResult(default));
 
-				await capture.StartAsync(ct).ConfigureAwait(false);
-				await tcs.Task.ConfigureAwait(false);
-			});
+			await capture.StartAsync(ct).ConfigureAwait(false);
+			await tcs.Task.ConfigureAwait(false);
+		});
 	}
 
 	private string Decode(PixelBufferScope scope)
diff --git a/WalletWasabi.Fluent/Models/UI/TorStatusCheckerModel.cs b/WalletWasabi.Fluent/Models/UI/TorStatusCheckerModel.cs
index f0ff6ab64f..91bbe3261e 100644
--- a/WalletWasabi.Fluent/Models/UI/TorStatusCheckerModel.cs
+++ b/WalletWasabi.Fluent/Models/UI/TorStatusCheckerModel.cs
@@ -11,7 +11,7 @@ public TorStatusCheckerModel()
 	{
 		Issues =
 			Observable.FromEventPattern<Issue[]>(Services.TorStatusChecker, nameof(TorStatusChecker.StatusEvent))
-					  .Select(pattern => pattern.EventArgs.ToList());
+				.Select(pattern => pattern.EventArgs.ToList());
 	}
 
 	public IObservable<IList<Issue>> Issues { get; }
diff --git a/WalletWasabi.Fluent/Models/UI/UiClipboard.cs b/WalletWasabi.Fluent/Models/UI/UiClipboard.cs
index ee5eda4f1f..7791a7fd86 100644
--- a/WalletWasabi.Fluent/Models/UI/UiClipboard.cs
+++ b/WalletWasabi.Fluent/Models/UI/UiClipboard.cs
@@ -9,5 +9,5 @@ public class UiClipboard
 
 	public async Task SetTextAsync(string? text) => await ApplicationHelper.SetTextAsync(text);
 
-	public async Task ClearAsync() => await ApplicationHelper.ClearAsync();
+	public async Task ClearAsync() => await ApplicationHelper.ClearClipboardAsync();
 }
diff --git a/WalletWasabi.Fluent/Models/Wallets/AddressesModel.cs b/WalletWasabi.Fluent/Models/Wallets/AddressesModel.cs
index c0d474a03a..0bf828b754 100644
--- a/WalletWasabi.Fluent/Models/Wallets/AddressesModel.cs
+++ b/WalletWasabi.Fluent/Models/Wallets/AddressesModel.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
@@ -79,6 +80,15 @@ private void UpdateUnusedKeys()
 		}
 	}
 
+	public bool TryGetHdPubKey(string address, [NotNullWhen(true)] out HdPubKey? hdPubKey)
+	{
+		hdPubKey = _wallet.KeyManager
+			.GetKeys(x => x is { IsInternal: false })
+			.FirstOrDefault(x => x.GetAddress(_wallet.Network).ToString() == address);
+
+		return hdPubKey is not null;
+	}
+
 	public void Dispose()
 	{
 		_disposable.Dispose();
diff --git a/WalletWasabi.Fluent/Models/Wallets/Amount.cs b/WalletWasabi.Fluent/Models/Wallets/Amount.cs
index 3085cdfad1..b3b612fb61 100644
--- a/WalletWasabi.Fluent/Models/Wallets/Amount.cs
+++ b/WalletWasabi.Fluent/Models/Wallets/Amount.cs
@@ -25,14 +25,14 @@ public Amount(Money money, AmountProvider exchangeRateProvider)
 	{
 		Btc = money;
 		Fiat = exchangeRateProvider.ExchangeRateObservable.Select(x => x * Btc.ToDecimal(MoneyUnit.BTC));
-		HasFiatBalance = Fiat.Select(x => x != 0m);
+		HasFiatBalance = Fiat.Select(x => x > 0m);
 	}
 
 	public Amount(decimal amount, AmountProvider exchangeRateProvider)
 	{
 		Btc = Money.Coins(amount);
 		Fiat = exchangeRateProvider.ExchangeRateObservable.Select(x => x * Btc.ToDecimal(MoneyUnit.BTC));
-		HasFiatBalance = Fiat.Select(x => x != 0m);
+		HasFiatBalance = Fiat.Select(x => x > 0m);
 	}
 
 	public Amount(decimal amount)
diff --git a/WalletWasabi.Fluent/Models/Wallets/CoinModel.cs b/WalletWasabi.Fluent/Models/Wallets/CoinModel.cs
index 14d404a31a..3d8540c046 100644
--- a/WalletWasabi.Fluent/Models/Wallets/CoinModel.cs
+++ b/WalletWasabi.Fluent/Models/Wallets/CoinModel.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using System.Reactive.Disposables;
 using NBitcoin;
 using ReactiveUI;
@@ -5,8 +6,10 @@
 using WalletWasabi.Blockchain.Analysis.Clustering;
 using WalletWasabi.Blockchain.Keys;
 using WalletWasabi.Blockchain.TransactionOutputs;
+using WalletWasabi.Extensions;
 using WalletWasabi.Fluent.Helpers;
 using WalletWasabi.Lang;
+using WalletWasabi.WabiSabi.Models;
 
 namespace WalletWasabi.Fluent.Models.Wallets;
 
@@ -18,6 +21,8 @@ public partial class CoinModel : ReactiveObject
 	[AutoNotify] private bool _isCoinJoinInProgress;
 	[AutoNotify] private bool _isBanned;
 	[AutoNotify] private string? _bannedUntilUtcToolTip;
+	[AutoNotify] private string? _banReason;
+	[AutoNotify] private string? _banDetails;
 	[AutoNotify] private string? _confirmedToolTip;
 	[AutoNotify] private int _anonScore;
 	[AutoNotify] private int _confirmations;
@@ -32,6 +37,7 @@ public CoinModel(SmartCoin coin, Network network, int anonScoreTarget)
 		Labels = coin.GetLabels(anonScoreTarget);
 		Key = coin.Outpoint.GetHashCode();
 		BannedUntilUtc = coin.BannedUntilUtc;
+		BanReason = GetBanReason(coin.BanReasons);
 		ScriptType = ScriptType.FromEnum(coin.ScriptType);
 		Address = coin.HdPubKey.GetAddress(network);
 		Index = coin.HdPubKey.Index;
@@ -90,18 +96,42 @@ public void SubscribeToCoinChanges(CompositeDisposable disposable)
 		this.WhenAnyValue(c => c.Coin.HdPubKey.AnonymitySet).Select(x => (int)x).BindTo(this, x => x.AnonScore).DisposeWith(disposable);
 		this.WhenAnyValue(c => c.Coin.CoinJoinInProgress).BindTo(this, x => x.IsCoinJoinInProgress).DisposeWith(disposable);
 		this.WhenAnyValue(c => c.Coin.IsBanned).BindTo(this, x => x.IsBanned).DisposeWith(disposable);
-		this.WhenAnyValue(c => c.Coin.BannedUntilUtc).WhereNotNull().Subscribe(x => BannedUntilUtcToolTip = Resources.CantParticipateInCoinjoinUntil.SafeInject($"{x:g}")).DisposeWith(disposable);
+		this.WhenAnyValue(c => c.Coin.BannedUntilUtc).WhereNotNull().Subscribe(x => BannedUntilUtcToolTip = Resources.CantParticipateInCoinjoinUntil.SafeInject(x?.ToString("g", Resources.Culture))).DisposeWith(disposable);
+		this.WhenAnyValue(c => c.Coin.BanReasons).Subscribe(x => BanReason = GetBanReason(x)).DisposeWith(disposable);
 
-		this.WhenAnyValue(c => c.Coin.Height).Select(_ => Coin.GetConfirmations()).Subscribe(
-			confirmations =>
-			{
-				Confirmations = confirmations;
-				ConfirmedToolTip = TextHelpers.GetConfirmationText(confirmations);
-			}).DisposeWith(disposable);
+		this.WhenAnyValue(c => c.Coin.Height).Select(_ => Coin.GetConfirmations()).Subscribe(confirmations =>
+		{
+			Confirmations = confirmations;
+			ConfirmedToolTip = TextHelpers.GetConfirmationText(confirmations);
+		}).DisposeWith(disposable);
 
 		_subscribedToCoinChanges = true;
 	}
 
+	private string? GetBanReason(InputBannedReasonEnum[]? reasons)
+	{
+		if (reasons is null)
+		{
+			return null;
+		}
+
+		var hasInherited = false;
+		if (reasons.Contains(InputBannedReasonEnum.Inherited))
+		{
+			hasInherited = true;
+			reasons = reasons.Except([InputBannedReasonEnum.Inherited]).ToArray();
+		}
+
+		var reasonString = string.Join(@", ", reasons.Select(x => x.FriendlyName()));
+
+		if (hasInherited)
+		{
+			reasonString += $@" {InputBannedReasonEnum.Inherited.FriendlyName()}";
+		}
+
+		return reasonString;
+	}
+
 	public bool IsSameAddress(CoinModel anotherCoin) => anotherCoin is CoinModel cm && cm.Coin.HdPubKey == Coin.HdPubKey;
 
 	public bool IsSame(CoinModel anotherCoin) => anotherCoin is CoinModel cm && cm.Coin.Outpoint == Coin.Outpoint;
diff --git a/WalletWasabi.Fluent/Models/Wallets/HardwareWalletModel.cs b/WalletWasabi.Fluent/Models/Wallets/HardwareWalletModel.cs
index 83637f9851..5c81a06c8f 100644
--- a/WalletWasabi.Fluent/Models/Wallets/HardwareWalletModel.cs
+++ b/WalletWasabi.Fluent/Models/Wallets/HardwareWalletModel.cs
@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using System.Threading;
+using WalletWasabi.Blockchain.Keys;
 using WalletWasabi.Hwi;
 using WalletWasabi.Wallets;
 using WalletWasabi.Extensions;
@@ -48,4 +49,28 @@ public async Task<bool> AuthorizeTransactionAsync(TransactionAuthorizationInfo t
 			return false;
 		}
 	}
+
+	public async Task<string> SignMessageAsync(string message, HdPubKey hdPubKey)
+	{
+		try
+		{
+			var client = new HwiClient(Wallet.Network);
+
+			TimeSpan baseTimeout = TimeSpan.FromMinutes(3);
+			using var cts = new CancellationTokenSource(baseTimeout);
+
+			var signature = await client.SignMessageAsync(
+				Wallet.KeyManager.MasterFingerprint!.Value,
+				hdPubKey.FullKeyPath,
+				message,
+				cts.Token);
+
+			return signature;
+		}
+		catch (Exception ex)
+		{
+			Logger.LogError(ex);
+			throw;
+		}
+	}
 }
diff --git a/WalletWasabi.Fluent/Models/Wallets/HealthMonitor.cs b/WalletWasabi.Fluent/Models/Wallets/HealthMonitor.cs
index 55d8e706f0..b277561c48 100644
--- a/WalletWasabi.Fluent/Models/Wallets/HealthMonitor.cs
+++ b/WalletWasabi.Fluent/Models/Wallets/HealthMonitor.cs
@@ -43,16 +43,16 @@ public HealthMonitor(ApplicationSettings applicationSettings, TorStatusCheckerMo
 
 		// Tor Status
 		synchronizer.WhenAnyValue(x => x.TorStatus)
-							 .ObserveOn(RxApp.MainThreadScheduler)
-							 .Select(status => UseTor != TorMode.Disabled ? status : TorStatus.TurnedOff)
-							 .BindTo(this, x => x.TorStatus)
-							 .DisposeWith(Disposables);
+			.ObserveOn(RxApp.MainThreadScheduler)
+			.Select(status => UseTor != TorMode.Disabled ? status : TorStatus.TurnedOff)
+			.BindTo(this, x => x.TorStatus)
+			.DisposeWith(Disposables);
 
 		// Backend Status
 		synchronizer.WhenAnyValue(x => x.BackendStatus)
-							 .ObserveOn(RxApp.MainThreadScheduler)
-							 .BindTo(this, x => x.BackendStatus)
-							 .DisposeWith(Disposables);
+			.ObserveOn(RxApp.MainThreadScheduler)
+			.BindTo(this, x => x.BackendStatus)
+			.DisposeWith(Disposables);
 
 		// Backend Connection Issues flag
 		Observable.FromEventPattern<bool>(synchronizer, nameof(synchronizer.SynchronizeRequestFinished))
@@ -65,23 +65,23 @@ public HealthMonitor(ApplicationSettings applicationSettings, TorStatusCheckerMo
 		// Tor Issues
 		var issues =
 			torStatusChecker.Issues
-							.Select(r => r.Where(issue => !issue.Resolved).ToList())
-							.ObserveOn(RxApp.MainThreadScheduler)
-							.Publish();
+				.Select(r => r.Where(issue => !issue.Resolved).ToList())
+				.ObserveOn(RxApp.MainThreadScheduler)
+				.Publish();
 
 		_torIssues = issues.ToProperty(this, m => m.TorIssues);
 
 		issues.Connect()
-			  .DisposeWith(Disposables);
+			.DisposeWith(Disposables);
 
 		// Peers
 		Observable.Merge(Observable.FromEventPattern(nodes, nameof(nodes.Added)).ToSignal()
-				  .Merge(Observable.FromEventPattern<NodeEventArgs>(nodes, nameof(nodes.Removed)).ToSignal()
-				  .Merge(synchronizer.WhenAnyValue(x => x.TorStatus).ToSignal())))
-				  .ObserveOn(RxApp.MainThreadScheduler)
-				  .Select(_ => synchronizer.TorStatus == TorStatus.NotRunning ? 0 : nodes.Count) // Set peers to 0 if Tor is not running, because we get Tor status from backend answer so it seems to the user that peers are connected over clearnet, while they are not.
-				  .BindTo(this, x => x.Peers)
-				  .DisposeWith(Disposables);
+				.Merge(Observable.FromEventPattern<NodeEventArgs>(nodes, nameof(nodes.Removed)).ToSignal()
+					.Merge(synchronizer.WhenAnyValue(x => x.TorStatus).ToSignal())))
+			.ObserveOn(RxApp.MainThreadScheduler)
+			.Select(_ => synchronizer.TorStatus == TorStatus.NotRunning ? 0 : nodes.Count) // Set peers to 0 if Tor is not running, because we get Tor status from backend answer so it seems to the user that peers are connected over clearnet, while they are not.
+			.BindTo(this, x => x.Peers)
+			.DisposeWith(Disposables);
 
 		// Bitcoin Core Status
 		if (UseBitcoinCore)
@@ -179,10 +179,10 @@ private async Task WaitForRpcMonitorAsync()
 			if (rpcMonitor is { })
 			{
 				Observable.FromEventPattern<RpcStatus>(rpcMonitor, nameof(rpcMonitor.RpcStatusChanged))
-						  .ObserveOn(RxApp.MainThreadScheduler)
-						  .Select(x => x.EventArgs)
-						  .BindTo(this, x => x.BitcoinCoreStatus)
-						  .DisposeWith(Disposables);
+					.ObserveOn(RxApp.MainThreadScheduler)
+					.Select(x => x.EventArgs)
+					.BindTo(this, x => x.BitcoinCoreStatus)
+					.DisposeWith(Disposables);
 				BitcoinCoreStatus = rpcMonitor.RpcStatus;
 				return;
 			}
diff --git a/WalletWasabi.Fluent/Models/Wallets/SpeedupTransaction.cs b/WalletWasabi.Fluent/Models/Wallets/SpeedupTransaction.cs
index b5e6b01e56..f47f15dfcd 100644
--- a/WalletWasabi.Fluent/Models/Wallets/SpeedupTransaction.cs
+++ b/WalletWasabi.Fluent/Models/Wallets/SpeedupTransaction.cs
@@ -8,4 +8,4 @@ public record SpeedupTransaction(
 	BuildTransactionResult BoostingTransaction,
 	bool AreWePayingTheFee,
 	Amount Fee
-	);
+);
diff --git a/WalletWasabi.Fluent/Models/Wallets/TransactionTreeBuilder.cs b/WalletWasabi.Fluent/Models/Wallets/TransactionTreeBuilder.cs
index 466fa54cdd..bb146857fb 100644
--- a/WalletWasabi.Fluent/Models/Wallets/TransactionTreeBuilder.cs
+++ b/WalletWasabi.Fluent/Models/Wallets/TransactionTreeBuilder.cs
@@ -43,6 +43,7 @@ public IEnumerable<TransactionModel> Build(List<TransactionSummary> summaries)
 				coinJoinGroup.Add(CreateCoinjoinTransaction(i, item));
 			}
 		}
+
 		AddCoinjoinOrGroup(result, ref coinJoinGroup);
 
 		// This second iteration is necessary to transform the flat list of speed-ups into actual groups.
@@ -103,6 +104,7 @@ private void AddCoinjoinOrGroup(List<TransactionModel> list, ref TransactionMode
 				UpdateCoinjoinGroup(group);
 				list.Add(group);
 			}
+
 			group = default;
 		}
 	}
@@ -188,8 +190,8 @@ private TransactionModel CreateSpeedUpGroup(TransactionSummary transactionSummar
 			Type = GetItemType(transactionSummary),
 			Status =
 				isConfirmed
-				? TransactionStatus.Confirmed
-				: TransactionStatus.Pending,
+					? TransactionStatus.Confirmed
+					: TransactionStatus.Pending,
 			HasBeenSpedUp = true,
 		};
 
@@ -223,8 +225,8 @@ private void UpdateCoinjoinGroup(TransactionModel coinjoinGroup)
 		var isConfirmed = coinjoinGroup.Children.All(x => x.IsConfirmed);
 		coinjoinGroup.Status =
 			isConfirmed
-			? TransactionStatus.Confirmed
-			: TransactionStatus.Pending;
+				? TransactionStatus.Confirmed
+				: TransactionStatus.Pending;
 
 		coinjoinGroup.ConfirmedTooltip = coinjoinGroup.Children.MinBy(x => x.Confirmations)?.ConfirmedTooltip ?? "";
 		coinjoinGroup.Date = coinjoinGroup.Children.Select(tx => tx.Date).Max().ToLocalTime();
diff --git a/WalletWasabi.Fluent/Models/Wallets/UserSelectionCoinListModel.cs b/WalletWasabi.Fluent/Models/Wallets/UserSelectionCoinListModel.cs
index cc899930e5..89eb5a2888 100644
--- a/WalletWasabi.Fluent/Models/Wallets/UserSelectionCoinListModel.cs
+++ b/WalletWasabi.Fluent/Models/Wallets/UserSelectionCoinListModel.cs
@@ -16,7 +16,7 @@ protected override Pocket[] GetPockets()
 	{
 		return
 			new CoinsView(selectedCoins).GetPockets(WalletModel.Settings.AnonScoreTarget)
-										.Select(x => new Pocket(x))
-										.ToArray();
+				.Select(x => new Pocket(x))
+				.ToArray();
 	}
 }
diff --git a/WalletWasabi.Fluent/Models/Wallets/WalletCoinjoinModel.cs b/WalletWasabi.Fluent/Models/Wallets/WalletCoinjoinModel.cs
index be0c58dbd8..0f34f4a337 100644
--- a/WalletWasabi.Fluent/Models/Wallets/WalletCoinjoinModel.cs
+++ b/WalletWasabi.Fluent/Models/Wallets/WalletCoinjoinModel.cs
@@ -29,26 +29,26 @@ public WalletCoinjoinModel(Wallet wallet, WalletSettingsModel settings)
 
 		StatusUpdated =
 			Observable.FromEventPattern<StatusChangedEventArgs>(_coinJoinManager, nameof(CoinJoinManager.StatusChanged))
-					  .Where(x => x.EventArgs.Wallet == wallet)
-					  .Select(x => x.EventArgs)
-					  .Where(x => x is WalletStartedCoinJoinEventArgs or WalletStoppedCoinJoinEventArgs or StartErrorEventArgs or CoinJoinStatusEventArgs or CompletedEventArgs or StartedEventArgs)
-					  .ObserveOn(RxApp.MainThreadScheduler);
+				.Where(x => x.EventArgs.Wallet == wallet)
+				.Select(x => x.EventArgs)
+				.Where(x => x is WalletStartedCoinJoinEventArgs or WalletStoppedCoinJoinEventArgs or StartErrorEventArgs or CoinJoinStatusEventArgs or CompletedEventArgs or StartedEventArgs)
+				.ObserveOn(RxApp.MainThreadScheduler);
 
 		settings.WhenAnyValue(x => x.AutoCoinjoin)
-				.Skip(1) // The first one is triggered at the creation.
-				.DoAsync(async (autoCoinJoin) =>
+			.Skip(1) // The first one is triggered at the creation.
+			.DoAsync(async (autoCoinJoin) =>
+			{
+				if (autoCoinJoin)
+				{
+					await StartAsync(stopWhenAllMixed: false, false);
+				}
+				else
 				{
-					if (autoCoinJoin)
-					{
-						await StartAsync(stopWhenAllMixed: false, false);
-					}
-					else
-					{
-						await StopAsync();
-					}
-				})
-				.Subscribe()
-				.DisposeWith(_disposable);
+					await StopAsync();
+				}
+			})
+			.Subscribe()
+			.DisposeWith(_disposable);
 
 		var coinjoinInputStarted =
 			StatusUpdated
diff --git a/WalletWasabi.Fluent/Models/Wallets/WalletLoadWorkflow.cs b/WalletWasabi.Fluent/Models/Wallets/WalletLoadWorkflow.cs
index 711ca8bbd8..e29538dd27 100644
--- a/WalletWasabi.Fluent/Models/Wallets/WalletLoadWorkflow.cs
+++ b/WalletWasabi.Fluent/Models/Wallets/WalletLoadWorkflow.cs
@@ -34,10 +34,10 @@ public WalletLoadWorkflow(Wallet wallet)
 
 		LoadCompleted =
 			Observable.FromEventPattern<WalletState>(_wallet, nameof(Wallet.StateChanged))
-					.ObserveOn(RxApp.MainThreadScheduler)
-					.Select(x => x.EventArgs)
-					.Where(x => x == WalletState.Started)
-					.ToSignal();
+				.ObserveOn(RxApp.MainThreadScheduler)
+				.Select(x => x.EventArgs)
+				.Where(x => x == WalletState.Started)
+				.ToSignal();
 	}
 
 	public IObservable<(double PercentComplete, TimeSpan TimeRemaining)> Progress => _progress;
@@ -64,15 +64,14 @@ public void Start()
 			.DisposeWith(_disposables);
 
 		Observable.Interval(TimeSpan.FromSeconds(1))
-				.ObserveOn(RxApp.MainThreadScheduler)
-				.Subscribe(
-					_ =>
-					{
-						UpdateCurrentTipHeight();
-						var processedCount = GetCurrentProcessedCount();
-						UpdateProgress(processedCount);
-					})
-				.DisposeWith(_disposables);
+			.ObserveOn(RxApp.MainThreadScheduler)
+			.Subscribe(_ =>
+			{
+				UpdateCurrentTipHeight();
+				var processedCount = GetCurrentProcessedCount();
+				UpdateProgress(processedCount);
+			})
+			.DisposeWith(_disposables);
 	}
 
 	public void Stop()
diff --git a/WalletWasabi.Fluent/Models/Wallets/WalletModel.cs b/WalletWasabi.Fluent/Models/Wallets/WalletModel.cs
index 8b0f64e9f6..f51bbe5e53 100644
--- a/WalletWasabi.Fluent/Models/Wallets/WalletModel.cs
+++ b/WalletWasabi.Fluent/Models/Wallets/WalletModel.cs
@@ -3,6 +3,7 @@
 using System.Reactive.Linq;
 using NBitcoin;
 using ReactiveUI;
+using WalletWasabi.Blockchain.Keys;
 using WalletWasabi.Fluent.Helpers;
 using WalletWasabi.Fluent.HomeScreen.BuySell.Models;
 using WalletWasabi.Fluent.HomeScreen.Labels.Models;
@@ -42,8 +43,8 @@ public WalletModel(Wallet wallet, AmountProvider amountProvider)
 
 		State =
 			Observable.FromEventPattern<WalletState>(Wallet, nameof(Wallet.StateChanged))
-					  .ObserveOn(RxApp.MainThreadScheduler)
-					  .Select(_ => Wallet.State);
+				.ObserveOn(RxApp.MainThreadScheduler)
+				.Select(_ => Wallet.State);
 
 		Privacy = new WalletPrivacyModel(this, Wallet);
 
@@ -62,8 +63,8 @@ public WalletModel(Wallet wallet, AmountProvider amountProvider)
 
 		// Stop the loader after load is completed
 		State.Where(x => x == WalletState.Started)
-			 .Do(_ => Loader.Stop())
-			 .Subscribe();
+			.Do(_ => Loader.Stop())
+			.Subscribe();
 
 		this.WhenAnyValue(x => x.Auth.IsLoggedIn)
 			.BindTo(this, x => x.IsLoggedIn)
@@ -145,6 +146,11 @@ public PrivacySuggestionsModel GetPrivacySuggestionsModel(SendFlowModel sendFlow
 		return new PrivacySuggestionsModel(sendFlow);
 	}
 
+	public string SignMessage(string messageToSign, HdPubKey hdPubKey)
+	{
+		return Wallet.KeyChain.SignMessage(messageToSign, hdPubKey);
+	}
+
 	public void Rename(string newWalletName)
 	{
 		Services.WalletManager.RenameWallet(Wallet, newWalletName);
diff --git a/WalletWasabi.Fluent/Models/Wallets/WalletPrivacyModel.cs b/WalletWasabi.Fluent/Models/Wallets/WalletPrivacyModel.cs
index a8ab0fd27c..c3992048cf 100644
--- a/WalletWasabi.Fluent/Models/Wallets/WalletPrivacyModel.cs
+++ b/WalletWasabi.Fluent/Models/Wallets/WalletPrivacyModel.cs
@@ -14,9 +14,9 @@ public WalletPrivacyModel(WalletModel walletModel, Wallet wallet)
 	{
 		ProgressUpdated =
 			walletModel.Transactions.TransactionProcessed
-					   .Merge(walletModel.Settings.WhenAnyValue(x => x.AnonScoreTarget).ToSignal())
-					   .ObserveOn(RxApp.MainThreadScheduler)
-					   .Skip(1);
+				.Merge(walletModel.Settings.WhenAnyValue(x => x.AnonScoreTarget).ToSignal())
+				.ObserveOn(RxApp.MainThreadScheduler)
+				.Skip(1);
 
 		Progress = ProgressUpdated.Select(_ => wallet.GetPrivacyPercentage());
 		PrivatePercentage = ProgressUpdated.Select(_ =>
diff --git a/WalletWasabi.Fluent/Models/Wallets/WalletRepository.cs b/WalletWasabi.Fluent/Models/Wallets/WalletRepository.cs
index 44fc03dd5b..e6a3a25832 100644
--- a/WalletWasabi.Fluent/Models/Wallets/WalletRepository.cs
+++ b/WalletWasabi.Fluent/Models/Wallets/WalletRepository.cs
@@ -39,12 +39,12 @@ public WalletRepository(AmountProvider amountProvider, HardwareWalletInterface h
 
 		Wallets =
 			signals.Fetch(() => Services.WalletManager.GetWallets(), x => x.WalletId)
-				   .DisposeWith(_disposable)
-				   .Connect()
-				   .TransformWithInlineUpdate(CreateWalletModel, (_, _) => { })
-				   .DisposeMany()
-				   .AsObservableCache()
-				   .DisposeWith(_disposable);
+				.DisposeWith(_disposable)
+				.Connect()
+				.TransformWithInlineUpdate(CreateWalletModel, (_, _) => { })
+				.DisposeMany()
+				.AsObservableCache()
+				.DisposeWith(_disposable);
 
 		DefaultWalletName = _settings.LastSelectedWallet;
 	}
@@ -108,6 +108,7 @@ public void LoadWalletListFromFileSystem()
 		{
 			return GetById(existingWallet.WalletId);
 		}
+
 		return null;
 	}
 
@@ -118,17 +119,16 @@ private async Task<WalletSettingsModel> CreateNewWalletAsync(WalletCreationOptio
 		ArgumentException.ThrowIfNullOrEmpty(walletName);
 		ArgumentNullException.ThrowIfNull(password);
 
-		var (keyManager, _) = await Task.Run(
-				() =>
-				{
-					var walletGenerator = new WalletGenerator(
-						Services.WalletManager.WalletDirectories.WalletsDir,
-						Services.WalletManager.Network)
-					{
-						TipHeight = Services.SmartHeaderChain.TipHeight
-					};
-					return walletGenerator.GenerateWallet(walletName, password, mnemonic);
-				});
+		var (keyManager, _) = await Task.Run(() =>
+		{
+			var walletGenerator = new WalletGenerator(
+				Services.WalletManager.WalletDirectories.WalletsDir,
+				Services.WalletManager.Network)
+			{
+				TipHeight = Services.SmartHeaderChain.TipHeight
+			};
+			return walletGenerator.GenerateWallet(walletName, password, mnemonic);
+		});
 
 		return new WalletSettingsModel(keyManager, true);
 	}
@@ -199,8 +199,8 @@ private WalletModel GetById(WalletId id)
 	{
 		return
 			_walletDictionary.TryGetValue(id, out var wallet)
-			? wallet
-			: throw new InvalidOperationException($"Wallet not found: {id}");
+				? wallet
+				: throw new InvalidOperationException($"Wallet not found: {id}");
 	}
 
 	private WalletModel CreateWalletModel(Wallet wallet)
@@ -211,13 +211,14 @@ private WalletModel CreateWalletModel(Wallet wallet)
 			{
 				throw new InvalidOperationException($"Different instance of: {wallet.WalletName}");
 			}
+
 			return existing;
 		}
 
 		var result =
 			wallet.KeyManager.IsHardwareWallet
-			? new HardwareWalletModel(wallet, _amountProvider)
-			: new WalletModel(wallet, _amountProvider);
+				? new HardwareWalletModel(wallet, _amountProvider)
+				: new WalletModel(wallet, _amountProvider);
 
 		_walletDictionary[wallet.WalletId] = result;
 
diff --git a/WalletWasabi.Fluent/Models/Wallets/WalletStatsModel.cs b/WalletWasabi.Fluent/Models/Wallets/WalletStatsModel.cs
index d18f6f6b4e..a7014a6767 100644
--- a/WalletWasabi.Fluent/Models/Wallets/WalletStatsModel.cs
+++ b/WalletWasabi.Fluent/Models/Wallets/WalletStatsModel.cs
@@ -29,9 +29,9 @@ public WalletStatsModel(WalletModel walletModel, Wallet wallet)
 		_unconfirmedBalance = Amount.Zero;
 
 		walletModel.Transactions.TransactionProcessed
-								.Do(_ => Update(walletModel, wallet))
-								.Subscribe()
-								.DisposeWith(_disposables);
+			.Do(_ => Update(walletModel, wallet))
+			.Subscribe()
+			.DisposeWith(_disposables);
 	}
 
 	public void Dispose()
@@ -60,19 +60,19 @@ private void Update(WalletModel walletModel, Wallet wallet)
 
 		var singleCoinjoins =
 			walletModel.Transactions.Cache.Items
-									.Where(x => x.Type == TransactionType.Coinjoin)
-									.ToList();
+				.Where(x => x.Type == TransactionType.Coinjoin)
+				.ToList();
 
 		var groupedCoinjoins =
 			walletModel.Transactions.Cache.Items
-									.Where(x => x.Type == TransactionType.CoinjoinGroup)
-									.ToList();
+				.Where(x => x.Type == TransactionType.CoinjoinGroup)
+				.ToList();
 
 		var nestedCoinjoins = groupedCoinjoins.SelectMany(x => x.Children).ToList();
 		var nonCoinjoins =
 			walletModel.Transactions.Cache.Items
-									.Where(x => !x.IsCoinjoin)
-									.ToList();
+				.Where(x => !x.IsCoinjoin)
+				.ToList();
 
 		TotalTransactionCount = singleCoinjoins.Count + nestedCoinjoins.Count + nonCoinjoins.Count;
 		NonCoinjointransactionCount = nonCoinjoins.Count;
diff --git a/WalletWasabi.Fluent/Models/Wallets/WalletTransactionsModel.cs b/WalletWasabi.Fluent/Models/Wallets/WalletTransactionsModel.cs
index feee751086..2e9a5bcd58 100644
--- a/WalletWasabi.Fluent/Models/Wallets/WalletTransactionsModel.cs
+++ b/WalletWasabi.Fluent/Models/Wallets/WalletTransactionsModel.cs
@@ -126,6 +126,7 @@ public SpeedupTransaction CreateSpeedUpTransaction(TransactionModel transaction)
 		{
 			targetTransaction = largestCpfp;
 		}
+
 		var boostingTransaction = _wallet.SpeedUpTransaction(targetTransaction);
 
 		var fee = _walletModel.AmountProvider.Create(GetFeeDifference(targetTransaction, boostingTransaction));
diff --git a/WalletWasabi.Fluent/NavBar/Interfaces/INavBarButton.cs b/WalletWasabi.Fluent/NavBar/Interfaces/INavBarButton.cs
index a26c751ecd..8b07134a8a 100644
--- a/WalletWasabi.Fluent/NavBar/Interfaces/INavBarButton.cs
+++ b/WalletWasabi.Fluent/NavBar/Interfaces/INavBarButton.cs
@@ -1,4 +1,5 @@
 // Namespace does not match folder structure (see https://github.com/zkSNACKs/WalletWasabi/pull/10576#issuecomment-1552750543)
+
 #pragma warning disable IDE0130
 
 using System.Threading.Tasks;
diff --git a/WalletWasabi.Fluent/NavBar/Interfaces/INavBarItem.cs b/WalletWasabi.Fluent/NavBar/Interfaces/INavBarItem.cs
index 6a5eef8c0a..8696dcef31 100644
--- a/WalletWasabi.Fluent/NavBar/Interfaces/INavBarItem.cs
+++ b/WalletWasabi.Fluent/NavBar/Interfaces/INavBarItem.cs
@@ -1,4 +1,5 @@
 // Namespace does not match folder structure (see https://github.com/zkSNACKs/WalletWasabi/pull/10576#issuecomment-1552750543)
+
 #pragma warning disable IDE0130
 
 using System.ComponentModel;
diff --git a/WalletWasabi.Fluent/NavBar/Interfaces/INavBarToggle.cs b/WalletWasabi.Fluent/NavBar/Interfaces/INavBarToggle.cs
index 1fa0b3d5d3..91e1f26624 100644
--- a/WalletWasabi.Fluent/NavBar/Interfaces/INavBarToggle.cs
+++ b/WalletWasabi.Fluent/NavBar/Interfaces/INavBarToggle.cs
@@ -1,4 +1,5 @@
 // Namespace does not match folder structure (see https://github.com/zkSNACKs/WalletWasabi/pull/10576#issuecomment-1552750543)
+
 #pragma warning disable IDE0130
 
 namespace WalletWasabi.Fluent;
diff --git a/WalletWasabi.Fluent/NavBar/Models/NavBarPosition.cs b/WalletWasabi.Fluent/NavBar/Models/NavBarPosition.cs
index c1593a1a18..21b6c4fe02 100644
--- a/WalletWasabi.Fluent/NavBar/Models/NavBarPosition.cs
+++ b/WalletWasabi.Fluent/NavBar/Models/NavBarPosition.cs
@@ -1,4 +1,5 @@
 // Namespace does not match folder structure (see https://github.com/zkSNACKs/WalletWasabi/pull/10576#issuecomment-1552750543)
+
 #pragma warning disable IDE0130
 
 namespace WalletWasabi.Fluent;
diff --git a/WalletWasabi.Fluent/NavBar/Models/NavBarSelectionMode.cs b/WalletWasabi.Fluent/NavBar/Models/NavBarSelectionMode.cs
index 6d78456165..cce38e354b 100644
--- a/WalletWasabi.Fluent/NavBar/Models/NavBarSelectionMode.cs
+++ b/WalletWasabi.Fluent/NavBar/Models/NavBarSelectionMode.cs
@@ -1,4 +1,5 @@
 // Namespace does not match folder structure (see https://github.com/zkSNACKs/WalletWasabi/pull/10576#issuecomment-1552750543)
+
 #pragma warning disable IDE0130
 
 namespace WalletWasabi.Fluent;
diff --git a/WalletWasabi.Fluent/NavBar/Models/NavigationTarget.cs b/WalletWasabi.Fluent/NavBar/Models/NavigationTarget.cs
index cba56a4219..6ce10ed714 100644
--- a/WalletWasabi.Fluent/NavBar/Models/NavigationTarget.cs
+++ b/WalletWasabi.Fluent/NavBar/Models/NavigationTarget.cs
@@ -1,4 +1,5 @@
 // Namespace does not match folder structure (see https://github.com/zkSNACKs/WalletWasabi/pull/10576#issuecomment-1552750543)
+
 #pragma warning disable IDE0130
 
 namespace WalletWasabi.Fluent;
diff --git a/WalletWasabi.Fluent/NavBar/ViewModels/NavBarItemViewModel.cs b/WalletWasabi.Fluent/NavBar/ViewModels/NavBarItemViewModel.cs
index 81b9a4ed67..a2accd4e90 100644
--- a/WalletWasabi.Fluent/NavBar/ViewModels/NavBarItemViewModel.cs
+++ b/WalletWasabi.Fluent/NavBar/ViewModels/NavBarItemViewModel.cs
@@ -37,6 +37,7 @@ public async Task ActivateAsync()
 		{
 			toggle.Toggle();
 		}
+
 		if (_item is INavBarButton button)
 		{
 			await button.Activate();
diff --git a/WalletWasabi.Fluent/NavBar/ViewModels/NavBarViewModel.cs b/WalletWasabi.Fluent/NavBar/ViewModels/NavBarViewModel.cs
index 3b36f22058..e338f86fff 100644
--- a/WalletWasabi.Fluent/NavBar/ViewModels/NavBarViewModel.cs
+++ b/WalletWasabi.Fluent/NavBar/ViewModels/NavBarViewModel.cs
@@ -27,14 +27,14 @@ public NavBarViewModel()
 		BottomItems = new ObservableCollection<NavBarItemViewModel>();
 
 		UiContext.WalletRepository
-				 .Wallets
-				 .Connect()
-				 .Transform(newWallet => new WalletPageViewModel(newWallet))
-				 .DisposeMany()
-				 .AutoRefresh(x => x.IsLoggedIn)
-				 .Sort(SortExpressionComparer<WalletPageViewModel>.Descending(i => i.IsLoggedIn).ThenByAscending(x => x.WalletModel.Name))
-				 .Bind(out var wallets)
-				 .Subscribe();
+			.Wallets
+			.Connect()
+			.Transform(newWallet => new WalletPageViewModel(newWallet))
+			.DisposeMany()
+			.AutoRefresh(x => x.IsLoggedIn)
+			.Sort(SortExpressionComparer<WalletPageViewModel>.Descending(i => i.IsLoggedIn).ThenByAscending(x => x.WalletModel.Name))
+			.Bind(out var wallets)
+			.Subscribe();
 
 		wallets
 			.ToObservableChangeSet()
diff --git a/WalletWasabi.Fluent/NavBar/Views/NavBar.axaml b/WalletWasabi.Fluent/NavBar/Views/NavBar.axaml
index ad285d5fab..0cb4092fbe 100644
--- a/WalletWasabi.Fluent/NavBar/Views/NavBar.axaml
+++ b/WalletWasabi.Fluent/NavBar/Views/NavBar.axaml
@@ -94,11 +94,11 @@
     </Style>
 
     <Style Selector="ListBoxItem">
-      <Setter Property="Padding" Value="0"/>
-      <Setter Property="ClipToBounds" Value="False"/>
+      <Setter Property="Padding" Value="0" />
+      <Setter Property="ClipToBounds" Value="False" />
     </Style>
     <Style Selector="ListBoxItem:selected /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Background" Value="Transparent" />
     </Style>
     <Style Selector="ListBoxItem:pointerover /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Background" Value="Transparent" />
@@ -176,7 +176,8 @@
                   <PathIcon Classes="new size24 wallet"
                             Classes.isfocused="{Binding $parent[ListBoxItem].IsSelected}" />
                   <LayoutTransformControl>
-                    <FadeOutTextControl Text="{Binding Title}" HorizontalAlignment="Center" FontSize="{StaticResource FontSizeH9}" />
+                    <FadeOutTextControl Text="{Binding Title}" HorizontalAlignment="Center"
+                                        FontSize="{StaticResource FontSizeH9}" />
                   </LayoutTransformControl>
                 </StackPanel>
               </Panel>
diff --git a/WalletWasabi.Fluent/Navigation/ViewModels/NavigationStack.cs b/WalletWasabi.Fluent/Navigation/ViewModels/NavigationStack.cs
index 3c18f5eb03..6398ed8496 100644
--- a/WalletWasabi.Fluent/Navigation/ViewModels/NavigationStack.cs
+++ b/WalletWasabi.Fluent/Navigation/ViewModels/NavigationStack.cs
@@ -86,6 +86,7 @@ protected virtual void Clear(bool keepRoot)
 					OnPopped(item);
 				}
 			}
+
 			CurrentPage = root;
 		}
 		else
@@ -149,6 +150,7 @@ public void To(T viewModel, NavigationMode mode = NavigationMode.Normal)
 				{
 					_backStack.Push(oldPage);
 				}
+
 				break;
 
 			case NavigationMode.Clear:
diff --git a/WalletWasabi.Fluent/Navigation/ViewModels/RoutableViewModel.cs b/WalletWasabi.Fluent/Navigation/ViewModels/RoutableViewModel.cs
index 3a003c4d7a..327337fa69 100644
--- a/WalletWasabi.Fluent/Navigation/ViewModels/RoutableViewModel.cs
+++ b/WalletWasabi.Fluent/Navigation/ViewModels/RoutableViewModel.cs
@@ -93,10 +93,10 @@ protected async Task ShowErrorAsync(string title, string message, string caption
 	{
 		var target =
 			navigationTarget != NavigationTarget.Unspecified
-			? navigationTarget
-			: CurrentTarget == NavigationTarget.CompactDialogScreen
-				? NavigationTarget.CompactDialogScreen
-				: NavigationTarget.DialogScreen;
+				? navigationTarget
+				: CurrentTarget == NavigationTarget.CompactDialogScreen
+					? NavigationTarget.CompactDialogScreen
+					: NavigationTarget.DialogScreen;
 
 		await UiContext.Navigate().Navigate(target).To().ShowErrorDialog(message, title, caption).GetResultAsync();
 	}
diff --git a/WalletWasabi.Fluent/OpenDirectory/ViewModels/OpenWalletsFolderViewModel.cs b/WalletWasabi.Fluent/OpenDirectory/ViewModels/OpenWalletsFolderViewModel.cs
index a07fa3e401..a2c10de1bd 100644
--- a/WalletWasabi.Fluent/OpenDirectory/ViewModels/OpenWalletsFolderViewModel.cs
+++ b/WalletWasabi.Fluent/OpenDirectory/ViewModels/OpenWalletsFolderViewModel.cs
@@ -14,8 +14,7 @@ public partial class OpenWalletsFolderViewModel : TriggerCommandViewModel
 {
 	public OpenWalletsFolderViewModel()
 	{
-		TargetCommand = ReactiveCommand.Create(
-			() => UiContext.FileSystem.OpenFolderInFileExplorer(UiContext.Config.WalletsDir));
+		TargetCommand = ReactiveCommand.Create(() => UiContext.FileSystem.OpenFolderInFileExplorer(UiContext.Config.WalletsDir));
 	}
 
 	public override ICommand TargetCommand { get; }
diff --git a/WalletWasabi.Fluent/Screenshot/Capture.cs b/WalletWasabi.Fluent/Screenshot/Capture.cs
index 064d47d9a2..e0ca8b8ba6 100644
--- a/WalletWasabi.Fluent/Screenshot/Capture.cs
+++ b/WalletWasabi.Fluent/Screenshot/Capture.cs
@@ -11,12 +11,14 @@
 using WalletWasabi.Lang;
 
 namespace WalletWasabi.Fluent.Screenshot;
+
 public static class Capture
 {
 	public static void AttachCapture(this TopLevel root)
 	{
 		AttachCapture(root, new(Key.F6));
 	}
+
 	public static void AttachCapture(this TopLevel root, KeyGesture gesture)
 	{
 		async void Handler(object? sender, KeyEventArgs args)
@@ -26,8 +28,10 @@ async void Handler(object? sender, KeyEventArgs args)
 				await SaveAsync(root);
 			}
 		}
+
 		root.AddHandler(InputElement.KeyDownEvent, Handler, RoutingStrategies.Tunnel);
 	}
+
 	private static async Task SaveAsync(TopLevel root)
 	{
 		var file = await FileDialogHelper.SaveFileAsync(
@@ -43,7 +47,7 @@ private static async Task SaveAsync(TopLevel root)
 
 	private static void RenderAsPng(Control target, Size size, FileStream stream)
 	{
-		var pixelSize = new PixelSize((int) size.Width, (int) size.Height);
+		var pixelSize = new PixelSize((int)size.Width, (int)size.Height);
 		var dpiVector = new Vector(96d, 96d);
 		using var bitmap = new RenderTargetBitmap(pixelSize, dpiVector);
 		target.Measure(size);
@@ -55,7 +59,7 @@ private static void RenderAsPng(Control target, Size size, FileStream stream)
 	private static async Task RenderAsSvgAsync(Stream stream, Size size, Visual visual)
 	{
 		using var managedWStream = new SKManagedWStream(stream);
-		var bounds = SKRect.Create(new SKSize((float) size.Width, (float) size.Height));
+		var bounds = SKRect.Create(new SKSize((float)size.Width, (float)size.Height));
 		using var canvas = SKSvgCanvas.Create(bounds, managedWStream);
 		await DrawingContextHelper.RenderAsync(canvas, visual);
 	}
@@ -66,6 +70,7 @@ private static async Task SaveAsync(Control? target, Size size, string path)
 		{
 			return;
 		}
+
 		var extension = Path.GetExtension(path);
 		switch (extension.ToLower(Resources.Culture))
 		{
diff --git a/WalletWasabi.Fluent/SearchBar/Models/ValueObject.cs b/WalletWasabi.Fluent/SearchBar/Models/ValueObject.cs
index 7969bf9448..d35a91e491 100644
--- a/WalletWasabi.Fluent/SearchBar/Models/ValueObject.cs
+++ b/WalletWasabi.Fluent/SearchBar/Models/ValueObject.cs
@@ -85,14 +85,14 @@ public override int GetHashCode()
 		{
 			_cachedHashCode = GetEqualityComponents()
 				.Aggregate(
-				1,
-				(current, obj) =>
-				{
-					unchecked
+					1,
+					(current, obj) =>
 					{
-						return (current * 23) + (obj?.GetHashCode() ?? 0);
-					}
-				});
+						unchecked
+						{
+							return (current * 23) + (obj?.GetHashCode() ?? 0);
+						}
+					});
 		}
 
 		return _cachedHashCode.Value;
diff --git a/WalletWasabi.Fluent/SearchBar/ViewModels/SearchBarDesignViewModel.cs b/WalletWasabi.Fluent/SearchBar/ViewModels/SearchBarDesignViewModel.cs
index 7f446f16cb..f627a57261 100644
--- a/WalletWasabi.Fluent/SearchBar/ViewModels/SearchBarDesignViewModel.cs
+++ b/WalletWasabi.Fluent/SearchBar/ViewModels/SearchBarDesignViewModel.cs
@@ -64,13 +64,12 @@ public SearchBarDesignViewModel()
 		new ObservableCollection<SearchItemGroup>(
 			_items
 				.GroupBy(r => r.Category)
-				.Select(
-					grouping =>
-					{
-						var sourceCache = new SourceCache<ISearchItem, ComposedKey>(r => r.Key);
-						sourceCache.PopulateFrom(grouping.ToObservable());
-						return new SearchItemGroup(grouping.Key, sourceCache.Connect());
-					})));
+				.Select(grouping =>
+				{
+					var sourceCache = new SourceCache<ISearchItem, ComposedKey>(r => r.Key);
+					sourceCache.PopulateFrom(grouping.ToObservable());
+					return new SearchItemGroup(grouping.Key, sourceCache.Connect());
+				})));
 
 	public string SearchText => "";
 }
diff --git a/WalletWasabi.Fluent/SearchBar/ViewModels/SearchBarViewModel.cs b/WalletWasabi.Fluent/SearchBar/ViewModels/SearchBarViewModel.cs
index 4c7b7b49b6..c8368ceb83 100644
--- a/WalletWasabi.Fluent/SearchBar/ViewModels/SearchBarViewModel.cs
+++ b/WalletWasabi.Fluent/SearchBar/ViewModels/SearchBarViewModel.cs
@@ -21,7 +21,7 @@ public partial class SearchBarViewModel : ReactiveObject
 	public SearchBarViewModel(ISearchSource searchSource)
 	{
 		searchSource.Changes
-            .DisposeMany()
+			.DisposeMany()
 			.Group(s => s.Category)
 			.Transform(group => new SearchItemGroup(group.Key, group.Cache.Connect()))
 			.Sort(SortExpressionComparer<SearchItemGroup>.Ascending(x => x.Title))
@@ -30,15 +30,14 @@ public SearchBarViewModel(ISearchSource searchSource)
 			.ObserveOn(RxApp.MainThreadScheduler)
 			.Subscribe();
 
-		var activateFirstItemCommand = ReactiveCommand.Create(
-			() =>
+		var activateFirstItemCommand = ReactiveCommand.Create(() =>
+		{
+			if (_groups is [{ Items: [IActionableItem item] }])
 			{
-				if (_groups is [{ Items: [IActionableItem item] }])
-				{
-					item.Activate();
-					SearchText = "";
-				}
-			});
+				item.Activate();
+				SearchText = "";
+			}
+		});
 
 		ActivateFirstItemCommand = activateFirstItemCommand;
 		CommandActivated = activateFirstItemCommand.ToSignal();
diff --git a/WalletWasabi.Fluent/SearchBar/ViewModels/Sources/TransactionsSearchSource.cs b/WalletWasabi.Fluent/SearchBar/ViewModels/Sources/TransactionsSearchSource.cs
index 7a3c8bd8d7..16f553cfab 100644
--- a/WalletWasabi.Fluent/SearchBar/ViewModels/Sources/TransactionsSearchSource.cs
+++ b/WalletWasabi.Fluent/SearchBar/ViewModels/Sources/TransactionsSearchSource.cs
@@ -109,9 +109,8 @@ private static ISearchItem ToSearchItem(WalletViewModel wallet, HistoryItemViewM
 			.Where(x => x.IsLoggedIn && x.Wallet.State == WalletState.Started)
 			.Select(x => x.WalletViewModel)
 			.WhereNotNull()
-			.Select(
-				x => (Wallet: x,
-					x.History.Transactions.Concat(x.History.Transactions.OfType<CoinJoinsHistoryItemViewModel>().SelectMany(y => y.Children))));
+			.Select(x => (Wallet: x,
+				x.History.Transactions.Concat(x.History.Transactions.OfType<CoinJoinsHistoryItemViewModel>().SelectMany(y => y.Children))));
 	}
 
 	private static IEnumerable<ISearchItem> Search(string query)
@@ -124,9 +123,7 @@ private static IEnumerable<ISearchItem> Search(string query)
 	private static IEnumerable<(WalletViewModel, HistoryItemViewModelBase)> Filter(string queryStr)
 	{
 		return Flatten(GetTransactionsByWallet())
-		.Where(tuple => NBitcoinHelpers.TryParseBitcoinAddress(tuple.Item1.WalletModel.Network, queryStr, out var address) ?
-			ContainsDestinationAddress(tuple.Item1, tuple.Item2, address) :
-			ContainsId(tuple.Item2, queryStr));
+			.Where(tuple => NBitcoinHelpers.TryParseBitcoinAddress(tuple.Item1.WalletModel.Network, queryStr, out var address) ? ContainsDestinationAddress(tuple.Item1, tuple.Item2, address) : ContainsId(tuple.Item2, queryStr));
 	}
 
 	private static bool ContainsDestinationAddress(WalletViewModel walletViewModel, HistoryItemViewModelBase historyItem, BitcoinAddress address)
diff --git a/WalletWasabi.Fluent/SearchBar/Views/RestartView.axaml b/WalletWasabi.Fluent/SearchBar/Views/RestartView.axaml
index 991dd20904..ff548fd545 100644
--- a/WalletWasabi.Fluent/SearchBar/Views/RestartView.axaml
+++ b/WalletWasabi.Fluent/SearchBar/Views/RestartView.axaml
@@ -9,7 +9,8 @@
              x:Class="WalletWasabi.Fluent.SearchBar.Views.RestartView">
 
   <DockPanel>
-    <Button Classes="action" Margin="0 0 0 20" HorizontalAlignment="Center" DockPanel.Dock="Bottom" Command="{Binding RestartCommand}">
+    <Button Classes="action" Margin="0 0 0 20" HorizontalAlignment="Center" DockPanel.Dock="Bottom"
+            Command="{Binding RestartCommand}">
       <TextBlock>Restart now</TextBlock>
     </Button>
     <TextBlock Margin="20 15 20 15" TextAlignment="Center" TextWrapping="Wrap" Text="{Binding Message}" />
diff --git a/WalletWasabi.Fluent/SearchBar/Views/SearchBar.axaml b/WalletWasabi.Fluent/SearchBar/Views/SearchBar.axaml
index 9d847984c0..b2b11576e2 100644
--- a/WalletWasabi.Fluent/SearchBar/Views/SearchBar.axaml
+++ b/WalletWasabi.Fluent/SearchBar/Views/SearchBar.axaml
@@ -133,7 +133,7 @@
 
       <TextBox.Transitions>
         <Transitions>
-          <DoubleTransition Property="MaxWidth" Duration="0:0:0.2" Easing="CubicEaseOut"/>
+          <DoubleTransition Property="MaxWidth" Duration="0:0:0.2" Easing="CubicEaseOut" />
         </Transitions>
       </TextBox.Transitions>
 
@@ -151,7 +151,8 @@
         <PathIcon Name="LeftIcon" Data="{DynamicResource search_regular}" />
       </TextBox.InnerLeftContent>
     </TextBox>
-    <SearchBarPopup x:Name="SearchResultsPopup" PlacementTarget="SearchBox" Placement="BottomEdgeAlignedLeft" VerticalOffset="-13">
+    <SearchBarPopup x:Name="SearchResultsPopup" PlacementTarget="SearchBox" Placement="BottomEdgeAlignedLeft"
+                    VerticalOffset="-13">
       <SearchBarPopup.IsCustomOpen>
         <MultiBinding Converter="{x:Static BoolConverters.And}">
           <MultiBinding Converter="{x:Static BoolConverters.Or}">
diff --git a/WalletWasabi.Fluent/SearchBar/Views/SearchBarDropdown.axaml b/WalletWasabi.Fluent/SearchBar/Views/SearchBarDropdown.axaml
index d9687d68fd..1bc9e94139 100644
--- a/WalletWasabi.Fluent/SearchBar/Views/SearchBarDropdown.axaml
+++ b/WalletWasabi.Fluent/SearchBar/Views/SearchBarDropdown.axaml
@@ -61,10 +61,14 @@
     <SolidColorBrush x:Key="ToggleSwitchKnobFillOnPressed" Color="{DynamicResource AcrylicTrimForeground}" />
 
     <!--Disabled overrides-->
-    <SolidColorBrush Opacity="0.6" x:Key="ToggleSwitchHeaderForegroundDisabled" Color="{DynamicResource AcrylicTrimForeground}" />
-    <SolidColorBrush Opacity="0.6" x:Key="ToggleSwitchStrokeOffDisabled" Color="{DynamicResource AcrylicTrimForeground}" />
-    <SolidColorBrush Opacity="0.6" x:Key="ToggleSwitchKnobFillOffDisabled" Color="{DynamicResource AcrylicTrimForeground}" />
-    <SolidColorBrush Opacity="0.6" x:Key="ToggleSwitchKnobFillOnDisabled" Color="{DynamicResource AcrylicTrimForeground}" />
+    <SolidColorBrush Opacity="0.6" x:Key="ToggleSwitchHeaderForegroundDisabled"
+                     Color="{DynamicResource AcrylicTrimForeground}" />
+    <SolidColorBrush Opacity="0.6" x:Key="ToggleSwitchStrokeOffDisabled"
+                     Color="{DynamicResource AcrylicTrimForeground}" />
+    <SolidColorBrush Opacity="0.6" x:Key="ToggleSwitchKnobFillOffDisabled"
+                     Color="{DynamicResource AcrylicTrimForeground}" />
+    <SolidColorBrush Opacity="0.6" x:Key="ToggleSwitchKnobFillOnDisabled"
+                     Color="{DynamicResource AcrylicTrimForeground}" />
     <SolidColorBrush Opacity="0.6" x:Key="ToggleSwitchFillOnDisabled" Color="{DynamicResource AcrylicTrimForeground}" />
     <SolidColorBrush Opacity="0.6" x:Key="ToggleSwitchStrokeOnDisabled" Color="{DynamicResource AcrylicTrimForeground}" />
     <!--Disabled overrides-->
@@ -76,7 +80,8 @@
     <settings:SettingSelector>
       <settings:SettingSelector.DataTemplates>
         <DataTemplate DataType="x:Boolean">
-          <ToggleSwitch Focusable="False" x:CompileBindings="False" HorizontalAlignment="Right" IsChecked="{Binding Value, Mode=TwoWay}" />
+          <ToggleSwitch Focusable="False" x:CompileBindings="False" HorizontalAlignment="Right"
+                        IsChecked="{Binding Value, Mode=TwoWay}" />
         </DataTemplate>
       </settings:SettingSelector.DataTemplates>
     </settings:SettingSelector>
@@ -87,7 +92,8 @@
         <Panel DockPanel.Dock="Left" Width="16" Height="16" Opacity="0.8" VerticalAlignment="Center">
           <PathIcon Data="{Binding Icon, Converter={x:Static conv:NavBarIconConverter.Instance}}" />
         </Panel>
-        <TextBlock Margin="10 0 10 0" Text="{Binding Name}" VerticalAlignment="Center" IsVisible="{Binding Name, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
+        <TextBlock Margin="10 0 10 0" Text="{Binding Name}" VerticalAlignment="Center"
+                   IsVisible="{Binding Name, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
         <ContentControl HorizontalContentAlignment="Stretch"
                         VerticalContentAlignment="Stretch"
                         Content="{Binding Content}" />
@@ -97,15 +103,18 @@
     <DataTemplate DataType="searchItems:ActionableItem">
 
       <Button ClickMode="Press" Focusable="False" Classes="searchItem" Background="Transparent"
-              Foreground="{DynamicResource AcrylicTrimForeground}" HorizontalAlignment="Stretch" Padding="0" Cursor="Hand">
+              Foreground="{DynamicResource AcrylicTrimForeground}" HorizontalAlignment="Stretch" Padding="0"
+              Cursor="Hand">
 
         <DockPanel Background="Transparent" Margin="10">
-          <PathIcon DockPanel.Dock="Left" Width="16" Height="16" Opacity="0.8" VerticalAlignment="Center" Foreground="{DynamicResource AcrylicTrimForeground}"
+          <PathIcon DockPanel.Dock="Left" Width="16" Height="16" Opacity="0.8" VerticalAlignment="Center"
+                    Foreground="{DynamicResource AcrylicTrimForeground}"
                     Data="{Binding Icon, Converter={x:Static conv:NavBarIconConverter.Instance}}" />
           <TextBlock Margin="10 0 10 0" Text="{Binding Name}"
                      ToolTip.Tip="{Binding Name}"
-                     VerticalAlignment="Center"  TextTrimming="CharacterEllipsis" MaxWidth="150" />
-          <TextBlock Opacity="0.5" VerticalAlignment="Center" ToolTip.Tip="{Binding Description}" Text="{Binding Description}"
+                     VerticalAlignment="Center" TextTrimming="CharacterEllipsis" MaxWidth="150" />
+          <TextBlock Opacity="0.5" VerticalAlignment="Center" ToolTip.Tip="{Binding Description}"
+                     Text="{Binding Description}"
                      TextTrimming="CharacterEllipsis" />
         </DockPanel>
 
@@ -113,7 +122,8 @@
           <ButtonClickEventTriggerBehavior>
             <FocusControlAction TargetControl="{x:Static helpers:ApplicationHelper.MainWindow}" />
             <InvokeCommandAction Command="{Binding Command}" />
-            <InvokeCommandAction Command="{Binding $parent[views:SearchBar].((viewModels:SearchBarViewModel)DataContext).ResetCommand}" />
+            <InvokeCommandAction
+              Command="{Binding $parent[views:SearchBar].((viewModels:SearchBarViewModel)DataContext).ResetCommand}" />
           </ButtonClickEventTriggerBehavior>
         </Interaction.Behaviors>
       </Button>
@@ -122,7 +132,7 @@
 
   <Panel VerticalAlignment="Center">
     <TextBlock IsVisible="{Binding !#Items.IsVisible, FallbackValue=False}" Margin="10"
-               Text="{x:Static lang:Resources.NoResults}"/>
+               Text="{x:Static lang:Resources.NoResults}" />
     <ItemsControl x:Name="Items" IsVisible="{Binding !!Groups.Count}" ItemsSource="{Binding Groups}">
       <ItemsControl.ItemTemplate>
         <DataTemplate DataType="{x:Type viewModels:SearchItemGroup}">
diff --git a/WalletWasabi.Fluent/Settings/ViewModels/SettingsPageViewModel.cs b/WalletWasabi.Fluent/Settings/ViewModels/SettingsPageViewModel.cs
index debb2e9df1..c0c3242ad0 100644
--- a/WalletWasabi.Fluent/Settings/ViewModels/SettingsPageViewModel.cs
+++ b/WalletWasabi.Fluent/Settings/ViewModels/SettingsPageViewModel.cs
@@ -51,13 +51,13 @@ public SettingsPageViewModel()
 
 		// Show restart message when needed
 		UiContext.ApplicationSettings.IsRestartNeeded
-									 .BindTo(this, x => x.IsModified);
+			.BindTo(this, x => x.IsModified);
 
 		// Show restart notification when needed only if this page is not active.
 		UiContext.ApplicationSettings.IsRestartNeeded
-				 .Where(x => x && !IsActive && !_isDisplayed && !UiContext.ApplicationSettings.Oobe)
-				 .Do(_ => NotificationHelpers.Show(new RestartViewModel(Resources.ApplyNewSettingRestart)))
-				 .Subscribe();
+			.Where(x => x && !IsActive && !_isDisplayed && !UiContext.ApplicationSettings.Oobe)
+			.Do(_ => NotificationHelpers.Show(new RestartViewModel(Resources.ApplyNewSettingRestart)))
+			.Subscribe();
 	}
 
 	public bool IsReadOnly => UiContext.ApplicationSettings.IsOverridden;
diff --git a/WalletWasabi.Fluent/Settings/Views/AppearanceSettingsTabView.axaml b/WalletWasabi.Fluent/Settings/Views/AppearanceSettingsTabView.axaml
index a4f2d1cb79..b03ebac753 100644
--- a/WalletWasabi.Fluent/Settings/Views/AppearanceSettingsTabView.axaml
+++ b/WalletWasabi.Fluent/Settings/Views/AppearanceSettingsTabView.axaml
@@ -13,23 +13,23 @@
              x:CompileBindings="True"
              x:DataType="viewModels:AppearanceSettingsTabViewModel">
   <UserControl.Resources>
-    <conv:NumberFormatExampleConverter x:Key="DecimalSeparatorConverter" Type="DecimalSeparator" ExampleNumber="0.5"/>
-    <conv:NumberFormatExampleConverter x:Key="GroupSeparatorConverter" Type="GroupSeparator" ExampleNumber="1000"/>
+    <conv:NumberFormatExampleConverter x:Key="DecimalSeparatorConverter" Type="DecimalSeparator" ExampleNumber="0.5" />
+    <conv:NumberFormatExampleConverter x:Key="GroupSeparatorConverter" Type="GroupSeparator" ExampleNumber="1000" />
   </UserControl.Resources>
 
   <StackPanel Classes="settingsLayout">
     <StackPanel.Styles>
       <Style Selector="TextBlock.exampleTitle">
-        <Setter Property="DockPanel.Dock" Value="Left"/>
-        <Setter Property="HorizontalAlignment" Value="Left"/>
-        <Setter Property="Margin" Value="0 0 10 0"/>
+        <Setter Property="DockPanel.Dock" Value="Left" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="Margin" Value="0 0 10 0" />
       </Style>
 
       <Style Selector="TextBlock.exampleValue">
-        <Setter Property="DockPanel.Dock" Value="Right"/>
-        <Setter Property="HorizontalAlignment" Value="Right"/>
-        <Setter Property="Margin" Value="0 1 0 0"/>
-        <Setter Property="Opacity" Value="0.6"/>
+        <Setter Property="DockPanel.Dock" Value="Right" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
+        <Setter Property="Margin" Value="0 1 0 0" />
+        <Setter Property="Opacity" Value="0.6" />
       </Style>
 
     </StackPanel.Styles>
@@ -62,7 +62,8 @@
           <DataTemplate x:DataType="models1:SeparatorModel">
             <DockPanel>
               <TextBlock Classes="exampleTitle" Text="{Binding Name}" />
-              <TextBlock Classes="exampleValue monoSpaced" Text="{Binding Char, Converter={StaticResource DecimalSeparatorConverter}}" />
+              <TextBlock Classes="exampleValue monoSpaced"
+                         Text="{Binding Char, Converter={StaticResource DecimalSeparatorConverter}}" />
             </DockPanel>
           </DataTemplate>
         </ComboBox.ItemTemplate>
@@ -76,7 +77,8 @@
           <DataTemplate x:DataType="models1:SeparatorModel">
             <DockPanel>
               <TextBlock Classes="exampleTitle" Text="{Binding Name}" />
-              <TextBlock Classes="exampleValue monoSpaced" Text="{Binding Char, Converter={StaticResource GroupSeparatorConverter}}" />
+              <TextBlock Classes="exampleValue monoSpaced"
+                         Text="{Binding Char, Converter={StaticResource GroupSeparatorConverter}}" />
             </DockPanel>
           </DataTemplate>
         </ComboBox.ItemTemplate>
diff --git a/WalletWasabi.Fluent/Settings/Views/BitcoinTabSettingsView.axaml b/WalletWasabi.Fluent/Settings/Views/BitcoinTabSettingsView.axaml
index 260a857593..3e5eecfdc8 100644
--- a/WalletWasabi.Fluent/Settings/Views/BitcoinTabSettingsView.axaml
+++ b/WalletWasabi.Fluent/Settings/Views/BitcoinTabSettingsView.axaml
@@ -50,7 +50,7 @@
     </DockPanel>
 
     <DockPanel IsVisible="{Binding !Settings.StartLocalBitcoinCoreOnStartup}"
-                ToolTip.Tip="{x:Static lang:Resources.WasabiDownloadBlocksFromFullNode}">
+               ToolTip.Tip="{x:Static lang:Resources.WasabiDownloadBlocksFromFullNode}">
       <TextBlock Text="{x:Static lang:Resources.BitcoinP2PEndpoint}" />
       <TextBox Text="{Binding BitcoinP2PEndPoint}">
         <Interaction.Behaviors>
diff --git a/WalletWasabi.Fluent/Settings/Views/GeneralSettingsTabView.axaml b/WalletWasabi.Fluent/Settings/Views/GeneralSettingsTabView.axaml
index f4dc3eebf6..abc82d7bde 100644
--- a/WalletWasabi.Fluent/Settings/Views/GeneralSettingsTabView.axaml
+++ b/WalletWasabi.Fluent/Settings/Views/GeneralSettingsTabView.axaml
@@ -42,8 +42,9 @@
       <ToggleSwitch IsChecked="{Binding Settings.EnableGpu}" />
     </DockPanel>
 
-    <DockPanel IsVisible="{Binding Settings.SelectedBrowser, Converter={x:Static conv:EnumToBoolConverter.Instance}, ConverterParameter={x:Static models:BrowserTypeDropdownListEnum.Custom}}"
-        ToolTip.Tip="{x:Static lang:Resources.SetPreferredBrowserPath}">
+    <DockPanel
+      IsVisible="{Binding Settings.SelectedBrowser, Converter={x:Static conv:EnumToBoolConverter.Instance}, ConverterParameter={x:Static models:BrowserTypeDropdownListEnum.Custom}}"
+      ToolTip.Tip="{x:Static lang:Resources.SetPreferredBrowserPath}">
       <TextBlock Text="{x:Static lang:Resources.CustomBrowserPath}" />
       <TextBox Text="{Binding Settings.BrowserPath}">
         <Interaction.Behaviors>
diff --git a/WalletWasabi.Fluent/Settings/Views/SecuritySettingsTabView.axaml b/WalletWasabi.Fluent/Settings/Views/SecuritySettingsTabView.axaml
index 43391ecdfe..81fb179d82 100644
--- a/WalletWasabi.Fluent/Settings/Views/SecuritySettingsTabView.axaml
+++ b/WalletWasabi.Fluent/Settings/Views/SecuritySettingsTabView.axaml
@@ -24,16 +24,17 @@
         </ComboBox.ItemTemplate>
         <ComboBox.Styles>
           <Style Selector="ComboBox /template/ Border#Background">
-            <Setter Property="CornerRadius" Value="30"/>
+            <Setter Property="CornerRadius" Value="30" />
           </Style>
           <Style Selector="ComboBox /template/ Border#HighlightBackground">
-            <Setter Property="CornerRadius" Value="30"/>
+            <Setter Property="CornerRadius" Value="30" />
           </Style>
         </ComboBox.Styles>
       </ComboBox>
     </DockPanel>
 
-    <DockPanel IsVisible="{Binding Settings.UseTor, ConverterParameter={x:Static basemodels:TorMode.Enabled}, Converter={x:Static conv:EnumToBoolConverter.Instance}}">
+    <DockPanel
+      IsVisible="{Binding Settings.UseTor, ConverterParameter={x:Static basemodels:TorMode.Enabled}, Converter={x:Static conv:EnumToBoolConverter.Instance}}">
       <TextBlock Text="{x:Static lang:Resources.TerminateTorWhenShutdown}" />
       <ToggleSwitch IsChecked="{Binding Settings.TerminateTorOnExit}" />
     </DockPanel>
diff --git a/WalletWasabi.Fluent/Settings/Views/SettingsPageView.axaml b/WalletWasabi.Fluent/Settings/Views/SettingsPageView.axaml
index 6f4c0d958e..0cc9c67c26 100644
--- a/WalletWasabi.Fluent/Settings/Views/SettingsPageView.axaml
+++ b/WalletWasabi.Fluent/Settings/Views/SettingsPageView.axaml
@@ -25,7 +25,8 @@
                    DockPanel.Dock="Bottom">
         <StackPanel Orientation="Horizontal">
           <TextBlock Text="{x:Static lang:Resources.ChangesAppliedAfterRestart}" />
-          <Button Content="{x:Static lang:Resources.RestartApplication}" Classes="activeHyperLink plain" Margin="5 0 0 0"
+          <Button Content="{x:Static lang:Resources.RestartApplication}" Classes="activeHyperLink plain"
+                  Margin="5 0 0 0"
                   Command="{Binding RestartCommand}" />
         </StackPanel>
       </InfoMessage>
@@ -48,7 +49,8 @@
 
         <TabItem Header="{x:Static lang:Resources.AppearanceSettingsTabViewModelTitle}">
           <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-            <views:AppearanceSettingsTabView DataContext="{Binding AppearanceSettingsTab}" IsEnabled="{Binding !IsReadOnly}" />
+            <views:AppearanceSettingsTabView DataContext="{Binding AppearanceSettingsTab}"
+                                             IsEnabled="{Binding !IsReadOnly}" />
           </ScrollViewer>
         </TabItem>
 
@@ -60,7 +62,8 @@
 
         <TabItem Header="{x:Static lang:Resources.Security}">
           <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-            <views:SecuritySettingsTabView DataContext="{Binding SecuritySettingsTab}" IsEnabled="{Binding !IsReadOnly}" />
+            <views:SecuritySettingsTabView DataContext="{Binding SecuritySettingsTab}"
+                                           IsEnabled="{Binding !IsReadOnly}" />
           </ScrollViewer>
         </TabItem>
       </TabControl>
diff --git a/WalletWasabi.Fluent/SignMessage/ViewModels/HardwareWalletMessageSigningViewModel.cs b/WalletWasabi.Fluent/SignMessage/ViewModels/HardwareWalletMessageSigningViewModel.cs
new file mode 100644
index 0000000000..9ec877d776
--- /dev/null
+++ b/WalletWasabi.Fluent/SignMessage/ViewModels/HardwareWalletMessageSigningViewModel.cs
@@ -0,0 +1,43 @@
+using ReactiveUI;
+using WalletWasabi.Blockchain.Keys;
+using WalletWasabi.Fluent.Common.ViewModels.DialogBase;
+using WalletWasabi.Fluent.Extensions;
+using WalletWasabi.Fluent.Models.Wallets;
+using WalletWasabi.Logging;
+using WalletWasabi.Wallets;
+
+namespace WalletWasabi.Fluent.SignMessage.ViewModels;
+
+[NavigationMetaData(NavigationTarget = NavigationTarget.CompactDialogScreen)]
+public partial class HardwareWalletMessageSigningViewModel : DialogViewModelBase<string?>
+{
+	[AutoNotify] private string _authorizationFailedMessage = "";
+
+	public HardwareWalletMessageSigningViewModel(HardwareWalletModel wallet, string message, HdPubKey hdPubKey)
+	{
+		WalletType = wallet.Settings.WalletType;
+
+		SetupCancel(enableCancel: true, enableCancelOnEscape: true, enableCancelOnPressed: true);
+		EnableBack = false;
+
+		NextCommand = ReactiveCommand.CreateFromTask(async () =>
+		{
+			AuthorizationFailedMessage = "";
+
+			try
+			{
+				var signature = await wallet.SignMessageAsync(message, hdPubKey);
+				Close(result: signature);
+			}
+			catch (Exception ex)
+			{
+				Logger.LogError(ex);
+				AuthorizationFailedMessage = ex.ToUserFriendlyString();
+			}
+		});
+
+		EnableAutoBusyOn(NextCommand);
+	}
+
+	public WalletType WalletType { get; }
+}
diff --git a/WalletWasabi.Fluent/SignMessage/ViewModels/SignMessageViewModel.cs b/WalletWasabi.Fluent/SignMessage/ViewModels/SignMessageViewModel.cs
new file mode 100644
index 0000000000..8078e2a23b
--- /dev/null
+++ b/WalletWasabi.Fluent/SignMessage/ViewModels/SignMessageViewModel.cs
@@ -0,0 +1,187 @@
+using System.Reactive.Concurrency;
+using System.Reactive.Disposables;
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Avalonia.Threading;
+using ReactiveUI;
+using WalletWasabi.Extensions;
+using WalletWasabi.Fluent.Extensions;
+using WalletWasabi.Fluent.Helpers;
+using WalletWasabi.Fluent.Models.Wallets;
+using WalletWasabi.Fluent.Navigation.ViewModels;
+using WalletWasabi.Fluent.Validation;
+using WalletWasabi.Lang;
+using WalletWasabi.Logging;
+using WalletWasabi.Models;
+using WalletWasabi.Userfacing;
+using WalletWasabi.Userfacing.Bip21;
+
+namespace WalletWasabi.Fluent.SignMessage.ViewModels;
+
+[NavigationMetaData(NavigationTarget = NavigationTarget.DialogScreen)]
+public partial class SignMessageViewModel : RoutableViewModel
+{
+	private readonly WalletModel _walletModel;
+	private readonly object _parsingLock = new();
+
+	[AutoNotify] private string _address = "";
+	[AutoNotify] private string _messageToSign = "";
+	[AutoNotify] private string _signedMessage = "";
+
+	private bool _parsingTo;
+
+	public SignMessageViewModel(WalletModel walletModel)
+	{
+		_walletModel = walletModel;
+
+		SetupCancel(enableCancel: true, enableCancelOnEscape: true, enableCancelOnPressed: true);
+		EnableBack = false;
+
+		this.ValidateProperty(x => x.Address, ValidateAddressField);
+
+		PasteCommand = ReactiveCommand.CreateFromTask(async () => await OnPasteAsync());
+		PasteMessageCommand = ReactiveCommand.CreateFromTask(async () => await OnPasteMessageAsync());
+		AutoPasteCommand = ReactiveCommand.CreateFromTask(OnAutoPasteAsync);
+		FindAddressCommand = ReactiveCommand.CreateFromTask(OnAutoPasteAsync);
+
+		var nextCommandCanExecute =
+			this.WhenAnyValue(x => x.Address, x => x.MessageToSign)
+				.Select(x =>
+				{
+					var allFilled = !string.IsNullOrEmpty(x.Item1) && !string.IsNullOrEmpty(x.Item2);
+					var hasError = Validations.Any;
+
+					return allFilled && !hasError;
+				});
+		NextCommand = ReactiveCommand.CreateFromTask(SignMessageAsync, nextCommandCanExecute);
+	}
+
+	public ICommand PasteCommand { get; }
+	public ICommand PasteMessageCommand { get; }
+	public ICommand AutoPasteCommand { get; }
+	public ICommand FindAddressCommand { get; }
+
+	private async Task SignMessageAsync()
+	{
+		if (string.IsNullOrEmpty(MessageToSign) ||
+		    !_walletModel.Addresses.TryGetHdPubKey(Address, out var hdPubKey))
+		{
+			return;
+		}
+
+		try
+		{
+			if (_walletModel is HardwareWalletModel hardwareWallet)
+			{
+				SignedMessage = await UiContext.Navigate().To().HardwareWalletMessageSigning(hardwareWallet, MessageToSign, hdPubKey).GetResultAsync() ?? "";
+			}
+			else
+			{
+				IsBusy = true;
+				SignedMessage = _walletModel.SignMessage(MessageToSign, hdPubKey);
+			}
+		}
+		catch (Exception ex)
+		{
+			Logger.LogError(ex);
+			await ShowErrorAsync(Resources.SignMessage, ex.ToUserFriendlyString(), "");
+		}
+		finally
+		{
+			IsBusy = false;
+		}
+	}
+
+	private void ValidateAddressField(IValidationErrors errors)
+	{
+		if (string.IsNullOrEmpty(Address))
+		{
+			return;
+		}
+
+		if (!string.IsNullOrEmpty(Address) && (Address.IsTrimmable() || !AddressStringParser.TryParse(Address, _walletModel.Network, out _)))
+		{
+			errors.Add(ErrorSeverity.Error, Resources.InvalidBitcoinAddress);
+			return;
+		}
+
+		if (!_walletModel.Addresses.TryGetHdPubKey(Address, out _))
+		{
+			errors.Add(ErrorSeverity.Error, Resources.TheAddressDoesNotBelongToThisWallet);
+			return;
+		}
+	}
+
+	protected override void OnNavigatedTo(bool isInHistory, CompositeDisposable disposables)
+	{
+		base.OnNavigatedTo(isInHistory, disposables);
+
+		if (!isInHistory)
+		{
+			RxApp.MainThreadScheduler.Schedule(async () => await OnAutoPasteAsync());
+		}
+	}
+
+	private async Task OnAutoPasteAsync()
+	{
+		var isAutoPasteEnabled = UiContext.ApplicationSettings.AutoPaste;
+
+		if (string.IsNullOrEmpty(Address) && isAutoPasteEnabled)
+		{
+			await OnPasteAsync(pasteIfInvalid: false);
+		}
+	}
+
+	private async Task OnPasteAsync(bool pasteIfInvalid = true)
+	{
+		var text = await ApplicationHelper.GetTextAsync();
+
+		lock (_parsingLock)
+		{
+			if (!TryParseUrl(text) && pasteIfInvalid)
+			{
+				Address = text;
+			}
+		}
+	}
+
+	private async Task OnPasteMessageAsync()
+	{
+		MessageToSign = await ApplicationHelper.GetTextAsync();
+	}
+
+	private bool TryParseUrl(string? text)
+	{
+		if (_parsingTo)
+		{
+			return false;
+		}
+
+		_parsingTo = true;
+
+		text = text?.Trim();
+
+		if (string.IsNullOrEmpty(text))
+		{
+			_parsingTo = false;
+			return false;
+		}
+
+		bool result = false;
+
+		if (AddressStringParser.TryParse(text, _walletModel.Network, out Bip21UriParser.Result? parserResult))
+		{
+			result = true;
+
+			if (parserResult.Address is { })
+			{
+				Address = parserResult.Address.ToString();
+			}
+		}
+
+		Dispatcher.UIThread.Post(() => _parsingTo = false);
+
+		return result;
+	}
+}
diff --git a/WalletWasabi.Fluent/SignMessage/Views/HardwareWalletMessageSigningView.axaml b/WalletWasabi.Fluent/SignMessage/Views/HardwareWalletMessageSigningView.axaml
new file mode 100644
index 0000000000..a5585c9d25
--- /dev/null
+++ b/WalletWasabi.Fluent/SignMessage/Views/HardwareWalletMessageSigningView.axaml
@@ -0,0 +1,30 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="428" d:DesignHeight="371"
+             x:DataType="viewModels1:HardwareWalletMessageSigningViewModel"
+             x:CompileBindings="True"
+             xmlns:lang="using:WalletWasabi.Lang"
+             xmlns:viewModels1="clr-namespace:WalletWasabi.Fluent.SignMessage.ViewModels"
+             x:Class="WalletWasabi.Fluent.SignMessage.Views.HardwareWalletMessageSigningView">
+  <ContentArea Title="{x:Static lang:Resources.SignWithHardwareWallet}"
+               Caption="{x:Static lang:Resources.HardwareWalletAuthDialogViewModelCaption}"
+               MaxWidth="500"
+               CancelContent="{x:Static lang:Resources.Cancel}"
+               EnableCancel="{Binding EnableCancel}"
+               EnableBack="{Binding EnableBack}"
+               EnableNext="True" NextContent="{x:Static lang:Resources.Continue}"
+               IsBusy="{Binding IsBusy}"
+               ScrollViewer.VerticalScrollBarVisibility="Disabled">
+    <StackPanel>
+      <Viewbox MaxHeight="100">
+        <WalletIconControl WalletType="{Binding WalletType}" />
+      </Viewbox>
+      <TextBlock TextAlignment="Center" Foreground="{DynamicResource SystemErrorTextColor}"
+                 Text="{Binding AuthorizationFailedMessage}"
+                 TextWrapping="Wrap"
+                 IsVisible="{Binding AuthorizationFailedMessage, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
+    </StackPanel>
+  </ContentArea>
+</UserControl>
diff --git a/WalletWasabi.Fluent/SignMessage/Views/HardwareWalletMessageSigningView.axaml.cs b/WalletWasabi.Fluent/SignMessage/Views/HardwareWalletMessageSigningView.axaml.cs
new file mode 100644
index 0000000000..3c3ab10282
--- /dev/null
+++ b/WalletWasabi.Fluent/SignMessage/Views/HardwareWalletMessageSigningView.axaml.cs
@@ -0,0 +1,17 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace WalletWasabi.Fluent.SignMessage.Views;
+
+public class HardwareWalletMessageSigningView : UserControl
+{
+	public HardwareWalletMessageSigningView()
+	{
+		InitializeComponent();
+	}
+
+	private void InitializeComponent()
+	{
+		AvaloniaXamlLoader.Load(this);
+	}
+}
diff --git a/WalletWasabi.Fluent/SignMessage/Views/SignMessageView.axaml b/WalletWasabi.Fluent/SignMessage/Views/SignMessageView.axaml
new file mode 100644
index 0000000000..79760fb53e
--- /dev/null
+++ b/WalletWasabi.Fluent/SignMessage/Views/SignMessageView.axaml
@@ -0,0 +1,126 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:viewModels1="clr-namespace:WalletWasabi.Fluent.SignMessage.ViewModels"
+             xmlns:lang="clr-namespace:WalletWasabi.Lang;assembly=WalletWasabi"
+             mc:Ignorable="d" d:DesignWidth="650"
+             x:Class="WalletWasabi.Fluent.SignMessage.Views.SignMessageView"
+             x:CompileBindings="True"
+             x:DataType="viewModels1:SignMessageViewModel">
+  <ContentArea Title="{x:Static lang:Resources.SignMessage}"
+               Caption="{x:Static lang:Resources.SignMessageToVerifyYouOwnAddressForExchange}"
+               EnableNext="True" NextContent="{x:Static lang:Resources.Continue}"
+               EnableCancel="{Binding EnableCancel}"
+               IsBusy="{Binding IsBusy}"
+               ScrollViewer.VerticalScrollBarVisibility="Disabled">
+    <DockPanel HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+      <Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto,Auto"
+            ColumnSpacing="10" RowSpacing="20"
+            VerticalAlignment="Top" HorizontalAlignment="Stretch"
+            DockPanel.Dock="Top">
+        <Grid.Styles>
+          <Style Selector="AnimatedButton.flash">
+            <Setter Property="InitialOpacity" Value="0.8" />
+          </Style>
+          <Style Selector="AnimatedButton.flash /template/ PathIcon#PART_IconNormal">
+            <Setter Property="Foreground" Value="{DynamicResource SystemAccentColor}" />
+            <Style.Animations>
+              <Animation Duration="0.25" IterationCount="6"
+                         PlaybackDirection="AlternateReverse"
+                         Easing="{StaticResource FluentEasing}">
+                <KeyFrame KeyTime="0:0:0.0">
+                  <Setter Property="Opacity" Value="0.1" />
+                </KeyFrame>
+                <KeyFrame KeyTime="0:0:0.25">
+                  <Setter Property="Opacity" Value="1" />
+                </KeyFrame>
+              </Animation>
+            </Style.Animations>
+          </Style>
+        </Grid.Styles>
+
+        <!-- To -->
+        <Label Grid.Row="0" Grid.Column="0" Content="{x:Static lang:Resources.AddressWithColon}" Target="toTb" />
+        <TextBox Grid.Row="0" Grid.Column="1" x:Name="toTb" VerticalAlignment="Top" MaxLength="250"
+                 Text="{Binding Address}"
+                 Classes="monoSpaced"
+                 Watermark="{x:Static lang:Resources.PasteTheAddressProvidedByTheExchange}"
+                 ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+                 ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                 AcceptsReturn="False">
+          <Interaction.Behaviors>
+            <FocusOnAttachedBehavior />
+            <ExecuteCommandOnActivatedBehavior Command="{Binding AutoPasteCommand}" />
+            <FocusNextWhenValidBehavior />
+          </Interaction.Behaviors>
+          <TextBox.InnerRightContent>
+            <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="10" Margin="10 0">
+              <AnimatedButton KeyboardNavigation.IsTabStop="False"
+                              Focusable="False"
+                              Command="{Binding PasteCommand}"
+                              NormalIcon="{StaticResource paste_regular}"
+                              ClickIcon="{StaticResource copy_confirmed}">
+                <Interaction.Behaviors>
+                  <PasteButtonFlashBehavior FlashAnimation="flash" CurrentAddress="{Binding Address}" />
+                </Interaction.Behaviors>
+              </AnimatedButton>
+            </StackPanel>
+          </TextBox.InnerRightContent>
+        </TextBox>
+
+        <!-- Message To Sing -->
+        <Label Grid.Row="1" Grid.Column="0" Content="{x:Static lang:Resources.MessageWithColon}" Target="toTb" />
+        <TextBox Grid.Row="1" Grid.Column="1" x:Name="messageTb"
+                 Text="{Binding MessageToSign}"
+                 MaxHeight="100"
+                 AcceptsReturn="True"
+                 TextWrapping="Wrap"
+                 Classes="monoSpaced"
+                 Watermark="{x:Static lang:Resources.EnterTheMessageYouWishToSign}"
+                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                 ScrollViewer.VerticalScrollBarVisibility="Auto"
+                 VerticalAlignment="Top">
+          <TextBox.InnerRightContent>
+            <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="10" Margin="10 0">
+              <AnimatedButton KeyboardNavigation.IsTabStop="False"
+                              Focusable="False"
+                              Command="{Binding PasteMessageCommand}"
+                              NormalIcon="{StaticResource paste_regular}"
+                              ClickIcon="{StaticResource copy_confirmed}">
+              </AnimatedButton>
+            </StackPanel>
+          </TextBox.InnerRightContent>
+        </TextBox>
+      </Grid>
+
+      <!-- Message To Sing -->
+      <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" MaxWidth="450" DockPanel.Dock="Bottom"
+                  Classes="transitionO hide"
+                  Classes.show="{Binding SignedMessage, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+        <Border VerticalAlignment="Top"
+                BorderThickness="2"
+                BorderBrush="{DynamicResource TextControlBorderBrushFocused}"
+                CornerRadius="15"
+                Background="{DynamicResource Layer1BackgroundBrush}"
+                Padding="30 10 30 15">
+          <StackPanel Spacing="10">
+            <TextBlock Text="{x:Static lang:Resources.Signature}" HorizontalAlignment="Center" FontWeight="Bold"
+                       Opacity="0.4" />
+            <CopyableItem ContentToCopy="{Binding SignedMessage}">
+              <SelectableTextBlock Text="{Binding SignedMessage}"
+                                   TextWrapping="Wrap"
+                                   Classes="monoSpaced"
+                                   ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                                   ScrollViewer.VerticalScrollBarVisibility="Auto" />
+            </CopyableItem>
+          </StackPanel>
+
+        </Border>
+      </StackPanel>
+
+    </DockPanel>
+
+  </ContentArea>
+
+</UserControl>
diff --git a/WalletWasabi.Fluent/SignMessage/Views/SignMessageView.axaml.cs b/WalletWasabi.Fluent/SignMessage/Views/SignMessageView.axaml.cs
new file mode 100644
index 0000000000..13c1f8101b
--- /dev/null
+++ b/WalletWasabi.Fluent/SignMessage/Views/SignMessageView.axaml.cs
@@ -0,0 +1,17 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace WalletWasabi.Fluent.SignMessage.Views;
+
+public class SignMessageView : UserControl
+{
+	public SignMessageView()
+	{
+		InitializeComponent();
+	}
+
+	private void InitializeComponent()
+	{
+		AvaloniaXamlLoader.Load(this);
+	}
+}
diff --git a/WalletWasabi.Fluent/Status/ViewModels/StatusIconViewModel.cs b/WalletWasabi.Fluent/Status/ViewModels/StatusIconViewModel.cs
index 3579cbdeac..0f78528454 100644
--- a/WalletWasabi.Fluent/Status/ViewModels/StatusIconViewModel.cs
+++ b/WalletWasabi.Fluent/Status/ViewModels/StatusIconViewModel.cs
@@ -20,12 +20,11 @@ public StatusIconViewModel()
 		HealthMonitor = UiContext.HealthMonitor;
 
 		ManualUpdateCommand = ReactiveCommand.CreateFromTask(() => UiContext.FileSystem.OpenBrowserAsync(UiConstants.DownloadLink));
-		UpdateCommand = ReactiveCommand.Create(
-			() =>
-			{
-				UiContext.ApplicationSettings.DoUpdateOnClose = true;
-				AppLifetimeHelper.Shutdown();
-			});
+		UpdateCommand = ReactiveCommand.Create(() =>
+		{
+			UiContext.ApplicationSettings.DoUpdateOnClose = true;
+			AppLifetimeHelper.Shutdown();
+		});
 
 		AskMeLaterCommand = ReactiveCommand.Create(() => HealthMonitor.CheckForUpdates = false);
 
diff --git a/WalletWasabi.Fluent/Status/Views/StatusIcon.axaml b/WalletWasabi.Fluent/Status/Views/StatusIcon.axaml
index c805ecc7f3..709cf79832 100644
--- a/WalletWasabi.Fluent/Status/Views/StatusIcon.axaml
+++ b/WalletWasabi.Fluent/Status/Views/StatusIcon.axaml
@@ -21,11 +21,13 @@
     <Style Selector="PathIcon.statusIcon">
       <Setter Property="Opacity" Value="0" />
       <Setter Property="RenderTransform" Value="scale(0.8,0.8)" />
-      <Setter Property="IsVisible" Value="{Binding $self.Opacity, Converter={x:Static converters:BoolOpacityConverters.OpacityToBool}}" />
+      <Setter Property="IsVisible"
+              Value="{Binding $self.Opacity, Converter={x:Static converters:BoolOpacityConverters.OpacityToBool}}" />
       <Setter Property="Transitions">
         <Transitions>
-          <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.135" Easing="{StaticResource FluentEasing}" />
-          <DoubleTransition Property="Opacity" Duration="0:0:.135" Easing="{StaticResource FluentEasing}"/>
+          <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.135"
+                                         Easing="{StaticResource FluentEasing}" />
+          <DoubleTransition Property="Opacity" Duration="0:0:.135" Easing="{StaticResource FluentEasing}" />
         </Transitions>
       </Setter>
     </Style>
diff --git a/WalletWasabi.Fluent/Styles/CopyablePasswordTextBox.axaml b/WalletWasabi.Fluent/Styles/CopyablePasswordTextBox.axaml
index 1944683bae..f35a8166e5 100644
--- a/WalletWasabi.Fluent/Styles/CopyablePasswordTextBox.axaml
+++ b/WalletWasabi.Fluent/Styles/CopyablePasswordTextBox.axaml
@@ -4,7 +4,7 @@
   <Design.PreviewWith>
     <CopyablePasswordTextBox Text="123"
                              PasswordChar="•"
-                             Classes="copyablePasswordTextBox"/>
+                             Classes="copyablePasswordTextBox" />
   </Design.PreviewWith>
 
   <Styles.Resources>
@@ -18,12 +18,12 @@
                 Header="{x:Static lang:Resources.Copy}"
                 Command="{Binding $parent[CopyablePasswordTextBox].Copy}"
                 IsEnabled="{Binding $parent[CopyablePasswordTextBox].CanCopyModified}"
-                InputGesture="{x:Static TextBox.CopyGesture}"/>
+                InputGesture="{x:Static TextBox.CopyGesture}" />
       <MenuItem x:Name="TextBoxContextFlyoutPasteItem"
                 Header="{x:Static lang:Resources.Paste}"
                 Command="{Binding $parent[CopyablePasswordTextBox].Paste}"
                 IsEnabled="{Binding $parent[CopyablePasswordTextBox].CanPasteModified}"
-                InputGesture="{x:Static TextBox.PasteGesture}"/>
+                InputGesture="{x:Static TextBox.PasteGesture}" />
     </MenuFlyout>
     <MenuFlyout x:Key="CopyablePasswordTextBoxHorizontalTextBoxContextFlyout"
                 FlyoutPresenterTheme="{StaticResource HorizontalMenuFlyoutPresenter}"
diff --git a/WalletWasabi.Fluent/Styles/CuedScrollViewer.axaml b/WalletWasabi.Fluent/Styles/CuedScrollViewer.axaml
index 5a9aca06a9..8a74c7d999 100644
--- a/WalletWasabi.Fluent/Styles/CuedScrollViewer.axaml
+++ b/WalletWasabi.Fluent/Styles/CuedScrollViewer.axaml
@@ -115,9 +115,10 @@
             </ScrollContentPresenter.Styles>
 
             <ScrollContentPresenter.GestureRecognizers>
-              <ScrollGestureRecognizer CanHorizontallyScroll="{Binding CanHorizontallyScroll, ElementName=PART_ContentPresenter}"
-                                       CanVerticallyScroll="{Binding CanVerticallyScroll, ElementName=PART_ContentPresenter}"
-                                       IsScrollInertiaEnabled="{Binding IsScrollInertiaEnabled, RelativeSource={RelativeSource TemplatedParent}}" />
+              <ScrollGestureRecognizer
+                CanHorizontallyScroll="{Binding CanHorizontallyScroll, ElementName=PART_ContentPresenter}"
+                CanVerticallyScroll="{Binding CanVerticallyScroll, ElementName=PART_ContentPresenter}"
+                IsScrollInertiaEnabled="{Binding IsScrollInertiaEnabled, RelativeSource={RelativeSource TemplatedParent}}" />
             </ScrollContentPresenter.GestureRecognizers>
           </ScrollContentPresenter>
 
@@ -140,7 +141,8 @@
 
           <!-- Scroll cues (hints)  -->
           <!-- They are disabled for now. If we want to enable them, just remove the IsVisible="False" attribute below -->
-          <Panel x:Name="ScrollCues" Grid.Row="0" Grid.ColumnSpan="2" Grid.RowSpan="2" Grid.Column="0" IsVisible="False">
+          <Panel x:Name="ScrollCues" Grid.Row="0" Grid.ColumnSpan="2" Grid.RowSpan="2" Grid.Column="0"
+                 IsVisible="False">
             <RepeatButton x:Name="TopCue"
                           VerticalAlignment="Top"
                           Command="{Binding LineUp, RelativeSource={RelativeSource TemplatedParent}}">
diff --git a/WalletWasabi.Fluent/Styles/Dialog.axaml b/WalletWasabi.Fluent/Styles/Dialog.axaml
index c38902ec13..0e289351e9 100644
--- a/WalletWasabi.Fluent/Styles/Dialog.axaml
+++ b/WalletWasabi.Fluent/Styles/Dialog.axaml
@@ -6,13 +6,13 @@
     <Style.Animations>
       <Animation Duration="0:0:0.6" PlaybackDirection="AlternateReverse" IterationCount="1">
         <KeyFrame Cue="25%">
-          <Setter Property="BoxShadow" Value="{DynamicResource DialogAlertStartBoxShadow}"/>
+          <Setter Property="BoxShadow" Value="{DynamicResource DialogAlertStartBoxShadow}" />
         </KeyFrame>
         <KeyFrame Cue="50%">
-          <Setter Property="BoxShadow" Value="{DynamicResource DialogAlertEndBoxShadow}"/>
+          <Setter Property="BoxShadow" Value="{DynamicResource DialogAlertEndBoxShadow}" />
         </KeyFrame>
         <KeyFrame Cue="75%">
-          <Setter Property="BoxShadow" Value="{DynamicResource DialogAlertStartBoxShadow}"/>
+          <Setter Property="BoxShadow" Value="{DynamicResource DialogAlertStartBoxShadow}" />
         </KeyFrame>
         <KeyFrame Cue="100%">
           <Setter Property="BoxShadow" Value="{DynamicResource EmptyBoxShadow}" />
diff --git a/WalletWasabi.Fluent/Styles/Markdown.axaml b/WalletWasabi.Fluent/Styles/Markdown.axaml
index d3d54ffe61..6b1fae0223 100644
--- a/WalletWasabi.Fluent/Styles/Markdown.axaml
+++ b/WalletWasabi.Fluent/Styles/Markdown.axaml
@@ -63,38 +63,38 @@
   </Style>
 
   <Style Selector="ctxt|CHyperlink:pointerover">
-    <Setter Property="Foreground" Value="{DynamicResource SystemAccentColorLight3}"/>
+    <Setter Property="Foreground" Value="{DynamicResource SystemAccentColorLight3}" />
   </Style>
 
   <Style Selector="Border.Table">
-    <Setter Property="Padding" Value="2"/>
-    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}"/>
-    <Setter Property="BorderThickness" Value="0"/>
+    <Setter Property="Padding" Value="2" />
+    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
+    <Setter Property="BorderThickness" Value="0" />
   </Style>
 
   <Style Selector="Grid.Table">
-    <Setter Property="Background" Value="{DynamicResource Layer1BackgroundBrush}"/>
+    <Setter Property="Background" Value="{DynamicResource Layer1BackgroundBrush}" />
   </Style>
 
   <Style Selector="Border.TableHeader">
-    <Setter Property="Margin" Value="1 0"/>
-    <Setter Property="BorderThickness" Value="0"/>
-    <Setter Property="Background" Value="{DynamicResource Layer1BackgroundBrush}"/>
+    <Setter Property="Margin" Value="1 0" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Background" Value="{DynamicResource Layer1BackgroundBrush}" />
   </Style>
 
   <Style Selector="Border.OddTableRow">
-    <Setter Property="Margin" Value="1 1"/>
-    <Setter Property="BorderThickness" Value="0"/>
-    <Setter Property="Background" Value="{DynamicResource Layer2BackgroundBrush}"/>
+    <Setter Property="Margin" Value="1 1" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Background" Value="{DynamicResource Layer2BackgroundBrush}" />
   </Style>
 
   <Style Selector="Border.EvenTableRow">
-    <Setter Property="Margin" Value="1 1"/>
-    <Setter Property="BorderThickness" Value="0"/>
-    <Setter Property="Background" Value="{DynamicResource Layer2BackgroundBrush}"/>
+    <Setter Property="Margin" Value="1 1" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Background" Value="{DynamicResource Layer2BackgroundBrush}" />
   </Style>
 
   <Style Selector="Border.TableHeader ctxt|CTextBlock">
-    <Setter Property="FontWeight" Value="Bold"/>
+    <Setter Property="FontWeight" Value="Bold" />
   </Style>
 </Styles>
diff --git a/WalletWasabi.Fluent/Styles/RadioButton.axaml b/WalletWasabi.Fluent/Styles/RadioButton.axaml
index 6e03b4142e..b5b26ed316 100644
--- a/WalletWasabi.Fluent/Styles/RadioButton.axaml
+++ b/WalletWasabi.Fluent/Styles/RadioButton.axaml
@@ -41,7 +41,8 @@
   <Style Selector="RadioButton.text:checked /template/ ContentPresenter#PART_ContentPresenter">
     <Setter Property="(TextElement.Foreground)" Value="{DynamicResource SystemAccentColor}" />
   </Style>
-  <Style Selector="RadioButton.text:pointerover:not(:pressed) /template/ ContentPresenter#PART_ContentPresenter, RadioButton.text:checked /template/ ContentPresenter#PART_ContentPresenter, RadioButton.text:pressed /template/ ContentPresenter#PART_ContentPresenter">
+  <Style
+    Selector="RadioButton.text:pointerover:not(:pressed) /template/ ContentPresenter#PART_ContentPresenter, RadioButton.text:checked /template/ ContentPresenter#PART_ContentPresenter, RadioButton.text:pressed /template/ ContentPresenter#PART_ContentPresenter">
     <Setter Property="Opacity" Value="1" />
   </Style>
 </Styles>
diff --git a/WalletWasabi.Fluent/Styles/ScrollBar.axaml b/WalletWasabi.Fluent/Styles/ScrollBar.axaml
index 84e54973ea..e426b7d153 100644
--- a/WalletWasabi.Fluent/Styles/ScrollBar.axaml
+++ b/WalletWasabi.Fluent/Styles/ScrollBar.axaml
@@ -3,7 +3,7 @@
   <Design.PreviewWith>
     <Border Padding="20">
       <ScrollViewer Width="150" Height="150">
-        <Panel Background="Red" Width="200" Height="200"  />
+        <Panel Background="Red" Width="200" Height="200" />
       </ScrollViewer>
     </Border>
   </Design.PreviewWith>
diff --git a/WalletWasabi.Fluent/Styles/SettingsLayout.axaml b/WalletWasabi.Fluent/Styles/SettingsLayout.axaml
index 86d3c5c7e4..18cefd5ddd 100644
--- a/WalletWasabi.Fluent/Styles/SettingsLayout.axaml
+++ b/WalletWasabi.Fluent/Styles/SettingsLayout.axaml
@@ -57,7 +57,8 @@
     <Setter Property="HorizontalContentAlignment" Value="Center" />
   </Style>
 
-  <Style Selector="StackPanel.settingsLayout > DockPanel > CurrencyEntryBox.hideValidations /template/ DataValidationErrors#PART_DataValidationErrors">
+  <Style
+    Selector="StackPanel.settingsLayout > DockPanel > CurrencyEntryBox.hideValidations /template/ DataValidationErrors#PART_DataValidationErrors">
     <Setter Property="IsVisible" Value="False" />
   </Style>
 
diff --git a/WalletWasabi.Fluent/Styles/TagsBox.axaml b/WalletWasabi.Fluent/Styles/TagsBox.axaml
index 26761938b4..ad9e83e7c2 100644
--- a/WalletWasabi.Fluent/Styles/TagsBox.axaml
+++ b/WalletWasabi.Fluent/Styles/TagsBox.axaml
@@ -1,7 +1,8 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-  <Style Selector="TagsBox:not(:readonly) TagControl /template/ Panel#PART_TagPanel:pointerover Button#PART_DeleteButton">
+  <Style
+    Selector="TagsBox:not(:readonly) TagControl /template/ Panel#PART_TagPanel:pointerover Button#PART_DeleteButton">
     <Setter Property="Opacity" Value="1" />
     <Setter Property="RenderTransform" Value="scale(1,1)" />
   </Style>
diff --git a/WalletWasabi.Fluent/Styles/Themes/Base.axaml b/WalletWasabi.Fluent/Styles/Themes/Base.axaml
index c0d755f96a..638e9880f5 100644
--- a/WalletWasabi.Fluent/Styles/Themes/Base.axaml
+++ b/WalletWasabi.Fluent/Styles/Themes/Base.axaml
@@ -114,8 +114,10 @@
   <BoxShadows x:Key="OptimizePrivacyOptionBoxShadow2">0 4 10 0 #4A000000</BoxShadows>
 
   <!-- Invisible function button -->
-  <SolidColorBrush x:Key="InvisibleButtonPointerOverBackgroundColor" Opacity="0.25" Color="{StaticResource SystemBaseHighColor}" />
-  <SolidColorBrush x:Key="InvisibleButtonPressedBackgroundColor" Opacity="0.15" Color="{StaticResource SystemBaseHighColor}" />
+  <SolidColorBrush x:Key="InvisibleButtonPointerOverBackgroundColor" Opacity="0.25"
+                   Color="{StaticResource SystemBaseHighColor}" />
+  <SolidColorBrush x:Key="InvisibleButtonPressedBackgroundColor" Opacity="0.15"
+                   Color="{StaticResource SystemBaseHighColor}" />
 
   <!-- LineChart -->
   <StaticResource x:Key="LineChartAreaGradientStartStopColor" ResourceKey="SystemAccentCustomColorDark" />
diff --git a/WalletWasabi.Fluent/Styles/Themes/Dark.axaml b/WalletWasabi.Fluent/Styles/Themes/Dark.axaml
index 1d5ff18c75..edbd2f154a 100644
--- a/WalletWasabi.Fluent/Styles/Themes/Dark.axaml
+++ b/WalletWasabi.Fluent/Styles/Themes/Dark.axaml
@@ -89,7 +89,8 @@
   <Color x:Key="OfferBorderColor">#27757575</Color>
 
   <SolidColorBrush x:Key="PrivacyControlWhiteListHeaderForeground" Color="#FFFFFF" />
-  <SolidColorBrush x:Key="PrivacyControlWhiteListBackground" Color="{StaticResource SystemAccentCustomColorDark}" Opacity="0.1" />
+  <SolidColorBrush x:Key="PrivacyControlWhiteListBackground" Color="{StaticResource SystemAccentCustomColorDark}"
+                   Opacity="0.1" />
   <SolidColorBrush x:Key="PrivacyControlBlackListBackground" Color="Transparent" />
   <SolidColorBrush x:Key="PrivacyControlItemBackground" Color="#2FFFFFFF" />
 
@@ -145,7 +146,8 @@
   <SolidColorBrush x:Key="BuyAnythingChatBackground" Color="{StaticResource Layer2BackgroundBrush}" />
   <SolidColorBrush x:Key="AssistantMessageBackground" Color="{StaticResource Layer1BackgroundBrush}" />
   <SolidColorBrush x:Key="ConversationSelectedBackground" Color="{StaticResource Layer2BackgroundBrush}" />
-  <SolidColorBrush x:Key="ConversationPointerOverBackground" Color="{StaticResource Layer2BackgroundBrush}" Opacity="0.5" />
+  <SolidColorBrush x:Key="ConversationPointerOverBackground" Color="{StaticResource Layer2BackgroundBrush}"
+                   Opacity="0.5" />
   <SolidColorBrush x:Key="ConversationPressedBackground" Color="{StaticResource Layer2BackgroundBrush}" Opacity="0.8" />
   <StaticResource x:Key="UserMessageBackground" ResourceKey="SystemAccentCustomColorLight" />
 
diff --git a/WalletWasabi.Fluent/Styles/Themes/Light.axaml b/WalletWasabi.Fluent/Styles/Themes/Light.axaml
index 5bf8c107ca..b07bb8c6ff 100644
--- a/WalletWasabi.Fluent/Styles/Themes/Light.axaml
+++ b/WalletWasabi.Fluent/Styles/Themes/Light.axaml
@@ -145,8 +145,10 @@
   <SolidColorBrush x:Key="BuyAnythingChatBackground" Color="{StaticResource Layer2BackgroundBrushLight1}" />
   <SolidColorBrush x:Key="AssistantMessageBackground" Color="{StaticResource Layer1BackgroundBrushDark2}" />
   <SolidColorBrush x:Key="ConversationSelectedBackground" Color="{StaticResource Layer2BackgroundBrushLight1}" />
-  <SolidColorBrush x:Key="ConversationPointerOverBackground" Color="{StaticResource Layer2BackgroundBrushLight1}" Opacity="0.5" />
-  <SolidColorBrush x:Key="ConversationPressedBackground" Color="{StaticResource Layer2BackgroundBrushLight1}" Opacity="0.8" />
+  <SolidColorBrush x:Key="ConversationPointerOverBackground" Color="{StaticResource Layer2BackgroundBrushLight1}"
+                   Opacity="0.5" />
+  <SolidColorBrush x:Key="ConversationPressedBackground" Color="{StaticResource Layer2BackgroundBrushLight1}"
+                   Opacity="0.8" />
   <StaticResource x:Key="UserMessageBackground" ResourceKey="SystemAccentCustomColorLight" />
 
   <!-- WalletIcon -->
diff --git a/WalletWasabi.Fluent/Styles/ToggleSwitch.axaml b/WalletWasabi.Fluent/Styles/ToggleSwitch.axaml
index 91cdd10989..496623837c 100644
--- a/WalletWasabi.Fluent/Styles/ToggleSwitch.axaml
+++ b/WalletWasabi.Fluent/Styles/ToggleSwitch.axaml
@@ -5,21 +5,21 @@
   </Style>
 
   <Style Selector="ToggleSwitch:disabled /template/ Border#OuterBorder">
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchFillOnDisabled}"/>
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnDisabled}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchFillOnDisabled}" />
+    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnDisabled}" />
   </Style>
 
   <Style Selector="ToggleSwitch:disabled /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnDisabled}"/>
+    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnDisabled}" />
   </Style>
 
   <Style Selector="ToggleSwitch:disabled /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffDisabled}"/>
+    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffDisabled}" />
   </Style>
 
   <Style Selector="ToggleSwitch:disabled /template/ Border#SwitchKnobBounds">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnDisabled}"/>
+    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnDisabled}" />
   </Style>
 
   <!-- Fix for https://github.com/zkSNACKs/WalletWasabi/issues/9436 -->
diff --git a/WalletWasabi.Fluent/TransactionBroadcasting/Views/BroadcastTransactionView.axaml b/WalletWasabi.Fluent/TransactionBroadcasting/Views/BroadcastTransactionView.axaml
index f07aa9b00e..169a7666c1 100644
--- a/WalletWasabi.Fluent/TransactionBroadcasting/Views/BroadcastTransactionView.axaml
+++ b/WalletWasabi.Fluent/TransactionBroadcasting/Views/BroadcastTransactionView.axaml
@@ -5,34 +5,34 @@
              x:CompileBindings="True"
              x:Class="WalletWasabi.Fluent.TransactionBroadcasting.Views.BroadcastTransactionView">
   <ContentArea Title="{Binding Title}"
-                 EnableCancel="{Binding EnableCancel}"
-                 EnableBack="{Binding EnableBack}"
-                 EnableNext="True" NextContent="Broadcast"
-                 IsBusy="{Binding IsBusy}">
+               EnableCancel="{Binding EnableCancel}"
+               EnableBack="{Binding EnableBack}"
+               EnableNext="True" NextContent="Broadcast"
+               IsBusy="{Binding IsBusy}">
     <StackPanel Spacing="20">
       <PreviewItem Icon="{StaticResource transaction_id}"
-                     Label="Transaction ID"
-                     Content="{Binding TransactionId, FallbackValue=ab550cbedcacc9e4d1d6d37b1dc54eee0cax7b70c4e0beeac2d0915353b70ae0}" />
+                   Label="Transaction ID"
+                   Content="{Binding TransactionId, FallbackValue=ab550cbedcacc9e4d1d6d37b1dc54eee0cax7b70c4e0beeac2d0915353b70ae0}" />
       <Separator />
       <PreviewItem Icon="{StaticResource btc_logo}"
-                     Label="Input amount"
-                     Content="{Binding InputAmountString, FallbackValue=0.0001 1234 BTC}" />
+                   Label="Input amount"
+                   Content="{Binding InputAmountString, FallbackValue=0.0001 1234 BTC}" />
       <Separator />
       <PreviewItem Icon="{StaticResource btc_logo}"
-                     Label="Output amount"
-                     Content="{Binding OutputAmountString, FallbackValue=0.0001 1234 BTC}" />
+                   Label="Output amount"
+                   Content="{Binding OutputAmountString, FallbackValue=0.0001 1234 BTC}" />
       <Separator />
       <PreviewItem Icon="{StaticResource arrow_down_right_circle_regular}"
-                     Label="Input count"
-                     Content="{Binding InputCount, FallbackValue=1}" />
+                   Label="Input count"
+                   Content="{Binding InputCount, FallbackValue=1}" />
       <Separator />
       <PreviewItem Icon="{StaticResource arrow_up_right_circle_regular}"
-                     Label="Output count"
-                     Content="{Binding OutputCount, FallbackValue=1}" />
+                   Label="Output count"
+                   Content="{Binding OutputCount, FallbackValue=1}" />
       <Separator />
       <PreviewItem Icon="{StaticResource paper_cash_regular}"
-                     Label="Fee"
-                     Content="{Binding FeeString, FallbackValue=0.0001 1234 BTC}" />
+                   Label="Fee"
+                   Content="{Binding FeeString, FallbackValue=0.0001 1234 BTC}" />
     </StackPanel>
   </ContentArea>
 </UserControl>
diff --git a/WalletWasabi.Fluent/TreeDataGrid/PlainTextElementFactory.cs b/WalletWasabi.Fluent/TreeDataGrid/PlainTextElementFactory.cs
index a96d8ce617..6fa6a6a453 100644
--- a/WalletWasabi.Fluent/TreeDataGrid/PlainTextElementFactory.cs
+++ b/WalletWasabi.Fluent/TreeDataGrid/PlainTextElementFactory.cs
@@ -7,15 +7,11 @@ internal class PlainTextElementFactory : TreeDataGridElementFactory
 {
 	protected override Control CreateElement(object? data)
 	{
-		return data is PlainTextCell ?
-			new TreeDataGridPlainTextCell() :
-			base.CreateElement(data);
+		return data is PlainTextCell ? new TreeDataGridPlainTextCell() : base.CreateElement(data);
 	}
 
 	protected override string GetDataRecycleKey(object? data)
 	{
-		return data is PlainTextCell ?
-			typeof(TreeDataGridPlainTextCell).FullName! :
-			base.GetDataRecycleKey(data);
+		return data is PlainTextCell ? typeof(TreeDataGridPlainTextCell).FullName! : base.GetDataRecycleKey(data);
 	}
 }
diff --git a/WalletWasabi.Fluent/TreeDataGrid/TreeDataGridPlainTextCell.cs b/WalletWasabi.Fluent/TreeDataGrid/TreeDataGridPlainTextCell.cs
index d5558f6eb9..9e015f93f9 100644
--- a/WalletWasabi.Fluent/TreeDataGrid/TreeDataGridPlainTextCell.cs
+++ b/WalletWasabi.Fluent/TreeDataGrid/TreeDataGridPlainTextCell.cs
@@ -47,6 +47,7 @@ public override void Render(DrawingContext context)
 			{
 				_formattedText.SetForegroundBrush(Foreground);
 			}
+
 			context.DrawText(_formattedText, new Point(0, r.Position.Y));
 		}
 	}
diff --git a/WalletWasabi.Fluent/TreeDataGrid/TreeDataGridPrivacyTextCell.cs b/WalletWasabi.Fluent/TreeDataGrid/TreeDataGridPrivacyTextCell.cs
index e11986bfdb..0532813006 100644
--- a/WalletWasabi.Fluent/TreeDataGrid/TreeDataGridPrivacyTextCell.cs
+++ b/WalletWasabi.Fluent/TreeDataGrid/TreeDataGridPrivacyTextCell.cs
@@ -89,7 +89,9 @@ public override void Render(DrawingContext context)
 
 		var formattedText = !_isContentVisible
 			? _privacyFormattedText
-			: _haveText ? _formattedText : null;
+			: _haveText
+				? _formattedText
+				: null;
 
 		if (formattedText is null)
 		{
diff --git a/WalletWasabi.Fluent/TwoFactor/Controls/TwoFactorEntryBox.axaml b/WalletWasabi.Fluent/TwoFactor/Controls/TwoFactorEntryBox.axaml
index 9961a0ae31..ac57570711 100644
--- a/WalletWasabi.Fluent/TwoFactor/Controls/TwoFactorEntryBox.axaml
+++ b/WalletWasabi.Fluent/TwoFactor/Controls/TwoFactorEntryBox.axaml
@@ -8,35 +8,35 @@
     <Setter Property="Template">
       <ControlTemplate>
         <ItemsControl Name="PART_NumberControls" ItemsSource="{TemplateBinding Items}">
-         <ItemsControl.ItemsPanel>
-           <ItemsPanelTemplate>
-             <StackPanel Orientation="Horizontal" Spacing="8"/>
-           </ItemsPanelTemplate>
-         </ItemsControl.ItemsPanel>
-         <ItemsControl.ItemTemplate>
-           <DataTemplate>
-             <TextBox FontSize="35"
-                      MinWidth="45" MaxWidth="45" Width="45"
-                      TextAlignment="Center"
-                      MaxLength="1"
-                      x:DataType="viewModels:TwoFactorNumberViewModel" Text="{Binding Number}">
-               <TextBox.Styles>
-                 <Style Selector="TextBox /template/ Border#PART_BorderElement">
-                   <Setter Property="CornerRadius" Value="10" />
-                 </Style>
-               </TextBox.Styles>
-               <TextBox.Resources>
-                 <Thickness x:Key="TextControlBorderThemeThickness">1</Thickness>
-                 <Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness>
-                 <Thickness x:Key="TextControlThemePadding">10,15</Thickness>
-               </TextBox.Resources>
-               <Interaction.Behaviors>
-                 <TwoFactorTextBoxBehavior />
-               </Interaction.Behaviors>
-             </TextBox>
-           </DataTemplate>
-         </ItemsControl.ItemTemplate>
-       </ItemsControl>
+          <ItemsControl.ItemsPanel>
+            <ItemsPanelTemplate>
+              <StackPanel Orientation="Horizontal" Spacing="8" />
+            </ItemsPanelTemplate>
+          </ItemsControl.ItemsPanel>
+          <ItemsControl.ItemTemplate>
+            <DataTemplate>
+              <TextBox FontSize="35"
+                       MinWidth="45" MaxWidth="45" Width="45"
+                       TextAlignment="Center"
+                       MaxLength="1"
+                       x:DataType="viewModels:TwoFactorNumberViewModel" Text="{Binding Number}">
+                <TextBox.Styles>
+                  <Style Selector="TextBox /template/ Border#PART_BorderElement">
+                    <Setter Property="CornerRadius" Value="10" />
+                  </Style>
+                </TextBox.Styles>
+                <TextBox.Resources>
+                  <Thickness x:Key="TextControlBorderThemeThickness">1</Thickness>
+                  <Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness>
+                  <Thickness x:Key="TextControlThemePadding">10,15</Thickness>
+                </TextBox.Resources>
+                <Interaction.Behaviors>
+                  <TwoFactorTextBoxBehavior />
+                </Interaction.Behaviors>
+              </TextBox>
+            </DataTemplate>
+          </ItemsControl.ItemTemplate>
+        </ItemsControl>
       </ControlTemplate>
     </Setter>
 
diff --git a/WalletWasabi.Fluent/TwoFactor/Controls/TwoFactorEntryBox.axaml.cs b/WalletWasabi.Fluent/TwoFactor/Controls/TwoFactorEntryBox.axaml.cs
index 894bb38bc0..5afa2878fb 100644
--- a/WalletWasabi.Fluent/TwoFactor/Controls/TwoFactorEntryBox.axaml.cs
+++ b/WalletWasabi.Fluent/TwoFactor/Controls/TwoFactorEntryBox.axaml.cs
@@ -116,7 +116,7 @@ private void ItemsControlLoaded(object? sender, RoutedEventArgs e)
 
 		if (textBoxes[DigitCount / 2 - 1] is { } middleTb)
 		{
-			middleTb.Margin = new Thickness(0, 0, 10 , 0);
+			middleTb.Margin = new Thickness(0, 0, 10, 0);
 		}
 	}
 
diff --git a/WalletWasabi.Fluent/TwoFactor/Views/TwoFactoryAuthenticationDialogView.axaml b/WalletWasabi.Fluent/TwoFactor/Views/TwoFactoryAuthenticationDialogView.axaml
index c91605253a..72847244fe 100644
--- a/WalletWasabi.Fluent/TwoFactor/Views/TwoFactoryAuthenticationDialogView.axaml
+++ b/WalletWasabi.Fluent/TwoFactor/Views/TwoFactoryAuthenticationDialogView.axaml
@@ -16,7 +16,8 @@
                ScrollViewer.VerticalScrollBarVisibility="Disabled">
     <DockPanel Margin="20 0">
 
-      <controls:TwoFactorEntryBox HorizontalAlignment="Center" DockPanel.Dock="Bottom" Text="{Binding TwoFactorToken, Mode=OneWayToSource}" />
+      <controls:TwoFactorEntryBox HorizontalAlignment="Center" DockPanel.Dock="Bottom"
+                                  Text="{Binding TwoFactorToken, Mode=OneWayToSource}" />
       <Label HorizontalAlignment="Center" DockPanel.Dock="Bottom">Verification code:</Label>
 
       <Viewbox Margin="20" MaxHeight="270" MinHeight="100" DockPanel.Dock="Top">
diff --git a/WalletWasabi.Fluent/TwoFactor/Views/VerifyTwoFactoryAuthenticationDialogView.axaml b/WalletWasabi.Fluent/TwoFactor/Views/VerifyTwoFactoryAuthenticationDialogView.axaml
index b071c9b24e..3aa739a767 100644
--- a/WalletWasabi.Fluent/TwoFactor/Views/VerifyTwoFactoryAuthenticationDialogView.axaml
+++ b/WalletWasabi.Fluent/TwoFactor/Views/VerifyTwoFactoryAuthenticationDialogView.axaml
@@ -16,7 +16,7 @@
                NextContent="{x:Static lang:Resources.Verify}">
     <DockPanel>
       <controls:TwoFactorEntryBox HorizontalAlignment="Center" DockPanel.Dock="Bottom"
-                         Text="{Binding TwoFactorToken, Mode=OneWayToSource}" />
+                                  Text="{Binding TwoFactorToken, Mode=OneWayToSource}" />
       <Label HorizontalAlignment="Center" DockPanel.Dock="Bottom">Verification code:</Label>
       <Viewbox MaxHeight="150" Margin="40">
         <PathIcon Data="{StaticResource shield_lock}" Opacity="0.6" />
diff --git a/WalletWasabi.Fluent/Validation/Validations.cs b/WalletWasabi.Fluent/Validation/Validations.cs
index 29598921bf..52cac8e7a1 100644
--- a/WalletWasabi.Fluent/Validation/Validations.cs
+++ b/WalletWasabi.Fluent/Validation/Validations.cs
@@ -88,7 +88,8 @@ public IEnumerable GetErrors(string? propertyName)
 		if (!string.IsNullOrWhiteSpace(propertyName))
 		{
 			return ErrorsByPropertyName.TryGetValue(propertyName, out ErrorDescriptors? value) && value.Any()
-				? value : ErrorDescriptors.Empty;
+				? value
+				: ErrorDescriptors.Empty;
 		}
 		else
 		{
diff --git a/WalletWasabi.Fluent/ViewLocator.cs b/WalletWasabi.Fluent/ViewLocator.cs
index 7ab7d649b3..e41fb03348 100644
--- a/WalletWasabi.Fluent/ViewLocator.cs
+++ b/WalletWasabi.Fluent/ViewLocator.cs
@@ -13,12 +13,13 @@ public Control Build(object? data)
 		{
 			throw new ArgumentNullException($"Param: {data}");
 		}
-		
+
 		var type = data.GetType();
 		if (s_views.TryGetValue(type, out var func))
 		{
 			return func.Invoke();
 		}
+
 		throw new Exception($"Unable to create view for type: {type}");
 	}
 
diff --git a/WalletWasabi.Fluent/WalletWasabi.Fluent.csproj b/WalletWasabi.Fluent/WalletWasabi.Fluent.csproj
index 0d168701fc..851bc23b40 100644
--- a/WalletWasabi.Fluent/WalletWasabi.Fluent.csproj
+++ b/WalletWasabi.Fluent/WalletWasabi.Fluent.csproj
@@ -12,28 +12,28 @@
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	</PropertyGroup>
 	<ItemGroup>
-		<AvaloniaResource Include="Assets\**" />
+		<AvaloniaResource Include="Assets\**"/>
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Avalonia" />
-		<PackageReference Include="Avalonia.Controls.TreeDataGrid" />
-		<PackageReference Include="Avalonia.ReactiveUI" />
-		<PackageReference Include="Avalonia.Diagnostics" Condition="'$(Configuration)' == 'Debug'" />
-		<PackageReference Include="Avalonia.Xaml.Behaviors" />
-		<PackageReference Include="Avalonia.Skia" />
-		<PackageReference Include="Avalonia.Themes.Fluent" />
-		<PackageReference Include="Avalonia.Fonts.Inter" />
-		<PackageReference Include="DynamicData" />
-		<PackageReference Include="Markdown.Avalonia" />
-		<PackageReference Include="System.Runtime" />
-		<PackageReference Include="QRackers" />
-		<PackageReference Include="System.Private.Uri" />
-		<PackageReference Include="System.Text.Json" />
+		<PackageReference Include="Avalonia"/>
+		<PackageReference Include="Avalonia.Controls.TreeDataGrid"/>
+		<PackageReference Include="Avalonia.ReactiveUI"/>
+		<PackageReference Include="Avalonia.Diagnostics" Condition="'$(Configuration)' == 'Debug'"/>
+		<PackageReference Include="Avalonia.Xaml.Behaviors"/>
+		<PackageReference Include="Avalonia.Skia"/>
+		<PackageReference Include="Avalonia.Themes.Fluent"/>
+		<PackageReference Include="Avalonia.Fonts.Inter"/>
+		<PackageReference Include="DynamicData"/>
+		<PackageReference Include="Markdown.Avalonia"/>
+		<PackageReference Include="System.Runtime"/>
+		<PackageReference Include="QRackers"/>
+		<PackageReference Include="System.Private.Uri"/>
+		<PackageReference Include="System.Text.Json"/>
 	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\WalletWasabi.Daemon\WalletWasabi.Daemon.csproj" />
+		<ProjectReference Include="..\WalletWasabi.Daemon\WalletWasabi.Daemon.csproj"/>
 
 		<!-- See explanation of the additional properties here: https://github.com/dotnet/roslyn/issues/60744#issuecomment-1438273464 -->
-		<ProjectReference Include="..\WalletWasabi.Fluent.Generators\WalletWasabi.Fluent.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" AdditionalProperties="IsRidAgnostic=true" />
+		<ProjectReference Include="..\WalletWasabi.Fluent.Generators\WalletWasabi.Fluent.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" AdditionalProperties="IsRidAgnostic=true"/>
 	</ItemGroup>
 </Project>
diff --git a/WalletWasabi.Fluent/WalletWasabi.Fluent.csproj.DotSettings b/WalletWasabi.Fluent/WalletWasabi.Fluent.csproj.DotSettings
index 71a1e0fc85..0601543646 100644
--- a/WalletWasabi.Fluent/WalletWasabi.Fluent.csproj.DotSettings
+++ b/WalletWasabi.Fluent/WalletWasabi.Fluent.csproj.DotSettings
@@ -1,3 +1,3 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeEditing/Localization/Localizable/@EntryValue">Yes</s:String>
-	<s:String x:Key="/Default/CodeEditing/Localization/LocalizableInspector/@EntryValue">Pessimistic</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+    <s:String x:Key="/Default/CodeEditing/Localization/LocalizableInspector/@EntryValue">Pessimistic</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/WalletWasabi.Fluent/WebBrowserService.cs b/WalletWasabi.Fluent/WebBrowserService.cs
index 8a20dad683..38981bd304 100644
--- a/WalletWasabi.Fluent/WebBrowserService.cs
+++ b/WalletWasabi.Fluent/WebBrowserService.cs
@@ -16,14 +16,12 @@ public sealed class WebBrowserService
 	private BrowserType? PreferredBrowserType { get; set; } = null;
 
 	private WebBrowserService()
-	{ }
+	{
+	}
 
 	public static WebBrowserService Instance
 	{
-		get
-		{
-			return LazyInstance.Value;
-		}
+		get { return LazyInstance.Value; }
 	}
 
 	public void SetConfig(string filePathOrEnumValueThatIsInConfig)
@@ -124,8 +122,10 @@ private static bool TryOpenPreferredBrowser(string url, BrowserType preferredBro
 						Process.Start(iePath, url);
 						return true;
 					}
+
 					return true;
 				}
+
 				break;
 
 			case BrowserType.Safari:
@@ -134,6 +134,7 @@ private static bool TryOpenPreferredBrowser(string url, BrowserType preferredBro
 					OpenInBrowser(url, "open"); // Safari uses the 'open' command
 					return true;
 				}
+
 				break;
 
 			case BrowserType.Firefox:
@@ -142,8 +143,10 @@ private static bool TryOpenPreferredBrowser(string url, BrowserType preferredBro
 					OpenInBrowser(url, GetFirefoxPath());
 					return true;
 				}
+
 				break;
 		}
+
 		return false;
 	}
 
@@ -155,6 +158,7 @@ private static bool TryOpenTorBrowser(string url)
 			Process.Start(torBrowserPath, url);
 			return true;
 		}
+
 		return false;
 	}
 
@@ -166,6 +170,7 @@ private static bool TryOpenChrome(string url)
 			Process.Start(chromePath, url);
 			return true;
 		}
+
 		return false;
 	}
 
@@ -177,6 +182,7 @@ private static bool TryOpenBrave(string url)
 			Process.Start(bravePath, url);
 			return true;
 		}
+
 		return false;
 	}
 
@@ -188,6 +194,7 @@ private static bool TryOpenOpera(string url)
 			Process.Start(operaPath, url);
 			return true;
 		}
+
 		return false;
 	}
 
@@ -212,6 +219,7 @@ private static string GetTorBrowserPath()
 		{
 			return Path.Combine(Environment.GetEnvironmentVariable("HOME") ?? "", "tor-browser", "Browser", "firefox");
 		}
+
 		return string.Empty;
 	}
 
@@ -229,6 +237,7 @@ private static string GetChromePath()
 		{
 			return "/usr/bin/google-chrome";
 		}
+
 		return string.Empty;
 	}
 
@@ -246,6 +255,7 @@ private static string GetBravePath()
 		{
 			return "/usr/bin/brave-browser";
 		}
+
 		return string.Empty;
 	}
 
@@ -263,6 +273,7 @@ private static string GetOperaPath()
 		{
 			return "/usr/bin/opera";
 		}
+
 		return string.Empty;
 	}
 
@@ -276,6 +287,7 @@ private static string GetFirefoxPath()
 		{
 			return "/usr/bin/firefox";
 		}
+
 		return string.Empty;
 	}
 
@@ -287,26 +299,32 @@ public static List<BrowserType> GetAvailableBrowsers()
 		{
 			availableBrowsers.Add(BrowserType.Tor);
 		}
+
 		if (!string.IsNullOrEmpty(GetChromePath()) && File.Exists(GetChromePath()))
 		{
 			availableBrowsers.Add(BrowserType.Chrome);
 		}
+
 		if (!string.IsNullOrEmpty(GetBravePath()) && File.Exists(GetBravePath()))
 		{
 			availableBrowsers.Add(BrowserType.Brave);
 		}
+
 		if (!string.IsNullOrEmpty(GetOperaPath()) && File.Exists(GetOperaPath()))
 		{
 			availableBrowsers.Add(BrowserType.Opera);
 		}
+
 		if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && File.Exists(InternetExplorerDefaultPath))
 		{
 			availableBrowsers.Add(BrowserType.InternetExplorer);
 		}
+
 		if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && File.Exists("/Applications/Safari.app"))
 		{
 			availableBrowsers.Add(BrowserType.Safari);
 		}
+
 		if (!string.IsNullOrEmpty(GetFirefoxPath()) && File.Exists(GetFirefoxPath()))
 		{
 			availableBrowsers.Add(BrowserType.Firefox);
@@ -323,8 +341,8 @@ private static bool IsLikelyTorPath(string? customBrowserPath)
 		}
 
 		if (customBrowserPath.Contains("firefox") &&
-			customBrowserPath.Contains("tor", StringComparison.InvariantCultureIgnoreCase) &&
-			customBrowserPath.Contains("browser", StringComparison.InvariantCultureIgnoreCase))
+		    customBrowserPath.Contains("tor", StringComparison.InvariantCultureIgnoreCase) &&
+		    customBrowserPath.Contains("browser", StringComparison.InvariantCultureIgnoreCase))
 		{
 			return true;
 		}
diff --git a/WalletWasabi.Packager/Program.cs b/WalletWasabi.Packager/Program.cs
index d8f70ab080..fd61f718be 100644
--- a/WalletWasabi.Packager/Program.cs
+++ b/WalletWasabi.Packager/Program.cs
@@ -8,7 +8,6 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using WalletWasabi.Helpers;
-using WalletWasabi.Userfacing;
 
 namespace WalletWasabi.Packager;
 
@@ -33,7 +32,6 @@ public static class Program
 	private static readonly string WasabiPrivateKeyFilePath = Path.Combine(GingerFolderPath, "Ginger.privkey");
 	private static readonly string WasabiPublicKeyFilePath = Path.Combine(GingerFolderPath, "Ginger.pubkey");
 
-
 	/// <remarks>Only 64-bit platforms are supported for now.</remarks>
 	/// <seealso href="https://docs.microsoft.com/en-us/dotnet/articles/core/rid-catalog"/>
 	private static string[] Targets = new[]
@@ -61,7 +59,6 @@ public static class Program
 	/// </summary>
 	private static async Task Main(string[] args)
 	{
-
 		var argsProcessor = new ArgsProcessor(args);
 
 		// For now this is enough. If you run it on macOS you want to sign.
@@ -647,7 +644,6 @@ private static void ExecuteBashCommands(string[] commands)
 		return output;
 	}
 
-
 	private static bool TryStartProcessAndWaitForExit(string command, string workingDirectory, [NotNullWhen(true)] out string? result, string? writeToStandardInput = null, string? arguments = null, bool redirectStandardOutput = false)
 	{
 		result = null;
diff --git a/WalletWasabi.Tests/RegressionTests/BackendTests.cs b/WalletWasabi.Tests/RegressionTests/BackendTests.cs
index f162d7c7c8..a7df78877a 100644
--- a/WalletWasabi.Tests/RegressionTests/BackendTests.cs
+++ b/WalletWasabi.Tests/RegressionTests/BackendTests.cs
@@ -64,7 +64,7 @@ public async Task GetExchangeRatesAsync()
 		Assert.Equal(HttpStatusCode.OK, response.StatusCode);
 
 		var exchangeRates = await response.Content.ReadAsJsonAsync<List<ExchangeRate>>();
-		Assert.Single(exchangeRates);
+		Assert.True(exchangeRates.Count > 0);
 
 		var rate = exchangeRates[0];
 		Assert.Equal("USD", rate.Ticker);
diff --git a/WalletWasabi.Tests/UnitTests/KeyManagementTests.cs b/WalletWasabi.Tests/UnitTests/KeyManagementTests.cs
index 207ad32c67..73a125beea 100644
--- a/WalletWasabi.Tests/UnitTests/KeyManagementTests.cs
+++ b/WalletWasabi.Tests/UnitTests/KeyManagementTests.cs
@@ -8,7 +8,6 @@
 using WalletWasabi.Logging;
 using WalletWasabi.Models;
 using WalletWasabi.Tests.TestCommon;
-using WalletWasabi.Wallets;
 using Xunit;
 
 namespace WalletWasabi.Tests.UnitTests;
diff --git a/WalletWasabi.Tests/UnitTests/StandaloneTests/ConfigTests.cs b/WalletWasabi.Tests/UnitTests/StandaloneTests/ConfigTests.cs
index d8d9620a8d..5a9302bdc9 100644
--- a/WalletWasabi.Tests/UnitTests/StandaloneTests/ConfigTests.cs
+++ b/WalletWasabi.Tests/UnitTests/StandaloneTests/ConfigTests.cs
@@ -81,6 +81,7 @@ public static string GetWasabiConfigString(decimal coordinationFeeRate = 0.003m)
 			  "ConfirmationTarget": 108,
 			  "DoSSeverity": "0.10",
 			  "DoSMinTimeForFailedToVerify": "31d 0h 0m 0s",
+			  "DoSSimplifiedPunishment": "1d 0h 0m 0s",
 			  "DoSMinTimeForCheating": "1d 0h 0m 0s",
 			  "DoSPenaltyFactorForDisruptingConfirmation": 0.2,
 			  "DoSPenaltyFactorForDisruptingSignalReadyToSign": 1.0,
diff --git a/WalletWasabi.Tests/UnitTests/StartWasabiOnSystemStartupTests.cs b/WalletWasabi.Tests/UnitTests/StartWasabiOnSystemStartupTests.cs
index cef57276f8..2f6756370b 100644
--- a/WalletWasabi.Tests/UnitTests/StartWasabiOnSystemStartupTests.cs
+++ b/WalletWasabi.Tests/UnitTests/StartWasabiOnSystemStartupTests.cs
@@ -2,7 +2,6 @@
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using WalletWasabi.Daemon;
-using WalletWasabi.Fluent;
 using WalletWasabi.Fluent.Helpers;
 using WalletWasabi.Helpers;
 using WalletWasabi.Tests.Helpers;
diff --git a/WalletWasabi.Tests/UnitTests/TestWallet.cs b/WalletWasabi.Tests/UnitTests/TestWallet.cs
index 70d4460715..4a95a1b589 100644
--- a/WalletWasabi.Tests/UnitTests/TestWallet.cs
+++ b/WalletWasabi.Tests/UnitTests/TestWallet.cs
@@ -170,4 +170,9 @@ private ExtKey CreateNewKey(bool isInternal)
 		var path = isInternal ? "84'/0'/0'/1" : "84'/0'/0'/0";
 		return ExtKey.Derive(KeyPath.Parse($"{path}/{NextKeyIndex++}"));
 	}
+
+	public string SignMessage(string message, HdPubKey hdPubKey)
+	{
+		throw new NotImplementedException();
+	}
 }
diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/CoinVerifierTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/CoinVerifierTests.cs
index e717f4b0ce..cb7e929a7d 100644
--- a/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/CoinVerifierTests.cs
+++ b/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/CoinVerifierTests.cs
@@ -43,7 +43,7 @@ public override bool IsValid(HttpResponseMessage response)
 		public override ApiResponse ParseResponse(HttpStatusCode statusCode, string responseString, Coin coin, int coinBlockHeight, int currentBlockHeight)
 		{
 			bool ban = responseString == BanResponse;
-			return new ApiResponse(ApiResponseInfo.OK, "mock", ban, ban, "");
+			return new ApiResponse(ApiResponseInfo.OK, "mock", ban, ban, "", TimeSpan.Zero);
 		}
 	}
 
diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/OffenderSerializationTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/OffenderSerializationTests.cs
index 7c975b0ed1..e1d0a35b27 100644
--- a/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/OffenderSerializationTests.cs
+++ b/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/OffenderSerializationTests.cs
@@ -2,6 +2,7 @@
 using NBitcoin;
 using WalletWasabi.Tests.Helpers;
 using WalletWasabi.WabiSabi.Backend.DoSPrevention;
+using WalletWasabi.WabiSabi.Models;
 using Xunit;
 
 namespace WalletWasabi.Tests.UnitTests.WabiSabi.Backend;
@@ -41,13 +42,13 @@ public void SerializationTest()
 		Assert.Equal(offender3xstr, Offender.FromStringLine(offender3xstr).ToStringLine());
 
 		// Fail to verify
-		var offender4 = new Offender(outpoint, now, new FailedToVerify(roundId));
+		var offender4 = new Offender(outpoint, now, new FailedToVerify(roundId, TimeSpan.Zero, "local"));
 		var offender4str = offender4.ToStringLine();
 		Assert.Equal(offender4str, Offender.FromStringLine(offender4str).ToStringLine());
 
 		// Fail to verify
 		var ancestors = Enumerable.Range(0, 3).Select(_ => BitcoinFactory.CreateOutPoint()).ToArray();
-		var offender5 = new Offender(outpoint, now, new Inherited(ancestors));
+		var offender5 = new Offender(outpoint, now, new Inherited(ancestors, [InputBannedReasonEnum.RoundDisruptionMethodDoubleSpent, InputBannedReasonEnum.Inherited]));
 		var offender5str = offender5.ToStringLine();
 		Assert.Equal(offender5str, Offender.FromStringLine(offender5str).ToStringLine());
 
diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/PostRequests/RegisterInputFailureTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/PostRequests/RegisterInputFailureTests.cs
index 6f11b865cc..8b98e95084 100644
--- a/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/PostRequests/RegisterInputFailureTests.cs
+++ b/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/PostRequests/RegisterInputFailureTests.cs
@@ -154,7 +154,7 @@ public async Task InputLongBannedAsync()
 		var round = WabiSabiTestFactory.CreateRound(cfg);
 
 		Prison prison = WabiSabiTestFactory.CreatePrison();
-		prison.FailedVerification(coin.Outpoint, round.Id);
+		prison.FailedVerification(coin.Outpoint, round.Id, TimeSpan.Zero, "");
 		using Arena arena = await ArenaTestFactory.From(cfg, rpc, prison).CreateAndStartAsync(round);
 
 		var ownershipProof = WabiSabiTestFactory.CreateOwnershipProof(key, round.Id);
diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/PostRequests/RegisterOutputTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/PostRequests/RegisterOutputTests.cs
index 803d5eab56..43d1e32f25 100644
--- a/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/PostRequests/RegisterOutputTests.cs
+++ b/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/PostRequests/RegisterOutputTests.cs
@@ -7,7 +7,6 @@
 using WalletWasabi.WabiSabi.Backend;
 using WalletWasabi.WabiSabi.Backend.Models;
 using WalletWasabi.WabiSabi.Backend.Rounds;
-using WalletWasabi.WabiSabi.Models.MultipartyTransaction;
 using Xunit;
 
 namespace WalletWasabi.Tests.UnitTests.WabiSabi.Backend.PostRequests;
diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/PrisonTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/PrisonTests.cs
index 030ce39f8c..6a7679bdb5 100644
--- a/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/PrisonTests.cs
+++ b/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/PrisonTests.cs
@@ -5,6 +5,7 @@
 using WalletWasabi.Tests.Helpers;
 using WalletWasabi.WabiSabi.Backend.DoSPrevention;
 using Xunit;
+using WalletWasabi.WabiSabi.Models;
 
 namespace WalletWasabi.Tests.UnitTests.WabiSabi.Backend;
 
@@ -24,7 +25,7 @@ public async Task OffensesAreSavedAsync()
 		var roundId = BitcoinFactory.CreateUint256();
 
 		// Fail to verify
-		prison.FailedVerification(outpoint, roundId);
+		prison.FailedVerification(outpoint, roundId, TimeSpan.Zero, "");
 		var offenderToSave = await reader.ReadAsync(ctsTimeout.Token);
 		var failedToVerify = Assert.IsType<FailedToVerify>(offenderToSave.Offense);
 		Assert.Equal(outpoint, offenderToSave.OutPoint);
@@ -80,7 +81,7 @@ public async Task OffensesAreSavedAsync()
 			BitcoinFactory.CreateOutPoint()
 		};
 
-		prison.InheritPunishment(outpoint, ancestors);
+		prison.InheritPunishment(outpoint, ancestors, []);
 		offenderToSave = await reader.ReadAsync(ctsTimeout.Token);
 		var inherited = Assert.IsType<Inherited>(offenderToSave.Offense);
 		Assert.Equal(outpoint, offenderToSave.OutPoint);
@@ -94,16 +95,16 @@ public async Task OffensesAreSavedAsync()
 	public void BanningTime()
 	{
 		var (prison, _) = WabiSabiTestFactory.CreateObservablePrison();
-		var cfg = WabiSabiTestFactory.CreateWabiSabiConfig().GetDoSConfiguration();
+		var cfg = WabiSabiTestFactory.CreateWabiSabiConfig().GetDoSConfiguration() with { SimplifiedPunishment = TimeSpan.Zero };
 
 		var roundId = BitcoinFactory.CreateUint256();
 
 		// Failed to verify punishment is constant (not affected by number of attempts)
 		var ftvOutpoint = BitcoinFactory.CreateOutPoint();
-		prison.FailedVerification(ftvOutpoint, roundId);
-		prison.FailedVerification(ftvOutpoint, roundId);
-		prison.FailedVerification(ftvOutpoint, roundId);
-		var banningPeriod = prison.GetBanTimePeriod(ftvOutpoint, cfg);
+		prison.FailedVerification(ftvOutpoint, roundId, TimeSpan.Zero, "");
+		prison.FailedVerification(ftvOutpoint, roundId, TimeSpan.Zero, "");
+		prison.FailedVerification(ftvOutpoint, roundId, TimeSpan.Zero, "");
+		var banningPeriod = prison.GetBan(ftvOutpoint, cfg).BanningTime;
 		Assert.Equal(cfg.MinTimeForFailedToVerify, banningPeriod.Duration);
 
 		// Cheating punishment is constant (not affected by number of attempts)
@@ -111,7 +112,7 @@ public void BanningTime()
 		prison.CheatingDetected(chtOutpoint, roundId);
 		prison.CheatingDetected(chtOutpoint, roundId);
 		prison.CheatingDetected(chtOutpoint, roundId);
-		banningPeriod = prison.GetBanTimePeriod(chtOutpoint, cfg);
+		banningPeriod = prison.GetBan(chtOutpoint, cfg).BanningTime;
 		Assert.Equal(cfg.MinTimeForCheating, banningPeriod.Duration);
 
 		// Failed to confirm is calculated and inversely proportional to the amount
@@ -120,13 +121,13 @@ public void BanningTime()
 		prison.FailedToConfirm(ftcOutpoint1, Money.Coins(0.5m), roundId);
 		prison.FailedToConfirm(ftcOutpoint2, Money.Coins(1.0m), roundId);
 
-		var banningPeriod1 = prison.GetBanTimePeriod(ftcOutpoint1, cfg);
-		var banningPeriod2 = prison.GetBanTimePeriod(ftcOutpoint2, cfg);
+		var banningPeriod1 = prison.GetBan(ftcOutpoint1, cfg).BanningTime;
+		var banningPeriod2 = prison.GetBan(ftcOutpoint2, cfg).BanningTime;
 		Assert.True(banningPeriod1.Duration == 2 * banningPeriod2.Duration);
 
 		// .... second attempt is punished harder
 		prison.FailedToConfirm(ftcOutpoint1, Money.Coins(0.5m), roundId);
-		var banningPeriod1FailedToConfirmTwice = prison.GetBanTimePeriod(ftcOutpoint1, cfg);
+		var banningPeriod1FailedToConfirmTwice = prison.GetBan(ftcOutpoint1, cfg).BanningTime;
 		Assert.True(banningPeriod1FailedToConfirmTwice.Duration > banningPeriod1.Duration);
 
 		// .... the worst offense is applied
@@ -135,28 +136,28 @@ public void BanningTime()
 		prison.FailedToConfirm(ftcOutpoint3, Money.Coins(0.5m), roundId);
 		prison.FailedToSign(ftcOutpoint3, Money.Coins(0.5m), roundId);
 
-		var banningPeriod3FailedToConfirmAndSign = prison.GetBanTimePeriod(ftcOutpoint3, cfg);
+		var banningPeriod3FailedToConfirmAndSign = prison.GetBan(ftcOutpoint3, cfg).BanningTime;
 		Assert.True(banningPeriod3FailedToConfirmAndSign.Duration > banningPeriod1FailedToConfirmTwice.Duration);
 
 		// Big amounts are not banned the first time
 		var ftcOutpointBig = BitcoinFactory.CreateOutPoint();
 		prison.FailedToConfirm(ftcOutpointBig, Money.Coins(2m), roundId);
-		var banningPeriodBigCoin = prison.GetBanTimePeriod(ftcOutpointBig, cfg);
+		var banningPeriodBigCoin = prison.GetBan(ftcOutpointBig, cfg).BanningTime;
 		Assert.Equal(TimeSpan.Zero, banningPeriodBigCoin.Duration);
 
 		// ... however, second attempts could be punished
 		prison.FailedToConfirm(ftcOutpointBig, Money.Coins(2m), roundId);
-		banningPeriodBigCoin = prison.GetBanTimePeriod(ftcOutpointBig, cfg);
+		banningPeriodBigCoin = prison.GetBan(ftcOutpointBig, cfg).BanningTime;
 		Assert.NotEqual(TimeSpan.Zero, banningPeriodBigCoin.Duration);
 
 		// ... except if they come from previous coinjoins
 		var ftcOutpointBigPaid = new OutPoint(uint256.One, 1); // tx 0000....0000001 is a coinjoin
 		prison.FailedToConfirm(ftcOutpointBigPaid, Money.Coins(2m), roundId);
-		var banningPeriodBigPaidCoin = prison.GetBanTimePeriod(ftcOutpointBigPaid, cfg);
+		var banningPeriodBigPaidCoin = prison.GetBan(ftcOutpointBigPaid, cfg).BanningTime;
 		Assert.Equal(TimeSpan.Zero, banningPeriodBigPaidCoin.Duration); // it is not banned first time
 
 		prison.FailedToConfirm(ftcOutpointBigPaid, Money.Coins(2m), roundId);
-		banningPeriodBigPaidCoin = prison.GetBanTimePeriod(ftcOutpointBigPaid, cfg);
+		banningPeriodBigPaidCoin = prison.GetBan(ftcOutpointBigPaid, cfg).BanningTime;
 		Assert.NotEqual(TimeSpan.Zero, banningPeriodBigPaidCoin.Duration); // it IS banned second time
 
 		// coins inherit the punishments from their ancestors
@@ -165,21 +166,28 @@ public void BanningTime()
 		var ftcInheritFromFailedToSign = BitcoinFactory.CreateOutPoint();
 		prison.FailedToSign(ftcFailedToSign, Money.Coins(0.005m), roundId);
 		prison.FailedToConfirm(ftcFailedToConfirm, Money.Coins(0.005m), roundId);
-		prison.InheritPunishment(ftcInheritFromFailedToSign, new[] { ftcFailedToSign, ftcFailedToConfirm });
-		var failToSignBanningTime = prison.GetBanTimePeriod(ftcFailedToSign, cfg);
-		var inheritedBanningTime = prison.GetBanTimePeriod(ftcInheritFromFailedToSign, cfg);
+		prison.InheritPunishment(ftcInheritFromFailedToSign, [ftcFailedToSign, ftcFailedToConfirm], [InputBannedReasonEnum.RoundDisruptionMethodDidNotSign, InputBannedReasonEnum.RoundDisruptionMethodDidNotConfirm]);
+		var failToSignBanningTime = prison.GetBan(ftcFailedToSign, cfg).BanningTime;
+		var inheritedBanItem = prison.GetBan(ftcInheritFromFailedToSign, cfg);
+		var inheritedBanningTime = inheritedBanItem.BanningTime;
+		var inheritedReasons = inheritedBanItem.Reasons;
 
 		Assert.Equal(failToSignBanningTime.StartTime, inheritedBanningTime.StartTime); // because fail to sign is punished harder
 		Assert.Equal(failToSignBanningTime.Duration * 0.5, inheritedBanningTime.Duration); // after spending the punishment is reduced by half
 
+		InputBannedReasonEnum[] expected = [InputBannedReasonEnum.Inherited, InputBannedReasonEnum.RoundDisruptionMethodDidNotSign, InputBannedReasonEnum.RoundDisruptionMethodDidNotConfirm];
+
+		// Assert exact match ignoring order
+		Assert.Equal(expected.OrderBy(e => e), inheritedReasons.OrderBy(e => e));
+
 		// After spending a couple of times the coin is no longer banned
 		var outpointsToBan = Enumerable.Range(0, 10).Select(_ => BitcoinFactory.CreateOutPoint()).ToArray();
 		prison.FailedToSign(outpointsToBan[0], Money.Coins(0.005m), roundId);
 		var banningTimeFrames = outpointsToBan.Zip(outpointsToBan[1..], (a, b) => new { Destroyed = a, Created = b })
 			.Select(x =>
 			{
-				prison.InheritPunishment(x.Created, new[] { x.Destroyed });
-				return prison.GetBanTimePeriod(x.Created, cfg);
+				prison.InheritPunishment(x.Created, new[] { x.Destroyed }, []);
+				return prison.GetBan(x.Created, cfg).BanningTime;
 			}).ToArray();
 
 		// Every time it is banned, the duration is halfed
diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/UtxoPrisonWardenTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/UtxoPrisonWardenTests.cs
index 07644fbe78..0cb02ec07e 100644
--- a/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/UtxoPrisonWardenTests.cs
+++ b/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/UtxoPrisonWardenTests.cs
@@ -1,5 +1,6 @@
 using Moq;
 using NBitcoin;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using WalletWasabi.Tests.Helpers;
@@ -7,6 +8,7 @@
 using WalletWasabi.WabiSabi;
 using WalletWasabi.WabiSabi.Backend.DoSPrevention;
 using WalletWasabi.WabiSabi.Backend.Rounds.CoinJoinStorage;
+using WalletWasabi.WabiSabi.Models;
 using Xunit;
 
 namespace WalletWasabi.Tests.UnitTests.WabiSabi.Backend;
@@ -44,11 +46,13 @@ public async Task PrisonSerializationAsync()
 		var i3 = BitcoinFactory.CreateOutPoint();
 		var i4 = BitcoinFactory.CreateOutPoint();
 		var i5 = BitcoinFactory.CreateOutPoint();
-		w.Prison.FailedVerification(i1, uint256.One);
+		var i6 = BitcoinFactory.CreateOutPoint();
+		w.Prison.FailedVerification(i1, uint256.One, TimeSpan.Zero, "local"); // For local we will add a special reason.
 		w.Prison.FailedToConfirm(i2, Money.Coins(0.01m), uint256.One);
 		w.Prison.FailedToSign(i3, Money.Coins(0.1m), uint256.One);
 		w.Prison.DoubleSpent(i4, Money.Coins(0.1m), uint256.One);
 		w.Prison.CheatingDetected(i5, uint256.One);
+		w.Prison.InheritPunishment(i6, [i3], [InputBannedReasonEnum.RoundDisruptionMethodDidNotSignalReadyToSign]);
 
 		// Wait until serializes.
 		await w.StopAsync(CancellationToken.None);
@@ -66,6 +70,11 @@ public async Task PrisonSerializationAsync()
 		Assert.True(w2.Prison.IsBanned(i3, dosConfig, DateTimeOffset.UtcNow));
 		Assert.True(w2.Prison.IsBanned(i4, dosConfig, DateTimeOffset.UtcNow));
 		Assert.True(w2.Prison.IsBanned(i5, dosConfig, DateTimeOffset.UtcNow));
+		Assert.True(w2.Prison.IsBanned(i6, dosConfig, DateTimeOffset.UtcNow));
+
+		Assert.Equal(InputBannedReasonEnum.LocalCoinVerifier, w2.Prison.GetBan(i1, dosConfig).Reasons.First());
+
+		Assert.Equal([InputBannedReasonEnum.Inherited, InputBannedReasonEnum.RoundDisruptionMethodDidNotSignalReadyToSign], w2.Prison.GetBan(i6, dosConfig).Reasons.OrderBy(x => x));
 
 		await w2.StopAsync(CancellationToken.None);
 	}
diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/WhitelistTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/WhitelistTests.cs
index d1d341eb43..b878e46435 100644
--- a/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/WhitelistTests.cs
+++ b/WalletWasabi.Tests/UnitTests/WabiSabi/Backend/WhitelistTests.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using WalletWasabi.Tests.Helpers;
-using WalletWasabi.WabiSabi.Backend;
 using WalletWasabi.WabiSabi.Backend.Banning;
 using Xunit;
 
diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Client/KeyChainTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Client/KeyChainTests.cs
index 86656b7efa..ce9da98c0d 100644
--- a/WalletWasabi.Tests/UnitTests/WabiSabi/Client/KeyChainTests.cs
+++ b/WalletWasabi.Tests/UnitTests/WabiSabi/Client/KeyChainTests.cs
@@ -1,4 +1,5 @@
 using NBitcoin;
+using NBitcoin.BIP322;
 using System.Linq;
 using WalletWasabi.Blockchain.Keys;
 using WalletWasabi.Tests.Helpers;
@@ -28,4 +29,153 @@ public void SignTransactionTest()
 		var signedTx = keyChain.Sign(transaction, coin, transaction.PrecomputeTransactionData(new[] { coin }));
 		Assert.True(signedTx.HasWitness);
 	}
+
+	// --- Legacy (+8 header quirk) exact-match fixtures for index 0 and 1 ---
+	[Theory]
+	[InlineData(0, "helloworld", "H5bVLsJtPUeZiS+7N1GlMw6hTsLbUcLocs7qkeCzlxnmdYPBxk7NrgtYyd+NaNDvBW1ehOU69qSdohfZnFzI3X0=")]
+	[InlineData(1, "helloworld", "IGC8vofPdhcLLSlVR2CCf35R6VJzYQknFjF6FR5zuKfnLXVcxopHBGD+4BL9JimiRUTlLzBGpF47oB7IP5hQnjI=")]
+	public void SignMessage_LegacyPlus8_MultipleCases(int index, string message, string expectedBase64)
+	{
+		// Arrange wallet & helpers
+		var keyManager = KeyManager.Recover(
+			new Mnemonic("faculty plunge pilot slice amount salute artist raw amateur excite dial canyon"),
+			"",
+			Network.Main,
+			KeyManager.GetAccountKeyPath(Network.Main, ScriptPubKeyType.Segwit));
+
+		var destinationProvider = new InternalDestinationProvider(keyManager);
+		var keyChain = new KeyChain(keyManager, new Kitchen(""));
+		var net = keyManager.GetNetwork();
+
+		// Get HdPubKey at the requested external index
+		var dests = destinationProvider.GetNextDestinations(index + 1, false).ToArray();
+		var dest = dests.Last();
+		Assert.True(keyManager.TryGetKeyForScriptPubKey(dest.ScriptPubKey, out HdPubKey? hdPubKey));
+		Assert.NotNull(hdPubKey);
+
+		// Act: your KeyChain.SignMessage uses Legacy + header +8, lowR:false
+		var sig = keyChain.SignMessage(message, hdPubKey!);
+
+		// Exact-match with the fixture you supplied
+		Assert.Equal(expectedBase64, sig);
+
+		// Sanity: recover pubkey from legacy compact sig & compare
+		var hashLegacy = BIP322Signature.CreateMessageHash(message, legacy: true);
+		var raw = Convert.FromBase64String(sig);
+		Assert.Equal(65, raw.Length);
+		int recId = (raw[0] - 27) & 3;
+		var compact = new CompactSignature(recId, raw.AsSpan(1, 64).ToArray());
+		var recovered = PubKey.RecoverCompact(hashLegacy, compact);
+		Assert.Equal(hdPubKey!.PubKey, recovered);
+
+		// Legacy website-style verification (requires P2PKH)
+		var p2pkh = hdPubKey.PubKey.GetAddress(ScriptPubKeyType.Legacy, keyManager.GetNetwork());
+		Assert.True(VerifyLegacyCompact(p2pkh, message, expectedBase64));
+	}
+
+	private static bool VerifyLegacyCompact(BitcoinAddress p2pkh, string message, string base64)
+	{
+		// Must be a P2PKH address for legacy compact signatures
+		if (!p2pkh.ScriptPubKey.IsScriptType(ScriptType.P2PKH))
+		{
+			return false;
+		}
+
+		byte[] bytes;
+		try { bytes = Convert.FromBase64String(base64); }
+		catch { return false; }
+
+		if (bytes.Length != 65)
+		{
+			return false;
+		}
+
+		// Legacy message hash = doubleSHA256(varstr("Bitcoin Signed Message:\n") || varstr(message))
+		var hash = BIP322Signature.CreateMessageHash(message, legacy: true);
+
+		// Parse header & compact r||s (header may include the +8 quirk; we only use the low 2 bits)
+		int header = bytes[0];
+		int recId = (header - 27) & 3;
+		var compact = new CompactSignature(recId, bytes.AsSpan(1, 64).ToArray());
+
+		// Recover pubkey and compare to the P2PKH address
+		var recovered = PubKey.RecoverCompact(hash, compact);
+		var recoveredAddr = recovered.GetAddress(ScriptPubKeyType.Legacy, p2pkh.Network);
+		return recoveredAddr == p2pkh;
+	}
+
+	[Theory]
+	[InlineData(0, "helloworld")]
+	[InlineData(1, "verify taproot bip322")]
+	public void SignMessage_BIP322_Taproot_Simple_Verifies(int index, string message)
+	{
+		var keyManager = KeyManager.Recover(
+			new Mnemonic("faculty plunge pilot slice amount salute artist raw amateur excite dial canyon"),
+			"",
+			Network.Main,
+			KeyManager.GetAccountKeyPath(Network.Main, ScriptPubKeyType.TaprootBIP86));
+
+		var net = keyManager.GetNetwork();
+		var destinationProvider = new InternalDestinationProvider(keyManager);
+
+		// Ask for (index+1) external destinations with Taproot preferred, then take the last (our target index).
+		var dests = destinationProvider.GetNextDestinations(index + 1, preferTaproot: true).ToArray();
+		Assert.NotEmpty(dests);
+		var dest = dests.Last();
+
+		// Resolve HdPubKey for the selected destination.
+		Assert.True(keyManager.TryGetKeyForScriptPubKey(dest.ScriptPubKey, out HdPubKey? hdPubKey));
+		Assert.NotNull(hdPubKey);
+
+		// Assert we actually got a Taproot key (by derivation path type).
+		var scriptType = hdPubKey!.FullKeyPath.GetScriptTypeFromKeyPath();
+		Assert.Equal(ScriptPubKeyType.TaprootBIP86, scriptType);
+
+		// Optional: double-check via the address script type as well.
+		var addr = hdPubKey.GetAddress(net);
+		Assert.True(addr.ScriptPubKey.IsScriptType(ScriptType.Taproot), "Expected Taproot (P2TR) address.");
+
+		// Taproot uses BIP-322 Simple proof.
+		var sig322 = KeyManagerExtension.SignMessage(keyManager, "", message, hdPubKey, legacy: false);
+
+		var parsed = BIP322Signature.Parse(sig322, net);
+		Assert.True(addr.VerifyBIP322(message, parsed));
+
+		// Negative check: flip a byte → verification must fail.
+		var tampered = Convert.FromBase64String(sig322);
+		tampered[8] ^= 0x01;
+		Assert.False(addr.VerifyBIP322(message, BIP322Signature.Parse(Convert.ToBase64String(tampered), net)));
+	}
+
+	// --- Optional: BIP-322 verification for both indices (no fixed base64 needed) ---
+	[Theory]
+	[InlineData(0, "helloworld")]
+	[InlineData(1, "helloworld")]
+	public void SignMessage_BIP322_Verifies(int index, string message)
+	{
+		var keyManager = KeyManager.Recover(
+			new Mnemonic("faculty plunge pilot slice amount salute artist raw amateur excite dial canyon"),
+			"",
+			Network.Main,
+			KeyManager.GetAccountKeyPath(Network.Main, ScriptPubKeyType.Segwit));
+
+		var destinationProvider = new InternalDestinationProvider(keyManager);
+		var net = keyManager.GetNetwork();
+
+		var dests = destinationProvider.GetNextDestinations(index + 1, false).ToArray();
+		var dest = dests.Last();
+		Assert.True(keyManager.TryGetKeyForScriptPubKey(dest.ScriptPubKey, out HdPubKey? hdPubKey));
+		Assert.NotNull(hdPubKey);
+
+		// Use your helper directly to generate BIP-322 (legacy:false)
+		var sig322 = KeyManagerExtension.SignMessage(keyManager, "", message, hdPubKey!, legacy: false);
+		var addr = hdPubKey!.GetAddress(net);
+		var parsed = BIP322Signature.Parse(sig322, net);
+		Assert.True(addr.VerifyBIP322(message, parsed));
+
+		// Negative: tamper a byte -> must fail
+		var tampered = Convert.FromBase64String(sig322);
+		tampered[8] ^= 0x01;
+		Assert.False(addr.VerifyBIP322(message, BIP322Signature.Parse(Convert.ToBase64String(tampered), net)));
+	}
 }
diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Client/PaymentAwareOutputProviderTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Client/PaymentAwareOutputProviderTests.cs
index 293469b7da..9d0c7e1cb6 100644
--- a/WalletWasabi.Tests/UnitTests/WabiSabi/Client/PaymentAwareOutputProviderTests.cs
+++ b/WalletWasabi.Tests/UnitTests/WabiSabi/Client/PaymentAwareOutputProviderTests.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using WalletWasabi.Extensions;
 using WalletWasabi.Tests.Helpers;
-using WalletWasabi.WabiSabi.Backend;
 using WalletWasabi.WabiSabi.Client;
 using WalletWasabi.WabiSabi.Client.Batching;
 using WalletWasabi.WabiSabi.Recommendation;
diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Integration/StuttererHttpClient.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Integration/StuttererHttpClient.cs
index fabb4a1882..383470788e 100644
--- a/WalletWasabi.Tests/UnitTests/WabiSabi/Integration/StuttererHttpClient.cs
+++ b/WalletWasabi.Tests/UnitTests/WabiSabi/Integration/StuttererHttpClient.cs
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Hosting;
-using NBitcoin;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Integration/WabiSabiHttpApiIntegrationTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Integration/WabiSabiHttpApiIntegrationTests.cs
index 641dae1f64..eec1d42c87 100644
--- a/WalletWasabi.Tests/UnitTests/WabiSabi/Integration/WabiSabiHttpApiIntegrationTests.cs
+++ b/WalletWasabi.Tests/UnitTests/WabiSabi/Integration/WabiSabiHttpApiIntegrationTests.cs
@@ -89,7 +89,7 @@ public async Task RegisterBannedCoinAsync()
 				services.AddScoped<IRPCClient>(s => rpc);
 
 				var prison = WabiSabiTestFactory.CreatePrison();
-				prison.FailedVerification(bannedOutPoint, uint256.One);
+				prison.FailedVerification(bannedOutPoint, uint256.One, TimeSpan.Zero, "");
 				services.AddScoped(_ => prison);
 			})).CreateClient();
 
diff --git a/WalletWasabi.Tests/UnitTests/WabiSabi/Models/ConstructionStateTests.cs b/WalletWasabi.Tests/UnitTests/WabiSabi/Models/ConstructionStateTests.cs
index 5e67b3fa7f..f9fa3e0e63 100644
--- a/WalletWasabi.Tests/UnitTests/WabiSabi/Models/ConstructionStateTests.cs
+++ b/WalletWasabi.Tests/UnitTests/WabiSabi/Models/ConstructionStateTests.cs
@@ -2,7 +2,6 @@
 using WalletWasabi.Extensions;
 using WalletWasabi.Helpers;
 using WalletWasabi.Tests.Helpers;
-using WalletWasabi.WabiSabi.Backend;
 using WalletWasabi.WabiSabi.Backend.Rounds;
 using WalletWasabi.WabiSabi.Models.MultipartyTransaction;
 using Xunit;
diff --git a/WalletWasabi.Tests/UnitTests/Wallet/WalletSynchronizationTests.cs b/WalletWasabi.Tests/UnitTests/Wallet/WalletSynchronizationTests.cs
index f759aba78a..10d69363a9 100644
--- a/WalletWasabi.Tests/UnitTests/Wallet/WalletSynchronizationTests.cs
+++ b/WalletWasabi.Tests/UnitTests/Wallet/WalletSynchronizationTests.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using WalletWasabi.Wallets;
 using Xunit;
 
 namespace WalletWasabi.Tests.UnitTests.Wallet;
diff --git a/WalletWasabi/Announcer/AnnouncementManager.cs b/WalletWasabi/Announcer/AnnouncementManager.cs
index ddf923f3c4..94cb90cb1d 100644
--- a/WalletWasabi/Announcer/AnnouncementManager.cs
+++ b/WalletWasabi/Announcer/AnnouncementManager.cs
@@ -4,12 +4,10 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using WalletWasabi.Bases;
 using WalletWasabi.Extensions;
-using WalletWasabi.Interfaces;
 using WalletWasabi.Logging;
 using WalletWasabi.Models;
 using WalletWasabi.WebClients.Wasabi;
diff --git a/WalletWasabi/Backend/Models/Responses/TwoFactorSetupResponse.cs b/WalletWasabi/Backend/Models/Responses/TwoFactorSetupResponse.cs
index a4b3ebe0a7..5a908a658b 100644
--- a/WalletWasabi/Backend/Models/Responses/TwoFactorSetupResponse.cs
+++ b/WalletWasabi/Backend/Models/Responses/TwoFactorSetupResponse.cs
@@ -1,5 +1,3 @@
-using Newtonsoft.Json;
-
 namespace WalletWasabi.Backend.Models.Responses;
 
 public class TwoFactorSetupResponse
diff --git a/WalletWasabi/Blockchain/Keys/HdPubKey.cs b/WalletWasabi/Blockchain/Keys/HdPubKey.cs
index 56f4208f23..dc4fcd5fc2 100644
--- a/WalletWasabi/Blockchain/Keys/HdPubKey.cs
+++ b/WalletWasabi/Blockchain/Keys/HdPubKey.cs
@@ -2,7 +2,6 @@
 using Newtonsoft.Json;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.Json;
 using System.Text.Json.Serialization;
 using WalletWasabi.Bases;
 using WalletWasabi.Blockchain.Analysis.Clustering;
diff --git a/WalletWasabi/Blockchain/TransactionOutputs/SmartCoin.cs b/WalletWasabi/Blockchain/TransactionOutputs/SmartCoin.cs
index a918691c54..2d99f273bd 100644
--- a/WalletWasabi/Blockchain/TransactionOutputs/SmartCoin.cs
+++ b/WalletWasabi/Blockchain/TransactionOutputs/SmartCoin.cs
@@ -6,6 +6,7 @@
 using WalletWasabi.Blockchain.Transactions;
 using WalletWasabi.Extensions;
 using WalletWasabi.Models;
+using WalletWasabi.WabiSabi.Models;
 
 namespace WalletWasabi.Blockchain.TransactionOutputs;
 
@@ -23,6 +24,7 @@ public class SmartCoin : NotifyPropertyChangedBase, IEquatable<SmartCoin>, IDest
 
 	private bool _confirmed;
 	private bool _isBanned;
+	private InputBannedReasonEnum[]? _reasons;
 	private bool _isExcludedFromCoinJoin;
 	private bool _isCoinJoinOutput;
 
@@ -101,6 +103,12 @@ public DateTimeOffset? BannedUntilUtc
 		}
 	}
 
+	public InputBannedReasonEnum[]? BanReasons
+	{
+		get => _reasons;
+		set => RaiseAndSetIfChanged(ref _reasons, value);
+	}
+
 	/// <summary>
 	/// If the backend thinks it's spent, but Wasabi does not yet know.
 	/// </summary>
@@ -153,6 +161,7 @@ public bool RefreshAndGetIsBanned()
 
 		IsBanned = false;
 		BannedUntilUtc = null;
+		BanReasons = null;
 
 		return false;
 	}
diff --git a/WalletWasabi/Extensions/KeyManagerExtension.cs b/WalletWasabi/Extensions/KeyManagerExtension.cs
new file mode 100644
index 0000000000..7588ed46eb
--- /dev/null
+++ b/WalletWasabi/Extensions/KeyManagerExtension.cs
@@ -0,0 +1,136 @@
+using NBitcoin;
+using NBitcoin.BIP322;
+using System.Linq;
+using System.Security;
+using WalletWasabi.Blockchain.Keys;
+using WalletWasabi.Extensions;
+using WalletWasabi.Helpers;
+
+public static class KeyManagerExtension
+{
+	/// <summary>
+	/// Controls the first byte ("header") of legacy compact signatures.
+	/// Standard=27..34 as per de-facto convention.
+	/// Plus8 allows reproducing historical/quirky signers that emitted header+8
+	/// (verifiers usually mask off the extra bit, so both parse identically).
+	/// </summary>
+	public enum LegacyHeaderStyle
+	{
+		Standard = 0,
+		Plus8 = 8
+	}
+
+	/// <summary>
+	/// Signs an arbitrary message with the HdPubKey's private key.
+	///
+	/// Two modes:
+	///  - legacy=true  → legacy "Bitcoin Signed Message" compact ECDSA (65 bytes, base64).
+	///                   Works best with P2PKH verifiers. Header byte is adjustable to reproduce
+	///                   historical outputs; r||s is produced by RFC6979 (deterministic k).
+	///  - legacy=false → BIP-322 (Simple/Full) proof depending on address type (SegWit/Taproot).
+	///                   Safer & standard for bc1... addresses; bytes are library-specific,
+	///                   so verify, don't compare for byte-equality.
+	///
+	/// Notes / gotchas (short and on-point):
+	///  - Legacy preimage is double-SHA256(varstr("Bitcoin Signed Message:\n") || varstr(message)).
+	///  - Compact legacy signature layout: [header (1)] [r (32)] [s (32)].
+	///    header = 27 + recId (0..3) + (IsCompressed ? 4 : 0) + headerStyle (0 or 8).
+	///    Many verifiers only use (header-27)&3 and (header-27)&4, so Standard and Plus8 both verify.
+	///  - We *recompute* recId by trying 0..3 and checking pubkey recovery. This guarantees the header
+	///    decodes back to the exact HdPubKey regardless of library internals.
+	///  - forceLowR=false may be needed to reproduce old fixtures; low-R only affects DER/compact encoding
+	///    choice of r (same signature validity).
+	///  - Legacy verification on websites typically expects a P2PKH address; BIP-322 should be used for
+	///    SegWit/Taproot (bc1...) and is what modern wallets accept.
+	/// </summary>
+	public static string SignMessage(
+		this KeyManager keyManager,
+		string password,
+		string message,
+		HdPubKey hdPubKey,
+		bool legacy = true,
+		LegacyHeaderStyle headerStyle = LegacyHeaderStyle.Standard,
+		bool forceLowR = true)
+	{
+		Guard.NotNullOrEmptyOrWhitespace(message, nameof(message));
+		Guard.NotNull(nameof(hdPubKey), hdPubKey);
+
+		// Can't sign without secrets (watch-only / HW-only without software signing)
+		if (keyManager.IsWatchOnly)
+		{
+			throw new SecurityException("Wallet is watch-only/hardware-only; cannot sign.");
+		}
+
+		// Must know the derivation to locate the child secret
+		if (hdPubKey.FullKeyPath is null)
+		{
+			throw new InvalidOperationException("HdPubKey does not have a FullKeyPath.");
+		}
+
+		var network = keyManager.GetNetwork();
+		var spk = hdPubKey.GetAssumedScriptPubKey();
+
+		// Retrieve the child extended key for this script; throws if not found
+		var ek = keyManager.GetSecrets(password, spk).SingleOrDefault()
+				 ?? throw new InvalidOperationException($"The signing key for '{spk}' was not found.");
+		var key = ek.GetBitcoinSecret(network, spk).PrivateKey;
+
+		if (legacy)
+		{
+			// LEGACY COMPACT (Bitcoin Signed Message)
+			// Preimage = varstr("Bitcoin Signed Message:\n") || varstr(message)
+			// Hash = double-SHA256(preimage)
+			var msgHash = BIP322Signature.CreateMessageHash(message, legacy: true);
+
+			// RFC6979 deterministic ECDSA; low-R toggle for fixture reproduction
+			var compact = key.SignCompact(msgHash, forceLowR: forceLowR);
+
+			// Determine recId (0..3) by recovery so our header definitely maps to this pubkey
+			int recId = -1;
+			for (int i = 0; i < 4; i++)
+			{
+				var candidate = new CompactSignature(i, compact.Signature);
+				if (PubKey.RecoverCompact(msgHash, candidate) == hdPubKey.PubKey)
+				{
+					recId = i;
+					break;
+				}
+			}
+			if (recId < 0)
+			{
+				throw new InvalidOperationException("Could not determine recovery id.");
+			}
+
+			// Header layout:
+			//   27 base + recId (0..3) + 4 if compressed + optional +8 for historical compatibility
+			bool compressed = hdPubKey.PubKey.IsCompressed; // HD keys are typically compressed
+			byte header = (byte)(27 + recId + (compressed ? 4 : 0) + (int)headerStyle);
+
+			// Assemble 65-byte payload: header + r||s (big-endian, fixed 32 bytes each)
+			var sig65 = new byte[65];
+			sig65[0] = header;
+			Buffer.BlockCopy(compact.Signature, 0, sig65, 1, 64);
+
+			// Most sites/APIs take base64 of these 65 bytes
+			return Convert.ToBase64String(sig65);
+		}
+		else
+		{
+			// BIP-322 (preferred for SegWit/Taproot). Produces either a Simple proof (witness stack)
+			// or a Full proof (serialized tx), both accepted by modern verifiers for the address type.
+			var addr = hdPubKey.GetAddress(network);
+
+			// Choose proof flavor: Simple for BIP84/86 single-key (P2WPKH/P2TR), Legacy for P2PKH
+			var sigType = hdPubKey.FullKeyPath.GetScriptTypeFromKeyPath() switch
+			{
+				ScriptPubKeyType.Segwit => SignatureType.Simple, // BIP84 P2WPKH
+				ScriptPubKeyType.TaprootBIP86 => SignatureType.Simple, // BIP86 P2TR single-key
+				_ => SignatureType.Legacy // P2PKH fallback
+			};
+
+			// NOTE: BIP-322 serialization can vary by implementation; do not byte-compare between libs.
+			// Always verify with addr.VerifyBIP322(message, parsedSignature).
+			return key.SignBIP322(addr, message, sigType).ToBase64();
+		}
+	}
+}
diff --git a/WalletWasabi/Filter/FilterChecker.cs b/WalletWasabi/Filter/FilterChecker.cs
index 57d52a6e44..ba86cbd3af 100644
--- a/WalletWasabi/Filter/FilterChecker.cs
+++ b/WalletWasabi/Filter/FilterChecker.cs
@@ -2,7 +2,6 @@
 using System.Buffers.Binary;
 using System.Collections.Generic;
 using System.Numerics;
-using WalletWasabi.Backend.Models;
 
 namespace WalletWasabi.Filter;
 
diff --git a/WalletWasabi/Hwi/HwiClient.cs b/WalletWasabi/Hwi/HwiClient.cs
index 4da9da53d1..a8e722a258 100644
--- a/WalletWasabi/Hwi/HwiClient.cs
+++ b/WalletWasabi/Hwi/HwiClient.cs
@@ -159,6 +159,22 @@ private async Task<BitcoinWitPubKeyAddress> DisplayAddressImplAsync(HardwareWall
 		return address;
 	}
 
+	public async Task<string> SignMessageAsync(HDFingerprint fingerprint, KeyPath keyPath, string message, CancellationToken cancel)
+	{
+		var keyPathString = keyPath.ToString(true, "h");
+
+		var response = await SendCommandAsync(
+			options: BuildOptions(deviceType: null, devicePath: null, fingerprint: fingerprint),
+			command: HwiCommands.SignMessage,
+			commandArguments: $"\"{message}\" {keyPathString}",
+			openConsole: false,
+			cancel).ConfigureAwait(false);
+
+		return HwiParser.ParseSignMessageResponse(response);
+	}
+
+
+
 	public async Task<PSBT> SignTxAsync(HardwareWalletModels deviceType, string? devicePath, PSBT psbt, CancellationToken cancel)
 		=> await SignTxImplAsync(deviceType, devicePath, null, psbt, cancel).ConfigureAwait(false);
 
diff --git a/WalletWasabi/Hwi/Parsers/HwiParser.cs b/WalletWasabi/Hwi/Parsers/HwiParser.cs
index a457698f4a..1e8f12d096 100644
--- a/WalletWasabi/Hwi/Parsers/HwiParser.cs
+++ b/WalletWasabi/Hwi/Parsers/HwiParser.cs
@@ -398,4 +398,20 @@ public static string ToHwiFriendlyString(this HardwareWalletModels me)
 	{
 		return me.ToString().ToLowerInvariant();
 	}
+
+	public static string ParseSignMessageResponse(string json)
+	{
+		if (JsonHelpers.TryParseJToken(json, out JToken? token))
+		{
+			string? signature = token["signature"]?.ToString()?.Trim()
+			                    ?? throw new ArgumentNullException("Signature is null.");
+
+			return signature;
+		}
+		else
+		{
+			throw new FormatException($"Could not parse signature: {json}.");
+		}
+	}
+
 }
diff --git a/WalletWasabi/JsonConverters/DecimalSeparatorJsonConverter.cs b/WalletWasabi/JsonConverters/DecimalSeparatorJsonConverter.cs
index 12ea143d65..f7c4ec070a 100644
--- a/WalletWasabi/JsonConverters/DecimalSeparatorJsonConverter.cs
+++ b/WalletWasabi/JsonConverters/DecimalSeparatorJsonConverter.cs
@@ -1,5 +1,4 @@
-using System.Globalization;
-using System.Linq;
+using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using WalletWasabi.Extensions;
diff --git a/WalletWasabi/JsonConverters/DisplayLanguageJsonConverter.cs b/WalletWasabi/JsonConverters/DisplayLanguageJsonConverter.cs
index 1089912e6b..da626fffb4 100644
--- a/WalletWasabi/JsonConverters/DisplayLanguageJsonConverter.cs
+++ b/WalletWasabi/JsonConverters/DisplayLanguageJsonConverter.cs
@@ -1,6 +1,5 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using WalletWasabi.Lang;
 using WalletWasabi.Models;
 
 namespace WalletWasabi.JsonConverters;
diff --git a/WalletWasabi/JsonConverters/GetOrderResponseItemJsonConverter.cs b/WalletWasabi/JsonConverters/GetOrderResponseItemJsonConverter.cs
index 1b6ca79883..c454fc9f73 100644
--- a/WalletWasabi/JsonConverters/GetOrderResponseItemJsonConverter.cs
+++ b/WalletWasabi/JsonConverters/GetOrderResponseItemJsonConverter.cs
@@ -1,6 +1,4 @@
 using Newtonsoft.Json;
-using System;
-using WalletWasabi.BuySell;
 using static WalletWasabi.BuySell.BuySellClientModels;
 
 namespace WalletWasabi.JsonConverters
diff --git a/WalletWasabi/JsonConverters/GroupSeparatorJsonConverter.cs b/WalletWasabi/JsonConverters/GroupSeparatorJsonConverter.cs
index 0429c7a497..c8125f4f4e 100644
--- a/WalletWasabi/JsonConverters/GroupSeparatorJsonConverter.cs
+++ b/WalletWasabi/JsonConverters/GroupSeparatorJsonConverter.cs
@@ -1,5 +1,4 @@
-using System.Globalization;
-using System.Linq;
+using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using WalletWasabi.Extensions;
diff --git a/WalletWasabi/Lang/LocalizationExtension.cs b/WalletWasabi/Lang/LocalizationExtension.cs
index fbe3bac544..3e7a73c2a2 100644
--- a/WalletWasabi/Lang/LocalizationExtension.cs
+++ b/WalletWasabi/Lang/LocalizationExtension.cs
@@ -2,7 +2,6 @@
 using System.Globalization;
 using System.Linq;
 using System.Resources;
-using System.Text;
 using WalletWasabi.Extensions;
 using WalletWasabi.Lang.Models;
 using WalletWasabi.Logging;
diff --git a/WalletWasabi/Lang/Models/DecimalSeparator.cs b/WalletWasabi/Lang/Models/DecimalSeparator.cs
index e7e777ce73..59f5d46ec0 100644
--- a/WalletWasabi/Lang/Models/DecimalSeparator.cs
+++ b/WalletWasabi/Lang/Models/DecimalSeparator.cs
@@ -1,4 +1,3 @@
-using System.ComponentModel;
 using WalletWasabi.Models;
 
 namespace WalletWasabi.Lang.Models;
diff --git a/WalletWasabi/Lang/Models/GroupSeparator.cs b/WalletWasabi/Lang/Models/GroupSeparator.cs
index 46762764cf..8549613e54 100644
--- a/WalletWasabi/Lang/Models/GroupSeparator.cs
+++ b/WalletWasabi/Lang/Models/GroupSeparator.cs
@@ -1,4 +1,3 @@
-using System.ComponentModel;
 using WalletWasabi.Models;
 
 namespace WalletWasabi.Lang.Models;
diff --git a/WalletWasabi/Lang/Resources.Designer.cs b/WalletWasabi/Lang/Resources.Designer.cs
index 3884483cfa..68a7b0b24c 100644
--- a/WalletWasabi/Lang/Resources.Designer.cs
+++ b/WalletWasabi/Lang/Resources.Designer.cs
@@ -1,6 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -185,6 +186,15 @@ public static string AddressesAwaitingPayment {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Address:.
+        /// </summary>
+        public static string AddressWithColon {
+            get {
+                return ResourceManager.GetString("AddressWithColon", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Create, connect, import or recover.
         /// </summary>
@@ -608,6 +618,15 @@ public static string BackendNotConnected {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Temporary Server Issue.
+        /// </summary>
+        public static string BackendStabilitySafetyEnum {
+            get {
+                return ResourceManager.GetString("BackendStabilitySafetyEnum", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The reported balance might not be accurate, and some other features may not be available because Ginger was unable to connect to the server. Retrying to connect..
         /// </summary>
@@ -959,6 +978,15 @@ public static string ChangeTransactionFeeOrConfirmationTime {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Protocol Violation.
+        /// </summary>
+        public static string CheatingEnum {
+            get {
+                return ResourceManager.GetString("CheatingEnum", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Check your device and finish the initialization..
         /// </summary>
@@ -1976,6 +2004,15 @@ public static string EnterPassphraseAuth {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Enter the message you wish to sign.
+        /// </summary>
+        public static string EnterTheMessageYouWishToSign {
+            get {
+                return ResourceManager.GetString("EnterTheMessageYouWishToSign", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Some entities can deanonymize this transaction because it spends coins with no privacy. Coinjoin more to have enough private coins for this transaction..
         /// </summary>
@@ -2201,6 +2238,15 @@ public static string FailedToGetLegalDocuments {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Potential Risk.
+        /// </summary>
+        public static string FailedToVerifyEnum {
+            get {
+                return ResourceManager.GetString("FailedToVerifyEnum", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to FAQ.
         /// </summary>
@@ -2651,6 +2697,15 @@ public static string Index {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to (Inherited from another coin).
+        /// </summary>
+        public static string InheritedEnum {
+            get {
+                return ResourceManager.GetString("InheritedEnum", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Initialize your device first..
         /// </summary>
@@ -2714,6 +2769,15 @@ public static string InTheFieldBelow {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid Bitcoin address..
+        /// </summary>
+        public static string InvalidBitcoinAddress {
+            get {
+                return ResourceManager.GetString("InvalidBitcoinAddress", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Address is not a valid BTC address..
         /// </summary>
@@ -2957,6 +3021,15 @@ public static string LocalBitcoinCoreKnotsVersion {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Temporarily Restriction.
+        /// </summary>
+        public static string LocalCoinVerifierEnum {
+            get {
+                return ResourceManager.GetString("LocalCoinVerifierEnum", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Mark all as read.
         /// </summary>
@@ -2975,6 +3048,15 @@ public static string Max {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Message:.
+        /// </summary>
+        public static string MessageWithColon {
+            get {
+                return ResourceManager.GetString("MessageWithColon", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to min.
         /// </summary>
@@ -3552,6 +3634,15 @@ public static string PasteFromClipboard {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Paste the address provided by the exchange.
+        /// </summary>
+        public static string PasteTheAddressProvidedByTheExchange {
+            get {
+                return ResourceManager.GetString("PasteTheAddressProvidedByTheExchange", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to You can track, manage, and view the details of your past orders..
         /// </summary>
@@ -3894,6 +3985,15 @@ public static string Rarely {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Reason: {0}.
+        /// </summary>
+        public static string Reason {
+            get {
+                return ResourceManager.GetString("Reason", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Receive in:.
         /// </summary>
@@ -4101,6 +4201,51 @@ public static string ReviewCoins {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Round Interruption.
+        /// </summary>
+        public static string RoundDisruption {
+            get {
+                return ResourceManager.GetString("RoundDisruption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Round Interruption.
+        /// </summary>
+        public static string RoundDisruptionMethodDidNotConfirmEnum {
+            get {
+                return ResourceManager.GetString("RoundDisruptionMethodDidNotConfirmEnum", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Round Interruption.
+        /// </summary>
+        public static string RoundDisruptionMethodDidNotSignalReadyToSignEnum {
+            get {
+                return ResourceManager.GetString("RoundDisruptionMethodDidNotSignalReadyToSignEnum", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Round Interruption.
+        /// </summary>
+        public static string RoundDisruptionMethodDidNotSignEnum {
+            get {
+                return ResourceManager.GetString("RoundDisruptionMethodDidNotSignEnum", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Coin was spent during the round.
+        /// </summary>
+        public static string RoundDisruptionMethodDoubleSpentEnum {
+            get {
+                return ResourceManager.GetString("RoundDisruptionMethodDoubleSpentEnum", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Round ended, awaiting next round.
         /// </summary>
@@ -4578,6 +4723,42 @@ public static string ShowSensitiveData {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Signature.
+        /// </summary>
+        public static string Signature {
+            get {
+                return ResourceManager.GetString("Signature", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Sign Message.
+        /// </summary>
+        public static string SignMessage {
+            get {
+                return ResourceManager.GetString("SignMessage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Sign a message to verify you own the address for the exchange.
+        /// </summary>
+        public static string SignMessageToVerifyYouOwnAddressForExchange {
+            get {
+                return ResourceManager.GetString("SignMessageToVerifyYouOwnAddressForExchange", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Sign with Hardware Wallet.
+        /// </summary>
+        public static string SignWithHardwareWallet {
+            get {
+                return ResourceManager.GetString("SignWithHardwareWallet", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Skip.
         /// </summary>
@@ -4812,6 +4993,15 @@ public static string TermsAndConditionsViewTermsAndConditions {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to The address does not belong to this wallet..
+        /// </summary>
+        public static string TheAddressDoesNotBelongToThisWallet {
+            get {
+                return ResourceManager.GetString("TheAddressDoesNotBelongToThisWallet", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to the same amount.
         /// </summary>
@@ -5370,6 +5560,15 @@ public static string Unknown {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Unknown.
+        /// </summary>
+        public static string UnknownEnum {
+            get {
+                return ResourceManager.GetString("UnknownEnum", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Unknown error. Make sure the device is connected and isn&apos;t busy, then try again..
         /// </summary>
diff --git a/WalletWasabi/Lang/Resources.de.resx b/WalletWasabi/Lang/Resources.de.resx
index b2a77c6bb6..c675bc80a5 100644
--- a/WalletWasabi/Lang/Resources.de.resx
+++ b/WalletWasabi/Lang/Resources.de.resx
@@ -2134,4 +2134,70 @@
     <data name="TwoFactorDisabledWarnMessageOpenSettings" xml:space="preserve">
         <value>Einstellungen öffnen</value>
     </data>
+    <data name="SignMessage" xml:space="preserve">
+        <value>Nachricht signieren</value>
+    </data>
+    <data name="InvalidBitcoinAddress" xml:space="preserve">
+        <value>Ungültige Bitcoin-Adresse.</value>
+    </data>
+    <data name="TheAddressDoesNotBelongToThisWallet" xml:space="preserve">
+        <value>Die Adresse gehört nicht zu dieser Wallet.</value>
+    </data>
+    <data name="SignWithHardwareWallet" xml:space="preserve">
+        <value>Mit Hardware-Wallet signieren</value>
+    </data>
+    <data name="SignMessageToVerifyYouOwnAddressForExchange" xml:space="preserve">
+        <value>Signieren Sie eine Nachricht, um zu bestätigen, dass Sie die Adresse für die Börse besitzen</value>
+    </data>
+    <data name="AddressWithColon" xml:space="preserve">
+        <value>Adresse:</value>
+    </data>
+    <data name="PasteTheAddressProvidedByTheExchange" xml:space="preserve">
+        <value>Fügen Sie die von der Wechselstelle bereitgestellte Adresse ein</value>
+    </data>
+    <data name="MessageWithColon" xml:space="preserve">
+        <value>Nachricht:</value>
+    </data>
+    <data name="EnterTheMessageYouWishToSign" xml:space="preserve">
+        <value>Geben Sie die Nachricht ein, die Sie signieren möchten</value>
+    </data>
+    <data name="Signature" xml:space="preserve">
+        <value>Signatur</value>
+    </data>
+    <data name="Reason" xml:space="preserve">
+        <value>Grund: {0}</value>
+    </data>
+    <data name="UnknownEnum" xml:space="preserve">
+        <value>Unbekannt</value>
+    </data>
+    <data name="BackendStabilitySafetyEnum" xml:space="preserve">
+        <value>Vorübergehendes Serverproblem</value>
+    </data>
+    <data name="CheatingEnum" xml:space="preserve">
+        <value>Protokollverletzung</value>
+    </data>
+    <data name="RoundDisruption" xml:space="preserve">
+        <value>Rundenunterbrechung</value>
+    </data>
+    <data name="FailedToVerifyEnum" xml:space="preserve">
+        <value>Potenzielles Risiko</value>
+    </data>
+    <data name="InheritedEnum" xml:space="preserve">
+        <value>(Von einer anderen Münze geerbt)</value>
+    </data>
+    <data name="LocalCoinVerifierEnum" xml:space="preserve">
+        <value>Vorübergehende Einschränkung</value>
+    </data>
+    <data name="RoundDisruptionMethodDidNotConfirmEnum" xml:space="preserve">
+        <value>Rundenunterbrechung</value>
+    </data>
+    <data name="RoundDisruptionMethodDidNotSignEnum" xml:space="preserve">
+        <value>Rundenunterbrechung</value>
+    </data>
+    <data name="RoundDisruptionMethodDoubleSpentEnum" xml:space="preserve">
+        <value>Münze wurde während der Runde ausgegeben</value>
+    </data>
+    <data name="RoundDisruptionMethodDidNotSignalReadyToSignEnum" xml:space="preserve">
+        <value>Rundenunterbrechung</value>
+    </data>
 </root>
diff --git a/WalletWasabi/Lang/Resources.es.resx b/WalletWasabi/Lang/Resources.es.resx
index 0ef6e53528..f1cdf6f6eb 100644
--- a/WalletWasabi/Lang/Resources.es.resx
+++ b/WalletWasabi/Lang/Resources.es.resx
@@ -2119,4 +2119,70 @@
     <data name="SetAsDefault" xml:space="preserve">
     <value>Establecer como predeterminado</value>
   </data>
+    <data name="SignMessage" xml:space="preserve">
+    <value>Firmar mensaje</value>
+  </data>
+    <data name="InvalidBitcoinAddress" xml:space="preserve">
+    <value>Dirección de Bitcoin no válida.</value>
+  </data>
+    <data name="TheAddressDoesNotBelongToThisWallet" xml:space="preserve">
+    <value>La dirección no pertenece a esta cartera.</value>
+  </data>
+    <data name="SignWithHardwareWallet" xml:space="preserve">
+    <value>Firmar con cartera de hardware</value>
+  </data>
+    <data name="SignMessageToVerifyYouOwnAddressForExchange" xml:space="preserve">
+    <value>Firma un mensaje para verificar que eres el propietario de la dirección para el intercambio</value>
+  </data>
+    <data name="AddressWithColon" xml:space="preserve">
+    <value>Dirección:</value>
+  </data>
+    <data name="PasteTheAddressProvidedByTheExchange" xml:space="preserve">
+    <value>Pega la dirección proporcionada por el cambiador</value>
+  </data>
+    <data name="MessageWithColon" xml:space="preserve">
+    <value>Mensaje:</value>
+  </data>
+    <data name="EnterTheMessageYouWishToSign" xml:space="preserve">
+    <value>Introduce el mensaje que deseas firmar</value>
+  </data>
+    <data name="Signature" xml:space="preserve">
+    <value>Firma</value>
+  </data>
+    <data name="Reason" xml:space="preserve">
+    <value>Razón: {0}</value>
+  </data>
+    <data name="UnknownEnum" xml:space="preserve">
+    <value>Desconocido</value>
+  </data>
+  <data name="BackendStabilitySafetyEnum" xml:space="preserve">
+    <value>Problema temporal del servidor</value>
+  </data>
+  <data name="CheatingEnum" xml:space="preserve">
+    <value>Violación de protocolo</value>
+  </data>
+  <data name="RoundDisruption" xml:space="preserve">
+    <value>Interrupción de la ronda</value>
+  </data>
+  <data name="FailedToVerifyEnum" xml:space="preserve">
+    <value>Riesgo potencial</value>
+  </data>
+  <data name="InheritedEnum" xml:space="preserve">
+    <value>(Heredado de otra moneda)</value>
+  </data>
+  <data name="LocalCoinVerifierEnum" xml:space="preserve">
+    <value>Restricción temporal</value>
+  </data>
+  <data name="RoundDisruptionMethodDidNotSignEnum" xml:space="preserve">
+    <value>Interrupción de la ronda</value>
+  </data>
+  <data name="RoundDisruptionMethodDoubleSpentEnum" xml:space="preserve">
+    <value>La moneda se gastó durante la ronda</value>
+  </data>
+  <data name="RoundDisruptionMethodDidNotConfirmEnum" xml:space="preserve">
+    <value>Interrupción de la ronda</value>
+  </data>
+  <data name="RoundDisruptionMethodDidNotSignalReadyToSignEnum" xml:space="preserve">
+    <value>Interrupción de la ronda</value>
+  </data>
 </root>
diff --git a/WalletWasabi/Lang/Resources.fr.resx b/WalletWasabi/Lang/Resources.fr.resx
index 10989918bc..76c6d62a19 100644
--- a/WalletWasabi/Lang/Resources.fr.resx
+++ b/WalletWasabi/Lang/Resources.fr.resx
@@ -2125,4 +2125,70 @@
     <data name="SetAsDefault" xml:space="preserve">
     <value>Définir par défaut</value>
   </data>
+    <data name="SignMessage" xml:space="preserve">
+    <value>Signer le message</value>
+  </data>
+    <data name="InvalidBitcoinAddress" xml:space="preserve">
+    <value>Adresse Bitcoin invalide.</value>
+  </data>
+    <data name="TheAddressDoesNotBelongToThisWallet" xml:space="preserve">
+    <value>L'adresse n'appartient pas à ce portefeuille.</value>
+  </data>
+    <data name="SignWithHardwareWallet" xml:space="preserve">
+    <value>Signer avec un portefeuille matériel</value>
+  </data>
+    <data name="SignMessageToVerifyYouOwnAddressForExchange" xml:space="preserve">
+    <value>Signez un message pour vérifier que vous possédez l'adresse pour l'échange</value>
+  </data>
+    <data name="AddressWithColon" xml:space="preserve">
+    <value>Adresse :</value>
+  </data>
+    <data name="PasteTheAddressProvidedByTheExchange" xml:space="preserve">
+    <value>Collez l'adresse fournie par le service de change</value>
+  </data>
+    <data name="MessageWithColon" xml:space="preserve">
+    <value>Message :</value>
+  </data>
+    <data name="EnterTheMessageYouWishToSign" xml:space="preserve">
+    <value>Entrez le message que vous souhaitez signer</value>
+  </data>
+    <data name="Signature" xml:space="preserve">
+    <value>Signature</value>
+  </data>
+    <data name="Reason" xml:space="preserve">
+    <value>Raison : {0}</value>
+  </data>
+    <data name="UnknownEnum" xml:space="preserve">
+    <value>Inconnu</value>
+  </data>
+  <data name="BackendStabilitySafetyEnum" xml:space="preserve">
+    <value>Problème temporaire du serveur</value>
+  </data>
+  <data name="CheatingEnum" xml:space="preserve">
+    <value>Violation du protocole</value>
+  </data>
+  <data name="RoundDisruption" xml:space="preserve">
+    <value>Interruption de la manche</value>
+  </data>
+  <data name="FailedToVerifyEnum" xml:space="preserve">
+    <value>Risque potentiel</value>
+  </data>
+  <data name="InheritedEnum" xml:space="preserve">
+    <value>(Hérité d'une autre pièce)</value>
+  </data>
+  <data name="LocalCoinVerifierEnum" xml:space="preserve">
+    <value>Restriction temporaire</value>
+  </data>
+  <data name="RoundDisruptionMethodDidNotConfirmEnum" xml:space="preserve">
+    <value>Interruption de la manche</value>
+  </data>
+  <data name="RoundDisruptionMethodDidNotSignEnum" xml:space="preserve">
+    <value>Manche interrompue</value>
+  </data>
+  <data name="RoundDisruptionMethodDoubleSpentEnum" xml:space="preserve">
+    <value>La pièce a été dépensée pendant la manche</value>
+  </data>
+  <data name="RoundDisruptionMethodDidNotSignalReadyToSignEnum" xml:space="preserve">
+    <value>Interruption de la manche</value>
+  </data>
 </root>
diff --git a/WalletWasabi/Lang/Resources.hu.resx b/WalletWasabi/Lang/Resources.hu.resx
index 90ed8364e8..9d7bdf2ea6 100644
--- a/WalletWasabi/Lang/Resources.hu.resx
+++ b/WalletWasabi/Lang/Resources.hu.resx
@@ -2119,4 +2119,70 @@
     <data name="SetAsDefault" xml:space="preserve">
     <value>Beállítás alapértelmezettként</value>
   </data>
+    <data name="SignMessage" xml:space="preserve">
+    <value>Üzenet aláírása</value>
+  </data>
+    <data name="InvalidBitcoinAddress" xml:space="preserve">
+    <value>Érvénytelen Bitcoin-cím.</value>
+  </data>
+    <data name="TheAddressDoesNotBelongToThisWallet" xml:space="preserve">
+    <value>A cím nem ehhez a pénztárcához tartozik.</value>
+  </data>
+    <data name="SignWithHardwareWallet" xml:space="preserve">
+    <value>Aláírás hardveres pénztárcával</value>
+  </data>
+    <data name="SignMessageToVerifyYouOwnAddressForExchange" xml:space="preserve">
+    <value>Írj alá egy üzenetet annak igazolására, hogy a váltó számára te birtoklod a címet</value>
+  </data>
+    <data name="AddressWithColon" xml:space="preserve">
+    <value>Cím:</value>
+  </data>
+    <data name="PasteTheAddressProvidedByTheExchange" xml:space="preserve">
+    <value>Illeszd be a váltó által megadott címet</value>
+  </data>
+    <data name="MessageWithColon" xml:space="preserve">
+    <value>Üzenet:</value>
+  </data>
+    <data name="EnterTheMessageYouWishToSign" xml:space="preserve">
+    <value>Add meg az üzenetet, amelyet alá szeretnél írni</value>
+  </data>
+    <data name="Signature" xml:space="preserve">
+    <value>Aláírás</value>
+  </data>
+    <data name="Reason" xml:space="preserve">
+    <value>Ok: {0}</value>
+  </data>
+    <data name="UnknownEnum" xml:space="preserve">
+    <value>Ismeretlen</value>
+  </data>
+  <data name="BackendStabilitySafetyEnum" xml:space="preserve">
+    <value>Átmeneti szerverhiba</value>
+  </data>
+  <data name="CheatingEnum" xml:space="preserve">
+    <value>Protokoll megsértése</value>
+  </data>
+  <data name="RoundDisruption" xml:space="preserve">
+    <value>Kör megszakítása</value>
+  </data>
+  <data name="FailedToVerifyEnum" xml:space="preserve">
+    <value>Lehetséges kockázat</value>
+  </data>
+  <data name="InheritedEnum" xml:space="preserve">
+    <value>(Egy másik érmétől örökölve)</value>
+  </data>
+  <data name="LocalCoinVerifierEnum" xml:space="preserve">
+    <value>Átmeneti korlátozás</value>
+  </data>
+  <data name="RoundDisruptionMethodDidNotConfirmEnum" xml:space="preserve">
+    <value>Kör megszakítása</value>
+  </data>
+  <data name="RoundDisruptionMethodDidNotSignEnum" xml:space="preserve">
+    <value>Kör megszakítása</value>
+  </data>
+  <data name="RoundDisruptionMethodDoubleSpentEnum" xml:space="preserve">
+    <value>Az érme elköltésre került a kör során</value>
+  </data>
+  <data name="RoundDisruptionMethodDidNotSignalReadyToSignEnum" xml:space="preserve">
+    <value>Kör megszakítása</value>
+  </data>
 </root>
diff --git a/WalletWasabi/Lang/Resources.it.resx b/WalletWasabi/Lang/Resources.it.resx
index 7a816fdf2f..9cf63dfb56 100644
--- a/WalletWasabi/Lang/Resources.it.resx
+++ b/WalletWasabi/Lang/Resources.it.resx
@@ -2098,4 +2098,70 @@
     <data name="SetAsDefault" xml:space="preserve">
     <value>Imposta come predefinito</value>
   </data>
+    <data name="SignMessage" xml:space="preserve">
+    <value>Firma messaggio</value>
+  </data>
+    <data name="InvalidBitcoinAddress" xml:space="preserve">
+    <value>Indirizzo Bitcoin non valido.</value>
+  </data>
+    <data name="TheAddressDoesNotBelongToThisWallet" xml:space="preserve">
+    <value>L'indirizzo non appartiene a questo portafoglio.</value>
+  </data>
+    <data name="SignWithHardwareWallet" xml:space="preserve">
+    <value>Firma con portafoglio hardware</value>
+  </data>
+    <data name="SignMessageToVerifyYouOwnAddressForExchange" xml:space="preserve">
+    <value>Firma un messaggio per verificare che possiedi l'indirizzo per lo scambio</value>
+  </data>
+    <data name="AddressWithColon" xml:space="preserve">
+    <value>Indirizzo:</value>
+  </data>
+    <data name="PasteTheAddressProvidedByTheExchange" xml:space="preserve">
+    <value>Incolla l'indirizzo fornito dal servizio di cambio</value>
+  </data>
+    <data name="MessageWithColon" xml:space="preserve">
+    <value>Messaggio:</value>
+  </data>
+    <data name="EnterTheMessageYouWishToSign" xml:space="preserve">
+    <value>Inserisci il messaggio che desideri firmare</value>
+  </data>
+    <data name="Signature" xml:space="preserve">
+    <value>Firma</value>
+  </data>
+    <data name="Reason" xml:space="preserve">
+    <value>Motivo: {0}</value>
+  </data>
+    <data name="UnknownEnum" xml:space="preserve">
+    <value>Sconosciuto</value>
+  </data>
+  <data name="BackendStabilitySafetyEnum" xml:space="preserve">
+    <value>Problema temporaneo del server</value>
+  </data>
+  <data name="CheatingEnum" xml:space="preserve">
+    <value>Violazione del protocollo</value>
+  </data>
+  <data name="RoundDisruption" xml:space="preserve">
+    <value>Interruzione del turno</value>
+  </data>
+  <data name="FailedToVerifyEnum" xml:space="preserve">
+    <value>Rischio potenziale</value>
+  </data>
+  <data name="InheritedEnum" xml:space="preserve">
+    <value>(Ereditato da un'altra moneta)</value>
+  </data>
+  <data name="LocalCoinVerifierEnum" xml:space="preserve">
+    <value>Restrizione temporanea</value>
+  </data>
+  <data name="RoundDisruptionMethodDidNotConfirmEnum" xml:space="preserve">
+    <value>Interruzione del turno</value>
+  </data>
+  <data name="RoundDisruptionMethodDidNotSignEnum" xml:space="preserve">
+    <value>Interruzione del turno</value>
+  </data>
+  <data name="RoundDisruptionMethodDoubleSpentEnum" xml:space="preserve">
+    <value>La moneta è stata spesa durante il turno</value>
+  </data>
+  <data name="RoundDisruptionMethodDidNotSignalReadyToSignEnum" xml:space="preserve">
+    <value>Interruzione del turno</value>
+  </data>
 </root>
diff --git a/WalletWasabi/Lang/Resources.pt.resx b/WalletWasabi/Lang/Resources.pt.resx
index b8d365f86a..aeec8de4c2 100644
--- a/WalletWasabi/Lang/Resources.pt.resx
+++ b/WalletWasabi/Lang/Resources.pt.resx
@@ -2119,4 +2119,70 @@
     <data name="SetAsDefault" xml:space="preserve">
         <value>Definir como padrão</value>
     </data>
+    <data name="SignMessage" xml:space="preserve">
+        <value>Assinar mensagem</value>
+    </data>
+    <data name="InvalidBitcoinAddress" xml:space="preserve">
+        <value>Endereço de Bitcoin inválido.</value>
+    </data>
+    <data name="TheAddressDoesNotBelongToThisWallet" xml:space="preserve">
+        <value>O endereço não pertence a esta carteira.</value>
+    </data>
+    <data name="SignWithHardwareWallet" xml:space="preserve">
+        <value>Assinar com carteira de hardware</value>
+    </data>
+    <data name="SignMessageToVerifyYouOwnAddressForExchange" xml:space="preserve">
+        <value>Assine uma mensagem para verificar que você possui o endereço para a troca</value>
+    </data>
+    <data name="AddressWithColon" xml:space="preserve">
+        <value>Endereço:</value>
+    </data>
+    <data name="PasteTheAddressProvidedByTheExchange" xml:space="preserve">
+        <value>Cole o endereço fornecido pelo serviço de câmbio</value>
+    </data>
+    <data name="MessageWithColon" xml:space="preserve">
+        <value>Mensagem:</value>
+    </data>
+    <data name="EnterTheMessageYouWishToSign" xml:space="preserve">
+        <value>Insira a mensagem que deseja assinar</value>
+    </data>
+    <data name="Signature" xml:space="preserve">
+        <value>Assinatura</value>
+    </data>
+    <data name="Reason" xml:space="preserve">
+        <value>Motivo: {0}</value>
+    </data>
+    <data name="UnknownEnum" xml:space="preserve">
+        <value>Desconhecido</value>
+    </data>
+    <data name="BackendStabilitySafetyEnum" xml:space="preserve">
+        <value>Problema temporário no servidor</value>
+    </data>
+    <data name="CheatingEnum" xml:space="preserve">
+        <value>Violação de protocolo</value>
+    </data>
+    <data name="RoundDisruption" xml:space="preserve">
+        <value>Interrupção da rodada</value>
+    </data>
+    <data name="FailedToVerifyEnum" xml:space="preserve">
+        <value>Risco potencial</value>
+    </data>
+    <data name="InheritedEnum" xml:space="preserve">
+        <value>(Herdado de outra moeda)</value>
+    </data>
+    <data name="LocalCoinVerifierEnum" xml:space="preserve">
+        <value>Restrição temporária</value>
+    </data>
+    <data name="RoundDisruptionMethodDidNotConfirmEnum" xml:space="preserve">
+        <value>Interrupção da rodada</value>
+    </data>
+    <data name="RoundDisruptionMethodDidNotSignEnum" xml:space="preserve">
+        <value>Interrupção da rodada</value>
+    </data>
+    <data name="RoundDisruptionMethodDoubleSpentEnum" xml:space="preserve">
+        <value>A moeda foi gasta durante a rodada</value>
+    </data>
+    <data name="RoundDisruptionMethodDidNotSignalReadyToSignEnum" xml:space="preserve">
+        <value>Interrupção da rodada</value>
+    </data>
 </root>
diff --git a/WalletWasabi/Lang/Resources.resx b/WalletWasabi/Lang/Resources.resx
index 9e65bf40e5..f7a7c2cb5c 100644
--- a/WalletWasabi/Lang/Resources.resx
+++ b/WalletWasabi/Lang/Resources.resx
@@ -2121,4 +2121,70 @@
     <data name="SetAsDefault" xml:space="preserve">
     <value>Set as Default</value>
   </data>
+    <data name="SignMessage" xml:space="preserve">
+    <value>Sign Message</value>
+  </data>
+    <data name="InvalidBitcoinAddress" xml:space="preserve">
+    <value>Invalid Bitcoin address.</value>
+  </data>
+    <data name="TheAddressDoesNotBelongToThisWallet" xml:space="preserve">
+    <value>The address does not belong to this wallet.</value>
+  </data>
+    <data name="SignWithHardwareWallet" xml:space="preserve">
+    <value>Sign with Hardware Wallet</value>
+  </data>
+    <data name="SignMessageToVerifyYouOwnAddressForExchange" xml:space="preserve">
+    <value>Sign a message to verify you own the address for the exchange</value>
+  </data>
+    <data name="AddressWithColon" xml:space="preserve">
+    <value>Address:</value>
+  </data>
+    <data name="PasteTheAddressProvidedByTheExchange" xml:space="preserve">
+    <value>Paste the address provided by the exchange</value>
+  </data>
+    <data name="MessageWithColon" xml:space="preserve">
+    <value>Message:</value>
+  </data>
+    <data name="EnterTheMessageYouWishToSign" xml:space="preserve">
+    <value>Enter the message you wish to sign</value>
+  </data>
+    <data name="Signature" xml:space="preserve">
+    <value>Signature</value>
+  </data>
+    <data name="Reason" xml:space="preserve">
+    <value>Reason: {0}</value>
+  </data>
+    <data name="UnknownEnum" xml:space="preserve">
+    <value>Unknown</value>
+  </data>
+  <data name="BackendStabilitySafetyEnum" xml:space="preserve">
+    <value>Temporary Server Issue</value>
+  </data>
+  <data name="CheatingEnum" xml:space="preserve">
+    <value>Protocol Violation</value>
+  </data>
+  <data name="RoundDisruption" xml:space="preserve">
+    <value>Round Interruption</value>
+  </data>
+    <data name="FailedToVerifyEnum" xml:space="preserve">
+    <value>Potential Risk</value>
+  </data>
+  <data name="InheritedEnum" xml:space="preserve">
+    <value>(Inherited from another coin)</value>
+  </data>
+  <data name="LocalCoinVerifierEnum" xml:space="preserve">
+    <value>Temporarily Restriction</value>
+  </data>
+  <data name="RoundDisruptionMethodDidNotConfirmEnum" xml:space="preserve">
+    <value>Round Interruption</value>
+  </data>
+  <data name="RoundDisruptionMethodDidNotSignEnum" xml:space="preserve">
+    <value>Round Interruption</value>
+  </data>
+    <data name="RoundDisruptionMethodDoubleSpentEnum" xml:space="preserve">
+    <value>Coin was spent during the round</value>
+  </data>
+  <data name="RoundDisruptionMethodDidNotSignalReadyToSignEnum" xml:space="preserve">
+    <value>Round Interruption</value>
+  </data>
 </root>
diff --git a/WalletWasabi/Lang/Resources.tr.resx b/WalletWasabi/Lang/Resources.tr.resx
index ad022cb557..7ebc26026e 100644
--- a/WalletWasabi/Lang/Resources.tr.resx
+++ b/WalletWasabi/Lang/Resources.tr.resx
@@ -2119,4 +2119,70 @@
     <data name="SetAsDefault" xml:space="preserve">
         <value>Varsayılan olarak ayarla</value>
     </data>
+    <data name="SignMessage" xml:space="preserve">
+        <value>Mesaj imzala</value>
+    </data>
+    <data name="InvalidBitcoinAddress" xml:space="preserve">
+        <value>Geçersiz Bitcoin adresi.</value>
+    </data>
+    <data name="TheAddressDoesNotBelongToThisWallet" xml:space="preserve">
+        <value>Adres bu cüzdana ait değil.</value>
+    </data>
+    <data name="SignWithHardwareWallet" xml:space="preserve">
+        <value>Donanım cüzdanı ile imzala</value>
+    </data>
+    <data name="SignMessageToVerifyYouOwnAddressForExchange" xml:space="preserve">
+        <value>Borsada adresin size ait olduğunu doğrulamak için bir mesaj imzalayın</value>
+    </data>
+    <data name="AddressWithColon" xml:space="preserve">
+        <value>Adres:</value>
+    </data>
+    <data name="PasteTheAddressProvidedByTheExchange" xml:space="preserve">
+        <value>Döviz bozdurma hizmeti tarafından verilen adresi yapıştırın</value>
+    </data>
+    <data name="MessageWithColon" xml:space="preserve">
+        <value>Mesaj:</value>
+    </data>
+    <data name="EnterTheMessageYouWishToSign" xml:space="preserve">
+        <value>İmzalamak istediğiniz mesajı girin</value>
+    </data>
+    <data name="Signature" xml:space="preserve">
+        <value>İmza</value>
+    </data>
+    <data name="Reason" xml:space="preserve">
+        <value>Sebep: {0}</value>
+    </data>
+    <data name="UnknownEnum" xml:space="preserve">
+        <value>Bilinmiyor</value>
+    </data>
+    <data name="BackendStabilitySafetyEnum" xml:space="preserve">
+        <value>Geçici sunucu sorunu</value>
+    </data>
+    <data name="CheatingEnum" xml:space="preserve">
+        <value>Protokol ihlali</value>
+    </data>
+    <data name="RoundDisruption" xml:space="preserve">
+        <value>Turun kesilmesi</value>
+    </data>
+    <data name="FailedToVerifyEnum" xml:space="preserve">
+        <value>Potansiyel risk</value>
+    </data>
+    <data name="InheritedEnum" xml:space="preserve">
+        <value>(Başka bir madenden devralındı)</value>
+    </data>
+    <data name="LocalCoinVerifierEnum" xml:space="preserve">
+        <value>Geçici kısıtlama</value>
+    </data>
+    <data name="RoundDisruptionMethodDidNotConfirmEnum" xml:space="preserve">
+        <value>Turun kesilmesi</value>
+    </data>
+    <data name="RoundDisruptionMethodDidNotSignEnum" xml:space="preserve">
+        <value>Turun kesilmesi</value>
+    </data>
+    <data name="RoundDisruptionMethodDoubleSpentEnum" xml:space="preserve">
+        <value>Tur sırasında madeni para harcandı</value>
+    </data>
+    <data name="RoundDisruptionMethodDidNotSignalReadyToSignEnum" xml:space="preserve">
+        <value>Turun kesilmesi</value>
+    </data>
 </root>
diff --git a/WalletWasabi/Lang/Resources.zh.resx b/WalletWasabi/Lang/Resources.zh.resx
index 735502222b..df8e2184c8 100644
--- a/WalletWasabi/Lang/Resources.zh.resx
+++ b/WalletWasabi/Lang/Resources.zh.resx
@@ -2134,4 +2134,70 @@
   <data name="TwoFactorDisabledWarnMessageOpenSettings" xml:space="preserve">
     <value>打开设置</value>
   </data>
+    <data name="SignMessage" xml:space="preserve">
+    <value>签署消息</value>
+  </data>
+    <data name="InvalidBitcoinAddress" xml:space="preserve">
+    <value>无效的比特币地址。</value>
+  </data>
+    <data name="TheAddressDoesNotBelongToThisWallet" xml:space="preserve">
+    <value>该地址不属于此钱包。</value>
+  </data>
+    <data name="SignWithHardwareWallet" xml:space="preserve">
+    <value>使用硬件钱包签名</value>
+  </data>
+    <data name="SignMessageToVerifyYouOwnAddressForExchange" xml:space="preserve">
+    <value>签署一条消息以验证您拥有用于交易所的地址</value>
+  </data>
+    <data name="AddressWithColon" xml:space="preserve">
+    <value>地址：</value>
+  </data>
+    <data name="PasteTheAddressProvidedByTheExchange" xml:space="preserve">
+    <value>粘贴兑换服务提供的地址</value>
+  </data>
+    <data name="MessageWithColon" xml:space="preserve">
+    <value>消息：</value>
+  </data>
+    <data name="EnterTheMessageYouWishToSign" xml:space="preserve">
+    <value>输入您想要签名的消息</value>
+  </data>
+    <data name="Signature" xml:space="preserve">
+    <value>签名</value>
+  </data>
+    <data name="Reason" xml:space="preserve">
+    <value>原因：{0}</value>
+  </data>
+    <data name="UnknownEnum" xml:space="preserve">
+    <value>未知</value>
+  </data>
+  <data name="BackendStabilitySafetyEnum" xml:space="preserve">
+    <value>临时服务器问题</value>
+  </data>
+  <data name="CheatingEnum" xml:space="preserve">
+    <value>协议违规</value>
+  </data>
+  <data name="RoundDisruption" xml:space="preserve">
+    <value>回合中断</value>
+  </data>
+  <data name="FailedToVerifyEnum" xml:space="preserve">
+    <value>潜在风险</value>
+  </data>
+  <data name="InheritedEnum" xml:space="preserve">
+    <value>（继承自另一枚币）</value>
+  </data>
+  <data name="LocalCoinVerifierEnum" xml:space="preserve">
+    <value>临时限制</value>
+  </data>
+  <data name="RoundDisruptionMethodDidNotConfirmEnum" xml:space="preserve">
+    <value>回合中断</value>
+  </data>
+  <data name="RoundDisruptionMethodDidNotSignEnum" xml:space="preserve">
+    <value>回合中断</value>
+  </data>
+  <data name="RoundDisruptionMethodDoubleSpentEnum" xml:space="preserve">
+    <value>硬币在回合中已被花费</value>
+  </data>
+  <data name="RoundDisruptionMethodDidNotSignalReadyToSignEnum" xml:space="preserve">
+    <value>回合中断</value>
+  </data>
 </root>
diff --git a/WalletWasabi/Models/TorMode.cs b/WalletWasabi/Models/TorMode.cs
index 0c9e2d1115..cf127f7d85 100644
--- a/WalletWasabi/Models/TorMode.cs
+++ b/WalletWasabi/Models/TorMode.cs
@@ -1,5 +1,3 @@
-using WalletWasabi.Lang;
-
 namespace WalletWasabi.Models;
 
 /// <summary>
diff --git a/WalletWasabi/Nostr/CoordinatorNostrPublisher.cs b/WalletWasabi/Nostr/CoordinatorNostrPublisher.cs
index 6894c76afc..729c0db6ce 100644
--- a/WalletWasabi/Nostr/CoordinatorNostrPublisher.cs
+++ b/WalletWasabi/Nostr/CoordinatorNostrPublisher.cs
@@ -1,7 +1,6 @@
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
-using NBitcoin;
 using NBitcoin.Secp256k1;
 using NNostr.Client;
 using WalletWasabi.Bases;
diff --git a/WalletWasabi/Nostr/NostrExtensions.cs b/WalletWasabi/Nostr/NostrExtensions.cs
index 7fd57f0368..8913f2df00 100644
--- a/WalletWasabi/Nostr/NostrExtensions.cs
+++ b/WalletWasabi/Nostr/NostrExtensions.cs
@@ -6,7 +6,6 @@
 using NBitcoin;
 using NBitcoin.Secp256k1;
 using NNostr.Client;
-using WalletWasabi.Exceptions;
 using WalletWasabi.Helpers;
 
 namespace WalletWasabi.Nostr;
diff --git a/WalletWasabi/Tor/TorProcessManager.cs b/WalletWasabi/Tor/TorProcessManager.cs
index e0afa85a07..c4b9897ed8 100644
--- a/WalletWasabi/Tor/TorProcessManager.cs
+++ b/WalletWasabi/Tor/TorProcessManager.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
diff --git a/WalletWasabi/Userfacing/CurrencyInput.cs b/WalletWasabi/Userfacing/CurrencyInput.cs
index 253128b198..987464d1ac 100644
--- a/WalletWasabi/Userfacing/CurrencyInput.cs
+++ b/WalletWasabi/Userfacing/CurrencyInput.cs
@@ -1,6 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
 
 namespace WalletWasabi.Userfacing;
diff --git a/WalletWasabi/WabiSabi/Backend/Banning/ApiResponse.cs b/WalletWasabi/WabiSabi/Backend/Banning/ApiResponse.cs
index be012cc983..fa583b48e3 100644
--- a/WalletWasabi/WabiSabi/Backend/Banning/ApiResponse.cs
+++ b/WalletWasabi/WabiSabi/Backend/Banning/ApiResponse.cs
@@ -1,3 +1,3 @@
 namespace WalletWasabi.WabiSabi.Backend.Banning;
 
-public record ApiResponse(ApiResponseInfo Info, string Provider, bool ShouldBan, bool ShouldRemove, string Details);
+public record ApiResponse(ApiResponseInfo Info, string Provider, bool ShouldBan, bool ShouldRemove, string Details, TimeSpan RecommendedBanTime);
diff --git a/WalletWasabi/WabiSabi/Backend/Banning/CoinVerifier.cs b/WalletWasabi/WabiSabi/Backend/Banning/CoinVerifier.cs
index aba8d0b630..17f0f9cc9c 100644
--- a/WalletWasabi/WabiSabi/Backend/Banning/CoinVerifier.cs
+++ b/WalletWasabi/WabiSabi/Backend/Banning/CoinVerifier.cs
@@ -32,7 +32,21 @@ internal CoinVerifier(CoinJoinIdStore coinJoinIdStore, CoinVerifierApiClient api
 		VerifierAuditArchiver = auditArchiver ?? new("test/directory/path");
 	}
 
-	public event EventHandler<Coin>? CoinBlacklisted;
+	public class CoinBlacklistedEventArgs : EventArgs
+	{
+		public Coin Coin { get; }
+		public TimeSpan RecommendedBanTime { get; }
+		public string Provider { get; }
+
+		public CoinBlacklistedEventArgs(Coin coin, TimeSpan recommendedBanTime, string provider)
+		{
+			Coin = coin;
+			RecommendedBanTime = recommendedBanTime;
+			Provider = provider;
+		}
+	}
+
+	public event EventHandler<CoinBlacklistedEventArgs>? CoinBlacklisted;
 
 	// This should be much bigger than the possible input-reg period.
 	private TimeSpan AbsoluteScheduleSanityTimeout { get; } = TimeSpan.FromDays(2);
@@ -231,7 +245,7 @@ public bool TryScheduleVerification(Coin coin, TimeSpan delayedStart, int confir
 					// We got a definitive answer.
 					if (apiResponseItem.ShouldBan)
 					{
-						CoinBlacklisted?.SafeInvoke(this, coin);
+						CoinBlacklisted?.SafeInvoke(this, new CoinBlacklistedEventArgs(coin, apiResponseItem.RecommendedBanTime, apiResponseItem.Provider));
 					}
 					else if (!apiResponseItem.ShouldRemove)
 					{
diff --git a/WalletWasabi/WabiSabi/Backend/Banning/CoinVerifierApiClient.cs b/WalletWasabi/WabiSabi/Backend/Banning/CoinVerifierApiClient.cs
index d7ea919a3f..eaf5df6e85 100644
--- a/WalletWasabi/WabiSabi/Backend/Banning/CoinVerifierApiClient.cs
+++ b/WalletWasabi/WabiSabi/Backend/Banning/CoinVerifierApiClient.cs
@@ -32,7 +32,7 @@ public async Task<ApiResponse> SendRequestAsync(Coin coin, int coinBlockHeight,
 				return response;
 			}
 		}
-		response ??= new(ApiResponseInfo.OK, "none", true, true, "No providers");
+		response ??= new(ApiResponseInfo.OK, "none", true, true, "No providers", TimeSpan.FromHours(1));
 		return response;
 	}
 
diff --git a/WalletWasabi/WabiSabi/Backend/DoSPrevention/DoSConfiguration.cs b/WalletWasabi/WabiSabi/Backend/DoSPrevention/DoSConfiguration.cs
index e3653e30f2..129ec3f045 100644
--- a/WalletWasabi/WabiSabi/Backend/DoSPrevention/DoSConfiguration.cs
+++ b/WalletWasabi/WabiSabi/Backend/DoSPrevention/DoSConfiguration.cs
@@ -3,6 +3,7 @@ namespace WalletWasabi.WabiSabi.Backend.DoSPrevention;
 public record DoSConfiguration(
 	decimal SeverityInBitcoinsPerHour,
 	TimeSpan MinTimeForFailedToVerify,
+	TimeSpan SimplifiedPunishment,
 	TimeSpan MinTimeForCheating,
 	TimeSpan MinTimeInPrison,
 	decimal PenaltyFactorForDisruptingConfirmation,
diff --git a/WalletWasabi/WabiSabi/Backend/DoSPrevention/Offender.cs b/WalletWasabi/WabiSabi/Backend/DoSPrevention/Offender.cs
index 0c20592d70..97ac85935c 100644
--- a/WalletWasabi/WabiSabi/Backend/DoSPrevention/Offender.cs
+++ b/WalletWasabi/WabiSabi/Backend/DoSPrevention/Offender.cs
@@ -1,7 +1,9 @@
+using NBitcoin;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
-using NBitcoin;
 using WalletWasabi.Extensions;
+using WalletWasabi.WabiSabi.Models;
 
 namespace WalletWasabi.WabiSabi.Backend.DoSPrevention;
 
@@ -18,12 +20,12 @@ public abstract record Offense();
 
 public record RoundDisruption(IEnumerable<uint256> DisruptedRoundIds, Money Value, RoundDisruptionMethod Method) : Offense
 {
-	public	RoundDisruption(uint256 disruptedRoundId, Money value, RoundDisruptionMethod method)
-		: this(disruptedRoundId.Singleton(), value, method) {}
+	public RoundDisruption(uint256 disruptedRoundId, Money value, RoundDisruptionMethod method)
+		: this(disruptedRoundId.Singleton(), value, method) { }
 }
 public record BackendStabilitySafety(uint256 RoundId) : Offense;
-public record FailedToVerify(uint256 VerifiedInRoundId) : Offense;
-public record Inherited(OutPoint[] Ancestors) : Offense;
+public record FailedToVerify(uint256 VerifiedInRoundId, TimeSpan RecommendedBanTime, string Provider) : Offense;
+public record Inherited(OutPoint[] Ancestors, InputBannedReasonEnum[] InputBannedReasonEnums) : Offense;
 public record Cheating(uint256 RoundId) : Offense;
 
 public record Offender(OutPoint OutPoint, DateTimeOffset StartedTime, Offense Offense)
@@ -54,25 +56,36 @@ IEnumerable<string> SerializedElements()
 						yield return disruptedRoundId.ToString();
 					}
 					break;
+
 				case BackendStabilitySafety backendStabilitySafety:
 					yield return nameof(BackendStabilitySafety);
 					yield return backendStabilitySafety.RoundId.ToString();
 					break;
+
 				case FailedToVerify fv:
 					yield return nameof(FailedToVerify);
 					yield return fv.VerifiedInRoundId.ToString();
+					yield return fv.RecommendedBanTime.ToString();
+					yield return fv.Provider;
 					break;
+
 				case Inherited inherited:
 					yield return nameof(Inherited);
 					foreach (var ancestor in inherited.Ancestors)
 					{
 						yield return ancestor.ToString();
 					}
+					foreach (var reason in inherited.InputBannedReasonEnums)
+					{
+						yield return reason.ToString();
+					}
 					break;
+
 				case Cheating cheating:
 					yield return nameof(Cheating);
 					yield return cheating.RoundId.ToString();
 					break;
+
 				default:
 					throw new NotImplementedException("Cannot serialize an unknown offense type.");
 			}
@@ -84,7 +97,6 @@ IEnumerable<string> SerializedElements()
 	public static Offender FromStringLine(string str)
 	{
 		var parts = str.Split(Separator);
-
 		var startedTime = DateTimeOffset.FromUnixTimeSeconds(long.Parse(parts[0]));
 		var outpoint = OutPoint.Parse(parts[1]);
 
@@ -106,20 +118,103 @@ public static Offender FromStringLine(string str)
 			nameof(BackendStabilitySafety) =>
 				new BackendStabilitySafety(uint256.Parse(parts[3])),
 			nameof(FailedToVerify) =>
-				new FailedToVerify(uint256.Parse(parts[3])),
+				new FailedToVerify(
+					VerifiedInRoundId: uint256.Parse(parts[3]),
+					RecommendedBanTime: parts.Length > 4 ? TimeSpan.Parse(parts[4], CultureInfo.InvariantCulture) : TimeSpan.Zero,
+					Provider: parts.Length > 5 ? parts[5] : ""),
 			nameof(Inherited) =>
 				ParseInheritedOffense(),
 			nameof(Cheating) =>
 				new Cheating(uint256.Parse(parts[3])),
-		_ => throw new NotImplementedException("Cannot deserialize an unknown offense type.")
+			_ => throw new NotImplementedException("Cannot deserialize an unknown offense type.")
 		};
 
 		return new Offender(outpoint, startedTime, offense);
 
 		Offense ParseInheritedOffense()
 		{
-			var ancestors = parts.Skip(3).Select(OutPoint.Parse).ToArray();
-			return new Inherited(ancestors);
+			List<OutPoint> ancestors = [];
+			List<InputBannedReasonEnum> reasons = [];
+
+			foreach (var ancestorOrReason in parts.Skip(3))
+			{
+				if (OutPoint.TryParse(ancestorOrReason, out var outPoint))
+				{
+					ancestors.Add(outPoint!);
+				}
+				else if (Enum.TryParse<InputBannedReasonEnum>(ancestorOrReason, true, out var reason))
+				{
+					reasons.Add(reason);
+				}
+			}
+
+			return new Inherited(ancestors.ToArray(), reasons.ToArray());
 		}
 	}
+
+	public InputBannedReasonEnum[] GetReasonEnums()
+	{
+		return GetReasonEnums(this);
+	}
+
+	private static InputBannedReasonEnum[] GetReasonEnums(Offender offender)
+	{
+		List<InputBannedReasonEnum> reasonEnums = [];
+
+		switch (offender.Offense)
+		{
+			case RoundDisruption rd:
+				switch (rd.Method)
+				{
+					case RoundDisruptionMethod.DidNotConfirm:
+						reasonEnums.Add(InputBannedReasonEnum.RoundDisruptionMethodDidNotConfirm);
+						break;
+
+					case RoundDisruptionMethod.DidNotSignalReadyToSign:
+						reasonEnums.Add(InputBannedReasonEnum.RoundDisruptionMethodDidNotSignalReadyToSign);
+						break;
+
+					case RoundDisruptionMethod.DidNotSign:
+						reasonEnums.Add(InputBannedReasonEnum.RoundDisruptionMethodDidNotSign);
+						break;
+
+					case RoundDisruptionMethod.DoubleSpent:
+						reasonEnums.Add(InputBannedReasonEnum.RoundDisruptionMethodDoubleSpent);
+						break;
+
+					default:
+						throw new NotImplementedException("Unknown round disruption method.");
+				}
+				break;
+
+			case BackendStabilitySafety:
+				reasonEnums.Add(InputBannedReasonEnum.BackendStabilitySafety);
+				break;
+
+			case FailedToVerify ftv:
+				if (string.Equals(ftv.Provider, "local", StringComparison.InvariantCultureIgnoreCase))
+				{
+					reasonEnums.Add(InputBannedReasonEnum.LocalCoinVerifier);
+				}
+				else
+				{
+					reasonEnums.Add(InputBannedReasonEnum.FailedToVerify);
+				}
+				break;
+
+			case Inherited inherited:
+				reasonEnums.Add(InputBannedReasonEnum.Inherited);
+				reasonEnums.AddRange(inherited.InputBannedReasonEnums);
+				break;
+
+			case Cheating:
+				reasonEnums.Add(InputBannedReasonEnum.Cheating);
+				break;
+
+			default:
+				throw new NotImplementedException("Unknown offense type.");
+		}
+
+		return reasonEnums.Distinct().ToArray();
+	}
 }
diff --git a/WalletWasabi/WabiSabi/Backend/DoSPrevention/Prison.cs b/WalletWasabi/WabiSabi/Backend/DoSPrevention/Prison.cs
index a0b02e6e0d..1b4cff3b9e 100644
--- a/WalletWasabi/WabiSabi/Backend/DoSPrevention/Prison.cs
+++ b/WalletWasabi/WabiSabi/Backend/DoSPrevention/Prison.cs
@@ -5,6 +5,7 @@
 using WalletWasabi.Logging;
 using WalletWasabi.WabiSabi.Backend.Rounds;
 using WalletWasabi.WabiSabi.Backend.Rounds.CoinJoinStorage;
+using WalletWasabi.WabiSabi.Models;
 
 namespace WalletWasabi.WabiSabi.Backend.DoSPrevention;
 
@@ -20,7 +21,7 @@ public Prison(ICoinJoinIdStore coinJoinIdStore, IEnumerable<Offender> offenders,
 	private ICoinJoinIdStore CoinJoinIdStore { get; }
 	private ChannelWriter<Offender> NotificationChannelWriter { get; }
 	private Dictionary<uint256, List<Offender>> OffendersByTxId { get; }
-	private Dictionary<OutPoint, TimeFrame> BanningTimeCache { get; } = new();
+	private Dictionary<OutPoint, BanItem> BanningTimeCache { get; } = new();
 
 	/// <remarks>Lock object to guard <see cref="OffendersByTxId"/>and <see cref="BanningTimeCache"/></remarks>
 	private object Lock { get; } = new();
@@ -34,8 +35,8 @@ public void FailedToConfirm(OutPoint outPoint, Money value, uint256 roundId) =>
 	public void FailedToSign(OutPoint outPoint, Money value, uint256 roundId) =>
 		Punish(new Offender(outPoint, DateTimeOffset.UtcNow, new RoundDisruption(roundId, value, RoundDisruptionMethod.DidNotSign)));
 
-	public void FailedVerification(OutPoint outPoint, uint256 roundId) =>
-		Punish(new Offender(outPoint, DateTimeOffset.UtcNow, new FailedToVerify(roundId)));
+	public void FailedVerification(OutPoint outPoint, uint256 roundId, TimeSpan recommendedBanTime, string provider) =>
+		Punish(new Offender(outPoint, DateTimeOffset.UtcNow, new FailedToVerify(roundId, recommendedBanTime, provider)));
 
 	public void CheatingDetected(OutPoint outPoint, uint256 roundId) =>
 		Punish(new Offender(outPoint, DateTimeOffset.UtcNow, new Cheating(roundId)));
@@ -46,16 +47,16 @@ public void DoubleSpent(OutPoint outPoint, Money value, uint256 roundId) =>
 	public void DoubleSpent(OutPoint outPoint, Money value, IEnumerable<uint256> roundIds) =>
 		Punish(new Offender(outPoint, DateTimeOffset.UtcNow, new RoundDisruption(roundIds, value, RoundDisruptionMethod.DoubleSpent)));
 
-	public void InheritPunishment(OutPoint outpoint, OutPoint[] ancestors) =>
-		Punish(new Offender(outpoint, DateTimeOffset.UtcNow, new Inherited(ancestors)));
+	public void InheritPunishment(OutPoint outpoint, OutPoint[] outPoints, InputBannedReasonEnum[] inputBannedReasonEnum) =>
+		Punish(new Offender(outpoint, DateTimeOffset.UtcNow, new Inherited(outPoints, inputBannedReasonEnum)));
 
 	public void FailedToSignalReadyToSign(OutPoint outPoint, Money value, uint256 roundId) =>
 		Punish(new Offender(outPoint, DateTimeOffset.UtcNow, new RoundDisruption(roundId, value, RoundDisruptionMethod.DidNotSignalReadyToSign)));
 
 	public bool IsBanned(OutPoint outpoint, DoSConfiguration configuration, DateTimeOffset when) =>
-		GetBanTimePeriod(outpoint, configuration).Includes(when);
+		GetBan(outpoint, configuration).BanningTime.Includes(when);
 
-	public TimeFrame GetBanTimePeriod(OutPoint outpoint, DoSConfiguration configuration)
+	public BanItem GetBan(OutPoint outpoint, DoSConfiguration configuration)
 	{
 		TimeFrame EffectiveMinTimeFrame(TimeFrame banningPeriod) =>
 			banningPeriod.Duration < configuration.MinTimeInPrison
@@ -64,6 +65,11 @@ TimeFrame EffectiveMinTimeFrame(TimeFrame banningPeriod) =>
 
 		TimeSpan CalculatePunishment(Offender offender, RoundDisruption disruption)
 		{
+			if (configuration.SimplifiedPunishment > TimeSpan.Zero)
+			{
+				return configuration.SimplifiedPunishment;
+			}
+
 			var basePunishmentInHours = configuration.SeverityInBitcoinsPerHour / disruption.Value.ToDecimal(MoneyUnit.BTC);
 
 			IReadOnlyList<RoundDisruption> offenderHistory;
@@ -102,7 +108,7 @@ TimeSpan CalculatePunishment(Offender offender, RoundDisruption disruption)
 		TimeFrame CalculatePunishmentInheritance(OutPoint[] ancestors)
 		{
 			var banningTimeFrame = ancestors
-				.Select(a => (Ancestor: a, BanningTime: GetBanTimePeriod(a, configuration)))
+				.Select(a => (Ancestor: a, BanningTime: GetBan(a, configuration).BanningTime))
 				.MaxBy(x => x.BanningTime.EndTime)
 				.BanningTime;
 			return new TimeFrame(banningTimeFrame.StartTime, banningTimeFrame.Duration / 2);
@@ -125,18 +131,20 @@ TimeFrame CalculatePunishmentInheritance(OutPoint[] ancestors)
 		{
 			null => TimeFrame.Zero,
 			{ Offense: BackendStabilitySafety } => new TimeFrame(offender.StartedTime, configuration.MinTimeInPrison + TimeSpan.FromHours(new Random().Next(0, 4))),
-			{ Offense: FailedToVerify } => new TimeFrame(offender.StartedTime, configuration.MinTimeForFailedToVerify),
+			{ Offense: FailedToVerify offense } => new TimeFrame(offender.StartedTime, offense.RecommendedBanTime > TimeSpan.Zero ? offense.RecommendedBanTime : configuration.MinTimeForFailedToVerify),
 			{ Offense: Cheating } => new TimeFrame(offender.StartedTime, configuration.MinTimeForCheating),
 			{ Offense: RoundDisruption offense } => new TimeFrame(offender.StartedTime, CalculatePunishment(offender, offense)),
 			{ Offense: Inherited { Ancestors: { } ancestors } } => CalculatePunishmentInheritance(ancestors),
 			_ => throw new NotSupportedException("Unknown offense type.")
 		});
 
+		var result = new BanItem(banningTime, offender?.GetReasonEnums() ?? []);
+
 		lock (Lock)
 		{
-			BanningTimeCache[outpoint] = banningTime;
+			BanningTimeCache[outpoint] = result;
 		}
-		return banningTime;
+		return result;
 	}
 
 	private void Punish(Offender offender)
@@ -165,3 +173,11 @@ public int GetCount()
 		return OffendersByTxId.Count;
 	}
 }
+
+public record BanItem(TimeFrame BanningTime, InputBannedReasonEnum[] Reasons)
+{
+	public override string ToString()
+	{
+		return $"BannItem {{ BanningTime duration = {BanningTime.Duration}, Reasons = '{string.Join(",", Reasons.Select(r => r.ToString()))}' }}";
+	}
+}
diff --git a/WalletWasabi/WabiSabi/Backend/Models/InputBannedExceptionData.cs b/WalletWasabi/WabiSabi/Backend/Models/InputBannedExceptionData.cs
index 236edc6709..5981d202b4 100644
--- a/WalletWasabi/WabiSabi/Backend/Models/InputBannedExceptionData.cs
+++ b/WalletWasabi/WabiSabi/Backend/Models/InputBannedExceptionData.cs
@@ -1,3 +1,7 @@
+using WalletWasabi.WabiSabi.Models;
+
 namespace WalletWasabi.WabiSabi.Backend.Models;
 
-public record InputBannedExceptionData(DateTimeOffset BannedUntil) : ExceptionData;
+public record InputBannedExceptionData(
+	DateTimeOffset BannedUntil,
+	InputBannedReasonEnum[]? InputBannedReasonEnums = null) : ExceptionData;
diff --git a/WalletWasabi/WabiSabi/Backend/Rounds/Arena.Partial.cs b/WalletWasabi/WabiSabi/Backend/Rounds/Arena.Partial.cs
index 7f00c254ba..fb8bb23124 100644
--- a/WalletWasabi/WabiSabi/Backend/Rounds/Arena.Partial.cs
+++ b/WalletWasabi/WabiSabi/Backend/Rounds/Arena.Partial.cs
@@ -422,11 +422,12 @@ public async Task<RoundRecommendationResponse> GetRecommendationAsync(RoundRecom
 
 	private void CheckCoinIsNotBanned(OutPoint input, Round round)
 	{
-		var banningTime = Prison.GetBanTimePeriod(input, Config.GetDoSConfiguration());
-		if (banningTime.Includes(DateTimeOffset.UtcNow))
+		var bannItem = Prison.GetBan(input, Config.GetDoSConfiguration());
+
+		if (bannItem.BanningTime.Includes(DateTimeOffset.UtcNow))
 		{
-			round.LogInfo($"{input} rejected. Banned until {banningTime.EndTime}");
-			throw new WabiSabiProtocolException(WabiSabiProtocolErrorCode.InputBanned, exceptionData: new InputBannedExceptionData(banningTime.EndTime));
+			round.LogInfo($"{input} rejected. {bannItem}");
+			throw new WabiSabiProtocolException(WabiSabiProtocolErrorCode.InputBanned, exceptionData: new InputBannedExceptionData(bannItem.BanningTime.EndTime, bannItem.Reasons));
 		}
 	}
 
diff --git a/WalletWasabi/WabiSabi/Backend/Rounds/Arena.cs b/WalletWasabi/WabiSabi/Backend/Rounds/Arena.cs
index 2f85d0313f..689392f66d 100644
--- a/WalletWasabi/WabiSabi/Backend/Rounds/Arena.cs
+++ b/WalletWasabi/WabiSabi/Backend/Rounds/Arena.cs
@@ -758,14 +758,14 @@ private Script GetCoordinatorScriptPreventReuse(Round round)
 		return coordinatorScriptPubKey;
 	}
 
-	private void CoinVerifier_CoinBlacklisted(object? _, Coin coin)
+	private void CoinVerifier_CoinBlacklisted(object? _, CoinVerifier.CoinBlacklistedEventArgs args)
 	{
 		// For logging reason Prison needs the roundId.
-		var roundState = RoundStates.FirstOrDefault(rs => rs.CoinjoinState.Inputs.Any(input => input.Outpoint == coin.Outpoint));
+		var roundState = RoundStates.FirstOrDefault(rs => rs.CoinjoinState.Inputs.Any(input => input.Outpoint == args.Coin.Outpoint));
 
 		// Could be a coin from WW1.
 		var roundId = roundState?.Id ?? uint256.Zero;
-		Prison.FailedVerification(coin.Outpoint, roundId);
+		Prison.FailedVerification(args.Coin.Outpoint, roundId, args.RecommendedBanTime, args.Provider);
 	}
 
 	private void AddRound(Round round)
diff --git a/WalletWasabi/WabiSabi/Backend/Rounds/RoundParameters.cs b/WalletWasabi/WabiSabi/Backend/Rounds/RoundParameters.cs
index 2b8172d1fa..c3d7d02641 100644
--- a/WalletWasabi/WabiSabi/Backend/Rounds/RoundParameters.cs
+++ b/WalletWasabi/WabiSabi/Backend/Rounds/RoundParameters.cs
@@ -1,7 +1,6 @@
 using System.Collections.Immutable;
 using NBitcoin;
 using NBitcoin.Policy;
-using WalletWasabi.Helpers;
 using WalletWasabi.WabiSabi.Models;
 using WalletWasabi.WabiSabi.Models.MultipartyTransaction;
 
diff --git a/WalletWasabi/WabiSabi/Backend/WabiSabiConfig.cs b/WalletWasabi/WabiSabi/Backend/WabiSabiConfig.cs
index 168ab4b58d..aaa110fd73 100644
--- a/WalletWasabi/WabiSabi/Backend/WabiSabiConfig.cs
+++ b/WalletWasabi/WabiSabi/Backend/WabiSabiConfig.cs
@@ -34,6 +34,10 @@ public WabiSabiConfig() : base()
 	[JsonProperty(PropertyName = "DoSMinTimeForFailedToVerify", DefaultValueHandling = DefaultValueHandling.Populate)]
 	public TimeSpan DoSMinTimeForFailedToVerify { get; set; } = TimeSpan.FromDays(31);
 
+	[DefaultValueTimeSpan("1d 0h 0m 0s")]
+	[JsonProperty(PropertyName = "DoSSimplifiedPunishment", DefaultValueHandling = DefaultValueHandling.Populate)]
+	public TimeSpan DoSSimplifiedPunishment { get; set; } = TimeSpan.FromDays(1);
+
 	[DefaultValueTimeSpan("1d 0h 0m 0s")]
 	[JsonProperty(PropertyName = "DoSMinTimeForCheating", DefaultValueHandling = DefaultValueHandling.Populate)]
 	public TimeSpan DoSMinTimeForCheating { get; set; } = TimeSpan.FromDays(1);
@@ -249,6 +253,7 @@ public DoSConfiguration GetDoSConfiguration() =>
 		new(
 			SeverityInBitcoinsPerHour: DoSSeverity.ToDecimal(MoneyUnit.BTC),
 			MinTimeForFailedToVerify: DoSMinTimeForFailedToVerify,
+			SimplifiedPunishment: DoSSimplifiedPunishment,
 			MinTimeForCheating: DoSMinTimeForCheating,
 			PenaltyFactorForDisruptingConfirmation: (decimal)DoSPenaltyFactorForDisruptingConfirmation,
 			PenaltyFactorForDisruptingSignalReadyToSign: (decimal)DoSPenaltyFactorForDisruptingSignalReadyToSign,
diff --git a/WalletWasabi/WabiSabi/Client/Banning/CoinPrison.cs b/WalletWasabi/WabiSabi/Client/Banning/CoinPrison.cs
index dd9af9ccb8..ae5ee16a3f 100644
--- a/WalletWasabi/WabiSabi/Client/Banning/CoinPrison.cs
+++ b/WalletWasabi/WabiSabi/Client/Banning/CoinPrison.cs
@@ -6,14 +6,15 @@
 using WalletWasabi.Blockchain.TransactionOutputs;
 using WalletWasabi.Helpers;
 using WalletWasabi.Logging;
+using WalletWasabi.WabiSabi.Models;
 using WalletWasabi.Wallets;
 
 namespace WalletWasabi.WabiSabi.Client.Banning;
 
 public class CoinPrison : IDisposable
 {
-	// Coins with banning time longer than this will be reduced to a random value between 2 and 4 days.
-	private static readonly int MaxDaysToTrustLocalPrison = 4;
+	// Coins with banning time longer than this will be reduced to a random value between 1 and 2 days.
+	private static readonly int MaxDaysToTrustLocalPrison = 2;
 
 	public CoinPrison(string filePath)
 	{
@@ -24,16 +25,16 @@ public CoinPrison(string filePath)
 	private string FilePath { get; }
 	private object Lock { get; set; } = new();
 
-	public bool TryGetOrRemoveBannedCoin(SmartCoin coin, [NotNullWhen(true)] out DateTimeOffset? bannedUntil)
+	public bool TryGetOrRemoveBannedCoin(SmartCoin coin, [NotNullWhen(true)] out PrisonedCoinRecord? prisonedCoin)
 	{
 		lock (Lock)
 		{
-			bannedUntil = null;
-			if (BannedCoins.SingleOrDefault(record => record.Outpoint == coin.Outpoint) is { } record)
+			prisonedCoin = null;
+			if (BannedCoins.SingleOrDefault(x => x.Outpoint == coin.Outpoint) is { } record)
 			{
 				if (DateTimeOffset.UtcNow < record.BannedUntil)
 				{
-					bannedUntil = record.BannedUntil;
+					prisonedCoin = record;
 					return true;
 				}
 				RemoveBannedCoinNoLock(coin);
@@ -42,7 +43,7 @@ public bool TryGetOrRemoveBannedCoin(SmartCoin coin, [NotNullWhen(true)] out Dat
 		}
 	}
 
-	public void Ban(SmartCoin coin, DateTimeOffset until)
+	public void Ban(SmartCoin coin, DateTimeOffset until, InputBannedReasonEnum[] reasons)
 	{
 		lock (Lock)
 		{
@@ -52,8 +53,9 @@ public void Ban(SmartCoin coin, DateTimeOffset until)
 			}
 
 			until = ReduceBanningTimeIfNeeded(until);
-			BannedCoins.Add(new(coin.Outpoint, until));
+			BannedCoins.Add(new(coin.Outpoint, until, reasons));
 			coin.BannedUntilUtc = until;
+			coin.BanReasons = reasons;
 			ToFile();
 		}
 	}
@@ -86,7 +88,7 @@ private void ToFile()
 	/// <summary>
 	///	Reduces local banning time, which we save to disk, if it's longer than the <see cref="MaxDaysToTrustLocalPrison"/>.
 	///	This is to avoid saving absurd long banning times like 1-2 years.
-	///	With this, the coin will retry to participate in a CJ in every 2-4 days and see if the coin is still banned or not according to the backend.
+	///	With this, the coin will retry to participate in a CJ in every 1-2 days and see if the coin is still banned or not according to the backend.
 	///	Random values are used for the new banning period so we don't leak information to the coordinator when the coins get released from the local prison.
 	/// </summary>
 	/// <param name="bannedUntil">Banning time according to the backend.</param>
@@ -144,9 +146,10 @@ public void UpdateWallet(Wallet wallet)
 	{
 		foreach (var coin in wallet.Coins)
 		{
-			if (TryGetOrRemoveBannedCoin(coin, out var bannedUntil))
+			if (TryGetOrRemoveBannedCoin(coin, out var prisonedCoin))
 			{
-				coin.BannedUntilUtc = bannedUntil;
+				coin.BannedUntilUtc = prisonedCoin.BannedUntil;
+				coin.BanReasons = prisonedCoin.Reasons;
 			}
 		}
 	}
diff --git a/WalletWasabi/WabiSabi/Client/Banning/PrisonedCoinRecord.cs b/WalletWasabi/WabiSabi/Client/Banning/PrisonedCoinRecord.cs
index 0bd5402475..7207c4d5cc 100644
--- a/WalletWasabi/WabiSabi/Client/Banning/PrisonedCoinRecord.cs
+++ b/WalletWasabi/WabiSabi/Client/Banning/PrisonedCoinRecord.cs
@@ -1,15 +1,17 @@
 using NBitcoin;
 using Newtonsoft.Json;
 using WalletWasabi.JsonConverters;
+using WalletWasabi.WabiSabi.Models;
 
 namespace WalletWasabi.WabiSabi.Client.Banning;
 
 public record PrisonedCoinRecord
 {
-	public PrisonedCoinRecord(OutPoint outpoint, DateTimeOffset bannedUntil)
+	public PrisonedCoinRecord(OutPoint outpoint, DateTimeOffset bannedUntil, InputBannedReasonEnum[] reasons)
 	{
 		Outpoint = outpoint;
 		BannedUntil = bannedUntil;
+		Reasons = reasons;
 	}
 
 	[JsonProperty]
@@ -17,4 +19,5 @@ public PrisonedCoinRecord(OutPoint outpoint, DateTimeOffset bannedUntil)
 	public OutPoint Outpoint { get; set; }
 
 	public DateTimeOffset BannedUntil { get; set; }
+	public InputBannedReasonEnum[] Reasons { get; set; }
 }
diff --git a/WalletWasabi/WabiSabi/Client/CoinJoin/Client/CoinJoinClient.cs b/WalletWasabi/WabiSabi/Client/CoinJoin/Client/CoinJoinClient.cs
index e73c314717..5d63d317ee 100644
--- a/WalletWasabi/WabiSabi/Client/CoinJoin/Client/CoinJoinClient.cs
+++ b/WalletWasabi/WabiSabi/Client/CoinJoin/Client/CoinJoinClient.cs
@@ -528,7 +528,8 @@ public async Task<CoinJoinResult> StartRoundAsync(IEnumerable<SmartCoin> smartCo
 							Logger.LogError($"{nameof(InputBannedExceptionData)} is missing.");
 						}
 						var bannedUntil = inputBannedExData?.BannedUntil ?? DateTimeOffset.UtcNow + TimeSpan.FromDays(1);
-						CoinJoinClientProgress.SafeInvoke(this, new CoinBanned(coin, bannedUntil));
+
+						CoinJoinClientProgress.SafeInvoke(this, new CoinBanned(coin, bannedUntil, inputBannedExData?.InputBannedReasonEnums ?? []));
 						roundState.LogInfo($"{coin.Coin.Outpoint} is banned until {bannedUntil}.");
 						break;
 
diff --git a/WalletWasabi/WabiSabi/Client/CoinJoin/Client/CoinJoinProgressEvents/CoinBanned.cs b/WalletWasabi/WabiSabi/Client/CoinJoin/Client/CoinJoinProgressEvents/CoinBanned.cs
index bc424c52cd..ea6fede33f 100644
--- a/WalletWasabi/WabiSabi/Client/CoinJoin/Client/CoinJoinProgressEvents/CoinBanned.cs
+++ b/WalletWasabi/WabiSabi/Client/CoinJoin/Client/CoinJoinProgressEvents/CoinBanned.cs
@@ -1,15 +1,18 @@
 using WalletWasabi.Blockchain.TransactionOutputs;
+using WalletWasabi.WabiSabi.Models;
 
 namespace WalletWasabi.WabiSabi.Client.CoinJoinProgressEvents;
 
 public class CoinBanned : CoinJoinProgressEventArgs
 {
-	public CoinBanned(SmartCoin coin, DateTimeOffset banUntilUtc)
+	public CoinBanned(SmartCoin coin, DateTimeOffset banUntilUtc, InputBannedReasonEnum[] reasons)
 	{
 		Coin = coin;
 		BanUntilUtc = banUntilUtc;
+		Reasons = reasons;
 	}
 
 	public SmartCoin Coin { get; }
 	public DateTimeOffset BanUntilUtc { get; }
+	public InputBannedReasonEnum[] Reasons { get; }
 }
diff --git a/WalletWasabi/WabiSabi/Client/CoinJoin/Client/CoinSelectionStatistics.cs b/WalletWasabi/WabiSabi/Client/CoinJoin/Client/CoinSelectionStatistics.cs
index c83c7e8210..f8bf12594d 100644
--- a/WalletWasabi/WabiSabi/Client/CoinJoin/Client/CoinSelectionStatistics.cs
+++ b/WalletWasabi/WabiSabi/Client/CoinJoin/Client/CoinSelectionStatistics.cs
@@ -1,9 +1,5 @@
 using NBitcoin;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Transactions;
 
 namespace WalletWasabi.WabiSabi.Client.CoinJoin.Client;
 
diff --git a/WalletWasabi/WabiSabi/Client/CoinJoin/Client/DependencyGraphTaskScheduler.cs b/WalletWasabi/WabiSabi/Client/CoinJoin/Client/DependencyGraphTaskScheduler.cs
index d4207ca595..b9b8e61cc2 100644
--- a/WalletWasabi/WabiSabi/Client/CoinJoin/Client/DependencyGraphTaskScheduler.cs
+++ b/WalletWasabi/WabiSabi/Client/CoinJoin/Client/DependencyGraphTaskScheduler.cs
@@ -8,7 +8,6 @@
 using WalletWasabi.Crypto;
 using WalletWasabi.Helpers;
 using WalletWasabi.Logging;
-using WalletWasabi.Userfacing.Bip21;
 using WalletWasabi.WabiSabi.Backend.Models;
 using WalletWasabi.WabiSabi.Client.CredentialDependencies;
 
diff --git a/WalletWasabi/WabiSabi/Client/CoinJoin/Manager/CoinJoinManager.cs b/WalletWasabi/WabiSabi/Client/CoinJoin/Manager/CoinJoinManager.cs
index 56595772e0..de89474e08 100644
--- a/WalletWasabi/WabiSabi/Client/CoinJoin/Manager/CoinJoinManager.cs
+++ b/WalletWasabi/WabiSabi/Client/CoinJoin/Manager/CoinJoinManager.cs
@@ -572,7 +572,7 @@ private async Task HandleCoinJoinFinalizationAsync(CoinJoinTracker finishedCoinJ
 		{
 			foreach (var info in finishedCoinJoin.BannedCoins)
 			{
-				CoinPrison.Ban(info.Coin, info.BanUntilUtc);
+				CoinPrison.Ban(info.Coin, info.BanUntilUtc, info.Reasons);
 			}
 		}
 
diff --git a/WalletWasabi/WabiSabi/Client/IKeyChain.cs b/WalletWasabi/WabiSabi/Client/IKeyChain.cs
index ef3b064785..1fc1a4c31f 100644
--- a/WalletWasabi/WabiSabi/Client/IKeyChain.cs
+++ b/WalletWasabi/WabiSabi/Client/IKeyChain.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using NBitcoin;
 using WalletWasabi.Blockchain.Keys;
 using WalletWasabi.Crypto;
@@ -10,4 +9,6 @@ public interface IKeyChain
 	OwnershipProof GetOwnershipProof(IDestination destination, CoinJoinInputCommitmentData committedData);
 
 	Transaction Sign(Transaction transaction, Coin coin, PrecomputedTransactionData precomputeTransactionData);
+
+	public string SignMessage(string message, HdPubKey hdPubKey);
 }
diff --git a/WalletWasabi/WabiSabi/Client/KeyChain.cs b/WalletWasabi/WabiSabi/Client/KeyChain.cs
index 327505e3bf..f8d923fd23 100644
--- a/WalletWasabi/WabiSabi/Client/KeyChain.cs
+++ b/WalletWasabi/WabiSabi/Client/KeyChain.cs
@@ -61,4 +61,9 @@ public Transaction Sign(Transaction transaction, Coin coin, PrecomputedTransacti
 
 		return transaction;
 	}
+
+	public string SignMessage(string message, HdPubKey hdPubKey)
+	{
+		return KeyManager.SignMessage(Kitchen.SaltSoup(), message, hdPubKey, true, KeyManagerExtension.LegacyHeaderStyle.Standard, false);
+	}
 }
diff --git a/WalletWasabi/WabiSabi/Client/RoundStateAwaiters/RoundStateHolder.cs b/WalletWasabi/WabiSabi/Client/RoundStateAwaiters/RoundStateHolder.cs
index 00d64df23a..843a388b31 100644
--- a/WalletWasabi/WabiSabi/Client/RoundStateAwaiters/RoundStateHolder.cs
+++ b/WalletWasabi/WabiSabi/Client/RoundStateAwaiters/RoundStateHolder.cs
@@ -7,8 +7,6 @@
 using WalletWasabi.WabiSabi.Models.MultipartyTransaction;
 using WalletWasabi.WabiSabi.Models.Serialization;
 using WalletWasabi.WabiSabi.Backend.Rounds;
-using NBitcoin;
-using WalletWasabi.WabiSabi.Crypto;
 
 namespace WalletWasabi.WabiSabi.Client.RoundStateAwaiters;
 
diff --git a/WalletWasabi/WabiSabi/Models/InputBannedReasonEnum.cs b/WalletWasabi/WabiSabi/Models/InputBannedReasonEnum.cs
new file mode 100644
index 0000000000..fcd4dfe8c9
--- /dev/null
+++ b/WalletWasabi/WabiSabi/Models/InputBannedReasonEnum.cs
@@ -0,0 +1,36 @@
+using WalletWasabi.Models;
+
+namespace WalletWasabi.WabiSabi.Models;
+
+public enum InputBannedReasonEnum
+{
+	[FriendlyName(isLocalized: true)]
+	Unknown,
+
+	[FriendlyName(isLocalized: true)]
+	BackendStabilitySafety,
+
+	[FriendlyName(isLocalized: true)]
+	FailedToVerify,
+
+	[FriendlyName(isLocalized: true)]
+	Cheating,
+
+	[FriendlyName(isLocalized: true)]
+	Inherited,
+
+	[FriendlyName(isLocalized: true)]
+	RoundDisruptionMethodDidNotConfirm,
+
+	[FriendlyName(isLocalized: true)]
+	RoundDisruptionMethodDidNotSign,
+
+	[FriendlyName(isLocalized: true)]
+	RoundDisruptionMethodDoubleSpent,
+
+	[FriendlyName(isLocalized: true)]
+	RoundDisruptionMethodDidNotSignalReadyToSign,
+
+	[FriendlyName(isLocalized: true)]
+	LocalCoinVerifier
+}
diff --git a/WalletWasabi/WabiSabi/Models/ReadyToSignRequestRequest.cs b/WalletWasabi/WabiSabi/Models/ReadyToSignRequestRequest.cs
index 7b485ddc2d..fe2bdb0c47 100644
--- a/WalletWasabi/WabiSabi/Models/ReadyToSignRequestRequest.cs
+++ b/WalletWasabi/WabiSabi/Models/ReadyToSignRequestRequest.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using NBitcoin;
 using Newtonsoft.Json;
 
diff --git a/WalletWasabi/WabiSabi/Models/RoundState.cs b/WalletWasabi/WabiSabi/Models/RoundState.cs
index f0490a5770..537638597b 100644
--- a/WalletWasabi/WabiSabi/Models/RoundState.cs
+++ b/WalletWasabi/WabiSabi/Models/RoundState.cs
@@ -1,7 +1,6 @@
 using NBitcoin;
 using WabiSabi.Crypto;
 using WabiSabi.Crypto.Randomness;
-using WalletWasabi.Helpers;
 using WalletWasabi.WabiSabi.Backend.Rounds;
 using WalletWasabi.WabiSabi.Models.MultipartyTransaction;
 using CredentialIssuerParameters = WabiSabi.Crypto.CredentialIssuerParameters;
diff --git a/WalletWasabi/WabiSabi/WabiSabiCoordinator.cs b/WalletWasabi/WabiSabi/WabiSabiCoordinator.cs
index ad52dd19b7..7393044906 100644
--- a/WalletWasabi/WabiSabi/WabiSabiCoordinator.cs
+++ b/WalletWasabi/WabiSabi/WabiSabiCoordinator.cs
@@ -119,18 +119,25 @@ public void BanDescendant(object? sender, Block block)
 	{
 		var now = DateTimeOffset.UtcNow;
 
-		bool IsInputBanned(TxIn input) => Warden.Prison.IsBanned(input.PrevOut, Config.GetDoSConfiguration(), now);
-		OutPoint[] BannedInputs(Transaction tx) => tx.Inputs.Where(IsInputBanned).Select(x => x.PrevOut).ToArray();
+		bool IsInputBanned(BanItem banItem) => banItem.BanningTime.Includes(now);
+		BanItem GetBan(TxIn input) => Warden.Prison.GetBan(input.PrevOut, Config.GetDoSConfiguration());
+
+		BanItem[] BannedInputs(Transaction tx) =>
+			tx.Inputs
+				.Select(GetBan)
+				.Where(IsInputBanned)
+				.Where(b => b.Reasons.Contains(Models.InputBannedReasonEnum.RoundDisruptionMethodDoubleSpent))
+				.ToArray();
 
 		var outpointsToBan = block.Transactions
 			.Where(tx => !DescendantCoinJoinCheck(tx))  // We don't ban coinjoin outputs
 			.Select(tx => (Tx: tx, BannedInputs: BannedInputs(tx)))
 			.Where(x => x.BannedInputs.Length != 0)
-			.SelectMany(x => x.Tx.Outputs.Select((_, i) => (new OutPoint(x.Tx, i), x.BannedInputs)));
+			.SelectMany(x => x.Tx.Outputs.Select((_, i) => (new OutPoint(x.Tx, i), x.Tx.Inputs.Select(tx => tx.PrevOut).ToArray(), x.BannedInputs)));
 
-		foreach (var (outpoint, ancestors) in outpointsToBan)
+		foreach (var (outpoint, ancestors, banItems) in outpointsToBan)
 		{
-			Warden.Prison.InheritPunishment(outpoint, ancestors);
+			Warden.Prison.InheritPunishment(outpoint, ancestors, banItems.SelectMany(bi => bi.Reasons).ToArray());
 		}
 	}
 
diff --git a/WalletWasabi/Wallets/P2PNodesManager.cs b/WalletWasabi/Wallets/P2PNodesManager.cs
index 4f0723144d..497b390cb9 100644
--- a/WalletWasabi/Wallets/P2PNodesManager.cs
+++ b/WalletWasabi/Wallets/P2PNodesManager.cs
@@ -1,7 +1,7 @@
-using System.Threading;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBitcoin.Protocol;
+using System.Threading;
+using System.Threading.Tasks;
 using WabiSabi.Crypto.Randomness;
 using WalletWasabi.Extensions;
 using WalletWasabi.Helpers;
@@ -26,18 +26,30 @@ public P2PNodesManager(Network network, NodesGroup nodes, bool isTorEnabled)
 
 	public async Task<Node?> GetNodeAsync(CancellationToken cancellationToken)
 	{
-		while (Nodes.ConnectedNodes.Count == 0)
+		do
 		{
-			await Task.Delay(100, cancellationToken).ConfigureAwait(false);
-		}
+			if (Nodes.ConnectedNodes.Count > 0)
+			{
+				var node = Nodes.ConnectedNodes.RandomElement(SecureRandom.Instance);
 
-		// Select a random node we are connected to.
-		return Nodes.ConnectedNodes.RandomElement(SecureRandom.Instance);
+				if (node is not null && node.IsConnected)
+				{
+					return node;
+				}
+
+				Logger.LogTrace($"Selected node is null or disconnected.");
+			}
+
+			await Task.Delay(TimeSpan.FromMilliseconds(50), cancellationToken).ConfigureAwait(false);
+
+			cancellationToken.ThrowIfCancellationRequested();
+		}
+		while (true);
 	}
 
 	public void DisconnectNodeIfEnoughPeers(Node node, string reason)
 	{
-		if (Nodes.ConnectedNodes.Count > 3)
+		if (Nodes.ConnectedNodes.Count > 5)
 		{
 			DisconnectNode(node, reason);
 		}
diff --git a/WalletWasabi/Wallets/WalletFilterProcessor.cs b/WalletWasabi/Wallets/WalletFilterProcessor.cs
index 3619e6fea4..2db9f021ce 100644
--- a/WalletWasabi/Wallets/WalletFilterProcessor.cs
+++ b/WalletWasabi/Wallets/WalletFilterProcessor.cs
@@ -9,7 +9,6 @@
 using WalletWasabi.Blockchain.Keys;
 using WalletWasabi.Blockchain.TransactionProcessing;
 using WalletWasabi.Blockchain.Transactions;
-using WalletWasabi.Extensions;
 using WalletWasabi.Filter;
 using WalletWasabi.Logging;
 using WalletWasabi.Models;
diff --git a/WalletWasabi/Wallets/WalletManager.cs b/WalletWasabi/Wallets/WalletManager.cs
index ac0471f98c..a4551cd97a 100644
--- a/WalletWasabi/Wallets/WalletManager.cs
+++ b/WalletWasabi/Wallets/WalletManager.cs
@@ -4,7 +4,6 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
 using WalletWasabi.Blockchain.Keys;
@@ -404,9 +403,12 @@ public async Task RemoveAndStopAllAsync(CancellationToken cancel)
 					if (wallet.State >= WalletState.Initialized)
 					{
 						var keyManager = wallet.KeyManager;
-						string backupWalletFilePath = WalletDirectories.GetWalletFilePaths(Path.GetFileName(keyManager.FilePath)!).walletBackupFilePath;
-						keyManager.ToFile(backupWalletFilePath);
-						Logger.LogInfo($"{nameof(wallet.KeyManager)} backup saved to `{backupWalletFilePath}`.");
+						if (keyManager.FilePath is not null)
+						{
+							string backupWalletFilePath = WalletDirectories.GetWalletFilePaths(Path.GetFileName(keyManager.FilePath)!).walletBackupFilePath;
+							keyManager.ToFile(backupWalletFilePath);
+							Logger.LogInfo($"{nameof(wallet.KeyManager)} backup saved to `{backupWalletFilePath}`.");
+						}
 						await wallet.StopAsync(cancel).ConfigureAwait(false);
 						Logger.LogInfo($"'{wallet.WalletName}' wallet is stopped.");
 					}
diff --git a/WalletWasabi/WebClients/Bitstamp/BitstampExchangeRateProvider.cs b/WalletWasabi/WebClients/Bitstamp/BitstampExchangeRateProvider.cs
index 7e6de2b410..78c5921028 100644
--- a/WalletWasabi/WebClients/Bitstamp/BitstampExchangeRateProvider.cs
+++ b/WalletWasabi/WebClients/Bitstamp/BitstampExchangeRateProvider.cs
@@ -3,7 +3,6 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using GingerCommon.Logging;
 using WalletWasabi.Backend.Models;
 using WalletWasabi.Interfaces;
 using WalletWasabi.Tor.Http.Extensions;
diff --git a/WalletWasabi/WebClients/CoinGecko/CoinGeckoExchangeRateProvider.cs b/WalletWasabi/WebClients/CoinGecko/CoinGeckoExchangeRateProvider.cs
index 21c4bd0816..19e82ac9e2 100644
--- a/WalletWasabi/WebClients/CoinGecko/CoinGeckoExchangeRateProvider.cs
+++ b/WalletWasabi/WebClients/CoinGecko/CoinGeckoExchangeRateProvider.cs
@@ -8,7 +8,6 @@
 using WalletWasabi.Backend.Models;
 using WalletWasabi.Helpers;
 using WalletWasabi.Interfaces;
-using WalletWasabi.Logging;
 using WalletWasabi.Tor.Http.Extensions;
 
 namespace WalletWasabi.WebClients.CoinGecko;
diff --git a/WalletWasabi/WebClients/Coingate/CoingateExchangeRateProvider.cs b/WalletWasabi/WebClients/Coingate/CoingateExchangeRateProvider.cs
index ca1e21bcb8..af408f4c16 100644
--- a/WalletWasabi/WebClients/Coingate/CoingateExchangeRateProvider.cs
+++ b/WalletWasabi/WebClients/Coingate/CoingateExchangeRateProvider.cs
@@ -2,7 +2,6 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using GingerCommon.Logging;
 using WalletWasabi.Backend.Models;
 using WalletWasabi.Interfaces;
 
diff --git a/WalletWasabi/WebClients/Gemini/GeminiExchangeRateProvider.cs b/WalletWasabi/WebClients/Gemini/GeminiExchangeRateProvider.cs
index 04cb3d1d35..4b3601fba4 100644
--- a/WalletWasabi/WebClients/Gemini/GeminiExchangeRateProvider.cs
+++ b/WalletWasabi/WebClients/Gemini/GeminiExchangeRateProvider.cs
@@ -3,7 +3,6 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using GingerCommon.Logging;
 using WalletWasabi.Backend.Models;
 using WalletWasabi.Interfaces;
 using WalletWasabi.Tor.Http.Extensions;