diff --git a/BTCPayServer/Models/StoreViewModels/UpdateCoinSwitchSettingsViewModel.cs b/BTCPayServer/Models/StoreViewModels/UpdateCoinSwitchSettingsViewModel.cs
index 41d146451..424ba255b 100644
--- a/BTCPayServer/Models/StoreViewModels/UpdateCoinSwitchSettingsViewModel.cs
+++ b/BTCPayServer/Models/StoreViewModels/UpdateCoinSwitchSettingsViewModel.cs
@@ -11,7 +11,7 @@ namespace BTCPayServer.Models.StoreViewModels
         public bool Enabled { get; set; }
 
         [Display(Name = "Integration Mode")]
-        public string Mode { get; set; } = "popup";
+        public string Mode { get; set; } = "inline";
 
         public List<SelectListItem> Modes { get; } = new List<SelectListItem>
         {
diff --git a/BTCPayServer/Views/Invoice/Checkout-Body.cshtml b/BTCPayServer/Views/Invoice/Checkout-Body.cshtml
index 307bddabb..5ee6e178e 100644
--- a/BTCPayServer/Views/Invoice/Checkout-Body.cshtml
+++ b/BTCPayServer/Views/Invoice/Checkout-Body.cshtml
@@ -299,9 +299,16 @@
                                     :autoload="selectedThirdPartyProcessor === 'coinswitch'"
                                     :to-currency-address="srvModel.btcAddress">
                             <div>
-                            <a v-on:click="openDialog($event)" :href="url" class="action-button" v-show="url && !opened">
-                                {{$t("Pay with CoinSwitch")}}
-                            </a>
+                                <a v-on:click="openDialog($event)" :href="url" class="action-button" v-show="url && !opened">
+                                    {{$t("Pay with CoinSwitch")}}
+                                </a>
+                                
+                            @if (Model.ChangellyEnabled)
+                            {
+                                <button v-show="!opened" v-on:click="$parent.selectedThirdPartyProcessor = 'changelly'" class="btn-link mt-2">
+                                    {{$t("Pay with Changelly")}}
+                                </button>
+                            }
                             
                                 <iframe  
                                     v-if="showInlineIFrame"
@@ -342,6 +349,12 @@
                                 <a  v-on:click="openDialog($event)" :href="url" class="action-button"  v-show="url">
                                     {{$t("Pay with Changelly")}}
                                 </a>
+                                @if (Model.CoinSwitchEnabled)
+                                {
+                                    <button v-on:click="$parent.selectedThirdPartyProcessor = 'coinswitch'" class="btn-link mt-2">
+                                        {{$t("Pay with CoinSwitch")}}
+                                    </button>
+                                }
                                 <button class="retry-button" v-if="calculateError" v-on:click="retry('calculateAmount')">
                                     {{$t("ConversionTab_CalculateAmount_Error")}}
                                 </button>
diff --git a/BTCPayServer/wwwroot/checkout/css/normalizer.css b/BTCPayServer/wwwroot/checkout/css/normalizer.css
index 386a156f9..effb742a3 100644
--- a/BTCPayServer/wwwroot/checkout/css/normalizer.css
+++ b/BTCPayServer/wwwroot/checkout/css/normalizer.css
@@ -11504,3 +11504,15 @@ low-fee-timeline {
 #prettydropdown-DefaultLang ul li{
     width:100% !important;
 }
+
+[v-cloak] > * { display:none }
+[v-cloak]::before { content: "loading…" }
+
+
+.btn-link {
+    color: #329F80;
+}
+
+.btn-link:hover {
+    color: #24725B;
+}