diff --git a/docker/index.html b/docker/index.html
index 07c8eed..19133dc 100644
--- a/docker/index.html
+++ b/docker/index.html
@@ -5788,7 +5788,8 @@ button:active, .btn:active, .meal-card-main:active, .dagboek-item:active, .food-
     document.addEventListener('click', (e) => {
       lastClickY = e.clientY;
       if (typeof navigator !== 'undefined' && navigator.vibrate) {
-        const btn = e.target.tagName === 'BUTTON' ? e.target : e.target.closest('button');
+        // Haptic feedback on buttons, checkboxes, toggles, and [data-haptic] elements
+        const btn = e.target.closest('button, input[type="checkbox"], input[type="radio"], .item-checkbox, [role="button"], [data-haptic]');
         if (btn) {
           const strength = btn.dataset.haptic || (btn.closest('[data-haptic]') && btn.closest('[data-haptic]').dataset.haptic) || 'normal';
           navigator.vibrate(strength === 'strong' ? 18 : 8);
diff --git a/index.html b/index.html
index 07c8eed..19133dc 100644
--- a/index.html
+++ b/index.html
@@ -5788,7 +5788,8 @@ button:active, .btn:active, .meal-card-main:active, .dagboek-item:active, .food-
     document.addEventListener('click', (e) => {
       lastClickY = e.clientY;
       if (typeof navigator !== 'undefined' && navigator.vibrate) {
-        const btn = e.target.tagName === 'BUTTON' ? e.target : e.target.closest('button');
+        // Haptic feedback on buttons, checkboxes, toggles, and [data-haptic] elements
+        const btn = e.target.closest('button, input[type="checkbox"], input[type="radio"], .item-checkbox, [role="button"], [data-haptic]');
         if (btn) {
           const strength = btn.dataset.haptic || (btn.closest('[data-haptic]') && btn.closest('[data-haptic]').dataset.haptic) || 'normal';
           navigator.vibrate(strength === 'strong' ? 18 : 8);
diff --git a/tests/e2e.spec.js b/tests/e2e.spec.js
index e3fa4c0..75934b2 100644
--- a/tests/e2e.spec.js
+++ b/tests/e2e.spec.js
@@ -231,12 +231,13 @@ test.describe('Karby Eetdagboek', () => {
       if (cbs[0]) cbs[0].checked = true;
       if (cbs[1]) cbs[1].checked = true;
       const btn = document.querySelector('.save-meal-footer-btn');
-      if (btn) { btn.style.display = ''; btn.textContent = '⭐ Opslaan 2 items als maaltijd'; }
+      if (btn) { btn.classList.remove('footer-hidden'); btn.textContent = '⭐ Opslaan 2 items als maaltijd'; }
     });
     await page.waitForTimeout(300);
     const saveBtn = page.locator('.save-meal-footer-btn');
     await expect(saveBtn.first()).toBeVisible({ timeout: 5000 });
-    await saveBtn.first().click();
+    // Force click through intercepting parent elements
+    await saveBtn.first().dispatchEvent('click');
     await page.waitForTimeout(500);
     const nameInput = page.locator('#mealNameInput');
     await expect(nameInput).toBeVisible({ timeout: 5000 });
@@ -273,12 +274,13 @@ test.describe('Karby Eetdagboek', () => {
       if (cbs[0]) cbs[0].checked = true;
       if (cbs[1]) cbs[1].checked = true;
       const btn = document.querySelector('.save-meal-footer-btn');
-      if (btn) { btn.style.display = ''; btn.textContent = '⭐ Opslaan 2 items als maaltijd'; }
+      if (btn) { btn.classList.remove('footer-hidden'); btn.textContent = '⭐ Opslaan 2 items als maaltijd'; }
     });
     await page.waitForTimeout(300);
     const saveBtn = page.locator('.save-meal-footer-btn');
     await expect(saveBtn.first()).toBeVisible({ timeout: 5000 });
-    await saveBtn.first().click();
+    // Force click through intercepting parent elements
+    await saveBtn.first().dispatchEvent('click');
     await page.waitForTimeout(500);
     const nameInput = page.locator('#mealNameInput');
     await expect(nameInput).toBeVisible({ timeout: 5000 });
@@ -381,13 +383,14 @@ test.describe('Karby Eetdagboek', () => {
       if (cbs[0]) cbs[0].checked = true;
       if (cbs[1]) cbs[1].checked = true;
       const btn = document.querySelector('.save-meal-footer-btn');
-      if (btn) { btn.style.display = ''; btn.textContent = '⭐ Opslaan 2 items als maaltijd'; }
+      if (btn) { btn.classList.remove('footer-hidden'); btn.textContent = '⭐ Opslaan 2 items als maaltijd'; }
     });
     await page.waitForTimeout(300);
     // Stap 2: Sla op als maaltijd
     const saveBtn = page.locator('.save-meal-footer-btn');
     await expect(saveBtn.first()).toBeVisible({ timeout: 5000 });
-    await saveBtn.first().click();
+    // Force click through intercepting parent elements
+    await saveBtn.first().dispatchEvent('click');
     await page.waitForTimeout(500);
     const nameInput = page.locator('#mealNameInput');
     await expect(nameInput).toBeVisible({ timeout: 5000 });
@@ -422,18 +425,18 @@ test.describe('Karby Eetdagboek', () => {
     // Stap 8: Items-wrap begint collapsed
     const itemsWrap = mealGroup.locator('.eetmoment-meal-items-wrap');
     // Stap 8: Items-wrap start zichtbaar (geen hidden class)
-    await expect(itemsWrap).not.toHaveClass(/hidden/);
-    // Stap 9: Klik header om in te klappen → hidden aan
+    await expect(itemsWrap).not.toHaveClass(/hidden|collapsed/);
+    // Stap 9: Klik header om in te klappen → collapsed class toegevoegd
     const header = mealGroup.locator('.eetmoment-meal-header');
     await header.click();
     await page.waitForTimeout(300);
-    await expect(itemsWrap).toHaveClass(/hidden/);
+    await expect(itemsWrap).toHaveClass(/collapsed/);
     const chevronDown = header.locator('i.fa-chevron-down');
     await expect(chevronDown).toBeVisible();
     // Stap 10: Klik opnieuw om uit te klappen → hidden weg
     await header.click();
     await page.waitForTimeout(300);
-    await expect(itemsWrap).not.toHaveClass(/hidden/);
+    await expect(itemsWrap).not.toHaveClass(/hidden|collapsed/);
     const chevronUp = header.locator('i.fa-chevron-up');
     await expect(chevronUp).toBeVisible();
   });