diff --git a/classic/config/general_variables.css b/classic/config/general_variables.css
index 2ff86095..7fbbaffe 100644
--- a/classic/config/general_variables.css
+++ b/classic/config/general_variables.css
@@ -36,7 +36,7 @@
   --bookmark_items_lines: 3 !important; /* <- maximum amount of lines */
   
   /* for increase_ui_font_size.css */
-  --general_ui_font_size: 12pt !important;
+  --general_ui_font_size: 10pt !important;
   
   /* for searchbar_popup_engines_show_labels_scrollbars.css / ..._fx66.css*/
   --search-one-offs_labels_height: 100px !important;
diff --git a/classic/css/aboutaddons/addonlists_show_buttons_instead_of_menu_popup_fx72.css b/classic/css/aboutaddons/addonlists_show_buttons_instead_of_menu_popup_fx72.css
index fb828f5c..ccd08024 100644
--- a/classic/css/aboutaddons/addonlists_show_buttons_instead_of_menu_popup_fx72.css
+++ b/classic/css/aboutaddons/addonlists_show_buttons_instead_of_menu_popup_fx72.css
@@ -19,7 +19,7 @@
 	}
 		/**/
 	
-	addon-list[type="theme"] addon-card:not([expanded="true"]) button[data-l10n-id="enable-addon-button"],
+	addon-list[type="theme"] addon-card:not([expanded="true"]) button[data-l10n-id="enable-addon-button"]:not(.theme-enable-button),
 	.more-options-menu panel-item {
 	  background: white !important;
 	  color: black !important;
@@ -27,7 +27,7 @@
 	  border: 1px solid lightgrey !important;
 	}
 	
-	addon-list[type="theme"] addon-card:not([expanded="true"]) button[data-l10n-id="enable-addon-button"]:not([badged]),
+	addon-list[type="theme"] addon-card:not([expanded="true"]) button[data-l10n-id="enable-addon-button"]:not(.theme-enable-button):not([badged]),
 	addon-list panel-item:not([badged]){
 	  border: 1px solid lightgrey !important;
 	}
@@ -37,21 +37,21 @@
 	  color: black !important;
 	}
 	
