Backed out changeset 15e19c4203af (bug 1703957) for causing issues with addressbar suggestions (Bug 1707257). a=backout

browser/themes/addons/dark/manifest.json

@@ -96,7 +96,6 @@
       "input_border": "--input-border-color",
       "input_border_error": "--input-error-border-color",
       "autocomplete_popup_separator": "--autocomplete-popup-separator-color",
-      "zoom_controls": "--zoom-controls-bgcolor",
       "appmenu_update_icon_color": "--panel-banner-item-update-supported-bgcolor",
       "appmenu_warning_icon_color": "--panel-banner-item-warning-icon-bgcolor",
       "appmenu_info_icon_color": "--panel-banner-item-info-icon-bgcolor"

browser/themes/addons/light/manifest.json

@@ -53,6 +53,9 @@
       "checkbox_checked_background_hover": "rgb(2, 80, 187)",
       "checkbox_checked_background_active": "rgb(5, 62, 148)",
       "checkbox_checked_color": "rgb(251, 251, 254)",
+      "panel_hover": "rgb(224,224,230)",
+      "panel_active": "rgb(207,207,21)",
+      "panel_active_darker": "rgb(191,191,201)",
       "autocomplete_popup_hover": "rgb(240,240,244)",
       "autocomplete_popup_separator": "rgb(240,240,244)",
       "appmenu_update_icon_color": "#2AC3A2",

browser/themes/osx/browser.css

@@ -8,6 +8,7 @@
 %include ../shared/browser-custom-colors.inc.css
 
 :root {
+  --toolbar-non-lwt-bgcolor: #f9f9fb;
   --toolbar-non-lwt-textcolor: #0c0c0d;
   --toolbar-non-lwt-bgimage: none;
 

browser/themes/shared/browser-custom-colors.inc.css

@@ -45,7 +45,6 @@
     --tab-selected-bgcolor: rgb(255,255,255);
     --tabs-border-color: transparent;
     --toolbar-color: rgb(21,20,26);
-    --toolbar-non-lwt-bgcolor: #f9f9fb;
     --toolbarbutton-icon-fill: rgb(91,91,102);
 
     --urlbar-popup-action-color: rgb(21,20,26);
@@ -54,12 +53,10 @@
     --autocomplete-popup-separator-color: rgb(240,240,244);
     --toolbar-field-border-color: transparent;
     --arrowpanel-border-color: transparent;
-    --chrome-content-separator-color: rgb(204,204,204);
 
     --toolbar-field-non-lwt-bgcolor: rgb(240,240,244);
-    --toolbar-field-non-lwt-color: rgb(21,20,26);
 
-    --autocomplete-popup-highlight-background: "#e0e0e6";
+    --autocomplete-popup-highlight-background: var(--arrowpanel-dimmed);
     --autocomplete-popup-highlight-color: rgb(21,20,26);
     --autocomplete-popup-hover-background: rgb(240,240,244);
   }

browser/themes/shared/urlbar-searchbar.inc.css

@@ -50,7 +50,7 @@
 #searchbar {
   min-height: var(--urlbar-min-height);
   text-shadow: none;
-  color: var(--toolbar-field-non-lwt-color, FieldText);
+  color: FieldText;
 }
 
 @media not (-moz-proton) {

browser/themes/windows/browser.css

@@ -40,6 +40,7 @@
 
 @media (-moz-windows-default-theme) {
   :root {
+    --toolbar-non-lwt-bgcolor: #f9f9fa;
     --toolbar-non-lwt-textcolor: #0c0c0d;
     --toolbar-non-lwt-bgimage: none;