From a9fbba5825a35c2f0412701b273bb43e405a03af Mon Sep 17 00:00:00 2001
From: Dennis Reimann <mail@dennisreimann.de>
Date: Tue, 11 Mar 2025 10:54:17 +0100
Subject: [PATCH] UI: Fix and unify localizer usage for page titles

Issue was caused by duplicate translation through a combination of `StringLocalizer` and `text-translate="true"` usage. Fixes #6622.
---
 BTCPayServer/Components/StoreNumbers/Default.cshtml      | 2 +-
 BTCPayServer/Views/Shared/CreateOrEditRole.cshtml        | 9 ++++-----
 .../Views/Shared/Crowdfund/UpdateCrowdfund.cshtml        | 2 +-
 BTCPayServer/Views/Shared/ListRoles.cshtml               | 4 ++--
 BTCPayServer/Views/Shared/PayButton/Enable.cshtml        | 5 ++---
 BTCPayServer/Views/Shared/PayButton/PayButton.cshtml     | 5 ++---
 .../Views/Shared/PointOfSale/UpdatePointOfSale.cshtml    | 2 +-
 BTCPayServer/Views/UIAccount/CheatPermissions.cshtml     | 4 ++--
 BTCPayServer/Views/UIAccount/SignedOut.cshtml            | 4 ++--
 BTCPayServer/Views/UIApps/CreateApp.cshtml               | 4 ++--
 BTCPayServer/Views/UIFido2/Create.cshtml                 | 2 +-
 BTCPayServer/Views/UIForms/FormsList.cshtml              | 2 +-
 BTCPayServer/Views/UIForms/Modify.cshtml                 | 2 +-
 BTCPayServer/Views/UIInvoice/CreateInvoice.cshtml        | 4 ++--
 BTCPayServer/Views/UIInvoice/Invoice.cshtml              | 4 ++--
 BTCPayServer/Views/UIInvoice/ListInvoices.cshtml         | 2 +-
 BTCPayServer/Views/UILNURL/EditLightningAddress.cshtml   | 2 +-
 BTCPayServer/Views/UILNURLAuth/Create.cshtml             | 2 +-
 .../Configure.cshtml                                     | 2 +-
 .../UILightningLikePayout/ConfirmLightningPayout.cshtml  | 4 ++--
 .../UILightningLikePayout/LightningPayoutResult.cshtml   | 5 ++---
 BTCPayServer/Views/UIManage/APIKeys.cshtml               | 2 +-
 BTCPayServer/Views/UIManage/AddApiKey.cshtml             | 6 +++---
 BTCPayServer/Views/UIManage/ChangePassword.cshtml        | 2 +-
 BTCPayServer/Views/UIManage/EnableAuthenticator.cshtml   | 4 ++--
 BTCPayServer/Views/UIManage/GenerateRecoveryCodes.cshtml | 2 +-
 BTCPayServer/Views/UIManage/Index.cshtml                 | 2 +-
 BTCPayServer/Views/UIManage/LoginCodes.cshtml            | 2 +-
 BTCPayServer/Views/UIManage/NotificationSettings.cshtml  | 4 ++--
 BTCPayServer/Views/UIManage/SetPassword.cshtml           | 2 +-
 .../Views/UIManage/TwoFactorAuthentication.cshtml        | 2 +-
 BTCPayServer/Views/UINotifications/Index.cshtml          | 2 +-
 .../UIOnChainAutomatedPayoutProcessors/Configure.cshtml  | 4 ++--
 .../Views/UIPaymentRequest/EditPaymentRequest.cshtml     | 2 +-
 .../ConfigureStorePayoutProcessors.cshtml                | 2 +-
 BTCPayServer/Views/UIPullPayment/EditPullPayment.cshtml  | 4 ++--
 BTCPayServer/Views/UIServer/Branding.cshtml              | 2 +-
 .../Views/UIServer/CLightningRestServices.cshtml         | 2 +-
 BTCPayServer/Views/UIServer/ConfiguratorService.cshtml   | 4 ++--
 BTCPayServer/Views/UIServer/CreateDictionary.cshtml      | 4 ++--
 .../Views/UIServer/CreateTemporaryFileUrl.cshtml         | 2 +-
 BTCPayServer/Views/UIServer/CreateUser.cshtml            | 4 ++--
 BTCPayServer/Views/UIServer/DynamicDnsServices.cshtml    | 4 ++--
 .../Views/UIServer/EditAmazonS3StorageProvider.cshtml    | 2 +-
 .../UIServer/EditAzureBlobStorageStorageProvider.cshtml  | 2 +-
 BTCPayServer/Views/UIServer/EditDictionary.cshtml        | 1 -
 .../Views/UIServer/EditFileSystemStorageProvider.cshtml  | 2 +-
 .../EditGoogleCloudStorageStorageProvider.cshtml         | 2 +-
 BTCPayServer/Views/UIServer/Emails.cshtml                | 2 +-
 BTCPayServer/Views/UIServer/Files.cshtml                 | 2 +-
 .../Views/UIServer/LightningChargeServices.cshtml        | 4 ++--
 BTCPayServer/Views/UIServer/ListDictionaries.cshtml      | 4 ++--
 BTCPayServer/Views/UIServer/ListStores.cshtml            | 2 +-
 BTCPayServer/Views/UIServer/ListUsers.cshtml             | 2 +-
 BTCPayServer/Views/UIServer/LndSeedBackup.cshtml         | 4 ++--
 BTCPayServer/Views/UIServer/LndServices.cshtml           | 4 ++--
 BTCPayServer/Views/UIServer/Logs.cshtml                  | 2 +-
 BTCPayServer/Views/UIServer/Maintenance.cshtml           | 2 +-
 BTCPayServer/Views/UIServer/Policies.cshtml              | 4 ++--
 BTCPayServer/Views/UIServer/ResetUserPassword.cshtml     | 6 +++---
 BTCPayServer/Views/UIServer/SSHService.cshtml            | 4 ++--
 BTCPayServer/Views/UIServer/Services.cshtml              | 2 +-
 BTCPayServer/Views/UIServer/Storage.cshtml               | 4 ++--
 BTCPayServer/Views/UIServer/User.cshtml                  | 2 +-
 .../Views/UIStorePullPayments/NewPullPayment.cshtml      | 4 ++--
 BTCPayServer/Views/UIStores/CheckoutAppearance.cshtml    | 2 +-
 BTCPayServer/Views/UIStores/CreateToken.cshtml           | 6 +++---
 BTCPayServer/Views/UIStores/Lightning.cshtml             | 2 +-
 BTCPayServer/Views/UIStores/LightningSettings.cshtml     | 2 +-
 BTCPayServer/Views/UIStores/ListTokens.cshtml            | 2 +-
 BTCPayServer/Views/UIStores/ModifyWebhook.cshtml         | 2 +-
 BTCPayServer/Views/UIStores/Rates.cshtml                 | 2 +-
 BTCPayServer/Views/UIStores/RequestPairing.cshtml        | 4 ++--
 BTCPayServer/Views/UIStores/StoreEmails.cshtml           | 4 ++--
 BTCPayServer/Views/UIStores/StoreUsers.cshtml            | 2 +-
 BTCPayServer/Views/UIStores/TestWebhook.cshtml           | 2 +-
 BTCPayServer/Views/UIStores/WalletSettings.cshtml        | 2 +-
 BTCPayServer/Views/UIStores/Webhooks.cshtml              | 2 +-
 BTCPayServer/Views/UIUserStores/CreateStore.cshtml       | 2 +-
 BTCPayServer/Views/UIUserStores/ListStores.cshtml        | 2 +-
 BTCPayServer/Views/UIWallets/WalletLabels.cshtml         | 2 +-
 BTCPayServer/Views/UIWallets/WalletPSBTCombine.cshtml    | 2 +-
 BTCPayServer/Views/UIWallets/WalletPSBTDecoded.cshtml    | 2 +-
 83 files changed, 119 insertions(+), 124 deletions(-)

diff --git a/BTCPayServer/Components/StoreNumbers/Default.cshtml b/BTCPayServer/Components/StoreNumbers/Default.cshtml
index b9517b47d..9511a07d0 100644
--- a/BTCPayServer/Components/StoreNumbers/Default.cshtml
+++ b/BTCPayServer/Components/StoreNumbers/Default.cshtml
@@ -24,7 +24,7 @@
     {
         <div class="store-number">
             <header>
-                <h6 text-translate="true">@ViewLocalizer["Paid invoices in the last {0} days", Model.TimeframeDays]</h6>
+                <h6>@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.StoreId"  permission="@Policies.CanViewInvoices" text-translate="true">View All</a>
diff --git a/BTCPayServer/Views/Shared/CreateOrEditRole.cshtml b/BTCPayServer/Views/Shared/CreateOrEditRole.cshtml
index 0f6db3857..5f248ba84 100644
--- a/BTCPayServer/Views/Shared/CreateOrEditRole.cshtml
+++ b/BTCPayServer/Views/Shared/CreateOrEditRole.cshtml
@@ -12,12 +12,11 @@
         role = null;
 
     var storeId = Context.GetRouteValue("storeId") as string;
+    var title = role is null ? StringLocalizer["Create role"] : StringLocalizer["Update Role"];
     if (storeId is null)
-        ViewData.SetActivePage(ServerNavPages.Roles, role is null ? "Create role" : "Update Role");
+        ViewData.SetActivePage(ServerNavPages.Roles, title);
     else
-    {
-        ViewData.SetActivePage(StoreNavPages.Roles, role is null ? "Create role" : "Update Role");
-    }
+        ViewData.SetActivePage(StoreNavPages.Roles, title, storeId);
     var storePolicies = Policies.AllPolicies.Where(Policies.IsStorePolicy).ToArray();
 }
 
