Bug 1274480 - Part 1 - Use SVG for permission icons and notifications. r=Gijs draft
authorPaolo Amadini <paolo.mozmail@amadzone.org>
Tue, 07 Jun 2016 14:49:47 +0100
changeset 376207 ee04742885b1dd62c38d118f462a22e3f94f36a4
parent 375957 1828937da9493b2cd54862b9c520b2ba5c7db92b
child 376208 e4e7e654638c2a49bbe6e9abbc5addeb22bce2c7
push id20514
push userpaolo.mozmail@amadzone.org
push dateTue, 07 Jun 2016 14:19:24 +0000
reviewersGijs
bugs1274480
milestone50.0a1
Bug 1274480 - Part 1 - Use SVG for permission icons and notifications. r=Gijs MozReview-Commit-ID: Dk0PajOppVL
browser/themes/linux/Geolocation-16.png
browser/themes/linux/Geolocation-64.png
browser/themes/linux/jar.mn
browser/themes/linux/pointerLock-16.png
browser/themes/linux/pointerLock-64.png
browser/themes/osx/Geolocation-16.png
browser/themes/osx/Geolocation-16@2x.png
browser/themes/osx/Geolocation-64.png
browser/themes/osx/Geolocation-64@2x.png
browser/themes/osx/jar.mn
browser/themes/osx/pointerLock-16.png
browser/themes/osx/pointerLock-16@2x.png
browser/themes/osx/pointerLock-64.png
browser/themes/osx/pointerLock-64@2x.png
browser/themes/shared/filters.svg
browser/themes/shared/glyphs.svg
browser/themes/shared/jar.inc.mn
browser/themes/shared/notification-icons.inc.css
browser/themes/shared/web-notifications-icon.svg
browser/themes/shared/web-notifications-tray.svg
browser/themes/shared/webrtc/webRTC-shareDevice-16.png
browser/themes/shared/webrtc/webRTC-shareDevice-16@2x.png
browser/themes/shared/webrtc/webRTC-shareDevice-64.png
browser/themes/shared/webrtc/webRTC-shareDevice-64@2x.png
browser/themes/shared/webrtc/webRTC-shareMicrophone-16.png
browser/themes/shared/webrtc/webRTC-shareMicrophone-16@2x.png
browser/themes/shared/webrtc/webRTC-shareMicrophone-64.png
browser/themes/shared/webrtc/webRTC-shareMicrophone-64@2x.png
browser/themes/shared/webrtc/webRTC-shareScreen-16.png
browser/themes/shared/webrtc/webRTC-shareScreen-16@2x.png
browser/themes/shared/webrtc/webRTC-shareScreen-64.png
browser/themes/shared/webrtc/webRTC-shareScreen-64@2x.png
browser/themes/shared/webrtc/webRTC-sharingDevice-16.png
browser/themes/shared/webrtc/webRTC-sharingDevice-16@2x.png
browser/themes/shared/webrtc/webRTC-sharingMicrophone-16.png
browser/themes/shared/webrtc/webRTC-sharingMicrophone-16@2x.png
browser/themes/shared/webrtc/webRTC-sharingScreen-16.png
browser/themes/shared/webrtc/webRTC-sharingScreen-16@2x.png
browser/themes/windows/Geolocation-16.png
browser/themes/windows/Geolocation-64.png
browser/themes/windows/jar.mn
browser/themes/windows/pointerLock-16.png
browser/themes/windows/pointerLock-64.png
caps/tests/mochitest/test_bug292789.html
toolkit/components/passwordmgr/nsLoginManagerPrompter.js
toolkit/themes/linux/mozapps/jar.mn
toolkit/themes/linux/mozapps/passwordmgr/key-16.png
toolkit/themes/linux/mozapps/passwordmgr/key-64.png
toolkit/themes/osx/mozapps/jar.mn
toolkit/themes/osx/mozapps/passwordmgr/key-16.png
toolkit/themes/osx/mozapps/passwordmgr/key-16@2x.png
toolkit/themes/osx/mozapps/passwordmgr/key-64.png
toolkit/themes/osx/mozapps/passwordmgr/key.png
toolkit/themes/windows/mozapps/jar.mn
toolkit/themes/windows/mozapps/passwordmgr/key-16.png
toolkit/themes/windows/mozapps/passwordmgr/key-64.png
toolkit/themes/windows/mozapps/passwordmgr/key.png
deleted file mode 100644
index 082b177811eb58303ee74b744e924adaf7223ade..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 6e09ab9c32d021d9f1f4c937943b31be08cb87c8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -11,36 +11,32 @@ browser.jar:
   skin/classic/browser/aboutSyncTabs.css
 * skin/classic/browser/syncedtabs/sidebar.css     (syncedtabs/sidebar.css)
   skin/classic/browser/actionicon-tab.png
 * skin/classic/browser/browser.css
 * skin/classic/browser/devedition.css
 * skin/classic/browser/browser-lightweightTheme.css
   skin/classic/browser/click-to-play-warning-stripes.png
   skin/classic/browser/content-contextmenu.svg
-  skin/classic/browser/Geolocation-16.png
-  skin/classic/browser/Geolocation-64.png
   skin/classic/browser/Info.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/monitor.png
   skin/classic/browser/monitor_16-10.png
 * skin/classic/browser/pageInfo.css
   skin/classic/browser/pageInfo.png
   skin/classic/browser/page-livemarks.png
-  skin/classic/browser/pointerLock-16.png
-  skin/classic/browser/pointerLock-64.png
   skin/classic/browser/Privacy-16.png
   skin/classic/browser/privatebrowsing-mask.png
   skin/classic/browser/reload-stop-go.png
   skin/classic/browser/reload-stop-go@2x.png
   skin/classic/browser/searchbar.css
   skin/classic/browser/Security-broken.png
   skin/classic/browser/setDesktopBackground.css
   skin/classic/browser/slowStartup-16.png
deleted file mode 100644
index 862cd11c6a2156d74505f977b822ad99616fb96a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a35ce040c87d03153ab1bef60fa4fefdb0e3a0b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 54ef8f8eae7221735fe774a2d6cfc4c68c1e342e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 314089368457780f64af9b7107edfda1d8f37ebc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 099b9c76f355237c3ae163f5c17845bb2cf36c6c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 411db1a5a455401d5df6a5fd3bca39bd3b3bca77..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -11,20 +11,16 @@ browser.jar:
 * skin/classic/browser/syncedtabs/sidebar.css          (syncedtabs/sidebar.css)
   skin/classic/browser/actionicon-tab.png
   skin/classic/browser/actionicon-tab@2x.png
 * skin/classic/browser/browser.css
 * skin/classic/browser/devedition.css
 * skin/classic/browser/browser-lightweightTheme.css
   skin/classic/browser/click-to-play-warning-stripes.png
   skin/classic/browser/content-contextmenu.svg
