diff --git a/src/invoices/InvoiceDetails/__snapshots__/InvoiceDetails.test.js.snap b/src/invoices/InvoiceDetails/__snapshots__/InvoiceDetails.test.js.snap
index 726fa398..1726abbb 100644
--- a/src/invoices/InvoiceDetails/__snapshots__/InvoiceDetails.test.js.snap
+++ b/src/invoices/InvoiceDetails/__snapshots__/InvoiceDetails.test.js.snap
@@ -206,7 +206,7 @@ exports[`InvoiceDetails should render correct structure for Approved invoice 1`]
             </div>
             <div
               class="content-wrap expanded"
-              style="z-index: 1;"
+              style="z-index: 5;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-information"
@@ -269,7 +269,7 @@ exports[`InvoiceDetails should render correct structure for Approved invoice 1`]
             </div>
             <div
               class="content-wrap expanded"
-              style="z-index: 1;"
+              style="z-index: 4;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-invoiceLines"
@@ -327,7 +327,7 @@ exports[`InvoiceDetails should render correct structure for Approved invoice 1`]
             </div>
             <div
               class="content-wrap expanded"
-              style="z-index: 1;"
+              style="z-index: 3;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-vendorDetails"
@@ -385,7 +385,7 @@ exports[`InvoiceDetails should render correct structure for Approved invoice 1`]
             </div>
             <div
               class="content-wrap"
