diff --git a/src/_includes/icons/symbols/edit.svg b/src/_includes/icons/symbols/edit.svg
new file mode 100755
index 0000000000..e5b330753f
--- /dev/null
+++ b/src/_includes/icons/symbols/edit.svg
@@ -0,0 +1,5 @@
+<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.8544 6.26742L10.4403 4.85243C10.2459 4.65803 9.92761 4.65803 9.73336 4.85333L5.23324 9.3524L4.70703 12L7.35445 11.4736L11.8544 6.97454C12.0488 6.78013 12.0488 6.46182 11.8544 6.26742Z" fill="#A5B0BA"/>
+<path d="M9.00004 3.49989L5.5 0V3.49989H9.00004Z" fill="#A5B0BA"/>
+<path d="M4.31156 8.85982L8.67232 4.49996H5.50004C4.94772 4.49996 4.50011 4.05175 4.50011 3.49989V0H1.00007C0.447761 0 0 0.447161 0 0.998875V10.9999C0 11.5522 0.447761 12 1.00007 12H3.68709L4.31156 8.85982Z" fill="#A5B0BA"/>
+</svg>
diff --git a/src/_includes/icons/symbols/plus.svg b/src/_includes/icons/symbols/plus.svg
new file mode 100755
index 0000000000..9c1b54bda9
--- /dev/null
+++ b/src/_includes/icons/symbols/plus.svg
@@ -0,0 +1,3 @@
+<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 0C2.688 0 0 2.688 0 6C0 9.312 2.688 12 6 12C9.312 12 12 9.312 12 6C12 2.688 9.312 0 6 0ZM9 6.6H6.6V9H5.4V6.6H3V5.4H5.4V3H6.6V5.4H9V6.6Z" fill="#A5B0BA"/>
+</svg>
diff --git a/src/_layouts/home.html b/src/_layouts/home.html
index 5796ecd2c5..ac97f02931 100644
--- a/src/_layouts/home.html
+++ b/src/_layouts/home.html
@@ -46,7 +46,27 @@ <h1 id="{{ page.title | slugify }}" class="home__heading page__heading">
   {% include_cached navbar/nav.html %}
   {% unless page.hide-sidebar %}
   <div class="sidebar sidebar--sticky sidebar--scroll">
-    {% unless page.hide_toc %}
+    {% unless page.hide-feedback %}
+
+      <div>
+        <a href="https://github.com/segmentio/segment-docs/edit/master/src/{{ page.name }}" class="button button-hollow button-hollow--small button-hollow--gray button--xsmall flex" target="_blank">
+          <span class="button__icon">{% include icons/symbols/edit.svg %}</span>
+
+          <span class="button__text">Edit this page</span>
+        </a>
+
+        <a href="https://github.com/segmentio/segment-docs/issues/new?body=File:%20[{{ page.name }}](https://segment.com/docs/)" class="button button-hollow button-hollow--small button-hollow--gray button--xsmall" target="_blank">
+          <span class="button__icon">{% include icons/symbols/plus.svg %}</span>
+
+          <span class="button__text">Request docs change</span>
+        </a>
+      </div>
+
+      {% include_cached sidebar/feedback.html %}
+    {% endunless %}
+
+    {%- unless page.hide_toc -%}
+
       <div data-anchors-indicator data-sections="h2" data-active-class="menu-side__link--active">
         {% include_cached sidebar/menu-side.html class="menu-side" anchor_class="menu-side__link" html=content h_min=2 h_max=2 %}
       </div>
@@ -55,10 +75,6 @@ <h1 id="{{ page.title | slugify }}" class="home__heading page__heading">
     {% if page.related %}
       {% include sidebar/related-content.html items=page.related %}
     {% endif %}
-
-    {% unless page.hide-feedback %}
-      {% include_cached sidebar/feedback.html %}
-    {% endunless %}
   </div>
   {% endunless %}
 </div>
