Removed old opacity-based disabled states

build

@@ -35,7 +35,6 @@ for F in layer-*; do
             echo "  --icon-$LINE1-$S: url(\"moz-icon://stock/$LINE2?size=$S\");" >> $F.css
             echo "  --icon-$LINE1-$S-dis: url(\"moz-icon://stock/$LINE2?size=$S&state=disabled\");" >> $F.css
         done
-        echo "  --icon-$LINE1-dis-opacity: var(--icon-base-dis-native-opacity);"  >> $F.css
         echo ""  >> $F.css
     done < $F
 
@@ -93,7 +92,6 @@ for THEME in $THEMES; do
                 echo "  --icon-$N-$DD-dis: url(\"chrome://icons/skin/dis/$THEME/${DD}x$DD/$D/$N.png\");" >> icon-theme-$THEME.css
             fi
         done
-        echo "  --icon-$N-dis-opacity: var(--icon-base-dis-opacity);" >> icon-theme-$THEME.css
         echo "" >> icon-theme-$THEME.css
     done
     echo '}' >> icon-theme-$THEME.css

theme/communicator/bookmarks/bookmarksManager.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 /* Info box */
 #detailsDeck {
   margin: 5px;
@@ -41,7 +43,6 @@ menuitem:not([type]) {
 
 #newbookmark[disabled] {
   list-style-image: var(--icon-bookmark-new-16-dis);
-  opacity: var(--icon-bookmark-new-dis-opacity);
 }
 
 #newfolder {
@@ -50,7 +51,6 @@ menuitem:not([type]) {
 
 #newfolder[disabled] {
   list-style-image: var(--icon-folder-new-16-dis);
-  opacity: var(--icon-folder-new-dis-opacity);
 }
 
 #orgClose {
@@ -59,7 +59,6 @@ menuitem:not([type]) {
 
 #orgClose[disabled] {
   list-style-image: var(--icon-window-close-16-dis);
-  opacity: var(--icon-window-close-dis-opacity);
 }
 
 #fileImport {
@@ -68,7 +67,6 @@ menuitem:not([type]) {
 
 #fileImport[disabled] {
   list-style-image: var(--icon-document-revert-16-dis);
-  opacity: var(--icon-document-revert-dis-opacity);
 }
 
 #fileExport {
@@ -77,6 +75,5 @@ menuitem:not([type]) {
 
 #fileExport[disabled] {
   list-style-image: var(--icon-document-save-as-16-dis);
-  opacity: var(--icon-document-save-as-dis-opacity);
 }
 

theme/communicator/bookmarks/bookmarksToolbar.css

@@ -50,12 +50,10 @@ toolbarbutton.bookmark-item[disabled="true"] {
   cursor: default !important;
   text-decoration: none !important;
   list-style-image: var(--icon-text-x-generic-16-dis);
-  opacity: var(--icon-text-x-generic-dis-opacity);
 }
 
 toolbarbutton.bookmark-item[disabled="true"][container="true"] {
   list-style-image: var(--icon-stock_folder-16-dis);
-  opacity: var(--icon-folder-dis-opacity);
 }
 
 .bookmark-item > .toolbarbutton-icon {
@@ -93,17 +91,14 @@ menuitem.bookmark-item {
 
 .bookmark-group {
   list-style-image: var(--icon-edit-copy-16-dis) !important;
-  opacity: var(--icon-edit-copy-dis-opacity);
 }
 
 .menuitem-iconic.bookmark-item[disabled="true"] {
   list-style-image: var(--icon-text-x-generic-16-dis);
-  opacity: var(--icon-text-x-generic-dis-opacity);
 }
 
 .menu-iconic.bookmark-item[disabled="true"][container="true"] {
   list-style-image: var(--icon-stock_folder-16-dis);
-  opacity: var(--icon-folder-dis-opacity);
 }
 
 /* ..... drag and drop styles ..... */

theme/communicator/bookmarks/placesOverlay-menus.css

@@ -14,7 +14,6 @@ menuitem:not([type]) {
 
 #placesContext_open\:newtab[disabled] {
   list-style-image: var(--icon-tab-new-16-dis);
-  opacity: var(--icon-tab-new-dis-opacity);
 }
 
 #placesContext_open\:newwindow {
@@ -23,7 +22,6 @@ menuitem:not([type]) {
 
 #placesContext_open\:newwindow[disabled] {
   list-style-image: var(--icon-window-new-16-dis);
-  opacity: var(--icon-window-new-dis-opacity);
 }
 
 #placesContext_new\:bookmark,
@@ -38,7 +36,6 @@ menuitem:not([type]) {
 #addBookmarkContextItem[disabled],
 #addMultipleBookmarksContextItem[disabled] {
   list-style-image: var(--icon-bookmark-new-16-dis);
-  opacity: var(--icon-bookmark-new-dis-opacity);
 }
 
 #placesContext_new\:folder {
@@ -47,7 +44,6 @@ menuitem:not([type]) {
 
 #placesContext_new\:folder[disabled] {
   list-style-image: var(--icon-folder-new-16-dis);
-  opacity: var(--icon-folder-new-dis-opacity);
 }
 
 #placesContext_cut {
@@ -56,7 +52,6 @@ menuitem:not([type]) {
 
 #placesContext_cut[disabled] {
   list-style-image: var(--icon-edit-cut-16-dis);
-  opacity: var(--icon-edit-cut-dis-opacity);
 }
 
 #placesContext_copy {
@@ -65,7 +60,6 @@ menuitem:not([type]) {
 
 #placesContext_copy[disabled] {
   list-style-image: var(--icon-edit-copy-16-dis);
-  opacity: var(--icon-edit-copy-dis-opacity);
 }
 
 #placesContext_paste {
@@ -74,7 +68,6 @@ menuitem:not([type]) {
 
 #placesContext_paste[disabled] {
   list-style-image: var(--icon-edit-paste-16-dis);
-  opacity: var(--icon-edit-paste-dis-opacity);
 }
 
 #placesContext_delete,
@@ -85,7 +78,6 @@ menuitem:not([type]) {
 #placesContext_delete[disabled],
 #placesContext_delete_history[disabled] {
   list-style-image: var(--icon-edit-delete-16-dis);
-  opacity: var(--icon-edit-delete-dis-opacity);
 }
 
 #placesContext_sortBy\:name {
@@ -94,7 +86,6 @@ menuitem:not([type]) {
 
 #placesContext_sortBy\:name[disabled] {
   list-style-image: var(--icon-view-sort-ascending-16-dis);
-  opacity: var(--icon-view-sort-ascending-dis-opacity);
 }
 
 #placesContext_show\:info {
@@ -103,7 +94,6 @@ menuitem:not([type]) {
 
 #placesContext_sortBy\:info[disabled] {
   list-style-image: var(--icon-document-properties-16-dis);
-  opacity: var(--icon-document-properties-dis-opacity);
 }
 
 #placesContext_selectAll {
@@ -112,6 +102,5 @@ menuitem:not([type]) {
 
 #placesContext_selectAll[disabled] {
   list-style-image: var(--icon-edit-select-all-16-dis);
-  opacity: var(--icon-edit-select-all-dis-opacity);
 }
 

theme/communicator/communicator.css

@@ -103,7 +103,6 @@ menuitem.menuitem-iconic > .menu-iconic-left {
 
 #print-button[disabled="true"] {
   list-style-image: var(--icon-document-print-24-dis) !important;
-  opacity: var(--icon-document-print-dis-opacity);
 }
 
 toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,

theme/communicator/contentAreaContextOverlay-menus.css

@@ -14,7 +14,6 @@ menuitem:not([type]) {
 
 #spell-add-to-dictionary[disabled="true"] {
   list-style-image: var(--icon-list-add-16-dis);
-  opacity: var(--icon-list-add-dis-opacity);
 }
 
 #spell-undo-add-to-dictionary {
@@ -23,7 +22,6 @@ menuitem:not([type]) {
 
 #spell-undo-add-to-dictionary[disabled="true"] {
   list-style-image: var(--icon-edit-undo-16-dis);
-  opacity:  var(--icon-edit-undo-dis-opacity);
 }
 
 #context-openlinkintab,
@@ -34,7 +32,6 @@ menuitem:not([type]) {
 #context-openlinkintab[disabled="true"],
 #context-openframeintab[disabled="true"] {
   list-style-image: var(--icon-tab-new-16-dis);
-  opacity:  var(--icon-tab-new-dis-opacity);
 }
 
 #context-openlink,
@@ -45,7 +42,6 @@ menuitem:not([type]) {
 #context-openlink[disabled="true"],
 #context-openframe[disabled="true"] {
   list-style-image: var(--icon-window-new-16-dis);
-  opacity:  var(--icon-window-new-dis-opacity);
 }
 
 #context-bookmarklink,
@@ -58,7 +54,6 @@ menuitem:not([type]) {
 #context-bookmarkpage[disabled="true"],
 #context-bookmarkframe[disabled="true"] {
   list-style-image: var(--icon-bookmark-new-16-dis);
-  opacity: var(--icon-bookmark-new-dis-opacity);
 }
 
 #context-savelink,
@@ -77,7 +72,6 @@ menuitem:not([type]) {
 #context-savepage[disabled="true"],
 #context-saveframe[disabled="true"] {
   list-style-image: var(--icon-document-save-as-16-dis);
-  opacity: var(--icon-document-save-as-dis-opacity);
 }
 
 #context-copyemail,
@@ -94,7 +88,6 @@ menuitem:not([type]) {
 #context-copyvideourl[disabled="true"],
 #context-copyaudiourl[disabled="true"] {
   list-style-image: var(--icon-edit-copy-16-dis);
-  opacity: var(--icon-edit-copy-dis-opacity);
 }
 
 #context-media-play {
@@ -103,7 +96,6 @@ menuitem:not([type]) {
 
 #context-media-play[disabled="true"] {
   list-style-image: var(--icon-media-playback-start-16-dis);
-  opacity: var(--icon-media-playback-start-dis-opacity);
 }
 
 #context-media-pause {
@@ -112,7 +104,6 @@ menuitem:not([type]) {
 
 #context-media-pause[disabled="true"] {
   list-style-image: var(--icon-media-playback-pause-16-dis);
-  opacity: var(--icon-media-playback-pause-dis-opacity);
 }
 
 #context-media-mute {
@@ -121,7 +112,6 @@ menuitem:not([type]) {
 
 #context-media-mute[disabled="true"] {
   list-style-image: var(--icon-audio-volume-muted-16-dis);
-  opacity: var(--icon-audio-volume-muted-dis-opacity);
 }
 
 #context-media-unmute {
@@ -130,7 +120,6 @@ menuitem:not([type]) {
 
 #context-media-unmute[disabled="true"] {
   list-style-image: var(--icon-audio-volume-high-16-dis);
-  opacity: var(--icon-audio-volume-high-dis-opacity);
 }
 
 #context-video-fullscreen {
@@ -139,7 +128,6 @@ menuitem:not([type]) {
 
 #context-video-fullscreen[disabled="true"] {
   list-style-image: var(--icon-view-fullscreen-16-dis);
-  opacity: var(--icon-view-fullscreen-dis-opacity);
 }
 
 #context-reloadimage,
@@ -152,7 +140,6 @@ menuitem:not([type]) {
 #context-reload[disabled="true"],
 #context-reloadframe[disabled="true"] {
   list-style-image: var(--icon-view-refresh-16-dis);
-  opacity: var(--icon-view-refresh-dis-opacity);
 }
 
 #context-back {
@@ -161,7 +148,6 @@ menuitem:not([type]) {
 
 #context-back[disabled="true"] {
   list-style-image: var(--icon-go-previous-16-dis);
-  opacity: var(--icon-go-previous-dis-opacity);
 }
 
 #context-forward {
@@ -170,7 +156,6 @@ menuitem:not([type]) {
 
 #context-forward[disabled="true"] {
   list-style-image: var(--icon-go-next-16-dis);
-  opacity: var(--icon-go-next-dis-opacity);
 }
 
 #context-stop {
@@ -179,7 +164,6 @@ menuitem:not([type]) {
 
 #context-stop[disabled="true"] {
   list-style-image: var(--icon-process-stop-16-dis);
-  opacity: var(--icon-process-stop-dis-opacity);
 }
 
 #context-searchselect {
@@ -188,7 +172,6 @@ menuitem:not([type]) {
 
 #context-searchselect[disabled="true"] {
   list-style-image: var(--icon-edit-find-16-dis);
-  opacity: var(--icon-edit-find-dis-opacity);
 }
 
 #context-viewinfo,
@@ -199,7 +182,6 @@ menuitem:not([type]) {
 #context-viewinfo[disabled="true"],
 #context-viewframeinfo[disabled="true"] {
   list-style-image: var(--icon-dialog-information-16-dis);
-  opacity: var(--icon-dialog-information-dis-opacity);
 }
 
 #context-metadata {
@@ -208,7 +190,6 @@ menuitem:not([type]) {
 
 #context-metadata[disabled="true"] {
   list-style-image: var(--icon-document-properties-16-dis);
-  opacity: var(--icon-document-properties-dis-opacity);
 }
 
 #context-printframe {
@@ -217,6 +198,5 @@ menuitem:not([type]) {
 
 #context-printframe[disabled="true"] {
   list-style-image: var(--icon-document-print-16-dis);
-  opacity: var(--icon-document-print-dis-opacity);
 }
 

theme/communicator/dataman/dataman.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 #permList {
   margin-top: .5em;
   overflow: auto;
@@ -50,7 +52,6 @@ menuitem:not([type]) {
 #storage-context-remove[disabled],
 #fdata-context-remove[disabled] {
   list-style-image: var(--icon-edit-delete-16-dis);
-  opacity: var(--icon-edit-delete-dis-opacity);
 }
 
 #cookies-context-selectall,
@@ -67,7 +68,6 @@ menuitem:not([type]) {
 #storage-context-selectall[disabled],
 #fdata-context-selectall[disabled] {
   list-style-image: var(--icon-edit-select-all-16-dis);
-  opacity: var(--icon-edit-select-all-dis-opacity);
 }
 
 #pwd-context-copypassword {
@@ -76,6 +76,5 @@ menuitem:not([type]) {
 
 #pwd-context-copypassword[disabled] {
   list-style-image: var(--icon-edit-copy-16-dis);
-  opacity: var(--icon-edit-copy-dis-opacity);
 }
 

theme/communicator/downloads/downloadmanager-menus.css

@@ -16,7 +16,6 @@ menuitem:not([type]) {
 #dlContext-pause[disabled="true"],
 #dlMenu_pause[disabled="true"] {
   list-style-image: var(--icon-media-playback-pause-16-dis);
-  opacity: var(--icon-media-playback-pause-dis-opacity);
 }
 
 #dlContext-resume,
@@ -27,7 +26,6 @@ menuitem:not([type]) {
 #dlContext-resume[disabled="true"],
 #dlMenu_resume[disabled="true"] {
   list-style-image: var(--icon-media-playback-start-16-dis);
-  opacity: var(--icon-media-playback-start-dis-opacity);
 }
 
 #dlContext-retry,
@@ -38,7 +36,6 @@ menuitem:not([type]) {
 #dlContext-retry[disabled="true"],
 #dlMenu_retry[disabled="true"] {
   list-style-image: var(--icon-view-refresh-16-dis);
-  opacity: var(--icon-view-refresh-dis-opacity);
 }
 
 #dlContext-cancel,
@@ -49,7 +46,6 @@ menuitem:not([type]) {
 #dlContext-cancel[disabled="true"],
 #dlMenu_cancel[disabled="true"] {
   list-style-image: var(--icon-gtk-cancel-16-dis);
-  opacity: var(--icon-gtk-cancel-dis-opacity);
 }
 
 #dlContext-remove,
@@ -60,7 +56,6 @@ menuitem:not([type]) {
 #dlContext-remove[disabled="true"],
 #dlMenu_remove[disabled="true"] {
   list-style-image: var(--icon-edit-delete-16-dis);
-  opacity: var(--icon-edit-delete-dis-opacity);
 }
 
 #dlContext-open,
@@ -71,7 +66,6 @@ menuitem:not([type]) {
 #dlContext-open[disabled="true"],
 #dlMenu_open[disabled="true"] {
   list-style-image: var(--icon-document-open-16-dis);
-  opacity: var(--icon-document-open-dis-opacity);
 }
 
 #dlContext-openReferrer,
@@ -82,7 +76,6 @@ menuitem:not([type]) {
 #dlContext-openReferrer[disabled="true"],
 #dlMenu_openReferrer[disabled="true"] {
   list-style-image: var(--icon-go-jump-16-dis);
-  opacity: var(--icon-go-jump-dis-opacity);
 }
 
 #dlContext-copyLocation,
@@ -93,7 +86,6 @@ menuitem:not([type]) {
 #dlContext-copyLocation[disabled="true"],
 #dlMenu_copyLocation[disabled="true"] {
   list-style-image: var(--icon-edit-copy-16-dis);
-  opacity: var(--icon-edit-copy-dis-opacity);
 }
 
 #dlContext-properties,
@@ -104,7 +96,6 @@ menuitem:not([type]) {
 #dlContext-properties[disabled="true"],
 #dlMenu_properties[disabled="true"] {
   list-style-image: var(--icon-document-properties-16-dis);
-  opacity: var(--icon-document-properties-dis-opacity);
 }
 
 #cMenu_selectAll {
@@ -113,7 +104,6 @@ menuitem:not([type]) {
 
 #cMenu_selectAll[disabled="true"] {
   list-style-image: var(--icon-edit-select-all-16-dis);
-  opacity: var(--icon-edit-select-all-dis-opacity);
 }
 
 #dlMenu_clearList {
@@ -122,7 +112,6 @@ menuitem:not([type]) {
 
 #dlMenu_clearList[disabled="true"] {
   list-style-image: var(--icon-edit-clear-16-dis);
-  opacity: var(--icon-edit-clear-dis-opacity);
 }
 
 #dlMenu_find {
@@ -131,6 +120,5 @@ menuitem:not([type]) {
 
 #dlMenu_find[disabled="true"] {
   list-style-image: var(--icon-edit-find-16-dis);
-  opacity: var(--icon-edit-find-dis-opacity);
 }
 

theme/communicator/downloads/downloadmanager.css

@@ -2,6 +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://icons/skin/icon-theme-default.css");
 @import url("chrome://communicator/skin/downloads/downloadmanager-menus.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

theme/communicator/helpOverlay.css

@@ -29,7 +29,6 @@
 
 #help-back-button[disabled="true"] {
   list-style-image: var(--icon-go-previous-24-dis);
-  opacity: var(--icon-go-previous-dis-opacity);
 }
 
 #help-back-button:-moz-locale-dir(rtl) {
@@ -38,7 +37,6 @@
 
 #help-back-button:-moz-locale-dir(rtl)[disabled="true"] {
   list-style-image: var(--icon-go-previous-rtl-24-dis);
-  opacity: var(--icon-go-previous-rtl-dis-opacity);
 }
 
 #help-forward-button {
@@ -47,7 +45,6 @@
 
 #help-forward-button[disabled="true"] {
   list-style-image: var(--icon-go-next-24-dis);
-  opacity: var(--icon-go-next-dis-opacity);
 }
 
 #help-forward-button:-moz-locale-dir(rtl) {
