diff --git a/BTCPayServer.Client/BTCPayServerClient.Apps.cs b/BTCPayServer.Client/BTCPayServerClient.Apps.cs
index 4c2aff7ae7..3112467ca1 100644
--- a/BTCPayServer.Client/BTCPayServerClient.Apps.cs
+++ b/BTCPayServer.Client/BTCPayServerClient.Apps.cs
@@ -78,4 +78,14 @@ public virtual async Task DeleteApp(string appId, CancellationToken token = defa
         if (appId == null) throw new ArgumentNullException(nameof(appId));
         await SendHttpRequest($"api/v1/apps/{appId}", null, HttpMethod.Delete, token);
     }
+
+    public virtual async Task<FileData> UploadAppItemImage(string appId, string filePath, string mimeType, CancellationToken token = default)
+    {
+        return await UploadFileRequest<FileData>($"api/v1/apps/{appId}/image", filePath, mimeType, "file", HttpMethod.Post, token);
+    }
+
+    public virtual async Task DeleteAppItemImage(string appId, string fileId, CancellationToken token = default)
+    {
+        await SendHttpRequest($"api/v1/apps/{appId}/image/{fileId}", null, HttpMethod.Delete, token);
+    }
 }
diff --git a/BTCPayServer.Client/BTCPayServerClient.cs b/BTCPayServer.Client/BTCPayServerClient.cs
index 1e3a035354..85adbddf8b 100644
--- a/BTCPayServer.Client/BTCPayServerClient.cs
+++ b/BTCPayServer.Client/BTCPayServerClient.cs
@@ -156,7 +156,7 @@ protected virtual HttpRequestMessage CreateHttpRequest<T>(string path,
     protected virtual async Task<T> UploadFileRequest<T>(string apiPath, string filePath, string mimeType, string formFieldName, HttpMethod method = null, CancellationToken token = default)
     {
         using MultipartFormDataContent multipartContent = new();
-        var fileContent = new StreamContent(File.OpenRead(filePath));
+        using var fileContent = new StreamContent(File.OpenRead(filePath));
         var fileName = Path.GetFileName(filePath);
         fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse(mimeType);
         multipartContent.Add(fileContent, formFieldName, fileName);
diff --git a/BTCPayServer.Common/BTCPayServer.Common.csproj b/BTCPayServer.Common/BTCPayServer.Common.csproj
index e7f8a51303..bfa7a579e0 100644
--- a/BTCPayServer.Common/BTCPayServer.Common.csproj
+++ b/BTCPayServer.Common/BTCPayServer.Common.csproj
@@ -7,7 +7,4 @@
     <PackageReference Include="NBXplorer.Client" Version="4.3.1" />
     <PackageReference Include="NicolasDorier.StandardConfiguration" Version="2.0.1" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Altcoins\" />
-  </ItemGroup>
 </Project>
diff --git a/BTCPayServer.Tests/GreenfieldAPITests.cs b/BTCPayServer.Tests/GreenfieldAPITests.cs
index 307adf15b9..805d93097a 100644
--- a/BTCPayServer.Tests/GreenfieldAPITests.cs
+++ b/BTCPayServer.Tests/GreenfieldAPITests.cs
@@ -318,6 +318,20 @@ await AssertValidationError(["file"],
             Assert.Empty(await client.GetFiles());
             storeData = await client.GetStore(store.Id);
             Assert.Null(storeData.LogoUrl);
+            
+            // App Item Image
+            var app = await client.CreatePointOfSaleApp(store.Id, new PointOfSaleAppRequest { AppName = "Test App" });
+            await AssertValidationError(["file"],
+                async () => await client.UploadAppItemImage(app.Id, filePath, "text/csv")
+            );
+            
+            var fileData = await client.UploadAppItemImage(app.Id, logoPath, "image/png");
+            Assert.Equal("logo.png", fileData.OriginalName);
+            files = await client.GetFiles();
+            Assert.Single(files);
+            
+            await client.DeleteAppItemImage(app.Id, fileData.Id);
+            Assert.Empty(await client.GetFiles());
         }
 
         [Fact(Timeout = TestTimeout)]
diff --git a/BTCPayServer/ColorPalette.cs b/BTCPayServer/ColorPalette.cs
index 462a4350ba..631c549872 100644
--- a/BTCPayServer/ColorPalette.cs
+++ b/BTCPayServer/ColorPalette.cs
@@ -110,5 +110,10 @@ public Color FromHtml(string html)
         {
             return ColorTranslator.FromHtml(html);
         }
+
+        public string ToHtml(Color color)
+        {
+            return ColorTranslator.ToHtml(color);
+        }
     }
 }
diff --git a/BTCPayServer/Components/AppSales/AppSales.cs b/BTCPayServer/Components/AppSales/AppSales.cs
index 4e0d3dbe58..02670e1153 100644
--- a/BTCPayServer/Components/AppSales/AppSales.cs
+++ b/BTCPayServer/Components/AppSales/AppSales.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Security.AccessControl;
 using System.Threading.Tasks;
-using BTCPayServer.Data;
-using BTCPayServer.Models.AppViewModels;
 using BTCPayServer.Services.Apps;
-using BTCPayServer.Services.Stores;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ViewComponents;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
diff --git a/BTCPayServer/Components/AppSales/AppSalesViewModel.cs b/BTCPayServer/Components/AppSales/AppSalesViewModel.cs
index d7fab9e943..3d7513cabf 100644
--- a/BTCPayServer/Components/AppSales/AppSalesViewModel.cs
+++ b/BTCPayServer/Components/AppSales/AppSalesViewModel.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using BTCPayServer.Client.Models;
-using BTCPayServer.Services.Apps;
 
 namespace BTCPayServer.Components.AppSales;
 
