diff --git a/mozilla/layout/forms/resources/content/xbl-forms.css b/mozilla/layout/forms/resources/content/xbl-forms.css
index 01c567a4a27..0c24c28f2e9 100644
--- a/mozilla/layout/forms/resources/content/xbl-forms.css
+++ b/mozilla/layout/forms/resources/content/xbl-forms.css
@@ -117,6 +117,8 @@ button {
 input[type="button"],input[type="submit"],input[type="reset"] {
   cursor: default;
   -moz-box-sizing: border-box;
+  padding-top: 0px;
+  padding-bottom: 0px;
 }
 
 input[type="button"] {
diff --git a/mozilla/layout/forms/resources/skin/button.css b/mozilla/layout/forms/resources/skin/button.css
index 91b7f33a0e2..afd51d3aff7 100644
--- a/mozilla/layout/forms/resources/skin/button.css
+++ b/mozilla/layout/forms/resources/skin/button.css
@@ -35,7 +35,6 @@ input[type="button"],
 input[type="submit"],
 input[type="reset"] {
   /* -moz-appearance: button; */
-  margin: 1px 5px 2px 5px;
   border: 3px solid;
   -moz-border-top-colors: transparent ThreeDHighlight ThreeDLightShadow;
   -moz-border-right-colors: transparent ThreeDDarkShadow ThreeDShadow;
diff --git a/mozilla/layout/html/forms/resources/content/xbl-forms.css b/mozilla/layout/html/forms/resources/content/xbl-forms.css
index 01c567a4a27..0c24c28f2e9 100644
--- a/mozilla/layout/html/forms/resources/content/xbl-forms.css
+++ b/mozilla/layout/html/forms/resources/content/xbl-forms.css
@@ -117,6 +117,8 @@ button {
 input[type="button"],input[type="submit"],input[type="reset"] {
   cursor: default;
   -moz-box-sizing: border-box;
+  padding-top: 0px;
+  padding-bottom: 0px;
 }
 
 input[type="button"] {
diff --git a/mozilla/layout/html/forms/resources/skin/button.css b/mozilla/layout/html/forms/resources/skin/button.css
index 91b7f33a0e2..afd51d3aff7 100644
--- a/mozilla/layout/html/forms/resources/skin/button.css
+++ b/mozilla/layout/html/forms/resources/skin/button.css
@@ -35,7 +35,6 @@ input[type="button"],
 input[type="submit"],
 input[type="reset"] {
   /* -moz-appearance: button; */
-  margin: 1px 5px 2px 5px;
   border: 3px solid;
   -moz-border-top-colors: transparent ThreeDHighlight ThreeDLightShadow;
   -moz-border-right-colors: transparent ThreeDDarkShadow ThreeDShadow;