diff --git a/website/site/layouts/partials/footer.html b/website/site/layouts/partials/footer.html
index 09af0b72..00092f41 100755
--- a/website/site/layouts/partials/footer.html
+++ b/website/site/layouts/partials/footer.html
@@ -24,5 +24,6 @@ debug: false // Set debug to true if you want to inspect the dropdown
 {{- if eq .Title "Widgets" -}} <!-- Check if is widgets page, if so, add the widget cloud js script -->
   <script src="/widgets.js"></script>
 {{- end -}}
+<script async defer src="https://buttons.github.io/buttons.js"></script>
 </body>
 </html>
diff --git a/website/site/layouts/partials/header.html b/website/site/layouts/partials/header.html
index 0327620f..5b8b1a88 100755
--- a/website/site/layouts/partials/header.html
+++ b/website/site/layouts/partials/header.html
@@ -27,8 +27,10 @@
     {{ end }}
     <header id="header" {{ if or (eq .Section "docs") (eq .Title "Docs") }}class="docs"{{ end }}>
       <div class="contained">
-        <a href="/" class="logo"><img src="/img/netlify-cms-logo.svg"/></a>
-        <a class="nav-link docs-link" href="/docs">Docs</a>
+        <div class="logo-container">
+          <a href="/" class="logo"><img src="/img/netlify-cms-logo.svg"/></a>
+          <a class="github-button" href="https://github.com/netlify/netlify-cms" data-icon="octicon-star" data-show-count="true" aria-label="Star netlify/netlify-cms on GitHub">Star</a>
+        </div>
         <a class="nav-link contributing-link" href="/docs/contributor-guide">Contributing</a>
         <a class="nav-link" href="/community">Community</a>
         <a class="utility-input">
diff --git a/website/src/css/imports/header.css b/website/src/css/imports/header.css
index 1493bc7d..847a709e 100644
--- a/website/src/css/imports/header.css
+++ b/website/src/css/imports/header.css
@@ -213,17 +213,23 @@ header {
     }
   }
 
-  .logo {
-    display: block;
-    margin: 0 auto $tiny auto;
-    width: 100%;
-
+  .logo-container {
     @media screen and (min-width: $tablet) {
+      margin-top: 10px;
       float: left;
-      margin: -4px 0 -6px 0;
-      width: initial;
+    }
+    .logo {
+      display: block;
+      margin: 0 auto $tiny auto;
+      width: 100%;
+      @media screen and (min-width: $tablet) {
+        margin: -14px 20px -6px 0;
+        width: initial;
+        float: left;
+      }
     }
   }
+
   .cta-header {
     margin-left: $micro;
   }