@@ -56,7 +53,6 @@
 
 #help-forward-button:-moz-locale-dir(rtl)[disabled="true"] {
   list-style-image: var(--icon-go-next-rtl-24);
-  opacity: var(--icon-go-next-rtl-dis-opacity);
 }
 
 #help-home-button {
@@ -65,7 +61,6 @@
 
 #help-home-button[disabled="true"] {
   list-style-image: var(--icon-go-home-24-dis);
-  opacity: var(--icon-go-home-dis-opacity);
 }
 
 #help-print-button {
@@ -74,7 +69,6 @@
 
 #help-print-button[disabled="true"] {
   list-style-image: var(--icon-document-print-24-dis) !important;
-  opacity: var(--icon-document-print-dis-opacity);
 }
 
 /* make findbar appear above content */

theme/communicator/prefpanels.css

@@ -6,6 +6,8 @@
    == Styles used by all preference panels in the Communicator suite.
    ====================================================================== */
 
+@import url("chrome://icons/skin/icon-theme-default.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: Fonts ::::: */

theme/communicator/profile/profile.css

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @import url("chrome://global/skin/global.css");
+@import url("chrome://icons/skin/icon-theme-default.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

theme/communicator/sidebar/sidebar.css

@@ -151,7 +151,6 @@ menuitem:not([type]) {
 
 #switch-ctx-item[disabled] {
   list-style-image: var(--icon-go-jump-16-dis);
-  opacity: var(--icon-go-jump-dis-opacity);
 }
 
 #reload-ctx-item {
@@ -160,7 +159,6 @@ menuitem:not([type]) {
 
 #reload-ctx-item[disabled] {
   list-style-image: var(--icon-view-refresh-16-dis);
-  opacity: var(--icon-view-refresh-dis-opacity);
 }
 
 #stop-ctx-item {
@@ -169,7 +167,6 @@ menuitem:not([type]) {
 
 #stop-ctx-item[disabled] {
   list-style-image: var(--icon-process-stop-16-dis);
-  opacity: var(--icon-view-refresh-dis-opacity);
 }
 
 #hide-ctx-item {
@@ -178,7 +175,6 @@ menuitem:not([type]) {
 
 #hide-ctx-item[disabled] {
   list-style-image: var(--icon-list-remove-16-dis);
-  opacity: var(--icon-list-remove-dis-opacity);
 }
 
 #customize-ctx-item,
@@ -189,5 +185,4 @@ menuitem[oncommand="SidebarCustomize();"] {
 #customize-ctx-item[disabled],
 menuitem[oncommand="SidebarCustomize();"][disabled] {
   list-style-image: var(--icon-document-properties-16-dis);
-  opacity: var(--icon-document-properties-dis-opacity);
 }

theme/communicator/tasksOverlay.css

@@ -7,6 +7,8 @@
    == content, such as the taskbar and product launcher icons.
    ====================================================================== */
 
+@import url("chrome://icons/skin/icon-theme-default.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: communicator product icons ::::: */

theme/communicator/utilityOverlay-menus.css

@@ -14,7 +14,6 @@ menuitem:not([type]) {
 
 #customize_toolbars[disabled] {
   list-style-image: var(--icon-document-properties-16-dis);
-  opacity: var(--icon-document-properties-dis-opacity);
 }
 
 #menu_newEditor {
@@ -23,7 +22,6 @@ menuitem:not([type]) {
 
 #menu_newEditor[disabled] {
   list-style-image: var(--icon-document-new-16-dis);
-  opacity: var(--icon-document-new-dis-opacity);
 }
 
 #menu_New {
@@ -37,7 +35,6 @@ menuitem:not([type]) {
 
 #menu_newNavigator[disabled] {
   list-style-image: var(--icon-window-new-16-dis);
-  opacity: var(--icon-window-new-dis-opacity);
 }
 
 #menu_printSetup {
@@ -46,7 +43,6 @@ menuitem:not([type]) {
 
 #menu_printSetup[disabled] {
   list-style-image: var(--icon-document-page-setup-16-dis);
-  opacity:  var(--icon-document-page-setup-dis-opacity);
 }
 
 #menu_printPreview,
@@ -57,7 +53,6 @@ menuitem:not([type]) {
 #menu_printPreview[disabled],
 #printPreviewMenuItemToolbar[disabled] {
   list-style-image: var(--icon-document-print-preview-16-dis);
-  opacity:  var(--icon-document-print-preview-dis-opacity);
 }
 
 #menu_print,
@@ -68,7 +63,6 @@ menuitem:not([type]) {
 #menu_print[disabled],
 #printMenuItemToolbar[disabled] {
   list-style-image: var(--icon-document-print-16-dis);
-  opacity:  var(--icon-document-print-dis-opacity);
 }
 
 #menu_close {
@@ -77,7 +71,6 @@ menuitem:not([type]) {
 
 #menu_close[disabled] {
   list-style-image: var(--icon-window-close-16-dis);
-  opacity:  var(--icon-window-close-dis-opacity);
 }
 
 #menu_FileQuitItem {
@@ -86,7 +79,6 @@ menuitem:not([type]) {
 
 #menu_FileQuitItem[disabled] {
   list-style-image: var(--icon-application-exit-16-dis);
-  opacity:  var(--icon-application-exit-dis-opacity);
 }
 
 #menu_undo,
@@ -97,7 +89,6 @@ menuitem:not([type]) {
 #menu_undo[disabled],
 #context-undo[disabled] {
   list-style-image: var(--icon-edit-undo-16-dis);
-  opacity:  var(--icon-edit-undo-dis-opacity);
 }
 
 #menu_redo,
@@ -108,7 +99,6 @@ menuitem:not([type]) {
 #menu_redo[disabled],
 #context-redo[disabled] {
   list-style-image: var(--icon-edit-redo-16-dis);
-  opacity:  var(--icon-edit-redo-dis-opacity);
 }
 
 #menu_cut,
@@ -119,7 +109,6 @@ menuitem:not([type]) {
 #menu_cut[disabled],
 #context-cut[disabled] {
   list-style-image: var(--icon-edit-cut-16-dis);
-  opacity: var(--icon-edit-cut-dis-opacity);
 }
 
 #menu_copy,
@@ -130,7 +119,6 @@ menuitem:not([type]) {
 #menu_copy[disabled],
 #context-copy[disabled] {
   list-style-image: var(--icon-edit-copy-16-dis);
-  opacity: var(--icon-edit-copy-dis-opacity);
 }
 
 #menu_paste,
@@ -141,7 +129,6 @@ menuitem:not([type]) {
 #menu_paste[disabled],
 #context-paste[disabled] {
   list-style-image: var(--icon-edit-paste-16-dis);
-  opacity: var(--icon-edit-paste-dis-opacity);
 }
 
 #menu_delete,
@@ -152,7 +139,6 @@ menuitem:not([type]) {
 #menu_delete[disabled],
 #context-delete[disabled] {
   list-style-image: var(--icon-edit-delete-16-dis);
-  opacity: var(--icon-edit-delete-dis-opacity);
 }
 
 #menu_selectAll,
@@ -163,7 +149,6 @@ menuitem:not([type]) {
 #menu_selectAll[disabled],
 #context-selectall[disabled] {
   list-style-image: var(--icon-edit-select-all-16-dis);
-  opacity: var(--icon-edit-select-all-dis-opacity);
 }
 
 #menu_find {
@@ -172,7 +157,6 @@ menuitem:not([type]) {
 
 #menu_find[disabled] {
   list-style-image: var(--icon-edit-find-16-dis);
-  opacity: var(--icon-edit-find-dis-opacity);
 }
 
 #menu_findReplace {
@@ -181,7 +165,6 @@ menuitem:not([type]) {
 
 #menu_findReplace[disabled] {
   list-style-image: var(--icon-edit-find-replace-16-dis);
-  opacity: var(--icon-edit-find-replace-dis-opacity);
 }
 
 #help {
@@ -190,7 +173,6 @@ menuitem:not([type]) {
 
 #help[disabled] {
   list-style-image: var(--icon-help-contents-16-dis);
-  opacity: var(--icon-help-contents-dis-opacity);
 }
 
 #aboutName {
@@ -199,5 +181,4 @@ menuitem:not([type]) {
 
 #aboutName[disabled] {
   list-style-image: var(--icon-help-about-16-dis);
-  opacity: var(--icon-help-about-dis-opacity);
 }

theme/communicator/viewSourceOverlay-menus.css

@@ -14,5 +14,4 @@ menuitem:not([type]) {
 
 #menu_editPage[disabled] {
   list-style-image: var(--icon-gtk-edit-16-dis);
-  opacity: var(--icon-gtk-edit-dis-opacity);
 }

theme/communicator/viewZoomOverlay-menus.css

@@ -14,7 +14,6 @@ menuitem:not([type]) {
 
 #menu_zoomReduce[disabled] {
   list-style-image: var(--icon-zoom-out-16-dis);
-  opacity: var(--icon-zoom-out-dis-opacity);
 }
 
 #menu_zoomEnlarge {
@@ -23,5 +22,4 @@ menuitem:not([type]) {
 
 #menu_zoomEnlarge[disabled] {
   list-style-image: var(--icon-zoom-in-16-dis);
-  opacity: var(--icon-zoom-in-dis-opacity);
 }

theme/editor/EditorContextMenuOverlay-menus.css

@@ -14,7 +14,6 @@ menuitem:not([type]) {
 
 #createLink_cm[disabled] {
   list-style-image: var(--icon-insert-link-16-dis);
-  opacity: var(--icon-insert-link-dis-opacity);
 }
 
 #objectProperties_cm {
@@ -23,7 +22,6 @@ menuitem:not([type]) {
 
 #objectProperties_cm[disabled] {
   list-style-image: var(--icon-document-properties-16-dis);
-  opacity: var(--icon-document-properties-dis-opacity);
 }
 
 #editLink_cm {
@@ -32,7 +30,6 @@ menuitem:not([type]) {
 
 #editLink_cm[disabled] {
   list-style-image: var(--icon-gtk-edit-16-dis);
-  opacity: var(--icon-gtk-edit-dis-opacity);
 }
 
 

theme/editor/composerOverlay-menus.css

@@ -14,7 +14,6 @@ menuitem:not([type]) {
 
 #fileExportToText[disabled] {
   list-style-image: var(--icon-text-x-generic-16-dis);
-  opacity: var(--icon-text-x-generic-dis-opacity);
 }
 
 #previewInBrowser {
@@ -23,5 +22,4 @@ menuitem:not([type]) {
 
 #previewInBrowser[disabled] {
   list-style-image: var(--icon-internet-web-browser-16-dis);
-  opacity: var(--icon-internet-web-browser-dis-opacity);
 }

theme/editor/editingOverlay-menus.css

@@ -14,7 +14,6 @@ menuitem:not([type]) {
 
 #menu_openRemote[disabled] {
   list-style-image: var(--icon-text-html-16-dis);
-  opacity: var(--icon-text-html-dis-opacity);
 }
 
 #menu_openFile {
@@ -23,7 +22,6 @@ menuitem:not([type]) {
 
 #menu_openFile[disabled] {
   list-style-image: var(--icon-document-open-16-dis);
-  opacity: var(--icon-document-open-dis-opacity);
 }
 
 #menu_RecentFiles {
@@ -33,7 +31,6 @@ menuitem:not([type]) {
 
 #menu_RecentFiles[disabled] {
   list-style-image: var(--icon-document-open-recent-16-dis);
-  opacity: var(--icon-document-open-recent-dis-opacity);
 }
 
 #menu_saveCmd {
@@ -42,7 +39,6 @@ menuitem:not([type]) {
 
 #menu_saveCmd[disabled] {
   list-style-image: var(--icon-document-save-16-dis);
-  opacity: var(--icon-document-save-dis-opacity);
 }
 
 #menu_saveAsCmd {
@@ -51,7 +47,6 @@ menuitem:not([type]) {
 
 #menu_saveAsCmd[disabled] {
   list-style-image: var(--icon-document-save-as-16-dis);
-  opacity: var(--icon-document-save-as-dis-opacity);
 }
 
 #menu_publish {
@@ -60,7 +55,6 @@ menuitem:not([type]) {
 
 #menu_publish[disabled] {
   list-style-image: var(--icon-network-idle-16-dis);
-  opacity: var(--icon-network-idle-dis-opacity);
 }
 
 #menu_fileRevert {
@@ -69,7 +63,6 @@ menuitem:not([type]) {
 
 #menu_fileRevert[disabled] {
   list-style-image: var(--icon-document-revert-16-dis);
-  opacity: var(--icon-document-revert-dis-opacity);
 }
 
 

theme/editor/editor-menus.css

@@ -14,7 +14,6 @@ menuitem:not([type]) {
 
 #snapToGrid[disabled] {
   list-style-image: var(--icon-stock_snap-grid-16-dis);
-  opacity: var(--icon-stock_snap-grid-dis-opacity);
 }
 
 #pageProperties {
@@ -23,6 +22,5 @@ menuitem:not([type]) {
 
 #pageProperties[disabled] {
   list-style-image: var(--icon-document-properties-16-dis);
-  opacity: var(--icon-document-properties-dis-opacity);
 }
 

theme/editor/editorFormatToolbar.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: formatting buttons ::::: */
@@ -16,7 +18,6 @@
 
 #DecreaseFontSizeButton[disabled="true"] {
   list-style-image: var(--icon-stock_decrease-font-16-dis);
-  opacity: var(--icon-stock_decrease-font-dis-opacity);
 }
 
 #IncreaseFontSizeButton {
@@ -25,7 +26,6 @@
 
 #IncreaseFontSizeButton[disabled="true"] {
   list-style-image: var(--icon-stock_increase-font-16-dis);
-  opacity: var(--icon-stock_increase-font-dis-opacity);
 }
 
 #boldButton {
@@ -34,7 +34,6 @@
 
 #boldButton[disabled="true"] {
   list-style-image: var(--icon-format-text-bold-16-dis);
-  opacity: var(--icon-format-text-bold-dis-opacity);
 }
 
 #italicButton {
@@ -43,7 +42,6 @@
 
 #italicButton[disabled="true"] {
   list-style-image: var(--icon-format-text-italic-16-dis);
-  opacity: var(--icon-format-text-italic-dis-opacity);
 }
 
 #underlineButton {
