diff --git a/userChrome.css b/userChrome.css
index 383e0b4..9ea7b12 100644
--- a/userChrome.css
+++ b/userChrome.css
@@ -388,7 +388,6 @@
       --autocomplete-popup-hover-background: var(--win-button-hover-bgcolor) !important;
 
       /* Button Border Color */
-      --tab-line-color: var(--win-button-border) !important;
       --checkbox-border-color: var(--win-button-border) !important;
       --input-border-color: var(--win-button-border) !important;
       --autocomplete-popup-separator-color: var(--win-button-border) !important;
@@ -416,6 +415,7 @@
       --input-error-border-color: var(--win-error-color) !important;
 
       /* Others */
+      --tab-line-color: Highlight !important;
       --tab-selected-bgcolor: unset !important;
       --tabs-border-color: transparent !important;
       --checkbox-checked-border-color: transparent !important;
@@ -429,6 +429,9 @@
 
       --panelview-toolbarbutton-focus-box-shadow: inset 0 0 0 2px var(--focus-outline-color) !important;
     }
+    #navigator-toolbox:not(:-moz-lwtheme) {
+      background: var(--lwt-accent-color) !important;
+    }
 
     /*- Separator ------------------------------------------------------------*/
     :root:not(:-moz-lwtheme) {
@@ -1077,7 +1080,7 @@
     --input-bgcolor: color-mix(in srgb, currentColor 30%, transparent);
 
     appearance: none !important;
-    padding: 8px 11px !important;
+    padding: 5px 8px !important;
     border: 1px solid var(--input-bgcolor) !important;
     border-radius: 4px;
 
@@ -2069,7 +2072,7 @@
           --organizer-pane-field-border-color: color-mix(in srgb, currentColor 41%, transparent);
         }
 
-        @media (prefers-color-scheme: dark) {
+        @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) {
           :root {
             --organizer-color: rgb(251, 251, 254);
             --organizer-deemphasized-color: rgb(191, 191, 201);
@@ -2938,9 +2941,6 @@
     /* Original: 0.5em */
     padding-block: var(--menu-padding) !important;
   }
-  menupopup > menu {
-    padding-inline-start: 0.5em;
-  }
 
   @supports not -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
     :root:not([uidensity="touch"]) .menu-text,
@@ -2971,6 +2971,12 @@
     }
   }
 
+  @media (-moz-gtk-csd-available) {
+    menupopup > menu {
+      padding-inline-start: 0.5em;
+    }
+  }
+
   /* Arrow Icon Align to Right */
   .bookmark-item.subviewbutton > .menu-right {
     margin-inline-end: 0 !important;
diff --git a/userContent.css b/userContent.css
index 91e9c0d..e446d4f 100644
--- a/userContent.css
+++ b/userContent.css
@@ -131,7 +131,8 @@
     /*- Fix Color For Nightly ------------------------------------------------*/
     .contentSearchSuggestionTable,
     .contentSearchHeaderRow,
-    .contentSearchHeader {
+    .contentSearchHeader,
+    .contentSearchSuggestionsContainer {
       color: var(--newtab-text-primary-color) !important;
       background: var(--newtab-search-background-color) !important;
     }