--- a/browser/themes/shared/toolbarbuttons.inc.css
+++ b/browser/themes/shared/toolbarbuttons.inc.css
@@ -9,17 +9,17 @@
 %define conditionalForwardWithUrlbar window:not([chromehidden~="toolbar"]) #urlbar-wrapper
 %endif
 
 :root {
 %ifdef MOZ_PHOTON_THEME
   --toolbarbutton-hover-background: hsla(240, 5%, 5%, .1);
   --toolbarbutton-active-background: hsla(240, 5%, 5%, .15);
 
-  --toolbarbutton-inner-padding: 5px;
+  --toolbarbutton-inner-padding: 6px;
 %else
   --backbutton-urlbar-overlap: 6px;
 
   /* icon width + border + horizontal padding (without the overlap from backbutton-urlbar-overlap) */
   --forwardbutton-width: 25px;
 
   --toolbarbutton-inner-padding: 3px;
 %endif
@@ -159,20 +159,20 @@ toolbarbutton.bookmark-item:not(.subview
 #nav-bar .toolbarbutton-1 > .toolbarbutton-text,
 #nav-bar .toolbarbutton-1 > .toolbarbutton-badge-stack,
 #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
 #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
 %ifdef MOZ_PHOTON_THEME
   padding: var(--toolbarbutton-inner-padding);
 %else
   padding: var(--toolbarbutton-inner-padding) 7px;
-%endif
   background-origin: padding-box !important;
   background-clip: padding-box !important;
   border: 1px solid transparent;
+%endif
   border-radius: var(--toolbarbutton-border-radius);
   transition-property: background-color, border-color, box-shadow;
   transition-duration: 150ms;
 }
 
 #nav-bar .toolbarbutton-1 > .toolbarbutton-icon,
 #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
 #nav-bar #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
@@ -368,17 +368,19 @@ toolbarbutton.bookmark-item[open="true"]
 
 #back-button > menupopup {
   margin-top: -1px !important;
 }
 
 #back-button > .toolbarbutton-icon {
 %ifdef MOZ_PHOTON_THEME
   background: var(--backbutton-background);
-  border-color: var(--backbutton-border-color) !important;
+  border: 1px solid var(--backbutton-border-color);
+  background-origin: padding-box;
+  background-clip: padding-box;
 %endif
   border-radius: 10000px !important;
   padding: 7px !important;
 }
 
 /* bookmarks menu-button */
 
 #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker {