diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index aca0e7a187..8abdfd2054 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1647,9 +1647,10 @@ select:focus:invalid:focus {
 .input-append,
 .input-prepend {
   display: inline-block;
-  margin-bottom: 5px;
+  margin-bottom: 10px;
   font-size: 0;
   white-space: nowrap;
+  vertical-align: middle;
 }
 
 .input-append input,
diff --git a/less/forms.less b/less/forms.less
index c1b381380b..06767bdd3e 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -423,7 +423,8 @@ select:focus:invalid {
 .input-append,
 .input-prepend {
   display: inline-block;
-  margin-bottom: 5px;
+  margin-bottom: @baseLineHeight / 2;
+  vertical-align: middle;
   font-size: 0; // white space collapse hack
   white-space: nowrap; // Prevent span and input from separating