diff --git a/chrome/toolbar/personalbar.css b/chrome/toolbar/personalbar.css
index 0c13f4c..808a348 100644
--- a/chrome/toolbar/personalbar.css
+++ b/chrome/toolbar/personalbar.css
@@ -16,12 +16,12 @@ toolbarbutton.bookmark-item:not(.subviewbutton) {
   content: "";
   display: block;
   border-inline-start: 1px solid var(--toolbarseparator-color) !important;
-  margin-block: 8px !important;
+  margin-block: 6px 10px !important;
   border-image-source: none !important;
 }
 
 #PersonalToolbar {
-  padding-inline: var(--toolbar-start-end-padding) calc(var(--toolbar-start-end-padding) + 4px) !important;
+  padding-inline: calc(var(--toolbar-start-end-padding) - 2px) calc(var(--toolbar-start-end-padding) + 4px) !important;
 }
 
 #managed-bookmarks>.toolbarbutton-icon,
diff --git a/chrome/toolbar/tabbar.css b/chrome/toolbar/tabbar.css
index 1b7a751..f948447 100644
--- a/chrome/toolbar/tabbar.css
+++ b/chrome/toolbar/tabbar.css
@@ -205,14 +205,21 @@
 #TabsToolbar .toolbarbutton-1>.toolbarbutton-icon,
 #TabsToolbar .toolbarbutton-1>.toolbarbutton-badge-stack {
   border-radius: var(--toolbarbutton-border-radius) !important;
-  padding: var(--uc-toolbarbutton-inner-padding) !important;
+  padding: var(--uc-toolbarbutton-inner-padding) var(--uc-toolbarbutton-inner-inline-padding) !important;
 }
 
 #TabsToolbar .toolbarbutton-1>.toolbarbutton-icon {
-  width: calc(2 * var(--uc-toolbarbutton-inner-padding) + 16px) !important;
+  width: calc(2 * var(--uc-toolbarbutton-inner-inline-padding) + 16px) !important;
   height: calc(2 * var(--uc-toolbarbutton-inner-padding) + 16px) !important;
 }
 
+#TabsToolbar #tabs-newtab-button>.toolbarbutton-icon,
+#TabsToolbar #alltabs-button>.toolbarbutton-badge-stack,
+#TabsToolbar #tabbrowser-tabs[hasadjacentnewtabbutton][overflow="true"] ~ #new-tab-button>.toolbarbutton-icon {
+  padding: var(--uc-toolbarbutton-inner-padding) !important;
+  width: calc(2 * var(--uc-toolbarbutton-inner-padding) + 16px) !important;
+}
+
 #tabbrowser-tabs #tabs-newtab-button {
   margin-inline-start: 2px !important;
 }
@@ -278,24 +285,13 @@ toolbarbutton[part="scrollbutton-down"] {
 
 /* mac titlebar buttons */
 @media (-moz-platform: macos) {
-  @media (-moz-mac-big-sur-theme:0) {
-    .titlebar-buttonbox {
-      margin-inline: 10px !important;
-    }
-
-    .titlebar-buttonbox-container {
-      margin-inline-end: -8px !important;
-    }
+  .titlebar-buttonbox {
+    margin-inline: calc((var(--tab-min-height) + var(--tab-block-margin) - 14px) / 2) !important;
   }
 
-  @media (-moz-mac-big-sur-theme:1) {
-    .titlebar-buttonbox {
-      margin-inline: calc((var(--tab-min-height) + var(--tab-block-margin) - 14px) / 2) !important;
-    }
-  
-    .titlebar-buttonbox-container {
-      margin-inline-end: -8px !important;
-    }
+  .titlebar-buttonbox-container {
+    margin-inline-start: -6px !important;
+    margin-inline-end: -2px !important;
   }
 }
 
@@ -320,6 +316,14 @@ toolbarbutton[part="scrollbutton-down"] {
   margin-inline-start: 8px !important;
 }
 
+#tabbrowser-tabs {
+  margin-inline-start: -6px !important;
+}
+
+#TabsToolbar {
+  padding-inline-start: 6px !important;
+}
+
 #tabbrowser-tabs[overflow] .tabbrowser-tab[last-visible-tab]:not([pinned]) {
   margin-inline-end: 7px !important;
 }