diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 5f0a15b..65f5f6d 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -8042,7 +8042,16 @@
   }
 }
 @supports -moz-bool-pref("userChrome.combined.nav_button") or -moz-bool-pref("userChrome.combined.urlbar.nav_button") {
-  @supports not -moz-bool-pref("userChrome.combined.sub_button.as_normal") {
+  @supports -moz-bool-pref("userChrome.combined.urlbar.nav_button") or
+    (
+      not
+        (
+          -moz-bool-pref("userChrome.combined.sub_button.as_normal") and -moz-bool-pref(
+              "userChrome.combined.nav_button"
+            )
+            and -moz-bool-pref("userChrome.combined.urlbar.home_button")
+        )
+    ) {
     #nav-bar-customization-target > #forward-button {
       --uc-forward-button-margin: calc(-1 * var(--uc-toolbarbutton-boundary) + 1px);
       z-index: 2;
diff --git a/src/combined/_back_forward_button.scss b/src/combined/_back_forward_button.scss
index 530cfd4..e237209 100644
--- a/src/combined/_back_forward_button.scss
+++ b/src/combined/_back_forward_button.scss
@@ -39,7 +39,11 @@
 //------------------------------------------------------------------------------
 
 #nav-bar-customization-target > {
-  @include NotOption("userChrome.combined.sub_button.as_normal") {
+  @supports -moz-bool-pref("userChrome.combined.urlbar.nav_button") or
+  (not (-moz-bool-pref("userChrome.combined.sub_button.as_normal") and
+        -moz-bool-pref("userChrome.combined.nav_button") and
+        -moz-bool-pref("userChrome.combined.urlbar.home_button")
+  )) {
     #forward-button {
       --uc-forward-button-margin: calc(-1 * var(--uc-toolbarbutton-boundary) + 1px);