diff --git a/docs/.vuepress/theme/components/HelpCallout.vue b/docs/.vuepress/theme/components/HelpCallout.vue
new file mode 100644
index 000000000..734274056
--- /dev/null
+++ b/docs/.vuepress/theme/components/HelpCallout.vue
@@ -0,0 +1,45 @@
+<template>
+  <div class="help-callout">
+    <p><b>Help us improve this site!</b></p>
+    <p v-if="editLink">
+      <a :href="editLink" target="_blank" rel="noopener noreferrer">Edit this page</a>
+      <span v-if="issueLink">
+        or
+        <a :href="issueLink" target="_blank" rel="noopener noreferrer">open an issue</a>
+      </span>
+    </p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'HelpCallout',
+  computed: {
+    editLink() {
+      const { docsRepo, docsDir = '', docsBranch = 'main' } = this.$site.themeConfig
+      if (!docsRepo || !this.$page.relativePath) return null
+      const dir = docsDir ? docsDir.replace(/\/$/, '') + '/' : ''
+      return `https://github.com/${docsRepo}/edit/${docsBranch}/${dir}${this.$page.relativePath}`
+    },
+    issueLink() {
+      const { docsRepo } = this.$site.themeConfig
+      if (!docsRepo) return null
+      return `https://github.com/${docsRepo}/issues/new?title=${encodeURIComponent(this.$page.title)}`
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+.help-callout {
+  background-color: lighten($badgeTipColor, 95%);
+  color: lighten($textColor, 20%);
+  border-color: $badgeTipColor;
+  padding: 1rem 2rem;
+  margin-top: 3rem;
+
+  p {
+    margin: 0.5rem 0;
+  }
+}
+</style>
diff --git a/docs/.vuepress/theme/components/LegacyCallout.vue b/docs/.vuepress/theme/components/LegacyCallout.vue
deleted file mode 100644
index 19af75c7b..000000000
--- a/docs/.vuepress/theme/components/LegacyCallout.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
-  <div class="legacy-callout">
-    <p>
-      <b>Help us improve this site!</b>
-    </p>
-    <section>
-      <div class="block">
-        <ul>
-          <li>
-            <a
-              href="https://github.com/ipfs/ipfs-docs/issues/new?assignees=&labels=OKR+3%3A+Content+Improvement%2C+docs-ipfs&template=content-request.md&title=%5BCONTENT+REQUEST%5D+%28add+your+title+here%21%29"
-              target="_blank"
-              rel="noopener noreferrer"
-              >Suggest new content</a
-            >
-          </li>
-        </ul>
-      </div>
-      <div class="block">
-        <ul>
-          <li>
-            <a
-              href="https://github.com/ipfs/ipfs-docs/issues/new?assignees=&labels=OKR+3%3A+Content+Improvement%2C+docs-ipfs&template=documentation-issue.md&title=%5BDOCS+ISSUE%5D+%28add+your+title+here%21%29"
-              target="_blank"
-              rel="noopener noreferrer"
-              >Give general feedback</a
-            >
-          </li>
-        </ul>
-      </div>
-    </section>
-  </div>
-</template>
-
-<style lang="stylus" scoped>
-.legacy-callout {
-  background-color: lighten($badgeTipColor, 95%);
-  color: lighten($textColor, 20%);
-  border-color: $badgeTipColor;
-  padding: 1rem 2rem;
-  margin-top: 3rem;
-}
-
-.legacy-links a {
-  font-weight: 400;
-}
-
-section {
-  margin: 1rem 0;
-
-  ul {
-    margin: 0;
-    padding: 0;
-    list-style: none;
-
-    li {
-      margin: 0;
-      line-height: 2em;
-      padding: 0;
-    }
-  }
-}
-
-@media (min-width: $MQNarrow) {
-  section {
-    display: flex;
-
-    .block {
-      flex: 1;
-    }
-  }
-}
-</style>
diff --git a/docs/.vuepress/theme/components/Page.vue b/docs/.vuepress/theme/components/Page.vue
index 81e6cdf23..7f13ee9c3 100644
--- a/docs/.vuepress/theme/components/Page.vue
+++ b/docs/.vuepress/theme/components/Page.vue
@@ -5,13 +5,7 @@
     <Content class="theme-default-content" />
 
     <div class="content-footer" v-if="!isContentStatus">
-      <Feedback
-        class="content-feedback"
-        evtYes="information_helpful"
-        evtNo="information_not_helpful"
-      />
-      <LegacyCallout />
-      <PageEdit />
+      <HelpCallout />
       <PageNav v-bind="{ sidebarItems }" />
     </div>
 
@@ -22,20 +16,16 @@
 </template>
 
 <script>
-import PageEdit from '@parent-theme/components/PageEdit.vue'
 import PageNav from '@parent-theme/components/PageNav.vue'
 
-import Feedback from './Feedback.vue'
-import LegacyCallout from './LegacyCallout.vue'
+import HelpCallout from './HelpCallout.vue'
 import Analytics from './Analytics.vue'
 
 export default {
   name: 'Page',
   components: {
-    PageEdit,
     PageNav,
-    Feedback,
-    LegacyCallout,
+    HelpCallout,
     Analytics
   },
   props: ['sidebarItems'],
@@ -107,36 +97,10 @@ export default {
   max-width: $contentWidth;
 }
 
-.page-edit {
-  max-width: 100%;
-  padding: 2rem 2rem;
-}
-
-.content-feedback {
-  padding: 0 2rem;
-}
-
 @media (min-width: $MQMobile) {
   .content-footer {
     padding: 0 2.5rem;
     padding-top: 0;
   }
-
-  .content-feedback {
-    padding: 0;
-    margin: 0;
-  }
-
-  .page-edit {
-    padding: 2.5rem 0;
-  }
-
-  section {
-    display: flex;
-
-    .block {
-      flex: 1;
-    }
-  }
 }
 </style>