diff --git a/BTCPayServer/Views/Invoice/Checkout.cshtml b/BTCPayServer/Views/Invoice/Checkout.cshtml
index 7f2ac29bb..dec3105f2 100644
--- a/BTCPayServer/Views/Invoice/Checkout.cshtml
+++ b/BTCPayServer/Views/Invoice/Checkout.cshtml
@@ -93,7 +93,7 @@
                                                 </div>
                                             </div>
                                             <div class="single-item-order__right">
-                                                <div>
+                                                <div class="payment__currencies">
                                                     @foreach (var crypto in Model.AvailableCryptos)
                                                     {
                                                         <a href="@crypto.Link" onclick="return changeCurrency('@crypto.PaymentMethodId');">
@@ -101,6 +101,13 @@
                                                         </a>
                                                     }
                                                 </div>
+                                                <div class="payment__spinner">
+                                                    <bp-spinner>
+                                                        <svg xml:space="preserve" style="enable-background:new 0 0 50 50;" version="1.1" viewBox="0 0 50 50" x="0px" xmlns="http://www.w3.org/2000/svg" y="0px">
+                                                        <path d="M11.1,29.6c-0.5-1.5-0.8-3-0.8-4.6c0-8.1,6.6-14.7,14.7-14.7S39.7,16.9,39.7,25c0,1.6-0.3,3.2-0.8,4.6l6.1,2c0.7-2.1,1.1-4.3,1.1-6.6c0-11.7-9.5-21.2-21.2-21.2S3.8,13.3,3.8,25c0,2.3,0.4,4.5,1.1,6.6L11.1,29.6z"></path>
+                                                </svg>
+                                                    </bp-spinner>
+                                                </div>
                                             </div>
                                         </div>
                                     }
@@ -180,13 +187,6 @@
                                             </a>
                                         </div>
                                     </div>
-                                    <div class="payment__spinner">
-                                        <bp-spinner>
-                                            <svg xml:space="preserve" style="enable-background:new 0 0 50 50;" version="1.1" viewBox="0 0 50 50" x="0px" xmlns="http://www.w3.org/2000/svg" y="0px">
-                                            <path d="M11.1,29.6c-0.5-1.5-0.8-3-0.8-4.6c0-8.1,6.6-14.7,14.7-14.7S39.7,16.9,39.7,25c0,1.6-0.3,3.2-0.8,4.6l6.1,2c0.7-2.1,1.1-4.3,1.1-6.6c0-11.7-9.5-21.2-21.2-21.2S3.8,13.3,3.8,25c0,2.3,0.4,4.5,1.1,6.6L11.1,29.6z"></path>
-                                                </svg>
-                                        </bp-spinner>
-                                    </div>
                                     <div class="bp-view payment manual-flow enter-contact-email active" id="emailAddressView">
                                         <form class="manual__step-one refund-address-form contact-email-form" id="emailAddressForm" name="emailAddressForm" novalidate="">
                                             <div class="manual__step-one__header">
diff --git a/BTCPayServer/wwwroot/css/normalizer.css b/BTCPayServer/wwwroot/css/normalizer.css
index bae0b5330..367f92900 100644
--- a/BTCPayServer/wwwroot/css/normalizer.css
+++ b/BTCPayServer/wwwroot/css/normalizer.css
@@ -10894,14 +10894,13 @@ bp-spinner {
 }
 
 .payment__spinner {
-    margin-top: 140px;
     display: none;
 }
 
     .payment__spinner > bp-spinner > svg {
-        margin: auto auto;
-        height: 60px;
-        width: 60px;
+        margin: auto 0px 0px auto;
+        height: 32px;
+        width: 32px;
         fill: gray;
         animation: spin 0.55s linear infinite;
         opacity: .85;
diff --git a/BTCPayServer/wwwroot/js/core.js b/BTCPayServer/wwwroot/js/core.js
index bffe67348..8946e2181 100644
--- a/BTCPayServer/wwwroot/js/core.js
+++ b/BTCPayServer/wwwroot/js/core.js
@@ -49,7 +49,7 @@ function onDataCallback(jsonData) {
 
     // restoring qr code view only when currency is switched
     if (jsonData.paymentMethodId == srvModel.paymentMethodId) {
-        $("#scan").show();
+        $(".payment__currencies").show();
         $(".payment__spinner").hide();
     }
 
@@ -59,7 +59,7 @@ function onDataCallback(jsonData) {
 
 function changeCurrency(currency) {
     if (srvModel.paymentMethodId != currency) {
-        $("#scan").hide();
+        $(".payment__currencies").hide();
         $(".payment__spinner").show();
         srvModel.paymentMethodId = currency;
         fetchStatus();