Bug 875488 - Add and update toolbar buttons and menu panel icons for Australis. r=dao, Gijs.

browser/themes/linux/browser.css

@@ -540,6 +540,10 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 }
 
 /* 24px primary toolbar buttons */
+#PanelUI-menu-button {
+  list-style-image: url("chrome://browser/skin/appmenu.png");
+}
+
 #back-button {
   list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=toolbar");
 }
@@ -729,6 +733,9 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   list-style-image: url("moz-icon://stock/gtk-home?size=menu&state=disabled");
 }
 
+/* Menu panel buttons */
+
+%include ../shared/menupanel.inc
 
 /* Fullscreen window controls */
 #window-controls {

browser/themes/linux/customizableui/panelUIOverlay.css

@@ -6,36 +6,3 @@
 %define menuPanelWidth 23em
 
 %include ../../shared/customizableui/panelUIOverlay.inc.css
-
-#PanelUI-contents #cut-button {
-  list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar");
-}
-#PanelUI-contents #cut-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar&state=disabled");
-}
-
-#PanelUI-contents #copy-button {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar");
-}
-#PanelUI-contents #copy-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar&state=disabled");
-}
-
-#PanelUI-contents #paste-button {
-  list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar");
-}
-#PanelUI-contents #paste-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar&state=disabled");
-}
-
-#PanelUI-contents #zoom-out-button {
-  list-style-image: url("moz-icon://stock/gtk-zoom-out?size=toolbar");
-  padding-left: 12px;
-  padding-right: 12px;
-}
-
-#PanelUI-contents #zoom-in-button {
-  list-style-image: url("moz-icon://stock/gtk-zoom-in?size=toolbar");
-  padding-left: 12px;
-  padding-right: 12px;
-}

browser/themes/linux/jar.mn

@@ -26,8 +26,6 @@ browser.jar:
   skin/classic/browser/customizableui/customizeMode-gridTexture.png  (customizableui/customizeMode-gridTexture.png)
   skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png  (customizableui/customizeMode-separatorHorizontal.png)
   skin/classic/browser/customizableui/customizeMode-separatorVertical.png  (customizableui/customizeMode-separatorVertical.png)
-  skin/classic/browser/customizableui/menuPanel-icons.png (customizableui/menuPanel-icons.png)
-  skin/classic/browser/customizableui/menuPanel-small-icons.png (customizableui/menuPanel-small-icons.png)
 * skin/classic/browser/engineManager.css
   skin/classic/browser/Geolocation-16.png
   skin/classic/browser/Geolocation-64.png
@@ -38,6 +36,8 @@ browser.jar:
   skin/classic/browser/identity-icons-https-ev.png
   skin/classic/browser/identity-icons-https-mixed-active.png
   skin/classic/browser/Info.png
+  skin/classic/browser/menuPanel.png
+  skin/classic/browser/menuPanel-small.png
   skin/classic/browser/mixed-content-blocked-16.png
   skin/classic/browser/mixed-content-blocked-64.png
   skin/classic/browser/monitor.png

browser/themes/osx/customizableui/panelUIOverlay.css

@@ -8,160 +8,30 @@
 %include ../../shared/customizableui/panelUIOverlay.inc.css
 
 @media (min-resolution: 2dppx) {
-  #PanelUI-contents[type="grid"] toolbarbutton,
-  #customization-palette toolbarbutton {
-    list-style-image: url(chrome://browser/skin/customizableui/menuPanel-icons@2x.png);
-  }
-
   #customization-palette toolbarbutton > .toolbarbutton-icon,
   #PanelUI-mainView toolbarbutton > .toolbarbutton-icon {
     width: 20px;
   }