-  skin/classic/browser/Geolocation-16.png
-  skin/classic/browser/Geolocation-16@2x.png
-  skin/classic/browser/Geolocation-64.png
-  skin/classic/browser/Geolocation-64@2x.png
   skin/classic/browser/Info.png
   skin/classic/browser/keyhole-circle.png
   skin/classic/browser/keyhole-circle@2x.png
   skin/classic/browser/KUI-background.png
   skin/classic/browser/subtle-pattern.png
   skin/classic/browser/menu-back.png
   skin/classic/browser/menu-forward.png
   skin/classic/browser/menuPanel.png
@@ -40,20 +36,16 @@ browser.jar:
   skin/classic/browser/panel-expander-closed.png
   skin/classic/browser/panel-expander-closed@2x.png
   skin/classic/browser/panel-expander-open.png
   skin/classic/browser/panel-expander-open@2x.png
   skin/classic/browser/panel-plus-sign.png
   skin/classic/browser/page-livemarks.png
   skin/classic/browser/page-livemarks@2x.png
   skin/classic/browser/pageInfo.css
-  skin/classic/browser/pointerLock-16.png
-  skin/classic/browser/pointerLock-16@2x.png
-  skin/classic/browser/pointerLock-64.png
-  skin/classic/browser/pointerLock-64@2x.png
   skin/classic/browser/privatebrowsing-mask.png
   skin/classic/browser/privatebrowsing-mask@2x.png
   skin/classic/browser/privatebrowsing-mask-short.png
   skin/classic/browser/privatebrowsing-mask-short@2x.png
   skin/classic/browser/reload-stop-go.png
   skin/classic/browser/reload-stop-go@2x.png
   skin/classic/browser/searchbar.css
   skin/classic/browser/slowStartup-16.png