@@ -30,7 +29,7 @@
                 </li>
                 <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
             </ol>
-            <h2 text-translate="true">@ViewData["Title"]</h2>
+            <h2>@ViewData["Title"]</h2>
         </nav>
         <button id="page-primary" type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
     </div>
diff --git a/BTCPayServer/Views/Shared/Crowdfund/UpdateCrowdfund.cshtml b/BTCPayServer/Views/Shared/Crowdfund/UpdateCrowdfund.cshtml
index e4566b26d..914cd0c3a 100644
--- a/BTCPayServer/Views/Shared/Crowdfund/UpdateCrowdfund.cshtml
+++ b/BTCPayServer/Views/Shared/Crowdfund/UpdateCrowdfund.cshtml
@@ -30,7 +30,7 @@
 
 <form method="post" enctype="multipart/form-data" permissioned="@Policies.CanModifyStoreSettings">
     <div class="sticky-header">
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
         <div>
             <button id="page-primary" type="submit" class="btn btn-primary order-sm-1">Save</button>
             <a class="btn btn-secondary" asp-action="ListInvoices" asp-controller="UIInvoice" asp-route-storeId="@Model.StoreId" asp-route-searchterm="@Model.SearchTerm">Invoices</a>
diff --git a/BTCPayServer/Views/Shared/ListRoles.cshtml b/BTCPayServer/Views/Shared/ListRoles.cshtml
index ead7b90c7..5c0455501 100644
--- a/BTCPayServer/Views/Shared/ListRoles.cshtml
+++ b/BTCPayServer/Views/Shared/ListRoles.cshtml
@@ -9,7 +9,7 @@
     if (string.IsNullOrEmpty(storeId))
         ViewData.SetActivePage(ServerNavPages.Roles, StringLocalizer["Roles"]);
     else
-        ViewData.SetActivePage(StoreNavPages.Roles, StringLocalizer["Roles"]);
+        ViewData.SetActivePage(StoreNavPages.Roles, StringLocalizer["Roles"], storeId);
     var permission = string.IsNullOrEmpty(storeId) ? Policies.CanModifyServerSettings : Policies.CanModifyStoreSettings;
     var nextRoleSortOrder = (string) ViewData["NextRoleSortOrder"];
     var roleSortOrder = nextRoleSortOrder switch
@@ -25,7 +25,7 @@
 }
 
 <div class="sticky-header">
-    <h2 text-translate="true">@ViewData["Title"]</h2>
+    <h2>@ViewData["Title"]</h2>
 	<a id="page-primary" class="btn btn-primary" role="button" asp-controller="@controller" asp-action="CreateOrEditRole" asp-route-role="create" asp-route-storeId="@storeId" permission="@permission">Add Role</a>
 </div>
 <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/Shared/PayButton/Enable.cshtml b/BTCPayServer/Views/Shared/PayButton/Enable.cshtml
index 1dc8aca06..9dda162ae 100644
--- a/BTCPayServer/Views/Shared/PayButton/Enable.cshtml
+++ b/BTCPayServer/Views/Shared/PayButton/Enable.cshtml
@@ -1,13 +1,12 @@
 @using BTCPayServer.TagHelpers
 @using BTCPayServer.Views.Stores
-@using Microsoft.AspNetCore.Html
 @using Microsoft.AspNetCore.Mvc.TagHelpers
 @{
-	ViewData.SetActivePage(StoreNavPages.PayButton, "Pay Button", Context.GetStoreData().Id);
+	ViewData.SetActivePage(StoreNavPages.PayButton, StringLocalizer["Pay Button"], Context.GetStoreData().Id);
 }
 
 <div class="sticky-header">
-    <h2 class="my-1" text-translate="true">@ViewData["Title"]</h2>
+    <h2 class="my-1">@ViewData["Title"]</h2>
 </div>
 
 <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/Shared/PayButton/PayButton.cshtml b/BTCPayServer/Views/Shared/PayButton/PayButton.cshtml
index 4eb63a35f..31df3177e 100644
--- a/BTCPayServer/Views/Shared/PayButton/PayButton.cshtml
+++ b/BTCPayServer/Views/Shared/PayButton/PayButton.cshtml
@@ -1,10 +1,9 @@
 @using BTCPayServer.Views.Stores
-@using Microsoft.AspNetCore.Html
 @inject Security.ContentSecurityPolicies Csp
 @inject BTCPayNetworkProvider NetworkProvider
 @model BTCPayServer.Plugins.PayButton.Models.PayButtonViewModel
 @{
-    ViewData.SetActivePage(StoreNavPages.PayButton, "Pay Button", Context.GetStoreData().Id);
+    ViewData.SetActivePage(StoreNavPages.PayButton, StringLocalizer["Pay Button"], Context.GetStoreData().Id);
 	Csp.UnsafeEval();
 }
 
@@ -176,7 +175,7 @@
 }
 
 <div class="sticky-header">
-	<h2 class="my-1" text-translate="true">@ViewData["Title"]</h2>
+	<h2 class="my-1">@ViewData["Title"]</h2>
 </div>
 
 <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/Shared/PointOfSale/UpdatePointOfSale.cshtml b/BTCPayServer/Views/Shared/PointOfSale/UpdatePointOfSale.cshtml
index e876d4450..2fc339a25 100644
--- a/BTCPayServer/Views/Shared/PointOfSale/UpdatePointOfSale.cshtml
+++ b/BTCPayServer/Views/Shared/PointOfSale/UpdatePointOfSale.cshtml
@@ -29,7 +29,7 @@
 
 <form method="post" permissioned="@Policies.CanModifyStoreSettings">
     <div class="sticky-header">
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
         <div>
             <button id="page-primary" type="submit" class="btn btn-primary order-sm-1">Save</button>
             <a class="btn btn-secondary" asp-action="ListInvoices" asp-controller="UIInvoice" asp-route-storeId="@Model.StoreId" asp-route-searchterm="@Model.SearchTerm" text-translate="true">Invoices</a>
diff --git a/BTCPayServer/Views/UIAccount/CheatPermissions.cshtml b/BTCPayServer/Views/UIAccount/CheatPermissions.cshtml
index e8beee6e3..becad2ade 100644
--- a/BTCPayServer/Views/UIAccount/CheatPermissions.cshtml
+++ b/BTCPayServer/Views/UIAccount/CheatPermissions.cshtml
@@ -7,11 +7,11 @@
 
 @if (Model.StoreId is not null)
 {
-	<h1 text-translate="true">@ViewLocalizer["Store: {0}", Model.StoreId]</h1>
+	<h1>@ViewLocalizer["Store: {0}", Model.StoreId]</h1>
 }
 else
 {
-	<h1 text-translate="true" text-translate="true">No scope</h1>
+	<h1 text-translate="true">No scope</h1>
 }
 
 <ul>
diff --git a/BTCPayServer/Views/UIAccount/SignedOut.cshtml b/BTCPayServer/Views/UIAccount/SignedOut.cshtml
index 5e7a2b197..0d45f1d41 100644
--- a/BTCPayServer/Views/UIAccount/SignedOut.cshtml
+++ b/BTCPayServer/Views/UIAccount/SignedOut.cshtml
@@ -1,8 +1,8 @@
 @{
-    ViewData["Title"] = "Signed out";
+    ViewData["Title"] = StringLocalizer["Signed out"];
 }
 
-<h2 text-translate="true">@ViewData["Title"]</h2>
+<h2>@ViewData["Title"]</h2>
 <p text-translate="true">
     You have successfully signed out.
 </p>
