diff --git a/chrome/tabs_on_bottom.css b/chrome/tabs_on_bottom.css
index cd289a2..651ce97 100644
--- a/chrome/tabs_on_bottom.css
+++ b/chrome/tabs_on_bottom.css
@@ -11,15 +11,14 @@ have menubar permanently enabled and want it on top
 /*
 Get window_control_placeholder_support.css
 Window controls will be all wrong without it.
-
 Additionally on Linux, you may need to get:
 linux_gtk_window_control_patch.css
-
 */
 
 :root{ --uc-titlebar-padding: 0px; }
-:root[sizemode="maximized"][tabsintitlebar]{ --uc-titlebar-padding: 8px }
-
+@media (-moz-os-version: windows-win10){
+  :root[sizemode="maximized"][tabsintitlebar]{ --uc-titlebar-padding: 8px }
+}
 #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container,
 #TabsToolbar > .titlebar-buttonbox-container{
   position: fixed;
@@ -30,9 +29,7 @@ linux_gtk_window_control_patch.css
 }
 /* Mac specific. You should set that font-smoothing pref to true if you are on any platform where window controls are on left */
 @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled"){
-  @media not (-moz-os-version: windows-win10){
-    :root{ --uc-titlebar-padding: 0px !important }
-  }
+  :root{ --uc-titlebar-padding: 0px !important }
   .titlebar-buttonbox-container{ left:0; right: unset !important; }
 }
 
@@ -42,7 +39,6 @@ linux_gtk_window_control_patch.css
 
 #navigator-toolbox{ padding-top: var(--uc-titlebar-padding,0px) !important; }
 
-
 .titlebar-buttonbox-container > .titlebar-buttonbox{ height: 100%; }
 
 #titlebar{
diff --git a/chrome/tabs_on_bottom_menubar_on_top_patch.css b/chrome/tabs_on_bottom_menubar_on_top_patch.css
index 0911526..10baec3 100644
--- a/chrome/tabs_on_bottom_menubar_on_top_patch.css
+++ b/chrome/tabs_on_bottom_menubar_on_top_patch.css
@@ -6,14 +6,13 @@ See the above repository for updates as well as full license text. */
 
 :root{ --uc-window-control-width: 0px !important }
 
-#navigator-toolbox{ padding-top: 29px !important }
+#navigator-toolbox{ padding-top: calc(29px + var(--uc-titlebar-padding,0px)) !important }
 
 #toolbar-menubar{
   position: fixed;
   display: flex;
   top: var(--uc-titlebar-padding,0px);
   height: 29px;
-  margin-top:1px;
   width: 100%;
   overflow: hidden;
 }