diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 031b5711..ac295edd 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -770,15 +770,11 @@
         --urlbar-popup-url-color: -moz-accent-color;
       }
     }
-  }
-  @media (-moz-gtk-csd-available) and (not (-moz-gtk-theme-family)) {
     :root:not(:-moz-lwtheme) {
       --toolbar-field-background-color: Field !important;
       --toolbar-field-color: FieldText !important;
       --toolbar-field-border-color: ThreeDShadow !important;
     }
-  }
-  @media (-moz-gtk-csd-available) {
     :root:not(:-moz-lwtheme) #urlbar-background,
     :root:not(:-moz-lwtheme) #searchbar {
       background-color: var(--toolbar-field-background-color) !important;
@@ -14176,14 +14172,12 @@
     --urlbar-popup-url-color: -moz-accent-color;
   }
 }
-@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-gtk-csd-available) and (not (-moz-gtk-theme-family)) {
+@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-gtk-csd-available) {
   :root:not(:-moz-lwtheme) {
     --toolbar-field-background-color: Field !important;
     --toolbar-field-color: FieldText !important;
     --toolbar-field-border-color: ThreeDShadow !important;
   }
-}
-@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-gtk-csd-available) {
   :root:not(:-moz-lwtheme) #urlbar-background,
   :root:not(:-moz-lwtheme) #searchbar {
     background-color: var(--toolbar-field-background-color) !important;
diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css
index 9c605221..25f348c1 100644
--- a/css/leptonChromeESR.css
+++ b/css/leptonChromeESR.css
@@ -989,15 +989,11 @@
         --urlbar-popup-url-color: -moz-accent-color;
       }
     }
-  }
-  @media (-moz-gtk-csd-available) and (not (-moz-gtk-theme-family)) {
     :root:not(:-moz-lwtheme) {
       --toolbar-field-background-color: Field !important;
       --toolbar-field-color: FieldText !important;
       --toolbar-field-border-color: ThreeDShadow !important;
     }
-  }
-  @media (-moz-gtk-csd-available) {
     :root:not(:-moz-lwtheme) #urlbar-background,
     :root:not(:-moz-lwtheme) #searchbar {
       background-color: var(--toolbar-field-background-color) !important;
diff --git a/src/theme/system_default_theme/_gtk.scss b/src/theme/system_default_theme/_gtk.scss
index 1f72f54e..51010ef3 100644
--- a/src/theme/system_default_theme/_gtk.scss
+++ b/src/theme/system_default_theme/_gtk.scss
@@ -8,12 +8,10 @@
 
   // #864
   :root:not(:-moz-lwtheme) {
-    @media not (-moz-gtk-theme-family) {
-      // Rollback to color
-      --toolbar-field-background-color: Field !important;
-      --toolbar-field-color: FieldText !important;
-      --toolbar-field-border-color: ThreeDShadow !important;
-    }
+    // Rollback to color
+    --toolbar-field-background-color: Field !important;
+    --toolbar-field-color: FieldText !important;
+    --toolbar-field-border-color: ThreeDShadow !important;
 
     #urlbar-background, #searchbar {
       // Original: light-dark(rgba(0, 0, 0, .05), rgba(0, 0, 0, .3))