diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 8913b23..62f70c9 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -6712,13 +6712,29 @@
       }
     }
 
-    .tabbrowser-tab {
-      padding-inline: 0 !important;
-      overflow-clip-margin: var(--uc-tab-corner-half-size) !important;
+    @supports -moz-bool-pref("userChrome.tab.bottom_rounded_corner.all") {
+      .tabbrowser-tab {
+        padding-inline: 0 !important;
+        overflow-clip-margin: var(--uc-tab-corner-half-size) !important;
+      }
+      .tabbrowser-tab .tab-background {
+        --tab-border-radius: 0px;
+        margin-inline: var(--uc-tab-corner-half-size) !important;
+      }
     }
-    .tabbrowser-tab .tab-background {
-      --tab-border-radius: 0px;
-      margin-inline: var(--uc-tab-corner-half-size) !important;
+    @supports not -moz-bool-pref("userChrome.tab.bottom_rounded_corner.all") {
+      .tabbrowser-tab[visuallyselected] {
+        padding-inline: 0 !important;
+        overflow-clip-margin: var(--uc-tab-corner-half-size) !important;
+      }
+      .tabbrowser-tab[visuallyselected] .tab-background {
+        --tab-border-radius: 0px;
+        margin-inline: var(--uc-tab-corner-half-size) !important;
+      }
+      .tabbrowser-tab[visuallyselected] .tab-background::before,
+      .tabbrowser-tab[visuallyselected] .tab-background::after {
+        content: "";
+      }
     }
     .tabbrowser-tab .tab-background::before,
     .tabbrowser-tab .tab-background::after {
@@ -6775,12 +6791,6 @@
     .tabbrowser-tab[positionpinnedtabs] .tabbrowser-tab[first-visible-unpinned-tab] .tab-background::before {
       background-image: var(--uc-tab-corner-left-side-svg) !important;
     }
-    @supports not -moz-bool-pref("userChrome.tab.bottom_rounded_corner.all") {
-      .tabbrowser-tab[visuallyselected] .tab-background::before,
-      .tabbrowser-tab[visuallyselected] .tab-background::after {
-        content: "";
-      }
-    }
     .tabbrowser-tab[visuallyselected] .tab-background::before,
     .tabbrowser-tab[visuallyselected] .tab-background::after,
     .tabbrowser-tab[multiselected] .tab-background::before,
diff --git a/src/tab/selected_tab/_bottom_rounded_corner_others.scss b/src/tab/selected_tab/_bottom_rounded_corner_others.scss
index cacc5e8..28aafb7 100644
--- a/src/tab/selected_tab/_bottom_rounded_corner_others.scss
+++ b/src/tab/selected_tab/_bottom_rounded_corner_others.scss
@@ -55,7 +55,8 @@
   }
 }
 
-.tabbrowser-tab {
+//-- Mixin ---------------------------------------------------------------------
+@mixin _bottomRoundedCornerOtherPadding() {
   padding-inline: 0 !important;
   overflow-clip-margin: var(--uc-tab-corner-half-size) !important;
 
@@ -63,6 +64,28 @@
     --tab-border-radius: 0px;
     margin-inline: var(--uc-tab-corner-half-size) !important;
 
+    @content;
+  }
+}
+
+//------------------------------------------------------------------------------
+
+.tabbrowser-tab {
+  @include Option("userChrome.tab.bottom_rounded_corner.all") {
+    @include _bottomRoundedCornerOtherPadding;
+  }
+  @include NotOption("userChrome.tab.bottom_rounded_corner.all") {
+    &[visuallyselected] {
+      @include _bottomRoundedCornerOtherPadding {
+        &::before,
+        &::after {
+          content: "";
+        }
+      }
+    }
+  }
+
+  .tab-background {
     &::before,
     &::after {
       /* Box */
@@ -124,15 +147,6 @@
     background-image: var(--uc-tab-corner-left-side-svg) !important;
   }
 
-  &[visuallyselected] .tab-background {
-
-    &::before,
-    &::after {
-      @include NotOption("userChrome.tab.bottom_rounded_corner.all") {
-        content: "";
-      }
-    }
-  }
   &[visuallyselected] .tab-background,
   &[multiselected] .tab-background {
     &::before,