diff --git a/material/overrides/main.html b/material/overrides/main.html
index 5afd4d59c..4204b1c5f 100644
--- a/material/overrides/main.html
+++ b/material/overrides/main.html
@@ -14,6 +14,9 @@
     <strong>Twitter</strong>
   </a>
 {% endblock %}
+{% block content %}
+  {% include "overrides/partials/content.html" %}
+{% endblock %}
 {% block scripts %}
   {{ super() }}
   <script src="{{ 'overrides/assets/javascripts/bundle.641d98f2.min.js' | url }}"></script>
diff --git a/material/overrides/partials/content.html b/material/overrides/partials/content.html
new file mode 100644
index 000000000..4a1aee30f
--- /dev/null
+++ b/material/overrides/partials/content.html
@@ -0,0 +1,26 @@
+{#-
+  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 %}
+{% if not "\x3ch1" in page.content %}
+  <h1>{{ page.title | d(config.site_name, true)}}</h1>
+{% endif %}
+{{ page.content }}
+{% if page and page.meta and (
+  page.meta.git_revision_date_localized or
+  page.meta.revision_date
+) %}
+  {% include "partials/source-file.html" %}
+{% endif %}
diff --git a/material/partials/content.html b/material/partials/content.html
index eb9eed6c2..4b1cd7cce 100644
--- a/material/partials/content.html
+++ b/material/partials/content.html
@@ -2,9 +2,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">
-  {% include ".icons/material/pencil.svg" %}
-</a>
+  <a href="{{ page.edit_url }}" title="{{ lang.t('edit.link.title') }}" class="md-content__button md-icon">
+    {% include ".icons/material/pencil.svg" %}
+  </a>
 {% endif %}
 {% if "tags" in config.plugins %}
   {% include "partials/tags.html" %}
diff --git a/mkdocs.yml b/mkdocs.yml
index 18a030129..cf0b45c7b 100755
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -29,7 +29,6 @@ site_description: >-
 # Repository
 repo_name: squidfunk/mkdocs-material
 repo_url: https://github.com/squidfunk/mkdocs-material
-edit_uri: ""
 
 # Copyright
 copyright: Copyright &copy; 2016 - 2022 Martin Donath
diff --git a/src/overrides/main.html b/src/overrides/main.html
index 88a14e8f7..5aeb7e294 100644
--- a/src/overrides/main.html
+++ b/src/overrides/main.html
@@ -43,6 +43,11 @@
   </a>
 {% endblock %}
 
+<!-- Content -->
+{% block content %}
+  {% include "overrides/partials/content.html" %}
+{% endblock %}
+
 <!-- Theme-related JavaScript -->
 {% block scripts %}
   {{ super() }}
diff --git a/src/overrides/partials/content.html b/src/overrides/partials/content.html
new file mode 100644
index 000000000..45e6c4070
--- /dev/null
+++ b/src/overrides/partials/content.html
@@ -0,0 +1,66 @@
+<!--
+  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 %}
+
+<!-- Tags -->
+{% if "tags" in config.plugins %}
+  {% include "partials/tags.html" %}
+{% endif %}
+
+<!--
+  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.
+-->
+{% if not "\x3ch1" in page.content %}
+  <h1>{{ page.title | d(config.site_name, true)}}</h1>
+{% endif %}
+
+<!-- Markdown content -->
+{{ page.content }}
+
+<!-- Source file information -->
+{% if page and page.meta and (
+  page.meta.git_revision_date_localized or
+  page.meta.revision_date
+) %}
+  {% include "partials/source-file.html" %}
+{% endif %}
diff --git a/src/partials/content.html b/src/partials/content.html
index 4d7f96f14..a46570045 100644
--- a/src/partials/content.html
+++ b/src/partials/content.html
@@ -22,13 +22,13 @@
 
 <!-- Edit button -->
 {% if page.edit_url %}
-<a
-  href="{{ page.edit_url }}"
-  title="{{ lang.t('edit.link.title') }}"
-  class="md-content__button md-icon"
->
-  {% include ".icons/material/pencil.svg" %}
-</a>
+  <a
+    href="{{ page.edit_url }}"
+    title="{{ lang.t('edit.link.title') }}"
+    class="md-content__button md-icon"
+  >
+    {% include ".icons/material/pencil.svg" %}
+  </a>
 {% endif %}
 
 <!-- Tags -->