diff --git a/browser/themes/pinstripe/browser/preferences/preferences.css b/browser/themes/pinstripe/browser/preferences/preferences.css
index 6ebdb827428..2eac103d6c6 100644
--- a/browser/themes/pinstripe/browser/preferences/preferences.css
+++ b/browser/themes/pinstripe/browser/preferences/preferences.css
@@ -160,8 +160,9 @@ tabpanels {
 }
 
 caption {
-  border-bottom: 1px solid #ECECEC;
-  padding: 4px 4px 0px 0px !important;
+  -moz-padding-start: 5px;
+  padding-top: 4px;
+  padding-bottom: 2px;
 }
 
 #paneMain description,
diff --git a/toolkit/themes/gnomestripe/global/groupbox.css b/toolkit/themes/gnomestripe/global/groupbox.css
index dfbd97a8c6d..97b4f237e3b 100644
--- a/toolkit/themes/gnomestripe/global/groupbox.css
+++ b/toolkit/themes/gnomestripe/global/groupbox.css
@@ -57,9 +57,9 @@ caption {
   font-weight: bold;
 }
 
+/* !important is needed to override label in global.css */
 .caption-text {
-  margin-top: 0;
-  margin-bottom: 0;
-  -moz-margin-start: 1px;
-  -moz-margin-end: 2px;
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
+  -moz-margin-start: 1px !important;
 }
diff --git a/toolkit/themes/pinstripe/global/groupbox.css b/toolkit/themes/pinstripe/global/groupbox.css
index dc1d32a0ed2..d6d65283742 100644
--- a/toolkit/themes/pinstripe/global/groupbox.css
+++ b/toolkit/themes/pinstripe/global/groupbox.css
@@ -45,25 +45,26 @@
 /* ::::: groupbox ::::: */
 
 groupbox {
-  padding: 5px 1px 1px 0px;
+  padding: 5px 1px 1px;
+  -moz-padding-start: 0;
   margin: 6px;
 }
 
 .groupbox-body {
   -moz-appearance: groupbox;
-  padding: 8px 8px 3px 8px;
-  margin: 0px;
-
+  padding: 8px 8px 3px;
+  margin: 0;
 }
 
 caption {
-  padding: 0px 2px 1px 4px !important;
+  -moz-padding-start: 4px;
+  padding-bottom: 1px;
   font: caption;
 }
 
+/* !important is needed to override label in global.css */
 .caption-text {
-  margin-top: 0;
-  margin-bottom: 0;
-  -moz-margin-start: 1px;
-  -moz-margin-end: 2px;
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
+  -moz-margin-start: 1px !important;
 }
diff --git a/toolkit/themes/winstripe/global/groupbox.css b/toolkit/themes/winstripe/global/groupbox.css
index d7431e2c7ed..6f26e1f44a5 100644
--- a/toolkit/themes/winstripe/global/groupbox.css
+++ b/toolkit/themes/winstripe/global/groupbox.css
@@ -48,7 +48,7 @@ groupbox {
   border: 2px groove ThreeDFace;
   -moz-border-radius: 3px;
   margin: 3px;
-  padding: 3px 3px 6px 3px;
+  padding: 3px 3px 6px;
 }
 
 .groupbox-body {
@@ -56,7 +56,7 @@ groupbox {
 }
 
 caption {
-  margin: 0px 6px 0px 6px;
+  margin: 0 6px;
   background-color: -moz-Dialog;
 }