diff --git a/BTCPayServer/Views/UIApps/CreateApp.cshtml b/BTCPayServer/Views/UIApps/CreateApp.cshtml
index 573838924..3529742a2 100644
--- a/BTCPayServer/Views/UIApps/CreateApp.cshtml
+++ b/BTCPayServer/Views/UIApps/CreateApp.cshtml
@@ -1,6 +1,6 @@
 @model CreateAppViewModel
 @{
-    ViewData.SetActivePage(AppsNavPages.Create, $"Create a new {Model.AppType ?? "app"}", Model.AppType);
+    ViewData.SetActivePage(AppsNavPages.Create, StringLocalizer["Create a new {0}", Model.AppType]);
 }
 
 @section PageFootContent {
@@ -9,7 +9,7 @@
 
 <form asp-action="CreateApp" asp-route-appType="@Model.AppType">
     <div class="sticky-header">
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
 		<input id="page-primary" type="submit" value="Create" class="btn btn-primary" />
     </div>
     <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIFido2/Create.cshtml b/BTCPayServer/Views/UIFido2/Create.cshtml
index 26d01d8e9..45ce3ec81 100644
--- a/BTCPayServer/Views/UIFido2/Create.cshtml
+++ b/BTCPayServer/Views/UIFido2/Create.cshtml
@@ -12,7 +12,7 @@
             </li>
             <li class="breadcrumb-item active" aria-current="page" text-translate="true">Register Device</li>
         </ol>
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
     </nav>
 </div>
 <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIForms/FormsList.cshtml b/BTCPayServer/Views/UIForms/FormsList.cshtml
index 3e7089f32..725411ea9 100644
--- a/BTCPayServer/Views/UIForms/FormsList.cshtml
+++ b/BTCPayServer/Views/UIForms/FormsList.cshtml
@@ -9,7 +9,7 @@
 
 <div class="sticky-header">
     <h2>
-        <span text-translate="true">@ViewData["Title"]</span>
+        <span>@ViewData["Title"]</span>
         <a href="https://docs.btcpayserver.org/Forms" target="_blank" rel="noreferrer noopener" title="@StringLocalizer["More information..."]">
             <vc:icon symbol="info" />
         </a>
diff --git a/BTCPayServer/Views/UIForms/Modify.cshtml b/BTCPayServer/Views/UIForms/Modify.cshtml
index daef1b321..af38f0194 100644
--- a/BTCPayServer/Views/UIForms/Modify.cshtml
+++ b/BTCPayServer/Views/UIForms/Modify.cshtml
@@ -203,7 +203,7 @@
                 <li class="breadcrumb-item">
                     <a asp-controller="UIForms" asp-action="FormsList" asp-route-storeId="@storeId" text-translate="true">Forms</a>
                 </li>
-                <li class="breadcrumb-item active" aria-current="page" text-translate="true">@ViewData["Title"]</li>
+                <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
             </ol>
             <h2>
                 @ViewData["Title"]
diff --git a/BTCPayServer/Views/UIInvoice/CreateInvoice.cshtml b/BTCPayServer/Views/UIInvoice/CreateInvoice.cshtml
index 026e97dad..030525201 100644
--- a/BTCPayServer/Views/UIInvoice/CreateInvoice.cshtml
+++ b/BTCPayServer/Views/UIInvoice/CreateInvoice.cshtml
@@ -34,9 +34,9 @@
                 <li class="breadcrumb-item">
                     <a asp-action="ListInvoices" asp-route-storeId="@Model.StoreId" text-translate="true">Invoices</a>
                 </li>
-                <li class="breadcrumb-item active" aria-current="page" text-translate="true">@ViewData["Title"]</li>
+                <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
             </ol>
-            <h2 text-translate="true">@ViewData["Title"]</h2>
+            <h2>@ViewData["Title"]</h2>
         </nav>
 		<input id="page-primary" type="submit" value="Create" class="btn btn-primary" />
     </div>
diff --git a/BTCPayServer/Views/UIInvoice/Invoice.cshtml b/BTCPayServer/Views/UIInvoice/Invoice.cshtml
index 219f821e4..117928fa6 100644
--- a/BTCPayServer/Views/UIInvoice/Invoice.cshtml
+++ b/BTCPayServer/Views/UIInvoice/Invoice.cshtml
@@ -1,7 +1,7 @@
 @using BTCPayServer.Client
 @model InvoiceDetailsModel
 @{
-    ViewData["Title"] = $"Invoice {Model.Id}";
+    ViewData["Title"] = StringLocalizer["Invoice {0}", Model.Id];
 }
 
 @section PageHeadContent {
@@ -177,7 +177,7 @@
             </li>
             <li class="breadcrumb-item active" aria-current="page">Invoice</li>
         </ol>
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
     </nav>
     <div>
         @if (Model.ShowCheckout)
diff --git a/BTCPayServer/Views/UIInvoice/ListInvoices.cshtml b/BTCPayServer/Views/UIInvoice/ListInvoices.cshtml
index 4685e40ca..096afd110 100644
--- a/BTCPayServer/Views/UIInvoice/ListInvoices.cshtml
+++ b/BTCPayServer/Views/UIInvoice/ListInvoices.cshtml
@@ -102,7 +102,7 @@
 
 <div class="sticky-header">
     <h2>
-        <span text-translate="true">@ViewData["Title"]</span>
+        <span>@ViewData["Title"]</span>
         <a href="#descriptor" data-bs-toggle="collapse">
             <vc:icon symbol="info" />
         </a>
diff --git a/BTCPayServer/Views/UILNURL/EditLightningAddress.cshtml b/BTCPayServer/Views/UILNURL/EditLightningAddress.cshtml
index c4b48370f..62afdc959 100644
--- a/BTCPayServer/Views/UILNURL/EditLightningAddress.cshtml
+++ b/BTCPayServer/Views/UILNURL/EditLightningAddress.cshtml
@@ -26,7 +26,7 @@
 }
 
 <div class="sticky-header">
-    <h2 text-translate="true">@ViewData["Title"]</h2>
+    <h2>@ViewData["Title"]</h2>
 	<a id="page-primary" data-bs-toggle="collapse" data-bs-target="#AddAddress" class="btn btn-primary" role="button">
         Add Address
     </a>
diff --git a/BTCPayServer/Views/UILNURLAuth/Create.cshtml b/BTCPayServer/Views/UILNURLAuth/Create.cshtml
index bfd2d7ee8..67a114ecf 100644
--- a/BTCPayServer/Views/UILNURLAuth/Create.cshtml
+++ b/BTCPayServer/Views/UILNURLAuth/Create.cshtml
@@ -9,7 +9,7 @@
     };
 }
 
-<h2 class="mb-2 mb-lg-3" text-translate="true">@ViewData["Title"]</h2>
+<h2 class="mb-2 mb-lg-3">@ViewData["Title"]</h2>
 <partial name="_StatusMessage" />
 
 <p text-translate="true">Scan the QR code with your Lightning wallet to link it to your user account.</p>
diff --git a/BTCPayServer/Views/UILightningAutomatedPayoutProcessors/Configure.cshtml b/BTCPayServer/Views/UILightningAutomatedPayoutProcessors/Configure.cshtml
index a85ed4cdb..bca140b2e 100644
--- a/BTCPayServer/Views/UILightningAutomatedPayoutProcessors/Configure.cshtml
+++ b/BTCPayServer/Views/UILightningAutomatedPayoutProcessors/Configure.cshtml
@@ -16,7 +16,7 @@
                 </li>
                 <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
             </ol>
-            <h2 text-translate="true">@ViewData["Title"]</h2>
+            <h2>@ViewData["Title"]</h2>
         </nav>
 		<button id="page-primary" name="command" type="submit" class="btn btn-primary" value="Save">Save</button>
     </div>
diff --git a/BTCPayServer/Views/UILightningLikePayout/ConfirmLightningPayout.cshtml b/BTCPayServer/Views/UILightningLikePayout/ConfirmLightningPayout.cshtml
index 70281a1c2..a0acfe2fc 100644
--- a/BTCPayServer/Views/UILightningLikePayout/ConfirmLightningPayout.cshtml
+++ b/BTCPayServer/Views/UILightningLikePayout/ConfirmLightningPayout.cshtml
@@ -1,11 +1,11 @@
 @model System.Collections.Generic.List<BTCPayServer.Data.Payouts.LightningLike.UILightningLikePayoutController.ConfirmVM>
 @{
     Layout = "../Shared/_Layout.cshtml";
-    ViewData["Title"] = "Confirm Lightning Payout";
+    ViewData["Title"] = StringLocalizer["Confirm Lightning Payout"];
     var cryptoCode = Context.GetRouteValue("cryptoCode");
 }
 
-<h2 class="mt-1 mb-2" text-translate="true">@ViewData["Title"]</h2>
+<h2 class="mt-1 mb-2">@ViewData["Title"]</h2>
 <div class="row">
     <div class="col-md-12">
         <ul class="list-group list-group-flush">
diff --git a/BTCPayServer/Views/UILightningLikePayout/LightningPayoutResult.cshtml b/BTCPayServer/Views/UILightningLikePayout/LightningPayoutResult.cshtml
index 1422fbab9..c51abaaa6 100644
--- a/BTCPayServer/Views/UILightningLikePayout/LightningPayoutResult.cshtml
+++ b/BTCPayServer/Views/UILightningLikePayout/LightningPayoutResult.cshtml
@@ -1,11 +1,10 @@
-@using BTCPayServer.Lightning
 @model System.Collections.Generic.List<BTCPayServer.Data.Payouts.LightningLike.UILightningLikePayoutController.ResultVM>
 @{
     Layout = "_Layout";
-    ViewData["Title"] = "Lightning Payout Result";
+    ViewData["Title"] = StringLocalizer["Lightning Payout Result"];
 }
 
-<h2 class="mt-1 mb-4" text-translate="true">@ViewData["Title"]</h2>
+<h2 class="mt-1 mb-4">@ViewData["Title"]</h2>
 @foreach (var item in Model)
 {
     <div class="alert alert-@(item.Success is true ? "success" : "danger") mb-3" role="alert">
diff --git a/BTCPayServer/Views/UIManage/APIKeys.cshtml b/BTCPayServer/Views/UIManage/APIKeys.cshtml
index 8f6272f91..6313ea8b4 100644
--- a/BTCPayServer/Views/UIManage/APIKeys.cshtml
+++ b/BTCPayServer/Views/UIManage/APIKeys.cshtml
@@ -12,7 +12,7 @@
 }
 
 <div class="sticky-header">