@@ -52,7 +50,6 @@
 
 #underlineButton[disabled="true"] {
   list-style-image: var(--icon-format-text-underline-16-dis);
-  opacity: var(--icon-format-text-underline-dis-opacity);
 }
 
 #ulButton {
@@ -61,7 +58,6 @@
 
 #ulButton[disabled="true"] {
   list-style-image: var(--icon-stock_list_bullet-16-dis);
-  opacity: var(--icon-stock_list_bullet-dis-opacity);
 }
 
 #olButton {
@@ -70,7 +66,6 @@
 
 #olButton[disabled="true"] {
   list-style-image: var(--icon-stock_list_enum-16-dis);
-  opacity: var(--icon-stock_list_enum-dis-opacity);
 }
 
 #outdentButton {
@@ -79,7 +74,6 @@
 
 #outdentButton[disabled="true"] {
   list-style-image: var(--icon-format-indent-less-16-dis);
-  opacity: var(--icon-format-indent-less-dis-opacity);
 }
 
 #indentButton {
@@ -88,7 +82,6 @@
 
 #indentButton[disabled="true"] {
   list-style-image: var(--icon-format-indent-more-16-dis);
-  opacity: var(--icon-format-indent-more-dis-opacity);
 }
 
 #align-left-button,
@@ -99,7 +92,6 @@
 #align-left-button[disabled="true"],
 #AlignPopupButton[disabled="true"] {
   list-style-image: var(--icon-format-justify-left-16-dis);
-  opacity: var(--icon-format-justify-left-dis-opacity);
 }
 
 #align-center-button,
@@ -110,7 +102,6 @@
 #align-center-button[disabled="true"],
 #AlignPopupButton[state="center"][disabled="true"] {
   list-style-image: var(--icon-format-justify-center-16-dis);
-  opacity: var(--icon-format-justify-center-dis-opacity);
 }
 
 #align-right-button,
@@ -121,7 +112,6 @@
 #align-right-button[disabled="true"],
 #AlignPopupButton[state="right"][disabled="true"] {
   list-style-image: var(--icon-format-justify-right-16-dis);
-  opacity: var(--icon-format-justify-right-dis-opacity);
 }
 
 #align-justify-button,
@@ -132,7 +122,6 @@
 #align-justify-button[disabled="true"],
 #AlignPopupButton[state="justify"][disabled="true"] {
   list-style-image: var(--icon-format-justify-fill-16-dis);
-  opacity: var(--icon-format-justify-fill-dis-opacity);
 }
 
 #InsertPopupButton {
@@ -141,7 +130,6 @@
 
 #InsertPopupButton[disabled="true"] {
   list-style-image: var(--icon-insert-object-16-dis);
-  opacity: var(--icon-insert-object-dis-opacity);
 }
 
 #smileButtonMenu {
@@ -321,7 +309,6 @@
 
 #HighlightColorButton[disabled="true"] {
   list-style-image: var(--icon-stock_text_color_hilight-16-dis);
-  opacity: var(--icon-stock_text_color_hilight-dis-opacity);
 }
 
 #absolutePositionButton{
@@ -330,7 +317,6 @@
 
 #absolutePositionButton[disabled="true"] {
   list-style-image: var(--icon-stock_insert-floating-frame-16-dis);
-  opacity: var(--icon-stock_insert-floating-frame-dis-opacity);
 }
 
 #increaseZIndexButton {
@@ -339,7 +325,6 @@
 
 #increaseZIndexButton[disabled="true"] {
   list-style-image: var(--icon-stock_bring-forward-16-dis);
-  opacity: var(--icon-stock_bring-forward-dis-opacity);
 }
 
 #decreaseZIndexButton {
@@ -348,5 +333,4 @@
 
 #decreaseZIndexButton[disabled="true"] {
   list-style-image: var(--icon-stock_bring-backward-16-dis);
-  opacity: var(--icon-stock_bring-backward-dis-opacity);
 }

theme/editor/editorOverlay-menus.css

@@ -14,7 +14,6 @@ menuitem:not([type]) {
 
 #menu_checkspelling[disabled="true"] {
   list-style-image: var(--icon-tools-check-spelling-16-dis);
-  opacity: var(--icon-tools-check-spelling-dis-opacity);
 }
 
 #menu_preferences {
@@ -23,7 +22,6 @@ menuitem:not([type]) {
 
 #menu_preferences[disabled] {
   list-style-image: var(--icon-preferences-desktop-16-dis);
-  opacity: var(--icon-preferences-desktop-dis-opacity);
 }
 
 #insertImage {
@@ -32,7 +30,6 @@ menuitem:not([type]) {
 
 #insertImage[disabled] {
   list-style-image: var(--icon-insert-image-16-dis);
-  opacity: var(--icon-insert-image-dis-opacity);
 }
 
 #insertTable {
@@ -41,7 +38,6 @@ menuitem:not([type]) {
 
 #insertTable[disabled] {
   list-style-image: var(--icon-stock_insert-table-16-dis);
-  opacity: var(--icon-stock_insert-table-dis-opacity);
 }
 
 #insertLink {
@@ -50,7 +46,6 @@ menuitem:not([type]) {
 
 #insertLink[disabled] {
   list-style-image: var(--icon-insert-link-16-dis);
-  opacity: var(--icon-insert-link-dis-opacity);
 }
 
 #insertAnchor {
@@ -59,7 +54,6 @@ menuitem:not([type]) {
 
 #insertAnchor[disabled] {
   list-style-image: var(--icon-stock_anchor-16-dis);
-  opacity: var(--icon-stock_anchor-dis-opacity);
 }
 
 #insertHline {
@@ -68,7 +62,6 @@ menuitem:not([type]) {
 
 #insertHline[disabled] {
   list-style-image: var(--icon-stock_insert-rule-16-dis);
-  opacity: var(--icon-stock_insert-rule-dis-opacity);
 }
 
 #insertHTMLSource {
@@ -77,7 +70,6 @@ menuitem:not([type]) {
 
 #insertHTMLSource[disabled] {
   list-style-image: var(--icon-text-html-16-dis);
-  opacity: var(--icon-text-html-dis-opacity);
 }
 
 #insertMath {
@@ -86,7 +78,6 @@ menuitem:not([type]) {
 
 #insertMath[disabled] {
   list-style-image: var(--icon-stock_insert-math-object-16-dis);
-  opacity: var(--icon-stock_insert-math-object-dis-opacity);
 }
 
 #insertChars {
@@ -95,7 +86,6 @@ menuitem:not([type]) {
 
 #insertChars[disabled] {
   list-style-image: var(--icon-stock_insert_special_character-16-dis);
-  opacity: var(--icon-stock_insert_special_character-dis-opacity);
 }
 /*
 fontFaceMenu

theme/editor/editorPrimaryToolbar.css

@@ -14,7 +14,6 @@
 
 #newButton[disabled="true"] {
   list-style-image: var(--icon-document-new-24-dis);
-  opacity: var(--icon-document-new-dis-opacity);
 }
 
 #openButton {
@@ -23,7 +22,6 @@
 
 #openButton[disabled="true"] {
   list-style-image: var(--icon-document-open-24-dis);
-  opacity: var(--icon-document-open-dis-opacity);
 }
 
 #saveButton {
@@ -32,7 +30,6 @@
 
 #saveButton[disabled="true"] {
   list-style-image: var(--icon-document-save-24-dis);
-  opacity: var(--icon-document-save-dis-opacity);
 }
 
 #publishButton {
@@ -41,7 +38,6 @@
 
 #publishButton[disabled="true"] {
   list-style-image: var(--icon-network-idle-24-dis);
-  opacity: var(--icon-network-idle-dis-opacity);
 }
 
 #previewButton {
@@ -50,7 +46,6 @@
 
 #previewButton[disabled="true"] {
   list-style-image: var(--icon-internet-web-browser-24-dis);
-  opacity: var(--icon-internet-web-browser-dis-opacity);
 }
 
 #linkButton {
@@ -59,7 +54,6 @@
 
 #linkButton[disabled="true"] {
   list-style-image: var(--icon-insert-link-24-dis);
-  opacity: var(--icon-insert-link-dis-opacity);
 }
 
 #imageButton {
@@ -68,7 +62,6 @@
 
 #imageButton[disabled="true"] {
   list-style-image: var(--icon-insert-image-24-dis);
-  opacity: var(--icon-insert-image-dis-opacity);
 }
 
 #namedAnchorButton {
@@ -89,7 +82,6 @@
 
 #spellingButton[disabled="true"] {
   list-style-image: var(--icon-tools-check-spelling-24-dis);
-  opacity: var(--icon-tools-check-spelling-dis-opacity);
 }
 
 #cutButton {
@@ -98,7 +90,6 @@
 
 #cutButton[disabled="true"] {
   list-style-image: var(--icon-edit-cut-24-dis);
-  opacity: var(--icon-edit-cut-dis-opacity);
 }
 
 #copyButton {
@@ -107,7 +98,6 @@
 
 #copyButton[disabled="true"] {
   list-style-image: var(--icon-edit-copy-24-dis);
-  opacity: var(--icon-edit-copy-dis-opacity);
 }
 
 #pasteButton {
@@ -116,7 +106,6 @@
 
 #pasteButton[disabled="true"] {
   list-style-image: var(--icon-edit-paste-24-dis);
-  opacity: var(--icon-edit-paste-dis-opacity);
 }
 
 #findButton {
@@ -125,5 +114,4 @@
 
 #findButton[disabled="true"] {
   list-style-image: var(--icon-edit-find-24-dis);
-  opacity: var(--icon-edit-find-dis-opacity);
 }

theme/extensions/calendar/accountCentral.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 #lightning-newCalendar-row {
   list-style-image: var(--icon-x-office-calendar-32) !important;
 }

theme/extensions/calendar/calendar-task-view.css

@@ -44,7 +44,6 @@
 
 #calendar-add-task-button[disabled="true"] > .toolbarbutton-icon {
   list-style-image: var(--icon-stock_task-16-dis);
-  opacity: var(--icon-stock_task-dis-opacity);
 }
 
 #calendar-add-task-button > .toolbarbutton-icon {

theme/extensions/calendar/lightbird.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 #mini-cal,
 #tasksMenuCalendar {
   list-style-image: var(--icon-x-office-calendar-16);

theme/extensions/calendar/lightning-toolbar.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 /* Lightning "Calendar" Toolbarbutton */
 
 #lightning-button-calendar {
@@ -20,7 +22,6 @@
 #calendar-synchronize-button[disabled="true"],
 #task-synchronize-button[disabled="true"] {
   list-style-image: var(--icon-view-refresh-24-dis);
-  opacity: var(--icon-view-refresh-dis-opacity);
 }
 
 #extractEventButton,
@@ -35,7 +36,6 @@
 #hdrExtractEventButton[disabled="true"],
 #calendar-newevent-button[disabled="true"] {
   list-style-image: var(--icon-appointment-new-24-dis);
-  opacity: var(--icon-appoitment-new-dis-opacity);
 }
 
 #extractTaskButton,
@@ -50,7 +50,6 @@
 #hdrExtractTaskButton[disabled="true"],
 #calendar-newtask-button[disabled="true"] {
   list-style-image: var(--icon-stock_task-24-dis);
-  opacity: var(--icon-stock_task-dis-opacity);
 }
 
 #calendar-edit-button,
@@ -61,7 +60,6 @@
 #calendar-edit-button[disabled="true"],
 #task-edit-button[disabled="true"] {
   list-style-image: var(--icon-gtk-edit-24-dis);
-  opacity: var(--icon-gtk-edit-dis-opacity);
 }
 
 #calendar-delete-button,
@@ -72,7 +70,6 @@
 #calendar-delete-button[disabled="true"],
 #task-delete-button[disabled="true"] {
   list-style-image: var(--icon-edit-delete-24-dis);
-  opacity: var(--icon-edit-delete-dis-opacity);
 }
 
 #calendar-goto-today-button {
@@ -81,7 +78,6 @@
 
 #calendar-goto-today-button[disabled="true"] {
   list-style-image: var(--icon-go-today-24-dis);
-  opacity: var(--icon-go-today-dis-opacity);
 }
 
 #calendar-print-button,
@@ -92,7 +88,6 @@
 #calendar-print-button[disabled="true"],
 #task-print-button[disabled="true"] {
   list-style-image: var(--icon-document-print-24-dis);
-  opacity: var(--icon-document-print-dis-opacity);
 }
 
 #calendar-unifinder-button {
@@ -101,7 +96,6 @@
 
 #calendar-unifinder-button[disabled="true"] {
   list-style-image: var(--icon-edit-find-24-dis);
-  opacity: var(--icon-edit-find-dis-opacity);
 }
 
 toolbar[iconsize="small"] #lightning-button-calendar {
@@ -120,7 +114,6 @@ toolbar[iconsize="small"] #task-synchronize-button {
 toolbar[iconsize="small"] #calendar-synchronize-button[disabled="true"],
 toolbar[iconsize="small"] #task-synchronize-button[disabled="true"] {
   list-style-image: var(--icon-view-refresh-16-dis);
-  opacity: var(--icon-view-refresh-dis-opacity);
 }
 
 toolbar[iconsize="small"] #extractEventButton,
@@ -135,7 +128,6 @@ toolbar[iconsize="small"] #task-newevent-button[disabled="true"],
 toolbar[iconsize="small"] #hdrExtractEventButton[disabled="true"],
 toolbar[iconsize="small"] #calendar-newevent-button[disabled="true"] {
   list-style-image: var(--icon-appointment-new-16-dis);
-  opacity: var(--icon-appoitment-new-dis-opacity);
 }
 
 toolbar[iconsize="small"] #extractTaskButton,
@@ -150,7 +142,6 @@ toolbar[iconsize="small"] #task-newtask-button[disabled="true"],
 toolbar[iconsize="small"] #hdrExtractTaskButton[disabled="true"],
 toolbar[iconsize="small"] #calendar-newtask-button[disabled="true"] {
   list-style-image: var(--icon-stock_task-16-dis);
-  opacity: var(--icon-stock_task-dis-opacity);
 }
 
 toolbar[iconsize="small"] #calendar-edit-button,
@@ -161,7 +152,6 @@ toolbar[iconsize="small"] #task-edit-button {
 toolbar[iconsize="small"] #calendar-edit-button[disabled="true"],
 toolbar[iconsize="small"] #task-edit-button[disabled="true"] {
   list-style-image: var(--icon-gtk-edit-16-dis);
