--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -862,23 +862,20 @@ toolbarpaletteitem[place="palette"] > #p
 }
 
 .autocomplete-richlistitem:hover,
 treechildren.searchbar-treebody::-moz-tree-row(hover) {
   background-color: hsla(0, 0%, 0%, 0.06);
   border-color: hsla(0, 0%, 0%, 0.1);
 }
 
-.autocomplete-richlistitem[selected] {
-  background-color: hsl(210, 80%, 52%);
-  color: hsl(0, 0%, 100%);
-}
-
+.autocomplete-richlistitem[selected],
 treechildren.searchbar-treebody::-moz-tree-row(selected) {
   background-color: Highlight;
+  color: HighlightText;
 }
 
 .ac-title {
   font-size: 14px;
 }
 
 .ac-separator,
 .ac-url,

--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1042,31 +1042,16 @@ html|span.ac-tag {
 
 html|span.ac-emphasize-text-title,
 html|span.ac-emphasize-text-tag,
 html|span.ac-emphasize-text-url {
   font-weight: 600;
 }
 
 @media (-moz-windows-default-theme) {
-  .autocomplete-richlistitem:hover,
-  treechildren.searchbar-treebody::-moz-tree-row(hover) {
-    background-color: hsla(0, 0%, 0%, 0.06);
-    border-color: hsla(0, 0%, 0%, 0.1);
-  }
-
-  .autocomplete-richlistitem[selected] {
-    background-color: hsl(210, 80%, 52%);
-    color: hsl(0, 0%, 100%);
-  }
-
-  treechildren.searchbar-treebody::-moz-tree-row(selected) {
-    background-color: Highlight;
-  }
-
   .ac-title:not([selected=true]) {
     color: hsl(0, 0%, 0%);
   }
 
   .ac-separator:not([selected=true]) {
     color: hsl(0, 0%, 50%);
   }
 
@@ -1102,16 +1087,28 @@ html|span.ac-emphasize-text-url {
   }
 
   .ac-tags-text[selected] > html|span.ac-tag {
     background-color: HighlightText;
     color: Highlight;
   }
 }
 
+.autocomplete-richlistitem:hover,
+treechildren.searchbar-treebody::-moz-tree-row(hover) {
+  background-color: var(--arrowpanel-dimmed);
+  border-color: hsla(0, 0%, 0%, 0.1);
+}
+
+.autocomplete-richlistitem[selected],
+treechildren.searchbar-treebody::-moz-tree-row(selected) {
+  background-color: Highlight;
+  color: HighlightText;
+}
+
 .ac-type-icon[type=bookmark] {
   list-style-image: url("chrome://browser/skin/urlbar-star.svg#star");
 }
 
 .ac-type-icon[type=bookmark][selected][current] {
   list-style-image: url("chrome://browser/skin/urlbar-star.svg#star-inverted");
 }