-    <h2 text-translate="true">@ViewData["Title"]</h2>
+    <h2>@ViewData["Title"]</h2>
 	<a id="page-primary" class="btn btn-primary" asp-action="AddApiKey">
         Generate Key
     </a>
diff --git a/BTCPayServer/Views/UIManage/AddApiKey.cshtml b/BTCPayServer/Views/UIManage/AddApiKey.cshtml
index 6a7222b54..d12abedd6 100644
--- a/BTCPayServer/Views/UIManage/AddApiKey.cshtml
+++ b/BTCPayServer/Views/UIManage/AddApiKey.cshtml
@@ -3,7 +3,7 @@
 @model UIManageController.AddApiKeyViewModel
 
 @{
-    ViewData.SetActivePage(ManageNavPages.APIKeys, "Generate API Key");
+    ViewData.SetActivePage(ManageNavPages.APIKeys, StringLocalizer["Generate API Key"]);
 }
 
 @section PageHeadContent {
@@ -32,9 +32,9 @@
                 <li class="breadcrumb-item">
                     <a asp-action="APIKeys" text-translate="true">API Keys</a>
                 </li>
-                <li class="breadcrumb-item active" aria-current="page" text-translate="true">@ViewData["Title"]</li>
+                <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
             </ol>
-            <h2 text-translate="true">@ViewData["Title"]</h2>
+            <h2>@ViewData["Title"]</h2>
         </nav>
 		<button id="page-primary" type="submit" class="btn btn-primary">Generate API Key</button>
     </div>
diff --git a/BTCPayServer/Views/UIManage/ChangePassword.cshtml b/BTCPayServer/Views/UIManage/ChangePassword.cshtml
index 5af1e2b69..d3c61619f 100644
--- a/BTCPayServer/Views/UIManage/ChangePassword.cshtml
+++ b/BTCPayServer/Views/UIManage/ChangePassword.cshtml
@@ -5,7 +5,7 @@
 
 <form method="post">
     <div class="sticky-header">
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
 		<button id="page-primary" type="submit" class="btn btn-primary">Update Password</button>
     </div>
     <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIManage/EnableAuthenticator.cshtml b/BTCPayServer/Views/UIManage/EnableAuthenticator.cshtml
index 82303f192..c493f6c36 100644
--- a/BTCPayServer/Views/UIManage/EnableAuthenticator.cshtml
+++ b/BTCPayServer/Views/UIManage/EnableAuthenticator.cshtml
@@ -13,9 +13,9 @@
             <li class="breadcrumb-item">
                 <a asp-action="TwoFactorAuthentication" text-translate="true">Two Factor Authentication</a>
             </li>
-            <li class="breadcrumb-item active" aria-current="page" text-translate="true">@ViewData["Title"]</li>
+            <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
         </ol>
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
     </nav>
 </div>
 <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIManage/GenerateRecoveryCodes.cshtml b/BTCPayServer/Views/UIManage/GenerateRecoveryCodes.cshtml
index 7a1df68a5..c92560118 100644
--- a/BTCPayServer/Views/UIManage/GenerateRecoveryCodes.cshtml
+++ b/BTCPayServer/Views/UIManage/GenerateRecoveryCodes.cshtml
@@ -3,7 +3,7 @@
     ViewData.SetActivePage(ManageNavPages.TwoFactorAuthentication, StringLocalizer["Recovery codes"]);
 }
 
-<h2 class="mb-2 mb-lg-3" text-translate="true">@ViewData["Title"]</h2>
+<h2 class="mb-2 mb-lg-3">@ViewData["Title"]</h2>
 <partial name="_StatusMessage" />
 
 <div class="alert alert-warning" role="alert">
diff --git a/BTCPayServer/Views/UIManage/Index.cshtml b/BTCPayServer/Views/UIManage/Index.cshtml
index 4f7eca1e8..539ba3047 100644
--- a/BTCPayServer/Views/UIManage/Index.cshtml
+++ b/BTCPayServer/Views/UIManage/Index.cshtml
@@ -10,7 +10,7 @@
 
 <form method="post" enctype="multipart/form-data">
     <div class="sticky-header">
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
 		<button id="page-primary" type="submit" class="btn btn-primary">Save</button>
     </div>
     <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIManage/LoginCodes.cshtml b/BTCPayServer/Views/UIManage/LoginCodes.cshtml
index e6bddd71d..6f7c1a9ec 100644
--- a/BTCPayServer/Views/UIManage/LoginCodes.cshtml
+++ b/BTCPayServer/Views/UIManage/LoginCodes.cshtml
@@ -4,7 +4,7 @@
 }
 
 <div class="sticky-header">
-    <h2 text-translate="true">@ViewData["Title"]</h2>
+    <h2>@ViewData["Title"]</h2>
 </div>
 <partial name="_StatusMessage" />
 <p text-translate="true">Easily log into BTCPay Server on another device using a simple login code from an already authenticated device.</p>
diff --git a/BTCPayServer/Views/UIManage/NotificationSettings.cshtml b/BTCPayServer/Views/UIManage/NotificationSettings.cshtml
index 969bc5c6b..010189ecb 100644
--- a/BTCPayServer/Views/UIManage/NotificationSettings.cshtml
+++ b/BTCPayServer/Views/UIManage/NotificationSettings.cshtml
@@ -10,9 +10,9 @@
                 <li class="breadcrumb-item">
                     <a asp-controller="UINotifications" asp-action="Index" text-translate="true">Notifications</a>
                 </li>
-                <li class="breadcrumb-item active" aria-current="page" text-translate="true">@ViewData["Title"]</li>
+                <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
             </ol>
-            <h2 text-translate="true">@ViewData["Title"]</h2>
+            <h2>@ViewData["Title"]</h2>
         </nav>
 		<button id="page-primary" type="submit" class="btn btn-primary" name="command" value="update">Save</button>
     </div>
diff --git a/BTCPayServer/Views/UIManage/SetPassword.cshtml b/BTCPayServer/Views/UIManage/SetPassword.cshtml
index bae533e78..03e9472a7 100644
--- a/BTCPayServer/Views/UIManage/SetPassword.cshtml
+++ b/BTCPayServer/Views/UIManage/SetPassword.cshtml
@@ -5,7 +5,7 @@
 
 <form method="post">
     <div class="sticky-header">
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
 		<button id="page-primary" type="submit" class="btn btn-primary">Set Password</button>
     </div>
     <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIManage/TwoFactorAuthentication.cshtml b/BTCPayServer/Views/UIManage/TwoFactorAuthentication.cshtml
index 18fcc911e..860d5f1fe 100644
--- a/BTCPayServer/Views/UIManage/TwoFactorAuthentication.cshtml
+++ b/BTCPayServer/Views/UIManage/TwoFactorAuthentication.cshtml
@@ -4,7 +4,7 @@
     ViewData.SetActivePage(ManageNavPages.TwoFactorAuthentication, StringLocalizer["Two-Factor Authentication"]);
 }
 <div class="sticky-header">
-	<h2 class="my-1" text-translate="true">@ViewData["Title"]</h2>
+	<h2 class="my-1">@ViewData["Title"]</h2>
 </div>
 <partial name="_StatusMessage" />
 <div class="row">
diff --git a/BTCPayServer/Views/UINotifications/Index.cshtml b/BTCPayServer/Views/UINotifications/Index.cshtml
index 16d7eaa20..81177c596 100644
--- a/BTCPayServer/Views/UINotifications/Index.cshtml
+++ b/BTCPayServer/Views/UINotifications/Index.cshtml
@@ -32,7 +32,7 @@
 }
 
 <div class="sticky-header">
-	<h2 class="my-1" text-translate="true">@ViewData["Title"]</h2>
+	<h2 class="my-1">@ViewData["Title"]</h2>
     <a id="NotificationSettings" asp-controller="UIManage" asp-action="NotificationSettings" class="btn btn-secondary d-flex align-items-center">
         <vc:icon symbol="nav-store-settings" />
     </a>
diff --git a/BTCPayServer/Views/UIOnChainAutomatedPayoutProcessors/Configure.cshtml b/BTCPayServer/Views/UIOnChainAutomatedPayoutProcessors/Configure.cshtml
index 2ee1f2514..0ec84dbfe 100644
--- a/BTCPayServer/Views/UIOnChainAutomatedPayoutProcessors/Configure.cshtml
+++ b/BTCPayServer/Views/UIOnChainAutomatedPayoutProcessors/Configure.cshtml
@@ -15,9 +15,9 @@
                 <li class="breadcrumb-item">
                     <a asp-controller="UIPayoutProcessors" asp-action="ConfigureStorePayoutProcessors" asp-route-storeId="@storeId" text-translate="true">Payout Processors</a>
                 </li>
-                <li class="breadcrumb-item active" aria-current="page" text-translate="true">@ViewData["Title"]</li>
+                <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
             </ol>
-            <h2 text-translate="true">@ViewData["Title"]</h2>
+            <h2>@ViewData["Title"]</h2>
         </nav>
 		<button id="page-primary" name="command" type="submit" class="btn btn-primary" value="Save" text-translate="true">Save</button>
     </div>
diff --git a/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml b/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml
index 80eda9fd9..0c56a10a7 100644
--- a/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml
+++ b/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml
@@ -30,7 +30,7 @@
                 </li>
                 <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
             </ol>
