diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css
index 7bd2e06a1b65edab48e1a3334d46875c7014d95e..39007f130df1e11ad3ace771a661bba71dbb9145 100644
--- a/bootstrap-1.2.0.css
+++ b/bootstrap-1.2.0.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Fri Sep  2 09:52:17 PDT 2011
+ * Date: Fri Sep  2 11:52:53 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -658,10 +658,10 @@ select,
 .uneditable-input {
   display: inline-block;
   width: 210px;
+  height: 18px;
   padding: 4px;
   font-size: 13px;
   line-height: 18px;
-  height: 18px;
   color: #808080;
   border: 1px solid #ccc;
   -webkit-border-radius: 3px;
@@ -671,14 +671,17 @@ select,
 /* mini reset for non-html5 file types */
 input[type=checkbox], input[type=radio] {
   width: auto;
-  padding: 0;
-  line-height: normal;
   height: auto;
+  padding: 0;
   margin: 3px 0;
+  line-height: normal;
+  border: none;
 }
 input[type=file] {
-  border: 0;
-  padding: 0;
+  background-color: #fff;
+  padding: initial;
+  border: initial;
+  line-height: initial;
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
   box-shadow: none;
diff --git a/bootstrap-1.2.0.min.css b/bootstrap-1.2.0.min.css
index 7769c7a8cf380241397d04671fd4eac363d9c97c..9ebd00190cee096f2f9378c0fbd8b7b2432411bc 100644
--- a/bootstrap-1.2.0.min.css
+++ b/bootstrap-1.2.0.min.css
@@ -106,9 +106,9 @@ label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-se
 label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;}
 div.input{margin-left:150px;}
 input[type=checkbox],input[type=radio]{cursor:pointer;}
-input,textarea,select,.uneditable-input{display:inline-block;width:210px;padding:4px;font-size:13px;line-height:18px;height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
-input[type=checkbox],input[type=radio]{width:auto;padding:0;line-height:normal;height:auto;margin:3px 0;}
-input[type=file]{border:0;padding:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;font-size:13px;line-height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;line-height:normal;border:none;}
+input[type=file]{background-color:#fff;padding:initial;border:initial;line-height:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;}
 select,input[type=file]{height:27px;line-height:27px;}
 textarea{height:auto;}
diff --git a/lib/forms.less b/lib/forms.less
index d79decd24100f02b09d4748346df4b42f569c1b2..3fc62f93dee0d0045e92fdb04e567d8feb112ab9 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -67,10 +67,10 @@ select,
 .uneditable-input {
   display: inline-block;
   width: 210px;
+  height: @baseline;
   padding: 4px;
   font-size: 13px;
   line-height: @baseline;
-  height: @baseline;
   color: @gray;
   border: 1px solid #ccc;
   .border-radius(3px);
@@ -80,15 +80,18 @@ select,
 input[type=checkbox],
 input[type=radio] {
   width: auto;
-  padding: 0;
-  line-height: normal;
   height: auto;
+  padding: 0;
   margin: 3px 0;
+  line-height: normal;
+  border: none;
 }
 
 input[type=file] {
-  border: 0;
-  padding: 0;
+  background-color: #fff;
+  padding: initial;
+  border: initial;
+  line-height: initial;
   .box-shadow(none);
 }