Bug 1630615 - Remove duplicate settings icons. r=dao
authorTim Nguyen <ntim.bugs@gmail.com>
Thu, 16 Apr 2020 18:48:33 +0000
changeset 524469 4caa42b4c8165d6fb90ad244c09210f6576f71a3
parent 524468 feaa9875d5c74420810fdd6c79cbd1e78166760f
child 524470 c424381097d7cd4e386939977dbcde0cf940e601
push id113207
push userntim.bugs@gmail.com
push dateThu, 16 Apr 2020 19:01:36 +0000
treeherderautoland@4caa42b4c816 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs1630615
milestone77.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1630615 - Remove duplicate settings icons. r=dao Differential Revision: https://phabricator.services.mozilla.com/D71185
browser/components/aboutlogins/content/components/menu-button.css
browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSPrivacyModal/_DSPrivacyModal.scss
browser/components/newtab/content-src/styles/_icons.scss
browser/components/newtab/css/activity-stream-linux.css
browser/components/newtab/css/activity-stream-mac.css
browser/components/newtab/css/activity-stream-windows.css
browser/components/preferences/in-content/preferences.xhtml
browser/components/protections/content/protections.css
browser/themes/osx/places/organizer.css
browser/themes/shared/controlcenter/panel.inc.css
browser/themes/shared/icons/settings.svg
browser/themes/shared/jar.inc.mn
browser/themes/shared/menupanel.inc.css
browser/themes/shared/searchbar.inc.css
browser/themes/shared/toolbarbutton-icons.inc.css
browser/themes/windows/places/organizer.css
browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm
toolkit/mozapps/extensions/content/aboutaddons.css
toolkit/themes/shared/alert.inc.css
toolkit/themes/shared/extensions/utilities.svg
toolkit/themes/shared/icons/settings.svg
toolkit/themes/shared/in-content/common.inc.css
toolkit/themes/shared/jar.inc.mn
toolkit/themes/shared/mozapps.inc.mn
--- a/browser/components/aboutlogins/content/components/menu-button.css
+++ b/browser/components/aboutlogins/content/components/menu-button.css
@@ -66,17 +66,17 @@
   background-image: url("chrome://global/skin/icons/help.svg");
 }
 
 .menuitem-import {
   background-image: url("chrome://browser/skin/import.svg");
 }
 
 .menuitem-preferences {
-  background-image: url("chrome://browser/skin/settings.svg");
+  background-image: url("chrome://global/skin/icons/settings.svg");
 }
 
 .menuitem-mobile-ios {
   background-image: url("chrome://browser/skin/logo-ios.svg");
 }
 
 .menuitem-mobile-android {
   background-image: url("chrome://browser/skin/logo-android.svg");
--- a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSPrivacyModal/_DSPrivacyModal.scss
+++ b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSPrivacyModal/_DSPrivacyModal.scss
@@ -27,17 +27,17 @@
       background-size: 16px;
     }
 
     &.modal-link-privacy::before {
       background-image: url('../data/content/assets/glyph-info-16.svg');
     }
 
     &.modal-link-manage::before {
-      background-image: url('chrome://browser/skin/settings.svg');
+      background-image: url('chrome://global/skin/icons/settings.svg');
     }
   }
 
   p {
     line-height: 24px;
   }
 
   .privacy-notice {
--- a/browser/components/newtab/content-src/styles/_icons.scss
+++ b/browser/components/newtab/content-src/styles/_icons.scss
@@ -70,17 +70,17 @@
     background-image: url('#{$image-path}glyph-newWindow-16.svg');
   }
 
   &.icon-new-window-private {
     background-image: url('chrome://browser/skin/privateBrowsing.svg');
   }
 
   &.icon-settings {
-    background-image: url('chrome://browser/skin/settings.svg');
+    background-image: url('chrome://global/skin/icons/settings.svg');
   }
 
   &.icon-pin {
     @include flip-icon;
     background-image: url('#{$image-path}glyph-pin-16.svg');
   }
 
   &.icon-unpin {
--- a/browser/components/newtab/css/activity-stream-linux.css
+++ b/browser/components/newtab/css/activity-stream-linux.css
@@ -177,17 +177,17 @@ body {
     background-image: url("../data/content/assets/glyph-info-16.svg"); }
   .icon.icon-new-window {
     background-image: url("../data/content/assets/glyph-newWindow-16.svg"); }
     .icon.icon-new-window:dir(rtl) {
       transform: scaleX(-1); }
   .icon.icon-new-window-private {
     background-image: url("chrome://browser/skin/privateBrowsing.svg"); }
   .icon.icon-settings {
-    background-image: url("chrome://browser/skin/settings.svg"); }
+    background-image: url("chrome://global/skin/icons/settings.svg"); }
   .icon.icon-pin {
     background-image: url("../data/content/assets/glyph-pin-16.svg"); }
     .icon.icon-pin:dir(rtl) {
       transform: scaleX(-1); }
   .icon.icon-unpin {
     background-image: url("../data/content/assets/glyph-unpin-16.svg"); }
     .icon.icon-unpin:dir(rtl) {
       transform: scaleX(-1); }
