From 3d37a2d4d30120aafb4e4c13d193193c0c6e7861 Mon Sep 17 00:00:00 2001
From: Dao Gottwald <dao@mozilla.com>
Date: Tue, 8 Oct 2024 16:10:59 +0000
Subject: [PATCH] Bug 1923367 - Revert bug 1910203 (patch for beta and
 release).  a=RyanVM

Differential Revision: https://phabricator.services.mozilla.com/D224962
---
 .../test/browser/browser_ext_tabs_hide.js        |  2 +-
 .../shared/addons/extension-controlled.css       | 16 ++++++----------
 browser/themes/shared/tabbrowser/tabs.css        |  7 +------
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_hide.js b/browser/components/extensions/test/browser/browser_ext_tabs_hide.js
index d166133d2b479..ce896cdc9d8a4 100644
--- a/browser/components/extensions/test/browser/browser_ext_tabs_hide.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_hide.js
@@ -158,7 +158,7 @@ const doorHangerDisable = (
     );
     ok(
       images.some(img =>
-        getComputedStyle(img).backgroundImage.includes("view-opentabs.svg")
+        getComputedStyle(img).backgroundImage.includes("arrow-down.svg")
       ),
       "There's an icon for the all tabs menu"
     );
diff --git a/browser/themes/shared/addons/extension-controlled.css b/browser/themes/shared/addons/extension-controlled.css
index 975d95bb65c44..69d78373fcef5 100644
--- a/browser/themes/shared/addons/extension-controlled.css
+++ b/browser/themes/shared/addons/extension-controlled.css
@@ -14,20 +14,16 @@
   margin-bottom: 0;
 }
 
-.extension-controlled-icon {
+.extension-controlled-notification popupnotificationcontent > description > .extension-controlled-icon {
   height: 16px;
   width: 16px;
   vertical-align: bottom;
+}
 
-  &.alltabs-icon {
-    background: url("chrome://browser/content/firefoxview/view-opentabs.svg");
-    -moz-context-properties: fill;
-    fill: currentColor;
-    height: 20px;
-    width: 20px;
-    /* This icon has a lot of extra space to the sides, reduce that a little. */
-    margin-block: -2px;
-  }
+.extension-controlled-icon.alltabs-icon {
+  background: url("chrome://global/skin/icons/arrow-down.svg");
+  /* This icon has a lot of extra space to the sides, reduce that a little. */
+  margin: 0 -1px 1px;
 }
 
 .extension-controlled-notification > .popup-notification-body-container > .popup-notification-body > .popup-notification-bottom-content > .popup-notification-warning,
diff --git a/browser/themes/shared/tabbrowser/tabs.css b/browser/themes/shared/tabbrowser/tabs.css
index 24909332163ee..d48aad3a39790 100644
--- a/browser/themes/shared/tabbrowser/tabs.css
+++ b/browser/themes/shared/tabbrowser/tabs.css
@@ -1099,12 +1099,7 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
 /* All tabs button and menupopup */
 
 #alltabs-button {
-  list-style-image: url("chrome://browser/content/firefoxview/view-opentabs.svg");
-
-  > .toolbarbutton-badge-stack > .toolbarbutton-icon {
-    width: 20px;
-    margin: -2px;
-  }
+  list-style-image: url(chrome://global/skin/icons/arrow-down.svg);
 
   #tabbrowser-tabs[hiddensoundplaying] ~ & > .toolbarbutton-badge-stack > .toolbarbutton-badge {
     background: transparent url(chrome://browser/skin/tabbrowser/tab-audio-playing-small.svg);