diff --git a/Configuration/page.tsconfig b/Configuration/page.tsconfig
index 3979b0e..7357e03 100644
--- a/Configuration/page.tsconfig
+++ b/Configuration/page.tsconfig
@@ -1,3 +1,9 @@
 templates.typo3/cms-backend {
   1691683586 = b13/collapse:Resources/Private/TemplateOverrides
 }
+
+[typo3.branch == "12.4"]
+ templates.typo3/cms-backend {
+   1691683586 = b13/collapse:Resources/Private/TemplateOverrides12
+ }
+[end]
diff --git a/Resources/Private/TemplateOverrides/Partials/PageLayout/RecordDefault/Header.html b/Resources/Private/TemplateOverrides/Partials/PageLayout/RecordDefault/Header.html
index c100781..1376b0c 100644
--- a/Resources/Private/TemplateOverrides/Partials/PageLayout/RecordDefault/Header.html
+++ b/Resources/Private/TemplateOverrides/Partials/PageLayout/RecordDefault/Header.html
@@ -1,57 +1,59 @@
 <html
-		xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
-		xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
-		xmlns:c="http://typo3.org/ns/B13/Collapse/ViewHelpers"
-		data-namespace-typo3-fluid="true"
+	xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
+	xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
+	xmlns:c="http://typo3.org/ns/B13/Collapse/ViewHelpers"
+	data-namespace-typo3-fluid="true"
 >
-
-<div class="t3-page-ce-header {f:if(condition: '{allowEditContent} && {item.dragAndDropAllowed}', then: 't3-page-ce-header-draggable t3js-page-ce-draghandle')}">
-	<div class="t3-page-ce-header-left">
-		{item.icons -> f:format.raw()}
-		<f:if condition="{item.siteLanguage.flagIdentifier}">
-			<span class="t3-page-ce-header-icon-flag t3js-flag" title="{item.siteLanguage.title}">
-				<core:icon identifier="{item.siteLanguage.flagIdentifier}" />
-			</span>
-		</f:if>
-	</div>
-	<div class="t3-page-ce-header-title">
-		{item.contentTypeLabel}
-	</div>
-	<div class="t3-page-ce-header-right">
-		<f:if condition="{item.editable} && {allowEditContent}">
-			<div class="btn-toolbar">
-				<div class="btn-group btn-group-sm">
-					<a href="{item.editUrl}" class="btn btn-default btn-borderless" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:edit')}">
-						<core:icon identifier="actions-open" />
-					</a>
-					<f:if condition="{item.visibilityToggling}">
-						<a class="btn btn-default btn-borderless" href="{item.visibilityToggleUrl}" title="{item.visibilityToggleTitle}">
-							<core:icon identifier="actions-edit-{item.visibilityToggleIconName}" />
-						</a>
-					</f:if>
-					<f:if condition="{item.delible}">
-						<a class="btn btn-default btn-borderless t3js-modal-trigger"
-								href="{item.deleteUrl}"
-								data-severity="warning"
-								data-title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_alt_doc.xlf:label.confirm.delete_record.title')}"
-								data-bs-content="{item.deleteMessage}"
-								data-button-close-text="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:cancel')}"
-								data-button-ok-text="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf:delete')}"
-								title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:deleteItem')}">
-							<core:icon identifier="actions-edit-delete" size="small" />
-						</a>
-					</f:if>
-					<button aria-haspopup="true"
-							aria-controls="contentMenu0" aria-label="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:advancedFunctions')}"
-							class="btn btn-default btn-borderless btn-sm"
-							data-contextmenu-trigger="click"
-							data-contextmenu-table="tt_content"
-							data-contextmenu-uid="{item.record.uid}">
-						<core:icon identifier="actions-menu-alternative" />
-					</button>
-				</div>
-				<c:collapse contentElementId="{item.record.uid}" row="{item.record}" type="{item}" />
-			</div>
-		</f:if>
-	</div>
+<div class="t3-page-ce-header t3js-page-ce-header" {f:if(condition: '{allowEditContent} && {item.dragAndDropAllowed}', then: 'draggable="true"')}>
+    <div class="t3-page-ce-header-left">
+        {item.icons -> f:format.raw()}
+        <f:if condition="{item.siteLanguage.flagIdentifier}">
+            <span class="t3-page-ce-header-icon-flag t3js-flag" title="{item.siteLanguage.title}">
+                <core:icon identifier="{item.siteLanguage.flagIdentifier}" />
+            </span>
+        </f:if>
+    </div>
+    <div class="t3-page-ce-header-title">
+        {item.contentTypeLabel}
+    </div>
+    <div class="t3-page-ce-header-right">
+        <f:if condition="{item.editable} && {allowEditContent}">
+            <div class="btn-toolbar">
+                <div class="btn-group btn-group-sm">
+                    <a href="{item.editUrl}" class="btn btn-sm btn-default btn-borderless" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:edit')}">
+                        <core:icon identifier="actions-open" />
+                    </a>
+                    <f:if condition="{item.visibilityToggling}">
+                        <a class="btn btn-sm btn-default btn-borderless" href="{item.visibilityToggleUrl}" title="{item.visibilityToggleTitle}">
+                            <core:icon identifier="actions-edit-{item.visibilityToggleIconName}" />
+                        </a>
+                    </f:if>
+                    <f:if condition="{item.delible}">
+                        <a class="btn btn-default btn-borderless t3js-modal-trigger"
+                            href="{item.deleteUrl}"
+                            data-severity="warning"
+                            data-title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_alt_doc.xlf:label.confirm.delete_record.title')}"
+                            data-bs-content="{item.deleteMessage}"
+                            data-button-close-text="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:cancel')}"
+                            data-button-ok-text="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf:delete')}"
+                            title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:deleteItem')}">
+                            <core:icon identifier="actions-edit-delete" size="small" />
+                        </a>
+                    </f:if>
+                    <button type="button"
+                            aria-haspopup="true"
+                            aria-controls="contentMenu0"
+                            aria-label="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.contextMenu.open')}"
+                            class="btn btn-sm btn-default btn-borderless"
+                            data-contextmenu-trigger="click"
+                            data-contextmenu-table="{item.table}"
+                            data-contextmenu-uid="{item.record.uid}">
+                        <core:icon identifier="actions-menu-alternative" />
+                    </button>
+					<c:collapse contentElementId="{item.record.uid}" row="{item.record}" type="{item}" />
+                </div>
+            </div>
+        </f:if>
+    </div>
 </div>