@@ -3211,17 +3211,17 @@ main {
     margin: 0;
     margin-inline-end: 8px;
     background-position: center center;
     background-repeat: no-repeat;
     background-size: 16px; }
   .ds-privacy-modal .modal-link.modal-link-privacy::before {
     background-image: url("../data/content/assets/glyph-info-16.svg"); }
   .ds-privacy-modal .modal-link.modal-link-manage::before {
-    background-image: url("chrome://browser/skin/settings.svg"); }
+    background-image: url("chrome://global/skin/icons/settings.svg"); }
 
 .ds-privacy-modal p {
   line-height: 24px; }
 
 .ds-privacy-modal .privacy-notice {
   max-width: 572px;
   padding: 40px;
   margin: auto; }
--- a/browser/components/newtab/css/activity-stream-mac.css
+++ b/browser/components/newtab/css/activity-stream-mac.css
@@ -180,17 +180,17 @@ body {
     background-image: url("../data/content/assets/glyph-info-16.svg"); }
   .icon.icon-new-window {
     background-image: url("../data/content/assets/glyph-newWindow-16.svg"); }
     .icon.icon-new-window:dir(rtl) {
       transform: scaleX(-1); }
   .icon.icon-new-window-private {
     background-image: url("chrome://browser/skin/privateBrowsing.svg"); }
   .icon.icon-settings {
-    background-image: url("chrome://browser/skin/settings.svg"); }
+    background-image: url("chrome://global/skin/icons/settings.svg"); }
   .icon.icon-pin {
     background-image: url("../data/content/assets/glyph-pin-16.svg"); }
     .icon.icon-pin:dir(rtl) {
       transform: scaleX(-1); }
   .icon.icon-unpin {
     background-image: url("../data/content/assets/glyph-unpin-16.svg"); }
     .icon.icon-unpin:dir(rtl) {
       transform: scaleX(-1); }
@@ -3214,17 +3214,17 @@ main {
     margin: 0;
     margin-inline-end: 8px;
     background-position: center center;
     background-repeat: no-repeat;
     background-size: 16px; }
   .ds-privacy-modal .modal-link.modal-link-privacy::before {
     background-image: url("../data/content/assets/glyph-info-16.svg"); }
   .ds-privacy-modal .modal-link.modal-link-manage::before {
-    background-image: url("chrome://browser/skin/settings.svg"); }
+    background-image: url("chrome://global/skin/icons/settings.svg"); }
 
 .ds-privacy-modal p {
   line-height: 24px; }
 
 .ds-privacy-modal .privacy-notice {
   max-width: 572px;
   padding: 40px;
   margin: auto; }
