diff --git a/docs/_static/extra.css b/docs/_static/extra.css
index 846e05d9..1513daa2 100644
--- a/docs/_static/extra.css
+++ b/docs/_static/extra.css
@@ -29,7 +29,8 @@ nav {
   margin-right: auto;
   margin-left: auto;
 }
-@media (min-width: 768px) {
+
+@media (min-width: 992px) {
   #pionav {
     display: block !important;
   }
@@ -39,11 +40,7 @@ nav {
   .wy-nav-side {
     top: 50px;
   }
-  .container {
-    width: 750px;
-  }
-}
-@media (min-width: 992px) {
+
   .container {
     width: 970px;
   }
@@ -94,6 +91,7 @@ nav {
   position: relative;
   display: block;
   padding: 10px 15px;
+  font-size: 14px;
 }
 .nav > li > a:hover,
 .nav > li > a:focus {
@@ -103,6 +101,9 @@ nav {
 .nav > li > a > img {
   max-width: none;
 }
+.nav > li > a > i {
+  margin-right: 5px;
+}
 
 .navbar {
   position: relative;
diff --git a/docs/_templates/footer.html b/docs/_templates/footer.html
index 5b562649..65446636 100644
--- a/docs/_templates/footer.html
+++ b/docs/_templates/footer.html
@@ -11,16 +11,16 @@
     <nav role="navigation">
       <div>
         <ul class="nav navbar-nav">
-          <li><a href="http://platformio.org/#!/get-started"><i class="fa fa-rocket fa-lg"></i> Get Started</a></li>
-          <li><a href="http://platformio.org/#!/platforms"><i class="fa fa-laptop fa-lg"></i> Platforms</a></li>
-          <li><a href="http://platformio.org/#!/frameworks"><i class="fa fa-cogs fa-lg"></i> Frameworks</a></li>
-          <li><a href="http://platformio.org/#!/boards"><i class="fa fa-gamepad fa-lg"></i> Boards</a></li>
-          <li ><a href="http://platformio.org/#!/lib"><i class="fa fa-code fa-lg"></i> Libraries</a></li>
+          <li><a href="http://platformio.org/#!/get-started"><i class="fa fa-rocket fa-lg"></i>Get Started</a></li>
+          <li><a href="http://platformio.org/#!/platforms"><i class="fa fa-laptop fa-lg"></i>Platforms</a></li>
+          <li><a href="http://platformio.org/#!/frameworks"><i class="fa fa-cogs fa-lg"></i>Frameworks</a></li>
+          <li><a href="http://platformio.org/#!/boards"><i class="fa fa-gamepad fa-lg"></i>Boards</a></li>
+          <li ><a href="http://platformio.org/#!/lib"><i class="fa fa-code fa-lg"></i>Libraries</a></li>
         </ul>
 
         <ul class="nav navbar-nav navbar-right">
-          <li><a href="http://platformio.org/#!/who-uses"><i class="fa fa-heart-o fa-lg"></i> Who uses</a></li>
-          <li class="active"><a href="http://docs.platformio.org/"><i class="fa fa-book fa-lg"></i> Docs</a></li>
+          <li><a href="http://platformio.org/#!/who-uses"><i class="fa fa-heart-o fa-lg"></i>Who uses</a></li>
+          <li class="active"><a href="http://docs.platformio.org/"><i class="fa fa-book fa-lg"></i>Docs</a></li>
         </ul>
       </div>
 
@@ -39,7 +39,7 @@
         }
         window.setTimeout(fixScroll, 50);
         $(window).on('hashchange', function(e){fixScroll();});
-    });  
+    });
   };
 
   var timer = function() {