diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index d02fcc8..6d878bd 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -3359,29 +3359,25 @@
 @supports -moz-bool-pref("userChrome.padding.tabbar_height") {
   /* Toolbar Height */
   @supports -moz-bool-pref("userChrome.tab.lepton_like_padding") {
-    :root:not([uidensity]) #TabsToolbar {
-      --tab-min-height: 36px;
+    :root:not([uidensity]) {
+      --tab-min-height: 36px !important;
     }
-
-    :root[uidensity="compact"] #TabsToolbar {
-      --tab-min-height: 32px;
+    :root[uidensity="compact"] {
+      --tab-min-height: 32px !important;
     }
-
-    :root[uidensity="touch"] #TabsToolbar {
-      --tab-min-height: 41px;
+    :root[uidensity="touch"] {
+      --tab-min-height: 41px !important;
     }
   }
   @supports -moz-bool-pref("userChrome.tab.photon_like_padding") {
-    :root:not([uidensity]) #TabsToolbar {
-      --tab-min-height: 32px;
+    :root:not([uidensity]) {
+      --tab-min-height: 32px !important;
     }
-
-    :root[uidensity="compact"] #TabsToolbar {
-      --tab-min-height: 29px;
+    :root[uidensity="compact"] {
+      --tab-min-height: 29px !important;
     }
-
-    :root[uidensity="touch"] #TabsToolbar {
-      --tab-min-height: 41px;
+    :root[uidensity="touch"] {
+      --tab-min-height: 41px !important;
     }
 
     /* Top Margin */
@@ -3392,13 +3388,12 @@
   }
   @supports not -moz-bool-pref("userChrome.tab.lepton_like_padding") {
     @supports not -moz-bool-pref("userChrome.tab.photon_like_padding") {
-      :root:not([uidensity]) #TabsToolbar {
-        --tab-min-height: 36px;
+      :root:not([uidensity]) {
+        --tab-min-height: 36px !important;
         /* 38px -> 36px */
       }
-
-      :root[uidensity="compact"] #TabsToolbar {
-        --tab-min-height: 29px;
+      :root[uidensity="compact"] {
+        --tab-min-height: 29px !important;
         /* 36px -> 29px */
       }
     }
@@ -4150,10 +4145,6 @@
       background-image: unset !important;
     }
 
-    #nav-bar > * {
-      transform: translateY(calc((var(--uc-tabbar-height) + var(--uc-navbar-hide-height)) / 2));
-    }
-
     #urlbar-container {
       min-width: calc(24px + 2 * var(--toolbarbutton-inner-padding)) !important;
     }
@@ -4213,10 +4204,6 @@
         background-image: unset !important;
       }
 
-      #nav-bar > * {
-        transform: translateY(calc((var(--uc-tabbar-height) + var(--uc-navbar-hide-height)) / 2));
-      }
-
       #urlbar-container {
         min-width: calc(24px + 2 * var(--toolbarbutton-inner-padding)) !important;
       }
