diff --git a/BTCPayServer/Views/UIPaymentRequest/ViewPaymentRequest.cshtml b/BTCPayServer/Views/UIPaymentRequest/ViewPaymentRequest.cshtml
index e950034e3..1f6c01b09 100644
--- a/BTCPayServer/Views/UIPaymentRequest/ViewPaymentRequest.cshtml
+++ b/BTCPayServer/Views/UIPaymentRequest/ViewPaymentRequest.cshtml
@@ -37,14 +37,8 @@
 <!DOCTYPE html>
 <html lang="en" @(env.IsDeveloping ? " data-devenv" : "")>
 <head>
-    <title>@Model.Title</title>
-    <meta charset="utf-8" />
-    <meta name="robots" content="noindex,nofollow">
-    <meta name="viewport" content="width=device-width,initial-scale=1">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <bundle name="wwwroot/bundles/main-bundle.min.css" asp-append-version="true" />
+    <partial name="LayoutHead" />
     <bundle name="wwwroot/bundles/payment-request-bundle.min.css" asp-append-version="true"></bundle>
-    <link href="@Context.Request.GetRelativePathOrAbsolute(theme.CssUri)" rel="stylesheet" asp-append-version="true"/>
     @if (Model.CustomCSSLink != null)
     {
         <link href="@Model.CustomCSSLink" rel="stylesheet" />
@@ -62,12 +56,6 @@
         .invoice + .invoice { margin-top: var(--btcpay-space-m); }
         .invoice .badge { font-size: var(--btcpay-font-size-s); }
     </style>
-    <noscript>
-        <style>
-            .hide-when-js, [v-cloak] { display: block !important; }
-            .only-for-js { display: none !important; }
-        </style>
-    </noscript>
 </head>
 <body>
     <div id="app" class="min-vh-100 d-flex flex-column">
@@ -373,10 +361,17 @@
             </div>
         </main>
         <footer class="pt-2 pb-4 d-print-none">
-            <div class="container text-center">
-                Powered by <a href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">BTCPay Server</a>
+            <div class="container d-flex flex-wrap align-items-center justify-content-center">
+                <span class="text-muted mx-2">
+                    Powered by <a href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">BTCPay Server</a>
+                </span>
+                @if (!theme.CustomTheme)
+                {
+                    <vc:theme-switch css-class="text-muted mx-2" responsive="none"/>
+                }
             </div>
         </footer>
     </div>
+    <partial name="LayoutFoot"/>
 </body>
 </html>
diff --git a/BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml b/BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml
index e2cee255e..5d852d155 100644
--- a/BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml
+++ b/BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml
@@ -27,25 +27,13 @@
 <!DOCTYPE html>
 <html lang="en" @(env.IsDeveloping ? " data-devenv" : "")>
 <head>
-    <title>@ViewData["Title"]</title>
-    <meta charset="utf-8" />
-    <meta name="robots" content="noindex, nofollow">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <bundle name="wwwroot/bundles/main-bundle.min.css" asp-append-version="true" />
+    <partial name="LayoutHead" />
     <bundle name="wwwroot/bundles/payment-request-bundle.min.css" asp-append-version="true"></bundle>
-    <link href="@Context.Request.GetRelativePathOrAbsolute(theme.CssUri)" rel="stylesheet" asp-append-version="true"/>
     @if (Model.CustomCSSLink != null)
     {
         <link href="@Model.CustomCSSLink" rel="stylesheet" />
     }
     @Safe.Raw(Model.EmbeddedCSS)
-    <noscript>
-        <style>
-            .hide-when-js, [v-cloak] { display: block !important; }
-            .only-for-js { display: none !important; }
-        </style>
-    </noscript>
 </head>
 <body>
     <div class="min-vh-100 d-flex flex-column">
@@ -200,8 +188,14 @@
             </div>
         </main>
         <footer class="pt-2 pb-4 d-print-none">
-            <div class="container text-center">
-                Powered by <a href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">BTCPay Server</a>
+            <div class="container d-flex flex-wrap align-items-center justify-content-center">
+                <span class="text-muted mx-2">
+                    Powered by <a href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">BTCPay Server</a>
+                </span>
+                @if (!theme.CustomTheme)
+                {
+                    <vc:theme-switch css-class="text-muted mx-2" responsive="none"/>
+                }
             </div>
         </footer>
     </div>
diff --git a/BTCPayServer/bundleconfig.json b/BTCPayServer/bundleconfig.json
index 0da52cf28..ce77b0244 100644
--- a/BTCPayServer/bundleconfig.json
+++ b/BTCPayServer/bundleconfig.json
@@ -110,9 +110,6 @@
             "wwwroot/vendor/bootstrap-vue/bootstrap-vue.js",
             "wwwroot/vendor/signalr/signalr.js",
             "wwwroot/vendor/animejs/anime.min.js",
-            "wwwroot/vendor/moment/moment.min.js",
-            "wwwroot/js/copy-to-clipboard.js",
-            "wwwroot/main/utils.js",
             "wwwroot/payment-request/**/*.js"
         ],
         "minify": {