--- a/browser/components/newtab/css/activity-stream-windows.css
+++ b/browser/components/newtab/css/activity-stream-windows.css
@@ -177,17 +177,17 @@ body {
     background-image: url("../data/content/assets/glyph-info-16.svg"); }
   .icon.icon-new-window {
     background-image: url("../data/content/assets/glyph-newWindow-16.svg"); }
     .icon.icon-new-window:dir(rtl) {
       transform: scaleX(-1); }
   .icon.icon-new-window-private {
     background-image: url("chrome://browser/skin/privateBrowsing.svg"); }
   .icon.icon-settings {
-    background-image: url("chrome://browser/skin/settings.svg"); }
+    background-image: url("chrome://global/skin/icons/settings.svg"); }
   .icon.icon-pin {
     background-image: url("../data/content/assets/glyph-pin-16.svg"); }
     .icon.icon-pin:dir(rtl) {
       transform: scaleX(-1); }
   .icon.icon-unpin {
     background-image: url("../data/content/assets/glyph-unpin-16.svg"); }
     .icon.icon-unpin:dir(rtl) {
       transform: scaleX(-1); }
@@ -3211,17 +3211,17 @@ main {
     margin: 0;
     margin-inline-end: 8px;
     background-position: center center;
     background-repeat: no-repeat;
     background-size: 16px; }
   .ds-privacy-modal .modal-link.modal-link-privacy::before {
     background-image: url("../data/content/assets/glyph-info-16.svg"); }
   .ds-privacy-modal .modal-link.modal-link-manage::before {
-    background-image: url("chrome://browser/skin/settings.svg"); }
+    background-image: url("chrome://global/skin/icons/settings.svg"); }
 
 .ds-privacy-modal p {
   line-height: 24px; }
 
 .ds-privacy-modal .privacy-notice {
   max-width: 572px;
   padding: 40px;
   margin: auto; }
--- a/browser/components/preferences/in-content/preferences.xhtml
+++ b/browser/components/preferences/in-content/preferences.xhtml
@@ -46,17 +46,17 @@
   <link rel="localization" href="browser/preferences/selectBookmark.ftl"/>
   <link rel="localization" href="browser/preferences/siteDataSettings.ftl"/>
   <link rel="localization" href="browser/aboutDialog.ftl"/>
   <link rel="localization" href="browser/sanitize.ftl"/>
   <link rel="localization" href="toolkit/updates/history.ftl"/>
   <link rel="localization" href="security/certificates/deviceManager.ftl"/>
   <link rel="localization" href="security/certificates/certManager.ftl"/>
 
-  <link rel="shortcut icon" href="chrome://browser/skin/settings.svg"/>
+  <link rel="shortcut icon" href="chrome://global/skin/icons/settings.svg"/>
 
   <script src="chrome://browser/content/utilityOverlay.js"/>
   <script src="chrome://global/content/preferencesBindings.js"/>
   <script src="chrome://browser/content/preferences/in-content/preferences.js"/>
   <script src="chrome://browser/content/preferences/in-content/extensionControlled.js"/>
   <script src="chrome://browser/content/preferences/in-content/findInPage.js"/>
   <script src="chrome://browser/content/preferences/in-content/subdialogs.js"/>
 </head>
--- a/browser/components/protections/content/protections.css
+++ b/browser/components/protections/content/protections.css
@@ -229,17 +229,17 @@ a.hidden,
   display: initial;
 }
 
 #protection-details {
   margin-block: 24px 0;
   padding-inline: 24px 3px;
   -moz-context-properties: fill;
   fill: currentColor;
-  background: url("chrome://browser/skin/settings.svg") no-repeat 3px;
+  background: url("chrome://global/skin/icons/settings.svg") no-repeat 3px;
   font-size: 0.75em;
   cursor: default;
   width: max-content;
 }
 
 #protection-details:dir(rtl) {
   background-position-x: right 3px;
 }
--- a/browser/themes/osx/places/organizer.css
+++ b/browser/themes/osx/places/organizer.css
@@ -133,17 +133,17 @@
 }
 
 #forward-button > .toolbarbutton-icon {
   margin-inline: 2px 3px !important;
 }
 
 /* organize button */
 #organizeButton {
-  list-style-image: url("chrome://browser/skin/settings.svg");
+  list-style-image: url("chrome://global/skin/icons/settings.svg");
 }
 
 /* view button */
 #viewMenu {
   list-style-image: url("chrome://browser/skin/sort.svg");
 }
 
 /* maintenance button */
