diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 33fb717b68..17f272fc5a 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 64c024c9b8..433a345abb 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -982,7 +982,6 @@ select:focus:required:invalid:focus {
 }
 .input-prepend,
 .input-append {
-  display: inline-block;
   margin-bottom: 5px;
 }
 .input-prepend input,
@@ -1071,7 +1070,13 @@ select:focus:required:invalid:focus {
 .form-horizontal .help-inline,
 .form-search .uneditable-input,
 .form-inline .uneditable-input,
-.form-horizontal .uneditable-input {
+.form-horizontal .uneditable-input,
+.form-search .input-prepend,
+.form-inline .input-prepend,
+.form-horizontal .input-prepend,
+.form-search .input-append,
+.form-inline .input-append,
+.form-horizontal .input-append {
   display: inline-block;
   margin-bottom: 0;
 }
@@ -1081,11 +1086,7 @@ select:focus:required:invalid:focus {
   display: none;
 }
 .form-search label,
-.form-inline label,
-.form-search .input-append,
-.form-inline .input-append,
-.form-search .input-prepend,
-.form-inline .input-prepend {
+.form-inline label {
   display: inline-block;
 }
 .form-search .input-append,
diff --git a/less/forms.less b/less/forms.less
index 5fc8f52619..5045dc2544 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -361,7 +361,6 @@ select:focus:required:invalid {
 // Allow us to put symbols and text within the input field for a cleaner look
 .input-prepend,
 .input-append {
-  display: inline-block;
   margin-bottom: 5px;
   input,
   select,
@@ -440,7 +439,9 @@ select:focus:required:invalid {
   textarea,
   select,
   .help-inline,
-  .uneditable-input {
+  .uneditable-input,
+  .input-prepend,
+  .input-append {
     display: inline-block;
     margin-bottom: 0;
   }
@@ -450,11 +451,7 @@ select:focus:required:invalid {
   }
 }
 .form-search label,
-.form-inline label,
-.form-search .input-append,
-.form-inline .input-append,
-.form-search .input-prepend,
-.form-inline .input-prepend {
+.form-inline label {
   display: inline-block;
 }
 // Remove margin for input-prepend/-append