Merge branch 'upstream'

The bottom left corner of a tab can overlap the currently selected tab
if hovered over, this fixes the issue.

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,14 @@
+---
+name: 🐛 Bug
+about: Report a bug
+labels: bug
+---
+
+**Description**
+Include clear explaination of bug and how to reproduce.
+
+**Include screenshot / video recording if possible.**
+
+**Configuration**
+- Firefox Version: 
+- OS: (eg. Windows, macOS, etc.)

.github/ISSUE_TEMPLATE/feature.md

@@ -0,0 +1,10 @@
+---
+name: ✨ Feature
+about: Request a new feature / enhancement
+labels: enhancement
+---
+
+**Description**
+Include clear explaination of the feature and how it works.
+
+**Include screenshot / video recording if possible.**

.gitignore

@@ -4,3 +4,8 @@ inkscape-template.svg
 /userContent.css
 .vscode
 /icons
+/chrome/background-0.jpg
+/chrome/background-1.jpg
+/chrome/background-0.png
+/chrome/background-1.png
+/custom/

README.md

@@ -1,83 +1,116 @@
 # Edge-Frfox
 A Firefox userChrome.css theme that aims to recreate the look and feel of the Chromium version of Microsoft Edge.
 
-![thumbnail](screenshots/thumbnail.png)
+<!-- use <img> element to set a maximum width -->
-###### Screenshot taken with macOS Monterey / Firefox Nightly 96.0a1 (2021-11-30)
+<img src="screenshots/thumbnail.png" alt="thumbnail screenshot" title="Screenshot taken with macOS Monterey / Firefox Nightly 96.0a1 (2021-11-30)" width="800">
 
 ## How to install
 1. Go to `about:support` and click the "Open Folder/Show in Finder" button for the root directory of your browser profile/s.
 2. Download and copy the `chrome` folder into the profile folder.
 3. Go to about:config and change these preferences:
-   ###### For all operating systems:
-   1. `toolkit.legacyUserProfileCustomizations.stylesheets` = `true`
-   2. `svg.context-properties.content.enabled` = `true`
-   3. `layout.css.color-mix.enabled` = `true`
 
-   ###### On macOS:
+   ### For all operating systems:
-   ~~1. To use the Edge style context menu on macOS then set `widget.macos.native-context-menus` = `false`~~ **(Not Implemented Yet!)**
+   * `toolkit.legacyUserProfileCustomizations.stylesheets` = `true`
+   * `svg.context-properties.content.enabled` = `true`
+   * `layout.css.color-mix.enabled` = `true`
 
-   ##### Recommended:
+   ### Firefox 119.0 and above:
-   1. `browser.tabs.tabMinWidth` = `66`
+   * `layout.css.light-dark.enabled` = `true`
-   2. `browser.tabs.tabClipWidth` = `66`
 