-            <h2 text-translate="true">@ViewData["Title"]</h2>
+            <h2>@ViewData["Title"]</h2>
         </nav>
         <div>
             @if (string.IsNullOrEmpty(Model.Id))
diff --git a/BTCPayServer/Views/UIPayoutProcessors/ConfigureStorePayoutProcessors.cshtml b/BTCPayServer/Views/UIPayoutProcessors/ConfigureStorePayoutProcessors.cshtml
index f353627d0..e14f611f9 100644
--- a/BTCPayServer/Views/UIPayoutProcessors/ConfigureStorePayoutProcessors.cshtml
+++ b/BTCPayServer/Views/UIPayoutProcessors/ConfigureStorePayoutProcessors.cshtml
@@ -8,7 +8,7 @@
     ViewData.SetActivePage(StoreNavPages.PayoutProcessors, StringLocalizer["Payout Processors"], storeId);
 }
 <div class="sticky-header">
-	<h2 class="my-1" text-translate="true">@ViewData["Title"]</h2>
+	<h2 class="my-1">@ViewData["Title"]</h2>
 </div>
 
 <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIPullPayment/EditPullPayment.cshtml b/BTCPayServer/Views/UIPullPayment/EditPullPayment.cshtml
index e08fd7f75..6bda47821 100644
--- a/BTCPayServer/Views/UIPullPayment/EditPullPayment.cshtml
+++ b/BTCPayServer/Views/UIPullPayment/EditPullPayment.cshtml
@@ -21,9 +21,9 @@
                 <li class="breadcrumb-item">
                     <a asp-controller="UIStorePullPayments" asp-action="PullPayments" asp-route-storeId="@storeId" text-translate="true">Pull Payments</a>
                 </li>
-                <li class="breadcrumb-item active" aria-current="page" text-translate="true">@ViewData["Title"]</li>
+                <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
             </ol>
-            <h2 text-translate="true">@ViewData["Title"]</h2>
+            <h2>@ViewData["Title"]</h2>
         </nav>
         <div>
             @if (string.IsNullOrEmpty(Model.Id))
diff --git a/BTCPayServer/Views/UIServer/Branding.cshtml b/BTCPayServer/Views/UIServer/Branding.cshtml
index e18e3c8da..64a2bc3a5 100644
--- a/BTCPayServer/Views/UIServer/Branding.cshtml
+++ b/BTCPayServer/Views/UIServer/Branding.cshtml
@@ -15,7 +15,7 @@
 
 <form method="post" enctype="multipart/form-data">
     <div class="sticky-header">
-		<h2 text-translate="true">@ViewData["Title"]</h2>
+		<h2>@ViewData["Title"]</h2>
 		<button id="page-primary" type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
     </div>
     <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIServer/CLightningRestServices.cshtml b/BTCPayServer/Views/UIServer/CLightningRestServices.cshtml
index 1e5fbc785..dce518551 100644
--- a/BTCPayServer/Views/UIServer/CLightningRestServices.cshtml
+++ b/BTCPayServer/Views/UIServer/CLightningRestServices.cshtml
@@ -11,7 +11,7 @@
             </li>
             <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
         </ol>
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
     </nav>
 </div>
 <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIServer/ConfiguratorService.cshtml b/BTCPayServer/Views/UIServer/ConfiguratorService.cshtml
index 08af54b6c..e83b31141 100644
--- a/BTCPayServer/Views/UIServer/ConfiguratorService.cshtml
+++ b/BTCPayServer/Views/UIServer/ConfiguratorService.cshtml
@@ -10,9 +10,9 @@
             <li class="breadcrumb-item">
                 <a asp-action="Services" text-translate="true">Services</a>
             </li>
-            <li class="breadcrumb-item active" aria-current="page" text-translate="true">@ViewData["Title"]</li>
+            <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
         </ol>
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
     </nav>
 </div>
 <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIServer/CreateDictionary.cshtml b/BTCPayServer/Views/UIServer/CreateDictionary.cshtml
index 53bc3d0b8..4133d2a05 100644
--- a/BTCPayServer/Views/UIServer/CreateDictionary.cshtml
+++ b/BTCPayServer/Views/UIServer/CreateDictionary.cshtml
@@ -9,9 +9,9 @@
 				<li class="breadcrumb-item">
 					<a asp-action="ListDictionaries" text-translate="true">Dictionaries</a>
 				</li>
-				<li class="breadcrumb-item active" aria-current="page" text-translate="true">@ViewData["Title"]</li>
+				<li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
 			</ol>
-			<h2 text-translate="true">@ViewData["Title"]</h2>
+			<h2>@ViewData["Title"]</h2>
 		</nav>
 		<input id="page-primary" type="submit" value="Create" class="btn btn-primary" />
 	</div>
diff --git a/BTCPayServer/Views/UIServer/CreateTemporaryFileUrl.cshtml b/BTCPayServer/Views/UIServer/CreateTemporaryFileUrl.cshtml
index f43e5471d..0976c11fa 100644
--- a/BTCPayServer/Views/UIServer/CreateTemporaryFileUrl.cshtml
+++ b/BTCPayServer/Views/UIServer/CreateTemporaryFileUrl.cshtml
@@ -6,7 +6,7 @@
 
 <form method="post">
     <div class="sticky-header">
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
 		<button id="page-primary" type="submit" class="btn btn-primary" name="command" value="Generate" text-translate="true">Generate</button>
     </div>
     <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIServer/CreateUser.cshtml b/BTCPayServer/Views/UIServer/CreateUser.cshtml
index 62c37f584..b90452fd8 100644
--- a/BTCPayServer/Views/UIServer/CreateUser.cshtml
+++ b/BTCPayServer/Views/UIServer/CreateUser.cshtml
@@ -13,9 +13,9 @@
                 <li class="breadcrumb-item">
                     <a asp-action="ListUsers" text-translate="true">Users</a>
                 </li>
-                <li class="breadcrumb-item active" aria-current="page" text-translate="true">@ViewData["Title"]</li>
+                <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
             </ol>
-            <h2 text-translate="true">@ViewData["Title"]</h2>
+            <h2>@ViewData["Title"]</h2>
         </nav>
 		<button id="page-primary" type="submit" class="btn btn-primary" name="command" value="Save">Create Account</button>
     </div>
diff --git a/BTCPayServer/Views/UIServer/DynamicDnsServices.cshtml b/BTCPayServer/Views/UIServer/DynamicDnsServices.cshtml
index 9e5eb0676..55fa9c1c8 100644
--- a/BTCPayServer/Views/UIServer/DynamicDnsServices.cshtml
+++ b/BTCPayServer/Views/UIServer/DynamicDnsServices.cshtml
@@ -9,10 +9,10 @@
             <li class="breadcrumb-item">
                 <a asp-action="Services" text-translate="true">Services</a>
             </li>
-            <li class="breadcrumb-item active" aria-current="page" text-translate="true">@ViewData["Title"]</li>
+            <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
         </ol>
         <h2>
-            <span text-translate="true">@ViewData["Title"]</span>
+            <span>@ViewData["Title"]</span>
             <small>
                 <a href="https://docs.btcpayserver.org/Apps/" target="_blank" rel="noreferrer noopener" title="@StringLocalizer["More information..."]">
                     <vc:icon symbol="info" />
diff --git a/BTCPayServer/Views/UIServer/EditAmazonS3StorageProvider.cshtml b/BTCPayServer/Views/UIServer/EditAmazonS3StorageProvider.cshtml
index 643d88574..bef2fe38a 100644
--- a/BTCPayServer/Views/UIServer/EditAmazonS3StorageProvider.cshtml
+++ b/BTCPayServer/Views/UIServer/EditAmazonS3StorageProvider.cshtml
@@ -14,7 +14,7 @@
             </li>
             <li class="breadcrumb-item active" aria-current="page" text-translate="true">Provider</li>
         </ol>
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
     </nav>
 </div>
 <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIServer/EditAzureBlobStorageStorageProvider.cshtml b/BTCPayServer/Views/UIServer/EditAzureBlobStorageStorageProvider.cshtml
index ba0163fb5..7deb05aca 100644
--- a/BTCPayServer/Views/UIServer/EditAzureBlobStorageStorageProvider.cshtml
+++ b/BTCPayServer/Views/UIServer/EditAzureBlobStorageStorageProvider.cshtml
@@ -14,7 +14,7 @@
             </li>
             <li class="breadcrumb-item active" aria-current="page" text-translate="true">Provider</li>
         </ol>
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
     </nav>
 </div>
 <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIServer/EditDictionary.cshtml b/BTCPayServer/Views/UIServer/EditDictionary.cshtml
