From 596428caeeb98d61bfd2ae47c870f4112e74a6eb Mon Sep 17 00:00:00 2001
From: Aris-t2 <aris-addons@gmx.net>
Date: Sat, 28 Jan 2023 12:24:11 +0100
Subject: [PATCH] 4.3.0

---
 current/config/color_variables_aeroglass.css   |  2 +-
 .../addons_manager_alternative_appearance.css  | 18 ++++++++++++++----
 ...ns_on_bookmarks_toolbar_aero_appearance.css |  5 +++++
 ...bookmarks_toolbar_aero_appearance_items.css |  5 +++++
 ...on_bookmarks_toolbar_classic_appearance.css |  7 ++++++-
 ...okmarks_toolbar_classic_appearance_dark.css |  5 +++++
 ...kmarks_toolbar_classic_appearance_items.css |  7 ++++++-
 ...s_toolbar_classic_appearance_items_dark.css |  5 +++++
 ...s_on_menubar_toolbar_classic_appearance.css |  5 +++++
 .../buttons_on_navbar_aero_appearance.css      |  5 +++++
 .../buttons_on_navbar_classic_appearance.css   |  5 +++++
 ...ttons_on_navbar_classic_appearance_dark.css |  5 +++++
 ...buttons_on_navbar_classic_appearance_v2.css |  5 +++++
 .../buttons_on_navbar_glass_appearance.css     |  5 +++++
 .../buttons_on_navbar_osx_appearance.css       |  5 +++++
 .../buttons_on_navbar_squared_buttons.css      |  6 +++---
 ...navbar_windows_classic_theme_appearance.css |  5 +++++
 ...tons_on_tabs_toolbar_classic_appearance.css |  5 +++++
 current/css/buttons/icons_colorized.css        |  6 +++---
 current/css/buttons/icons_custom_icons.css     |  2 +-
 .../css/buttons/icons_custom_icons_crystal.css |  2 +-
 .../buttons/icons_custom_icons_firebird.css    |  2 +-
 current/css/buttons/icons_custom_icons_fx1.css |  2 +-
 .../icons_custom_icons_fx12_colorized.css      |  2 +-
 current/css/buttons/icons_custom_icons_fx2.css |  2 +-
 current/css/buttons/icons_custom_icons_fx3.css |  2 +-
 .../buttons/icons_custom_icons_fx3strata.css   |  2 +-
 .../css/buttons/icons_custom_icons_fx45.css    |  2 +-
 .../icons_custom_icons_fx45_inverted.css       |  2 +-
 current/css/buttons/icons_custom_icons_ie6.css |  2 +-
 .../buttons/icons_custom_icons_kempelton.css   |  2 +-
 .../css/buttons/icons_custom_icons_noia.css    |  2 +-
 .../buttons/icons_custom_icons_old_chrome.css  |  2 +-
 .../css/buttons/icons_custom_icons_old_osx.css |  2 +-
 .../buttons/icons_custom_icons_seamonkey.css   |  2 +-
 .../css/buttons/icons_custom_icons_sizes.css   | 12 ++++++------
 .../css/buttons/icons_custom_icons_tango.css   |  2 +-
 current/css/buttons/icons_white_icons.css      |  2 +-
 current/css/generalui/popup_compact_menus.css  |  1 +
 .../css/generalui/sidebar_show_on_hover.css    | 10 ++++++----
 current/css/tabs/classic_squared_tabs.css      |  4 ++++
 ...olbar_colors_aeroglass_windows10_glass8.css |  5 +++--
 .../toolbars/toolbar_mode_icons_and_text.css   |  2 +-
 current/userChrome.css                         |  2 +-
 44 files changed, 138 insertions(+), 45 deletions(-)

diff --git a/current/config/color_variables_aeroglass.css b/current/config/color_variables_aeroglass.css
index 5be1f397..55513f11 100644
--- a/current/config/color_variables_aeroglass.css
+++ b/current/config/color_variables_aeroglass.css
@@ -52,7 +52,7 @@ toolbar:not(#TabsToolbar):not(#toolbar-menubar):not(#nav-bar):not(:-moz-lwtheme)
 /* hide toolbar shadow */
 #nav-bar:not(:-moz-lwtheme),
 toolbar:not(#TabsToolbar):not(#toolbar-menubar):not(#nav-bar):not(:-moz-lwtheme) {
-  -moz-appearance: none !important;
+  appearance: none !important;
   box-shadow: unset !important;
 }
 
diff --git a/current/css/aboutaddons/addons_manager_alternative_appearance.css b/current/css/aboutaddons/addons_manager_alternative_appearance.css
index 42434f51..3da0212d 100644
--- a/current/css/aboutaddons/addons_manager_alternative_appearance.css
+++ b/current/css/aboutaddons/addons_manager_alternative_appearance.css
@@ -19,11 +19,11 @@
 	
 	@media (max-width: 830px) {
 	
-	:root {
+	 :root {
 	  --section-width: 100% !important;
 	  --in-content-sidebar-width: 49px !important;
 	  --main-margin-start: 0px !important;
-	}
+	 }
 	
 	}
 	
@@ -383,14 +383,12 @@
 	  margin-bottom: 0px !important;
 	}
 