-   Additional tweaks can also be applied to the theme, such as Mica (Windows 11 Only), Floating Tabs and more. See [Tweaks](#tweaks).
+   ### On macOS:
+   * To use the Edge style context menu on macOS then set `widget.macos.native-context-menus` = `false`
+
+   ### Recommended:
+   * `browser.tabs.tabMinWidth` = `66`
+   * `browser.tabs.tabClipWidth` = `86`
+
+   ### Optional:
+   * To use the light theme in private browsing mode set `browser.theme.dark-private-windows` = `false`
+
+   Additional tweaks can also be applied to the theme, such as Floating Tabs, rounded browser corners and more. See [Tweaks](#tweaks).
 
 **Note: Most frequently tested on macOS**
 
-## Screenshots (Windows)
+## Screenshots
-|Theme|Light|Dark|
+| Theme                               | Light                         | Dark                         |
-|-|-|-|
+| ----------------------------------- | ----------------------------- | ---------------------------- |
-|Default|![Light](screenshots/light.png)|![Dark](screenshots/dark.png)|
+| Default (Windows 11)                | ![Light][s-l]                 | ![Dark][s-d]                 |
-|Floating Tabs|![Light, Floating Tabs](screenshots/light-floating-tabs.png)|![Dark, Floating Tabs](screenshots/dark-floating-tabs.png)|
+| Floating Tabs (Windows 11)          | ![Light, Floating Tabs][s-lf] | ![Dark, Floating Tabs][s-df] |
-|Mica|![Light, Mica](screenshots/light-mica.png)|![Dark, Mica](screenshots/dark-mica.png)|
+| GTK (GNOME 42, [adw-gtk3][1] theme) | ![Light, GTK][s-lgtk]         | ![Dark, GTK][s-dgtk]         |
-|Mica and Floating Tabs|![Light, Mica and Floating Tabs](screenshots/light-mica-floating-tabs.png)|![Dark, Mica and Floating Tabs](screenshots/dark-mica-floating-tabs.png)|
 
 ## Tweaks
 Certain tweaks can be applied to the theme, to enable them navigate to `about:config` and create a boolean key for each tweak you want to use and set it to `true`, then restart the browser.
 
 To disable a tweak, set the key to `false` or delete it, then restart the browser.
 
-|disable drag space above tabs|
+| Enable Edge style floating tabs                                 |
-|-|
+| --------------------------------------------------------------- |
-|`uc.tweak.disable-drag-space`|
+| `uc.tweak.floating-tabs`                                        |
+| **OPTIONAL1: Make the top and bottom margins of the tab equal** |
+| `uc.tweak.floating-tabs.equal-margin`                           |
 
-|enable Edge style floating tabs|
+| Enable rounded corners     |
-|-|
+| -------------------------- |
-|`uc.tweak.floating-tabs`|
+| `uc.tweak.rounded-corners` |
 
-|enable Mica toolbar background (Windows 11 only)|
+| Hide Tabs Bar (Useful when using vertical tabs extensions such as Sidebery, Tree Style Tab, etc.) |
-|-|
+| ------------------------------------------------------------------------------------------------- |
-|**See [Mica Tweak Instructions (Windows 11 Only)](#mica-tweak-instructions-windows-11-only) for installation instructions.**|
+| **NOTE: At the moment, this only supports macOS and Windows.**                                    |
-|**NOTE: Only works on default theme: 'System theme - auto'**|
+| `uc.tweak.hide-tabs-bar`                                                                          |
-|`uc.tweak.win11-mica`|
+| **OPTIONAL: Only enable in fullscreen mode (currently: macOS Only!)**                             |
+| `uc.tweak.hide-tabs-bar.only-when-maximised`                                                      |
 
-|force tab background colour to the same colour as the navbar background (useful for Proton themes)|
+| Use background image on newtab page                                                                |
-|-|
+| -------------------------------------------------------------------------------------------------- |
-|**NOTE: can cause readability issues with some themes! (eg. white text on white bg)**|
+| **SETUP: Add an image named `background-0.(jpg/png)` to the `chrome` folder.**                     |
-|`uc.tweak.force-tab-colour`|
+| **OPTIONAL: Add a second image named `background-1.(jpg/png)` for seperate dark mode background.** |
-|![force tab colour example](screenshots/force-tab-colour.svg) (Left: OFF, Right: ON)|
+| `uc.tweak.newtab-background`                                                                       |
 
-|only show Firefox account button when in private mode (useful as a private browsing indicator)|
+| Hide forward button when it's disabled (like in Edge)  |
-|-|
+| ------------------------------------------------------ |
-|**NOTE: all functionality of this button can still be accessed from the app menu.**|
+| `uc.tweak.hide-forward-button`                         |
-|`uc.tweak.fxa-button-as-private-indicator`|
 
-|remove tab separators|
+| Hide Firefox logo on newtab page |
-|-|
+| -------------------------------- |
-|`uc.tweak.remove-tab-separators`|
+| `uc.tweak.hide-newtab-logo`      |
 
-|remove extra padding from permissions button (older functionality)|
+| Disable drag space above tabs |
-|-|
+| ----------------------------- |
-|`uc.tweak.less-permissions-button-padding`|
+| `uc.tweak.disable-drag-space` |
 
-## Mica Tweak Instructions (Windows 11 Only)
+| Force tab background colour to the same colour as the navbar background (useful for Proton themes) |
-1. Download and install [Mica For Everyone](https://github.com/MicaForEveryone/MicaForEveryone).
+| -------------------------------------------------------------------------------------------------- |
-2. Create a custom process rule with the following:
+| **NOTE: can cause readability issues with some themes! (eg. white text on white bg)**              |
-   1. Name: `firefox`
+| `uc.tweak.force-tab-colour`                                                                        |
-   2. Titlebar Color: `System`
+| ![force tab colour example](screenshots/force-tab-colour.svg) (Left: OFF, Right: ON)               |
-   3. Backdrop Type: `Mica`
+
-3. Enable tweak in `about:config`: `uc.tweak.win11-mica`
+| Show context menu navigation buttons (Back, Forward, Reload, Bookmark) vertically |
-4. Restart Firefox.
+| --------------------------------------------------------------------------------- |
+| **NOTE: labels are only shown in the English language.**                          |
+| `uc.tweak.vertical-context-navigation`                                            |
+
+| Remove tab separators            |
+| -------------------------------- |
+| `uc.tweak.remove-tab-separators` |
+
+| Use Firefox's default context menu font-size (only applies to Windows) |
+| ---------------------------------------------------------------------- |
+| `uc.tweak.smaller-context-menu-text`                                   |
+
+| Disable custom context menus   |
+| ------------------------------ |
+| `uc.tweak.revert-context-menu` |
+
+| If a tab's close button is hidden, show it when hovering over tab |
+| ----------------------------------------------------------------- |
+| `uc.tweak.show-tab-close-button-on-hover`                         |
+
+## Mica Tweak Notice
+Mica is broken due to changes made in the Firefox 115 update, Mica has now been
+removed from this theme.
+
+If you still have `uc.tweak.win11-mica` set in `about:config` you can safely
+delete it
 
 ## Acknowledgements
 [muckSponge](https://github.com/muckSponge) - [MaterialFox](https://github.com/muckSponge/MaterialFox)
@@ -86,6 +119,15 @@ To disable a tweak, set the key to `false` or delete it, then restart the browse
 
 [KibSquib48](https://github.com/KibSquib48) - [MicaFox](https://github.com/KibSquib48/MicaFox)
 
----
+<!-- links -->
+[1]: https://github.com/lassekongo83/adw-gtk3
 
-Old version can be found [here](https://github.com/bmFtZQ/edge-frfox/tree/v91.0-archive).
+<!-- light mode screenshot links -->
+[s-l]: screenshots/light.png
+[s-lf]: screenshots/light-floating-tabs.png
+[s-lgtk]: screenshots/gtk-light.png
+
+<!-- dark mode screenshot links -->
+[s-d]: screenshots/dark.png
+[s-df]: screenshots/dark-floating-tabs.png
+[s-dgtk]: screenshots/gtk-dark.png

chrome/content/common.css

@@ -1,84 +1,59 @@
-/* EdgeFr-Fox by bmFtZQ - content/common.css */
+/* Edge-Frfox - content/common.css */
 
 /* colours */
 @-moz-document url-prefix(about:) {
   :root {
-    --in-content-page-color: #252525 !important;
+    --in-content-page-color: light-dark(#252525, #fff) !important;
-    --in-content-page-background: #f7f7f7 !important;
+    --in-content-page-background: light-dark(#f7f7f7, #252525) !important;
-    --in-content-deemphasized-text: #666 !important;
+    --in-content-deemphasized-text: light-dark(#666, #bbb) !important;
-    --in-content-box-background: #fff !important;
+    --in-content-box-background: light-dark(#fff, #333) !important;
-    --in-content-box-background-odd: rgba(0, 0, 0, 0.05) !important;
+    --in-content-box-background-odd: light-dark(rgb(0 0 0 / .05), rgb(255 255 255 / .05)) !important;
-    --in-content-box-info-background: #f7f7f7 !important;
+    --in-content-box-info-background: light-dark(#f7f7f7, rgb(255 255 255 / 0.15)) !important;
-    --in-content-icon-color: #666 !important;
+    --in-content-icon-color: light-dark(#666, #fff) !important;
-    --in-content-accent-color: #006CBE !important;
+    --in-content-accent-color: light-dark(#006CBE, #75B6E8) !important;
-    --in-content-accent-color-active: #1683D8 !important;
+    --in-content-accent-color-active: light-dark(#1683D8, #4C98D1) !important;
-    --in-content-border-hover: rgba(0, 0, 0, 0.5) !important;
+    --in-content-border-hover: light-dark(rgb(0 0 0 / .5), rgb(255 255 255 / .3)) !important;
     --in-content-border-invalid: var(--red-50) !important;
-    --in-content-border-color: #bebebe !important;
+    --in-content-border-color: light-dark(#bebebe, rgb(255 255 255 / .2)) !important;
-    --in-content-error-text-color: #FF848A !important;
+    --in-content-error-text-color: light-dark(#FF848A, #FF9AA2) !important;
-    --in-content-link-color: #0078D4 !important;
+    --in-content-link-color: light-dark(#0078D4, #75B6E8) !important;
-    --in-content-link-color-hover: #006CBE !important;
+    --in-content-link-color-hover: light-dark(#006CBE, #63ADE5) !important;
-    --in-content-link-color-active: #0749AC !important;
+    --in-content-link-color-active: light-dark(#0749AC, #4C98D1) !important;
-    --in-content-link-color-visited: #0078D4 !important;
+    --in-content-link-color-visited: light-dark(#0078D4, #75B6E8) !important;
+    --link-color: var(--in-content-link-color) !important;
+    --link-color-hover: var(--in-content-link-color-hover) !important;
+    --link-color-active: var(--in-content-link-color-active) !important;
+    --link-color-visited: var(--in-content-link-color-visited) !important;
     --in-content-button-text-color: var(--in-content-text-color) !important;
     --in-content-button-text-color-hover: var(--in-content-text-color) !important;
     --in-content-button-text-color-active: var(--in-content-button-text-color-hover) !important;
-    --in-content-button-background: #EDEDED !important;
+    --in-content-button-background: light-dark(#EDEDED, #3B3B3B) !important;
-    --in-content-button-background-hover: #e5e5e5 !important;
+    --in-content-button-background-hover: light-dark(#e5e5e5, #545454) !important;
-    --in-content-button-background-active: #d5d5d5 !important;
+    --in-content-button-background-active: light-dark(#d5d5d5, #606060) !important;
-    --in-content-primary-button-text-color: #fff !important;
+    --in-content-primary-button-text-color: light-dark(#fff, #fff) !important;
-    --in-content-primary-button-background: #0061e0 !important;
+    --in-content-primary-button-background: light-dark(#0061e0, #006CBE) !important;
-    --in-content-primary-button-background-hover: #0250bb !important;
+    --in-content-primary-button-background-hover: light-dark(#0250bb, #0078D4) !important;
-    --in-content-primary-button-background-active: #053e94 !important;
+    --in-content-primary-button-background-active: light-dark(#053e94, #005CA3) !important;
-    --in-content-danger-button-background: #DF4951 !important;
+    --color-accent-primary: light-dark(#0078D4, #006CBE) !important;
-    --in-content-danger-button-background-hover: #EA656C !important;
+    --color-accent-primary-hover: light-dark(#006CBE, #0078D4) !important;
-    --in-content-danger-button-background-active: #BB353C !important;
+    --color-accent-primary-active: light-dark(#0749AC, #005CA3) !important;
-    --in-content-focus-outline-color: color-mix(in srgb, #0055D7 50%, transparent) !important;
+    --in-content-danger-button-background: light-dark(#DF4951, #E12424) !important;
-    --in-content-table-background: #f7f7f7 !important;
+    --in-content-danger-button-background-hover: light-dark(#EA656C, #F94343) !important;
+    --in-content-danger-button-background-active: light-dark(#BB353C, #AA1E1E) !important;
+    --in-content-focus-outline-color: light-dark(rgb(0 85 215 / .5), #63ADE5) !important;
+    --focus-outline-color: var(--in-content-focus-outline-color) !important;
+    --in-content-table-background: light-dark(#f7f7f7, #252525) !important;
     --in-content-text-color: var(--in-content-page-color) !important;
-    scrollbar-color: rgba(37, 37, 37, 0.4) #f7f7f7 !important;
+    --border-interactive-color: light-dark(#929292, #858585) !important;
-  }
+    scrollbar-color:
-
+      light-dark(rgb(37 37 37 / .4), rgb(255 255 255 / .4))
-  @media (prefers-color-scheme: dark) {
+      light-dark(#f7f7f7, #252525) !important;
-    :root {
-      --in-content-page-background: #252525 !important;
-      --in-content-page-color: #fff !important;
-      --in-content-deemphasized-text: #bbb !important;
-      --in-content-box-background: #333 !important;
-      --in-content-box-background-odd: rgba(255, 255, 255, 0.05) !important;
-      --in-content-box-info-background: rgba(255, 255, 255, 0.15) !important;
-      --in-content-border-color: rgba(255, 255, 255, 0.2) !important;
-      --in-content-border-hover: rgba(255, 255, 255, 0.3) !important;
-      --in-content-border-invalid: rgb(255, 132, 139) !important;
-      --in-content-error-text-color: #FF9AA2 !important;
-      --in-content-button-background: #3B3B3B !important;
-      --in-content-button-background-hover: #545454 !important;
-      --in-content-button-background-active: #606060 !important;
-      --in-content-icon-color: #fff !important;
-      --in-content-primary-button-text-color: #fff !important;
-      --in-content-primary-button-background: #006CBE !important;
-      --in-content-primary-button-background-hover: #0078D4 !important;
-      --in-content-primary-button-background-active: #005CA3 !important;
-      --in-content-danger-button-background: #E12424 !important;
-      --in-content-danger-button-background-hover: #F94343 !important;
-      --in-content-danger-button-background-active: #AA1E1E !important;
-      --in-content-focus-outline-color: #63ADE5 !important;
-      --in-content-table-background: #252525 !important;
-      --in-content-accent-color: #75B6E8 !important;
-      --in-content-accent-color-active: #4C98D1 !important;
-      --in-content-link-color: #75B6E8 !important;
-      --in-content-link-color-hover: #63ADE5 !important;
-      --in-content-link-color-active: #4C98D1 !important;
-      --in-content-link-color-visited: var(--in-content-link-color) !important;
-      --card-outline-color: #555 !important;
-      --dialog-warning-text-color: var(--red-40) !important;
-      scrollbar-color: rgba(255, 255, 255, .4) #252525 !important;
-    }
   }
 }
 
 /* preferences */
-@-moz-document url-prefix(about:preferences), url-prefix(about:addons) {
+@-moz-document url-prefix(about:preferences),
+url-prefix(about:addons) {
   .category[selected] {
     position: relative !important;
     border-radius: 4px !important;
@@ -96,8 +71,9 @@
     background-color: var(--in-content-accent-color);
     border-radius: 3px;
     position: absolute;
-    left: 0;
+    left: 2px;
-    top: 12px;
+    top: 50%;
+    translate: 0 -50%;
   }
 
   button.tab-button:hover {
@@ -108,6 +84,16 @@
   button.tab-button[selected]:hover {
     border-block-color: transparent currentColor !important;
   }
+
+  .toggle-button {
+    --toggle-dot-margin: 4px !important;
+    --toggle-width: 40px !important;
+    --toggle-height: 20px !important;
+    --toggle-background-color: transparent !important;
+    --toggle-dot-background-color: var(--in-content-page-color) !important;
+    --toggle-dot-background-color-on-pressed: #fff !important;
+    --toggle-dot-transform-x: calc(var(--toggle-width) - 2 * var(--toggle-dot-margin) - 2 * var(--toggle-border-width) - var(--toggle-dot-width)) !important;
+  }
 }
 
 /* fix page flashes when loading some websites */

chrome/content/newtab.css

@@ -1,9 +1,10 @@
-/* EdgeFr-Fox by bmFtZQ - content/newtab.css */
+/* Edge-Frfox - content/newtab.css */
 
 /* colours */
-@-moz-document url-prefix("about:newtab"), url-prefix("about:home") {
+@-moz-document url-prefix("about:newtab"),
-  body:not([lwt-newtab], [lwt-newtab-brighttext]),
+url-prefix("about:home"),
-  body[style*="--newtab-background-color: rgb(249, 249, 251)"] {
+url-prefix("about:firefoxview") {
+  :root:not([lwt-newtab], [lwt-newtab-brighttext]) {
     --newtab-background-color: #F7F7F7 !important;
     --newtab-background-color-secondary: #fff !important;
     --newtab-text-primary-color: #252525 !important;
@@ -22,7 +23,7 @@
     --newtab-wordmark-color: #737373 !important;
     --newtab-status-success: #50B080 !important;
     --newtab-status-error: #FF848A !important;
-    --newtab-inner-box-shadow-color: rgba(0, 0, 0, 0.1) !important;
+    --newtab-inner-box-shadow-color: rgb(0 0 0 / .1) !important;
     --newtab-overlay-color: color-mix(in srgb, var(--newtab-background-color) 85%, transparent) !important;
     --newtab-text-emphasis-background: #FFED32 !important;
     --newtab-text-emphasis-text-color: #000 !important;
@@ -31,8 +32,7 @@
     --newtab-button-secondary-color: inherit !important;
   }
 
-  body[style*="--newtab-background-color: rgb(43, 42, 51)"][lwt-newtab-brighttext],
+  :root:not([style*="color"])[lwt-newtab-brighttext] {
-  body:not([style*="color"])[lwt-newtab-brighttext] {
     --newtab-background-color: #252525 !important;
     --newtab-background-color-secondary: #4A4A4A !important;
     --newtab-text-primary-color: #fff !important;
@@ -49,7 +49,8 @@
   }
 }
 
-@-moz-document url-prefix("about:newtab"), url-prefix("about:home") {
+@-moz-document url-prefix("about:newtab"),
+url-prefix("about:home") {
   /* hide pin */
   .icon.icon-pin-small {
     display: none !important;
@@ -57,7 +58,7 @@
 
   /* unpinned sites have lower opacity title */
   .top-site-button .title:not(.pinned) {
-    opacity: 0.6 !important;
+    opacity: 0.7 !important;
   }
 
   /* search bar */
@@ -72,7 +73,7 @@
     white-space: nowrap !important;
     text-overflow: ellipsis !important;
     --elevation: 4;
-    box-shadow: 0 0 calc((var(--elevation) * 0.225px) + 2px) rgba(0, 0, 0, 0.11), 0 calc(var(--elevation) * 0.4px) calc((var(--elevation) * 0.9px)) rgba(0, 0, 0, 0.13) !important;
+    box-shadow: 0 0 calc((var(--elevation) * 0.225px) + 2px) rgb(0 0 0 / .11), 0 calc(var(--elevation) * 0.4px) calc((var(--elevation) * 0.9px)) rgb(0 0 0 / .13) !important;
   }
 
   .search-handoff-button:hover {
@@ -110,7 +111,7 @@
 
   .top-site-outer .default-icon,
   .top-site-outer .search-topsite {
-    background-size: 24px !important;
+    background-size: 16px !important;
     height: 24px !important;
     width: 24px !important;
   }
@@ -120,29 +121,51 @@
   }
 
   /* card */
+  .card-outer,
   .card-outer .card,
   .ds-card-grid.ds-card-grid-border .ds-card:not(.placeholder) {
-    border-radius: 4px !important;
+    border-radius: 6px !important;
-    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) !important;
+  }
+
+  .card-outer .card,
+  .ds-card-grid.ds-card-grid-border .ds-card:not(.placeholder) {
+    box-shadow: 0 1px 4px rgb(0 0 0 / .3) !important;
   }
 
   .card-outer .card-preview-image-outer,
   .ds-card-grid.ds-card-grid-border .ds-card:not(.placeholder) .img-wrapper .img img {
-    border-radius: 4px 4px 0 0 !important
+    border-radius: 6px 6px 0 0 !important
+  }
+
+  .fake-textbox {
+    overflow: hidden !important;
+    text-overflow: ellipsis !important;
+  }
+
+  .outer-wrapper.only-search {
+    display: flex !important;
+    padding: 30px !important;
+  }
+
+  @media (-moz-bool-pref: "uc.tweak.hide-newtab-logo") {
+    .logo-and-wordmark {
+      display: none !important;
+    }
+
+    .outer-wrapper:not(.fixed-search) .search-wrapper {
+      padding-top: 0 !important;
+    }
   }
 }
 
 /* private browsing newtab */
 @-moz-document url-prefix(about:privatebrowsing) {
   :root {
-    --uc-wordmark-color: #737373 !important;
+    --uc-wordmark-color: light-dark(#737373, #fff);
-    --uc-background-color-secondary: #fff !important;
+    --uc-background-color-secondary: light-dark(#fff, #4a4a4a);
-  }
 
-  @media (prefers-color-scheme: dark) {
+    @media (-moz-bool-pref: "browser.theme.dark-private-windows") {
-    :root {
+      color-scheme: dark !important;
-      --uc-wordmark-color: #fff !important;
-      --uc-background-color-secondary: #4a4a4a !important;
     }
   }
 
@@ -159,7 +182,7 @@
     border-radius: 99px !important;
     padding-inline-start: 48px !important;
     --elevation: 4;
-    box-shadow: 0 0 calc((var(--elevation) * 0.225px) + 2px) rgba(0, 0, 0, 0.11), 0 calc(var(--elevation) * 0.4px) calc((var(--elevation) * 0.9px)) rgba(0, 0, 0, 0.13) !important;
+    box-shadow: 0 0 calc((var(--elevation) * 0.225px) + 2px) rgb(0 0 0 / .11), 0 calc(var(--elevation) * 0.4px) calc((var(--elevation) * 0.9px)) rgb(0 0 0 / .13) !important;
   }
 
   .search-handoff-button:hover {
@@ -186,5 +209,108 @@
 
   .info {
     background-color: var(--uc-background-color-secondary) !important;
+    background-image: none !important;
+    position: relative !important;
+  }
+
+  .info::before {
+    content: "";
+    position: absolute;
+    left: 32px;
+    top: 20px;
+    height: 32px;
+    aspect-ratio: 1 / 1;
+    background: center / contain url("../icons/account-private.svg");
+    border-radius: 99px;
+  }
+}
+
+@media (-moz-bool-pref: "uc.tweak.newtab-background") {
+  @-moz-document url(about:newtab),
+  url(about:home),
+  url(about:privatebrowsing),
+  url-prefix("about:firefoxview") {
+    :root body {
+      /* specify both jpg and png file extensions, but jpg images will always
+      have a higher priority */
+      --bg-0: url(../background-0.jpg), url(../background-0.png);
+      --bg-1: url(../background-1.jpg), url(../background-1.png);
+      --newtab-element-hover-color: rgb(239 239 239 / .3) !important;
+      --newtab-element-active-color: rgb(239 239 239 / .45) !important;
+      --text-shadow: 0 1px 2px #000;
+      --icon-shadow: drop-shadow(0 0.3px 0.6px #000);
+      background-color: #252525 !important;
+      background-image: var(--bg-0) !important;
+      background-position: center !important;
+      background-size: cover !important;
+      background-attachment: fixed !important;
+    }
+
+    :root[lwt-newtab-brighttext] body,
+    :root.private body {
+      background-image: var(--bg-1), var(--bg-0) !important;
+      --newtab-element-hover-color: rgb(66 66 66 / .4) !important;
+      --newtab-element-active-color: rgb(66 66 66 / .55) !important;
+    }
+
+    @media not (-moz-bool-pref: "browser.theme.dark-private-windows") {
+      :root.private body {
+        background-image: var(--bg-0) !important;
+      }
+
+      @media (prefers-color-scheme: dark) {
+        :root.private body {
+          background-image: var(--bg-1), var(--bg-0) !important;
+        }
+      }
+    }
+
+    .top-site-outer .title,
+    .ds-header,
+    .ds-layout .section-title span,
+    .ds-navigation,
+    .page-section-header>h1,
+    .page-section-header>.section-description,
+    .closed-tab-li-main:not(:hover, :active),
+    .closed-tab-li-dismiss,
+    .brand-logo>.brand-feature-name,
+    #colorways-collection-title,
+    #colorways-collection-description,
+    .synced-tabs-container>.loading-content {
+      text-shadow: var(--text-shadow) !important;
+      color: #fff !important;
+      -moz-osx-font-smoothing: auto !important;
+    }
+
+    .wordmark,
+    .icon-settings,
+    .top-site-outer .context-menu-button,
+    .closed-tab-li-main:not(:hover, :active) .favicon,
+    .page-section-header:not(:hover)>.twisty,
+    .synced-tab-li-favicon,
+    .page-section-header:not(:hover)>.twisty,
+    .closed-tab-li-dismiss:not(:hover),
+    .synced-tabs-container>.loading-content .sync {
+      filter: var(--icon-shadow) !important;
+      color: #fff !important;
+      fill: currentColor !important
+    }
+
+    .section-top-bar .learn-more-link a,
+    .ds-navigation a {
+      color: #b3d4ff !important;
+      text-shadow: var(--text-shadow) !important;
+      -moz-osx-font-smoothing: auto !important;
+    }
+
+    .top-site-outer .title .sponsored-label,
+    .closed-tab-li-main:not(:hover, :active) :is(.closed-tab-li-url, .closed-tab-li-time) {
+      color: #eee !important;
+    }
+
+    .fixed-search .search-wrapper {
+      border-bottom: 0 !important;
+      background: transparent linear-gradient(#0004, transparent) !important;
+    }
   }
 }

chrome/global/browser.css

@@ -0,0 +1,79 @@
+/* Edge-Frfox - browser.css */
+
+@media (-moz-bool-pref: "uc.tweak.floating-tabs") {
+  :root {
+    --browser-frame-bgcolor: var(--lwt-accent-color);
+  }
+}
+
+@media not (-moz-bool-pref: "uc.tweak.floating-tabs") {
+  :root {
+    --browser-frame-bgcolor: var(--toolbar-bgcolor);
+  }
+}
+
+@media (-moz-bool-pref: "uc.tweak.rounded-corners") {
+  /* Fix changes to the bookmarks bar made in Firefox 120 */
+  :root[BookmarksToolbarOverlapsBrowser] .newTabBrowserPanel,
+  :root[BookmarksToolbarOverlapsBrowser] #sidebar-box {
+    padding-top: 0 !important;
+  }
+
+  :root[BookmarksToolbarOverlapsBrowser] #appcontent,
+  :root[BookmarksToolbarOverlapsBrowser] #sidebar-box {
+    margin-top: var(--bookmarks-toolbar-overlapping-browser-height);
+  }
+
+  :root {
+    --uc-tweak-rounded-corners-padding: 3px;
+    --uc-tweak-rounded-corners-border: 1px solid rgb(0 0 0 / .05);
+    --uc-tweak-rounded-corners-radius: 8px;
+    --uc-tweak-rounded-corners-shadow: 0px 1px 1px rgb(0 0 0 / .1);
+
+    & #browser:not([style*="--sidebar-border-color"]) {
+      --sidebar-border-color: light-dark(#bfbfbf80, #595959) !important;
+    }
+  }
+
+  /* disable rounded corners in fullscreen, only if the toolbar is hidden */
+  :root[inFullscreen] #navigator-toolbox:where([style*="margin-top"], [fullscreenShouldAnimate]) + #browser,
+  :root[inDOMFullscreen] #browser {
+    --uc-tweak-rounded-corners-padding: 0;
+    --uc-tweak-rounded-corners-border: none;
+    --uc-tweak-rounded-corners-radius: 0;
+    --uc-tweak-rounded-corners-shadow: none;
+  }
+
+  #appcontent {
+    margin-inline: var(--uc-tweak-rounded-corners-padding) !important;
+    margin-block-end: var(--uc-tweak-rounded-corners-padding) !important;
+    border-radius: var(--uc-tweak-rounded-corners-radius) !important;
+    overflow: hidden !important;
+    border: var(--uc-tweak-rounded-corners-border) !important;
+    box-shadow: var(--uc-tweak-rounded-corners-shadow) !important;
+  }
+  
+  /* apply rounded corners to sidebar */
+  #sidebar-box {
+    margin-inline-start: var(--uc-tweak-rounded-corners-padding) !important;
+    margin-block-end: var(--uc-tweak-rounded-corners-padding) !important;
+    border-radius: var(--uc-tweak-rounded-corners-radius) !important;
+    overflow: hidden !important;
+    border: var(--uc-tweak-rounded-corners-border) !important;
+    box-shadow: var(--uc-tweak-rounded-corners-shadow) !important;
+    
+    &[positionend] {
+      margin-inline-start: 0 !important;
+      margin-inline-end: var(--uc-tweak-rounded-corners-padding) !important;
+    }
+  }
+
+  /* remove sidebar border */
+  #sidebar-splitter {
+    border-inline-width: 0 !important;
+  }
+
+  #browser {
+    background-color: var(--browser-frame-bgcolor);
+  }
+}

chrome/global/colors.css

@@ -1,281 +1,312 @@
-/* EdgeFr-Fox by bmFtZQ - colors.css */
+/* Edge-Frfox - colors.css */
 
-/* light */
+/* default colours (light & dark) */
 :root:not(:-moz-lwtheme),
-:root[style*="--lwt-accent-color: rgb(240, 240, 244)"] {
+:root[privatebrowsingmode="temporary"][style*="--lwt-accent-color: rgb(28, 27, 34)"] {
-  --lwt-accent-color: #cecece !important;
+  --lwt-accent-color: light-dark(#cecece, #1C1C1C) !important;
-  --lwt-accent-color-inactive: #e8e8e8 !important;
+  --lwt-accent-color-inactive: light-dark(#e8e8e8, #2e2e2e) !important;
-  --lwt-text-color: #000 !important;
+  --lwt-text-color: light-dark(#000, #E5E5E5) !important;
-  --toolbar-bgcolor: #f7f7f7 !important;
+  --toolbar-bgcolor: light-dark(#f7f7f7, #3B3B3B) !important;
-  --toolbar-color: #000 !important;
+  --toolbar-non-lwt-bgcolor: var(--toolbar-bgcolor) !important;
-  --toolbarbutton-icon-fill: #000 !important;
+  --toolbar-color: light-dark(#000, #fff) !important;
-  --chrome-content-separator-color: #bfbfbf !important;
+  --toolbarbutton-icon-fill: light-dark(#000, #fff) !important;
-  --lwt-toolbarbutton-icon-fill-attention: #0078D4 !important;
+  --chrome-content-separator-color: light-dark(#bfbfbf, #686868) !important;
-  --toolbarbutton-icon-fill-attention: #0078D4 !important;
+  --lwt-toolbarbutton-icon-fill-attention: light-dark(#0078D4, #4C98D1) !important;
+  --toolbarbutton-icon-fill-attention: light-dark(#0078D4, #4C98D1) !important;
   --lwt-tab-text: var(--toolbar-color) !important;
-  --lwt-selected-tab-background-color: var(--toolbar-bgcolor) !important;
+  --lwt-selected-tab-background-color: unset !important;
   --tab-selected-bgcolor: var(--toolbar-bgcolor) !important;
-  --toolbar-field-background-color: #fff !important;
+  --toolbar-field-background-color: light-dark(#fff, #2B2B2B) !important;
-  --toolbar-field-color: #000 !important;
+  --toolbar-field-color: light-dark(#000, #fff) !important;
-  --toolbar-field-border-color: #0000 !important;
+  --toolbar-field-border-color: light-dark(#0000, #0000) !important;
   --toolbar-field-focus-background-color: var(--toolbar-field-background-color) !important;
   --toolbar-field-focus-color: var(--toolbar-field-color) !important;
-  --toolbar-field-focus-border-color: #0055D7 !important;
+  --toolbar-field-focus-border-color: light-dark(#0055D7, #63ADE5) !important;
+  --link-color: light-dark(#0078D4, #75B6E8) !important;
+  --urlbar-hover-highlight-color: light-dark(rgb(192 192 192 / .5), rgb(128 128 128 / .5)) !important;
+  --urlbar-box-bgcolor: light-dark(rgb(0 0 0 / .09), rgb(255 255 255 / .11)) !important;
+  --urlbar-box-hover-bgcolor: light-dark(rgb(0 0 0 / .09), rgb(255 255 255 / .11)) !important;
+  --urlbar-box-focus-bgcolor: light-dark(rgb(0 0 0 / .22), rgb(255 255 255 / .28)) !important;
   --urlbar-icon-fill-opacity: 1 !important;
-  --urlbar-popup-url-color: #0072C9 !important;
+  --urlbar-popup-url-color: light-dark(#0072C9, #75B6E8) !important;
   --lwt-brighttext-url-color: var(--urlbar-popup-url-color) !important;
-  --urlbar-box-bgcolor: var(--toolbar-field-background-color) !important;
+  --autocomplete-popup-background: light-dark(#fff, #4A4A4A) !important;
-  --autocomplete-popup-background: #fff !important;
+  --autocomplete-popup-color: light-dark(#fff, #fff) !important;
-  --autocomplete-popup-color: #fff !important;
+  --autocomplete-popup-highlight-background: light-dark(#f2f2f2, #383838) !important;
-  --autocomplete-popup-highlight-background: #f2f2f2 !important;
+  --autocomplete-popup-hover-background: light-dark(#e5e5e5, #444444) !important;
-  --autocomplete-popup-hover-background: #e5e5e5 !important;
+  --autocomplete-popup-separator-color: light-dark(#dadada00, #63636300) !important;
-  --autocomplete-popup-separator-color: #dadada00 !important;
+  --button-bgcolor: light-dark(#EDEDED, #5C5C5C) !important;
-  --toolbarbutton-hover-background: #e0e0e0 !important;
+  --button-hover-bgcolor: light-dark(#e5e5e5, #646464) !important;
-  --toolbarbutton-active-background: #d5d5d5 !important;
+  --button-active-bgcolor: light-dark(#d5d5d5, #575757) !important;
-  --button-bgcolor: #EDEDED !important;
+  --button-primary-bgcolor: light-dark(#0078D4, #006CBE) !important;
-  --button-hover-bgcolor: #e5e5e5 !important;
+  --button-primary-hover-bgcolor: light-dark(#006CBE, #0078D4) !important;
-  --button-active-bgcolor: #d5d5d5 !important;
+  --button-primary-active-bgcolor: light-dark(#1683D8, #005CA3) !important;
-  --button-primary-bgcolor: #0078D4 !important;
+  --button-primary-color: light-dark(#fff, #fff) !important;
-  --button-primary-hover-bgcolor: #006CBE !important;
+  --error-text-color: light-dark(#FF9AA2, #FF9AA2) !important;
-  --button-primary-active-bgcolor: #1683D8 !important;
+  --input-bgcolor: light-dark(#fff, #4A4A4A) !important;
-  --button-primary-color: #fff !important;
+  --input-color: light-dark(#2b2b2b, #fff) !important;
-  --error-text-color: #FF9AA2 !important;
+  --input-border-color: light-dark(#bebebe, #8A8A8A) !important;
-  --input-bgcolor: #fff !important;
+  --input-error-border-color: light-dark(#FF848A, #FF848A) !important;
-  --input-color: #2b2b2b !important;
+  --zoom-controls-bgcolor: light-dark(#4A4A4A, #4A4A4A) !important;
-  --input-border-color: #bebebe !important;
+  --arrowpanel-background: light-dark(#fff, #4A4A4A) !important;
-  --input-error-border-color: #FF848A !important;
+  --arrowpanel-color: light-dark(#1c1c1c, #fff) !important;
-  --zoom-controls-bgcolor: #4A4A4A !important;
+  --panel-description-color: light-dark(#000a, #fffb) !important;
-  --arrowpanel-background: #fff !important;
+  --panel-disabled-color: light-dark(#9E9E9E, #ABABAA) !important;
-  --arrowpanel-color: #000 !important;
+  --arrowpanel-dimmed: light-dark(#565656, #565656) !important;
-  --panel-description-color: #000a !important;
+  --arrowpanel-dimmed-further: light-dark(#707070, #707070) !important;
-  --panel-disabled-color: #0009 !important;
+  --panel-item-hover-bgcolor: light-dark(#eee, #646464) !important;
-  --arrowpanel-dimmed: #565656 !important;
+  --panel-item-active-bgcolor: light-dark(#ddd, #747474) !important;
-  --arrowpanel-dimmed-further: #707070 !important;
+  --arrowpanel-border-color: light-dark(#dadada, #636363) !important;
-  --panel-item-hover-bgcolor: #eee !important;
+  --panel-separator-color: light-dark(#dadada, #636363) !important;
-  --panel-item-active-bgcolor: #ddd !important;
+  --panel-banner-item-update-supported-bgcolor: light-dark(#188038, #81C995) !important;
-  --arrowpanel-border-color: #dadada !important;
+  --focus-outline-color: light-dark(#0055D7, #63ADE5) !important;
-  --panel-separator-color: #dadada !important;
-  --panel-banner-item-update-supported-bgcolor: #50B080 !important;
-  --focus-outline-color: #0055D7 !important;
   --panel-shortcut-color: inherit !important;
-  --uc-urlbar-shadow: 0 0 4px rgba(0, 0, 0, 0.1);
+  --uc-urlbar-shadow: 0 0 4px rgb(0 0 0 / .1);
-  --toolbarbutton-hover-background: #00000014 !important;
+  --toolbarbutton-hover-background: light-dark(rgb(0 0 0 / .08), rgb(255 255 255 / .1)) !important;
-  --toolbarbutton-active-background: #00000021 !important;
+  --toolbarbutton-active-background: light-dark(rgb(0 0 0 / .12), rgb(255 255 255 / .16)) !important;
   --uc-private-browsing-indicator: var(--button-primary-bgcolor);
-  --uc-private-browding-indicator-hover: var(--button-primary-hover-bgcolor);
+  --uc-private-browsing-indicator-text: var(--button-primary-color);
-  --uc-private-browding-indicator-active: var(--button-primary-active-bgcolor);
+  --tab-icon-overlay-stroke: light-dark(#fff, #4b4b4b) !important;
-  --uc-private-browding-indicator-text: var(--button-primary-color);
+  --tab-icon-overlay-fill: light-dark(#252525, #fff) !important;
+  --toolbarseparator-color: color-mix(in srgb, currentColor 40%, transparent) !important;
 }
 
-/* dark */
+/* ensure that dark mode is enabled completely in private browsing mode. */
-:root[lwt-default-theme-in-dark-mode="true"],
+@media (-moz-bool-pref: "browser.theme.dark-private-windows") {
-:root[style*="--lwt-accent-color: rgb(28, 27, 34)"] {
+  :root[privatebrowsingmode="temporary"],
-  --lwt-accent-color: #1C1C1C !important;
+  :root[privatebrowsingmode="temporary"] #nav-bar,
-  --lwt-accent-color-inactive: #2e2e2e !important;
+  :root[privatebrowsingmode="temporary"] #PersonalToolbar {
-  --lwt-text-color: #E5E5E5 !important;
+    color-scheme: dark !important;
-  --toolbar-bgcolor: #3B3B3B !important;
+  }
-  --toolbar-color: #fff !important;
+}
-  --toolbarbutton-icon-fill: #fff !important;
+
-  --chrome-content-separator-color: #686868 !important;
+#urlbar {
-  --lwt-toolbarbutton-icon-fill-attention: #4C98D1 !important;
+  --urlbar-box-bgcolor: inherit !important;
-  --toolbarbutton-icon-fill-attention: #4C98D1 !important;
+  --urlbar-box-hover-bgcolor: inherit !important;
-  --lwt-tab-text: var(--toolbar-color) !important;
+  --urlbar-box-focus-bgcolor: inherit !important;
-  --lwt-selected-tab-background-color: var(--toolbar-bgcolor) !important;
-  --tab-selected-bgcolor: var(--toolbar-bgcolor) !important;
-  --toolbar-field-background-color: #2B2B2B !important;
-  --toolbar-field-color: #fff !important;
-  --toolbar-field-border-color: #0000 !important;
-  --toolbar-field-focus-background-color: var(--toolbar-field-background-color) !important;
-  --toolbar-field-focus-color: var(--toolbar-field-color) !important;
-  --toolbar-field-focus-border-color: #63ADE5 !important;
-  --urlbar-icon-fill-opacity: 1 !important;
-  --urlbar-popup-url-color: #75B6E8 !important;
-  --lwt-brighttext-url-color: var(--urlbar-popup-url-color) !important;
-  --urlbar-box-bgcolor: var(--toolbar-field-background-color) !important;
-  --autocomplete-popup-background: #4A4A4A !important;
-  --autocomplete-popup-color: #fff !important;
-  --autocomplete-popup-highlight-background: #383838 !important;
-  --autocomplete-popup-hover-background: #444444 !important;
-  --autocomplete-popup-separator-color: #63636300 !important;
-  --button-bgcolor: #3B3B3B !important;
-  --button-hover-bgcolor: #545454 !important;
-  --button-active-bgcolor: #606060 !important;
-  --button-primary-bgcolor: #006CBE !important;
-  --button-primary-hover-bgcolor: #0078D4 !important;
-  --button-primary-active-bgcolor: #005CA3 !important;
-  --button-primary-color: #fff !important;
-  --error-text-color: #FF9AA2 !important;
-  --input-bgcolor: #4A4A4A !important;
-  --input-color: #fff !important;
-  --input-border-color: #8A8A8A !important;
-  --input-error-border-color: #FF848A !important;
-  --zoom-controls-bgcolor: #4A4A4A !important;
-  --arrowpanel-background: #4A4A4A !important;
-  --arrowpanel-color: #fff !important;
-  --panel-description-color: #fffb !important;
-  --panel-disabled-color: #ABABAA !important;
-  --arrowpanel-dimmed: #565656 !important;
-  --arrowpanel-dimmed-further: #707070 !important;
-  --panel-item-hover-bgcolor: #646464 !important;
-  --panel-item-active-bgcolor: #747474 !important;
-  --arrowpanel-border-color: #636363 !important;
-  --panel-separator-color: #636363 !important;
-  --panel-banner-item-update-supported-bgcolor: #50B080 !important;
-  --focus-outline-color: #63ADE5 !important;
-  --panel-shortcut-color: inherit !important;
-  --toolbarbutton-hover-background: #ffffff25 !important;
-  --toolbarbutton-active-background: #ffffff32 !important;
-  --uc-private-browsing-indicator: var(--button-primary-bgcolor);
-  --uc-private-browding-indicator-hover: var(--button-primary-hover-bgcolor);
-  --uc-private-browding-indicator-active: var(--button-primary-active-bgcolor);
-  --uc-private-browding-indicator-text: var(--button-primary-color);
 }
 
 /* Change Colour of page when loading */
-:root:not(:-moz-lwtheme) #tabbrowser-tabpanels,
+:root:not(:-moz-lwtheme) #tabbrowser-tabpanels {
-:root[style*="--lwt-accent-color: rgb(240, 240, 244)"] #tabbrowser-tabpanels {
+  background-color: light-dark(#f7f7f7, #252525) !important;
-  background-color: #f7f7f7 !important;
-}
-
-:root[lwt-default-theme-in-dark-mode="true"] #tabbrowser-tabpanels,
-:root[style*="--lwt-accent-color: rgb(28, 27, 34)"] #tabbrowser-tabpanels {
-  background-color: #252525 !important;
 }
 
 /* make the titlebar buttons black/white on default themes */
-:root:not(:-moz-lwtheme)[tabsintitlebar] .titlebar-buttonbox,
+:root:not(:-moz-lwtheme)[tabsintitlebar] .titlebar-buttonbox {
-:root[style*="--lwt-accent-color: rgb(240, 240, 244)"] .titlebar-buttonbox {
+  color: var(--toolbar-color) !important;
-  color: #000 !important;
 }
 
-:root[lwt-default-theme-in-dark-mode="true"][tabsintitlebar] .titlebar-buttonbox,
+#statuspanel-label {
-:root[style*="--lwt-accent-color: rgb(28, 27, 34)"][tabsintitlebar] .titlebar-buttonbox {
+  background-color: var(--toolbar-field-focus-background-color) !important;
-  color: #fff !important;
+  color: var(--toolbar-field-focus-color) !important;
+  border-color: transparent !important;
+  box-shadow: 0 2px 5px #0002, 0 0 0 1px light-dark(#0001, #0002) !important;
+  border-radius: 0 4px 0 0 !important;
+
+  #statuspanel[mirror] & {
+    border-radius: 4px 0 0 0 !important;
+  }
 }
 
-/* library window theme */
 @media (-moz-platform: windows) {
+  tooltip {
+    background-color: var(--arrowpanel-background) !important;
+    color: var(--arrowpanel-color) !important;
+    border-color: var(--arrowpanel-border-color) !important;
+  }
+
+  .titlebar-button:not(.titlebar-close):hover {
+    background-color: color-mix(in srgb, currentColor 11%, transparent) !important;
+  }
+
+  .titlebar-button:hover:active {
+    background-color: color-mix(in srgb, currentColor 20%, transparent) !important;
+  }
+
+  .titlebar-close:hover {
+    stroke: white !important;
+    background-color: #e81123 !important;
+  }
+
+  .titlebar-close:hover:active {
+    background-color: #EF6B76 !important;
+  }
+
+  toolbar[brighttext] .titlebar-close:hover:active {
+    background-color: #9C1420 !important;
+  }
+
+  /* library window theme */
   window#places {
-    --organizer-color: #000 !important;
+    --organizer-color: light-dark(#000, #fff) !important;
-    --organizer-deemphasized-color: #666 !important;
+    --organizer-deemphasized-color: light-dark(#666, #bbb) !important;
-    --organizer-toolbar-background: #f7f7f7 !important;
+    --organizer-toolbar-background: light-dark(#f7f7f7, #3B3B3B) !important;
-    --organizer-pane-background: #f7f7f7 !important;
+    --organizer-pane-background: light-dark(#f7f7f7, #2B2B2B) !important;
-    --organizer-content-background: #f7f7f7 !important;
+    --organizer-content-background: light-dark(#f7f7f7, #1C1C1C) !important;
-    --organizer-hover-background: #00000025 !important;
+    --organizer-hover-background: light-dark(#00000025, #ffffff25) !important;
-    --organizer-selected-background: #006CBE80 !important;
+    --organizer-selected-background: light-dark(#006CBE80, #006CBE80) !important;
-    --organizer-outline-color: #0055D7a0 !important;
+    --organizer-outline-color: light-dark(#0055D7a0, #63ADE5) !important;
-    --organizer-toolbar-field-background: #fff !important;
+    --organizer-toolbar-field-background: light-dark(#fff, #2B2B2B) !important;
-    --organizer-toolbar-field-background-focused: #fff !important;
+    --organizer-toolbar-field-background-focused: light-dark(#fff, #2B2B2B) !important;
-    --organizer-border-color: #bfbfbf !important;
+    --organizer-border-color: light-dark(#bfbfbf, #686868) !important;
-    scrollbar-color: #0006 #f7f7f740 !important;
+    scrollbar-color:
+      light-dark(#0006, #fff6)
+      light-dark(#f7f7f740, #2B2B2B40) !important;
   }
 
   #placesViewsBox #downloadsListBox richlistitem[selected="true"] {
-    background-color: #006CBE !important;
+    background-color: light-dark(#006CBE, #006CBE) !important;
-    color: #fff !important;
+    color: light-dark(#fff, #fff) !important;
   }
 
   #placeContentColumns :is(treecol, treecolpicker) {
-    background-color: #f7f7f7 !important;
+    background-color: light-dark(#f7f7f7, #3B3B3B) !important;
-    color: #000 !important;
+    color: light-dark(#000, #fff) !important;
-    border-inline-start: 1px solid #bfbfbf !important;
+    border-inline-start: 1px solid light-dark(#bfbfbf, #686868) !important;
-    box-shadow: inset 0 -1px #bfbfbf !important;
+    box-shadow: inset 0 -1px light-dark(#bfbfbf, #686868) !important;
     appearance: none !important;
   }
 
   #placeContentColumns :is(treecol, treecolpicker):where(:hover) {
-    background-color: #cecece !important;
+    background-color: light-dark(#cecece, #4A4A4A ) !important;
-    color: #000 !important;
+    color: light-dark(#000, #fff) !important;
-  }
-
-  @media (prefers-color-scheme: dark) {
-    window#places {
-      --organizer-color: #fff !important;
-      --organizer-deemphasized-color: #bbb !important;
-      --organizer-toolbar-background: #3B3B3B !important;
-      --organizer-pane-background: #2B2B2B !important;
-      --organizer-content-background: #1C1C1C !important;
-      --organizer-hover-background: #ffffff25 !important;
-      --organizer-selected-background: #006CBE80 !important;
-      --organizer-outline-color: #63ADE5 !important;
-      --organizer-toolbar-field-background: #2B2B2B !important;
-      --organizer-toolbar-field-background-focused: #2B2B2B !important;
-      --organizer-border-color: #686868 !important;
-      scrollbar-color: #fff6 #2B2B2B40 !important;
-    }
-
-    #placesViewsBox #downloadsListBox richlistitem[selected="true"] {
-      background-color: #006CBE !important;
-      color: #fff !important;
-    }
-
-    #placeContentColumns :is(treecol, treecolpicker) {
-      background-color: #3B3B3B !important;
-      color: #fff !important;
-      border-inline-start: 1px solid #686868 !important;
-      box-shadow: inset 0 -1px #686868 !important;
-    }
-
-    #placeContentColumns :is(treecol, treecolpicker):where(:hover) {
-      background-color: #4A4A4A !important;
-      color: #fff !important;
-    }
   }
 }
 
 /* side bar theme */
 #sidebar-box:not([lwt-sidebar]) {
-  --sidebar-background-color: #f7f7f7 !important;
+  --sidebar-background-color: light-dark(#f7f7f7, #3b3b3b) !important;
-  --sidebar-text-color: #000 !important;
+  --sidebar-text-color: light-dark(#000, #fff) !important;
   appearance: none !important;
 }
 
-#sidebar-box[style*="--sidebar-background-color: rgb(56, 56, 61"] {
-  --sidebar-background-color: #3B3B3B !important;
-  --sidebar-text-color: #fff !important;
-}
-
 #browser:not([style*="--sidebar-border-color"]) {
-  --sidebar-border-color: #bfbfbf !important;
+  --sidebar-border-color: light-dark(#bfbfbf, #686868) !important;
-}
-
-#browser[style*="--sidebar-border-color: rgba(255, 255, 255"] {
-  --sidebar-border-color: #686868 !important;
 }
 
 .sidebar-panel:not([lwt-sidebar]) {
-  color: #000 !important;
+  color: light-dark(#000, #fff) !important;
+  scrollbar-color: light-dark(#0006, #fff6) light-dark(#f7f7f740, #3b3b3b40) !important;
+
+  /* Sidebar search box (Windows) */
+  @media(-moz-platform: windows) {
+    & #sidebar-search-container>#search-box,
+    & #viewButton {
+      appearance: none !important;
+      background-color: light-dark(#fff, #2b2b2b) !important;
+      color: inherit !important;
+      border: 1px solid light-dark(#bfbfbf, #686868) !important;
+      border-radius: 4px !important;
+      padding: 6px 8px !important;
+
+      &:focus {
+        border-width: 2px !important;
+        padding: 5px 7px !important;
+      }
+    }
+  }
 }
 
-@-moz-document url(chrome://browser/content/syncedtabs/sidebar.xhtml) {
+@-moz-document url(chrome://browser/content/syncedtabs/sidebar.xhtml){
   body {
     background: transparent !important;
   }
 }
 
-.sidebar-panel[lwt-sidebar-brighttext][style*="--lwt-sidebar-background-color: rgb(56, 56, 61)"],
+/* Linux / GTK csd support */
-body[lwt-sidebar-brighttext][style*="--lwt-sidebar-background-color: rgb(56, 56, 61)"] {
+@media (-moz-gtk-csd-available) {
-  --lwt-sidebar-background-color: #3B3B3B !important;
+  :root:not(:-moz-lwtheme) {
-  --lwt-sidebar-text-color: #fff !important;
+    --toolbar-bgcolor: color-mix(in srgb, -moz-dialog 80%, #fff) !important;
-  scrollbar-color: #fff6 #3B3B3B40 !important;
+    --toolbar-bgimage: none !important;
-}
+    --toolbar-color: -moz-dialogtext !important;
-
+    --tab-selected-bgimage: none !important;
-@media(-moz-platform: windows) {
+    --chrome-content-separator-color: ThreeDShadow !important;
-  .sidebar-panel:not([lwt-sidebar]) #sidebar-search-container>#search-box,
+    --panel-separator-color: ThreeDShadow !important;
-  .sidebar-panel:not([lwt-sidebar]) #viewButton {
+    --button-bgcolor: color-mix(in srgb, currentColor 10%, transparent) !important;
-    appearance: none !important;
+    --button-hover-bgcolor: color-mix(in srgb, currentColor 14%, transparent) !important;
-    background-color: #fff !important;
+    --button-active-bgcolor: color-mix(in srgb, currentColor 20%, transparent) !important;
-    color: inherit !important;
+    --button-color: currentColor !important;
-    border: 1px solid #bfbfbf !important;
+    --button-primary-bgcolor: -moz-accent-color !important;
-    border-radius: 2px !important;
+    --button-primary-hover-bgcolor: color-mix(in srgb, black 10%, -moz-accent-color) !important;
+    --button-primary-active-bgcolor: color-mix(in srgb, black 20%, -moz-accent-color) !important;
+    --button-primary-color: -moz-accent-color-foreground !important;
+    --autocomplete-popup-hover-background: var(--arrowpanel-dimmed) !important;
+    --autocomplete-popup-separator-color: color-mix(in srgb, currentColor 14%, transparent) !important;
+    --urlbar-box-bgcolor: var(--button-bgcolor) !important;
+    --urlbar-box-focus-bgcolor: var(--button-bgcolor) !important;
+    --urlbar-box-hover-bgcolor: var(--button-hover-bgcolor) !important;
+    --urlbar-box-active-bgcolor: var(--button-active-bgcolor) !important;
+    --urlbar-box-text-color: inherit !important;
+    --urlbar-box-hover-text-color: var(--urlbar-box-text-color) !important;
+    --urlbar-icon-fill-opacity: 0.9 !important;
+    --urlbar-popup-url-color: -moz-nativehyperlinktext !important;
+    --lwt-brighttext-url-color: #00ddff !important;
+    --toolbarbutton-icon-fill-attention: -moz-nativehyperlinktext !important;
+    --focus-outline-color: -moz-accent-color !important;
+    --arrowpanel-background: Field !important;
+    --arrowpanel-color: FieldText !important;
+    --arrowpanel-border-color: ThreeDShadow !important;
+    --arrowpanel-dimmed: color-mix(in srgb, currentColor 17%, transparent) !important;
+    --arrowpanel-dimmed-further: color-mix(in srgb, currentColor 30%, transparent) !important;
+    --panel-description-color: GrayText !important;
+    --panel-disabled-color: GrayText !important;
+    --toolbarbutton-icon-fill: currentColor !important;
+    --toolbar-field-background-color: Field !important;
+    --toolbar-field-color: FieldText !important;
+    --toolbar-field-border-color: ThreeDShadow !important;
+    --toolbar-field-focus-background-color: Field !important;
+    --toolbar-field-focus-color: FieldText !important;
+    --toolbar-field-focus-border-color: -moz-accent-color !important;
+    --toolbarbutton-hover-background: color-mix(in srgb, -moz-dialogtext 14%, transparent) !important;
+    --toolbarbutton-active-background: color-mix(in srgb, -moz-dialogtext 20%, transparent) !important;
+    --uc-urlbar-shadow: none;
+    --autocomplete-popup-highlight-color: FieldText !important;
+    --autocomplete-popup-highlight-background: color-mix(in srgb, currentColor 8%, transparent) !important;
+    --autocomplete-popup-hover-background: color-mix(in srgb, currentColor 12%, transparent) !important;
+    --autocomplete-popup-separator-color: #0000 !important;
+    --panel-item-hover-bgcolor: color-mix(in srgb, currentColor 17%, transparent) !important;
+    --panel-item-active-bgcolor: color-mix(in srgb, currentColor 30%, transparent) !important;
+    --panel-separator-color: ThreeDShadow !important;
+    --panel-banner-item-update-supported-bgcolor: #1bba6b !important;
+    --focus-outline-color: -moz-accent-color !important;
+    --uc-private-browsing-indicator: -moz-accent-color !important;
+    --uc-private-browsing-indicator-text: var(--button-primary-color);
   }
 
-  .sidebar-panel[lwt-sidebar-brighttext][style*="--lwt-sidebar-background-color: rgb(56, 56, 61)"] #sidebar-search-container>#search-box,
+  #sidebar-box:not([lwt-sidebar]) {
-  .sidebar-panel[lwt-sidebar-brighttext][style*="--lwt-sidebar-background-color: rgb(56, 56, 61)"] #viewButton {
+    --sidebar-background-color: -moz-dialog !important;
-    appearance: none !important;
+    --sidebar-text-color: -moz-dialog-text !important;
-    background-color: #2B2B2B !important;
+  }
-    color: inherit !important;
+
-    border: 1px solid #686868 !important;
+  #browser:not([style*="--sidebar-border-color"]) {
-    border-radius: 2px !important;
+    --sidebar-border-color: ThreeDShadow !important;
+  }
+
+  .sidebar-panel:not([lwt-sidebar]) {
+    color: -moz-dialogtext !important;
+  }
+
+  @media (prefers-color-scheme: light) {
+    :root:not(:-moz-lwtheme) {
+      --toolbar-bgcolor: color-mix(in srgb, -moz-dialog 65%, #fff) !important;
+      --urlbar-icon-fill-opacity: 0.7 !important;
+      --toolbar-field-border-color: transparent !important;
+      --toolbar-field-background-color: color-mix(in srgb, Field 90%, -moz-dialogtext) !important;
+      --toolbar-field-color: FieldText !important;
+      --toolbar-field-focus-background-color: Field !important;
+      --toolbar-field-focus-color: FieldText !important;
+    }
+  }
+
+  @media (prefers-color-scheme: dark) {
+    :root:not(:-moz-lwtheme) {
+      --toolbar-bgcolor: color-mix(in srgb, -moz-dialog 90%, #fff) !important;
+      --urlbar-icon-fill-opacity: 1.0 !important;
+      --toolbar-field-border-color: transparent !important;
+      --toolbar-field-background-color: color-mix(in srgb, Field 90%, -moz-dialogtext) !important;
+      --toolbar-field-color: FieldText !important;
+      --toolbar-field-focus-background-color: color-mix(in srgb, Field 90%, -moz-dialogtext) !important;
+      --toolbar-field-focus-color: FieldText !important;
+    }
   }
 }

chrome/global/popup.css

@@ -1,42 +1,66 @@
-/* EdgeFr-Fox by bmFtZQ - popup.css */
+/* Edge-Frfox - popup.css */
 
 :root {
-  --arrowpanel-border-radius: 4px !important;
+  --panel-subview-body-padding: 2px 0 !important;
-  --panel-subview-body-padding: 4px 0 !important;
+  --arrowpanel-border-radius: 8px !important;
-  --arrowpanel-menuitem-border-radius: 0 !important;
+  --arrowpanel-menuitem-border-radius: 4px !important;
-  --arrowpanel-menuitem-margin: 0 !important;
+  --arrowpanel-menuitem-margin: var(--uc-arrowpanel-menuitem-margin-block) var(--uc-arrowpanel-menuitem-margin-inline) !important;
-  --arrowpanel-menuitem-padding-block: 8px !important;
+  --arrowpanel-menuitem-padding-block: 6px !important;
-  --arrowpanel-menuitem-padding-inline: 14px !important;
+  --arrowpanel-menuitem-padding-inline: 10px !important;
   --uc-arrowpanel-menuicon-margin-inline: 14px;
-  --panel-separator-margin-vertical: 4px !important;
+  --uc-arrowpanel-menuitem-margin-inline: 4px;
+  --uc-arrowpanel-menuitem-margin-block: 2px;
+  --panel-separator-margin-vertical: 2px !important;
   --panel-separator-margin-horizontal: 0 !important;
+
   --uc-panel-zoom-button-padding: 8px;
-  --uc-panel-zoom-button-inline-padding: 13px;
+  --uc-panel-zoom-button-inline-padding: 9px;
+  --uc-panel-zoom-padding-block: calc(var(--panel-separator-margin-vertical) + var(--uc-arrowpanel-menuitem-margin-block));
+
   --uc-autocomplete-panel-menuitem-margin: 4px;
-  --uc-autocomplete-panel-menuicon-padding-inline: 12px;
+  --uc-autocomplete-panel-menuicon-padding-inline: 14px;
   --uc-autocomplete-panel-separator-margin-vertical: 4px;
+
+  --uc-permission-itemcontainer-padding-block: 8px;
+  --uc-permission-item-margin-block: 4px;
+  --uc-permission-item-padding-inline: 16px;
+
+  --uc-contextmenu-border-radius: 8px;
+  --uc-contextmenu-padding: calc(4px - var(--uc-contextmenu-menuitem-border-width)) 0;
+  --uc-contextmenu-menuitem-border-radius: calc(4px + var(--uc-contextmenu-menuitem-border-width));
+  --uc-contextmenu-menuitem-padding-block: 6px;
+  --uc-contextmenu-menuitem-padding-inline: 10px;
+  --uc-contextmenu-menuitem-border-width: 2px;
+  --uc-contextmenu-menuicon-margin-inline: 12px;
+  --uc-contextmenu-menuitem-margin-inline: calc(4px - var(--uc-contextmenu-menuitem-border-width));
+  --uc-contextmenu-menuitem-margin-block: 0px;
+  --uc-contextmenu-menuitem-margin: var(--uc-contextmenu-menuitem-margin-block) var(--uc-contextmenu-menuitem-margin-inline);
+  --uc-contextmenu-separator-vertical: calc(4px - var(--uc-contextmenu-menuitem-border-width));
+  --uc-contextmenu-separator-horizontal: 0;
 }
 
 /* app menu */
 .addon-banner-item,
 .panel-banner-item {
-  margin: 0 4px 4px !important;
+  margin: 2px 4px 2px !important;
   padding-inline: 4px 12px !important;
-  border-radius: 2px !important;
+  padding-block: var(--arrowpanel-menuitem-padding-block) !important;
+  border-radius: var(--arrowpanel-menuitem-border-radius) !important;
 }
 
-#appMenu-fxa-label2>vbox>label {
+#appMenu-fxa-label2 label,
+#PanelUI-fxa-menu-syncnow-button label {
   margin-block: 0 !important;
 }
 
 .widget-overflow-list .toolbarbutton-1:not(.toolbarbutton-combined)>.toolbarbutton-text,
-.subviewbutton:not(#appMenu-zoom-controls2 > .subviewbutton)>.toolbarbutton-icon+.toolbarbutton-text,
+.subviewbutton:not(#appMenu-zoom-controls > .subviewbutton)>.toolbarbutton-icon+.toolbarbutton-text,
 #appMenu-fxa-label2>vbox {
   padding-inline-start: var(--uc-arrowpanel-menuicon-margin-inline) !important;
 }
 
 /* special case menuitems with no icons */
-#appMenu-zoom-controls2>.toolbarbutton-text,
+#appMenu-zoom-controls>.toolbarbutton-text,
 #fxa-manage-account-button>vbox,
 #PanelUI-fxa-menu-syncnow-button>hbox {
   padding-inline-start: calc(16px + var(--uc-arrowpanel-menuicon-margin-inline)) !important;
@@ -49,7 +73,7 @@
 /* firefox profile avatar in appmenu */
 #appMenu-fxa-label2::before {
   content: "";
-  display: -moz-box;
+  display: flex;
   height: 16px;
   width: 16px;
   background: var(--avatar-image-url) 0/16px;
@@ -57,31 +81,49 @@
   border-radius: 99px;
 }
 
-
 /* disable proton account separator */
 #appMenu-fxa-separator {
   border-image: none !important;
 }
 
+#appMenu-fxa-status2:not([fxastatus]) {
+  padding-block: 0 !important;
+}
+
+#appMenu-fxa-status2:not([fxastatus])>#appMenu-fxa-label2 {
+  margin-inline-end: calc(var(--arrowpanel-menuitem-padding-inline) * -1) !important;
+}
+
 /* zoom controls */
-#appMenu-zoom-controls2 {
+#appMenu-zoom-controls {
   border-top: 1px solid var(--panel-separator-color) !important;
-  padding: 0 0 0 var(--arrowpanel-menuitem-padding-inline) !important;
+  padding-inline: calc(var(--arrowpanel-menuitem-padding-inline) + var(--uc-arrowpanel-menuitem-margin-inline)) var(--uc-arrowpanel-menuitem-margin-inline) !important;
+  padding-block: var(--uc-panel-zoom-padding-block) !important;
   margin: var(--panel-separator-margin-vertical) 0 calc(var(--panel-separator-margin-vertical) * -1) !important;
 }
 
-#appMenu-zoom-controls2>.subviewbutton {
+#appMenu-zoom-controls>.subviewbutton {
   padding: var(--uc-panel-zoom-button-padding) var(--uc-panel-zoom-button-inline-padding) !important;
   margin: 0 !important;
 }
 
-#appMenu-zoom-controls2>#appMenu-zoomReset-button2 {
+#appMenu-zoom-controls>#appMenu-zoomReset-button2 {
   padding: var(--uc-panel-zoom-button-padding) calc(var(--uc-panel-zoom-button-padding) / 2) !important;
 }
 
-#appMenu-zoomReduce-button2,
+/* #appMenu-zoomReduce-button2, */
-#appMenu-fullscreen-button2 {
+#appMenu-zoom-controls>#appMenu-fullscreen-button2 {
-  border-inline-start: 1px solid var(--panel-separator-color) !important;
+  margin-left: calc((var(--panel-separator-margin-vertical) + var(--uc-arrowpanel-menuitem-margin-block)) * 2 + 1px) !important;
+}
+
+#appMenu-zoom-controls>#appMenu-fullscreen-button2::before {
+  content: "";
+  border-inline-start: 1px solid var(--panel-separator-color);
+  display: block;
+  position: relative;
+  height: 32px;
+  margin-block: calc(var(--uc-panel-zoom-button-padding) * -1);
+  transform: translateX(calc(var(--uc-panel-zoom-button-inline-padding) * -1 - (var(--panel-separator-margin-vertical) + var(--uc-arrowpanel-menuitem-margin-block)) - 1px));
 }
 
 #appMenu-zoomReset-button2 {
@@ -89,23 +131,17 @@
   min-height: calc(16px + var(--uc-panel-zoom-button-padding) * 2) !important;
 }
 
-#appMenu-zoomReset-button2:not([disabled], [open], :active):is(:hover) {
-  background-color: var(--panel-item-hover-bgcolor) !important;
-}
-
-#appMenu-zoomReset-button2:not([disabled]):is([open], :hover:active) {
-  background-color: var(--panel-item-active-bgcolor) !important;
-}
-
 #appMenu-zoomReduce-button2:not([disabled], [open], :active):is(:hover),
 #appMenu-zoomEnlarge-button2:not([disabled], [open], :active):is(:hover),
-#appMenu-fullscreen-button2:not([disabled], [open], :active):is(:hover) {
+#appMenu-fullscreen-button2:not([disabled], [open], :active):is(:hover),
+#appMenu-zoomReset-button2:not([disabled], [open], :active):is(:hover) {
   background-color: var(--panel-item-hover-bgcolor) !important;
 }
 
 #appMenu-zoomReduce-button2:not([disabled]):is([open], :hover:active),
 #appMenu-zoomEnlarge-button2:not([disabled]):is([open], :hover:active),
-#appMenu-fullscreen-button2:not([disabled]):is([open], :hover:active) {
+#appMenu-fullscreen-button2:not([disabled]):is([open], :hover:active),
+#appMenu-zoomReset-button2:not([disabled]):is([open], :hover:active) {
   background-color: var(--panel-item-active-bgcolor) !important;
 }
 
@@ -115,8 +151,37 @@
   stroke: none !important;
 }
 
+#appMenu-zoomReset-button2>.toolbarbutton-text,
 #appMenu-fullscreen-button2>.toolbarbutton-icon {
   background-color: transparent !important;
+  padding: 0 !important;
+}
+
+.subviewbutton[shortcut]::after {
+  opacity: 0.7 !important;
+}
+
+#widget-overflow-mainView .panel-subview-body {
+  padding-bottom: 0 !important;
+}
+
+.PanelUI-subView>.panel-header+toolbarseparator {
+  margin-bottom: 0 !important;
+}
+
+.PanelUI-subView>.panel-header+toolbarseparator+.panel-subview-body {
+  padding-top: var(--panel-separator-margin-vertical) !important;
+}
+
+#identity-popup-security-button {
+  margin-bottom: var(--panel-separator-margin-vertical) !important;
+}
+
+#permission-popup-mainView-panel-header,
+#identity-popup-mainView-panel-header,
+#protections-popup-mainView-panel-header,
+.panel-header {
+  min-height: calc((var(--arrowpanel-menuitem-padding-block) + 4px) * 2 + 16px) !important;
 }
 
 /* URL bar popup */
@@ -124,14 +189,6 @@
   border-radius: 2px !important;
 }
 
-#identity-popup-security-button {
-  padding-inline: calc(var(--arrowpanel-menuitem-padding-inline) - 4px) !important;
-}
-
-.identity-popup-security-connection>hbox {
-  margin-inline-start: calc(20px + var(--uc-arrowpanel-menuicon-margin-inline)) !important;
-}
-
 .identity-popup-security-connection>hbox>description {
   margin-inline-start: 0 !important;
 }
@@ -140,19 +197,53 @@
   margin-inline-end: calc(-1 * (var(--arrowpanel-menuitem-padding-inline) - 10px)) !important;
 }
 
+#identity-popup-mainView-panel-header-span,
+#permission-popup-mainView-panel-header-span,
+#identity-popup-mainView-panel-header label,
+#permission-popup-mainView-panel-header label,
+#protections-popup-mainView-panel-header-span {
+  margin-block: 0 !important;
+}
+
+.permission-popup-section {
+  padding-block: var(--uc-permission-itemcontainer-padding-block) !important;
+}
+
+#permission-popup-permissions-content {
+  padding-inline: var(--uc-permission-item-padding-inline) !important;
+}
+
+.permission-popup-permission-item,
+#permission-popup-storage-access-permission-list-header {
+  margin-block: var(--uc-permission-item-margin-block) !important;
+}
+
+.permission-popup-permission-label,
+.permission-popup-permission-header-label {
+  margin-inline-start: var(--uc-arrowpanel-menuicon-margin-inline) !important;
+}
+
+#editBookmarkPanel>#editBookmarkHeaderSeparator,
+#editBookmarkPanel>.panel-subview-body>#editBookmarkSeparator {
+  margin-inline: 0 !important;
+}
+
 /* subview */
 .panel-header {
-  padding: 4px;
+  padding: 4px !important;
   padding-top: 4px !important;
 }
 
-.panel-header+toolbarseparator {
+.panel-header+toolbarseparator,
+#identity-popup-mainView-panel-header+toolbarseparator,
+#permission-popup-mainView-panel-header+toolbarseparator,
+#protections-popup-mainView-panel-header-section+toolbarseparator {
   margin-block-start: 0 !important;
 }
 
-.subviewbutton-back {
+.panel-header>.subviewbutton-back {
   margin: 0 !important;
-  border-radius: 2px !important;
+  padding: var(--arrowpanel-menuitem-padding-block) !important;
 }
 
 .panel-subview-footer-button {
@@ -184,34 +275,34 @@
 
 #downloadsListBox>richlistitem {
   padding-inline-end: 8px !important;
-  border-radius: 0 !important;
+  border-radius: var(--arrowpanel-menuitem-border-radius) !important;
+}
+
+#downloadsListBox,
+.downloadsPanelFooterButton {
+  margin: var(--arrowpanel-menuitem-margin) !important;
+  width: auto !important;
+  min-width: auto !important;
 }
 
 #downloadsPanel-blockedSubview,
 #downloadsPanel-mainView {
-  padding: var(--panel-separator-margin-vertical) 0 0 !important;
+  padding: var(--panel-separator-margin-vertical) 0 !important;
 }
 
 #emptyDownloads {
   padding: 1.5em 16px 1.7em !important;
 }
 
-/* context menus */
+#downloadsHistory .button-text {
-@media (-moz-windows-compositor) {
+  margin-block: 0 !important;
-  menupopup {
+  margin-inline: 0 !important;
-    --panel-color: var(--arrowpanel-color) !important;
+}
-    --panel-border-radius: 4px !important;
+
-    --panel-padding: 4px 0px !important;
+.PanelUI-subView .subviewbutton-nav::after,
-    --panel-border-color: var(--arrowpanel-border-color) !important;
+#PlacesToolbar menu>.menu-right,
-    --panel-background: var(--arrowpanel-background) !important;
+.subviewbutton>.menu-right {
-    --nested-margin: -6px !important;
+  fill-opacity: 1 !important;
-    --menuitem-hover-background-color: var(--panel-item-hover-bgcolor) !important;
-    --menu-background-color: var(--arrowpanel-background) !important;
-    --menu-color: var(--arrowpanel-color) !important;
-    --menuitem-disabled-hover-background-color: #0000 !important;
-    --menu-disabled-color: var(--panel-disabled-color) !important;
-    --menu-border-color: var(--panel-separator-color) !important;
-  }
 }
 
 /* auto complete popup */
@@ -221,25 +312,329 @@
   box-shadow: 0 0 0 1px inset var(--arrowpanel-border-color) !important;
 }
 
-.autocomplete-richlistitem[originaltype="loginsFooter"] {
+#PopupAutoComplete .autocomplete-richlistitem[originaltype="loginsFooter"] {
+  justify-content: start !important;
   -moz-box-pack: start !important;
   color: inherit !important;
-  border-color: var(--panel-separator-color) !important;
   background-color: transparent !important;
-  height: 40px !important;
+  height: 28px !important;
-  padding-inline-start: var(--uc-autocomplete-panel-menuicon-padding-inline) !important;
+  min-height: 28px !important;
+  padding-inline-start: var(--uc-contextmenu-menuitem-padding-inline) !important;
+  position: relative !important;
+  overflow: visible !important;
+  margin-top: calc(var(--uc-contextmenu-separator-vertical) * 2 + 1px) !important;
 }
 
-.autocomplete-richlistitem:hover {
+.autocomplete-richlistitem[originaltype="loginsFooter"]::before {
+  content: "";
+  width: calc(100% + var(--uc-contextmenu-menuitem-margin-inline) * 2);
+  border-top: 1px solid var(--panel-separator-color);
+  position: absolute;
+  top: calc((var(--uc-contextmenu-separator-vertical) + var(--uc-contextmenu-menuitem-border-width)) * -1 - 1px);
+  left: calc(var(--uc-contextmenu-menuitem-margin-inline) * -1);
+}
+
+#PopupAutoComplete .autocomplete-richlistitem:hover {
   background-color: var(--panel-item-hover-bgcolor) !important;
 }
 
-.autocomplete-richlistitem[selected] {
+#PopupAutoComplete .autocomplete-richlistitem[selected] {
   background-color: var(--panel-item-active-bgcolor) !important;
   color: inherit !important;
 }
 
 .ac-site-icon {
   fill: currentColor !important;
-  margin: auto var(--uc-autocomplete-panel-menuicon-padding-inline) !important;
+  margin-block: auto !important;
+  margin-inline: 0 var(--uc-autocomplete-panel-menuicon-padding-inline) !important;
+}
+
+#PopupAutoComplete>richlistbox>richlistitem>.ac-title {
+  margin-inline: calc(16px + var(--uc-autocomplete-panel-menuicon-padding-inline)) !important;
+}
+
+/* workaround for inaccessible shadow-root element
+ moves the shadow-root element underneath, and away from panel edges */
+#PopupAutoComplete {
+  padding-block: 10px !important;
+  padding-inline: 2px !important;
+}
+
+panel[type="autocomplete-richlistbox"]>.autocomplete-richlistbox {
+  margin-block: -10px !important;
+  margin-inline: -2px !important;
+  padding: var(--uc-contextmenu-padding) !important;
+  border-radius: var(--uc-contextmenu-border-radius) !important;
+  color: inherit !important;
+}
+
+#PopupAutoComplete>richlistbox>richlistitem>.two-line-wrapper {
+  padding-block: 0 !important;
+  padding-inline-end: calc((var(--uc-autocomplete-panel-menuitem-margin) + var(--arrowpanel-menuitem-padding-inline)) * 2) !important;
+}
+
+#PlacesToolbar menuitem,
+#PlacesToolbar menu,
+panelview .toolbarbutton-1,
+.subviewbutton,
+.widget-overflow-list .toolbarbutton-1 {
+  min-height: calc(16px + var(--uc-contextmenu-menuitem-padding-block) * 2) !important;
+}
+
+/* disable context menu when this tweak is applied */
+@media not (-moz-bool-pref: "uc.tweak.revert-context-menu") {
+  /* Context Menu */
+  menupopup:not(.PanelUI-subView),
+  menupopup:not(.PanelUI-subView) menuitem,
+  menupopup:not(.PanelUI-subView) menu,
+  menupopup:not(.PanelUI-subView) menuseparator,
+  panel {
+    appearance: none !important;
+  }
+
+  menupopup:not(.PanelUI-subView),
+  panel[type="autocomplete-richlistbox"],
+  menulist>menupopup:not(.PanelUI-subView)>menucaption {
+    -moz-window-shadow: none !important;
+    background: 0 !important;
+    border: 0 !important;
+    color: var(--arrowpanel-color) !important;
+  }
+
+  .popup-internal-box,
+  panel[type="autocomplete-richlistbox"]>.autocomplete-richlistbox,
+  .menupopup-arrowscrollbox {
+    background: var(--arrowpanel-background) !important;
+    border: 1px solid light-dark(transparent, var(--panel-separator-color)) !important;
+  }
+
+  /* make room for menu shadow */
+  menupopup:not(.PanelUI-subView) {
+    padding: 4px 12px 20px !important;
+    margin: -6px -12px -16px !important;
+  }
+
+  /* cut off shadow so it doesn't get in the way of the menubar items */
+  menubar menupopup {
+    padding: 1px 8px 20px !important;
+    margin: -1px -4px -16px !important;
+  }
+
+  menupopup {
+    --uc-margin: 0 !important;
+    --uc-box-shadow:
+      0 8px 12px #0003,
+      0 4px 5px #0002,
+      0 2px 4px #0002,
+      0 0 0 1px #0001;
+  }
+
+  @media (prefers-color-scheme:dark) {
+    menupopup {
+      --uc-box-shadow:
+        0 8px 12px #0003,
+        0 4px 5px #0003,
+        0 2px 4px #0002,
+        0 0 0 1px #0002;
+    }
+  }
+
+  /* use default shadow for subview menupopup (eg. bookmarks) */
+  menupopup.PanelUI-subView {
+    --uc-box-shadow: 0 0 0 1px var(--panel-border-color);
+    --uc-margin: 1px !important;
+    margin-top: -5px !important;
+  }
+
+  .menupopup-arrowscrollbox {
+    box-shadow: var(--uc-box-shadow) !important;
+  }
+
+  .popup-internal-box {
+    margin: 0 !important;
+  }
+
+  .popup-internal-box,
+  .menupopup-arrowscrollbox {
+    padding: var(--uc-contextmenu-padding) !important;
+    border-radius: var(--uc-contextmenu-border-radius) !important;
+    color: inherit !important;
+  }
+
+  menupopup menu[disabled="true"],
+  menupopup menuitem[disabled="true"] {
+    color: var(--panel-disabled-color) !important;
+    background: none !important;
+  }
+
+  menupopup menu:hover:not([disabled=true]),
+  menupopup menuitem:hover:not([disabled=true]),
+  menupopup menu[_moz-menuactive]:not([disabled=true]),
+  menupopup menuitem[_moz-menuactive]:not([disabled=true]) {
+    background-color: var(--panel-item-hover-bgcolor) !important;
+    color: inherit !important;
+  }
+
+  menupopup menuitem:hover:active:not([disabled=true]),
+  menupopup menu:hover:active:not([disabled=true]) {
+    background-color: var(--panel-item-active-bgcolor) !important;
+    color: inherit !important;
+  }
+
+  menupopup menuseparator {
+    margin: var(--uc-contextmenu-separator-vertical) 0 !important;
+    padding: 0 !important;
+    background: none !important;
+    border-top: 1px solid var(--panel-separator-color) !important;
+
+    &::before {
+      content: unset !important;
+    }
+  }
+
+  #PlacesToolbar menupopup[placespopup="true"] menuseparator::before {
+    display: none !important;
+  }
+
+  menupopup menu,
+  menupopup menuitem,
+  menupopup menucaption,
+  #PopupAutoComplete>richlistbox>richlistitem {
+    padding: var(--uc-contextmenu-menuitem-padding-block) var(--uc-contextmenu-menuitem-padding-inline) !important;
+    margin: var(--uc-contextmenu-menuitem-margin) !important;
+    border-radius: var(--uc-contextmenu-menuitem-border-radius) !important;
+    border: var(--uc-contextmenu-menuitem-border-width) solid transparent !important;
+    background-clip: padding-box !important;
+    min-height: calc(16px + (var(--uc-contextmenu-menuitem-padding-block) + var(--uc-contextmenu-menuitem-border-width)) * 2) !important;
+  }
+
+  :not(:not(menubar)>menu, #ContentSelectDropdown)>menupopup>menuitem:not(.menuitem-iconic, [type="checkbox"], [type="radio"], .in-menulist, .in-menulist menuitem, .unified-nav-current),
+  :not(:not(menubar)>menu, #ContentSelectDropdown)>menupopup>menu:not(.menu-iconic, [type="checkbox"], [type="radio"], .in-menulist, .in-menulist menu, .unified-nav-current),
+  :not(:not(menubar)>menu, #ContentSelectDropdown)>menupopup>menucaption {
+    padding-inline-start: calc(var(--uc-contextmenu-menuitem-padding-inline) + 16px + var(--uc-contextmenu-menuicon-margin-inline)) !important;
+  }
+
+  .menu-iconic-icon {
+    margin-block: 0 !important;
+    margin-inline-end: 0 !important;
+    margin-inline-start: 0 !important;
+  }
+
+  menu>.menu-iconic-text,
+  menuitem>.menu-iconic-text {
+    padding-inline-start: var(--uc-contextmenu-menuicon-margin-inline) !important;
+  }
+
+  .menu-text,
+  .menu-iconic-text {
+    margin-inline-start: 0 !important;
+    padding-block: 0 !important;
+  }
+
+  .menu-accel,
+  .menu-iconic-accel {
+    margin-inline-end: 0 !important;
+    padding-block: 0 !important;
+    opacity: 0.7 !important;
+  }
+
+  .menu-iconic>.menu-iconic-left,
+  .menuitem-iconic>.menu-iconic-left {
+    padding-inline-end: 0 !important;
+    padding-block: 0 !important;
+  }
+
+  menuitem:is(.menuitem-iconic:not([data-usercontextid]), [type="checkbox"], [type="radio"], [checked], [selected]) .menu-iconic-icon {
+    -moz-context-properties: fill !important;
+    fill: currentColor !important;
+  }
+
+  .menu-right,
+  .menu-accel-container {
+    appearance: none !important;
+    margin-inline-end: 0 !important;
+    -moz-context-properties: fill;
+    fill: currentColor !important;
+  }
+
+  menupopup menuitem:is([type="checkbox"], [type="radio"]) .menu-iconic-icon,
+  menulist>menupopup>menuitem .menu-iconic-icon,
+  menu .menu-right {
+    height: 16px !important;
+    width: 16px !important;
+  }
+
+  menulist>menupopup>menuitem:is([checked="true"], [selected="true"])::before,
+  menupopup>menuitem::before,
+  menupopup>menuitem::after {
+    display: none !important;
+  }
+
+  menuitem:is([type="checkbox"], [checked="true"], [type="radio"])>.menu-iconic-left>.menu-iconic-icon {
+    display: flex !important;
+  }
+
+  menuitem[checked="true"]>.menu-iconic-left,
+  .menu-iconic>.menu-iconic-left,
+  .menuitem-iconic>.menu-iconic-left {
+    margin: 0 !important;
+  }
+
+  #context-navigation:not([hidden]) {
+    padding: 0 !important;
+    --menuitem-min-width: calc(16px + var(--uc-contextmenu-menuitem-padding-inline) * 2) !important;
+    min-width: calc(4 * var(--menuitem-min-width));
+  }
+
+  #context-navigation>.menuitem-iconic>.menu-iconic-left>.menu-iconic-icon {
+    width: 16px !important;
+    height: 16px !important;
+    padding: 0 !important;
+  }
+
+  #context-navigation {
+    margin-inline: var(--uc-contextmenu-menuitem-margin-inline) !important;
+  }
+
+  #context-navigation>.menuitem-iconic {
+    justify-content: center !important;
+    -moz-box-pack: center !important;
+  }
+
+  #context-navigation>.menuitem-iconic {
+    margin: 0 !important;
+  }
+
+  #context-navigation>.menuitem-iconic {
+    flex-grow: 1 !important;
+    width: unset !important;
+  }
+
+  #context-navigation>.menuitem-iconic[_moz-menuactive="true"]>.menu-iconic-left>.menu-iconic-icon {
+    background-color: transparent !important;
+  }
+
+  #context-bookmarkpage[starred] .menu-iconic-icon {
+    fill: var(--lwt-toolbarbutton-icon-fill-attention, var(--toolbarbutton-icon-fill-attention, currentColor)) !important;
+  }
+
+  @media not (-moz-bool-pref: "uc.tweak.smaller-context-menu-text") {
+    @media (-moz-platform: windows) {
+      .menu-text,
+      .menu-iconic-text,
+      panel .toolbarbutton-text {
+        margin-inline-start: 0 !important;
+        margin-block: -3px -1px !important;
+        padding-block: 0 !important;
+      }
+
+      .menu-text,
+      .menu-iconic-text,
+      panel .toolbarbutton-text,
+      #appMenu-fxa-status2,
+      .panel-header {
+        font-size: 13.6px !important;
+      }
+    }
+  }
 }

chrome/global/tree.css

@@ -0,0 +1,87 @@
+/* Edge-Frfox - tree.css */
+
+/* Change height of tree items and add rounded corners */
+treechildren::-moz-tree-row,
+treecol:not([hideheader="true"]),
+.tree-columnpicker-button {
+  min-height: max(28px, 1.3em) !important;
+  border-radius: 2px !important;
+}
+
+/* Change the background colour on hover */
+@media not (prefers-contrast) {
+  treechildren::-moz-tree-row(hover) {
+    background-color: var(--toolbarbutton-hover-background) !important;
+  }
+}
+
+/* Change the background colour when pressed */
+treechildren::-moz-tree-row(selected) {
+  background-color: var(--toolbarbutton-active-background) !important;
+}
+
+/* Change the background colour when focused */
+treechildren::-moz-tree-row(selected, focus) {
+  background-color: var(--button-primary-bgcolor) !important;
+}
+
+treechildren::-moz-tree-row(current, focus) {
+  outline: var(--default-focusring);
+  outline-color: var(--button-primary-bgcolor) !important;
+  outline-offset: calc(-1 * var(--default-focusring-width));
+}
+
+treechildren::-moz-tree-image(selected),
+treechildren::-moz-tree-twisty(selected),
+treechildren::-moz-tree-cell-text(selected) {
+  color: inherit !important;
+}
+
+treechildren::-moz-tree-image(selected, focus),
+treechildren::-moz-tree-twisty(selected, focus),
+treechildren::-moz-tree-cell-text(selected, focus) {
+  color: var(--button-primary-color) !important;
+}
+
+/* Spacing between icon and label */
+treechildren::-moz-tree-image {
+  margin-inline-end: 8px !important;
+}
+
+/* Separator appearance */
+treechildren::-moz-tree-separator {
+  border-top: 1px solid var(--toolbarseparator-color) !important;
+  border-bottom: none !important;
+}
+
+/* Change the colour of the drop feedback elements */
+treechildren::-moz-tree-cell-text(primary, dropOn) {
+  background-color: var(--button-primary-bgcolor) !important;
+  color: var(--button-primary-color) !important;
+}
+
+treechildren::-moz-tree-drop-feedback {
+  background-color: var(--toolbarbutton-icon-fill-attention) !important;
+  border-radius: 2px !important;
+}
+
+/* Change the appearance for the expandable items */
+treechildren::-moz-tree-twisty {
+  padding-top: 0 !important;
+  padding-inline: 4px !important;
+  width: 16px !important;
+  list-style-image: url("../icons/arrow-filled-right.svg") !important;
+}
+
+treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(closed) {
+  list-style-image: url("../icons/arrow-filled-left.svg") !important;
+}
+
+treechildren::-moz-tree-twisty(open) {
+  list-style-image: url("../icons/arrow-filled-down.svg") !important;
+}
+
+/* Change the identation of child items */
+treechildren::-moz-tree-indentation {
+  width: 16px !important;
+}

chrome/global/tweaks.css

@@ -1,63 +1,64 @@
-/* EdgeFr-Fox by bmFtZQ - tweaks.css */
+/* Edge-Frfox - tweaks.css */
 
 /* disable drag space above tabs */
-@supports -moz-bool-pref("uc.tweak.disable-drag-space") {
+@media (-moz-bool-pref: "uc.tweak.disable-drag-space") {
-  :root #titlebar {
+  :root {
     --tab-block-margin: 0px !important;
   }
 }
 
 /* force tabs to toolbar bg (useful for proton themes) (might experience some
 bugs with certain themes eg. dark text on dark background.) */
-@supports -moz-bool-pref("uc.tweak.force-tab-colour") {
+@media (-moz-bool-pref: "uc.tweak.force-tab-colour") {
   :root {
     --lwt-selected-tab-background-color: unset !important;
   }
 }
 
-/* hide firefox account button when not in private mode (useful as a private
-browsing indicator) */
-@supports -moz-bool-pref("uc.tweak.fxa-button-as-private-indicator") {
-  :root:not([privatebrowsingmode]) #nav-bar:not([customizing]) #fxa-toolbar-menu-button {
-    display: none !important;
-  }
-}
-
 /* remove tab separators */
-@supports -moz-bool-pref("uc.tweak.remove-tab-separators") {
+@media (-moz-bool-pref: "uc.tweak.remove-tab-separators") {
-  .tabbrowser-tab:not([selected="true"], :hover, [beforeselected-visible], [beforehovered]) .tab-stack::after {
+  .tabbrowser-tab .tab-stack {
-    display: none !important;
+    &::before,
-  }
+    &::after {
-
+      content: initial !important;
-  .tabbrowser-tab:not([last-visible-tab="true"]) {
+    }
-    margin-inline-end: 0px !important;
   }
 }
 
-@supports -moz-bool-pref("uc.tweak.less-permissions-button-padding") {
+@media (-moz-bool-pref: "uc.tweak.floating-tabs") {
-  #identity-icon-box {
-    padding-inline: var(--uc-toolbarbutton-inner-inline-padding) !important;
-  }
-
-  #identity-permission-box {
-    padding-inline: 2px var(--uc-urlbar-icon-inline-padding) !important;
-    margin-inline-start: -8px !important;
-  }
-}
-
-@supports -moz-bool-pref("uc.tweak.floating-tabs") {
   :root:not(:-moz-lwtheme),
-  :root[style*="--lwt-accent-color: rgb(240, 240, 244)"] {
+  :root[privatebrowsingmode="temporary"][style*="--lwt-accent-color: rgb(28, 27, 34)"] {
-    --lwt-accent-color: #f3f3f3 !important;
+    --lwt-accent-color: light-dark(#f3f3f3, #202020) !important;
     --lwt-accent-color-inactive: unset !important;
-    --toolbar-bgcolor: #fff !important;
+    --toolbar-bgcolor: light-dark(#fff, #4D4D4D) !important;
+    --lwt-tab-text: light-dark(#262626, #fff) !important;
+    --chrome-content-separator-color: light-dark(#bfbfbf, #535353) !important;
+    --uc-urlbar-shadow: none !important;
+    --uc-tab-border-color: light-dark(#0000, #fff1) !important;
+    --toolbar-non-lwt-bgcolor: var(--lwt-accent-color) !important;
   }
 
-  :root[lwt-default-theme-in-dark-mode="true"],
+  @media (-moz-gtk-csd-available) {
-  :root[style*="--lwt-accent-color: rgb(28, 27, 34)"] {
+    :root:not(:-moz-lwtheme) {
-    --toolbar-bgcolor: #4D4D4D !important;
+      --toolbar-bgcolor: color-mix(in srgb, -moz-dialog 80%, #fff) !important;
-    --lwt-accent-color-inactive: unset !important;
+      --toolbar-field-background-color: Field !important;
-    --chrome-content-separator-color: #535353 !important;
+      --lwt-tab-text: -moz-dialogtext !important;
+      --uc-tab-border-color: #ffffff0f !important;
+    }
+  }
+
+  .tabbrowser-tab,
+  #tabbrowser-arrowscrollbox-periphery #tabs-newtab-button,
+  #TabsToolbar #TabsToolbar-customization-target> :not(#tabbrowser-tabs) {
+    padding-top: 4px !important;
+  }
+
+  #tabbrowser-tabs {
+    margin-top: calc(var(--tab-block-margin) - 4px) !important;
+  }
+
+  #TabsToolbar #TabsToolbar-customization-target> :not(#tabbrowser-tabs) {
+    margin-top: calc(var(--tab-block-margin) - 2px) !important;
   }
 
   /* remove toolbar bg */
@@ -76,33 +77,28 @@ browsing indicator) */
     border-radius: var(--tab-border-radius) !important;
   }
 
+  .tab-background[selected] {
+    outline: 1px solid var(--uc-tab-border-color, var(--lwt-tab-line-color, var(--lwt-tabs-border-color, transparent))) !important;
+    outline-offset: -1px !important;
+  }
+
   /* adjust spacing of area above tabs */
-  @supports not -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
+  @media not (-moz-platform: macos) {
-    :root[sizemode="maximized"] #titlebar {
+    :root[sizemode="maximized"] {
       --tab-block-margin: 4px !important;
     }
   }
 
-  :root:is([inFullscreen], :not([tabsintitlebar])) #titlebar {
+  :root:is([inFullscreen], :not([tabsintitlebar])) {
     --tab-block-margin: 4px !important;
   }
 
-  @supports -moz-bool-pref("uc.tweak.disable-drag-space") {
+  @media (-moz-bool-pref: "uc.tweak.disable-drag-space") {
-    :root #titlebar {
+    :root {
       --tab-block-margin: 4px !important;
     }
   }
 
-  :root #titlebar {
-    --tab-min-height: 33px !important;
-  }
-
-  /* remove navbar shadow */
-  #titlebar,
-  :root[lwtheme-brighttext="true"] #titlebar {
-    box-shadow: none !important;
-  }
-
   /* move tab shadow behind urlbar */
   .tabbrowser-tab[visuallyselected="true"],
   #nav-bar {
@@ -126,72 +122,187 @@ browsing indicator) */
     margin-bottom: -8px !important;
   }
 
-  .tabbrowser-tab:is([visuallyselected="true"], [multiselected])>.tab-stack>.tab-background {
+  :root {
-    box-shadow: 0 3px 4px rgba(0, 0, 0, 0.12), 0 0px 2px rgba(0, 0, 0, 0.1) !important;
+    --uc-titlebar-shadow: none;
+    --uc-tab-shadow:
+      0 3.3px 3px rgb(0 0 0 / .06),
+      0 0 0 1px rgb(0 0 0 / .11);
   }
 
-  :root[lwtheme-brighttext="true"] .tabbrowser-tab:is([visuallyselected="true"], [multiselected])>.tab-stack>.tab-background {
+  :root[lwtheme-brighttext="true"] {
-    box-shadow: 0 3px 4px rgba(0, 0, 0, 0.2), 0 0px 2px rgba(0, 0, 0, 0.1) !important;
+    --uc-titlebar-shadow: none;
+    --uc-tab-shadow: 0 1px 2px rgb(0 0 0 / .08);
+  }
+}
+
+@media not (-moz-platform: macos) {
+  @media not (-moz-bool-pref: "uc.tweak.revert-context-menu") {
+    @media (-moz-bool-pref: "uc.tweak.vertical-context-navigation") {
+      #context-navigation {
+        flex-direction: column !important;
+        -moz-box-orient: vertical !important;
+      }
+
+      #context-navigation>.menuitem-iconic {
+        justify-content: start !important;
+        -moz-box-pack: start !important;
+      }
+
+      #context-navigation .menu-iconic-text {
+        display: flex !important;
+      }
+
+      :root,
+      :root[lang^="en"] {
+        --uc-string-back: "Back";
+        --uc-string-forward: "Forward";
+        --uc-string-reload: "Reload";
+        --uc-string-stop: "Stop";
+        --uc-string-bookmark-page: "Bookmark Page";
+        --uc-string-edit-bookmark: "Edit Bookmark";
+      }
+
+      #context-navigation>#context-back .menu-iconic-text::before {
+        content: var(--uc-string-back) !important;
+      }
+
+      #context-navigation>#context-forward .menu-iconic-text::before {
+        content: var(--uc-string-forward) !important;
+      }
+
+      #context-navigation>#context-reload .menu-iconic-text::before {
+        content: var(--uc-string-reload) !important;
+      }
+
+      #context-navigation>#context-stop .menu-iconic-text::before {
+        content: var(--uc-string-stop) !important;
+      }
+
+      #context-navigation>#context-bookmarkpage .menu-iconic-text::before {
+        content: var(--uc-string-bookmark-page) !important;
+      }
+
+      #context-navigation>#context-bookmarkpage[starred] .menu-iconic-text::before {
+        content: var(--uc-string-edit-bookmark) !important;
+      }
+    }
   }
 }
 
 @media (-moz-windows-compositor) {
-  @supports -moz-bool-pref("uc.tweak.win11-mica") {
+  @media (-moz-bool-pref: "uc.tweak.revert-context-menu") {
-    /* enable mica appearance */
+    menupopup {
-    #main-window:not(:-moz-lwtheme),
+      --panel-color: var(--arrowpanel-color) !important;
-    #main-window[lwt-default-theme-in-dark-mode="true"] {
+      --panel-border-radius: 4px !important;
-      appearance: -moz-win-glass !important;
+      --panel-border-color: var(--arrowpanel-border-color) !important;
-      background: transparent !important;
+      --panel-background: var(--arrowpanel-background) !important;
-    }
+      --menuitem-hover-background-color: var(--panel-item-hover-bgcolor) !important;
-
+      --menu-background-color: var(--arrowpanel-background) !important;
-    #main-window[lwt-default-theme-in-dark-mode="true"] #navigator-toolbox:not(:-moz-window-inactive) {
+      --menu-color: var(--arrowpanel-color) !important;
-      background: transparent !important;
+      --menuitem-disabled-hover-background-color: #0000 !important;
-    }
+      --menu-disabled-color: var(--panel-disabled-color) !important;
-
+      --menu-border-color: var(--panel-separator-color) !important;
-    @supports -moz-bool-pref("uc.tweak.floating-tabs") {
-      #navigator-toolbox:not(:-moz-lwtheme),
-      #main-window[lwt-default-theme-in-dark-mode="true"] #navigator-toolbox:not(:-moz-window-inactive) {
-        background: transparent !important;
-      }
-    }
-
-    /* force tab color (for the tab transparency) */
-    .tab-background:is([selected], [multiselected]) {
-      background: var(--toolbar-bgcolor) !important;
-    }
-
-    /* color adjustments */
-    :root:not(:-moz-lwtheme):not(:-moz-window-inactive) {
-      --lwt-accent-color: #00000020 !important;
-    }
-
-    @supports -moz-bool-pref("uc.tweak.floating-tabs") {
-      :root:not(:-moz-lwtheme):not(:-moz-window-inactive) {
-        --toolbar-bgcolor: #ffffffcc !important;
-      }
-
-      :root[lwt-default-theme-in-dark-mode="true"]:not(:-moz-window-inactive) {
-        --toolbar-bgcolor: #ffffff20 !important;
-      }
-    }
-
-    /* line up buttons with duplicate icons from -moz-win-glass */
-    :root:is(:not(:-moz-lwtheme),[lwt-default-theme-in-dark-mode="true"]) .titlebar-buttonbox-container {
-      --uc-titlebar-button-size: 30px;
-      --uc-titlebar-size: calc(var(--tab-min-height) + var(--tab-block-margin));
-      margin-bottom: calc(var(--uc-titlebar-size) - var(--uc-titlebar-button-size)) !important;
-    }
-
-    :root:is(:not(:-moz-lwtheme), [lwt-default-theme-in-dark-mode="true"]) .titlebar-button:not(.titlebar-close:hover, :-moz-window-inactive) {
-      list-style-image: none !important;
-    }
-
-    :root:is(:not(:-moz-lwtheme), [lwt-default-theme-in-dark-mode="true"]):is([inFullscreen], [sizemode="maximized"]) .titlebar-button {
-      padding-block: 7px 9px !important;
-    }
-
-    :root:is(:not(:-moz-lwtheme), [lwt-default-theme-in-dark-mode="true"]):is([inFullscreen], [sizemode="maximized"]) .titlebar-close {
-      padding-right: 19px !important;
     }
   }
 }
+
+@media (-moz-bool-pref: "uc.tweak.show-tab-close-button-on-hover") {
+  #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([pinned], [selected]):hover .tab-close-button {
+    display: flex !important;
+  }
+}
+
+@media (-moz-bool-pref: "uc.tweak.hide-tabs-bar") {
+  :root:not([customizing]) {
+    /* Height of navbar, used for determining height and position of window controls */
+    --uc-navbar-height: 38px;
+    /* Drag space next to the window controls, allows you to move the window more easily */
+    --uc-titlebar-drag-space: 40px;
+
+    @media not (-moz-bool-pref: "uc.tweak.hide-tabs-bar.only-when-maximised") {
+      /* Set containing block for the window buttons */
+      & #titlebar {
+        position: relative !important;
+      }
+
+      /* Hide the tabs */
+      & #TabsToolbar {
+        visibility: collapse !important;
+        padding-inline-start: 0 !important;
+      }
+
+      /* Add some padding to the top of the navbar */
+      & #nav-bar {
+        padding-top: var(--tab-block-margin) !important;
+      }
+    }
+
+    /* macOS specific positioning */
+    @media (-moz-platform: macos) {
+      &[inFullscreen] {
+        /* Hide the tabs */
+        & #TabsToolbar {
+          visibility: collapse !important;
+          padding-inline-start: 0 !important;
+        }
+      }
+
+      @media not (-moz-bool-pref: "uc.tweak.hide-tabs-bar.only-when-maximised") {
+        /* Offset navbar contents to make space for the window controls */
+        &[tabsintitlebar] #nav-bar:not([inFullscreen]) {
+          padding-left: calc(84px + var(--uc-titlebar-drag-space));
+
+          /* Remove the padding from the side of the navbar */
+          & #nav-bar-customization-target > :is(toolbarbutton, toolbaritem):first-child {
+            padding-inline-start: 0 !important;
+          }
+        }
+
+        /* Positioning of the window controls */
+        #TabsToolbar .titlebar-buttonbox {
+          --uc-position: calc((var(--uc-navbar-height) + var(--tab-block-margin)) / 2 - 8px);
+          visibility: visible !important;
+          position: absolute !important;
+          top: var(--uc-position);
+          left: var(--uc-position);
+          margin: 0 !important;
+        }
+      }
+    }
+
+    /* Windows specific positioning */
+    @media (-moz-platform: windows) {
+      /* Offset navbar contents to make space for the window controls */
+      &:where([inFullscreen], [tabsintitlebar]) #nav-bar {
+        padding-right: calc(140px + var(--uc-titlebar-drag-space));
+
+        /* Remove the padding from the side of the navbar */
+        & #PanelUI-menu-button {
+          padding-inline-end: 0 !important;
+        }
+      }
+
+      /* Positioning of the window controls */
+      & #toolbar-menubar[inactive] + #TabsToolbar .titlebar-buttonbox {
+        visibility: visible !important;
+        position: absolute !important;
+        top: 0;
+        right: 0;
+        height: calc(var(--uc-navbar-height) + var(--tab-block-margin)) !important;
+      }
+        
+      /* Set background colour of the menu bar to maintain consistency with the navbar */
+      @media not (-moz-bool-pref: "uc.tweak.floating-tabs") {
+        #toolbar-menubar {
+          background-color: var(--toolbar-bgcolor) !important;
+        }
+      }
+    }
+  }
+}
+
+@media (-moz-bool-pref: "uc.tweak.hide-forward-button") {
+  :root:not([customizing]) #forward-button[disabled] {
+    display: none !important;
+  }
+}

chrome/icons/accessibility.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M8 0a2.5 2.5 0 0 0-2.396 3.213l-2.24-.847a1.746 1.746 0 0 0-1.245 3.26L5 6.736v2.398l-1.643 4.524a1.747 1.747 0 0 0 3.284 1.194L8 11.145l1.365 3.702a1.745 1.745 0 0 0 3.278-1.2L11 9.124V6.73l2.867-1.087a1.752 1.752 0 1 0-1.244-3.278l-2.227.843A2.5 2.5 0 0 0 8 0zm0 1a1.5 1.5 0 1 1 0 2.999 1.5 1.5 0 0 1 0-3zM2.729 3.252a.74.74 0 0 1 .28.05l4.104 1.551c.571.216 1.201.216 1.772 0l4.094-1.552a.754.754 0 1 1 .535 1.41l-3.192 1.208a.498.498 0 0 0-.322.467V9.21c0 .058.01.117.03.171l1.673 4.608a.745.745 0 0 1-1.4.511l-1.37-3.719c-.319-.867-1.547-.866-1.865.002L5.703 14.51a.747.747 0 1 1-1.404-.511l1.67-4.606A.497.497 0 0 0 6 9.222v-2.83a.5.5 0 0 0-.32-.467L2.479 4.693a.745.745 0 0 1 .25-1.44z"/>
+</svg>

chrome/icons/account-private.svg

@@ -0,0 +1,13 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <linearGradient id="a" x1="4.22" x2="11.78" y1="7.979" y2="7.979" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#b2b2b2" offset="0"/>
+      <stop stop-color="#b2b2b2" stop-opacity="0" offset="1"/>
+    </linearGradient>
+  </defs>
+  <path fill="#303030" d="M0 0h16v16H0z"/>
+  <g fill="url(#a)">
+    <circle cx="8" cy="5.767" r="2.433"/>
+    <path d="M5.244 8.867c-.613 0-1.024.46-1.024 1.107 0 1.949 1.996 2.651 3.78 2.651 1.784 0 3.78-.702 3.78-2.651 0-.648-.41-1.107-1.023-1.107z"/>
+  </g>
+</svg>

chrome/icons/account.svg

@@ -0,0 +1,7 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#fafafa" d="M0 0h16v16H0z"/>
+  <g fill="#8f8f8f">
+    <circle cx="8" cy="5.767" r="2.433"/>
+    <path d="M5.244 8.867c-.613 0-1.024.46-1.024 1.107 0 1.949 1.996 2.651 3.78 2.651 1.784 0 3.78-.702 3.78-2.651 0-.648-.41-1.107-1.023-1.107z"/>
+  </g>
+</svg>

chrome/icons/add-to-dictionary.svg

@@ -0,0 +1,4 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M4 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h4.35a5.769 5.769 0 0 1-1.076-1H4.001a1 1 0 0 1-1-1h3.605a5.376 5.376 0 0 1-.406-1H3V2a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1v4.199a5.2 5.2 0 0 1 1 .398V2a2 2 0 0 0-2-2H4zm1 2a1 1 0 0 0-1 1v1a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V3a1 1 0 0 0-1-1H5zm0 1h6v1H5V3z"/>
+  <path d="M16 11.5a4.5 4.5 0 1 1-9 0 4.5 4.5 0 0 1 9 0zm-4-2a.5.5 0 0 0-1 0V11H9.5a.5.5 0 0 0 0 1H11v1.5a.5.5 0 0 0 1 0V12h1.5a.5.5 0 0 0 0-1H12z"/>
+</svg>

chrome/icons/arrow-filled-down.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path transform="rotate(90)" transform-origin="center" d="M6.479 2.729 11.1 7.35a.92.92 0 0 1 0 1.3l-4.621 4.621a.72.72 0 0 1-1.229-.509V3.237a.72.72 0 0 1 1.229-.508z"/>
+</svg>

chrome/icons/arrow-filled-left.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path transform="rotate(180)" transform-origin="center" d="M6.479 2.729 11.1 7.35a.92.92 0 0 1 0 1.3l-4.621 4.621a.72.72 0 0 1-1.229-.509V3.237a.72.72 0 0 1 1.229-.508z"/>
+</svg>

chrome/icons/arrow-filled-right.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M6.479 2.729 11.1 7.35a.92.92 0 0 1 0 1.3l-4.621 4.621a.72.72 0 0 1-1.229-.509V3.237a.72.72 0 0 1 1.229-.508z"/>
+</svg>

chrome/icons/arrow-left.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path transform="scale(-1 1) translate(-16 0)" d="M5.5 2a.5.5 0 0 0-.354.853L10.313 8l-5.167 5.146a.5.5 0 0 0 .707.71l5.484-5.468a.548.548 0 0 0 0-.777L5.853 2.143A.496.496 0 0 0 5.5 2z"/>
+</svg>

chrome/icons/audio-save.svg

@@ -0,0 +1,4 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M14.13 7c-.478 0-.957.18-1.322.547l-4.828 4.83a2.2 2.2 0 0 0-.578 1.02l-.375 1.498a.889.889 0 0 0 1.078 1.078l1.498-.375a2.2 2.2 0 0 0 1.02-.578l4.828-4.828A1.872 1.872 0 0 0 14.13 7zm-.002 1.002c.427.002.671.224.8.537.13.314.116.643-.187.947l-4.826 4.826a1.204 1.204 0 0 1-.556.315l-1.316.332.33-1.32H8.37c.053-.21.163-.403.316-.557l4.828-4.83a.85.85 0 0 1 .614-.25zm-6.266 7 .002.002H7.86z"/>
+  <path d="M12.94.182c-.08.004-.162.02-.242.045l-7 2.188a.998.998 0 0 0-.701.953V11.5a2.5 2.5 0 1 0 1 2V6.368l7-2.188v2.055c.32-.137.66-.213 1-.229V1.18c0-.59-.5-1.032-1.057-.998zm.057.998v1.953l-7 2.188V3.368l7-2.188zM3.497 12a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3z"/>
+</svg>

chrome/icons/bookmark-star-on-tray.svg

@@ -1,4 +1,4 @@
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-linecap="round" stroke-width="1.001">
-  <path d="M1.5 12a.5.5 0 0 0-.5.5v1C1 14.875 2.125 16 3.5 16h9c1.375 0 2.5-1.125 2.5-2.5v-1a.5.5 0 0 0-1 0v1c0 .834-.666 1.5-1.5 1.5h-9c-.834 0-1.5-.666-1.5-1.5v-1a.5.5 0 0 0-.5-.5z"/>
+  <path d="m8 12.95-4.09 2.151a.501.501 0 0 1-.727-.528l.731-4.266a.561.562 0 0 0-.161-.498L.655 6.79a.501.501 0 0 1 .278-.855l4.28-.623a.561.562 0 0 0 .423-.307L7.55 1.123a.501.501 0 0 1 .9 0l2.031 4.115a.475.475 0 0 0 .426.264H15.5"/>
-  <path d="M8 .75c-.305 0-.61.15-.758.45L5.84 4.04l-3.133.453c-.661.096-.947.977-.469 1.443l2.268 2.211-.535 3.121c-.113.66.635 1.202 1.227.89l2.803-1.474 2.803 1.475c.592.311 1.34-.232 1.227-.89l-.535-3.122 2.268-2.21c.479-.467.193-1.348-.469-1.444l-3.133-.453L8.76 1.2A.829.829 0 0 0 8.002.75zm0 1.174 1.297 2.627a.854.854 0 0 0 .643.467l2.9.422-2.098 2.045a.855.855 0 0 0-.246.756l.494 2.889-2.592-1.363a.859.859 0 0 0-.797 0L5.009 11.13l.494-2.89a.855.855 0 0 0-.246-.755L3.159 5.44l2.9-.422A.854.854 0 0 0 6.7 4.55z"/>
+  <path d="M15.5 8.5h-5M10.5 11.5h5"/>
 </svg>

chrome/icons/checkmark.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M14.5 2a.5.5 0 0 0-.379.174l-9.129 10.57-4.12-4.578a.5.5 0 0 0-.706-.037.5.5 0 0 0-.037.705l4.5 5a.5.5 0 0 0 .75-.008l9.5-11a.5.5 0 0 0-.053-.705A.5.5 0 0 0 14.5 2z"/>
+</svg>

chrome/icons/container-tab.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M2 0C.901 0 0 .901 0 2v1.5a.5.5 0 0 0 .5.5.5.5 0 0 0 .5-.5V2c0-.558.442-1 1-1h1.5A.5.5 0 0 0 4 .5a.5.5 0 0 0-.5-.5H2zm10.5 0a.5.5 0 0 0-.5.5.5.5 0 0 0 .5.5H14c.558 0 1 .442 1 1v1.5a.5.5 0 0 0 .5.5.5.5 0 0 0 .5-.5V2c0-1.099-.901-2-2-2h-1.5zm-8 2A2.508 2.508 0 0 0 2 4.5v7C2 12.875 3.125 14 4.5 14h7c1.375 0 2.5-1.125 2.5-2.5v-7C14 3.125 12.875 2 11.5 2h-7zm0 1H7v1.5C7 5.323 7.677 6 8.5 6H13v5.5c0 .834-.666 1.5-1.5 1.5h-7c-.834 0-1.5-.666-1.5-1.5v-7C3 3.666 3.666 3 4.5 3zM8 3h3.5c.834 0 1.5.666 1.5 1.5V5H8.5a.493.493 0 0 1-.5-.5V3zM.5 12a.5.5 0 0 0-.5.5V14c0 1.099.901 2 2 2h1.5a.5.5 0 0 0 .5-.5.5.5 0 0 0-.5-.5H2c-.558 0-1-.442-1-1v-1.5a.5.5 0 0 0-.5-.5zm15 0a.5.5 0 0 0-.5.5V14c0 .558-.442 1-1 1h-1.5a.5.5 0 0 0-.5.5.5.5 0 0 0 .5.5H14c1.099 0 2-.901 2-2v-1.5a.5.5 0 0 0-.5-.5z"/>
+</svg>

chrome/icons/duplicate-tab.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M5.5 0A2.5 2.5 0 0 0 3 2.5v8A2.5 2.5 0 0 0 5.5 13h8a2.5 2.5 0 0 0 2.5-2.5v-8A2.5 2.5 0 0 0 13.5 0h-8zm0 1H7v1.5A1.5 1.5 0 0 0 8.5 4H15v6.5a1.5 1.5 0 0 1-1.5 1.5h-8A1.5 1.5 0 0 1 4 10.5v-8A1.5 1.5 0 0 1 5.5 1zM8 1h5.5A1.5 1.5 0 0 1 15 2.5V3H8.5a.5.5 0 0 1-.5-.5V1zM2 3.05A2.5 2.5 0 0 0 0 5.5V12a4 4 0 0 0 4 4h6.5a2.5 2.5 0 0 0 2.45-2h-1.036a1.5 1.5 0 0 1-1.414 1H4a3 3 0 0 1-3-3V5.5a1.5 1.5 0 0 1 1-1.414V3.05z"/>
+</svg>

chrome/icons/edit-delete.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M8 .5A2.5 2.5 0 0 0 5.5 3H1a.5.5 0 0 0-.5.5l.008.09A.5.5 0 0 0 1 4h.553L2.85 14.229A2 2 0 0 0 4.836 16h6.328a2 2 0 0 0 1.986-1.771L14.445 4H15a.5.5 0 0 0 0-1h-4.5A2.5 2.5 0 0 0 8 .5zm0 1A1.5 1.5 0 0 1 9.5 3h-3A1.5 1.5 0 0 1 8 1.5zM2.56 4h10.877l-1.28 10.116a.998.998 0 0 1-.993.884H4.836a.998.998 0 0 1-.992-.884zM6.5 6.5c-.276 0-.5.196-.5.438v5.124l.008.078c.042.204.247.36.492.36.276 0 .5-.196.5-.438V6.938l-.008-.079C6.95 6.655 6.745 6.5 6.5 6.5zm3 0c-.276 0-.5.196-.5.438v5.124l.008.078c.042.204.247.36.492.36.276 0 .5-.196.5-.438V6.938l-.008-.079C9.95 6.655 9.745 6.5 9.5 6.5z"/>
+</svg>

chrome/icons/edit-redo.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path transform="scale(-1 1) translate(-16 0)" d="M1.5 0a.5.5 0 0 0-.5.5v4.9a.6.6 0 0 0 .6.6h4.9a.5.5 0 0 0 0-1H2.906L6.38 1.98a4 4 0 1 1 5.248 6.04l-8.172 7.103a.5.5 0 1 0 .656.754l8.172-7.104a5.001 5.001 0 0 0-6.56-7.547L2 4.464V.5a.5.5 0 0 0-.5-.5z"/>
+</svg>

chrome/icons/edit-select-all.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M6 0a2 2 0 0 0-2 2v.5a.5.5 0 0 0 1 0V2a1 1 0 0 1 1-1h.5a.5.5 0 0 0 0-1H6zm2.5 0a.5.5 0 0 0 0 1h3a.5.5 0 0 0 0-1h-3zm5 0a.5.5 0 0 0 0 1h.5a1 1 0 0 1 1 1v.5a.5.5 0 0 0 1 0V2a2 2 0 0 0-2-2h-.5zM2 4a2 2 0 0 0-2 2v6.5A3.5 3.5 0 0 0 3.5 16H10a2 2 0 0 0 2-2v-1h-1v1a1 1 0 0 1-1 1H3.5A2.5 2.5 0 0 1 1 12.5V6a1 1 0 0 1 1-1h1V4H2zm2.5 0a.5.5 0 0 0-.5.5v3a.5.5 0 0 0 1 0v-3a.5.5 0 0 0-.5-.5zm11 0a.5.5 0 0 0-.5.5v3a.5.5 0 0 0 1 0v-3a.5.5 0 0 0-.5-.5zm-11 5a.5.5 0 0 0-.5.5v.5a2 2 0 0 0 2 2h.5a.5.5 0 0 0 0-1H6a1 1 0 0 1-1-1v-.5a.5.5 0 0 0-.5-.5zm11 0a.5.5 0 0 0-.5.5v.5a1 1 0 0 1-1 1h-.5a.5.5 0 0 0 0 1h.5a2 2 0 0 0 2-2v-.5a.5.5 0 0 0-.5-.5zm-7 2a.5.5 0 0 0 0 1h3a.5.5 0 0 0 0-1h-3z"/>
+</svg>

chrome/icons/edit-undo.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M1.5 0a.5.5 0 0 0-.5.5v4.9a.6.6 0 0 0 .6.6h4.9a.5.5 0 0 0 0-1H2.906L6.38 1.98a4 4 0 1 1 5.248 6.04l-8.172 7.103a.5.5 0 1 0 .656.754l8.172-7.104a5.001 5.001 0 0 0-6.56-7.547L2 4.464V.5a.5.5 0 0 0-.5-.5z"/>
+</svg>

chrome/icons/edit.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M11.25.815a2.783 2.783 0 0 1 4.066 3.796l-.13.14-9.606 9.605a2 2 0 0 1-.723.463l-.165.053-4.055 1.106a.5.5 0 0 1-.63-.535l.016-.08L1.13 11.31a2 2 0 0 1 .398-.76l.117-.128zm-.86 2.275-8.04 8.038a1 1 0 0 0-.215.321l-.042.123-.876 3.211 3.212-.876a1 1 0 0 0 .238-.1l.108-.071.098-.086 8.038-8.04zm4.089-1.568a1.784 1.784 0 0 0-2.402-.11l-.12.11-.86.86 2.52 2.522.861-.86a1.784 1.784 0 0 0 .11-2.402z"/>
+</svg>

chrome/icons/firefox-view.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M5.5 7a.5.5 0 0 0-.5.5.5.5 0 0 0 .5.5h5a.5.5 0 0 0 .5-.5.5.5 0 0 0-.5-.5zM4 2c-.736 0-1.381.404-1.729 1h11.46c-.347-.596-.993-1-1.729-1zM3 4c-1.099 0-2 .9-2 2v7c0 1.099.9 2 2 2h10c1.099 0 2-.9 2-2V6c0-1.099-.9-2-2-2zm0 1h10c.563 0 1 .437 1 1v7c0 .563-.437 1-1 1H3c-.563 0-1-.437-1-1V6c0-.563.437-1 1-1z"/>
+</svg>

chrome/icons/icons.css

@@ -1,8 +1,9 @@
-/* EdgeFr-Fox by bmFtZQ - icons.css */
+/* Edge-Frfox - icons.css */
 
 /* windows 11 style window controls (no known way to detect between windows 10
 and 11 so applied to both) */
-@media (-moz-windows-compositor) {
+@media (-moz-platform: windows),
+(-moz-gtk-csd-available) {
   .titlebar-min {
     list-style-image: url("win11-minimize.svg") !important;
   }
@@ -19,24 +20,32 @@ and 11 so applied to both) */
     list-style-image: url("win11-close.svg") !important;
   }
 
-  /* darkmode icon that uses thicker strokes and easier to see (only needed at
+  /* darkmode icon that uses thicker strokes and is easier to see (only needed
-  1x scale) */
+  at 1x scale) */
   @media (max-resolution: 1dppx) {
-    :root[lwtheme-brighttext="true"] .titlebar-close,
+    toolbar[brighttext] .titlebar-close,
     .titlebar-close:hover {
       list-style-image: url("win11-close-dark.svg") !important;
     }
   }
 }
 
-#appMenu-multiView .subviewbutton,
+.subviewbutton {
-#overflowMenu-customize-button {
   -moz-context-properties: fill, fill-opacity !important;
   fill: currentColor !important;
 }
 
+:root[fxastatus="not_configured"] #fxa-avatar-image {
+  list-style-image: url("account.svg") !important;
+}
+
+.private-browsing-indicator-icon {
+  list-style-image: url("account-private.svg") !important;
+  border-radius: 100% !important;
+}
+
 /* disable context menu icons on macOS */
-@supports not -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
+@media not (-moz-platform: macos) {
   #context-back {
     list-style-image: url("back.svg") !important;
   }
@@ -94,15 +103,16 @@ and 11 so applied to both) */
 
 #downloads-button,
 #downloads-indicator-anchor,
-#appMenu-downloads-button {
+#appMenu-downloads-button,
+#appMenu-library-downloads-button {
   list-style-image: url("downloads.svg") !important;
 }
 
 #appMenu-passwords-button,
 #password-notification-icon,
-#PopupAutoComplete > richlistbox > richlistitem[originaltype="generatedPassword"] > .two-line-wrapper > .ac-site-icon,
+#PopupAutoComplete>richlistbox>richlistitem[originaltype="generatedPassword"]>.two-line-wrapper>.ac-site-icon,
-#PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] > .two-line-wrapper > .ac-site-icon,
+#PopupAutoComplete>richlistbox>richlistitem[originaltype="loginWithOrigin"]>.two-line-wrapper>.ac-site-icon,
-#PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon {
+#PopupAutoComplete>richlistbox>richlistitem[originaltype="login"]>.ac-site-icon {
   list-style-image: url("passwords.svg") !important;
 }
 
@@ -123,6 +133,10 @@ and 11 so applied to both) */
   list-style-image: url("new-tab.svg") !important;
 }
 
+#firefox-view-button {
+  list-style-image: url("firefox-view.svg") !important;
+}
+
 #sync-button,
 .urlbarView-row[source="tabs"]>.urlbarView-row-inner>.urlbarView-no-wrap>.urlbarView-favicon,
 #urlbar-engine-one-off-item-tabs {
@@ -132,7 +146,10 @@ and 11 so applied to both) */
 #history-panelmenu,
 .urlbarView-row[source="history"]>.urlbarView-row-inner>.urlbarView-no-wrap>.urlbarView-favicon,
 #urlbar-engine-one-off-item-history,
-#appMenu-history-button {
+#appMenu-history-button,
+#appMenu-library-history-button,
+#sidebar-switcher-history,
+#sidebar-box[sidebarcommand="viewHistorySidebar"]>#sidebar-header>#sidebar-switcher-target>#sidebar-icon {
   list-style-image: url("history.svg") !important;
 }
 
@@ -146,18 +163,27 @@ and 11 so applied to both) */
   list-style-image: url("print.svg") !important;
 }
 
-#find-button,
+.searchbar-search-icon {
-.searchbar-search-icon,
-#appMenu-find-button2 {
   list-style-image: url("search-glass.svg") !important;
 }
 
+#find-button,
+#appMenu-find-button2 {
+  list-style-image: url("search-page.svg") !important;
+}
+
+#appMenu-translate-button,
+#translations-button-icon {
+  list-style-image: url("translate.svg") !important;
+}
+
 #open-file-button {
   list-style-image: url("open.svg") !important;
 }
 
 #add-ons-button,
-#appMenu-extensions-themes-button {
+#appMenu-extensions-themes-button,
+#unified-extensions-button {
   list-style-image: url("extension.svg") !important;
 }
 
@@ -195,7 +221,8 @@ and 11 so applied to both) */
 
 #preferences-button,
 .search-setting-button>.button-box>.button-icon,
-#appMenu-settings-button {
+#appMenu-settings-button,
+.unified-extensions-item-open-menu.subviewbutton {
   list-style-image: url("settings.svg") !important;
 }
 
@@ -203,8 +230,11 @@ and 11 so applied to both) */
   list-style-image: url("forget.svg") !important;
 }
 
-#privatebrowsing-button,
 #appMenu-new-private-window-button2 {
+  list-style-image: url("private-window.svg") !important;
+}
+
+#privatebrowsing-button {
   list-style-image: url("privateBrowsing.svg") !important;
 }
 
@@ -239,7 +269,10 @@ and 11 so applied to both) */
 }
 
 #bookmarks-menu-button,
-#appMenu-bookmarks-button {
+#appMenu-bookmarks-button,
+#sidebar-switcher-bookmarks,
+#appMenu-library-bookmarks-button,
+#sidebar-box[sidebarcommand="viewBookmarksSidebar"]>#sidebar-header>#sidebar-switcher-target>#sidebar-icon {
   list-style-image: url("bookmark-star-on-tray.svg") !important;
 }
 
@@ -284,7 +317,7 @@ and 11 so applied to both) */
 
 /* security */
 .identity-popup-security-connection {
-  background-image: url("security-broken.svg") !important;
+  list-style-image: url("security-broken.svg") !important;
 }
 
 #identity-box[pageproxystate="valid"].notSecure #identity-icon,
@@ -294,30 +327,30 @@ and 11 so applied to both) */
 }
 
 #identity-popup[connection=chrome] .identity-popup-security-connection {
-  background-image: url("firefox.svg") !important;
+  list-style-image: url("firefox.svg") !important;
 }
 
 #identity-popup[connection="file"] .identity-popup-security-connection {
-  background-image: url("page-portrait.svg") !important;
+  list-style-image: url("page-portrait.svg") !important;
 }
 
 #identity-popup[connection^=secure] .identity-popup-security-connection {
-  background-image: url("security.svg") !important;
+  list-style-image: url("security.svg") !important;
 }
 
 #identity-popup[ciphers=weak] .identity-popup-security-connection,
 #identity-popup[mixedcontent~=passive-loaded][isbroken] .identity-popup-security-connection,
 #identity-popup[connection=secure-cert-user-overridden] .identity-popup-security-connection,
 #identity-popup[connection=cert-error-page] .identity-popup-security-connection {
-  background-image: url("security-warning.svg") !important;
+  list-style-image: url("security-warning.svg") !important;
 }
 
 #identity-popup[connection=net-error-page] .identity-popup-security-connection {
-  background-image: url("info.svg") !important;
+  list-style-image: url("info.svg") !important;
 }
 
 #identity-popup[connection=extension] .identity-popup-security-connection {
-  background-image: url("extension.svg") !important;
+  list-style-image: url("extension.svg") !important;
 }
 
 #appMenu-new-tab-button2 {
@@ -337,7 +370,9 @@ and 11 so applied to both) */
 .widget-overflow-list .subviewbutton-nav::after,
 .PanelUI-subView .subviewbutton-nav::after,
 .menu-right {
-  content: url("arrow-right.svg") !important;
+  content: url("arrow-filled-right.svg") !important;
+  opacity: 0.6 !important;
+  scale: 0.75 !important;
 }
 
 #PlacesChevron,
@@ -345,6 +380,10 @@ and 11 so applied to both) */
   list-style-image: url("arrow-right.svg") !important;
 }
 
+.panel-header>.subviewbutton-back {
+  list-style-image: url("arrow-left.svg") !important;
+}
+
 #overflowMenu-customize-button,
 #appmenu-moreTools-button {
   list-style-image: url("customize.svg") !important;
@@ -364,32 +403,27 @@ and 11 so applied to both) */
   list-style-image: url("bookmark.svg") !important;
 }
 
-/* tab icons */
+#sidebar-box[sidebarcommand="viewTabsSidebar"]>#sidebar-header>#sidebar-switcher-target>#sidebar-icon,
-.tab-icon-image[src="chrome://branding/content/icon32.png"],
+#sidebar-switcher-tabs {
-.tab-icon-image[src="chrome://global/skin/icons/settings.svg"],
+  list-style-image: url("send-to-device.svg") !important;
-.tab-icon-image[src="chrome://mozapps/skin/extensions/extension.svg"],
-.tab-icon-image[src="chrome://browser/skin/customize.svg"],
-.tab-icon-image[src="chrome://browser/skin/privatebrowsing/favicon.svg"] {
-  padding-left: 16px !important;
-  box-sizing: border-box !important;
 }
 
+/* tab icons */
 .tab-icon-image[src="chrome://branding/content/icon32.png"],
 .tab-icon-image[src="chrome://browser/skin/privatebrowsing/favicon.svg"] {
-  background: url("new-tab-image.svg") !important;
+  content: url("new-tab-image.svg") !important;
 }
 
 .tab-icon-image[src="chrome://global/skin/icons/settings.svg"] {
-  background: url("settings.svg") !important;
+  content: url("settings.svg") !important;
 }
 
-
 .tab-icon-image[src="chrome://mozapps/skin/extensions/extension.svg"] {
-  background: url("extension.svg") !important;
+  content: url("extension.svg") !important;
 }
 
 .tab-icon-image[src="chrome://browser/skin/customize.svg"] {
-  background: url("customize.svg") !important;
+  content: url("customize.svg") !important;
 }
 
 /* permissions */
@@ -517,3 +551,460 @@ and 11 so applied to both) */
 #stop-reload-button[animate]>#reload-button>.toolbarbutton-animatable-box>.toolbarbutton-animatable-image {
   background-image: url("stop-to-reload.svg") !important;
 }
+
+#reader-mode-button>.urlbar-icon {
+  list-style-image: url("reader-mode.svg") !important;
+}
+
+#unified-extensions-manage-extensions {
+  list-style-image: url("manage.svg") !important;
+}
+
+/* disable context menu icons when this tweak is applied */
+@media not (-moz-bool-pref: "uc.tweak.revert-context-menu") {
+
+  /* Context Menu Icons */
+  menupopup>menuitem:is([checked="true"], [selected="true"]) .menu-iconic-icon {
+    list-style-image: url("checkmark.svg") !important;
+  }
+
+  #context-video-pictureinpicture:not([checked="true"]) .menu-iconic-icon {
+    list-style-image: url("media-pip.svg") !important;
+  }
+
+  #context-media-loop:not([checked="true"]) .menu-iconic-icon {
+    list-style-image: url("media-loop.svg") !important;
+  }
+
+  :not(:not(menubar)>menu, #ContentSelectDropdown)>menupopup>menuitem:not(.menuitem-iconic, [type="checkbox"], [type="radio"], .in-menulist, .in-menulist menuitem, .unified-nav-current),
+  :not(:not(menubar)>menu, #ContentSelectDropdown)>menupopup>menu:not(.menu-iconic, [type="checkbox"], [type="radio"], .in-menulist, .in-menulist menu, .unified-nav-current) {
+    background-image: var(--menu-image) !important;
+    background-size: 16px !important;
+    background-position: var(--uc-contextmenu-menuitem-padding-inline) center !important;
+    background-repeat: no-repeat !important;
+    -moz-context-properties: fill, fill-opacity !important;
+    fill: currentColor !important;
+  }
+
+  @media (-moz-platform: macos) {
+    #context-back {
+      --menu-image: url("back.svg");
+    }
+
+    #context-forward {
+      --menu-image: url("forward.svg");
+    }
+
+    #context-reload {
+      --menu-image: url("reload.svg");
+    }
+
+    #context-stop {
+      --menu-image: url("close.svg");
+    }
+
+    #context-bookmarkpage {
+      --menu-image: url("bookmark-hollow.svg");
+    }
+
+    #contentAreaContextMenu #context-bookmarkpage[starred] {
+      --menu-image: url("bookmark.svg");
+      fill: var(--lwt-toolbarbutton-icon-fill-attention, var(--toolbarbutton-icon-fill-attention, currentColor)) !important;
+    }
+  }
+
+  #context-savepage {
+    --menu-image: url("save.svg");
+  }
+
+  #context-selectall,
+  .textbox-contextmenu menuitem[cmd*="selectAll"],
+  #context_selectAllTabs,
+  #toolbar-context-selectAllTabs {
+    --menu-image: url("edit-select-all.svg");
+  }
+
+  #context-undo,
+  .textbox-contextmenu menuitem[cmd*="undo"],
+  #context_undoCloseTab,
+  #toolbar-context-undoCloseTab {
+    --menu-image: url("edit-undo.svg");
+  }
+
+  #context-redo,
+  .textbox-contextmenu menuitem[cmd*="redo"] {
+    --menu-image: url("edit-redo.svg");
+  }
+
+  #context-copy,
+  .textbox-contextmenu menuitem[cmd*="copy"],
+  #placesContext_copy {
+    --menu-image: url("edit-copy.svg");
+  }
+
+  #context-paste,
+  .textbox-contextmenu menuitem[cmd*="paste"],
+  #placesContext_paste_group {
+    --menu-image: url("edit-paste.svg");
+  }
+
+  #context-cut,
+  .textbox-contextmenu menuitem[cmd*="cut"],
+  #placesContext_cut {
+    --menu-image: url("edit-cut.svg");
+  }
+
+  #context-delete,
+  .customize-context-removeExtension,
+  .unified-extensions-context-menu-remove-extension,
+  .textbox-contextmenu menuitem[cmd*="delete"],
+  menuitem[id="placesContext_deleteBookmark"],
+  menuitem[id="placesContext_deleteFolder"],
+  menuitem[id="placesContext_delete"],
+  menuitem[id="placesContext_delete_history"],
+  menuitem[id="placesContext_deleteHost"] {
+    --menu-image: url("edit-delete.svg");
+  }
+
+  #paste-and-go {
+    --menu-image: url("paste-and-go.svg");
+  }
+
+  #context-print-selection {
+    --menu-image: url("print.svg");
+  }
+
+  #context-take-screenshot {
+    --menu-image: url("screenshot.svg");
+  }
+
+  #context-viewsource {
+    --menu-image: url("source-code.svg");
+  }
+
+  #context-inspect-a11y {
+    --menu-image: url("accessibility.svg");
+  }
+
+  #context-inspect {
+    --menu-image: url("inspect.svg");
+  }
+
+  #context-searchselect {
+    --menu-image: url("search-glass.svg");
+  }
+
+  #context-viewimage {
+    --menu-image: url("image-open.svg");
+  }
+
+  #context-saveimage,
+  #context-video-saveimage {
+    --menu-image: url("image-save.svg");
+  }
+
+  #context-savevideo {
+    --menu-image: url("video-save.svg");
+  }
+
+  #context-viewvideo {
+    --menu-image: url("video-open.svg")
+  }
+
+  #context-saveaudio {
+    --menu-image: url("audio-save.svg");
+  }
+
+  #context-copyimage-contents {
+    --menu-image: url("image-copy.svg");
+  }
+
+  #context-copyimage,
+  #context-copyvideourl,
+  #context-copylink {
+    --menu-image: url("link.svg");
+  }
+
+  #context-sendimage,
+  #context-sendvideo,
+  #context-sendaudio {
+    --menu-image: url("mail.svg");
+  }
+
+  #context-setDesktopBackground,
+  .viewCustomizeToolbar {
+    --menu-image: url("customize.svg");
+  }
+
+  #context-reloadimage,
+  #context_reloadTab,
+  #context_reloadSelectedTabs,
+  #toolbar-context-reloadSelectedTab,
+  #toolbar-context-reloadSelectedTabs {
+    --menu-image: url("reload.svg");
+  }
+
+  #context-sendlinktodevice,
+  #context_sendTabToDevice,
+  #context-sendpagetodevice {
+    --menu-image: url("send-to-device.svg");
+  }
+
+  #context-openlinkintab,
+  #context-openlinkincontainertab,
+  menuitem[id="placesContext_open:newtab"],
+  menuitem[id="placesContext_openLinks:tabs"],
+  menuitem[id="placesContext_openBookmarkLinks:tabs"],
+  menuitem[id="placesContext_openBookmarkContainer:tabs"] {
+    --menu-image: url("tab.svg");
+  }
+
+  #context_openANewTab,
+  #toolbar-context-openANewTab {
+    --menu-image: url("new-tab-image.svg");
+  }
+
+  #context-openlinkinusercontext-menu,
+  menu[id="placesContext_open:newcontainertab"],
+  menu[id="placesContext_openContainer:tabs"] {
+    --menu-image: url("container-tab.svg");
+  }
+
+  #context-openlink,
+  menuitem[id="placesContext_open:newwindow"] {
+    --menu-image: url("window.svg");
+  }
+
+  #context-openlinkprivate,
+  menuitem[id="placesContext_open:newprivatewindow"] {
+    --menu-image: url("private-window.svg");
+  }
+
+  #context-savelink {
+    --menu-image: url("downloads.svg");
+  }
+
+  #spell-add-to-dictionary {
+    --menu-image: url("add-to-dictionary.svg");
+  }
+
+  #manage-saved-logins {
+    --menu-image: url("passwords.svg");
+  }
+
+  #context-media-play,
+  #context_playTab,
+  #context_playSelectedTabs {
+    --menu-image: url("media-play.svg");
+  }
+
+  #context-media-pause {
+    --menu-image: url("media-pause.svg");
+  }
+
+  #context-media-mute,
+  #context_toggleMuteTab,
+  #context_toggleMuteSelectedTabs {
+    --menu-image: url("media-mute.svg");
+  }
+
+  #context-media-unmute,
+  #context_toggleMuteTab[muted],
+  #context_toggleMuteSelectedTabs[muted] {
+    --menu-image: url("media-unmute.svg");
+  }
+
+  #context-media-playbackrate {
+    --menu-image: url("media-speed.svg");
+  }
+
+  #context-video-fullscreen {
+    --menu-image: url("fullscreen.svg");
+  }
+
+  #context-leave-dom-fullscreen,
+  menuitem[contexttype="fullscreen"][label*="Exit"] {
+    --menu-image: url("fullscreen-exit.svg");
+  }
+
+  #context-media-hidecontrols,
+  #context-media-showcontrols {
+    --menu-image: url("permissions.svg");
+  }
+
+  #context_pinTab,
+  #context_unpinTab,
+  #context_pinSelectedTabs,
+  #context_unpinSelectedTabs,
+  .customize-context-moveToPanel {
+    --menu-image: url("pin.svg");
+  }
+
+  #context_duplicateTab,
+  #context_duplicateTabs {
+    --menu-image: url("duplicate-tab.svg");
+  }
+
+  #context_bookmarkTab,
+  #context_bookmarkSelectedTabs,
+  #toggle_PersonalToolbar,
+  #context-bookmarklink,
+  #toolbar-context-bookmarkSelectedTab,
+  #toolbar-context-bookmarkSelectedTabs {
+    --menu-image: url("bookmark-hollow.svg");
+  }
+
+  menuitem[id="placesContext_show_bookmark:info"],
+  menuitem[id="placesContext_show_folder:info"],
+  menuitem[id="placesContext_show:info"] {
+    --menu-image: url("edit.svg");
+  }
+
+  menuitem[id="placesContext_showAllBookmarks"],
+  #BMB_bookmarksShowAllTop,
+  #BMB_bookmarksShowAll,
+  .customize-context-manageExtension,
+  .unified-extensions-context-menu-manage-extension {
+    --menu-image: url("manage.svg");
+  }
+
+  menuitem[id="placesContext_new:bookmark"],
+  menuitem[id="placesContext_new:folder"],
+  menuitem[id="placesContext_new:separator"] {
+    --menu-image: url("plus.svg");
+  }
+
+  #context-savelinktopocket,
+  #context-pocket {
+    --menu-image: url("pocket-outline.svg");
+  }
+
+  #context_moveTabOptions {
+    --menu-image: url("move-tab.svg");
+  }
+
+  .share-tab-url-item {
+    --menu-image: url("share.svg");
+  }
+
+  #context_reopenInContainer {
+    --menu-image: url("container-tab.svg");
+  }
+
+  #context_closeTab {
+    --menu-image: url("close.svg");
+  }
+
+  .customize-context-reportExtension,
+  .unified-extensions-context-menu-report-extension {
+    --menu-image: url("report.svg");
+  }
+}
+
+/* header icons for the app menu sub menus (eg. fx account, history...) */
+.panel-header>h1>span::before {
+  content: "";
+  background: var(--header-image, none) center / 16px no-repeat;
+  -moz-context-properties: fill, fill-opacity;
+  fill: currentColor;
+  padding-inline-start: calc(var(--uc-enabled, 0) * 16px);
+  margin-inline-end: calc(var(--uc-enabled, 0) * 8px);
+}
+
+#PanelUI-fxa .panel-header>h1>span::before {
+  --header-image: var(--avatar-image-url);
+  --uc-enabled: 1;
+  transform: scale(1.25);
+  border-radius: 99px;
+  display: inline-block;
+  height: 16px;
+}
+
+#PanelUI-bookmarks .panel-header>h1>span::before {
+  --header-image: url("bookmark-star-on-tray.svg");
+  --uc-enabled: 1;
+}
+
+#PanelUI-history .panel-header>h1>span::before {
+  --header-image: url("history.svg");
+  --uc-enabled: 1;
+}
+
+#PanelUI-helpView .panel-header>h1>span::before {
+  --header-image: url("help.svg");
+  --uc-enabled: 1;
+}
+
+#appMenu-libraryView .panel-header>h1>span::before {
+  --header-image: url("library.svg");
+  --uc-enabled: 1;
+}
+
+#unified-extensions-panel .panel-header>h1>span::before {
+  --header-image: url("extension.svg");
+  --uc-enabled: 1;
+}
+
+/* Tree items used for side bar and library windows */
+treechildren::-moz-tree-image {
+  fill-opacity: 1 !important;
+}
+
+treechildren::-moz-tree-image(title) {
+  list-style-image: url("page-portrait.svg") !important;
+}
+
+/* default folder icon */
+treechildren::-moz-tree-image(title, container),
+treechildren::-moz-tree-image(title, open) {
+  list-style-image: url("folder.svg") !important;
+}
+
+/* bookmarks bar icon */
+treechildren::-moz-tree-image(container, queryFolder_toolbar_____) {
+  list-style-image: url("bookmark-hollow.svg") !important;
+}
+
+/* bookmarks menu icon */
+treechildren::-moz-tree-image(container, queryFolder_menu________) {
+  list-style-image: url("folder.svg") !important;
+}
+
+/* smart folder icon */
+treechildren::-moz-tree-image(query) {
+  list-style-image: url("settings.svg") !important;
+}
+
+/* bookmarks category icon */
+treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) {
+  list-style-image: url("bookmark-hollow.svg") !important;
+}
+
+/* downloads category icon */
+treechildren::-moz-tree-image(query, OrganizerQuery_downloads__v) {
+  list-style-image: url("downloads.svg") !important;
+}
+
+/* tags category icon */
+treechildren::-moz-tree-image(title, query, tagContainer),
+treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v) {
+  list-style-image: url("tag.svg") !important;
+}
+
+/* calendar icon for folders grouping items by date */
+treechildren::-moz-tree-image(title, query, dayContainer) {
+  list-style-image: url("history.svg") !important;
+}
+
+treechildren::-moz-tree-image(title, query, hostContainer) {
+  list-style-image: url("folder.svg") !important;
+}
+
+/* history category icon */
+treechildren::-moz-tree-image(query, OrganizerQuery_history____v) {
+  list-style-image: url("history.svg") !important;
+}
+
+treechildren::-moz-tree-image(title, query, folder) {
+  list-style-image: url("folder.svg") !important;
+}