-	addon-list[type="theme"] addon-card:not([expanded="true"]) button[data-l10n-id="enable-addon-button"]:hover,
-	addon-list[type="theme"] addon-card:not([expanded="true"]) button[data-l10n-id="enable-addon-button"]:active {
+	addon-list[type="theme"] addon-card:not([expanded="true"]) button[data-l10n-id="enable-addon-button"]:not(.theme-enable-button):hover,
+	addon-list[type="theme"] addon-card:not([expanded="true"]) button[data-l10n-id="enable-addon-button"]:not(.theme-enable-button):active {
 	  border: 1px solid black !important;
 	}
 	
 	@supports -moz-bool-pref("browser.in-content.dark-mode") {
 	  @media (prefers-color-scheme: dark) {
 		addon-list addon-card:not([expanded="true"]) panel-list *,
-		addon-list[type="theme"] addon-card:not([expanded="true"]) button[data-l10n-id="enable-addon-button"],
+		addon-list[type="theme"] addon-card:not([expanded="true"]) button[data-l10n-id="enable-addon-button"]:not(.theme-enable-button),
 		.more-options-menu panel-item {
 		  background: black !important;
 		  color: white !important;
 	    }
-		addon-list[type="theme"] addon-card:not([expanded="true"]) button[data-l10n-id="enable-addon-button"]:hover,
-		addon-list[type="theme"] addon-card:not([expanded="true"]) button[data-l10n-id="enable-addon-button"]:active {
+		addon-list[type="theme"] addon-card:not([expanded="true"]) button[data-l10n-id="enable-addon-button"]:not(.theme-enable-button):hover,
+		addon-list[type="theme"] addon-card:not([expanded="true"]) button[data-l10n-id="enable-addon-button"]:not(.theme-enable-button):active {
 		  border: 1px solid white !important;
 		}
 	}}
@@ -133,7 +133,7 @@
 	
 	addon-list addon-card:not([expanded="true"]) panel-list {
 	  position: relative !important;
-	  display: block !important;
+	  display: flex !important;
 	  overflow: hidden !important;
 	  background: unset !important;
 	  border: unset !important;
@@ -144,26 +144,65 @@
 	  right: 36px !important;
 	}
 	
-	addon-list:-moz-any([type="theme"],[type="plugin"],[type="dictionary"]) addon-card:not([expanded="true"]) panel-list {
+	/*addon-list:-moz-any([type="theme"],[type="plugin"],[type="dictionary"],[type="all"]) addon-card:not([expanded="true"]) panel-list {
 	  right: 1px !important;
-	}
+	}*/
 
 	addon-list addon-card:not([expanded="true"]) panel-list {
 	  margin-top: -48px !important;
 	}
 
-	addon-list[type="theme"] addon-card:not([expanded="true"]) panel-list {
-	  margin-top: -80px !important;
+	/*addon-list[type="theme"] addon-card:not([expanded="true"]) panel-list {
+	  -moz-margin-end: 22px !important;
+	}*/
+	
+	addon-list addon-card:not([expanded="true"]) .addon.card .theme-enable-button {
+	  -moz-appearance: none !important;
+	  min-width: 20px !important;
+	  width: 20px !important;
+	  max-width: 20px !important;
+	  height: 20px !important;
+	  font-size: 0 !important;
+	  border: 1px solid !important;
+	  border-top: 3px solid !important;
+	  -moz-margin-end: 1px !important;
+	  opacity: 0.9 !important;
+	}
+	
+	addon-list addon-card:not([expanded="true"]) .addon.card .theme-enable-button:hover {
+	  cursor: pointer !important;
+	  opacity: 1.0 !important;
+	  filter: brightness(2.00) !important;
+	}
+	
+	addon-list addon-card:not([expanded="true"]) .addon.card[active="true"] .theme-enable-button {
+	  background: Highlight url("chrome://global/skin/icons/check.svg") 2px no-repeat !important;
 	}
 	
-	addon-list[type="theme"] addon-card:not([expanded="true"]) .card-heading-image {
-	  width: 440px !important;
-	  height: 60px !important;
-	  object-fit: unset !important;
+	addon-list addon-card:not([expanded="true"]):hover .addon.card[active="true"] .theme-enable-button {
+	  background: red url("chrome://browser/skin/zoom-out.svg") 2px no-repeat !important;
+	}
+	
+	addon-list addon-card:not([expanded="true"]):hover .addon.card[active="false"] .theme-enable-button {
+	  background: green url("chrome://global/skin/icons/check.svg") 2px no-repeat !important;
 	}
 	
 	addon-list[type="theme"] addon-card:not([expanded="true"]) .card-contents{
 	  height: 40px !important;
 	}
+	
+	/*input[type="checkbox"].toggle-button {
+	  margin: 0 8px !important;
+	}*/
+	
+	addon-list addon-card:not([expanded="true"]) .addon.card .theme-enable-button,
+	input[type="checkbox"].toggle-button {
+	  -moz-margin-end: 8px !important;
+	}
+	
+	addon-card:not([expanded]) > .addon.card,
+	addon-card:not([expanded]) > .addon.card * {
+	  overflow: hidden !important;
+	}
 
 }
\ No newline at end of file
diff --git a/classic/css/aboutaddons/addons_manager_alternative_appearance_fx68.css b/classic/css/aboutaddons/addons_manager_alternative_appearance_fx68.css
index 348b8d92..e278593c 100644
--- a/classic/css/aboutaddons/addons_manager_alternative_appearance_fx68.css
+++ b/classic/css/aboutaddons/addons_manager_alternative_appearance_fx68.css
@@ -233,7 +233,7 @@
 	  padding-bottom: 7px !important;
 	}
 
-	.addon.card {
+	addon-card:not([expanded]) .addon.card {
 	  max-width: unset !important;
 	  padding-inline-end: 0px !important;
 	}
@@ -249,9 +249,7 @@
 
 	.list > .addon,
 	.list > .addon:hover {
-	  /*outset: unset !important;*/
 	  box-shadow: unset !important;
-	  /*duration: unset !important;*/
 	  border-bottom: 1px solid var(--in-content-box-border-color) !important;
 	}
 
@@ -260,9 +258,7 @@
 	}
 	
 	#detail-view .card {
-	  /*outset: unset !important;*/
 	  box-shadow: unset !important;
-	  /*duration: unset !important;*/
 	}
 
 	#detail-view .detail-view-container {
@@ -340,7 +336,6 @@
 	addon-card:not([expanded]) > .addon.card[active="false"]:focus-within,
 	addon-card:not([expanded]) > .addon.card[active="false"]:hover {
 	  color: grey !important;
-	  /*opacity: 0.6 !important;*/
 	  transition: unset !important;
 	}
 	
diff --git a/classic/css/aboutpreferences/preferences_alternative_appearance.css b/classic/css/aboutpreferences/preferences_alternative_appearance.css
index 9d9d783a..3ddc6b02 100644
--- a/classic/css/aboutpreferences/preferences_alternative_appearance.css
+++ b/classic/css/aboutpreferences/preferences_alternative_appearance.css
@@ -12,7 +12,8 @@
  	#preferences-stack,.sticky-container,
 	page,
 	.dialogBox .groupbox-title {
-	  background: linear-gradient(to bottom right, #f5f5f5,-moz-Dialog,#f5f5f5,-moz-Dialog) !important;
+	  /*background: linear-gradient(to bottom right, #f5f5f5,-moz-Dialog,#f5f5f5,-moz-Dialog) !important;*/
+	  background: -moz-Dialog !important;
 	}
 
 	#categories {
@@ -29,7 +30,9 @@
 	}
 
 	.pane-container {
-	  width: unset !important;
+	  width: 100vw !important;
+	  padding: 0px !important;
+	  margin: 0px !important;
 	}
 	
 	.sticky-container,
@@ -188,7 +191,7 @@
 	radio image {
 	  width: 14px !important;
 	  height: 14px !important;
-	  margin: 0 !important;
+	  margin: 0 1px !important;
 	}
 	
 	/*checkbox label,
diff --git a/classic/css/aboutpreferences/preferences_alternative_appearance_aero.css b/classic/css/aboutpreferences/preferences_alternative_appearance_aero.css
index abfc8ced..3addf330 100644
--- a/classic/css/aboutpreferences/preferences_alternative_appearance_aero.css
+++ b/classic/css/aboutpreferences/preferences_alternative_appearance_aero.css
@@ -5,12 +5,12 @@
 @import "./preferences_alternative_appearance.css";
 
 @-moz-document url(about:preferences),url-prefix(about:preferences){
-/*.navigation, #preferences-body*/
+	.navigation, #preferences-body,
 	window > stack > hbox,
 	#preferences-stack,.sticky-container,
-	page,
-	page .dialogBox .groupbox-title{
-	  background: linear-gradient(to bottom right, #edf6ff,#dbeaf9,#edf6ff,#dbeaf9) !important;
+	page, page .dialogBox .groupbox-title{
+	  /*background: linear-gradient(to bottom right, #edf6ff,#dbeaf9,#edf6ff,#dbeaf9) !important;*/
+	  background: #edf6ff !important;
 	}
 
 }
diff --git a/classic/css/aboutpreferences/preferences_alternative_appearance_v2.css b/classic/css/aboutpreferences/preferences_alternative_appearance_v2.css
index 4000286c..eb3b143d 100644
--- a/classic/css/aboutpreferences/preferences_alternative_appearance_v2.css
+++ b/classic/css/aboutpreferences/preferences_alternative_appearance_v2.css
@@ -36,11 +36,17 @@
 	}
 	
 	.sticky-container,
-	.search-container {
-	  background: transparent !important;
-	  position: absolute !important;
-	  display:block !important;
-	  top: 20px !important;
+	.search-container  {
+	  width: 100% !important;
+	  margin-inline: 0px !important;
+	  padding-inline: 0px !important;
+	  min-height: unset !important;
+	  height: unset !important;
+	}
+	
+	#policies-container, #searchInput {
+	  min-height: unset !important;
+	  margin: 3px 0 !important;
 	}
 	
 	.header-name {
diff --git a/classic/css/appbutton/appbutton_in_titlebar.css b/classic/css/appbutton/appbutton_in_titlebar.css
index 1f44d10a..906ac3b5 100644
--- a/classic/css/appbutton/appbutton_in_titlebar.css
+++ b/classic/css/appbutton/appbutton_in_titlebar.css
@@ -7,20 +7,6 @@
 /* cheat main menu button into title bar ********/
 /************************************************/
 
-/* workaround for Firefox 71+ *******************/
-:root {
-  --space_required_for_appbutton_fix: 36px;
-  --space_required_for_appbutton_fix2: 4px;
-}
-
-:root[uidensity="compact"] {
-  --space_required_for_appbutton_fix: 34px;
-}
-
-:root[uidensity="touch"] {
-  --space_required_for_appbutton_fix: 42px;
-}
-
 /* menubar adjustments */
 #main-window[tabsintitlebar] #toolbar-menubar {
   -moz-margin-start: 95px !important;
@@ -69,7 +55,7 @@
   -moz-appearance: none !important;
   -moz-box-ordinal-group: 0 !important;
   position: fixed !important;
-  display: block !important;
+  display: flex !important;
   height: 22px !important;
   margin: 0 !important;
   -moz-margin-start: 1px !important;
@@ -374,34 +360,6 @@
   display: none !important;
 }
 
-#main-window[tabsintitlebar] #PanelUI-button {
-  min-width: 1px !important;
-  width: 1px !important;
-  max-width: 1px !important;
-  margin-inline-start: 0px !important;
-}
-
-#main-window[tabsintitlebar][sizemode="maximized"] #PanelUI-button {
-  margin-inline-start: -2px !important;
-}
-
-#main-window[tabsintitlebar] #nav-bar-customization-target {
-  z-index: 10000 !important;
-}
-#main-window[tabsintitlebar] #nav-bar {
-  padding-inline-start: 1px !important;
-}
-#main-window[tabsintitlebar] #nav-bar #nav-bar-overflow-button{
-  padding-inline-end: 0px !important;
-}
-#main-window[tabsintitlebar] #nav-bar-customization-target {
-  max-width: calc(100vw - var(--space_required_for_appbutton_fix)) !important;
-}
-
-#main-window[tabsintitlebar] #nav-bar:not([nonemptyoverflow="true"]) #nav-bar-customization-target {
-  max-width: calc(100vw - var(--space_required_for_appbutton_fix2)) !important;
-}
-
 #main-window[tabsintitlebar][uidensity=compact] #PanelUI-menu-button .toolbarbutton-badge-stack,
 #main-window[tabsintitlebar]:not([uidensity=compact]):not([uidensity=touch]) #PanelUI-menu-button .toolbarbutton-badge-stack,
 #main-window[tabsintitlebar][uidensity=touch] #PanelUI-menu-button .toolbarbutton-badge-stack,
