diff --git a/browser/themes/shared/searchbar.inc.css b/browser/themes/shared/searchbar.inc.css
index f724ece90b9d..e5660da2d13f 100644
--- a/browser/themes/shared/searchbar.inc.css
+++ b/browser/themes/shared/searchbar.inc.css
@@ -20,12 +20,12 @@
   font-weight: normal;
   margin: 0;
   padding: 3px;
-  color: var(--panel-disabled-color);
 }
 
 .search-panel-header > label {
   margin-top: 2px;
   margin-bottom: 1px;
+  opacity: .6;
 }
 
 /**
@@ -76,7 +76,7 @@
   height: 32px;
   margin: 0;
   padding: 0;
-  color: var(--panel-disabled-color);
+  color: inherit;
 }
 
 .searchbar-engine-one-off-item:not([selected]):hover,
@@ -213,6 +213,7 @@
 
 .search-setting-button-compact > .button-box > .button-icon {
   list-style-image: url("chrome://browser/skin/settings.svg");
-  -moz-context-properties: fill;
+  -moz-context-properties: fill, fill-opacity;
   fill: currentColor;
+  fill-opacity: .6;
 }
diff --git a/browser/themes/shared/urlbar-autocomplete.inc.css b/browser/themes/shared/urlbar-autocomplete.inc.css
index 51613722cb9e..36e79a24822a 100644
--- a/browser/themes/shared/urlbar-autocomplete.inc.css
+++ b/browser/themes/shared/urlbar-autocomplete.inc.css
@@ -63,7 +63,7 @@
 
 .urlbarView.megabar .urlbarView-body-inner {
   width: 100%;
-  border-top: 1px solid var(--panel-separator-color);
+  border-top: 1px solid var(--urlbar-separator-color);
 }
 
 .urlbarView:not(.megabar) {
@@ -387,7 +387,7 @@
 
 .urlbarView-title-separator::before {
   content: "\2014";
-  color: var(--panel-disabled-color);
+  color: var(--urlbar-separator-color);
   margin: 0 .4em;
 }