-
 	#addons-page .main-content{
 	  margin-inline-start: -1px !important;
 	}
 
 	.main-heading,
 	.main-search {
-	 /* background: unset !important;*/
 	  max-width: unset !important;
 	  padding-inline-start: unset !important;
 	  padding-top: unset !important;
@@ -520,5 +518,17 @@
 	  height: unset !important;
 	  margin: unset !important;
 	}
+	
+	/* fix Firefox bug */
+	#addon-inline-options {
+	  height: unset !important;
+	  min-height: 100% !important;
+	}
+	
+	.inline-options-stack {
+	  height: unset !important;
+	  min-height: calc(100vh - 220px) !important;
+	  max-height: calc(100vh - 220px) !important;
+	}
 
 }
diff --git a/current/css/buttons/buttons_on_bookmarks_toolbar_aero_appearance.css b/current/css/buttons/buttons_on_bookmarks_toolbar_aero_appearance.css
index 98292b3d..0e379ef4 100644
--- a/current/css/buttons/buttons_on_bookmarks_toolbar_aero_appearance.css
+++ b/current/css/buttons/buttons_on_bookmarks_toolbar_aero_appearance.css
@@ -55,3 +55,8 @@
 			  border-color .2s ease-in,
 			  box-shadow .2s ease-in !important;
 }
+
+/* deep Fx 109 bs and nonsense override */
+#PersonalToolbar :is(toolbarbutton.subviewbutton,.toolbaritem-combined-buttons:is(:not([cui-areatype="toolbar"]),[overflowedItem=true]) > toolbarbutton):not([disabled]):hover {
+  background-color: unset !important; 
+}
diff --git a/current/css/buttons/buttons_on_bookmarks_toolbar_aero_appearance_items.css b/current/css/buttons/buttons_on_bookmarks_toolbar_aero_appearance_items.css
index 941738fd..f7ef4321 100644
--- a/current/css/buttons/buttons_on_bookmarks_toolbar_aero_appearance_items.css
+++ b/current/css/buttons/buttons_on_bookmarks_toolbar_aero_appearance_items.css
@@ -49,3 +49,8 @@
 			  border-color .2s ease-in,
 			  box-shadow .2s ease-in !important;
 }
+
+/* deep Fx 109 bs and nonsense override */
+#PlacesToolbar :is(toolbarbutton.subviewbutton,.toolbaritem-combined-buttons:is(:not([cui-areatype="toolbar"]),[overflowedItem=true]) > toolbarbutton):not([disabled]):hover {
+  background-color: unset !important; 
+}
diff --git a/current/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance.css b/current/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance.css
index c9a4c273..d4406c60 100644
--- a/current/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance.css
+++ b/current/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance.css
@@ -95,4 +95,9 @@
 #PersonalToolbar .toolbarbutton-1:not([disabled=true]):is([open],[checked],:hover:active) > .toolbarbutton-text,
 #PersonalToolbar .toolbarbutton-1:not([disabled=true]):is([open],[checked],:hover:active) > .toolbarbutton-badge-stack {
   background-color: transparent !important;
-}
\ No newline at end of file
+}
+
+/* deep Fx 109 bs and nonsense override */
+#PersonalToolbar :is(toolbarbutton.subviewbutton,.toolbaritem-combined-buttons:is(:not([cui-areatype="toolbar"]),[overflowedItem=true]) > toolbarbutton):not([disabled]):hover {
+  background-color: unset !important; 
+}
diff --git a/current/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance_dark.css b/current/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance_dark.css
index 5136655d..59a508f6 100644
--- a/current/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance_dark.css
+++ b/current/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance_dark.css
@@ -96,3 +96,8 @@
 #PersonalToolbar .toolbarbutton-1:not([disabled=true]):is([open],[checked],:hover:active) > .toolbarbutton-badge-stack {
   background-color: transparent !important;
 }
+
+/* deep Fx 109 bs and nonsense override */
+#PersonalToolbar :is(toolbarbutton.subviewbutton,.toolbaritem-combined-buttons:is(:not([cui-areatype="toolbar"]),[overflowedItem=true]) > toolbarbutton):not([disabled]):hover {
+  background-color: unset !important; 
+}
diff --git a/current/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance_items.css b/current/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance_items.css
index 2332ee63..6b6a7755 100644
--- a/current/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance_items.css
+++ b/current/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance_items.css
@@ -84,4 +84,9 @@
 #PersonalToolbar toolbarbutton.bookmark-item:hover:active:not(.subviewbutton, [disabled="true"]),
 #PersonalToolbar toolbarbutton.bookmark-item[open="true"] {
   background-color: transparent !important;