diff --git a/classic/css/appbutton/appbutton_in_titlebar_icon_only.css b/classic/css/appbutton/appbutton_in_titlebar_icon_only.css
index f40b8a8e..52f587d1 100644
--- a/classic/css/appbutton/appbutton_in_titlebar_icon_only.css
+++ b/classic/css/appbutton/appbutton_in_titlebar_icon_only.css
@@ -7,19 +7,6 @@
 /* cheat main menu button into title bar ********/
 /************************************************/
 
-/* workaround for Firefox 71+ *******************/
-:root {
-  --space_required_for_appbutton_fix: 36px;
-  --space_required_for_appbutton_fix2: 4px;
-}
-
-:root[uidensity="compact"] {
-  --space_required_for_appbutton_fix: 34px;
-}
-
-:root[uidensity="touch"] {
-  --space_required_for_appbutton_fix: 42px;
-}
 
 /* tabs toolbar adjustments */
 #main-window[tabsintitlebar] #toolbar-menubar {
@@ -75,7 +62,7 @@
   -moz-appearance: none !important;
   -moz-box-ordinal-group: 0 !important;
   position: fixed !important;
-  display:block !important;
+  display: flex !important;
   height: 22px !important;
   margin: 0 !important;
   -moz-margin-start: 1px !important;
