diff --git a/docs/components/accordion/overview.md b/docs/components/accordion/overview.md
index e0f1c613e..26ba74897 100644
--- a/docs/components/accordion/overview.md
+++ b/docs/components/accordion/overview.md
@@ -28,7 +28,7 @@ class MyComponent extends ScopedElementsMixin(LitElement) {
             decrease gradually during development, whereas volatile aroma compounds tend to peak in
             mid– to late–season development. Taste quality tends to improve later in harvests when
             there is a higher sugar/acid ratio with less bitterness. As a citrus fruit, the orange
-            is acidic, with pH levels ranging from 2.9 to 4.0.
+            is acidic, with pH levels ranging from 2.9 to 4.0. <a href="#">Link</a>
           </p>
           <p>
             Sensory qualities vary according to genetic background, environmental conditions during
diff --git a/packages/accordion/src/LionAccordion.js b/packages/accordion/src/LionAccordion.js
index 5d762c0e8..4c2abde5b 100644
--- a/packages/accordion/src/LionAccordion.js
+++ b/packages/accordion/src/LionAccordion.js
@@ -61,6 +61,25 @@ export class LionAccordion extends LitElement {
           visibility: visible;
           display: block;
         }
+
+        .accordion [slot='invoker'] {
+          margin: 0;
+        }
+
+        .accordion [slot='invoker'][expanded] {
+          font-weight: bold;
+        }
+
+        .accordion [slot='content'] {
+          margin: 0;
+          visibility: hidden;
+          display: none;
+        }
+
+        .accordion [slot='content'][expanded] {
+          visibility: visible;
+          display: block;
+        }
       `,
     ];
   }
@@ -139,10 +158,12 @@ export class LionAccordion extends LitElement {
   __setupSlots() {
     const invokerSlot = this.shadowRoot?.querySelector('slot[name=invoker]');
     const handleSlotChange = () => {
-      this.__cleanStore();
-      this.__setupStore();
-      this.__updateFocused();
-      this.__updateExpanded();
+      if (invokerSlot instanceof HTMLSlotElement && invokerSlot.assignedNodes().length > 0) {
+        this.__cleanStore();
+        this.__setupStore();
+        this.__updateFocused();
+        this.__updateExpanded();
+      }
     };
     if (invokerSlot) {
       invokerSlot.addEventListener('slotchange', handleSlotChange);
@@ -180,12 +201,33 @@ export class LionAccordion extends LitElement {
       };
       this._setupContent(entry);
       this._setupInvoker(entry);
+      this.__rearrangeInvokersAndContent();
       this._unfocusInvoker(entry);
       this._collapse(entry);
       this.__store.push(entry);
     });
   }
 
+  /**
+   *  @private
+   */
+  __rearrangeInvokersAndContent() {
+    const invokers = /** @type {HTMLElement[]} */ (
+      Array.from(this.querySelectorAll('[slot="invoker"]'))
+    );
+    const contents = /** @type {HTMLElement[]} */ (
+      Array.from(this.querySelectorAll('[slot="content"]'))
+    );
+    const accordion = this.shadowRoot?.querySelector('.accordion');
+
+    if (accordion) {
+      invokers.forEach((invoker, index) => {
+        accordion.insertAdjacentElement('beforeend', invoker);
+        accordion.insertAdjacentElement('beforeend', contents[index]);
+      });
+    }
+  }
+
   /**
    * @param {number} index
    * @private