-}
\ No newline at end of file
+}
+
+/* deep Fx 109 bs and nonsense override */
+#PersonalToolbar :is(toolbarbutton.subviewbutton,.toolbaritem-combined-buttons:is(:not([cui-areatype="toolbar"]),[overflowedItem=true]) > toolbarbutton):not([disabled]):hover {
+  background-color: unset !important; 
+}
diff --git a/current/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance_items_dark.css b/current/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance_items_dark.css
index 7e271a01..9bdc877a 100644
--- a/current/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance_items_dark.css
+++ b/current/css/buttons/buttons_on_bookmarks_toolbar_classic_appearance_items_dark.css
@@ -84,3 +84,8 @@
 #PersonalToolbar toolbarbutton.bookmark-item[open="true"] {
   background-color: transparent !important;
 }
+
+/* deep Fx 109 bs and nonsense override */
+#PlacesToolbar :is(toolbarbutton.subviewbutton,.toolbaritem-combined-buttons:is(:not([cui-areatype="toolbar"]),[overflowedItem=true]) > toolbarbutton):not([disabled]):hover {
+  background-color: unset !important; 
+}
diff --git a/current/css/buttons/buttons_on_menubar_toolbar_classic_appearance.css b/current/css/buttons/buttons_on_menubar_toolbar_classic_appearance.css
index fa9f47e4..62fd2ba8 100644
--- a/current/css/buttons/buttons_on_menubar_toolbar_classic_appearance.css
+++ b/current/css/buttons/buttons_on_menubar_toolbar_classic_appearance.css
@@ -99,3 +99,8 @@
 #toolbar-menubar .toolbarbutton-1:not([disabled=true]):is([open],[checked],:hover:active) > .toolbarbutton-badge-stack {
   background-color: transparent !important;
 }
+
+/* deep Fx 109 bs and nonsense override */
+#toolbar-menubar :is(toolbarbutton.subviewbutton,.toolbaritem-combined-buttons:is(:not([cui-areatype="toolbar"]),[overflowedItem=true]) > toolbarbutton):not([disabled]):hover {
+  background-color: unset !important; 
+}
diff --git a/current/css/buttons/buttons_on_navbar_aero_appearance.css b/current/css/buttons/buttons_on_navbar_aero_appearance.css
index f552154c..f7d612e0 100644
--- a/current/css/buttons/buttons_on_navbar_aero_appearance.css
+++ b/current/css/buttons/buttons_on_navbar_aero_appearance.css
@@ -56,3 +56,8 @@
 #nav-bar .toolbarbutton-1:not([disabled=true]):is([open],[checked],:hover:active) > .toolbarbutton-badge-stack {
   background-color: transparent !important;
 }
+
+/* deep Fx 109 bs and nonsense override */
+#nav-bar :is(toolbarbutton.subviewbutton,.toolbaritem-combined-buttons:is(:not([cui-areatype="toolbar"]),[overflowedItem=true]) > toolbarbutton):not([disabled]):hover {
+  background-color: unset !important; 
+}
diff --git a/current/css/buttons/buttons_on_navbar_classic_appearance.css b/current/css/buttons/buttons_on_navbar_classic_appearance.css
index 1582997f..db5b19a0 100644
--- a/current/css/buttons/buttons_on_navbar_classic_appearance.css
+++ b/current/css/buttons/buttons_on_navbar_classic_appearance.css
@@ -128,3 +128,8 @@
 #nav-bar .toolbarbutton-1:not([disabled=true]):is([open],[checked],:hover:active) > .toolbarbutton-badge-stack {
   background-color: transparent !important;
 }
+
+/* deep Fx 109 bs and nonsense override */
+#nav-bar :is(toolbarbutton.subviewbutton,.toolbaritem-combined-buttons:is(:not([cui-areatype="toolbar"]),[overflowedItem=true]) > toolbarbutton):not([disabled]):hover {
+  background-color: unset !important; 
+}
diff --git a/current/css/buttons/buttons_on_navbar_classic_appearance_dark.css b/current/css/buttons/buttons_on_navbar_classic_appearance_dark.css
index 985aae03..f2a7055d 100644
--- a/current/css/buttons/buttons_on_navbar_classic_appearance_dark.css
+++ b/current/css/buttons/buttons_on_navbar_classic_appearance_dark.css
@@ -127,3 +127,8 @@
   background-color: transparent !important;
 }
 
+/* deep Fx 109 bs and nonsense override */
+#nav-bar :is(toolbarbutton.subviewbutton,.toolbaritem-combined-buttons:is(:not([cui-areatype="toolbar"]),[overflowedItem=true]) > toolbarbutton):not([disabled]):hover {
+  background-color: unset !important; 
+}
+
diff --git a/current/css/buttons/buttons_on_navbar_classic_appearance_v2.css b/current/css/buttons/buttons_on_navbar_classic_appearance_v2.css
index 3828889e..fb9bd7b6 100644
--- a/current/css/buttons/buttons_on_navbar_classic_appearance_v2.css
+++ b/current/css/buttons/buttons_on_navbar_classic_appearance_v2.css
@@ -123,3 +123,8 @@
   background-color: transparent !important;
 }
 