+</html>
diff --git a/Resources/Private/TemplateOverrides12/Partials/PageLayout/RecordDefault/Header.html b/Resources/Private/TemplateOverrides12/Partials/PageLayout/RecordDefault/Header.html
new file mode 100644
index 0000000..0f0c99e
--- /dev/null
+++ b/Resources/Private/TemplateOverrides12/Partials/PageLayout/RecordDefault/Header.html
@@ -0,0 +1,59 @@
+<html
+    xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
+    xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
+    xmlns:c="http://typo3.org/ns/B13/Collapse/ViewHelpers"
+    data-namespace-typo3-fluid="true"
+>
+<div class="t3-page-ce-header {f:if(condition: '{allowEditContent} && {item.dragAndDropAllowed}', then: 't3-page-ce-header-draggable t3js-page-ce-draghandle')}">
+    <div class="t3-page-ce-header-left">
+        {item.icons -> f:format.raw()}
+        <f:if condition="{item.siteLanguage.flagIdentifier}">
+            <span class="t3-page-ce-header-icon-flag t3js-flag" title="{item.siteLanguage.title}">
+                <core:icon identifier="{item.siteLanguage.flagIdentifier}" />
+            </span>
+        </f:if>
+    </div>
+    <div class="t3-page-ce-header-title">
+        {item.contentTypeLabel}
+    </div>
+    <div class="t3-page-ce-header-right">
+        <f:if condition="{item.editable} && {allowEditContent}">
+            <div class="btn-toolbar">
+                <div class="btn-group btn-group-sm">
+                    <a href="{item.editUrl}" class="btn btn-default btn-borderless" title="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:edit')}">
+                        <core:icon identifier="actions-open" />
+                    </a>
+                    <f:if condition="{item.visibilityToggling}">
+                        <a class="btn btn-default btn-borderless" href="{item.visibilityToggleUrl}" title="{item.visibilityToggleTitle}">
+                            <core:icon identifier="actions-edit-{item.visibilityToggleIconName}" />
+                        </a>
+                    </f:if>
+                    <f:if condition="{item.delible}">
+                        <a class="btn btn-default btn-borderless t3js-modal-trigger"
+                            href="{item.deleteUrl}"
+                            data-severity="warning"
+                            data-title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_alt_doc.xlf:label.confirm.delete_record.title')}"
+                            data-bs-content="{item.deleteMessage}"
+                            data-button-close-text="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:cancel')}"
+                            data-button-ok-text="{f:translate(key:'LLL:EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf:delete')}"
+                            title="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:deleteItem')}">
+                            <core:icon identifier="actions-edit-delete" size="small" />
+                        </a>
+                    </f:if>
+                    <button type="button"
+                            aria-haspopup="true"
+                            aria-controls="contentMenu0"
+                            aria-label="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.contextMenu.open')}"
+                            class="btn btn-link p-0"
+                            data-contextmenu-trigger="click"
+                            data-contextmenu-table="{item.table}"
+                            data-contextmenu-uid="{item.record.uid}">
+                        <core:icon identifier="actions-menu-alternative" />
+                    </button>
+                    <c:collapse contentElementId="{item.record.uid}" row="{item.record}" type="{item}" />
+                </div>
+            </div>
+        </f:if>
+    </div>
+</div>
+</html>