@@ -309,34 +296,6 @@
   display: none !important;
 }
 
-#main-window[tabsintitlebar] #PanelUI-button {
-  min-width: 1px !important;
-  width: 1px !important;
-  max-width: 1px !important;
-  margin-inline-start: 0px !important;
-}
-
-#main-window[tabsintitlebar][sizemode="maximized"] #PanelUI-button {
-  margin-inline-start: -2px !important;
-}
-
-#main-window[tabsintitlebar] #nav-bar-customization-target {
-  z-index: 10000 !important;
-}
-#main-window[tabsintitlebar] #nav-bar {
-  padding-inline-start: 1px !important;
-}
-#main-window[tabsintitlebar] #nav-bar #nav-bar-overflow-button{
-  padding-inline-end: 0px !important;
-}
-#main-window[tabsintitlebar] #nav-bar-customization-target {
-  max-width: calc(100vw - var(--space_required_for_appbutton_fix)) !important;
-}
-
-#main-window[tabsintitlebar] #nav-bar:not([nonemptyoverflow="true"]) #nav-bar-customization-target {
-  max-width: calc(100vw - var(--space_required_for_appbutton_fix2)) !important;
-}
-
 #main-window[tabsintitlebar][uidensity=compact] #PanelUI-menu-button .toolbarbutton-badge-stack,
 #main-window[tabsintitlebar]:not([uidensity=compact]):not([uidensity=touch]) #PanelUI-menu-button .toolbarbutton-badge-stack,
 #main-window[tabsintitlebar][uidensity=touch] #PanelUI-menu-button .toolbarbutton-badge-stack,
