diff --git a/website/www/source/layouts/layout.erb b/website/www/source/layouts/layout.erb
index b6d014bac..f0d2538e5 100644
--- a/website/www/source/layouts/layout.erb
+++ b/website/www/source/layouts/layout.erb
@@ -47,7 +47,7 @@
   						<span class="bar"></span>
   					</button>
           </div>
-          <div class="buttons hidden-xs">
+          <div class="buttons">
   					<nav class="navigation-links" role="navigation">
               <ul class="main-links nav navbar-nav">
                 <li class="pill"><a href="/vmware">VMware Integration</a></li>
diff --git a/website/www/source/layouts/svg/_svg-by-hashicorp.erb b/website/www/source/layouts/svg/_svg-by-hashicorp.erb
index d89929590..607d16b1e 100644
--- a/website/www/source/layouts/svg/_svg-by-hashicorp.erb
+++ b/website/www/source/layouts/svg/_svg-by-hashicorp.erb
@@ -1,18 +1,17 @@
-<svg class="svg-by" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="-668 566 50 11" xml:space="preserve" enable-background="new -668 566 50 11">
-  <style type="text/css">
-	.st0{fill:none;stroke:#000000;stroke-width:0.75;stroke-miterlimit:10;}
-  </style>
+<svg class="svg-by" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="-1337.4 1130.1 73.8 16.1" xml:space="preserve" enable-background="new -1337.4 1130.1 73.8 16.1">
   <g>
-    <path d="M-663.3 574.4v-3.3h-3v3.4h-1.5v-8h1.5v3.3h3v-3.4h1.5v8H-663.3z"/>
-    <path d="M-655.7 574.4h-1.2l-0.1-0.4c-0.5 0.3-1.2 0.5-1.7 0.5 -1.1 0-1.5-0.7-1.5-1.7 0-1.2 0.5-1.6 1.7-1.6h1.4v-0.6c0-0.6-0.2-0.9-1.1-0.9 -0.5 0-1.1 0.1-1.6 0.2l-0.3-1.2c0.6-0.2 1.4-0.3 2-0.3 1.8 0 2.4 0.6 2.4 2.1C-655.7 570.5-655.7 574.4-655.7 574.4zM-657.2 572.2h-1.1c-0.5 0-0.6 0.1-0.6 0.6 0 0.4 0.1 0.6 0.6 0.6 0.4 0 0.8-0.1 1.1-0.3V572.2z"/>
-    <path d="M-652.3 574.6c-0.6 0-1.5-0.1-2-0.3l0.2-1.1c0.5 0.1 1.1 0.3 1.7 0.3s0.7-0.1 0.7-0.6c0-0.4-0.1-0.5-1-0.8 -1.4-0.3-1.6-0.7-1.6-1.8 0-1.2 0.5-1.7 2.2-1.7 0.5 0 1.2 0.1 1.8 0.2l-0.1 1.2c-0.4-0.1-1.2-0.2-1.6-0.2 -0.6 0-0.7 0.1-0.7 0.5 0 0.5 0 0.5 0.8 0.7 1.6 0.4 1.8 0.6 1.8 1.8C-650.2 573.9-650.6 574.6-652.3 574.6z"/>
-    <path d="M-645.3 574.4v-4c0-0.3-0.1-0.5-0.5-0.5s-1 0.2-1.5 0.5v4.1h-1.5v-8.3l1.5-0.2v3c0.6-0.3 1.5-0.6 2.1-0.6 1 0 1.3 0.7 1.3 1.7v4.2L-645.3 574.4 -645.3 574.4z"/>
-    <path d="M-642.3 567.8v-1.7h1.5v1.7H-642.3zM-642.3 574.4v-5.8h1.5v5.8H-642.3z"/>
-    <path d="M-639.4 572.3v-1.6c0-1.6 0.7-2.2 2.5-2.2 0.4 0 1 0.1 1.4 0.2l-0.2 1.2c-0.4-0.1-0.9-0.2-1.2-0.2 -0.8 0-1.1 0.3-1.1 1v1.6c0 0.7 0.3 1 1.1 1 0.4 0 0.8 0 1.2-0.2l0.2 1.2c-0.4 0.1-0.9 0.2-1.4 0.2C-638.7 574.6-639.4 573.9-639.4 572.3z"/>
-    <path d="M-631.9 574.6c-2 0-2.5-1.1-2.5-2.3v-1.5c0-1.2 0.5-2.3 2.5-2.3s2.5 1.1 2.5 2.3v1.5C-629.4 573.4-629.9 574.6-631.9 574.6zM-631.9 569.7c-0.8 0-1.1 0.3-1.1 1v1.6c0 0.7 0.3 1 1.1 1 0.8 0 1.1-0.3 1.1-1v-1.6C-630.8 570.1-631.1 569.7-631.9 569.7z"/>
-    <path d="M-624.9 569.8c-0.6 0.3-1 0.5-1.5 0.9v3.8h-1.5v-5.9h1.2l0.1 0.6c0.3-0.2 1-0.6 1.5-0.8L-624.9 569.8z"/>
-    <path d="M-619 572.5c0 1.3-0.6 2.1-1.9 2.1 -0.5 0-1.1-0.1-1.6-0.2v2.4l-1.4 0.2v-8.4h1.2l0.1 0.5c0.5-0.4 1.1-0.6 1.8-0.6 1.2 0 1.8 0.7 1.8 2V572.5zM-622.5 573.1c0.4 0.1 0.9 0.2 1.3 0.2 0.5 0 0.7-0.3 0.7-0.8v-2c0-0.5-0.2-0.7-0.7-0.7s-1 0.2-1.3 0.5V573.1z"/>
+    <path d="M-1329.6 1142.4v-4.9h-4.3v4.9h-2.2v-11.6h2.2v4.8h4.3v-4.8h2.2v11.6H-1329.6z"/>
+    <path d="M-1318.8 1142.4h-1.7l-0.2-0.6c-0.8 0.5-1.7 0.8-2.5 0.8 -1.6 0-2.2-1.1-2.2-2.5 0-1.7 0.8-2.4 2.5-2.4h2v-0.9c0-0.9-0.3-1.3-1.6-1.3 -0.8 0-1.6 0.1-2.4 0.3l-0.3-1.6c0.8-0.2 2-0.4 2.9-0.4 2.7 0 3.5 0.9 3.5 3.1V1142.4zM-1321 1139.2h-1.6c-0.7 0-0.9 0.2-0.9 0.8 0 0.6 0.2 0.9 0.9 0.9 0.6 0 1.2-0.2 1.6-0.4V1139.2z"/>
+    <path d="M-1314.2 1142.6c-0.9 0-2.1-0.2-2.9-0.5l0.3-1.6c0.7 0.2 1.7 0.4 2.5 0.4 0.9 0 1.1-0.2 1.1-0.9 0-0.5-0.1-0.8-1.5-1.1 -2.1-0.5-2.3-1-2.3-2.7s0.8-2.5 3.2-2.5c0.8 0 1.8 0.1 2.5 0.3l-0.2 1.7c-0.6-0.1-1.7-0.2-2.3-0.2 -0.9 0-1.1 0.2-1.1 0.7 0 0.7 0.1 0.7 1.2 1 2.4 0.6 2.6 0.9 2.6 2.7C-1311.1 1141.6-1311.6 1142.6-1314.2 1142.6z"/>
+    <path d="M-1304.3 1142.4v-5.9c0-0.5-0.2-0.7-0.7-0.7s-1.4 0.3-2.2 0.7v5.9h-2.1v-12l2.1-0.3v4.4c0.9-0.5 2.2-0.8 3.1-0.8 1.4 0 1.9 1 1.9 2.5v6.2H-1304.3L-1304.3 1142.4z"/>
+    <path d="M-1300.1 1132.7v-2.5h2.1v2.5H-1300.1zM-1300.1 1142.4v-8.5h2.1v8.5H-1300.1z"/>
+    <path d="M-1296 1134c0-2.1 1.2-3.4 4.1-3.4 1.1 0 2.2 0.1 3.2 0.4l-0.2 1.9c-0.9-0.2-2-0.3-2.8-0.3 -1.5 0-2 0.5-2 1.8v4.5c0 1.2 0.5 1.8 2 1.8 0.8 0 1.9-0.1 2.8-0.3l0.2 1.9c-1 0.2-2.1 0.4-3.2 0.4 -2.9 0-4.1-1.2-4.1-3.4V1134z"/>
+    <path d="M-1283.8 1142.6c-2.9 0-3.7-1.6-3.7-3.3v-2.1c0-1.7 0.8-3.4 3.7-3.4s3.7 1.6 3.7 3.4v2.1C-1280.1 1141-1280.9 1142.6-1283.8 1142.6zM-1283.8 1135.6c-1.1 0-1.6 0.5-1.6 1.5v2.3c0 1 0.4 1.5 1.6 1.5 1.1 0 1.6-0.5 1.6-1.5v-2.4C-1282.2 1136.1-1282.7 1135.6-1283.8 1135.6z"/>
+    <path d="M-1273.9 1135.7c-0.8 0.4-1.5 0.8-2.3 1.2v5.5h-2.1v-8.5h1.8l0.1 0.9c0.5-0.3 1.5-0.9 2.2-1.1L-1273.9 1135.7z"/>
+    <path d="M-1265.6 1139.6c0 1.9-0.8 3-2.8 3 -0.8 0-1.6-0.1-2.3-0.2v3.5l-2.1 0.3V1134h1.7l0.2 0.7c0.8-0.5 1.6-0.9 2.7-0.9 1.7 0 2.6 1 2.6 2.9V1139.6L-1265.6 1139.6zM-1270.6 1140.5c0.6 0.1 1.3 0.2 1.9 0.2 0.8 0 1.1-0.4 1.1-1.1v-3c0-0.7-0.3-1.1-1-1.1 -0.7 0-1.4 0.3-1.9 0.8L-1270.6 1140.5 -1270.6 1140.5z"/>
+  </g>
+  <g class="svg-bg-line">
+    <rect x="-1268" y="1145" width="4.3" height="1"/>
+    <rect x="-1338" y="1145" width="63" height="1"/>
   </g>
-  <line class="st0" x1="-620.9" y1="575.9" x2="-618" y2="575.9"/>
-  <line class="st0" x1="-668" y1="575.9" x2="-625.2" y2="575.9"/>
 </svg>
diff --git a/website/www/source/stylesheets/_header.less b/website/www/source/stylesheets/_header.less
index 8c93f2f63..dfa8e7da1 100644
--- a/website/www/source/stylesheets/_header.less
+++ b/website/www/source/stylesheets/_header.less
@@ -44,24 +44,20 @@
 
       svg{
         path,
-        polygon{
+        polygon,
+        rect{
           fill: @project-link-color;
         }
-        line{
-          stroke: @project-link-color;
-        }
       }
 
       &:hover{
         color: black;
         svg{
           path,
-          polygon{
+          polygon,
+          rect{
             fill: black;
           }
-          line{
-            stroke: black;
-          }
         }
       }
 
@@ -72,6 +68,7 @@
   }
 
   .buttons{
+    display: none;
     margin-top: 2px; //baseline everything
 
     .navigation-links{
@@ -113,11 +110,19 @@
   }
 }
 
-@media (max-width: 768px) {
-  .hidden-xs{
+@media (min-width: 768px) {
+  .navbar-toggle{
     display: none;
   }
 
+  #header{
+    .buttons{
+      display: block;
+    }
+  }
+}
+
+@media (max-width: 768px) {
   .navbar-header{
     margin-left: 15px;
   }
diff --git a/website/www/source/stylesheets/_mobile-nav.less b/website/www/source/stylesheets/_mobile-nav.less
index f1a6cf95d..55e5db76b 100644
--- a/website/www/source/stylesheets/_mobile-nav.less
+++ b/website/www/source/stylesheets/_mobile-nav.less
@@ -41,9 +41,3 @@
     }
   }
 }
-
-@media (max-width: 768px) {
-  #header {
-    position: relative;
-  }
-}
diff --git a/website/www/source/stylesheets/_nav.less b/website/www/source/stylesheets/_nav.less
deleted file mode 100644
index 64fdd2ed8..000000000
--- a/website/www/source/stylesheets/_nav.less
+++ /dev/null
@@ -1,118 +0,0 @@
-// roll your own nav
-
-nav {
-  width: 100%;
-  font-size: 15px;
-  text-transform: uppercase;
-  .museo-sans-light;
-  color: @medium-gray-text;
-  height: 80px;
-  position: fixed;
-  top: 0;
-  left: 0;
-  background-color: @white;
-  z-index: 9999999999;
-  
-  &.docs {
-    background: @gray-background;
-  }
-
-  .logo {
-    font-size: 0;
-    .img-retina('/images/logo-header.png', @project-logo-width, @project-logo-height, no-repeat);
-    background-position: 0, center;
-    height: @project-logo-height;
-    width: @project-logo-width;
-    margin-left: 15px;
-    &:hover{
-      opacity: .6;
-    }
-  }
-
-  .by-hashicorp{
-    &:hover{
-      svg{
-        line{
-          opacity: .4;
-        }
-      }
-    }
-  }
-
-  .by-hashicorp{
-    color: @project-link-color;
-
-    &:hover{
-      color: black;
-      svg{
-        path,
-        polygon{
-          fill: black;
-        }
-        line{
-          stroke: black;
-        }
-      }
-    }
-
-    .svg-wrap{
-      font-weight: 400;
-    }
-
-    svg{
-      path,
-      polygon{
-        fill: @project-link-color;
-      }
-      line{
-        stroke: @project-link-color;
-      }
-    }
-  }
-
-  .vagrant-docs-logo {
-    display: block;
-    text-indent: -999999px;
-    background: url(/images/logo_docs.png) no-repeat 0 0;
-    height: 70px;
-    width: 350px;
-    float: left;
-    margin: 10px 20px;
-  }
-
-  ul {
-    margin: 25px 20px;
-
-    li {
-      display: inline;
-      margin-left: 15px;
-      font-size: 15px;
-    }
-
-    li.pill {
-      background-color: #48b4fb;
-      border-radius: 50px;
-      color: #FFF;
-      padding: 10px 18px;
-    }
-  }
-
-  .active-nav {
-    color: @blue;
-  }
-
-  .contact {
-
-    &:hover {
-      background-color: @light-gray-background;
-      padding: 10px;
-      margin-right: -10px;
-      margin-left: 5px;
-      .rounded;
-    }
-
-    &:active {
-      background-color: darken(@light-gray-background, 5%);
-    }
-  }
-}
diff --git a/website/www/source/stylesheets/hashicorp-shared/_hashicorp-header.less b/website/www/source/stylesheets/hashicorp-shared/_hashicorp-header.less
index 9eb181b62..0936f8935 100755
--- a/website/www/source/stylesheets/hashicorp-shared/_hashicorp-header.less
+++ b/website/www/source/stylesheets/hashicorp-shared/_hashicorp-header.less
@@ -158,7 +158,7 @@
   display: inline-block;
   vertical-align:top;
   height: @header-height;
-  margin-left: 3px;
+  margin-left: -3px;
   padding-top: 2px;
   color: black;
   line-height: @header-height;
@@ -174,12 +174,10 @@
     font-weight: 300;
     svg{
       path,
-      polygon{
+      polygon,
+      rect{
         fill: white;
       }
-      line{
-        stroke: white;
-      }
     }
   }
 
@@ -213,18 +211,11 @@
     }
 
     path,
-    polygon{
+    polygon,
+    rect{
       fill: black;
       .transition(all 300ms ease-in);
 
-      &:hover{
-        .transition(all 300ms ease-in);
-      }
-    }
-    line{
-      stroke: black;
-      .transition(all 300ms ease-in);
-
       &:hover{
         .transition(all 300ms ease-in);
       }