diff --git a/src/Core/ShopControl.php b/src/Core/ShopControl.php
index 56f6cf336..32855f9bf 100644
--- a/src/Core/ShopControl.php
+++ b/src/Core/ShopControl.php
@@ -22,12 +22,12 @@ class ShopControl extends ShopControl_parent
     /**
      * @param StandardException $exception
      */
-    protected function _handleBaseException($exception) // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+    protected function handleBaseException($exception) // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
     {
         if ($exception instanceof PayPalException) {
             $this->handleCustomPayPalException($exception);
         } else {
-            parent::_handleBaseException($exception);
+            parent::handleBaseException($exception);
         }
     } // @codeCoverageIgnore
 
@@ -41,7 +41,7 @@ public function handleCustomPayPalException(PayPalException $exception): void
         } elseif ($exception instanceof Redirect) {
             $this->handlePayPalRedirectException($exception, false);
         } else {
-            parent::_handleBaseException($exception);
+            parent::handleBaseException($exception);
         }
     } // @codeCoverageIgnore
 
diff --git a/views/twig/extensions/themes/default/layout/base.html.twig b/views/twig/extensions/themes/default/layout/base.html.twig
index 8a21b3ff0..abf342741 100644
--- a/views/twig/extensions/themes/default/layout/base.html.twig
+++ b/views/twig/extensions/themes/default/layout/base.html.twig
@@ -4,31 +4,21 @@
     {{ parent() }}
     {% if oViewConf.isPayPalCheckoutActive() %}
         {% set className = oViewConf.getTopActiveClassName() %}
-        {% if oViewConf.isPayPalExpressPaymentEnabled() and
-            ((className == 'order' and not oViewConf.isPayPalACDCSessionActive()) or (className != 'order' and className != 'payment')) and
-            (
-                (oxcmp_basket.getProductsCount() and oViewConf.showPayPalMiniBasketButton()) or
-                (className == 'details' and oViewConf.showPayPalProductDetailsButton()) or
-                (className == 'basket' and oViewConf.showPayPalBasketButton())
-            )
-        %}
-            <script src="{{ oViewConf.getBaseDir() }}/out/modules/osc_paypal/js/paypal-frontend.min.js?v=1"></script>
-            <script src="{{ oViewConf.getPayPalJsSdkUrl()|raw }}"
-                    data-partner-attribution-id="{{ oViewConf.getPayPalPartnerAttributionIdForBanner() }}"
-                    onload="window.OxidPayPal.onSDKLoaded()"
-            ></script>
-            {% set sCountryRestriction = oViewConf.getCountryRestrictionForPayPalExpress() %}
-            {% if sCountryRestriction %}
-                <script>
-                    const countryRestriction = [{{ sCountryRestriction }}];
-                </script>
-            {% endif %}
-        {% elseif className == 'order' and oViewConf.isPayPalACDCSessionActive() %}
-            <script src="{{ oViewConf.getPayPalJsSdkUrlForACDC()|raw }}" data-client-token="{{ oViewConf.getDataClientToken() }}"></script>
-        {% elseif className == 'payment' %}
-            <script src="{{ oViewConf.getPayPalJsSdkUrlForButtonPayments()|raw }}" data-partner-attribution-id="{{ oViewConf.getPayPalPartnerAttributionIdForBanner() }}"></script>
-        {% elseif oViewConf.isPayPalBannerActive() and (className == 'start' or className == 'search' or className == 'details' or className == 'alist' or className == 'basket') %}
-            <script src="{{ oViewConf.getPayPalApiBannerUrl()|raw }}" data-partner-attribution-id="{{ oViewConf.getPayPalPartnerAttributionIdForBanner() }}"></script>
+        {% set sFileMTime = oViewConf.getModulePath('osc_paypal', 'js/paypal-frontend.min.js') %}
+        <script src="{{ oViewConf.getModuleUrl('osc_paypal','js/paypal-frontend.min.js') }}"></script>
+        <script src="{{ oViewConf.getPayPalJsSdkUrl() }}"
+                {% if oViewConf.isVaultingEligibility() %}
+                    data-user-id-token="{{ oViewConf.getUserIdForVaulting() }}"
+                {% endif %}
+                data-partner-attribution-id="{{ oViewConf.getPayPalPartnerAttributionIdForBanner() }}"
+                data-client-token="{{ oViewConf.getDataClientToken() }}"
+                onload="window.OxidPayPal.onSDKLoaded()"
+        ></script>
+        {% set sCountryRestriction = oViewConf.getCountryRestrictionForPayPalExpress() %}
+        {% if sCountryRestriction %}
+            <script>
+                const countryRestriction = [{{ sCountryRestriction }}];
+            </script>
         {% endif %}
         {% if submitCart %}
             <script>
@@ -40,5 +30,8 @@
 
 {% block base_style %}
     {{ parent() }}
-    {{ style({ include: oViewConf.getModuleUrl('osc_paypal', 'css/paypal.css') }) }}
+    {% if oViewConf.isPayPalCheckoutActive() %}
+    {{ style({ include: oViewConf.getModuleUrl('osc_paypal', 'css/paypal.min.css') }) }}
+    {% endif %}
+
 {% endblock %}