diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b7aa3fd1cf..51c2143766 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4197,6 +4197,8 @@ input[type="submit"].btn.btn-mini {
   white-space: nowrap;
 }
 
+.navbar-form .input-append .btn,
+.navbar-form .input-prepend .btn,
 .navbar-form .input-append input,
 .navbar-form .input-prepend input {
   margin-top: 0;
diff --git a/less/navbar.less b/less/navbar.less
index 63d95fe9f2..65137ea9e1 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -90,10 +90,11 @@
   .navbarVerticalAlign(28px); // Vertically center in navbar
 }
 .navbar .btn-group .btn {
-  margin: 0; // then undo the margin here so we don't accidentally double it
+  margin-top: 0; // then undo the margin here so we don't accidentally double it
 }
 
 // Navbar forms
+// -------------------------
 .navbar-form {
   margin-bottom: 0; // remove default bottom margin
   .clearfix();
@@ -125,6 +126,7 @@
 }
 
 // Navbar search
+// -------------------------
 .navbar-search {
   position: relative;
   float: left;