--- a/browser/themes/shared/controlcenter/panel.inc.css
+++ b/browser/themes/shared/controlcenter/panel.inc.css
@@ -1035,17 +1035,17 @@ description#identity-popup-content-verif
 
 .protections-popup-footer-icon {
   -moz-context-properties: fill;
   width: 16px;
   height: 16px;
 }
 
 .protections-popup-settings-icon {
-  list-style-image: url(chrome://browser/skin/settings.svg);
+  list-style-image: url(chrome://global/skin/icons/settings.svg);
 }
 
 .protections-popup-show-report-icon {
   list-style-image: url(chrome://browser/skin/controlcenter/dashboard.svg);
 }
 
 #protections-popup-footer {
   padding: var(--vertical-section-padding) 0;
deleted file mode 100644
--- a/browser/themes/shared/icons/settings.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="16" height="16" viewBox="0 0 16 16">
-  <path fill="context-fill" fill-opacity="context-fill-opacity" 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"/>
-</svg>
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -211,17 +211,16 @@
   skin/classic/browser/privateBrowsing.svg            (../shared/icons/privateBrowsing.svg)
   skin/classic/browser/restore-session.svg            (../shared/icons/restore-session.svg)
   skin/classic/browser/quit.svg                       (../shared/icons/quit.svg)
   skin/classic/browser/reload.svg                     (../shared/icons/reload.svg)
   skin/classic/browser/reload-to-stop.svg             (../shared/icons/reload-to-stop.svg)
   skin/classic/browser/save.svg                       (../shared/icons/save.svg)
   skin/classic/browser/search-glass.svg               (../shared/icons/search-glass.svg)
   skin/classic/browser/send-to-device.svg             (../shared/icons/send-to-device.svg)
-  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)
   skin/classic/browser/sign-out.svg                   (../shared/icons/sign-out.svg)
 #ifndef MOZ_WIDGET_GTK
   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)
--- a/browser/themes/shared/menupanel.inc.css
+++ b/browser/themes/shared/menupanel.inc.css
@@ -27,17 +27,17 @@
 
 #appMenu-addons-button {
   list-style-image: url(chrome://mozapps/skin/extensions/extension.svg);
 }
 
 #PanelUI-fxa-menu-sync-prefs-button,
 #PanelUI-fxa-menu-account-devices-button,
 #appMenu-preferences-button {
-  list-style-image: url(chrome://browser/skin/settings.svg);
+  list-style-image: url(chrome://global/skin/icons/settings.svg);
 }
 
 #appMenu-customize-button {
   list-style-image: url(chrome://browser/skin/customize.svg);
 }
 
 #appMenu-find-button,
 #panelMenu_searchBookmarks {
--- a/browser/themes/shared/searchbar.inc.css
+++ b/browser/themes/shared/searchbar.inc.css
@@ -207,13 +207,13 @@
 }
 
 .search-setting-button:hover,
 .search-setting-button[selected] {
   background-color: var(--arrowpanel-dimmed-further);
 }
 
 .search-setting-button-compact > .button-box > .button-icon {
-  list-style-image: url("chrome://browser/skin/settings.svg");
+  list-style-image: url("chrome://global/skin/icons/settings.svg");
   -moz-context-properties: fill, fill-opacity;
   fill: currentColor;
   fill-opacity: .6;
 }
--- a/browser/themes/shared/toolbarbutton-icons.inc.css
+++ b/browser/themes/shared/toolbarbutton-icons.inc.css
@@ -260,17 +260,17 @@ toolbar[brighttext] {
   list-style-image: url("chrome://devtools/skin/images/profiler-stopwatch.svg");
 }
 
 #PanelUI-profilerIframe {
   width: 450px;
 }
 
 #preferences-button {
-  list-style-image: url("chrome://browser/skin/settings.svg");
+  list-style-image: url("chrome://global/skin/icons/settings.svg");
 }
 
 #PanelUI-menu-button {
   list-style-image: url("chrome://browser/skin/menu.svg");
 }
 
 #PanelUI-menu-button[badge-status="update-available"],
 #PanelUI-menu-button[badge-status="update-manual"],