chrome/icons/image-copy.svg

@@ -0,0 +1,5 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M6.498 5.497a.998.998 0 1 0 0-1.995.998.998 0 0 0 0 1.995z"/>
+  <path d="M3 4a3 3 0 0 1 3-3h6a3 3 0 0 1 3 3v6a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3zm3-2a2 2 0 0 0-2 2v6c0 .37.101.718.277 1.016L7.79 7.502a1.71 1.71 0 0 1 2.418 0l3.514 3.514c.176-.298.277-.645.277-1.016V4a2 2 0 0 0-2-2zm7.016 9.723L9.502 8.209a.71.71 0 0 0-1.004 0l-3.514 3.514c.298.176.645.277 1.016.277h6c.37 0 .718-.101 1.016-.277z"/>
+  <path d="M10 15c.888 0 1.687-.386 2.236-1H5.5A3.5 3.5 0 0 1 2 10.5V3.764C1.386 4.314 1 5.112 1 6v4.5A4.5 4.5 0 0 0 5.5 15z"/>
+</svg>

chrome/icons/image-open.svg

@@ -0,0 +1,8 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M3 1c-1.099 0-2 .9-2 2v3.174C1.313 6.064 1.648 6 2 6V3c0-.563.437-1 1-1h3v1.5C6 4.323 6.677 5 7.5 5H14v8c0 .563-.437 1-1 1h-3c0 .352-.064.687-.174 1H13c1.1 0 2-.9 2-2V3c0-1.099-.9-2-2-2H3zm4 1h6c.563 0 1 .437 1 1v1H7.5a.493.493 0 0 1-.5-.5V2z"/>
+  <g fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-width="1.001">
+  <rect x=".5" y="7.5" width="8" height="8" rx="1.5" ry="1.5"/>
+  <path d="m1 15 2.793-2.793a1 1 0 0 1 1.414 0L8 15"/>
+  </g>
+  <circle cx="6.25" cy="9.75" r=".75"/>
+</svg>

