diff --git a/docs/gridsome.config.js b/docs/gridsome.config.js
index b4c0ae5d..8a44a952 100644
--- a/docs/gridsome.config.js
+++ b/docs/gridsome.config.js
@@ -36,6 +36,7 @@ function tableWrapper() {
 module.exports = {
   siteName: 'tiptap',
   titleTemplate: '%s | tiptap',
+  icon: './src/favicon.svg',
   port: 3000,
   plugins: [
     {
diff --git a/docs/src/components/PageFooter/index.vue b/docs/src/components/PageFooter/index.vue
new file mode 100644
index 00000000..3eaa22ff
--- /dev/null
+++ b/docs/src/components/PageFooter/index.vue
@@ -0,0 +1,133 @@
+<template>
+  <footer class="page-footer">
+    <div class="page-footer__section">
+      <div class="page-footer__column">
+        <svg
+          width="32"
+          height="32"
+          viewBox="0 0 32 32"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            fill-rule="evenodd"
+            clip-rule="evenodd"
+            d="M15.9999 1C13.2726 1 10.7152 1.72789 8.51156 3H23.4883C21.2846 1.72789 18.7273 1 15.9999 1ZM26.198 5H5.80177C5.14307 5.61097 4.53933 6.28039 3.99881 7H28.001C27.4605 6.28039 26.8568 5.61097 26.198 5ZM29.2698 9H2.73C2.39138 9.6406 2.09779 10.3087 1.85344 11H30.1464C29.902 10.3087 29.6084 9.6406 29.2698 9ZM30.6999 13H1.29996C1.16756 13.6523 1.07748 14.32 1.03271 15H30.9671C30.9223 14.32 30.8323 13.6523 30.6999 13ZM30.9671 17H1.03271C1.07748 17.68 1.16756 18.3477 1.29996 19H30.6999C30.8323 18.3477 30.9223 17.68 30.9671 17ZM30.1464 21H1.85344C2.09779 21.6913 2.39138 22.3594 2.73 23H29.2698C29.6084 22.3594 29.902 21.6913 30.1464 21ZM28.001 25H3.99881C4.53933 25.7196 5.14307 26.389 5.80177 27H26.198C26.8568 26.389 27.4605 25.7196 28.001 25ZM23.4883 29H8.51156C10.7152 30.2721 13.2726 31 15.9999 31C18.7273 31 21.2846 30.2721 23.4883 29Z"
+            fill="currentColor"
+          />
+        </svg>
+      </div>
+    </div>
+
+    <div class="page-footer__section">
+      <div class="page-footer__column">
+        <h3>
+          Legal
+        </h3>
+        <ul>
+          <li>
+            <g-link to="/impressum">
+              Impressum
+            </g-link>
+          </li>
+          <li>
+            <g-link to="/privacy-policy">
+              Privacy Policy
+            </g-link>
+          </li>
+        </ul>
+      </div>
+
+      <div class="page-footer__column">
+        <h3>
+          Community
+        </h3>
+        <ul>
+          <li>
+            <g-link to="https://github.com/ueberdosis/tiptap-next">
+              GitHub
+            </g-link>
+          </li>
+          <li>
+            <g-link to="https://twitter.com/tiptap_editor">
+              Twitter
+            </g-link>
+          </li>
+        </ul>
+      </div>
+
+      <div class="page-footer__column">
+        <h3>
+          Links
+        </h3>
+        <ul>
+          <li>
+            <g-link to="/experiments">
+              Experiments
+            </g-link>
+          </li>
+          <li>
+            <g-link to="https://v1.tiptap.dev">
+              Docs for tiptap 1.x
+            </g-link>
+          </li>
+        </ul>
+      </div>
+
+      <div class="page-footer__column">
+        <h3>
+          Licence
+        </h3>
+        <ul>
+          <li>
+            MIT
+          </li>
+        </ul>
+      </div>
+
+      <div class="page-footer__column">
+        <a :href="editLink" target="_blank">Edit this page on GitHub</a>
+      </div>
+    </div>
+
+    <div class="page-footer__section">
+      <div class="page-footer__small-text text">
+        <p>
+          Made with ♥️ by <a href="https://twitter.com/_ueberdosis">überdosis</a>
+          &middot;
+          Based on <a href="https://prosemirror.net/">ProseMirror by Marijn Haverbeke</a>
+        </p>
+      </div>
+    </div>
+  </footer>
+</template>
+
+<script>
+export default {
+  computed: {
+    currentPath() {
+      return this.$route.matched[0].path
+    },
+
+    editLink() {
+      const { currentPath } = this
+
+      if (process.env.NODE_ENV === 'development') {
+        if (currentPath === '') {
+          return `vscode://file${this.cwd}/src/pages/index.vue`
+        }
+
+        return `vscode://file${this.cwd}/src/docPages${currentPath}.md`
+      }
+
+      if (currentPath === '') {
+        return 'https://github.com/ueberdosis/tiptap-next/blob/main/docs/src/pages/index.vue'
+      }
+
+      return `https://github.com/ueberdosis/tiptap-next/blob/main/docs/src/docPages${currentPath}.md`
+    },
+  },
+}
+</script>
+
+<style lang="scss" src="./style.scss" scoped></style>
diff --git a/docs/src/components/PageFooter/style.scss b/docs/src/components/PageFooter/style.scss
new file mode 100644
index 00000000..3993596b
--- /dev/null
+++ b/docs/src/components/PageFooter/style.scss
@@ -0,0 +1,37 @@
+.page-footer {
+  display: flex;
+  flex-wrap: wrap;
+  background: $colorBlack;
+  color: $colorWhite;
+  flex-direction: column;
+  padding: 3rem 1rem;
+  font-size: 0.85rem;
+  overflow: hidden;
+
+  @media (min-width: 600px) {
+    padding: 3rem 2rem;
+    flex-direction: row;
+  }
+
+  &__section {
+    display: flex;
+    flex-wrap: wrap;
+    padding-bottom: 2rem;
+    margin-bottom: -1.5rem;
+  }
+
+  &__column {
+    flex: 0 0 auto;
+    padding-bottom: 1.5rem;
+    padding-right: 1.5rem;
+    width: 14rem;
+
+    ul {
+      list-style: none;
+    }
+  }
+
+  &__small-text {
+    opacity: 0.5;
+  }
+}
diff --git a/docs/src/components/PageNavigation/index.vue b/docs/src/components/PageNavigation/index.vue
index 080d3cc8..57f161d8 100644
--- a/docs/src/components/PageNavigation/index.vue
+++ b/docs/src/components/PageNavigation/index.vue
@@ -1,6 +1,7 @@
 <template>
   <btn-wrapper class="page-navigation">
     <btn
+      class="page-navigation__previous"
       type="secondary"
       icon="arrow-left"
       icon-position="before"
@@ -10,6 +11,7 @@
       {{ previousPage.title }}
     </btn>
     <btn
+      class="page-navigation__next"
       type="secondary"
       icon="arrow-right"
       :to="nextPage.redirect || nextPage.link"
diff --git a/docs/src/components/PageNavigation/style.scss b/docs/src/components/PageNavigation/style.scss
index 95a5e549..d4fb671b 100644
--- a/docs/src/components/PageNavigation/style.scss
+++ b/docs/src/components/PageNavigation/style.scss
@@ -1,3 +1,7 @@
 .page-navigation {
   justify-content: space-between;
+
+  &__next:only-child {
+    margin-left: auto;
+  }
 }
diff --git a/docs/src/demos/Examples/CollaborativeEditing/index.vue b/docs/src/demos/Examples/CollaborativeEditing/index.vue
index 488dc0e9..8c9afaf5 100644
--- a/docs/src/demos/Examples/CollaborativeEditing/index.vue
+++ b/docs/src/demos/Examples/CollaborativeEditing/index.vue
@@ -145,7 +145,7 @@ export default {
   color: #0D0D0D;
   background-color: $colorWhite;
   border: 3px solid #0D0D0D;
-  border-radius: 0.5rem;
+  border-radius: 0.75rem;
 
   &__header {
     display: flex;
diff --git a/docs/src/favicon.png b/docs/src/favicon.png
deleted file mode 100644
index e2b445d8..00000000
Binary files a/docs/src/favicon.png and /dev/null differ
diff --git a/docs/src/favicon.svg b/docs/src/favicon.svg
new file mode 100644
index 00000000..4f3d821d
--- /dev/null
+++ b/docs/src/favicon.svg
@@ -0,0 +1,14 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <style>
+    path {
+      fill: black;
+    }
+
+    @media (prefers-color-scheme: dark) {
+      path {
+        fill: white;
+      }
+    }
+  </style>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M15.9999 1C13.2726 1 10.7152 1.72789 8.51156 3H23.4883C21.2846 1.72789 18.7273 1 15.9999 1ZM26.198 5H5.80177C5.14307 5.61097 4.53933 6.28039 3.99881 7H28.001C27.4605 6.28039 26.8568 5.61097 26.198 5ZM29.2698 9H2.73C2.39138 9.6406 2.09779 10.3087 1.85344 11H30.1464C29.902 10.3087 29.6084 9.6406 29.2698 9ZM30.6999 13H1.29996C1.16756 13.6523 1.07748 14.32 1.03271 15H30.9671C30.9223 14.32 30.8323 13.6523 30.6999 13ZM30.9671 17H1.03271C1.07748 17.68 1.16756 18.3477 1.29996 19H30.6999C30.8323 18.3477 30.9223 17.68 30.9671 17ZM30.1464 21H1.85344C2.09779 21.6913 2.39138 22.3594 2.73 23H29.2698C29.6084 22.3594 29.902 21.6913 30.1464 21ZM28.001 25H3.99881C4.53933 25.7196 5.14307 26.389 5.80177 27H26.198C26.8568 26.389 27.4605 25.7196 28.001 25ZM23.4883 29H8.51156C10.7152 30.2721 13.2726 31 15.9999 31C18.7273 31 21.2846 30.2721 23.4883 29Z" fill="black"/>
+</svg>
diff --git a/docs/src/layouts/App/base.scss b/docs/src/layouts/App/base.scss
index 86032e85..68df1f91 100644
--- a/docs/src/layouts/App/base.scss
+++ b/docs/src/layouts/App/base.scss
@@ -77,10 +77,6 @@ a {
   color: inherit;
   transition: color 0.2s $ease, background-color 0.2s $ease;
   text-decoration: none;
-
-  &:hover {
-    color: $colorBlack;
-  }
 }
 
 code {
diff --git a/docs/src/layouts/App/index.vue b/docs/src/layouts/App/index.vue
index 389de183..9e141d00 100644
--- a/docs/src/layouts/App/index.vue
+++ b/docs/src/layouts/App/index.vue
@@ -98,13 +98,7 @@
       </portal>
     </div>
 
-    <footer class="app__footer">
-      <a :href="editLink" target="_blank">Edit this page on GitHub</a>
-      &middot;
-      Made with 🖤 by <a href="https://twitter.com/_ueberdosis">überdosis</a>
-      &middot;
-      Based on <a href="https://prosemirror.net/">ProseMirror by Marijn Haverbeke</a>
-    </footer>
+    <page-footer />
   </div>
 </template>
 
@@ -119,6 +113,7 @@ query {
 <script>
 import linkGroups from '@/links.yaml'
 import Icon from '@/components/Icon'
+import PageFooter from '@/components/PageFooter'
 // import GithubButton from 'vue-github-button'
 
 export default {
@@ -131,6 +126,7 @@ export default {
 
   components: {
     Icon,
+    PageFooter,
     // GithubButton,
   },
 
@@ -166,28 +162,6 @@ export default {
 
       return 'desktop-sidebar'
     },
-
-    currentPath() {
-      return this.$route.matched[0].path
-    },
-
-    editLink() {
-      const { currentPath } = this
-
-      if (process.env.NODE_ENV === 'development') {
-        if (currentPath === '') {
-          return `vscode://file${this.cwd}/src/pages/index.vue`
-        }
-
-        return `vscode://file${this.cwd}/src/docPages${currentPath}.md`
-      }
-
-      if (currentPath === '') {
-        return 'https://github.com/ueberdosis/tiptap-next/blob/main/docs/src/pages/index.vue'
-      }
-
-      return `https://github.com/ueberdosis/tiptap-next/blob/main/docs/src/docPages${currentPath}.md`
-    },
   },
 
   watch: {
diff --git a/docs/src/layouts/App/style.scss b/docs/src/layouts/App/style.scss
index bd3b81e7..3b15bcbb 100644
--- a/docs/src/layouts/App/style.scss
+++ b/docs/src/layouts/App/style.scss
@@ -322,9 +322,4 @@ $menuBreakPoint: 800px;
       padding: 2rem 0;
     }
   }
-
-  &__footer {
-    border-top: 1px solid rgba($colorBlack, 0.1);
-    padding: 2rem;
-  }
 }
diff --git a/docs/src/links.yaml b/docs/src/links.yaml
index 7b69f13e..5c9dfd9f 100644
--- a/docs/src/links.yaml
+++ b/docs/src/links.yaml
@@ -219,19 +219,3 @@
       link: /api/schema
     - title: Keyboard Shortcuts
       link: /api/keyboard-shortcuts
-
-- title: Links
-  items:
-    - title: 'Follow on Twitter'
-      link: https://twitter.com/tiptap_editor
-    - title: Experiments
-      link: /experiments
-    - title: Documentation for tiptap 1.x
-      link: https://v1.tiptap.dev
-
-- title: Legal
-  items:
-    - title: Impressum
-      link: /impressum
-    - title: Privacy Policy
-      link: /privacy-policy