+/* deep Fx 109 bs and nonsense override */
+#nav-bar :is(toolbarbutton.subviewbutton,.toolbaritem-combined-buttons:is(:not([cui-areatype="toolbar"]),[overflowedItem=true]) > toolbarbutton):not([disabled]):hover {
+  background-color: unset !important; 
+}
+
diff --git a/current/css/buttons/buttons_on_navbar_glass_appearance.css b/current/css/buttons/buttons_on_navbar_glass_appearance.css
index 8d69649e..6ffdad5b 100644
--- a/current/css/buttons/buttons_on_navbar_glass_appearance.css
+++ b/current/css/buttons/buttons_on_navbar_glass_appearance.css
@@ -127,3 +127,8 @@
 #nav-bar .toolbarbutton-1:not([disabled=true]):is([open],[checked],:hover:active) > .toolbarbutton-badge-stack {
   background-color: transparent !important;
 }
+
+/* deep Fx 109 bs and nonsense override */
+#nav-bar :is(toolbarbutton.subviewbutton,.toolbaritem-combined-buttons:is(:not([cui-areatype="toolbar"]),[overflowedItem=true]) > toolbarbutton):not([disabled]):hover {
+  background-color: unset !important; 
+}
diff --git a/current/css/buttons/buttons_on_navbar_osx_appearance.css b/current/css/buttons/buttons_on_navbar_osx_appearance.css
index b4ae4a38..f38a8b30 100644
--- a/current/css/buttons/buttons_on_navbar_osx_appearance.css
+++ b/current/css/buttons/buttons_on_navbar_osx_appearance.css
@@ -123,3 +123,8 @@
 #nav-bar .toolbarbutton-1:not([disabled=true]):is([open],[checked],:hover:active) > .toolbarbutton-badge-stack {
   background-color: transparent !important;
 }
+
+/* deep Fx 109 bs and nonsense override */
+#nav-bar :is(toolbarbutton.subviewbutton,.toolbaritem-combined-buttons:is(:not([cui-areatype="toolbar"]),[overflowedItem=true]) > toolbarbutton):not([disabled]):hover {
+  background-color: unset !important; 
+}
diff --git a/current/css/buttons/buttons_on_navbar_squared_buttons.css b/current/css/buttons/buttons_on_navbar_squared_buttons.css
index 35408e8e..4b9463cc 100644
--- a/current/css/buttons/buttons_on_navbar_squared_buttons.css
+++ b/current/css/buttons/buttons_on_navbar_squared_buttons.css
@@ -50,7 +50,7 @@
   margin-left: 2px !important;
   margin-right: 2px !important;
 }
-#main-window[uidensity=compact] #nav-bar :is(#add-ons-button,#zoom-out-button,#zoom-in-button) .toolbarbutton-icon {
+#main-window[uidensity=compact] #nav-bar :is(#add-ons-button,#unified-extensions-button,#zoom-out-button,#zoom-in-button) .toolbarbutton-icon {
   padding-left: 8px !important;
   padding-right: 8px !important;
 }
@@ -103,7 +103,7 @@
   height: 34px !important;
   width: 34px !important;
 }
-#main-window:not([uidensity=compact]):not([uidensity=touch])  #nav-bar :is(#add-ons-button,#zoom-out-button,#zoom-in-button) .toolbarbutton-icon {
+#main-window:not([uidensity=compact]):not([uidensity=touch])  #nav-bar :is(#add-ons-button,#unified-extensions-button,#zoom-out-button,#zoom-in-button) .toolbarbutton-icon {
   padding-left: 11px !important;
   padding-right: 11px !important;
 }
@@ -155,7 +155,7 @@
   height: 40px !important;
   width: 40px !important;
 }
-#main-window[uidensity=touch]  #nav-bar :is(#add-ons-button,#zoom-out-button,#zoom-in-button) .toolbarbutton-icon {
+#main-window[uidensity=touch]  #nav-bar :is(#add-ons-button,#unified-extensions-button,#zoom-out-button,#zoom-in-button) .toolbarbutton-icon {
   padding-left: 14px !important;
   padding-right: 14px !important;
 }
diff --git a/current/css/buttons/buttons_on_navbar_windows_classic_theme_appearance.css b/current/css/buttons/buttons_on_navbar_windows_classic_theme_appearance.css
index 09615f45..d70242cd 100644
--- a/current/css/buttons/buttons_on_navbar_windows_classic_theme_appearance.css
+++ b/current/css/buttons/buttons_on_navbar_windows_classic_theme_appearance.css
@@ -107,3 +107,8 @@
 #nav-bar toolbarbutton[disabled=true]{
   opacity: 1.0 !important;
 }
