Bug 1698035 - De-duplicate 16x16 icons re-packaged in browser/themes/shared/preferences directory. r=preferences-reviewers,Gijs

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

browser/themes/shared/jar.inc.mn

@@ -112,28 +112,22 @@
   skin/classic/browser/protections/new-feature.svg             (../shared/protections/new-feature.svg)
 
   skin/classic/browser/preferences/android-menu.svg            (../shared/preferences/android-menu.svg)
-  skin/classic/browser/preferences/bookmark.svg                (../shared/preferences/bookmark.svg)
   skin/classic/browser/preferences/category-experiments.svg    (../shared/preferences/category-experiments.svg)
   skin/classic/browser/preferences/category-general.svg        (../shared/preferences/category-general.svg)
   skin/classic/browser/preferences/category-search.svg         (../shared/preferences/category-search.svg)
   skin/classic/browser/preferences/category-sync.svg           (../shared/preferences/category-sync.svg)
   skin/classic/browser/preferences/critters-postcard.jpg       (../shared/preferences/critters-postcard.jpg)
-  skin/classic/browser/preferences/extensions.svg              (../shared/preferences/extensions.svg)
   skin/classic/browser/preferences/face-sad.svg                (../shared/preferences/face-sad.svg)
   skin/classic/browser/preferences/face-smile.svg              (../shared/preferences/face-smile.svg)
-  skin/classic/browser/preferences/formfill.svg                (../shared/preferences/formfill.svg)
   skin/classic/browser/preferences/fxaPairDevice.css           (../shared/preferences/fxaPairDevice.css)
-  skin/classic/browser/preferences/history.svg                 (../shared/preferences/history.svg)
   skin/classic/browser/preferences/ios-menu.svg                (../shared/preferences/ios-menu.svg)
   skin/classic/browser/preferences/no-search-bar.svg           (../shared/preferences/no-search-bar.svg)
   skin/classic/browser/preferences/no-search-results.svg       (../shared/preferences/no-search-results.svg)
-  skin/classic/browser/preferences/preferences.svg             (../shared/preferences/preferences.svg)
   skin/classic/browser/preferences/privacy.css                 (../shared/preferences/privacy.css)
   skin/classic/browser/preferences/search-arrow-indicator.svg  (../shared/preferences/search-arrow-indicator.svg)
   skin/classic/browser/preferences/search-bar.svg              (../shared/preferences/search-bar.svg)
   skin/classic/browser/preferences/search.css                  (../shared/preferences/search.css)
   skin/classic/browser/preferences/siteDataSettings.css        (../shared/preferences/siteDataSettings.css)
-  skin/classic/browser/preferences/tab.svg                     (../shared/preferences/tab.svg)
 * skin/classic/browser/preferences/containers.css              (../shared/preferences/containers.css)
 * skin/classic/browser/preferences/containers-dialog.css       (../shared/preferences/containers-dialog.css)
   skin/classic/browser/fxa/fxa-spinner.svg                     (../shared/fxa/fxa-spinner.svg)

browser/themes/shared/preferences/bookmark.svg

@@ -1,4 +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="16" height="16" viewBox="0 0 16 16"><path fill="context-fill" d="M15.845 6.064A1.1 1.1 0 0 0 15 5.331L10.911 4.6 8.985.735a1.1 1.1 0 0 0-1.969 0L5.089 4.6l-4.081.729a1.1 1.1 0 0 0-.615 1.834L3.32 10.31l-.609 4.36a1.1 1.1 0 0 0 1.6 1.127L8 13.873l3.69 1.927a1.1 1.1 0 0 0 1.6-1.127l-.61-4.363 2.926-3.146a1.1 1.1 0 0 0 .239-1.1z"></path></svg>

browser/themes/shared/preferences/extensions.svg

@@ -1,4 +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="16" height="16" viewBox="0 0 16 16"><path fill="context-fill" d="M14.5 8c-.971 0-1 1-1.75 1a.765.765 0 0 1-.75-.75V5a1 1 0 0 0-1-1H7.75A.765.765 0 0 1 7 3.25c0-.75 1-.779 1-1.75C8 .635 7.1 0 6 0S4 .635 4 1.5c0 .971 1 1 1 1.75a.765.765 0 0 1-.75.75H1a1 1 0 0 0-1 1v2.25A.765.765 0 0 0 .75 8c.75 0 .779-1 1.75-1C3.365 7 4 7.9 4 9s-.635 2-1.5 2c-.971 0-1-1-1.75-1a.765.765 0 0 0-.75.75V15a1 1 0 0 0 1 1h3.25a.765.765 0 0 0 .75-.75c0-.75-1-.779-1-1.75 0-.865.9-1.5 2-1.5s2 .635 2 1.5c0 .971-1 1-1 1.75a.765.765 0 0 0 .75.75H11a1 1 0 0 0 1-1v-3.25a.765.765 0 0 1 .75-.75c.75 0 .779 1 1.75 1 .865 0 1.5-.9 1.5-2s-.635-2-1.5-2z"></path></svg>

browser/themes/shared/preferences/formfill.svg

