Bug 1531214 - Update remaining library icons to SVG. r=dao

Differential Revision: https://phabricator.services.mozilla.com/D27011

--HG--
extra : moz-landing-system : lando

browser/themes/linux/jar.mn

@@ -23,7 +23,6 @@ browser.jar:
   skin/classic/browser/notification-icons/geo-blocked.svg  (notification-icons/geo-blocked.svg)
   skin/classic/browser/notification-icons/geo-detailed.svg (notification-icons/geo-detailed.svg)
   skin/classic/browser/notification-icons/geo.svg          (notification-icons/geo.svg)
-  skin/classic/browser/places/allBookmarks.png        (places/allBookmarks.png)
   skin/classic/browser/places/editBookmark.css        (places/editBookmark.css)
 * skin/classic/browser/places/sidebar.css             (places/sidebar.css)
   skin/classic/browser/places/organizer.css           (places/organizer.css)

browser/themes/osx/jar.mn

@@ -21,10 +21,8 @@ browser.jar:
   skin/classic/browser/monitor-border.png
   skin/classic/browser/notification-icons/geo-blocked.svg  (notification-icons/geo-blocked.svg)
   skin/classic/browser/notification-icons/geo.svg          (notification-icons/geo.svg)
-  skin/classic/browser/places/allBookmarks.png              (places/allBookmarks.png)
 * skin/classic/browser/places/sidebar.css                   (places/sidebar.css)
   skin/classic/browser/places/organizer.css                 (places/organizer.css)
-  skin/classic/browser/places/toolbar.png                   (places/toolbar.png)
   skin/classic/browser/places/toolbarDropMarker.png         (places/toolbarDropMarker.png)
   skin/classic/browser/places/editBookmark.css              (places/editBookmark.css)
   skin/classic/browser/preferences/alwaysAsk.png            (preferences/alwaysAsk.png)

browser/themes/osx/places/organizer.css

@@ -70,7 +70,6 @@
 }
 
 #placesToolbar > toolbarbutton {
-  list-style-image: url("chrome://browser/skin/places/toolbar.png");
   margin: 4px 4px 5px;
   padding: 0;
   height: 22px;
@@ -78,6 +77,9 @@
 }
 
 #placesToolbar > toolbarbutton > .toolbarbutton-icon {
+  -moz-context-properties: fill, fill-opacity;
+  fill: currentColor;
+  fill-opacity: 0.8;
   margin: 1px 4px;
 }
 
@@ -88,7 +90,6 @@
 #placesToolbar > toolbarbutton[type="menu"] > .toolbarbutton-menu-dropmarker {
   list-style-image: url(chrome://global/skin/icons/arrow-dropdown-12.svg);
   padding: 0;
-  margin-top: 1px;
   margin-inline-end: 2px;
 }
 
@@ -109,41 +110,45 @@
 }
 
 /* back and forward button */
-#back-button:-moz-locale-dir(ltr),
-#forward-button:-moz-locale-dir(rtl) {
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-  margin-right: 0;
+#back-button,
+#forward-button {
+  list-style-image: url("chrome://browser/skin/arrow-left.svg");
 }
 
-#forward-button:-moz-locale-dir(ltr),
-#back-button:-moz-locale-dir(rtl) {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
-  margin-left: 0;
+#back-button {
+  margin-inline-end: 0 !important; /* override margin from #placesToolbar > toolbarbutton */
+}
+
+#forward-button {
+  margin-inline-start: 0 !important; /* override margin from #placesToolbar > toolbarbutton */
+}
+
+#back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
+#forward-button:-moz-locale-dir(ltr) > .toolbarbutton-icon {
+  transform: scaleX(-1);
 }
 
 #back-button > .toolbarbutton-icon {
-  margin-inline-start: 3px !important;
-  margin-inline-end: 2px !important;
+  margin-inline: 3px 2px !important;
 }
 
 #forward-button > .toolbarbutton-icon {
-  margin-inline-start: 2px !important;
-  margin-inline-end: 3px !important;
+  margin-inline: 2px 3px !important;
 }
 
 /* organize button */
 #organizeButton {
-  -moz-image-region: rect(0px, 48px, 16px, 32px);
+  list-style-image: url("chrome://browser/skin/settings.svg");
 }
 
 /* view button */
 #viewMenu {
-  -moz-image-region: rect(0px, 64px, 16px, 48px);
+  list-style-image: url("chrome://browser/skin/sort.svg");
 }
 
 /* maintenance button */
 #maintenanceButton {