+
+/* deep Fx 109 bs and nonsense override */
+#nav-bar :is(toolbarbutton.subviewbutton,.toolbaritem-combined-buttons:is(:not([cui-areatype="toolbar"]),[overflowedItem=true]) > toolbarbutton):not([disabled]):hover {
+  background-color: unset !important; 
+}
diff --git a/current/css/buttons/buttons_on_tabs_toolbar_classic_appearance.css b/current/css/buttons/buttons_on_tabs_toolbar_classic_appearance.css
index bf157ccf..124149c7 100644
--- a/current/css/buttons/buttons_on_tabs_toolbar_classic_appearance.css
+++ b/current/css/buttons/buttons_on_tabs_toolbar_classic_appearance.css
@@ -104,3 +104,8 @@
 #TabsToolbar .toolbarbutton-1:not([disabled=true]):is([open],[checked],:hover:active) > .toolbarbutton-badge-stack {
   background-color: transparent !important;
 }
+
+/* deep Fx 109 bs and nonsense override */
+#TabsToolbar :is(toolbarbutton.subviewbutton,.toolbaritem-combined-buttons:is(:not([cui-areatype="toolbar"]),[overflowedItem=true]) > toolbarbutton):not([disabled]):hover {
+  background-color: unset !important; 
+}
diff --git a/current/css/buttons/icons_colorized.css b/current/css/buttons/icons_colorized.css
index df6301d6..f50e0764 100644
--- a/current/css/buttons/icons_colorized.css
+++ b/current/css/buttons/icons_colorized.css
@@ -56,16 +56,16 @@ toolbar:not(#TabsToolbar):not(:-moz-lwtheme) :is(.scrollbutton-up,.scrollbutton-
 }
 
 /*green*/
-:is(#add-ons-button,#search-go-button,.search-go-button,#urlbar-go-button,.urlbar-go-button,#paste-button,#email-link-button,#reload-button),
+:is(#add-ons-button,#unified-extensions-button,#search-go-button,.search-go-button,#urlbar-go-button,.urlbar-go-button,#paste-button,#email-link-button,#reload-button),
 #reload-button .toolbarbutton-animatable-image {
   fill: green !important;
 }
-#main-window:not([style*='--lwt-header-image']):-moz-lwtheme:-moz-lwtheme-brighttext :is(#add-ons-button,#search-go-button,.search-go-button,#urlbar-go-button,.urlbar-go-button,#paste-button,#email-link-button,#reload-button),
+#main-window:not([style*='--lwt-header-image']):-moz-lwtheme:-moz-lwtheme-brighttext :is(#add-ons-button,#unified-extensions-button,#search-go-button,.search-go-button,#urlbar-go-button,.urlbar-go-button,#paste-button,#email-link-button,#reload-button),
 #main-window:not([style*='--lwt-header-image']):-moz-lwtheme:-moz-lwtheme-brighttext #reload-button .toolbarbutton-animatable-image {
   fill: lightgreen !important;
 }
 @media (-moz-content-prefers-color-scheme: dark) {
-	#main-window:not([style*='--lwt-header-image']):-moz-lwtheme :is(#add-ons-button,#search-go-button,.search-go-button,#urlbar-go-button,.urlbar-go-button,#paste-button,#email-link-button,#reload-button),
+	#main-window:not([style*='--lwt-header-image']):-moz-lwtheme :is(#add-ons-button,#unified-extensions-button,#search-go-button,.search-go-button,#urlbar-go-button,.urlbar-go-button,#paste-button,#email-link-button,#reload-button),
 	#main-window:not([style*='--lwt-header-image']):-moz-lwtheme #reload-button .toolbarbutton-animatable-image {
 	  fill: lightgreen !important;
 	}
diff --git a/current/css/buttons/icons_custom_icons.css b/current/css/buttons/icons_custom_icons.css
index 79af9a36..bb6cfbd1 100644
--- a/current/css/buttons/icons_custom_icons.css
+++ b/current/css/buttons/icons_custom_icons.css
@@ -10,7 +10,7 @@
 */
 
 :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#bookmarks-menu-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#PanelUI-menu-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
diff --git a/current/css/buttons/icons_custom_icons_crystal.css b/current/css/buttons/icons_custom_icons_crystal.css
index c5869b46..6d2f1c94 100644
--- a/current/css/buttons/icons_custom_icons_crystal.css
+++ b/current/css/buttons/icons_custom_icons_crystal.css
@@ -10,7 +10,7 @@
 */
 
 :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#bookmarks-menu-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#PanelUI-menu-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
diff --git a/current/css/buttons/icons_custom_icons_firebird.css b/current/css/buttons/icons_custom_icons_firebird.css
index 3512af41..fdc82142 100644
--- a/current/css/buttons/icons_custom_icons_firebird.css
+++ b/current/css/buttons/icons_custom_icons_firebird.css
@@ -10,7 +10,7 @@
 */
 
 :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#bookmarks-menu-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#PanelUI-menu-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