index bd4c8f4dd..d556a167d 100644
--- a/BTCPayServer/Views/UIServer/EditDictionary.cshtml
+++ b/BTCPayServer/Views/UIServer/EditDictionary.cshtml
@@ -1,4 +1,3 @@
-@using BTCPayServer.Abstractions.Models
 @model EditDictionaryViewModel
 @{
 	ViewData.SetActivePage(ServerNavPages.Translations);
diff --git a/BTCPayServer/Views/UIServer/EditFileSystemStorageProvider.cshtml b/BTCPayServer/Views/UIServer/EditFileSystemStorageProvider.cshtml
index 57067d5b3..fb7e89495 100644
--- a/BTCPayServer/Views/UIServer/EditFileSystemStorageProvider.cshtml
+++ b/BTCPayServer/Views/UIServer/EditFileSystemStorageProvider.cshtml
@@ -14,7 +14,7 @@
             </li>
             <li class="breadcrumb-item active" aria-current="page" text-translate="true">Provider</li>
         </ol>
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
     </nav>
 </div>
 <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIServer/EditGoogleCloudStorageStorageProvider.cshtml b/BTCPayServer/Views/UIServer/EditGoogleCloudStorageStorageProvider.cshtml
index 5f70e2ee9..7a419be3f 100644
--- a/BTCPayServer/Views/UIServer/EditGoogleCloudStorageStorageProvider.cshtml
+++ b/BTCPayServer/Views/UIServer/EditGoogleCloudStorageStorageProvider.cshtml
@@ -14,7 +14,7 @@
             </li>
             <li class="breadcrumb-item active" aria-current="page" text-translate="true">Provider</li>
         </ol>
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
     </nav>
 </div>
 <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIServer/Emails.cshtml b/BTCPayServer/Views/UIServer/Emails.cshtml
index 0cb14a26e..abfaf9ac5 100644
--- a/BTCPayServer/Views/UIServer/Emails.cshtml
+++ b/BTCPayServer/Views/UIServer/Emails.cshtml
@@ -5,7 +5,7 @@
 
 <form method="post" autocomplete="off">
     <div class="sticky-header">
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
 		<button id="page-primary" type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
     </div>
     <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIServer/Files.cshtml b/BTCPayServer/Views/UIServer/Files.cshtml
index a688b3bb1..d99c22673 100644
--- a/BTCPayServer/Views/UIServer/Files.cshtml
+++ b/BTCPayServer/Views/UIServer/Files.cshtml
@@ -4,7 +4,7 @@
 }
 
 <div class="sticky-header">
-	<h2 class="my-1" text-translate="true">@ViewData["Title"]</h2>
+	<h2 class="my-1">@ViewData["Title"]</h2>
     <a asp-action="storage" asp-route-forceChoice="true" asp-route-returnurl="@ViewData["ReturnUrl"]" class="btn btn-secondary d-flex align-items-center">
         <vc:icon symbol="settings" />
     </a>
diff --git a/BTCPayServer/Views/UIServer/LightningChargeServices.cshtml b/BTCPayServer/Views/UIServer/LightningChargeServices.cshtml
index d8f47c2d0..49944c878 100644
--- a/BTCPayServer/Views/UIServer/LightningChargeServices.cshtml
+++ b/BTCPayServer/Views/UIServer/LightningChargeServices.cshtml
@@ -9,9 +9,9 @@
             <li class="breadcrumb-item">
                 <a asp-action="Services" text-translate="true">Services</a>
             </li>
-            <li class="breadcrumb-item active" aria-current="page" text-translate="true">@ViewData["Title"]</li>
+            <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
         </ol>
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
     </nav>
 </div>
 <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIServer/ListDictionaries.cshtml b/BTCPayServer/Views/UIServer/ListDictionaries.cshtml
index 21ff851c1..476d758b6 100644
--- a/BTCPayServer/Views/UIServer/ListDictionaries.cshtml
+++ b/BTCPayServer/Views/UIServer/ListDictionaries.cshtml
@@ -1,11 +1,11 @@
 @using BTCPayServer.Abstractions.Models
 @model ListDictionariesViewModel
 @{
-    ViewData.SetActivePage(ServerNavPages.Translations, "Dictionaries");
+    ViewData.SetActivePage(ServerNavPages.Translations, StringLocalizer["Dictionaries"]);
 }
 
 <div class="sticky-header">
-	<h2 text-translate="true">@ViewData["Title"]</h2>
+	<h2>@ViewData["Title"]</h2>
 	<a id="page-primary" asp-action="CreateDictionary" class="btn btn-primary" role="button">
 		Create
 	</a>
diff --git a/BTCPayServer/Views/UIServer/ListStores.cshtml b/BTCPayServer/Views/UIServer/ListStores.cshtml
index 02652e3d2..63a1a624f 100644
--- a/BTCPayServer/Views/UIServer/ListStores.cshtml
+++ b/BTCPayServer/Views/UIServer/ListStores.cshtml
@@ -4,7 +4,7 @@
     ViewData.SetActivePage(ServerNavPages.Stores, StringLocalizer["Store Overview"]);
 }
 <div class="sticky-header">
-	<h2 class="my-1" text-translate="true">@ViewData["Title"]</h2>
+	<h2 class="my-1">@ViewData["Title"]</h2>
 </div>
 <partial name="_StatusMessage" />
 
diff --git a/BTCPayServer/Views/UIServer/ListUsers.cshtml b/BTCPayServer/Views/UIServer/ListUsers.cshtml
index 240aeaa80..2756c951d 100644
--- a/BTCPayServer/Views/UIServer/ListUsers.cshtml
+++ b/BTCPayServer/Views/UIServer/ListUsers.cshtml
@@ -29,7 +29,7 @@
 }
 
 <div class="sticky-header">
-    <h2 text-translate="true">@ViewData["Title"]</h2>
+    <h2>@ViewData["Title"]</h2>
 	<a id="page-primary" asp-action="CreateUser" class="btn btn-primary" role="button">
         Add User
     </a>
diff --git a/BTCPayServer/Views/UIServer/LndSeedBackup.cshtml b/BTCPayServer/Views/UIServer/LndSeedBackup.cshtml
index 274d22dbe..2ffc56215 100644
--- a/BTCPayServer/Views/UIServer/LndSeedBackup.cshtml
+++ b/BTCPayServer/Views/UIServer/LndSeedBackup.cshtml
@@ -10,9 +10,9 @@
             <li class="breadcrumb-item">
                 <a asp-action="Services" text-translate="true">Services</a>
             </li>
-            <li class="breadcrumb-item active" aria-current="page" text-translate="true">@ViewData["Title"]</li>
+            <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
         </ol>
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
     </nav>
 </div>
 <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIServer/LndServices.cshtml b/BTCPayServer/Views/UIServer/LndServices.cshtml
index 979cac9ab..8f1195163 100644
--- a/BTCPayServer/Views/UIServer/LndServices.cshtml
+++ b/BTCPayServer/Views/UIServer/LndServices.cshtml
@@ -9,9 +9,9 @@
             <li class="breadcrumb-item">
                 <a asp-action="Services" text-translate="true">Services</a>
             </li>
-            <li class="breadcrumb-item active" aria-current="page" text-translate="true">@ViewData["Title"]</li>
+            <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
         </ol>
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
     </nav>
 </div>
 <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIServer/Logs.cshtml b/BTCPayServer/Views/UIServer/Logs.cshtml
index f9acf11b8..eafd044f8 100644
--- a/BTCPayServer/Views/UIServer/Logs.cshtml
+++ b/BTCPayServer/Views/UIServer/Logs.cshtml
@@ -4,7 +4,7 @@
 }
 
 <div class="sticky-header">
-	<h2 class="my-1" text-translate="true">@ViewData["Title"]</h2>
+	<h2 class="my-1">@ViewData["Title"]</h2>
 </div>
 <partial name="_StatusMessage" />
 
diff --git a/BTCPayServer/Views/UIServer/Maintenance.cshtml b/BTCPayServer/Views/UIServer/Maintenance.cshtml
index a69c9e524..74a70076d 100644
--- a/BTCPayServer/Views/UIServer/Maintenance.cshtml
+++ b/BTCPayServer/Views/UIServer/Maintenance.cshtml
@@ -7,7 +7,7 @@
 }
 
 <div class="sticky-header">
-	<h2 class="my-1" text-translate="true">@ViewData["Title"]</h2>
+	<h2 class="my-1">@ViewData["Title"]</h2>
 </div>
 <partial name="_StatusMessage" />
 
diff --git a/BTCPayServer/Views/UIServer/Policies.cshtml b/BTCPayServer/Views/UIServer/Policies.cshtml
index 15082446c..bece6a7bf 100644
--- a/BTCPayServer/Views/UIServer/Policies.cshtml
+++ b/BTCPayServer/Views/UIServer/Policies.cshtml
@@ -4,7 +4,7 @@
 @inject EmailSenderFactory EmailSenderFactory
 @inject TransactionLinkProviders TransactionLinkProviders
 @{
-    ViewData.SetActivePage(ServerNavPages.Policies);
+    ViewData.SetActivePage(ServerNavPages.Policies, StringLocalizer["Policies"]);
     var linkProviders = TransactionLinkProviders.ToArray();
 }
 
@@ -20,7 +20,7 @@
 
 <form method="post">
     <div class="sticky-header">
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
 		<button id="page-primary" type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
     </div>
     <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIServer/ResetUserPassword.cshtml b/BTCPayServer/Views/UIServer/ResetUserPassword.cshtml
index a521deae5..4f58ab808 100644
--- a/BTCPayServer/Views/UIServer/ResetUserPassword.cshtml
+++ b/BTCPayServer/Views/UIServer/ResetUserPassword.cshtml
@@ -1,6 +1,6 @@
 @model BTCPayServer.Controllers.ResetUserPasswordFromAdmin
 @{
-    ViewData.SetActivePage(ServerNavPages.Users, "Reset Password");
+    ViewData.SetActivePage(ServerNavPages.Users, StringLocalizer["Reset Password"]);
 }
 
 <form method="post" asp-action="ResetUserPassword">
