diff --git a/chrome/global/tweaks.css b/chrome/global/tweaks.css
index 1a30a1b..7b867ef 100644
--- a/chrome/global/tweaks.css
+++ b/chrome/global/tweaks.css
@@ -51,13 +51,16 @@ browsing indicator) */
     --lwt-accent-color: #f3f3f3 !important;
     --lwt-accent-color-inactive: unset !important;
     --toolbar-bgcolor: #fff !important;
+    --uc-urlbar-shadow: none !important;
   }
 
   :root[lwt-default-theme-in-dark-mode="true"],
   :root[style*="--lwt-accent-color: rgb(28, 27, 34)"] {
+    --lwt-accent-color: #202020 !important;
     --toolbar-bgcolor: #4D4D4D !important;
     --lwt-accent-color-inactive: unset !important;
     --chrome-content-separator-color: #535353 !important;
+    --uc-tab-border-color: #ffffff0f !important;
   }
 
   @media (-moz-gtk-csd-available) {
@@ -83,6 +86,15 @@ browsing indicator) */
     border-radius: var(--tab-border-radius) !important;
   }
 
+  .tab-background[selected] {
+    outline: 1px solid var(--uc-tab-border-color, var(--lwt-tab-line-color, var(--lwt-tabs-border-color, transparent))) !important;
+    outline-offset: -1px !important;
+  }
+
+  .tabbrowser-tab[selected] .tab-label {
+    font-weight: 600 !important;
+  }
+
   /* adjust spacing of area above tabs */
   @media not (-moz-platform: macos) {
     :root[sizemode="maximized"] #titlebar {
@@ -100,10 +112,6 @@ browsing indicator) */
     }
   }
 
-  :root #titlebar {
-    --tab-min-height: 33px !important;
-  }
-
   /* remove navbar shadow */
   #titlebar,
   :root[lwtheme-brighttext="true"] #titlebar {
@@ -134,11 +142,11 @@ browsing indicator) */
   }
 
   .tabbrowser-tab:is([visuallyselected="true"], [multiselected])>.tab-stack>.tab-background {
-    box-shadow: 0 3px 4px rgba(0, 0, 0, 0.12), 0 0px 2px rgba(0, 0, 0, 0.1) !important;
+    box-shadow: 0 3.3px 3px rgba(0, 0, 0, 0.06), 0 0 0 1px rgba(0, 0, 0, 0.11) !important;
   }
 
   :root[lwtheme-brighttext="true"] .tabbrowser-tab:is([visuallyselected="true"], [multiselected])>.tab-stack>.tab-background {
-    box-shadow: 0 3px 4px rgba(0, 0, 0, 0.2), 0 0px 2px rgba(0, 0, 0, 0.1) !important;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.08) !important;
   }
 }
 
@@ -178,7 +186,7 @@ browsing indicator) */
       }
 
       :root[lwt-default-theme-in-dark-mode="true"]:not(:-moz-window-inactive) {
-        --toolbar-bgcolor: #ffffff20 !important;
+        --toolbar-bgcolor: #ffffff25 !important;
       }
     }
 
diff --git a/chrome/toolbar/tabbar.css b/chrome/toolbar/tabbar.css
index 97e5630..1b7a751 100644
--- a/chrome/toolbar/tabbar.css
+++ b/chrome/toolbar/tabbar.css
@@ -92,16 +92,18 @@
 }
 
 .tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected="true"], [multiselected]) {
-  background-color: color-mix(in srgb, white 30%, transparent) !important;
-  --uc-tab-corner-bg: color-mix(in srgb, white 30%, transparent) !important;
-}
-
-:root[lwtheme-brighttext="true"]  .tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected="true"], [multiselected]) {
   background-color: color-mix(in srgb, currentColor 8%, transparent) !important;
   --uc-tab-corner-bg: color-mix(in srgb, currentColor 8%, transparent) !important;
 }
 
-#tabbrowser-tabs .tab-background:is([selected], [multiselected]) {
+@supports not -moz-bool-pref("uc.tweak.floating-tabs") {
+  :root:not([lwtheme-brighttext="true"]) .tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected="true"], [multiselected]) {
+    background-color: color-mix(in srgb, white 30%, transparent) !important;
+    --uc-tab-corner-bg: color-mix(in srgb, white 30%, transparent) !important;
+  }
+}
+
+.tab-background:is([selected], [multiselected]) {
   outline: none !important;
 }
 
@@ -170,6 +172,10 @@
   display: none !important;
 }
 
+#tabbrowser-tabs:not([secondarytext-unsupported]) .tab-label-container {
+  height: var(--tab-min-height) !important;
+}
+
 .tab-icon-stack:is([soundplaying], [muted], [activemedia-blocked])>.tab-icon-overlay,
 .tabbrowser-tab:hover .tab-icon-stack:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])> :not(.tab-icon-overlay) {
   opacity: 1 !important;
@@ -319,7 +325,8 @@ toolbarbutton[part="scrollbutton-down"] {
 }
 
 .tabbrowser-tab:is([visuallyselected="true"], [multiselected])>.tab-stack>.tab-background {
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3), 0 0px 2px rgba(0, 0, 0, 0.2) !important;
+  box-shadow: 0 0 0 1px var(--lwt-tab-line-color, var(--lwt-tabs-border-color, transparent)),
+    0 2px 4px rgba(0, 0, 0, 0.3), 0 0px 2px rgba(0, 0, 0, 0.2) !important;
 }
 
 #titlebar {
@@ -327,7 +334,8 @@ toolbarbutton[part="scrollbutton-down"] {
 }
 
 :root[lwtheme-brighttext="true"] .tabbrowser-tab:is([visuallyselected="true"], [multiselected])>.tab-stack>.tab-background {
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.45), 0 0px 2px rgba(0, 0, 0, 0.2) !important;
+  box-shadow: 0 0 0 1px var(--lwt-tab-line-color, var(--lwt-tabs-border-color, transparent)),
+    0 2px 4px rgba(0, 0, 0, 0.45), 0 0px 2px rgba(0, 0, 0, 0.2) !important;
 }
 
 :root[lwtheme-brighttext="true"] #titlebar {