1 files changed, 30 insertions, 16 deletions

diff --git a/arc-firefox-theme/chrome/browser/searchbar.css b/arc-firefox-theme/chrome/browser/searchbar.css
index f1544af..130b90a 100644
--- a/arc-firefox-theme/chrome/browser/searchbar.css
+++ b/arc-firefox-theme/chrome/browser/searchbar.css
@@ -132,12 +132,14 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
 }
 
 .search-panel-tree {
-  border-top: 1px solid #ccc !important;
+  border-top: 1px solid var(--panel-separator-color) !important;
 }
 
 .search-panel-header {
   font-weight: normal;
-  border-top: 1px solid rgba(0, 0, 0, 0.2);
+  background-color: var(--arrowpanel-dimmed);
+  border: none;
+  border-top: 1px solid var(--panel-separator-color);
   padding: 3px 5px;
   color: GrayText;
 }
@@ -152,12 +154,12 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
 }
 
 .search-panel-input-value {
-  color: Highlight;
+  color: -moz-fieldtext;
 }
 
 .search-panel-one-offs {
   margin: 0 !important;
-  border-top: 1px solid rgba(0, 0, 0, 0.2);
+  border-top: 1px solid var(--panel-separator-color);
 }
 
 .searchbar-engine-one-off-item {
@@ -166,12 +168,13 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
   border: none;
   min-width: 48px;
   height: 32px;
-  margin: 0 0;
-  padding: 0 0;
-  background: none;
-  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAABmJLR0QA/wD/AP+gvaeTAAAAFElEQVQI12NgYGAwZmJgYGCgBwEAHpIAXs+dj/cAAAAASUVORK5CYII=');
+  margin: 0;
+  padding: 0;
+  background: linear-gradient(transparent 15%, var(--panel-separator-color) 15%, var(--panel-separator-color) 85%, transparent 85%);
+  background-size: 1px auto;
   background-repeat: no-repeat;
   background-position: right center;
+  color: GrayText;
 }
 
 .searchbar-engine-one-off-item:-moz-locale-dir(rtl) {
@@ -180,16 +183,25 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
 
 .searchbar-engine-one-off-item:not(.last-row) {
   box-sizing: content-box;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+  border-bottom: 1px solid var(--panel-separator-color);
+}
+
+.search-setting-button-compact {
+  border-bottom: none !important;
 }
 
-.searchbar-engine-one-off-item.last-of-row {
+.search-panel-one-offs:not([compact=true]) > .searchbar-engine-one-off-item.last-of-row,
+.search-panel-one-offs[compact=true] > .searchbar-engine-one-off-item.last-of-row:not(.dummy),
+.search-panel-one-offs[compact=true] > .searchbar-engine-one-off-item.dummy:not(.last-of-row),
+.search-panel-one-offs[compact=true] > .searchbar-engine-one-off-item.last-engine,
+.search-setting-button-compact {
   background-image: none;
 }
 
 .searchbar-engine-one-off-item[selected] {
   background-color: Highlight;
   background-image: none;
+  color: HighlightText;
 }
 
 .searchbar-engine-one-off-item > .button-box {
@@ -223,7 +235,7 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
 }
 
 .addengine-item:first-of-type {
-  border-top: 1px solid rgba(0, 0, 0, 0.2);
+  border-top: 1px solid var(--panel-separator-color);
 }
 
 .addengine-item[selected] {
@@ -286,14 +298,16 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
 
 .search-setting-button {
   -moz-appearance: none;
-  border: none;
-  border-top: 1px solid rgba(0, 0, 0, 0.2);
   margin: 0;
   min-height: 32px;
 }
 
 .search-setting-button[selected] {
-  background-color: Highlight;
-  color: HighlightText;
-  border-top-color: #bdbebe;
+  background-color: var(--arrowpanel-dimmed-further);
+}
+
+.search-setting-button-compact > .button-box > .button-icon {
+  list-style-image: url("chrome://browser/skin/gear.svg");
+  filter: url(chrome://browser/skin/filters.svg#fill);
+  fill: currentColor;
 }