@@ -10,9 +10,9 @@
                 <li class="breadcrumb-item">
                     <a asp-action="ListUsers" text-translate="true">Users</a>
                 </li>
-                <li class="breadcrumb-item active" aria-current="page" text-translate="true">@ViewData["Title"]</li>
+                <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
             </ol>
-            <h2 text-translate="true">@ViewData["Title"]</h2>
+            <h2>@ViewData["Title"]</h2>
         </nav>
 		<button id="page-primary" type="submit" class="btn btn-primary" name="command" value="Save">Reset Password</button>
     </div>
diff --git a/BTCPayServer/Views/UIServer/SSHService.cshtml b/BTCPayServer/Views/UIServer/SSHService.cshtml
index 9aeca2a6e..5ab50fd1b 100644
--- a/BTCPayServer/Views/UIServer/SSHService.cshtml
+++ b/BTCPayServer/Views/UIServer/SSHService.cshtml
@@ -10,9 +10,9 @@
             <li class="breadcrumb-item">
                 <a asp-action="Services" text-translate="true">Services</a>
             </li>
-            <li class="breadcrumb-item active" aria-current="page" text-translate="true">@ViewData["Title"]</li>
+            <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
         </ol>
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
     </nav>
 </div>
 <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIServer/Services.cshtml b/BTCPayServer/Views/UIServer/Services.cshtml
index 068adc18c..91a1c600d 100644
--- a/BTCPayServer/Views/UIServer/Services.cshtml
+++ b/BTCPayServer/Views/UIServer/Services.cshtml
@@ -4,7 +4,7 @@
 }
 
 <div class="sticky-header">
-	<h2 class="my-1" text-translate="true">@ViewData["Title"]</h2>
+	<h2 class="my-1">@ViewData["Title"]</h2>
 </div>
 <partial name="_StatusMessage" />
 
diff --git a/BTCPayServer/Views/UIServer/Storage.cshtml b/BTCPayServer/Views/UIServer/Storage.cshtml
index 58c0fa182..0c58af783 100644
--- a/BTCPayServer/Views/UIServer/Storage.cshtml
+++ b/BTCPayServer/Views/UIServer/Storage.cshtml
@@ -10,9 +10,9 @@
                 <li class="breadcrumb-item">
                     <a asp-action="Files" text-translate="true">Files</a>
                 </li>
-                <li class="breadcrumb-item active" aria-current="page" text-translate="true">@ViewData["Title"]</li>
+                <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
             </ol>
-            <h2 text-translate="true">@ViewData["Title"]</h2>
+            <h2>@ViewData["Title"]</h2>
         </nav>         
         <button id="page-primary" type="submit" class="btn btn-primary" name="command" value="Save" text-translate="true">Next</button>
     </div>
diff --git a/BTCPayServer/Views/UIServer/User.cshtml b/BTCPayServer/Views/UIServer/User.cshtml
index ae7acc072..d78ca8fc2 100644
--- a/BTCPayServer/Views/UIServer/User.cshtml
+++ b/BTCPayServer/Views/UIServer/User.cshtml
@@ -16,7 +16,7 @@
                 </li>
                 <li class="breadcrumb-item active" aria-current="page" text-translate="true">User</li>
             </ol>
-            <h2 text-translate="true">@ViewData["Title"]</h2>
+            <h2>@ViewData["Title"]</h2>
         </nav>
 		<button id="page-primary" name="command" type="submit" class="btn btn-primary" value="Save" text-translate="true">Save</button>
     </div>
diff --git a/BTCPayServer/Views/UIStorePullPayments/NewPullPayment.cshtml b/BTCPayServer/Views/UIStorePullPayments/NewPullPayment.cshtml
index 3f94f6400..18ea3aa4b 100644
--- a/BTCPayServer/Views/UIStorePullPayments/NewPullPayment.cshtml
+++ b/BTCPayServer/Views/UIStorePullPayments/NewPullPayment.cshtml
@@ -22,9 +22,9 @@
                 <li class="breadcrumb-item">
                     <a asp-action="PullPayments" asp-route-storeId="@storeId" text-translate="true">Pull Payments</a>
                 </li>
-                <li class="breadcrumb-item active" aria-current="page" text-translate="true">@ViewData["Title"]</li>
+                <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
             </ol>
-            <h2 text-translate="true">@ViewData["Title"]</h2>
+            <h2>@ViewData["Title"]</h2>
         </nav>
 		<input id="page-primary" type="submit" value="Create" class="btn btn-primary"/>
     </div>
diff --git a/BTCPayServer/Views/UIStores/CheckoutAppearance.cshtml b/BTCPayServer/Views/UIStores/CheckoutAppearance.cshtml
index 83dbe9521..4dd83ee19 100644
--- a/BTCPayServer/Views/UIStores/CheckoutAppearance.cshtml
+++ b/BTCPayServer/Views/UIStores/CheckoutAppearance.cshtml
@@ -66,7 +66,7 @@
 
 <form method="post" enctype="multipart/form-data" permissioned="@Policies.CanModifyStoreSettings">
     <div class="sticky-header">
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
 		<button id="page-primary" type="submit" class="btn btn-primary">Save</button>
     </div>
     <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIStores/CreateToken.cshtml b/BTCPayServer/Views/UIStores/CreateToken.cshtml
index a8ee48324..fa4b26c1d 100644
--- a/BTCPayServer/Views/UIStores/CreateToken.cshtml
+++ b/BTCPayServer/Views/UIStores/CreateToken.cshtml
@@ -15,14 +15,14 @@
                     <li class="breadcrumb-item">
                         <a asp-action="ListTokens" asp-route-storeId="@store.Id" text-translate="true">Access Tokens</a>
                     </li>
-                    <li class="breadcrumb-item active" aria-current="page" text-translate="true">@ViewData["Title"]</li>
+                    <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
                 </ol>
-                <h2 text-translate="true">@ViewData["Title"]</h2>
+                <h2>@ViewData["Title"]</h2>
             </nav>
         }
         else
         {
-            <h2 text-translate="true">@ViewData["Title"]</h2>
+            <h2>@ViewData["Title"]</h2>
         }
         <input id="page-primary" type="submit" value="Request Pairing" class="btn btn-primary" />
     </div>
diff --git a/BTCPayServer/Views/UIStores/Lightning.cshtml b/BTCPayServer/Views/UIStores/Lightning.cshtml
index 272d3f079..ca05e0bdc 100644
--- a/BTCPayServer/Views/UIStores/Lightning.cshtml
+++ b/BTCPayServer/Views/UIStores/Lightning.cshtml
@@ -7,7 +7,7 @@
     ViewData.SetActivePage(StoreNavPages.Lightning, StringLocalizer["{0} Lightning", Model.CryptoCode], $"{Context.GetStoreData().Id}-{Model.CryptoCode}");
 }
 
-<h2 class="mb-2 mb-lg-3" text-translate="true">@ViewData["Title"]</h2>
+<h2 class="mb-2 mb-lg-3">@ViewData["Title"]</h2>
 <partial name="_StatusMessage" />
 <div class="mb-5">
     <div class="mb-3">
diff --git a/BTCPayServer/Views/UIStores/LightningSettings.cshtml b/BTCPayServer/Views/UIStores/LightningSettings.cshtml
index c4c87444c..af546ffdc 100644
--- a/BTCPayServer/Views/UIStores/LightningSettings.cshtml
+++ b/BTCPayServer/Views/UIStores/LightningSettings.cshtml
@@ -8,7 +8,7 @@
 
 <form method="post">
     <div class="sticky-header">
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
 		<button id="page-primary" name="command" type="submit" value="save" class="btn btn-primary">Save</button>
     </div>
     <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIStores/ListTokens.cshtml b/BTCPayServer/Views/UIStores/ListTokens.cshtml
index 2bb856b52..87a86704d 100644
--- a/BTCPayServer/Views/UIStores/ListTokens.cshtml
+++ b/BTCPayServer/Views/UIStores/ListTokens.cshtml
@@ -34,7 +34,7 @@
         </p>
         
         <div class="d-flex align-items-center justify-content-between mt-5 mb-3">
-            <h3 class="mb-0" text-translate="true">@ViewData["Title"]</h3>
+            <h3 class="mb-0">@ViewData["Title"]</h3>
             <a id="CreateNewToken" asp-action="CreateToken" class="btn btn-primary" role="button" asp-route-storeId="@Context.GetRouteValue("storeId")" permission="@Policies.CanModifyStoreSettings" text-translate="true">
                 Create Token
             </a>
diff --git a/BTCPayServer/Views/UIStores/ModifyWebhook.cshtml b/BTCPayServer/Views/UIStores/ModifyWebhook.cshtml
index d580d06db..15c85abd3 100644
--- a/BTCPayServer/Views/UIStores/ModifyWebhook.cshtml
+++ b/BTCPayServer/Views/UIStores/ModifyWebhook.cshtml
@@ -22,7 +22,7 @@
                 </li>
                 <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
             </ol>