chrome/icons/image-save.svg

@@ -0,0 +1,4 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M4 1a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h2.006a1.8 1.8 0 0 1 .05-.348L6.22 14h-2.22c-.355 0-.704-.094-1.011-.273L7.65 9.145a.496.496 0 0 1 .7 0l.73.716.707-.707-.737-.722a1.5 1.5 0 0 0-2.102 0l-4.67 4.588A1.989 1.989 0 0 1 2 12V4a2 2 0 0 1 2-2h8a2 2 0 0 1 2 2v2.006c.044-.002.087-.006.13-.006h.003c.305 0 .596.051.867.139v-2.14a3 3 0 0 0-3-3zm6.5 3c-2 0-2 3 0 3s2-3 0-3zm0 1c.667 0 .667 1 0 1s-.667-1 0-1z"/>
+  <path d="M14.13 7c-.478 0-.957.18-1.322.547l-4.828 4.83a2.2 2.2 0 0 0-.578 1.02l-.375 1.498a.889.889 0 0 0 1.078 1.078l1.498-.375a2.2 2.2 0 0 0 1.02-.578l4.828-4.828A1.872 1.872 0 0 0 14.13 7zm-.002 1.002c.427.002.671.224.8.537.13.314.116.643-.187.947l-4.826 4.826a1.204 1.204 0 0 1-.556.315l-1.316.332.33-1.32H8.37c.053-.21.163-.403.316-.557l4.828-4.83a.85.85 0 0 1 .614-.25zm-6.266 7 .002.002H7.86l.002-.002z"/>
+</svg>