-
-  #PanelUI-contents #edit-controls toolbarbutton,
-  #PanelUI-contents #zoom-controls toolbarbutton,
-  .panel-combined-button {
-    list-style-image: url(chrome://browser/skin/customizableui/menuPanel-small-icons@2x.png);
-  }
-
-  #PanelUI-contents[type="grid"] #new-window-button,
-  #customization-palette #new-window-button {
-    -moz-image-region: rect(0 128px 64px 64px);
-  }
-
-  #PanelUI-contents[type="grid"] #privatebrowsing-button,
-  #customization-palette #privatebrowsing-button {
-    -moz-image-region: rect(0 192px 64px 128px);
-  }
-
-  #PanelUI-contents[type="grid"] #open-file-button,
-  #customization-palette #open-file-button {
-    -moz-image-region: rect(64px 64px 128px 0);
-  }
-
-  #PanelUI-contents[type="grid"] #save-page-button,
-  #customization-palette #save-page-button {
-    -moz-image-region: rect(64px 128px 128px 64px);
-  }
-
-  #PanelUI-contents[type="grid"] #bookmarks-menu-button,
-  #customization-palette #bookmarks-menu-button {
-    -moz-image-region: rect(64px 192px 128px 128px);
-  }
-
-  #PanelUI-contents[type="grid"] #history-panelmenu,
-  #customization-palette #history-panelmenu {
-    -moz-image-region: rect(128px 64px 192px 0);
-  }
-
-  #PanelUI-contents[type="grid"] #add-ons-button,
-  #customization-palette #add-ons-button {
-    -moz-image-region: rect(128px 128px 192px 64px);
-  }
-
-  #PanelUI-contents[type="grid"] #downloads-button,
-  #customization-palette #downloads-button {
-    -moz-image-region: rect(128px 192px 192px 128px);
-  }
-
-  #PanelUI-contents[type="grid"] #sync-button,
-  #customization-palette #sync-button {
-    -moz-image-region: rect(192px 64px 256px 0);
-  }
-
-  #PanelUI-contents[type="grid"] #print-button,
-  #customization-palette #print-button {
-    -moz-image-region: rect(192px 128px 256px 64px);
-  }
-
-  #PanelUI-contents[type="grid"] #fullscreen-button,
-  #customization-palette #fullscreen-button {
-    -moz-image-region: rect(192px 192px 256px 128px);
-  }
-
-  #PanelUI-contents[type="grid"] #feed-button,
-  #customization-palette #feed-button {
-    -moz-image-region: rect(256px 64px 320px 0);
-  }
-
-  #PanelUI-contents[type="grid"] #find-button,
-  #customization-palette #find-button {
-    -moz-image-region: rect(256px 128px 320px 64px);
-  }
-
-  #PanelUI-contents[type="grid"] #developer-button,
-  #customization-palette #developer-button {
-    -moz-image-region: rect(256px 192px 320px 128px);
-  }
-
-  #PanelUI-contents[type="grid"] #tabview-button,
-  #customization-palette #tabview-button {
-    -moz-image-region: rect(320px 64px 384px 0);
-  }
-
-  #PanelUI-contents[type="grid"] #preferences-button,
-  #customization-palette #preferences-button {
-    -moz-image-region: rect(320px 128px 384px 64px);
-  }
-
-  #PanelUI-contents[type="grid"] #home-button,
-  #customization-palette #home-button {
-    -moz-image-region: rect(320px 192px 384px 128px);
-  }
-
-  #PanelUI-contents[type="grid"] #reload-button,
-  #customization-palette #reload-button {
-    -moz-image-region: rect(384px 64px 448px 0);
-  }
-
-  #PanelUI-contents[type="grid"] #stop-button,
-  #customization-palette #stop-button {
-    -moz-image-region: rect(384px 128px 448px 64px);
-  }
-
-  #PanelUI-contents #cut-button {
-    -moz-image-region: rect(0 32px 32px 0);
-  }
-
-  #PanelUI-contents #copy-button {
-    -moz-image-region: rect(0 64px 32px 32px);
-  }
-
-  #PanelUI-contents #paste-button {
-    -moz-image-region: rect(0 96px 32px 64px);
-  }
-
-  #PanelUI-contents #zoom-out-button {
-    -moz-image-region: rect(0 128px 32px 96px);
-  }
-
-  #PanelUI-contents #zoom-in-button {
-    -moz-image-region: rect(0 160px 32px 128px);
-  }
 }
 
-#PanelUI-contents #edit-controls toolbarbutton:not(:first-child),
-#PanelUI-contents #zoom-controls toolbarbutton:not(:first-child) {
+#edit-controls[customizableui-areatype="menu-panel"] > toolbarbutton:not(:first-child),
+#zoom-controls[customizableui-areatype="menu-panel"] > toolbarbutton:not(:first-child) {
   -moz-margin-start: 0;
 }
-#PanelUI-contents #edit-controls toolbarbutton:not(:last-child),
-#PanelUI-contents #zoom-controls toolbarbutton:not(:last-child) {
+#edit-controls[customizableui-areatype="menu-panel"] > toolbarbutton:not(:last-child),
+#zoom-controls[customizableui-areatype="menu-panel"] > toolbarbutton:not(:last-child) {
   -moz-margin-end: 0;
 }
-#PanelUI-contents #edit-controls toolbarbutton:not(:first-child):not(:last-child),
-#PanelUI-contents #zoom-controls toolbarbutton:not(:first-child):not(:last-child) {
+#edit-controls[customizableui-areatype="menu-panel"] > toolbarbutton:not(:first-child):not(:last-child),
+#zoom-controls[customizableui-areatype="menu-panel"] > toolbarbutton:not(:first-child):not(:last-child) {
   margin-left: 0;
   margin-right: 0;
 }
 
-#PanelUI-contents #zoom-in-button,
-#PanelUI-contents #zoom-out-button {
+#zoom-controls[customizableui-areatype="menu-panel"] > #zoom-in-button,
+#zoom-controls[customizableui-areatype="menu-panel"] > #zoom-out-button,
+toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button,
+toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-out-button {
   padding-left: 12px;
   padding-right: 12px;
 }
-
-#PanelUI-contents #zoom-in-button .toolbarbutton-text,
-#PanelUI-contents #zoom-out-button .toolbarbutton-text,
-#PanelUI-contents #zoom-reset-button .toolbarbutton-icon {
-  display: none;
-}

browser/themes/osx/downloads/downloads.css

@@ -374,7 +374,7 @@ richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:acti
 
 #downloads-indicator-icon {
   background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"),
-                              0, 140, 20, 120) center no-repeat;
+                              0, 198, 18, 180) center no-repeat;
 }
 
 #downloads-indicator[attention]
@@ -388,7 +388,7 @@ richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:acti
 #downloads-indicator:not([counter])
 #downloads-indicator-counter {
   background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"),
-                              0, 140, 20, 120) center no-repeat;
+                              0, 198, 18, 180) center no-repeat;
   background-size: 12px;
 }
 
@@ -399,13 +399,13 @@ richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:acti
 
 @media (min-resolution: 2dppx) {
   #downloads-indicator-icon:not(:-moz-lwtheme-brighttext) {
-    background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar@2x.png"), 0, 280, 40, 240);
+    background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar@2x.png"), 0, 396, 36, 360);
     background-size: 20px;
   }
 
   #downloads-indicator:not([counter]) > #downloads-indicator-anchor >
   #downloads-indicator-progress-area > #downloads-indicator-counter {
-    background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar@2x.png"), 0, 280, 40, 240);
+    background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar@2x.png"), 0, 396, 36, 360);
   }
 
   #downloads-indicator[attention] > #downloads-indicator-anchor >

browser/themes/osx/jar.mn

@@ -18,7 +18,6 @@ browser.jar:
 #endif
   skin/classic/browser/actionicon-tab.png
   skin/classic/browser/actionicon-tab@2x.png
