diff --git a/browser/components/protections/content/protections.html b/browser/components/protections/content/protections.html
index e33c814f6281..c2ac72331727 100644
--- a/browser/components/protections/content/protections.html
+++ b/browser/components/protections/content/protections.html
@@ -78,13 +78,13 @@
diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn
index de859743a796..a1b2075777c5 100644
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -119,14 +119,6 @@ chrome/toolkit/skin/classic/global/icons/check.svg
browser/chrome/browser/skin/classic/browser/notification-icons/indexedDB.svg
browser/chrome/browser/skin/classic/browser/notification-icons/persistent-storage.svg
-# Bug 1707101 - De-duplicate Protections Panel icons
-browser/chrome/browser/skin/classic/browser/controlcenter/tracker-image.svg
-browser/chrome/browser/skin/classic/browser/notification-icons/canvas.svg
-browser/chrome/browser/skin/classic/browser/controlcenter/tracker-image-disabled.svg
-browser/chrome/browser/skin/classic/browser/notification-icons/canvas-blocked.svg
-browser/chrome/browser/skin/classic/browser/controlcenter/fingerprinters.svg
-browser/chrome/browser/skin/classic/browser/notification-icons/webauthn.svg
-
# Bug 1708008 - De-duplicate extension icons
browser/chrome/browser/content/browser/extension.svg
chrome/toolkit/skin/classic/mozapps/extensions/extension.svg
diff --git a/browser/themes/shared/controlcenter/panel.inc.css b/browser/themes/shared/controlcenter/panel.inc.css
index b93dc48c03cf..f7515c82d2fe 100644
--- a/browser/themes/shared/controlcenter/panel.inc.css
+++ b/browser/themes/shared/controlcenter/panel.inc.css
@@ -546,13 +546,13 @@ description#identity-popup-content-verifier,
}
.protections-popup-trackersView-icon {
- list-style-image: url(chrome://browser/skin/controlcenter/tracker-image-disabled.svg);
+ list-style-image: url(chrome://browser/skin/canvas-blocked.svg);
width: 16px;
height: 16px;
}
.protections-popup-trackersView-icon.allowed {
- list-style-image: url(chrome://browser/skin/controlcenter/tracker-image.svg);
+ list-style-image: url(chrome://browser/skin/canvas.svg);
}
.protections-popup-socialblockView-icon {
@@ -576,7 +576,7 @@ description#identity-popup-content-verifier,
}
.protections-popup-fingerprintersView-icon.allowed {
- list-style-image: url(chrome://browser/skin/controlcenter/fingerprinters.svg);
+ list-style-image: url(chrome://browser/skin/fingerprint.svg);
}
.protections-popup-cryptominersView-icon {
@@ -655,7 +655,7 @@ description#identity-popup-content-verifier,
}
.trackers-icon {
- list-style-image: url(chrome://browser/skin/controlcenter/tracker-image.svg);
+ list-style-image: url(chrome://browser/skin/canvas.svg);
}
.socialblock-icon {
@@ -671,7 +671,7 @@ description#identity-popup-content-verifier,
}
.fingerprinters-icon {
- list-style-image: url(chrome://browser/skin/controlcenter/fingerprinters.svg);
+ list-style-image: url(chrome://browser/skin/fingerprint.svg);
}
/* PERMISSIONS */
diff --git a/browser/themes/shared/controlcenter/tracker-image-disabled.svg b/browser/themes/shared/controlcenter/tracker-image-disabled.svg
deleted file mode 100644
index 636b6f8fa8b7..000000000000
--- a/browser/themes/shared/controlcenter/tracker-image-disabled.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/browser/themes/shared/controlcenter/tracker-image.svg b/browser/themes/shared/controlcenter/tracker-image.svg
deleted file mode 100644
index 4a3e99094f67..000000000000
--- a/browser/themes/shared/controlcenter/tracker-image.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/browser/themes/shared/notification-icons/canvas-blocked.svg b/browser/themes/shared/icons/canvas-blocked.svg
similarity index 100%
rename from browser/themes/shared/notification-icons/canvas-blocked.svg
rename to browser/themes/shared/icons/canvas-blocked.svg
diff --git a/browser/themes/shared/notification-icons/canvas.svg b/browser/themes/shared/icons/canvas.svg
similarity index 100%
rename from browser/themes/shared/notification-icons/canvas.svg
rename to browser/themes/shared/icons/canvas.svg
diff --git a/browser/themes/shared/controlcenter/fingerprinters.svg b/browser/themes/shared/icons/fingerprint.svg
similarity index 100%
rename from browser/themes/shared/controlcenter/fingerprinters.svg
rename to browser/themes/shared/icons/fingerprint.svg
diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
index 6730c66442f2..b971ac8678a4 100644
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -29,12 +29,9 @@
skin/classic/browser/controlcenter/cryptominers-disabled.svg (../shared/controlcenter/cryptominers-disabled.svg)
skin/classic/browser/controlcenter/mcb-disabled.svg (../shared/controlcenter/mcb-disabled.svg)
skin/classic/browser/controlcenter/etp-milestone.svg (../shared/controlcenter/etp-milestone.svg)
- skin/classic/browser/controlcenter/fingerprinters.svg (../shared/controlcenter/fingerprinters.svg)
skin/classic/browser/controlcenter/fingerprinters-disabled.svg (../shared/controlcenter/fingerprinters-disabled.svg)
skin/classic/browser/controlcenter/socialblock.svg (../shared/controlcenter/socialblock.svg)
skin/classic/browser/controlcenter/socialblock-disabled.svg (../shared/controlcenter/socialblock-disabled.svg)
- skin/classic/browser/controlcenter/tracker-image.svg (../shared/controlcenter/tracker-image.svg)
- skin/classic/browser/controlcenter/tracker-image-disabled.svg (../shared/controlcenter/tracker-image-disabled.svg)
skin/classic/browser/controlcenter/trackers.svg (../shared/controlcenter/trackers.svg)
skin/classic/browser/controlcenter/tracking-protection.svg (../shared/controlcenter/tracking-protection.svg)
skin/classic/browser/controlcenter/hero-message-background.svg (../shared/controlcenter/hero-message-background.svg)
@@ -62,8 +59,6 @@
skin/classic/browser/notification-icons/autoplay-media-blocked.svg (../shared/notification-icons/autoplay-media-blocked.svg)
skin/classic/browser/notification-icons/camera-blocked.svg (../shared/notification-icons/camera-blocked.svg)
skin/classic/browser/notification-icons/camera.svg (../shared/notification-icons/camera.svg)
- skin/classic/browser/notification-icons/canvas-blocked.svg (../shared/notification-icons/canvas-blocked.svg)
- skin/classic/browser/notification-icons/canvas.svg (../shared/notification-icons/canvas.svg)
skin/classic/browser/notification-icons/desktop-notification-blocked.svg (../shared/notification-icons/desktop-notification-blocked.svg)
skin/classic/browser/notification-icons/desktop-notification.svg (../shared/notification-icons/desktop-notification.svg)
skin/classic/browser/notification-icons/drag-indicator.svg (../shared/notification-icons/drag-indicator.svg)
@@ -82,7 +77,6 @@
skin/classic/browser/notification-icons/xr-blocked.svg (../shared/notification-icons/xr-blocked.svg)
skin/classic/browser/notification-icons/xr.svg (../shared/notification-icons/xr.svg)
skin/classic/browser/notification-icons/midi.svg (../shared/notification-icons/midi.svg)
- skin/classic/browser/notification-icons/webauthn.svg (../shared/notification-icons/webauthn.svg)
skin/classic/browser/tracking-protection.svg (../shared/identity-block/tracking-protection.svg)
skin/classic/browser/tracking-protection-disabled.svg (../shared/identity-block/tracking-protection-disabled.svg)
@@ -140,6 +134,8 @@
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/canvas.svg (../shared/icons/canvas.svg)
+ skin/classic/browser/canvas-blocked.svg (../shared/icons/canvas-blocked.svg)
skin/classic/browser/characterEncoding.svg (../shared/icons/characterEncoding.svg)
skin/classic/browser/chevron-animation.svg (../shared/icons/chevron-animation.svg)
skin/classic/browser/customize.svg (../shared/icons/customize.svg)
@@ -152,6 +148,7 @@
skin/classic/browser/edit-copy.svg (../shared/icons/edit-copy.svg)
skin/classic/browser/edit-cut.svg (../shared/icons/edit-cut.svg)
skin/classic/browser/edit-paste.svg (../shared/icons/edit-paste.svg)
+ skin/classic/browser/fingerprint.svg (../shared/icons/fingerprint.svg)
skin/classic/browser/forget.svg (../shared/icons/forget.svg)
skin/classic/browser/forward.svg (../shared/icons/forward.svg)
skin/classic/browser/fullscreen.svg (../shared/icons/fullscreen.svg)
diff --git a/browser/themes/shared/notification-icons.inc.css b/browser/themes/shared/notification-icons.inc.css
index 4a9ed3ae8b7e..1d7ef73afbed 100644
--- a/browser/themes/shared/notification-icons.inc.css
+++ b/browser/themes/shared/notification-icons.inc.css
@@ -206,16 +206,16 @@
#canvas-notification-icon,
.popup-notification-icon[popupid="canvas-permissions-prompt"],
.canvas-icon {
- list-style-image: url(chrome://browser/skin/notification-icons/canvas.svg);
+ list-style-image: url(chrome://browser/skin/canvas.svg);
}
.canvas-icon.blocked-permission-icon {
- list-style-image: url(chrome://browser/skin/notification-icons/canvas-blocked.svg);
+ list-style-image: url(chrome://browser/skin/canvas-blocked.svg);
}
#webauthn-notification-icon,
.popup-notification-icon[popupid^="webauthn-prompt-"] {
- list-style-image: url(chrome://browser/skin/notification-icons/webauthn.svg);
+ list-style-image: url(chrome://browser/skin/fingerprint.svg);
}
#permission-popup-menulist {
diff --git a/browser/themes/shared/notification-icons/webauthn.svg b/browser/themes/shared/notification-icons/webauthn.svg
deleted file mode 100644
index 320d516b076c..000000000000
--- a/browser/themes/shared/notification-icons/webauthn.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-