fix: Fixed caption buttons showing native panel when hidden, b=closes #10973, c=compact-mode, tabs

ebar, b=closes #10968, c=common, tabs

locales/ar/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/ca/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Següent
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Permès
 zen-site-data-setting-block = Bloquejat
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Galetes entre llocs
 zen-site-data-security-info-extension = 
     .label = Extensió
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Afegeix extensions
 zen-site-data-site-settings = 
     .label = Totes les configuracions del lloc
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Comparteix aquesta pàgina
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copia l'URL
 zen-site-data-setting-site-protection = Protecció contra el seguiment

locales/cs/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Povoleno
 zen-site-data-setting-block = Blokováno
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Rozšíření
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Přidat rozšíření
 zen-site-data-site-settings = 
     .label = Nastavení všech stránek
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/cy/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/da/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Næste
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Tilladt
 zen-site-data-setting-block = Blokeret
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Udvidelse
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Tilføj udvidelser
 zen-site-data-site-settings = 
     .label = All Site Settings
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Del denne side
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Kopiér URL
 zen-site-data-setting-site-protection = Sporingsbeskyttelse

locales/de/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Weiter
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Erlaubt
 zen-site-data-setting-block = Blockiert
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site-Cookie
 zen-site-data-security-info-extension = 
     .label = Erweiterung
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Erweiterungen hinzufügen
 zen-site-data-site-settings = 
     .label = Alle Website-Einstellungen
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Diese Seite teilen
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = URL kopieren
 zen-site-data-setting-site-protection = Tracking-Schutz

locales/el/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/en-GB/browser/browser/zen-general.ftl

@@ -57,6 +57,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -70,8 +72,14 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/en-US/browser/browser/zen-general.ftl

@@ -77,6 +77,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension =
     .label = Extension
@@ -91,8 +93,16 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings =
     .label = All Site Settings
-zen-site-data-share =
+
-    .label = Share This Page
+
+zen-site-data-header-share =
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode =
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot =
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark =
+    .tooltiptext = Bookmark This Page
 
 zen-urlbar-copy-url-button =
   .tooltiptext = Copy URL

locales/es-ES/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Siguiente
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Permitido
 zen-site-data-setting-block = Bloqueado
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cookie de terceros
 zen-site-data-security-info-extension = 
     .label = Extensión
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Añadir extensión
 zen-site-data-site-settings = 
     .label = Todas las configuraciones del sitio
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Compartir esta página
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copiar URL
 zen-site-data-setting-site-protection = Protección contra el rastreo

locales/et/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Lubatud
 zen-site-data-setting-block = Keelatud
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Laiendus
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Lisa laiendusi
 zen-site-data-site-settings = 
     .label = Kõik saidi sätted
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/fa/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/fi/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/fr/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Suivant
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Autorisé
 zen-site-data-setting-block = Bloqué
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cookie intersite
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Ajouter des extensions
 zen-site-data-site-settings = 
     .label = Tous les paramètres du site
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Partager cette page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copier l'URL
 zen-site-data-setting-site-protection = Protection contre le pistage

locales/ga-IE/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Ar Aghaidh
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Ceadaithe
 zen-site-data-setting-block = Blocáilte
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Fianán Tras-Láithreáin
 zen-site-data-security-info-extension = 
     .label = Síneadh
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Cuir Síneadh leis
 zen-site-data-site-settings = 
     .label = Gach Socrú Suímh
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Comhroinn an Leathanach seo
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Cóipeáil URL
 zen-site-data-setting-site-protection = Cosaint Rianaithe

locales/he/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = אושר
 zen-site-data-setting-block = חסום
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = תוספים
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = הוספת תוספים
 zen-site-data-site-settings = 
     .label = כל הגדרות אתר
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/hu/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Következő
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Engedélyezve
 zen-site-data-setting-block = Letiltva
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Webhelyek közötti sütik
 zen-site-data-security-info-extension = 
     .label = Kiegészítő
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Kiegészítő hozzáadása
 zen-site-data-site-settings = 
     .label = Minden webhelybeállítás
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Oldal megosztása
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = URL másolása
 zen-site-data-setting-site-protection = Nyomkövetés védelem

locales/id/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Lanjut
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Diizinkan
 zen-site-data-setting-block = Diblokir
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Kuki Lintas Situs
 zen-site-data-security-info-extension = 
     .label = Ekstensi
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Tambahkan Ekstensi
 zen-site-data-site-settings = 
     .label = Semua Pengaturan Situs
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Bagikan Halaman Ini
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Salin URL
 zen-site-data-setting-site-protection = Perlindungan Pelacakan

locales/is/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/it/browser/browser/zen-general.ftl

@@ -57,6 +57,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Consentito
 zen-site-data-setting-block = Bloccato
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Estensione
@@ -70,8 +72,14 @@ zen-site-data-get-addons =
     .label = Aggiungi estensioni
 zen-site-data-site-settings = 
     .label = Tutte le impostazioni del sito
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Condividi questa pagina
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copia URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/ja/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/ko/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = 다음
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = 허용됨
 zen-site-data-setting-block = 금지됨
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = 사이트 간 공유 쿠키
 zen-site-data-security-info-extension = 
     .label = 확장
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = 확장 프로그램 추가
 zen-site-data-site-settings = 
     .label = 모든 사이트 설정
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = 이 페이지 공유
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = URL 복사
 zen-site-data-setting-site-protection = 추적 보호