-  skin/classic/browser/appmenu.png
 * skin/classic/browser/browser.css                          (browser.css)
 * skin/classic/browser/browser-lightweightTheme.css
   skin/classic/browser/click-to-play-warning-stripes.png
@@ -26,10 +25,6 @@ browser.jar:
   skin/classic/browser/customizableui/customizeMode-gridTexture.png  (customizableui/customizeMode-gridTexture.png)
   skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png  (customizableui/customizeMode-separatorHorizontal.png)
   skin/classic/browser/customizableui/customizeMode-separatorVertical.png  (customizableui/customizeMode-separatorVertical.png)
-  skin/classic/browser/customizableui/menuPanel-icons.png           (customizableui/menuPanel-icons.png)
-  skin/classic/browser/customizableui/menuPanel-icons@2x.png        (customizableui/menuPanel-icons@2x.png)
-  skin/classic/browser/customizableui/menuPanel-small-icons.png     (customizableui/menuPanel-small-icons.png)
-  skin/classic/browser/customizableui/menuPanel-small-icons@2x.png  (customizableui/menuPanel-small-icons@2x.png)
 * skin/classic/browser/engineManager.css                    (engineManager.css)
   skin/classic/browser/Geolocation-16.png
   skin/classic/browser/Geolocation-16@2x.png
@@ -56,6 +51,10 @@ browser.jar:
   skin/classic/browser/notification-16@2x.png
   skin/classic/browser/notification-64.png
   skin/classic/browser/notification-64@2x.png
+  skin/classic/browser/menuPanel.png
+  skin/classic/browser/menuPanel@2x.png
+  skin/classic/browser/menuPanel-small.png
+  skin/classic/browser/menuPanel-small@2x.png
   skin/classic/browser/mixed-content-blocked-16.png
   skin/classic/browser/mixed-content-blocked-16@2x.png
   skin/classic/browser/mixed-content-blocked-64.png
@@ -91,6 +90,9 @@ browser.jar:
   skin/classic/browser/Secure-Glyph@2x.png
   skin/classic/browser/slowStartup-16.png
   skin/classic/browser/Toolbar.png
+  skin/classic/browser/Toolbar@2x.png
+  skin/classic/browser/Toolbar-inverted.png
+  skin/classic/browser/Toolbar-inverted@2x.png
   skin/classic/browser/toolbarbutton-dropmarker.png
   skin/classic/browser/urlbar-history-dropmarker.png
   skin/classic/browser/urlbar-history-dropmarker@2x.png
@@ -334,8 +336,6 @@ browser.jar:
 #endif
   skin/classic/browser/lion/keyhole-circle.png              (keyhole-circle-lion.png)
   skin/classic/browser/keyhole-circle@2x.png                (keyhole-circle-lion@2x.png)
-  skin/classic/browser/lion/Toolbar.png                     (Toolbar-lion.png)
-  skin/classic/browser/Toolbar@2x.png                       (Toolbar-lion@2x.png)
   skin/classic/browser/Toolbar-background-noise.png         (Toolbar-background-noise.png)
   skin/classic/browser/lion/toolbarbutton-dropmarker.png    (toolbarbutton-dropmarker-lion.png)
   skin/classic/browser/toolbarbutton-dropmarker@2x.png      (toolbarbutton-dropmarker-lion@2x.png)
@@ -348,7 +348,6 @@ browser.jar:
   skin/classic/browser/webapps-64.png
 
 % override chrome://browser/skin/keyhole-circle.png                        chrome://browser/skin/lion/keyhole-circle.png                           os=Darwin osversion>=10.7
-% override chrome://browser/skin/Toolbar.png                               chrome://browser/skin/lion/Toolbar.png                                  os=Darwin osversion>=10.7
 % override chrome://browser/skin/toolbarbutton-dropmarker.png              chrome://browser/skin/lion/toolbarbutton-dropmarker.png                 os=Darwin osversion>=10.7
 % override chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon.png     chrome://browser/skin/lion/tabbrowser/alltabs-box-bkgnd-icon.png        os=Darwin osversion>=10.7
 % override chrome://browser/skin/tabview/tabview.png                       chrome://browser/skin/lion/tabview/tabview.png                          os=Darwin osversion>=10.7

browser/themes/shared/browser.inc

@@ -1,3 +1,3 @@
 %filter substitution
 
-%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button
+%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button

browser/themes/shared/customizableui/panelUIOverlay.inc.css

@@ -47,14 +47,6 @@
   padding: 0;
 }
 
-#PanelUI-menu-button > .toolbarbutton-icon {
-  list-style-image: url("chrome://browser/skin/appmenu.png");
-}
-
-#PanelUI-menu-button {
-  list-style-image: none;
-}
-
 #PanelUI-mainView .toolbarbutton-text {
   display: -moz-box;
   font-size: 10px;
@@ -126,7 +118,8 @@ panelview:not([mainview]) .toolbarbutton-text,
 }
 
 #PanelUI-contents[type="grid"] toolbarbutton,
-#customization-palette toolbarbutton,
+toolbarpaletteitem[place="panel"] > toolbarbutton,
+toolbarpaletteitem[place="palette"] > toolbarbutton,
 .panel-customization-placeholder {
   -moz-appearance: none;
   -moz-box-orient: vertical;
@@ -134,7 +127,6 @@ panelview:not([mainview]) .toolbarbutton-text,
   max-width: 7em;
   height: 6em;
   max-height: 6em;
-  list-style-image: url(chrome://browser/skin/customizableui/menuPanel-icons.png);
 }
 
 #PanelUI-contents #edit-controls toolbarbutton,
@@ -161,14 +153,6 @@ panelview:not([mainview]) .toolbarbutton-text,
   min-width: 1em;
 }
 
