diff --git a/mozilla/layout/html/document/src/forms.css b/mozilla/layout/html/document/src/forms.css
index 8b7e305af1d..7def7c44924 100644
--- a/mozilla/layout/html/document/src/forms.css
+++ b/mozilla/layout/html/document/src/forms.css
@@ -70,6 +70,7 @@ input {
   -moz-box-sizing: border-box;
   -moz-user-focus: normal;
   -moz-binding: url("resource:///res/builtin/platformHTMLBindings.xml#inputFields");
+  padding: 1px 0 1px 0;
 }
 
 textarea {
@@ -97,7 +98,7 @@ select {
   font: list;
   background-color: -moz-field;
   border: 2px inset ThreeDFace;
-  margin: 1px 0 1px 0;
+  margin: 0;
   vertical-align: bottom;
   color: WindowText;
   white-space: nowrap;
@@ -218,6 +219,7 @@ input[type="image"] {
   font-family: sans-serif;
   font-size: small;
   -moz-binding: none;
+  padding: 0;
 }
 
 input[type="image"][disabled] {
@@ -234,6 +236,7 @@ input[type="file"] {
   border: none;
   cursor: default;
   -moz-binding: none;
+  padding: 0;
 }
 
 /* button part of file selector */
@@ -252,6 +255,7 @@ input[type="radio"] {
   vertical-align: baseline;
   -moz-border-radius: 100%;
   -moz-binding: none;
+  padding: 0;
 }
 
 /* check boxes */
@@ -265,6 +269,7 @@ input[type="checkbox"] {
   vertical-align: bottom;
   -moz-binding: none;
   margin: 3px 4px 3px 4px;
+  padding: 0;
 }
 
 /* common features of radio buttons and check boxes */
diff --git a/mozilla/layout/style/forms.css b/mozilla/layout/style/forms.css
index 8b7e305af1d..7def7c44924 100644
--- a/mozilla/layout/style/forms.css
+++ b/mozilla/layout/style/forms.css
@@ -70,6 +70,7 @@ input {
   -moz-box-sizing: border-box;
   -moz-user-focus: normal;
   -moz-binding: url("resource:///res/builtin/platformHTMLBindings.xml#inputFields");
+  padding: 1px 0 1px 0;
 }
 
 textarea {
@@ -97,7 +98,7 @@ select {
   font: list;
   background-color: -moz-field;
   border: 2px inset ThreeDFace;
-  margin: 1px 0 1px 0;
+  margin: 0;
   vertical-align: bottom;
   color: WindowText;
   white-space: nowrap;
@@ -218,6 +219,7 @@ input[type="image"] {
   font-family: sans-serif;
   font-size: small;
   -moz-binding: none;
+  padding: 0;
 }
 
 input[type="image"][disabled] {
@@ -234,6 +236,7 @@ input[type="file"] {
   border: none;
   cursor: default;
   -moz-binding: none;
+  padding: 0;
 }
 
 /* button part of file selector */
@@ -252,6 +255,7 @@ input[type="radio"] {
   vertical-align: baseline;
   -moz-border-radius: 100%;
   -moz-binding: none;
+  padding: 0;
 }
 
 /* check boxes */
@@ -265,6 +269,7 @@ input[type="checkbox"] {
   vertical-align: bottom;
   -moz-binding: none;
   margin: 3px 4px 3px 4px;
+  padding: 0;
 }
 
 /* common features of radio buttons and check boxes */