deleted file mode 100644
index 862cd11c6a2156d74505f977b822ad99616fb96a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 584c8b1924ccc7141ec69f33609ce9e273bf709e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a35ce040c87d03153ab1bef60fa4fefdb0e3a0b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 25a8cbab0f2012e0d86840795aa4eb4e885e78f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
--- /dev/null
+++ b/browser/themes/shared/filters.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg">
+  <filter id="fill">
+    <feComposite in="FillPaint" in2="SourceGraphic" operator="in"/>
+  </filter>
+</svg>
new file mode 100644
--- /dev/null
+++ b/browser/themes/shared/glyphs.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="32" height="32" viewBox="0 0 32 32">
+  <style>
+    path:not(:target) {
+      display: none;
+    }
+  </style>
+  <path id="camera" d="m 28,24.4 -6,-5.3 0,4.1 a 2.6,2.8 0 0 1 -2.6,2.8 l -14.8,0 a 2.6,2.8 0 0 1 -2.6,-2.8 l 0,-14.5 a 2.7,2.7 0 0 1 2.7,-2.7 l 14.7,0 a 2.6,2.8 0 0 1 2.6,2.8 l 0,4.1 6,-5.2 a 2,2 0 0 1 2,-0.7 l 0,18 a 2,2 0 0 1 -2,-0.6 z" />
+  <path id="geo-linux" d="m 2,15.9 a 14,14 0 1 1 0,0.2 z m 4,2.1 a 10,10 0 0 0 8,8 l 0,-4 4,0 0,4 a 10,10 0 0 0 8,-8 l -4,0 0,-4 4,0 a 10,10 0 0 0 -8,-8 l 0,4 -4,0 0,-4 a 10,10 0 0 0 -8,8 l 4,0 0,4 z" />
+  <path id="geo-linux-detailed" d="m 2,15.9 a 14,14 0 1 1 0,0.2 z m 3,2.1 a 11,11 0 0 0 9,9 l 1,-5 2,0 1,5 a 11,11 0 0 0 9,-9 l -5,-1 0,-2 5,-1 a 11,11 0 0 0 -9,-9 l -1,5 -2,0 -1,-5 a 11,11 0 0 0 -9,9 l 5,1 0,2 z" />
+  <path id="geo-osx" d="m 0,16 16,0 0,16 12,-28 z" />
+  <path id="geo-windows" d="m 2,14 0,4 2,0 a 12,12 0 0 0 10,10 l 0,2 4,0 0,-2 a 12,12 0 0 0 10,-10 l 2,0 0,-4 -2,0 a 12,12 0 0 0 -10,-10 l 0,-2 -4,0 0,2 a 12,12 0 0 0 -10,10 z m 4,1.9 a 10,10 0 1 1 0,0.2 z m 4,0 a 6,6 0 1 1 0,0.2 z" />
+  <path id="geo-windows-detailed" d="m 2,14.5 0,3 2,0.5 a 12,12 0 0 0 10,10 l 0.5,2 3,0 0.5,-2 a 12,12 0 0 0 10,-10 l 2,-0.5 0,-3 -2,-0.5 a 12,12 0 0 0 -10,-10 l -0.5,-2 -3,0 -0.5,2 a 12,12 0 0 0 -10,10 z m 4,1.4 a 10,10 0 1 1 0,0.2 z m 3,0 a 7,7 0 1 1 0,0.2 z" />
+  <path id="indexedDB" d="m 26,28 -2,0 0,-4 2,0 0,-16 -20,0 0,16 2,0 0,4 -2,0 a 4,4 0 0 1 -4,-4 l 0,-16 a 4,4 0 0 1 4,-4 l 20,0 a 4,4 0 0 1 4,4 l 0,16 a 4,4 0 0 1 -4,4 z m -12,-14 4,0 0,8 4,0 -6,7 -6,-7 4,0 0,-8 z" />
+  <path id="indexedDB-detailed" d="m 28,28 -6,0 0,-3 5,0 0,-18 -22,0 0,18 5,0 0,3 -6,0 a 2,2 0 0 1 -2,-2 l 0,-20 a 2,2 0 0 1 2,-2 l 24,0 a 2,2 0 0 1 2,2 l 0,20 a 2,2 0 0 1 -2,2 z m -14,-6 0,-8 4,0 0,8 4,0 -6,7 -6,-7 4,0 z" />
+  <path id="login" d="m 22,18 -3,3 -1.5,-1.5 -2.5,2.5 -2,0 0,3 -2,0 0,1 -1,0 0,2 -2,0 0,2 -6,0 0,-4 11,-11 -2,-2 3,-3 c 0,-7 8.6,-10.7 13.7,-5.7 5,5.1 1.3,13.7 -5.7,13.7 z m 3,-13 c -1.8,0 -2.7,2.2 -1.4,3.4 1.2,1.3 3.4,0.4 3.4,-1.4 0,-1.1 -0.9,-2 -2,-2 z" />
+  <path id="login-detailed" d="m 22,19 -0.4,0 -1.7,2.2 c -0.2,0.2 -0.4,0.3 -0.6,0.3 -0.3,0 -0.3,0 -0.8,-0.5 l -1,-1 -0.5,0 -3,3 -2,0 0,2 c 0,0.3 -0.2,0.5 -0.5,0.5 l -1,0 0,1 c 0,0.3 -0.2,0.5 -0.5,0.5 l -1,0 0,1.5 c 0,0.3 -0.2,0.5 -0.5,0.5 l -1.5,0 0,1.5 c 0,0.3 -0.2,0.5 -0.5,0.5 l -5,0 c -0.3,0 -0.5,-0.2 -0.5,-0.5 l 0,-3.5 11,-11 c 0.3,-0.3 0.3,-0.7 0,-1 l -1,-1 c -0.2,-0.3 -0.2,-0.7 0,-1 l 2.1,-2.1 c -0.8,-8.2 8.9,-13.1 15,-7.6 6.1,5.6 2.2,15.8 -6.1,15.7 z m 2,-13 c -1.8,0 -2.7,2.1 -1.4,3.4 1.2,1.3 3.4,0.4 3.4,-1.4 0,-1.1 -0.9,-2 -2,-2 z" />
+  <path id="microphone" d="m 18,25.6 0,2.4 2,0 c 1,0 2,1 2,2 l -12,0 c 0,-1 1,-2 2,-2 l 2,0 0,-2.4 c -3.5,-0.9 -6,-4 -6,-7.6 l 0,-4 2,0 0,4 c 0,3.3 2.7,6 6,6 3.3,0 6,-2.7 6,-6 l 0,-4 2,0 0,4 c -0.1,3.6 -2.5,6.7 -6,7.6 z m -6,-7.6 0,-12 c 0,-5.3 8,-5.3 8,0 l 0,12 c 0,5.3 -8,5.3 -8,0 z" />
+  <path id="microphone-detailed" d="m 24,18 c 0,3.6 -2.5,6.8 -6,7.7 l 0,2.3 1,0 c 1.3,0 2.4,0.8 2.8,2 l -11.6,0 c 0.4,-1.2 1.5,-2 2.8,-2 l 1,0 0,-2.3 c -3.5,-0.9 -5.98,-4.1 -6,-7.7 0,-1.4 0,-2.6 0,-4 0,-1.3 2,-1.3 2,0 l 0,4 c 0,3.3 2.7,6 6,6 3.3,0 6,-2.7 6,-6 l 0,-4 c 0,-1.3 2,-1.3 2,0 z m -12,0 0,-12 c 0,-5.3 8,-5.3 8,0 l 0,12 c 0,5.3 -8,5.3 -8,0 z" />
+  <path id="pointer" d="m 17.8,17.3 4.8,9.9 -4.1,1.8 -4.7,-9.8 -5.8,5.4 0,-23 17.6,14.5 z" />
+  <path id="screen" d="m 28,30 -18,0 a 2,2 0 0 1 -2,-2 l 0,-14 a 2,2 0 0 1 2,-2 l 18,0 a 2,2 0 0 1 2,2 l 0,14 a 2,2 0 0 1 -2,2 z m -22,-16 0,6 -2,0 a 2,2 0 0 1 -2,-2 l 0,-14 a 2,2 0 0 1 2,-2 l 18,0 a 2,2 0 0 1 2,2 l 0,6 -14,0 a 4,4 0 0 0 -4,4 z" />
+  <path id="screen-detailed" d="m 29,29 -18,0 a 2,2 0 0 1 -2,-2 l 0,-15 a 2,2 0 0 1 2,-2 l 18,0 a 2,2 0 0 1 2,2 l 0,15 a 2,2 0 0 1 -2,2 z m -22,-17 0,10 -4,0 a 2,2 0 0 1 -2,-2 l 0,-15 a 2,2 0 0 1 2,-2 l 18,0 a 2,2 0 0 1 2,2 l 0,3 -12,0 a 4,4 0 0 0 -4,4 z" />
+  <path id="web-notifications" d="m 26,24 0,7 -7.3,-7 -12.7,0 a 4,4 0 0 1 -4,-4 l 0,-12 a 4,4 0 0 1 4,-4 l 20,0 a 4,4 0 0 1 4,4 l 0,12 a 4,4 0 0 1 -4,4 z m -19,-6 10,0 a 1,1 0 0 0 0,-2 l -10,0 a 1,1 0 1 0 0,2 z m 0,-4 14,0 a 1,1 0 0 0 0,-2 l -14,0 a 1,1 0 1 0 0,2 z m 18,-6 -18,0 a 1,1 0 1 0 0,2 l 18,0 a 1,1 0 0 0 0,-2 z" />
+</svg>
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -48,18 +48,20 @@
   skin/classic/browser/customizableui/subView-arrow-back-inverted.png  (../shared/customizableui/subView-arrow-back-inverted.png)
   skin/classic/browser/customizableui/subView-arrow-back-inverted@2x.png  (../shared/customizableui/subView-arrow-back-inverted@2x.png)
   skin/classic/browser/customizableui/subView-arrow-back-inverted-rtl.png  (../shared/customizableui/subView-arrow-back-inverted-rtl.png)
   skin/classic/browser/customizableui/subView-arrow-back-inverted-rtl@2x.png  (../shared/customizableui/subView-arrow-back-inverted-rtl@2x.png)
   skin/classic/browser/customizableui/whimsy.png               (../shared/customizableui/whimsy.png)
   skin/classic/browser/customizableui/whimsy@2x.png            (../shared/customizableui/whimsy@2x.png)
   skin/classic/browser/downloads/contentAreaDownloadsView.css  (../shared/downloads/contentAreaDownloadsView.css)
   skin/classic/browser/drm-icon.svg                            (../shared/drm-icon.svg)
+  skin/classic/browser/filters.svg                             (../shared/filters.svg)
   skin/classic/browser/fullscreen/insecure.svg                 (../shared/fullscreen/insecure.svg)
   skin/classic/browser/fullscreen/secure.svg                   (../shared/fullscreen/secure.svg)