--- a/browser/themes/windows/places/organizer.css
+++ b/browser/themes/windows/places/organizer.css
@@ -67,17 +67,17 @@
 }
 
 #placesMenu > menu > .menubar-text:-moz-locale-dir(rtl) {
   background-position-x: left;
 }
 
 /* organize button */
 #organizeButton {
-  list-style-image: url("chrome://browser/skin/settings.svg");
+  list-style-image: url("chrome://global/skin/icons/settings.svg");
 }
 
 /* view button */
 #viewMenu {
   list-style-image: url("chrome://browser/skin/sort.svg");
 }
 
 /* maintenance button */
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm
@@ -2,17 +2,17 @@
  * 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/. */
 
 "use strict";
 
 var EXPORTED_SYMBOLS = ["Tabs"];
 
 const CUST_TAB = "chrome://browser/skin/customize.svg";
-const PREFS_TAB = "chrome://browser/skin/settings.svg";
+const PREFS_TAB = "chrome://global/skin/icons/settings.svg";
 const DEFAULT_FAVICON_TAB = `data:text/html,<meta%20charset="utf-8"><title>No%20favicon</title>`;
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 const { TestUtils } = ChromeUtils.import(
@@ -154,17 +154,17 @@ var Tabs = {
 
 async function allTabTitlesDisplayed(browserWindow) {
   let specToTitleMap = {
     "about:home": "New Tab",
     "about:newtab": "New Tab",
     "about:addons": "Add-ons Manager",
     "about:privatebrowsing": "about:privatebrowsing",
   };
-  specToTitleMap[PREFS_TAB] = "browser/skin/settings.svg";
+  specToTitleMap[PREFS_TAB] = "global/skin/icons/settings.svg";
   specToTitleMap[CUST_TAB] = "browser/skin/customize.svg";
   specToTitleMap[DEFAULT_FAVICON_TAB] = "No favicon";
 
   let tabTitlePromises = [];
   for (let tab of browserWindow.gBrowser.tabs) {
     function getSpec() {
       return (
         tab.linkedBrowser &&
--- a/toolkit/mozapps/extensions/content/aboutaddons.css
+++ b/toolkit/mozapps/extensions/content/aboutaddons.css
@@ -339,17 +339,17 @@ addon-card:not([expanded]) .addon-descri
   overflow-x: hidden;
 }
 
 .page-options-menu {
   align-self: center;
 }
 
 .page-options-menu > .more-options-button {
-  background-image: url("chrome://mozapps/skin/extensions/utilities.svg");
+  background-image: url("chrome://global/skin/icons/settings.svg");
   width: 32px;
   height: 32px;
 }
 
 /* Recommended add-ons on list views */
 .recommended-heading {
   margin-bottom: 24px;
   margin-top: 48px;
--- a/toolkit/themes/shared/alert.inc.css
+++ b/toolkit/themes/shared/alert.inc.css
@@ -129,17 +129,17 @@
 }
 
 #alertSettings {
   -moz-appearance: none;
   background-color: transparent;
   border-width: 0;
   border-radius: 20px;
   min-width: 0;
-  list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg");
+  list-style-image: url("chrome://global/skin/icons/settings.svg");
   -moz-context-properties: fill;
   fill: currentColor;
   margin-inline-end: 4px;
   margin-bottom: 0;
 }
 
 #alertSettings > .button-box {
   padding: 0;
rename from toolkit/themes/shared/extensions/utilities.svg
rename to toolkit/themes/shared/icons/settings.svg
--- a/toolkit/themes/shared/extensions/utilities.svg
+++ b/toolkit/themes/shared/icons/settings.svg
@@ -1,6 +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">
-  <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"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path 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"/>
 </svg>
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@@ -1107,21 +1107,21 @@ xul|*.help-icon {
   list-style-image: url("chrome://global/skin/icons/help.svg");
 }
 
 html|*.help-icon {
   background-image: url("chrome://global/skin/icons/help.svg");
 }
 
 .preferences-icon {
-  background-image: url("chrome://browser/skin/preferences/general.svg");
+  background-image: url("chrome://global/skin/icons/settings.svg");
 }
 
 .addons-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.svg");
+  list-style-image: url("chrome://mozapps/skin/extensions/extension.svg");
   /* The add-ons icon doesn't have much (any?) margin, so make it a bit smaller. */
   width: 14px;
   height: 14px;
   margin-inline-start: 15px;
 }
 
 .sidebar-footer-label {
   margin: 0 4px;
--- a/toolkit/themes/shared/jar.inc.mn
+++ b/toolkit/themes/shared/jar.inc.mn
@@ -47,16 +47,17 @@ toolkit.jar:
   skin/classic/global/icons/loading.png                    (../../shared/icons/loading.png)
   skin/classic/global/icons/loading@2x.png                 (../../shared/icons/loading@2x.png)
   skin/classic/global/icons/more.svg                       (../../shared/icons/more.svg)
   skin/classic/global/icons/performance.svg                (../../shared/icons/performance.svg)
   skin/classic/global/pictureinpicture/pause.svg           (../../shared/pictureinpicture/pause.svg)
   skin/classic/global/pictureinpicture/play.svg            (../../shared/pictureinpicture/play.svg)
   skin/classic/global/icons/identity-icon.svg              (../../shared/icons/identity-icon.svg)
   skin/classic/global/icons/resizer.svg                    (../../shared/icons/resizer.svg)
+  skin/classic/global/icons/settings.svg                   (../../shared/icons/settings.svg)
   skin/classic/global/icons/shortcut.svg                   (../../shared/icons/shortcut.svg)
   skin/classic/global/icons/spinner-arrow-down.svg         (../../shared/icons/spinner-arrow-down.svg)
   skin/classic/global/icons/spinner-arrow-up.svg           (../../shared/icons/spinner-arrow-up.svg)
   skin/classic/global/icons/twisty-collapsed.svg           (../../shared/icons/twisty-collapsed.svg)
   skin/classic/global/icons/twisty-collapsed-rtl.svg       (../../shared/icons/twisty-collapsed-rtl.svg)
   skin/classic/global/icons/twisty-expanded.svg            (../../shared/icons/twisty-expanded.svg)
   skin/classic/global/icons/update-icon.svg                (../../shared/icons/update-icon.svg)
   skin/classic/global/icons/arrow-dropdown-12.svg          (../../shared/icons/arrow-dropdown-12.svg)
--- a/toolkit/themes/shared/mozapps.inc.mn
+++ b/toolkit/themes/shared/mozapps.inc.mn
@@ -9,17 +9,16 @@
 
   skin/classic/mozapps/extensions/dictionaryGeneric.svg      (../../shared/extensions/category-dictionaries.svg)
   skin/classic/mozapps/extensions/extensionGeneric.svg       (../../shared/extensions/category-extensions.svg)
   skin/classic/mozapps/extensions/themeGeneric.svg           (../../shared/extensions/category-themes.svg)
   skin/classic/mozapps/extensions/category-discover.svg      (../../shared/extensions/category-discover.svg)
   skin/classic/mozapps/extensions/category-recent.svg        (../../shared/extensions/category-recent.svg)
   skin/classic/mozapps/extensions/category-available.svg     (../../shared/extensions/category-available.svg)
   skin/classic/mozapps/extensions/extension.svg              (../../shared/extensions/extension.svg)
-  skin/classic/mozapps/extensions/utilities.svg              (../../shared/extensions/utilities.svg)
   skin/classic/mozapps/extensions/recommended.svg            (../../shared/extensions/recommended.svg)
 #ifndef ANDROID
   skin/classic/mozapps/extensions/rating-star.svg            (../../shared/extensions/rating-star.svg)
 #endif
 #ifndef ANDROID
   skin/classic/mozapps/aboutProfiles.css                     (../../shared/aboutProfiles.css)
 #endif
   skin/classic/mozapps/aboutServiceWorkers.css               (../../shared/aboutServiceWorkers.css)