chrome/icons/inspect.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M2 1a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h5v-1H2a1 1 0 0 1-1-1V3a1 1 0 0 1 1-1h12a1 1 0 0 1 1 1v7a1 1 0 0 1-.885.994l.446.445c.113.114.205.242.275.38A2.001 2.001 0 0 0 16 10V3a2 2 0 0 0-2-2H2zm6.598 6.01A.5.5 0 0 0 8 7.5v7a.5.5 0 0 0 .91.287l1.57-2.246 2.944.453a.499.499 0 0 0 .43-.848l-5-5a.499.499 0 0 0-.256-.136zM9 8.707l3.066 3.066-1.74-.267a.5.5 0 0 0-.486.207L9 12.914V8.707z"/>
+</svg>

chrome/icons/link.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M6 4a.5.5 0 0 1 .09.992L6 5H4a3 3 0 0 0-.197 5.994L4 11h2a.5.5 0 0 1 .09.992L6 12H4a4 4 0 0 1-.219-7.994L4.001 4zm6 0a4 4 0 0 1 .22 7.994L12 12h-2a.5.5 0 0 1-.09-.992L10 11h2a3 3 0 0 0 .198-5.994L12 5h-2a.5.5 0 0 1-.09-.992L10 4zM4 7.5h8a.5.5 0 0 1 .09.992L12 8.5H4a.5.5 0 0 1-.09-.992L4 7.5h8z"/>
+</svg>

