diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index c5ac344..0172471 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -7368,7 +7368,7 @@
   }
 
   #urlbar {
-    padding-right: var(--uc-toolbarbutton-size);
+    padding-right: calc(var(--uc-toolbarbutton-size) - var(--urlbar-margin-inline) / 2);
   }
 
   #nav-bar-customization-target > #stop-reload-button {
@@ -7376,7 +7376,7 @@
     position: relative;
     --toolbarbutton-hover-background: var(--urlbar-box-hover-bgcolor);
     color: var(--urlbar-box-hover-text-color) !important;
-    margin-left: calc(-1 * (15px + var(--urlbar-margin-inline) + var(--uc-toolbarbutton-padding)));
+    margin-left: calc(-1 * (var(--uc-toolbarbutton-size) + var(--urlbar-margin-inline)));
   }
 
   #nav-bar-customization-target > #stop-reload-button > .toolbarbutton-1 > .toolbarbutton-icon {
diff --git a/src/urlbar/_reload_button.scss b/src/urlbar/_reload_button.scss
index 471375f..011eae7 100644
--- a/src/urlbar/_reload_button.scss
+++ b/src/urlbar/_reload_button.scss
@@ -1,7 +1,7 @@
 // Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/reload_button_in_urlbar.css made available under Mozilla Public License v. 2.0
 // See the above repository for updates as well as full license text.
 #urlbar {
-  padding-right: var(--uc-toolbarbutton-size);
+  padding-right: calc(var(--uc-toolbarbutton-size) - (var(--urlbar-margin-inline) / 2));
 }
 
 #nav-bar-customization-target > #stop-reload-button {
@@ -9,9 +9,9 @@
   position: relative;
 
   --toolbarbutton-hover-background: var(--urlbar-box-hover-bgcolor);
-  color:  var(--urlbar-box-hover-text-color) !important;
+  color: var(--urlbar-box-hover-text-color) !important;
 
-  margin-left: calc( -1 * ( #{ 16px - 1px } + var(--urlbar-margin-inline) + var(--uc-toolbarbutton-padding)));
+  margin-left: calc( -1 * (var(--uc-toolbarbutton-size) + var(--urlbar-margin-inline)));
 }
 
 #nav-bar-customization-target > #stop-reload-button > .toolbarbutton-1 > .toolbarbutton-icon {