Bug 1708502 - De-dupe about:newtab icons. r=thecount

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

browser/components/newtab/content-src/asrouter/components/SnippetBase/_SnippetBase.scss

@@ -59,7 +59,7 @@
     inset-inline-end: 12px;
     height: 16px;
     width: 16px;
-    background-image: url('chrome://activity-stream/content/data/content/assets/glyph-dismiss-16.svg');
+    background-image: url('chrome://global/skin/icons/close.svg');
     -moz-context-properties: fill;
     color: inherit;
     fill: currentColor;

browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSPrivacyModal/_DSPrivacyModal.scss

@@ -28,7 +28,7 @@
     }
 
     &.modal-link-privacy::before {
-      background-image: url('chrome://activity-stream/content/data/content/assets/glyph-info-16.svg');
+      background-image: url('chrome://global/skin/icons/info.svg');
     }
 
     &.modal-link-manage::before {

browser/components/newtab/content-src/components/TopSites/_TopSites.scss

@@ -183,7 +183,7 @@ $letter-fallback-color: $white;
   }
 
   .search-topsite {
-    background-image: url('#{$image-path}glyph-search-16.svg');
+    background-image: url('chrome://global/skin/icons/search-glass.svg');
     background-size: 26px;
     background-color: $blue-60;
     border-radius: $default-icon-wrapper-size;

browser/components/newtab/content-src/styles/_icons.scss

@@ -43,7 +43,7 @@
   }
 
   &.icon-delete {
-    background-image: url('chrome://activity-stream/content/data/content/assets/glyph-delete-16.svg');
+    background-image: url('chrome://global/skin/icons/delete.svg');
   }
 
   &.icon-search {
@@ -63,11 +63,11 @@
   }
 
   &.icon-dismiss {
-    background-image: url('chrome://activity-stream/content/data/content/assets/glyph-dismiss-16.svg');
+    background-image: url('chrome://global/skin/icons/close.svg');
   }
 
   &.icon-info {
-    background-image: url('chrome://activity-stream/content/data/content/assets/glyph-info-16.svg');
+    background-image: url('chrome://global/skin/icons/info.svg');
   }
 
   &.icon-new-window {
@@ -98,11 +98,11 @@
   }
 
   &.icon-pocket {
-    background-image: url('chrome://activity-stream/content/data/content/assets/glyph-pocket-16.svg');
+    background-image: url('chrome://global/skin/icons/pocket.svg');
   }
 
   &.icon-pocket-save {
-    background-image: url('chrome://activity-stream/content/data/content/assets/glyph-pocket-save-16.svg');
+    background-image: url('chrome://browser/skin/pocket-outline.svg');
   }
 
   &.icon-pocket-delete {
@@ -132,7 +132,7 @@
 
   &.icon-pin-small {
     @include flip-icon;
-    background-image: url('chrome://activity-stream/content/data/content/assets/glyph-pin-12.svg');
+    background-image: url('chrome://browser/skin/pin-12.svg');
     background-size: $smaller-icon-size;
     height: $smaller-icon-size;
     width: $smaller-icon-size;
@@ -159,7 +159,7 @@
   }
 
   &.icon-highlights {
-    background-image: url('chrome://activity-stream/content/data/content/assets/glyph-highlights-16.svg');
+    background-image: url('chrome://global/skin/icons/highlights.svg');
   }
 
   &.icon-arrowhead-down {

browser/components/newtab/css/activity-stream-linux.css

@@ -224,7 +224,7 @@ body[lwt-newtab-brighttext] {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-cancel-16.svg");
 }
 .icon.icon-delete {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-delete-16.svg");
+  background-image: url("chrome://global/skin/icons/delete.svg");
 }
 .icon.icon-search {
   background-image: url("chrome://global/skin/icons/search-glass.svg");
@@ -240,10 +240,10 @@ body[lwt-newtab-brighttext] {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-mail-16.svg");
 }
 .icon.icon-dismiss {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-dismiss-16.svg");
+  background-image: url("chrome://global/skin/icons/close.svg");
 }
 .icon.icon-info {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-info-16.svg");
+  background-image: url("chrome://global/skin/icons/info.svg");
 }
 .icon.icon-new-window {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-newWindow-16.svg");
@@ -273,10 +273,10 @@ body[lwt-newtab-brighttext] {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-edit-16.svg");
 }
 .icon.icon-pocket {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-pocket-16.svg");
+  background-image: url("chrome://global/skin/icons/pocket.svg");
 }
 .icon.icon-pocket-save {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-pocket-save-16.svg");
+  background-image: url("chrome://browser/skin/pocket-outline.svg");
 }
 .icon.icon-pocket-delete {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-pocket-delete-16.svg");
@@ -298,7 +298,7 @@ body[lwt-newtab-brighttext] {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-topsites-16.svg");
 }
 .icon.icon-pin-small {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-pin-12.svg");
+  background-image: url("chrome://browser/skin/pin-12.svg");
   background-size: 12px;
   height: 12px;
   width: 12px;
@@ -322,7 +322,7 @@ body[lwt-newtab-brighttext] {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-webextension-16.svg");
 }
 .icon.icon-highlights {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-highlights-16.svg");
+  background-image: url("chrome://global/skin/icons/highlights.svg");
 }
 .icon.icon-arrowhead-down {
   background-image: url("chrome://global/skin/icons/arrow-down.svg");
@@ -786,7 +786,7 @@ main.has-snippet {
   content: attr(data-fallback);
 }
 .top-site-outer .search-topsite {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-search-16.svg");
+  background-image: url("chrome://global/skin/icons/search-glass.svg");
   background-size: 26px;
   background-color: #0060DF;
   border-radius: 42px;
@@ -4754,7 +4754,7 @@ main.has-snippet {
   background-size: 16px;
 }
 .ds-privacy-modal .modal-link.modal-link-privacy::before {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-info-16.svg");
+  background-image: url("chrome://global/skin/icons/info.svg");
 }
 .ds-privacy-modal .modal-link.modal-link-manage::before {
   background-image: url("chrome://global/skin/icons/settings.svg");
@@ -4897,7 +4897,7 @@ main.has-snippet {
   inset-inline-end: 12px;
   height: 16px;
   width: 16px;
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-dismiss-16.svg");
+  background-image: url("chrome://global/skin/icons/close.svg");
   -moz-context-properties: fill;
   color: inherit;
   fill: currentColor;

browser/components/newtab/css/activity-stream-mac.css

@@ -228,7 +228,7 @@ body[lwt-newtab-brighttext] {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-cancel-16.svg");
 }
 .icon.icon-delete {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-delete-16.svg");
+  background-image: url("chrome://global/skin/icons/delete.svg");
 }
 .icon.icon-search {
   background-image: url("chrome://global/skin/icons/search-glass.svg");
@@ -244,10 +244,10 @@ body[lwt-newtab-brighttext] {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-mail-16.svg");
 }
 .icon.icon-dismiss {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-dismiss-16.svg");
+  background-image: url("chrome://global/skin/icons/close.svg");
 }
 .icon.icon-info {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-info-16.svg");
+  background-image: url("chrome://global/skin/icons/info.svg");
 }
 .icon.icon-new-window {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-newWindow-16.svg");
@@ -277,10 +277,10 @@ body[lwt-newtab-brighttext] {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-edit-16.svg");
 }
 .icon.icon-pocket {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-pocket-16.svg");
+  background-image: url("chrome://global/skin/icons/pocket.svg");
 }
 .icon.icon-pocket-save {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-pocket-save-16.svg");
+  background-image: url("chrome://browser/skin/pocket-outline.svg");
 }
 .icon.icon-pocket-delete {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-pocket-delete-16.svg");
@@ -302,7 +302,7 @@ body[lwt-newtab-brighttext] {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-topsites-16.svg");
 }
 .icon.icon-pin-small {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-pin-12.svg");
+  background-image: url("chrome://browser/skin/pin-12.svg");
   background-size: 12px;
   height: 12px;
   width: 12px;
@@ -326,7 +326,7 @@ body[lwt-newtab-brighttext] {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-webextension-16.svg");
 }
 .icon.icon-highlights {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-highlights-16.svg");
+  background-image: url("chrome://global/skin/icons/highlights.svg");
 }
 .icon.icon-arrowhead-down {
   background-image: url("chrome://global/skin/icons/arrow-down.svg");
@@ -790,7 +790,7 @@ main.has-snippet {
   content: attr(data-fallback);
 }
 .top-site-outer .search-topsite {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-search-16.svg");
+  background-image: url("chrome://global/skin/icons/search-glass.svg");
   background-size: 26px;
   background-color: #0060DF;
   border-radius: 42px;
@@ -4758,7 +4758,7 @@ main.has-snippet {
   background-size: 16px;
 }
 .ds-privacy-modal .modal-link.modal-link-privacy::before {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-info-16.svg");
+  background-image: url("chrome://global/skin/icons/info.svg");
 }
 .ds-privacy-modal .modal-link.modal-link-manage::before {
   background-image: url("chrome://global/skin/icons/settings.svg");
@@ -4901,7 +4901,7 @@ main.has-snippet {
   inset-inline-end: 12px;
   height: 16px;
   width: 16px;
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-dismiss-16.svg");
+  background-image: url("chrome://global/skin/icons/close.svg");
   -moz-context-properties: fill;
   color: inherit;
   fill: currentColor;

browser/components/newtab/css/activity-stream-windows.css

@@ -224,7 +224,7 @@ body[lwt-newtab-brighttext] {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-cancel-16.svg");
 }
 .icon.icon-delete {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-delete-16.svg");
+  background-image: url("chrome://global/skin/icons/delete.svg");
 }
 .icon.icon-search {
   background-image: url("chrome://global/skin/icons/search-glass.svg");
@@ -240,10 +240,10 @@ body[lwt-newtab-brighttext] {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-mail-16.svg");
 }
 .icon.icon-dismiss {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-dismiss-16.svg");
+  background-image: url("chrome://global/skin/icons/close.svg");
 }
 .icon.icon-info {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-info-16.svg");
+  background-image: url("chrome://global/skin/icons/info.svg");
 }
 .icon.icon-new-window {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-newWindow-16.svg");
@@ -273,10 +273,10 @@ body[lwt-newtab-brighttext] {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-edit-16.svg");
 }
 .icon.icon-pocket {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-pocket-16.svg");
+  background-image: url("chrome://global/skin/icons/pocket.svg");
 }
 .icon.icon-pocket-save {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-pocket-save-16.svg");
+  background-image: url("chrome://browser/skin/pocket-outline.svg");
 }
 .icon.icon-pocket-delete {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-pocket-delete-16.svg");
@@ -298,7 +298,7 @@ body[lwt-newtab-brighttext] {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-topsites-16.svg");
 }
 .icon.icon-pin-small {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-pin-12.svg");
+  background-image: url("chrome://browser/skin/pin-12.svg");
   background-size: 12px;
   height: 12px;
   width: 12px;
@@ -322,7 +322,7 @@ body[lwt-newtab-brighttext] {
   background-image: url("chrome://activity-stream/content/data/content/assets/glyph-webextension-16.svg");
 }
 .icon.icon-highlights {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-highlights-16.svg");
+  background-image: url("chrome://global/skin/icons/highlights.svg");
 }
 .icon.icon-arrowhead-down {
   background-image: url("chrome://global/skin/icons/arrow-down.svg");
@@ -786,7 +786,7 @@ main.has-snippet {
   content: attr(data-fallback);
 }
 .top-site-outer .search-topsite {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-search-16.svg");
+  background-image: url("chrome://global/skin/icons/search-glass.svg");
   background-size: 26px;
   background-color: #0060DF;
   border-radius: 42px;
@@ -4754,7 +4754,7 @@ main.has-snippet {
   background-size: 16px;
 }
 .ds-privacy-modal .modal-link.modal-link-privacy::before {
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-info-16.svg");
+  background-image: url("chrome://global/skin/icons/info.svg");
 }
 .ds-privacy-modal .modal-link.modal-link-manage::before {
   background-image: url("chrome://global/skin/icons/settings.svg");
@@ -4897,7 +4897,7 @@ main.has-snippet {
   inset-inline-end: 12px;
   height: 16px;
   width: 16px;
-  background-image: url("chrome://activity-stream/content/data/content/assets/glyph-dismiss-16.svg");
+  background-image: url("chrome://global/skin/icons/close.svg");
   -moz-context-properties: fill;
   color: inherit;
   fill: currentColor;

browser/components/newtab/data/content/assets/glyph-delete-16.svg

@@ -1,8 +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" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M7 12.4c0 .3-.3.6-.6.6s-.6-.3-.6-.6l0-4.8c-.1-.3.2-.6.6-.6s.6.3.6.6l0 4.8z"/>
-  <path d="M10.2 12.4c0 .3-.3.6-.6.6s-.6-.3-.6-.6l0-4.8c0-.3.3-.6.6-.6s.6.3.6.6l0 4.8z"/>
-  <path d="M13.6 3 11 3l0-1c0-1.1-.9-2-2-2L7 0C5.9 0 5 .9 5 2l0 1-2.6 0c-.4 0-.6.2-.6.6s.2.6.6.6l.4 0 0 9.8c0 1.1.9 2 2 2l6.5 0c1.1 0 2-.9 2-2l0-9.8.4 0c.3 0 .6-.3.6-.6S14 3 13.6 3zM6.3 1.8l.6-.6 2.3 0 .6.6 0 1.2-3.5 0c0 0 0-1.2 0-1.2zM12 14.1l-.6.6-6.8 0-.6-.6 0-9.9 8 0 0 9.9z"/>
-</svg>

browser/components/newtab/data/content/assets/glyph-dismiss-16.svg

@@ -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" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="m9.108 7.776 4.709-4.709a.626.626 0 0 0-.884-.885L8.244 6.871l-.488 0-4.689-4.688a.625.625 0 1 0-.884.885L6.87 7.754l0 .491-4.687 4.687a.626.626 0 0 0 .884.885L7.754 9.13l.491 0 4.687 4.687a.627.627 0 0 0 .885 0 .626.626 0 0 0 0-.885L9.108 8.223l0-.447z"/>
-</svg>

browser/components/newtab/data/content/assets/glyph-help-24.svg

@@ -1,8 +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" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M7.625 1.75c3.446 0 6.25 2.804 6.25 6.25s-2.804 6.25-6.25 6.25-6.25-2.804-6.25-6.25 2.804-6.25 6.25-6.25m0-1.25a7.5 7.5 0 1 0 0 15 7.5 7.5 0 0 0 0-15z"/>
-  <path d="M7.625 9.709A.625.625 0 0 1 7 9.084l0-.767c0-.527.37-.987.879-1.092.577-.12.996-.635.996-1.225a1.252 1.252 0 0 0-2.432-.409.626.626 0 0 1-1.181-.408A2.5 2.5 0 1 1 8.25 8.421l0 .663c0 .345-.28.625-.625.625z"/>
-  <path d="m8 12-.75 0-.25-.25L7 11l.25-.25.75 0 .25.25 0 .75z"/>
-</svg>

browser/components/newtab/data/content/assets/glyph-info-16.svg

@@ -1,8 +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" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8.25 6.938a.625.625 0 0 0-1.25 0l0 4.438a.625.625 0 0 0 1.25-.001l0-4.437z"/>
-  <path d="m8 4-.75 0-.25.25L7 5l.25.25.75 0L8.25 5l0-.75z"/>
-  <path d="M7.625 1.75c3.446 0 6.25 2.804 6.25 6.25s-2.804 6.25-6.25 6.25-6.25-2.804-6.25-6.25 2.804-6.25 6.25-6.25m0-1.25a7.5 7.5 0 1 0 0 15 7.5 7.5 0 0 0 0-15z"/>
-</svg>

browser/components/newtab/data/content/assets/glyph-pin-12.svg

@@ -1,7 +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" viewBox="0 0 12 12" width="12" height="12" fill-opacity="context-fill-opacity">
-  <path fill="context-fill" d="m9.05 4.055-1.45 0-.444-.165c0 0-.966-.964-1.544-1.541l.494-.494a.5.5 0 1 0-.708-.708l-.709.708-3.542 3.543a.5.5 0 1 0 .708.708l.494-.494c.581.582 1.555 1.558 1.555 1.558l.15.427.001 1.452a.922.922 0 0 0 .926.926.92.92 0 0 0 .653-.272l1.68-1.68 2.83 2.83a.5.5 0 1 0 .708-.708l-2.83-2.83 1.68-1.68a.923.923 0 0 0 .201-1.008.918.918 0 0 0-.853-.572z"/>
-  <path fill="context-stroke"  d="M5.399 1.156a.5.5 0 0 1 .707.707l-.493.494c.577.575 1.541 1.538 1.541 1.538l.444.165 1.446 0a.92.92 0 0 1 .853.57.921.921 0 0 1-.2 1.006L8.02 7.313l2.824 2.824a.5.5 0 0 1-.707.707L7.313 8.02 5.636 9.697c-.001.001-.001.001-.002.002a.917.917 0 0 1-1.004.199.92.92 0 0 1-.57-.853l-.002-1.451-.15-.426c0 0-.972-.975-1.552-1.555l-.493.493a.5.5 0 0 1-.707-.707l3.536-3.536.707-.707M4.69.439l-.709.709L.439 4.69a1.504 1.504 0 0 0 0 2.125 1.505 1.505 0 0 0 1.888.193l.708.709.018.052.001 1.281c0 .782.467 1.48 1.189 1.779a1.92 1.92 0 0 0 2.098-.416l.973-.973 2.121 2.121a1.504 1.504 0 0 0 2.125 0 1.504 1.504 0 0 0 0-2.125L9.44 7.314l.972-.972a1.922 1.922 0 0 0 .418-2.1 1.921 1.921 0 0 0-1.78-1.189l-1.269 0-.072-.026-.701-.7A1.505 1.505 0 0 0 6.815.439a1.506 1.506 0 0 0-2.125 0z"/>
-</svg>

browser/components/newtab/data/content/assets/glyph-pocket-16.svg

@@ -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" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M13 2 3 2a2 2 0 0 0-2 2l0 3.524c0 .942.204 1.858.56 2.724.382.865.865 1.604 1.502 2.24a7.14 7.14 0 0 0 2.24 1.476c.865.382 1.756.56 2.724.56a7.15 7.15 0 0 0 2.724-.56 6.433 6.433 0 0 0 2.215-1.502 7.14 7.14 0 0 0 1.476-2.24A6.623 6.623 0 0 0 15 7.498L15 4a2 2 0 0 0-2-2zm-1.183 4.523L8.34 10l-.68 0-3.478-3.477a.626.626 0 0 1 .885-.885L8 8.572l2.933-2.934a.626.626 0 0 1 .885 0 .63.63 0 0 1-.001.885z"/>
-</svg>

browser/components/newtab/data/content/assets/glyph-pocket-save-16.svg

@@ -1,7 +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" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="m13 3.25.75.75 0 3.498c0 .801-.148 1.527-.466 2.248-.28.68-.68 1.285-1.222 1.85-.5.521-1.102.929-1.789 1.212a5.899 5.899 0 0 1-2.248.466 5.424 5.424 0 0 1-2.248-.466 5.836 5.836 0 0 1-1.832-1.204 5.967 5.967 0 0 1-1.23-1.832 5.92 5.92 0 0 1-.465-2.248L2.25 4 3 3.25l10 0M13 2 3 2a2 2 0 0 0-2 2l0 3.524c0 .942.204 1.858.56 2.724.382.865.865 1.604 1.502 2.24a7.14 7.14 0 0 0 2.24 1.476c.865.382 1.756.56 2.724.56a7.15 7.15 0 0 0 2.724-.56 6.433 6.433 0 0 0 2.215-1.502 7.14 7.14 0 0 0 1.476-2.24A6.623 6.623 0 0 0 15 7.498L15 4a2 2 0 0 0-2-2z"/>
-  <path d="M7.66 10 4.182 6.523a.626.626 0 0 1 .885-.885L8 8.572l2.933-2.934a.626.626 0 0 1 .885.885L8.34 10l-.68 0z"/>
-</svg>

browser/components/newtab/data/content/assets/glyph-search-16.svg

@@ -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" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="m10.089 10.973 3.845 3.844a.62.62 0 0 0 .883-.001.625.625 0 0 0-.001-.884L10.983 10.1l.006-.427A5.5 5.5 0 1 0 1 6.5 5.5 5.5 0 0 0 6.5 12c1.189 0 2.288-.38 3.187-1.022l.402-.005zM6.5 10.75c-2.343 0-4.25-1.907-4.25-4.25S4.157 2.25 6.5 2.25s4.25 1.907 4.25 4.25-1.907 4.25-4.25 4.25z"/>
-</svg>

browser/components/newtab/data/content/assets/glyph-star-17.svg

@@ -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" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M3.475 9.824.615 7.449A1.207 1.207 0 0 1 .237 6.14a1.205 1.205 0 0 1 1.074-.835l3.697-.239.501-.375 1.364-3.427C7.059.8 7.501.5 8 .5s.941.3 1.127.763l0 .001 1.364 3.427.501.375 3.697.239c.498.032.92.36 1.074.835.155.476.006.99-.378 1.309L12.53 9.82l-.18.592.91 3.575c.123.485-.059.986-.463 1.279a1.213 1.213 0 0 1-1.36.045L8.31 13.334l-.621 0-3.126 1.977c-.426.266-.96.247-1.361-.045a1.205 1.205 0 0 1-.463-1.279l.908-3.566-.172-.597z"/>
-</svg>

browser/installer/allowed-dupes.mn

@@ -112,27 +112,6 @@ browser/chrome/browser/skin/classic/browser/customize.svg
 browser/features/webcompat-reporter@mozilla.org/icons/lightbulb.svg
 chrome/toolkit/skin/classic/global/icons/lightbulb.svg
 
-# Bug 1708502 - De-duplicate about:newtab icons
-browser/chrome/browser/content/activity-stream/data/content/assets/glyph-dismiss-16.svg
-browser/chrome/browser/content/activity-stream/data/content/assets/glyph-delete-16.svg
-browser/chrome/browser/content/activity-stream/data/content/assets/glyph-help-24.svg
-browser/chrome/browser/content/activity-stream/data/content/assets/glyph-highlights-16.svg
-browser/chrome/browser/content/activity-stream/data/content/assets/glyph-info-16.svg
-browser/chrome/browser/content/activity-stream/data/content/assets/glyph-pin-12.svg
-browser/chrome/browser/content/activity-stream/data/content/assets/glyph-pocket-16.svg
-browser/chrome/browser/content/activity-stream/data/content/assets/glyph-pocket-save-16.svg
-browser/chrome/browser/content/activity-stream/data/content/assets/glyph-search-16.svg
-browser/chrome/browser/content/activity-stream/data/content/assets/glyph-star-17.svg
-browser/chrome/browser/skin/classic/browser/bookmark.svg
-browser/chrome/browser/skin/classic/browser/pin-12.svg
-browser/chrome/browser/skin/classic/browser/pocket-outline.svg
-chrome/toolkit/skin/classic/global/icons/close.svg
-chrome/toolkit/skin/classic/global/icons/delete.svg
-chrome/toolkit/skin/classic/global/icons/help.svg
-chrome/toolkit/skin/classic/global/icons/info.svg
-chrome/toolkit/skin/classic/global/icons/pocket.svg
-chrome/toolkit/skin/classic/global/icons/search-glass.svg
-
 # Bug 1700124 - De-duplicate browser/themes/shared icons
 browser/chrome/browser/content/activity-stream/data/content/assets/glyph-add-16.svg
 browser/chrome/browser/skin/classic/browser/zoom-in.svg

browser/themes/shared/browser.inc.css

@@ -445,7 +445,7 @@ menupopup::part(drop-indicator) {
   -moz-context-properties: fill, fill-opacity;
   fill: currentColor;
   fill-opacity: 0.6;
-  list-style-image: url(chrome://activity-stream/content/data/content/assets/glyph-help-24.svg);
+  list-style-image: url(chrome://global/skin/icons/help.svg);
 }
 
 #cfr-notification-header-image:hover {
@@ -659,8 +659,7 @@ menupopup::part(drop-indicator) {
 #cfr-notification-footer-filled-stars,
 #cfr-notification-footer-empty-stars {
   -moz-context-properties: fill, fill-opacity;
-  background-image: url(chrome://activity-stream/content/data/content/assets/glyph-star-17.svg);
-  background-size: 17px;
+  background-image: url(chrome://browser/skin/bookmark.svg);
   fill: currentColor;
   fill-opacity: 0.7;
   height: 16px;

browser/themes/shared/urlbar-searchbar.inc.css

@@ -598,7 +598,7 @@
   --cfr-animation-duration: 0.35s;
   --cfr-button-addons-icon: url(chrome://activity-stream/content/data/content/assets/glyph-webextension-16.svg);
   --cfr-button-features-icon: url(chrome://activity-stream/content/data/content/assets/glyph-cfr-feature-16.svg);
-  --cfr-button-highlights-icon: url(chrome://activity-stream/content/data/content/assets/glyph-highlights-16.svg);
+  --cfr-button-highlights-icon: url(chrome://global/skin/icons/highlights.svg);
   --cfr-active-color: #0060df;
 }
 

toolkit/themes/shared/jar.inc.mn

@@ -50,6 +50,7 @@ toolkit.jar:
   skin/classic/global/icons/folder.svg                     (../../shared/icons/folder.svg)
   skin/classic/global/icons/heart.svg                      (../../shared/icons/heart.svg)
   skin/classic/global/icons/help.svg                       (../../shared/icons/help.svg)
+  skin/classic/global/icons/highlights.svg                 (../../shared/icons/highlights.svg)
   skin/classic/global/icons/info.svg                       (../../shared/icons/info.svg)
   skin/classic/global/icons/info-filled.svg                (../../shared/icons/info-filled.svg)
   skin/classic/global/icons/lightbulb.svg                  (../../shared/icons/lightbulb.svg)