diff --git a/docs/_includes/layouts/base.njk b/docs/_includes/layouts/base.njk
index a4ecabe2e7..8bc9f9f663 100644
--- a/docs/_includes/layouts/base.njk
+++ b/docs/_includes/layouts/base.njk
@@ -70,9 +70,11 @@
     </main>
 
     <div class="pre-footer">
-      <a href="https://github.com/penpot/penpot/blob/main/docs/{{ page.inputPath }}">Edit this page on GitHub</a> 
-               &nbsp;or ask a&nbsp;
-               <a href="https://penpot.app/talk-to-us" target="_blank">question</a>.
+      <div>Found an issue or want to improve this page?<br><br>
+        <a href="https://github.com/penpot/penpot/blob/main/docs/{{ page.inputPath }}">Edit this page on GitHub</a> 
+        &nbsp; · &nbsp;
+        <a href="https://github.com/penpot/penpot/issues/new/choose" target="_blank">Open an issue</a>
+      </div>
     </div>
     <footer class="footer">
       <div class="footer-inside">
diff --git a/docs/index.njk b/docs/index.njk
index ae0b36043a..ef15854588 100644
--- a/docs/index.njk
+++ b/docs/index.njk
@@ -57,5 +57,5 @@ eleventyNavigation:
 
 <div class="contact-block">
   <h2>Contact us</h2>
-  <p>Need help? <a href="https://penpot.app/talk-to-us" target="_blank">Talk to us</a> or join our <a href="https://community.penpot.app/" target="_blank">community</a>.</p>
+  <p>Write us at <a href="mailto:support@penpot.app" target="_blank">support@penpot.app</a> or join our <a href="https://community.penpot.app/" target="_blank">Community</a>.</p>
 </div>