chrome/icons/manage.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M7.004 4.5A4.5 4.5 0 0 1 13.356.398a.5.5 0 0 1 .147.809L11.21 3.5l1.293 1.293L14.796 2.5a.5.5 0 0 1 .81.148 4.5 4.5 0 0 1-5.207 6.215L4.032 15.31A2.357 2.357 0 0 1 .66 12.018l6.425-6.66a4.52 4.52 0 0 1-.082-.858zm4.5-3.5a3.5 3.5 0 0 0-3.387 4.386.5.5 0 0 1-.124.473L1.38 12.712a1.357 1.357 0 0 0 1.943 1.896l6.574-6.66a.5.5 0 0 1 .512-.123A3.5 3.5 0 0 0 14.93 3.78l-2.073 2.072a.5.5 0 0 1-.707 0l-2-2a.5.5 0 0 1 0-.707l2.073-2.073a3.516 3.516 0 0 0-.72-.074z"/>
+</svg>

chrome/icons/media-loop.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M9.957.502a.501.501 0 0 0-.37.783l.06.069 1.656 1.656c-.1-.006-.201-.01-.303-.01H5l-.217.004a5 5 0 0 0-3.69 8.119.5.5 0 1 0 .8-.602A4 4 0 0 1 5 4h6.002l.143.002.14.008-1.637 1.636-.058.069a.503.503 0 0 0 0 .57l.058.069.069.058c.17.118.4.118.57 0l.069-.058 2.5-2.5.058-.069a.503.503 0 0 0 0-.57l-.058-.069-2.5-2.5-.069-.058a.502.502 0 0 0-.328-.086zm4.543 4.17a.5.5 0 0 0-.39.812A4 4 0 0 1 11 12H5l-.143-.002-.14-.008 1.637-1.636.058-.069a.501.501 0 0 0-.766-.639l-2.5 2.5-.058.069a.501.501 0 0 0 .058.639l2.5 2.5.069.058a.501.501 0 0 0 .639-.058l.058-.069a.501.501 0 0 0-.058-.639L4.697 12.99c.1.006.201.01.303.01h6l.217-.004a5 5 0 0 0 3.676-8.135l-.018-.021-.066-.063a.498.498 0 0 0-.309-.105z"/>
+</svg>

chrome/icons/media-mute.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M8.852.01a.985.985 0 0 0-.532.26L4.447 3.865a.499.499 0 0 1-.34.133H1.5a1.5 1.5 0 0 0-1.5 1.5v5.003a1.5 1.5 0 0 0 1.5 1.5h2.607c.127 0 .248.048.34.134L8.32 15.73c.64.594 1.68.141 1.68-.732V1.002C10 .347 9.414-.072 8.852.01zM9 1.002v13.996l-3.873-3.596a1.497 1.497 0 0 0-1.02-.4H1.5a.5.5 0 0 1-.5-.5V5.498a.5.5 0 0 1 .5-.5h2.607a1.5 1.5 0 0 0 1.02-.401zM11.5 5.5a.5.5 0 0 0-.354.854L12.793 8l-1.647 1.647a.5.5 0 0 0 .708.708L13.5 8.707l1.646 1.648a.5.5 0 1 0 .708-.708L14.207 8l1.647-1.647a.5.5 0 0 0-.708-.708L13.5 7.293l-1.646-1.648A.498.498 0 0 0 11.5 5.5z"/>
+</svg>

chrome/icons/media-pause.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M7 5.5a.5.5 0 0 0-1 0v5a.5.5 0 0 0 1 0zm3 0a.5.5 0 0 0-1 0v5a.5.5 0 0 0 1 0zM8 0a8 8 0 1 0 0 16A8 8 0 0 0 8 0zM1 8a7 7 0 1 1 14 0A7 7 0 0 1 1 8z"/>
+</svg>

chrome/icons/media-pip.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M3 1a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h10a3 3 0 0 0 3-3V4a3 3 0 0 0-3-3zm0 1h10a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2zm4 5a1 1 0 0 0-1 1v4a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V8a1 1 0 0 0-1-1zm0 1h6v4h-1.293L9.354 9.646a.5.5 0 0 0-.708 0L7 11.293zm4.5 1a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1zM9 10.707 10.293 12H7.707z"/>
+</svg>

chrome/icons/media-play.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M7.125 5.184A.75.75 0 0 0 6 5.834v4.333a.75.75 0 0 0 1.125.65l4.125-2.383a.5.5 0 0 0 0-.866zM0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8zm8-7a7 7 0 1 0 0 14A7 7 0 0 0 8 1z"/>
+</svg>

chrome/icons/media-speed.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M8.006 3A8.517 8.517 0 0 0 .03 8.545a.5.5 0 0 0 .295.644.5.5 0 0 0 .643-.294c.1-.272.232-.526.361-.78l1.928 1.073a.5.5 0 0 0 .68-.196.5.5 0 0 0-.196-.68L1.844 7.259A7.479 7.479 0 0 1 7.5 4.039V6.5A.5.5 0 0 0 8 7a.5.5 0 0 0 .5-.5V4.04c.62.041 1.23.139 1.807.325l.65-.806a1.5 1.5 0 0 1 .002-.002A8.437 8.437 0 0 0 8.006 3zm4.117 1a.5.5 0 0 0-.387.186l-5.185 6.439c-.483.6-.724 1.448-.364 2.22a2.002 2.002 0 0 0 1.987 1.147c.844-.074 1.492-.688 1.748-1.443l2.676-7.889a.5.5 0 0 0-.475-.66zm1.395 1.064-.344 1.01c.37.354.702.75.996 1.176l-1.912 1.063a.5.5 0 0 0-.195.68.5.5 0 0 0 .68.195l1.943-1.08c.128.253.245.515.345.787a.5.5 0 0 0 .643.294.5.5 0 0 0 .295-.642 8.465 8.465 0 0 0-2.451-3.483zM10.746 7.01l-1.771 5.219c-.15.439-.475.731-.887.767a.998.998 0 0 1-.994-.574c-.173-.37-.074-.786.234-1.168z"/>
+</svg>

chrome/icons/media-unmute.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M8.85.01a.985.985 0 0 0-.53.26L4.446 3.865a.498.498 0 0 1-.34.133H1.5a1.5 1.5 0 0 0-1.5 1.5v5.003a1.5 1.5 0 0 0 1.5 1.5h2.607a.5.5 0 0 1 .34.134l3.872 3.595c.64.594 1.68.141 1.68-.732V1.002c0-.655-.586-1.074-1.149-.992zm.15.992v13.996l-3.873-3.596a1.497 1.497 0 0 0-1.02-.4H1.5a.5.5 0 0 1-.5-.5V5.498a.5.5 0 0 1 .5-.5h2.607c.378 0 .742-.143 1.02-.401zm4.62 1.495a.502.502 0 0 0-.4.834 7.007 7.007 0 0 1 0 9.337.502.502 0 0 0 .04.708c.205.184.52.166.704-.04a8.01 8.01 0 0 0 0-10.673.496.496 0 0 0-.344-.166zm-1.35 2.505a.5.5 0 0 0-.371.746 4.501 4.501 0 0 1 0 4.503.501.501 0 0 0 .868.5 5.504 5.504 0 0 0-.002-5.502.499.499 0 0 0-.494-.247z"/>
+</svg>

chrome/icons/move-tab.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M10.5 1a.498.498 0 0 0-.354.854L12.293 4H2.5a.5.5 0 0 0 0 1h9.793l-2.147 2.146a.5.5 0 0 0 .708.708l3-3a.5.5 0 0 0 0-.708l-3-3A.498.498 0 0 0 10.5 1zm-5 7a.498.498 0 0 0-.354.146l-3 3a.5.5 0 0 0 0 .708l3 3a.5.5 0 0 0 .708-.708L3.707 12H13.5a.5.5 0 0 0 0-1H3.707l2.147-2.146A.5.5 0 0 0 5.5 8z"/>
+</svg>

chrome/icons/paste-and-go.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M5.5 0a1.5 1.5 0 0 0-1.414 1H2.5A1.5 1.5 0 0 0 1 2.5v12A1.5 1.5 0 0 0 2.5 16h5.844a5.536 5.536 0 0 1-1.086-1H2.5a.5.5 0 0 1-.5-.5v-12a.5.5 0 0 1 .5-.5h1.586A1.5 1.5 0 0 0 5.5 3h3a1.5 1.5 0 0 0 1.414-1H11.5a.5.5 0 0 1 .5.5v3.525c.344.031.677.096 1 .188V2.5A1.5 1.5 0 0 0 11.5 1H9.914A1.5 1.5 0 0 0 8.5 0h-3zm0 1h3a.5.5 0 0 1 0 1h-3a.5.5 0 0 1 0-1zm6 6a4.5 4.5 0 1 0 0 9 4.5 4.5 0 0 0 0-9zm0 2c.128 0 .256.049.354.146l2 2a.502.502 0 0 1 .146.35v.008a.495.495 0 0 1-.145.348l-.001.002-2 2a.5.5 0 0 1-.708-.708L12.293 12H9.5a.5.5 0 0 1 0-1h2.793l-1.147-1.146A.5.5 0 0 1 11.5 9z"/>
+</svg>

chrome/icons/pin.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M10.049 1.004a1.995 1.995 0 0 0-1.926 1.101l-1.73 3.46a1.503 1.503 0 0 1-.786.722l-3.59 1.436a.999.999 0 0 0-.333 1.634l2.609 2.612L1 15.262v.707h.707L5 12.676l2.61 2.61a1 1 0 0 0 1.636-.337l1.436-3.59a1.5 1.5 0 0 1 .722-.783l3.457-1.73a2 2 0 0 0 .522-3.203l-4.059-4.057a1.978 1.978 0 0 0-1.275-.582zm-.069.998c.23.015.456.11.637.291l4.059 4.057a1 1 0 0 1-.262 1.601l-3.457 1.73a2.498 2.498 0 0 0-1.203 1.307l-1.436 3.59L2.391 8.65l3.59-1.435a2.498 2.498 0 0 0 1.306-1.203l1.729-3.46a1 1 0 0 1 .964-.55z"/>
+</svg>

chrome/icons/private-window.svg

