diff --git a/src/js/constants/selectors-map.ts b/src/js/constants/selectors-map.ts
index 1805bcfc4..06dfaba87 100644
--- a/src/js/constants/selectors-map.ts
+++ b/src/js/constants/selectors-map.ts
@@ -35,12 +35,14 @@ export const listing = {
 
 export const cart = {
   container: '.cart-container',
+  summary: '.cart-summary',
   overview: '.cart-overview',
   discountCode: '.js-discount .js-code',
   discountName: '[name=discount_name]',
   displayPromo: '.display-promo',
   promoCode: '#promo-code',
   deleteLinkAction: 'delete-from-cart',
+  removeVoucherAction: 'remove-voucher',
   productQuantity: '.cart__items .js-quantity-button',
   productItem: '.cart__item',
   removeFromCartLink: '.remove-from-cart',
diff --git a/src/js/pages/cart.ts b/src/js/pages/cart.ts
index e00c066fb..b3217bc7b 100644
--- a/src/js/pages/cart.ts
+++ b/src/js/pages/cart.ts
@@ -9,30 +9,30 @@ import handleCartAction from '../components/UseHandleCartAction';
 
 export default () => {
   const {Theme} = window;
-  const voucherCodes = document.querySelectorAll(Theme.selectors.cart.discountCode);
   const cartContainer = document.querySelector<HTMLElement>(Theme.selectors.cart.container);
+  const cartSummary = document.querySelector<HTMLElement>(Theme.selectors.cart.summary);
 
-  voucherCodes.forEach((voucher) => {
-    voucher.addEventListener('click', (event: Event) => {
-      event.stopPropagation();
+  if (cartSummary) {
+    cartSummary.addEventListener('click', (event: Event) => {
+      const eventTarget = event.target as HTMLElement;
+      const voucherTarget = eventTarget.closest(Theme.selectors.cart.discountCode);
 
-      if (isHTMLElement(event.currentTarget)) {
-        const code = event.currentTarget;
+      if (voucherTarget && isHTMLElement(voucherTarget)) {
         const discountInput = document.querySelector<HTMLInputElement>(Theme.selectors.cart.discountName);
         const promoCode = document.querySelector(Theme.selectors.cart.promoCode);
 
         if (promoCode && discountInput) {
-          const formCollapser = new Collapse(promoCode);
+          const formCollapser = new Collapse(promoCode, {
+            toggle: false,
+          });
 
-          discountInput.value = code.innerText;
+          discountInput.value = voucherTarget.innerText;
           // Show promo code field
           formCollapser.show();
         }
       }
-
-      return false;
     });
-  });
+  }
 
   if (cartContainer) {
     cartContainer.addEventListener('click', (event: Event) => {
diff --git a/templates/checkout/_partials/cart-voucher.tpl b/templates/checkout/_partials/cart-voucher.tpl
index 3d655a952..b405718c8 100644
--- a/templates/checkout/_partials/cart-voucher.tpl
+++ b/templates/checkout/_partials/cart-voucher.tpl
@@ -12,11 +12,15 @@
           <ul class="cart-voucher__list">
             {foreach from=$cart.vouchers.added item=voucher}
               <li class="cart-voucher__item row">
-                <span class="cart-voucher__name col">{$voucher.name}</span>
                 <div class="d-flex align-items-center justify-content-end col">
+                  <span class="cart-voucher__name col">{$voucher.name}</span>
                   <span class="fw-bold">{$voucher.reduction_formatted}</span>
                     {if isset($voucher.code) && $voucher.code !== ''}
-                      <a href="{$voucher.delete_url}" class="ms-2" data-link-action="remove-voucher"><i class="material-icons" title="{l s='Remove Voucher' d='Shop.Theme.Checkout'}">&#xE872;</i></a>
+                      <form action="{url entity='cart' params=['action' => 'show']}" data-form-action="remove-voucher" class="d-flex" method="post">
+                        <input type="hidden" name="token" value="{$static_token}">
+                        <input type="hidden" name="deleteDiscount" value="{$voucher.id_cart_rule}">
+                        <button type="submit" class="btn btn-link ms-2"><span><i class="material-icons" title="{l s='Remove Voucher' d='Shop.Theme.Checkout'}">&#xE872;</i></span></button>
+                      </form>
                     {/if}
                 </div>
               </li>
@@ -24,7 +28,7 @@
           </ul>
         {/block}
       {/if}
-    
+
       <hr />
 
       <div class="accordion">
@@ -36,7 +40,7 @@
           <div id="promo-code" class="accordion-collapse collapse">
             <div class="accordion-body px-0">
               {block name='cart_voucher_form'}
-                <form action="{$urls.pages.cart}" data-link-action="add-voucher" class="d-flex" method="post">
+                <form action="{url entity='cart' params=['action' => 'show']}" data-link-action="add-voucher" class="d-flex" method="post">
                   <input type="hidden" name="token" value="{$static_token}">
                   <input type="hidden" name="addDiscount" value="1">
                   <input class="form-control" type="text" name="discount_name" placeholder="{l s='Paste your voucher here' d='Shop.Theme.Checkout'}">