locales/lt/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Leidžiama
 zen-site-data-setting-block = Užblokuota
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Plėtinys
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Įtraukti plėtinius
 zen-site-data-site-settings = 
     .label = Visi svetainės nustatymai
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/nl/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/nn-NO/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/pl/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/pt-BR/browser/browser/zen-general.ftl

@@ -57,6 +57,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Permitido
 zen-site-data-setting-block = Bloqueado
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extensão
@@ -70,8 +72,14 @@ zen-site-data-get-addons =
     .label = Adicionar Extensões
 zen-site-data-site-settings = 
     .label = Todas as Configurações do Site
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/pt-PT/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Seguinte
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Permitido
 zen-site-data-setting-block = Bloqueado
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cookies entre sites
 zen-site-data-security-info-extension = 
     .label = Extensão
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Adicionar Extensões
 zen-site-data-site-settings = 
     .label = Todas as Definições do Site
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Partilhar Esta Página
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copiar URL
 zen-site-data-setting-site-protection = Proteção contra rastreio

locales/ru/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Далее
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Разрешено
 zen-site-data-setting-block = Запрещено
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Расширение
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Добавить расширения
 zen-site-data-site-settings = 
     .label = Все настройки сайта
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Поделиться этой страницей
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Скопировать URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/sv-SE/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/th/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/tr/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/uk/browser/browser/zen-general.ftl

@@ -59,7 +59,9 @@ zen-generic-next = Далі
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Дозволено
 zen-site-data-setting-block = Заблоковано
-zen-site-data-setting-cross-site = Cross-Site cookie
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
+zen-site-data-setting-cross-site = Міжсайтові cookie
 zen-site-data-security-info-extension = 
     .label = Розширення
 zen-site-data-security-info-secure = 
@@ -72,11 +74,17 @@ zen-site-data-get-addons =
     .label = Додати розширення
 zen-site-data-site-settings = 
     .label = Усі налаштування сайту
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Поділитися цією сторінкою
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Копіювати URL-адресу
-zen-site-data-setting-site-protection = Tracking Protection
+zen-site-data-setting-site-protection = Захист від відстеження
 
 # Section: Feature callouts
 

locales/vi/browser/browser/zen-general.ftl

@@ -59,6 +59,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/zh-CN/browser/browser/zen-general.ftl

@@ -57,6 +57,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -70,8 +72,14 @@ zen-site-data-get-addons =
     .label = 添加扩展
 zen-site-data-site-settings = 
     .label = 所有站点设置
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

locales/zh-TW/browser/browser/zen-general.ftl

@@ -57,6 +57,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -70,8 +72,14 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
-zen-site-data-share = 
+zen-site-data-header-share = 
-    .label = Share This Page
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

