diff --git a/test/components/structures/__snapshots__/FilePanel-test.tsx.snap b/test/components/structures/__snapshots__/FilePanel-test.tsx.snap
index 3f6d08c099..d848b24074 100644
--- a/test/components/structures/__snapshots__/FilePanel-test.tsx.snap
+++ b/test/components/structures/__snapshots__/FilePanel-test.tsx.snap
@@ -8,12 +8,16 @@ exports[`FilePanel renders empty state 1`] = `
     <div
       class="mx_BaseCard_header"
     >
-      <p
-        class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title"
-        role="heading"
+      <div
+        class="mx_BaseCard_header_title"
       >
-        Files
-      </p>
+        <p
+          class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title_heading"
+          role="heading"
+        >
+          Files
+        </p>
+      </div>
       <button
         class="_icon-button_bh2qc_17 _subtle-bg_bh2qc_38"
         data-testid="base-card-close-button"
diff --git a/test/components/views/right_panel/__snapshots__/BaseCard-test.tsx.snap b/test/components/views/right_panel/__snapshots__/BaseCard-test.tsx.snap
index 629000b7f9..567edc2c60 100644
--- a/test/components/views/right_panel/__snapshots__/BaseCard-test.tsx.snap
+++ b/test/components/views/right_panel/__snapshots__/BaseCard-test.tsx.snap
@@ -8,12 +8,16 @@ exports[`<BaseCard /> should close when clicking X button 1`] = `
     <div
       class="mx_BaseCard_header"
     >
-      <p
-        class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title"
-        role="heading"
+      <div
+        class="mx_BaseCard_header_title"
       >
-        Heading text
-      </p>
+        <p
+          class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title_heading"
+          role="heading"
+        >
+          Heading text
+        </p>
+      </div>
       <button
         class="_icon-button_bh2qc_17 _subtle-bg_bh2qc_38"
         data-testid="base-card-close-button"
diff --git a/test/components/views/right_panel/__snapshots__/ExtensionsCard-test.tsx.snap b/test/components/views/right_panel/__snapshots__/ExtensionsCard-test.tsx.snap
index b8ecd74a2c..0cbda3ab64 100644
--- a/test/components/views/right_panel/__snapshots__/ExtensionsCard-test.tsx.snap
+++ b/test/components/views/right_panel/__snapshots__/ExtensionsCard-test.tsx.snap
@@ -8,12 +8,16 @@ exports[`<ExtensionsCard /> should render empty state 1`] = `
     <div
       class="mx_BaseCard_header"
     >
-      <p
-        class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title"
-        role="heading"
+      <div
+        class="mx_BaseCard_header_title"
       >
-        Extensions
-      </p>
+        <p
+          class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title_heading"
+          role="heading"
+        >
+          Extensions
+        </p>
+      </div>
       <button
         class="_icon-button_bh2qc_17 _subtle-bg_bh2qc_38"
         data-testid="base-card-close-button"
@@ -89,12 +93,16 @@ exports[`<ExtensionsCard /> should render widgets 1`] = `
     <div
       class="mx_BaseCard_header"
     >
-      <p
-        class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title"
-        role="heading"
+      <div
+        class="mx_BaseCard_header_title"
       >
-        Extensions
-      </p>
+        <p
+          class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title_heading"
+          role="heading"
+        >
+          Extensions
+        </p>
+      </div>
       <button
         class="_icon-button_bh2qc_17 _subtle-bg_bh2qc_38"
         data-testid="base-card-close-button"