@@ -0,0 +1,4 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="m3.25 0c-1.241 0.004388-2.246 1.009-2.25 2.25v9.5c0.00439 1.241 1.009 2.246 2.25 2.25h3.99c-0.1098-0.3225-0.2246-0.6595-0.2352-1h-3.754c-0.696 0-1.25-0.554-1.25-1.25v-7.75h13v-1.75c-0.004388-1.241-1.009-2.246-2.25-2.25zm0 1h9.5c0.696 0 1.25 0.554 1.25 1.25v0.75h-12v-0.75c0-0.696 0.554-1.25 1.25-1.25z"/>
+  <path d="m12 5a2.5 2.5 0 1 0 2 4h-2a1.5 1.5 0 0 1 0-3h2a2.496 2.496 0 0 0-2-1zm0 2v1h2.45a2.512 2.512 0 0 0 0-1zm-2.45 4c-0.464 0-0.855 0.236-1.116 0.53-0.26 0.29-0.434 0.684-0.434 1.09v0.32c0 1.633 1.633 3.06 4 3.06 1.24 0 2.28-0.392 2.988-1h-2.988c-2.03 0-3-1.172-3-2.06v-0.32c0-0.126 0.06-0.29 0.182-0.427 0.119-0.133 0.254-0.193 0.369-0.193h6.316a1.777 1.777 0 0 0-0.3-0.47c-0.262-0.294-0.653-0.53-1.118-0.53h-4.898zm2.45 2v1h3.762c0.147-0.315 0.23-0.653 0.238-1z"/>
+</svg>

chrome/icons/reader-mode.svg

@@ -0,0 +1,4 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-width="1.001" stroke-linecap="round">
+  <rect x="2.5" y="1.5" width="11" height="13" rx="1.5" ry="1.5"/>
+  <path d="M5.5 10.5h3M5.5 7.5h5M5.5 4.5h5"/>
+</svg>

chrome/icons/report.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M2.5 1a.5.5 0 0 0-.5.5v14a.5.5 0 0 0 1 0V11h11a.5.5 0 0 0 .416-.777L11.602 6l2.814-4.223A.5.5 0 0 0 14 1zM3 2h10.066l-2.482 3.723a.5.5 0 0 0 0 .554L13.066 10H3zm4.5 1a.5.5 0 0 0-.5.5v3a.5.5 0 1 0 1 0v-3a.5.5 0 0 0-.5-.5zm0 5a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1z"/>
+</svg>

chrome/icons/save.svg

@@ -1,3 +1,3 @@
 <svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4.621a2 2 0 0 0-.586-1.414l-1.62-1.621A2 2 0 0 0 11.378 1H3zm0 1h1v2.5A1.5 1.5 0 0 0 5.5 6h4A1.5 1.5 0 0 0 11 4.5V2h.379a1 1 0 0 1 .707.293l1.62 1.621a1 1 0 0 1 .294.707V13a1 1 0 0 1-1 1V9.5A1.5 1.5 0 0 0 11.5 8h-7A1.5 1.5 0 0 0 3 9.5V14a1 1 0 0 1-1-1V3a1 1 0 0 1 1-1zm2 0h5v2.5a.5.5 0 0 1-.5.5h-4a.5.5 0 0 1-.5-.5V2zm-.5 7h7a.5.5 0 0 1 .5.5V14H4V9.5a.5.5 0 0 1 .5-.5z"/>
+  <path d="M3 1a2 2 0 0 0-2 2v9.998a2 2 0 0 0 2 2h3.004a1.95 1.95 0 0 1 .054-.347l.162-.653H4v-4.5a.5.5 0 0 1 .5-.5h5.443l1-.999H4.5A1.5 1.5 0 0 0 3 9.5v4.5a1 1 0 0 1-1-1v-10a1 1 0 0 1 1-1h1v2.5A1.5 1.5 0 0 0 5.5 6h4A1.5 1.5 0 0 0 11 4.5V2h.378a1 1 0 0 1 .707.294l1.621 1.62a1 1 0 0 1 .293.708v1.382a2.88 2.88 0 0 1 1 .13V4.62a2 2 0 0 0-.586-1.414l-1.62-1.621A2 2 0 0 0 11.377 1zm2 1h5v2.5a.5.5 0 0 1-.5.5h-4a.5.5 0 0 1-.5-.5zm9.13 5c-.478 0-.957.18-1.322.546l-4.828 4.83a2.2 2.2 0 0 0-.578 1.02l-.375 1.499a.889.889 0 0 0 1.078 1.078l1.498-.375a2.2 2.2 0 0 0 1.021-.578l4.828-4.828A1.872 1.872 0 0 0 14.13 7z"/>
 </svg>

chrome/icons/search-page.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M3.5 0A1.5 1.5 0 0 0 2 1.5v3.916A4.963 4.963 0 0 1 3 5.1V1.5a.5.5 0 0 1 .5-.5H8v3.5A1.5 1.5 0 0 0 9.5 6H13v8.5c0 .276-.09.5-.365.5h-1.559c.064.38.048.699.028 1H12.5a1.5 1.5 0 0 0 1.5-1.5V5.414a1.5 1.5 0 0 0-.44-1.06L9.647.439A1.5 1.5 0 0 0 8.586 0H3.5zM9 1.207 12.793 5H9.5a.5.5 0 0 1-.5-.5V1.207zM4 6a4 4 0 1 0 2.453 7.16l2.692 2.692a.5.5 0 1 0 .707-.707L7.16 12.453A4 4 0 0 0 4 6zm0 1a3 3 0 1 1 0 6 3 3 0 0 1 0-6z"/>
+</svg>

chrome/icons/send-to-device.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M2.5 1A1.5 1.5 0 0 0 1 2.5V4h1V2.5a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-.5.5H8v1h5.5A1.5 1.5 0 0 0 15 9.5v-7A1.5 1.5 0 0 0 13.5 1h-11zm-1 4A1.5 1.5 0 0 0 0 6.5v8A1.5 1.5 0 0 0 1.5 16h4A1.5 1.5 0 0 0 7 14.5v-8A1.5 1.5 0 0 0 5.5 5h-4zm0 1h4a.5.5 0 0 1 .5.5v8a.5.5 0 0 1-.5.5h-4a.5.5 0 0 1-.5-.5v-8a.5.5 0 0 1 .5-.5zM8 12v1h7.5a.5.5 0 0 0 0-1H8zm-5 1a.5.5 0 0 0 0 1h1a.5.5 0 0 0 0-1H3z"/>
+</svg>

chrome/icons/share.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M10.977 1.002a.569.569 0 0 0-.6.576v2.129l-.225.016c-3.562.282-5.65 2.536-6.148 6.627-.064.525.538.853.928.505 1.432-1.278 2.911-2.072 4.445-2.39.246-.051.493-.089.742-.115l.258-.024v2.096l.006.082c.06.453.61.666.947.334l4.496-4.422.059-.066a.588.588 0 0 0-.059-.768l-4.496-4.42-.062-.053a.537.537 0 0 0-.291-.107zM3.5 2A2.5 2.5 0 0 0 1 4.5v8A2.5 2.5 0 0 0 3.5 15h8a2.5 2.5 0 0 0 2.5-2.5v-1a.5.5 0 0 0-1 0v1a1.5 1.5 0 0 1-1.5 1.5h-8A1.5 1.5 0 0 1 2 12.5v-8A1.5 1.5 0 0 1 3.5 3h3a.5.5 0 0 0 0-1h-3zm7.877.611L14.824 6l-3.447 3.389V7.232l-1.356.122-.007.001c-1.703.182-3.31.864-4.826 2 .298-1.338.807-2.344 1.476-3.066.83-.894 1.989-1.442 3.563-1.568l1.15-.078V2.61z"/>
+</svg>

chrome/icons/source-code.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M10.485 1a.501.501 0 0 0-.452.32l-5 13a.5.5 0 0 0 .934.36l5-13a.5.5 0 0 0-.482-.68zM3.46 4.002a.494.494 0 0 0-.34.172l-3 3.5a.502.502 0 0 0 0 .652l3 3.5a.5.5 0 0 0 .758-.652L1.158 8l2.72-3.174a.5.5 0 0 0-.417-.824zm9.078.5a.5.5 0 0 0-.418.824L14.842 8.5l-2.72 3.174a.5.5 0 1 0 .757.652l3-3.5a.502.502 0 0 0 0-.652l-3-3.5a.494.494 0 0 0-.34-.172z"/>
+</svg>

chrome/icons/tag.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M12 5a1 1 0 1 0 0-2 1 1 0 0 0 0 2zM9.129 0a2.003 2.003 0 0 0-1.426.584L1.021 7.249a2 2 0 0 0-.002 2.83l4.948 4.948a2 2 0 0 0 2.828 0l6.631-6.631a2 2 0 0 0 .586-1.417l-.007-4.95A2 2 0 0 0 14.018.032zm-.72 1.292A1 1 0 0 1 9.123 1l4.89.032a1 1 0 0 1 .994.999l.007 4.95a1 1 0 0 1-.293.708L8.09 14.32a1 1 0 0 1-1.415 0L1.727 9.372a1 1 0 0 1 .001-1.415z"/>
+</svg>

chrome/icons/translate.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M3.453 3.115c-.973 0-1.88.34-2.533.78a.5.5 0 0 0 .559.83c.487-.328 1.244-.61 1.975-.61.835 0 1.537.219 1.979.65.368.36.568.929.568 1.924v.08c-.728-.221-1.415-.359-2.199-.359-.895 0-1.815.273-2.543.816C.531 7.77.001 8.622.001 9.666c0 1.845 1.375 3.255 3.051 3.255 1.094 0 2.143-.543 2.949-1.11v.61a.5.5 0 0 0 1 0V6.69c0-1.135-.247-2.032-.87-2.641-.692-.677-1.67-.934-2.677-.934zm.348 4.295c.764 0 1.405.146 2.199.408v2.73c-.75.608-2.013 1.373-2.95 1.373-1.13 0-2.05-.886-2.05-2.256 0-.718.33-1.245.857-1.639.527-.394 1.258-.617 1.943-.617zm7.648-5.406a.5.5 0 0 0-.428.354 28.188 28.188 0 0 0-.47 1.814c-.485.033-.99.038-1.519.003a.5.5 0 0 0-.53.467.5.5 0 0 0 .464.531c.476.031.935.031 1.377.01a22.568 22.568 0 0 0-.262 1.812c-.315.17-.627.378-.93.635-.862.732-1.39 1.665-1.582 2.572-.192.907-.057 1.82.51 2.445.273.3.672.445 1.068.445s.802-.122 1.205-.342c.195-.105.39-.235.582-.386.036.081.07.16.098.234a.5.5 0 0 0 .644.29.5.5 0 0 0 .29-.645c-.08-.211-.17-.413-.264-.621.326-.381.635-.834.91-1.36.458-.873.693-1.791.803-2.647 1.003.383 1.619 1.313 1.619 2.385 0 1.445-1.142 2.572-2.24 3.068a.5.5 0 0 0-.25.662.5.5 0 0 0 .662.25c1.374-.622 2.828-2.026 2.828-3.98a3.563 3.563 0 0 0-2.54-3.404c.003-.08.004-.157.005-.235a.5.5 0 0 0-.496-.502.5.5 0 0 0-.504.496l-.002.075a4.885 4.885 0 0 0-1.356.15c.062-.48.144-.98.242-1.488.82-.105 1.568-.275 2.244-.455a.5.5 0 0 0 .354-.611.5.5 0 0 0-.611-.356c-.55.146-1.136.283-1.762.381.111-.476.235-.95.37-1.408a.5.5 0 0 0-.337-.621.5.5 0 0 0-.194-.018zm.912 5.424.07.002c-.096.782-.305 1.611-.703 2.371a6.595 6.595 0 0 1-.45.738 6.652 6.652 0 0 1-.263-1.52c-.025-.398-.018-.861.018-1.368.432-.159.87-.222 1.328-.222zm-2.357.803c-.006.298-.004.583.013.85.064.996.28 1.735.506 2.321-.223.203-.442.36-.646.471-.292.158-.55.22-.727.22s-.263-.042-.33-.116c-.283-.312-.415-.889-.271-1.566.143-.679.555-1.428 1.25-2.018.068-.059.137-.11.205-.163z"/>
+</svg>

chrome/icons/video-open.svg

@@ -0,0 +1,5 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M3 1c-1.099 0-2 .9-2 2v3.174C1.313 6.064 1.648 6 2 6V3c0-.563.437-1 1-1h3v1.5C6 4.323 6.677 5 7.5 5H14v8c0 .563-.437 1-1 1h-3c0 .352-.064.687-.174 1H13c1.1 0 2-.9 2-2V3c0-1.099-.9-2-2-2zm4 1h6c.563 0 1 .437 1 1v1H7.5a.493.493 0 0 1-.5-.5z"/>
+  <rect x=".5" y="7.5" width="8" height="8" rx="1.5" ry="1.5" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-width="1.001"/>
+  <path d="M3 9.867v3.265a.24.24 0 0 0 .365.205l2.442-1.492a.405.405 0 0 0 0-.69L3.365 9.661A.24.24 0 0 0 3 9.867z"/>
+</svg>

chrome/icons/video-save.svg

@@ -0,0 +1,5 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M14.13 7c-.478 0-.957.18-1.322.547l-4.828 4.83a2.2 2.2 0 0 0-.578 1.02l-.375 1.498a.889.889 0 0 0 1.078 1.078l1.498-.375a2.2 2.2 0 0 0 1.02-.578l4.828-4.828A1.872 1.872 0 0 0 14.13 7zm-.002 1.002c.427.002.671.224.8.537.13.314.116.643-.187.947l-4.826 4.826a1.204 1.204 0 0 1-.556.315l-1.316.332.33-1.32H8.37c.053-.21.163-.403.316-.557l4.828-4.83a.85.85 0 0 1 .614-.25zm-6.266 7 .002.002H7.86z"/>
+  <path d="M5.765 5.076A.5.5 0 0 0 5 5.5v5.15a.5.5 0 0 0 .776.417l4-2.648a.5.5 0 0 0-.01-.84z"/>
+  <path d="M3.5 1A2.5 2.5 0 0 0 1 3.5v9A2.5 2.5 0 0 0 3.5 15h2.506c.006-.115.022-.231.05-.348L6.222 14H3.5A1.5 1.5 0 0 1 2 12.5v-9A1.5 1.5 0 0 1 3.5 2h9A1.5 1.5 0 0 1 14 3.5v2.506c.044-.002.087-.006.13-.006h.005c.304.001.594.051.865.139v-2.64A2.5 2.5 0 0 0 12.5 1z"/>
+</svg>

chrome/toolbar/findbar.css

@@ -1,4 +1,4 @@
-/* EdgeFr-Fox by bmFtZQ - findbar.css */
+/* Edge-Frfox - findbar.css */
 
 .findbar-find-previous,
 .findbar-find-next,
@@ -28,3 +28,15 @@
 .findbar-container {
   overflow-inline: visible !important;
 }
+
+.close-icon:not([disabled]):hover,
+.findbar-find-previous:not([disabled]):hover,
+.findbar-find-next:not([disabled]):hover {
+  background: var(--toolbarbutton-hover-background, rgb(190 190 190 / .2)) !important;
+}
+
+.close-icon:not([disabled]):hover:active,
+.findbar-find-previous:not([disabled]):hover:active,
+.findbar-find-next:not([disabled]):hover:active {
+  background: var(--toolbarbutton-active-background, rgb(190 190 190 / .4)) !important;
+}

chrome/toolbar/navbar.css

@@ -1,9 +1,9 @@
-/* EdgeFr-Fox by bmFtZQ - navbar.css */
+/* Edge-Frfox - navbar.css */
 
 :root {
-  --toolbarbutton-border-radius: 2px !important;
+  --toolbarbutton-border-radius: 4px !important;
   --toolbarbutton-inner-padding: 7px !important;
-  --uc-toolbarbutton-inner-inline-padding: 12px !important;
+  --uc-toolbarbutton-inner-inline-padding: 10px !important;
   --tabs-navbar-shadow-size: 0 !important;
 }
 
@@ -21,16 +21,22 @@
 #reload-button>.toolbarbutton-animatable-box,
 #stop-button>.toolbarbutton-animatable-box {
   top: calc(50% - 10px) !important;
-  margin-inline-start: calc((16px + 2 * var(--uc-toolbarbutton-inner-inline-padding) - 20px) / 2) !important;
 }
 
 #nav-bar-customization-target :where(#reload-button, #stop-button)>.toolbarbutton-icon {
   padding: var(--toolbarbutton-inner-padding) var(--uc-toolbarbutton-inner-inline-padding) !important;
 }
 
+@media (-moz-bool-pref: "uc.tweak.rounded-corners") {
+  #navigator-toolbox {
+    border-bottom: none !important;
+  }
+}
+
 /* account button */
 #navigator-toolbox>toolbar #fxa-toolbar-menu-button,
-#navigator-toolbox>toolbar #fxa-toolbar-menu-button>.toolbarbutton-badge-stack {
+#navigator-toolbox>toolbar #fxa-toolbar-menu-button>.toolbarbutton-badge-stack,
+#fxa-avatar-image {
   border-radius: 99px !important;
 }
 
@@ -39,35 +45,17 @@
   margin-inline: calc(var(--uc-toolbarbutton-inner-inline-padding) - var(--toolbarbutton-inner-padding)) !important;
 }
 
-:root[fxastatus="signedin"] #fxa-avatar-image {
+#fxa-toolbar-menu-button {
-  scale: 1.5 !important;
+  display: flex !important;
-}
-
-:root[privatebrowsingmode] #fxa-toolbar-menu-button::before {
-  content: "Private" !important;
   display: -moz-box !important;
-  font-size: 12px !important;
 }
 
-:root[privatebrowsingmode] #fxa-toolbar-menu-button {
+#widget-overflow-list>#fxa-toolbar-menu-button #fxa-avatar-image {
-  background: var(--uc-private-browsing-indicator, var(--lwt-toolbarbutton-icon-fill-attention, var(--toolbarbutton-icon-fill-attention))) !important;
+  scale: 1.25 !important;
-  margin: 4px !important;
-  padding-inline: 8px 0 !important;
-  color: var(--uc-private-browding-indicator-text, var(--toolbar-bgcolor)) !important;
-  fill: currentColor !important;
 }
 
-:root[privatebrowsingmode] #fxa-toolbar-menu-button:hover {
+#nav-bar-customization-target>#fxa-toolbar-menu-button #fxa-avatar-image {
-  background: var(--uc-private-browding-indicator-hover, color-mix(in srgb, var(--lwt-toolbarbutton-icon-fill-attention, var(--toolbarbutton-icon-fill-attention)) 90%, transparent)) !important;
+  scale: 1.5 !important;
-}
-
-:root[privatebrowsingmode] #fxa-toolbar-menu-button:not([disabled=true]):is([open], [checked], :hover:active) {
-  background: var(--uc-private-browding-indicator-active, color-mix(in srgb, var(--lwt-toolbarbutton-icon-fill-attention, var(--toolbarbutton-icon-fill-attention)) 70%, transparent)) !important;
-}
-
-:root[privatebrowsingmode] #nav-bar #fxa-toolbar-menu-button>.toolbarbutton-badge-stack {
-  background: transparent !important;
-  margin-inline: 0 !important;
 }
 
 /* button background transition */
@@ -75,22 +63,26 @@
   .toolbarbutton-1>.toolbarbutton-icon,
   .toolbarbutton-1>.toolbarbutton-text,
   .toolbarbutton-1>.toolbarbutton-badge-stack,
-  .bookmark-item,
+  :not(.panel-subview-body>toolbaritem)>.bookmark-item:not(menu, menuitem),
   .urlbar-page-action,
   .identity-box-button,
   #tracking-protection-icon-container,
-  #fxa-toolbar-menu-button {
+  panel button,
+  panel menulist,
+  .titlebar-button {
     transition: background-color 0.25s ease !important;
   }
 
-  .toolbarbutton-1:not([disabled=true]):is([open],[checked],:hover:active)>.toolbarbutton-icon,
+  .toolbarbutton-1:not([disabled=true]):is([open], [checked], :hover:active)>.toolbarbutton-icon,
-  .toolbarbutton-1:not([disabled=true]):is([open],[checked],:hover:active)>.toolbarbutton-text,
+  .toolbarbutton-1:not([disabled=true]):is([open], [checked], :hover:active)>.toolbarbutton-text,
-  .toolbarbutton-1:not([disabled=true]):is([open],[checked],:hover:active)>.toolbarbutton-badge-stack,
+  .toolbarbutton-1:not([disabled=true]):is([open], [checked], :hover:active)>.toolbarbutton-badge-stack,
-  .bookmark-item:not([disabled=true]):is([open],[checked],:hover:active),
+  :not(.panel-subview-body>toolbaritem)>.bookmark-item:not(menu, menuitem):not([disabled=true]):is([open], [checked], :hover:active),
-  .urlbar-page-action:not([disabled=true]):is([open],[checked],:hover:active),
+  .urlbar-page-action:not([disabled=true]):is([open], [checked], :hover:active),
-  .identity-box-button:not([disabled=true]):is([open],[checked],:hover:active),
+  .identity-box-button:not([disabled=true]):is([open], [checked], :hover:active),
-  #tracking-protection-icon-container:not([disabled=true]):is([open],[checked],:hover:active),
+  #tracking-protection-icon-container:not([disabled=true]):is([open], [checked], :hover:active),
-  #fxa-toolbar-menu-button:not([disabled=true]):is([open],[checked],:hover:active) {
+  panel button:not([disabled=true]):is([open], [checked], :hover:active),
+  panel menulist:not([disabled=true]):is([open], [checked], :hover:active),
+  .titlebar-button:not([disabled=true]):hover:active {
     transition-duration: 0s !important;
   }
 }

chrome/toolbar/personalbar.css

@@ -1,32 +1,63 @@
-/* EdgeFr-Fox by bmFtZQ - personalbar.css */
+/* Edge-Frfox - personalbar.css */
 
 #PersonalToolbar {
   --bookmark-block-padding: 6px !important;
 }
 
+/* Bookmarks bar item sizing */
 #personal-toolbar-empty-description,
 #PersonalToolbar .toolbarbutton-1,
 toolbarbutton.bookmark-item:not(.subviewbutton) {
-  margin-block: 0 4px !important;
+  margin-block: 2px 4px !important;
-  padding: var(--bookmark-block-padding) 6px !important;
+  padding-block: var(--bookmark-block-padding) !important;
+  padding-inline: 6px !important;
   font-size: 12px !important;
+
+  /* Adjust vertical label position on Windows */
+  @media (-moz-platform: windows) {
+    & .toolbarbutton-text {
+      margin-block: -1px 0 !important;
+    }
+  }
 }
 
-#PlacesToolbarItems>toolbarseparator::before {
+#PersonalToolbar .toolbarbutton-1 {
-  content: "";
+  padding: 0 !important;
-  display: block;
-  border-inline-start: 1px solid var(--toolbarseparator-color) !important;
-  margin-block: 8px !important;
-  border-image-source: none !important;
 }
 
+/* Bookmarks bar separators */
+#PlacesToolbarItems > toolbarseparator {
+  padding-inline: 1px !important;
+
+  &::before {
+    content: "";
+    display: block;
+    border-inline-start: 1px solid var(--toolbarseparator-color) !important;
+    margin-block: 8px 10px !important;
+    border-image-source: none !important;
+  }
+}
+
+/* Left and Right padding of bookmarks bar */
 #PersonalToolbar {
-  padding-inline: var(--toolbar-start-end-padding) calc(var(--toolbar-start-end-padding) + 4px) !important;
+  padding-inline: calc(var(--toolbar-start-end-padding) - 2px) calc(var(--toolbar-start-end-padding) + 6px) !important;
 }
 
+/* Spacing between icon and label for bookmarks bar items */
 #managed-bookmarks>.toolbarbutton-icon,
 #bookmarks-toolbar-placeholder>.toolbarbutton-icon,
 #PlacesToolbarItems>.bookmark-item>.toolbarbutton-icon[label]:not([label=""]),
 #OtherBookmarks.bookmark-item[container]>.toolbarbutton-icon {
-  margin-inline-end: 6px !important;
+  margin-inline-end: 8px !important;
+}
+
+/* Sizing for bookmarks bar icons */
+#PersonalToolbar .toolbarbutton-1>.toolbarbutton-icon {
+  width: calc(2 * var(--bookmark-block-padding) + 16px) !important;
+  height: calc(2 * var(--bookmark-block-padding) + 16px) !important;
+  padding: var(--bookmark-block-padding) !important;
+}
+
+:root {
+  --bookmarks-toolbar-overlapping-browser-height: 34px !important;
 }

chrome/toolbar/tabbar.css

@@ -1,14 +1,23 @@
-/* EdgeFr-Fox 2 - tabbar */
+/* Edge-Frfox - tabbar.css */
 
-:root #titlebar {
+:root {
-  --tab-min-height: 32px !important;
-  --inline-tab-padding: 11px !important;
-  --tab-border-radius: 4px !important;
   --tab-block-margin: 8px !important;
   
-  --uc-toolbarbutton-inner-padding: 6px !important;
+  & #titlebar {
-  --toolbarbutton-border-radius: 2px !important;
+    --tab-min-height: 32px !important;
-  --tabs-navbar-shadow-size: 0 !important;
+    --inline-tab-padding: 11px !important;
+    --tab-border-radius: 4px !important;
+    
+    --uc-toolbarbutton-inner-padding: 6px !important;
+    --toolbarbutton-border-radius: 4px !important;
+    --toolbarbutton-tabsline-border-radius: 8px !important;
+    --tabs-navbar-shadow-size: 0 !important;
+    --tab-shadow-max-size: 0 !important;
+  }
+
+  @media (-moz-bool-pref: "uc.tweak.floating-tabs.equal-margin") and (-moz-bool-pref: "uc.tweak.floating-tabs") {
+    --tab-block-margin: 5px !important;
+  }
 }
 
 /* tab open/close transition */
@@ -24,13 +33,13 @@
   transition: transform 200ms cubic-bezier(0, .75, .25, 1) !important;
 }
 
-:root:is([inFullscreen], :not([tabsintitlebar])) #titlebar {
+:root:is([inFullscreen], :not([tabsintitlebar])) {
   --tab-block-margin: 0px !important;
 }
 
 /* hide space above tabs when maximised for non-macOS versions of Firefox */
-@supports not -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
+@media not (-moz-platform: macos) {
-  :root:is([inFullscreen], :not([tabsintitlebar]), [sizemode="maximized"]) #titlebar,
+  :root:is([inFullscreen], :not([tabsintitlebar]), [sizemode="maximized"]),
   #toolbar-menubar:not([inactive])+#TabsToolbar {
     --tab-block-margin: 0px !important;
   }
@@ -44,55 +53,66 @@
   border: 0 !important;
   position: relative !important;
   --uc-tab-corner-bg: transparent;
+
+  /* Rounded bottom corners */
+  &::before,
+  &::after {
+    content: "" !important;
+    display: block !important;
+    position: absolute !important;
+    width: 8px !important;
+    height: 8px !important;
+    bottom: 0 !important;
+    pointer-events: none !important;
+    clip-path: inset(0);
+  }
+
+  &::before {
+    border-bottom-right-radius: var(--tab-border-radius) !important;
+    left: 0 !important;
+    transform: translateX(-8px) !important;
+    box-shadow: 4px 4px 0 4px var(--uc-tab-corner-bg) !important;
+  }
+
+  &::after {
+    border-bottom-left-radius: var(--tab-border-radius) !important;
+    right: 0 !important;
+    transform: translateX(8px) !important;
+    box-shadow: -4px 4px 0 4px var(--uc-tab-corner-bg) !important;
+  }
 }
 
