diff --git a/assets/shop/controllers/apple-pay_controller.js b/assets/shop/controllers/apple-pay_controller.js
index e9d99adc..fe977eb6 100644
--- a/assets/shop/controllers/apple-pay_controller.js
+++ b/assets/shop/controllers/apple-pay_controller.js
@@ -1,166 +1,181 @@
 import { Controller } from '@hotwired/stimulus';
-import $ from 'jquery';
 
 /* stimulusFetch: 'lazy' */
 export default class extends Controller {
-  connect() {
-    this.applePayHandler();
+  static values = {
+    paymentInputId: String,
+    settings: Object,
+    notice: String,
   }
-  showApplePayButton() {
-    const applePayButton = $(document).find("apple-pay-button");
-    if (applePayButton.length) {
-      applePayButton.addClass('enabled');
+
+  connect() {
+    this.applePayButton = this.element.querySelector('apple-pay-button');
+    this.onApplePayButtonClick = this.onApplePayButtonClick.bind(this);
+
+    if (this.applePayButton) {
+      this.applePayButton.addEventListener('click', this.onApplePayButtonClick);
     }
+
+    this.retryCount = 0;
+    this.initApplePay();
   }
-  hideApplePayButton() {
-    const applePayButton = $(document).find("apple-pay-button.enabled");
-    if (applePayButton.length) {
-      applePayButton.removeClass('enabled');
+
+  initApplePay() {
+    if (typeof window.ApplePaySession !== 'undefined') {
+      this.checkSupport();
+      return;
+    }
+
+    if (this.retryCount < 20) { // Try for 2 seconds
+      this.retryCount++;
+      setTimeout(() => this.initApplePay(), 100);
+    } else {
+      this.disablePaymentMethod();
     }
   }
-  applePayHandler() {
-    const applePayChoice = $(".payment-item .checkbox-applepay input:radio");
-    if (applePayChoice) {
-      if (applePayChoice.is(':checked')) {
-        this.disableNextStepButton();
-        this.showApplePayButton();
+
+  checkSupport() {
+    try {
+      const isSupported = window.ApplePaySession.canMakePayments();
+
+      if (isSupported && this.applePayButton) {
+        this.applePayButton.classList.add('enabled');
       } else {
-        this.enableNextStepButton();
-        this.hideApplePayButton();
+        this.disablePaymentMethod();
       }
+    } catch (e) {
+      this.disablePaymentMethod();
     }
-    $(".payment-item .checkbox input:radio").on('change', this.onPaymentMethodChoice);
-    $(document).find("apple-pay-button").on('click', this.onApplePayButtonClick);
   }
-  onPaymentMethodChoice(event) {
-    const isApplePay = $(event.currentTarget).closest('.checkbox-applepay').length;
-    if (isApplePay) {
-      this.showApplePayButton();
-      this.disableNextStepButton();
-    } else {
-      this.hideApplePayButton();
-      this.enableNextStepButton();
+
+  disablePaymentMethod() {
+    if (!this.paymentInputIdValue) return;
+
+    const input = document.getElementById(this.paymentInputIdValue);
+    if (!input) return;
+
+    const container = input.closest('.card, .item, .form-check, .field');
+    if (container) {
+      container.style.opacity = '0.5';
+      container.style.pointerEvents = 'none';
+      container.classList.add('apple-pay-ineligible');
+
+      // Add a small info message if not already present
+      if (!container.querySelector('.apple-pay-notice')) {
+        const notice = document.createElement('div');
+        notice.className = 'apple-pay-notice small text-muted mt-2';
+        notice.style.padding = '0 1rem 1rem';
+        notice.innerText = this.noticeValue || 'Apple Pay is not available on this browser or device.';
+        container.appendChild(notice);
+      }
+
+      if (input.checked) {
+        input.checked = false;
+        input.dispatchEvent(new Event('change', { bubbles: true }));
+      }
+    }
+
+    input.disabled = true;
+
+    if (this.element) {
+      this.element.style.display = 'none';
     }
   }
-  onApplePayButtonClick(event) {
-    const applePayButton = $(event.currentTarget);
 
-    if (applePaySessionRequestSettings === undefined) {
+  async onApplePayButtonClick(event) {
+    const applePayButton = event.currentTarget;
+
+    if (!this.settingsValue) {
       console.error('Invalid Apple Pay settings!');
-      return false;
+      return;
     }
 
-    // Create ApplePaySession
-    const session = new ApplePaySession(3, applePaySessionRequestSettings);
+    if (typeof window.ApplePaySession === 'undefined') {
+      return;
+    }
 
-    session.onvalidatemerchant = async event => {
-      $.ajax({
-        url: applePayButton.data('validate-merchant-route'),
-        method: 'POST',
-        cache: false,
-        data: {},
-        success: (authorization) => {
-          let result = authorization.merchant_session;
-          console.log(result);
+    // Prepare settings
+    const settings = { ...this.settingsValue };
+    if (settings.applePayDomain) {
+      settings.applicationData = btoa(JSON.stringify({
+        'apple_pay_domain': settings.applePayDomain
+      }));
+      delete settings.applePayDomain;
+    }
+
+    try {
+      const version = window.ApplePaySession.supportsVersion(14) ? 14 : 3;
+      const session = new window.ApplePaySession(version, settings);
+
+      session.onvalidatemerchant = async (event) => {
+        try {
+          const response = await fetch(applePayButton.dataset.validateMerchantRoute, {
+            method: 'POST',
+            headers: {
+              'X-Requested-With': 'XMLHttpRequest',
+            },
+          });
+          const authorization = await response.json();
 
           if (authorization.success === true) {
-            console.log(authorization.merchant_session);
-            session.completeMerchantValidation(result);
+            session.completeMerchantValidation(authorization.merchant_session);
           } else {
             session.abort();
           }
-        },
-        error: (XHR, status, error) => {
-          console.log(XHR, status, error);
+        } catch (error) {
+          console.error(error);
           session.abort();
           window.location.reload();
-        },
-      });
-    };
-
-    session.onpaymentauthorized = event => {
-      $.ajax({
-        url: applePayButton.data('payment-authorized-route'),
-        method: 'POST',
-        cache: false,
-        data: {
-          token: event.payment.token
-        },
-        success: (authorization) => {
-          try {
-            var apple_pay_Session_status = ApplePaySession.STATUS_SUCCESS;
-
-            console.log(authorization);
-            console.log(authorization.data.responseToApple.status);
-            if (authorization.data.responseToApple.status != 1) {
-              apple_pay_Session_status = ApplePaySession.STATUS_FAILURE;
-            }
-
-            const result = {
-              "status": apple_pay_Session_status
-            };
-
-            console.log(apple_pay_Session_status);
-            console.log(result);
-
-            session.completePayment(result);
-
-            console.log(authorization.data.returnUrl);
-            window.location.href = authorization.data.returnUrl;
-          } catch (err) {
-            console.error(err);
-            window.location.reload();
+        }
+      };
+
+      session.onpaymentauthorized = async (event) => {
+        try {
+          const response = await fetch(applePayButton.dataset.paymentAuthorizedRoute, {
+            method: 'POST',
+            headers: {
+              'X-Requested-With': 'XMLHttpRequest',
+              'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+              token: event.payment.token,
+            }),
+          });
+          const authorization = await response.json();
+
+          let applePaySessionStatus = window.ApplePaySession.STATUS_SUCCESS;
+
+          if (authorization.data.responseToApple.status !== 1) {
+            applePaySessionStatus = window.ApplePaySession.STATUS_FAILURE;
           }
-        },
-        error: (XHR, status, error) => {
-          console.log(XHR, status, error);
-          session.abort();
+
+          session.completePayment({ "status": applePaySessionStatus });
+          window.location.href = authorization.data.returnUrl;
+        } catch (error) {
+          console.error(error);
           window.location.reload();
-        },
-      });
-    };
-
-    session.oncancel = event => {
-      console.log('Cancelling Apple Pay session!');
-
-      $.ajax({
-        url: applePayButton.data('session-cancel-route'),
-        cache: false,
-        method: 'POST',
-        data: {},
-        success: (authorization) => {
-          console.log('Cancelled!');
-          console.log(authorization.data.returnUrl);
+        }
+      };
+
+      session.oncancel = async (event) => {
+        try {
+          const response = await fetch(applePayButton.dataset.sessionCancelRoute, {
+            method: 'POST',
+            headers: {
+              'X-Requested-With': 'XMLHttpRequest',
+            },
+          });
+          const authorization = await response.json();
           window.location.href = authorization.data.returnUrl;
-        },
-        error: (XHR, status, error) => {
-          console.log(XHR, status, error);
+        } catch (error) {
+          console.error(error);
           window.location.reload();
-        },
-      });
-    };
+        }
+      };
 
-    session.begin();
-  }
-  disableNextStepButton() {
-    const nextStepButton = $('form[name*="checkout_select_payment"] [data-test-next-step]');
-    nextStepButton.replaceWith(
-      $("<span/>", {
-        id: 'next-step',
-        class: 'btn btn-primary btn-icon',
-        html: nextStepButton.html()
-      })
-    );
-  }
-  enableNextStepButton() {
-    const nextStepButton = $('form[name*="checkout_select_payment"] [data-test-next-step]');
-    nextStepButton.replaceWith(
-      $("<button/>", {
-        type: 'submit',
-        id: 'next-step',
-        class: 'btn btn-primary btn-icon',
-        html: nextStepButton.html()
-      })
-    );
+      session.begin();
+    } catch (e) {
+      console.error('Failed to create Apple Pay session:', e);
+    }
   }
 }
diff --git a/assets/shop/controllers/checkout-select-payment_controller.js b/assets/shop/controllers/checkout-select-payment_controller.js
index e2a21c74..ead033d4 100644
--- a/assets/shop/controllers/checkout-select-payment_controller.js
+++ b/assets/shop/controllers/checkout-select-payment_controller.js
@@ -4,46 +4,126 @@ import $ from 'jquery';
 /* stimulusFetch: 'lazy' */
 export default class extends Controller {
   static targets = ['trigger'];
-  form= null;
+  form = null;
 
   connect() {
+    this.form = this.element.closest('form') || document.querySelector('form[name*="checkout_select_payment"]');
+    this.findNextStepButton();
+
+    this.handleStateChange = this.handleStateChange.bind(this);
+    this.element.addEventListener('payment-method-state-change', this.handleStateChange);
+
     this.toggleGateway();
 
-    this.form = document.querySelector('form[name*="checkout_select_payment"]');
-    this.form.addEventListener('submit', (event) => {
-      this.handleForm();
-    });
+    if (this.form) {
+      this.form.addEventListener('submit', (event) => {
+        this.handleForm();
+      });
+    }
+  }
+
+  disconnect() {
+    this.element.removeEventListener('payment-method-state-change', this.handleStateChange);
+  }
+
+  handleStateChange(event) {
+    this.updateNextStepButtonVisibility(event.target);
+  }
+
+  findNextStepButton() {
+    if (!this.form) return;
+    this.nextStepButton = this.form.querySelector('button[type="submit"], button:not([type])');
   }
+
   toggleGateway() {
-    let checkedPaymentMethodInput;
+    const $inputs = $(this.element).find('input[id*="checkout_select_payment_payments"]');
+    const checkedInput = $inputs.filter(':checked')[0];
 
-    $(this.triggerTargets).each((k, v) => {
-      const paymentMethodInputId = $(v).data('payment-input-id');
-      checkedPaymentMethodInput = $(`#${paymentMethodInputId}:checked`);
-      if (checkedPaymentMethodInput.length) {
-        return false;
-      }
-    })
+    // Hide all initially
+    this.triggerTargets.forEach(target => $(target).hide());
 
-    if (checkedPaymentMethodInput?.length) {
-      $(`.payment-method-choice[data-payment-input-id="${$(checkedPaymentMethodInput).attr('id')}"]`).show();
+    if (checkedInput) {
+      const currentTarget = this.triggerTargets.find(target => target.dataset.paymentInputId === checkedInput.id);
+      if (currentTarget) {
+        $(currentTarget).show();
+        this.updateNextStepButtonVisibility(currentTarget);
+      } else {
+        this.toggleNextStepButton(true);
+      }
     }
 
-    const $inputs = $('input[id*="checkout_select_payment_payments"]');
     $inputs.on('change', (event) => {
-      const clickedPaymentMethodId = $(event.currentTarget).attr('id');
-      $('.payment-method-choice').slideUp(); // Hide others
-      $(`.payment-method-choice[data-payment-input-id="${clickedPaymentMethodId}"]`).slideDown(); // Show current
+      const clickedPaymentMethodId = event.currentTarget.id;
+
+      // Hide all choices
+      this.triggerTargets.forEach(target => $(target).slideUp());
+
+      const currentTarget = this.triggerTargets.find(target => target.dataset.paymentInputId === clickedPaymentMethodId);
+      if (currentTarget) {
+        $(currentTarget).slideDown(() => {
+          this.updateNextStepButtonVisibility(currentTarget);
+        });
+      } else {
+        this.toggleNextStepButton(true);
+      }
     });
   }
+
+  updateNextStepButtonVisibility(container) {
+    let targetContainer = container;
+
+    if (!targetContainer || !targetContainer.dataset.paymentInputId) {
+      // Fallback to currently checked input
+      const checkedInput = this.element.querySelector('input[id*="checkout_select_payment_payments"]:checked');
+      if (checkedInput) {
+        targetContainer = this.triggerTargets.find(target => target.dataset.paymentInputId === checkedInput.id);
+      }
+    }
+
+    if (!targetContainer) {
+      this.toggleNextStepButton(true);
+      return;
+    }
+
+    const handlesSubmit = targetContainer.dataset.paymentInlineSubmit === 'true' ||
+                         targetContainer.querySelector('[data-payment-inline-submit="true"]') !== null;
+
+    this.toggleNextStepButton(!handlesSubmit);
+  }
+
+  toggleNextStepButton(show) {
+    if (!this.nextStepButton) {
+      this.findNextStepButton();
+    }
+    if (!this.nextStepButton) return;
+
+    if (show) {
+      this.nextStepButton.classList.remove('disabled');
+      this.nextStepButton.disabled = false;
+    } else {
+      this.nextStepButton.classList.add('disabled');
+      this.nextStepButton.disabled = true;
+    }
+  }
+
+  enableNextStepButton() {
+    this.toggleNextStepButton(true);
+  }
+
+  disableNextStepButton() {
+    this.toggleNextStepButton(false);
+  }
+
   handleForm() {
     if ($('.checkbox-oney :radio:checked').length) {
-      $('.checkbox-payplug').closest('.payment-item').find('.payment-choice__input:checked').prop('checked', false);
+      $('.checkbox-payplug').closest('.oney-payment-choice__item, .payplug-payment-choice__item, .form-check, .payment-item').find('.payment-choice__input:checked').prop('checked', false);
     } else if ($('.checkbox-payplug :radio:checked').length) {
-      $('.checkbox-oney').closest('.payment-item').find('.payment-choice__input:checked').prop('checked', false);
+      $('.checkbox-oney').closest('.oney-payment-choice__item, .payplug-payment-choice__item, .form-check, .payment-item').find('.payment-choice__input:checked').prop('checked', false);
     }
 
-    $('input#payplug_choice_card_other').attr('disabled', true);
-    this.form.submit();
+    const otherCardOther = document.querySelector('input#payplug_choice_card_other');
+    if (otherCardOther) {
+      otherCardOther.disabled = true;
+    }
   }
 }
diff --git a/assets/shop/controllers/integrated-payment_controller.js b/assets/shop/controllers/integrated-payment_controller.js
index 4af78c21..5c85c16e 100644
--- a/assets/shop/controllers/integrated-payment_controller.js
+++ b/assets/shop/controllers/integrated-payment_controller.js
@@ -3,6 +3,7 @@ import WebFont from 'webfontloader';
 
 /* stimulusFetch: 'lazy' */
 export default class extends Controller {
+  static targets = ['container']
   static values = {
     code: String,
     factoryName: String,
@@ -55,23 +56,32 @@ export default class extends Controller {
 
     // Verify if we have required data
     // TODO: Pass as param
-    if (payplug_integrated_payment_params === undefined) {
+    if (typeof payplug_integrated_payment_params === 'undefined') {
       return;
     }
 
+    this.form = this.element.closest('form');
+
     if (payplug_integrated_payment_params.has_saved_cards) {
-      document.querySelectorAll('.payment-choice__input, .payment-item input[type=radio]:not([name=schemeOptions])').forEach((element) => {
+      const otherCardRadio = this.element.querySelector('#payplug_choice_card_other');
+      const payplugRadio = document.querySelector(`[id*="checkout_select_payment_payments"][value="${payplug_integrated_payment_params.payment_method_code}"]`);
+
+      // Initial check
+      if (
+          (otherCardRadio && otherCardRadio.checked && payplugRadio && payplugRadio.checked) ||
+          (otherCardRadio && otherCardRadio.checked && !payplugRadio && document.querySelector('.payplug-payment-choice__input:checked'))
+      ) {
+        this.openFields();
+      }
+
+      this.element.querySelectorAll('.payment-choice__input, [id*="checkout_select_payment_payments"]').forEach((element) => {
         element.addEventListener('change', (e) => {
-          if (
-            'payplug_choice_card_other' === e.currentTarget.id &&
-            e.currentTarget.checked ||
-            e.target.value === payplug_integrated_payment_params.payment_method_code &&
-            document.querySelector('#payplug_choice_card_other').checked
-          ) {
+          const isOtherCardChecked = this.element.querySelector('#payplug_choice_card_other')?.checked;
+          const isPayplugSelected = document.querySelector(`[id*="checkout_select_payment_payments"][value="${payplug_integrated_payment_params.payment_method_code}"]`)?.checked;
+
+          if (isOtherCardChecked && isPayplugSelected) {
             this.openFields();
-            return;
           }
-          this.closeFields();
         })
       })
       return;
@@ -82,18 +92,39 @@ export default class extends Controller {
       this.openFields();
     }
 
-    const selectPaymentMethodsField= this.getPaymentMethodSelectors();
+    const selectPaymentMethodsField = this.getPaymentMethodSelectors();
     selectPaymentMethodsField.forEach((element) => {
-      // On payment method select, open or close card fields
+      // On payment method select, open fields if payplug selected
       element.addEventListener('change', (e) => {
         if (payplug_integrated_payment_params.payment_method_code === e.currentTarget.value && e.currentTarget.checked) {
           this.openFields();
-          return;
         }
-        this.closeFields();
       })
     });
   }
+
+  handleShow(event) {
+    if (this.hasContainerTarget) {
+      import('jquery').then(({ default: $ }) => {
+        $(this.containerTarget).slideDown();
+      });
+      this.openFields();
+      this.containerTarget.dataset.paymentInlineSubmit = "true";
+      this.element.dispatchEvent(new CustomEvent('payment-method-state-change', { bubbles: true }));
+    }
+  }
+
+  handleHide(event) {
+    if (this.hasContainerTarget) {
+      import('jquery').then(({ default: $ }) => {
+        $(this.containerTarget).slideUp();
+      });
+      this.closeFields();
+      this.containerTarget.dataset.paymentInlineSubmit = "false";
+      this.element.dispatchEvent(new CustomEvent('payment-method-state-change', { bubbles: true }));
+    }
+  }
+
   getPaymentMethodSelectors({ methodCode, checked } = {}) {
     const baseSelector = '[id*=checkout_select_payment_payments]';
 
@@ -105,45 +136,47 @@ export default class extends Controller {
     }
     return document.querySelectorAll(baseSelector);
   }
+
   openFields() {
-    document.querySelector('.payplugIntegratedPayment').classList.add('payplugIntegratedPayment--loaded');
-    document.querySelector('button[type=submit]').classList.add('disabled');
+    this.containerTarget.classList.add('payplugIntegratedPayment--loaded');
     if (null === this.options.api) {
       this.load();
     }
   }
+
   closeFields() {
-    document.querySelector('.payplugIntegratedPayment').classList.remove('payplugIntegratedPayment--loaded');
-    document.querySelector('button[type=submit]').classList.remove('disabled');
+    this.containerTarget.classList.remove('payplugIntegratedPayment--loaded');
   }
+
   load() {
-    this.options.api = new Payplug.IntegratedPayment(payplug_integrated_payment_params.is_test_mode);
+    this.options.api = new window.Payplug.IntegratedPayment(payplug_integrated_payment_params.is_test_mode);
+    this.options.api.setDisplayMode3ds(window.Payplug.DisplayMode3ds.LIGHTBOX);
 
-    this.options.api.setDisplayMode3ds(Payplug.DisplayMode3ds.LIGHTBOX);
+    const container = this.hasContainerTarget ? this.containerTarget : this.element;
 
     this.options.form.cardHolder = this.options.api.cardHolder(
-      document.querySelector('.cardHolder-input-container'),
+      container.querySelector('.cardHolder-input-container'),
       {
         default: this.options.inputStyle.default,
         placeholder: payplug_integrated_payment_params.cardholder
       }
     );
     this.options.form.pan = this.options.api.cardNumber(
-      document.querySelector('.pan-input-container'),
+      container.querySelector('.pan-input-container'),
       {
         default: this.options.inputStyle.default,
         placeholder: payplug_integrated_payment_params.pan
       }
     );
     this.options.form.cvv = this.options.api.cvv(
-      document.querySelector('.cvv-input-container'),
+      container.querySelector('.cvv-input-container'),
       {
         default: this.options.inputStyle.default,
         placeholder: payplug_integrated_payment_params.cvv
       }
     );
     this.options.form.exp = this.options.api.expiration(
-      document.querySelector('.exp-input-container'),
+      container.querySelector('.exp-input-container'),
       {
         default: this.options.inputStyle.default,
         placeholder: payplug_integrated_payment_params.exp
@@ -154,20 +187,24 @@ export default class extends Controller {
     this.fieldValidation();
   }
   bindEvents() {
-    document.querySelector('#paid').addEventListener('click', (event) => {
-      event.preventDefault();
+    const container = this.hasContainerTarget ? this.containerTarget : this.element;
+    const paidButton = container.querySelector('#paid');
+    if (paidButton) {
+      paidButton.addEventListener('click', (event) => {
+        event.preventDefault();
+        this.options.api.validateForm();
+      });
+    }
 
-      this.options.api.validateForm();
-    });
     this.options.api.onValidateForm(async ({ isFormValid }) => {
       if (isFormValid) {
         this.toggleLoader();
-        const saveCardElement = document.querySelector('#savecard');
+        const saveCardElement = this.element.querySelector('#savecard');
         if (null !== saveCardElement) {
           this.options.save_card = saveCardElement.checked;
         }
-        const chosenScheme = document.querySelector('input.schemeOptions:checked');
-        this.options.scheme = Payplug.Scheme.AUTO;
+        const chosenScheme = this.element.querySelector('input.schemeOptions:checked');
+        this.options.scheme = window.Payplug.Scheme.AUTO;
         if (null !== chosenScheme) {
           this.options.scheme = chosenScheme.value;
         }
@@ -186,28 +223,29 @@ export default class extends Controller {
         return;
       }
       document.querySelector('input[name=payplug_integrated_payment_token]').value = event.token;
-      document.querySelector('form[name*="checkout_select_payment"]').submit();
+      this.form.submit();
     });
   }
   fieldValidation () {
+    const container = this.hasContainerTarget ? this.containerTarget : this.element;
     Object.keys(this.options.form).forEach((key) => {
       const field = this.options.form[key];
       field.onChange((err) => {
         if (err.error) {
-          document.querySelector(`.payplugIntegratedPayment__error--${key}`).classList.remove('payplugIntegratedPayment__error--hide');
-          document.querySelector(`.${key}-input-container`).classList.add('payplugIntegratedPayment__container--invalid');
+          container.querySelector(`.payplugIntegratedPayment__error--${key}`).classList.remove('payplugIntegratedPayment__error--hide');
+          container.querySelector(`.${key}-input-container`).classList.add('payplugIntegratedPayment__container--invalid');
           if (err.error.name === "FIELD_EMPTY") {
-            document.querySelector(`.payplugIntegratedPayment__error--${key}`).querySelector(".emptyField").classList.remove('payplugIntegratedPayment__error--hide');
-            document.querySelector(`.payplugIntegratedPayment__error--${key}`).querySelector(".invalidField").classList.add('payplugIntegratedPayment__error--hide');
+            container.querySelector(`.payplugIntegratedPayment__error--${key}`).querySelector(".emptyField").classList.remove('payplugIntegratedPayment__error--hide');
+            container.querySelector(`.payplugIntegratedPayment__error--${key}`).querySelector(".invalidField").classList.add('payplugIntegratedPayment__error--hide');
           } else {
-            document.querySelector(`.payplugIntegratedPayment__error--${key}`).querySelector(".invalidField").classList.remove('payplugIntegratedPayment__error--hide');
-            document.querySelector(`.payplugIntegratedPayment__error--${key}`).querySelector(".emptyField").classList.add('payplugIntegratedPayment__error--hide');
+            container.querySelector(`.payplugIntegratedPayment__error--${key}`).querySelector(".invalidField").classList.remove('payplugIntegratedPayment__error--hide');
+            container.querySelector(`.payplugIntegratedPayment__error--${key}`).querySelector(".emptyField").classList.add('payplugIntegratedPayment__error--hide');
           }
         } else {
-          document.querySelector(`.payplugIntegratedPayment__error--${key}`).classList.add('payplugIntegratedPayment__error--hide');
-          document.querySelector(`.${key}-input-container`).classList.remove('payplugIntegratedPayment__container--invalid');
-          document.querySelector(`.payplugIntegratedPayment__error--${key}`).querySelector(".invalidField").classList.add('payplugIntegratedPayment__error--hide');
-          document.querySelector(`.payplugIntegratedPayment__error--${key}`).querySelector(".emptyField").classList.add('payplugIntegratedPayment__error--hide');
+          container.querySelector(`.payplugIntegratedPayment__error--${key}`).classList.add('payplugIntegratedPayment__error--hide');
+          container.querySelector(`.${key}-input-container`).classList.remove('payplugIntegratedPayment__container--invalid');
+          container.querySelector(`.payplugIntegratedPayment__error--${key}`).querySelector(".invalidField").classList.add('payplugIntegratedPayment__error--hide');
+          container.querySelector(`.payplugIntegratedPayment__error--${key}`).querySelector(".emptyField").classList.add('payplugIntegratedPayment__error--hide');
           this.options.fieldsValid[key] = true;
           this.options.fieldsEmpty[key] = false;
         }
@@ -215,6 +253,7 @@ export default class extends Controller {
     })
   }
   toggleLoader() {
-    document.querySelector('.payplugIntegratedPayment').querySelector('.sylius-shop-loader').classList.toggle('d-none');
+    const container = this.hasContainerTarget ? this.containerTarget : this.element;
+    container.querySelector('.sylius-shop-loader').classList.toggle('d-none');
   }
 }
diff --git a/assets/shop/dist/payment/index.css b/assets/shop/dist/payment/index.css
index bb6bfa52..95e0bf4b 100644
--- a/assets/shop/dist/payment/index.css
+++ b/assets/shop/dist/payment/index.css
@@ -4,10 +4,6 @@
     display: flex !important
 }
 
-.oney-payment-choice, .payplug-payment-choice {
-    display: none
-}
-
 .oney-payment-choice__container, .payplug-payment-choice__container {
     margin: 1rem 0;
     display: flex
@@ -103,11 +99,11 @@
     padding: 0 !important
 }
 
-.payment-item .oney-logo[src*=without-fees] {
+.oney-logo[src*=without-fees] {
     max-width: 200px
 }
 
-.payment-item apple-pay-button {
+apple-pay-button {
     --apple-pay-button-width: 222px;
     --apple-pay-button-height: 40px;
     --apple-pay-button-border-radius: 4px;
@@ -115,29 +111,12 @@
     --apple-pay-button-box-sizing: border-box;
     min-width: 140px;
     max-width: 100%;
-    transition: background-color .3s ease-in-out;
-    display: none
-}
-
-.payment-item apple-pay-button.enabled {
-    display: block
 }
 
-.payment-item label {
+label {
     cursor: pointer
 }
 
-.payment-item .bancontact-method label, .payment-item .apple-pay-method label, .payment-item .american-express-method label {
-    position: relative
-}
-
-.payment-item .bancontact-method label img, .payment-item .apple-pay-method label img, .payment-item .american-express-method label img {
-    margin-left: .5em;
-    position: absolute;
-    top: -12px;
-    left: 100%
-}
-
 .payplug-payment-choice__container {
     flex-direction: column
 }
@@ -174,16 +153,17 @@
     content: "";
     background-image: var(--logo);
     display: inline-block;
-    width: 60px;
-    height: 25px;
+    width: 45px;
+    height: 40px;
+    margin-top: -6px;
+    margin-left: 10px;
     background-repeat: no-repeat;
-    background-position: 0 -11px;
-    background-size: 60px 45px;
-    float: right
+    background-position: center;
+    background-size: contain;
+    float: right;
 }
-
-.bancontact-label::after {
-    margin-left: 5px
+.payment-label-with-image.oney-label::after {
+    width: 130px;
 }
 
 @media screen and (max-width: 991px) {
diff --git a/assets/shop/dist/payment/integrated.css b/assets/shop/dist/payment/integrated.css
index 9a2805f7..2bf34d51 100644
--- a/assets/shop/dist/payment/integrated.css
+++ b/assets/shop/dist/payment/integrated.css
@@ -1 +1,301 @@
-.payplugIntegratedPayment{justify-self:center;display:none}.payplugIntegratedPayment *{font-family:Poppins,Arial,sans-serif!important}.payplugIntegratedPayment--loaded{width:100%;max-width:400px;flex-wrap:wrap;justify-content:space-between;margin-top:20px;margin-bottom:0;display:flex;position:relative}.payplugIntegratedPayment__select{height:36px;width:100%;border:1px solid #ccc;border-radius:5px;margin:0 0 10px;padding:0 8px}.payplugIntegratedPayment__container{width:100%;margin:0 0 10px;padding:0;display:flex;position:relative}.payplugIntegratedPayment__container--cardHolder,.payplugIntegratedPayment__container--pan,.payplugIntegratedPayment__container--exp,.payplugIntegratedPayment__container--cvv{height:40px;cursor:text;border:1px solid #d5d6d8;border-radius:2px;padding:0 16px 0 50px;line-height:40px}.payplugIntegratedPayment__container--cardHolder:before,.payplugIntegratedPayment__container--pan:before,.payplugIntegratedPayment__container--exp:before,.payplugIntegratedPayment__container--cvv:before{content:"";width:24px;height:24px;background:#95999e 50%/100% no-repeat;position:absolute;top:20%;left:16px}.payplugIntegratedPayment__container--cardHolder:focus,.payplugIntegratedPayment__container--pan:focus,.payplugIntegratedPayment__container--exp:focus,.payplugIntegratedPayment__container--cvv:focus{border-color:#2b343d}.payplugIntegratedPayment__container--cardHolder--invalid,.payplugIntegratedPayment__container--pan--invalid,.payplugIntegratedPayment__container--exp--invalid,.payplugIntegratedPayment__container--cvv--invalid{border-color:#e91932}.payplugIntegratedPayment__container--cardHolder:before{-webkit-mask-image:url(account.039342ad.svg);mask-image:url(account.039342ad.svg)}.payplugIntegratedPayment__container--pan:before{-webkit-mask-image:url(card.0d2bd9bc.svg);mask-image:url(card.0d2bd9bc.svg)}.payplugIntegratedPayment__container--exp:before{-webkit-mask-image:url(calendar.3c23bb16.svg);mask-image:url(calendar.3c23bb16.svg)}.payplugIntegratedPayment__container--cvv:before{-webkit-mask-image:url(lock.fe8a73cd.svg);mask-image:url(lock.fe8a73cd.svg)}.payplugIntegratedPayment__container--exp,.payplugIntegratedPayment__container--cvv{max-width:calc(50% - 2px);display:inline-block}.payplugIntegratedPayment__container--scheme{text-transform:uppercase;height:22px;justify-content:space-between;align-items:center;margin:10px 0;font-size:14px;font-weight:700}.payplugIntegratedPayment__container--saveCard{height:auto;align-items:center;padding:10px 0 0;display:flex}.payplugIntegratedPayment__container--saveCard input{display:none}.payplugIntegratedPayment__container--saveCard input:checked+label span:before{opacity:1}.payplugIntegratedPayment__container--saveCard label{cursor:pointer;color:#918f8f;margin:0!important;font-size:12px!important}.payplugIntegratedPayment__container--saveCard label span{cursor:pointer;height:16px;-o-transition:border .4s;width:16px;border:1px solid #d5d6d8;border-radius:2px;margin:0 10px -3px 0;transition:border .4s;display:inline-block;position:relative}.payplugIntegratedPayment__container--saveCard label span:before{content:"";height:5px;opacity:0;width:10px;border-top:none;border-bottom:2.5px solid #2b343d;border-left:2.5px solid #2b343d;border-right:none;border-radius:1px;transition:opacity .4s;display:block;position:absolute;top:50%;left:50%;transform:translate(-50%,-55%)rotate(-48deg)}.payplugIntegratedPayment__container--saveCard label:hover{color:#2b343d;transition:all .1s}.payplugIntegratedPayment__container--saveCard label:hover span{border-color:#2b343d;transition:all .1s}.payplugIntegratedPayment__container--transaction{align-items:center;margin-top:10px}.payplugIntegratedPayment__container--transaction .transaction-label{vertical-align:super;margin-left:5px;font-size:12px}.payplugIntegratedPayment__container img.lock-icon{width:18px;float:left!important}.payplugIntegratedPayment__container img.payplug-logo{width:80px;height:auto;vertical-align:text-top;margin-left:6px;display:inline-block;float:inherit!important}.payplugIntegratedPayment__container--privacy-policy{text-align:center;display:inline-block}.payplugIntegratedPayment__container--privacy-policy a{color:#918f8f;font-size:14px}.payplugIntegratedPayment__schemes{width:115px;flex-wrap:wrap;justify-content:space-between;align-items:center;display:flex}.payplugIntegratedPayment__schemes label{display:table-cell}.payplugIntegratedPayment__scheme{margin:0}.payplugIntegratedPayment__scheme span{cursor:pointer;width:33px;height:22px;background:50%/100% no-repeat;display:block}.payplugIntegratedPayment__scheme span:before{width:100%;height:100%;content:"";opacity:0;background:50%/100% no-repeat;display:block}.payplugIntegratedPayment__scheme input{display:none}.payplugIntegratedPayment__scheme input:checked+span:before{opacity:1}.payplugIntegratedPayment__scheme--visa span{background-image:url(visa-dark.87c34e0f.svg)}.payplugIntegratedPayment__scheme--visa span:before{background-image:url(visa.d11a46f6.svg)}.payplugIntegratedPayment__scheme--mastercard span{background-image:url(mastercard-dark.8977e440.svg)}.payplugIntegratedPayment__scheme--mastercard span:before{background-image:url(mastercard.7dd4ce0b.svg)}.payplugIntegratedPayment__scheme--cb span{background-image:url(./cb-dark.888aec45.svg)}.payplugIntegratedPayment__scheme--cb span:before{background-image:url(./cb.ccd964e9.svg)}.payplugIntegratedPayment__error{color:#e91932;width:100%;margin:-10px 0 10px;padding-left:4px;font-size:12px;line-height:18px}.payplugIntegratedPayment__error--cardHolder{margin:-10px 0 0}.payplugIntegratedPayment__error--cvv{justify-self:flex-end;margin:-10px 0 10px auto}.payplugIntegratedPayment__error--exp,.payplugIntegratedPayment__error--cvv{width:100%;max-width:49%}.payplugIntegratedPayment__error--hide{display:none}
\ No newline at end of file
+.payplugIntegratedPayment {
+    justify-self: center;
+    display: none
+}
+
+.payplugIntegratedPayment * {
+    font-family: Poppins, Arial, sans-serif !important
+}
+
+.payplugIntegratedPayment--loaded {
+    width: 100%;
+    max-width: 400px;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    margin: 20px auto 0;
+    display: flex;
+    position: relative
+}
+
+.payplugIntegratedPayment__select {
+    height: 36px;
+    width: 100%;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    margin: 0 0 10px;
+    padding: 0 8px
+}
+
+.payplugIntegratedPayment__container {
+    width: 100%;
+    margin: 0 0 10px;
+    padding: 0;
+    display: flex;
+    position: relative
+}
+
+.payplugIntegratedPayment__container--cardHolder,
+.payplugIntegratedPayment__container--pan,
+.payplugIntegratedPayment__container--exp,
+.payplugIntegratedPayment__container--cvv {
+    height: 40px;
+    cursor: text;
+    border: 1px solid #d5d6d8;
+    border-radius: 2px;
+    padding: 0 16px 0 50px;
+    line-height: 40px
+}
+
+.payplugIntegratedPayment__container--cardHolder:before,
+.payplugIntegratedPayment__container--pan:before,
+.payplugIntegratedPayment__container--exp:before,
+.payplugIntegratedPayment__container--cvv:before {
+    content: "";
+    width: 24px;
+    height: 24px;
+    background: #95999e 50%/100% no-repeat;
+    position: absolute;
+    top: 20%;
+    left: 16px
+}
+
+.payplugIntegratedPayment__container--cardHolder:focus,
+.payplugIntegratedPayment__container--pan:focus,
+.payplugIntegratedPayment__container--exp:focus,
+.payplugIntegratedPayment__container--cvv:focus {
+    border-color: #2b343d
+}
+
+.payplugIntegratedPayment__container--cardHolder--invalid,
+.payplugIntegratedPayment__container--pan--invalid,
+.payplugIntegratedPayment__container--exp--invalid,
+.payplugIntegratedPayment__container--cvv--invalid {
+    border-color: #e91932
+}
+
+.payplugIntegratedPayment__container--cardHolder:before {
+    -webkit-mask-image: url(account.039342ad.svg);
+    mask-image: url(account.039342ad.svg)
+}
+
+.payplugIntegratedPayment__container--pan:before {
+    -webkit-mask-image: url(card.0d2bd9bc.svg);
+    mask-image: url(card.0d2bd9bc.svg)
+}
+
+.payplugIntegratedPayment__container--exp:before {
+    -webkit-mask-image: url(calendar.3c23bb16.svg);
+    mask-image: url(calendar.3c23bb16.svg)
+}
+
+.payplugIntegratedPayment__container--cvv:before {
+    -webkit-mask-image: url(lock.fe8a73cd.svg);
+    mask-image: url(lock.fe8a73cd.svg)
+}
+
+.payplugIntegratedPayment__container--exp,
+.payplugIntegratedPayment__container--cvv {
+    max-width: calc(50% - 2px);
+    display: inline-block
+}
+
+.payplugIntegratedPayment__container--scheme {
+    text-transform: uppercase;
+    height: 22px;
+    justify-content: space-between;
+    align-items: center;
+    margin: 10px 0;
+    font-size: 14px;
+    font-weight: 700
+}
+
+.payplugIntegratedPayment__container--saveCard {
+    height: auto;
+    align-items: center;
+    padding: 10px 0 0;
+    display: flex
+}
+
+.payplugIntegratedPayment__container--saveCard input {
+    display: none
+}
+
+.payplugIntegratedPayment__container--saveCard input:checked+label span:before {
+    opacity: 1
+}
+
+.payplugIntegratedPayment__container--saveCard label {
+    cursor: pointer;
+    color: #918f8f;
+    margin: 0 !important;
+    font-size: 12px !important
+}
+
+.payplugIntegratedPayment__container--saveCard label span {
+    cursor: pointer;
+    height: 16px;
+    -o-transition: border .4s;
+    width: 16px;
+    border: 1px solid #d5d6d8;
+    border-radius: 2px;
+    margin: 0 10px -3px 0;
+    transition: border .4s;
+    display: inline-block;
+    position: relative
+}
+
+.payplugIntegratedPayment__container--saveCard label span:before {
+    content: "";
+    height: 5px;
+    opacity: 0;
+    width: 10px;
+    border-top: none;
+    border-bottom: 2.5px solid #2b343d;
+    border-left: 2.5px solid #2b343d;
+    border-right: none;
+    border-radius: 1px;
+    transition: opacity .4s;
+    display: block;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -55%)rotate(-48deg)
+}
+
+.payplugIntegratedPayment__container--saveCard label:hover {
+    color: #2b343d;
+    transition: all .1s
+}
+
+.payplugIntegratedPayment__container--saveCard label:hover span {
+    border-color: #2b343d;
+    transition: all .1s
+}
+
+.payplugIntegratedPayment__container--transaction {
+    align-items: center;
+    margin-top: 10px
+}
+
+.payplugIntegratedPayment__container--transaction .transaction-label {
+    vertical-align: super;
+    margin-left: 5px;
+    font-size: 12px
+}
+
+.payplugIntegratedPayment__container img.lock-icon {
+    width: 18px;
+    float: left !important
+}
+
+.payplugIntegratedPayment__container img.payplug-logo {
+    width: 80px;
+    height: auto;
+    vertical-align: text-top;
+    margin-left: 6px;
+    display: inline-block;
+    float: inherit !important
+}
+
+.payplugIntegratedPayment__container--privacy-policy {
+    text-align: center;
+    display: inline-block
+}
+
+.payplugIntegratedPayment__container--privacy-policy a {
+    color: #918f8f;
+    font-size: 14px
+}
+
+.payplugIntegratedPayment__schemes {
+    width: 115px;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    align-items: center;
+    display: flex
+}
+
+.payplugIntegratedPayment__schemes label {
+    display: table-cell
+}
+
+.payplugIntegratedPayment__scheme {
+    margin: 0
+}
+
+.payplugIntegratedPayment__scheme span {
+    cursor: pointer;
+    width: 33px;
+    height: 22px;
+    background: 50%/100% no-repeat;
+    display: block
+}
+
+.payplugIntegratedPayment__scheme span:before {
+    width: 100%;
+    height: 100%;
+    content: "";
+    opacity: 0;
+    background: 50%/100% no-repeat;
+    display: block
+}
+
+.payplugIntegratedPayment__scheme input {
+    display: none
+}
+
+.payplugIntegratedPayment__scheme input:checked+span:before {
+    opacity: 1
+}
+
+.payplugIntegratedPayment__scheme--visa span {
+    background-image: url(visa-dark.87c34e0f.svg)
+}
+
+.payplugIntegratedPayment__scheme--visa span:before {
+    background-image: url(visa.d11a46f6.svg)
+}
+
+.payplugIntegratedPayment__scheme--mastercard span {
+    background-image: url(mastercard-dark.8977e440.svg)
+}
+
+.payplugIntegratedPayment__scheme--mastercard span:before {
+    background-image: url(mastercard.7dd4ce0b.svg)
+}
+
+.payplugIntegratedPayment__scheme--cb span {
+    background-image: url(./cb-dark.888aec45.svg)
+}
+
+.payplugIntegratedPayment__scheme--cb span:before {
+    background-image: url(./cb.ccd964e9.svg)
+}
+
+.payplugIntegratedPayment__error {
+    color: #e91932;
+    width: 100%;
+    margin: -10px 0 10px;
+    padding-left: 4px;
+    font-size: 12px;
+    line-height: 18px
+}
+
+.payplugIntegratedPayment__error--cardHolder {
+    margin: -10px 0 0
+}
+
+.payplugIntegratedPayment__error--cvv {
+    justify-self: flex-end;
+    margin: -10px 0 10px auto
+}
+
+.payplugIntegratedPayment__error--exp,
+.payplugIntegratedPayment__error--cvv {
+    width: 100%;
+    max-width: 49%
+}
+
+.payplugIntegratedPayment__error--hide {
+    display: none
+}
diff --git a/config/services.yaml b/config/services.yaml
index a58fc643..8b5dac42 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -20,6 +20,7 @@ services:
 
     PayPlug\SyliusPayPlugPlugin\Controller\OrderController:
         parent: sylius.controller.order
+        autowire: true
 
     PayPlug\SyliusPayPlugPlugin\Provider\OneySimulation\OneySimulationDataProviderInterface:
         class: PayPlug\SyliusPayPlugPlugin\Provider\OneySimulation\OneySimulationDataProvider
diff --git a/public/assets/american-express/logo.svg b/public/assets/american-express/logo.svg
index 5a587766..b6dfc5b8 100644
--- a/public/assets/american-express/logo.svg
+++ b/public/assets/american-express/logo.svg
@@ -1,25 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1__x28_1:1_x29_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 x="0px" y="0px" viewBox="0 0 70 70" style="enable-background:new 0 0 70 70;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#0071CE;}
-</style>
-<g>
-	<g>
-		<path class="st0" d="M59.4,49.7l-2.6-2.9l-2.7,2.9h-5.3l0,0H37.4V36.2h-5.3l6.6-15.1l6.4,0l2.3,5.2v-5.2h8l1.4,3.9l1.4-3.9l6.1,0
-			v-2.3c0-1.4-1.1-2.5-2.5-2.5H8.2c-1.4,0-2.5,1.1-2.5,2.5v32.5c0,1.4,1.1,2.5,2.5,2.5h53.6c1.4,0,2.5-1.1,2.5-2.5v-1.6L59.4,49.7z"
-			/>
-		<g>
-			<polygon class="st0" points="60.1,48.1 64.3,48.1 58.8,42.2 64.3,36.4 60.2,36.4 56.7,40.2 53.3,36.4 49.1,36.4 54.7,42.3 
-				49.1,48.1 53.2,48.1 56.7,44.3 60.1,48.1 			"/>
-			<polygon class="st0" points="42.4,45.4 42.4,43.6 49,43.6 49,40.9 42.4,40.9 42.4,39.1 49.1,39.1 49.1,36.4 39.2,36.4 39.2,48.1 
-				49.1,48.1 49.1,45.4 42.4,45.4 			"/>
-			<polygon class="st0" points="61.2,34.7 64.2,34.7 64.2,22.9 59.4,23 56.8,30.3 54.1,23 49.1,23 49.1,34.7 52.3,34.7 52.3,26.5 
-				55.3,34.7 58.1,34.7 61.2,26.5 61.2,34.7 			"/>
-			<path class="st0" d="M44,23h-4.1l-5.2,11.7h3.5l1-2.3h5.4l1,2.3h3.6L44,23z M40.3,29.7l1.6-3.8l1.6,3.8H40.3z"/>
-		</g>
-	</g>
-	<polygon class="st0" points="61.4,41.9 64.3,45.1 64.3,38.7 61.4,41.9 	"/>
-</g>
-</svg>
+<svg fill="none" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><path d="m32 32h-15.9042-16.0958v-16.159-15.841h15.8815 16.1185v15.9984z" fill="#fff"/><path d="m32 32v-5.0705h-3.8605l-1.9876-2.1978-1.9977 2.1978h-12.7285v-10.243h-4.1082l5.0958-11.53232h4.9144l1.7544 3.95078v-3.95078h6.0831l1.0562 2.97715 1.0631-2.97715h4.7155v-5.15418h-32v32zm-3.2102-6.353h3.2102l-4.2466-4.5033 4.2466-4.4521h-3.1592l-2.6225 2.8658-2.5973-2.8658h-3.211l4.2217 4.4777-4.2217 4.4777h3.1216l2.6354-2.8913zm.751-4.4995 2.4592 2.6163v-5.2107zm-14.3121 2.427v-1.3945h5.0532v-2.0214h-5.0532v-1.3944h5.1811l.0002-2.0726h-7.625v8.9554h7.625l-.0002-2.0725zm14.3533-8.1824h2.418v-8.95543h-3.7613l-2.0087 5.57783-1.9957-5.57783h-3.8251v8.95543h2.4178v-6.26877l2.3029 6.26877h2.1492l2.3029-6.2817zm-11.9234 0h2.7506l-3.953-8.95543h-3.1473l-3.95331 8.95543h2.68661l.7422-1.7911h4.1193zm-1.5991-3.7997h-2.4309l1.2155-2.92968z" fill="#006fcf"/></svg>
\ No newline at end of file
diff --git a/public/assets/apple-pay/logo.svg b/public/assets/apple-pay/logo.svg
index 1240e7d4..5a86310e 100644
--- a/public/assets/apple-pay/logo.svg
+++ b/public/assets/apple-pay/logo.svg
@@ -1,5 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 70 70">
-    <path fill="#fff" d="m59.05202574 17.024237.59551824.00078152c.16333768.00078152.32667536.00312608.49079456.00703368.29775912.0078152.64788008.02422712.9847152.08518568.31182648.05626944.57598024.14301816.83153728.27275048a2.7235972 2.7235972 0 0 1 1.19807016 1.19885168c.12973232.25477552.21569952.51892928.27196896.83153728.06017704.33370904.07737048.68461152.08440416.98393368.00468912.16255616.00703368.32589384.0078152.49079456.00156304.19772456.00156304.39701216.00156304.59551824v27.01870944c0 .19850608 0 .39701216-.00156304.5978628a20.2960744 20.2960744 0 0 1-.0078152.48845c-.0078152.29932216-.02422712.65022464-.08440416.98627824a2.92913696 2.92913696 0 0 1-.27196896.82919272 2.74782432 2.74782432 0 0 1-1.1996332 1.1996332 2.9267924 2.9267924 0 0 1-.82997424.27275048 6.73513936 6.73513936 0 0 1-.98237064.08440416c-.1641192.0039076-.3282384.00625216-.49470216.00625216-.19772456.00156304-.39701216.00156304-.59473672.00156304h-48.1103712c-.19616152 0-.39232304 0-.59082912-.00156304-.1641192 0-.3282384-.00234456-.48845-.00625216a6.82110656 6.82110656 0 0 1-.9847152-.08440416 2.89475008 2.89475008 0 0 1-.8323188-.273532 2.696244 2.696244 0 0 1-.69398976-.50486192 2.71031136 2.71031136 0 0 1-.50329888-.69398976 2.92054024 2.92054024 0 0 1-.27275048-.83153728 6.54288544 6.54288544 0 0 1-.08518568-.98393368 25.6221332 25.6221332 0 0 1-.00703368-.48923152l-.00078152-.4767272V21.37105124l.00078152-.47594568c.00078152-.16333768.00312608-.32667536.00703368-.49079456.0078152-.29775912.02422712-.64788008.08518568-.98549672a2.891624 2.891624 0 0 1 .27275048-.83075576 2.73063088 2.73063088 0 0 1 1.19807016-1.19807016 2.9072544 2.9072544 0 0 1 .83075576-.27196896 6.57180168 6.57180168 0 0 1 .98549672-.08518568c.16333768-.0039076.32667536-.00625216.48923152-.00703368l.59708128-.00156304h48.10411904"/>
-    <path d="m59.05202574 17.024237.59551824.00078152c.16333768.00078152.32667536.00312608.49079456.00703368.29775912.0078152.64788008.02422712.9847152.08518568.31182648.05626944.57598024.14301816.83153728.27275048a2.7235972 2.7235972 0 0 1 1.19807016 1.19885168c.12973232.25477552.21569952.51892928.27196896.83153728.06017704.33370904.07737048.68461152.08440416.98393368.00468912.16255616.00703368.32589384.0078152.49079456.00156304.19772456.00156304.39701216.00156304.59551824v27.01870944c0 .19850608 0 .39701216-.00156304.5978628a20.2960744 20.2960744 0 0 1-.0078152.48845c-.0078152.29932216-.02422712.65022464-.08440416.98627824a2.92913696 2.92913696 0 0 1-.27196896.82919272 2.74782432 2.74782432 0 0 1-1.1996332 1.1996332 2.9267924 2.9267924 0 0 1-.82997424.27275048 6.73513936 6.73513936 0 0 1-.98237064.08440416c-.1641192.0039076-.3282384.00625216-.49470216.00625216-.19772456.00156304-.39701216.00156304-.59473672.00156304h-48.1103712c-.19616152 0-.39232304 0-.59082912-.00156304-.1641192 0-.3282384-.00234456-.48845-.00625216a6.82110656 6.82110656 0 0 1-.9847152-.08440416 2.89475008 2.89475008 0 0 1-.8323188-.273532 2.696244 2.696244 0 0 1-.69398976-.50486192 2.71031136 2.71031136 0 0 1-.50329888-.69398976 2.92054024 2.92054024 0 0 1-.27275048-.83153728 6.54288544 6.54288544 0 0 1-.08518568-.98393368 25.6221332 25.6221332 0 0 1-.00703368-.48923152l-.00078152-.4767272V21.37105124l.00078152-.47594568c.00078152-.16333768.00312608-.32667536.00703368-.49079456.0078152-.29775912.02422712-.64788008.08518568-.98549672a2.891624 2.891624 0 0 1 .27275048-.83075576 2.73063088 2.73063088 0 0 1 1.19807016-1.19807016 2.9072544 2.9072544 0 0 1 .83075576-.27196896 6.57180168 6.57180168 0 0 1 .98549672-.08518568c.16333768-.0039076.32667536-.00625216.48923152-.00703368l.59708128-.00156304h48.10411904m0-.78152H10.9479067l-.60098888.00078152c-.16880832.00078152-.33761664.00312608-.50642496.0078152a7.43928888 7.43928888 0 0 0-1.1019432.09690848 3.7356656 3.7356656 0 0 0-1.04801832.34543184 3.53715952 3.53715952 0 0 0-1.5395944 1.54037592 3.70284176 3.70284176 0 0 0-.34543184 1.04801832 7.33612824 7.33612824 0 0 0-.09769 1.1019432c-.0039076.1680268-.00625216.33683512-.00703368.50564344l-.00078152.60098888v27.01870944l.00078152.6017704c.00078152.16880832.00312608.33761664.0078152.50564344.01015976.3673144.03204232.73775488.09769 1.10116168.06564768.36965896.17427896.71274624.34465032 1.04801832A3.50824328 3.50824328 0 0 0 7.69131286 53.306303c.33527208.17115288.67835936.27900264 1.0472368.34543184.3634068.06486616.73384728.08674872 1.1019432.09690848.16880832.00468912.33683512.00703368.50642496.00703368.20006912.00156304.40091976.00156304.60098888.00156304h48.10411904c.20006912 0 .40091976 0 .60098888-.00156304.16880832-.00078152.33761664-.00312608.50642496-.00703368.3673144-.01015976.73775488-.03204232 1.1019432-.09690848a3.73097648 3.73097648 0 0 0 1.0472368-.34543184 3.50277264 3.50277264 0 0 0 1.54037592-1.54037592c.17115288-.33527208.27900264-.67835936.34465032-1.04801832.06564768-.3634068.08674872-.73384728.09690848-1.10116168.00468912-.16880832.00703368-.33761664.0078152-.50564344.00156304-.20085064.00156304-.40091976.00156304-.6017704V21.4906238c0-.20085064 0-.40091976-.00156304-.6017704a21.75126464 21.75126464 0 0 0-.0078152-.50564344 7.34472496 7.34472496 0 0 0-.09690848-1.1019432 3.70127872 3.70127872 0 0 0-.34465032-1.04801832 3.52152912 3.52152912 0 0 0-1.54037592-1.54037592 3.73097648 3.73097648 0 0 0-1.0472368-.34543184 7.45726384 7.45726384 0 0 0-1.1019432-.09690848c-.16958984-.00468912-.33839816-.00625216-.50642496-.0078152Z"/>
-    <path d="M23.17166102 27.49816804c.54081184-.65569528.90578168-1.5669476.80652864-2.47507384-.78152.03204232-1.72637768.52205536-2.28281992 1.17540608-.5040804.57988784-.94016856 1.5083336-.81981448 2.39848488.86905024.06721072 1.75529392-.44312184 2.29610576-1.09881712zm2.24530696 5.76292848c-.01719344-1.96395976 1.602116-2.90881744 1.67714192-2.95570864-.91359688-1.328584-2.33049264-1.51302272-2.83535456-1.53334224-1.2074484-.11957256-2.35862736.7111832-2.96899448.7111832-.61271168 0-1.5552248-.69242672-2.55869648-.67132568-1.31607968.01875648-2.52978024.76510808-3.20735808 1.94285872-1.3637524 2.37816536-.34621336 5.89031624.98549672 7.81363696.65178768.9417316 1.42705552 1.99990968 2.44850216 1.9616152.98315216-.03829448 1.3520296-.63615728 2.53994-.63615728 1.18556584-.00156304 1.52083792.63459424 2.55635192.61661928 1.05661504-.02266408 1.7271592-.9612696 2.37503928-1.90769032.74478856-1.0902204 1.05348896-2.14918 1.06911936-2.20232336-.02110104-.01406736-2.05774216-.79089824-2.08118776-3.13936584zm12.57934592-5.76371c-.39388608-.37981872-.90187408-.67523328-1.50989664-.87842848-.60255192-.20085064-1.32623944-.30244824-2.15074304-.30244824a14.06736 14.06736 0 0 0-1.58101496.0820596 23.3205568 23.3205568 0 0 0-1.30826448.1836572l-.12738776.02188256V40.411223h1.26059176v-5.81685336c.42436536.07268136.9104708.11097584 1.44659352.11097584.71352776 0 1.38172736-.09143784 1.98662384-.27040592a4.43981512 4.43981512 0 0 0 1.59273776-.83075576 4.01857584 4.01857584 0 0 0 1.06364872-1.38250888c.2579016-.547064.38919696-1.19025496.38919696-1.91394248 0-.59864432-.09456392-1.1371116-.27900264-1.60055296a3.6614212 3.6614212 0 0 0-.78308304-1.20979296zm-1.15821264 5.27369696c-.64709856.54237488-1.56304.81746992-2.72516024.81746992-.31964168 0-.62208992-.01406736-.89952952-.03985752a4.220208 4.220208 0 0 1-.6330312-.10628672V27.5708494c.16646376-.03047928.37278504-.05939552.61505624-.08518568.30713736-.03282384.67679632-.04923576 1.10038016-.04923576a5.2439992 5.2439992 0 0 1 1.44034136.18678328 3.31598936 3.31598936 0 0 1 1.10741384.54237488c.30244824.234456.54003032.5392488.70493104.9065632.16646376.37200352.2500864.81590688.2500864 1.31842424-.00078152 1.0433292-.3243308 1.8443872-.96048808 2.38050992zm9.75493264 6.34750544c-.01406736-.39076-.019538-.78308304-.019538-1.17384304v-3.83804472c0-.45484464-.04610968-.91906752-.13598448-1.38016432a3.50199112 3.50199112 0 0 0-.52205536-1.28481888c-.25633856-.38450784-.61505624-.70180496-1.06364872-.94407616-.44859248-.24148968-1.0316064-.3634068-1.73419288-.3634068-.51267712 0-1.01363144.0664292-1.48645104.19850608a4.7203808 4.7203808 0 0 0-1.39032408.66116592l-.10237912.07111832.4259284.996438.15395944-.10394216a4.12017344 4.12017344 0 0 1 1.09100192-.51892928 4.07797136 4.07797136 0 0 1 1.20901144-.18600176c.52518144 0 .94485768.09534544 1.24417984.28291024.30401128.18990936.53299664.42514688.68070392.70024192.15395944.28369176.25477552.58535848.29932216.898748.04767272.32589384.0703368.6174008.0703368.8674872v.11097584c-1.86861432-.00859672-3.32771216.30244824-4.29679696.92688272-1.01675752.65491376-1.53256072 1.58726712-1.53256072 2.7704884 0 .34074272.06095856.68383.18131264 1.02300968.12191712.34308728.30713736.65022464.54940856.91281536.24383424.2657168.5587868.48219784.93547944.64397248.3751296.16333768.8166884.24539728 1.30982752.24539728a3.66767336 3.66767336 0 0 0 1.98037168-.54159336c.25946464-.1602116.49001304-.34230576.68695608-.53846728a3.8997848 3.8997848 0 0 0 .23992664-.26415376h.04845424l.11566496 1.12069968h1.2152636l-.03360536-.1797496a7.73548496 7.73548496 0 0 1-.11957256-1.113666zm-1.28012976-1.96630432c0 .13442144-.03204232.31886016-.09300088.54003032a2.7587656 2.7587656 0 0 1-.33917968.67445176 2.58995728 2.58995728 0 0 1-1.31998728.996438 3.08387792 3.08387792 0 0 1-1.01050536.15395944 2.0006912 2.0006912 0 0 1-.664292-.1133204 1.60289752 1.60289752 0 0 1-.5587868-.33449056 1.6646376 1.6646376 0 0 1-.39232304-.56816504c-.09925304-.22898536-.14927032-.51267712-.14927032-.84247856 0-.54003032.14536272-.97846304.43061752-1.29888624a2.8291024 2.8291024 0 0 1 1.12382576-.761982 5.76527304 5.76527304 0 0 1 1.51849336-.34621336 13.83212248 13.83212248 0 0 1 1.45440872-.06330312zm9.8354292-6.79375336-2.3523752 6.39517816c-.14692576.38607088-.28369176.77526784-.40873496 1.15430504-.06095856.18912784-.11879104.36809592-.175842.53846728h-.04454664a47.5515844 47.5515844 0 0 0-.1797496-.5587868c-.12191712-.3751296-.25321248-.74322552-.38763392-1.094128l-2.51571288-6.43503568h-1.34499592l3.5988996 9.25163376c.09456392.2227332.10863128.32511232.10863128.36653288 0 .01250432-.00468912.08831176-.11019432.36965896a6.7093492 6.7093492 0 0 1-.76354504 1.41924032c-.28838088.39232304-.55253464.7111832-.78777216.94642072-.273532.273532-.55566072.49782824-.84247856.66741808-.29307.17271592-.56034984.312608-.7971504.4181132l-.13598448.06095856.43843272 1.06521176.13911056-.05158032c.11410192-.0429836.3282384-.1406736.65335072-.29932216.3282384-.16177464.6916452-.4181132 1.07927912-.76510808a5.58239736 5.58239736 0 0 0 .90812624-1.02300968c.2657168-.38138176.5314336-.82919272.79246128-1.32623944.2579016-.4962652.5158032-1.06052264.76745264-1.67870496.25164944-.6213084.52205536-1.31607968.801058-2.06243128l2.90647288-7.35879232z"/>
-</svg>
\ No newline at end of file
+<svg viewBox="0 0 40 27" xmlns="http://www.w3.org/2000/svg"><g fill="none" transform="translate(.003122 .687332)"><path d="m36.4229471.01124859h-32.84589423c-.13498313 0-.26996626 0-.40494938 0-.11248594 0-.22497188 0-.34870641 0-.24746907.0112486-.50618673.02249719-.7536558.06749157-.24746906.04499437-.49493813.12373453-.71991001.23622047-.44994376.22497188-.82114735.59617548-1.04611923 1.04611924-.11248594.22497187-.1912261.46119235-.23622048.71991001-.04499437.24746906-.05624297.50618672-.06749156.75365579v.34870641.40494938 18.44769404.416198.3487064c.01124859.2474691.02249719.5061867.06749156.7536558.04499438.247469.12373454.4949381.23622048.71991s.25871766.4274466.43869516.6074241.38245219.3262092.60742407.4386951c.22497188.112486.46119235.1912261.71991001.2362205.24746907.0449944.50618673.056243.7536558.0674916h.34870641.40494938 32.84589423.4049494.3487064c.2474691-.0112486.5061868-.0224972.7536558-.0674916.2474691-.0449944.4949382-.1237345.71991-.2362205.4499438-.2362204.8211474-.5961755 1.0461193-1.0461192.1124859-.2249719.1912261-.4611924.2362204-.71991.0449944-.2474691.056243-.5061867.0674916-.7536558 0-.112486 0-.2249719 0-.3487064 0-.1349832 0-.2699663 0-.416198v-18.44769404c0-.13498312 0-.26996625 0-.41619797 0-.11248594 0-.22497188 0-.34870641-.0112486-.24746907-.0224972-.50618673-.0674916-.7536558-.0449943-.24746906-.1237345-.49493813-.2362204-.71991001-.2249719-.44994376-.5961755-.82114735-1.0461193-1.04611923-.2249718-.11248594-.4611923-.1912261-.71991-.23622048-.247469-.04499437-.5061867-.05624297-.7536558-.06749156-.1124859 0-.2249719 0-.3487064 0-.1349831.01124859-.2699662.01124859-.4049494.01124859z" fill="#010202"/><path d="m36.4229471.86614173h.4049494.3262092c.1912261 0 .416198.0112486.6299213.05624297.1799775.03374578.3374578.07874016.4836895.15748032.2924635.14623172.5286839.38245219.6749157.67491563.0787401.14623172.1237345.29246344.1574803.48368954.0337458.20247469.0449944.42744657.056243.61867267v.32620922.40494938 18.44769404.4049494.3262092c0 .1912261-.0112486.416198-.056243.6299213-.0224972.1687289-.0787402.3262092-.1574803.4724409-.1462318.2924635-.3824522.5286839-.6749157.6749156-.1462317.0787402-.2924634.1237346-.4724409.1574804-.2137233.0337457-.4499438.0449943-.6186727.0562429-.1124859 0-.2249719 0-.3374578 0-.1349831 0-.2699662 0-.4049494 0h-32.84589424c-.13498312 0-.26996625 0-.40494938 0-.11248594 0-.21372328 0-.32620922 0-.17997751 0-.41619798-.0112486-.62992126-.0562429-.16872891-.0224972-.32620923-.0787402-.48368954-.1574804-.14623172-.0787401-.28121485-.1687289-.39370079-.2812148s-.21372328-.2474691-.28121485-.3937008c-.07874015-.1462317-.12373453-.3149606-.15748031-.4836895-.03374578-.2137233-.04499438-.4274466-.05624297-.6186727 0-.1124859 0-.2137233 0-.3262092v-.3262092-18.6051744-.31496063c0-.11248593 0-.21372328 0-.32620922 0-.1912261.01124859-.41619797.05624297-.62992126.02249719-.16872891.07874016-.32620922.15748031-.48368954.07874016-.14623172.16872891-.28121485.28121485-.39370078.11248594-.11248594.24746907-.21372329.39370079-.28121485.14623172-.07874016.31496063-.12373454.48368954-.15748032.21372328-.03374578.43869516-.04499437.62992126-.05624297h.32620922.40494938z" fill="#fff"/><g fill="#010202"><g transform="translate(5.077255 7.086614)"><path d="m5.44018066 1.57480315c.33745782-.42744657.57367829-.98987627.50618673-1.57480315-.49493814.02249719-1.10236221.32620922-1.45106862.75365579-.31496063.35995501-.59617548.95613049-.51743532 1.51856018.5511811.04499438 1.1136108-.28121485 1.46231721-.69741282"/><path d="m5.93511879 2.37345332c-.80989876-.04499438-1.49606299.46119235-1.87851518.46119235-.3824522 0-.97862767-.43869516-1.61979753-.42744657-.83239595.01124859-1.60854893.48368954-2.0247469 1.23734533-.86614174 1.49606299-.22497188 3.72328459.61867266 4.93813274.41619798.60742407.91113611 1.27109111 1.55230596 1.24859392.61867267-.02249719.85489314-.39370079 1.60854893-.39370079.7536558 0 .96737908.39370079 1.61979753.3824522.67491563-.0112486 1.1023622-.60742407 1.50731159-1.20359955.47244094-.68616423.66366704-1.34983127.67491563-1.39482565-.01124859-.01124859-1.30483689-.50618673-1.31608549-1.99100112-.01124859-1.24859393 1.01237345-1.83352081 1.06861642-1.87851519-.58492688-.85489314-1.49606299-.95613048-1.81102362-.97862767"/></g><g transform="translate(15.691789 7.772778)"><path d="m3.39707537 0c1.75478065 0 2.98087739 1.21484814 2.98087739 2.98087739 0 1.77727784-1.24859393 2.99212598-3.02587177 2.99212598h-1.94600675v3.09336333h-1.40607424v-9.0663667zm-1.99100113 4.79190101h1.61979753c1.22609673 0 1.92350956-.66366704 1.92350956-1.79977503 0-1.14735658-.69741283-1.79977502-1.91226097-1.79977502h-1.61979753c-.01124859 0-.01124859 3.59955005-.01124859 3.59955005z"/><path d="m6.72665917 7.18785152c0-1.15860518.88863892-1.83352081 2.51968504-1.92350956l1.75478069-.10123735v-.50618672c0-.73115861-.4836896-1.13610799-1.34983131-1.13610799-.70866142 0-1.22609674.359955-1.32733408.9223847h-1.27109112c.03374578-1.16985377 1.14735658-2.02474691 2.64341957-2.02474691 1.60854894 0 2.65466814.84364455 2.65466814 2.14848144v4.51068617h-1.3048369v-1.09111361h-.0337457c-.3712036.70866141-1.192351 1.15860517-2.06974133 1.15860517-1.30483689-.01124859-2.215973-.78740157-2.215973-1.95725534zm4.27446573-.58492689v-.50618672l-1.5635546.10123734c-.87739032.05624297-1.33858267.3824522-1.33858267.95613049 0 .5511811.47244094.9111361 1.22609673.9111361.95613044 0 1.67604054-.60742407 1.67604054-1.46231721z"/><path d="m13.5433071 11.496063v-1.0911136c.0899887.0112486.303712.0224972.416198.0224972.6186726 0 .9786276-.2587177 1.1923509-.94488192l.1237346-.40494938-2.384702-6.59167604h1.4735658l1.6535434 5.35433071h.0337457l1.6535433-5.35433071h1.4398201l-2.4746907 6.92913386c-.5624297 1.58605178-1.2148481 2.11473568-2.5871766 2.11473568-.1012374 0-.4386952-.0112486-.5399325-.0337458z"/></g></g></g></svg>
\ No newline at end of file
diff --git a/public/assets/bancontact/logo.svg b/public/assets/bancontact/logo.svg
index 99d4989c..1ab4d0f9 100644
--- a/public/assets/bancontact/logo.svg
+++ b/public/assets/bancontact/logo.svg
@@ -1 +1 @@
-<svg id="logo" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 758.35585 567.43933"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#1e3764;}.cls-3{fill:url(#Bancontact_blauw_rgb);}.cls-4{fill:url(#Bancontact_geel_rgb);}</style><linearGradient id="Bancontact_blauw_rgb" x1="178.26969" y1="283.79938" x2="362.50962" y2="215.36753" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#005ab9"/><stop offset="1" stop-color="#1e3764"/></linearGradient><linearGradient id="Bancontact_geel_rgb" x1="394.42829" y1="237.30482" x2="590.05287" y2="170.56231" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fba900"/><stop offset="1" stop-color="#ffd800"/></linearGradient></defs><path id="rounded_white_background" class="cls-1" d="M93.85452,72.75839H664.50134A21.09611,21.09611,0,0,1,685.59745,93.8545V473.58481a21.09613,21.09613,0,0,1-21.09613,21.09613H93.85452A21.09613,21.09613,0,0,1,72.7584,473.58481V93.85452A21.09613,21.09613,0,0,1,93.85452,72.75839Z"/><path id="Bancontact" class="cls-2" d="M127.32817,438.86511V366.10672h22.4512c16.31873,0,26.81678,6.13247,26.81678,18.8133,0,7.17195-3.3261,12.1611-8.00347,15.07131,6.756,3.1179,10.70573,9.14653,10.70573,17.358,0,14.65593-10.70573,21.51583-27.33625,21.51583Zm14.44773-42.51193h10.706c6.5481,0,9.35473-3.22226,9.35473-9.14652,0-6.34068-5.09326-8.41911-11.95341-8.41911H141.7759Zm0,29.83109h8.93884c8.73115,0,13.82415-2.18279,13.82415-9.04268,0-6.75605-4.36531-9.56242-12.57673-9.56242H141.7759Zm65.54053,13.928c-14.24,0-21.412-6.96374-21.412-16.31847,0-10.29036,8.41936-16.319,20.89225-16.42283a65.088,65.088,0,0,1,9.25063.83178v-2.49484c0-6.34016-3.6379-9.35473-10.60189-9.35473a36.46647,36.46647,0,0,0-13.72031,2.49484l-2.59842-11.22547c4.46942-1.87126,11.64136-3.11842,17.98178-3.11842,15.27925,0,22.86683,8.10757,22.86683,22.13941V435.539C225.71385,437.72179,217.71038,440.11227,207.31643,440.11227Zm8.7309-11.74521V417.24543a34.90987,34.90987,0,0,0-7.37964-.83178c-4.78146,0-8.5232,1.87125-8.5232,6.75657,0,4.36557,3.11816,6.6522,8.627,6.6522A16.27158,16.27158,0,0,0,216.04733,428.36706ZM240.074,438.86511V389.0774a63.469,63.469,0,0,1,23.49067-4.57327c15.17515,0,23.90631,7.48348,23.90631,21.30763v33.05335H273.127V406.85123c0-7.17194-3.3261-10.498-9.66652-10.498a21.79963,21.79963,0,0,0-9.14679,1.87126v40.64067Zm97.52356-51.24256L334.895,398.95186a31.66107,31.66107,0,0,0-11.74521-2.59868c-8.4191,0-12.99262,5.92479-12.99262,15.69541,0,10.70573,4.78121,16.21463,13.72031,16.21463a29.42534,29.42534,0,0,0,11.53726-2.70253l2.28663,11.53752a34.98384,34.98384,0,0,1-14.96747,3.01406c-17.2541,0-27.23241-10.70574-27.23241-27.6483,0-16.83821,9.87447-27.95984,26.40114-27.95984A40.06388,40.06388,0,0,1,337.59751,387.62255Zm30.98726,52.48972c-16.00694,0-25.98525-11.12163-25.98525-27.856,0-16.63052,9.97831-27.75215,25.98525-27.75215,16.11078,0,25.88114,11.12163,25.88114,27.75215C394.46591,428.99064,384.69555,440.11227,368.58477,440.11227Zm0-11.84905c7.37988,0,11.22547-6.13248,11.22547-16.00694,0-9.77063-3.84559-15.9031-11.22547-15.9031-7.27579,0-11.32958,6.13247-11.32958,15.9031C357.25519,422.13074,361.309,428.26322,368.58477,428.26322Zm34.18173,10.60189V389.0774a63.469,63.469,0,0,1,23.49067-4.57327c15.17515,0,23.9063,7.48348,23.9063,21.30763v33.05335H435.81959V406.85123c0-7.17194-3.32611-10.498-9.66653-10.498a21.79959,21.79959,0,0,0-9.14678,1.87126v40.64067Zm79.74559,1.24716c-12.36879,0-18.7092-6.75605-18.7092-20.47636V397.185h-7.0681V385.75129h7.0681V374.21377l14.34362-.72742v12.26494H489.684V397.185H478.14651v22.24325c0,6.02863,2.49484,8.835,7.172,8.835a25.20427,25.20427,0,0,0,5.50889-.62358l.72768,11.53752A39.64728,39.64728,0,0,1,482.51209,440.11227Zm36.20489,0c-14.24,0-21.412-6.96374-21.412-16.31847,0-10.29036,8.41937-16.319,20.89226-16.42283a65.08772,65.08772,0,0,1,9.25062.83178v-2.49484c0-6.34016-3.63789-9.35473-10.60189-9.35473a36.46646,36.46646,0,0,0-13.7203,2.49484l-2.59843-11.22547c4.46942-1.87126,11.64137-3.11842,17.98179-3.11842,15.27925,0,22.86683,8.10757,22.86683,22.13941V435.539C537.1144,437.72179,529.11093,440.11227,518.717,440.11227Zm8.73089-11.74521V417.24543a34.91021,34.91021,0,0,0-7.37989-.83178c-4.7812,0-8.52294,1.87125-8.52294,6.75657,0,4.36557,3.11816,6.6522,8.62705,6.6522A16.27073,16.27073,0,0,0,527.44787,428.36706Zm63.00332-40.74451-2.70253,11.32931a31.661,31.661,0,0,0-11.7452-2.59868c-8.41911,0-12.99263,5.92479-12.99263,15.69541,0,10.70573,4.78121,16.21463,13.72031,16.21463a29.4253,29.4253,0,0,0,11.53726-2.70253l2.28689,11.53752a34.98559,34.98559,0,0,1-14.96747,3.01406c-17.25435,0-27.23267-10.70574-27.23267-27.6483,0-16.83821,9.87447-27.95984,26.40089-27.95984A40.06428,40.06428,0,0,1,590.45119,387.62255Zm31.53635,52.48972c-12.36879,0-18.70921-6.75605-18.70921-20.47636V397.185h-7.0681V385.75129h7.0681V374.21377l14.34363-.72742v12.26494h11.53752V397.185H617.622v22.24325c0,6.02863,2.49484,8.835,7.172,8.835a25.20434,25.20434,0,0,0,5.50889-.62358l.72768,11.53752A39.64728,39.64728,0,0,1,621.98754,440.11227Z"/><path id="blue-symbol" class="cls-3" d="M227.37928,329.72767c75.9,0,113.85-50.60015,151.80005-101.2003H127.32817v101.2003Z"/><path id="yellow-symbol" class="cls-4" d="M530.97937,127.32707c-75.9,0-113.85,50.60015-151.8,101.2003H631.03048V127.32707Z"/></svg>
+<svg fill="none" viewBox="0 0 42 26" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="416.071" x2="1766.43" y1="427.26" y2="-74.3006"><stop offset="0" stop-color="#005ab9"/><stop offset="1" stop-color="#1e3764"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="145.412" x2="1601.92" y1="491.069" y2="-5.85735"><stop offset="0" stop-color="#fba900"/><stop offset="1" stop-color="#ffd800"/></linearGradient><path d="m.452209 25.4324v-5.9362h1.831741c1.3314 0 2.18791.5003 2.18791 1.5349 0 .5852-.27137.9922-.65298 1.2297.5512.2544.87345.7462.87345 1.4162 0 1.1957-.87345 1.7554-2.23029 1.7554zm1.178751-3.4685h.87348c.53424 0 .76323-.2628.76323-.7462 0-.5173-.41555-.6869-.97525-.6869h-.66146zm0 2.4339h.7293c.71235 0 1.12788-.1781 1.12788-.7378 0-.5512-.35616-.7802-1.0261-.7802h-.83108zm5.34729 1.1363c-1.1618 0-1.74695-.5681-1.74695-1.3313 0-.8396.68691-1.3315 1.70455-1.3399.25287.0046.50509.0273.75473.0678v-.2035c0-.5173-.29681-.7633-.86498-.7633-.38276-.0047-.76284.0644-1.11941.2036l-.21199-.9159c.36464-.1526.94978-.2544 1.46708-.2544 1.2466 0 1.86565.6615 1.86565 1.8063v2.3575c-.34768.1781-1.00066.3731-1.84868.3731zm.71233-.9582v-.9074c-.19771-.044-.39955-.0667-.60208-.0679-.39011 0-.69539.1527-.69539.5513 0 .3562.2544.5427.70386.5427.20437.0067.40753-.0339.59361-.1187zm1.96028.8565v-4.0621c.60944-.2447 1.25984-.3714 1.91654-.3731 1.2381 0 1.9505.6106 1.9505 1.7385v2.6967h-1.1703v-2.6119c0-.5852-.2714-.8565-.7887-.8565-.2569-.0036-.5115.0484-.7463.1526v3.3158zm7.95674-4.1808-.2205.9244c-.303-.1313-.6283-.2033-.9583-.2121-.6869 0-1.06.4834-1.06 1.2806 0 .8735.3901 1.3229 1.1194 1.3229.3254-.0089.6457-.0839.9413-.2205l.1865.9413c-.384.1709-.8009.2549-1.2211.2459-1.4077 0-2.2219-.8734-2.2219-2.2557 0-1.3738.8057-2.2812 2.1541-2.2812.4396-.0021.8751.0844 1.2805.2544zm2.5281 4.2825c-1.3059 0-2.12-.9073-2.12-2.2727 0-1.3568.8141-2.2642 2.12-2.2642 1.3145 0 2.1116.9074 2.1116 2.2642 0 1.3654-.7971 2.2727-2.1116 2.2727zm0-.9667c.6021 0 .9159-.5003.9159-1.306 0-.7971-.3138-1.2975-.9159-1.2975-.5936 0-.9243.5004-.9243 1.2975 0 .8057.3307 1.306.9243 1.306zm2.7888.865v-4.0621c.6094-.2447 1.2599-.3714 1.9166-.3731 1.2381 0 1.9504.6106 1.9504 1.7385v2.6967h-1.1702v-2.6119c0-.5852-.2714-.8565-.7887-.8565-.2569-.0036-.5115.0484-.7463.1526v3.3158zm6.5063.1017c-1.0092 0-1.5265-.5512-1.5265-1.6706v-1.8317h-.5766v-.9328h.5766v-.9414l1.1703-.0593v1.0007h.9413v.9328h-.9413v1.8148c0 .4918.2035.7208.5851.7208.1513-.0004.302-.0174.4495-.0509l.0594.9414c-.2422.0536-.4898.0792-.7378.0762zm2.9538 0c-1.1618 0-1.7469-.5681-1.7469-1.3313 0-.8396.6869-1.3315 1.7045-1.3399.2529.0046.5051.0273.7548.0678v-.2035c0-.5173-.2968-.7633-.865-.7633-.3828-.0047-.7628.0644-1.1194.2036l-.212-.9159c.3646-.1526.9498-.2544 1.4671-.2544 1.2466 0 1.8656.6615 1.8656 1.8063v2.3575c-.3477.1781-1.0006.3731-1.8487.3731zm.7124-.9582v-.9074c-.1977-.044-.3996-.0667-.6021-.0679-.3901 0-.6954.1527-.6954.5513 0 .3562.2544.5427.7039.5427.2043.0067.4075-.0339.5936-.1187zm5.1403-3.3243-.2205.9244c-.303-.1313-.6283-.2033-.9583-.2121-.6869 0-1.06.4834-1.06 1.2806 0 .8735.3901 1.3229 1.1194 1.3229.3254-.0089.6457-.0839.9413-.2205l.1866.9413c-.384.1709-.801.2549-1.2212.2459-1.4077 0-2.2219-.8734-2.2219-2.2557 0-1.3738.8057-2.2812 2.154-2.2812.4396-.0021.8752.0844 1.2806.2544zm2.5729 4.2825c-1.0091 0-1.5264-.5512-1.5264-1.6706v-1.8317h-.5767v-.9328h.5767v-.9414l1.1703-.0593v1.0007h.9413v.9328h-.9413v1.8148c0 .4918.2035.7208.5851.7208.1512-.0004.302-.0174.4495-.0509l.0593.9414c-.2422.0536-.4897.0792-.7378.0762z" fill="#1e3764"/><path d="m8.61513 16.5281c6.19247 0 9.28877-4.1283 12.38497-8.25665h-20.547891v8.25665z" fill="url(#a)"/><path d="m33.3851.0147705c-6.1925 0-9.2887 4.1283395-12.385 8.2566795h20.5479v-8.2566795z" fill="url(#b)"/></svg>
\ No newline at end of file
diff --git a/ruleset/phpstan-baseline.neon b/ruleset/phpstan-baseline.neon
index 2ed4e7ab..1d16fed3 100644
--- a/ruleset/phpstan-baseline.neon
+++ b/ruleset/phpstan-baseline.neon
@@ -1156,12 +1156,6 @@ parameters:
 			count: 1
 			path: ../src/Provider/AbstractSupportedRefundPaymentMethodsProvider.php
 
-		-
-			message: '#^Cannot cast mixed to int\.$#'
-			identifier: cast.int
-			count: 1
-			path: ../src/Provider/ApplePayOrderProvider.php
-
 		-
 			message: '#^Cannot access offset ''max_amounts'' on mixed\.$#'
 			identifier: offsetAccess.nonOffsetAccessible
diff --git a/src/Checker/ApplePayChecker.php b/src/Checker/ApplePayChecker.php
deleted file mode 100644
index f3e681b1..00000000
--- a/src/Checker/ApplePayChecker.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace PayPlug\SyliusPayPlugPlugin\Checker;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
-
-final class ApplePayChecker implements ApplePayCheckerInterface
-{
-    public function __construct(private RequestStack $requestStack)
-    {
-    }
-
-    public function isDeviceReady(): bool
-    {
-        $mainRequest = $this->requestStack->getMainRequest();
-        if (!$mainRequest instanceof Request) {
-            return false;
-        }
-
-        $userAgent = $mainRequest->headers->get('User-Agent');
-
-        if (!is_string($userAgent)) {
-            return false;
-        }
-
-        $browsers = ['Opera', 'Edg', 'Chrome', 'Firefox', 'MSIE', 'Trident'];
-
-        foreach ($browsers as $browser) {
-            if (str_contains($userAgent, $browser)) {
-                return false;
-            }
-        }
-
-        preg_match('/iPhone|Android|iPad|iPod|webOS|Mac/', $userAgent, $matches);
-        $os = current($matches);
-
-        return \is_string($os);
-    }
-}
diff --git a/src/Checker/ApplePayCheckerInterface.php b/src/Checker/ApplePayCheckerInterface.php
deleted file mode 100644
index 531d576b..00000000
--- a/src/Checker/ApplePayCheckerInterface.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace PayPlug\SyliusPayPlugPlugin\Checker;
-
-interface ApplePayCheckerInterface
-{
-    public function isDeviceReady(): bool;
-}
diff --git a/src/Controller/OrderController.php b/src/Controller/OrderController.php
index 8cb7afe1..7c70250e 100644
--- a/src/Controller/OrderController.php
+++ b/src/Controller/OrderController.php
@@ -18,6 +18,7 @@
 use Sylius\Component\Resource\Exception\UpdateHandlingException;
 use Sylius\Component\Resource\ResourceActions;
 use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Attribute\AsController;
@@ -32,33 +33,26 @@
 final class OrderController extends BaseOrderController
 {
     private const APPLE_ERROR_RESPONSE_CODE = 0;
-
     private const APPLE_SUCCESS_RESPONSE_CODE = 1;
 
-    #[Required] // @phpstan-ignore-next-line - Symfony write this attribute
-    private StateMachineInterface $stateMachineAbstraction;
+    #[Required]
+    public StateMachineInterface $stateMachineAbstraction;
 
-    #[Required] // @phpstan-ignore-next-line - Symfony write this attribute
-    private ApplePayPaymentProvider $applePayPaymentProvider;
+    #[Required]
+    public ApplePayPaymentProvider $applePayPaymentProvider;
 
-    #[Required] // @phpstan-ignore-next-line - Symfony write this attribute
-    private LockFactory $lockFactory;
+    #[Required]
+    public LockFactory $lockFactory;
 
-    #[Required] // @phpstan-ignore-next-line - Symfony write this attribute
-    private LoggerInterface $logger;
+    #[Required]
+    public LoggerInterface $logger;
 
     #[Route(
-        path: '/payplug/apple-pay/prepare/{orderId}',
+        path: '/payplug/apple-pay/prepare/{id}',
         name: 'payplug_shop_checkout_apple_prepare',
         options: [
             '_sylius' => [
                 'flash' => false,
-                'repository' => [
-                    'method' => 'find',
-                    'arguments' => [
-                        'expr:service("PayPlug\\SyliusPayPlugPlugin\\Provider\\ApplePayOrderProvider").getCurrentCart()',
-                    ],
-                ],
             ],
         ],
         methods: ['GET', 'POST'],
@@ -101,7 +95,6 @@ public function initiateApplePaySessionAction(Request $request): Response
             }
 
             $initializeEvent = $this->eventDispatcher->dispatchInitializeEvent(ResourceActions::UPDATE, $configuration, $resource);
-
             $initializeEventResponse = $initializeEvent->getResponse();
 
             if ($initializeEventResponse instanceof \Symfony\Component\HttpFoundation\Response) {
@@ -114,6 +107,7 @@ public function initiateApplePaySessionAction(Request $request): Response
 
             $payment = $this->applePayPaymentProvider->provide($request, $resource);
 
+            $this->logger->info('[Payplug] ApplePay payment', ['payment' => $payment, 'details' => $payment->getDetails()]);
             $this->manager->flush();
 
             return new JsonResponse([
@@ -132,6 +126,7 @@ public function initiateApplePaySessionAction(Request $request): Response
         } catch (\Exception) {
             try {
                 $this->applePayPaymentProvider->cancel($resource);
+                $this->manager->flush();
             } catch (\Throwable $throwable) {
                 $this->logger->error('Could not cancel ApplePay payment', [
                     'order_id' => $resource->getId(),
@@ -143,7 +138,7 @@ public function initiateApplePaySessionAction(Request $request): Response
 
             $request->getSession()->getFlashBag()->add('error', 'sylius.payment.cancelled');
             $dataResponse = [];
-            $redirect = $this->redirectToRoute('sylius_shop_checkout_select_payment');
+            $redirect = $this->getApplePayNextRoute($resource);
             $dataResponse['returnUrl'] = $redirect->getTargetUrl();
             $dataResponse['responseToApple'] = ['status' => self::APPLE_ERROR_RESPONSE_CODE];
 
@@ -157,17 +152,11 @@ public function initiateApplePaySessionAction(Request $request): Response
     }
 
     #[Route(
-        path: '/payplug/apple-pay/complete/{orderId}',
+        path: '/payplug/apple-pay/complete/{id}',
         name: 'payplug_shop_checkout_apple_confirm',
         options: [
             '_sylius' => [
                 'flash' => false,
-                'repository' => [
-                    'method' => 'find',
-                    'arguments' => [
-                        'expr:service("PayPlug\\SyliusPayPlugPlugin\\Provider\\ApplePayOrderProvider").getCurrentCart()',
-                    ],
-                ],
             ],
         ],
         methods: ['GET', 'POST'],
@@ -175,60 +164,51 @@ public function initiateApplePaySessionAction(Request $request): Response
     public function confirmApplePayPaymentAction(Request $request): Response
     {
         $configuration = $this->requestConfigurationFactory->create($this->metadata, $request);
-
         $this->isGrantedOr403($configuration, ResourceActions::UPDATE);
 
-        /** @var OrderInterface $resource */
-        $resource = $this->findOr404($configuration);
-
+        /** @var OrderInterface $order */
+        $order = $this->findOr404($configuration);
         /** @var ResourceControllerEvent $event */
-        $event = $this->eventDispatcher->dispatchPreEvent(ResourceActions::UPDATE, $configuration, $resource);
-
+        $event = $this->eventDispatcher->dispatchPreEvent(ResourceActions::UPDATE, $configuration, $order);
         if ($event->isStopped() && !$configuration->isHtmlRequest()) {
             throw new HttpException($event->getErrorCode(), $event->getMessage());
         }
-
         if ($event->isStopped()) {
             $eventResponse = $event->getResponse();
             if (null !== $eventResponse) {
                 return $eventResponse;
             }
-
             return new JsonResponse([], Response::HTTP_BAD_REQUEST);
         }
 
         try {
-            $lastPayment = $this->applePayPaymentProvider->patch($request, $resource);
-
+            $lastPayment = $this->applePayPaymentProvider->patch($request, $order);
             if (PaymentInterface::STATE_COMPLETED !== $lastPayment->getState()) {
                 throw new PaymentNotCompletedException();
             }
         } catch (\Exception | PaymentNotCompletedException $exception) {
-            try {
-                $this->applePayPaymentProvider->cancel($resource);
-            } catch (\Throwable $throwable) {
-                $this->logger->error('Could not cancel ApplePay payment', [
-                    'order_id' => $resource->getId(),
-                    'code' => $throwable->getCode(),
-                    'message' => $throwable->getMessage(),
-                    'trace' => $throwable->getTraceAsString(),
-                ]);
-            }
-
             $request->getSession()->getFlashBag()->add('error', 'sylius.payment.cancelled');
-            $redirect = $this->redirectToRoute('sylius_shop_checkout_select_payment');
+            $redirect = $this->getApplePayNextRoute($order);
+
             $dataResponse = [];
             $dataResponse['returnUrl'] = $redirect->getTargetUrl();
             $dataResponse['responseToApple'] = ['status' => self::APPLE_ERROR_RESPONSE_CODE];
-            $dataResponse['errors'] = 'Payment not created';
+            $dataResponse['errors'] = 'Payment not completed';
             $dataResponse['message'] = $exception->getMessage();
 
-            return new JsonResponse($dataResponse, Response::HTTP_BAD_REQUEST);
+            $this->logger->error('Could not complete ApplePay payment', ['exception' => $exception, 'data_response' => $dataResponse]);
+
+            $response = [
+                'success' => false,
+                'data' => $dataResponse,
+            ];
+
+            return new JsonResponse($response, Response::HTTP_BAD_REQUEST);
         }
 
         $this->manager->flush();
 
-        $postEvent = $this->eventDispatcher->dispatchPostEvent(ResourceActions::UPDATE, $configuration, $resource);
+        $postEvent = $this->eventDispatcher->dispatchPostEvent(ResourceActions::UPDATE, $configuration, $order);
 
         $postEventResponse = $postEvent->getResponse();
 
@@ -236,17 +216,6 @@ public function confirmApplePayPaymentAction(Request $request): Response
             return $postEventResponse;
         }
 
-        $initializeEvent = $this->eventDispatcher->dispatchInitializeEvent(ResourceActions::UPDATE, $configuration, $resource);
-
-        $initializeEventResponse = $initializeEvent->getResponse();
-
-        if ($initializeEventResponse instanceof \Symfony\Component\HttpFoundation\Response) {
-            return $initializeEventResponse;
-        }
-
-        $order = $lastPayment->getOrder();
-        Assert::isInstanceOf($order, OrderInterface::class);
-
         if ($this->stateMachineAbstraction->can($order, OrderCheckoutTransitions::GRAPH, OrderCheckoutTransitions::TRANSITION_COMPLETE)) {
             $this->stateMachineAbstraction->apply($order, OrderCheckoutTransitions::GRAPH, OrderCheckoutTransitions::TRANSITION_COMPLETE);
         }
@@ -268,17 +237,11 @@ public function confirmApplePayPaymentAction(Request $request): Response
     }
 
     #[Route(
-        path: '/payplug/apple-pay/cancel/{orderId}',
+        path: '/payplug/apple-pay/cancel/{id}',
         name: 'payplug_shop_checkout_apple_cancel',
         options: [
             '_sylius' => [
                 'flash' => false,
-                'repository' => [
-                    'method' => 'find',
-                    'arguments' => [
-                        'expr:service("PayPlug\\SyliusPayPlugPlugin\\Provider\\ApplePayOrderProvider").getCurrentCart()',
-                    ],
-                ],
             ],
         ],
         methods: ['GET', 'POST'],
@@ -291,7 +254,6 @@ public function cancelApplePaySessionAction(Request $request): Response
 
         /** @var OrderInterface $resource */
         $resource = $this->findOr404($configuration);
-
         $lock = $this->lockFactory->createLock('apple_pay_cancel' . $resource->getId());
         $lock->acquire(true);
 
@@ -332,6 +294,7 @@ public function cancelApplePaySessionAction(Request $request): Response
 
             try {
                 $this->applePayPaymentProvider->cancel($resource);
+                $this->manager->flush();
             } catch (\Throwable $throwable) {
                 $this->logger->error('Could not cancel ApplePay payment', [
                     'order_id' => $resource->getId(),
@@ -349,14 +312,7 @@ public function cancelApplePaySessionAction(Request $request): Response
             $request->getSession()->getFlashBag()->add('error', 'sylius.payment.cancelled');
 
             $dataResponse = [];
-            $redirect = $this->redirectToRoute('sylius_shop_checkout_select_payment', ['_locale' => $resource->getLocaleCode()]);
-
-            if (OrderCheckoutStates::STATE_COMPLETED === $resource->getCheckoutState()) {
-                $redirect = $this->redirectToRoute('sylius_shop_order_show', [
-                    'tokenValue' => $resource->getTokenValue(),
-                    '_locale' => $resource->getLocaleCode(),
-                ]);
-            }
+            $redirect = $this->getApplePayNextRoute($resource);
 
             $dataResponse['returnUrl'] = $redirect->getTargetUrl();
             $dataResponse['responseToApple'] = ['status' => self::APPLE_SUCCESS_RESPONSE_CODE];
@@ -390,14 +346,7 @@ public function cancelApplePaySessionAction(Request $request): Response
 
             $dataResponse = [];
 
-            $redirect = $this->redirectToRoute('sylius_shop_checkout_select_payment');
-
-            if (OrderInterface::STATE_NEW === $resource->getState()) {
-                $redirect = $this->redirectToRoute('sylius_shop_order_show', [
-                    'tokenValue' => $resource->getTokenValue(),
-                    '_locale' => $resource->getLocaleCode(),
-                ]);
-            }
+            $redirect = $this->getApplePayNextRoute($resource);
 
             $dataResponse['returnUrl'] = $redirect->getTargetUrl();
             $dataResponse['responseToApple'] = ['status' => self::APPLE_ERROR_RESPONSE_CODE];
@@ -410,4 +359,27 @@ public function cancelApplePaySessionAction(Request $request): Response
             return new JsonResponse($response, Response::HTTP_OK);
         }
     }
+
+    private function getApplePayNextRoute(OrderInterface $resource): RedirectResponse
+    {
+        $redirect = $this->redirectToRoute('sylius_shop_checkout_select_payment', ['_locale' => $resource->getLocaleCode()]);
+
+        if (OrderCheckoutStates::STATE_COMPLETED === $resource->getCheckoutState()) {
+            $redirect = $this->redirectToRoute('sylius_shop_order_show', [
+                'tokenValue' => $resource->getTokenValue(),
+                '_locale' => $resource->getLocaleCode(),
+            ]);
+        }
+
+        if (OrderInterface::STATE_NEW === $resource->getState()) {
+            $redirect = $this->redirectToRoute('sylius_shop_order_show', [
+                'tokenValue' => $resource->getTokenValue(),
+                '_locale' => $resource->getLocaleCode(),
+            ]);
+        }
+
+        $this->logger->debug('[Payplug] Redirect', ['redirect' => $redirect, 'targetUrl' => $redirect->getTargetUrl()]);
+
+        return $redirect;
+    }
 }
diff --git a/src/OrderPay/Provider/NotifyPaymentProvider.php b/src/OrderPay/Provider/NotifyPaymentProvider.php
index eb84a9aa..1f7818c3 100644
--- a/src/OrderPay/Provider/NotifyPaymentProvider.php
+++ b/src/OrderPay/Provider/NotifyPaymentProvider.php
@@ -27,16 +27,16 @@ public function __construct(
 
     public function getPayment(Request $request, PaymentMethodInterface $paymentMethod): PaymentInterface
     {
-        /** @var string|null $orderNumber */
+        /** @var string|int|null $orderNumber */
         $orderNumber = $request->getPayload()->all('metadata')['order_number'] ?? null;
         if (null === $orderNumber) {
             throw new \InvalidArgumentException('Order number not found in request payload');
         }
-        $order = $this->getOrderFromReference($orderNumber);
+        $order = $this->getOrderFromReference((string) $orderNumber);
 
         $payId = $request->getPayload()->getString('id');
         $payment = $order->getPayments()->filter(function (PaymentInterface $payment) use ($payId) {
-            return $payment->getDetails()['payment_id'] === $payId;
+            return $payId === ($payment->getDetails()['payment_id'] ?? null);
         })->first();
         if (false === $payment) {
             throw new \InvalidArgumentException(sprintf('Payment with ID "%s" not found in order "%s"', $payId, $orderNumber));
diff --git a/src/PaymentProcessing/AbortPaymentProcessor.php b/src/PaymentProcessing/AbortPaymentProcessor.php
index e03fceef..a4f85d78 100644
--- a/src/PaymentProcessing/AbortPaymentProcessor.php
+++ b/src/PaymentProcessing/AbortPaymentProcessor.php
@@ -5,11 +5,10 @@
 namespace PayPlug\SyliusPayPlugPlugin\PaymentProcessing;
 
 use Payplug\Exception\HttpException;
-use PayPlug\SyliusPayPlugPlugin\ApiClient\PayPlugApiClientInterface;
+use PayPlug\SyliusPayPlugPlugin\ApiClient\PayPlugApiClientFactory;
 use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Payment\PaymentTransitions;
 use Symfony\Component\DependencyInjection\Attribute\Autoconfigure;
-use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\Workflow\Attribute\AsCompletedListener;
 use Symfony\Component\Workflow\Event\CompletedEvent;
 
@@ -17,8 +16,7 @@
 class AbortPaymentProcessor
 {
     public function __construct(
-        #[Autowire('@payplug_sylius_payplug_plugin.api_client.payplug')]
-        private PayPlugApiClientInterface $payPlugApiClient,
+        private PayPlugApiClientFactory $payplugApiClientFactory,
     ) {
     }
 
@@ -41,12 +39,17 @@ public function process(PaymentInterface $payment): void
             return;
         }
 
+        $method = $payment->getMethod();
+        if (null === $method) {
+            return;
+        }
+        $client = $this->payplugApiClientFactory->createForPaymentMethod($method);
         try {
             // When a payment is failed on Sylius, also abort it on PayPlug.
             // This should prevent the case that if we are already on PayPlug payment page
             // and go to the order history in another tab to click on pay again, then fail the transaction
             // and go back on the first PayPlug payment page and succeed it, it stays failed as its first payment model is already failed
-            $this->payPlugApiClient->abortPayment($paymentId);
+            $client->abortPayment($paymentId);
         } catch (HttpException) {
         }
     }
diff --git a/src/Provider/ApplePayOrderProvider.php b/src/Provider/ApplePayOrderProvider.php
deleted file mode 100644
index abeef1c7..00000000
--- a/src/Provider/ApplePayOrderProvider.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace PayPlug\SyliusPayPlugPlugin\Provider;
-
-use LogicException;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
-
-class ApplePayOrderProvider
-{
-    public function __construct(private RequestStack $requestStack)
-    {
-    }
-
-    public function getCurrentCart(): ?int
-    {
-        $request = $this->requestStack->getCurrentRequest();
-
-        if (!$request instanceof Request) {
-            throw new LogicException();
-        }
-
-        $orderId = $request->attributes->get('orderId');
-
-        if (null === $orderId || '' === $orderId) {
-            throw new LogicException();
-        }
-
-        return (int) $orderId;
-    }
-}
diff --git a/src/Provider/Payment/ApplePayPaymentProvider.php b/src/Provider/Payment/ApplePayPaymentProvider.php
index 022d6084..74f9b93c 100644
--- a/src/Provider/Payment/ApplePayPaymentProvider.php
+++ b/src/Provider/Payment/ApplePayPaymentProvider.php
@@ -15,6 +15,7 @@
 use PayPlug\SyliusPayPlugPlugin\Exception\Payment\PaymentNotCompletedException;
 use PayPlug\SyliusPayPlugPlugin\Gateway\ApplePayGatewayFactory;
 use PayPlug\SyliusPayPlugPlugin\Repository\PaymentMethodRepositoryInterface;
+use Psr\Log\LoggerInterface;
 use Sylius\Abstraction\StateMachine\StateMachineInterface;
 use Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
@@ -31,7 +32,6 @@
 use Sylius\Component\Payment\PaymentTransitions;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Generator\UrlGenerator;
 use Symfony\Component\Routing\RouterInterface;
 use Webmozart\Assert\Assert;
 
@@ -42,11 +42,11 @@ public function __construct(
         private StateMachineInterface $stateMachine,
         private PaymentMethodRepositoryInterface $paymentMethodRepository,
         private PayPlugPaymentDataCreator $paymentDataCreator,
-        #[Autowire('@sylius_payplug_plugin.api_client.apple_pay')]
+        #[Autowire('@payplug_sylius_payplug_plugin.api_client.apple_pay')]
         private PayPlugApiClientInterface $applePayClient,
-        private EntityManagerInterface $entityManager,
         private OrderTokenAssignerInterface $orderTokenAssigner,
         private RouterInterface $router,
+        private LoggerInterface $logger,
     ) {
     }
 
@@ -58,13 +58,6 @@ public function provide(Request $request, OrderInterface $order): PaymentInterfa
             throw new LogicException('Apple Pay is not enabled');
         }
 
-        $state = PaymentInterface::STATE_CART;
-
-        /** @phpstan-ignore-next-line */
-        if ($order->getPayments()->filter(fn (PaymentInterface $payment): bool => PaymentInterface::STATE_FAILED === $payment->getState() || PaymentInterface::STATE_CANCELLED === $payment->getState())->count() > 0) {
-            $state = PaymentInterface::STATE_NEW;
-        }
-
         $payment = $this->initApplePaySyliusPaymentState($order);
 
         Assert::notNull($order->getBillingAddress());
@@ -88,9 +81,11 @@ public function provide(Request $request, OrderInterface $order): PaymentInterfa
         );
 
         $paymentData = $paymentDataObject->getArrayCopy();
-        $paymentData['notification_url'] = $this->router->generate('payplug_sylius_ipn', [], UrlGenerator::ABSOLUTE_URL);
+        $paymentData['notification_url'] = $this->router->generate('sylius_payment_method_notify', ['code' => $payment->getMethod()?->getCode()], RouterInterface::ABSOLUTE_URL);
+        $this->logger->notice('[Payplug] ApplePay payment data', ['data' => $paymentData]);
 
         $paymentResource = $this->applePayClient->createPayment($paymentData);
+        $this->logger->notice('[Payplug] ApplePay payment resource', ['payment' => (array) $paymentResource]);
 
         $details = $paymentData;
         $details['merchant_session'] = $paymentResource->payment_method['merchant_session'];
@@ -102,17 +97,18 @@ public function provide(Request $request, OrderInterface $order): PaymentInterfa
         $this->applyRequiredPaymentTransition($payment, PaymentInterface::STATE_NEW);
         $this->applyRequiredOrderPaymentTransition($order, OrderPaymentStates::STATE_AWAITING_PAYMENT);
         $this->applyRequiredOrderCheckoutTransition($order, OrderCheckoutStates::STATE_COMPLETED);
-
-        $this->entityManager->flush();
+        $this->orderTokenAssigner->assignTokenValueIfNotSet($order);
 
         return $payment;
     }
 
     public function patch(Request $request, OrderInterface $order): PaymentInterface
     {
+        $this->logger->notice('[Payplug] ApplePay payment patch', ['order' => $order]);
         $lastPayment = $order->getLastPayment(PaymentInterface::STATE_NEW);
 
         if (!$lastPayment instanceof PaymentInterface) {
+            $this->logger->error('[Payplug] No new payment found for order', ['order' => $order]);
             throw new LogicException();
         }
 
@@ -126,35 +122,39 @@ public function patch(Request $request, OrderInterface $order): PaymentInterface
         }
 
         $paymentResource = $this->applePayClient->retrieve($lastPayment->getDetails()['payment_id']);
-
+        $this->logger->notice('[Payplug] ApplePay payment resource', ['payment' => (array) $paymentResource]);
         try {
-            $applePay = [];
-            $applePay['payment_token'] = $request->get('token');
+            $token = $request->request->all('token');
+            if ([] === $token) {
+                $token = json_decode($request->getContent(), true)['token'] ?? null; // @phpstan-ignore-line
+            }
+
+            if (null === $token) {
+                throw new \InvalidArgumentException('Missing token in request');
+            }
 
+            $this->logger->notice('[Payplug] ApplePay payment token', ['token' => $token]);
             $data = [
-                ApplePayGatewayFactory::PAYMENT_METHOD_APPLE_PAY => $applePay,
+                'apple_pay' => [
+                    'payment_token' => $token,
+                ],
+                'metadata' => (array) $paymentResource->metadata,
             ];
 
+            $this->logger->notice('[Payplug] ApplePay sending update to Payplug', ['data' => $data]);
             /** @var Payment $response */
-            $response = $paymentResource->update($data);
-            $details = $lastPayment->getDetails();
+            $response = $paymentResource->update($data, $this->applePayClient->getConfiguration());
+            $this->logger->notice('[Payplug] ApplePay updated response from Payplug', ['response' => (array) $response]);
 
             if (!$response->is_paid) {
-                $this->applyRequiredPaymentTransition($lastPayment, PaymentInterface::STATE_FAILED);
-
                 throw new PaymentNotCompletedException();
             }
+            $this->logger->notice('[Payplug] ApplePay payment update response is paid', ['response' => (array) $response]);
 
+            $details = $lastPayment->getDetails();
             $details['status'] = PaymentInterface::STATE_COMPLETED;
             $details['created_at'] = $response->created_at;
 
-            $order = $lastPayment->getOrder();
-            Assert::isInstanceOf($order, OrderInterface::class);
-
-            $this->orderTokenAssigner->assignTokenValueIfNotSet($order);
-
-            $this->entityManager->flush();
-
             $this->applyRequiredPaymentTransition($lastPayment, PaymentInterface::STATE_COMPLETED);
 
             if ($this->isResourceIsAuthorized($response)) {
@@ -164,9 +164,14 @@ public function patch(Request $request, OrderInterface $order): PaymentInterface
             $lastPayment->setDetails($details);
 
             return $lastPayment;
-        } catch (\Exception) {
-            $paymentResource->abort();
+        } catch (\Exception $exception) {
+            $this->logger->error('[Payplug] ApplePay payment update failed', ['exception' => $exception, 'message' => $exception->getMessage()]);
             $this->applyRequiredPaymentTransition($lastPayment, PaymentInterface::STATE_FAILED);
+            try {
+                $paymentResource->abort($this->applePayClient->getConfiguration());
+            } catch (\Throwable $throwable) {
+                $this->logger->error('[Payplug] ApplePay payment abort failed', ['payment' => $lastPayment, 'exception' => $throwable]);
+            }
 
             throw new PaymentNotCompletedException();
         }
@@ -175,9 +180,10 @@ public function patch(Request $request, OrderInterface $order): PaymentInterface
     public function cancel(OrderInterface $order): void
     {
         $lastPayment = $order->getLastPayment(PaymentInterface::STATE_NEW);
-
         if (!$lastPayment instanceof PaymentInterface) {
-            throw new LogicException();
+            $this->logger->error('[Payplug] No new payment found for order during cancel', ['order' => $order]);
+
+            return;
         }
 
         $paymentMethod = $lastPayment->getMethod();
@@ -190,7 +196,6 @@ public function cancel(OrderInterface $order): void
         }
 
         $this->applyRequiredPaymentTransition($lastPayment, PaymentInterface::STATE_CANCELLED);
-        $this->entityManager->flush();
     }
 
     /**
@@ -205,7 +210,6 @@ private function initApplePaySyliusPaymentState(OrderInterface $order): PaymentI
         $paymentMethod = $this->paymentMethodRepository->findOneByGatewayName(ApplePayGatewayFactory::FACTORY_NAME);
         $payment->setMethod($paymentMethod);
         $order->addPayment($payment);
-        $this->entityManager->flush();
 
         return $payment;
     }
diff --git a/src/Resolver/ApplePayPaymentMethodsResolverDecorator.php b/src/Resolver/ApplePayPaymentMethodsResolverDecorator.php
index a86b6533..1374a5ad 100644
--- a/src/Resolver/ApplePayPaymentMethodsResolverDecorator.php
+++ b/src/Resolver/ApplePayPaymentMethodsResolverDecorator.php
@@ -4,12 +4,9 @@
 
 namespace PayPlug\SyliusPayPlugPlugin\Resolver;
 
-use PayPlug\SyliusPayPlugPlugin\Checker\ApplePayCheckerInterface;
 use PayPlug\SyliusPayPlugPlugin\Gateway\ApplePayGatewayFactory;
 use PayPlug\SyliusPayPlugPlugin\Provider\SupportedMethodsProvider;
-use Sylius\Component\Payment\Model\GatewayConfigInterface;
 use Sylius\Component\Core\Model\Payment;
-use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Payment\Model\PaymentInterface as BasePaymentInterface;
 use Sylius\Component\Payment\Resolver\PaymentMethodsResolverInterface;
 use Symfony\Component\DependencyInjection\Attribute\AsDecorator;
@@ -23,7 +20,6 @@ public function __construct(
         #[AutowireDecorated]
         private PaymentMethodsResolverInterface $decorated,
         private SupportedMethodsProvider $supportedMethodsProvider,
-        private ApplePayCheckerInterface $applePayChecker,
     ) {
     }
 
@@ -32,21 +28,6 @@ public function getSupportedMethods(BasePaymentInterface $subject): array
         Assert::isInstanceOf($subject, Payment::class);
         $supportedMethods = $this->decorated->getSupportedMethods($subject);
 
-        foreach ($supportedMethods as $key => $paymentMethod) {
-            Assert::isInstanceOf($paymentMethod, PaymentMethodInterface::class);
-
-            /** @var GatewayConfigInterface $gatewayConfig */
-            $gatewayConfig = $paymentMethod->getGatewayConfig();
-
-            if (ApplePayGatewayFactory::FACTORY_NAME !== $gatewayConfig->getFactoryName()) {
-                continue;
-            }
-
-            if (!$this->applePayChecker->isDeviceReady()) {
-                unset($supportedMethods[$key]);
-            }
-        }
-
         return $this->supportedMethodsProvider->provide(
             $supportedMethods,
             ApplePayGatewayFactory::FACTORY_NAME,
diff --git a/templates/form/sylius_checkout_select_payment_row.html.twig b/templates/form/sylius_checkout_select_payment_row.html.twig
index f6b2ae7b..6c27adff 100644
--- a/templates/form/sylius_checkout_select_payment_row.html.twig
+++ b/templates/form/sylius_checkout_select_payment_row.html.twig
@@ -78,6 +78,10 @@
                            id="payplug_choice_card_{{ card.id }}"
                            name="{{ form.vars.full_name }}"
                            class="payplug-payment-choice__input payment-choice__input"
+                           {{
+                                stimulus_action('@payplug/sylius-payplug-plugin/checkout-select-payment', 'enableNextStepButton', 'change') |
+                                stimulus_action('@payplug/sylius-payplug-plugin/integrated-payment', 'handleHide', 'change')
+                           }}
                         {% if form.vars.value is not empty %}
                             {{ form.vars.value == card.id ? 'checked="checked"' : '' }}
                         {% elseif loop.index is same as(1) %}
@@ -99,6 +103,7 @@
                    id="payplug_choice_card_other"
                    name="{{ form.vars.full_name }}"
                    class="payplug-payment-choice__input payment-choice__input"
+                   {{ stimulus_action('@payplug/sylius-payplug-plugin/integrated-payment', 'handleShow', 'change') }}
                 {% if form.vars.value is not empty %}
                     {{ form.vars.value == 'other' ? 'checked="checked"' : '' }}
                 {% elseif sylius.customer.cards is empty %}
diff --git a/templates/shop/integrated/index.html.twig b/templates/shop/integrated/index.html.twig
index 1329c28e..61a4b1d2 100644
--- a/templates/shop/integrated/index.html.twig
+++ b/templates/shop/integrated/index.html.twig
@@ -25,7 +25,8 @@
 </script>
 <div
     class="payplugIntegratedPayment"
-    {{ stimulus_controller('@payplug/sylius-payplug-plugin/integrated-payment') }}
+    {{ stimulus_target('@payplug/sylius-payplug-plugin/integrated-payment', 'container') }}
+    data-payment-inline-submit="{{ hasSavedCards is not same as true ? 'true' : 'false' }}"
 >
     <div class="sylius-shop-loader d-none">
         <img src="{{ asset('build/shop/images/loader.gif', 'shop') }}" alt="{{ 'sylius.ui.loading'|trans }}" loading="lazy"/>
diff --git a/templates/shop/select_payment/_apple_pay.html.twig b/templates/shop/select_payment/_apple_pay.html.twig
index 3ae26542..fd8a56d2 100644
--- a/templates/shop/select_payment/_apple_pay.html.twig
+++ b/templates/shop/select_payment/_apple_pay.html.twig
@@ -1,55 +1,39 @@
 {% set form = hookable_metadata.context.form %}
 {% set method = hookable_metadata.context.method %}
 {% set order = hookable_metadata.context.order %}
-{% set factoryName = method.gatewayConfig.factoryName %}
-{% set code = method.code %}
 
-{% set applePayFactoryName = constant('PayPlug\\SyliusPayPlugPlugin\\Gateway\\ApplePayGatewayFactory::FACTORY_NAME') %}
-{% set checkboxClass = 'checkbox-applepay' %}
+{% set applePaySettings = {
+    'countryCode': sylius.channel.defaultLocale.code|length == 2 ? sylius.channel.defaultLocale.code : sylius.channel.defaultLocale.code|slice(3, 2),
+    'currencyCode': sylius.channel.baseCurrency.code,
+    'merchantCapabilities': ['supports3DS'],
+    'supportedNetworks': ['cartesBancaires', 'visa', 'masterCard'],
+    'total': {
+        'label': sylius.channel.name,
+        'type': 'final',
+        'amount': (order is not null ? order.total / 100 : 0)
+    },
+    'applePayDomain': sylius.channel.hostname
+} %}
 
 <div
-    class="content"
-    {{ stimulus_controller('@payplug/sylius-payplug-plugin/apple-pay') }}
+    {{ stimulus_controller('@payplug/sylius-payplug-plugin/apple-pay', {
+        'paymentInputId': form.vars.id,
+        'settings': applePaySettings,
+        'notice': 'payplug_sylius_payplug_plugin.ui.apple_pay_not_available'|trans
+    })|stimulus_controller('@payplug/sylius-payplug-plugin/payment-logo', {
+        'inputId': form.vars.id,
+        'logoUrl': asset('bundles/payplugsyliuspayplugplugin/assets/apple-pay/logo.svg'),
+        'className': 'apple-pay-label'
+    }) }}
+    data-payment-inline-submit="true"
 >
-    <a class="header">
-        <div class="apple-pay-method">
-            <label for="{{ form.vars.id }}" data-test-payment-method-label="" data-gateway="apple-pay">{{ form.vars.label }}
-                <img src="{{ asset('bundles/payplugsyliuspayplugplugin/assets/apple-pay/logo.svg') }}" class="apple-pay-logo" alt="Apple Pay" height="45" width="60" />
-            </label>
-        </div>
-    </a>
-
-    <script src="https://applepay.cdn-apple.com/jsapi/v1/apple-pay-sdk.js"></script>
-    <script>
-      /* <![CDATA[ */
-        const applePaySessionRequestSettings = {
-            "countryCode": "{% if sylius.channel.defaultLocale.code|length == 2 %}{{ sylius.channel.defaultLocale.code }}{% else %}{{ sylius.channel.defaultLocale.code|slice(3, 2) }}{% endif %}",
-            "currencyCode": "{{ sylius.channel.baseCurrency.code }}",
-            "merchantCapabilities": [
-                "supports3DS"
-            ],
-            "supportedNetworks": [
-                "visa",
-                "mastercard"
-            ],
-            "total": {
-                "label": "",
-                "type": "final",
-                "amount": {{ order.total / 100 }}
-            },
-            'applicationData': btoa(JSON.stringify({
-                'apple_pay_domain': "{{ sylius.channel.hostname }}"
-            }))
-        };
-      /* ]] */
-    </script>
+    <script src="https://applepay.cdn-apple.com/jsapi/1.latest/apple-pay-sdk.js"></script>
     <apple-pay-button id="payplug-applepay-btn"
                       buttonstyle="black"
                       type="pay"
                       locale="{{ app.request.locale }}"
-                      data-validate-merchant-route="{{ path('payplug_shop_checkout_apple_prepare', {'orderId': order.id}) }}"
-                      data-payment-authorized-route="{{ path('payplug_shop_checkout_apple_confirm', {'orderId': order.id}) }}"
-                      data-session-cancel-route="{{ path('payplug_shop_checkout_apple_cancel', {'orderId': order.id}) }}"
+                      data-validate-merchant-route="{{ path('payplug_shop_checkout_apple_prepare', {'id': order.id}) }}"
+                      data-payment-authorized-route="{{ path('payplug_shop_checkout_apple_confirm', {'id': order.id}) }}"
+                      data-session-cancel-route="{{ path('payplug_shop_checkout_apple_cancel', {'id': order.id}) }}"
     ></apple-pay-button>
 </div>
-
diff --git a/templates/shop/select_payment/_oney.html.twig b/templates/shop/select_payment/_oney.html.twig
index fc5d2cd8..97ae38c5 100644
--- a/templates/shop/select_payment/_oney.html.twig
+++ b/templates/shop/select_payment/_oney.html.twig
@@ -22,30 +22,24 @@
     {% set values = values|merge(completeInfoRoute) %}
 {% endif %}
 
+{% set logo_path = 'bundles/payplugsyliuspayplugplugin/assets/oney/3x4x-without-fees.svg' %}
+{% if ((form.parent.parent.oney_payment_choice.vars.choices|last).value|split('oney_')|last) not in constant('PayPlug\\SyliusPayPlugPlugin\\Gateway\\OneyGatewayFactory::ONEY_WITHOUT_FEES_CHOICES') %}
+    {% set logo_path = 'bundles/payplugsyliuspayplugplugin/assets/oney/3x4x.svg' %}
+{% endif %}
 <div
     class="content"
-    {{ stimulus_controller('@payplug/sylius-payplug-plugin/oney-payment', values) }}
+    {{
+        stimulus_controller('@payplug/sylius-payplug-plugin/oney-payment', values)|
+        stimulus_controller('@payplug/sylius-payplug-plugin/payment-logo', {
+            'inputId': form.vars.id,
+            'logoUrl': asset(logo_path),
+            'className': 'oney-label'
+        })
+    }}
 >
-    <a class="header">
-        {% if factoryName == oneyFactoryName %}
-            <label for="{{ form.vars.id }}" data-test-payment-method-label="" data-gateway="oney">
-                {% if ((form.parent.parent.oney_payment_choice.vars.choices|last).value|split('oney_')|last) not in constant('PayPlug\\SyliusPayPlugPlugin\\Gateway\\OneyGatewayFactory::ONEY_WITHOUT_FEES_CHOICES') %}
-                    <img src="{{ asset('bundles/payplugsyliuspayplugplugin/assets/oney/3x4x.svg') }}" class="oney-logo" alt="Oney"/>
-                {% else %}
-                    <img src="{{ asset('bundles/payplugsyliuspayplugplugin/assets/oney/3x4x-without-fees.svg') }}" class="oney-logo" alt="Oney Sans Frais"/>
-                {% endif %}
-            </label>
-        {% endif %}
-    </a>
-
     {% if showOney %}
-        <div
-            class="payment-method-choice oney-payment-choice"
-            {{ stimulus_target('@payplug/sylius-payplug-plugin/checkout-select-payment', 'trigger') }}
-            data-payment-input-id="{{ form.vars.id }}"
-        >
+        <div class="oney-payment-choice">
             {{ form_row(form.parent.parent.oney_payment_choice) }}
         </div>
     {% endif %}
 </div>
-
diff --git a/templates/shop/select_payment/_payplug.html.twig b/templates/shop/select_payment/_payplug.html.twig
index 98d2b3e1..cb5fa9e5 100644
--- a/templates/shop/select_payment/_payplug.html.twig
+++ b/templates/shop/select_payment/_payplug.html.twig
@@ -21,17 +21,9 @@
     {% set integratedPayment = true %}
 {% endif %}
 
-<div class="content">
-    <a class="header">
-        {{ form_label(form, null, {'label_attr': {'data-test-payment-method-label': '', 'data-gateway': 'payplug'}}) }}
-    </a>
-
+<div class="content" {{ integratedPayment ? stimulus_controller('@payplug/sylius-payplug-plugin/integrated-payment', {'code': method.code}) : '' }}>
     {% if hasSavedCards %}
-        <div
-            class="payment-method-choice payplug-payment-choice"
-            {{ stimulus_target('@payplug/sylius-payplug-plugin/checkout-select-payment', 'trigger') }}
-            data-payment-input-id="{{ form.vars.id }}"
-        >
+        <div class="payplug-payment-choice">
             {{ form_row(form.parent.parent.payplug_card_choice) }}
         </div>
     {% endif %}
@@ -41,6 +33,7 @@
             'paymentMethod': method,
             'payment': order.getLastPayment('cart'),
             'hasSavedCards': hasSavedCards,
+            'paymentInputId': form.vars.id,
         } %}
     {% endif %}
 </div>
diff --git a/templates/shop/select_payment/choice.html.twig b/templates/shop/select_payment/choice.html.twig
index dbda00d3..9e39f4f6 100644
--- a/templates/shop/select_payment/choice.html.twig
+++ b/templates/shop/select_payment/choice.html.twig
@@ -3,10 +3,10 @@
 {% set order = hookable_metadata.context.order %}
 {% set factoryName = method.gatewayConfig.factoryName %}
 
-{% set oneyFactoryName = constant('PayPlug\\SyliusPayPlugPlugin\\Gateway\\OneyGatewayFactory::FACTORY_NAME') %}
-{% set payplugFactoryName = constant('PayPlug\\SyliusPayPlugPlugin\\Gateway\\PayplugGatewayFactory::FACTORY_NAME') %}
-{% set bancontactFactoryName = constant('PayPlug\\SyliusPayPlugPlugin\\Gateway\\BancontactGatewayFactory::FACTORY_NAME') %}
-{% set applePayFactoryName = constant('PayPlug\\SyliusPayPlugPlugin\\Gateway\\ApplePayGatewayFactory::FACTORY_NAME') %}
-{% set americanExpressFactoryName = constant('PayPlug\\SyliusPayPlugPlugin\\Gateway\\AmericanExpressGatewayFactory::FACTORY_NAME') %}
-
-{% hook '#' ~ factoryName %}
+<div
+    {{ stimulus_target('@payplug/sylius-payplug-plugin/checkout-select-payment', 'trigger') }}
+    data-payment-input-id="{{ form.vars.id }}"
+    style="display: none"
+>
+    {% hook '#' ~ factoryName %}
+</div>
diff --git a/translations/messages.en.yml b/translations/messages.en.yml
index 53f4ec16..c62ba008 100644
--- a/translations/messages.en.yml
+++ b/translations/messages.en.yml
@@ -26,6 +26,7 @@ payplug_sylius_payplug_plugin:
         bancontact_gateway_label: Bancontact by Payplug
         apple_pay_gateway_label: Apple Pay by Payplug
         american_express_gateway_label: American Express by Payplug
+        apple_pay_not_available: Apple Pay is not available on this browser or device.
         error:
             billing.postcode: The postal code %postalCode% entered for the billing address is invalid
             shipping.postcode: The postal code %postalCode% entered for the delivery address is invalid
diff --git a/translations/messages.fr.yml b/translations/messages.fr.yml
index c024c679..9a9de68e 100644
--- a/translations/messages.fr.yml
+++ b/translations/messages.fr.yml
@@ -26,6 +26,7 @@ payplug_sylius_payplug_plugin:
         bancontact_gateway_label: Bancontact by Payplug
         apple_pay_gateway_label: Apple Pay by Payplug
         american_express_gateway_label: American Express by Payplug
+        apple_pay_not_available: Apple Pay n'est pas disponible sur ce navigateur ou appareil.
         error:
             billing.postcode: Le code postal %postalCode% renseigné pour l'adresse de facturation est invalide
             shipping.postcode: Le code postal %postalCode% renseigné pour l'adresse de livraison est invalide
diff --git a/translations/messages.it.yml b/translations/messages.it.yml
index b703af6a..cc97e1ed 100644
--- a/translations/messages.it.yml
+++ b/translations/messages.it.yml
@@ -26,6 +26,7 @@ payplug_sylius_payplug_plugin:
         bancontact_gateway_label: Bancontact by Payplug
         apple_pay_gateway_label: Apple Pay by Payplug
         american_express_gateway_label: American Express by Payplug
+        apple_pay_not_available: Apple Pay non è disponibile su questo browser o dispositivo.
         error:
             billing.postcode: Il codice postale %postalCode% inserito per l’indirizzo di fatturazione non è valido
             shipping.postcode: Il codice postale %postalCode% inserito per l’indirizzo di consegna non è valido