-  opacity: var(--icon-gtk-edit-dis-opacity);
 }
 
 toolbar[iconsize="small"] #calendar-delete-button,
@@ -172,7 +162,6 @@ toolbar[iconsize="small"] #task-delete-button {
 toolbar[iconsize="small"] #calendar-delete-button[disabled="true"],
 toolbar[iconsize="small"] #task-delete-button[disabled="true"] {
   list-style-image: var(--icon-edit-delete-16-dis);
-  opacity: var(--icon-edit-delete-dis-opacity);
 }
 
 toolbar[iconsize="small"] #calendar-goto-today-button {
@@ -181,7 +170,6 @@ toolbar[iconsize="small"] #calendar-goto-today-button {
 
 toolbar[iconsize="small"] #calendar-goto-today-button[disabled="true"] {
   list-style-image: var(--icon-go-today-16-dis);
-  opacity: var(--icon-go-today-dis-opacity);
 }
 
 toolbar[iconsize="small"] #calendar-print-button,
@@ -192,7 +180,6 @@ toolbar[iconsize="small"] #task-print-button {
 toolbar[iconsize="small"] #calendar-print-button[disabled="true"],
 toolbar[iconsize="small"] #task-print-button[disabled="true"] {
   list-style-image: var(--icon-document-print-16-dis);
-  opacity: var(--icon-document-print-dis-opacity);
 }
 
 toolbar[iconsize="small"] #calendar-unifinder-button {
@@ -201,6 +188,5 @@ toolbar[iconsize="small"] #calendar-unifinder-button {
 
 toolbar[iconsize="small"] #calendar-unifinder-button[disabled="true"] {
   list-style-image: var(--icon-edit-find-16-dis);
-  opacity: var(--icon-edit-find-dis-opacity);
 }
 

theme/extensions/calendar/lightning.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 #calsidebar_splitter,
 #today-splitter {
   -moz-appearance: splitter !important;

theme/extensions/calendar/sunbird-toolbar.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 /*--------------------------------------------------------------------
  *   Cut button
  *-------------------------------------------------------------------*/
@@ -12,7 +14,6 @@
 
 #calendar-cut-button[disabled="true"] {
     list-style-image: var(--icon-edit-cut-24-dis);
