--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -367,21 +367,21 @@ html|span.ac-tag {
   padding: 0 1px;
 }
 
 .ac-separator:not([selected=true]) {
   color: hsl(0, 0%, 50%);
 }
 
 .ac-url:not([selected=true]) {
-  color: #0a84ff;
+  color: hsl(210, 77%, 47%);
 }
 
 .ac-action:not([selected=true]) {
-  color: #12bc00;
+  color: hsl(178, 100%, 28%);
 }
 
 .ac-tags-text[selected] > html|span.ac-tag {
   background-color: hsl(0, 0%, 100%);
   color: hsl(210, 80%, 40%);
 }
 
 html|span.ac-emphasize-text-title,

--- a/browser/themes/shared/compacttheme.inc.css
+++ b/browser/themes/shared/compacttheme.inc.css
@@ -13,55 +13,50 @@
   --toolbar-gbimage: none;
   --toolbar-non-lwt-bgcolor: var(--toolbar-bgcolor);
   --toolbar-non-lwt-textcolor: var(--chrome-color);
   --toolbar-non-lwt-bgimage: none;
 
   --toolbarbutton-icon-fill-opacity: .7;
 
   --tab-line-color: #0a84ff;
-
-  --urlbar-popup-background: var(--url-and-searchbar-background-color);
-  --urlbar-popup-color: var(--chrome-color);
-  --urlbar-popup-highlight-background: var(--chrome-selection-background-color);
-  --urlbar-popup-highlight-color: var(--chrome-selection-color);
 }
 
 :root:-moz-lwtheme-brighttext {
   /* Chrome */
   --chrome-background-color: hsl(240, 5%, 5%);
   --chrome-color: rgb(249, 249, 250);
   --chrome-secondary-background-color: hsl(240, 1%, 20%);
   --toolbox-border-bottom-color: hsla(240, 5%, 5%, .1);
   --chrome-nav-bar-separator-color: rgba(0,0,0,.2);
   --chrome-nav-buttons-background: hsla(240, 5%, 5%, .1);
   --chrome-nav-buttons-hover-background: hsla(240, 5%, 5%, .15);
   --chrome-nav-bar-controls-border-color: hsla(240, 5%, 5%, .3);
   --chrome-selection-color: #fff;
-  --chrome-selection-background-color: #0060df;
+  --chrome-selection-background-color: #5675B9;
 
   /* Url and search bars */
   --url-and-searchbar-background-color: rgb(71, 71, 73);
   --url-and-searchbar-color: var(--chrome-color);
   --urlbar-separator-color: #5F6670;
 }
 
 :root:-moz-lwtheme-darktext {
   --url-and-searchbar-background-color: #fff;
 
   --chrome-background-color: #E3E4E6;
   --chrome-color: #18191a;
   --chrome-secondary-background-color: #f5f6f7;
   --toolbox-border-bottom-color: #cccccc;
   --chrome-nav-bar-separator-color: #B6B6B8;
-  --chrome-nav-buttons-background: #ffffff;
+  --chrome-nav-buttons-background: #ffffff; /* --theme-body-background */
   --chrome-nav-buttons-hover-background: #DADBDB;
   --chrome-nav-bar-controls-border-color: #ccc;
   --chrome-selection-color: #f5f7fa;
-  --chrome-selection-background-color: #0060df;
+  --chrome-selection-background-color: #4c9ed9;
 }
 
 .toolbarbutton-animatable-box[brighttext],
 toolbar[brighttext] .toolbarbutton-animatable-box,
 toolbar[brighttext] .toolbarbutton-1 {
   fill: rgb(249, 249, 250);
 }
 
@@ -113,13 +108,8 @@ toolbar[brighttext] .toolbarbutton-1 {
   background-color: rgba(255,255,255,.3);
 }
 
 .tab-icon-sound[soundplaying],
 .tab-icon-sound[muted] {
   filter: none !important; /* removes drop-shadow filter */
 }
 
-/* Improve contrast of URL bar notification "Change Settings" link */
-
-#search-suggestions-change-settings {
-  color: #0a84ff;
-}

--- a/browser/themes/shared/urlbar-autocomplete.inc.css
+++ b/browser/themes/shared/urlbar-autocomplete.inc.css
@@ -1,52 +1,29 @@
 %if 0
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 %endif
 
-:root {
-  --urlbar-popup-background: -moz-field;
-  --urlbar-popup-color: -moz-fieldtext;
-  --urlbar-popup-highlight-background: Highlight;
-  --urlbar-popup-highlight-color: HighlightText;
-}
-
 #treecolAutoCompleteImage {
   max-width: 36px;
 }
 
-#PopupAutoCompleteRichResult {
-  background: var(--urlbar-popup-background);
-  color: var(--urlbar-popup-color);
-}
-
 #PopupAutoCompleteRichResult .autocomplete-richlistbox {
   padding: 4px 3px;
-  background: transparent;
-  color: inherit;
 }
 
 #PopupAutoCompleteRichResult .autocomplete-richlistitem {
   min-height: 30px;
   font: message-box;
   border-radius: 2px;
   padding-inline-start: var(--item-padding-start);
   /* For the space after the autocomplete text we have to use a transparent
      border instead of padding, because the latter would considered part of the
      scrollable area when generating the overflow events that we use to
      constrain the autocomplete result item size. */
   border-inline-end: var(--item-padding-end) solid transparent;
 }
 
-#PopupAutoCompleteRichResult .autocomplete-richlistitem[selected] {
-  background: var(--urlbar-popup-highlight-background);
-  color: var(--urlbar-popup-highlight-color);
-}
-
 :root[uidensity=touch] #PopupAutoCompleteRichResult .autocomplete-richlistitem {
   min-height: 40px;
 }
-
-#PopupAutoCompleteRichResult .search-panel-input-value {
-  color: var(--urlbar-popup-color);
-}

--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -632,21 +632,21 @@ html|span.ac-emphasize-text-url {
     color: hsl(0, 0%, 0%);
   }
 
   .ac-separator:not([selected=true]) {
     color: hsl(0, 0%, 50%);
   }
 
   .ac-url:not([selected=true]) {
-    color: #0a84ff;
+    color: hsl(210, 77%, 47%);
   }
 
   .ac-action:not([selected=true]) {
-    color: #12bc00;
+    color: hsl(178, 100%, 28%);
   }
 
   html|span.ac-tag {
     background-color: hsl(216, 0%, 88%);
     color: hsl(0, 0%, 0%);
   }
 
   .ac-tags-text[selected] > html|span.ac-tag {