diff --git a/BTCPayServer/Views/Invoice/Checkout.cshtml b/BTCPayServer/Views/Invoice/Checkout.cshtml
index 05a8690c9..405d38e56 100644
--- a/BTCPayServer/Views/Invoice/Checkout.cshtml
+++ b/BTCPayServer/Views/Invoice/Checkout.cshtml
@@ -24,6 +24,8 @@
     <bundle name="wwwroot/bundles/checkout-bundle.min.js" />
     <script>vex.defaultOptions.className = 'vex-theme-btcpay'</script>
 
+    <link href="/checkout/css/themes/default.css" rel="stylesheet" />
+
     @if (!string.IsNullOrEmpty(Model.CustomCSSLink))
     {
         <link href="@Model.CustomCSSLink" rel="stylesheet" />
diff --git a/BTCPayServer/bundleconfig.json b/BTCPayServer/bundleconfig.json
index 767a0d9c3..6507cc03e 100644
--- a/BTCPayServer/bundleconfig.json
+++ b/BTCPayServer/bundleconfig.json
@@ -37,7 +37,7 @@
         "inputFiles": [
             "wwwroot/vendor/font-awesome/css/font-awesome.css",
             "wwwroot/vendor/vex/css/vex.css",
-            "wwwroot/checkout/**/*.css",
+            "wwwroot/checkout/*/*.css",
             "wwwroot/vendor/jquery-prettydropdowns/prettydropdowns.css"
         ]
     },
diff --git a/BTCPayServer/wwwroot/checkout/css/css.css b/BTCPayServer/wwwroot/checkout/css/fonts.css
similarity index 100%
rename from BTCPayServer/wwwroot/checkout/css/css.css
rename to BTCPayServer/wwwroot/checkout/css/fonts.css
diff --git a/BTCPayServer/wwwroot/checkout/css/normalizer.css b/BTCPayServer/wwwroot/checkout/css/themes/default.css
similarity index 100%
rename from BTCPayServer/wwwroot/checkout/css/normalizer.css
rename to BTCPayServer/wwwroot/checkout/css/themes/default.css