-/* These smaller icons have different styling between the panel and the toolbar,
-   hence not referencing toolbar.png for these icons. */
-#PanelUI-contents #edit-controls toolbarbutton,
-#PanelUI-contents #zoom-controls toolbarbutton,
-.panel-combined-button {
-  list-style-image: url(chrome://browser/skin/customizableui/menuPanel-small-icons.png);
-}
-
 .panel-combined-button[disabled] > .toolbarbutton-icon {
   opacity: .5;
 }
@@ -194,9 +178,9 @@ panelview:not([mainview]) .toolbarbutton-text,
   border-radius: 0;
 }
 
-#PanelUI-contents #zoom-in-button .toolbarbutton-text,
-#PanelUI-contents #zoom-out-button .toolbarbutton-text,
-#PanelUI-contents #zoom-reset-button .toolbarbutton-icon {
+#zoom-in-button > .toolbarbutton-text,
+#zoom-out-button > .toolbarbutton-text,
+#zoom-reset-button > .toolbarbutton-icon {
   display: none;
 }
 
@@ -284,132 +268,15 @@ toolbarbutton.panel-multiview-anchor {
   color: HighlightText;
 }
 
-#PanelUI-contents[type="grid"] #new-window-button,
-#customization-palette #new-window-button {
-  -moz-image-region: rect(0 64px 32px 32px);
-}
-
-#PanelUI-contents[type="grid"] #privatebrowsing-button,
-#customization-palette #privatebrowsing-button {
-  -moz-image-region: rect(0 96px 32px 64px);
-}
-
-#PanelUI-contents[type="grid"] #open-file-button,
-#customization-palette #open-file-button {
-  -moz-image-region: rect(32px 32px 64px 0);
-}
-
-#PanelUI-contents[type="grid"] #save-page-button,
-#customization-palette #save-page-button {
-  -moz-image-region: rect(32px 64px 64px 32px);
-}
-
-#PanelUI-contents[type="grid"] #bookmarks-menu-button,
-#customization-palette #bookmarks-menu-button {
-  -moz-image-region: rect(32px 96px 64px 64px);
-}
-
 #PanelUI-contents[type="grid"] #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker,
 #customization-palette #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker {
   display: none;
 }
 
-#PanelUI-contents[type="grid"] #history-button,
-#customization-palette #history-button,
-#PanelUI-contents[type="grid"] #history-panelmenu,
-#customization-palette #history-panelmenu {
-  -moz-image-region: rect(64px 32px 96px 0);
-}
-
-#PanelUI-contents[type="grid"] #add-ons-button,
-#customization-palette #add-ons-button {
-  -moz-image-region: rect(64px 64px 96px 32px);
-}
-
-#PanelUI-contents[type="grid"] #downloads-button,
-#customization-palette #downloads-button {
-  -moz-image-region: rect(64px 96px 96px 64px);
-}
-
-#PanelUI-contents[type="grid"] #sync-button,
-#customization-palette #sync-button {
-  -moz-image-region: rect(96px 32px 128px 0);
-}
-
-#PanelUI-contents[type="grid"] #print-button,
-#customization-palette #print-button {
-  -moz-image-region: rect(96px 64px 128px 32px);
-}
-
-#PanelUI-contents[type="grid"] #fullscreen-button,
-#customization-palette #fullscreen-button {
-  -moz-image-region: rect(96px 96px 128px 64px);
-}
-
-#PanelUI-contents[type="grid"] #feed-button,
-#customization-palette #feed-button {
-  -moz-image-region: rect(128px 32px 160px 0);
-}
-
-#PanelUI-contents[type="grid"] #find-button,
-#customization-palette #find-button {
-  -moz-image-region: rect(128px 64px 160px 32px);
-}
-
-#PanelUI-contents[type="grid"] #developer-button,
-#customization-palette #developer-button {
-  -moz-image-region: rect(128px 96px 160px 64px);
-}
-
-#PanelUI-contents[type="grid"] #tabview-button,
-#customization-palette #tabview-button {
-  -moz-image-region: rect(160px 32px 192px 0);
-}
-
-#PanelUI-contents[type="grid"] #preferences-button,
-#customization-palette #preferences-button {
-  -moz-image-region: rect(160px 64px 192px 32px);
-}
-
-#PanelUI-contents[type="grid"] #home-button,
-#customization-palette #home-button {
-  -moz-image-region: rect(160px 96px 192px 64px);
-}
-
-#PanelUI-contents[type="grid"] #reload-button,
-#customization-palette #reload-button {
-  -moz-image-region: rect(192px 32px 224px 0);
-}
-
-#PanelUI-contents[type="grid"] #stop-button,
-#customization-palette #stop-button {
-  -moz-image-region: rect(192px 64px 224px 32px);
-}
-
-#PanelUI-contents #cut-button {
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-#PanelUI-contents #copy-button {
-  -moz-image-region: rect(0 32px 16px 16px);
-}
-
-#PanelUI-contents #paste-button {
-  -moz-image-region: rect(0 48px 16px 32px);
-}
-
-#PanelUI-contents #zoom-out-button {
-  -moz-image-region: rect(0 64px 16px 48px);
-}
-
 #PanelUI-contents #zoom-reset-button {
   list-style-image: none;
 }
 
-#PanelUI-contents #zoom-in-button {
-  -moz-image-region: rect(0 80px 16px 64px);
-}
-
 #PanelUI-contents #paste-button,
 #PanelUI-contents #zoom-in-button {
   -moz-border-start: 1px solid;
@@ -431,56 +298,3 @@ toolbarbutton.panel-multiview-anchor {
   border-bottom-left-radius: 2px;
 }
 
