diff --git a/chrome/combined_favicon_and_tab_close_button.css b/chrome/combined_favicon_and_tab_close_button.css
index 21255f1..3c651a3 100644
--- a/chrome/combined_favicon_and_tab_close_button.css
+++ b/chrome/combined_favicon_and_tab_close_button.css
@@ -7,7 +7,8 @@ See the above repository for updates as well as full license text. */
   -moz-box-ordinal-group: 0;
   display: -moz-box !important;
   position: relative;
-  margin-inline: -1px -19px !important;
+  margin-inline: -4px -20px !important;
+  padding-inline-start: 7px !important;
   z-index: -1;
   visibility: hidden;
   width: unset !important;
@@ -18,13 +19,6 @@ See the above repository for updates as well as full license text. */
   background-image: linear-gradient(var(--toolbarbutton-hover-background),var(--toolbarbutton-hover-background))
 }
 
-@media (-moz-proton){
-  .tab-close-button{
-    margin-inline: -4px -20px !important;
-    padding-inline-start: 7px !important;
-  }
-}
-
 /**** ONLY USE ONE OF THE FOLLOWING ****/
 /**** These select the behavior of a scenario where the page has no favicon ****/
 
diff --git a/chrome/compact_urlbar_megabar.css b/chrome/compact_urlbar_megabar.css
index 6e1df93..fa0ac66 100644
--- a/chrome/compact_urlbar_megabar.css
+++ b/chrome/compact_urlbar_megabar.css
@@ -13,7 +13,6 @@ See the above repository for updates as well as full license text. */
 .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; }
+#urlbar-input-container{ padding: 1px !important; height: 100% !important; }
 #identity-icon{ margin-block: var(--urlbar-icon-padding) }
 .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/navbar_tabs_oneliner.css b/chrome/navbar_tabs_oneliner.css
index 71d4e66..932c931 100644
--- a/chrome/navbar_tabs_oneliner.css
+++ b/chrome/navbar_tabs_oneliner.css
@@ -19,9 +19,10 @@ urlbar_popup_full_width.css is VERY MUCH recommended for Firefox 71+ because of
   --uc-toolbar-height: 40px;
   --uc-urlbar-min-width: 50vw; /* minimum width for opened urlbar */
 }
-@media (-moz-proton){
-  #scrollbutton-up,#scrollbutton-down{ border-block-width: 2px !important; }
-}
+
+#scrollbutton-up,
+#scrollbutton-down{ border-block-width: 2px !important; }
+
 /* Override for other densities */
 :root[uidensity="compact"] #navigator-toolbox{ --uc-toolbar-height: 34px; }
 :root[uidensity="touch"] #navigator-toolbox{ --uc-toolbar-height: 44px; }
diff --git a/chrome/navbar_tabs_oneliner_menu_buttons_on_right.css b/chrome/navbar_tabs_oneliner_menu_buttons_on_right.css
index f144b2d..ef54c44 100644
--- a/chrome/navbar_tabs_oneliner_menu_buttons_on_right.css
+++ b/chrome/navbar_tabs_oneliner_menu_buttons_on_right.css
@@ -19,9 +19,10 @@ Window controls will be all wrong without it
   --uc-navigationbar-width: 50vw;
   --uc-toolbar-height: 40px;
 }
-@media (-moz-proton){
-  #scrollbutton-up,#scrollbutton-down{ border-block-width: 2px !important; }
-}
+
+#scrollbutton-up,
+#scrollbutton-down{ border-block-width: 2px !important; }
+
 /* reserved space for overflow + menu buttons */
 #navigator-toolbox{--uc-buttons-width: calc(56px + 4 * var(--toolbarbutton-outer-padding) + var(--uc-menubutton-padding,6px))}
 #nav-bar:not([overflowing]) > #nav-bar-customization-target{ --uc-buttons-width: calc(28px + 2 * var(--toolbarbutton-outer-padding) + 6px) }
diff --git a/chrome/navbar_tabs_oneliner_tabs_on_left.css b/chrome/navbar_tabs_oneliner_tabs_on_left.css
index b3ed596..e2bfcec 100644
--- a/chrome/navbar_tabs_oneliner_tabs_on_left.css
+++ b/chrome/navbar_tabs_oneliner_tabs_on_left.css
@@ -19,9 +19,10 @@ Window controls will be all wrong without it
   --uc-toolbar-height: 40px;
   --uc-urlbar-min-width: 50vw; /* minimum width for opened urlbar */
 }
-@media (-moz-proton){
-  #scrollbutton-up,#scrollbutton-down{ border-block-width: 2px !important; }
-}
+
+#scrollbutton-up,
+#scrollbutton-down{ border-block-width: 2px !important; }
+
 /* Override for other densities */
 :root[uidensity="compact"] #navigator-toolbox{ --uc-toolbar-height: 34px;}
 :root[uidensity="touch"] #navigator-toolbox{ --uc-toolbar-height: 44px; }
diff --git a/chrome/navbar_tabs_responsive_oneliner.css b/chrome/navbar_tabs_responsive_oneliner.css
index 59b2ffd..53b4235 100644
--- a/chrome/navbar_tabs_responsive_oneliner.css
+++ b/chrome/navbar_tabs_responsive_oneliner.css
@@ -22,9 +22,10 @@ See the above repository for updates as well as full license text. */
     --uc-toolbar-height: 40px;
     --uc-urlbar-min-width: 50vw; /* minimum width for opened urlbar */
   }
-  @media (-moz-proton){
-    #scrollbutton-up,#scrollbutton-down{ border-block-width: 2px !important; }
-  }
+
+  #scrollbutton-up,
+  #scrollbutton-down{ border-block-width: 2px !important; }
+  
 /* prevent urlbar overflow on narrow windows */
 /* Dependent on how many items are in navigation toolbar ADJUST AS NEEDED */
   @media screen and (max-width: 1500px){