diff --git a/mozilla/themes/modern/global/browser.css b/mozilla/themes/modern/global/browser.css
index c2d96863fd3..f80ff4dc39f 100644
--- a/mozilla/themes/modern/global/browser.css
+++ b/mozilla/themes/modern/global/browser.css
@@ -72,7 +72,7 @@ tab[busy] {
 
 .tabs-closebutton {
   margin: 0px 4px;
-  padding: 4px 2px 4px 2px;
+  padding: 3px 2px;
   border: none;
   list-style-image: url("chrome://global/skin/icons/close.gif");
 }
@@ -83,4 +83,10 @@ tab[busy] {
 
 .tabs-closebutton:hover:active {
   list-style-image: url("chrome://global/skin/icons/close-act.gif");
-}
\ No newline at end of file
+}
+
+.tabs-closebutton[disabled="true"] {
+  padding: 3px 2px !important;
+  list-style-image: url("chrome://global/skin/icons/close-dis.gif") !important;
+}
+
diff --git a/mozilla/themes/modern/global/toolbarbutton.css b/mozilla/themes/modern/global/toolbarbutton.css
index 760b6f7d314..2dc0ba9e202 100644
--- a/mozilla/themes/modern/global/toolbarbutton.css
+++ b/mozilla/themes/modern/global/toolbarbutton.css
@@ -62,23 +62,23 @@ toolbarbutton {
 }
 
 toolbarbutton:hover {
-  border-top: 1px solid #EEF0F3;
-  border-right: 1px solid #86929E;
-  border-bottom: 1px solid #86929E;
-  border-left: 1px solid #EEF0F3;
+  border-top-color: #EEF0F3;
+  border-right-color: #86929E;
+  border-bottom-color: #86929E;
+  border-left-color: #EEF0F3;
 }
 
 toolbarbutton:hover:active,
 toolbarbutton[open="true"] {
-  border-top: 1px solid #86929E;
-  border-right: 1px solid #EEF0F3;
-  border-bottom: 1px solid #EEF0F3;
-  border-left: 1px solid #86929E;
+  border-top-color: #86929E;
+  border-right-color: #EEF0F3;
+  border-bottom-color: #EEF0F3;
+  border-left-color: #86929E;
   padding: 2px 1px 0px 3px;
 }
 
 toolbarbutton[disabled="true"] {
-  border: 1px solid transparent !important;
+  border-color: transparent !important;
   padding: 1px 2px !important;
   color: #9399AB !important;
 }
@@ -86,10 +86,10 @@ toolbarbutton[disabled="true"] {
 /* ..... checked state ..... */
   
 toolbarbutton[checked="true"] {
-  border-top: 1px solid #454C55 !important;
-  border-right: 1px solid #7D848D !important;
-  border-bottom: 1px solid #7D848D !important;
-  border-left: 1px solid #454C55 !important;
+  border-top-color: #454C55 !important;
+  border-right-color: #7D848D !important;
+  border-bottom-color: #7D848D !important;
+  border-left-color: #454C55 !important;
   background-color: #8C9AA8 !important;
   color: #EFF1F4;
 }