-/* These icons are missing from Toolbar.png, so this is a temporary
-   hack until they are added. */
-toolbar > .customization-target > #find-button,
-toolbar > .customization-target > #open-file-button,
-toolbar > .customization-target > #developer-button,
-toolbar > .customization-target > #privatebrowsing-button,
-toolbar > .customization-target > #save-page-button,
-toolbar > .customization-target > #add-ons-button,
-toolbar > .customization-target > #preferences-button,
-toolbar > .customization-target > toolbarpaletteitem > #find-button,
-toolbar > .customization-target > toolbarpaletteitem > #open-file-button,
-toolbar > .customization-target > toolbarpaletteitem > #developer-button,
-toolbar > .customization-target > toolbarpaletteitem > #privatebrowsing-button,
-toolbar > .customization-target > toolbarpaletteitem > #save-page-button,
-toolbar > .customization-target > toolbarpaletteitem > #add-ons-button,
-toolbar > .customization-target > toolbarpaletteitem > #preferences-button {
-  list-style-image: url(chrome://browser/skin/customizableui/menuPanel-icons.png);
-}
-
-toolbar > .customization-target > #find-button,
-toolbar > .customization-target > toolbarpaletteitem > #find-button {
-  -moz-image-region: rect(128px 64px 160px 32px);
-}
-
-toolbar > .customization-target > #open-file-button,
-toolbar > .customization-target > toolbarpaletteitem > #open-file-button {
-  -moz-image-region: rect(32px 32px 64px 0);
-}
-
-toolbar > .customization-target > #developer-button,
-toolbar > .customization-target > toolbarpaletteitem > #developer-button {
-  -moz-image-region: rect(128px 96px 160px 64px);
-}
-
-toolbar > .customization-target > #privatebrowsing-button,
-toolbar > .customization-target > toolbarpaletteitem > #privatebrowsing-button {
-  -moz-image-region: rect(0 96px 32px 64px);
-}
-
-toolbar > .customization-target > #save-page-button,
-toolbar > .customization-target > toolbarpaletteitem > #save-page-button {
-  -moz-image-region: rect(32px 64px 64px 32px);
-}
-
-toolbar > .customization-target > #add-ons-button,
-toolbar > .customization-target > toolbarpaletteitem > #add-ons-button {
-  -moz-image-region: rect(64px 64px 96px 32px);
-}
-
-toolbar > .customization-target > #preferences-button,
-toolbar > .customization-target > toolbarpaletteitem > #preferences-button {
-  -moz-image-region: rect(160px 64px 192px 32px);
-}

browser/themes/shared/menupanel.inc

@@ -0,0 +1,145 @@
+/* Menu panel and palette styles */
+
+:-moz-any(@primaryToolbarButtons@)[customizableui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > :-moz-any(@primaryToolbarButtons@) {
+  list-style-image: url(chrome://browser/skin/menuPanel.png);
+}
+
+#reload-button[customizableui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #reload-button {
+  -moz-image-region: rect(0px, 64px, 32px, 32px);
+}
+
+#stop-button[customizableui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #stop-button {
+  -moz-image-region: rect(0px, 96px, 32px, 64px);
+}
+
+#home-button[customizableui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #home-button {
+  -moz-image-region: rect(0px, 128px, 32px, 96px);
+}
+
+#bookmarks-menu-button[customizableui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #bookmarks-menu-button {
+  -moz-image-region: rect(0px, 160px, 32px, 128px);
+}
+
+#bookmarks-menu-button[starred][customizableui-areatype="menu-panel"] {
+  -moz-image-region: rect(0px, 192px, 32px, 160px);
+}
+
+#history-panelmenu[customizableui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #history-panelmenu {
+  -moz-image-region: rect(0px, 224px, 32px, 192px);
+}
+
+#downloads-button[customizableui-areatype="menu-panel"],
+#downloads-indicator[customizableui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #downloads-button {
+  -moz-image-region: rect(0px, 256px, 32px, 224px);
+}
+
+#add-ons-button[customizableui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #add-ons-button {
+  -moz-image-region: rect(0px, 288px, 32px, 256px);
+}
+
+#open-file-button[customizableui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #open-file-button {
+  -moz-image-region: rect(0px, 320px, 32px, 288px);
+}
+
+#save-page-button[customizableui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #save-page-button {
+  -moz-image-region: rect(0px, 352px, 32px, 320px);
+}
+
+#sync-button[customizableui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #sync-button {
+  -moz-image-region: rect(0px, 384px, 32px, 352px);
+}
+
+#feed-button[customizableui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #feed-button {
+  -moz-image-region: rect(0px, 416px, 32px, 384px);
+}
+
+#social-share-button[customizableui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #social-share-button {
+  -moz-image-region: rect(0px, 448px, 32px, 416px);
+}
+
+#new-window-button[customizableui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #new-window-button {
+  -moz-image-region: rect(0px, 512px, 32px, 480px);
+}
+
+#new-tab-button[customizableui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #new-tab-button {
+  -moz-image-region: rect(0px, 544px, 32px, 512px);
+}
+
+#privatebrowsing-button[customizableui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #privatebrowsing-button {
+  -moz-image-region: rect(0px, 576px, 32px, 544px);
+}
+
+#find-button[customizableui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #find-button {
+  -moz-image-region: rect(0px, 640px, 32px, 608px);
+}
+
+#print-button[customizableui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #print-button {
+  -moz-image-region: rect(0px, 672px, 32px, 640px);
+}
+
+#fullscreen-button[customizableui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #fullscreen-button {
+  -moz-image-region: rect(0px, 704px, 32px, 672px);
+}
+
+#developer-button[customizableui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #developer-button {
+  -moz-image-region: rect(0px, 736px, 32px, 704px);
+}
+
+#preferences-button[customizableui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #preferences-button {
+  -moz-image-region: rect(0px, 768px, 32px, 736px);
+}
+
+/* Wide panel control icons */
+
+#edit-controls[customizableui-areatype="menu-panel"] > toolbarbutton,
+#zoom-controls[customizableui-areatype="menu-panel"] > toolbarbutton,
+toolbarpaletteitem[place="palette"] > #edit-controls > toolbarbutton,
+toolbarpaletteitem[place="palette"] > #zoom-controls > toolbarbutton {
+  list-style-image: url(chrome://browser/skin/menuPanel-small.png);
+}
+
+#edit-controls[customizableui-areatype="menu-panel"] > #cut-button,
+toolbarpaletteitem[place="palette"] > #edit-controls > #cut-button {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+#edit-controls[customizableui-areatype="menu-panel"] > #copy-button,
+toolbarpaletteitem[place="palette"] > #edit-controls > #copy-button {
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+#edit-controls[customizableui-areatype="menu-panel"] > #paste-button,
+toolbarpaletteitem[place="palette"] > #edit-controls > #paste-button {
+  -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+#zoom-controls[customizableui-areatype="menu-panel"] > #zoom-out-button,
+toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-out-button {
+  -moz-image-region: rect(0px, 80px, 16px, 64px);
+}
+
+#zoom-controls[customizableui-areatype="menu-panel"] > #zoom-in-button,
+toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
+  -moz-image-region: rect(0px, 96px, 16px, 80px);
+}

