diff --git a/calendar/base/content/dialogs/calendar-migration-dialog.xhtml b/calendar/base/content/dialogs/calendar-migration-dialog.xhtml
index 546013b39a..c0787f2dc4 100644
--- a/calendar/base/content/dialogs/calendar-migration-dialog.xhtml
+++ b/calendar/base/content/dialogs/calendar-migration-dialog.xhtml
@@ -4,7 +4,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- Style sheets -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 
 <!DOCTYPE window
 [
diff --git a/calendar/base/content/dialogs/calendar-occurrence-prompt.xhtml b/calendar/base/content/dialogs/calendar-occurrence-prompt.xhtml
index f1df4f02cb..8d8f0d1a03 100644
--- a/calendar/base/content/dialogs/calendar-occurrence-prompt.xhtml
+++ b/calendar/base/content/dialogs/calendar-occurrence-prompt.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/shared/calendar-occurrence-prompt.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://calendar/locale/calendar-occurrence-prompt.dtd">
diff --git a/calendar/resources/content/calendarCreation.xhtml b/calendar/resources/content/calendarCreation.xhtml
index 560fc534cf..6df5728d91 100755
--- a/calendar/resources/content/calendarCreation.xhtml
+++ b/calendar/resources/content/calendarCreation.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/content/notification.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/shared/calendar-creation-wizard.css" type="text/css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
diff --git a/chat/content/browserRequest.xhtml b/chat/content/browserRequest.xhtml
index b1507924bb..ac76d683f7 100644
--- a/chat/content/browserRequest.xhtml
+++ b/chat/content/browserRequest.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://chat/skin/browserRequest.css" type="text/css"?>
 
 <!DOCTYPE window>
diff --git a/chat/content/otr-add-fingerprint.xhtml b/chat/content/otr-add-fingerprint.xhtml
index 29f1e7e91b..b5a2a50616 100644
--- a/chat/content/otr-add-fingerprint.xhtml
+++ b/chat/content/otr-add-fingerprint.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css" ?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css" ?>
 <?xml-stylesheet href="chrome://chat/skin/otrFingerprintDialog.css" type="text/css"?>
 
 <!DOCTYPE window>
diff --git a/chat/content/otr-auth.xhtml b/chat/content/otr-auth.xhtml
index c6fc78befa..1dda564ae8 100644
--- a/chat/content/otr-auth.xhtml
+++ b/chat/content/otr-auth.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css" ?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css" ?>
 <?xml-stylesheet href="chrome://messenger/skin/messenger.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
 
diff --git a/chat/content/otr-finger.xhtml b/chat/content/otr-finger.xhtml
index a97d2e5b14..1ce61dbd0f 100644
--- a/chat/content/otr-finger.xhtml
+++ b/chat/content/otr-finger.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css" ?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css" ?>
 
 <!DOCTYPE window>
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/common/src/customizeToolbar.xhtml b/common/src/customizeToolbar.xhtml
index 28552f1ce4..9ed454d883 100644
--- a/common/src/customizeToolbar.xhtml
+++ b/common/src/customizeToolbar.xhtml
@@ -14,7 +14,7 @@
   %customizeToolbarDTD;
 ]>
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 #ifdef MOZ_SUITE
 <?xml-stylesheet href="chrome://communicator/content/customizeToolbar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/customizeToolbar.css" type="text/css"?>
diff --git a/common/src/viewSource.xhtml b/common/src/viewSource.xhtml
index 6a4fe2b7c7..7093a532ab 100644
--- a/common/src/viewSource.xhtml
+++ b/common/src/viewSource.xhtml
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
diff --git a/editor/ui/composer/content/pref-toolbars.xhtml b/editor/ui/composer/content/pref-toolbars.xhtml
index ff94c2bebd..6edcdb0322 100644
--- a/editor/ui/composer/content/pref-toolbars.xhtml
+++ b/editor/ui/composer/content/pref-toolbars.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://editor/locale/pref-toolbars.dtd">
 
diff --git a/editor/ui/dialogs/content/EdInsertTOC.xhtml b/editor/ui/dialogs/content/EdInsertTOC.xhtml
index 15a6880671..8d82bac046 100644
--- a/editor/ui/dialogs/content/EdInsertTOC.xhtml
+++ b/editor/ui/dialogs/content/EdInsertTOC.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
diff --git a/mail/base/content/aboutDialog.xhtml b/mail/base/content/aboutDialog.xhtml
index 88ee42f2c6..fe18f0fa47 100644
--- a/mail/base/content/aboutDialog.xhtml
+++ b/mail/base/content/aboutDialog.xhtml
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/content/aboutDialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://branding/content/aboutDialog.css" type="text/css"?>
 