diff --git a/test/components/views/right_panel/__snapshots__/PinnedMessagesCard-test.tsx.snap b/test/components/views/right_panel/__snapshots__/PinnedMessagesCard-test.tsx.snap
index 3d7df00f53..0c7814d442 100644
--- a/test/components/views/right_panel/__snapshots__/PinnedMessagesCard-test.tsx.snap
+++ b/test/components/views/right_panel/__snapshots__/PinnedMessagesCard-test.tsx.snap
@@ -8,12 +8,16 @@ exports[`<PinnedMessagesCard /> should show the empty state when there are no pi
     <div
       class="mx_BaseCard_header"
     >
-      <p
-        class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title"
-        role="heading"
+      <div
+        class="mx_BaseCard_header_title"
       >
-        Pinned messages
-      </p>
+        <p
+          class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title_heading"
+          role="heading"
+        >
+          Pinned messages
+        </p>
+      </div>
       <button
         class="_icon-button_bh2qc_17 _subtle-bg_bh2qc_38"
         data-testid="base-card-close-button"
@@ -84,12 +88,16 @@ exports[`<PinnedMessagesCard /> should show two pinned messages 1`] = `
     <div
       class="mx_BaseCard_header"
     >
-      <p
-        class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title"
-        role="heading"
+      <div
+        class="mx_BaseCard_header_title"
       >
-        2 Pinned messages
-      </p>
+        <p
+          class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title_heading"
+          role="heading"
+        >
+          2 Pinned messages
+        </p>
+      </div>
       <button
         class="_icon-button_bh2qc_17 _subtle-bg_bh2qc_38"
         data-testid="base-card-close-button"
@@ -276,12 +284,16 @@ exports[`<PinnedMessagesCard /> unpin all should not allow to unpinall 1`] = `
     <div
       class="mx_BaseCard_header"
     >
-      <p
-        class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title"
-        role="heading"
+      <div
+        class="mx_BaseCard_header_title"
       >
-        2 Pinned messages
-      </p>
+        <p
+          class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title_heading"
+          role="heading"
+        >
+          2 Pinned messages
+        </p>
+      </div>
       <button
         class="_icon-button_bh2qc_17 _subtle-bg_bh2qc_38"
         data-testid="base-card-close-button"
diff --git a/test/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap b/test/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap
index 91e2475410..5e68b58085 100644
--- a/test/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap
+++ b/test/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap
@@ -77,12 +77,16 @@ exports[`<UserInfo /> with crypto enabled renders <BasicUserInfo /> 1`] = `
     <div
       class="mx_BaseCard_header"
     >
-      <p
-        class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title"
-        role="heading"
+      <div
+        class="mx_BaseCard_header_title"
       >
-        Profile
-      </p>
+        <p
+          class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title_heading"
+          role="heading"
+        >
+          Profile
+        </p>
+      </div>
       <button
         class="_icon-button_bh2qc_17 _subtle-bg_bh2qc_38"
         data-testid="base-card-close-button"
@@ -386,12 +390,16 @@ exports[`<UserInfo /> with crypto enabled should render a deactivate button for
     <div
       class="mx_BaseCard_header"
     >
-      <p
-        class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title"
-        role="heading"
+      <div
+        class="mx_BaseCard_header_title"
       >
-        Profile
-      </p>
+        <p
+          class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title_heading"
+          role="heading"
+        >
+          Profile
+        </p>
+      </div>
       <button
         class="_icon-button_bh2qc_17 _subtle-bg_bh2qc_38"
         data-testid="base-card-close-button"
diff --git a/test/components/views/rooms/__snapshots__/ThirdPartyMemberInfo-test.tsx.snap b/test/components/views/rooms/__snapshots__/ThirdPartyMemberInfo-test.tsx.snap
index 96fa7029c7..5db333e5ac 100644
--- a/test/components/views/rooms/__snapshots__/ThirdPartyMemberInfo-test.tsx.snap
+++ b/test/components/views/rooms/__snapshots__/ThirdPartyMemberInfo-test.tsx.snap
@@ -8,12 +8,16 @@ exports[`<ThirdPartyMemberInfo /> should render invite 1`] = `
     <div
       class="mx_BaseCard_header"
     >
-      <p
-        class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title"
-        role="heading"
+      <div
+        class="mx_BaseCard_header_title"
       >
-        Profile
-      </p>
+        <p
+          class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title_heading"
+          role="heading"
+        >
+          Profile
+        </p>
+      </div>
       <button
         class="_icon-button_bh2qc_17 _subtle-bg_bh2qc_38"
         data-testid="base-card-close-button"
@@ -77,12 +81,16 @@ exports[`<ThirdPartyMemberInfo /> should render invite when room in not availabl
     <div
       class="mx_BaseCard_header"
     >
-      <p
-        class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title"
-        role="heading"
+      <div
+        class="mx_BaseCard_header_title"
       >
-        Profile
-      </p>
+        <p
+          class="_typography_yh5dq_162 _font-body-md-medium_yh5dq_69 mx_BaseCard_header_title_heading"
+          role="heading"
+        >
+          Profile
+        </p>
+      </div>
       <button
         class="_icon-button_bh2qc_17 _subtle-bg_bh2qc_38"
         data-testid="base-card-close-button"