@@ -6309,7 +6296,7 @@
   )
   or -moz-bool-pref("userChrome.tab.one_liner") {
   :root {
-    --uc-tabbar-height: calc((var(--tab-block-margin) * 2) + var(--tab-min-height));
+    --uc-tabbar-height: var(--tab-min-height);
     --uc-tabbar-hide-height: calc(-1 * var(--uc-tabbar-height));
     --uc-navbar-height: calc(16px + 2 * (var(--toolbarbutton-inner-padding) + var(--toolbarbutton-outer-padding)));
     --uc-navbar-hide-height: calc(-1 * var(--uc-navbar-height));
diff --git a/src/autohide/_common.scss b/src/autohide/_common.scss
index a4a46d4..b9c7298 100644
--- a/src/autohide/_common.scss
+++ b/src/autohide/_common.scss
@@ -1,6 +1,6 @@
 @include Option("userChrome.autohide.tabbar", "userChrome.autohide.navbar", "userChrome.autohide.bookmarkbar", "userChrome.tab.one_liner") {
   :root {
-    --uc-tabbar-height: calc((var(--tab-block-margin) * 2) + var(--tab-min-height));
+    --uc-tabbar-height: var(--tab-min-height); // calc((var(--tab-block-margin) * 2) + var(--tab-min-height));
     --uc-tabbar-hide-height: calc(-1 * var(--uc-tabbar-height));
     --uc-navbar-height: calc(16px + 2 * (var(--toolbarbutton-inner-padding) + var(--toolbarbutton-outer-padding)));
     --uc-navbar-hide-height: calc(-1 * var(--uc-navbar-height));
diff --git a/src/padding/_tabbar_height.scss b/src/padding/_tabbar_height.scss
index 71fc4be..02456f7 100644
--- a/src/padding/_tabbar_height.scss
+++ b/src/padding/_tabbar_height.scss
@@ -1,24 +1,28 @@
 /* Toolbar Height */
 @include Option("userChrome.tab.lepton_like_padding") {
-  :root:not([uidensity]) #TabsToolbar {
-    --tab-min-height: 36px;
-  }
-  :root[uidensity="compact"] #TabsToolbar {
-    --tab-min-height: 32px;
-  }
-  :root[uidensity="touch"] #TabsToolbar {
-    --tab-min-height: 41px;
+  :root {
+    &:not([uidensity]) {
+      --tab-min-height: 36px !important;
+    }
+    &[uidensity="compact"] {
+      --tab-min-height: 32px !important;
+    }
+    &[uidensity="touch"]  {
+      --tab-min-height: 41px !important;
+    }
   }
 }
 @include Option("userChrome.tab.photon_like_padding") {
-  :root:not([uidensity]) #TabsToolbar {
-    --tab-min-height: 32px;
-  }
-  :root[uidensity="compact"] #TabsToolbar {
-    --tab-min-height: 29px;
-  }
-  :root[uidensity="touch"] #TabsToolbar {
-    --tab-min-height: 41px;
+  :root {
+    &:not([uidensity]) {
+      --tab-min-height: 32px !important;
+    }
+    &[uidensity="compact"] {
+      --tab-min-height: 29px !important;
+    }
+    &[uidensity="touch"]  {
+      --tab-min-height: 41px !important;
+    }
   }
 
   /* Top Margin */
@@ -29,11 +33,13 @@
 }
 @include NotOption("userChrome.tab.lepton_like_padding") {
   @include NotOption("userChrome.tab.photon_like_padding") {
-    :root:not([uidensity]) #TabsToolbar {
-      --tab-min-height: 36px; /* 38px -> 36px */
-    }
-    :root[uidensity="compact"] #TabsToolbar {
-      --tab-min-height: 29px; /* 36px -> 29px */
+    :root {
+      &:not([uidensity]) {
+        --tab-min-height: 36px !important; /* 38px -> 36px */
+      }
+      &[uidensity="compact"] {
+        --tab-min-height: 29px !important; /* 36px -> 29px */
+      }
     }
   }
 }
diff --git a/src/tabbar/_one_liner.scss b/src/tabbar/_one_liner.scss
index 77dc709..210dc4b 100644
--- a/src/tabbar/_one_liner.scss
+++ b/src/tabbar/_one_liner.scss
@@ -15,9 +15,6 @@
   background-color: unset !important; // var(--toolbar-bgcolor)
   background-image: unset !important; // var(--toolbar-bgimage)
 }
-#nav-bar > * {
-  transform: translateY(calc((var(--uc-tabbar-height) + var(--uc-navbar-hide-height)) / 2));
-}
 
 #urlbar-container {
   min-width: calc(24px + 2 * var(--toolbarbutton-inner-padding)) !important; // Original: calc(350px + 24px + 2 * var(--toolbarbutton-inner-padding))