diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index a5d00d95eb..e081f80dff 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 edeaf8bba7..e6ccb8b14b 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -990,6 +990,7 @@ select:focus:required:invalid:focus {
 .input-append select,
 .input-prepend .uneditable-input,
 .input-append .uneditable-input {
+  *margin-left: 0;
   -webkit-border-radius: 0 3px 3px 0;
   -moz-border-radius: 0 3px 3px 0;
   border-radius: 0 3px 3px 0;
@@ -1167,6 +1168,11 @@ legend + .control-group {
 }
 .form-horizontal .controls {
   margin-left: 160px;
+  /* Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls */
+
+  *display: inline-block;
+  *margin-left: 0;
+  *padding-left: 20px;
 }
 .form-horizontal .help-block {
   margin-top: 9px;
diff --git a/less/forms.less b/less/forms.less
index 6e1d0fae33..8d9c253083 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -365,6 +365,7 @@ select:focus:required:invalid {
   input,
   select,
   .uneditable-input {
+    *margin-left: 0;
     .border-radius(0 3px 3px 0);
     &:focus {
       position: relative;
@@ -537,6 +538,10 @@ legend + .control-group {
   // Move over all input controls and content
   .controls {
     margin-left: 160px;
+    /* Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls */
+    *display: inline-block;
+    *margin-left: 0;
+    *padding-left: 20px;
   }
   // Remove bottom margin on block level help text since that's accounted for on .control-group
   .help-block {