diff --git a/src/_layouts/page.html b/src/_layouts/page.html
index 716706463d..390939f6af 100644
--- a/src/_layouts/page.html
+++ b/src/_layouts/page.html
@@ -47,16 +47,32 @@ <h1 id="{{ page.title | slugify }}" class="page__heading">
 <div class="docs__sidebar stage__sidebar">
   {% include_cached navbar/nav.html %}
   <div class="sidebar sidebar--sticky sidebar--scroll">
+    {% unless page.hide-feedback %}
+      <div>
+        <a href="https://github.com/segmentio/segment-docs/edit/master/src/{{ page.path }}" class="button button-hollow button-hollow--small button-hollow--gray button--xsmall flex" target="_blank">
+          <span class="button__icon">{% include icons/symbols/edit.svg %}</span>
+
+          <span class="button__text">Edit this page</span>
+        </a>
+
+        <a href="https://github.com/segmentio/segment-docs/issues/new?body=File:%20[{{ page.path }}](https://segment.com/docs{{ page.url }})" class="button button-hollow button-hollow--small button-hollow--gray button--xsmall" target="_blank">
+          <span class="button__icon">{% include icons/symbols/plus.svg %}</span>
+
+          <span class="button__text">Request docs change</span>
+        </a>
+      </div>
+
+      {% include_cached sidebar/feedback.html %}
+    {% endunless %}
+
     {%- unless page.hide_toc -%}
       <div data-anchors-indicator data-sections="h2" data-active-class="menu-side__link--active">
         {% include_cached sidebar/menu-side.html class="menu-side" anchor_class="menu-side__link" html=content h_min=2 h_max=2 %}
       </div>
     {%- endunless -%}
+
     {% if page.related %}
       {% include sidebar/related-content.html items=page.related %}
     {% endif %}
-    {% unless page.hide-feedback %}
-      {% include_cached sidebar/feedback.html %}
-    {% endunless %}
   </div>
 </div>
diff --git a/src/_sass/components/_button-hollow.scss b/src/_sass/components/_button-hollow.scss
index 180e4a0df8..c9515b524e 100644
--- a/src/_sass/components/_button-hollow.scss
+++ b/src/_sass/components/_button-hollow.scss
@@ -1,4 +1,12 @@
 .button-hollow {
   color: color(secondary);
   padding: 12px 0;
+
+  &--gray {
+    color: color(gray-dark);
+  }
+
+  &--small {
+    padding: 8px 0;
+  }
 }
diff --git a/src/_sass/components/_button.scss b/src/_sass/components/_button.scss
index a820a4abfe..981a99a40a 100644
--- a/src/_sass/components/_button.scss
+++ b/src/_sass/components/_button.scss
@@ -18,7 +18,15 @@
 
   &__icon {
     display: inline-block;
-    vertical-align: middle;
+    vertical-align: text-bottom;
+  }
+
+  &__text {
+    padding-left: 3px;
+  }
+
+  &--xsmall {
+    font-size: 12px;
   }
 
   &--small {
@@ -27,6 +35,7 @@
     line-height: 1.14;
     padding: 9px 8px;
   }
+
   &--small-bordered {
     font-size: 14px;
     font-weight: 500;
@@ -48,6 +57,7 @@
   &--expand {
     width: 100%;
   }
+
   &--half {
     width: 50%;
   }
diff --git a/src/_sass/components/_sidebar.scss b/src/_sass/components/_sidebar.scss
index 896ff495f0..aad7b192f2 100644
--- a/src/_sass/components/_sidebar.scss
+++ b/src/_sass/components/_sidebar.scss
@@ -2,13 +2,13 @@
   $this: &;
 
   & > * + * {
-    margin-top: 32px;
-    padding-top: 32px;
-    border-top: 1px solid color(border-gray);
+    margin-top: 15px;
+    padding-top: 15px;
+    border-top: 1px solid color(border-gray-dark);
   }
 
   & > * + *:last-child {
-    padding-top: 32px;
+    padding-top: 15px;
   }
 
   &__content {