+  skin/classic/browser/glyphs.svg                              (../shared/glyphs.svg)
   skin/classic/browser/heartbeat-icon.svg                      (../shared/heartbeat-icon.svg)
   skin/classic/browser/heartbeat-star-lit.svg                  (../shared/heartbeat-star-lit.svg)
   skin/classic/browser/heartbeat-star-off.svg                  (../shared/heartbeat-star-off.svg)
   skin/classic/browser/identity-icon.svg                       (../shared/identity-block/identity-icon.svg)
   skin/classic/browser/identity-not-secure.svg                 (../shared/identity-block/identity-not-secure.svg)
   skin/classic/browser/identity-secure.svg                     (../shared/identity-block/identity-secure.svg)
   skin/classic/browser/identity-mixed-active-blocked.svg       (../shared/identity-block/identity-mixed-active-blocked.svg)
   skin/classic/browser/identity-mixed-passive-loaded.svg       (../shared/identity-block/identity-mixed-passive-loaded.svg)
@@ -127,36 +129,16 @@
   skin/classic/browser/reader-tour@2x.png                      (../shared/reader/reader-tour@2x.png)
   skin/classic/browser/readerMode.svg                          (../shared/reader/readerMode.svg)
   skin/classic/browser/notification-pluginNormal.png           (../shared/plugins/notification-pluginNormal.png)
   skin/classic/browser/notification-pluginNormal@2x.png        (../shared/plugins/notification-pluginNormal@2x.png)
   skin/classic/browser/notification-pluginAlert.png            (../shared/plugins/notification-pluginAlert.png)
   skin/classic/browser/notification-pluginAlert@2x.png         (../shared/plugins/notification-pluginAlert@2x.png)
   skin/classic/browser/notification-pluginBlocked.png          (../shared/plugins/notification-pluginBlocked.png)
   skin/classic/browser/notification-pluginBlocked@2x.png       (../shared/plugins/notification-pluginBlocked@2x.png)
-  skin/classic/browser/web-notifications-icon.svg              (../shared/web-notifications-icon.svg)
-  skin/classic/browser/web-notifications-tray.svg              (../shared/web-notifications-tray.svg)
-  skin/classic/browser/webRTC-shareDevice-16.png               (../shared/webrtc/webRTC-shareDevice-16.png)
-  skin/classic/browser/webRTC-shareDevice-16@2x.png            (../shared/webrtc/webRTC-shareDevice-16@2x.png)
-  skin/classic/browser/webRTC-shareDevice-64.png               (../shared/webrtc/webRTC-shareDevice-64.png)
-  skin/classic/browser/webRTC-shareDevice-64@2x.png            (../shared/webrtc/webRTC-shareDevice-64@2x.png)
-  skin/classic/browser/webRTC-sharingDevice-16.png             (../shared/webrtc/webRTC-sharingDevice-16.png)
-  skin/classic/browser/webRTC-sharingDevice-16@2x.png          (../shared/webrtc/webRTC-sharingDevice-16@2x.png)
-  skin/classic/browser/webRTC-shareMicrophone-16.png           (../shared/webrtc/webRTC-shareMicrophone-16.png)
-  skin/classic/browser/webRTC-shareMicrophone-16@2x.png        (../shared/webrtc/webRTC-shareMicrophone-16@2x.png)
-  skin/classic/browser/webRTC-shareMicrophone-64.png           (../shared/webrtc/webRTC-shareMicrophone-64.png)
-  skin/classic/browser/webRTC-shareMicrophone-64@2x.png        (../shared/webrtc/webRTC-shareMicrophone-64@2x.png)
-  skin/classic/browser/webRTC-sharingMicrophone-16.png         (../shared/webrtc/webRTC-sharingMicrophone-16.png)
-  skin/classic/browser/webRTC-sharingMicrophone-16@2x.png      (../shared/webrtc/webRTC-sharingMicrophone-16@2x.png)
-  skin/classic/browser/webRTC-shareScreen-16.png               (../shared/webrtc/webRTC-shareScreen-16.png)
-  skin/classic/browser/webRTC-shareScreen-16@2x.png            (../shared/webrtc/webRTC-shareScreen-16@2x.png)
-  skin/classic/browser/webRTC-shareScreen-64.png               (../shared/webrtc/webRTC-shareScreen-64.png)
-  skin/classic/browser/webRTC-shareScreen-64@2x.png            (../shared/webrtc/webRTC-shareScreen-64@2x.png)
-  skin/classic/browser/webRTC-sharingScreen-16.png             (../shared/webrtc/webRTC-sharingScreen-16.png)
-  skin/classic/browser/webRTC-sharingScreen-16@2x.png          (../shared/webrtc/webRTC-sharingScreen-16@2x.png)
   skin/classic/browser/webRTC-camera-white-16.png              (../shared/webrtc/camera-white-16.png)
   skin/classic/browser/webRTC-microphone-white-16.png          (../shared/webrtc/microphone-white-16.png)
   skin/classic/browser/webRTC-screen-white-16.png              (../shared/webrtc/screen-white-16.png)
   skin/classic/browser/panic-panel/header.png                  (../shared/panic-panel/header.png)
   skin/classic/browser/panic-panel/header@2x.png               (../shared/panic-panel/header@2x.png)
   skin/classic/browser/panic-panel/header-small.png            (../shared/panic-panel/header-small.png)
   skin/classic/browser/panic-panel/header-small@2x.png         (../shared/panic-panel/header-small@2x.png)
   skin/classic/browser/panic-panel/icons.png                   (../shared/panic-panel/icons.png)
