diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 7b25a5b..4b544b7 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -4466,12 +4466,24 @@
         :root[sizemode="maximized"][tabsintitlebar] {
           --uc-titlebar-padding: 8px;
         }
+        :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox {
+          margin-top: calc(-1 * var(--uc-titlebar-padding));
+        }
+
+        :root[sizemode="normal"][tabsintitlebar] #titlebar,
+        :root[sizemode="maximized"][tabsintitlebar] #titlebar {
+          appearance: none !important;
+        }
+
+        .browser-toolbar:not(.titlebar-color) {
+          background-clip: border-box !important;
+        }
       }
       #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container,
       #TabsToolbar > .titlebar-buttonbox-container {
         position: fixed;
         display: block;
-        top: var(--uc-titlebar-padding);
+        top: 0;
         right: 0;
         height: 40px;
         z-index: 1;
@@ -4614,12 +4626,24 @@
           :root[sizemode="maximized"][tabsintitlebar] {
             --uc-titlebar-padding: 8px;
           }
+          :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox {
+            margin-top: calc(-1 * var(--uc-titlebar-padding));
+          }
+
+          :root[sizemode="normal"][tabsintitlebar] #titlebar,
+          :root[sizemode="maximized"][tabsintitlebar] #titlebar {
+            appearance: none !important;
+          }
+
+          .browser-toolbar:not(.titlebar-color) {
+            background-clip: border-box !important;
+          }
         }
         #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container,
         #TabsToolbar > .titlebar-buttonbox-container {
           position: fixed;
           display: block;
-          top: var(--uc-titlebar-padding);
+          top: 0;
           right: 0;
           height: 40px;
           z-index: 1;
@@ -4759,12 +4783,24 @@
           :root[sizemode="maximized"][tabsintitlebar] {
             --uc-titlebar-padding: 8px;
           }
+          :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox {
+            margin-top: calc(-1 * var(--uc-titlebar-padding));
+          }
+
+          :root[sizemode="normal"][tabsintitlebar] #titlebar,
+          :root[sizemode="maximized"][tabsintitlebar] #titlebar {
+            appearance: none !important;
+          }
+
+          .browser-toolbar:not(.titlebar-color) {
+            background-clip: border-box !important;
+          }
         }
         #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container,
         #TabsToolbar > .titlebar-buttonbox-container {
           position: fixed;
           display: block;
-          top: var(--uc-titlebar-padding);
+          top: 0;
           right: 0;
           height: 40px;
           z-index: 1;
@@ -4907,12 +4943,24 @@
             :root[sizemode="maximized"][tabsintitlebar] {
               --uc-titlebar-padding: 8px;
             }
+            :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox {
+              margin-top: calc(-1 * var(--uc-titlebar-padding));
+            }
+
+            :root[sizemode="normal"][tabsintitlebar] #titlebar,
+            :root[sizemode="maximized"][tabsintitlebar] #titlebar {
+              appearance: none !important;
+            }
+
+            .browser-toolbar:not(.titlebar-color) {
+              background-clip: border-box !important;
+            }
           }
           #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container,
           #TabsToolbar > .titlebar-buttonbox-container {
             position: fixed;
             display: block;
-            top: var(--uc-titlebar-padding);
+            top: 0;
             right: 0;
             height: 40px;
             z-index: 1;
@@ -5065,12 +5113,24 @@
             :root[sizemode="maximized"][tabsintitlebar] {
               --uc-titlebar-padding: 8px;
             }
+            :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox {
+              margin-top: calc(-1 * var(--uc-titlebar-padding));
+            }
+
+            :root[sizemode="normal"][tabsintitlebar] #titlebar,
+            :root[sizemode="maximized"][tabsintitlebar] #titlebar {
+              appearance: none !important;
+            }
+
+            .browser-toolbar:not(.titlebar-color) {
+              background-clip: border-box !important;
+            }
           }
           #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container,
           #TabsToolbar > .titlebar-buttonbox-container {
             position: fixed;
             display: block;
-            top: var(--uc-titlebar-padding);
+            top: 0;
             right: 0;
             height: 40px;
             z-index: 1;
@@ -5210,12 +5270,24 @@
             :root[sizemode="maximized"][tabsintitlebar] {
               --uc-titlebar-padding: 8px;
             }
+            :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox {
+              margin-top: calc(-1 * var(--uc-titlebar-padding));
+            }
+
+            :root[sizemode="normal"][tabsintitlebar] #titlebar,
+            :root[sizemode="maximized"][tabsintitlebar] #titlebar {
+              appearance: none !important;
+            }
+
+            .browser-toolbar:not(.titlebar-color) {
+              background-clip: border-box !important;
+            }
           }
           #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container,
           #TabsToolbar > .titlebar-buttonbox-container {
             position: fixed;
             display: block;
-            top: var(--uc-titlebar-padding);
+            top: 0;
             right: 0;
             height: 40px;
             z-index: 1;
diff --git a/src/tabbar/layout/_window_control.scss b/src/tabbar/layout/_window_control.scss
index ca11c3d..5e16b16 100644
--- a/src/tabbar/layout/_window_control.scss
+++ b/src/tabbar/layout/_window_control.scss
@@ -8,6 +8,17 @@ See the above repository for updates as well as full license text. */
 @include OS($win) {
   :root[sizemode="maximized"][tabsintitlebar] {
     --uc-titlebar-padding: 8px;
+
+    #navigator-toolbox {
+      margin-top: calc(-1 * var(--uc-titlebar-padding));
+    }
+  }
+  :root[sizemode="normal"][tabsintitlebar] #titlebar,
+  :root[sizemode="maximized"][tabsintitlebar] #titlebar {
+    appearance: none !important;
+  }
+  .browser-toolbar:not(.titlebar-color) {
+    background-clip: border-box !important;
   }
 }
 
@@ -15,7 +26,7 @@ See the above repository for updates as well as full license text. */
 #TabsToolbar > .titlebar-buttonbox-container {
   position: fixed;
   display: block;
-  top: var(--uc-titlebar-padding);
+  top: 0;
   right:0;
   height: 40px;
   z-index: 1;