diff --git a/current/css/buttons/icons_custom_icons_fx1.css b/current/css/buttons/icons_custom_icons_fx1.css
index 2afd22f9..8d63468f 100644
--- a/current/css/buttons/icons_custom_icons_fx1.css
+++ b/current/css/buttons/icons_custom_icons_fx1.css
@@ -10,7 +10,7 @@
 */
 
 :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#bookmarks-menu-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#PanelUI-menu-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
diff --git a/current/css/buttons/icons_custom_icons_fx12_colorized.css b/current/css/buttons/icons_custom_icons_fx12_colorized.css
index 966edf90..31e39a7f 100644
--- a/current/css/buttons/icons_custom_icons_fx12_colorized.css
+++ b/current/css/buttons/icons_custom_icons_fx12_colorized.css
@@ -10,7 +10,7 @@
 */
 
 :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#bookmarks-menu-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#PanelUI-menu-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
diff --git a/current/css/buttons/icons_custom_icons_fx2.css b/current/css/buttons/icons_custom_icons_fx2.css
index cd0a67c0..352b8282 100644
--- a/current/css/buttons/icons_custom_icons_fx2.css
+++ b/current/css/buttons/icons_custom_icons_fx2.css
@@ -10,7 +10,7 @@
 */
 
 :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#bookmarks-menu-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#PanelUI-menu-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
diff --git a/current/css/buttons/icons_custom_icons_fx3.css b/current/css/buttons/icons_custom_icons_fx3.css
index eff5946e..75200e3d 100644
--- a/current/css/buttons/icons_custom_icons_fx3.css
+++ b/current/css/buttons/icons_custom_icons_fx3.css
@@ -10,7 +10,7 @@
 */
 
 :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#bookmarks-menu-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#PanelUI-menu-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
diff --git a/current/css/buttons/icons_custom_icons_fx3strata.css b/current/css/buttons/icons_custom_icons_fx3strata.css
index 03dee36d..5d92169c 100644
--- a/current/css/buttons/icons_custom_icons_fx3strata.css
+++ b/current/css/buttons/icons_custom_icons_fx3strata.css
@@ -10,7 +10,7 @@
 */
 
 :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#bookmarks-menu-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#PanelUI-menu-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
diff --git a/current/css/buttons/icons_custom_icons_fx45.css b/current/css/buttons/icons_custom_icons_fx45.css
index 9c8ab0cc..fa681d09 100644
--- a/current/css/buttons/icons_custom_icons_fx45.css
+++ b/current/css/buttons/icons_custom_icons_fx45.css
@@ -10,7 +10,7 @@
 */
 
 :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#bookmarks-menu-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#PanelUI-menu-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
diff --git a/current/css/buttons/icons_custom_icons_fx45_inverted.css b/current/css/buttons/icons_custom_icons_fx45_inverted.css
index 162fb944..6c55eef7 100644
--- a/current/css/buttons/icons_custom_icons_fx45_inverted.css
+++ b/current/css/buttons/icons_custom_icons_fx45_inverted.css
@@ -10,7 +10,7 @@
 */
 
 :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#bookmarks-menu-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#PanelUI-menu-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
diff --git a/current/css/buttons/icons_custom_icons_ie6.css b/current/css/buttons/icons_custom_icons_ie6.css
index da2105ae..da9ea95d 100644
--- a/current/css/buttons/icons_custom_icons_ie6.css
+++ b/current/css/buttons/icons_custom_icons_ie6.css
@@ -10,7 +10,7 @@
 */
 
 :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#bookmarks-menu-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#PanelUI-menu-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
diff --git a/current/css/buttons/icons_custom_icons_kempelton.css b/current/css/buttons/icons_custom_icons_kempelton.css
index 99e967d7..faf9972b 100644
--- a/current/css/buttons/icons_custom_icons_kempelton.css
+++ b/current/css/buttons/icons_custom_icons_kempelton.css
@@ -10,7 +10,7 @@
 */
 
 :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#bookmarks-menu-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#PanelUI-menu-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
diff --git a/current/css/buttons/icons_custom_icons_noia.css b/current/css/buttons/icons_custom_icons_noia.css
index 19a6bbc6..2e72ea1d 100644
--- a/current/css/buttons/icons_custom_icons_noia.css
+++ b/current/css/buttons/icons_custom_icons_noia.css
@@ -10,7 +10,7 @@
 */
 
 :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#bookmarks-menu-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#PanelUI-menu-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
diff --git a/current/css/buttons/icons_custom_icons_old_chrome.css b/current/css/buttons/icons_custom_icons_old_chrome.css
index 97c455d7..fa550901 100644
--- a/current/css/buttons/icons_custom_icons_old_chrome.css
+++ b/current/css/buttons/icons_custom_icons_old_chrome.css
@@ -10,7 +10,7 @@
 */
 
 :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#bookmarks-menu-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#PanelUI-menu-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
