diff --git a/chrome/autohide_bookmarks_and_main_toolbars.css b/chrome/autohide_bookmarks_and_main_toolbars.css
index 65efdfb..d8062ba 100644
--- a/chrome/autohide_bookmarks_and_main_toolbars.css
+++ b/chrome/autohide_bookmarks_and_main_toolbars.css
@@ -11,6 +11,16 @@ See the above repository for updates as well as full license text. */
 :root[uidensity="compact"] #navigator-toolbox{ --uc-bm-padding: 1px; --uc-navbar-height: -32px }
 :root[uidensity="touch"] #navigator-toolbox{ --uc-bm-padding: 6px }
 
+@media (-moz-proton){
+  #navigator-toolbox{
+     --uc-bm-height: 26px; /* Might need to adjust if the toolbar has other buttons */
+  }
+  :root[uidensity="compact"] #navigator-toolbox{
+    --uc-navbar-height: -34px;
+    --uc-bm-height: 23px;
+  }
+}
+
 :root[sessionrestored] #nav-bar,
 :root[sessionrestored] #PersonalToolbar{
   transform: rotateX(90deg);
diff --git a/chrome/button_effect_scale_onclick.css b/chrome/button_effect_scale_onclick.css
index 79c7046..fa2bccc 100644
--- a/chrome/button_effect_scale_onclick.css
+++ b/chrome/button_effect_scale_onclick.css
@@ -3,8 +3,6 @@ See the above repository for updates as well as full license text. */
 
 /* Effect */
 
-:root:not([uidensity="compact"],[proton]) #back-button{ --uc-back-extra-padding: 2px }
-
 .toolbarbutton-icon,
 .menuitem-iconic .menu-iconic-icon{
   transition: transform 83ms linear !important;
@@ -25,7 +23,7 @@ toolbarbutton#scrollbutton-down:active > .toolbarbutton-icon{ transform: scale(-
 
 
 toolbar .toolbarbutton-1:not([disabled]):active > .toolbarbutton-icon{
-  padding: calc(var(--toolbarbutton-inner-padding) + var(--uc-back-extra-padding,0px) + 3px) !important;
+  padding: calc(var(--toolbarbutton-inner-padding) + 3px) !important;
 }
 
 #page-action-buttons .urlbar-icon:active{ padding: calc(var(--urlbar-icon-padding) + 3px) !important; }
diff --git a/chrome/button_effect_scale_onhover.css b/chrome/button_effect_scale_onhover.css
index 4ac501a..231ce9e 100644
--- a/chrome/button_effect_scale_onhover.css
+++ b/chrome/button_effect_scale_onhover.css
@@ -3,8 +3,6 @@ See the above repository for updates as well as full license text. */
 
 /* Effect */
 
-:root:not([uidensity="compact"]) #back-button{ --uc-back-extra-padding: 2px }
-
 .toolbarbutton-icon,
 .menuitem-iconic .menu-iconic-icon{
   transition: transform 83ms linear !important;
@@ -23,7 +21,7 @@ toolbar .toolbarbutton-1 > .toolbarbutton-badge-stack > .toolbarbutton-icon,
 toolbarbutton#scrollbutton-down > .toolbarbutton-icon{ transform: scale(-0.8) !important; }
 
 toolbar .toolbarbutton-1 > .toolbarbutton-icon{
-  padding: calc(var(--toolbarbutton-inner-padding) + var(--uc-back-extra-padding,0px) + 2px) !important;
+  padding: calc(var(--toolbarbutton-inner-padding) + 2px) !important;
 }
 
 #page-action-buttons .urlbar-icon:not(:hover){ padding: calc(var(--urlbar-icon-padding) + 2px) !important; }
@@ -37,5 +35,5 @@ toolbar .toolbarbutton-1:not([disabled]):hover > .toolbarbutton-badge-stack > .t
 toolbarbutton#scrollbutton-down:not([disabled]):hover > .toolbarbutton-icon{transform: scale(-1) !important;}
 
 toolbar .toolbarbutton-1:not([disabled]):hover > .toolbarbutton-icon{
-  padding: calc(var(--toolbarbutton-inner-padding) + var(--uc-back-extra-padding,0px)) !important;
+  padding: var(--toolbarbutton-inner-padding) !important;
 }
\ No newline at end of file
diff --git a/chrome/compact_urlbar_megabar.css b/chrome/compact_urlbar_megabar.css
index 99a58cf..6e1df93 100644
--- a/chrome/compact_urlbar_megabar.css
+++ b/chrome/compact_urlbar_megabar.css
@@ -9,11 +9,11 @@ See the above repository for updates as well as full license text. */
   top: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2) !important;
 }
 #urlbar[breakout]:not([open]){ bottom: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2) !important; }
-.urlbar-icon{ height: calc(var(--urlbar-min-height) - 2px) !important; }
 .urlbarView{ margin-inline: 0 !important; width: auto !important; }
 .urlbarView-row{ padding: 0 2px !important; }
 .urlbarView-row-inner{ padding-inline-start: 4px !important; }
 #urlbar-background{ animation: none !important; }
 #urlbar-input-container{ padding: 0 !important; height: 100% !important; }
 #identity-icon{ margin-block: var(--urlbar-icon-padding) }