-    opacity: var(--icon-edit-cut-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -25,7 +26,6 @@ toolbar[iconsize="small"] #calendar-cut-button {
 
 toolbar[iconsize="small"] #calendar-cut-button[disabled="true"] {
     list-style-image: var(--icon-edit-cut-16-dis);
-    opacity: var(--icon-edit-cut-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -38,7 +38,6 @@ toolbar[iconsize="small"] #calendar-cut-button[disabled="true"] {
 
 #calendar-copy-button[disabled="true"] {
     list-style-image: var(--icon-edit-copy-24-dis);
-    opacity: var(--icon-edit-copy-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -51,7 +50,6 @@ toolbar[iconsize="small"] #calendar-copy-button {
 
 toolbar[iconsize="small"] #calendar-copy-button[disabled="true"] {
     list-style-image: var(--icon-edit-copy-16-dis);
-    opacity: var(--icon-edit-copy-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -64,7 +62,6 @@ toolbar[iconsize="small"] #calendar-copy-button[disabled="true"] {
 
 #calendar-paste-button[disabled="true"] {
     list-style-image: var(--icon-edit-paste-24-dis);
-    opacity: var(--icon-edit-paste-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -77,7 +74,6 @@ toolbar[iconsize="small"] #calendar-paste-button {
 
 toolbar[iconsize="small"] #calendar-paste-button[disabled="true"] {
     list-style-image: var(--icon-edit-paste-16-dis);
-    opacity: var(--icon-edit-paste-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -90,7 +86,6 @@ toolbar[iconsize="small"] #calendar-paste-button[disabled="true"] {
 
 #calendar-choose-date-button[disabled="true"] {
     list-style-image: var(--icon-go-jump-24-dis);
-    opacity: var(--icon-go-jump-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -103,7 +98,6 @@ toolbar[iconsize="small"] #calendar-choose-date-button {
 
 toolbar[iconsize="small"] #calendar-choose-date-button[disabled="true"] {
     list-style-image: var(--icon-go-jump-16-dis);
-    opacity: var(--icon-go-jump-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -116,7 +110,6 @@ toolbar[iconsize="small"] #calendar-choose-date-button[disabled="true"] {
 
 #calendar-delete-button[disabled="true"] {
     list-style-image: var(--icon-edit-delete-24-dis);
-    opacity: var(--icon-edit-delete-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -129,7 +122,6 @@ toolbar[iconsize="small"] #calendar-delete-button {
 
 toolbar[iconsize="small"] #calendar-delete-button[disabled="true"] {
     list-style-image: var(--icon-edit-delete-16-dis);
-    opacity: var(--icon-edit-delete-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -142,7 +134,6 @@ toolbar[iconsize="small"] #calendar-delete-button[disabled="true"] {
 
 #calendar-print-button[disabled="true"] {
     list-style-image: var(--icon-document-print-24-dis);
-    opacity: var(--icon-document-print-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -155,7 +146,6 @@ toolbar[iconsize="small"] #calendar-print-button {
 
 toolbar[iconsize="small"] #calendar-print-button[disabled="true"] {
     list-style-image: var(--icon-document-print-16-dis);
-    opacity: var(--icon-document-print-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -168,7 +158,6 @@ toolbar[iconsize="small"] #calendar-print-button[disabled="true"] {
 
 #calendar-go-to-today-button[disabled="true"] {
     list-style-image: var(--icon-go-today-24-dis);
-    opacity: var(--icon-go-today-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -181,7 +170,6 @@ toolbar[iconsize="small"] #calendar-go-to-today-button {
 
 toolbar[iconsize="small"] #calendar-go-to-today-button[disabled="true"] {
     list-style-image: var(--icon-go-today-16-dis);
-    opacity: var(--icon-go-today-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -194,7 +182,6 @@ toolbar[iconsize="small"] #calendar-go-to-today-button[disabled="true"] {
 
 #calendar-remote-reload-button[disabled="true"] {
     list-style-image: var(--icon-view-refresh-24-dis);
-    opacity: var(--icon-view-refresh-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -207,7 +194,6 @@ toolbar[iconsize="small"] #calendar-remote-reload-button {
 
 toolbar[iconsize="small"] #calendar-remote-reload-button[disabled="true"] {
     list-style-image: var(--icon-view-refresh-16-dis);
-    opacity: var(--icon-view-refresh-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -220,7 +206,6 @@ toolbar[iconsize="small"] #calendar-remote-reload-button[disabled="true"] {
 
 #calendar-new-event-button[disabled="true"] {
   list-style-image: var(--icon-appointment-new-24-dis);
-  opacity: var(--icon-appoitment-new-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -233,7 +218,6 @@ toolbar[iconsize="small"] #calendar-new-event-button {
 
 toolbar[iconsize="small"] #calendar-new-event-button[disabled="true"] {
   list-style-image: var(--icon-appointment-new-16-dis);
-  opacity: var(--icon-appoitment-new-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -246,7 +230,6 @@ toolbar[iconsize="small"] #calendar-new-event-button[disabled="true"] {
 
 #calendar-new-task-button[disabled="true"] {
   list-style-image: var(--icon-stock_task-24-dis);
-  opacity: var(--icon-stock_task-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -259,7 +242,6 @@ toolbar[iconsize="small"] #calendar-new-task-button {
 
 toolbar[iconsize="small"] #calendar-new-task-button[disabled="true"] {
   list-style-image: var(--icon-stock_task-16-dis);
-  opacity: var(--icon-stock_task-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -272,7 +254,6 @@ toolbar[iconsize="small"] #calendar-new-task-button[disabled="true"] {
 
 #calendar-edit-button[disabled="true"] {
   list-style-image: var(--icon-gtk-edit-24-dis);
-  opacity: var(--icon-gtk-edit-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -285,7 +266,6 @@ toolbar[iconsize="small"] #calendar-edit-button {
 
 toolbar[iconsize="small"] #calendar-edit-button[disabled="true"] {
   list-style-image: var(--icon-gtk-edit-16-dis);
-  opacity: var(--icon-gtk-edit-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -298,7 +278,6 @@ toolbar[iconsize="small"] #calendar-edit-button[disabled="true"] {
 
 #calendar-unifinder-button[disabled="true"] {
   list-style-image: var(--icon-edit-find-24-dis);
-  opacity: var(--icon-edit-find-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -311,7 +290,6 @@ toolbar[iconsize="small"] #calendar-unifinder-button {
 
 toolbar[iconsize="small"] #calendar-unifinder-button[disabled="true"] {
   list-style-image: var(--icon-edit-find-16-dis);
-  opacity: var(--icon-edit-find-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -324,7 +302,6 @@ toolbar[iconsize="small"] #calendar-unifinder-button[disabled="true"] {
 
 #calendar-import-button[disabled="true"] {
     list-style-image: var(--icon-stock_calendar-import-24-dis);
-    opacity: var(--icon-stock_calendar-import-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -337,7 +314,6 @@ toolbar[iconsize="small"] #calendar-import-button {
 
 toolbar[iconsize="small"] #calendar-import-button[disabled="true"] {
     list-style-image: var(--icon-stock_calendar-import-16-dis);
-    opacity: var(--icon-stock_calendar-import-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -350,7 +326,6 @@ toolbar[iconsize="small"] #calendar-import-button[disabled="true"] {
 
 #calendar-export-button[disabled="true"] {
     list-style-image: var(--icon-stock_calendar-export-24-dis);
-    opacity: var(--icon-stock_calendar-export-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -363,7 +338,6 @@ toolbar[iconsize="small"] #calendar-export-button {
 
 toolbar[iconsize="small"] #calendar-export-button[disabled="true"] {
     list-style-image: var(--icon-stock_calendar-export-16-dis);
-    opacity: var(--icon-stock_calendar-export-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -376,7 +350,6 @@ toolbar[iconsize="small"] #calendar-export-button[disabled="true"] {
 
 #calendar-subscribe-button[disabled="true"] {
     list-style-image: var(--icon-stock_calendar-subscribe-24-dis);
-    opacity: var(--icon-stock_calendar-subscribe-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -389,7 +362,6 @@ toolbar[iconsize="small"] #calendar-subscribe-button {
 
 toolbar[iconsize="small"] #calendar-subscribe-button[disabled="true"] {
     list-style-image: var(--icon-stock_calendar-subscribe-16-dis);
-    opacity: var(--icon-stock_calendar-subscribe-dis-opacity);
 }
 
 /*--------------------------------------------------------------------
@@ -402,7 +374,6 @@ toolbar[iconsize="small"] #calendar-subscribe-button[disabled="true"] {
 
 #calendar-publish-button[disabled="true"] {
     list-style-image: var(--icon-stock_calendar-publish-24-dis);
-    opacity: var(--icon-stock_calendar-publish-dis-opacity);
 }
 
 /*--------------------------------------------------------------------

theme/extensions/calendar/today-pane.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 .today-closebutton {
   -moz-appearance: toolbarbutton;
   list-style-image: var(--icon-window-close-16);
@@ -19,7 +21,6 @@
 
 #todaypane-new-event-button[disabled="true"] > .toolbarbutton-icon {
   list-style-image: var(--icon-appointment-new-16-dis);
-  opacity: var(--icon-appointment-new-dis-opacity);
 }
 
 #todaypane-new-event-button > .toolbarbutton-icon {

theme/extensions/chatzilla/browserOverlay.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 #tb-chatzilla-open {
   list-style-image: var(--icon-internet-group-chat-24);
 }

theme/extensions/chatzilla/chatzilla.css

@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @import url(chrome://communicator/skin/);
+@import url("chrome://icons/skin/icon-theme-default.css");
 
 window {
     width: 640px;

theme/extensions/chatzilla/chatzillaOverlay.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 #tasksMenuIRC,
 #mini-irc,
 .icon-irc16 {

theme/extensions/inspector/inspectorWindow.css

@@ -5,6 +5,7 @@
 @import url("chrome://inspector/skin");
 @import url("chrome://navigator/skin");
 @import url("chrome://browser/skin");
+@import url("chrome://icons/skin/icon-theme-default.css");
 
 #bxURLBar {
   padding: 2px;
@@ -38,7 +39,6 @@
 
 #btnFind[disabled="true"] {
   list-style-image: var(--icon-edit-find-24-dis);
-  opacity: var(--icon-edit-find-dis-opacity);
 }
 
 .viewer-list, .viewer-menu {

theme/extensions/inspector/titledSplitter.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 .titled-splitter {
   border-top: 1px outset InactiveCaption;
   border-bottom: 1px outset InactiveCaption;

theme/extensions/seafox/navigator.css

@@ -1,3 +1,5 @@
+@import url("chrome://icons/skin/icon-theme-default.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /************ IDENTITY BOX ************/

theme/extensions/seafox/toolbarbuttons.css

@@ -1,3 +1,5 @@
+@import url("chrome://icons/skin/icon-theme-default.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /*************** TOOLBAR BUTTONS ***************/
@@ -8,7 +10,6 @@
 
 #seafox-newwindow-button[disabled="true"] {
   list-style-image: var(--icon-window-new-24-dis);
-  opacity: var(--icon-window-new-dis-opacity);
 }
 
 #seafox-newtab-button {
@@ -17,7 +18,6 @@
 
 #seafox-newtab-button[disabled="true"] {
   list-style-image: var(--icon-tab-new-24-dis);
-  opacity: var(--icon-tab-new-dis-opacity);
 }
 
 #seafox-paste-button {
@@ -26,7 +26,6 @@
 
 #seafox-paste-button[disabled="true"] {
   list-style-image: var(--icon-edit-paste-24-dis);
-  opacity: var(--icon-edit-paste-dis-opacity);
 }
 
 #seafox-copy-button {
@@ -35,7 +34,6 @@
 
 #seafox-copy-button[disabled="true"] {
   list-style-image: var(--icon-edit-copy-24-dis);
-  opacity: var(--icon-edit-copy-dis-opacity);
 }
 
 #seafox-cut-button {
@@ -44,7 +42,6 @@
 
 #seafox-cut-button[disabled="true"] {
   list-style-image: var(--icon-edit-cut-24-dis);
-  opacity: var(--icon-edit-cut-dis-opacity);
 }
 
 #seafox-sidebar-button {
@@ -61,7 +58,6 @@ toolbar[iconsize="small"] #seafox-newwindow-button {
 
 toolbar[iconsize="small"] #seafox-newwindow-button[disabled="true"] {
   list-style-image: var(--icon-window-new-16-dis);
-  opacity: var(--icon-window-new-dis-opacity);
 }
 
 toolbar[iconsize="small"] #seafox-newtab-button {
@@ -70,7 +66,6 @@ toolbar[iconsize="small"] #seafox-newtab-button {
 
 toolbar[iconsize="small"] #seafox-newtab-button[disabled="true"] {
   list-style-image: var(--icon-tab-new-16-dis);
-  opacity: var(--icon-tab-new-dis-opacity);
 }
 
 toolbar[iconsize="small"] #seafox-paste-button {
@@ -79,7 +74,6 @@ toolbar[iconsize="small"] #seafox-paste-button {
 
 toolbar[iconsize="small"] #seafox-paste-button[disabled="true"] {
   list-style-image: var(--icon-edit-paste-16-dis);
-  opacity: var(--icon-edit-paste-dis-opacity);
 }
 
 toolbar[iconsize="small"] #seafox-copy-button {
@@ -88,7 +82,6 @@ toolbar[iconsize="small"] #seafox-copy-button {
 
 toolbar[iconsize="small"] #seafox-copy-button[disabled="true"] {
   list-style-image: var(--icon-edit-copy-16-dis);
-  opacity: var(--icon-edit-copy-dis-opacity);
 }
 
 toolbar[iconsize="small"] #seafox-cut-button {
@@ -97,7 +90,6 @@ toolbar[iconsize="small"] #seafox-cut-button {
 
 toolbar[iconsize="small"] #seafox-cut-button[disabled="true"] {
   list-style-image: var(--icon-edit-cut-16-dis);
-  opacity: var(--icon-edit-cut-dis-opacity);
 }
 
 toolbar[iconsize="small"]  #seafox-sidebar-button {

theme/extensions/seatabx2/seatabx2.css

@@ -1,5 +1,7 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+@import url("chrome://icons/skin/icon-theme-default.css");
+
 /* undo the fix for the skinny alltabs button. It is not skinny here, and it becomes too fat */
 .tabs-alltabs-button > .toolbarbutton-menu-dropmarker {
   margin-left: 0px !important;

theme/global/alerts/alert.css

@@ -7,6 +7,7 @@
   ======================================================================= */
 
 @import url("chrome://global/skin/");
+@import url("chrome://icons/skin/icon-theme-default.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

theme/global/button.css

@@ -6,6 +6,8 @@
   == Styles used by the XUL button element.
   ======================================================================= */
 
+@import url("chrome://icons/skin/icon-theme-default.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* :::::::::: button :::::::::: */
@@ -155,227 +157,202 @@ button[type="disclosure"][open="true"] {
  * GNOME Stock Icon Styles
  */
 
-button[icon="accept"] .button-icon {
+button[icon="accept"] {
   list-style-image: var(--icon-gtk-ok-22);
 }
 
-button[icon="accept"][disabled="true"] .button-icon {
+button[icon="accept"][disabled="true"] {
   list-style-image: var(--icon-gtk-ok-22-dis);
-  opacity: var(--icon-gtk-ok-dis-opacity);
 }
 
-button[icon="cancel"] .button-icon {
+button[icon="cancel"] {
   list-style-image: var(--icon-gtk-cancel-22);
 }
 
-button[icon="cancel"][disabled="true"] .button-icon {
+button[icon="cancel"][disabled="true"] {
   list-style-image: var(--icon-gtk-cancel-22-dis);
-  opacity: var(--icon-gtk-cancel-dis-opacity);
 }
 
-button[icon="help"] .button-icon {
+button[icon="help"] {
   list-style-image: var(--icon-help-contents-22);
 }
 
-button[icon="help"][disabled="true"] .button-icon {
+button[icon="help"][disabled="true"] {
   list-style-image: var(--icon-help-contents-22-dis);
-  opacity: var(--icon-document-open-dis-opacity);
 }
 
-button[icon="open"] .button-icon {
+button[icon="open"] {
   list-style-image: var(--icon-document-open-22);
 }
 
-button[icon="open"][disabled="true"] .button-icon {
+button[icon="open"][disabled="true"] {
   list-style-image: var(--icon-document-open-22-dis);
-  opacity: var(--icon-document-open-dis-opacity);
 }
 
-button[icon="save"] .button-icon {
+button[icon="save"] {
   list-style-image: var(--icon-document-save-22);
 }
 
-button[icon="save"][disabled="true"] .button-icon {
+button[icon="save"][disabled="true"] {
   list-style-image: var(--icon-document-save-22-dis);
-  opacity: var(--icon-document-save-dis-opacity);
 }
 
-button[icon="find"] .button-icon {
+button[icon="find"] {
   list-style-image: var(--icon-edit-find-22);
 }
 
-button[icon="find"][disabled="true"] .button-icon {
+button[icon="find"][disabled="true"] {
   list-style-image: var(--icon-edit-find-22-dis);
-  opacity: var(--icon-edit-find-dis-opacity);
 }
 
-button[icon="clear"] .button-icon {
+button[icon="clear"] {
   list-style-image: var(--icon-edit-clear-22);
 }
 
-button[icon="clear"][disabled="true"] .button-icon {
+button[icon="clear"][disabled="true"] {
   list-style-image: var(--icon-edit-clear-22-dis);
-  opacity: var(--icon-edit-clear-dis-opacity);
 }
 
-button[icon="yes"] .button-icon {
+button[icon="yes"] {
   list-style-image: var(--icon-gtk-yes-22);
 }
 
-button[icon="yes"][disabled="true"] .button-icon {
+button[icon="yes"][disabled="true"] {
   list-style-image: var(--icon-gtk-yes-22-dis);
-  opacity: var(--icon-gtk-yes-dis-opacity);
 }
 
-button[icon="no"] .button-icon {
+button[icon="no"] {
   list-style-image: var(--icon-gtk-no-22);
 }
 
-button[icon="no"][disabled="true"] .button-icon {
+button[icon="no"][disabled="true"] {
   list-style-image: var(--icon-gtk-no-22-dis);
-  opacity: var(--icon-gtk-no-dis-opacity);
 }
 
-button[icon="apply"] .button-icon {
+button[icon="apply"] {
   list-style-image: var(--icon-gtk-apply-22);
 }
 
-button[icon="apply"][disabled="true"] .button-icon {
+button[icon="apply"][disabled="true"] {
   list-style-image: var(--icon-gtk-apply-22-dis);
-  opacity: var(--icon-gtk-apply-dis-opacity);
 }
 
-button[icon="close"] .button-icon {
+button[icon="close"] {
   list-style-image: var(--icon-window-close-22);
 }
 
-button[icon="close"][disabled="true"] .button-icon {
+button[icon="close"][disabled="true"] {
   list-style-image: var(--icon-window-close-22-dis);
-  opacity: var(--icon-window-close-dis-opacity);
 }
 
-button[icon="print"] .button-icon {
+button[icon="print"] {
   list-style-image: var(--icon-document-print-22);
 }
 
-button[icon="print"][disabled="true"] .button-icon {
+button[icon="print"][disabled="true"] {
   list-style-image: var(--icon-document-print-22-dis);
-  opacity: var(--icon-document-print-dis-opacity);
 }
 
-button[icon="add"] .button-icon {
+button[icon="add"] {
   list-style-image: var(--icon-list-add-22);
 }
 
-button[icon="add"][disabled="true"] .button-icon {
+button[icon="add"][disabled="true"] {
   list-style-image: var(--icon-list-add-22-dis);
-  opacity: var(--icon-list-add-dis-opacity);
 }
 
-button[icon="remove"] .button-icon {
+button[icon="remove"] {
   list-style-image: var(--icon-list-remove-22);
 }
 
-button[icon="remove"][disabled="true"] .button-icon {
+button[icon="remove"][disabled="true"] {
   list-style-image: var(--icon-list-remove-22-dis);
-  opacity: var(--icon-list-remove-dis-opacity);
 }
 
-button[icon="refresh"] .button-icon {
+button[icon="refresh"] {
   list-style-image: var(--icon-view-refresh-22);
 }
 
-button[icon="refresh"][disabled="true"] .button-icon {
+button[icon="refresh"][disabled="true"] {
   list-style-image: var(--icon-view-refresh-22-dis);
-  opacity: var(--icon-view-refresh-dis-opacity);
 }
 
-button[icon="revert"] .button-icon {
+button[icon="revert"] {
   list-style-image: var(--icon-document-revert-22);
 }
 
-button[icon="revert"][disabled="true"] .button-icon {
+button[icon="revert"][disabled="true"] {
   list-style-image: var(--icon-document-revert-22-dis);
-  opacity: var(--icon-document-revert-dis-opacity);
 }
 
-button[icon="revert"]:-moz-locale-dir(rtl) .button-icon {
+button[icon="revert"]:-moz-locale-dir(rtl) {
   list-style-image: var(--icon-document-revert-rtl-22);
 }
 
-button[icon="revert"]:-moz-locale-dir(rtl)[disabled="true"] .button-icon {
+button[icon="revert"]:-moz-locale-dir(rtl)[disabled="true"] {
   list-style-image: var(--icon-document-revert-rtl-22-dis);
-  opacity: var(--icon-document-revert-rtl-dis-opacity);
 }
 
-button[icon="go-forward"] .button-icon {
+button[icon="go-forward"] {
   list-style-image: var(--icon-go-next-22);
 }
 
-button[icon="go-forward"][disabled="true"] .button-icon {
+button[icon="go-forward"][disabled="true"] {
   list-style-image: var(--icon-go-next-22-dis);
-  opacity: var(--icon-go-next-dis-opacity);
 }
 
-button[icon="go-forward"]:-moz-locale-dir(rtl) .button-icon {
+button[icon="go-forward"]:-moz-locale-dir(rtl) {
   list-style-image: var(--icon-go-next-rtl-22);
 }
 
-button[icon="go-forward"]:-moz-locale-dir(rtl)[disabled="true"] .button-icon {
+button[icon="go-forward"]:-moz-locale-dir(rtl)[disabled="true"] {
   list-style-image: var(--icon-go-next-rtl-22-dis);
-  opacity: var(--icon-go-next-rtl-dis-opacity);
 }
 
-button[icon="go-back"] .button-icon {
+button[icon="go-back"] {
   list-style-image: var(--icon-go-previous-22);
 }
 
-button[icon="go-back"][disabled="true"] .button-icon {
+button[icon="go-back"][disabled="true"] {
   list-style-image: var(--icon-go-previous-22-dis);
-  opacity: var(--icon-go-previous-dis-opacity);
 }
 
-button[icon="go-back"]:-moz-locale-dir(rtl) .button-icon {
+button[icon="go-back"]:-moz-locale-dir(rtl) {
   list-style-image: var(--icon-go-previous-rtl-22);
 }
 
-button[icon="go-back"]:-moz-locale-dir(rtl)[disabled="true"] .button-icon {
+button[icon="go-back"]:-moz-locale-dir(rtl)[disabled="true"] {
   list-style-image: var(--icon-go-previous-rtl-22-dis);
-  opacity: var(--icon-go-previous-rtl-dis-opacity);
 }
 
-button[icon="properties"] .button-icon {
+button[icon="properties"] {
   list-style-image: var(--icon-document-properties-22);
 }
 
-button[icon="properties"][disabled="true"] .button-icon {
+button[icon="properties"][disabled="true"] {
   list-style-image: var(--icon-document-properties-22-dis);
-  opacity: var(--icon-document-properties-dis-opacity);
 }
 
-button[icon="select-font"] .button-icon {
+button[icon="select-font"] {
   list-style-image: var(--icon-gtk-select-font-22);
 }
 
-button[icon="select-font"][disabled="true"] .button-icon {
+button[icon="select-font"][disabled="true"] {
   list-style-image: var(--icon-gtk-select-font-22-dis);
-  opacity: var(--icon-gtk-select-font-dis-opacity);
 }
 
-button[icon="select-color"] .button-icon {
+button[icon="select-color"] {
   list-style-image: var(--icon-gtk-color-picker-22);
 }
 
-button[icon="select-color"][disabled="true"] .button-icon {
+button[icon="select-color"][disabled="true"] {
   list-style-image: var(--icon-gtk-color-picker-22-dis);
-  opacity: var(--icon-gtk-color-picker-dis-opacity);
 }
 
-button[icon="network"] .button-icon {
+button[icon="network"] {
   list-style-image: var(--icon-network-idle-22);
 }
 
-button[icon="network"][disabled="true"] .button-icon {
+button[icon="network"][disabled="true"] {
   list-style-image: var(--icon-network-idle-22-dis);
-  opacity: var(--icon-network-idle-dis-opacity);
 }

theme/global/config.css

@@ -4,6 +4,8 @@
 
 
 @import url("chrome://global/skin/");
+@import url("chrome://icons/skin/icon-theme-default.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 

theme/global/console/console.css

@@ -6,6 +6,8 @@
    == Styles used by the Error Console window.
    ====================================================================== */
 
+@import url("chrome://icons/skin/icon-theme-default.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 .console-box {

theme/global/dirListing/dirListing.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 :root {
   background-color: -moz-dialog;
   color: -moz-dialogtext;

theme/global/filepicker.css

@@ -7,6 +7,7 @@
   ======================================================================= */
 
 @import url("chrome://global/skin/");
+@import url("chrome://icons/skin/icon-theme-default.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

theme/global/findBar.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 .findbar-closebutton {

theme/global/global.css

@@ -8,6 +8,7 @@
 
 /* all localizable skin settings shall live here */
 @import url("chrome://global/locale/intl.css");
+@import url("chrome://icons/skin/icon-theme-default.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

theme/global/netError.css

@@ -10,6 +10,8 @@
  *  Updated by: Michael Ventnor <m.ventnor@gmail.com>
  */
 
+@import url("chrome://icons/skin/icon-theme-default.css");
+
 html {
   background: -moz-Dialog;
 }

theme/global/notification.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 notification {

theme/global/printPageSetup.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 .portrait-page {
   list-style-image: var(--icon-gtk-orientation-portrait-22);
 }

theme/global/printPreview.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 /* ..... page navigation ..... */
 
 .home-arrow {

theme/global/textbox.css

@@ -6,6 +6,8 @@
   == Styles used by the XUL textbox element.
   ======================================================================= */
 
+@import url("chrome://icons/skin/icon-theme-default.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
 
@@ -107,7 +109,6 @@ menuitem[cmd="cmd_undo"] {
 
 menuitem[cmd="cmd_undo"][disabled] {
   list-style-image: var(--icon-edit-undo-16-dis);
-  opacity: var(--icon-edit-undo-dis-opacity);
 }
 
 menuitem[cmd="cmd_cut"] {
@@ -116,7 +117,6 @@ menuitem[cmd="cmd_cut"] {
 
 menuitem[cmd="cmd_cut"][disabled] {
   list-style-image: var(--icon-edit-cut-16-dis);
-  opacity: var(--icon-edit-cut-dis-opacity);
 }
 
 menuitem[cmd="cmd_copy"] {
@@ -125,7 +125,6 @@ menuitem[cmd="cmd_copy"] {
 
 menuitem[cmd="cmd_copy"][disabled] {
   list-style-image: var(--icon-edit-copy-16-dis);
-  opacity: var(--icon-edit-copy-dis-opacity);
 }
 
 menuitem[cmd="cmd_paste"] {
@@ -134,7 +133,6 @@ menuitem[cmd="cmd_paste"] {
 
 menuitem[cmd="cmd_paste"][disabled] {
   list-style-image: var(--icon-edit-paste-16-dis);
-  opacity: var(--icon-edit-paste-dis-opacity);
 }
 
 menuitem[cmd="cmd_delete"] {
@@ -143,7 +141,6 @@ menuitem[cmd="cmd_delete"] {
 
 menuitem[cmd="cmd_delete"][disabled] {
   list-style-image: var(--icon-edit-delete-16-dis);
-  opacity: var(--icon-edit-delete-dis-opacity);
 }
 
 menuitem[cmd="cmd_selectAll"] {
@@ -152,6 +149,5 @@ menuitem[cmd="cmd_selectAll"] {
 
 menuitem[cmd="cmd_selectAll"][disabled] {
   list-style-image: var(--icon-edit-select-all-16-dis);
-  opacity: var(--icon-edit-select-all-dis-opacity);
 }
 

theme/help/help.css

@@ -19,7 +19,6 @@
 
 #help-back-button[disabled="true"] {
   list-style-image: var(--icon-go-previous-24-dis);
-  opacity: var(--icon-go-previous-dis-opacity);
 }
 
 #help-back-button:-moz-locale-dir(rtl) {
@@ -28,7 +27,6 @@
 
 #help-back-button[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: var(--icon-go-previous-rtl-24-dis);
-  opacity: var(--icon-go-previous-rtl-dis-opacity);
 }
 
 #help-forward-button {
@@ -37,7 +35,6 @@
 
 #help-forward-button[disabled="true"] {
   list-style-image: var(--icon-go-next-24-dis);
-  opacity: var(--icon-go-next-dis-opacity);
 }
 
 #help-forward-button:-moz-locale-dir(rtl) {
@@ -46,7 +43,6 @@
 
 #help-forward-button[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: var(--icon-go-next-rtl-24);
-  opacity: var(--icon-go-next-rtl-dis-opacity);
 }
 
 #help-home-button {
@@ -55,7 +51,6 @@
 
 #help-home-button[disabled="true"] {
   list-style-image: var(--icon-go-home-24-dis);
-  opacity: var(--icon-go-home-dis-opacity);
 }
 
 #help-print-button {
@@ -64,7 +59,6 @@
 
 #help-print-button[disabled="true"] {
   list-style-image: var(--icon-document-print-24-dis) !important;
-  opacity: var(--icon-document-print-dis-opacity);
 }
 
 /* Hide labels for the toolbar because we really don't need them what with the
@@ -101,12 +95,10 @@ menuitem:not([type]) {
 
 #context-back[disabled="true"] {
   list-style-image: var(--icon-go-previous-16-dis);
-  opacity: var(--icon-go-previous-dis-opacity);
 }
 
 #context-back[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: var(--icon-go-previous-rtl-16-dis);
-  opacity: var(--icon-go-previous-rtl-dis-opacity);
 }
 
 #context-forward {
@@ -119,12 +111,10 @@ menuitem:not([type]) {
 
 #context-forward[disabled="true"] {
   list-style-image: var(--icon-go-next-16-dis);
-  opacity: var(--icon-go-next-dis-opacity);
 }
 
 #context-forward[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: var(--icon-go-next-rtl-16-dis);
-  opacity: var(--icon-go-next-rtl-dis-opacity);
 }
 
 #context-copy {

theme/icons/icon-theme-base.css

@@ -1,8 +1,3 @@
 /* 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/. */
-
-:root {
-  --icon-base-dis-native-opacity: 1;
-  --icon-base-dis-opacity: 1;
-}

theme/messenger/accountCentral.css

@@ -7,6 +7,7 @@
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://icons/skin/icon-theme-default.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

theme/messenger/accountManage.css

@@ -7,6 +7,7 @@
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://icons/skin/icon-theme-default.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

theme/messenger/addressbook/abResultsPane.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 treechildren::-moz-tree-image(GeneratedName) {

theme/messenger/addressbook/addressPanes.css

@@ -6,6 +6,8 @@
   == Styles for directory pane.
   ======================================================================= */
 
+@import url("chrome://icons/skin/icon-theme-default.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: directory pane icons ::::: */

theme/messenger/addressbook/addressbook-menus.css

@@ -18,7 +18,6 @@ menuitem:not([type]) {
 #dirTreeContext-newcard[disabled],
 #composeMail > menuitem[oncommand="AbPanelNewCard();"][disabled] {
   list-style-image: var(--icon-contact-new-16-dis);
-  opacity: var(--icon-contact-new-dis-opacity);
 }
 
 #menu_newList,
@@ -31,7 +30,6 @@ menuitem[command="cmd_newlist"] {
 #dirTreeContext-newlist[disabled],
 menuitem[command="cmd_newlist"][disabled] {
   list-style-image: var(--icon-stock_contact-list-16-dis);
-  opacity: var(--icon-stock_contact-list-dis-opacity);
 }
 
 #menu_newAddrbook {
@@ -40,7 +38,6 @@ menuitem[command="cmd_newlist"][disabled] {
 
 #menu_newAddrbook[disabled] {
   list-style-image: var(--icon-address-book-new-16-dis);
-  opacity: var(--icon-address-book-new-dis-opacity);
 }
 
 #menu_newMessage,
@@ -53,7 +50,6 @@ menuitem[command="cmd_newlist"][disabled] {
 #abResultsTreeContext-newmessage[disabled="true"],
 #composeMail > menuitem[oncommand="AbNewMessage();"][disabled="true"] {
   list-style-image: var(--icon-mail-message-new-16-dis);
-  opacity: var(--icon-mail-message-new-dis-opacity);
 }
 
 #printPreviewMenuItem,
@@ -64,7 +60,6 @@ menuitem[command="cmd_newlist"][disabled] {
 #printPreviewMenuItem[disabled],
 #printPreviewAddressBook[disabled] {
   list-style-image: var(--icon-document-print-preview-16-dis);
-  opacity:  var(--icon-document-print-preview-dis-opacity);
 }
 
 #printMenuItem,
@@ -75,7 +70,6 @@ menuitem[command="cmd_newlist"][disabled] {
 #printMenuItem[disabled],
 #printAddressBook[disabled] {
   list-style-image: var(--icon-document-print-16-dis);
-  opacity:  var(--icon-document-print-dis-opacity);
 }
 
 menuitem[command="cmd_properties"],
@@ -88,7 +82,6 @@ menuitem[command="cmd_properties"][disabled],
 #dirTreeContext-properties[disabled],
 #abResultsTreeContext-properties[disabled] {
   list-style-image: var(--icon-document-properties-16-dis);
-  opacity:  var(--icon-document-properties-dis-opacity);
 }
 
 #menu_preferences {
@@ -97,7 +90,6 @@ menuitem[command="cmd_properties"][disabled],
 
 #menu_preferences[disabled] {
   list-style-image: var(--icon-preferences-desktop-16-dis);
-  opacity: var(--icon-preferences-desktop-dis-opacity);
 }
 
 #menu_search_addresses {
@@ -106,7 +98,6 @@ menuitem[command="cmd_properties"][disabled],
 
 #menu_search_addresses[disabled] {
   list-style-image: var(--icon-edit-find-16-dis);
-  opacity: var(--icon-edit-find-dis-opacity);
 }
 
 #taskPopup > menuitem[oncommand="toImport()"] {
@@ -115,7 +106,6 @@ menuitem[command="cmd_properties"][disabled],
 
 #taskPopup > menuitem[oncommand="toImport()"][disabled] {
   list-style-image: var(--icon-document-revert-16-dis);
-  opacity: var(--icon-document-revert-dis-opacity);
 }
 
 #taskPopup > menuitem[oncommand="AbExport()"] {
@@ -124,7 +114,6 @@ menuitem[command="cmd_properties"][disabled],
 
 #taskPopup > menuitem[oncommand="AbExport()"][disabled] {
   list-style-image: var(--icon-document-save-as-16-dis);
-  opacity: var(--icon-document-save-as-dis-opacity);
 }
 
 #dirTreeContext-delete,
@@ -137,7 +126,6 @@ menuitem[command="cmd_properties"][disabled],
 #abResultsTreeContext-delete[disabled],
 #composeMail > menuitem[oncommand="AbDelete();"][disabled] {
   list-style-image: var(--icon-edit-delete-16-dis);
-  opacity: var(--icon-edit-delete-dis-opacity);
 }
 
 #abResultsTreeContext-newim {
@@ -146,7 +134,6 @@ menuitem[command="cmd_properties"][disabled],
 
 #abResultsTreeContext-newim[disabled] {
   list-style-image: var(--icon-internet-group-chat-16-dis);
-  opacity: var(--icon-internet-group-chat-dis-opacity);
 }
 
 #composeMail > menuitem[oncommand="AbCopyAddress();"] {
@@ -155,7 +142,6 @@ menuitem[command="cmd_properties"][disabled],
 
 #composeMail > menuitem[oncommand="AbCopyAddress();"][disabled] {
   list-style-image: var(--icon-edit-copy-16-dis);
-  opacity: var(--icon-edit-copy-dis-opacity);
 }
 
 #composeMail > menuitem[oncommand="AbPanelAdd('addr_to');"],
@@ -168,6 +154,5 @@ menuitem[command="cmd_properties"][disabled],
 #composeMail > menuitem[oncommand="AbPanelAdd('addr_cc');"][disabled],
 #composeMail > menuitem[oncommand="AbPanelAdd('addr_bcc');"][disabled] {
   list-style-image: var(--icon-list-add-16-dis);
-  opacity: var(--icon-list-add-dis-opacity);
 }
 

theme/messenger/addressbook/addressbook.css

@@ -7,6 +7,7 @@
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://icons/skin/icon-theme-default.css");
 @import url("chrome://messenger/skin/addressbook/addressbook-menus.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@@ -20,8 +21,7 @@
 
 #button-newcard[disabled] {
   list-style-image: var(--icon-contact-new-24-dis);
-  opacity: var(--icon-contact-new-dis-opacity);
-} 
+}
 
 #button-newlist {
   list-style-image: var(--icon-stock_contact-list-24);
@@ -29,8 +29,7 @@
 
 #button-newlist[disabled] {
   list-style-image: var(--icon-stock_contact-list-24-dis);
-  opacity: var(--icon-stock_contact-list-dis-opacity);
-} 
+}
 
 #button-editcard {
   list-style-image: var(--icon-document-properties-24);
@@ -38,8 +37,7 @@
 
 #button-editcard[disabled] {
   list-style-image: var(--icon-document-properties-24-dis);
-  opacity: var(--icon-document-properties-dis-opacity);
-} 
+}
 
 #button-newmessage {
   list-style-image: var(--icon-mail-message-new-24);
@@ -47,7 +45,6 @@
 
 #button-newmessage[disabled] {
   list-style-image: var(--icon-mail-message-new-24-dis);
-  opacity: var(--icon-mail-message-new-dis-opacity);
 }
 
 #button-newim {
@@ -56,7 +53,6 @@
 
 #button-newim[disabled] {
   list-style-image: var(--icon-internet-group-chat-24-dis);
-  opacity: var(--icon-internet-group-chat-dis-opacity);
 } 
 
 #button-abdelete {
@@ -65,7 +61,6 @@
 
 #button-abdelete[disabled] {
   list-style-image: var(--icon-edit-delete-24-dis);
-  opacity: var(--icon-edit-delete-dis-opacity);
 }
 
 /* ::::: small primary toolbar buttons ::::: */
@@ -77,7 +72,6 @@ toolbar[iconsize="small"] > toolbarpaletteitem > #button-newcard {
 
 toolbar[iconsize="small"] > #button-newcard[disabled] {
   list-style-image: var(--icon-contact-new-16-dis);
-  opacity: var(--icon-contact-new-dis-opacity);
 }
 
 toolbar[iconsize="small"] > #button-newlist,
@@ -87,7 +81,6 @@ toolbar[iconsize="small"] > toolbarpaletteitem > #button-newlist {
 
 toolbar[iconsize="small"] > #button-newlist[disabled] {
   list-style-image: var(--icon-stock_contact-list-16-dis);
-  opacity: var(--icon-stock_contact-list-dis-opacity);
 }
 
 toolbar[iconsize="small"] > #button-editcard,
@@ -97,7 +90,6 @@ toolbar[iconsize="small"] > toolbarpaletteitem > #button-editcard {
 
 toolbar[iconsize="small"] > #button-editcard[disabled] {
   list-style-image: var(--icon-document-properties-16-dis);
-  opacity: var(--icon-document-properties-dis-opacity);
 } 
 
 toolbar[iconsize="small"] > #button-newmessage,
@@ -107,7 +99,6 @@ toolbar[iconsize="small"] > toolbarpaletteitem > #button-newmessage {
 
 toolbar[iconsize="small"] > #button-newmessage[disabled] {
   list-style-image: var(--icon-mail-message-new-16-dis);
-  opacity: var(--icon-mail-message-new-dis-opacity);
 }
 
 toolbar[iconsize="small"] > #button-newim,
@@ -117,7 +108,6 @@ toolbar[iconsize="small"] > toolbarpaletteitem > #button-newim {
 
 toolbar[iconsize="small"] > #button-newim[disabled] {
   list-style-image: var(--icon-internet-group-chat-16-dis);
-  opacity: var(--icon-internet-group-chat-dis-opacity);
 } 
 
 toolbar[iconsize="small"] > #button-abdelete,
@@ -127,7 +117,6 @@ toolbar[iconsize="small"] > toolbarpaletteitem > #button-abdelete {
 
 toolbar[iconsize="small"] > #button-abdelete[disabled] {
   list-style-image: var(--icon-edit-delete-16-dis);
-  opacity: var(--icon-edit-delete-dis-opacity);
 }
 
 /* CardView styles - used in the Card View Pane */

theme/messenger/addressingWidget.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 /* ::::: addressing widget ::::: */
   
 #addressingWidget {

theme/messenger/browserRequest.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 #security-button {
   width: 20px;
   padding-right: 5px;

theme/messenger/dialogs2.css

@@ -7,6 +7,7 @@
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://icons/skin/icon-theme-default.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

theme/messenger/filterDialog.css

@@ -7,6 +7,7 @@
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://icons/skin/icon-theme-default.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

theme/messenger/folderMenus.css

@@ -6,6 +6,8 @@
   == Icons for menus which represent mail folder.
   ======================================================================= */
 
+@import url("chrome://icons/skin/icon-theme-default.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: folder icons for menus ::::: */

theme/messenger/folderPane.css

@@ -6,6 +6,8 @@
   == Styles for the Folder pane in the Messenger 3-pane window.
   ======================================================================= */
 
+@import url("chrome://icons/skin/icon-theme-default.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: mail folder ::::: */

theme/messenger/mailOverlay-menus.css

@@ -14,7 +14,6 @@ menuitem:not([type]) {
 
 #menu_newCard[disabled="true"] {
   list-style-image: var(--icon-contact-new-16-dis);
-  opacity: var(--icon-contact-new-dis-opacity);
 }
 
 #menu_newMessage {
@@ -23,7 +22,6 @@ menuitem:not([type]) {
 
 #menu_newMessage[disabled="true"] {
   list-style-image: var(--icon-mail-message-new-16-dis);
-  opacity: var(--icon-mail-message-new-dis-opacity);
 }
 
 #menu_sendPagee {
@@ -32,6 +30,5 @@ menuitem:not([type]) {
 
 #menu_sendPage[disabled="true"] {
   list-style-image: var(--icon-stock_mail-16-dis);
-  opacity: var(--icon-stock_mail-dis-opacity);
 }
 

theme/messenger/messageBody.css

@@ -7,6 +7,7 @@
   ======================================================================= */
 
 @import url(chrome://communicator/skin/smileys.css);
+@import url("chrome://icons/skin/icon-theme-default.css");
 
 @namespace url("http://www.w3.org/1999/xhtml");
 

theme/messenger/messageHeader.css

@@ -6,6 +6,8 @@
   == Styles for the header toolbars of a mail message.
   ======================================================================= */
 
+@import url("chrome://icons/skin/icon-theme-default.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: msg header toolbars ::::: */

theme/messenger/messengercompose/messengercompose.css

@@ -7,6 +7,7 @@
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://icons/skin/icon-theme-default.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
@@ -18,8 +19,7 @@
 
 #button-send[disabled="true"] {
   list-style-image: var(--icon-mail-send-24-dis);
-  opacity: var(--icon-mail-send-dis-opacity);
-} 
+}
 
 #button-address {
   list-style-image: var(--icon-x-office-address-book-24);
@@ -27,8 +27,7 @@
 
 #button-address[disabled="true"] {
   list-style-image: var(--icon-x-office-address-book-24-dis);
-  opacity: var(--icon-x-office-address-book-dis-opacity);
-} 
+}
 
 #button-attach {
   list-style-image: var(--icon-mail-attachment-24);
@@ -36,8 +35,7 @@
 
 #button-attach[disabled="true"] {
   list-style-image: var(--icon-mail-attachment-24-dis);
-  opacity: var(--icon-mail-attachment-dis-opacity);
-} 
+}
 
 #spellingButton {
   list-style-image: var(--icon-tools-check-spelling-24);
@@ -45,7 +43,6 @@
 
 #spellingButton[disabled="true"] {
   list-style-image: var(--icon-tools-check-spelling-24-dis);
-  opacity: var(--icon-tools-check-spelling-dis-opacity);
 }
 
 #button-save {
@@ -54,8 +51,7 @@
 
 #button-save[disabled="true"] {
   list-style-image: var(--icon-document-save-24-dis);
-  opacity: var(--icon-document-save-dis-opacity);
-} 
+}
 
 /* ::::: small primary toolbar buttons ::::: */
 
@@ -66,7 +62,6 @@ toolbar[iconsize="small"] > toolbarpaletteitem > #button-send {
 
 toolbar[iconsize="small"] > #button-send[disabled="true"] {
   list-style-image: var(--icon-mail-send-16-dis);
-  opacity: var(--icon-mail-send-dis-opacity);
 }
 
 toolbar[iconsize="small"] > #button-address,
@@ -76,8 +71,7 @@ toolbar[iconsize="small"] > toolbarpaletteitem > #button-address {
 
 toolbar[iconsize="small"] > #button-address[disabled="true"] {
   list-style-image: var(--icon-x-office-address-book-16-dis);
-  opacity: var(--icon-x-office-address-book-dis-opacity);
-} 
+}
 
 toolbar[iconsize="small"] > #button-attach,
 toolbar[iconsize="small"] > toolbarpaletteitem > #button-attach {
@@ -86,8 +80,7 @@ toolbar[iconsize="small"] > toolbarpaletteitem > #button-attach {
 
 toolbar[iconsize="small"] > #button-attach[disabled="true"] {
   list-style-image: var(--icon-mail-attachment-16-dis);
-  opacity: var(--icon-mail-attachment-dis-opacity);
-} 
+}
 
 toolbar[iconsize="small"] > #spellingButton,
 toolbar[iconsize="small"] > toolbarpaletteitem > #spellingButton {
@@ -96,7 +89,6 @@ toolbar[iconsize="small"] > toolbarpaletteitem > #spellingButton {
 
 toolbar[iconsize="small"] > #spellingButton[disabled="true"] {
   list-style-image: var(--icon-tools-check-spelling-16-dis);
-  opacity: var(--icon-tools-check-spelling-dis-opacity);
 }
 
 toolbar[iconsize="small"] > #button-save,
@@ -106,8 +98,7 @@ toolbar[iconsize="small"] > toolbarpaletteitem > #button-save {
 
 toolbar[iconsize="small"] > #button-save[disabled="true"] {
   list-style-image: var(--icon-document-save-16-dis);
-  opacity: var(--icon-document-save-dis-opacity);
-} 
+}
 
 /* ::::: special toolbar colors ::::: */
 

theme/messenger/newmailalert.css

@@ -8,6 +8,7 @@
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://icons/skin/icon-theme-default.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

theme/messenger/primaryToolbar.css

@@ -6,6 +6,8 @@
   == Images for the Mail primary toolbar.
   ======================================================================= */
 
+@import url("chrome://icons/skin/icon-theme-default.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: primary toolbar buttons ::::: */
@@ -16,7 +18,6 @@
 
 #button-getmsg[disabled] {
   list-style-image: var(--icon-stock_mail-receive-24-dis);
-  opacity: var(--icon-stock_mail-receive-dis-opacity);
 } 
 
 #button-newmsg {
@@ -25,7 +26,6 @@
 
 #button-newmsg[disabled] {
   list-style-image: var(--icon-mail-message-new-24-dis);
-  opacity: var(--icon-mail-message-new-dis-opacity);
 } 
 
 #button-reply {
@@ -34,7 +34,6 @@
 
 #button-reply[disabled] {
   list-style-image: var(--icon-mail-reply-sender-24-dis);
-  opacity: var(--icon-mail-reply-sender-dis-opacity);
 } 
 
 #button-replyall {
@@ -43,7 +42,6 @@
 
 #button-replyall[disabled] {
   list-style-image: var(--icon-mail-reply-all-24-dis);
-  opacity: var(--icon-mail-reply-all-dis-opacity);
 } 
 
 #button-forward {
@@ -52,7 +50,6 @@
 
 #button-forward[disabled] {
   list-style-image: var(--icon-mail-forward-24-dis);
-  opacity: var(--icon-mail-forward-dis-opacity);
 } 
 
 #button-file {
@@ -61,7 +58,6 @@
 
 #button-file[disabled] {
   list-style-image: var(--icon-stock_folder-24-dis);
-  opacity: var(--icon-stock_folder-dis-opacity);
 } 
 
 #button-goback {
@@ -70,7 +66,6 @@
 
 #button-goback[disabled="true"] {
   list-style-image: var(--icon-go-previous-24-dis);
-  opacity: var(--icon-go-previous-dis-opacity);
 } 
 
 #button-goback:-moz-locale-dir(rtl) {
@@ -79,7 +74,6 @@
 
 #button-goback:-moz-locale-dir(rtl)[disabled="true"] {
   list-style-image: var(--icon-go-previous-rtl-24-dis);
-  opacity: var(--icon-go-previous-rtl-dis-opacity);
 }
 
 #button-goforward {
@@ -88,7 +82,6 @@
 
 #button-goforward[disabled="true"] {
   list-style-image: var(--icon-go-next-24-dis);
-  opacity: var(--icon-go-next-dis-opacity);
 }
 
 #button-goforward:-moz-locale-dir(rtl) {
@@ -97,7 +90,6 @@
 
 #button-goforward:-moz-locale-dir(rtl)[disabled="true"] {
   list-style-image: var(--icon-go-next-rtl-24);
-  opacity: var(--icon-go-next-rtl-dis-opacity);
 }
 
 #button-next {
@@ -106,7 +98,6 @@
 
 #button-next[disabled] {
   list-style-image: var(--icon-go-down-24-dis);
-  opacity: var(--icon-go-down-dis-opacity);
 } 
 
 #button-delete {
@@ -115,7 +106,6 @@
 
 #button-delete[disabled] {
   list-style-image: var(--icon-edit-delete-24-dis);
-  opacity: var(--icon-edit-delete-dis-opacity);
 }
 
 toolbarpaletteitem > #button-delete {
@@ -128,7 +118,6 @@ toolbarpaletteitem > #button-delete {
 
 #button-mark[disabled] {
   list-style-image: var(--icon-mail-mark-read-24-dis);
-  opacity: var(--icon-mail-mark-read-dis-opacity);
 } 
 
 #button-isJunk {
@@ -137,7 +126,6 @@ toolbarpaletteitem > #button-delete {
 
 #button-isJunk[disabled="true"] {
   list-style-image: var(--icon-mail-mark-junk-24-dis);
-  opacity: var(--icon-mail-mark-junk-dis-opacity);
 }
 
 #button-notJunk {
@@ -146,7 +134,6 @@ toolbarpaletteitem > #button-delete {
 
 #button-notJunk[disabled="true"] {
   list-style-image: var(--icon-mail-mark-notjunk-24-dis);
-  opacity: var(--icon-mail-mark-junk-dis-opacity);
 }
 
 #button-print {
@@ -155,7 +142,6 @@ toolbarpaletteitem > #button-delete {
 
 #button-print[disabled] {
   list-style-image: var(--icon-document-print-24-dis);
-  opacity: var(--icon-document-print-dis-opacity);
 }
 
 #button-stop {
@@ -164,7 +150,6 @@ toolbarpaletteitem > #button-delete {
 
 #button-stop[disabled="true"] {
   list-style-image: var(--icon-process-stop-24-dis);
-  opacity: var(--icon-process-stop-dis-opacity);
 }
 
 #sync-button {
@@ -210,7 +195,6 @@ toolbar[iconsize="small"] > toolbarpaletteitem > #button-getmsg {
 
 toolbar[iconsize="small"] > #button-getmsg[disabled] {
   list-style-image: var(--icon-stock_mail-receive-16-dis);
-  opacity: var(--icon-stock_mail-receive-dis-opacity);
 }
 
 toolbar[iconsize="small"] > #button-newmsg,
@@ -220,7 +204,6 @@ toolbar[iconsize="small"] > toolbarpaletteitem > #button-newmsg {
 
 toolbar[iconsize="small"] > #button-newmsg[disabled] {
   list-style-image: var(--icon-mail-message-new-16-dis);
-  opacity: var(--icon-mail-message-new-dis-opacity);
 }
 
 toolbar[iconsize="small"] > #button-reply,
@@ -230,7 +213,6 @@ toolbar[iconsize="small"] > toolbarpaletteitem > #button-reply {
 
 toolbar[iconsize="small"] > #button-reply[disabled] {
   list-style-image: var(--icon-mail-reply-sender-16-dis);
-  opacity: var(--icon-mail-reply-sender-dis-opacity);
 }
 
 toolbar[iconsize="small"] > #button-replyall,
@@ -240,7 +222,6 @@ toolbar[iconsize="small"] > toolbarpaletteitem > #button-replyall {
 
 toolbar[iconsize="small"] > #button-replyall[disabled] {
   list-style-image: var(--icon-mail-reply-all-16-dis);
-  opacity: var(--icon-mail-reply-all-dis-opacity);
 }
 
 toolbar[iconsize="small"] > #button-forward,
@@ -250,7 +231,6 @@ toolbar[iconsize="small"] > toolbarpaletteitem > #button-forward {
 
 toolbar[iconsize="small"] > #button-forward[disabled] {
   list-style-image: var(--icon-mail-forward-16-dis);
-  opacity: var(--icon-mail-forward-dis-opacity);
 }
 
 toolbar[iconsize="small"] > #button-file,
@@ -324,7 +304,6 @@ toolbar[iconsize="small"] > toolbarpaletteitem > #button-mark {
 
 toolbar[iconsize="small"] > #button-mark[disabled] {
   list-style-image: var(--icon-mail-mark-read-16-dis);
-  opacity: var(--icon-mail-mark-read-dis-opacity);
 }
 
 toolbar[iconsize="small"] #button-isJunk {
@@ -333,7 +312,6 @@ toolbar[iconsize="small"] #button-isJunk {
 
 toolbar[iconsize="small"] #button-isJunk[disabled] {
   list-style-image: var(--icon-mail-mark-junk-16-dis);
-  opacity: var(--icon-mail-mark-junk-dis-opacity);
 }
 
 toolbar[iconsize="small"] #button-notJunk {
@@ -342,7 +320,6 @@ toolbar[iconsize="small"] #button-notJunk {
 
 toolbar[iconsize="small"] #button-notJunk[disabled] {
   list-style-image: var(--icon-mail-mark-notjunk-16-dis);
-  opacity: var(--icon-mail-mark-notjunk-dis-opacity);
 }
 
 toolbar[iconsize="small"] > #button-print,

theme/messenger/smime/msgCompSMIMEOverlay.css

@@ -6,6 +6,8 @@
   == Styles for the S/Mime in composer window.
   ======================================================================= */
 
+@import url("chrome://icons/skin/icon-theme-default.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #button-security {
@@ -14,7 +16,6 @@
 
 #button-security[disabled] {
   list-style-image: var(--icon-lock-secure-24-dis);
-  opacity: var(--icon-lock-secure-dis-opacity);
 }
 
 toolbar[iconsize="small"] > #button-security,
@@ -24,7 +25,6 @@ toolbar[iconsize="small"] > toolbarpaletteitem > #button-security {
 
 toolbar[iconsize="small"] > #button-security[disabled] {
   list-style-image: var(--icon-lock-secure-16-dis);
-  opacity: var(--icon-lock-secure-dis-opacity);
 }
 
 #msgcomposeWindow #signing-status {

theme/messenger/subscribe.css

@@ -7,6 +7,7 @@
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://icons/skin/icon-theme-default.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

theme/messenger/threadPane.css

@@ -6,6 +6,8 @@
   == Styles for the thread pane in the Messenger 3-pane window.
   ======================================================================= */
 
+@import url("chrome://icons/skin/icon-theme-default.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: thread decoration ::::: */

theme/messenger/virtualFolderListDialog.css

@@ -8,6 +8,7 @@
 
 @import url("chrome://messenger/skin/mailWindow1.css");
 @import url("chrome://messenger/skin/folderPane.css");
+@import url("chrome://icons/skin/icon-theme-default.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

theme/mozapps/downloads/downloads.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 #downloadManager {
   background-color: ThreeDFace;
 }
@@ -60,7 +62,6 @@ menuitem:not([type]) {
 }
 #menuitem_open[disabled="true"] {
   list-style-image: var(--icon-document-open-16-dis);
-  opacity: var(--icon-document-open-dis-opacity);
 }
 
 .pause,
@@ -71,7 +72,6 @@ menuitem:not([type]) {
 .pause[disabled="true"],
 #menuitem_pause[disabled="true"] {
   list-style-image: var(--icon-media-playback-pause-16-dis);
-  opacity: var(--icon-media-playback-pause-dis-opacity);
 }
 
 .resume,
@@ -111,5 +111,4 @@ menuitem:not([type]) {
 
 #clearListButton[disabled="true"] {
   list-style-image: var(--icon-edit-clear-22-dis);
-  opacity: var(--icon-edit-clear-dis-opacity);
 }

theme/mozapps/extensions/extensions.css

@@ -2,8 +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/inContentUI.css");*/
-
+@import url("chrome://icons/skin/icon-theme-default.css");
 
 /*** global warnings ***/
 
@@ -265,22 +264,18 @@
 
 #back-btn[disabled="true"]:-moz-locale-dir(ltr) {
   list-style-image: var(--icon-go-previous-24-dis);
-  opacity: var(--icon-go-previous-dis-opacity);
 }
 
 #forward-btn[disabled="true"]:-moz-locale-dir(ltr) {
   list-style-image: var(--icon-go-next-24-dis);
-  opacity: var(--icon-go-next-dis-opacity);
 }
 
 #back-btn[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: var(--icon-go-previous-rtl-24-dis);
-  opacity: var(--icon-go-previous-rtl-dis-opacity);
 }
 
 #forward-btn[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: var(--icon-go-next-rtl-24-dis);
-  opacity: var(--icon-go-next-rtl-dis-opacity);
 }
 
 #header-utils-btn {

theme/mozapps/update/updates.css

@@ -1,3 +1,5 @@
+@import url("chrome://icons/skin/icon-theme-default.css");
+
 /* General */
 /* Specify the size for the wizardpage so the billboard has a fixed size. 3rd
    party themes should typically specify the same values. */
@@ -108,7 +110,6 @@ wizardpage {
 
 #pauseButton[disabled="true"] {
   list-style-image: var(--icon-media-playback-pause-16-dis);
-  opacity: var(--icon-media-playback-pause-dis-opacity);
 }
 
 #pauseButton[paused="true"] {
@@ -117,7 +118,6 @@ wizardpage {
 
 #pauseButton[paused="true"][disabled="true"] {
   list-style-image: var(--icon-media-playback-start-16-dis);
-  opacity: var(--icon-media-playback-start-dis-opacity);
 }
 
 #verificationFailedIcon {

theme/mozapps/viewsource/viewsource.css

@@ -35,7 +35,6 @@ menuitem:not([type]) {
 
 #menu_undo[disabled] {
   list-style-image: var(--icon-edit-undo-16-dis);
-  opacity: var(--icon-edit-undo-dis-opacity);
 }
 
 #menu_redo {
@@ -44,7 +43,6 @@ menuitem:not([type]) {
 
 #menu_redo[disabled] {
   list-style-image: var(--icon-edit-redo-16-dis);
-  opacity: var(--icon-edit-redo-dis-opacity);
 }
 
 #menu_cut {
@@ -53,7 +51,6 @@ menuitem:not([type]) {
 
 #menu_cut[disabled] {
   list-style-image: var(--icon-edit-cut-16-dis);
-  opacity: var(--icon-edit-cut-dis-opacity);
 }
 
 #cMenu_copy,
@@ -63,7 +60,6 @@ menuitem:not([type]) {
 
 #menu_copy[disabled] {
   list-style-image: var(--icon-edit-copy-16-dis);
-  opacity: var(--icon-edit-copy-dis-opacity);
 }
 
 #menu_paste {
@@ -72,7 +68,6 @@ menuitem:not([type]) {
 
 #menu_paste[disabled] {
   list-style-image: var(--icon-edit-paste-16-dis);
-  opacity: var(--icon-edit-paste-dis-opacity);
 }
 
 #menu_delete {
@@ -81,7 +76,6 @@ menuitem:not([type]) {
 
 #menu_delete[disabled] {
   list-style-image: var(--icon-edit-delete-16-dis);
-  opacity: var(--icon-edit-delete-dis-opacity);
 }
 
 #cMenu_selectAll,
@@ -95,7 +89,6 @@ menuitem:not([type]) {
 
 #menu_find[disabled] {
   list-style-image: var(--icon-edit-find-16-dis);
-  opacity: var(--icon-edit-find-dis-opacity);
 }
 
 #menu_goToLine {
@@ -104,7 +97,6 @@ menuitem:not([type]) {
 
 #menu_goToLine[disabled] {
   list-style-image: var(--icon-go-jump-16-dis);
-  opacity: var(--icon-go-jump-dis-opacity);
 }
 
 #menu_reload {
@@ -113,7 +105,6 @@ menuitem:not([type]) {
 
 #menu_reload[disabled] {
   list-style-image: var(--icon-view-refresh-16-dis);
-  opacity: var(--icon-view-refresh-dis-opacity);
 }
 
 #menu_textEnlarge {

theme/navigator/linkToolbar.css

@@ -21,7 +21,6 @@
 #link-top[disabled="true"]
 {
   list-style-image: var(--icon-go-top-16-dis);
-  opacity: var(--icon-go-top-dis-opacity);
 }
 
 
@@ -33,7 +32,6 @@
 #link-up[disabled="true"]
 {
   list-style-image: var(--icon-go-up-16-dis);
-  opacity: var(--icon-go-up-dis-opacity);
 }
 
 
@@ -45,7 +43,6 @@
 #link-first[disabled="true"]
 {
   list-style-image: var(--icon-go-first-16-dis);
-  opacity: var(--icon-go-first-dis-opacity);
 }
 
 
@@ -57,7 +54,6 @@
 #link-first[disabled="true"]:-moz-locale-dir(rtl)
 {
   list-style-image: var(--icon-go-first-rtl-16-dis);
-  opacity: var(--icon-go-first-rtl-dis-opacity);
 }
 
 #link-prev
@@ -68,7 +64,6 @@
 #link-prev[disabled="true"]
 {
   list-style-image: var(--icon-go-previous-16-dis);
-  opacity: var(--icon-go-previous-dis-opacity);
 }
 
 
@@ -80,7 +75,6 @@
 #link-prev[disabled="true"]:-moz-locale-dir(rtl)
 {
   list-style-image: var(--icon-go-previous-rtl-16-dis);
-  opacity: var(--icon-go-previous-rtl-dis-opacity);
 }
 
 
@@ -92,7 +86,6 @@
 #link-next[disabled="true"]
 {
   list-style-image: var(--icon-go-next-16-dis);
-  opacity: var(--icon-go-next-dis-opacity);
 }
 
 
@@ -104,7 +97,6 @@
 #link-next[disabled="true"]:-moz-locale-dir(rtl)
 {
   list-style-image: var(--icon-go-next-rtl-16-dis);
-  opacity: var(--icon-go-next-rtl-dis-opacity);
 }
 
 
@@ -116,7 +108,6 @@
 #link-last[disabled="true"]
 {
   list-style-image: var(--icon-go-last-16-dis);
-  opacity: var(--icon-go-last-dis-opacity);
 }
 
 
@@ -128,7 +119,6 @@
 #link-last[disabled="true"]:-moz-locale-dir(rtl)
 {
   list-style-image: var(--icon-go-last-rtl-16-dis);
-  opacity: var(--icon-go-last-rtl-dis-opacity);
 }
 
 
@@ -138,6 +128,5 @@
 
 #link-feed[disabled="true"] {
   list-style-image: var(--icon-application-rss-xml-16-dis);
-  opacity: var(--icon-application-rss-xml-dis-opacity);
 }
 

theme/navigator/mailNavigatorOverlay-menus.css

@@ -14,7 +14,6 @@ menuitem:not([type]) {
 
 #menu_newCard[disabled="true"] {
   list-style-image: var(--icon-contact-new-16-dis);
-  opacity: var(--icon-contact-new-dis-opacity);
 }
 
 #menu_newMessage {
@@ -23,7 +22,6 @@ menuitem:not([type]) {
 
 #menu_newMessage[disabled="true"] {
   list-style-image: var(--icon-mail-message-new-16-dis);
-  opacity: var(--icon-mail-message-new-dis-opacity);
 }
 
 #menu_sendPage,
@@ -46,6 +44,5 @@ menuitem:not([type]) {
 #context-sendlink[disabled="true"],
 #context-sendframe[disabled="true"] {
   list-style-image: var(--icon-stock_mail-16-dis);
-  opacity: var(--icon-stock_mail-dis-opacity);
 }
 

theme/navigator/navigator-menus.css

@@ -16,7 +16,6 @@ menuitem:not([type]) {
 
 #viewSecurityInfo[disabled] {
   list-style-image: var(--icon-lock-secure-16-dis);
-  opacity: var(--icon-lock-secure-dis-opacity);
 }
 
 #viewCertificate {
@@ -25,7 +24,6 @@ menuitem:not([type]) {
 
 #viewCertificate[disabled] {
   list-style-image: var(--icon-application-certificate-16-dis);
-  opacity: var(--icon-application-certificate-dis-opacity);
 }
 
 #viewCertManager {
@@ -34,7 +32,6 @@ menuitem:not([type]) {
 
 #viewCertManager[disabled] {
   list-style-image: var(--icon-document-properties-16-dis);
-  opacity: var(--icon-document-properties-dis-opacity);
 }
 
 /* BMB_bookmarksPopup */
@@ -44,7 +41,6 @@ menuitem[command="Browser:AddBookmark"] {
 
 menuitem[command="Browser:AddBookmark"][disabled] {
   list-style-image: var(--icon-bookmark-new-16-dis);
-  opacity: var(--icon-bookmark-new-dis-opacity);
 }
 
 menuitem[command="Browser:ManageBookmark"] {
@@ -53,6 +49,5 @@ menuitem[command="Browser:ManageBookmark"] {
 
 menuitem[command="Browser:ManageBookmark"][disabled] {
   list-style-image: var(--icon-stock_bookmarks-16-dis);
-  opacity: var(--icon-stock_bookmarks-dis-opacity);
 }
 

theme/navigator/navigator.css

@@ -19,7 +19,6 @@
 
 #back-button[disabled="true"] {
   list-style-image: var(--icon-go-previous-24-dis);
-  opacity: var(--icon-go-previous-dis-opacity);
 }
 
 #back-button:-moz-locale-dir(rtl) {
@@ -28,7 +27,6 @@
 
 #back-button[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: var(--icon-go-previous-rtl-24-dis);
-  opacity: var(--icon-go-previous-rtl-dis-opacity);
 }
 
 #forward-button {
@@ -37,7 +35,6 @@
 
 #forward-button[disabled="true"] {
   list-style-image: var(--icon-go-next-24-dis);
-  opacity: var(--icon-go-next-dis-opacity);
 }
 
 #forward-button:-moz-locale-dir(rtl) {
@@ -46,7 +43,6 @@
 
 #forward-button:-moz-locale-dir(rtl)[disabled="true"] {
   list-style-image: var(--icon-go-next-rtl-24-dis);
-  opacity: var(--icon-go-next-rtl-dis-opacity);
 }
 
 #reload-button {
@@ -55,7 +51,6 @@
 
 #reload-button[disabled="true"] {
   list-style-image: var(--icon-view-refresh-24-dis);
-  opacity: var(--icon-view-refresh-dis-opacity);
 }
 
 #stop-button {
@@ -64,7 +59,6 @@
 
 #stop-button[disabled="true"] {
   list-style-image: var(--icon-process-stop-24-dis);
-  opacity: var(--icon-process-stop-dis-opacity);
 }
 
 #home-button {
@@ -73,7 +67,6 @@
 
 #home-button[disabled="true"] {
   list-style-image: var(--icon-go-home-24-dis);
-  opacity: var(--icon-go-home-dis-opacity);
 }
 
 #sync-button {
@@ -442,7 +435,6 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-icon {
 #page-proxy-button[pageproxystate="invalid"] {
   cursor: default;
   list-style-image: var(--icon-text-x-generic-16-dis);
-  opacity: var(--icon-text-x-generic-dis-opacity);
 }
 
 /* ::::: autocomplete ::::: */
@@ -669,13 +661,11 @@ toolbarbutton.chevron > .toolbarbutton-text {
 
 #star-button {
   list-style-image: var(--icon-bookmark-new-16-dis);
-  opacity: var(--icon-bookmark-new-dis-opacity);
 }
 
 #star-button[starred="true"],
 #editBookmarkPanelStarIcon {
   list-style-image: var(--icon-bookmark-new-16);
-  opacity: 1;
 }
 
 /* ::::: feeds ::::: */
@@ -686,7 +676,6 @@ toolbarbutton.chevron > .toolbarbutton-text {
 
 .feedsMenu[disabled="true"] {
   list-style-image: var(--icon-application-rss-xml-16-dis);
-  opacity: var(--icon-application-rss-xml-dis-opacity);
 }
 
 #feedsButton {

theme/navigator/navigatorOverlay-menus.css

@@ -14,7 +14,6 @@ menuitem:not([type]) {
 
 #menu_newNavigatorTab[disabled] {
   list-style-image: var(--icon-tab-new-16-dis);
-  opacity: var(--icon-tab-new-dis-opacity);
 }
 
 #menu_openLocation {
@@ -23,7 +22,6 @@ menuitem:not([type]) {
 
 #menu_openLocation[disabled] {
   list-style-image: var(--icon-text-html-16-dis);
-  opacity: var(--icon-text-html-dis-opacity);
 }
 
 #menu_openFile {
@@ -32,7 +30,6 @@ menuitem:not([type]) {
 
 #menu_openFile[disabled] {
   list-style-image: var(--icon-document-open-16-dis);
-  opacity: var(--icon-document-open-dis-opacity);
 }
 
 #savepage,
@@ -43,7 +40,6 @@ menuitem:not([type]) {
 #savepage[disabled],
 #saveframe[disabled] {
   list-style-image: var(--icon-document-save-as-16-dis);
-  opacity: var(--icon-document-save-as-dis-opacity);
 }
 
 menuitem[command="Browser:EditPage"] {
@@ -52,7 +48,6 @@ menuitem[command="Browser:EditPage"] {
 
 menuitem[command="Browser:EditPage"][disabled] {
   list-style-image: var(--icon-gtk-edit-16-dis);
-  opacity: var(--icon-gtk-edit-dis-opacity);
 }
 
 #menu_preferences {
@@ -61,7 +56,6 @@ menuitem[command="Browser:EditPage"][disabled] {
 
 #menu_preferences[disabled] {
   list-style-image: var(--icon-preferences-desktop-16-dis);
-  opacity: var(--icon-preferences-desktop-dis-opacity);
 }
 
 #menuitem_fullScreen {
@@ -70,7 +64,6 @@ menuitem[command="Browser:EditPage"][disabled] {
 
 #menuitem_fullScreen[disabled] {
   list-style-image: var(--icon-view-fullscreen-16-dis);
-  opacity: var(--icon-view-fullscreen-dis-opacity);
 }
 
 #menuitem-stop {
@@ -79,7 +72,6 @@ menuitem[command="Browser:EditPage"][disabled] {
 
 #menuitem-stop[disabled] {
   list-style-image: var(--icon-process-stop-16-dis);
-  opacity: var(--icon-process-stop-dis-opacity);
 }
 
 #menuitem_reload {
@@ -88,7 +80,6 @@ menuitem[command="Browser:EditPage"][disabled] {
 
 #menuitem_reload[disabled] {
   list-style-image: var(--icon-view-refresh-16-dis);
-  opacity: var(--icon-view-refresh-dis-opacity);
 }
 
 #menuitem_pageInfoCmd {
@@ -97,7 +88,6 @@ menuitem[command="Browser:EditPage"][disabled] {
 
 #menuitem_pageInfoCmd[disabled] {
   list-style-image: var(--icon-document-properties-16-dis);
-  opacity: var(--icon-document-properties-dis-opacity);
 }
 
 #historyMenuBack {
@@ -106,7 +96,6 @@ menuitem[command="Browser:EditPage"][disabled] {
 
 #historyMenuBack[disabled] {
   list-style-image: var(--icon-go-previous-16-dis);
-  opacity: var(--icon-go-previous-dis-opacity);
 }
 
 #historyMenuForward {
@@ -115,7 +104,6 @@ menuitem[command="Browser:EditPage"][disabled] {
 
 #historyMenuForward[disabled] {
   list-style-image: var(--icon-go-next-16-dis);
-  opacity: var(--icon-go-next-dis-opacity);
 }
 
 #historyMenuUp {
@@ -124,7 +112,6 @@ menuitem[command="Browser:EditPage"][disabled] {
 
 #historyMenuUp[disabled] {
   list-style-image: var(--icon-go-up-16-dis);
-  opacity: var(--icon-go-up-dis-opacity);
 }
 
 #historyMenuHome {
@@ -133,7 +120,6 @@ menuitem[command="Browser:EditPage"][disabled] {
 
 #historyMenuHome[disabled] {
   list-style-image: var(--icon-go-home-16-dis);
-  opacity: var(--icon-go-home-dis-opacity);
 }
 
 #historyRestoreLastSession {
@@ -142,7 +128,6 @@ menuitem[command="Browser:EditPage"][disabled] {
 
 #historyRestoreLastSession[disabled] {
   list-style-image: var(--icon-document-revert-16-dis);
-  opacity: var(--icon-document-revert-dis-opacity);
 }
 
 #menu_showAllHistory {
@@ -151,7 +136,6 @@ menuitem[command="Browser:EditPage"][disabled] {
 
 #menu_showAllHistory[disabled] {
   list-style-image: var(--icon-stock_history-16-dis);
-  opacity: var(--icon-stock_history-dis-opacity);
 }
 
 #sync-tabs-menuitem {
@@ -164,7 +148,6 @@ menuitem[command="Browser:EditPage"][disabled] {
 
 #menu_searchWeb[disabled] {
   list-style-image: var(--icon-edit-find-16-dis);
-  opacity: var(--icon-edit-find-dis-opacity);
 }
 
 #sanitizeItem {
@@ -173,7 +156,6 @@ menuitem[command="Browser:EditPage"][disabled] {
 
 #sanitizeItem[disabled] {
   list-style-image: var(--icon-edit-clear-16-dis);
-  opacity: var(--icon-edit-clear-dis-opacity);
 }
 
 

theme/navigator/pageInfo.css

@@ -2,6 +2,8 @@
  * 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://icons/skin/icon-theme-default.css");
+
 @import "chrome://global/skin/";
 
 /* Misc */
@@ -123,7 +125,6 @@ menuitem:not([type]) {
 
 #menu_selectall[disabled] {
   list-style-image: var(--icon-edit-select-all-16-dis);
-  opacity: var(--icon-edit-select-all-dis-opacity);
 }
 
 #menu_copy {
@@ -132,7 +133,6 @@ menuitem:not([type]) {
 
 #menu_copy[disabled] {
   list-style-image: var(--icon-edit-copy-16-dis);
-  opacity: var(--icon-edit-copy-dis-opacity);
 }
 
 /* piLinksContext menu */
@@ -142,7 +142,6 @@ menuitem:not([type]) {
 
 #menu_openInNewTab[disabled] {
   list-style-image: var(--icon-tab-new-16-dis);
-  opacity: var(--icon-tab-new-dis-opacity);
 }
 
 #menu_openInNewWindow {
@@ -151,7 +150,6 @@ menuitem:not([type]) {
 
 #menu_openInNewWindow[disabled] {
   list-style-image: var(--icon-window-new-16-dis);
-  opacity: var(--icon-window-new-dis-opacity);
 }
 
 #menu_selectall_links {
@@ -160,7 +158,6 @@ menuitem:not([type]) {
 
 #menu_selectall_links[disabled] {
   list-style-image: var(--icon-edit-select-all-16-dis);
-  opacity: var(--icon-edit-select-all-dis-opacity);
 }
 
 #menu_copyLinks {
@@ -169,6 +166,5 @@ menuitem:not([type]) {
 
 #menu_copyLinks[disabled] {
   list-style-image: var(--icon-edit-copy-16-dis);
-  opacity: var(--icon-edit-copy-dis-opacity);
 }