diff --git a/current/css/buttons/icons_custom_icons_old_osx.css b/current/css/buttons/icons_custom_icons_old_osx.css
index 459dddeb..7585cd73 100644
--- a/current/css/buttons/icons_custom_icons_old_osx.css
+++ b/current/css/buttons/icons_custom_icons_old_osx.css
@@ -10,7 +10,7 @@
 */
 
 :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#bookmarks-menu-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#PanelUI-menu-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
diff --git a/current/css/buttons/icons_custom_icons_seamonkey.css b/current/css/buttons/icons_custom_icons_seamonkey.css
index e58be390..09205ca9 100644
--- a/current/css/buttons/icons_custom_icons_seamonkey.css
+++ b/current/css/buttons/icons_custom_icons_seamonkey.css
@@ -10,7 +10,7 @@
 */
 
 :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#bookmarks-menu-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#PanelUI-menu-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
diff --git a/current/css/buttons/icons_custom_icons_sizes.css b/current/css/buttons/icons_custom_icons_sizes.css
index ec314c81..ab27aaaa 100644
--- a/current/css/buttons/icons_custom_icons_sizes.css
+++ b/current/css/buttons/icons_custom_icons_sizes.css
@@ -41,7 +41,7 @@
 #downloads-indicator-anchor {
   -moz-image-region: rect(0px, 198px, 18px, 180px) !important;
 }
-#add-ons-button	{
+#add-ons-button,#unified-extensions-button	{
   -moz-image-region: rect(0px, 216px, 18px, 198px) !important;
 }
 #open-file-button {
@@ -147,7 +147,7 @@
 
 /* icons adjustment */
 #main-window[uidensity=compact] #nav-bar :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
@@ -158,7 +158,7 @@
 }
 
 #main-window:not([uidensity=compact]):not([uidensity=touch]) #nav-bar :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
@@ -169,7 +169,7 @@
 }
 
 #main-window[uidensity=touch] #nav-bar :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
@@ -180,7 +180,7 @@
 }
 
 toolbar:not(#nav-bar) :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
@@ -198,7 +198,7 @@ toolbar:not(#nav-bar) :is(#panic-button,#pocket-button):not([open]) .toolbarbutt
 }
 
 #customization-palette :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
diff --git a/current/css/buttons/icons_custom_icons_tango.css b/current/css/buttons/icons_custom_icons_tango.css
index 328c8eca..64bf5cd1 100644
--- a/current/css/buttons/icons_custom_icons_tango.css
+++ b/current/css/buttons/icons_custom_icons_tango.css
@@ -10,7 +10,7 @@
 */
 
 :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#bookmarks-menu-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#PanelUI-menu-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
diff --git a/current/css/buttons/icons_white_icons.css b/current/css/buttons/icons_white_icons.css
index 98fb72df..7327f5ae 100644
--- a/current/css/buttons/icons_white_icons.css
+++ b/current/css/buttons/icons_white_icons.css
@@ -40,7 +40,7 @@
 #email-link-button,
 #reload-button,
 #reload-button .toolbarbutton-animatable-image,
-#add-ons-button,
+#add-ons-button,#unified-extensions-button,
 #open-file-button,
 #home-button,
 #feed-button,
diff --git a/current/css/generalui/popup_compact_menus.css b/current/css/generalui/popup_compact_menus.css
index 9e8e2937..c03749bc 100644
--- a/current/css/generalui/popup_compact_menus.css
+++ b/current/css/generalui/popup_compact_menus.css
@@ -116,4 +116,5 @@ menupopup[type=arrow] > menu {
 .unified-extensions-item-name,
 .unified-extensions-item-message {
   padding-inline-start: 0 !important;
+  width: 28em !important;
 }
diff --git a/current/css/generalui/sidebar_show_on_hover.css b/current/css/generalui/sidebar_show_on_hover.css
index 8ff8591d..39660a53 100644
--- a/current/css/generalui/sidebar_show_on_hover.css
+++ b/current/css/generalui/sidebar_show_on_hover.css
@@ -2,6 +2,7 @@
 /* Github: https://github.com/aris-t2/customcssforfx ************************************/
 /****************************************************************************************/
 
+
 :root{
   --sidebar-hover-width: 8px;
   --sidebar-visible-width: 300px;
@@ -32,6 +33,7 @@
 #sidebar-box #sidebar-header {
   visibility: collapse !important;
 }
+
 #sidebar-box:hover #sidebar-header {
   visibility: visible !important;
 }
@@ -55,11 +57,11 @@
 }
 
 #sidebar-box:not([positionend="true"]) ~ #appcontent {
-  margin-inline-start: calc(-1 * var(--sidebar-hover-width)) !important;
+  margin-inline-start: 0 !important;
 }
 
 #sidebar-box:not([positionend="true"]):hover ~ #appcontent {