--- a/browser/themes/shared/notification-icons.inc.css
+++ b/browser/themes/shared/notification-icons.inc.css
@@ -6,17 +6,23 @@
 
 .popup-notification-icon {
   width: 64px;
   height: 64px;
   margin-inline-end: 10px;
 }
 
 .popup-notification-icon[popupid="geolocation"] {
-  list-style-image: url(chrome://browser/skin/Geolocation-64.png);
+%ifdef XP_MACOSX
+  list-style-image: url(chrome://browser/skin/glyphs.svg#geo-osx);
+%elif defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
+  list-style-image: url(chrome://browser/skin/glyphs.svg#geo-linux-detailed);
+%else
+  list-style-image: url(chrome://browser/skin/glyphs.svg#geo-windows-detailed);
+%endif
 }
 
 .popup-notification-icon[popupid="xpinstall-disabled"],
 .popup-notification-icon[popupid="addon-install-blocked"],
 .popup-notification-icon[popupid="addon-install-origin-blocked"] {
   list-style-image: url(chrome://browser/skin/addons/addon-install-blocked.svg);
 }
 
@@ -43,47 +49,37 @@
 .popup-notification-icon[popupid="addon-install-restart"] {
   list-style-image: url(chrome://browser/skin/addons/addon-install-restart.svg);
 }
 
 .popup-notification-icon[popupid="click-to-play-plugins"] {
   list-style-image: url(chrome://mozapps/skin/plugins/pluginBlocked-64.png);
 }
 
-.popup-notification-icon[popupid="web-notifications"] {
-  list-style-image: url(chrome://browser/skin/web-notifications-icon.svg);
+.popup-notification-icon[popupid="indexedDB-permissions-prompt"] {
+  list-style-image: url(chrome://browser/skin/glyphs.svg#indexedDB-detailed);
 }
 
-.popup-notification-icon[popupid="indexedDB-permissions-prompt"],
 .popup-notification-icon[popupid*="offline-app-requested"],
 .popup-notification-icon[popupid="offline-app-usage"] {
   list-style-image: url(chrome://global/skin/icons/question-64.png);
 }
 
 .popup-notification-icon[popupid="password"] {
-  list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png);
-}
-
-.popup-notification-icon[popupid="webRTC-sharingDevices"],
-.popup-notification-icon[popupid="webRTC-shareDevices"] {
-  list-style-image: url(chrome://browser/skin/webRTC-shareDevice-64.png);
+  list-style-image: url(chrome://browser/skin/glyphs.svg#login-detailed);
 }
 
 .popup-notification-icon[popupid="webRTC-sharingMicrophone"],
 .popup-notification-icon[popupid="webRTC-shareMicrophone"] {
-  list-style-image: url(chrome://browser/skin/webRTC-shareMicrophone-64.png);
+  list-style-image: url(chrome://browser/skin/glyphs.svg#microphone-detailed);
 }
 
 .popup-notification-icon[popupid="webRTC-sharingScreen"],
 .popup-notification-icon[popupid="webRTC-shareScreen"] {
-  list-style-image: url(chrome://browser/skin/webRTC-shareScreen-64.png);
-}
-
-.popup-notification-icon[popupid="pointerLock"] {
-  list-style-image: url(chrome://browser/skin/pointerLock-64.png);
+  list-style-image: url(chrome://browser/skin/glyphs.svg#screen-detailed);
 }
 
 .popup-notification-icon[popupid="servicesInstall"] {
   list-style-image: url(chrome://browser/skin/social/services-64.png);
 }
 
 /* Notification icon box */
 #notification-popup-box {
@@ -134,38 +130,79 @@
 %ifdef MOZ_WIDGET_GTK
     list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog);
 %else
     list-style-image: url(chrome://global/skin/icons/information-32.png);
 %endif
   }
 }
 
+/* For the moment we apply the color filter only on the icons listed here.
+   The first two selectors are used by socialchat.xml (bug 1275558). */
+.webRTC-sharingDevices-notification-icon,
+.webRTC-sharingMicrophone-notification-icon,
+.camera-icon,
+.geo-icon,
+.indexedDB-icon,
+.login-icon,
+.microphone-icon,
+.pointer-icon,
+.screen-icon,
+.web-notifications-icon,
+.popup-notification-icon[popupid="geolocation"],
+.popup-notification-icon[popupid="indexedDB-permissions-prompt"],
+.popup-notification-icon[popupid="password"],
+.popup-notification-icon[popupid="pointerLock"],
+.popup-notification-icon[popupid="webRTC-shareDevices"],
+.popup-notification-icon[popupid="webRTC-shareMicrophone"],
+.popup-notification-icon[popupid="webRTC-shareScreen"],
+.popup-notification-icon[popupid="webRTC-sharingDevices"],
+.popup-notification-icon[popupid="webRTC-sharingMicrophone"],
+.popup-notification-icon[popupid="webRTC-sharingScreen"],
+.popup-notification-icon[popupid="web-notifications"] {
+  filter: url(chrome://browser/skin/filters.svg#fill);
+  fill: #999;
+}
+
+/* The first two selectors are used by socialchat.xml (bug 1275558). The
+   notifications in the chat window are only shown when they are in use. */
+.webRTC-sharingDevices-notification-icon,
+.webRTC-sharingMicrophone-notification-icon,
+.in-use {
+  fill: #fea01b;
+}
+
 .geo-icon {
-  list-style-image: url(chrome://browser/skin/Geolocation-16.png);
+%ifdef XP_MACOSX
+  list-style-image: url(chrome://browser/skin/glyphs.svg#geo-osx);
+%elif defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
+  list-style-image: url(chrome://browser/skin/glyphs.svg#geo-linux);
+%else
+  list-style-image: url(chrome://browser/skin/glyphs.svg#geo-windows);
+%endif
 }
 
 .install-icon {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default);
 }
 
 .install-icon:hover {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#hover);
 }
 
 .install-icon:hover:active {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#active);
 }
 
 .indexedDB-icon {
-  list-style-image: url(chrome://global/skin/icons/question-16.png);
+  list-style-image: url(chrome://browser/skin/glyphs.svg#indexedDB);
 }
 
 .login-icon {
-  list-style-image: url(chrome://mozapps/skin/passwordmgr/key-16.png);
+  list-style-image: url(chrome://browser/skin/glyphs.svg#login);
 }
 
 #login-fill-notification-icon {
   /* Temporary solution until the capture and fill doorhangers are unified. */
   transform: scaleX(-1);
 }
 
 .plugin-icon {
@@ -207,59 +244,42 @@
   from {
     opacity: 0;
   }
   to {
     opacity: 1;
   }
 }
 
-.camera-icon {
-  list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16.png);
-}
-
 /* The first selector is used by socialchat.xml (bug 1275558). */
 .webRTC-sharingDevices-notification-icon,
-.camera-icon.in-use {
-  list-style-image: url(chrome://browser/skin/webRTC-sharingDevice-16.png);
-}
-
-.microphone-icon {
-  list-style-image: url(chrome://browser/skin/webRTC-shareMicrophone-16.png);
+.camera-icon,
+.popup-notification-icon[popupid="webRTC-shareDevices"],
+.popup-notification-icon[popupid="webRTC-sharingDevices"] {
+  list-style-image: url(chrome://browser/skin/glyphs.svg#camera);
 }
 
 /* The first selector is used by socialchat.xml (bug 1275558). */
 .webRTC-sharingMicrophone-notification-icon,
-.microphone-icon.in-use {
-  list-style-image: url(chrome://browser/skin/webRTC-sharingMicrophone-16.png);
+.microphone-icon {
+  list-style-image: url(chrome://browser/skin/glyphs.svg#microphone);
 }
 
 .screen-icon {
-  list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png);
-}
-
-.screen-icon.in-use {
-  list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16.png);
+  list-style-image: url(chrome://browser/skin/glyphs.svg#screen);
 }
 
+.popup-notification-icon[popupid="web-notifications"],
 .web-notifications-icon {
-  list-style-image: url(chrome://browser/skin/web-notifications-tray.svg);
-  -moz-image-region: rect(0, 16px, 16px, 0);
+  list-style-image: url(chrome://browser/skin/glyphs.svg#web-notifications);
 }
 
-.web-notifications-icon:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-.web-notifications-icon:hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
+.popup-notification-icon[popupid="pointerLock"],
 .pointer-icon {
-  list-style-image: url(chrome://browser/skin/pointerLock-16.png);
+  list-style-image: url(chrome://browser/skin/glyphs.svg#pointer);
 }
 
 .service-icon {
   list-style-image: url(chrome://browser/skin/social/services-16.png);
 }
 
 .translation-icon {
   list-style-image: url(chrome://browser/skin/translation-16.png);
@@ -293,69 +313,19 @@
 }
 
 /* HiDPI notification icons */
 @media (min-resolution: 1.1dppx) {
   #notification-popup-box {
     border-image: url("chrome://browser/skin/urlbar-arrow@2x.png") 0 16 0 0 fill;
   }
 
-  .camera-icon {
-    list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16@2x.png);
-  }
-
-  .camera-icon.in-use {
-    list-style-image: url(chrome://browser/skin/webRTC-sharingDevice-16@2x.png);
-  }
-
-  .microphone-icon {
-    list-style-image: url(chrome://browser/skin/webRTC-shareMicrophone-16@2x.png);
-  }
-
-  .microphone-icon.in-use {
-    list-style-image: url(chrome://browser/skin/webRTC-sharingMicrophone-16@2x.png);
-  }
-
-  .screen-icon {
-    list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16@2x.png);
-  }
-
-  .screen-icon.in-use {
-    list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16@2x.png);
-  }
-
-  .popup-notification-icon[popupid="webRTC-sharingDevices"],
-  .popup-notification-icon[popupid="webRTC-shareDevices"] {
-    list-style-image: url(chrome://browser/skin/webRTC-shareDevice-64@2x.png);
-  }
-
-  .popup-notification-icon[popupid="webRTC-sharingMicrophone"],
-  .popup-notification-icon[popupid="webRTC-shareMicrophone"] {
-    list-style-image: url(chrome://browser/skin/webRTC-shareMicrophone-64@2x.png);
-  }
-
-  .popup-notification-icon[popupid="webRTC-sharingScreen"],
-  .popup-notification-icon[popupid="webRTC-shareScreen"] {
-    list-style-image: url(chrome://browser/skin/webRTC-shareScreen-64@2x.png);
-  }
 
 %ifdef XP_MACOSX
 /* OSX only until we have icons for Windows and Linux */
-  .geo-icon {
-    list-style-image: url(chrome://browser/skin/Geolocation-16@2x.png);
-  }
-
-  .indexedDB-icon {
-    list-style-image: url(chrome://global/skin/icons/question-32.png);
-  }
-
-  .login-icon {
-    list-style-image: url(chrome://mozapps/skin/passwordmgr/key-16@2x.png);
-  }
-
   .plugin-icon {
     list-style-image: url(chrome://browser/skin/notification-pluginNormal@2x.png);
   }
 
   .plugin-icon.plugin-hidden {
     list-style-image: url(chrome://browser/skin/notification-pluginAlert@2x.png);
   }
 
@@ -370,37 +340,16 @@
   .plugin-icon:hover {
     -moz-image-region: rect(0, 64px, 32px, 32px);
   }
 
   .plugin-icon:active {
     -moz-image-region: rect(0, 96px, 32px, 64px);
   }
 
-  .pointer-icon {
-    list-style-image: url(chrome://browser/skin/pointerLock-16@2x.png);
-  }
-
-  .translation-icon {
-    list-style-image: url(chrome://browser/skin/translation-16@2x.png);
-    -moz-image-region: rect(0px, 32px, 32px, 0px);
-  }
-
-  .translation-icon.in-use {
-    -moz-image-region: rect(0px, 64px, 32px, 32px);
-  }
-
-  .popup-notification-icon[popupid="geolocation"] {
-    list-style-image: url(chrome://browser/skin/Geolocation-64@2x.png);
-  }
-
-  .popup-notification-icon[popupid="pointerLock"] {
-    list-style-image: url(chrome://browser/skin/pointerLock-64@2x.png);
-  }
-
   .popup-notification-icon[popupid="servicesInstall"] {
     list-style-image: url(chrome://browser/skin/social/services-64@2x.png);
   }
 
   .service-icon {
     list-style-image: url(chrome://browser/skin/social/services-16@2x.png);
   }
 %endif
deleted file mode 100644
--- a/browser/themes/shared/web-notifications-icon.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- 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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-  <path fill="#a6a6a6" d="M53.6,8H10.4A6.4,6.4,0,0,0,4,14.4V41.6A6.4,6.4,0,0,0,10.4,48H12V62L26.7,48H53.6A6.4,6.4,0,0,0,60,41.6V14.4A6.4,6.4,0,0,0,53.6,8ZM34,36H14a2,2,0,0,1,0-4H34A2,2,0,0,1,34,36Zm8-8H14a2,2,0,0,1,0-4H42A2,2,0,0,1,42,28Zm8-8H14a2,2,0,0,1,0-4H50A2,2,0,0,1,50,20Z"/>
-</svg>
deleted file mode 100644
--- a/browser/themes/shared/web-notifications-tray.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="16" viewBox="0 0 48 16">
-  <defs>
-    <style>
-      .style-icon-notification {
-        fill: #666;
-      }
-      .style-icon-notification.hover {
-        fill: #808080;
-      }
-      .style-icon-notification.active {
-        fill: #4d4d4d;
-      }
-    </style>
-    <path id="shape-notifications-push" d="M13.4,2H2.6A1.6,1.6,0,0,0,1,3.6v6.8A1.6,1.6,0,0,0,2.6,12H3v3.5L6.7,12h6.7A1.6,1.6,0,0,0,15,10.4V3.6A1.6,1.6,0,0,0,13.4,2ZM8.5,9h-5a0.5,0.5,0,0,1,0-1h5A0.5,0.5,0,0,1,8.5,9Zm2-2h-7a0.5,0.5,0,0,1,0-1h7A0.5,0.5,0,0,1,10.5,7Zm2-2h-9a0.5,0.5,0,0,1,0-1h9A0.5,0.5,0,0,1,12.5,5Z"/>
-  </defs>
-  <use xlink:href="#shape-notifications-push" class="style-icon-notification"/>
-  <use xlink:href="#shape-notifications-push" transform="translate(16)" class="style-icon-notification hover"/>
-  <use xlink:href="#shape-notifications-push" transform="translate(32)" class="style-icon-notification active"/>
-</svg>
deleted file mode 100644
index 8bc5b3acaed5f864dd06c36ae9350dd15524df9a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 72d53e6d99366fab0c2b65044554b8c74e97e9a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index d125789fbce71eff4c4d5af890dd5ed6a862c50e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 82e591f614f8ccf807adf7ff575c8941e4acf5c5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index fea67f7a4803152ad255892d7d7487d094727416..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 590d032b79006f2cd7b50ce586372ccb7cba5885..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index f2ca85c2f7eceb3ca5c4139fddf4ebda2713c01e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 46cc4330671889b6f4e9547ba724be2bcd2528ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 30b1e87fa1bc6398bf138184597058cf51e03034..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 6eae122ba77aa30624d6fa3b10be1d3387a1e48c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index aae5238733eaefcfc07182128ca211cc90e18551..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 8d57427226a3907a20d01ebfcf94ee05c079f6f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index b7ab6f053df24ca3fcb8e55f394617db181a8558..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index cf1dd9ab6379291d393d4536195ba0af1bcdff28..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 2b4d219152f45b4400fa29cf032f8ae8229ab067..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index b45d08c1410f22bfccd4ffa1ed0325db729177b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 6cde0cb60147e5072999e51593e53c2b55d6b0f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a0aac6c033e7c07f71afd0671e6db89b9500d06c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index d710e7336dbc445d36ee4868257d9139c50f8919..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 27fecb8588f939fbb33347518c1627fc8e9b8af8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -13,18 +13,16 @@ browser.jar:
   skin/classic/browser/actionicon-tab@2x.png
   skin/classic/browser/actionicon-tab-XPVista7.png
 * skin/classic/browser/browser.css
 * skin/classic/browser/devedition.css
 * skin/classic/browser/browser-lightweightTheme.css
   skin/classic/browser/caption-buttons.svg
   skin/classic/browser/click-to-play-warning-stripes.png
   skin/classic/browser/content-contextmenu.svg
-  skin/classic/browser/Geolocation-16.png
-  skin/classic/browser/Geolocation-64.png
   skin/classic/browser/Info.png
   skin/classic/browser/Info-XP.png
   skin/classic/browser/keyhole-forward-mask.svg
   skin/classic/browser/KUI-background.png
   skin/classic/browser/livemark-folder.png
   skin/classic/browser/livemark-folder-XP.png
   skin/classic/browser/menu-back.png
   skin/classic/browser/menu-back-XP.png
@@ -44,18 +42,16 @@ browser.jar:
   skin/classic/browser/menuPanel-small@2x.png
   skin/classic/browser/menuPanel-small-aero.png
   skin/classic/browser/menuPanel-small-aero@2x.png
   skin/classic/browser/monitor.png
   skin/classic/browser/monitor_16-10.png
   skin/classic/browser/pageInfo.css
   skin/classic/browser/pageInfo.png
   skin/classic/browser/pageInfo-XP.png
-  skin/classic/browser/pointerLock-16.png
-  skin/classic/browser/pointerLock-64.png
   skin/classic/browser/privatebrowsing-mask-tabstrip.png
   skin/classic/browser/privatebrowsing-mask-tabstrip-XPVista7.png
   skin/classic/browser/privatebrowsing-mask-titlebar.png
   skin/classic/browser/privatebrowsing-mask-titlebar-XPVista7.png
   skin/classic/browser/privatebrowsing-mask-titlebar-XPVista7-tall.png
   skin/classic/browser/reload-stop-go.png
   skin/classic/browser/reload-stop-go@2x.png
   skin/classic/browser/reload-stop-go-XPVista7.png
deleted file mode 100644
index 862cd11c6a2156d74505f977b822ad99616fb96a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index f099f39bc5a26a8f95cc958e36fed7207787124a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/caps/tests/mochitest/test_bug292789.html
+++ b/caps/tests/mochitest/test_bug292789.html
@@ -49,18 +49,18 @@ function testScriptSrc(aCallback) {
       // trigger the callback
       if (aCallback)
         aCallback();
     }
 }
 
 /** <img src=""> tests **/
 var img_global = "chrome://global/skin/icons/Error.png";
-var img_mozapps = "chrome://mozapps/skin/passwordmgr/key-16.png";
-var res_mozapps = "resource://gre/chrome/toolkit/skin/classic/mozapps/passwordmgr/key-16.png";
+var img_mozapps = "chrome://mozapps/skin/profile/profileicon.png";
+var res_mozapps = "resource://gre/chrome/toolkit/skin/classic/mozapps/profile/profileicon.png";
 
 var imgTests = [[img_global, "success"],
                 [img_mozapps, "fail"],
                 [res_mozapps, "success"]];
 
 var curImgTest = 0;
 
 function runImgTest() {
--- a/toolkit/components/passwordmgr/nsLoginManagerPrompter.js
+++ b/toolkit/components/passwordmgr/nsLoginManagerPrompter.js
@@ -737,18 +737,17 @@ LoginManagerPrompter.prototype = {
    *
    */
   _showLoginNotification : function (aNotifyBox, aName, aText, aButtons) {
     var oldBar = aNotifyBox.getNotificationWithValue(aName);
     const priority = aNotifyBox.PRIORITY_INFO_MEDIUM;
 
     this.log("Adding new " + aName + " notification bar");
     var newBar = aNotifyBox.appendNotification(
-                            aText, aName,
-                            "chrome://mozapps/skin/passwordmgr/key.png",
+                            aText, aName, "",
                             priority, aButtons);
 
     // The page we're going to hasn't loaded yet, so we want to persist
     // across the first location change.
     newBar.persistence++;
 
     // Sites like Gmail perform a funky redirect dance before you end up
     // at the post-authentication page. I don't see a good way to
--- a/toolkit/themes/linux/mozapps/jar.mn
+++ b/toolkit/themes/linux/mozapps/jar.mn
@@ -16,23 +16,20 @@ toolkit.jar:
   skin/classic/mozapps/extensions/extensionGeneric-16.png  (extensions/extensionGeneric-16.png)
   skin/classic/mozapps/extensions/dictionaryGeneric.png    (extensions/dictionaryGeneric.png)
   skin/classic/mozapps/extensions/dictionaryGeneric-16.png (extensions/dictionaryGeneric-16.png)
   skin/classic/mozapps/extensions/themeGeneric.png         (extensions/themeGeneric.png)
   skin/classic/mozapps/extensions/themeGeneric-16.png      (extensions/themeGeneric-16.png)
   skin/classic/mozapps/extensions/localeGeneric.png        (extensions/localeGeneric.png)
 * skin/classic/mozapps/extensions/newaddon.css             (extensions/newaddon.css)
   skin/classic/mozapps/extensions/heart.png                (extensions/heart.png)
-  skin/classic/mozapps/passwordmgr/key-16.png              (passwordmgr/key-16.png)
-  skin/classic/mozapps/passwordmgr/key-64.png              (passwordmgr/key-64.png)
   skin/classic/mozapps/plugins/pluginGeneric.png           (plugins/pluginGeneric.png)
   skin/classic/mozapps/plugins/pluginBlocked.png           (plugins/pluginBlocked.png)
   skin/classic/mozapps/plugins/pluginGeneric-16.png        (plugins/pluginGeneric-16.png)
   skin/classic/mozapps/profile/profileicon.png             (profile/profileicon.png)
   skin/classic/mozapps/update/updates.css                  (update/updates.css)
   skin/classic/mozapps/viewsource/viewsource.css           (viewsource/viewsource.css)
 
 #if MOZ_BUILD_APP == browser
 [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
 [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #endif
-% override chrome://mozapps/skin/passwordmgr/key.png       chrome://mozapps/skin/passwordmgr/key-16.png
deleted file mode 100644
index 9472be0686b34fe34ab8d992a73ffe6b48413369..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index c300a265d3071b7dd3f3fd659503572b69782fa7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/osx/mozapps/jar.mn
+++ b/toolkit/themes/osx/mozapps/jar.mn
@@ -31,20 +31,16 @@ toolkit.jar:
   skin/classic/mozapps/extensions/heart.png                       (extensions/heart.png)
   skin/classic/mozapps/extensions/search.png                      (extensions/search.png)
   skin/classic/mozapps/extensions/about.css                       (extensions/about.css)
 * skin/classic/mozapps/extensions/extensions.css                  (extensions/extensions.css)
   skin/classic/mozapps/extensions/update.css                      (extensions/update.css)
   skin/classic/mozapps/extensions/eula.css                        (extensions/eula.css)
   skin/classic/mozapps/extensions/blocklist.css                   (extensions/blocklist.css)
 * skin/classic/mozapps/extensions/newaddon.css                    (extensions/newaddon.css)
-  skin/classic/mozapps/passwordmgr/key.png                        (passwordmgr/key.png)
-  skin/classic/mozapps/passwordmgr/key-16.png                     (passwordmgr/key-16.png)
-  skin/classic/mozapps/passwordmgr/key-16@2x.png                  (passwordmgr/key-16@2x.png)
-  skin/classic/mozapps/passwordmgr/key-64.png                     (passwordmgr/key-64.png)
   skin/classic/mozapps/plugins/notifyPluginGeneric.png            (plugins/notifyPluginGeneric.png)
   skin/classic/mozapps/plugins/pluginGeneric.png                  (plugins/pluginGeneric.png)
   skin/classic/mozapps/plugins/pluginBlocked.png                  (plugins/pluginBlocked.png)
   skin/classic/mozapps/plugins/pluginBlocked-64.png               (plugins/pluginBlocked-64.png)
   skin/classic/mozapps/plugins/pluginGeneric-16.png               (plugins/pluginGeneric-16.png)
   skin/classic/mozapps/plugins/pluginHelp-16.png                  (plugins/pluginHelp-16.png)
   skin/classic/mozapps/profile/profileicon.png                    (profile/profileicon.png)
   skin/classic/mozapps/profile/profileSelection.css               (profile/profileSelection.css)
deleted file mode 100644
index 5f2e54b70215afbe6a67966bd0f62d7b3efe3ab7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 7ec431b0ada8111ae918df14aada21f2be26b5ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 998cf14f7a2297b877a2bab35a74cbfb88ba9967..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index e51cf29881e91d75951b33abd954d97a22e65ffc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/windows/mozapps/jar.mn
+++ b/toolkit/themes/windows/mozapps/jar.mn
@@ -16,19 +16,16 @@ toolkit.jar:
   skin/classic/mozapps/extensions/extensionGeneric-16.png    (extensions/extensionGeneric-16.png)
   skin/classic/mozapps/extensions/themeGeneric.png           (extensions/themeGeneric.png)
   skin/classic/mozapps/extensions/themeGeneric-16.png        (extensions/themeGeneric-16.png)
   skin/classic/mozapps/extensions/dictionaryGeneric.png      (extensions/dictionaryGeneric.png)
   skin/classic/mozapps/extensions/dictionaryGeneric-16.png   (extensions/dictionaryGeneric-16.png)
   skin/classic/mozapps/extensions/localeGeneric.png          (extensions/localeGeneric.png)
   skin/classic/mozapps/extensions/heart.png                  (extensions/heart.png)
 * skin/classic/mozapps/extensions/newaddon.css               (extensions/newaddon.css)
-  skin/classic/mozapps/passwordmgr/key.png                   (passwordmgr/key.png)
-  skin/classic/mozapps/passwordmgr/key-16.png                (passwordmgr/key-16.png)
-  skin/classic/mozapps/passwordmgr/key-64.png                (passwordmgr/key-64.png)
   skin/classic/mozapps/plugins/pluginGeneric.png             (plugins/pluginGeneric.png)
   skin/classic/mozapps/plugins/pluginBlocked.png             (plugins/pluginBlocked.png)
   skin/classic/mozapps/plugins/pluginGeneric-16.png          (plugins/pluginGeneric-16.png)
   skin/classic/mozapps/profile/profileicon.png               (profile/profileicon.png)
   skin/classic/mozapps/update/updates.css                    (update/updates.css)
   skin/classic/mozapps/viewsource/viewsource.css             (viewsource/viewsource.css)
   skin/classic/mozapps/downloads/downloadButtons-XP.png      (downloads/downloadButtons-XP.png)
   skin/classic/mozapps/downloads/downloadIcon-XP.png         (downloads/downloadIcon-XP.png)
deleted file mode 100644
index ac135b847e2e2ba2177e57ddbf7ea59558f20ce2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 0fb69f3828a44b4d76adedcb61b17994dc6dd26b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index b5e8afefca4b4b4adfa8ebe2d528e3c68bfbb3a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001