diff --git a/BTCPayServer/Components/AppSales/Default.cshtml.js b/BTCPayServer/Components/AppSales/Default.cshtml.js
index 37472d1d77..e3cc686045 100644
--- a/BTCPayServer/Components/AppSales/Default.cshtml.js
+++ b/BTCPayServer/Components/AppSales/Default.cshtml.js
@@ -45,7 +45,6 @@ if (!window.appSales) {
             
             function addEventListeners() {
                 delegate('change', `#${id} [name="AppSalesPeriod-${appId}"]`, async e => {
-                    console.log("CHANGED", id)
                     const type = e.target.value;
                     await update(type);
                 });
diff --git a/BTCPayServer/Components/StoreLightningBalance/StoreLightningBalanceViewModel.cs b/BTCPayServer/Components/StoreLightningBalance/StoreLightningBalanceViewModel.cs
index 6bfd3eec7f..d4d2a1d858 100644
--- a/BTCPayServer/Components/StoreLightningBalance/StoreLightningBalanceViewModel.cs
+++ b/BTCPayServer/Components/StoreLightningBalance/StoreLightningBalanceViewModel.cs
@@ -4,7 +4,6 @@
 using BTCPayServer.Lightning;
 using BTCPayServer.Services.Rates;
 using NBitcoin;
-using StoreData = BTCPayServer.Data.StoreData;
 
 namespace BTCPayServer.Components.StoreLightningBalance;
 
diff --git a/BTCPayServer/Components/StoreLightningServices/Default.cshtml b/BTCPayServer/Components/StoreLightningServices/Default.cshtml
index 3deb55c349..7cc0755f6f 100644
--- a/BTCPayServer/Components/StoreLightningServices/Default.cshtml
+++ b/BTCPayServer/Components/StoreLightningServices/Default.cshtml
@@ -2,14 +2,14 @@
 
 @if (Model.Services != null && Model.Services.Any())
 {
-    <div id="StoreLightningServices-@Model.Store.Id" class="widget store-lightning-services">
+    <div id="StoreLightningServices-@Model.StoreId" class="widget store-lightning-services">
         <header class="mb-4">
             <h6 text-translate="true">Lightning Services</h6>
             <a
                 asp-controller="UIPublicLightningNodeInfo"
                 asp-action="ShowLightningNodeInfo"app-top-items
                 asp-route-cryptoCode="@Model.CryptoCode"
-                asp-route-storeId="@Model.Store.Id"
+                asp-route-storeId="@Model.StoreId"
                 target="_blank"
                 id="PublicNodeInfo"
                 text-translate="true">
diff --git a/BTCPayServer/Components/StoreLightningServices/StoreLightningServices.cs b/BTCPayServer/Components/StoreLightningServices/StoreLightningServices.cs
index 613079a2e1..b3247663c3 100644
--- a/BTCPayServer/Components/StoreLightningServices/StoreLightningServices.cs
+++ b/BTCPayServer/Components/StoreLightningServices/StoreLightningServices.cs
@@ -2,15 +2,16 @@
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Extensions;
+using BTCPayServer.Client;
 using BTCPayServer.Configuration;
 using BTCPayServer.Data;
-using BTCPayServer.Lightning;
 using BTCPayServer.Models;
 using BTCPayServer.Models.StoreViewModels;
 using BTCPayServer.Payments;
 using BTCPayServer.Payments.Lightning;
-using BTCPayServer.Services;
-using BTCPayServer.Services.Stores;
+using BTCPayServer.Security;
+using BTCPayServer.Services.Invoices;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 
@@ -20,24 +21,38 @@ public class StoreLightningServices : ViewComponent
 {
     private readonly BTCPayServerOptions _btcpayServerOptions;
     private readonly BTCPayNetworkProvider _networkProvider;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly PaymentMethodHandlerDictionary _handlers;
+    private readonly IOptions<LightningNetworkOptions> _lightningNetworkOptions;
     private readonly IOptions<ExternalServicesOptions> _externalServiceOptions;
 
     public StoreLightningServices(
         BTCPayNetworkProvider networkProvider,
         BTCPayServerOptions btcpayServerOptions,
+        IAuthorizationService authorizationService,
+        PaymentMethodHandlerDictionary handlers,
+        IOptions<LightningNetworkOptions> lightningNetworkOptions,
         IOptions<ExternalServicesOptions> externalServiceOptions)
     {
         _networkProvider = networkProvider;
         _btcpayServerOptions = btcpayServerOptions;
+        _lightningNetworkOptions = lightningNetworkOptions;
         _externalServiceOptions = externalServiceOptions;
+        _authorizationService = authorizationService;
+        _handlers = handlers;
     }
 
-    public IViewComponentResult Invoke(StoreLightningServicesViewModel vm)
+    public async Task<IViewComponentResult> InvokeAsync(StoreData store, string cryptoCode)
     {
-        if (vm.Store == null)
-            throw new ArgumentNullException(nameof(vm.Store));
-        if (vm.CryptoCode == null)
-            throw new ArgumentNullException(nameof(vm.CryptoCode));
+        var vm = new StoreLightningServicesViewModel { StoreId = store.Id, CryptoCode = cryptoCode };
+        var id = PaymentTypes.LN.GetPaymentMethodId(cryptoCode);
+        var existing = store.GetPaymentMethodConfig<LightningPaymentMethodConfig>(id, _handlers);
+        if (existing?.IsInternalNode is true && _lightningNetworkOptions.Value.InternalLightningByCryptoCode.TryGetValue(cryptoCode, out _))
+        {
+            var result = await _authorizationService.AuthorizeAsync(HttpContext.User, null, new PolicyRequirement(Policies.CanUseInternalLightningNode));
+            vm.LightningNodeType = result.Succeeded ? LightningNodeType.Internal : null;
+        }
+
         if (vm.LightningNodeType != LightningNodeType.Internal)
             return View(vm);
         if (!User.IsInRole(Roles.ServerAdmin))
diff --git a/BTCPayServer/Components/StoreLightningServices/StoreLightningServicesViewModel.cs b/BTCPayServer/Components/StoreLightningServices/StoreLightningServicesViewModel.cs
index 8a1a9b8163..33dd3681f1 100644
--- a/BTCPayServer/Components/StoreLightningServices/StoreLightningServicesViewModel.cs
+++ b/BTCPayServer/Components/StoreLightningServices/StoreLightningServicesViewModel.cs
@@ -8,8 +8,8 @@ namespace BTCPayServer.Components.StoreLightningServices;
 
 public class StoreLightningServicesViewModel
 {
+    public string StoreId { get; set; }
     public string CryptoCode { get; set; }
-    public StoreData Store { get; set; }
-    public LightningNodeType LightningNodeType { get; set; }
+    public LightningNodeType? LightningNodeType { get; set; }
     public List<AdditionalServiceViewModel> Services { get; set; }
 }
diff --git a/BTCPayServer/Components/StoreNumbers/Default.cshtml b/BTCPayServer/Components/StoreNumbers/Default.cshtml
index 1b3f26fffb..b9517b47dd 100644
--- a/BTCPayServer/Components/StoreNumbers/Default.cshtml
+++ b/BTCPayServer/Components/StoreNumbers/Default.cshtml
@@ -1,7 +1,7 @@
 @using BTCPayServer.Client
 @model BTCPayServer.Components.StoreNumbers.StoreNumbersViewModel
 
-<div class="widget store-numbers" id="StoreNumbers-@Model.Store.Id">
+<div class="widget store-numbers" id="StoreNumbers-@Model.StoreId">
     @if (Model.InitialRendering)
     {
         <div class="loading d-flex justify-content-center p-3">
@@ -11,8 +11,8 @@
         </div>
         <script>
             (async () => {
-                const url = @Safe.Json(Url.Action("StoreNumbers", "UIStores", new { storeId = Model.Store.Id, cryptoCode = Model.CryptoCode }));
-                const storeId = @Safe.Json(Model.Store.Id);
+                const url = @Safe.Json(Url.Action("StoreNumbers", "UIStores", new { storeId = Model.StoreId, cryptoCode = Model.CryptoCode }));
+                const storeId = @Safe.Json(Model.StoreId);
                 const response = await fetch(url);
                 if (response.ok) {
                     document.getElementById(`StoreNumbers-${storeId}`).outerHTML = await response.text();
@@ -24,10 +24,10 @@
     {
         <div class="store-number">
             <header>
-                <h6 text-translate="true">@ViewLocalizer["Paid invoices in the last {0} days", @Model.TimeframeDays]</h6>
+                <h6 text-translate="true">@ViewLocalizer["Paid invoices in the last {0} days", Model.TimeframeDays]</h6>
                 @if (Model.PaidInvoices > 0)
                 {
-                    <a asp-controller="UIInvoice" asp-action="ListInvoices" asp-route-storeId="@Model.Store.Id"  permission="@Policies.CanViewInvoices">View All</a>
+                    <a asp-controller="UIInvoice" asp-action="ListInvoices" asp-route-storeId="@Model.StoreId"  permission="@Policies.CanViewInvoices" text-translate="true">View All</a>
                 }
             </header>
             <div class="h3">@Model.PaidInvoices</div>
@@ -35,7 +35,7 @@
         <div class="store-number">
             <header>
                 <h6 text-translate="true">Payouts Pending</h6>
-                <a asp-controller="UIStorePullPayments" asp-action="Payouts" asp-route-storeId="@Model.Store.Id" permission="@Policies.CanManagePullPayments" text-translate="true">Manage</a>
+                <a asp-controller="UIStorePullPayments" asp-action="Payouts" asp-route-storeId="@Model.StoreId" permission="@Policies.CanManagePullPayments" text-translate="true">Manage</a>
             </header>
             <div class="h3">@Model.PayoutsPending</div>
         </div>
diff --git a/BTCPayServer/Components/StoreNumbers/StoreNumbers.cs b/BTCPayServer/Components/StoreNumbers/StoreNumbers.cs
index 5bf35bf270..cd1c174db0 100644
--- a/BTCPayServer/Components/StoreNumbers/StoreNumbers.cs
+++ b/BTCPayServer/Components/StoreNumbers/StoreNumbers.cs
@@ -1,19 +1,12 @@
 using System;
-using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
-using BTCPayServer.Components.StoreRecentTransactions;
 using BTCPayServer.Data;
-using BTCPayServer.Services;
 using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Stores;
-using BTCPayServer.Services.Wallets;
-using Dapper;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Npgsql;
 using StoreData = BTCPayServer.Data.StoreData;
 
 namespace BTCPayServer.Components.StoreNumbers;
@@ -34,14 +27,15 @@ public StoreNumbers(
         _invoiceRepository = invoiceRepository;
     }
 
-    public async Task<IViewComponentResult> InvokeAsync(StoreNumbersViewModel vm)
+    public async Task<IViewComponentResult> InvokeAsync(StoreData store, string cryptoCode, bool initialRendering)
     {
-        if (vm.Store == null)
-            throw new ArgumentNullException(nameof(vm.Store));
-        if (vm.CryptoCode == null)
-            throw new ArgumentNullException(nameof(vm.CryptoCode));
-
-        vm.WalletId = new WalletId(vm.Store.Id, vm.CryptoCode);
+        var vm = new StoreNumbersViewModel
+        {
+            StoreId = store.Id,
+            CryptoCode = cryptoCode,
+            InitialRendering = initialRendering,
+            WalletId = new WalletId(store.Id, cryptoCode)
+        };
 
         if (vm.InitialRendering)
             return View(vm);
@@ -50,12 +44,12 @@ public async Task<IViewComponentResult> InvokeAsync(StoreNumbersViewModel vm)
         var offset = DateTimeOffset.Now.AddDays(-vm.TimeframeDays).ToUniversalTime();
         
         vm.PaidInvoices = await _invoiceRepository.GetInvoiceCount(
-            new InvoiceQuery { StoreId = new [] { vm.Store.Id }, StartDate = offset, Status = new [] { "paid", "confirmed" } });
+            new InvoiceQuery { StoreId = [store.Id], StartDate = offset, Status = ["paid", "confirmed"] });
         vm.PayoutsPending = await ctx.Payouts
-            .Where(p => p.PullPaymentData.StoreId == vm.Store.Id && !p.PullPaymentData.Archived && p.State == PayoutState.AwaitingApproval)
+            .Where(p => p.PullPaymentData.StoreId == store.Id && !p.PullPaymentData.Archived && p.State == PayoutState.AwaitingApproval)
             .CountAsync();
         vm.RefundsIssued = await ctx.Invoices
-            .Where(i => i.StoreData.Id == vm.Store.Id && !i.Archived && i.Created >= offset)
+            .Where(i => i.StoreData.Id == store.Id && !i.Archived && i.Created >= offset)
             .SelectMany(i => i.Refunds)
             .CountAsync();
 
diff --git a/BTCPayServer/Components/StoreNumbers/StoreNumbersViewModel.cs b/BTCPayServer/Components/StoreNumbers/StoreNumbersViewModel.cs
index 55ba51bd64..6d08e90da2 100644
--- a/BTCPayServer/Components/StoreNumbers/StoreNumbersViewModel.cs
+++ b/BTCPayServer/Components/StoreNumbers/StoreNumbersViewModel.cs
@@ -1,10 +1,8 @@
-using BTCPayServer.Data;
-
 namespace BTCPayServer.Components.StoreNumbers;
 
 public class StoreNumbersViewModel
 {
-    public StoreData Store { get; set; }
+    public string StoreId { get; set; }
     public WalletId WalletId { get; set; }
     public int PayoutsPending { get; set; }
     public int TimeframeDays { get; set; } = 7;
diff --git a/BTCPayServer/Components/StoreRecentInvoices/Default.cshtml b/BTCPayServer/Components/StoreRecentInvoices/Default.cshtml
index fed940a933..46ba89a90f 100644
--- a/BTCPayServer/Components/StoreRecentInvoices/Default.cshtml
+++ b/BTCPayServer/Components/StoreRecentInvoices/Default.cshtml
@@ -1,15 +1,14 @@
 @using BTCPayServer.Client.Models
 @using BTCPayServer.Services
-@using BTCPayServer.Services.Invoices
 @inject DisplayFormatter DisplayFormatter
 @model BTCPayServer.Components.StoreRecentInvoices.StoreRecentInvoicesViewModel
 
-<div class="widget store-recent-invoices" id="StoreRecentInvoices-@Model.Store.Id">
+<div class="widget store-recent-invoices" id="StoreRecentInvoices-@Model.StoreId">
     <header>
         <h3 text-translate="true">Recent Invoices</h3>
         @if (Model.Invoices.Any())
         {
-            <a asp-controller="UIInvoice" asp-action="ListInvoices" asp-route-storeId="@Model.Store.Id" text-translate="true">View All</a>
+            <a asp-controller="UIInvoice" asp-action="ListInvoices" asp-route-storeId="@Model.StoreId" text-translate="true">View All</a>
         }
     </header>
     @if (Model.InitialRendering)
@@ -21,8 +20,8 @@
         </div>
         <script>
             (async () => {
-                const url = @Safe.Json(Url.Action("RecentInvoices", "UIStores", new { storeId = Model.Store.Id, cryptoCode = Model.CryptoCode }));
-                const storeId = @Safe.Json(Model.Store.Id);
+                const url = @Safe.Json(Url.Action("RecentInvoices", "UIStores", new { storeId = Model.StoreId, cryptoCode = Model.CryptoCode }));
+                const storeId = @Safe.Json(Model.StoreId);
                 const response = await fetch(url);
                 if (response.ok) {
                     document.getElementById(`StoreRecentInvoices-${storeId}`).outerHTML = await response.text();
@@ -68,7 +67,7 @@
         <p class="text-secondary my-3" text-translate="true">
             There are no recent invoices.
         </p>
-        <a asp-controller="UIInvoice" asp-action="CreateInvoice" asp-route-storeId="@Model.Store.Id" class="fw-semibold" text-translate="true">
+        <a asp-controller="UIInvoice" asp-action="CreateInvoice" asp-route-storeId="@Model.StoreId" class="fw-semibold" text-translate="true">
             Create Invoice
         </a>
     }
diff --git a/BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoices.cs b/BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoices.cs
index c90e4fa61d..6d01c23e7b 100644
--- a/BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoices.cs
+++ b/BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoices.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Data;
@@ -9,7 +7,6 @@
 using BTCPayServer.Services.Stores;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using NBitcoin;
 
 namespace BTCPayServer.Components.StoreRecentInvoices;
 
@@ -35,12 +32,15 @@ public StoreRecentInvoices(
         _dbContextFactory = dbContextFactory;
     }
 
-    public async Task<IViewComponentResult> InvokeAsync(StoreRecentInvoicesViewModel vm)
+    public async Task<IViewComponentResult> InvokeAsync(StoreData store, string cryptoCode, bool initialRendering)
     {
-        if (vm.Store == null)
-            throw new ArgumentNullException(nameof(vm.Store));
-        if (vm.CryptoCode == null)
-            throw new ArgumentNullException(nameof(vm.CryptoCode));
+        var vm = new StoreRecentInvoicesViewModel
+        {
+            StoreId = store.Id,
+            CryptoCode = cryptoCode,
+            InitialRendering = initialRendering
+        };
+
         if (vm.InitialRendering)
             return View(vm);
 
@@ -48,7 +48,7 @@ public async Task<IViewComponentResult> InvokeAsync(StoreRecentInvoicesViewModel
         var invoiceEntities = await _invoiceRepo.GetInvoices(new InvoiceQuery
         {
             UserId = userId,
-            StoreId = new[] { vm.Store.Id },
+            StoreId = [store.Id],
             IncludeArchived = false,
             IncludeRefunds = true,
             Take = 5
diff --git a/BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoicesViewModel.cs b/BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoicesViewModel.cs
index 339ca997c4..b129bfb852 100644
--- a/BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoicesViewModel.cs
+++ b/BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoicesViewModel.cs
@@ -5,7 +5,7 @@ namespace BTCPayServer.Components.StoreRecentInvoices;
 
 public class StoreRecentInvoicesViewModel
 {
-    public StoreData Store { get; set; }
+    public string StoreId { get; set; }
     public IList<StoreRecentInvoiceViewModel> Invoices { get; set; } = new List<StoreRecentInvoiceViewModel>();
     public bool InitialRendering { get; set; }
     public string CryptoCode { get; set; }
diff --git a/BTCPayServer/Components/StoreRecentTransactions/Default.cshtml b/BTCPayServer/Components/StoreRecentTransactions/Default.cshtml
index 4a48f0c0e2..0da1033e7d 100644
--- a/BTCPayServer/Components/StoreRecentTransactions/Default.cshtml
+++ b/BTCPayServer/Components/StoreRecentTransactions/Default.cshtml
@@ -2,7 +2,7 @@
 @inject DisplayFormatter DisplayFormatter
 @model BTCPayServer.Components.StoreRecentTransactions.StoreRecentTransactionsViewModel
 
-<div class="widget store-recent-transactions" id="StoreRecentTransactions-@Model.Store.Id">
+<div class="widget store-recent-transactions" id="StoreRecentTransactions-@Model.StoreId">
     <header>
         <h3 text-translate="true">Recent Transactions</h3>
         @if (Model.Transactions.Any())
@@ -19,8 +19,8 @@
         </div>
         <script>
             (async () => {
-                const url = @Safe.Json(Url.Action("RecentTransactions", "UIStores", new { storeId = Model.Store.Id, cryptoCode = Model.CryptoCode }));
-                const storeId = @Safe.Json(Model.Store.Id);
+                const url = @Safe.Json(Url.Action("RecentTransactions", "UIStores", new { storeId = Model.StoreId, cryptoCode = Model.CryptoCode }));
+                const storeId = @Safe.Json(Model.StoreId);
                 const response = await fetch(url);
                 if (response.ok) {
                     document.getElementById(`StoreRecentTransactions-${storeId}`).outerHTML = await response.text();
diff --git a/BTCPayServer/Components/StoreRecentTransactions/StoreRecentTransactions.cs b/BTCPayServer/Components/StoreRecentTransactions/StoreRecentTransactions.cs
index e202832d27..ad0e5d0835 100644
--- a/BTCPayServer/Components/StoreRecentTransactions/StoreRecentTransactions.cs
+++ b/BTCPayServer/Components/StoreRecentTransactions/StoreRecentTransactions.cs
@@ -1,27 +1,16 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
-using BTCPayServer.Abstractions.Extensions;
 using BTCPayServer.Data;
-using BTCPayServer.Models.StoreViewModels;
 using BTCPayServer.Payments;
 using BTCPayServer.Payments.Bitcoin;
 using BTCPayServer.Services;
 using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Labels;
-using BTCPayServer.Services.Stores;
 using BTCPayServer.Services.Wallets;
-using Dapper;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using NBitcoin;
-using NBXplorer;
-using NBXplorer.Client;
-using static BTCPayServer.Components.StoreRecentTransactions.StoreRecentTransactionsViewModel;
 
 namespace BTCPayServer.Components.StoreRecentTransactions;
 
@@ -47,26 +36,27 @@ public StoreRecentTransactions(
         _transactionLinkProviders = transactionLinkProviders;
     }
 
-    public async Task<IViewComponentResult> InvokeAsync(StoreRecentTransactionsViewModel vm)
+    public async Task<IViewComponentResult> InvokeAsync(StoreData store, string cryptoCode, bool initialRendering)
     {
-        if (vm.Store == null)
-            throw new ArgumentNullException(nameof(vm.Store));
-        if (vm.CryptoCode == null)
-            throw new ArgumentNullException(nameof(vm.CryptoCode));
-
-        vm.WalletId = new WalletId(vm.Store.Id, vm.CryptoCode);
+        var vm = new StoreRecentTransactionsViewModel
+        {
+            StoreId = store.Id,
+            CryptoCode = cryptoCode,
+            InitialRendering = initialRendering,
+            WalletId = new WalletId(store.Id, cryptoCode)
+        };
 
         if (vm.InitialRendering)
             return View(vm);
 
-        var derivationSettings = vm.Store.GetDerivationSchemeSettings(_handlers, vm.CryptoCode);
+        var derivationSettings = store.GetDerivationSchemeSettings(_handlers, vm.CryptoCode);
         var transactions = new List<StoreRecentTransactionViewModel>();
         if (derivationSettings?.AccountDerivation is not null)
         {
             var pmi = PaymentTypes.CHAIN.GetPaymentMethodId(vm.CryptoCode);
             var network = ((IHasNetwork)_handlers[pmi]).Network;
             var wallet = _walletProvider.GetWallet(network);
-            var allTransactions = await wallet.FetchTransactionHistory(derivationSettings.AccountDerivation, 0, 5, TimeSpan.FromDays(31.0), cancellationToken: this.HttpContext.RequestAborted);
+            var allTransactions = await wallet.FetchTransactionHistory(derivationSettings.AccountDerivation, 0, 5, TimeSpan.FromDays(31.0), cancellationToken: HttpContext.RequestAborted);
             var walletTransactionsInfo = await _walletRepository.GetWalletTransactionsInfo(vm.WalletId, allTransactions.Select(t => t.TransactionId.ToString()).ToArray());
             
             transactions = allTransactions
diff --git a/BTCPayServer/Components/StoreRecentTransactions/StoreRecentTransactionsViewModel.cs b/BTCPayServer/Components/StoreRecentTransactions/StoreRecentTransactionsViewModel.cs
index d8e1dbcd60..708d0fbbc2 100644
--- a/BTCPayServer/Components/StoreRecentTransactions/StoreRecentTransactionsViewModel.cs
+++ b/BTCPayServer/Components/StoreRecentTransactions/StoreRecentTransactionsViewModel.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
-using BTCPayServer.Data;
 
 namespace BTCPayServer.Components.StoreRecentTransactions;
 
 public class StoreRecentTransactionsViewModel
 {
-    public StoreData Store { get; set; }
+    public string StoreId { get; set; }
     public IList<StoreRecentTransactionViewModel> Transactions { get; set; } = new List<StoreRecentTransactionViewModel>();
     public WalletId WalletId { get; set; }
     public bool InitialRendering { get; set; }
diff --git a/BTCPayServer/Components/StoreSelector/StoreSelector.cs b/BTCPayServer/Components/StoreSelector/StoreSelector.cs
index 710e1895f5..9827ce7cd3 100644
--- a/BTCPayServer/Components/StoreSelector/StoreSelector.cs
+++ b/BTCPayServer/Components/StoreSelector/StoreSelector.cs
@@ -1,16 +1,11 @@
 using System.Linq;
 using System.Threading.Tasks;
-using BTCPayServer.Abstractions.Contracts;
 using BTCPayServer.Abstractions.Extensions;
-using BTCPayServer.Client;
 using BTCPayServer.Data;
-using BTCPayServer.Payments.Bitcoin;
 using BTCPayServer.Services;
-using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Stores;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Rendering;
 
 namespace BTCPayServer.Components.StoreSelector
 {
@@ -38,13 +33,11 @@ public async Task<IViewComponentResult> InvokeAsync()
             var archivedCount = stores.Count(s => s.Archived);
             var options = stores
                 .Where(store => !store.Archived)
-                .Select(store =>
-                new StoreSelectorOption
+                .Select(store => new StoreSelectorOption
                 {
                     Text = store.StoreName,
                     Value = store.Id,
-                    Selected = store.Id == currentStore?.Id,
-                    Store = store
+                    Selected = store.Id == currentStore?.Id
                 })
                 .OrderBy(s => s.Text)
                 .ToList();
diff --git a/BTCPayServer/Components/StoreSelector/StoreSelectorViewModel.cs b/BTCPayServer/Components/StoreSelector/StoreSelectorViewModel.cs
index 0383514aeb..584af10753 100644
--- a/BTCPayServer/Components/StoreSelector/StoreSelectorViewModel.cs
+++ b/BTCPayServer/Components/StoreSelector/StoreSelectorViewModel.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using BTCPayServer.Data;
 
 namespace BTCPayServer.Components.StoreSelector
 {
@@ -17,6 +16,5 @@ public class StoreSelectorOption
         public bool Selected { get; set; }
         public string Text { get; set; }
         public string Value { get; set; }
-        public StoreData Store { get; set; }
     }
 }
diff --git a/BTCPayServer/Components/StoreWalletBalance/StoreWalletBalanceViewModel.cs b/BTCPayServer/Components/StoreWalletBalance/StoreWalletBalanceViewModel.cs
index b5426ab60f..07d6f5b418 100644
--- a/BTCPayServer/Components/StoreWalletBalance/StoreWalletBalanceViewModel.cs
+++ b/BTCPayServer/Components/StoreWalletBalance/StoreWalletBalanceViewModel.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using BTCPayServer.Client.Models;
 using BTCPayServer.Services.Rates;
-using StoreData = BTCPayServer.Data.StoreData;
 
 namespace BTCPayServer.Components.StoreWalletBalance;
 
diff --git a/BTCPayServer/Controllers/GreenField/GreenfieldAppsController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldAppsController.cs
index 670cd0e860..8fa1cced41 100644
--- a/BTCPayServer/Controllers/GreenField/GreenfieldAppsController.cs
+++ b/BTCPayServer/Controllers/GreenField/GreenfieldAppsController.cs
@@ -3,7 +3,9 @@
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Constants;
+using BTCPayServer.Abstractions.Contracts;
 using BTCPayServer.Abstractions.Extensions;
+using BTCPayServer.Abstractions.Models;
 using BTCPayServer.Client;
 using BTCPayServer.Client.Models;
 using BTCPayServer.Data;
@@ -15,6 +17,7 @@
 using BTCPayServer.Services.Stores;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
@@ -33,13 +36,14 @@ public class GreenfieldAppsController : ControllerBase
         private readonly StoreRepository _storeRepository;
         private readonly CurrencyNameTable _currencies;
         private readonly UserManager<ApplicationUser> _userManager;
+        private readonly IFileService _fileService;
 
         public GreenfieldAppsController(
             AppService appService,
             UriResolver uriResolver,
             StoreRepository storeRepository,
-            BTCPayNetworkProvider btcPayNetworkProvider,
             CurrencyNameTable currencies,
+            IFileService fileService,
             UserManager<ApplicationUser> userManager
         )
         {
@@ -47,6 +51,7 @@ UserManager<ApplicationUser> userManager
             _uriResolver = uriResolver;
             _storeRepository = storeRepository;
             _currencies = currencies;
+            _fileService = fileService;
             _userManager = userManager;
         }
 
@@ -221,10 +226,7 @@ public async Task<IActionResult> GetCrowdfundApp(string appId)
         public async Task<IActionResult> DeleteApp(string appId)
         {
             var app = await _appService.GetApp(appId, null, includeArchived: true);
-            if (app == null)
-            {
-                return AppNotFound();
-            }
+            if (app == null) return AppNotFound();
 
             await _appService.DeleteApp(app);
 
@@ -254,6 +256,57 @@ public async Task<IActionResult> GetAppTopItems(string appId, [FromQuery] int of
             var items = stats.GetRange(offset, max);
             return Ok(items);
         }
+
+        [HttpPost("~/api/v1/apps/{appId}/image")]
+        [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Greenfield)]
+        public async Task<IActionResult> UploadAppItemImage(string appId, IFormFile? file)
+        {
+            var app = await _appService.GetApp(appId, null, includeArchived: true);
+            var userId = _userManager.GetUserId(User);
+            if (app == null || userId == null) return AppNotFound();
+            
+            UploadImageResultModel? upload = null;
+            if (file is null)
+                ModelState.AddModelError(nameof(file), "Invalid file");
+            else
+            {
+                upload = await _fileService.UploadImage(file, userId, 500_000);
+                if (!upload.Success)
+                    ModelState.AddModelError(nameof(file), upload.Response);
+            }
+            if (!ModelState.IsValid)
+                return this.CreateValidationError(ModelState);
+            
+            try
+            {
+                var storedFile = upload!.StoredFile!;
+                var fileData = new FileData
+                {
+                    Id = storedFile.Id,
+                    UserId = storedFile.ApplicationUserId,
+                    Url = await _fileService.GetFileUrl(Request.GetAbsoluteRootUri(), storedFile.Id),
+                    OriginalName = storedFile.FileName,
+                    StorageName = storedFile.StorageFileName,
+                    CreatedAt = storedFile.Timestamp
+                };
+                return Ok(fileData);
+            }
+            catch (Exception e)
+            {
+                return this.CreateAPIError(404, "file-upload-failed", e.Message);
+            }
+        }
+
+        [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Greenfield)]
+        [HttpDelete("~/api/v1/apps/{appId}/image/{fileId}")]
+        public async Task<IActionResult> DeleteAppItemImage(string appId, string fileId)
+        {
+            var app = await _appService.GetApp(appId, null, includeArchived: true);
+            var userId = _userManager.GetUserId(User);
+            if (app == null || userId == null) return AppNotFound();
+            if (!string.IsNullOrEmpty(fileId)) await _fileService.RemoveFile(fileId, userId);
+            return Ok();
+        }
         
         private IActionResult AppNotFound()
         {
diff --git a/BTCPayServer/Controllers/GreenField/GreenfieldStoresController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldStoresController.cs
index 92357bfc45..1679769edf 100644
--- a/BTCPayServer/Controllers/GreenField/GreenfieldStoresController.cs
+++ b/BTCPayServer/Controllers/GreenField/GreenfieldStoresController.cs
@@ -5,6 +5,7 @@
 using BTCPayServer.Abstractions.Constants;
 using BTCPayServer.Abstractions.Contracts;
 using BTCPayServer.Abstractions.Extensions;
+using BTCPayServer.Abstractions.Models;
 using BTCPayServer.Client;
 using BTCPayServer.Client.Models;
 using BTCPayServer.Data;
@@ -111,30 +112,25 @@ public async Task<IActionResult> UpdateStore(string storeId, UpdateStoreRequest
         [HttpPost("~/api/v1/stores/{storeId}/logo")]
         public async Task<IActionResult> UploadStoreLogo(string storeId, IFormFile file)
         {
+            var user = await _userManager.GetUserAsync(User);
             var store = HttpContext.GetStoreData();
-            if (store == null) return StoreNotFound();
-
+            if (user == null || store == null) return StoreNotFound();
+            
+            UploadImageResultModel upload = null;
             if (file is null)
                 ModelState.AddModelError(nameof(file), "Invalid file");
-            else if (file.Length > 1_000_000)
-                ModelState.AddModelError(nameof(file), "The uploaded image file should be less than 1MB");
-            else if (!file.ContentType.StartsWith("image/", StringComparison.InvariantCulture))
-                ModelState.AddModelError(nameof(file), "The uploaded file needs to be an image");
-            else if (!file.FileName.IsValidFileName())
-                ModelState.AddModelError(nameof(file.FileName), "Invalid filename");
             else
             {
-                var formFile = await file.Bufferize();
-                if (!FileTypeDetector.IsPicture(formFile.Buffer, formFile.FileName))
-                    ModelState.AddModelError(nameof(file), "The uploaded file needs to be an image");
+                upload = await _fileService.UploadImage(file, user.Id);
+                if (!upload.Success)
+                    ModelState.AddModelError(nameof(file), upload.Response);
             }
             if (!ModelState.IsValid)
                 return this.CreateValidationError(ModelState);
-
+            
             try
             {
-                var userId = _userManager.GetUserId(User)!;
-                var storedFile = await _fileService.AddFile(file!, userId);
+                var storedFile = upload!.StoredFile!;
                 var blob = store.GetStoreBlob();
                 blob.LogoUrl = new UnresolvedUri.FileIdUri(storedFile.Id);
                 store.SetStoreBlob(blob);
diff --git a/BTCPayServer/Controllers/GreenField/GreenfieldUsersController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldUsersController.cs
index 6f4a4db51a..fcaa5d911e 100644
--- a/BTCPayServer/Controllers/GreenField/GreenfieldUsersController.cs
+++ b/BTCPayServer/Controllers/GreenField/GreenfieldUsersController.cs
@@ -7,6 +7,7 @@
 using BTCPayServer.Abstractions.Constants;
 using BTCPayServer.Abstractions.Contracts;
 using BTCPayServer.Abstractions.Extensions;
+using BTCPayServer.Abstractions.Models;
 using BTCPayServer.Client;
 using BTCPayServer.Client.Models;
 using BTCPayServer.Configuration;
@@ -233,27 +234,24 @@ public async Task<IActionResult> UpdateCurrentUser(UpdateApplicationUserRequest
         [HttpPost("~/api/v1/users/me/picture")]
         public async Task<IActionResult> UploadCurrentUserProfilePicture(IFormFile? file)
         {
+            var user = await _userManager.GetUserAsync(User);
+            if (user is null) return this.UserNotFound();
+            
+            UploadImageResultModel? upload = null;
             if (file is null)
                 ModelState.AddModelError(nameof(file), "Invalid file");
-            else if (file.Length > 1_000_000)
-                ModelState.AddModelError(nameof(file), "The uploaded image file should be less than 1MB");
-            else if (!file.ContentType.StartsWith("image/", StringComparison.InvariantCulture))
-                ModelState.AddModelError(nameof(file), "The uploaded file needs to be an image");
-            else if (!file.FileName.IsValidFileName())
-                ModelState.AddModelError(nameof(file.FileName), "Invalid filename");
             else
             {
-                var formFile = await file.Bufferize();
-                if (!FileTypeDetector.IsPicture(formFile.Buffer, formFile.FileName))
-                    ModelState.AddModelError(nameof(file), "The uploaded file needs to be an image");
+                upload = await _fileService.UploadImage(file, user.Id);
+                if (!upload.Success)
+                    ModelState.AddModelError(nameof(file), upload.Response);
             }
             if (!ModelState.IsValid)
                 return this.CreateValidationError(ModelState);
 
             try
             {
-                var user = await _userManager.GetUserAsync(User);
-                var storedFile = await _fileService.AddFile(file!, user!.Id);
+                var storedFile = upload!.StoredFile!;
                 var blob = user.GetBlob() ?? new UserBlob();
                 var fileIdUri = new UnresolvedUri.FileIdUri(storedFile.Id);
                 blob.ImageUrl = fileIdUri.ToString();
@@ -274,10 +272,7 @@ public async Task<IActionResult> UploadCurrentUserProfilePicture(IFormFile? file
         public async Task<IActionResult> DeleteCurrentUserProfilePicture()
         {
             var user = await _userManager.GetUserAsync(User);
-            if (user is null)
-            {
-                return this.UserNotFound();
-            }
+            if (user is null) return this.UserNotFound();
             
             var blob = user.GetBlob() ?? new UserBlob();
             if (!string.IsNullOrEmpty(blob.ImageUrl))
diff --git a/BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs b/BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs
index 815d87e588..2a4b898f3c 100644
--- a/BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs
+++ b/BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs
@@ -1179,6 +1179,17 @@ public override async Task DeleteApp(string appId, CancellationToken token = def
             HandleActionResult(await GetController<GreenfieldAppsController>().DeleteApp(appId));
         }
 
+        public override async Task<FileData> UploadAppItemImage(string appId, string filePath, string mimeType, CancellationToken token = default)
+        {
+            var file = GetFormFile(filePath, mimeType);
+            return GetFromActionResult<FileData>(await GetController<GreenfieldAppsController>().UploadAppItemImage(appId, file));
+        }
+
+        public override async Task DeleteAppItemImage(string appId, string fileId, CancellationToken token = default)
+        {
+            HandleActionResult(await GetController<GreenfieldAppsController>().DeleteAppItemImage(appId, fileId));
+        }
+
         public override Task<List<RateSource>> GetRateSources(CancellationToken token = default)
         {
             return Task.FromResult(GetFromActionResult(GetController<GreenfieldStoreRateConfigurationController>().GetRateSources()));
diff --git a/BTCPayServer/Controllers/UIManageController.cs b/BTCPayServer/Controllers/UIManageController.cs
index 6f154024e7..0be7b0dd4a 100644
--- a/BTCPayServer/Controllers/UIManageController.cs
+++ b/BTCPayServer/Controllers/UIManageController.cs
@@ -4,6 +4,7 @@
 using BTCPayServer.Abstractions.Constants;
 using BTCPayServer.Abstractions.Contracts;
 using BTCPayServer.Abstractions.Extensions;
+using BTCPayServer.Abstractions.Models;
 using BTCPayServer.Client;
 using BTCPayServer.Data;
 using BTCPayServer.Fido2;
@@ -156,39 +157,24 @@ public async Task<IActionResult> Index(IndexViewModel model, [FromForm] bool Rem
                 blob.Name = model.Name;
                 needUpdate = true;
             }
-            
+
             if (model.ImageFile != null)
             {
-                if (model.ImageFile.Length > 1_000_000)
-                {
-                    ModelState.AddModelError(nameof(model.ImageFile), "The uploaded image file should be less than 1MB");
-                }
-                else if (!model.ImageFile.ContentType.StartsWith("image/", StringComparison.InvariantCulture))
-                {
-                    ModelState.AddModelError(nameof(model.ImageFile), "The uploaded file needs to be an image");
-                }
+                var imageUpload = await _fileService.UploadImage(model.ImageFile, user.Id);
+                if (!imageUpload.Success)
+                    ModelState.AddModelError(nameof(model.ImageFile), imageUpload.Response);
                 else
                 {
-                    var formFile = await model.ImageFile.Bufferize();
-                    if (!FileTypeDetector.IsPicture(formFile.Buffer, formFile.FileName))
+                    try
                     {
-                        ModelState.AddModelError(nameof(model.ImageFile), "The uploaded file needs to be an image");
+                        var storedFile = imageUpload.StoredFile!;
+                        var fileIdUri = new UnresolvedUri.FileIdUri(storedFile.Id);
+                        blob.ImageUrl = fileIdUri.ToString();
+                        needUpdate = true;
                     }
-                    else
+                    catch (Exception e)
                     {
-                        model.ImageFile = formFile;
-                        // add new image
-                        try
-                        {
-                            var storedFile = await _fileService.AddFile(model.ImageFile, user.Id);
-                            var fileIdUri = new UnresolvedUri.FileIdUri(storedFile.Id);
-                            blob.ImageUrl = fileIdUri.ToString();
-                            needUpdate = true;
-                        }
-                        catch (Exception e)
-                        {
-                            ModelState.AddModelError(nameof(model.ImageFile), $"Could not save image: {e.Message}");
-                        }
+                        ModelState.AddModelError(nameof(model.ImageFile), $"Could not save image: {e.Message}");
                     }
                 }
             }
diff --git a/BTCPayServer/Controllers/UINotificationsController.cs b/BTCPayServer/Controllers/UINotificationsController.cs
index 339e2ef821..7149c7fbe8 100644
--- a/BTCPayServer/Controllers/UINotificationsController.cs
+++ b/BTCPayServer/Controllers/UINotificationsController.cs
@@ -43,11 +43,21 @@ public async Task<IActionResult> Index(NotificationIndexViewModel model = null)
             if (!ValidUserClaim(out var userId))
                 return RedirectToAction("Index", "UIHome");
 
-            var stores = await _storeRepo.GetStoresByUserId(userId);
-            model.Stores = stores.Where(store => !store.Archived).OrderBy(s => s.StoreName).ToList();
-
             var searchTerm = string.IsNullOrEmpty(model.SearchText) ? model.SearchTerm : $"{model.SearchText},{model.SearchTerm}";
             var fs = new SearchString(searchTerm, timezoneOffset);
+            var storeIds = fs.GetFilterArray("storeid");
+            var stores = await _storeRepo.GetStoresByUserId(userId);
+            model.StoreFilterOptions = stores
+                .Where(store => !store.Archived)
+                .OrderBy(s => s.StoreName)
+                .Select(s => new StoreFilterOption
+                {
+                    Selected = storeIds?.Contains(s.Id) is true,
+                    Text = s.StoreName,
+                    Value = s.Id
+                })
+                .ToList();
+
             model.Search = fs;
 
             var res = await _notificationManager.GetNotifications(new NotificationsQuery
@@ -57,7 +67,7 @@ public async Task<IActionResult> Index(NotificationIndexViewModel model = null)
                 UserId = userId,
                 SearchText = model.SearchText,
                 Type = fs.GetFilterArray("type"),
-                StoreIds = fs.GetFilterArray("storeid"),
+                StoreIds = storeIds,
                 Seen = model.Status == "Unread" ? false : null
             });
             model.Items = res.Items;
diff --git a/BTCPayServer/Controllers/UIServerController.Users.cs b/BTCPayServer/Controllers/UIServerController.Users.cs
index ab6b226a61..02b588d377 100644
--- a/BTCPayServer/Controllers/UIServerController.Users.cs
+++ b/BTCPayServer/Controllers/UIServerController.Users.cs
@@ -134,39 +134,24 @@ public async Task<IActionResult> ListUsers(
                 blob.Name = viewModel.Name;
                 propertiesChanged = true;
             }
-            
+
             if (viewModel.ImageFile != null)
             {
-                if (viewModel.ImageFile.Length > 1_000_000)
-                {
-                    ModelState.AddModelError(nameof(viewModel.ImageFile), StringLocalizer["The uploaded image file should be less than {0}", "1MB"]);
-                }
-                else if (!viewModel.ImageFile.ContentType.StartsWith("image/", StringComparison.InvariantCulture))
-                {
-                    ModelState.AddModelError(nameof(viewModel.ImageFile), StringLocalizer["The uploaded file needs to be an image"]);
-                }
+                var imageUpload = await _fileService.UploadImage(viewModel.ImageFile, user.Id);
+                if (!imageUpload.Success)
+                    ModelState.AddModelError(nameof(viewModel.ImageFile), imageUpload.Response);
                 else
                 {
-                    var formFile = await viewModel.ImageFile.Bufferize();
-                    if (!FileTypeDetector.IsPicture(formFile.Buffer, formFile.FileName))
+                    try
                     {
-                        ModelState.AddModelError(nameof(viewModel.ImageFile), StringLocalizer["The uploaded file needs to be an image"]);
+                        var storedFile = imageUpload.StoredFile!;
+                        var fileIdUri = new UnresolvedUri.FileIdUri(storedFile.Id);
+                        blob.ImageUrl = fileIdUri.ToString();
+                        propertiesChanged = true;
                     }
-                    else
+                    catch (Exception e)
                     {
-                        viewModel.ImageFile = formFile;
-                        // add new image
-                        try
-                        {
-                            var storedFile = await _fileService.AddFile(viewModel.ImageFile, userId);
-                            var fileIdUri = new UnresolvedUri.FileIdUri(storedFile.Id);
-                            blob.ImageUrl = fileIdUri.ToString();
-                            propertiesChanged = true;
-                        }
-                        catch (Exception e)
-                        {
-                            ModelState.AddModelError(nameof(viewModel.ImageFile), StringLocalizer["Could not save image: {0}", e.Message]);
-                        }
+                        ModelState.AddModelError(nameof(viewModel.ImageFile), StringLocalizer["Could not save image: {0}", e.Message]);
                     }
                 }
             }
@@ -181,7 +166,7 @@ public async Task<IActionResult> ListUsers(
             var wasAdmin = Roles.HasServerAdmin(roles);
             if (!viewModel.IsAdmin && admins.Count == 1 && wasAdmin)
             {
-                TempData[WellKnownTempData.ErrorMessage] = StringLocalizer["This is the only admin, so their role can't be removed until another Admin is added."].Value;
+                TempData[WellKnownTempData.ErrorMessage] = StringLocalizer["This is the only admin, so their role can't be removed until another admin is added."].Value;
                 return View(viewModel);
             }
 
diff --git a/BTCPayServer/Controllers/UIServerController.cs b/BTCPayServer/Controllers/UIServerController.cs
index 0674d381dc..d55ad8cf8c 100644
--- a/BTCPayServer/Controllers/UIServerController.cs
+++ b/BTCPayServer/Controllers/UIServerController.cs
@@ -1108,12 +1108,12 @@ public async Task<IActionResult> Branding(
                     }
                     catch (Exception e)
                     {
-                        ModelState.AddModelError(nameof(vm.CustomThemeFile), $"Could not save theme file: {e.Message}");
+                        ModelState.AddModelError(nameof(vm.CustomThemeFile), StringLocalizer["Could not save CSS file: {0}", e.Message]);
                     }
                 }
                 else
                 {
-                    ModelState.AddModelError(nameof(vm.CustomThemeFile), "The uploaded theme file needs to be a CSS file");
+                    ModelState.AddModelError(nameof(vm.CustomThemeFile), StringLocalizer["The uploaded file needs to be a CSS file"]);
                 }
             }
             else if (RemoveCustomThemeFile && theme.CustomThemeCssUrl is not null)
@@ -1129,18 +1129,18 @@ public async Task<IActionResult> Branding(
             {
                 if (vm.LogoFile.Length > 1_000_000)
                 {
-                    ModelState.AddModelError(nameof(vm.LogoFile), "The uploaded logo file should be less than 1MB");
+                    ModelState.AddModelError(nameof(vm.LogoFile), StringLocalizer["The uploaded file should be less than {0}", "1MB"]);
                 }
                 else if (!vm.LogoFile.ContentType.StartsWith("image/", StringComparison.InvariantCulture))
                 {
-                    ModelState.AddModelError(nameof(vm.LogoFile), "The uploaded logo file needs to be an image");
+                    ModelState.AddModelError(nameof(vm.LogoFile), StringLocalizer["The uploaded file needs to be an image"]);
                 }
                 else
                 {
                     var formFile = await vm.LogoFile.Bufferize();
                     if (!FileTypeDetector.IsPicture(formFile.Buffer, formFile.FileName))
                     {
-                        ModelState.AddModelError(nameof(vm.LogoFile), "The uploaded logo file needs to be an image");
+                        ModelState.AddModelError(nameof(vm.LogoFile), StringLocalizer["The uploaded file needs to be an image"]);
                     }
                     else
                     {
@@ -1155,7 +1155,7 @@ public async Task<IActionResult> Branding(
                         }
                         catch (Exception e)
                         {
-                            ModelState.AddModelError(nameof(vm.LogoFile), $"Could not save logo: {e.Message}");
+                            ModelState.AddModelError(nameof(vm.LogoFile), StringLocalizer["Could not save logo: {0}", e.Message]);
                         }
                     }
                 }
diff --git a/BTCPayServer/Controllers/UIStoresController.Dashboard.cs b/BTCPayServer/Controllers/UIStoresController.Dashboard.cs
index f8c1124f4d..32ec77dfce 100644
--- a/BTCPayServer/Controllers/UIStoresController.Dashboard.cs
+++ b/BTCPayServer/Controllers/UIStoresController.Dashboard.cs
@@ -6,10 +6,6 @@
 using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Constants;
 using BTCPayServer.Client;
-using BTCPayServer.Components.StoreLightningBalance;
-using BTCPayServer.Components.StoreNumbers;
-using BTCPayServer.Components.StoreRecentInvoices;
-using BTCPayServer.Components.StoreRecentTransactions;
 using BTCPayServer.Data;
 using BTCPayServer.Models.StoreViewModels;
 using BTCPayServer.Payments.Bitcoin;
@@ -74,10 +70,9 @@ public async Task<IActionResult> Dashboard()
     public IActionResult LightningBalance(string storeId, string cryptoCode)
     {
         var store = HttpContext.GetStoreData();
-        if (store == null)
-            return NotFound();
-
-        return ViewComponent("StoreLightningBalance", new { Store = store, CryptoCode = cryptoCode });
+        return store != null
+             ? ViewComponent("StoreLightningBalance", new { Store = store, CryptoCode = cryptoCode })
+             : NotFound();
     }
 
     [HttpGet("{storeId}/dashboard/{cryptoCode}/numbers")]
@@ -85,11 +80,9 @@ public IActionResult LightningBalance(string storeId, string cryptoCode)
     public IActionResult StoreNumbers(string storeId, string cryptoCode)
     {
         var store = HttpContext.GetStoreData();
-        if (store == null)
-            return NotFound();
-
-        var vm = new StoreNumbersViewModel { Store = store, CryptoCode = cryptoCode };
-        return ViewComponent("StoreNumbers", new { vm });
+        return store != null
+            ? ViewComponent("StoreNumbers", new { Store = store, CryptoCode = cryptoCode })
+            : NotFound();
     }
 
     [HttpGet("{storeId}/dashboard/{cryptoCode}/recent-transactions")]
@@ -97,11 +90,9 @@ public IActionResult StoreNumbers(string storeId, string cryptoCode)
     public IActionResult RecentTransactions(string storeId, string cryptoCode)
     {
         var store = HttpContext.GetStoreData();
-        if (store == null)
-            return NotFound();
-
-        var vm = new StoreRecentTransactionsViewModel { Store = store, CryptoCode = cryptoCode };
-        return ViewComponent("StoreRecentTransactions", new { vm });
+        return store != null
+            ? ViewComponent("StoreRecentTransactions", new { Store = store, CryptoCode = cryptoCode })
+            : NotFound();
     }
 
     [HttpGet("{storeId}/dashboard/{cryptoCode}/recent-invoices")]
@@ -109,11 +100,9 @@ public IActionResult RecentTransactions(string storeId, string cryptoCode)
     public IActionResult RecentInvoices(string storeId, string cryptoCode)
     {
         var store = HttpContext.GetStoreData();
-        if (store == null)
-            return NotFound();
-
-        var vm = new StoreRecentInvoicesViewModel { Store = store, CryptoCode = cryptoCode };
-        return ViewComponent("StoreRecentInvoices", new { vm });
+        return store != null
+            ? ViewComponent("StoreRecentInvoices", new { Store = store, CryptoCode = cryptoCode })
+            : NotFound();
     }
 
     internal void AddPaymentMethods(StoreData store, StoreBlob storeBlob,
diff --git a/BTCPayServer/Controllers/UIStoresController.Settings.cs b/BTCPayServer/Controllers/UIStoresController.Settings.cs
index 52662032e1..a8ec9b508e 100644
--- a/BTCPayServer/Controllers/UIStoresController.Settings.cs
+++ b/BTCPayServer/Controllers/UIStoresController.Settings.cs
@@ -101,34 +101,19 @@ public async Task<IActionResult> GeneralSettings(
 
         if (model.LogoFile != null)
         {
-            if (model.LogoFile.Length > 1_000_000)
-            {
-                ModelState.AddModelError(nameof(model.LogoFile), StringLocalizer["The uploaded logo file should be less than {0}", "1MB"]);
-            }
-            else if (!model.LogoFile.ContentType.StartsWith("image/", StringComparison.InvariantCulture))
-            {
-                ModelState.AddModelError(nameof(model.LogoFile), StringLocalizer["The uploaded logo file needs to be an image"]);
-            }
+            var imageUpload = await _fileService.UploadImage(model.LogoFile, userId);
+            if (!imageUpload.Success)
+                ModelState.AddModelError(nameof(model.LogoFile), imageUpload.Response);
             else
             {
-                var formFile = await model.LogoFile.Bufferize();
-                if (!FileTypeDetector.IsPicture(formFile.Buffer, formFile.FileName))
+                try
                 {
-                    ModelState.AddModelError(nameof(model.LogoFile), StringLocalizer["The uploaded logo file needs to be an image"]);
+                    var storedFile = imageUpload.StoredFile!;
+                    blob.LogoUrl = new UnresolvedUri.FileIdUri(storedFile.Id);
                 }
-                else
+                catch (Exception e)
                 {
-                    model.LogoFile = formFile;
-                    // add new image
-                    try
-                    {
-                        var storedFile = await _fileService.AddFile(model.LogoFile, userId);
-                        blob.LogoUrl = new UnresolvedUri.FileIdUri(storedFile.Id);
-                    }
-                    catch (Exception e)
-                    {
-                        ModelState.AddModelError(nameof(model.LogoFile), StringLocalizer["Could not save logo: {0}", e.Message]);
-                    }
+                    ModelState.AddModelError(nameof(model.LogoFile), StringLocalizer["Could not save logo: {0}", e.Message]);
                 }
             }
         }
diff --git a/BTCPayServer/Controllers/UIStoresController.Users.cs b/BTCPayServer/Controllers/UIStoresController.Users.cs
index 144d01236e..bcb1661fc4 100644
--- a/BTCPayServer/Controllers/UIStoresController.Users.cs
+++ b/BTCPayServer/Controllers/UIStoresController.Users.cs
@@ -70,6 +70,7 @@ public async Task<IActionResult> StoreUsers(string storeId, StoreUsersViewModel
                     Kind = UserRegisteredEventKind.Invite,
                     User = user,
                     InvitedByUser = currentUser,
+                    SendInvitationEmail = true,
                     CallbackUrlGenerated = tcs
                 });
                     
diff --git a/BTCPayServer/Data/Payouts/LightningLike/UILightningLikePayoutController.cs b/BTCPayServer/Data/Payouts/LightningLike/UILightningLikePayoutController.cs
index ed866f6a55..90d24d194e 100644
--- a/BTCPayServer/Data/Payouts/LightningLike/UILightningLikePayoutController.cs
+++ b/BTCPayServer/Data/Payouts/LightningLike/UILightningLikePayoutController.cs
@@ -192,7 +192,7 @@ private ResultVM Fail(PayoutData payoutData, string message)
             return new ResultVM
             {
                 PayoutId = payoutData.Id,
-                Result = PayResult.Error,
+                Success = false,
                 Destination = blob.Destination,
                 Message = message
             };
@@ -216,7 +216,7 @@ public class ResultVM
         {
             public string PayoutId { get; set; }
             public string Destination { get; set; }
-            public PayResult Result { get; set; }
+            public bool? Success { get; set; }
             public string Message { get; set; }
         }
 
diff --git a/BTCPayServer/Events/UserRegisteredEvent.cs b/BTCPayServer/Events/UserRegisteredEvent.cs
index e27ea63c6c..16d136e8f5 100644
--- a/BTCPayServer/Events/UserRegisteredEvent.cs
+++ b/BTCPayServer/Events/UserRegisteredEvent.cs
@@ -11,7 +11,7 @@ public class UserRegisteredEvent
     public UserRegisteredEventKind Kind { get; set; } = UserRegisteredEventKind.Registration;
     public Uri RequestUri { get; set; }
     public ApplicationUser InvitedByUser { get; set; }
-    public bool SendInvitationEmail { get; set; }
+    public bool SendInvitationEmail { get; set; } = true;
     public TaskCompletionSource<Uri> CallbackUrlGenerated;
 }
 
diff --git a/BTCPayServer/Extensions/ColorExtensions.cs b/BTCPayServer/Extensions/ColorExtensions.cs
new file mode 100644
index 0000000000..71b43b275d
--- /dev/null
+++ b/BTCPayServer/Extensions/ColorExtensions.cs
@@ -0,0 +1,121 @@
+using System;
+using System.Drawing;
+
+namespace BTCPayServer;
+
+public static class ColorExtensions
+{
+    public static double GetLuminance(this Color color)
+    {
+        var r = color.R / 255.0;
+        var g = color.G / 255.0;
+        var b = color.B / 255.0;
+
+        r = (r <= 0.03928) ? r / 12.92 : Math.Pow((r + 0.055) / 1.055, 2.4);
+        g = (g <= 0.03928) ? g / 12.92 : Math.Pow((g + 0.055) / 1.055, 2.4);
+        b = (b <= 0.03928) ? b / 12.92 : Math.Pow((b + 0.055) / 1.055, 2.4);
+
+        return 0.2126 * r + 0.7152 * g + 0.0722 * b;
+    }
+
+    public static double GetContrastRatio(this Color color1, Color color2)
+    {
+        var luminance1 = color1.GetLuminance();
+        var luminance2 = color2.GetLuminance();
+        var lighter = Math.Max(luminance1, luminance2);
+        var darker = Math.Min(luminance1, luminance2);
+
+        return (lighter + 0.05) / (darker + 0.05);
+    }
+    
+    public static Color GetAdjustedForegroundForBackground(this Color foregroundColor, Color backgroundColor, double lightnessIncrement = 0.01, double threshold = 4.5)
+    {
+        var contrastRatio = foregroundColor.GetContrastRatio(backgroundColor);
+        if (contrastRatio >= threshold) return foregroundColor;
+
+        RgbToHsl(foregroundColor, out double hue, out double saturation, out double lightness);
+
+        for (int i = 0; i < 100; i++)
+        {
+            lightness += lightnessIncrement;
+            lightness = Math.Clamp(lightness, 0, 1);
+
+            Color adjustedColor = HslToRgb(hue, saturation, lightness);
+            contrastRatio = adjustedColor.GetContrastRatio(backgroundColor);
+
+            if (contrastRatio >= threshold) return adjustedColor;
+        }
+
+        return foregroundColor;
+    }
+    
+    private static void RgbToHsl(Color color, out double hue, out double saturation, out double lightness)
+    {
+        double r = color.R / 255.0;
+        double g = color.G / 255.0;
+        double b = color.B / 255.0;
+
+        double max = Math.Max(r, Math.Max(g, b));
+        double min = Math.Min(r, Math.Min(g, b));
+        lightness = (max + min) / 2.0;
+
+        if (max == min)
+        {
+            hue = saturation = 0;
+        }
+        else
+        {
+            double delta = max - min;
+            saturation = (lightness > 0.5) ? delta / (2.0 - max - min) : delta / (max + min);
+
+            if (max == r)
+            {
+                hue = (g - b) / delta + (g < b ? 6 : 0);
+            }
+            else if (max == g)
+            {
+                hue = (b - r) / delta + 2;
+            }
+            else
+            {
+                hue = (r - g) / delta + 4;
+            }
+
+            hue /= 6;
+        }
+    }
+
+    private static Color HslToRgb(double hue, double saturation, double lightness)
+    {
+        double r, g, b;
+
+        if (saturation == 0)
+        {
+            r = g = b = lightness;
+        }
+        else
+        {
+            Func<double, double, double, double> hueToRgb = (p, q, t) =>
+            {
+                if (t < 0) t += 1;
+                if (t > 1) t -= 1;
+                if (t < 1 / 6.0) return p + (q - p) * 6 * t;
+                if (t < 1 / 2.0) return q;
+                if (t < 2 / 3.0) return p + (q - p) * (2 / 3.0 - t) * 6;
+                return p;
+            };
+
+            double q = (lightness < 0.5) ? lightness * (1 + saturation) : lightness + saturation - lightness * saturation;
+            double p = 2 * lightness - q;
+
+            r = hueToRgb(p, q, hue + 1 / 3.0);
+            g = hueToRgb(p, q, hue);
+            b = hueToRgb(p, q, hue - 1 / 3.0);
+        }
+
+        return Color.FromArgb(
+            (int)Math.Round(r * 255),
+            (int)Math.Round(g * 255),
+            (int)Math.Round(b * 255));
+    }
+}
diff --git a/BTCPayServer/Models/NotificationViewModels/IndexViewModel.cs b/BTCPayServer/Models/NotificationViewModels/IndexViewModel.cs
index 6365e0596c..8b007e8e05 100644
--- a/BTCPayServer/Models/NotificationViewModels/IndexViewModel.cs
+++ b/BTCPayServer/Models/NotificationViewModels/IndexViewModel.cs
@@ -15,6 +15,13 @@ public class IndexViewModel : BasePagingViewModel
 
     public class NotificationIndexViewModel : IndexViewModel
     {
-        public List<StoreData> Stores { get; set; }
+        public List<StoreFilterOption> StoreFilterOptions { get; set; }
+    }
+
+    public class StoreFilterOption
+    {
+        public bool Selected { get; set; }
+        public string Text { get; set; }
+        public string Value { get; set; }
     }
 }
diff --git a/BTCPayServer/Payments/Lightning/LightningPendingPayoutListener.cs b/BTCPayServer/Payments/Lightning/LightningPendingPayoutListener.cs
index 8577e7fcaf..7cc17f40fe 100644
--- a/BTCPayServer/Payments/Lightning/LightningPendingPayoutListener.cs
+++ b/BTCPayServer/Payments/Lightning/LightningPendingPayoutListener.cs
@@ -100,25 +100,25 @@ private async Task Act()
 						if (proof is not null)
 							payment = await client.GetPayment(proof.PaymentHash, CancellationToken);
 					}
-					catch
+					catch (OperationCanceledException)
 					{
+                        // Do not mark as cancelled if the operation was cancelled.
+                        // This can happen with Nostr GetPayment if the connection to relay is too slow.
+                        continue;
 					}
-					if (payment is null)
-					{
-						payoutData.State = PayoutState.Cancelled;
-						continue;
-					}
-					switch (payment.Status)
-					{
-						case LightningPaymentStatus.Complete:
-							payoutData.State = PayoutState.Completed;
-							proof.Preimage = payment.Preimage;
-							payoutData.SetProofBlob(proof, null);
-							break;
-						case LightningPaymentStatus.Failed:
-							payoutData.State = PayoutState.Cancelled;
-							break;
-					}
+                    payoutData.State = payment?.Status switch
+                    {
+                        LightningPaymentStatus.Complete => PayoutState.Completed,
+                        LightningPaymentStatus.Failed => PayoutState.Cancelled,
+                        LightningPaymentStatus.Unknown or LightningPaymentStatus.Pending => PayoutState.InProgress,
+                        _ => PayoutState.Cancelled
+                    };
+
+                    if (payment is { Status: LightningPaymentStatus.Complete })
+                    {
+                        proof.Preimage = payment.Preimage;
+                        payoutData.SetProofBlob(proof, null);
+                    }
 				}
 
                 foreach (PayoutData payoutData in payoutByStoreByPaymentMethod)
diff --git a/BTCPayServer/PayoutProcessors/Lightning/LightningAutomatedPayoutProcessor.cs b/BTCPayServer/PayoutProcessors/Lightning/LightningAutomatedPayoutProcessor.cs
index 557a0c73e7..0f25c46021 100644
--- a/BTCPayServer/PayoutProcessors/Lightning/LightningAutomatedPayoutProcessor.cs
+++ b/BTCPayServer/PayoutProcessors/Lightning/LightningAutomatedPayoutProcessor.cs
@@ -110,7 +110,7 @@ public async Task<ResultVM> HandlePayout(PayoutData payoutData, ILightningClient
                 result = new ResultVM
                 {
                     PayoutId = payoutData.Id,
-                    Result = PayResult.Error,
+                    Success = false,
                     Destination = blob.Destination,
                     Message = claim.error
                 };
@@ -118,7 +118,7 @@ public async Task<ResultVM> HandlePayout(PayoutData payoutData, ILightningClient
         }
 
         bool updateBlob = false;
-		if (result.Result is PayResult.Error or PayResult.CouldNotFindRoute && payoutData.State == PayoutState.AwaitingPayment)
+		if (result.Success is false && payoutData.State == PayoutState.AwaitingPayment)
 		{
 			updateBlob = true;
             if (blob.IncrementErrorCount() >= 10)
@@ -141,7 +141,7 @@ private ResultVM InvalidState(string payoutId) =>
         new ResultVM
         {
             PayoutId = payoutId,
-            Result = PayResult.Error,
+            Success = false,
             Message = "The payout isn't in a valid state"
         };
 
@@ -163,7 +163,7 @@ private ResultVM InvalidState(string payoutId) =>
             return (null, new ResultVM
             {
                 PayoutId = payoutData.Id,
-                Result = PayResult.Error,
+                Success = false,
                 Destination = blob.Destination,
                 Message =
                     $"The LNURL provided would not generate an invoice of {lm.ToDecimal(LightMoneyUnit.Satoshi)} sats"
@@ -183,7 +183,7 @@ private ResultVM InvalidState(string payoutId) =>
                 new ResultVM
                 {
                     PayoutId = payoutData.Id,
-                    Result = PayResult.Error,
+                    Success = false,
                     Destination = blob.Destination,
                     Message = e.Message
                 });
@@ -204,7 +204,7 @@ async Task<ResultVM> TrypayBolt(
             return new ResultVM
             {
                 PayoutId = payoutData.Id,
-                Result = PayResult.Error,
+                Success = false,
                 Message = $"The BOLT11 invoice amount ({boltAmount} {payoutData.Currency}) did not match the payout's amount ({payoutData.Amount.GetValueOrDefault()} {payoutData.Currency})",
                 Destination = payoutBlob.Destination
             };
@@ -216,110 +216,107 @@ async Task<ResultVM> TrypayBolt(
             return new ResultVM
             {
                 PayoutId = payoutData.Id,
-                Result = PayResult.Error,
+                Success = false,
                 Message = $"The BOLT11 invoice expiry date ({bolt11PaymentRequest.ExpiryDate}) has expired",
                 Destination = payoutBlob.Destination
             };
         }
 
         var proofBlob = new PayoutLightningBlob { PaymentHash = bolt11PaymentRequest.PaymentHash.ToString() };
-        PayResponse pay = null;
-        Exception exception = null;
+        string errorReason = null;
+        string preimage = null;
+        // If success:
+        // * Is null, we don't know the status. The payout should become pending. (LightningPendingPayoutListener will monitor the situation)
+        // * Is true, we knew the transfer was done. The payout should be completed.
+        // * Is false, we knew it didn't happen. The payout can be retried.
+        bool? success = null;
+        LightMoney amountSent = null;
+
         try
         {
-            pay = await lightningClient.Pay(bolt11PaymentRequest.ToString(),
+            var pay = await lightningClient.Pay(bolt11PaymentRequest.ToString(),
                 new PayInvoiceParams()
                 {
                     Amount = new LightMoney((decimal)payoutData.Amount, LightMoneyUnit.BTC)
                 }, cancellationToken);
-
-            if (pay?.Result is PayResult.CouldNotFindRoute)
+            if (pay is { Result: PayResult.CouldNotFindRoute })
+            {
+                var err = pay.ErrorDetail is null ? "" : $" ({pay.ErrorDetail})";
+                errorReason ??= $"Unable to find a route for the payment, check your channel liquidity{err}";
+                success = false;
+            }
+            else if (pay is { Result: PayResult.Error })
+            {
+                errorReason ??= pay.ErrorDetail;
+                success = false;
+            }
+            else if (pay is { Result: PayResult.Ok })
             {
-                // Payment failed for sure... we can try again later!
-                payoutData.State = PayoutState.AwaitingPayment;
-                return new ResultVM
+                if (pay.Details is { } details)
                 {
-                    PayoutId = payoutData.Id,
-                    Result = PayResult.CouldNotFindRoute,
-                    Message = $"Unable to find a route for the payment, check your channel liquidity",
-                    Destination = payoutBlob.Destination
-                };
+                    preimage = details.Preimage?.ToString();
+                    amountSent = details.TotalAmount;
+                }
+                success = true;
             }
         }
         catch (Exception ex)
         {
-            exception = ex;
+            errorReason ??= ex.Message;
         }
 
-        LightningPayment payment = null;
-        try
+        if (success is null || preimage is null || amountSent is null)
         {
-            payment = await lightningClient.GetPayment(bolt11PaymentRequest.PaymentHash.ToString(), cancellationToken);
-        }
-        catch (Exception ex)
-        {
-            exception = ex;
-        }
-        if (payment is null)
-        {
-            payoutData.State = PayoutState.Cancelled;
-            var exceptionMessage = "";
-            if (exception is not null)
-                exceptionMessage = $" ({exception.Message})";
-            if (exceptionMessage == "")
-                exceptionMessage = $" ({pay?.ErrorDetail})";
-            return new ResultVM
+            LightningPayment payment = null;
+            try
             {
-                PayoutId = payoutData.Id,
-                Result = PayResult.Error,
-                Message = $"Unable to confirm the payment of the invoice" + exceptionMessage,
-                Destination = payoutBlob.Destination
+                payment = await lightningClient.GetPayment(bolt11PaymentRequest.PaymentHash.ToString(), cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                errorReason ??= ex.Message;
+            }
+            success ??= payment?.Status switch
+            {
+                LightningPaymentStatus.Complete => true,
+                LightningPaymentStatus.Failed => false,
+                _ => null
             };
+            amountSent ??= payment?.AmountSent;
+            preimage ??= payment?.Preimage;
         }
-        if (payment.Preimage is not null)
-            proofBlob.Preimage = payment.Preimage;
 
-        if (payment.Status == LightningPaymentStatus.Complete)
+        if (preimage is not null)
+            proofBlob.Preimage = preimage;
+        
+        var vm = new ResultVM
+        {
+            PayoutId = payoutData.Id,
+            Success = success,
+            Destination = payoutBlob.Destination
+        };
+        if (success is true)
         {
             payoutData.State = PayoutState.Completed;
             payoutData.SetProofBlob(proofBlob, null);
-            return new ResultVM
-            {
-                PayoutId = payoutData.Id,
-                Result = PayResult.Ok,
-                Destination = payoutBlob.Destination,
-                Message = payment.AmountSent != null
-                    ? $"Paid out {payment.AmountSent.ToDecimal(LightMoneyUnit.BTC)} {payoutData.Currency}"
-                    : "Paid out"
-            };
+            vm.Message = amountSent != null
+                    ? $"Paid out {amountSent.ToDecimal(LightMoneyUnit.BTC)} {payoutData.Currency}"
+                    : "Paid out";
         }
-        else if (payment.Status == LightningPaymentStatus.Failed)
+        else if (success is false)
         {
             payoutData.State = PayoutState.AwaitingPayment;
-            string reason = "";
-            if (pay?.ErrorDetail is string err)
-                reason = $" ({err})";
-            return new ResultVM
-            {
-                PayoutId = payoutData.Id,
-                Result = PayResult.Error,
-                Destination = payoutBlob.Destination,
-                Message = $"The payment failed{reason}"
-            };
+            var err = errorReason is null ? "" : $" ({errorReason})";
+            vm.Message = $"The payment failed{err}";
         }
         else
         {
             // Payment will be saved as pending, the LightningPendingPayoutListener will handle settling/cancelling
             payoutData.State = PayoutState.InProgress;
             payoutData.SetProofBlob(proofBlob, null);
-            return new ResultVM
-            {
-                PayoutId = payoutData.Id,
-                Result = PayResult.Ok,
-                Destination = payoutBlob.Destination,
-                Message = "The payment has been initiated but is still in-flight."
-            };
+            vm.Message = "The payment has been initiated but is still in-flight.";
         }
+        return vm;
     }
 
     protected override async Task<bool> ProcessShouldSave(object paymentMethodConfig, List<PayoutData> payouts)
diff --git a/BTCPayServer/Plugins/Crowdfund/CrowdfundPlugin.cs b/BTCPayServer/Plugins/Crowdfund/CrowdfundPlugin.cs
index 03dcf14e62..2d6149d409 100644
--- a/BTCPayServer/Plugins/Crowdfund/CrowdfundPlugin.cs
+++ b/BTCPayServer/Plugins/Crowdfund/CrowdfundPlugin.cs
@@ -251,7 +251,9 @@ private Dictionary<string, PaymentStat> GetPaymentStats(InvoiceStatistics stats,
                         .Select(s => s.Value.CurrencyValue).Sum();
             foreach (var kv in allStats
                                     .GroupBy(k => k.Key, k => k.Value)
-                                    .Select(g => (g.Key, CurrencyValue: g.Sum(s => s.CurrencyValue))))
+                                    .Select(g => (g.Key,
+                                                 PaymentCurrency: g.Select(s => s.Currency).First(),
+                                                 CurrencyValue: g.Sum(s => s.CurrencyValue))))
             {
                 var pmi = PaymentMethodId.Parse(kv.Key);
                 r.TryAdd(kv.Key, new PaymentStat()
@@ -259,7 +261,7 @@ private Dictionary<string, PaymentStat> GetPaymentStats(InvoiceStatistics stats,
                     Label = _prettyNameProvider.PrettyName(pmi),
                     Percent = (kv.CurrencyValue / total) * 100.0m,
                     // Note that the LNURL will have the same LN
-                    IsLightning = pmi == PaymentTypes.LN.GetPaymentMethodId(kv.Key)
+                    IsLightning = pmi == PaymentTypes.LN.GetPaymentMethodId(kv.PaymentCurrency)
                 });
             }
             return r;
diff --git a/BTCPayServer/Services/Invoices/InvoiceRepository.cs b/BTCPayServer/Services/Invoices/InvoiceRepository.cs
index e43c63e343..ae8c15b3e0 100644
--- a/BTCPayServer/Services/Invoices/InvoiceRepository.cs
+++ b/BTCPayServer/Services/Invoices/InvoiceRepository.cs
@@ -873,7 +873,7 @@ public InvoiceStatistics GetContributionsByPaymentMethodId(string currency, Invo
                 .GroupBy(p => p.GroupKey)
                 .ToDictionary(p => p.Key, p => new InvoiceStatistics.Contribution
                 {
-                    Currency = p.Key,
+                    Currency = p.Select(p => p.Currency).First(),
                     Settled = p.All(v => v.Settled),
                     Divisibility = p.Max(p => p.Divisibility),
                     Value = p.Select(v => v.Value).Sum(),
diff --git a/BTCPayServer/Services/Translations.Default.cs b/BTCPayServer/Services/Translations.Default.cs
index 99ba354728..3629099ab0 100644
--- a/BTCPayServer/Services/Translations.Default.cs
+++ b/BTCPayServer/Services/Translations.Default.cs
@@ -685,6 +685,7 @@ static Translations()
   "If your security device has a button, tap on it.": "",
   "Image": "",
   "Image Size": "",
+  "Image uploaded successfully": "",
   "Image Url": "",
   "Import {0} Wallet": "",
   "Import an existing hardware or software wallet": "",
@@ -1452,9 +1453,6 @@ static Translations()
   "The uploaded file needs to be a CSS file": "",
   "The uploaded file needs to be an image": "",
   "The uploaded file should be less than {0}": "",
-  "The uploaded image file should be less than {0}": "",
-  "The uploaded logo file needs to be an image": "",
-  "The uploaded logo file should be less than {0}": "",
   "The uploaded sound file needs to be an audio file": "",
   "The uploaded sound file should be less than {0}": "",
   "The URL to post purchase data.": "",
@@ -1516,7 +1514,7 @@ static Translations()
   "This invoice has expired": "",
   "This is an extremely dangerous operation!": "",
   "This is an overpayment of the initial amount.": "",
-  "This is the only admin, so their role can't be removed until another Admin is added.": "",
+  "This is the only admin, so their role can't be removed until another admin is added.": "",
   "This key, also called \"xpub\", is used to generate individual destination addresses for your invoices.": "",
   "This label will be removed from this wallet and its associated transactions.": "",
   "this link": "",
diff --git a/BTCPayServer/Storage/Services/FileService.cs b/BTCPayServer/Storage/Services/FileService.cs
index 7a7e8be3f3..0060ee1136 100644
--- a/BTCPayServer/Storage/Services/FileService.cs
+++ b/BTCPayServer/Storage/Services/FileService.cs
@@ -1,12 +1,10 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Text.RegularExpressions;
-using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
 using BTCPayServer.Abstractions.Contracts;
@@ -18,6 +16,7 @@
 using BTCPayServer.Storage.Services.Providers;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.StaticFiles;
+using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 
 namespace BTCPayServer.Storage.Services
@@ -29,11 +28,13 @@ public class FileService : IFileService
         private readonly SettingsRepository _settingsRepository;
         private readonly IOptions<DataDirectories> _dataDirectories;
         private readonly IHttpClientFactory _httpClientFactory;
+        private IStringLocalizer StringLocalizer { get; }
 
         public FileService(StoredFileRepository fileRepository,
             SettingsRepository settingsRepository,
             IEnumerable<IStorageProviderService> providers,
             IHttpClientFactory httpClientFactory,
+            IStringLocalizer stringLocalizer,
             IOptions<DataDirectories> dataDirectories)
         {
             _fileRepository = fileRepository;
@@ -41,6 +42,7 @@ public FileService(StoredFileRepository fileRepository,
             _settingsRepository = settingsRepository;
             _httpClientFactory = httpClientFactory;
             _dataDirectories = dataDirectories;
+            StringLocalizer = stringLocalizer;
         }
 
         public async Task<bool> IsAvailable()
@@ -56,32 +58,32 @@ public async Task<UploadImageResultModel> UploadImage(IFormFile file, string use
             if (file.Length > maxFileSizeInBytes)
             {
                 result.Success = false;
-                result.Response = $"The uploaded image file should be less than {maxFileSizeInBytes / 1_000_000}MB";
+                result.Response = StringLocalizer["The uploaded file should be less than {0}", $"{maxFileSizeInBytes / 1_000_000}MB"].Value;
                 return result;
             }
             if (!file.ContentType.StartsWith("image/", StringComparison.InvariantCulture))
             {
                 result.Success = false;
-                result.Response = "The uploaded file needs to be an image (based on content type)";
+                result.Response = StringLocalizer["The uploaded file needs to be an image"].Value;
                 return result;
             }
             var formFile = await file.Bufferize();
             if (!FileTypeDetector.IsPicture(formFile.Buffer, formFile.FileName))
             {
                 result.Success = false;
-                result.Response = "The uploaded file needs to be an image (based on file content)";
+                result.Response = StringLocalizer["The uploaded file needs to be an image"].Value;
                 return result;
             }
             try
             {
                 result.StoredFile = await AddFile(formFile, userId);
                 result.Success = true;
-                result.Response = "Image uploaded successfully";
+                result.Response = StringLocalizer["Image uploaded successfully"].Value;
             }
             catch (Exception e)
             {
                 result.Success = false;
-                result.Response = $"Could not save image: {e.Message}";
+                result.Response = StringLocalizer["Could not save image: {0}", e.Message].Value;
             }
 
             return result;
@@ -170,7 +172,7 @@ public async Task RemoveFile(string fileId, string userId)
 
         private IStorageProviderService GetProvider(StorageSettings storageSettings)
         {
-            return _providers.First((service) => service.StorageProvider().Equals(storageSettings.Provider));
+            return _providers.First(service => service.StorageProvider().Equals(storageSettings.Provider));
         }
 
         private static string GetContentType(string filePath)
diff --git a/BTCPayServer/Views/Shared/LayoutHeadStoreBranding.cshtml b/BTCPayServer/Views/Shared/LayoutHeadStoreBranding.cshtml
index 2c4f5c570f..fbd860e35c 100644
--- a/BTCPayServer/Views/Shared/LayoutHeadStoreBranding.cshtml
+++ b/BTCPayServer/Views/Shared/LayoutHeadStoreBranding.cshtml
@@ -1,14 +1,17 @@
-@using BTCPayServer.Services
+@using System.Drawing
 @using Microsoft.AspNetCore.Mvc.TagHelpers
 @model StoreBrandingViewModel
-@inject ThemeSettings Theme
 @if (!string.IsNullOrEmpty(Model.BrandColor))
 {
-    var hasCustomeTheme = Theme.CustomTheme && Theme.CustomThemeCssUrl is not null;
+    const double thresholdLight = 1.5;
+    const double thresholdDark = 2.5;
     var brand = Model.BrandColor;
     var brandColor = ColorPalette.Default.FromHtml(brand);
     var brandRgbValues = $"{brandColor.R}, {brandColor.G}, {brandColor.B}";
-    var brightness = brandColor.GetBrightness();
+    var bgLight = ColorPalette.Default.FromHtml("#F8F9FA");
+    var bgDark = ColorPalette.Default.FromHtml("#0d1117");
+    var brandColorAdjustedForLight = brandColor.GetAdjustedForegroundForBackground(bgLight, -.02, thresholdLight);
+    var brandColorAdjustedForDark = brandColor.GetAdjustedForegroundForBackground(bgDark, .02, thresholdDark);
     var accent = ColorPalette.Default.AdjustBrightness(brand, (float)-.15);
     var accentColor = ColorPalette.Default.FromHtml(accent);
     var accentRgbValues = $"{accentColor.R}, {accentColor.G}, {accentColor.B}";
@@ -28,13 +31,12 @@
             --btcpay-primary-text-active: @complementVar;
         }
     </style>
-    @if (brightness > .5 || (Theme.CustomThemeExtension == ThemeExtension.Dark && brightness < .5))
+    @if (brandColorAdjustedForLight != brandColor)
     {
-        var brandAdjusted = ColorPalette.Default.AdjustBrightness(brand, (float)(.35-brightness));
-        var brandColorAdjusted = ColorPalette.Default.FromHtml(brandAdjusted);
-        var brandRgbValuesAdjusted = $"{brandColorAdjusted.R}, {brandColorAdjusted.G}, {brandColorAdjusted.B}";
-        var accentAdjusted = ColorPalette.Default.AdjustBrightness(brandAdjusted, (float)-.15);
-        var accentColorAdjusted = ColorPalette.Default.FromHtml(accentAdjusted);
+        var brandAdjusted = ColorPalette.Default.ToHtml(brandColorAdjustedForLight);
+        var brandRgbValuesAdjusted = $"{brandColorAdjustedForLight.R}, {brandColorAdjustedForLight.G}, {brandColorAdjustedForLight.B}";
+        var accentColorAdjusted = ColorPalette.Default.AdjustBrightness(brandColorAdjustedForLight, (float)-.15);
+        var accentAdjusted = ColorPalette.Default.ToHtml(accentColorAdjusted);
         var accentRgbValuesAdjusted = $"{accentColorAdjusted.R}, {accentColorAdjusted.G}, {accentColorAdjusted.B}";
         var complementAdjusted = ColorPalette.Default.TextColor(brandAdjusted);
         var complementVarAdjusted = $"var(--btcpay-{(complementAdjusted == "black" ? "black" : "white")})";
@@ -68,16 +70,15 @@
             }
         </style>
     }
-    @if (brightness < .5 && (!hasCustomeTheme || Theme.CustomThemeExtension == ThemeExtension.Dark))
+    @if (brandColorAdjustedForDark != brandColor)
     {
-        var brandAdjusted = ColorPalette.Default.AdjustBrightness(brand, (float)(.5-brightness));
-        var brandColorAdjusted = ColorPalette.Default.FromHtml(brandAdjusted);
-        var brandRgbValuesAdjusted = $"{brandColorAdjusted.R}, {brandColorAdjusted.G}, {brandColorAdjusted.B}";
-        var accentAdjusted = ColorPalette.Default.AdjustBrightness(brandAdjusted, (float).15);
-        var accentColorAdjusted = ColorPalette.Default.FromHtml(accentAdjusted);
+        var brandAdjusted = ColorPalette.Default.ToHtml(brandColorAdjustedForDark);
+        var brandRgbValuesAdjusted = $"{brandColorAdjustedForDark.R}, {brandColorAdjustedForDark.G}, {brandColorAdjustedForDark.B}";
+        var accentColorAdjusted = ColorPalette.Default.AdjustBrightness(brandColorAdjustedForDark, (float).15);
+        var accentAdjusted = ColorPalette.Default.ToHtml(accentColorAdjusted);
         var accentRgbValuesAdjusted = $"{accentColorAdjusted.R}, {accentColorAdjusted.G}, {accentColorAdjusted.B}";
-        var complementAdjusted = ColorPalette.Default.TextColor(brandAdjusted);
-        var complementVarAdjusted = $"var(--btcpay-{(complementAdjusted == "black" ? "black" : "white")})";
+        var complementAdjusted = ColorPalette.Default.TextColor(brandColorAdjustedForDark);
+        var complementVarAdjusted = $"var(--btcpay-{(complementAdjusted == Color.Black ? "black" : "white")})";
         <style>
             :root[data-theme='dark'],
             :root[data-btcpay-theme='dark'] {
diff --git a/BTCPayServer/Views/UILightningLikePayout/LightningPayoutResult.cshtml b/BTCPayServer/Views/UILightningLikePayout/LightningPayoutResult.cshtml
index 66438c31ad..1422fbab98 100644
--- a/BTCPayServer/Views/UILightningLikePayout/LightningPayoutResult.cshtml
+++ b/BTCPayServer/Views/UILightningLikePayout/LightningPayoutResult.cshtml
@@ -8,9 +8,9 @@
 <h2 class="mt-1 mb-4" text-translate="true">@ViewData["Title"]</h2>
 @foreach (var item in Model)
 {
-    <div class="alert alert-@(item.Result == PayResult.Ok ? "success" : "danger") mb-3" role="alert">
+    <div class="alert alert-@(item.Success is true ? "success" : "danger") mb-3" role="alert">
         <h5 class="alert-heading">
-            @(item.Result == PayResult.Ok ? "Sent" : "Failed")
+            @(item.Success is true ? "Sent" : "Failed")
             @if (!string.IsNullOrEmpty(item.Message))
             {
                 <span>- @item.Message</span>
diff --git a/BTCPayServer/Views/UINotifications/Index.cshtml b/BTCPayServer/Views/UINotifications/Index.cshtml
index 4e60165413..16d7eaa20e 100644
--- a/BTCPayServer/Views/UINotifications/Index.cshtml
+++ b/BTCPayServer/Views/UINotifications/Index.cshtml
@@ -96,14 +96,14 @@
             }
         </button>
         <div class="dropdown-menu" aria-labelledby="StoresOptionsToggle">
-            @foreach (var store in Model.Stores)
+            @foreach (var store in Model.StoreFilterOptions)
             {
                 <a asp-action="Index"
                    asp-route-count="@Model.Count"
                    asp-route-status="@Model.Status"
-                   asp-route-searchTerm="@Model.Search.Toggle("storeid", store.Id)"
-                   class="dropdown-item @(HasArrayFilter("storeid", store.Id) ? "custom-active" : "")">
-                    @store.StoreName
+                   asp-route-searchTerm="@Model.Search.Toggle("storeid", store.Value)"
+                   class="dropdown-item @(store.Selected ? "custom-active" : "")">
+                    @store.Text
                 </a>
             }
         </div>
diff --git a/BTCPayServer/Views/UIStores/Dashboard.cshtml b/BTCPayServer/Views/UIStores/Dashboard.cshtml
index a0cf4b5562..5ac3dc2a5e 100644
--- a/BTCPayServer/Views/UIStores/Dashboard.cshtml
+++ b/BTCPayServer/Views/UIStores/Dashboard.cshtml
@@ -78,17 +78,17 @@
                 </div>
             </div>
         }
-        <vc:store-numbers vm="@(new StoreNumbersViewModel { Store = store, CryptoCode = Model.CryptoCode, InitialRendering = true })" />
+        <vc:store-numbers store="store" crypto-code="@Model.CryptoCode" initial-rendering="true" />
         @if (Model.LightningEnabled)
         {
             <vc:store-lightning-balance store="store" crypto-code="@Model.CryptoCode" initial-rendering="true" />
-            <vc:store-lightning-services vm="@(new StoreLightningServicesViewModel { Store = store, CryptoCode = Model.CryptoCode })" permission="@Policies.CanModifyServerSettings" />
+            <vc:store-lightning-services store="store" crypto-code="@Model.CryptoCode" permission="@Policies.CanModifyServerSettings" />
         }
         @if (Model.WalletEnabled)
         {
-            <vc:store-recent-transactions vm="@(new StoreRecentTransactionsViewModel { Store = store, CryptoCode = Model.CryptoCode, InitialRendering = true })" />
+            <vc:store-recent-transactions store="store" crypto-code="@Model.CryptoCode" initial-rendering="true" />
         }
-        <vc:store-recent-invoices vm="@(new StoreRecentInvoicesViewModel { Store = store, CryptoCode = Model.CryptoCode, InitialRendering = true })" />
+        <vc:store-recent-invoices store="store" crypto-code="@Model.CryptoCode" initial-rendering="true" />
         @foreach (var app in Model.Apps)
         {
             <vc:app-sales app-id="@app.Id" app-type="@app.AppType" />
diff --git a/BTCPayServer/Views/UIStores/ImportWallet/File.cshtml b/BTCPayServer/Views/UIStores/ImportWallet/File.cshtml
index 1b63de6807..b7e81e191c 100644
--- a/BTCPayServer/Views/UIStores/ImportWallet/File.cshtml
+++ b/BTCPayServer/Views/UIStores/ImportWallet/File.cshtml
@@ -35,12 +35,11 @@
     <tbody>
     <tr>
         <td>Electrum-GRS</td>
-        <td>File ❯ Save backup (not encrypted with a password)</td>
+        <td>File ❯ Save backup… <br>Supports Standard wallet, Wallet with two factor authentication. (Please ensure that wallet file is not encoded nor encrypted with a password)</td>
     </tr>
-	  <tr>
-		    <td>Sparrow-GRS</td>
-		    <td>File ❯ Export wallet… ❯ Electrum: export file…</td>
-	  </tr>
-
+	<tr>
+		<td>Sparrow-GRS</td>
+        <td>File ❯ Export wallet… ❯ Electrum-GRS: export file… <br>(Please ensure that wallet file is not encoded nor encrypted with a password)</td>
+	</tr>
     </tbody>
 </table>
diff --git a/BTCPayServer/Views/UIStores/SetupLightningNode.cshtml b/BTCPayServer/Views/UIStores/SetupLightningNode.cshtml
index b8d77b7e86..11838d10dd 100644
--- a/BTCPayServer/Views/UIStores/SetupLightningNode.cshtml
+++ b/BTCPayServer/Views/UIStores/SetupLightningNode.cshtml
@@ -1,7 +1,7 @@
 @model LightningNodeViewModel
 @{
     Layout = "_LayoutWalletSetup.cshtml";
-    ViewData.SetActivePage(StoreNavPages.LightningSettings, StringLocalizer["Connect to a Lightning node"], Context.GetStoreData().Id);
+    ViewData.SetActivePage(StoreNavPages.LightningSettings, StringLocalizer["Connect to a Lightning node"], Model.StoreId);
 }
 
 @section PageHeadContent {
diff --git a/BTCPayServer/Views/UIStores/StoreUsers.cshtml b/BTCPayServer/Views/UIStores/StoreUsers.cshtml
index 0b71917db9..340f9bf368 100644
--- a/BTCPayServer/Views/UIStores/StoreUsers.cshtml
+++ b/BTCPayServer/Views/UIStores/StoreUsers.cshtml
@@ -5,7 +5,7 @@
 @model StoreUsersViewModel
 @inject StoreRepository StoreRepository
 @{
-    var storeId = Context.GetStoreData().Id;
+    var storeId = Model.StoreId;
     var roles = new SelectList(
         await StoreRepository.GetStoreRoles(storeId),
         nameof(StoreRepository.StoreRole.Id), nameof(StoreRepository.StoreRole.Role),
diff --git a/BTCPayServer/wwwroot/swagger/v1/swagger.template.apps.json b/BTCPayServer/wwwroot/swagger/v1/swagger.template.apps.json
index 8b08cde730..52b241a53f 100644
--- a/BTCPayServer/wwwroot/swagger/v1/swagger.template.apps.json
+++ b/BTCPayServer/wwwroot/swagger/v1/swagger.template.apps.json
@@ -345,6 +345,82 @@
                 ]
             }
         },
+        "/api/v1/apps/{appId}/image": {
+            "post": {
+                "tags": [
+                    "Apps"
+                ],
+                "summary": "Uploads an image for a app item",
+                "description": "Uploads an image for a app item",
+                "requestBody": {
+                    "content": {
+                        "multipart/form-data": {
+                            "schema": {
+                                "type": "object",
+                                "additionalProperties": false,
+                                "properties": {
+                                    "file": {
+                                        "type": "string",
+                                        "description": "The image",
+                                        "format": "binary"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                "operationId": "Apps_UploadAppItemImage",
+                "responses": {
+                    "200": {
+                        "description": "Uploads an image for a app item",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/FileData"
+                                }
+                            }
+                        }
+                    },
+                    "404": {
+                        "description": "The app could not be found"
+                    }
+                },
+                "security": [
+                    {
+                        "API_Key": [
+                            "btcpay.store.canmodifystoresettings"
+                        ],
+                        "Basic": []
+                    }
+                ]
+            }
+        },
+        "/api/v1/apps/{appId}/image/{fileId}": {
+            "delete": {
+                "tags": [
+                    "Apps"
+                ],
+                "summary": "Deletes the app item image",
+                "description": "Deletes the app item image",
+                "operationId": "App_DeleteAppItemImage",
+                "responses": {
+                    "200": {
+                        "description": "App item image deleted successfully"
+                    },
+                    "404": {
+                        "description": "The app could not be found"
+                    }
+                },
+                "security": [
+                    {
+                        "API_Key": [
+                            "btcpay.store.canmodifystoresettings"
+                        ],
+                        "Basic": []
+                    }
+                ]
+            }
+        },
         "/api/v1/apps/{appId}/sales": {
             "get": {
                 "tags": [
diff --git a/Build/Version.csproj b/Build/Version.csproj
index ce07c9559c..a2e8ccd2a3 100644
--- a/Build/Version.csproj
+++ b/Build/Version.csproj
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-		<Version>2.0.1</Version>
+		<Version>2.0.2</Version>
   </PropertyGroup>
 </Project>
diff --git a/Changelog.md b/Changelog.md
index bee0635ec9..ef4e9b9a93 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## 2.0.2
+
+If you are using the Nostr or Blink plugin, consider this release **security-critical**.
+
+Without it, an attacker with access to a pull payment could drain the Lightning wallet without limit.
+
+### Bug fixes
+
+* Fix: Payouts were incorrectly marked as canceled even after successful completion (#6365) @NicolasDorier
+* Fix: Unable to export csv/xml from Reports (#6356 #6357) @dennisreimann
+
 ## 2.0.1
 
 ### Bug fixes