-.urlbarView > .search-one-offs:not([hidden]){ padding-block: 0px !important; }
\ No newline at end of file
+.urlbarView > .search-one-offs:not([hidden]){ padding-block: 0px !important; }
+@media (-moz-proton){ #urlbar-input-container{ padding: 1px !important; } }
\ No newline at end of file
diff --git a/chrome/hide_tabs_with_one_tab.css b/chrome/hide_tabs_with_one_tab.css
index 501c395..bbe37fa 100644
--- a/chrome/hide_tabs_with_one_tab.css
+++ b/chrome/hide_tabs_with_one_tab.css
@@ -29,7 +29,7 @@ See the above repository for updates as well as full license text. */
 }
 .accessibility-indicator > hbox{ padding-block: 0 !important }
 
-#tabbrowser-tabs .tabbrowser-tab{ height: var(--tab-min-height) }
+#tabbrowser-tabs .tabbrowser-tab{ height: calc(var(--tab-min-height) + 2 * var(--proton-tab-block-margin,0px)) }
 
 #tabbrowser-tabs .tabbrowser-tab[first-visible-tab="true"][last-visible-tab="true"]{
   visibility: collapse !important;
diff --git a/chrome/overlay_menubar.css b/chrome/overlay_menubar.css
index de2eac3..4a34607 100644
--- a/chrome/overlay_menubar.css
+++ b/chrome/overlay_menubar.css
@@ -20,7 +20,7 @@ See the above repository for updates as well as full license text. */
 #toolbar-menubar[inactive] > .titlebar-buttonbox-container{ display: none }
 
 #main-menubar{
-  height: calc(var(--tab-min-height) + 3px);
+  height: calc(var(--tab-min-height) +  2 * var(--proton-tab-block-margin,0px));
   background-color: var(--arrowpanel-background);
   color: var(--arrowpanel-color);
 }
@@ -30,7 +30,7 @@ See the above repository for updates as well as full license text. */
   content: "";
   display: -moz-box;
   width: 30px;
-  height: calc(var(--tab-min-height) + 3px);
+  height: calc(var(--tab-min-height) +  2 * var(--proton-tab-block-margin,0px));
   background-image: linear-gradient(to right, var(--arrowpanel-background) 30%, transparent);
 }
 
diff --git a/chrome/tab_line_loading_indicator.css b/chrome/tab_line_loading_indicator.css
index 99258bd..780a98f 100644
--- a/chrome/tab_line_loading_indicator.css
+++ b/chrome/tab_line_loading_indicator.css
@@ -4,23 +4,24 @@ See the above repository for updates as well as full license text. */
 /* Hide the normal loading indicator (just show tab-icon instead) and make the top tab-line bounce left-to-right */
 
 @keyframes tabline-anim{from{background-position-x: left}to{background-position-x: right}}
-.tab-line{ 
-  transform: none !important;
-  background-color: transparent !important;
+.tabbrowser-tab[busy] > stack >  .tab-background::before,
+.tab-background[selected]::before{
+  content: "";
+  display: -moz-box;
+  height: 2px;
+  opacity: 0;
   background-image: linear-gradient(rgba(255,255,255,.2),rgba(255,255,255,.2));
-  background-repeat: no-repeat !important;
+  background-repeat: no-repeat;
   background-size: 100%;
-  transition: background-size 80ms linear !important;
+  transition: background-size 80ms linear;
 }
 
-.tabbrowser-tab[busy] > stack > .tab-background > .tab-line{
-  background-size: 10% !important;
+.tabbrowser-tab[busy] > stack > .tab-background::before{
+  background-size: 10%;
   background-image: linear-gradient(var(--tab-line-color),var(--tab-line-color));
-  opacity: 0.7 !important;
+  opacity: 0.7;
   animation: tabline-anim 400ms alternate infinite ease-in-out;
 }
 
-.tab-line[selected]{ background-image: linear-gradient(var(--tab-line-color),var(--tab-line-color)); opacity: 1 !important; }
-
 .tabbrowser-tab .tab-throbber{ display: none }
-.tabbrowser-tab .tab-icon-image{ display: -moz-box !important; }
+.tabbrowser-tab .tab-icon-image{ display: -moz-box !important; }
\ No newline at end of file
diff --git a/chrome/vertical_context_navigation_v2.css b/chrome/vertical_context_navigation_v2.css
index 6c1c051..79a76b0 100644
--- a/chrome/vertical_context_navigation_v2.css
+++ b/chrome/vertical_context_navigation_v2.css
@@ -10,7 +10,8 @@ See the above repository for updates as well as full license text. */
 #context-reload,#context-stop{ transform: translate(-80px, 80px) }
 #context-bookmarkpage{ transform: translate(-120px,120px) }
 
-#context-navigation:not([hidden])~*{ margin-left: 20px;  }
+#context-navigation:not([hidden])~*{ margin-left: 32px;  }
 #context-sep-navigation{ display: none }
 #context-navigation{ margin-bottom: -34px; }
-#context-sep-navigation:not([hidden]) ~ *:not(.menuitem-iconic){ clip-path: polygon(1.45em 0%, 100% 0%,100% 100%,1.45em 100%) }
+#context-sep-navigation:not([hidden]) ~ *:not(.menuitem-iconic){ clip-path: polygon(0.8em 0%, 100% 0%,100% 100%,0.8em 100%); }
+#context-sep-navigation:not([hidden]) ~ menuseparator{ margin-left: 30px  !important; }
\ No newline at end of file