browser/themes/shared/toolbarbuttons.inc

@@ -0,0 +1,142 @@
+:-moz-any(@primaryToolbarButtons@) {
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
+}
+
+:-moz-any(@primaryToolbarButtons@):-moz-lwtheme-brighttext {
+  list-style-image: url(chrome://browser/skin/Toolbar-inverted.png);
+}
+
+#back-button {
+  -moz-image-region: rect(0, 36px, 18px, 18px);
+}
+
+#forward-button {
+  -moz-image-region: rect(0, 72px, 18px, 54px);
+}
+
+#back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
+#forward-button:-moz-locale-dir(rtl) {
+  transform: scaleX(-1);
+}
+
+#reload-button {
+  -moz-image-region: rect(0, 90px, 18px, 72px);
+}
+
+#stop-button {
+  -moz-image-region: rect(0, 108px, 18px, 90px);
+}
+
+#home-button[customizableui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 126px, 18px, 108px);
+}
+
+#bookmarks-menu-button[customizableui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 144px, 18px, 126px);
+}
+
+#bookmarks-menu-button[customizableui-areatype="toolbar"][starred] {
+  -moz-image-region: rect(0, 162px, 18px, 144px);
+}
+
+#history-panelmenu[customizableui-areatype="toolbar"]{
+  -moz-image-region: rect(0, 180px, 18px, 162px);
+}
+
+#downloads-indicator[customizableui-areatype="toolbar"],
+#downloads-button[customizableui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 198px, 18px, 180px);
+}
+
+#add-ons-button[customizableui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 216px, 18px, 198px);
+}
+
+#open-file-button[customizableui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 234px, 18px, 216px);
+}
+
+#save-page-button[customizableui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 252px, 18px, 234px);
+}
+
+#sync-button[customizableui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 270px, 18px, 252px);
+}
+
+#feed-button[customizableui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 288px, 18px, 270px);
+}
+
+#new-window-button[customizableui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 342px, 18px, 324px);
+}
+
+#new-tab-button[customizableui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 360px, 18px, 342px);
+}
+
+#privatebrowsing-button[customizableui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 378px, 18px, 360px);
+}
+
+#find-button[customizableui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 396px, 18px, 378px);
+}
+
+#print-button[customizableui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 414px, 18px, 396px);
+}
+
+#fullscreen-button[customizableui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 432px, 18px, 414px);
+}
+
+#developer-button[customizableui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 450px, 18px, 432px);
+}
+
+#preferences-button[customizableui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 468px, 18px, 450px);
+}
+
+#PanelUI-menu-button {
+  -moz-image-region: rect(0, 486px, 18px, 468px);
+}
+
+#edit-controls[customizableui-areatype="toolbar"] > #cut-button {
+  -moz-image-region: rect(0, 504px, 18px, 486px);
+}
+
+#edit-controls[customizableui-areatype="toolbar"] > #copy-button {
+  -moz-image-region: rect(0, 522px, 18px, 504px);
+}
+
+#edit-controls[customizableui-areatype="toolbar"] > #paste-button {
+  -moz-image-region: rect(0, 540px, 18px, 522px);
+}
+
+#zoom-controls[customizableui-areatype="toolbar"] > #zoom-out-button {
+  -moz-image-region: rect(0, 558px, 18px, 540px);
+}
+
+#zoom-controls[customizableui-areatype="toolbar"] > #zoom-in-button {
+  -moz-image-region: rect(0, 576px, 18px, 558px);
+}
+
+#webrtc-status-button[customizableui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 594px, 18px, 576px);
+}
+
+#nav-bar-overflow-button {
+  /* Need to override chevron styling */
+  list-style-image: url(chrome://browser/skin/Toolbar.png) !important;
+  -moz-image-region: rect(0, 612px, 18px, 594px);
+}
+
+#nav-bar-overflow-button:-moz-lwtheme-brighttext {
+  /* Need to override chevron styling */
+  list-style-image: url(chrome://browser/skin/Toolbar-inverted.png) !important;
+}
+
+

browser/themes/windows/browser.css

@@ -112,10 +112,6 @@
   z-index: 1;
 }
 
-#nav-bar-overflow-button {
-  -moz-image-region: rect(-5px, 12px, 11px, -4px);
-}
-
 #widget-overflow-list > .overflowedItem {
   width: 100%;
   min-height: 36px;