-              style="z-index: 1;"
+              style="z-index: 2;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-extendedInformation"
@@ -670,7 +670,7 @@ exports[`InvoiceDetails should render correct structure for Cancelled invoice 1`
             </div>
             <div
               class="content-wrap expanded"
-              style="z-index: 1;"
+              style="z-index: 5;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-information"
@@ -733,7 +733,7 @@ exports[`InvoiceDetails should render correct structure for Cancelled invoice 1`
             </div>
             <div
               class="content-wrap expanded"
-              style="z-index: 1;"
+              style="z-index: 4;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-invoiceLines"
@@ -791,7 +791,7 @@ exports[`InvoiceDetails should render correct structure for Cancelled invoice 1`
             </div>
             <div
               class="content-wrap expanded"
-              style="z-index: 1;"
+              style="z-index: 3;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-vendorDetails"
@@ -849,7 +849,7 @@ exports[`InvoiceDetails should render correct structure for Cancelled invoice 1`
             </div>
             <div
               class="content-wrap"
-              style="z-index: 1;"
+              style="z-index: 2;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-extendedInformation"
@@ -1134,7 +1134,7 @@ exports[`InvoiceDetails should render correct structure for Open invoice 1`] = `
             </div>
             <div
               class="content-wrap expanded"
-              style="z-index: 1;"
+              style="z-index: 5;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-information"
@@ -1197,7 +1197,7 @@ exports[`InvoiceDetails should render correct structure for Open invoice 1`] = `
             </div>
             <div
               class="content-wrap expanded"
-              style="z-index: 1;"
+              style="z-index: 4;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-invoiceLines"
@@ -1255,7 +1255,7 @@ exports[`InvoiceDetails should render correct structure for Open invoice 1`] = `
             </div>
             <div
               class="content-wrap expanded"
-              style="z-index: 1;"
+              style="z-index: 3;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-vendorDetails"
@@ -1313,7 +1313,7 @@ exports[`InvoiceDetails should render correct structure for Open invoice 1`] = `
             </div>
             <div
               class="content-wrap"
-              style="z-index: 1;"
+              style="z-index: 2;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-extendedInformation"
@@ -1597,7 +1597,7 @@ exports[`InvoiceDetails should render correct structure for Paid invoice 1`] = `
             </div>
             <div
               class="content-wrap expanded"
-              style="z-index: 1;"
+              style="z-index: 5;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-information"
@@ -1660,7 +1660,7 @@ exports[`InvoiceDetails should render correct structure for Paid invoice 1`] = `
             </div>
             <div
               class="content-wrap expanded"
-              style="z-index: 1;"
+              style="z-index: 4;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-invoiceLines"
@@ -1718,7 +1718,7 @@ exports[`InvoiceDetails should render correct structure for Paid invoice 1`] = `
             </div>
             <div
               class="content-wrap expanded"
-              style="z-index: 1;"
+              style="z-index: 3;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-vendorDetails"
@@ -1776,7 +1776,7 @@ exports[`InvoiceDetails should render correct structure for Paid invoice 1`] = `
             </div>
             <div
               class="content-wrap"
-              style="z-index: 1;"
+              style="z-index: 2;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-extendedInformation"
@@ -2061,7 +2061,7 @@ exports[`InvoiceDetails should render correct structure for Reviewed invoice 1`]
             </div>
             <div
               class="content-wrap expanded"
-              style="z-index: 1;"
+              style="z-index: 5;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-information"
@@ -2124,7 +2124,7 @@ exports[`InvoiceDetails should render correct structure for Reviewed invoice 1`]
             </div>
             <div
               class="content-wrap expanded"
-              style="z-index: 1;"
+              style="z-index: 4;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-invoiceLines"
@@ -2182,7 +2182,7 @@ exports[`InvoiceDetails should render correct structure for Reviewed invoice 1`]
             </div>
             <div
               class="content-wrap expanded"
-              style="z-index: 1;"
+              style="z-index: 3;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-vendorDetails"
@@ -2240,7 +2240,7 @@ exports[`InvoiceDetails should render correct structure for Reviewed invoice 1`]
             </div>
             <div
               class="content-wrap"
-              style="z-index: 1;"
+              style="z-index: 2;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-extendedInformation"
@@ -2524,7 +2524,7 @@ exports[`InvoiceDetails should render correct structure for invoice with batch v
             </div>
             <div
               class="content-wrap expanded"
-              style="z-index: 1;"
+              style="z-index: 6;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-information"
@@ -2587,7 +2587,7 @@ exports[`InvoiceDetails should render correct structure for invoice with batch v
             </div>
             <div
               class="content-wrap expanded"
-              style="z-index: 1;"
+              style="z-index: 5;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-invoiceLines"
@@ -2645,7 +2645,7 @@ exports[`InvoiceDetails should render correct structure for invoice with batch v
             </div>
             <div
               class="content-wrap expanded"
-              style="z-index: 1;"
+              style="z-index: 4;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-vendorDetails"
@@ -2703,7 +2703,7 @@ exports[`InvoiceDetails should render correct structure for invoice with batch v
             </div>
             <div
               class="content-wrap"
-              style="z-index: 1;"
+              style="z-index: 3;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-extendedInformation"
@@ -2761,7 +2761,7 @@ exports[`InvoiceDetails should render correct structure for invoice with batch v
             </div>
             <div
               class="content-wrap expanded"
-              style="z-index: 1;"
+              style="z-index: 2;"
             >
               <div
                 aria-labelledby="accordion-toggle-button-batchVoucherExport"
diff --git a/src/invoices/InvoiceForm/__snapshots__/InvoiceForm.test.js.snap b/src/invoices/InvoiceForm/__snapshots__/InvoiceForm.test.js.snap
index 6ad3c6dd..59dbf0d7 100644
--- a/src/invoices/InvoiceForm/__snapshots__/InvoiceForm.test.js.snap
+++ b/src/invoices/InvoiceForm/__snapshots__/InvoiceForm.test.js.snap
@@ -146,7 +146,7 @@ exports[`InvoiceForm component should render correct structure 1`] = `
                     </div>
                     <div
                       class="content-wrap expanded"
-                      style="z-index: 2;"
+                      style="z-index: 5;"
                     >
                       <div
                         aria-labelledby="accordion-toggle-button-invoiceForm-information"
@@ -1117,7 +1117,7 @@ exports[`InvoiceForm component should render correct structure 1`] = `
                             data-test-col-note="true"
                           >
                             <div
-                              class="textArea inputGroup"
+                              class="textArea"
                             >
                               <label
                                 class="label"
@@ -1125,16 +1125,20 @@ exports[`InvoiceForm component should render correct structure 1`] = `
                               >
                                 ui-invoice.invoice.note
                               </label>
-                              <textarea
-                                aria-invalid="false"
-                                class="formControl"
-                                id="note"
-                                name="note"
-                                type="text"
-                              />
                               <div
-                                role="alert"
-                              />
+                                class="inputGroup"
+                              >
+                                <textarea
+                                  aria-invalid="false"
+                                  class="formControl"
+                                  id="note"
+                                  name="note"
+                                  type="text"
+                                />
+                                <div
+                                  role="alert"
+                                />
+                              </div>
                             </div>
                           </div>
                         </div>
@@ -1186,7 +1190,7 @@ exports[`InvoiceForm component should render correct structure 1`] = `
                     </div>
                     <div
                       class="content-wrap expanded"
-                      style="z-index: 1;"
+                      style="z-index: 4;"
                     >
                       <div
                         aria-labelledby="accordion-toggle-button-invoiceForm-invoiceAdjustments"
@@ -1246,7 +1250,7 @@ exports[`InvoiceForm component should render correct structure 1`] = `
                     </div>
                     <div
                       class="content-wrap expanded"
-                      style="z-index: 2;"
+                      style="z-index: 3;"
                     >
                       <div
                         aria-labelledby="accordion-toggle-button-invoiceForm-vendorDetails"
diff --git a/src/invoices/InvoiceLineForm/__snapshots__/InvoiceLineForm.test.js.snap b/src/invoices/InvoiceLineForm/__snapshots__/InvoiceLineForm.test.js.snap
index 19217b3e..061d2b82 100644
--- a/src/invoices/InvoiceLineForm/__snapshots__/InvoiceLineForm.test.js.snap
+++ b/src/invoices/InvoiceLineForm/__snapshots__/InvoiceLineForm.test.js.snap
@@ -146,7 +146,7 @@ exports[`InvoiceLineForm component should render correct structure 1`] = `
                     </div>
                     <div
                       class="content-wrap expanded"
-                      style="z-index: 1;"
+                      style="z-index: 3;"
                     >
                       <div
                         aria-labelledby="accordion-toggle-button-invoiceLineForm-information"
diff --git a/src/invoices/InvoicesList/InvoicesListFilters/__snapshots__/InvoicesListFilters.test.js.snap b/src/invoices/InvoicesList/InvoicesListFilters/__snapshots__/InvoicesListFilters.test.js.snap
index 00437aad..11df8b2c 100644
--- a/src/invoices/InvoicesList/InvoicesListFilters/__snapshots__/InvoicesListFilters.test.js.snap
+++ b/src/invoices/InvoicesList/InvoicesListFilters/__snapshots__/InvoicesListFilters.test.js.snap
@@ -44,7 +44,7 @@ exports[`InvoicesListFilters should render correct structure 1`] = `
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 13;"
       >
         <div
           aria-labelledby="accordion-toggle-button-status"
@@ -345,7 +345,7 @@ exports[`InvoicesListFilters should render correct structure 1`] = `
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 12;"
       >
         <div
           aria-labelledby="accordion-toggle-button-vendorId"
@@ -422,7 +422,7 @@ exports[`InvoicesListFilters should render correct structure 1`] = `
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 11;"
       >
         <div
           aria-labelledby="accordion-toggle-button-metadata.createdDate"
@@ -626,7 +626,7 @@ exports[`InvoicesListFilters should render correct structure 1`] = `
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 10;"
       >
         <div
           aria-labelledby="accordion-toggle-button-invoiceDate"
@@ -830,7 +830,7 @@ exports[`InvoicesListFilters should render correct structure 1`] = `
       </div>
       <div
         class="content-wrap"
-        style="z-index: 2;"
+        style="z-index: 9;"
       >
         <div
           aria-labelledby="accordion-toggle-button-acqUnitIds"
@@ -982,7 +982,7 @@ exports[`InvoicesListFilters should render correct structure 1`] = `
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 8;"
       >
         <div
           aria-labelledby="accordion-toggle-button-tags.tagList"
@@ -1140,7 +1140,7 @@ exports[`InvoicesListFilters should render correct structure 1`] = `
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 7;"
       >
         <div
           aria-labelledby="accordion-toggle-button-paymentDue"
@@ -1344,7 +1344,7 @@ exports[`InvoicesListFilters should render correct structure 1`] = `
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 6;"
       >
         <div
           aria-labelledby="accordion-toggle-button-paymentMethod"
@@ -1795,7 +1795,7 @@ exports[`InvoicesListFilters should render correct structure 1`] = `
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 5;"
       >
         <div
           aria-labelledby="accordion-toggle-button-approvalDate"
@@ -1999,7 +1999,7 @@ exports[`InvoicesListFilters should render correct structure 1`] = `
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 4;"
       >
         <div
           aria-labelledby="accordion-toggle-button-source"
@@ -2250,7 +2250,7 @@ exports[`InvoicesListFilters should render correct structure 1`] = `
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 3;"
       >
         <div
           aria-labelledby="accordion-toggle-button-exportToAccounting"
@@ -2401,7 +2401,7 @@ exports[`InvoicesListFilters should render correct structure 1`] = `
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 2;"
       >
         <div
           aria-labelledby="accordion-toggle-button-paymentDate"
@@ -2723,7 +2723,7 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
           data-test-headline="true"
         >
           <button
-            aria-controls="accordion54"
+            aria-controls="accordion53"
             aria-expanded="false"
             aria-label="ui-invoice.invoice.details.information.status filter list"
             class="filterSetHeader"
@@ -2748,13 +2748,13 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 13;"
       >
         <div
           aria-labelledby="accordion-toggle-button-status"
           class="content-region"
           data-test-accordion-wrapper="true"
-          id="accordion54"
+          id="accordion53"
           role="region"
         >
           <div
@@ -3049,7 +3049,7 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
           data-test-headline="true"
         >
           <button
-            aria-controls="accordion55"
+            aria-controls="accordion54"
             aria-expanded="false"
             aria-label="ui-invoice.invoice.vendorName filter list"
             class="filterSetHeader"
@@ -3074,13 +3074,13 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 12;"
       >
         <div
           aria-labelledby="accordion-toggle-button-vendorId"
           class="content-region"
           data-test-accordion-wrapper="true"
-          id="accordion55"
+          id="accordion54"
           role="region"
         >
           <div
@@ -3126,7 +3126,7 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
           data-test-headline="true"
         >
           <button
-            aria-controls="accordion56"
+            aria-controls="accordion55"
             aria-expanded="false"
             aria-label="ui-invoice.invoice.dateCreated filter list"
             class="filterSetHeader"
@@ -3151,13 +3151,13 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 11;"
       >
         <div
           aria-labelledby="accordion-toggle-button-metadata.createdDate"
           class="content-region"
           data-test-accordion-wrapper="true"
-          id="accordion56"
+          id="accordion55"
           role="region"
         >
           <div
@@ -3330,7 +3330,7 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
           data-test-headline="true"
         >
           <button
-            aria-controls="accordion57"
+            aria-controls="accordion56"
             aria-expanded="false"
             aria-label="ui-invoice.invoice.details.information.invoiceDate filter list"
             class="filterSetHeader"
@@ -3355,13 +3355,13 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 10;"
       >
         <div
           aria-labelledby="accordion-toggle-button-invoiceDate"
           class="content-region"
           data-test-accordion-wrapper="true"
-          id="accordion57"
+          id="accordion56"
           role="region"
         >
           <div
@@ -3534,7 +3534,7 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
           data-test-headline="true"
         >
           <button
-            aria-controls="accordion58"
+            aria-controls="accordion57"
             aria-expanded="false"
             aria-label="stripes-acq-components.filter.acqUnit filter list"
             class="filterSetHeader"
@@ -3559,13 +3559,13 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
       </div>
       <div
         class="content-wrap"
-        style="z-index: 2;"
+        style="z-index: 9;"
       >
         <div
           aria-labelledby="accordion-toggle-button-acqUnitIds"
           class="content-region"
           data-test-accordion-wrapper="true"
-          id="accordion58"
+          id="accordion57"
           role="region"
         >
           <div
@@ -3687,7 +3687,7 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
           data-test-headline="true"
         >
           <button
-            aria-controls="accordion59"
+            aria-controls="accordion58"
             aria-expanded="false"
             aria-label="stripes-acq-components.filter.tags filter list"
             class="filterSetHeader"
@@ -3712,13 +3712,13 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 8;"
       >
         <div
           aria-labelledby="accordion-toggle-button-tags.tagList"
           class="content-region"
           data-test-accordion-wrapper="true"
-          id="accordion59"
+          id="accordion58"
           role="region"
         >
           <div
@@ -3847,7 +3847,7 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
           data-test-headline="true"
         >
           <button
-            aria-controls="accordion60"
+            aria-controls="accordion59"
             aria-expanded="false"
             aria-label="ui-invoice.invoice.details.information.paymentDue filter list"
             class="filterSetHeader"
@@ -3872,13 +3872,13 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 7;"
       >
         <div
           aria-labelledby="accordion-toggle-button-paymentDue"
           class="content-region"
           data-test-accordion-wrapper="true"
-          id="accordion60"
+          id="accordion59"
           role="region"
         >
           <div
@@ -4051,7 +4051,7 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
           data-test-headline="true"
         >
           <button
-            aria-controls="accordion61"
+            aria-controls="accordion60"
             aria-expanded="false"
             aria-label="ui-invoice.invoice.paymentMethod filter list"
             class="filterSetHeader"
@@ -4076,13 +4076,13 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 6;"
       >
         <div
           aria-labelledby="accordion-toggle-button-paymentMethod"
           class="content-region"
           data-test-accordion-wrapper="true"
-          id="accordion61"
+          id="accordion60"
           role="region"
         >
           <div
@@ -4542,7 +4542,7 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
           data-test-headline="true"
         >
           <button
-            aria-controls="accordion62"
+            aria-controls="accordion61"
             aria-expanded="false"
             aria-label="ui-invoice.invoice.approvalDate filter list"
             class="filterSetHeader"
@@ -4567,13 +4567,13 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 5;"
       >
         <div
           aria-labelledby="accordion-toggle-button-approvalDate"
           class="content-region"
           data-test-accordion-wrapper="true"
-          id="accordion62"
+          id="accordion61"
           role="region"
         >
           <div
@@ -4746,7 +4746,7 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
           data-test-headline="true"
         >
           <button
-            aria-controls="accordion63"
+            aria-controls="accordion62"
             aria-expanded="false"
             aria-label="stripes-acq-components.label.sourceFilter filter list"
             class="filterSetHeader"
@@ -4771,13 +4771,13 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 4;"
       >
         <div
           aria-labelledby="accordion-toggle-button-source"
           class="content-region"
           data-test-accordion-wrapper="true"
-          id="accordion63"
+          id="accordion62"
           role="region"
         >
           <div
@@ -5017,7 +5017,7 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
           data-test-headline="true"
         >
           <button
-            aria-controls="accordion64"
+            aria-controls="accordion63"
             aria-expanded="false"
             aria-label="ui-invoice.invoice.exportToAccounting filter list"
             class="filterSetHeader"
@@ -5042,13 +5042,13 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 3;"
       >
         <div
           aria-labelledby="accordion-toggle-button-exportToAccounting"
           class="content-region"
           data-test-accordion-wrapper="true"
-          id="accordion64"
+          id="accordion63"
           role="region"
         >
           <div
@@ -5178,7 +5178,7 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
           data-test-headline="true"
         >
           <button
-            aria-controls="accordion65"
+            aria-controls="accordion64"
             aria-expanded="false"
             aria-label="ui-invoice.invoice.paymentDate filter list"
             class="filterSetHeader"
@@ -5203,13 +5203,13 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
       </div>
       <div
         class="content-wrap"
-        style="z-index: 1;"
+        style="z-index: 2;"
       >
         <div
           aria-labelledby="accordion-toggle-button-paymentDate"
           class="content-region"
           data-test-accordion-wrapper="true"
-          id="accordion65"
+          id="accordion64"
           role="region"
         >
           <div
@@ -5398,7 +5398,7 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
           data-test-headline="true"
         >
           <button
-            aria-controls="accordion66"
+            aria-controls="accordion65"
             aria-expanded="false"
             aria-label="ui-invoice.invoice.lockTotal filter list"
             class="filterSetHeader"
@@ -5429,7 +5429,7 @@ exports[`InvoicesListFilters should render correct structure when disabled 1`] =
           aria-labelledby="accordion-toggle-button-lockTotal"
           class="content-region"
           data-test-accordion-wrapper="true"
-          id="accordion66"
+          id="accordion65"
           role="region"
         >
           <div