diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 65e2841e25..9020cef037 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 790d916227..7e2a821079 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2882,7 +2882,7 @@ input[type="submit"].btn.btn-small {
   line-height: 1;
   color: #ffffff;
   background-color: #626262;
-  border: 1px solid #000000;
+  border: 1px solid #151515;
   -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
   -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
diff --git a/docs/download.html b/docs/download.html
index fcb998cfd1..1adf12da7c 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -327,6 +327,12 @@
       <input type="text" class="span3" placeholder="transparent">
       <label>@navbarLinkBackgroundActive</label>
       <input type="text" class="span3" placeholder="@navbarBackground">
+      <label>@navbarSearchBackground</label>
+      <input type="text" class="span3" placeholder="lighten(@navbarBackground, 25%)">
+      <label>@navbarSearchBackgroundFocus</label>
+      <input type="text" class="span3" placeholder="@white">
+      <label>@navbarSearchBorder</label>
+      <input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)">
       <label>@navbarSearchPlaceholderColor</label>
       <input type="text" class="span3" placeholder="#ccc">
 
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 1e0ecbda44..c700632aee 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -251,6 +251,12 @@
       <input type="text" class="span3" placeholder="transparent">
       <label>@navbarLinkBackgroundActive</label>
       <input type="text" class="span3" placeholder="@navbarBackground">
+      <label>@navbarSearchBackground</label>
+      <input type="text" class="span3" placeholder="lighten(@navbarBackground, 25%)">
+      <label>@navbarSearchBackgroundFocus</label>
+      <input type="text" class="span3" placeholder="@white">
+      <label>@navbarSearchBorder</label>
+      <input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)">
       <label>@navbarSearchPlaceholderColor</label>
       <input type="text" class="span3" placeholder="#ccc">
 
diff --git a/less/navbar.less b/less/navbar.less
index 0a4870ec3c..fbac53f383 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -127,8 +127,8 @@
     padding: 4px 9px;
     #font > .sans-serif(13px, normal, 1);
     color: @white;
-    background-color: lighten(@navbarBackground, 25%);
-    border: 1px solid darken(@navbarBackground, 15%);
+    background-color: @navbarSearchBackground;
+    border: 1px solid @navbarSearchBorder;
     @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
     .box-shadow(@shadow);
     .transition(none);
@@ -147,7 +147,7 @@
       padding: 5px 10px;
       color: @grayDark;
       text-shadow: 0 1px 0 @white;
-      background-color: @white;
+      background-color: @navbarSearchBackgroundFocus;
       border: 0;
       .box-shadow(0 0 3px rgba(0,0,0,.15));
       outline: 0;
diff --git a/less/variables.less b/less/variables.less
index 6c251da566..c4614dd766 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -149,6 +149,9 @@
 @navbarLinkBackgroundHover:       transparent;
 @navbarLinkBackgroundActive:      @navbarBackground;
 
+@navbarSearchBackground:          lighten(@navbarBackground, 25%);
+@navbarSearchBackgroundFocus:     @white;
+@navbarSearchBorder:              darken(@navbarSearchBackground, 30%);
 @navbarSearchPlaceholderColor:    #ccc;