@@ -335,13 +331,16 @@ menuitem.bookmark-item {
 
 /* ::::: primary toolbar buttons ::::: */
 
-.toolbarbutton-1 {
-  list-style-image: url("chrome://browser/skin/Toolbar.png");
-}
+%include ../shared/toolbarbuttons.inc
+%include ../shared/menupanel.inc
 
-.toolbarbutton-1:-moz-lwtheme-brighttext {
-  list-style-image: url("chrome://browser/skin/Toolbar-inverted.png");
+%ifndef WINDOWS_AERO
+@media (-moz-windows-theme: luna-silver) {
+  :-moz-any(@primaryToolbarButtons@) {
+    list-style-image: url("chrome://browser/skin/Toolbar-lunaSilver.png");
+  }
 }
+%endif
 
 #main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-icon,
 #main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menu-dropmarker,
@@ -545,20 +544,6 @@ menuitem.bookmark-item {
 
 /* unified back/forward button */
 
-#back-button {
-  -moz-image-region: rect(0, 18px, 18px, 0);
-}
-
-#forward-button {
-  -moz-image-region: rect(0, 36px, 18px, 18px);
-}
-
-#back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
-#forward-button:-moz-locale-dir(rtl),
-#forward-button:-moz-locale-dir(rtl) > .toolbarbutton-text {
-  transform: scaleX(-1);
-}
-
 @conditionalForwardWithUrlbar@ {
   -moz-box-align: center;
 }
@@ -590,7 +575,6 @@ menuitem.bookmark-item {
 }
 
 @conditionalForwardWithUrlbar@ > #back-button {
-  -moz-image-region: rect(18px, 20px, 38px, 0);
   padding-top: 3px;
   padding-bottom: 3px;
   -moz-padding-start: 5px;
@@ -656,89 +640,18 @@ menuitem.bookmark-item {
   list-style-image: url("chrome://browser/skin/menu-forward.png") !important;
 }
 
-#stop-button {
-  -moz-image-region: rect(0, 54px, 18px, 36px);
-}
-
-#reload-button {
-  -moz-image-region: rect(0, 72px, 18px, 54px);
-}
-
 #home-button.bookmark-item {
   list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
 #home-button.bookmark-item:-moz-lwtheme-brighttext {
   list-style-image: url("chrome://browser/skin/Toolbar-inverted.png");
 }
-#home-button {
-  -moz-image-region: rect(0, 90px, 18px, 72px);
-}
 
-#downloads-button {
-  -moz-image-region: rect(0, 108px, 18px, 90px);
-}
-
-toolbar > .customization-target > #history-panelmenu,
-toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
-  -moz-image-region: rect(0, 126px, 18px, 108px);
-}
-
-#bookmarks-button {
-  -moz-image-region: rect(0, 144px, 18px, 126px);
-}
-
-#print-button {
-  -moz-image-region: rect(0, 162px, 18px, 144px);
-}
-
-#new-tab-button {
-  -moz-image-region: rect(0, 180px, 18px, 162px);
-}
-
-#new-window-button {
-  -moz-image-region: rect(0, 198px, 18px, 180px);
-}
-
-#cut-button {
-  -moz-image-region: rect(0, 216px, 18px, 198px);
-}
-
-#copy-button {
-  -moz-image-region: rect(0, 234px, 18px, 216px);
-}
-
-#paste-button {
-  -moz-image-region: rect(0, 252px, 18px, 234px);
-}
-
-#fullscreen-button {
-  -moz-image-region: rect(0, 270px, 18px, 252px);
-}
-
-#zoom-out-button {
-  -moz-image-region: rect(0, 288px, 18px, 270px);
-}
-
-#zoom-in-button {
-  -moz-image-region: rect(0, 306px, 18px, 288px);
-}
-
-#sync-button {
-  -moz-image-region: rect(0, 324px, 18px, 306px);
-}
 #sync-button[status="active"] {
   list-style-image: url("chrome://browser/skin/sync-throbber.png");
   -moz-image-region: rect(0, 18px, 18px, 0);
 }
 
-#feed-button {
-  -moz-image-region: rect(0, 342px, 18px, 324px);
-}
-
-#webrtc-status-button {
-  -moz-image-region: rect(0, 360px, 18px, 342px);
-}
-
 /* tabview button & menu item */
 
 #tabview-button,
@@ -1422,14 +1335,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 /* bookmarks menu-button */
 
-#bookmarks-menu-button {
-  -moz-image-region: rect(0px 378px 18px 360px);
-}
-
-#bookmarks-menu-button[starred] {
-  -moz-image-region: rect(18px 378px 36px 360px);
-}
-
 #bookmarks-menu-button.bookmark-item {
   list-style-image: url("chrome://browser/skin/places/bookmark.png");
   -moz-image-region: rect(0px 16px 16px 0px);

browser/themes/windows/customizableui/panelUIOverlay.css

@@ -7,27 +7,11 @@
 
 %include ../../shared/customizableui/panelUIOverlay.inc.css
 
-#PanelUI-contents #edit-controls toolbarbutton {
-  list-style-image: url("chrome://browser/skin/Toolbar.png");
-}
-
-#PanelUI-contents #cut-button {
-  -moz-image-region: rect(0, 216px, 18px, 198px);
-}
-#PanelUI-contents #copy-button {
-  -moz-image-region: rect(0, 234px, 18px, 216px);
-}
-#PanelUI-contents #paste-button {
-  -moz-image-region: rect(0, 252px, 18px, 234px);
-}
-
 #PanelUI-contents #zoom-out-btn {
-  -moz-image-region: rect(0, 288px, 18px, 270px);
   padding-left: 12px;
   padding-right: 12px;
 }
 #PanelUI-contents #zoom-in-btn {
-  -moz-image-region: rect(0, 306px, 18px, 288px);
   padding-left: 12px;
   padding-right: 12px;
 }

browser/themes/windows/downloads/downloads.css

@@ -249,14 +249,14 @@ richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:acti
 
 #downloads-indicator-icon {
   background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"),
