diff --git a/src/browser/base/content/zen-styles/zen-popup.css b/src/browser/base/content/zen-styles/zen-popup.css
index fb2a2e5ac..39d269389 100644
--- a/src/browser/base/content/zen-styles/zen-popup.css
+++ b/src/browser/base/content/zen-styles/zen-popup.css
@@ -88,10 +88,6 @@ panel {
padding-inline-start: calc(16px + var(--uc-arrowpanel-menuicon-margin-inline));
}
-.subviewbutton > .toolbarbutton-icon {
- width: 15px;
-}
-
/* firefox profile avatar in appmenu */
#appMenu-fxa-label2::before {
content: '';
diff --git a/src/browser/base/content/zen-styles/zen-theme.css b/src/browser/base/content/zen-styles/zen-theme.css
index fb90fcaaa..520f6ce27 100644
--- a/src/browser/base/content/zen-styles/zen-theme.css
+++ b/src/browser/base/content/zen-styles/zen-theme.css
@@ -138,6 +138,9 @@
--fp-contextmenu-menuitem-border-radius: calc(4px + var(--fp-contextmenu-menuitem-border-width));
--fp-contextmenu-menuitem-padding-block: 6px;
--fp-contextmenu-menuitem-padding-inline: 10px;
+ @media (-moz-platform: windows) {
+ --fp-contextmenu-menuitem-padding-inline: 8px;
+ }
--fp-contextmenu-menuitem-border-width: 2px;
--fp-contextmenu-menuicon-margin-inline: 12px;
--fp-contextmenu-menuitem-margin-inline: calc(4px - var(--fp-contextmenu-menuitem-border-width));
diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css
index 042c4d400..ac09c662c 100644
--- a/src/browser/base/content/zen-styles/zen-urlbar.css
+++ b/src/browser/base/content/zen-styles/zen-urlbar.css
@@ -126,6 +126,10 @@
backdrop-filter: none !important;
}
+#urlbar-go-button {
+ margin: auto 0;
+}
+
:root[zen-single-toolbar='true'] {
.urlbar-page-action:not([open]),
#tracking-protection-icon-container {
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index a44d27339..b275ed333 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -637,7 +637,7 @@
#PanelUI-history toolbarbutton,
#unified-extensions-context-menu menuitem {
background-image: var(--menu-image) !important;
- background-size: 16px !important;
+ background-size: 20px !important;
background-position: var(--fp-contextmenu-menuitem-padding-inline) center !important;
background-repeat: no-repeat !important;
-moz-context-properties: fill, fill-opacity !important;
diff --git a/src/browser/themes/shared/zen-icons/lin/icons.css b/src/browser/themes/shared/zen-icons/lin/icons.css
index a44d27339..e492aa771 100644
--- a/src/browser/themes/shared/zen-icons/lin/icons.css
+++ b/src/browser/themes/shared/zen-icons/lin/icons.css
@@ -382,11 +382,16 @@
#protections-popup-mainView .subviewbutton-nav:not(.notFound)::after,
#identity-popup-mainView .subviewbutton-nav::after,
.widget-overflow-list .subviewbutton-nav::after,
-.PanelUI-subView .subviewbutton-nav::after,
.menu-right {
content: url('arrow-right.svg') !important;
}
+@media not (-moz-platform: windows) {
+ #PanelUI-subView .subviewbutton-nav::after {
+ content: url('arrow-right.svg') !important;
+ }
+}
+
#PlacesChevron,
#urlbar-go-button {
list-style-image: url('arrow-right.svg') !important;
diff --git a/src/browser/themes/shared/zen-icons/win/drag-indicator.svg b/src/browser/themes/shared/zen-icons/win/drag-indicator.svg
index 2a105bb92..01edf38a6 100644
--- a/src/browser/themes/shared/zen-icons/win/drag-indicator.svg
+++ b/src/browser/themes/shared/zen-icons/win/drag-indicator.svg
@@ -1,8 +1,8 @@
diff --git a/src/browser/themes/shared/zen-icons/win/edit-theme.svg b/src/browser/themes/shared/zen-icons/win/edit-theme.svg
index 8a565f13d..ef696cb1c 100644
--- a/src/browser/themes/shared/zen-icons/win/edit-theme.svg
+++ b/src/browser/themes/shared/zen-icons/win/edit-theme.svg
@@ -1,3 +1,3 @@
-