-            <h2 text-translate="true">@ViewData["Title"]</h2>
+            <h2>@ViewData["Title"]</h2>
         </nav>
         @if (Model.IsNew)
         {
diff --git a/BTCPayServer/Views/UIStores/Rates.cshtml b/BTCPayServer/Views/UIStores/Rates.cshtml
index c48ef0f96..9a9b0fbd4 100644
--- a/BTCPayServer/Views/UIStores/Rates.cshtml
+++ b/BTCPayServer/Views/UIStores/Rates.cshtml
@@ -9,7 +9,7 @@
 
 <form method="post" permissioned="@Policies.CanModifyStoreSettings">
     <div class="sticky-header">
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
 		<button id="page-primary" name="command" type="submit" class="btn btn-primary" value="Save">Save</button>
     </div>
     <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIStores/RequestPairing.cshtml b/BTCPayServer/Views/UIStores/RequestPairing.cshtml
index 9db8bef28..47c979103 100644
--- a/BTCPayServer/Views/UIStores/RequestPairing.cshtml
+++ b/BTCPayServer/Views/UIStores/RequestPairing.cshtml
@@ -30,12 +30,12 @@
                     </li>
                     <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
                 </ol>
-                <h2 text-translate="true">@ViewData["Title"]</h2>
+                <h2>@ViewData["Title"]</h2>
             </nav>
         }
         else
         {
-            <h2 text-translate="true">@ViewData["Title"]</h2>
+            <h2>@ViewData["Title"]</h2>
         }
 		<button id="page-primary" type="submit" class="btn btn-primary mt-3" title="@StringLocalizer["Approve this pairing demand"]">Approve</button>
     </div>
diff --git a/BTCPayServer/Views/UIStores/StoreEmails.cshtml b/BTCPayServer/Views/UIStores/StoreEmails.cshtml
index fb6036d0f..99e96577c 100644
--- a/BTCPayServer/Views/UIStores/StoreEmails.cshtml
+++ b/BTCPayServer/Views/UIStores/StoreEmails.cshtml
@@ -21,9 +21,9 @@
                 <li class="breadcrumb-item">
                     <a asp-action="StoreEmailSettings" asp-route-storeId="@storeId" text-translate="true">Emails</a>
                 </li>
-                <li class="breadcrumb-item active" aria-current="page" text-translate="true">@ViewData["Title"]</li>
+                <li class="breadcrumb-item active" aria-current="page">@ViewData["Title"]</li>
             </ol>
-            <h2 text-translate="true">@ViewData["Title"]</h2>
+            <h2>@ViewData["Title"]</h2>
         </nav>
         <div permission="@Policies.CanModifyStoreSettings">
             @if (Model.Rules.Any())
diff --git a/BTCPayServer/Views/UIStores/StoreUsers.cshtml b/BTCPayServer/Views/UIStores/StoreUsers.cshtml
index 39c8b8052..1ce4f8262 100644
--- a/BTCPayServer/Views/UIStores/StoreUsers.cshtml
+++ b/BTCPayServer/Views/UIStores/StoreUsers.cshtml
@@ -19,7 +19,7 @@
         }
     </style>
 }
-<h2 class="mb-2 mb-lg-3" text-translate="true">@ViewData["Title"]</h2>
+<h2 class="mb-2 mb-lg-3">@ViewData["Title"]</h2>
 <partial name="_StatusMessage" />
 <div class="row">
     <div class="col-xxl-constrain col-xl-8">
diff --git a/BTCPayServer/Views/UIStores/TestWebhook.cshtml b/BTCPayServer/Views/UIStores/TestWebhook.cshtml
index fa2cd665b..5e1ab4ce9 100644
--- a/BTCPayServer/Views/UIStores/TestWebhook.cshtml
+++ b/BTCPayServer/Views/UIStores/TestWebhook.cshtml
@@ -6,7 +6,7 @@
 }
 <form method="post">
     <div class="sticky-header">
-        <h2 text-translate="true">@ViewData["Title"]</h2>
+        <h2>@ViewData["Title"]</h2>
 		<button id="page-primary" type="submit" class="btn btn-primary mt-3" text-translate="true">Send test webhook</button>
     </div>
     <partial name="_StatusMessage" />
diff --git a/BTCPayServer/Views/UIStores/WalletSettings.cshtml b/BTCPayServer/Views/UIStores/WalletSettings.cshtml
index bdc7e02d5..7be22f01e 100644
--- a/BTCPayServer/Views/UIStores/WalletSettings.cshtml
+++ b/BTCPayServer/Views/UIStores/WalletSettings.cshtml
@@ -18,7 +18,7 @@
 }
 
 <div class="sticky-header">
-    <h2 text-translate="true">@ViewData["Title"]</h2>
+    <h2>@ViewData["Title"]</h2>
     <div>
         <div class="dropdown">
             <button class="btn btn-secondary dropdown-toggle"
diff --git a/BTCPayServer/Views/UIStores/Webhooks.cshtml b/BTCPayServer/Views/UIStores/Webhooks.cshtml
index 2c3bb568a..76a528c37 100644
--- a/BTCPayServer/Views/UIStores/Webhooks.cshtml
+++ b/BTCPayServer/Views/UIStores/Webhooks.cshtml
@@ -7,7 +7,7 @@
 }
 
 <div class="sticky-header">
-    <h2 text-translate="true">@ViewData["Title"]</h2>
+    <h2>@ViewData["Title"]</h2>
 	<a id="page-primary" asp-action="NewWebhook" class="btn btn-primary" role="button" asp-route-storeId="@Context.GetRouteValue("storeId")" permission="@Policies.CanModifyStoreSettings">
         Create Webhook
     </a>
diff --git a/BTCPayServer/Views/UIUserStores/CreateStore.cshtml b/BTCPayServer/Views/UIUserStores/CreateStore.cshtml
index 701dbe3a3..9ecbcbe8d 100644
--- a/BTCPayServer/Views/UIUserStores/CreateStore.cshtml
+++ b/BTCPayServer/Views/UIUserStores/CreateStore.cshtml
@@ -53,7 +53,7 @@
 }
 else
 {
-	<h2 class="mb-2 mb-lg-3" text-translate="true">@ViewData["Title"]</h2>
+	<h2 class="mb-2 mb-lg-3">@ViewData["Title"]</h2>
     <partial name="_StatusMessage" />
     <div class="row">
         <div class="col-xl-8 col-xxl-constrain">
diff --git a/BTCPayServer/Views/UIUserStores/ListStores.cshtml b/BTCPayServer/Views/UIUserStores/ListStores.cshtml
index 71f3338d3..b7709d49f 100644
--- a/BTCPayServer/Views/UIUserStores/ListStores.cshtml
+++ b/BTCPayServer/Views/UIUserStores/ListStores.cshtml
@@ -4,7 +4,7 @@
     ViewData.SetActivePage(StoreNavPages.Index, Model.Archived ? StringLocalizer["Archived Stores"] : StringLocalizer["Stores"]);
 }
 
-<h2 class="mb-2 mb-lg-3" text-translate="true">@ViewData["Title"]</h2>
+<h2 class="mb-2 mb-lg-3">@ViewData["Title"]</h2>
 <partial name="_StatusMessage" />
 @if (Model.Stores.Any())
 {
diff --git a/BTCPayServer/Views/UIWallets/WalletLabels.cshtml b/BTCPayServer/Views/UIWallets/WalletLabels.cshtml
index f12a216a2..dc6693fdc 100644
--- a/BTCPayServer/Views/UIWallets/WalletLabels.cshtml
+++ b/BTCPayServer/Views/UIWallets/WalletLabels.cshtml
@@ -11,7 +11,7 @@
     </script>
 }
 
-<h2 class="mb-2 mb-lg-3" text-translate="true">@ViewData["Title"]</h2>
+<h2 class="mb-2 mb-lg-3">@ViewData["Title"]</h2>
 <partial name="_StatusMessage" />
 
 @if (Model.Labels.Any())
diff --git a/BTCPayServer/Views/UIWallets/WalletPSBTCombine.cshtml b/BTCPayServer/Views/UIWallets/WalletPSBTCombine.cshtml
index aeadd6da1..fa2372522 100644
--- a/BTCPayServer/Views/UIWallets/WalletPSBTCombine.cshtml
+++ b/BTCPayServer/Views/UIWallets/WalletPSBTCombine.cshtml
@@ -12,7 +12,7 @@
 }
 
 <header class="text-center">
-    <h1 text-translate="true">@ViewData["Title"]</h1>
+    <h1>@ViewData["Title"]</h1>
 </header>
 
 <form class="form-group" method="post" asp-action="WalletPSBTCombine" asp-route-walletId="@Context.GetRouteValue("walletId")" enctype="multipart/form-data">
diff --git a/BTCPayServer/Views/UIWallets/WalletPSBTDecoded.cshtml b/BTCPayServer/Views/UIWallets/WalletPSBTDecoded.cshtml
index d5690e9f3..af091cd8d 100644
--- a/BTCPayServer/Views/UIWallets/WalletPSBTDecoded.cshtml
+++ b/BTCPayServer/Views/UIWallets/WalletPSBTDecoded.cshtml
@@ -81,7 +81,7 @@
 }
 
 <header class="text-center mb-3">
-    <h1 text-translate="true">@ViewData["Title"]</h1>
+    <h1>@ViewData["Title"]</h1>
 </header>
 
 <partial name="_PSBTInfo" model="Model" />