Bug 892076 - Use finalized assets for customize, exit, and help buttons in panel UI. r=MattN

browser/themes/linux/jar.mn

@@ -41,6 +41,9 @@ browser.jar:
   skin/classic/browser/identity-icons-https-mixed-display.png
   skin/classic/browser/Info.png
   skin/classic/browser/menuPanel.png
+  skin/classic/browser/menuPanel-customize.png
+  skin/classic/browser/menuPanel-exit.png
+  skin/classic/browser/menuPanel-help.png
   skin/classic/browser/menuPanel-small.png
   skin/classic/browser/mixed-content-blocked-16.png
   skin/classic/browser/mixed-content-blocked-64.png

browser/themes/osx/customizableui/panelUIOverlay.css

@@ -12,6 +12,36 @@
   #PanelUI-contents toolbarbutton > .toolbarbutton-icon {
     width: 20px;
   }
+
+  #PanelUI-customize {
+    list-style-image: url(chrome://browser/skin/menuPanel-customize@2x.png);
+  }
+
+  #PanelUI-help {
+    list-style-image: url(chrome://browser/skin/menuPanel-help@2x.png);
+  }
+
+  #PanelUI-quit {
+    list-style-image: url(chrome://browser/skin/menuPanel-exit@2x.png);
+  }
+
+  #PanelUI-customize,
+  #PanelUI-help,
+  #PanelUI-quit {
+    -moz-image-region: rect(0, 32px, 32px, 0);
+  }
+
+  #PanelUI-customize:hover,
+  #PanelUI-help:hover,
+  #PanelUI-quit:hover {
+    -moz-image-region: rect(0, 64px, 32px, 32px);
+  }
+
+  #PanelUI-customize:hover:active,
+  #PanelUI-help:hover:active,
+  #PanelUI-quit:hover:active {
+    -moz-image-region: rect(0, 96px, 32px, 64px);
+  }
 }
 
 #edit-controls[customizableui-areatype="menu-panel"] > toolbarbutton:not(:first-child),

browser/themes/osx/jar.mn

@@ -58,6 +58,12 @@ browser.jar:
   skin/classic/browser/notification-64@2x.png
   skin/classic/browser/menuPanel.png
   skin/classic/browser/menuPanel@2x.png
+  skin/classic/browser/menuPanel-customize.png
+  skin/classic/browser/menuPanel-customize@2x.png
+  skin/classic/browser/menuPanel-exit.png
+  skin/classic/browser/menuPanel-exit@2x.png
+  skin/classic/browser/menuPanel-help.png
+  skin/classic/browser/menuPanel-help@2x.png
   skin/classic/browser/menuPanel-small.png
   skin/classic/browser/menuPanel-small@2x.png
   skin/classic/browser/mixed-content-blocked-16.png

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

@@ -220,20 +220,39 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
 :-moz-any(#PanelUI-help, #PanelUI-customize, #PanelUI-quit) > .toolbarbutton-icon {
   margin: 0 0 3px;
 }
+
+#PanelUI-customize {
+  list-style-image: url(chrome://browser/skin/menuPanel-customize.png);
+}
+
 #PanelUI-help {
   -moz-border-start-style: none;
-  list-style-image: url(chrome://global/skin/icons/question-16.png);
-}
-#PanelUI-customize {
-  list-style-image: url(chrome://browser/skin/menuPanel-small.png);
-  -moz-image-region: rect(0, 16px, 16px, 0);
+  list-style-image: url(chrome://browser/skin/menuPanel-help.png);
 }
+
 #PanelUI-quit {
   -moz-border-end-style: none;
-  list-style-image: url(chrome://browser/skin/menuPanel-small.png);
+  list-style-image: url(chrome://browser/skin/menuPanel-exit.png);
+}
+
+#PanelUI-customize,
+#PanelUI-help,
+#PanelUI-quit {
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
+#PanelUI-customize:hover,
+#PanelUI-help:hover,
+#PanelUI-quit:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+#PanelUI-customize:hover:active,
+#PanelUI-help:hover:active,
+#PanelUI-quit:hover:active {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+
 #PanelUI-help[disabled],
 #PanelUI-quit[disabled] {
   opacity: 0.4;

browser/themes/windows/jar.mn

@@ -46,6 +46,9 @@ browser.jar:
         skin/classic/browser/menu-back.png
         skin/classic/browser/menu-forward.png
         skin/classic/browser/menuPanel.png
+        skin/classic/browser/menuPanel-customize.png
+        skin/classic/browser/menuPanel-exit.png
+        skin/classic/browser/menuPanel-help.png
         skin/classic/browser/menuPanel-small.png
         skin/classic/browser/mixed-content-blocked-16.png
         skin/classic/browser/mixed-content-blocked-64.png
@@ -332,6 +335,9 @@ browser.jar:
         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-customize.png
+        skin/classic/aero/browser/menuPanel-exit.png
+        skin/classic/aero/browser/menuPanel-help.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