diff --git a/BTCPayServer/Components/StoreLightningBalance/Default.cshtml b/BTCPayServer/Components/StoreLightningBalance/Default.cshtml
index 7a4d8f3dd..c2cdbd902 100644
--- a/BTCPayServer/Components/StoreLightningBalance/Default.cshtml
+++ b/BTCPayServer/Components/StoreLightningBalance/Default.cshtml
@@ -23,15 +23,17 @@
             @if (Model.Balance.OffchainBalance != null)
             {
                 <div class="balance">
-                    <h3 class="d-inline-block me-1" data-balance="@Model.TotalOffchain" data-sensitive>@Model.TotalOffchain</h3>
-                    <span class="text-secondary fw-semibold text-nowrap">
-                        <span class="currency">@Model.CryptoCode</span> in channels
-                    </span>
+                    <div class="d-flex align-items-baseline gap-1">
+                        <h3 class="d-inline-block me-1" data-balance="@Model.TotalOffchain" data-sensitive>@Model.TotalOffchain</h3>
+                        <span class="text-secondary fw-semibold text-nowrap">
+                            <span class="currency">@Model.CryptoCode</span> in channels
+                        </span>
+                    </div>
 
                     <div class="balance-details collapse" id="balanceDetailsOffchain">
                         @if (Model.Balance.OffchainBalance.Opening != null)
                         {
-                            <div class="mt-2">
+                            <div class="mt-2 d-flex align-items-baseline gap-1">
                                 <span class="fw-semibold" data-balance="@Model.Balance.OffchainBalance.Opening" data-sensitive>
                                     @Model.Balance.OffchainBalance.Opening
                                 </span>
@@ -42,7 +44,7 @@
                         }
                         @if (Model.Balance.OffchainBalance.Local != null)
                         {
-                            <div class="mt-2">
+                            <div class="mt-2 d-flex align-items-baseline gap-1">
                                 <span class="fw-semibold" data-balance="@Model.Balance.OffchainBalance.Local" data-sensitive>
                                     @Model.Balance.OffchainBalance.Local
                                 </span>
@@ -53,7 +55,7 @@
                         }
                         @if (Model.Balance.OffchainBalance.Remote != null)
                         {
-                            <div class="mt-2">
+                            <div class="mt-2 d-flex align-items-baseline gap-1">
                                 <span class="fw-semibold" data-balance="@Model.Balance.OffchainBalance.Remote" data-sensitive>
                                     @Model.Balance.OffchainBalance.Remote
                                 </span>
@@ -64,7 +66,7 @@
                         }
                         @if (Model.Balance.OffchainBalance.Closing != null)
                         {
-                            <div class="mt-2">
+                            <div class="mt-2 d-flex align-items-baseline gap-1">
                                 <span class="fw-semibold" data-balance="@Model.Balance.OffchainBalance.Closing" data-sensitive>
                                     @Model.Balance.OffchainBalance.Closing
                                 </span>
@@ -79,14 +81,16 @@
             @if (Model.Balance.OnchainBalance != null)
             {
                 <div class="balance">
-                    <h3 class="d-inline-block me-1" data-balance="@Model.TotalOnchain" data-sensitive>@Model.TotalOnchain</h3>
-                    <span class="text-secondary fw-semibold text-nowrap">
-                        <span class="currency">@Model.CryptoCode</span> on-chain
-                    </span>
+                    <div class="d-flex align-items-baseline gap-1">
+                        <h3 class="d-inline-block me-1" data-balance="@Model.TotalOnchain" data-sensitive>@Model.TotalOnchain</h3>
+                        <span class="text-secondary fw-semibold text-nowrap">
+                            <span class="currency">@Model.CryptoCode</span> on-chain
+                        </span>
+                    </div>
                     <div class="balance-details collapse" id="balanceDetailsOnchain">
                         @if (Model.Balance.OnchainBalance.Confirmed != null)
                         {
-                            <div class="mt-2">
+                            <div class="mt-2 d-flex align-items-baseline gap-1">
                                 <span class="fw-semibold" data-balance="@Model.Balance.OnchainBalance.Confirmed" data-sensitive>
                                     @Model.Balance.OnchainBalance.Confirmed
                                 </span>
@@ -97,7 +101,7 @@
                         }
                         @if (Model.Balance.OnchainBalance.Unconfirmed != null)
                         {
-                            <div class="mt-2">
+                            <div class="mt-2 d-flex align-items-baseline gap-1">
                                 <span class="fw-semibold" data-balance="@Model.Balance.OnchainBalance.Unconfirmed" data-sensitive>
                                     @Model.Balance.OnchainBalance.Unconfirmed
                                 </span>
@@ -108,7 +112,7 @@
                         }
                         @if (Model.Balance.OnchainBalance.Reserved != null)
                         {
-                            <div class="mt-2">
+                            <div class="mt-2 d-flex align-items-baseline gap-1">
                                 <span class="fw-semibold" data-balance="@Model.Balance.OnchainBalance.Reserved" data-sensitive>
                                     @Model.Balance.OnchainBalance.Reserved
                                 </span>
diff --git a/BTCPayServer/Components/StoreWalletBalance/Default.cshtml b/BTCPayServer/Components/StoreWalletBalance/Default.cshtml
index bc912d926..d135e5707 100644
--- a/BTCPayServer/Components/StoreWalletBalance/Default.cshtml
+++ b/BTCPayServer/Components/StoreWalletBalance/Default.cshtml
@@ -17,7 +17,7 @@
     <header class="mb-3">
         @if (Model.Balance != null)
         {
-            <div class="balance">
+            <div class="balance d-flex align-items-baseline gap-1">
                 <h3 class="d-inline-block me-1" data-balance="@Model.Balance" data-sensitive>@Model.Balance</h3>
                 <span class="text-secondary fw-semibold currency">@Model.CryptoCode</span>
             </div>
diff --git a/BTCPayServer/wwwroot/main/site.css b/BTCPayServer/wwwroot/main/site.css
index 46e907f3c..76299b441 100644
--- a/BTCPayServer/wwwroot/main/site.css
+++ b/BTCPayServer/wwwroot/main/site.css
@@ -10,18 +10,17 @@
 
 /* Hide sensitive info */
 [data-hide-sensitive-info="true"] [data-sensitive] {
-    visibility: hidden;
+    display: inline-flex;
     position: relative;
+    visibility: hidden;
+    overflow: hidden;
 }
 
 [data-hide-sensitive-info="true"] [data-sensitive]:before {
-    content: '***';
+    content: '***********************';
     visibility: visible;
     position: absolute;
-}
-
-[data-hide-sensitive-info="true"] .text-end [data-sensitive]:before {
-    right: 0;
+    top: .2em;
 }
 
 [data-hide-sensitive-info="true"] .store-wallet-balance .ct-label.ct-vertical.ct-start {