@@ -1,4 +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="16" height="16" viewBox="0 0 16 16"><g fill="context-fill"><path d="M7.281 5H8.75A.25.25 0 0 0 9 4.75V.984a.984.984 0 0 0-1.969 0V4.75a.25.25 0 0 0 .25.25z"></path><path d="M13.5 2H11a1 1 0 0 0 0 2h2.5a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-.5.5h-11a.5.5 0 0 1-.5-.5v-7a.5.5 0 0 1 .5-.5H5a1 1 0 0 0 0-2H2.5A2.5 2.5 0 0 0 0 4.5v7A2.5 2.5 0 0 0 2.5 14h11a2.5 2.5 0 0 0 2.5-2.5v-7A2.5 2.5 0 0 0 13.5 2z"></path><rect x="3" y="6" width="4" height="4" rx=".577" ry=".577"></rect><path d="M9.5 7h3a.5.5 0 0 0 0-1h-3a.5.5 0 0 0 0 1zm0 1a.5.5 0 0 0 0 1h2a.5.5 0 0 0 0-1z"></path></g></svg>

browser/themes/shared/preferences/history.svg

@@ -1,4 +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="16" height="16" viewBox="0 0 16 16"><path fill="context-fill" d="M8 0a8 8 0 1 0 8 8 8.009 8.009 0 0 0-8-8zm0 14a6 6 0 1 1 6-6 6.007 6.007 0 0 1-6 6zm3.5-6H8V4.5a.5.5 0 0 0-1 0v4a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 0-1z"></path></svg>

browser/themes/shared/preferences/preferences.inc.css

@@ -771,17 +771,17 @@ dialog > .sync-engines-list + hbox {
 
 .sync-engine-bookmarks .checkbox-icon,
 .sync-engine-bookmarks.sync-engine-image {
-  list-style-image: url("chrome://browser/skin/preferences/bookmark.svg");
+  list-style-image: url("chrome://browser/skin/bookmark.svg");
 }
 
 .sync-engine-history .checkbox-icon,
 .sync-engine-history.sync-engine-image {
-  list-style-image: url("chrome://browser/skin/preferences/history.svg");
+  list-style-image: url("chrome://browser/skin/history.svg");
 }
 
 .sync-engine-tabs .checkbox-icon,
 .sync-engine-tabs.sync-engine-image {
-  list-style-image: url("chrome://browser/skin/preferences/tab.svg");
+  list-style-image: url("chrome://browser/skin/tab.svg");
 }
 
 .sync-engine-passwords .checkbox-icon,
@@ -791,17 +791,17 @@ dialog > .sync-engines-list + hbox {
 
 .sync-engine-addons .checkbox-icon,
 .sync-engine-addons.sync-engine-image {
-  list-style-image: url("chrome://browser/skin/preferences/extensions.svg");
+  list-style-image: url("chrome://mozapps/skin/extensions/extension.svg");
 }
 
 .sync-engine-prefs .checkbox-icon,
 .sync-engine-prefs.sync-engine-image {
-  list-style-image: url("chrome://browser/skin/preferences/preferences.svg");
+  list-style-image: url("chrome://global/skin/icons/settings.svg");
 }
 
 .sync-engine-addresses .checkbox-icon,
 .sync-engine-addresses.sync-engine-image {
-  list-style-image: url("chrome://browser/skin/preferences/formfill.svg");
+  list-style-image: url("chrome://formautofill/content/formfill-anchor.svg");
 }
 
 .sync-engine-creditcards .checkbox-icon,

browser/themes/shared/preferences/preferences.svg

@@ -1,4 +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="16" height="16" viewBox="0 0 16 16"><path fill="context-fill" d="M15 7h-2.1a4.967 4.967 0 0 0-.732-1.753l1.49-1.49a1 1 0 0 0-1.414-1.414l-1.49 1.49A4.968 4.968 0 0 0 9 3.1V1a1 1 0 0 0-2 0v2.1a4.968 4.968 0 0 0-1.753.732l-1.49-1.49a1 1 0 0 0-1.414 1.415l1.49 1.49A4.967 4.967 0 0 0 3.1 7H1a1 1 0 0 0 0 2h2.1a4.968 4.968 0 0 0 .737 1.763c-.014.013-.032.017-.045.03l-1.45 1.45a1 1 0 1 0 1.414 1.414l1.45-1.45c.013-.013.018-.031.03-.045A4.968 4.968 0 0 0 7 12.9V15a1 1 0 0 0 2 0v-2.1a4.968 4.968 0 0 0 1.753-.732l1.49 1.49a1 1 0 0 0 1.414-1.414l-1.49-1.49A4.967 4.967 0 0 0 12.9 9H15a1 1 0 0 0 0-2zM5 8a3 3 0 1 1 3 3 3 3 0 0 1-3-3z"></path></svg>

browser/themes/shared/preferences/tab.svg

@@ -1,4 +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="16" height="16" viewBox="0 0 16 16"><path fill="context-fill" d="M15 11h-1V5a2 2 0 0 0-2-2H4a2 2 0 0 0-2 2v6H1a1 1 0 0 0 0 2h14a1 1 0 1 0 0-2z"></path></svg>