-  -moz-image-region: rect(0px, 80px, 16px, 64px);
+  list-style-image: url("chrome://browser/skin/import-export.svg");
 }
 
 /* Root View */

browser/themes/shared/icons/import-export.svg

@@ -0,0 +1,6 @@
+<!-- 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="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M8.71 3.29l-3-3a1 1 0 0 0-.33-.21 1 1 0 0 0-.76 0 1 1 0 0 0-.33.21l-3 3a1 1 0 0 0 1.42 1.42L4 3.41V9a1 1 0 0 0 2 0V3.41l1.29 1.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zm6 8a1 1 0 0 0-1.42 0L12 12.59V7a1 1 0 0 0-2 0v5.59l-1.29-1.3a1 1 0 1 0-1.42 1.42l3 3a1 1 0 0 0 .33.21.94.94 0 0 0 .76 0 1 1 0 0 0 .33-.21l3-3a1 1 0 0 0 0-1.42z"/>
+</svg>

browser/themes/shared/icons/sort.svg

@@ -0,0 +1,6 @@
+<!-- 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="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M11 7H5a1 1 0 0 0 0 2h6a1 1 0 0 0 0-2zm-3 4H5a1 1 0 0 0 0 2h3a1 1 0 0 0 0-2zm6-8H5a1 1 0 0 0 0 2h9a1 1 0 0 0 0-2zM2 3a1 1 0 1 0 1 1 1 1 0 0 0-1-1zm0 4a1 1 0 1 0 1 1 1 1 0 0 0-1-1zm0 4a1 1 0 1 0 1 1 1 1 0 0 0-1-1z"/>
+</svg>

browser/themes/shared/jar.inc.mn

@@ -132,7 +132,7 @@
   skin/classic/browser/fxa/fxa-spinner.svg                     (../shared/fxa/fxa-spinner.svg)
   skin/classic/browser/fxa/sync-illustration.svg               (../shared/fxa/sync-illustration.svg)
   skin/classic/browser/fxa/sync-illustration-issue.svg         (../shared/fxa/sync-illustration-issue.svg)
-  
+
   skin/classic/browser/fxa/avatar.svg                          (../shared/fxa/avatar.svg)
   skin/classic/browser/fxa/avatar-confirm.svg                  (../shared/fxa/avatar-confirm.svg)
   skin/classic/browser/fxa/avatar-empty.svg                    (../shared/fxa/avatar-empty.svg)
@@ -150,6 +150,7 @@
   skin/classic/browser/bookmark-animation.svg         (../shared/icons/bookmark-animation.svg)
   skin/classic/browser/bookmark-hollow.svg            (../shared/icons/bookmark-hollow.svg)
   skin/classic/browser/bookmark-star-on-tray.svg      (../shared/icons/bookmark-star-on-tray.svg)
+  skin/classic/browser/bookmarks-toolbar.svg          (../shared/icons/bookmarks-toolbar.svg)
   skin/classic/browser/characterEncoding.svg          (../shared/icons/characterEncoding.svg)
   skin/classic/browser/chevron.svg                    (../shared/icons/chevron.svg)
   skin/classic/browser/chevron-animation.svg          (../shared/icons/chevron-animation.svg)
@@ -169,6 +170,9 @@
   skin/classic/browser/fullscreen-exit.svg            (../shared/icons/fullscreen-exit.svg)
   skin/classic/browser/history.svg                    (../shared/icons/history.svg)
   skin/classic/browser/home.svg                       (../shared/icons/home.svg)
+#ifndef XP_LINUX
+  skin/classic/browser/import-export.svg              (../shared/icons/import-export.svg)
+#endif
   skin/classic/browser/library.svg                    (../shared/icons/library.svg)
   skin/classic/browser/library-bookmark-animation.svg (../shared/icons/library-bookmark-animation.svg)
   skin/classic/browser/library-pocket-animation.svg   (../shared/icons/library-pocket-animation.svg)
@@ -197,13 +201,15 @@
   skin/classic/browser/settings.svg                   (../shared/icons/settings.svg)
   skin/classic/browser/sidebars.svg                   (../shared/icons/sidebars.svg)
   skin/classic/browser/sidebars-right.svg             (../shared/icons/sidebars-right.svg)