src/browser/base/content/browser-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
-index 32b67f846b9942ad3da4276bb8748fee915eb485..f77d5df7c8ef49c0366ada8b3153c5a6c676239b 100644
+index 32b67f846b9942ad3da4276bb8748fee915eb485..529ef8895d2ab01b4cbebd2992fd3b64225e42b0 100644
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
 @@ -31,6 +31,7 @@ ChromeUtils.defineESModuleGetters(this, {
@@ -19,6 +19,33 @@ index 32b67f846b9942ad3da4276bb8748fee915eb485..f77d5df7c8ef49c0366ada8b3153c5a6
      PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser);
  
      if (!gMultiProcessBrowser) {
+@@ -3795,7 +3798,7 @@ function warnAboutClosingWindow() {
+ 
+   if (!isPBWindow && !toolbar.visible) {
+     return gBrowser.warnAboutClosingTabs(
+-      gBrowser.openTabs.length,
++      gBrowser.visibleTabs.filter(t => t.getAttribute("pending")!=="true").length,
+       gBrowser.closingTabsEnum.ALL
+     );
+   }
+@@ -3835,7 +3838,7 @@ function warnAboutClosingWindow() {
+     return (
+       isPBWindow ||
+       gBrowser.warnAboutClosingTabs(
+-        gBrowser.openTabs.length,
++        gBrowser.visibleTabs.filter(t => t.getAttribute("pending")!=="true").length,
+         gBrowser.closingTabsEnum.ALL
+       )
+     );
+@@ -3860,7 +3863,7 @@ function warnAboutClosingWindow() {
+     AppConstants.platform != "macosx" ||
+     isPBWindow ||
+     gBrowser.warnAboutClosingTabs(
+-      gBrowser.openTabs.length,
++      gBrowser.visibleTabs.filter(t => t.getAttribute("pending")!=="true").length,
+       gBrowser.closingTabsEnum.ALL
+     )
+   );
 @@ -4782,6 +4785,9 @@ var ConfirmationHint = {
      MozXULElement.insertFTLIfNeeded("toolkit/branding/brandings.ftl");
      MozXULElement.insertFTLIfNeeded("browser/confirmationHints.ftl");

src/browser/base/content/browser-pageActions-js.patch

@@ -1,12 +1,13 @@
 diff --git a/browser/base/content/browser-pageActions.js b/browser/base/content/browser-pageActions.js
-index 00da33bc11189db17b6a2e656acb3a778531197c..9571155baccad9a886cbe9c7bf0bd76a135331c4 100644
+index 00da33bc11189db17b6a2e656acb3a778531197c..bdca62e9ed5513e1e1922f1f9498755f5459e0c2 100644
 --- a/browser/base/content/browser-pageActions.js
 +++ b/browser/base/content/browser-pageActions.js
-@@ -451,6 +451,7 @@ var BrowserPageActions = {
+@@ -449,7 +449,7 @@ var BrowserPageActions = {
+       document.getElementById(
+         action && this.urlbarButtonNodeIDForActionID(action.id)
        ),
-       document.getElementById(this.mainButtonNode.id),
+-      document.getElementById(this.mainButtonNode.id),
-       document.getElementById("identity-icon"),
 +      document.getElementById("zen-site-data-icon-button"),
+       document.getElementById("identity-icon"),
      ];
      for (let node of potentialAnchorNodes) {
-       if (node && !node.hidden) {

src/browser/base/content/zen-panels/site-data.inc

@@ -16,16 +16,20 @@
                 mainview-with-header="true">
       <hbox id="zen-site-data-header">
         <toolbarbutton id="zen-site-data-header-share"
-                        data-l10n-id="zen-site-data-share"
+                        data-l10n-id="zen-site-data-header-share"
                         flex="1"
                         closemenu="none" />
         <toolbarbutton id="zen-site-data-header-reader-mode"
+                        data-l10n-id="zen-site-data-header-reader-mode"
                         command="View:ReaderView"
+                        tooltip="dynamic-shortcut-tooltip"
                         flex="1" />
         <toolbarbutton id="zen-site-data-header-screenshot"
+                        data-l10n-id="zen-site-data-header-screenshot"
                         command="Browser:Screenshot"
                         flex="1" />
         <toolbarbutton id="zen-site-data-header-bookmark"
+                        data-l10n-id="zen-site-data-header-bookmark"
                         command="Browser:AddBookmarkAs"
                         flex="1" />
       </hbox>
@@ -35,10 +39,6 @@
           <label data-l10n-id="zen-generic-manage" id="zen-site-data-manage-addons" />
         </hbox>
         <hbox class="panel-subview-body" context="unified-extensions-context-menu" id="zen-site-data-addons">
-          <html:div id="unified-extensions-messages-container">
-            <!-- messages will be inserted here -->
-          </html:div>
-
           <vbox id="overflowed-extensions-list">
             <!-- overflowed extension buttons from the nav-bar will go here -->
           </vbox>
@@ -82,6 +82,9 @@
                        closemenu="none"
                        context="zenSiteDataActions" />
       </hbox>
+# Messages will be inserted here.
+# Dont write anything directly here, even comments, as this may break the layout
+      <html:div id="unified-extensions-messages-container"></html:div>
     </panelview>
   </panelmultiview>
 </panel>

src/browser/components/asrouter/modules/FeatureCallout-sys-mjs.patch

@@ -0,0 +1,12 @@
+diff --git a/browser/components/asrouter/modules/FeatureCallout.sys.mjs b/browser/components/asrouter/modules/FeatureCallout.sys.mjs
+index 2a2c5a6fe903694abbac0be86c7b3c8adc1d0275..5571b827198474a2635a9bd968adbc8c96dbc353 100644
+--- a/browser/components/asrouter/modules/FeatureCallout.sys.mjs
++++ b/browser/components/asrouter/modules/FeatureCallout.sys.mjs
+@@ -776,6 +776,7 @@ export class FeatureCallout {
+     ) {
+       return false;
+     }
++    if (el?.id === "zen-site-data-icon-button") return true;
+ 
+     const style = this.win.getComputedStyle(el);
+     return style?.visibility === "visible" && style?.display !== "none";

src/browser/components/customizableui/CustomizableUI-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index d9a059f608779fea7cd8c595a432f6fe95183e0c..31c43bc3d5b05713299c1b822b9774909445e862 100644
+index d9a059f608779fea7cd8c595a432f6fe95183e0c..c359e5115b315dbb4b14e07ab34526aab438565f 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
 @@ -14,6 +14,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -176,17 +176,23 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..31c43bc3d5b05713299c1b822b977490
      });
  
      lazy.log.debug(
-@@ -7909,7 +7909,8 @@ class OverflowableToolbar {
+@@ -7909,7 +7909,14 @@ class OverflowableToolbar {
        Math.max(targetWidth, targetChildrenWidth)
      );
      totalAvailWidth = Math.ceil(totalAvailWidth);
 -    let isOverflowing = targetContentWidth > totalAvailWidth;
 +    if (win.gZenVerticalTabsManager._hasSetSingleToolbar && this.#toolbar.id == 'nav-bar') return { isOverflowing: false, targetContentWidth, totalAvailWidth };
 +    let isOverflowing = targetContentWidth + (win.gZenVerticalTabsManager._hasSetSingleToolbar ? 0.1 : 0) > totalAvailWidth;
++    if (win.gZenVerticalTabsManager._hasSetSingleToolbar &&
++      this.#target.id == 'zen-sidebar-top-buttons-customization-target' &&
++      Array.from(this.#target.children).filter(child => child.getAttribute("overflows") != "false").length == 1 &&
++      this.#overflowedInfo.size == 0) {
++      isOverflowing = false;
++    }
      return { isOverflowing, targetContentWidth, totalAvailWidth };
    }
  
-@@ -7970,7 +7971,11 @@ class OverflowableToolbar {
+@@ -7970,7 +7977,11 @@ class OverflowableToolbar {
              return;
            }
          }
@@ -199,7 +205,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..31c43bc3d5b05713299c1b822b977490
            lazy.log.debug(
              `Need ${minSize} but width is ${totalAvailWidth} so bailing`
            );
-@@ -8003,7 +8008,7 @@ class OverflowableToolbar {
+@@ -8003,7 +8014,7 @@ class OverflowableToolbar {
          }
        }
        if (!inserted) {
@@ -208,7 +214,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..31c43bc3d5b05713299c1b822b977490
        }
        child.removeAttribute("cui-anchorid");
        child.removeAttribute("overflowedItem");
-@@ -8348,7 +8353,7 @@ class OverflowableToolbar {
+@@ -8348,7 +8359,7 @@ class OverflowableToolbar {
          break;
        }
        case "mousedown": {

src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch

@@ -0,0 +1,12 @@
+diff --git a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
+index 773f595e89e268578ba153907babec95b58a155a..abe86fc3d243a85c4a8dbee854a2d0130f7270fd 100644
+--- a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
++++ b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
+@@ -937,6 +937,7 @@ export class AsyncTabSwitcher {
+     return !(
+       this.tabbrowser._printPreviewBrowsers.has(browser) ||
+       lazy.PictureInPicture.isOriginatingBrowser(browser)
++      || browser?.hasAttribute('zen-glance-background')
+     );
+   }
+ 

src/browser/components/urlbar/UrlbarInput-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c64ab7bed9 100644
+index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d355858bcf37b 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -76,6 +76,13 @@ ChromeUtils.defineLazyGetter(lazy, "logger", () =>
@@ -122,14 +122,13 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
      // Enable the animation only after the first extend call to ensure it
      // doesn't run when opening a new window.
      if (!this.hasAttribute("breakout-extend-animate")) {
-@@ -2331,6 +2396,25 @@ export class UrlbarInput {
+@@ -2331,6 +2396,24 @@ export class UrlbarInput {
        return;
      }
  
 +    if (this._zenHandleUrlbarClose) {
 +      this._zenHandleUrlbarClose();
 +    }
-+    this.window.gZenUIManager.onUrlbarClose();
 +    
 +    // Arc like URLbar: Blur the input on exit
 +    const zenToolbox = this.document.getElementById("navigator-toolbox");
@@ -142,13 +141,22 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
 +    this.document.ownerGlobal.setTimeout(() => {
 +      this.window.document.documentElement.removeAttribute("supress-primary-adjustment");
 +    }, 100);
-+    
++    this.window.gZenUIManager.onUrlbarClose();
 +    this.removeAttribute("zen-floating-urlbar");
 +
      this.removeAttribute("breakout-extend");
      this.#updateTextboxPosition();
    }
-@@ -2595,10 +2679,12 @@ export class UrlbarInput {
+@@ -2361,7 +2444,7 @@ export class UrlbarInput {
+     forceUnifiedSearchButtonAvailable = false
+   ) {
+     let prevState = this.getAttribute("pageproxystate");
+-
++    this.removeAttribute("had-proxystate");
+     this.setAttribute("pageproxystate", state);
+     this._inputContainer.setAttribute("pageproxystate", state);
+     this._identityBox?.setAttribute("pageproxystate", state);
+@@ -2595,10 +2678,12 @@ export class UrlbarInput {
        return;
      }
      this.textbox.style.top = px(
@@ -161,7 +169,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
      );
    }
  
-@@ -2658,9 +2744,10 @@ export class UrlbarInput {
+@@ -2658,9 +2743,10 @@ export class UrlbarInput {
            return;
          }
  
@@ -173,7 +181,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
          );
          this.textbox.style.setProperty(
            "--urlbar-height",
-@@ -3093,6 +3180,7 @@ export class UrlbarInput {
+@@ -3093,6 +3179,7 @@ export class UrlbarInput {
    }
  
    _toggleActionOverride(event) {
@@ -181,7 +189,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
      if (
        event.keyCode == KeyEvent.DOM_VK_SHIFT ||
        event.keyCode == KeyEvent.DOM_VK_ALT ||
-@@ -3197,7 +3285,7 @@ export class UrlbarInput {
+@@ -3197,7 +3284,7 @@ export class UrlbarInput {
        return val;
      }
      let trimmedValue = lazy.UrlbarPrefs.get("trimURLs")
@@ -190,7 +198,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
        : val;
      // Only trim value if the directionality doesn't change to RTL and we're not
      // showing a strikeout https protocol.
-@@ -3501,6 +3589,7 @@ export class UrlbarInput {
+@@ -3501,6 +3588,7 @@ export class UrlbarInput {
      resultDetails = null,
      browser = this.window.gBrowser.selectedBrowser
    ) {
@@ -198,7 +206,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
      if (this.isAddressbar) {
        this.#prepareAddressbarLoad(
          url,
-@@ -3608,6 +3697,10 @@ export class UrlbarInput {
+@@ -3608,6 +3696,10 @@ export class UrlbarInput {
        }
        reuseEmpty = true;
      }
@@ -209,7 +217,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
      if (
        where == "tab" &&
        reuseEmpty &&
-@@ -3615,6 +3708,9 @@ export class UrlbarInput {
+@@ -3615,6 +3707,9 @@ export class UrlbarInput {
      ) {
        where = "current";
      }
@@ -219,7 +227,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
      return where;
    }
  
-@@ -3872,6 +3968,7 @@ export class UrlbarInput {
+@@ -3872,6 +3967,7 @@ export class UrlbarInput {
        this.setResultForCurrentValue(null);
        this.handleCommand();
        this.controller.clearLastQueryContextCache();
@@ -227,7 +235,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
  
        this._suppressStartQuery = false;
      });
-@@ -3879,7 +3976,6 @@ export class UrlbarInput {
+@@ -3879,7 +3975,6 @@ export class UrlbarInput {
      contextMenu.addEventListener("popupshowing", () => {
        // Close the results pane when the input field contextual menu is open,
        // because paste and go doesn't want a result selection.
@@ -235,7 +243,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
  
        let controller =
          this.document.commandDispatcher.getControllerForCommand("cmd_paste");
-@@ -3991,7 +4087,11 @@ export class UrlbarInput {
+@@ -3991,7 +4086,11 @@ export class UrlbarInput {
      if (!engineName && !source && !this.hasAttribute("searchmode")) {
        return;
      }
@@ -248,7 +256,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
      if (this._searchModeIndicatorTitle) {
        this._searchModeIndicatorTitle.textContent = "";
        this._searchModeIndicatorTitle.removeAttribute("data-l10n-id");
-@@ -4302,6 +4402,7 @@ export class UrlbarInput {
+@@ -4302,6 +4401,7 @@ export class UrlbarInput {
  
      this.document.l10n.setAttributes(
        this.inputField,
@@ -256,7 +264,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
        l10nId,
        l10nId == "urlbar-placeholder-with-name" ? { name } : undefined
      );
-@@ -4413,6 +4514,11 @@ export class UrlbarInput {
+@@ -4413,6 +4513,11 @@ export class UrlbarInput {
    }
  
    _on_click(event) {
@@ -268,7 +276,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
      if (
        event.target == this.inputField ||
        event.target == this._inputContainer
-@@ -4485,7 +4591,7 @@ export class UrlbarInput {
+@@ -4485,7 +4590,7 @@ export class UrlbarInput {
        }
      }
  
@@ -277,7 +285,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -4525,9 +4631,16 @@ export class UrlbarInput {
+@@ -4525,9 +4630,16 @@ export class UrlbarInput {
    }
  
    _on_mousedown(event) {
@@ -295,7 +303,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
  
          if (
            event.target != this.inputField &&
-@@ -4538,6 +4651,10 @@ export class UrlbarInput {
+@@ -4538,6 +4650,10 @@ export class UrlbarInput {
  
          this.focusedViaMousedown = !this.focused;
          this._preventClickSelectsAll = this.focused;
@@ -306,7 +314,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
  
          // Keep the focus status, since the attribute may be changed
          // upon calling this.focus().
-@@ -4573,7 +4690,7 @@ export class UrlbarInput {
+@@ -4573,7 +4689,7 @@ export class UrlbarInput {
          }
          // Don't close the view when clicking on a tab; we may want to keep the
          // view open on tab switch, and the TabSelect event arrived earlier.
@@ -315,7 +323,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
            break;
          }
  
-@@ -4890,7 +5007,7 @@ export class UrlbarInput {
+@@ -4890,7 +5006,7 @@ export class UrlbarInput {
      // When we are in actions search mode we can show more results so
      // increase the limit.
      let maxResults =

src/browser/themes/shared/preferences/zen-preferences.css

@@ -544,6 +544,12 @@ groupbox h2 {
   }
 }
 
+@media (max-width: 1320px) {
+  #zenLayoutList {
+    flex-wrap: wrap;
+  }
+}
+
 /* Disable mozilla's settings */
 
 #dataCollectionCategory,

src/toolkit/content/widgets/panel-js.patch

@@ -0,0 +1,24 @@
+diff --git a/toolkit/content/widgets/panel.js b/toolkit/content/widgets/panel.js
+index 1dd4fc2a839fc6fde1ce2fc6437625e8d22bbb90..04fcb049225148f1b1f9c4b16cf2d2537887fbec 100644
+--- a/toolkit/content/widgets/panel.js
++++ b/toolkit/content/widgets/panel.js
+@@ -138,6 +138,9 @@
+             this.anchorNode.closest("toolbarbutton, .anchor-root") ||
+             this.anchorNode;
+           anchorRoot.setAttribute("open", "true");
++          if (anchorRoot.closest("#urlbar") && window.gURLBar) {
++            gURLBar.setAttribute("has-popup-open", "true");
++          }
+         }
+ 
+         if (this.getAttribute("animate") != "false") {
+@@ -208,6 +211,9 @@
+             this.anchorNode.closest("toolbarbutton, .anchor-root") ||
+             this.anchorNode;
+           anchorRoot.removeAttribute("open");
++          if (anchorRoot.closest("#urlbar") && window.gURLBar) {
++            gURLBar.removeAttribute("has-popup-open");
++          }
+         }
+       }
+ 

src/zen/common/ZenCustomizableUI.sys.mjs

@@ -69,12 +69,12 @@ export var ZenCustomizableUI = new (class {
         addon-webext-overflowtarget="overflowed-extensions-list"
         mode="icons">
         <hbox id="zen-sidebar-top-buttons-customization-target" class="customization-target" flex="1">
-          <toolbaritem id="zen-toggle-compact-mode" removable="true">
+          <toolbaritem id="zen-toggle-compact-mode" removable="true" data-l10n-id="zen-toggle-compact-mode-button">
             <toolbarbutton
               class="toolbarbutton-1"
               command="cmd_toggleCompactModeIgnoreHover"
-              flex="1"
+              data-l10n-id="zen-toggle-compact-mode-button"
-              data-l10n-id="zen-toggle-compact-mode-button" />
+              flex="1" />
           </toolbaritem>
           <html:div id="zen-sidebar-top-buttons-separator" skipintoolbarset="true" overflows="false"></html:div>
         </hbox>

src/zen/common/ZenUIManager.mjs

@@ -275,15 +275,18 @@ var gZenUIManager = {
   // Section: URL bar
 
   onUrlbarOpen() {
-    gURLBar.setAttribute('had-proxystate', gURLBar.getAttribute('pageproxystate'));
+    setTimeout(() => {
+      const hadValid = gURLBar.getAttribute('pageproxystate') === 'valid';
       gURLBar.setPageProxyState('invalid', false);
+      gURLBar.setAttribute('had-proxystate', hadValid);
+    }, 0);
   },
 
   onUrlbarClose() {
-    if (gURLBar.hasAttribute('had-proxystate')) {
+    if (gURLBar.getAttribute('had-proxystate') == 'true') {
-      gURLBar.setURI();
+      gURLBar.setPageProxyState('valid', false);
-      gURLBar.removeAttribute('had-proxystate');
     }
+    gURLBar.removeAttribute('had-proxystate');
   },
 
   onUrlbarSearchModeChanged(event) {

src/zen/common/styles/zen-browser-ui.css

@@ -133,13 +133,17 @@
 }
 
 :root:not([zen-single-toolbar='true']) #zen-appcontent-wrapper {
-  z-index: 2;
+  z-index: 3;
 }
 
-:root[zen-single-toolbar='true'] #nav-bar {
+#nav-bar {
+  border-top-color: transparent !important;
+
+  :root[zen-single-toolbar='true'] & {
     border-top: none !important;
     --zen-toolbar-height: 37px;
   }
+}
 
 #zen-main-app-wrapper {
   background: var(--zen-themed-toolbar-bg-transparent);
@@ -243,6 +247,7 @@
 @media (-moz-platform: macos) {
   :root[zen-window-buttons-reversed='true'][zen-right-side='true'] .titlebar-buttonbox-container {
     margin-inline-start: max(calc(var(--zen-element-separation) - 3px), 4px);
+    margin-block: auto;
   }
 }
 

src/zen/common/styles/zen-omnibox.css

@@ -136,16 +136,20 @@
   }
 
   .identity-box-button,
-  #zen-copy-url-button {
+  .urlbar-page-action {
     opacity: 0;
+    height: 100%; /* To still be able to open popups */
+    visibility: collapse;
+
+    :root:not([supress-primary-adjustment='true']) & {
       transition:
         opacity 0.15s,
         visibility 0.15s;
-    visibility: collapse;
+    }
-    height: 100%; /* To still be able to open popups */
 
     #navigator-toolbox:hover &,
     &[open],
+    #urlbar[has-popup-open='true'] &,
     #identity-box[pageproxystate='invalid'] & {
       opacity: 1;
       visibility: visible;
@@ -296,13 +300,6 @@
 :root[zen-single-toolbar='true'] {
   --urlbar-icon-border-radius: 8px !important;
 
-  .urlbar-page-action:not([open]):not([showing]):not(
-      :is(#zen-copy-url-button, #identity-permission-box)
-    ),
-  #tracking-protection-icon-container {
-    display: none;
-  }
-
   #identity-permission-box > *:not(#zen-site-data-icon-button) {
     visibility: collapse;
   }
@@ -313,7 +310,7 @@
 
   #urlbar:not([breakout-extend='true']) {
     #identity-box:not([pageproxystate='invalid']) {
-      order: 9;
+      order: 2;
     }
   }
 
@@ -742,7 +739,9 @@
  * them into a single, unified button */
 #reader-mode-button,
 #urlbar-go-button,
-#star-button-box {
+#star-button-box,
+#picture-in-picture-button,
+#pageActionButton:not([open]) {
   display: none !important;
 }
 

src/zen/common/styles/zen-single-components.css

@@ -33,6 +33,12 @@
   display: none !important;
 }
 
+/* hide Mozilla services from the app menu */
+#PanelUI-fxa-menu-services,
+#PanelUI-fxa-cta-menu {
+  display: none !important;
+}
+
 body > #confetti {
   z-index: 1;
 }
@@ -290,16 +296,23 @@ body > #confetti {
   --arrowpanel-menuitem-border-radius: 10px;
 }
 
-#unified-extensions-messages-container {
-  display: none;
-}
-
 #zen-site-data-addons {
   display: flex;
   flex-wrap: wrap;
   gap: 8px;
   overflow: visible;
 
+  unified-extensions-item-messagebar-wrapper,
+  .unified-extensions-item-contents {
+    display: none !important;
+  }
+
+  &[overflowing='true'] {
+    overflow-x: auto;
+    max-height: 420px;
+    mask-image: linear-gradient(to top, transparent, black 5%);
+  }
+
   .unified-extensions-item-name,
   .unified-extensions-item-message,
   .unified-extensions-item-message-hover,
@@ -326,6 +339,11 @@ body > #confetti {
       justify-content: center;
       align-items: center;
       border-radius: 6px;
+
+      @media not (-moz-platform: macos) {
+        border-radius: 4px;
+      }
+
       transition:
         background-color 0.1s ease-in-out,
         transform 0.12s ease-in-out;
@@ -485,6 +503,10 @@ body > #confetti {
   padding: 8px;
   padding-bottom: 0;
 
+  :root[zen-single-toolbar='true']:not([zen-right-side='true']) & {
+    flex-direction: row-reverse;
+  }
+
   & toolbarbutton {
     margin: 0;
     appearance: none;
@@ -515,18 +537,27 @@ body > #confetti {
       position: absolute;
       width: 100%;
       height: 100%;
+      @media (-moz-platform: macos) {
         background: linear-gradient(
           to bottom,
           light-dark(rgb(255, 255, 255), rgb(34, 34, 34)),
           light-dark(rgb(246, 246, 246), rgb(21, 21, 21))
         );
-      transition: transform 0.12s ease-in-out;
+
         box-shadow:
           0px 2px 4px rgba(0, 0, 0, 0.075),
           inset 0px 1px 0px light-dark(transparent, rgba(255, 255, 255, 0.15));
         border-radius: 6px;
         --base-border-color: light-dark(rgba(0, 0, 0, 0.175), rgba(255, 255, 255, 0.1));
         border: 1px solid light-dark(var(--base-border-color), rgb(21, 21, 21));
+      }
+
+      @media not (-moz-platform: macos) {
+        border-radius: 4px;
+        background-color: color-mix(in srgb, currentcolor 6%, transparent);
+      }
+
+      transition: transform 0.12s ease-in-out;
       box-sizing: border-box;
       will-change: transform;
     }
@@ -553,6 +584,10 @@ body > #confetti {
   margin: 6px 0;
 }
 
+#unified-extensions-messages-container:empty {
+  display: none;
+}
+
 /* Overflow panel */
 #widget-overflow-mainView {
   --menu-panel-width-wide: 200px;

src/zen/common/styles/zen-theme.css

@@ -195,7 +195,8 @@
 
   /* Transitions */
   --zen-tabbox-element-indent-transition: margin-inline-start 0.1s ease-in-out;
-  --zen-hidden-toolbar-transition: 0.15s ease-in-out;
+  --zen-hidden-toolbar-transition-duration: 0.15s;
+  --zen-hidden-toolbar-transition: var(--zen-hidden-toolbar-transition-duration) ease-in-out;
 
   /* XUL */
   --zen-main-browser-background: light-dark(rgb(235, 235, 235), #1b1b1b);

src/zen/compact-mode/windows-captions-fix-active.inc.css

@@ -5,6 +5,6 @@
  */
 
 & .titlebar-buttonbox-container {
-  visibility: visible;
+  max-height: 100%;
   transition: none;
 }

src/zen/compact-mode/windows-captions-fix-default.inc.css

@@ -5,9 +5,15 @@
  */
 
 & .titlebar-buttonbox-container {
-  display: collapse;
+  max-height: 0px;
   /* We need to hide them since on Windows the native
    * panels when hovering over them can interfere with the
    * web content */
-  transition: visibility var(--zen-hidden-toolbar-transition);
+  transition: max-height 0s;
+  transition-delay: calc(var(--zen-hidden-toolbar-transition-duration) + 0.2s);
+
+  & .titlebar-button {
+    padding-top: 0 !important;
+    padding-bottom: 0 !important;
+  }
 }

src/zen/glance/ZenGlanceManager.mjs

@@ -247,7 +247,7 @@
         {
           duration: 0.3,
           type: 'spring',
-          delay: 0.15,
+          delay: 0.2,
           bounce: 0,
         }
       );
@@ -434,6 +434,16 @@
       };
     }
 
+    #createGlancePreviewElement(src) {
+      const imageDataElement = document.createXULElement('image');
+      imageDataElement.setAttribute('src', src);
+
+      const parent = document.createElement('div');
+      parent.classList.add('zen-glance-element-preview');
+      parent.appendChild(imageDataElement);
+      return parent;
+    }
+
     /**
      * Handle element preview if provided
      * @param {Object} data - Glance data
@@ -444,13 +454,7 @@
         return null;
       }
 
-      const imageDataElement = document.createXULElement('image');
+      const imageDataElement = this.#createGlancePreviewElement(data.elementData);
-      imageDataElement.setAttribute('src', data.elementData);
-      imageDataElement.classList.add('zen-glance-element-preview');
-
-      // set an aspect ratio to prevent stretching during animation
-      imageDataElement.style.aspectRatio = `${data.width} / ${data.height}`;
-
       this.browserWrapper.prepend(imageDataElement);
       this.#glances.get(this.#currentGlanceID).elementImageData = data.elementData;
 
@@ -460,7 +464,7 @@
           opacity: [1, 0],
         },
         {
-          duration: 0.3,
+          duration: 0.25,
           easing: 'easeInOut',
         }
       );
@@ -948,7 +952,7 @@
         const originalPosition = this.#glances.get(this.#currentGlanceID).originalPosition;
         const elementImageData = this.#glances.get(this.#currentGlanceID).elementImageData;
 
-        this.#addElementPreview(elementImageData, originalPosition);
+        this.#addElementPreview(elementImageData);
 
         // Create curved closing animation sequence
         const closingData = this.#createClosingDataFromOriginalPosition(originalPosition);
@@ -990,17 +994,10 @@
     /**
      * Add element preview if available, used for the closing animation
      * @param {string} elementImageData - The element image data
-     * @param {Object} rect - The rectangle data
      */
-    #addElementPreview(elementImageData, rect) {
+    #addElementPreview(elementImageData) {
       if (elementImageData) {
-        const imageDataElement = document.createXULElement('image');
+        const imageDataElement = this.#createGlancePreviewElement(elementImageData);
-        imageDataElement.setAttribute('src', elementImageData);
-        imageDataElement.classList.add('zen-glance-element-preview');
-
-        // set an aspect ratio to prevent stretching during animation
-        imageDataElement.style.aspectRatio = `${parseFloat(rect.width)} / ${parseFloat(rect.height)}`;
-
         this.browserWrapper.prepend(imageDataElement);
       }
     }

src/zen/glance/zen-glance.css

@@ -171,10 +171,17 @@
   position: absolute;
   pointer-events: none;
   width: 100%;
+  height: 100%;
   z-index: 0;
   border-radius: var(--zen-native-inner-radius);
   top: 0%;
   left: 50%;
   translate: -50% 0%;
   will-change: transform, opacity;
+  background: rgba(255, 255, 255, 0.1);
+
+  & image {
+    width: 100%;
+    max-width: 100%;
+  }
 }

src/zen/media/zen-media-controls.css

@@ -294,7 +294,7 @@
 }
 
 /* Hide #zen-media-focus-button if it doesn't fit in the toolbar */
-@container media-controls (max-width: 150px) {
+@container media-controls (max-width: 165px) {
   #zen-media-focus-button {
     display: none;
   }

src/zen/split-view/zen-split-group.inc.css

@@ -133,8 +133,11 @@ tab-group[split-view-group] {
     }
 
     @container browser-tab (min-width: 70px) {
-      :root[zen-sidebar-expanded='true'] &:hover > .tabbrowser-tab:not([pinned]) .tab-close-button {
+      :root[zen-sidebar-expanded='true'] &:hover > .tabbrowser-tab:not([pinned]:not([pending])) .tab-close-button {
         display: block !important;
+
+        /* This is from Firefox itself, but we need to always override it */
+        margin-inline-end: 0 !important;
       }
     }
 

src/zen/tabs/ZenPinnedTabManager.mjs

@@ -883,7 +883,7 @@
               );
               for (const tab of pinnedTabs) {
                 if (allAreUnloaded && closeIfPending) {
-                  return await this._onCloseTabShortcut(event, tab, { behavior: 'close' });
+                  return await this.onCloseTabShortcut(event, tab, { behavior: 'close' });
                 }
               }
               await gBrowser.explicitUnloadTabs(pinnedTabs);

src/zen/tabs/zen-tabs.css

@@ -112,5 +112,17 @@
     & #titlebar {
       padding-top: var(--zen-toolbar-height);
     }
+
+    & #nav-bar {
+      width: calc(100% + var(--zen-toolbox-max-width) - var(--zen-element-separation));
+
+      /**
+       * We only want it when the window buttons are on the left side, in other
+       * words, the first of the two selectors above.
+       */
+      :root:not([zen-window-buttons-reversed='true']) & {
+        margin-left: calc(-1 * var(--zen-toolbox-max-width) + var(--zen-element-separation) + 4px);
+      }
+    }
   }
 }

src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css

@@ -30,11 +30,6 @@ z-index: 1;
     }
 
 %include ../../compact-mode/windows-captions-fix-default.inc.css
-
-    & .titlebar-button {
-      padding-top: 0 !important;
-      padding-bottom: 0 !important;
-    }
   }
 
   @media -moz-pref('zen.view.experimental-no-window-controls') {

src/zen/urlbar/ZenSiteDataPanel.sys.mjs

@@ -127,6 +127,16 @@ export class nsZenSiteDataPanel {
     this.#setSitePermissions();
     this.#setSiteSecurityInfo();
     this.#setSiteHeader();
+    this.#setAddonsOverflow();
+  }
+
+  #setAddonsOverflow() {
+    const addons = this.document.getElementById('zen-site-data-addons');
+    if (addons.getBoundingClientRect().height > 420) {
+      addons.setAttribute('overflowing', 'true');
+    } else {
+      addons.removeAttribute('overflowing');
+    }
   }
 
   #setSiteHeader() {
@@ -353,9 +363,15 @@ export class nsZenSiteDataPanel {
     switch (permission.state) {
       // There should only be these types being displayed in the panel.
       case SitePermissions.ALLOW:
+        if (permission.id === 'site-protection') {
+          return 'zen-site-data-protections-enabled';
+        }
         return 'zen-site-data-setting-allow';
       case SitePermissions.BLOCK:
       case SitePermissions.AUTOPLAY_BLOCKED_ALL:
+        if (permission.id === 'site-protection') {
+          return 'zen-site-data-protections-disabled';
+        }
         return 'zen-site-data-setting-block';
       default:
         return null;
@@ -511,12 +527,12 @@ export class nsZenSiteDataPanel {
 
     const isCrossSiteCookie = permission.id.startsWith('3rdPartyStorage');
     label.parentNode.setAttribute('state', newState == SitePermissions.ALLOW ? 'allow' : 'block');
+    label._permission.state = newState;
     if (!isCrossSiteCookie) {
       label
         .querySelector('.zen-permission-popup-permission-state-label')
-        .setAttribute('data-l10n-id', this.#getPermissionStateLabelId({ state: newState }));
+        .setAttribute('data-l10n-id', this.#getPermissionStateLabelId(label._permission));
     }
-    label._permission.state = newState;
   }
 
   #onClickEvent(event) {
@@ -580,7 +596,6 @@ export class nsZenSiteDataPanel {
       };
       checkEmptyTab();
     });
-    this.anchor.setAttribute('open', 'true');
     const callout = new FeatureCallout({
       win: this.window,
       location: 'chrome',
@@ -609,13 +624,6 @@ export class nsZenSiteDataPanel {
                     callout_attachment: 'topleft',
                   },
                 },
-                {
-                  selector: '#identity-icon-box',
-                  panel_position: {
-                    anchor_attachment: 'bottomcenter',
-                    callout_attachment: 'topleft',
-                  },
-                },
               ],
               content: {
                 position: 'callout',

surfer.json

@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.17b",
+        "displayVersion": "1.17.3b",
         "github": {
           "repo": "zen-browser/desktop"
         },