diff --git a/source/_includes/edit_github.html b/source/_includes/edit_github.html
deleted file mode 100644
index 4316dffe242..00000000000
--- a/source/_includes/edit_github.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% if page.hide_github_edit != true %}
-<div class="material-card text feedback">
-  <b>Help us to improve our documentation</b><br />
-  Suggest an edit to this page, or provide/view feedback for this page.
-  <div class="links">
-    <a
-      href="{{ site.netlify.repository_url }}/tree/{{ site.netlify.head }}/source/{{ page.path }}" target="_blank"
-      ><i class="icon-edit" /> Edit</a
-    >
-    <a
-      href="{{ site.netlify.repository_url }}/issues/new?template=feedback.yml&url={{ site.netlify.url | url_encode }}{{ page.url | url_encode }}&version={{ site.current_major_version }}.{{
-        site.current_minor_version }}.{{ site.current_patch_version }}&labels={{ site.netlify.branch }}" target="_blank"
-      ><i class="icon-comment" /> Provide feedback</a
-    >
-    <a
-      href="{{ site.netlify.repository_url }}/issues?utf8=%E2%9C%93&q=%22{{ site.netlify.url | url_encode }}{{ page.url | url_encode }}%22&in=body" target="_blank"
-      ><i class="icon-comments" /> View pending feedback</a
-    >
-  </div>
-</div>
-{% endif %}
diff --git a/source/_includes/feedback.html b/source/_includes/feedback.html
new file mode 100644
index 00000000000..0201b541641
--- /dev/null
+++ b/source/_includes/feedback.html
@@ -0,0 +1,38 @@
+{% unless page.feedback == false %}
+<div class="material-card text feedback">
+  <b>Help us to improve our documentation</b><br />
+  Suggest an edit to this page, or provide/view feedback for this page.
+  <div class="links">
+    <a
+      href="{{ site.netlify.repository_url }}/tree/{{ site.netlify.head }}/source/{{ page.path }}"
+      target="_blank"
+      ><i class="icon-edit" /> Edit</a
+    >
+    {% if page.ha_domain %}
+    <a
+      href="{{ site.netlify.repository_url }}/issues/new?template=feedback.yml&url={{ site.netlify.url | url_encode }}{{ page.url | url_encode }}&version={{ site.current_major_version }}.{{
+        site.current_minor_version }}.{{ site.current_patch_version }}&labels={{ site.netlify.branch }},integration%3A%20{{ page.ha_domain }}"
+      target="_blank"
+      ><i class="icon-comment" /> Provide feedback</a
+    >
+    <a
+      href="{{ site.netlify.repository_url }}/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22integration%3A+{{ page.ha_domain }}%22"
+      target="_blank"
+      ><i class="icon-comments" /> View pending feedback</a
+    >
+    {% else %}
+    <a
+      href="{{ site.netlify.repository_url }}/issues/new?template=feedback.yml&url={{ site.netlify.url | url_encode }}{{ page.url | url_encode }}&version={{ site.current_major_version }}.{{
+        site.current_minor_version }}.{{ site.current_patch_version }}&labels={{ site.netlify.branch }}"
+      target="_blank"
+      ><i class="icon-comment" /> Provide feedback</a
+    >
+    <a
+      href="{{ site.netlify.repository_url }}/issues?utf8=%E2%9C%93&q=%22{{ page.url | url_encode }}%22&in=body"
+      target="_blank"
+      ><i class="icon-comments" /> View pending feedback</a
+    >
+    {% endif %}
+  </div>
+</div>
+{% endunless %}
diff --git a/source/_layouts/page.html b/source/_layouts/page.html
index 07fd6cfb5df..d11479071c8 100644
--- a/source/_layouts/page.html
+++ b/source/_layouts/page.html
@@ -13,6 +13,6 @@ layout: default
   <hr class="divider" />
   {% endif %}
   {{ content }}
-  
-  {% include edit_github.html %}
+
+  {% include feedback.html %}
 </article>
diff --git a/source/blue/index.html b/source/blue/index.html
index 731a2ebdb98..7d82f5baa9a 100644
--- a/source/blue/index.html
+++ b/source/blue/index.html
@@ -3,7 +3,7 @@ title: "Home Assistant Blue!"
 description: "Where style and performance meet privacy"
 sidebar: false
 is_homepage: true
-hide_github_edit: true
+feedback: false
 body_id: blue
 show_title: false
 og_image: /images/blue/blue_hero.jpg
diff --git a/source/conference/index.markdown b/source/conference/index.markdown
index 23e5b3e5dd2..651b5619abe 100644
--- a/source/conference/index.markdown
+++ b/source/conference/index.markdown
@@ -1,8 +1,7 @@
 ---
 title: Home Assistant Conference 2020
 show_title: false
-# is_homepage: true
-hide_github_edit: true
+feedback: false
 description: December 13, 2020 we will host the first online Home Assistant Conference.
 og_image: /images/conference/social.png
 ---
diff --git a/source/cookbook/index.markdown b/source/cookbook/index.markdown
index 87a5bf0ac12..1d5e4510f94 100644
--- a/source/cookbook/index.markdown
+++ b/source/cookbook/index.markdown
@@ -3,7 +3,7 @@ title: "Cookbook"
 description: "Community maintained list of different ways to use Home Assistant."
 sidebar: false
 regenerate: true
-hide_github_edit: true
+feedback: false
 ---
 
 This is a community curated list of different ways to use Home Assistant. Most
diff --git a/source/docs/index.markdown b/source/docs/index.markdown
index f074423ba76..a95282fdbb6 100644
--- a/source/docs/index.markdown
+++ b/source/docs/index.markdown
@@ -1,6 +1,7 @@
 ---
 title: "Documentation"
 description: "Documentation for Home Assistant"
+feedback: false
 ---
 
 The documentation covers beginner to advanced topics around the installation, setup, configuration, and usage of Home Assistant.
diff --git a/source/faq/index.markdown b/source/faq/index.markdown
index 641ce337d90..195c80fe474 100644
--- a/source/faq/index.markdown
+++ b/source/faq/index.markdown
@@ -2,7 +2,7 @@
 title: "FAQ"
 description: "Home Assistant's FAQ"
 regenerate: true
-hide_github_edit: true
+feedback: false
 ---
 
 This is a community curated list of frequently asked questions (FAQ) about the installation, setup, and usage of Home Assistant. If you want to get details about a term, please check the [glossary](/docs/glossary/).
@@ -23,4 +23,3 @@ This is a community curated list of frequently asked questions (FAQ) about the i
     {% endif %}
   {% endfor %}
 {% endfor %}
-
diff --git a/source/index.html b/source/index.html
index f9c571a0ea4..5c81818cab3 100644
--- a/source/index.html
+++ b/source/index.html
@@ -4,7 +4,7 @@ sidebar: false
 hero_unit: true
 is_homepage: true
 regenerate: true
-hide_github_edit: true
+feedback: false
 description:
   Open source home automation that puts local control and privacy first.
 ---
diff --git a/source/integrations/index.html b/source/integrations/index.html
index cdbf40701da..8ca9b2cd2b8 100644
--- a/source/integrations/index.html
+++ b/source/integrations/index.html
@@ -3,7 +3,7 @@ title: "Integrations"
 description: "List of the built-in integrations of Home Assistant."
 sidebar: false
 is_homepage: true
-hide_github_edit: true
+feedback: false
 body_id: components-page
 regenerate: false
 ---