diff --git a/elements/rh-accordion/BaseAccordion.ts b/elements/rh-accordion/BaseAccordion.ts
deleted file mode 100644
index 1e1ec67ddc..0000000000
--- a/elements/rh-accordion/BaseAccordion.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { LitElement } from 'lit';
-
-export abstract class BaseAccordion extends LitElement {
-  static isAccordion(target: EventTarget | null): target is BaseAccordion {
-    return target instanceof BaseAccordion;
-  }
-}
diff --git a/elements/rh-accordion/rh-accordion-header.ts b/elements/rh-accordion/rh-accordion-header.ts
index cb332e78e4..1e1eebbe64 100644
--- a/elements/rh-accordion/rh-accordion-header.ts
+++ b/elements/rh-accordion/rh-accordion-header.ts
@@ -1,35 +1,30 @@
-import type { TemplateResult } from 'lit';
+import type { RhAccordion } from './rh-accordion.js';
 
 import { html, LitElement } from 'lit';
 import { classMap } from 'lit/directives/class-map.js';
 import { customElement } from 'lit/decorators/custom-element.js';
 import { property } from 'lit/decorators/property.js';
 
-import { ComposedEvent } from '@patternfly/pfe-core';
-
-import { DirController } from '../../lib/DirController.js';
-
+import { Logger } from '@patternfly/pfe-core/controllers/logger.js';
 import { getRandomId } from '@patternfly/pfe-core/functions/random.js';
 
+import { DirController } from '../../lib/DirController.js';
 import { colorContextConsumer, type ColorTheme } from '../../lib/context/color/consumer.js';
 
-import { Logger } from '@patternfly/pfe-core/controllers/logger.js';
-
 import styles from './rh-accordion-header.css';
-import { BaseAccordion } from './BaseAccordion.js';
 
 const isPorHeader =
   (el: Node): el is HTMLElement =>
     el instanceof HTMLElement && !!el.tagName.match(/P|^H[1-6]/);
 