-/* rounded bottom corners */
+.tabbrowser-tab:where([selected], [multiselected], :hover) + .tabbrowser-tab:not([selected]) .tab-background {
-.tab-background::before,
-.tab-background::after {
-  content: "" !important;
-  display: block !important;
-  position: absolute !important;
-  width: 8px !important;
-  height: 8px !important;
-  bottom: 0 !important;
-  pointer-events: none !important;
-  clip-path: inset(0);
-}
-
-.tab-background::before {
-  border-bottom-right-radius: var(--tab-border-radius) !important;
-  left: 0 !important;
-  transform: translateX(-8px) !important;
-  box-shadow: 4px 4px 0 4px var(--uc-tab-corner-bg) !important;
-}
-
-.tab-background::after {
   border-bottom-left-radius: var(--tab-border-radius) !important;
-  right: 0 !important;
-  transform: translateX(8px) !important;
-  box-shadow: -4px 4px 0 4px var(--uc-tab-corner-bg) !important;
-}
 
-.tabbrowser-tab[selected="true"] .tab-background {
+  &::before {
-  --uc-tab-corner-bg: var(--lwt-selected-tab-background-color, var(--toolbar-bgcolor));
+    --uc-tab-corner-bg: transparent !important;
+  }
 }
 
 .tab-background:is([selected], [multiselected]) {
-  --uc-tab-corner-bg: var(--tab-selected-bgcolor, var(--toolbar-bgcolor));
+  --uc-tab-corner-bg: var(--tab-selected-bgcolor, var(--lwt-selected-tab-background-color, var(--toolbar-bgcolor)));
 }
 
-#tabbrowser-tabs:not([movingtab])>#tabbrowser-arrowscrollbox>.tabbrowser-tab>.tab-stack>.tab-background[multiselected="true"]:-moz-lwtheme,
+.tabbrowser-tab:hover .tab-background:not([selected], [multiselected]) {
-#tabbrowser-tabs:not([movingtab])>#tabbrowser-arrowscrollbox>.tabbrowser-tab>.tab-stack>.tab-background[selected="true"]:-moz-lwtheme {
+  background-color: color-mix(in srgb, currentColor 8%, transparent) !important;
-  background-image: linear-gradient(var(--lwt-selected-tab-background-color, transparent), var(--lwt-selected-tab-background-color, transparent)), linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-header-image, none);
+  --uc-tab-corner-bg: color-mix(in srgb, currentColor 8%, transparent) !important;
-  --uc-tab-corner-bg: var(--lwt-selected-tab-background-color, var(--toolbar-bgcolor));
 }
 
-.tabbrowser-tab .tab-background:is([selected], [multiselected]) {
+@media not (-moz-bool-pref: "uc.tweak.floating-tabs") {
-  --uc-tab-corner-bg: var(--tab-selected-bgcolor, var(--toolbar-bgcolor));
+  #Tabstoolbar:not([brighttext]) .tabbrowser-tab:hover .tab-background:not([selected], [multiselected]) {
+    background-color: color-mix(in srgb, white 30%, transparent) !important;
+    --uc-tab-corner-bg: color-mix(in srgb, white 30%, transparent) !important;
+  }
 }
 
-.tabbrowser-tab:hover>.tab-stack>.tab-background:not([selected="true"], [multiselected]) {
+.tab-background:is([selected], [multiselected]) {
-  --uc-tab-corner-bg: color-mix(in srgb, currentColor 11%, transparent)
+  outline: none !important;
+}
+
+#tabbrowser-tabs .tab-background[multiselected]:not([selected]) {
+  box-shadow: none !important;
+  opacity: 0.7 !important;
 }
 
 #tabbrowser-tabs,
@@ -104,18 +124,15 @@
   margin: 0 !important;
 }
 
-/* fix colours */
+/* fix window background colours */
-#navigator-toolbox:not(:-moz-lwtheme) {
+@media not (-moz-gtk-csd-available) {
-  background-color: var(--lwt-accent-color) !important;
+  :root:not(:-moz-lwtheme) #navigator-toolbox {
-  color: var(--lwt-text-color) !important;
+    background-color: var(--lwt-accent-color) !important;
-}
+    color: var(--lwt-text-color) !important;
+  }
 
-/* force inactive window on default theme */
+  :root:not(:-moz-lwtheme) #navigator-toolbox:-moz-window-inactive {
-@media not (-moz-platform: windows-win7) {
+    background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color)) !important;
-  @media not (-moz-platform: windows-win8) {
-    #navigator-toolbox:-moz-window-inactive:not(:-moz-lwtheme) {
-      background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color)) !important;
-    }
   }
 }
 
@@ -125,7 +142,7 @@
 
 #TabsToolbar .toolbarbutton-animatable-box,
 #TabsToolbar .toolbarbutton-1 {
-  fill: var(--lwt-text-color) !important;
+  fill: currentColor !important;
 }
 
 .tabbrowser-tab[multiselected]:not(:-moz-lwtheme),
@@ -133,6 +150,10 @@
   color: var(--lwt-tab-text, var(--toolbar-color)) !important;
 }
 
+.tabbrowser-tab:is([selected], [multiselected]):-moz-lwtheme {
+  z-index: 1;
+}
+
 .tab-close-button {
   margin-inline-end: 8px !important;
   width: 17px !important;
@@ -153,39 +174,93 @@
   display: none !important;
 }
 
+#tabbrowser-tabs:not([secondarytext-unsupported]) .tab-label-container {
+  height: var(--tab-min-height) !important;
+}
+
 .tab-icon-stack:is([soundplaying], [muted], [activemedia-blocked])>.tab-icon-overlay,
 .tabbrowser-tab:hover .tab-icon-stack:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])> :not(.tab-icon-overlay) {
   opacity: 1 !important;
 }
 
-.tab-icon-overlay:not([pinned]) {
+#tabbrowser-tabs:not([closebuttons="activetab"]) .tab-icon-overlay:not([pinned]) {
   margin-inline: 22px 6px !important;
 }
 
+.tabbrowser-tab:not([image]) .tab-icon-overlay:not([pinned]) {
+  margin-inline: 0px 6px !important;
+}
+
+/* move sound playing icon on top of favicon when there isn't enough space */
+.tab-icon-overlay:not([crashed]):is([pinned], [sharing]),
+#tabbrowser-tabs[closebuttons="activetab"] .tab-icon-overlay:not([crashed]) {
+  top: -5.5px !important;
+  inset-inline-end: -6px !important;
+}
+
+#tabbrowser-tabs[closebuttons="activetab"] :is(.tab-icon-overlay[soundplaying]:not([crashed]),
+  .tab-icon-overlay[muted]:not([crashed]),
+  .tab-icon-overlay[activemedia-blocked]:not([crashed])) {
+  stroke: var(--tab-icon-overlay-stroke, white) !important;
+  color: var(--tab-icon-overlay-fill, black) !important;
+  fill-opacity: 1 !important;
+}
+
+#TabsToolbar[brighttext] #tabbrowser-tabs[closebuttons="activetab"] :is(.tab-icon-overlay[soundplaying]:not([crashed]),
+  .tab-icon-overlay[muted]:not([crashed]),
+  .tab-icon-overlay[activemedia-blocked]:not([crashed])) {
+  stroke: var(--tab-icon-overlay-stroke, black) !important;
+  color: var(--tab-icon-overlay-fill, white) !important;
+}
+
+#tabbrowser-tabs[closebuttons="activetab"] :is(.tab-icon-overlay:not([crashed])[soundplaying]:hover,
+  .tab-icon-overlay:not([crashed])[muted]:hover,
+  .tab-icon-overlay:not([crashed])[activemedia-blocked]:hover) {
+  background-color: var(--tab-icon-overlay-stroke, white) !important;
+}
+
+#TabsToolbar[brighttext] #tabbrowser-tabs[closebuttons="activetab"] :is(.tab-icon-overlay:not([crashed])[soundplaying]:hover,
+  .tab-icon-overlay:not([crashed])[muted]:hover,
+  .tab-icon-overlay:not([crashed])[activemedia-blocked]:hover) {
+  background-color: var(--tab-icon-overlay-stroke, black) !important;
+}
+
 .tab-icon-overlay[soundplaying]:not([crashed]),
 .tab-icon-overlay[muted]:not([crashed]),
 .tab-icon-overlay[activemedia-blocked]:not([crashed]) {
-  border-radius: 2px !important;
+  border-radius: 4px !important;
   padding: 0 !important;
 }
 
 .tabbrowser-tab {
   font-size: 12px !important;
   padding-inline: 0 !important;
-  overflow-clip-margin: 4px !important;
+  overflow-clip-margin: 8px !important;
 }
 
 #TabsToolbar .toolbarbutton-1>.toolbarbutton-icon,
 #TabsToolbar .toolbarbutton-1>.toolbarbutton-badge-stack {
   border-radius: var(--toolbarbutton-border-radius) !important;
-  padding: var(--uc-toolbarbutton-inner-padding) !important;
+  padding: var(--uc-toolbarbutton-inner-padding) calc(var(--uc-toolbarbutton-inner-padding) + 2px) !important;
+}
+
+#tabbrowser-tabs .toolbarbutton-1>.toolbarbutton-icon,
+#tabbrowser-tabs .toolbarbutton-1>.toolbarbutton-badge-stack {
+  border-radius: var(--toolbarbutton-tabsline-border-radius) !important;
 }
 
 #TabsToolbar .toolbarbutton-1>.toolbarbutton-icon {
-  width: calc(2 * var(--uc-toolbarbutton-inner-padding) + 16px) !important;
+  width: calc(2 * (var(--uc-toolbarbutton-inner-padding) + 2px) + 16px) !important;
   height: calc(2 * var(--uc-toolbarbutton-inner-padding) + 16px) !important;
 }
 
+#TabsToolbar #tabs-newtab-button>.toolbarbutton-icon,
+#TabsToolbar #alltabs-button>.toolbarbutton-badge-stack,
+#TabsToolbar #tabbrowser-tabs[hasadjacentnewtabbutton][overflow="true"]~#new-tab-button>.toolbarbutton-icon {
+  padding: var(--uc-toolbarbutton-inner-padding) !important;
+  width: calc(2 * var(--uc-toolbarbutton-inner-padding) + 16px) !important;
+}
+
 #tabbrowser-tabs #tabs-newtab-button {
   margin-inline-start: 2px !important;
 }
@@ -194,17 +269,19 @@
   padding: 0 12px !important;
 }
 
-.tabbrowser-tab[usercontextid]>.tab-stack>.tab-background>.tab-context-line {
+/* Tab container indicator */
-  height: 8px !important;
+.tabbrowser-tab[usercontextid] .tab-background .tab-context-line {
-  clip-path: inset(0 0 6px) !important;
+  height: 2px !important;
-  border-radius: var(--tab-border-radius) !important;
+  border-radius: 2px !important;
-  border-bottom-left-radius: 0 !important;
+  margin: 2px 7px 0 !important;
-  border-bottom-right-radius: 0 !important;
+}
-  margin: 0 !important;
+
+.tabbrowser-tab[selected][usercontextid] .tab-background .tab-context-line {
+  margin-inline: 9px !important;
 }
 
 .titlebar-spacer[type="post-tabs"] {
-  display: -moz-box !important;
+  display: flex !important;
 }
 
 .titlebar-spacer[type="pre-tabs"],
@@ -223,21 +300,49 @@ toolbarbutton[part="scrollbutton-down"] {
   max-width: 240px !important;
 }
 
-/* tab separators */
+/* Tab separators */
-.tabbrowser-tab:not([last-visible-tab="true"]) {
+.tabbrowser-tab .tab-stack {
-  margin-inline-end: -1px !important;
+  &::before,
+  &::after {
+    content: "";
+    position: absolute;
+    height: 20px;
+    inset: 0 auto;
+    margin-block: auto;
+    border-left: 1px solid transparent;
+  }
+  
+  &::before {
+    left: 0;
+  }
+  
+  &::after {
+    right: 0;
+  }
 }
 
-.tabbrowser-tab:not([selected="true"], :hover, [beforeselected-visible], [beforehovered]) .tab-stack::after {
+/* Set separator color */
-  content: "";
+.tabbrowser-tab:not([selected], [multiselected], :hover) {
-  position: absolute;
+  & .tab-stack::before,
-  display: block;
+  &:last-of-type .tab-stack::after {
-  height: 20px;
+    border-color: color-mix(in srgb, currentColor 34%, transparent);
-  right: 0;
+  }
-  top: 6px;
-  border-right: 1px solid color-mix(in srgb, currentColor 34%, transparent);
 }
 
+/* Hide separator when previous sibling is hovered or selected */
+.tabbrowser-tab:where([selected], [multiselected], :hover) + .tabbrowser-tab:not([selected], [multiselected], :hover) .tab-stack::before {
+  border-color: transparent !important;
+}
+
+/* Hide first tab separator if there are no buttons before it (Such as Firefox View) */
+#TabsToolbar-customization-target > #tabbrowser-tabs:not(toolbarbutton:not(#fxa-toolbar-menu-button) + #tabbrowser-tabs) .tabbrowser-tab:first-of-type .tab-stack::before {
+  border-color: transparent !important;
+}
+
+/* .tabbrowser-tab:not([last-visible-tab="true"]) {
+  margin-inline-end: -1px !important;
+} */
+
 #tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs])>#tabbrowser-arrowscrollbox>.tabbrowser-tab[first-visible-unpinned-tab] {
   margin-inline-start: 0 !important;
 }
@@ -250,25 +355,14 @@ toolbarbutton[part="scrollbutton-down"] {
 }
 
 /* mac titlebar buttons */
-@supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
+@media (-moz-platform: macos) {
-  @media (-moz-mac-big-sur-theme:0) {
+  .titlebar-buttonbox {
-    .titlebar-buttonbox {
+    margin-inline: calc((var(--tab-min-height) + var(--tab-block-margin) - 14px) / 2) !important;
-      margin-inline: 10px !important;
-    }
-
-    .titlebar-buttonbox-container {
-      margin-inline-end: -8px !important;
-    }
   }
 
-  @media (-moz-mac-big-sur-theme:1) {
+  .titlebar-buttonbox-container {
-    .titlebar-buttonbox {
+    margin-inline-start: -6px !important;
-      margin-inline: calc((var(--tab-min-height) + var(--tab-block-margin) - 14px) / 2) !important;
+    margin-inline-end: -2px !important;
-    }
-  
-    .titlebar-buttonbox-container {
-      margin-inline-end: -8px !important;
-    }
   }
 }
 
@@ -289,35 +383,135 @@ toolbarbutton[part="scrollbutton-down"] {
   margin-top: calc(2px + var(--tab-block-margin)) !important;
 }
 
-#tabbrowser-tabs:not([overflow="true"]) .tabbrowser-tab[first-visible-tab] {
+/* add margin to tabs if they are the first or last tab */
+#tabbrowser-arrowscrollbox:not([overflowing]) .tabbrowser-tab {
+  &:first-of-type {
+    margin-inline-start: 14px !important;
+  }
+
+  &:last-of-type {
+    margin-inline-end: 6px !important;
+  }
+}
+
+/* remove gap between pinned and unpinned tabs */
+#tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab:nth-child(1 of :not([pinned], [hidden])) {
+  margin-inline-start: 0 !important;
+}
+
+#tabbrowser-tabs {
+  margin-inline-start: -6px !important;
+  border-inline: none !important;
+}
+
+#TabsToolbar {
+  padding-inline-start: 6px !important;
+}
+
+#tabbrowser-tabs[positionpinnedtabs]>#tabbrowser-arrowscrollbox {
   margin-inline-start: 8px !important;
 }
 
-#tabbrowser-tabs[overflow] .tabbrowser-tab[last-visible-tab]:not([pinned]) {
+#tabbrowser-tabs[positionpinnedtabs]>#tabbrowser-arrowscrollbox>.tabbrowser-tab[pinned] {
-  margin-inline-end: 8px !important;
+  clip-path: inset(-8px -8px 0) !important;
 }
 
+:root {
+  --uc-titlebar-shadow: 0 -3px 2px -3px rgb(0 0 0 / .2) inset;
+  --uc-tab-shadow:
+    0 0 0 1px var(--lwt-tab-line-color, var(--lwt-tabs-border-color, transparent)),
+    0px 2px 4px rgb(0 0 0 / .2), 0 4px 8px rgb(0 0 0 / .1);
+}
 
-.tabbrowser-tab:is([visuallyselected="true"], [multiselected])>.tab-stack>.tab-background {
+:root[lwtheme-brighttext="true"] {
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3), 0 0px 2px rgba(0, 0, 0, 0.2) !important;
+  --uc-titlebar-shadow: 0 -3px 2px -3px rgb(0 0 0 / .75) inset inset;
+  --uc-tab-shadow:
+    0 0 0 1px var(--lwt-tab-line-color, var(--lwt-tabs-border-color, transparent)),
+    0 2px 4px rgb(0 0 0 / .45), 0 0px 2px rgb(0 0 0 / .2);
+}
+
+#tabbrowser-tabs .tab-background:is([selected], [multiselected]),
+#TabsToolbar #firefox-view-button[open] > .toolbarbutton-icon {
+  box-shadow: var(--uc-tab-shadow) !important;
 }
 
 #titlebar {
-  box-shadow: 0 -3px 2px -3px rgba(0, 0, 0, 0.2) inset !important;
+  box-shadow: var(--uc-titlebar-shadow) !important;
 }
 
-:root[lwtheme-brighttext="true"] .tabbrowser-tab:is([visuallyselected="true"], [multiselected])>.tab-stack>.tab-background {
+#tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab .tab-label-container {
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.45), 0 0px 2px rgba(0, 0, 0, 0.2) !important;
+  --tab-label-mask-size: 1em !important;
 }
 
-:root[lwtheme-brighttext="true"] #titlebar {
+#tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([pinned]) .tab-content {
-  box-shadow: 0 -3px 2px -3px rgba(0, 0, 0, 0.75) inset !important;
+  padding-inline: calc(var(--inline-tab-padding) - 4px) 0 !important;
-}
-
-#tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab[selected="true"] .tab-label-container {
-  --tab-label-mask-size: 0.5em !important;
 }
 
 .tab-content {
   padding-inline: var(--inline-tab-padding) 0 !important;
 }
+
+/* new private browsing indicator */
+:root[privatebrowsingmode="temporary"] #TabsToolbar .toolbar-items,
+:root[privatebrowsingmode="temporary"] #TabsToolbar .titlebar-buttonbox-container {
+  position: relative;
+  z-index: 1;
+}
+
+:root[privatebrowsingmode="temporary"] .titlebar-spacer[type="post-tabs"] {
+  display: none !important;
+}
+
+#private-browsing-indicator-with-label {
+  position: relative !important;
+  isolation: isolate;
+  margin-inline: -16px -16px !important;
+  padding-inline: 32px 24px !important;
+  font-size: 12px;
+  color: var(--uc-private-browsing-indicator-text, var(--toolbar-bgcolor)) !important;
+  --uc-bg-color: var(--uc-private-browsing-indicator, var(--lwt-toolbarbutton-icon-fill-attention, var(--toolbarbutton-icon-fill-attention)));
+  --uc-gradient: linear-gradient(to right, transparent, var(--uc-bg-color) 35%);
+  --uc-gradient-alt: linear-gradient(to right, transparent, var(--uc-bg-color) 25%, var(--uc-bg-color) 75%, transparent);
+  background: var(--uc-gradient);
+}
+
+@media (-moz-gtk-csd-available) {
+  :root[privatebrowsingmode] #fxa-toolbar-menu-button:not(:-moz-lwtheme) {
+    --uc-bg-color: -moz-accent-color !important;
+    color: -moz-accent-color-foreground !important;
+  }
+}
+
+@media (-moz-platform: windows),
+(-moz-gtk-csd-available) {
+  @media not (-moz-gtk-csd-reversed-placement) {
+    :root[tabsintitlebar] #toolbar-menubar:not([autohide="false"])~#TabsToolbar #private-browsing-indicator-with-label {
+      background: var(--uc-gradient-alt);
+    }
+  }
+}
+
+#private-browsing-indicator-with-label .private-browsing-indicator-icon {
+  height: 24px !important;
+  width: 24px !important;
+}
+
+:root,
+:root[lang^="en"] {
+  --uc-string-private: "Private";
+}
+
+/* Change "Private Browsing" text to "Private" (English locale only) */
+:root:is([lang^="en"]) #private-browsing-indicator-with-label>label {
+  display: none !important;
+}
+
+:root:is([lang^="en"]) #private-browsing-indicator-with-label::after {
+  content: var(--uc-string-private);
+  margin-block: 1px 2px;
+  margin-inline: 6px 5px;
+}
+
+#tabbrowser-tabs[secondarytext-unsupported] .tab-icon-stack[indicator-replaces-favicon] > :not(.tab-icon-overlay) {
+  opacity: 1 !important;
+}

chrome/toolbar/urlbar.css

@@ -1,25 +1,27 @@
-/* EdgeFr-Fox by bmFtZQ - urlbar.css */
+/* Edge-Frfox - urlbar.css */
 
 :root {
-  --urlbar-min-height: 28px !important;
+  --urlbar-min-height: 30px !important;
   --urlbarView-item-inline-padding: 14px !important;
-  --urlbar-icon-border-radius: var(--toolbarbutton-border-radius) !important;
+  --urlbar-icon-border-radius: calc(var(--toolbarbutton-border-radius) + 2px) !important;
   --urlbar-icon-padding: calc(var(--toolbarbutton-inner-padding) - 2px) !important;
   --uc-urlbar-icon-inline-padding: calc(var(--uc-toolbarbutton-inner-inline-padding) - 2px) !important;
   --identity-box-margin-inline: 2px !important;
 }
 
-:root:not(:-moz-lwtheme) #urlbar {
-  --urlbar-box-bgcolor: unset !important;
-}
-
-#urlbar[focused="true"]:not([suppress-focus-border])>#urlbar-background:not(:-moz-lwtheme),
-#searchbar:not(:-moz-lwtheme):focus-within,
 :root[style*="--lwt-accent-color: rgb(240, 240, 244)"] #urlbar[focused="true"]:not([suppress-focus-border])>#urlbar-background,
 :root[style*="--lwt-accent-color: rgb(240, 240, 244)"] #searchbar:focus-within {
   outline-color: color-mix(in srgb, var(--toolbar-field-focus-border-color) 50%, transparent) !important;
 }
 
+@media not (-moz-gtk-csd-available) {
+  #urlbar[focused="true"]:not([suppress-focus-border])>#urlbar-background:not(:-moz-lwtheme),
+  #searchbar:not(:-moz-lwtheme):focus-within {
+    --uc-outline-dimmed: color-mix(in srgb, var(--toolbar-field-focus-border-color) 50%, transparent);
+    outline-color: light-dark(var(--uc-outline-dimmed), var(--toolbar-field-focus-border-color)) !important;
+  }
+}
+
 :root:not([lwtheme-brighttext="true"]) #urlbar-background {
   box-shadow: var(--uc-urlbar-shadow, none);
 }
@@ -107,24 +109,31 @@
   width: unset !important;
 }
 
-#identity-icon-box {
+#identity-icon-box,
-  padding-inline: var(--uc-urlbar-icon-inline-padding) !important;
+#identity-permission-box,
-}
+.notification-anchor-icon {
-
-#identity-permission-box {
   padding-inline: var(--uc-urlbar-icon-inline-padding) !important;
 }
 
 #urlbar-background,
 #searchbar {
-  border-radius: calc(var(--toolbarbutton-border-radius) + 2px) !important;
+  border-radius: var(--urlbar-icon-border-radius) !important;
 }
 
+#urlbar:hover:not([suppress-focus-border])>#urlbar-background,
+#searchbar:hover {
+  outline: 1.5px solid var(--urlbar-hover-highlight-color);
+}
 
 /* move tracking protection button */
 #tracking-protection-icon-container,
 #page-action-buttons {
   -moz-box-ordinal-group: 2 !important;
+  order: 2 !important;
+}
+
+#urlbar, #searchbar {
+  padding: 0 4px !important;
 }
 
 #urlbar-container:not(:hover) #tracking-protection-icon-container:not([open]) {
@@ -168,26 +177,24 @@
 }
 
 /* make urlbar icons opaque in default theme */
-@media not (prefers-contrast) {
-  :is(:root:not(:-moz-lwtheme), :root[style*="--lwt-accent-color: rgb(240, 240, 244)"]) :is(
-    .urlbar-icon:not(#star-button[starred]),
-    .sharing-icon,
-    #identity-icon,
-    .searchbar-search-icon,
-    #identity-icon-label,
-    #permissions-granted-icon,
-    #tracking-protection-icon,
-    .notification-anchor-icon,
-    #blocked-permissions-container > .blocked-permission-icon) {
-    opacity: 0.6 !important;
-  }
-}
-
 #urlbar-input::placeholder,
 .searchbar-textbox::placeholder {
   opacity: 0.6 !important;
 }
 
+:is(:root:not(:-moz-lwtheme), :root[style*="--lwt-accent-color: rgb(240, 240, 244)"]) #identity-icon-label {
+  opacity: var(--urlbar-icon-fill-opacity) !important;
+}
+
+#notification-popup-box:hover {
+  background-color: var(--urlbar-box-hover-bgcolor) !important;
+}
+
+#notification-popup-box:hover:active,
+#notification-popup-box[open] {
+  background-color: var(--urlbar-box-active-bgcolor) !important;
+}
+
 /* remove background from urlbar box */
 #identity-box[pageproxystate="valid"].notSecureText>.identity-box-button:not(:hover, [open]),
 #identity-box[pageproxystate="valid"].chromeUI>.identity-box-button:not(:hover, [open]),
@@ -195,6 +202,13 @@
   background-color: transparent !important;
 }
 
+:is(:root:not(:-moz-lwtheme),
+  :root[style*="--lwt-accent-color: rgb(240, 240, 244)"] #urlbar[focused="true"],
+  :root[lwt-default-theme-in-dark-mode="true"],
+  :root[style*="--lwt-accent-color: rgb(28, 27, 34)"]) #urlbar-search-mode-indicator {
+  background-color: var(--urlbar-box-hover-bgcolor) !important;
+}
+
 /* increase space between icon and text */
 #identity-icon-label {
   padding-inline-start: 8px !important;
@@ -219,7 +233,6 @@
 }
 
 @media not (prefers-reduced-motion) {
-
   :is(#identity-box[pageproxystate="valid"].notSecureText>.identity-box-button,
     #identity-box[pageproxystate="valid"].chromeUI>.identity-box-button,
     #identity-box[pageproxystate="valid"].extensionPage>.identity-box-button)::after {

chrome/userChrome.css

@@ -1,4 +1,4 @@
-/* EdgeFr-Fox by bmFtZQ */
+/* Edge-Frfox */
 @import url("icons/icons.css");
 @import url("toolbar/tabbar.css");
 @import url("toolbar/navbar.css");
@@ -8,3 +8,8 @@
 @import url("global/colors.css");
 @import url("global/popup.css");
 @import url("global/tweaks.css");
+@import url("global/browser.css");
+@import url("global/tree.css");
+
+/* import custom stylesheet instead of modifying Edge-Frfox theme files */
+@import url("custom.css");

chrome/userContent.css

@@ -1,3 +1,3 @@
-/* EdgeFr-Fox by bmFtZQ */
+/* Edge-Frfox */
-@import url(content/common.css);
+@import url("content/common.css");
-@import url(content/newtab.css);
+@import url("content/newtab.css");