diff --git a/mail/base/content/browserRequest.xhtml b/mail/base/content/browserRequest.xhtml
index eb05247715..0ec5fb4735 100644
--- a/mail/base/content/browserRequest.xhtml
+++ b/mail/base/content/browserRequest.xhtml
@@ -4,7 +4,7 @@
     # You can obtain one at http://mozilla.org/MPL/2.0/.
  -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/browserRequest.css" type="text/css"?>
 
 <!DOCTYPE window>
diff --git a/mail/base/content/multimessageview.xhtml b/mail/base/content/multimessageview.xhtml
index 8f53f6b0c5..60b554d8c4 100644
--- a/mail/base/content/multimessageview.xhtml
+++ b/mail/base/content/multimessageview.xhtml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/mail/base/content/safeMode.xhtml b/mail/base/content/safeMode.xhtml
index c9d64a6a14..a9fa483d4a 100644
--- a/mail/base/content/safeMode.xhtml
+++ b/mail/base/content/safeMode.xhtml
@@ -12,7 +12,7 @@
 %utilityDTD;
 ]>
 
-<?xml-stylesheet href="chrome://global/skin/"?>
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         title="&safeModeDialog.title;"
diff --git a/mail/base/content/sanitize.xhtml b/mail/base/content/sanitize.xhtml
index c3232b915a..d1b2b8a982 100644
--- a/mail/base/content/sanitize.xhtml
+++ b/mail/base/content/sanitize.xhtml
@@ -4,7 +4,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/"?>
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/sanitizeDialog.css"?>
 <?xml-stylesheet href="chrome://messenger/content/sanitizeDialog.css"?>
 