+#ifndef XP_LINUX
+  skin/classic/browser/sort.svg                       (../shared/icons/sort.svg)
+#endif
   skin/classic/browser/stop.svg                       (../shared/icons/stop.svg)
   skin/classic/browser/stop-to-reload.svg             (../shared/icons/stop-to-reload.svg)
   skin/classic/browser/sync.svg                       (../shared/icons/sync.svg)
   skin/classic/browser/tab.svg                        (../shared/icons/tab.svg)
   skin/classic/browser/undo.svg                       (../shared/icons/undo.svg)
   skin/classic/browser/unpin-tab.svg                  (../shared/icons/unpin-tab.svg)
-  skin/classic/browser/bookmarks-toolbar.svg          (../shared/icons/bookmarks-toolbar.svg)
   skin/classic/browser/webIDE.svg                     (../shared/icons/webIDE.svg)
   skin/classic/browser/window.svg                     (../shared/icons/window.svg)
   skin/classic/browser/zoom-in.svg                    (../shared/icons/zoom-in.svg)

browser/themes/shared/menupanel.inc.css

@@ -127,11 +127,11 @@
   list-style-image: url("chrome://browser/skin/bookmarks-toolbar.svg");
 }
 
-#appMenu-library-bookmarks-button,
 #panelMenuBookmarkThisPage {
   list-style-image: url("chrome://browser/skin/bookmark-hollow.svg");
 }
 
+#appMenu-library-bookmarks-button,
 #panelMenuBookmarkThisPage[starred] {
   list-style-image: url("chrome://browser/skin/bookmark.svg");
 }

browser/themes/shared/places/tree-icons.css

@@ -45,7 +45,7 @@ treechildren::-moz-tree-image(query) {
 }
 
 treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) {
-  list-style-image: url("chrome://browser/skin/places/allBookmarks.png");
+  list-style-image: url("chrome://browser/skin/bookmark.svg");
 }
 
 treechildren::-moz-tree-image(query, OrganizerQuery_downloads__v) {

browser/themes/windows/jar.mn

@@ -27,8 +27,6 @@ browser.jar:
 * skin/classic/browser/places/organizer.css                    (places/organizer.css)
   skin/classic/browser/places/toolbarDropMarker.png            (places/toolbarDropMarker.png)
   skin/classic/browser/places/editBookmark.css                 (places/editBookmark.css)
-  skin/classic/browser/places/libraryToolbar.png               (places/libraryToolbar.png)
-  skin/classic/browser/places/allBookmarks.png                 (places/allBookmarks.png)
   skin/classic/browser/preferences/alwaysAsk.png               (preferences/alwaysAsk.png)
   skin/classic/browser/preferences/application.png             (preferences/application.png)
   skin/classic/browser/preferences/saveFile.png                (preferences/saveFile.png)

browser/themes/windows/places/organizer.css

@@ -8,15 +8,14 @@
   padding-inline-end: 6px;
 }
 
-#placesToolbar > toolbarbutton[disabled] > .toolbarbutton-icon {
-  opacity: .4;
+#placesToolbar > toolbarbutton > .toolbarbutton-icon {
+  -moz-context-properties: fill, fill-opacity;
+  fill: currentColor;
+  fill-opacity: 0.8;
 }
 
-#back-button > .toolbarbutton-icon,
-#forward-button > .toolbarbutton-icon {
-  -moz-context-properties: fill;
-  fill: currentcolor;
-  opacity: 0.65;
+#placesToolbar > toolbarbutton[disabled] > .toolbarbutton-icon {
+  opacity: .4;
 }
 
 #back-button {
@@ -75,38 +74,19 @@
   background-position: left center;
 }
 
-/* organize, view and maintenance buttons icons */
-#organizeButton,
-#viewMenu,
-#maintenanceButton {
-  list-style-image: url("chrome://browser/skin/places/libraryToolbar.png");
-}
-
 /* organize button */
 #organizeButton {
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-#organizeButton:hover,
-#organizeButton[open="true"] {
-  -moz-image-region: rect(16px, 16px, 32px, 0px);
+  list-style-image: url("chrome://browser/skin/settings.svg");
 }
 
 /* view button */
 #viewMenu {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-#viewMenu:hover,
-#viewMenu[open="true"] {
-  -moz-image-region: rect(16px, 32px, 32px, 16px);
+  list-style-image: url("chrome://browser/skin/sort.svg");
 }
 
 /* maintenance button */
 #maintenanceButton {
-  -moz-image-region: rect(0px, 48px, 16px, 32px);
-}
-#maintenanceButton:hover,
-#maintenanceButton[open="true"] {
-  -moz-image-region: rect(16px, 48px, 32px, 32px);
+  list-style-image: url("chrome://browser/skin/import-export.svg");
 }
 
 /* Info box */