-                              0, 108, 18, 90) center no-repeat;
+                              0, 198, 18, 180) center no-repeat;
   min-width: 18px;
   min-height: 18px;
 }
 
 #downloads-indicator-icon:-moz-lwtheme-brighttext {
   background: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"),
-                              0, 108, 18, 90) center no-repeat;
+                              0, 198, 18, 180) center no-repeat;
 }
 
 #downloads-indicator[attention] > #downloads-indicator-anchor > #downloads-indicator-icon {
@@ -268,7 +268,7 @@ richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:acti
 
 #downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
   background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"),
-                              0, 108, 18, 90) center no-repeat;
+                              0, 198, 18, 180) center no-repeat;
   background-size: 12px;
 }
 

browser/themes/windows/jar.mn

@@ -20,7 +20,6 @@ browser.jar:
         skin/classic/browser/aboutSyncTabs.css
 #endif
         skin/classic/browser/actionicon-tab.png
-        skin/classic/browser/appmenu.png
 *       skin/classic/browser/browser.css
 *       skin/classic/browser/browser-lightweightTheme.css
         skin/classic/browser/click-to-play-warning-stripes.png
@@ -28,8 +27,6 @@ browser.jar:
         skin/classic/browser/customizableui/customizeMode-gridTexture.png  (customizableui/customizeMode-gridTexture.png)
         skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png  (customizableui/customizeMode-separatorHorizontal.png)
         skin/classic/browser/customizableui/customizeMode-separatorVertical.png  (customizableui/customizeMode-separatorVertical.png)
-        skin/classic/browser/customizableui/menuPanel-icons.png        (customizableui/menuPanel-icons.png)
-        skin/classic/browser/customizableui/menuPanel-small-icons.png  (customizableui/menuPanel-small-icons.png)
 *       skin/classic/browser/engineManager.css
         skin/classic/browser/Geolocation-16.png
         skin/classic/browser/Geolocation-64.png
@@ -44,6 +41,8 @@ browser.jar:
         skin/classic/browser/livemark-folder.png
         skin/classic/browser/menu-back.png
         skin/classic/browser/menu-forward.png
+        skin/classic/browser/menuPanel.png
+        skin/classic/browser/menuPanel-small.png
         skin/classic/browser/mixed-content-blocked-16.png
         skin/classic/browser/mixed-content-blocked-64.png
         skin/classic/browser/monitor.png
@@ -70,6 +69,7 @@ browser.jar:
         skin/classic/browser/slowStartup-16.png
         skin/classic/browser/Toolbar.png
         skin/classic/browser/Toolbar-inverted.png
+        skin/classic/browser/Toolbar-lunaSilver.png
         skin/classic/browser/toolbarbutton-dropdown-arrow.png
         skin/classic/browser/toolbarbutton-dropdown-arrow-inverted.png
         skin/classic/browser/urlbar-arrow.png
@@ -287,7 +287,6 @@ browser.jar:
         skin/classic/aero/browser/aboutSyncTabs.css
 #endif
         skin/classic/aero/browser/actionicon-tab.png
-        skin/classic/aero/browser/appmenu.png
 *       skin/classic/aero/browser/browser.css                        (browser-aero.css)
 *       skin/classic/aero/browser/browser-lightweightTheme.css
         skin/classic/aero/browser/click-to-play-warning-stripes.png
@@ -295,8 +294,6 @@ browser.jar:
         skin/classic/aero/browser/customizableui/customizeMode-gridTexture.png  (customizableui/customizeMode-gridTexture.png)
         skin/classic/aero/browser/customizableui/customizeMode-separatorHorizontal.png  (customizableui/customizeMode-separatorHorizontal.png)
         skin/classic/aero/browser/customizableui/customizeMode-separatorVertical.png  (customizableui/customizeMode-separatorVertical.png)
-        skin/classic/aero/browser/customizableui/menuPanel-icons.png        (customizableui/menuPanel-icons.png)
-        skin/classic/aero/browser/customizableui/menuPanel-small-icons.png  (customizableui/menuPanel-small-icons.png)
 *       skin/classic/aero/browser/engineManager.css
         skin/classic/aero/browser/Geolocation-16.png
         skin/classic/aero/browser/Geolocation-64.png
@@ -311,6 +308,8 @@ browser.jar:
         skin/classic/aero/browser/livemark-folder.png                (livemark-folder-aero.png)
         skin/classic/aero/browser/menu-back.png                      (menu-back-aero.png)
         skin/classic/aero/browser/menu-forward.png                   (menu-forward-aero.png)
+        skin/classic/aero/browser/menuPanel.png                      (menuPanel-aero.png)
+        skin/classic/aero/browser/menuPanel-small.png                (menuPanel-small-aero.png)
         skin/classic/aero/browser/mixed-content-blocked-16.png
         skin/classic/aero/browser/mixed-content-blocked-64.png
         skin/classic/aero/browser/monitor.png
@@ -335,10 +334,10 @@ browser.jar:
         skin/classic/aero/browser/Secure24.png                       (Secure24-aero.png)
         skin/classic/aero/browser/setDesktopBackground.css
         skin/classic/aero/browser/slowStartup-16.png
-        skin/classic/aero/browser/Toolbar.png
-        skin/classic/aero/browser/Toolbar-inverted.png
         skin/classic/aero/browser/toolbarbutton-dropdown-arrow.png
         skin/classic/aero/browser/toolbarbutton-dropdown-arrow-inverted.png
+        skin/classic/aero/browser/Toolbar.png                        (Toolbar-aero.png)
+        skin/classic/aero/browser/Toolbar-inverted.png               (Toolbar-inverted-aero.png)
         skin/classic/aero/browser/urlbar-arrow.png
         skin/classic/aero/browser/urlbar-popup-blocked.png
         skin/classic/aero/browser/urlbar-history-dropmarker.png