diff --git a/classic/css/generalui/findbar_compact.css b/classic/css/generalui/findbar_compact.css
index 9374f6b9..c50ae036 100644
--- a/classic/css/generalui/findbar_compact.css
+++ b/classic/css/generalui/findbar_compact.css
@@ -5,5 +5,5 @@
 
 .findbar-container,
 .findbar-container * {
-  padding:0 !important;
+  padding: 0 !important;
 }
diff --git a/classic/css/generalui/findbar_on_top.css b/classic/css/generalui/findbar_on_top.css
index c2110f3d..43b1d05b 100644
--- a/classic/css/generalui/findbar_on_top.css
+++ b/classic/css/generalui/findbar_on_top.css
@@ -15,13 +15,6 @@
   -moz-margin-end: 2px !important;
 }
 
-@media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10) {
-	:-moz-any(.browserContainer, #viewSource) .findbar-closebutton {
-	  position: relative !important;
-	  top: 4px !important;
-	}
-}
-
 :-moz-any(.browserContainer, #viewSource) .findbar-closebutton  .toolbarbutton-icon{
   width: 16px !important;
   height: 16px !important;
@@ -33,7 +26,7 @@
 :-moz-any(.browserContainer,#viewSource) :-moz-any(findbar,#FindToolbar) {
   -moz-box-ordinal-group: 0;
   position: fixed !important;
-  display:block !important;
+  display: flex !important;
   margin-top: -1px !important;
   box-shadow: unset !important;
   border: 1px solid #e1e1e2 !important;
@@ -124,5 +117,9 @@
 /**/
 
 :-moz-any(.browserContainer,#viewSource) :-moz-any(findbar,#FindToolbar) {
-	z-index: 10000 !important;
+  z-index: 10000 !important;
+}
+
+:-moz-any(.browserContainer,#viewSource) :-moz-any(findbar,#FindToolbar) {
+  overflow: hidden !important;
 }
diff --git a/classic/css/generalui/findbar_on_top_close_at_findbars_start.css b/classic/css/generalui/findbar_on_top_close_at_findbars_start.css
index 14405baf..31fbb949 100644
--- a/classic/css/generalui/findbar_on_top_close_at_findbars_start.css
+++ b/classic/css/generalui/findbar_on_top_close_at_findbars_start.css
@@ -3,6 +3,10 @@
 /****************************************************************************************/
 
 
+:-moz-any(.browserContainer,#viewSource) :-moz-any(findbar,#FindToolbar) {
+  display: block !important;
+}
+
 :-moz-any(.browserContainer,#viewSource) :-moz-any(findbar,#FindToolbar) .findbar-closebutton {
   position: absolute !important;
   display:block !important;
diff --git a/classic/css/tabs/tabs_below_navigation_toolbar_fx65.css b/classic/css/tabs/tabs_below_navigation_toolbar_fx65.css
index 3f654ca1..e66fbb46 100644
--- a/classic/css/tabs/tabs_below_navigation_toolbar_fx65.css
+++ b/classic/css/tabs/tabs_below_navigation_toolbar_fx65.css
@@ -68,8 +68,7 @@
 	  display: none !important;
 	}
 	#main-window[tabsintitlebar]:not([inDOMFullscreen="true"]):-moz-lwtheme #toolbar-menubar ~ #TabsToolbar .titlebar-buttonbox-container {
-	  display: block !important;
-	  margin-top: -13px !important;
+	  display: flex !important;
 	}
   }
   @media not all and (-moz-windows-compositor) {
diff --git a/classic/userChrome.css b/classic/userChrome.css
index 413f6688..d450e43e 100644
--- a/classic/userChrome.css
+++ b/classic/userChrome.css
@@ -5,7 +5,7 @@
 
 /************************************************************************************************/
 /* Custom CSS for Firefox 60+ *******************************************************************/
-/* version 2.9.8 ********************************************************************************/
+/* version 2.9.9 ********************************************************************************/
 /************************************************************************************************/
 
 /*************************************************************************************************