-export class AccordionHeaderChangeEvent extends ComposedEvent {
+export class AccordionHeaderChangeEvent extends Event {
   declare target: RhAccordionHeader;
   constructor(
     public expanded: boolean,
     public toggle: RhAccordionHeader,
-    public accordion: BaseAccordion
+    public accordion: RhAccordion,
   ) {
-    super('change');
+    super('change', { bubbles: true, cancelable: true });
   }
 }
 
@@ -83,22 +78,24 @@ export class RhAccordionHeader extends LitElement {
     this.#initHeader();
   }
 
-  render(): Array<TemplateResult> {
+  render() {
     const { on = '' } = this;
     const rtl = this.#dir.dir === 'rtl';
-    const res = [];
-    res.push(html`<div id="container" class="${classMap({ [on]: !!on, rtl })}" part="container">`);
-    switch (this.headingTag) {
-      case 'h1': res.push(html`<h1 id="heading">${this.#renderHeaderContent()}</h1>`); break;
-      case 'h2': res.push(html`<h2 id="heading">${this.#renderHeaderContent()}</h2>`); break;
-      case 'h3': res.push(html`<h3 id="heading">${this.#renderHeaderContent()}</h3>`); break;
-      case 'h4': res.push(html`<h4 id="heading">${this.#renderHeaderContent()}</h4>`); break;
-      case 'h5': res.push(html`<h5 id="heading">${this.#renderHeaderContent()}</h5>`); break;
-      case 'h6': res.push(html`<h6 id="heading">${this.#renderHeaderContent()}</h6>`); break;
-      default: res.push(this.#renderHeaderContent());
-    }
-    res.push(html`</div>`);
-    return res;
+    return html`
+      <div id="container" class="${classMap({ [on]: !!on, rtl })}" part="container">
+        ${(() => {
+          switch (this.headingTag) {
+            case 'h1': return html`<h1 id="heading">${this.#renderHeaderContent()}</h1>`;
+            case 'h2': return html`<h2 id="heading">${this.#renderHeaderContent()}</h2>`;
+            case 'h3': return html`<h3 id="heading">${this.#renderHeaderContent()}</h3>`;
+            case 'h4': return html`<h4 id="heading">${this.#renderHeaderContent()}</h4>`;
+            case 'h5': return html`<h5 id="heading">${this.#renderHeaderContent()}</h5>`;
+            case 'h6': return html`<h6 id="heading">${this.#renderHeaderContent()}</h6>`;
+            default: return this.#renderHeaderContent();
+          }
+        })()}
+      </div>
+    `;
   }
 
   async #initHeader() {
@@ -120,16 +117,6 @@ export class RhAccordionHeader extends LitElement {
     this.hidden = false;
   }
 
-  #renderAfterButton() {
-    // Font-Awesome free angle-down
-    // TODO: use rh-icon when it's ready
-    return html`
-      <svg id="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512">
-        <path d="M201.4 374.6c12.5 12.5 32.8 12.5 45.3 0l160-160c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0L224 306.7 86.6 169.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3l160 160z"/>
-      </svg>
-    `;
-  }
-
   #renderHeaderContent() {
     const headingText = this.headingText?.trim() ?? this.#header?.textContent?.trim();
     return html`
@@ -139,7 +126,9 @@ export class RhAccordionHeader extends LitElement {
         <span part="text">${headingText ?? html`
           <slot></slot>`}
         </span>
-        ${this.#renderAfterButton?.()}
+        <svg id="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512">
+          <path d="M201.4 374.6c12.5 12.5 32.8 12.5 45.3 0l160-160c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0L224 306.7 86.6 169.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3l160 160z"/>
+        </svg>
       </button>
     `;
   }
@@ -180,7 +169,7 @@ export class RhAccordionHeader extends LitElement {
 
   #onClick(event: MouseEvent) {
     const expanded = !this.expanded;
-    const acc = event.composedPath().find(BaseAccordion.isAccordion);
+    const acc = event.composedPath().find((x): x is RhAccordion => x instanceof HTMLElement && x.localName === 'rh-accordion');
     if (acc) {
       this.dispatchEvent(new AccordionHeaderChangeEvent(expanded, this, acc));
     }
diff --git a/elements/rh-accordion/rh-accordion.ts b/elements/rh-accordion/rh-accordion.ts
index ff90ae9e07..d6359d87de 100644
--- a/elements/rh-accordion/rh-accordion.ts
+++ b/elements/rh-accordion/rh-accordion.ts
@@ -1,4 +1,4 @@
-import { html, type TemplateResult } from 'lit';
+import { LitElement, html, type TemplateResult } from 'lit';
 import { classMap } from 'lit/directives/class-map.js';
 import { customElement } from 'lit/decorators/custom-element.js';
 import { property } from 'lit/decorators/property.js';
@@ -10,16 +10,14 @@ import { RovingTabindexController } from '@patternfly/pfe-core/controllers/rovin
 import { colorContextConsumer, type ColorTheme } from '../../lib/context/color/consumer.js';
 import { colorContextProvider, type ColorPalette } from '../../lib/context/color/provider.js';
 
-import { BaseAccordion } from './BaseAccordion.js';
-
 import { NumberListConverter, ComposedEvent } from '@patternfly/pfe-core';
 import { Logger } from '@patternfly/pfe-core/controllers/logger.js';
 
-import styles from './rh-accordion.css';
-
-import { AccordionHeaderChangeEvent, RhAccordionHeader } from './rh-accordion-header.js';
+import { RhAccordionHeader, AccordionHeaderChangeEvent } from './rh-accordion-header.js';
 import { RhAccordionPanel } from './rh-accordion-panel.js';
 
+import styles from './rh-accordion.css';
+
 export class AccordionExpandEvent extends ComposedEvent {
   constructor(
     public toggle: RhAccordionHeader,
@@ -52,11 +50,15 @@ export class AccordionCollapseEvent extends ComposedEvent {
  *
  */
 @customElement('rh-accordion')
-export class RhAccordion extends BaseAccordion {
+export class RhAccordion extends LitElement {
   static readonly version = '{{version}}';
 
   static readonly styles = [styles];
 
+  static isAccordion(target: EventTarget | null): target is RhAccordion {
+    return target instanceof RhAccordion;
+  }
+
   static isHeader(target: EventTarget | null): target is RhAccordionHeader {
     return target instanceof RhAccordionHeader;
   }
@@ -238,12 +240,12 @@ export class RhAccordion extends BaseAccordion {
     }
   }
 
-  #allHeaders(accordion: BaseAccordion = this): RhAccordionHeader[] {
-    return Array.from(accordion.children).filter(RhAccordion.isHeader);
+  #allHeaders(accordion: RhAccordion = this): RhAccordionHeader[] {
+    return Array.from(accordion.children).filter((x): x is RhAccordionHeader => x instanceof RhAccordionHeader);
   }
 
-  #allPanels(accordion: BaseAccordion = this): RhAccordionPanel[] {
-    return Array.from(accordion.children).filter(RhAccordion.isPanel);
+  #allPanels(accordion: RhAccordion = this): RhAccordionPanel[] {
+    return Array.from(accordion.children).filter((x => RhAccordion.isPanel(x)) as typeof RhAccordion.isPanel);
   }
 
   #getIndex(el: Element | null) {
@@ -299,7 +301,7 @@ export class RhAccordion extends BaseAccordion {
    * Accepts a 0-based index value (integer) for the set of accordion items to expand.
    * Accepts an optional parent accordion to search for headers and panels.
    */
-  public async expand(index: number, parentAccordion?: BaseAccordion) {
+  public async expand(index: number, parentAccordion?: RhAccordion) {
     const allHeaders: Array<RhAccordionHeader> = this.#allHeaders(parentAccordion);
 
     const header = allHeaders[index];