-  margin-inline-start: calc(-1 * (var(--sidebar-visible-width) + var(--sidebar-hover-width))) !important;
+  margin-inline-start: calc(-1 * var(--sidebar-visible-width)) !important;
 }
 
 #sidebar-box[positionend="true"] {
@@ -71,9 +73,9 @@
 }
 
 #sidebar-box[positionend="true"] ~ #appcontent {
-  margin-inline-end: calc(-1 * var(--sidebar-hover-width)) !important;
+  margin-inline-end: 0 !important;
 }
 
 #sidebar-box[positionend="true"]:hover ~ #appcontent {
-  margin-inline-end: calc(-1 * (var(--sidebar-visible-width) + var(--sidebar-hover-width))) !important;
+  margin-inline-end: calc(-1 * var(--sidebar-visible-width)) !important;
 }
diff --git a/current/css/tabs/classic_squared_tabs.css b/current/css/tabs/classic_squared_tabs.css
index bab82685..9895509b 100644
--- a/current/css/tabs/classic_squared_tabs.css
+++ b/current/css/tabs/classic_squared_tabs.css
@@ -535,6 +535,10 @@
   box-shadow: 0 calc(-1 * var(--tabs-navbar-shadow-size)) 0 var(--classic_squared_tabs-border2) !important;
 }
 
+#main-window:not(:-moz-lwtheme) #TabsToolbar #tabbrowser-tabs .tabbrowser-tab:not([selected]) .tab-stack .tab-content {
+  box-shadow: inset 0 -1px 0 0 var(--classic_squared_tabs-border2) !important;
+}
+
 /* remove active tabs left and right tab border color when using lw-themes */
 :root:not([lwtheme-mozlightdark]) #TabsToolbar:not([brighttext]) #tabbrowser-tabs:not([noshadowfortests]) .tabbrowser-tab:is([visuallyselected=true], [multiselected]) > .tab-stack > .tab-background:-moz-lwtheme,
 :root:not([lwtheme-mozlightdark]) #TabsToolbar[brighttext] #tabbrowser-tabs:not([noshadowfortests]) .tabbrowser-tab:is([visuallyselected=true], [multiselected]) > .tab-stack > .tab-background:-moz-lwtheme {
diff --git a/current/css/toolbars/general_toolbar_colors_aeroglass_windows10_glass8.css b/current/css/toolbars/general_toolbar_colors_aeroglass_windows10_glass8.css
index 5ce0755e..9da579d5 100644
--- a/current/css/toolbars/general_toolbar_colors_aeroglass_windows10_glass8.css
+++ b/current/css/toolbars/general_toolbar_colors_aeroglass_windows10_glass8.css
@@ -7,8 +7,9 @@
 
 @-moz-document url(chrome://browser/content/browser.xul), url(chrome://browser/content/browser.xhtml) {
 	#main-window {
-	  background-color: transparent !important;
-	  appearance: -moz-win-glass !important;
+      background-color: transparent !important;
+      appearance: auto !important;
+      -moz-default-appearance: -moz-win-borderless-glass !important;
 	}
 }
 #main-window:not([customizing]) .titlebar-button,
diff --git a/current/css/toolbars/toolbar_mode_icons_and_text.css b/current/css/toolbars/toolbar_mode_icons_and_text.css
index a33f18b4..fcfe167e 100644
--- a/current/css/toolbars/toolbar_mode_icons_and_text.css
+++ b/current/css/toolbars/toolbar_mode_icons_and_text.css
@@ -131,7 +131,7 @@ toolbar .toolbarbutton-1[type="menu-button"] toolbarbutton[disabled] .toolbarbut
 }
 
 toolbar:not(#nav-bar) :is(#back-button,#forward-button,#home-button,#stop-button,#reload-button,#history-panelmenu,
-	#add-ons-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
+	#add-ons-button,#unified-extensions-button,#open-file-button,#save-page-button,#sync-button,#feed-button,#characterencoding-button,#e10s-button,
 	#new-window-button,#new-tab-button,#privatebrowsing-button,#find-button,#print-button,#fullscreen-button,#developer-button,
 	#preferences-button,#cut-button,#copy-button,#paste-button,#zoom-out-button,#zoom-in-button,
 	#tabview-button,#email-link-button,#sidebar-button,#web-apps-button,#webide-button,#developer-button,#containers-panelmenu,
diff --git a/current/userChrome.css b/current/userChrome.css
index 67b8f339..1d3da349 100644
--- a/current/userChrome.css
+++ b/current/userChrome.css
@@ -2,7 +2,7 @@
   Firefox userChrome.css tweaks: main file
   
   Custom CSS for Firefox 109+
-  Current version: 4.2.9
+  Current version: 4.3.0
 
   Based on 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons CSS code 
   Github: https://github.com/aris-t2/customcssforfx