diff --git a/mail/base/content/systemIntegrationDialog.xhtml b/mail/base/content/systemIntegrationDialog.xhtml
index 9f0c42ed80..95bef0beea 100644
--- a/mail/base/content/systemIntegrationDialog.xhtml
+++ b/mail/base/content/systemIntegrationDialog.xhtml
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-<?xml-stylesheet href="chrome://global/skin/"?>
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
 
 <!DOCTYPE window [
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
diff --git a/mail/components/accountcreation/content/emailWizard.xhtml b/mail/components/accountcreation/content/emailWizard.xhtml
index 466ff2d5d3..b547f3d52c 100644
--- a/mail/components/accountcreation/content/emailWizard.xhtml
+++ b/mail/components/accountcreation/content/emailWizard.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/messenger.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/menulist.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
diff --git a/mail/components/activity/content/activity.xhtml b/mail/components/activity/content/activity.xhtml
index 8de9c6fe11..2d40f1b397 100644
--- a/mail/components/activity/content/activity.xhtml
+++ b/mail/components/activity/content/activity.xhtml
@@ -11,7 +11,7 @@
 #endif
 #endif
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/activity/activity.css"?>
 
 <!DOCTYPE window [
diff --git a/mail/components/compose/content/dialogs/EdAdvancedEdit.xhtml b/mail/components/compose/content/dialogs/EdAdvancedEdit.xhtml
index b51c0463b9..4f873bb92e 100644
--- a/mail/components/compose/content/dialogs/EdAdvancedEdit.xhtml
+++ b/mail/components/compose/content/dialogs/EdAdvancedEdit.xhtml
@@ -6,7 +6,7 @@
 <!-- first checkin of the year 2000!      -->
 <!-- Ben Goodger, 12:50AM, 01/00/00 NZST  -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/menulist.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
diff --git a/mail/components/compose/content/dialogs/EdColorPicker.xhtml b/mail/components/compose/content/dialogs/EdColorPicker.xhtml
index 05317a154b..c4887fc087 100644
--- a/mail/components/compose/content/dialogs/EdColorPicker.xhtml
+++ b/mail/components/compose/content/dialogs/EdColorPicker.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/EdColorPicker.dtd">
diff --git a/mail/components/compose/content/dialogs/EdColorProps.xhtml b/mail/components/compose/content/dialogs/EdColorProps.xhtml
index b2832bb5d8..0fc10ea7a3 100644
--- a/mail/components/compose/content/dialogs/EdColorProps.xhtml
+++ b/mail/components/compose/content/dialogs/EdColorProps.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
 
diff --git a/mail/components/compose/content/dialogs/EdConvertToTable.xhtml b/mail/components/compose/content/dialogs/EdConvertToTable.xhtml
index 974243af19..762e66efb3 100644
--- a/mail/components/compose/content/dialogs/EdConvertToTable.xhtml
+++ b/mail/components/compose/content/dialogs/EdConvertToTable.xhtml
@@ -4,7 +4,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
 
diff --git a/mail/components/compose/content/dialogs/EdDictionary.xhtml b/mail/components/compose/content/dialogs/EdDictionary.xhtml
index 6dcf544a5b..c13b8cc193 100644
--- a/mail/components/compose/content/dialogs/EdDictionary.xhtml
+++ b/mail/components/compose/content/dialogs/EdDictionary.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/shared/grid-layout.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
diff --git a/mail/components/compose/content/dialogs/EdHLineProps.xhtml b/mail/components/compose/content/dialogs/EdHLineProps.xhtml
index 6fa8e1b507..573cfee000 100644
--- a/mail/components/compose/content/dialogs/EdHLineProps.xhtml
+++ b/mail/components/compose/content/dialogs/EdHLineProps.xhtml
@@ -4,7 +4,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 
diff --git a/mail/components/compose/content/dialogs/EdImageProps.xhtml b/mail/components/compose/content/dialogs/EdImageProps.xhtml
index 25028779b4..f310fbbe90 100644
--- a/mail/components/compose/content/dialogs/EdImageProps.xhtml
+++ b/mail/components/compose/content/dialogs/EdImageProps.xhtml
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 
diff --git a/mail/components/compose/content/dialogs/EdInsSrc.xhtml b/mail/components/compose/content/dialogs/EdInsSrc.xhtml
index 3710b4beaf..320df43b91 100644
--- a/mail/components/compose/content/dialogs/EdInsSrc.xhtml
+++ b/mail/components/compose/content/dialogs/EdInsSrc.xhtml
@@ -4,7 +4,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/EditorInsertSource.dtd">
diff --git a/mail/components/compose/content/dialogs/EdInsertChars.xhtml b/mail/components/compose/content/dialogs/EdInsertChars.xhtml
index f55fbd62bb..768f29f2e5 100644
--- a/mail/components/compose/content/dialogs/EdInsertChars.xhtml
+++ b/mail/components/compose/content/dialogs/EdInsertChars.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/EditorInsertChars.dtd">
diff --git a/mail/components/compose/content/dialogs/EdInsertMath.xhtml b/mail/components/compose/content/dialogs/EdInsertMath.xhtml
index 524b58ad0e..dc0665c5e5 100644
--- a/mail/components/compose/content/dialogs/EdInsertMath.xhtml
+++ b/mail/components/compose/content/dialogs/EdInsertMath.xhtml
@@ -4,7 +4,7 @@
 - License, v. 2.0. If a copy of the MPL was not distributed with this
 - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/EditorInsertMath.dtd">
diff --git a/mail/components/compose/content/dialogs/EdInsertTOC.xhtml b/mail/components/compose/content/dialogs/EdInsertTOC.xhtml
index 7850b52597..37098ef337 100644
--- a/mail/components/compose/content/dialogs/EdInsertTOC.xhtml
+++ b/mail/components/compose/content/dialogs/EdInsertTOC.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
diff --git a/mail/components/compose/content/dialogs/EdInsertTable.xhtml b/mail/components/compose/content/dialogs/EdInsertTable.xhtml
index 275dfc2e0b..d65c8bf629 100644
--- a/mail/components/compose/content/dialogs/EdInsertTable.xhtml
+++ b/mail/components/compose/content/dialogs/EdInsertTable.xhtml
@@ -4,7 +4,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
 <!DOCTYPE window [
diff --git a/mail/components/compose/content/dialogs/EdLinkProps.xhtml b/mail/components/compose/content/dialogs/EdLinkProps.xhtml
index a0cbf75324..a4e3f242fc 100644
--- a/mail/components/compose/content/dialogs/EdLinkProps.xhtml
+++ b/mail/components/compose/content/dialogs/EdLinkProps.xhtml
@@ -4,7 +4,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 
diff --git a/mail/components/compose/content/dialogs/EdListProps.xhtml b/mail/components/compose/content/dialogs/EdListProps.xhtml
index 06418d6d65..79adb32b2c 100644
--- a/mail/components/compose/content/dialogs/EdListProps.xhtml
+++ b/mail/components/compose/content/dialogs/EdListProps.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 
diff --git a/mail/components/compose/content/dialogs/EdNamedAnchorProps.xhtml b/mail/components/compose/content/dialogs/EdNamedAnchorProps.xhtml
index fdf7e4b767..f51ae95aac 100644
--- a/mail/components/compose/content/dialogs/EdNamedAnchorProps.xhtml
+++ b/mail/components/compose/content/dialogs/EdNamedAnchorProps.xhtml
@@ -4,7 +4,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 
diff --git a/mail/components/compose/content/dialogs/EdReplace.xhtml b/mail/components/compose/content/dialogs/EdReplace.xhtml
index 910fd278b7..b23745c9f3 100644
--- a/mail/components/compose/content/dialogs/EdReplace.xhtml
+++ b/mail/components/compose/content/dialogs/EdReplace.xhtml
@@ -4,7 +4,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/shared/grid-layout.css" type="text/css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
diff --git a/mail/components/compose/content/dialogs/EdSpellCheck.xhtml b/mail/components/compose/content/dialogs/EdSpellCheck.xhtml
index 237eecf127..220cf376bb 100644
--- a/mail/components/compose/content/dialogs/EdSpellCheck.xhtml
+++ b/mail/components/compose/content/dialogs/EdSpellCheck.xhtml
@@ -4,7 +4,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/shared/grid-layout.css" type="text/css"?>
diff --git a/mail/components/compose/content/dialogs/EdTableProps.xhtml b/mail/components/compose/content/dialogs/EdTableProps.xhtml
index 91210ffae1..b09df68fc6 100644
--- a/mail/components/compose/content/dialogs/EdTableProps.xhtml
+++ b/mail/components/compose/content/dialogs/EdTableProps.xhtml
@@ -4,7 +4,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/shared/grid-layout.css" type="text/css" ?>
 <?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css" ?>
diff --git a/mail/components/downloads/content/aboutDownloads.xhtml b/mail/components/downloads/content/aboutDownloads.xhtml
index 8d47f62bd7..258acdf568 100644
--- a/mail/components/downloads/content/aboutDownloads.xhtml
+++ b/mail/components/downloads/content/aboutDownloads.xhtml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="chrome://global/skin/"?>
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/searchBox.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
diff --git a/mail/components/im/content/addbuddy.xhtml b/mail/components/im/content/addbuddy.xhtml
index 467ca472f3..4c34d49762 100644
--- a/mail/components/im/content/addbuddy.xhtml
+++ b/mail/components/im/content/addbuddy.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/imMenulist.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 
diff --git a/mail/components/im/content/imAccountWizard.xhtml b/mail/components/im/content/imAccountWizard.xhtml
index 4395ba7375..aa936dc006 100644
--- a/mail/components/im/content/imAccountWizard.xhtml
+++ b/mail/components/im/content/imAccountWizard.xhtml
@@ -4,7 +4,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/imAccountWizard.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
diff --git a/mail/components/im/content/imAccounts.xhtml b/mail/components/im/content/imAccounts.xhtml
index 986aa2ed7a..32f1d69f41 100644
--- a/mail/components/im/content/imAccounts.xhtml
+++ b/mail/components/im/content/imAccounts.xhtml
@@ -1,4 +1,4 @@
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
diff --git a/mail/components/im/content/joinchat.xhtml b/mail/components/im/content/joinchat.xhtml
index 7321f33da1..355e621ba0 100644
--- a/mail/components/im/content/joinchat.xhtml
+++ b/mail/components/im/content/joinchat.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/menulist.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/content/chat/chat.css" type="text/css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
diff --git a/mail/components/migration/content/migration.xhtml b/mail/components/migration/content/migration.xhtml
index 03f2fd9aac..e955847893 100644
--- a/mail/components/migration/content/migration.xhtml
+++ b/mail/components/migration/content/migration.xhtml
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/migration/migration.dtd" >
 
diff --git a/mail/components/preferences/applicationManager.xhtml b/mail/components/preferences/applicationManager.xhtml
index a57bdfb9bd..0b4ac795d4 100644
--- a/mail/components/preferences/applicationManager.xhtml
+++ b/mail/components/preferences/applicationManager.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/"?>
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/input-fields.css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/preferences/applicationManager.dtd">
diff --git a/mail/components/preferences/attachmentReminder.xhtml b/mail/components/preferences/attachmentReminder.xhtml
index 9fb7da2ccd..c4d406170b 100644
--- a/mail/components/preferences/attachmentReminder.xhtml
+++ b/mail/components/preferences/attachmentReminder.xhtml
@@ -4,7 +4,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/"?>
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
diff --git a/mail/components/preferences/colors.xhtml b/mail/components/preferences/colors.xhtml
index 915d5b8e7d..6136531055 100644
--- a/mail/components/preferences/colors.xhtml
+++ b/mail/components/preferences/colors.xhtml
@@ -5,7 +5,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/messenger.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 
diff --git a/mail/components/preferences/connection.xhtml b/mail/components/preferences/connection.xhtml
index 446bf2b529..affebf7dbf 100644
--- a/mail/components/preferences/connection.xhtml
+++ b/mail/components/preferences/connection.xhtml
@@ -7,7 +7,7 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/preferences/connection.dtd">
 
-<?xml-stylesheet href="chrome://global/skin/"?>
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/messenger.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/input-fields.css"?>
diff --git a/mail/components/preferences/cookies.xhtml b/mail/components/preferences/cookies.xhtml
index ad2845ade5..c196daa448 100644
--- a/mail/components/preferences/cookies.xhtml
+++ b/mail/components/preferences/cookies.xhtml
@@ -5,7 +5,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-<?xml-stylesheet href="chrome://global/skin/"?>
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/input-fields.css"?>
 
diff --git a/mail/components/preferences/dockoptions.xhtml b/mail/components/preferences/dockoptions.xhtml
index 9fac579de4..34ec429eca 100644
--- a/mail/components/preferences/dockoptions.xhtml
+++ b/mail/components/preferences/dockoptions.xhtml
@@ -4,7 +4,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/preferences/dockoptions.dtd">
diff --git a/mail/components/preferences/fonts.xhtml b/mail/components/preferences/fonts.xhtml
index 1c8987a0df..88faa00a7a 100644
--- a/mail/components/preferences/fonts.xhtml
+++ b/mail/components/preferences/fonts.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at https://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/"?>
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/messenger.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 
diff --git a/mail/components/preferences/messengerLanguages.xhtml b/mail/components/preferences/messengerLanguages.xhtml
index 6dde20c777..4411ef17d0 100644
--- a/mail/components/preferences/messengerLanguages.xhtml
+++ b/mail/components/preferences/messengerLanguages.xhtml
@@ -4,7 +4,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/"?>
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
 
 <window type="child"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/mail/components/preferences/notifications.xhtml b/mail/components/preferences/notifications.xhtml
index 7a8a644775..8674e14e8b 100644
--- a/mail/components/preferences/notifications.xhtml
+++ b/mail/components/preferences/notifications.xhtml
@@ -5,7 +5,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/"?>
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 
 <!DOCTYPE window [
diff --git a/mail/components/preferences/offline.xhtml b/mail/components/preferences/offline.xhtml
index 4755cad5bd..5c3ded4af1 100644
--- a/mail/components/preferences/offline.xhtml
+++ b/mail/components/preferences/offline.xhtml
@@ -4,7 +4,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/"?>
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 
 <!DOCTYPE window [
diff --git a/mail/components/preferences/passwordManager.xhtml b/mail/components/preferences/passwordManager.xhtml
index 5850dc2475..ca64d33ed5 100644
--- a/mail/components/preferences/passwordManager.xhtml
+++ b/mail/components/preferences/passwordManager.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at https://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/"?>
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/shared/in-content/passwordmgr.css"?>
 
 <window id="SignonViewerDialog"
diff --git a/mail/components/preferences/permissions.xhtml b/mail/components/preferences/permissions.xhtml
index 1a8c487b78..6a5a7343f9 100644
--- a/mail/components/preferences/permissions.xhtml
+++ b/mail/components/preferences/permissions.xhtml
@@ -4,7 +4,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/"?>
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/input-fields.css"?>
 
diff --git a/mail/components/preferences/receipts.xhtml b/mail/components/preferences/receipts.xhtml
index b948f57c51..369cf32cd6 100644
--- a/mail/components/preferences/receipts.xhtml
+++ b/mail/components/preferences/receipts.xhtml
@@ -4,7 +4,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 
 <!DOCTYPE window [
diff --git a/mail/components/preferences/sendoptions.xhtml b/mail/components/preferences/sendoptions.xhtml
index 23d8144696..e481324dff 100644
--- a/mail/components/preferences/sendoptions.xhtml
+++ b/mail/components/preferences/sendoptions.xhtml
@@ -4,7 +4,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/"?>
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 
 <!DOCTYPE window [
diff --git a/mail/extensions/openpgp/content/ui/enigmailKeyManager.xhtml b/mail/extensions/openpgp/content/ui/enigmailKeyManager.xhtml
index 40ece4034b..0e0818f070 100644
--- a/mail/extensions/openpgp/content/ui/enigmailKeyManager.xhtml
+++ b/mail/extensions/openpgp/content/ui/enigmailKeyManager.xhtml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://openpgp/skin/enigmail.css" type="text/css"?>
 
diff --git a/mail/extensions/openpgp/content/ui/enigmailKeygen.xhtml b/mail/extensions/openpgp/content/ui/enigmailKeygen.xhtml
index f82103783d..76eb531392 100644
--- a/mail/extensions/openpgp/content/ui/enigmailKeygen.xhtml
+++ b/mail/extensions/openpgp/content/ui/enigmailKeygen.xhtml
@@ -5,7 +5,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://openpgp/skin/enigmail.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xhtml"?>
diff --git a/mail/extensions/openpgp/content/ui/keyPicker.xhtml b/mail/extensions/openpgp/content/ui/keyPicker.xhtml
index 6af00cf2e0..9478cc5847 100644
--- a/mail/extensions/openpgp/content/ui/keyPicker.xhtml
+++ b/mail/extensions/openpgp/content/ui/keyPicker.xhtml
@@ -5,7 +5,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
 <?xml-stylesheet href="chrome://openpgp/content/ui/keyPicker.css" type="text/css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
diff --git a/mail/themes/linux/mail/messenger.css b/mail/themes/linux/mail/messenger.css
index b8b23297c2..913ed4ea28 100644
--- a/mail/themes/linux/mail/messenger.css
+++ b/mail/themes/linux/mail/messenger.css
@@ -6,7 +6,7 @@
   == Styles shared throughout the Messenger application.
   ======================================================================= */
 
-@import url("chrome://global/skin/");
+@import url("chrome://global/skin/global.css");
 @import url("chrome://messenger/content/messenger.css");
 @import url("chrome://messenger/skin/shared/messenger.css");
 
diff --git a/mail/themes/osx/mail/messenger.css b/mail/themes/osx/mail/messenger.css
index 7f027f9cc2..f76bc83264 100644
--- a/mail/themes/osx/mail/messenger.css
+++ b/mail/themes/osx/mail/messenger.css
@@ -6,7 +6,7 @@
   == Styles shared throughout the Messenger application.
   ======================================================================= */
 
-@import url("chrome://global/skin/");
+@import url("chrome://global/skin/global.css");
 @import url("chrome://messenger/content/messenger.css");
 @import url("chrome://messenger/skin/shared/messenger.css");
 
diff --git a/mail/themes/windows/mail/messenger.css b/mail/themes/windows/mail/messenger.css
index 52ad7fb0ca..8effad6ecd 100644
--- a/mail/themes/windows/mail/messenger.css
+++ b/mail/themes/windows/mail/messenger.css
@@ -6,7 +6,7 @@
   == Styles shared throughout the Messenger application.
   ======================================================================= */
 
-@import url("chrome://global/skin/");
+@import url("chrome://global/skin/global.css");
 @import url("chrome://messenger/content/messenger.css");
 @import url("chrome://messenger/skin/shared/messenger.css");
 
diff --git a/mailnews/extensions/smime/content/certFetchingStatus.xhtml b/mailnews/extensions/smime/content/certFetchingStatus.xhtml
index 1eafcc6180..6cea7d1f0e 100644
--- a/mailnews/extensions/smime/content/certFetchingStatus.xhtml
+++ b/mailnews/extensions/smime/content/certFetchingStatus.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/smime/certFetchingStatus.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger-smime/locale/certFetchingStatus.dtd">
diff --git a/mailnews/extensions/smime/content/certpicker.xhtml b/mailnews/extensions/smime/content/certpicker.xhtml
index 6db3db1000..8aaa9ae471 100644
--- a/mailnews/extensions/smime/content/certpicker.xhtml
+++ b/mailnews/extensions/smime/content/certpicker.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 
 <!DOCTYPE window [
 <!ENTITY % amE2EDTD SYSTEM "chrome://messenger/locale/am-smime.dtd" >
diff --git a/mailnews/extensions/smime/content/msgCompSecurityInfo.xhtml b/mailnews/extensions/smime/content/msgCompSecurityInfo.xhtml
index 210c6e6de4..a690e89dbc 100644
--- a/mailnews/extensions/smime/content/msgCompSecurityInfo.xhtml
+++ b/mailnews/extensions/smime/content/msgCompSecurityInfo.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/smime/msgCompSecurityInfo.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger-smime/locale/msgCompSecurityInfo.dtd">
diff --git a/mailnews/extensions/smime/content/msgReadSecurityInfo.xhtml b/mailnews/extensions/smime/content/msgReadSecurityInfo.xhtml
index b92c856fe1..652e03e874 100644
--- a/mailnews/extensions/smime/content/msgReadSecurityInfo.xhtml
+++ b/mailnews/extensions/smime/content/msgReadSecurityInfo.xhtml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/smime/msgReadSecurityInfo.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger-smime/locale/msgReadSecurityInfo.dtd">
diff --git a/suite/components/feeds/content/subscribe.xhtml b/suite/components/feeds/content/subscribe.xhtml
index 15353832f6..c1c4b90765 100644
--- a/suite/components/feeds/content/subscribe.xhtml
+++ b/suite/components/feeds/content/subscribe.xhtml
@@ -17,7 +17,7 @@
   %feedDTD;
 ]>
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 
 <html id="feedHandler"
       xmlns="http://www.w3.org/1999/xhtml">
diff --git a/suite/themes/classic/communicator/communicator.css b/suite/themes/classic/communicator/communicator.css
index 3f37223cc9..444f4d33ed 100644
--- a/suite/themes/classic/communicator/communicator.css
+++ b/suite/themes/classic/communicator/communicator.css
@@ -6,7 +6,7 @@
    == Styles shared everywhere throughout the Communicator suite.
    ========================================================================== */
 
-@import url("chrome://global/skin/");
+@import url("chrome://global/skin/global.css");
 @import url("chrome://communicator/content/communicator.css");
 @import url("chrome://communicator/skin/brand.css");
 @import url("chrome://communicator/skin/button.css");
diff --git a/suite/themes/classic/communicator/config.css b/suite/themes/classic/communicator/config.css
index 31547685fd..92c1ee9ca7 100644
--- a/suite/themes/classic/communicator/config.css
+++ b/suite/themes/classic/communicator/config.css
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url("chrome://global/skin/");
+@import url("chrome://global/skin/global.css");
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #warningScreen {
diff --git a/suite/themes/classic/linux/communicator/communicator.css b/suite/themes/classic/linux/communicator/communicator.css
index aa5b95dec5..2f68d4fbba 100644
--- a/suite/themes/classic/linux/communicator/communicator.css
+++ b/suite/themes/classic/linux/communicator/communicator.css
@@ -6,7 +6,7 @@
    == Styles shared everywhere throughout the Communicator suite.
    ========================================================================== */
 
-@import url("chrome://global/skin/");
+@import url("chrome://global/skin/global.css");
 @import url("chrome://communicator/content/communicator.css");
 @import url("chrome://communicator/skin/brand.css");
 @import url("chrome://communicator/skin/button.css");
diff --git a/suite/themes/classic/mac/communicator/communicator.css b/suite/themes/classic/mac/communicator/communicator.css
index ae405ebeb7..3f22865939 100644
--- a/suite/themes/classic/mac/communicator/communicator.css
+++ b/suite/themes/classic/mac/communicator/communicator.css
@@ -6,7 +6,7 @@
    == Styles shared everywhere throughout the Communicator suite.
    ========================================================================== */
 
-@import url("chrome://global/skin/");
+@import url("chrome://global/skin/global.css");
 @import url("chrome://communicator/content/communicator.css");
 @import url("chrome://communicator/skin/brand.css");
 @import url("chrome://communicator/skin/button.css");
diff --git a/suite/themes/classic/mac/communicator/config.css b/suite/themes/classic/mac/communicator/config.css
index 87a8c13806..b83b219d28 100644
--- a/suite/themes/classic/mac/communicator/config.css
+++ b/suite/themes/classic/mac/communicator/config.css
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url("chrome://global/skin/");
+@import url("chrome://global/skin/global.css");
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #warningScreen {
diff --git a/suite/themes/classic/mac/navigator/pageInfo.css b/suite/themes/classic/mac/navigator/pageInfo.css
index 138008d98e..3e912719da 100644
--- a/suite/themes/classic/mac/navigator/pageInfo.css
+++ b/suite/themes/classic/mac/navigator/pageInfo.css
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import "chrome://global/skin/";
+@import "chrome://global/skin/global.css";
 
 #main-window {
   width: 600px !important;
diff --git a/suite/themes/classic/navigator/pageInfo.css b/suite/themes/classic/navigator/pageInfo.css
index d3962b8d41..42ddab213f 100644
--- a/suite/themes/classic/navigator/pageInfo.css
+++ b/suite/themes/classic/navigator/pageInfo.css
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import "chrome://global/skin/";
+@import "chrome://global/skin/global.css";
 
 /* Misc */
 tree {
diff --git a/suite/themes/modern/communicator/communicator.css b/suite/themes/modern/communicator/communicator.css
index fcf24d3a46..bc7d1234ef 100644
--- a/suite/themes/modern/communicator/communicator.css
+++ b/suite/themes/modern/communicator/communicator.css
@@ -6,7 +6,7 @@
    == Styles shared everywhere throughout the Communicator suite.
    ========================================================================== */
 
-@import url("chrome://global/skin/");
+@import url("chrome://global/skin/global.css");
 @import url("chrome://communicator/content/communicator.css");
 @import url("chrome://communicator/skin/brand.css");
 @import url("chrome://communicator/skin/button.css");
diff --git a/suite/themes/modern/communicator/profile/profile.css b/suite/themes/modern/communicator/profile/profile.css
index 8cce1e19d0..c2bc2275ea 100644
--- a/suite/themes/modern/communicator/profile/profile.css
+++ b/suite/themes/modern/communicator/profile/profile.css
@@ -6,7 +6,7 @@
   == Styles for Profile Manager window and dialogs.
   ======================================================================= */
 
-@import url("chrome://global/skin/");
+@import url("chrome://global/skin/global.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
diff --git a/suite/themes/modern/global/alerts/alert.css b/suite/themes/modern/global/alerts/alert.css
index 7f38dbae1b..239a9fbe0c 100644
--- a/suite/themes/modern/global/alerts/alert.css
+++ b/suite/themes/modern/global/alerts/alert.css
@@ -6,7 +6,7 @@
   == Styles specific to the alerts dialog.
   ======================================================================= */
 
-@import url("chrome://global/skin/");
+@import url("chrome://global/skin/global.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
diff --git a/suite/themes/modern/global/config.css b/suite/themes/modern/global/config.css
index ba1da42821..c4864c7adb 100644
--- a/suite/themes/modern/global/config.css
+++ b/suite/themes/modern/global/config.css
@@ -6,7 +6,7 @@
    == Styles for about:config
    ======================================================================= */
 
-@import url("chrome://global/skin/");
+@import url("chrome://global/skin/global.css");
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: warning screen ::::: */
diff --git a/suite/themes/modern/global/filepicker.css b/suite/themes/modern/global/filepicker.css
index 54e0909b5e..7a253cf82d 100644
--- a/suite/themes/modern/global/filepicker.css
+++ b/suite/themes/modern/global/filepicker.css
@@ -6,7 +6,7 @@
   == Styles used by the File Picker dialog.
   ======================================================================= */
 
-@import url("chrome://global/skin/");
+@import url("chrome://global/skin/global.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
diff --git a/suite/themes/modern/navigator/pageInfo.css b/suite/themes/modern/navigator/pageInfo.css
index d0a06248c7..2406f9aab9 100644
--- a/suite/themes/modern/navigator/pageInfo.css
+++ b/suite/themes/modern/navigator/pageInfo.css
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import "chrome://global/skin/";
+@import "chrome://global/skin/global.css";
 
 /* Misc */
 tree {