diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html
index 2cc5820c3..1fffe04cd 100644
--- a/docs/_includes/nav-home.html
+++ b/docs/_includes/nav-home.html
@@ -1,9 +1,10 @@
-<header class="bd-header" role="banner">
-  <a class="bd-header-mark hidden-xs-down" href="{{ site.baseurl }}">Bootstrap 4 Alpha</a>
-
-  <nav class="nav nav-pills bd-header-nav">
-    <a class="nav-link" href="{{ site.baseurl }}/getting-started/overview/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Docs');">Documentation</a>
-    <a class="nav-link" href="{{ site.expo }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Expo');">Expo</a>
-    <a class="nav-link" href="{{ site.blog }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');">Blog</a>
-  </nav>
+<header class="navbar navbar-sm navbar-inverse navbar-fixed-top bd-navbar" role="banner">
+  <div class="container">
+    <nav class="nav navbar-nav">
+      <a class="nav-item nav-link" href="{{ site.baseurl }}/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Bootstrap');">Bootstrap</a>
+      <a class="nav-item nav-link" href="{{ site.baseurl }}/getting-started/overview/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Docs');">Documentation</a>
+      <a class="nav-item nav-link" href="{{ site.expo }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Expo');">Expo</a>
+      <a class="nav-item nav-link" href="{{ site.blog }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');">Blog</a>
+    </nav>
+  </div>
 </header>
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 2a1d159ba..274f51f8d 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <!-- Meta, title, CSS, favicons, etc. -->
     {% include header.html %}
   </head>
   <body class="bd-docs" data-spy="scroll" data-target=".bd-sidenav-active">
@@ -11,6 +10,8 @@
       </div>
     </a>
 
+    {% include nav-home.html %}
+
     {{ content }}
 
     {% include footer.html %}
diff --git a/docs/_layouts/home.html b/docs/_layouts/home.html
index 4f61cc0f0..788ecf1dd 100644
--- a/docs/_layouts/home.html
+++ b/docs/_layouts/home.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <!-- Meta, title, CSS, favicons, etc. -->
     {% include header.html %}
   </head>
   <body class="bd-home">
@@ -11,7 +10,8 @@
       </div>
     </a>
 
-    <!-- Page content of course! -->
+    {% include nav-home.html %}
+
     {{ content }}
 
     {% include footer.html %}
diff --git a/docs/assets/css/docs.min.css b/docs/assets/css/docs.min.css
index 500c0add0..e3b396cdf 100644
--- a/docs/assets/css/docs.min.css
+++ b/docs/assets/css/docs.min.css
@@ -239,38 +239,17 @@
       color: #fff;
       background-color: rgba(0, 0, 0, 0.5); }
 
-.bd-header {
-  padding-bottom: .5rem;
-  margin-bottom: 1rem;
-  border-bottom: 1px solid rgba(255, 255, 255, 0.25); }
-  .bd-header:before,
-  .bd-header:after {
-    content: " ";
-    display: table; }
-  .bd-header:after {
-    clear: both; }
-  .bd-header .bd-header-mark {
-    float: left;
-    padding-top: .6rem;
-    padding-bottom: .6rem;
-    font-size: 1.25rem;
-    font-weight: 500; }
-
-.bd-header-nav {
-  padding-bottom: 1rem;
-  margin-bottom: 2rem;
-  border-bottom: .0625rem solid #eee; }
-  .bd-header-nav .nav-link {
-    display: inline-block;
-    padding: 1.2rem 0.75rem; }
-    .bd-header-nav .nav-link:hover {
+.bd-navbar {
+  padding-top: .25rem;
+  padding-bottom: .25rem;
+  background-color: #2a2730; }
+  .bd-navbar .nav-link {
+    color: #8e869d; }
+    .bd-navbar .nav-link.active,
+    .bd-navbar .nav-link:hover,
+    .bd-navbar .nav-link:focus {
+      color: #fff;
       background-color: transparent; }
-  @media (min-width: 34em) {
-    .bd-header-nav {
-      float: right;
-      padding-bottom: 0;
-      margin-bottom: 0;
-      border-bottom: 0; } }
 
 .bd-masthead {
   position: relative;
diff --git a/docs/assets/css/docs.min.css.map b/docs/assets/css/docs.min.css.map
index baad6da5d..3d8fe8e96 100644
Binary files a/docs/assets/css/docs.min.css.map and b/docs/assets/css/docs.min.css.map differ
diff --git a/docs/assets/scss/_homepage.scss b/docs/assets/scss/_homepage.scss
index 33a8d26f6..3f64106c9 100644
--- a/docs/assets/scss/_homepage.scss
+++ b/docs/assets/scss/_homepage.scss
@@ -29,43 +29,61 @@
 // Homepage
 //
 
-.bd-header {
-  @include clearfix;
-  padding-bottom: .5rem;
-  margin-bottom: 1rem;
-  border-bottom: 1px solid rgba(255,255,255,.25);
-
-  .bd-header-mark {
-    float: left;
-    padding-top: .6rem;
-    padding-bottom: .6rem;
-    font-size: 1.25rem;
-    font-weight: 500;
-  }
-}
-
-.bd-header-nav {
-  padding-bottom: 1rem;
-  margin-bottom: 2rem;
-  border-bottom: .0625rem solid #eee;
+.bd-navbar {
+  padding-top: .25rem;
+  padding-bottom: .25rem;
+  background-color: $bd-graphite;
 
   .nav-link {
-    display: inline-block;
-    padding: 1.2rem .75rem;
+    color: $bd-graphite-light;
 
-    &:hover {
+    &.active,
+    &:hover,
+    &:focus {
+      color: #fff;
       background-color: transparent;
     }
   }
-
-  @include media-breakpoint-up(sm) {
-    float: right;
-    padding-bottom: 0;
-    margin-bottom: 0;
-    border-bottom: 0;
-  }
 }
 
+//
+// .bd-header {
+//   @include clearfix;
+//   padding-bottom: .5rem;
+//   margin-bottom: 1rem;
+//   border-bottom: 1px solid rgba(255,255,255,.25);
+//
+//   .bd-header-mark {
+//     float: left;
+//     padding-top: .6rem;
+//     padding-bottom: .6rem;
+//     font-size: 1.25rem;
+//     font-weight: 500;
+//   }
+// }
+//
+// .bd-header-nav {
+//   padding-bottom: 1rem;
+//   margin-bottom: 2rem;
+//   border-bottom: .0625rem solid #eee;
+//
+//   .nav-link {
+//     display: inline-block;
+//     padding: 1.2rem .75rem;
+//
+//     &:hover {
+//       background-color: transparent;
+//     }
+//   }
+//
+//   @include media-breakpoint-up(sm) {
+//     float: right;
+//     padding-bottom: 0;
+//     margin-bottom: 0;
+//     border-bottom: 0;
+//   }
+// }
+
 
 //
 // Masthead (headings and download button)
diff --git a/docs/index.html b/docs/index.html
index dadad0876..212e323c6 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -5,7 +5,6 @@ title: Bootstrap &middot; The world's most popular mobile-first and responsive f
 
 <main class="bd-masthead" id="content" role="main">
   <div class="container">
-    {% include nav-home.html %}
 
     <span class="bd-booticon outline">B</span>
     <p class="lead">Bootstrap is the most popular HTML, CSS, and JS framework for developing responsive, mobile first projects on the web.</p>
