diff --git a/material/overrides/partials/actions.html b/material/overrides/partials/actions.html
new file mode 100644
index 000000000..a31b0b725
--- /dev/null
+++ b/material/overrides/partials/actions.html
@@ -0,0 +1,13 @@
+{#-
+  This file was automatically generated - do not edit
+-#}
+{% if page.edit_url %}
+  {% set edit = "https://github.com/squidfunk/mkdocs-material/edit" %}
+  {% set view = "https://raw.githubusercontent.com/squidfunk/mkdocs-material" %}
+  <a href="{{ page.edit_url }}" title="{{ lang.t('edit.link.title') }}" class="md-content__button md-icon">
+    {% include ".icons/material/file-edit-outline.svg" %}
+  </a>
+  <a href="{{ page.edit_url | replace(edit, view) }}" title="View source of this page" class="md-content__button md-icon">
+    {% include ".icons/material/file-eye-outline.svg" %}
+  </a>
+{% endif %}
diff --git a/material/overrides/partials/content.html b/material/overrides/partials/content.html
index 3ce64ce8b..10acfc0cc 100644
--- a/material/overrides/partials/content.html
+++ b/material/overrides/partials/content.html
@@ -1,19 +1,10 @@
 {#-
   This file was automatically generated - do not edit
 -#}
-{% if page.edit_url %}
-  {% set edit = "https://github.com/squidfunk/mkdocs-material/edit" %}
-  {% set view = "https://raw.githubusercontent.com/squidfunk/mkdocs-material" %}
-  <a href="{{ page.edit_url }}" title="{{ lang.t('edit.link.title') }}" class="md-content__button md-icon">
-    {% include ".icons/material/file-edit-outline.svg" %}
-  </a>
-  <a href="{{ page.edit_url | replace(edit, view) }}" title="View source of this page" class="md-content__button md-icon">
-    {% include ".icons/material/file-eye-outline.svg" %}
-  </a>
-{% endif %}
 {% if "tags" in config.plugins %}
   {% include "partials/tags.html" %}
 {% endif %}
+{% include "overrides/partials/actions.html" %}
 {% if not "\x3ch1" in page.content %}
   <h1>{{ page.title | d(config.site_name, true)}}</h1>
 {% endif %}
diff --git a/material/partials/actions.html b/material/partials/actions.html
new file mode 100644
index 000000000..2c33c0249
--- /dev/null
+++ b/material/partials/actions.html
@@ -0,0 +1,9 @@
+{#-
+  This file was automatically generated - do not edit
+-#}
+{% if page.edit_url %}
+  <a href="{{ page.edit_url }}" title="{{ lang.t('edit.link.title') }}" class="md-content__button md-icon">
+    {% set icon = config.theme.icon.edit or "material/pencil" %}
+    {% include ".icons/" ~ icon ~ ".svg" %}
+  </a>
+{% endif %}
diff --git a/material/partials/content.html b/material/partials/content.html
index 11b7581b4..cff00de2a 100644
--- a/material/partials/content.html
+++ b/material/partials/content.html
@@ -1,15 +1,10 @@
 {#-
   This file was automatically generated - do not edit
 -#}
-{% if page.edit_url %}
-  <a href="{{ page.edit_url }}" title="{{ lang.t('edit.link.title') }}" class="md-content__button md-icon">
-    {% set icon = config.theme.icon.edit or "material/pencil" %}
-    {% include ".icons/" ~ icon ~ ".svg" %}
-  </a>
-{% endif %}
 {% if "tags" in config.plugins %}
   {% include "partials/tags.html" %}
 {% endif %}
+{% include "partials/actions.html" %}
 {% if not "\x3ch1" in page.content %}
   <h1>{{ page.title | d(config.site_name, true)}}</h1>
 {% endif %}
diff --git a/src/overrides/partials/actions.html b/src/overrides/partials/actions.html
new file mode 100644
index 000000000..e422b2750
--- /dev/null
+++ b/src/overrides/partials/actions.html
@@ -0,0 +1,41 @@
+<!--
+  Copyright (c) 2016-2022 Martin Donath <martin.donath@squidfunk.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to
+  deal in the Software without restriction, including without limitation the
+  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+  sell copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+  IN THE SOFTWARE.
+-->
+
+<!-- Edit and view button -->
+{% if page.edit_url %}
+  {% set edit = "https://github.com/squidfunk/mkdocs-material/edit" %}
+  {% set view = "https://raw.githubusercontent.com/squidfunk/mkdocs-material" %}
+  <a
+    href="{{ page.edit_url }}"
+    title="{{ lang.t('edit.link.title') }}"
+    class="md-content__button md-icon"
+  >
+    {% include ".icons/material/file-edit-outline.svg" %}
+  </a>
+  <a
+    href="{{ page.edit_url | replace(edit, view) }}"
+    title="View source of this page"
+    class="md-content__button md-icon"
+  >
+    {% include ".icons/material/file-eye-outline.svg" %}
+  </a>
+{% endif %}
diff --git a/src/overrides/partials/content.html b/src/overrides/partials/content.html
index 0e0b7fb06..b954431ad 100644
--- a/src/overrides/partials/content.html
+++ b/src/overrides/partials/content.html
@@ -20,31 +20,14 @@
   IN THE SOFTWARE.
 -->
 
-<!-- Edit and view button -->
-{% if page.edit_url %}
-  {% set edit = "https://github.com/squidfunk/mkdocs-material/edit" %}
-  {% set view = "https://raw.githubusercontent.com/squidfunk/mkdocs-material" %}
-  <a
-    href="{{ page.edit_url }}"
-    title="{{ lang.t('edit.link.title') }}"
-    class="md-content__button md-icon"
-  >
-    {% include ".icons/material/file-edit-outline.svg" %}
-  </a>
-  <a
-    href="{{ page.edit_url | replace(edit, view) }}"
-    title="View source of this page"
-    class="md-content__button md-icon"
-  >
-    {% include ".icons/material/file-eye-outline.svg" %}
-  </a>
-{% endif %}
-
 <!-- Tags -->
 {% if "tags" in config.plugins %}
   {% include "partials/tags.html" %}
 {% endif %}
 
+<!-- Actions -->
+{% include "overrides/partials/actions.html" %}
+
 <!--
   Hack: check whether the content contains a h1 headline. If it doesn't, the
   page title (or respectively site name) is used as the main headline.
@@ -53,7 +36,7 @@
   <h1>{{ page.title | d(config.site_name, true)}}</h1>
 {% endif %}
 
-<!-- Markdown content -->
+<!-- Page content -->
 {{ page.content }}
 
 <!-- Source file information -->
diff --git a/src/partials/actions.html b/src/partials/actions.html
new file mode 100644
index 000000000..7c0fcc553
--- /dev/null
+++ b/src/partials/actions.html
@@ -0,0 +1,33 @@
+<!--
+  Copyright (c) 2016-2022 Martin Donath <martin.donath@squidfunk.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to
+  deal in the Software without restriction, including without limitation the
+  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+  sell copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+  IN THE SOFTWARE.
+-->
+
+<!-- Edit button -->
+{% if page.edit_url %}
+  <a
+    href="{{ page.edit_url }}"
+    title="{{ lang.t('edit.link.title') }}"
+    class="md-content__button md-icon"
+  >
+    {% set icon = config.theme.icon.edit or "material/pencil" %}
+    {% include ".icons/" ~ icon ~ ".svg" %}
+  </a>
+{% endif %}
diff --git a/src/partials/content.html b/src/partials/content.html
index 58f798b02..f3b045555 100644
--- a/src/partials/content.html
+++ b/src/partials/content.html
@@ -20,23 +20,14 @@
   IN THE SOFTWARE.
 -->
 
-<!-- Edit button -->
-{% if page.edit_url %}
-  <a
-    href="{{ page.edit_url }}"
-    title="{{ lang.t('edit.link.title') }}"
-    class="md-content__button md-icon"
-  >
-    {% set icon = config.theme.icon.edit or "material/pencil" %}
-    {% include ".icons/" ~ icon ~ ".svg" %}
-  </a>
-{% endif %}
-
 <!-- Tags -->
 {% if "tags" in config.plugins %}
   {% include "partials/tags.html" %}
 {% endif %}
 
+<!-- Actions -->
+{% include "partials/actions.html" %}
+
 <!--
   Hack: check whether the content contains a h1 headline. If it doesn't, the
   page title (or respectively site name) is used as the main headline.
@@ -45,7 +36,7 @@
   <h1>{{ page.title | d(config.site_name, true)}}</h1>
 {% endif %}
 
-<!-- Markdown content -->
+<!-- Page content -->
 {{ page.content }}
 
 <!-- Source file information -->