diff --git a/.gluon/patchCount b/.gluon/patchCount
index cabf43b5d..410b14d2c 100644
--- a/.gluon/patchCount
+++ b/.gluon/patchCount
@@ -1 +1 @@
-24
\ No newline at end of file
+25
\ No newline at end of file
diff --git a/src/toolkit/themes/shared/menu-shared-css.patch b/src/toolkit/themes/shared/menu-shared-css.patch
new file mode 100644
index 000000000..4840d087c
--- /dev/null
+++ b/src/toolkit/themes/shared/menu-shared-css.patch
@@ -0,0 +1,19 @@
+diff --git a/toolkit/themes/shared/menu-shared.css b/toolkit/themes/shared/menu-shared.css
+index 40b4fdd66cf54f9d16be2c78be1b003abbd91e60..6be265511e625f78551c07cf21234f47fba9ed1d 100644
+--- a/toolkit/themes/shared/menu-shared.css
++++ b/toolkit/themes/shared/menu-shared.css
+@@ -100,13 +100,7 @@ menucaption {
+   list-style-image: none;
+   max-width: 42em;
+ 
+-  @media (-moz-platform: linux) {
+-    padding: 4px 6px;
+-  }
+-
+-  @media (-moz-platform: macos) {
+-    padding: 3px 9px;
+-  }
++  padding: 6px 5px;
+ }
+ 
+ menu,
diff --git a/src/toolkit/themes/shared/popup-css.patch b/src/toolkit/themes/shared/popup-css.patch
index 259ef4f70..acbc39ec5 100644
--- a/src/toolkit/themes/shared/popup-css.patch
+++ b/src/toolkit/themes/shared/popup-css.patch
@@ -1,8 +1,31 @@
 diff --git a/toolkit/themes/shared/popup.css b/toolkit/themes/shared/popup.css
-index ddc41a66ed0e3688ce34052652bef1fe33a08d49..478e16ce3bb0e797a681b1f7d283a1db2d0168f2 100644
+index ddc41a66ed0e3688ce34052652bef1fe33a08d49..e0034fb0306b0325b73875d6e2798006bc957d03 100644
 --- a/toolkit/themes/shared/popup.css
 +++ b/toolkit/themes/shared/popup.css
-@@ -38,6 +38,10 @@ panel {
+@@ -13,12 +13,12 @@ panel {
+   color-scheme: light dark;
+ 
+   min-width: 1px;
+-  --panel-background: Menu;
++  --panel-background: var(--arrowpanel-background);
+   --panel-color: MenuText;
+   --panel-padding-block: 4px;
+   --panel-padding: var(--panel-padding-block) 0;
+   --panel-border-radius: 4px;
+-  --panel-border-color: ThreeDShadow;
++  --panel-border-color: var(--arrowpanel-border-color);
+   --panel-width: initial;
+ 
+   --panel-shadow-margin: 0px;
+@@ -30,31 +30,22 @@ panel {
+   --color-canvas: var(--panel-background);
+ 
+   @media (-moz-platform: linux) {
+-    --panel-border-radius: 8px;
+-    --panel-padding-block: 3px;
+ 
+     @media (prefers-contrast) {
+       --panel-border-color: color-mix(in srgb, currentColor 60%, transparent);
      }
    }
  
@@ -13,3 +36,30 @@ index ddc41a66ed0e3688ce34052652bef1fe33a08d49..478e16ce3bb0e797a681b1f7d283a1db
    @media (-moz-platform: linux) or (-moz-platform: windows) {
      /* To account for the box-shadow below */
      --panel-shadow-margin: 4px;
+   }
+ 
+-  @media (-moz-platform: macos) {
+-    appearance: auto;
+-    -moz-default-appearance: menupopup;
+-    /* We set the default background here, rather than on ::part(content),
+-     * because otherwise it'd interfere with the native look. Non-native-looking
+-     * popups should get their background via --panel-background */
+-    background-color: Menu;
+-    --panel-background: none;
+-    --panel-border-color: transparent;
+-    /* This should be kept in sync with GetMenuMaskImage() */
+-    --panel-border-radius: 6px;
+-  }
++
+ 
+   &::part(content) {
+     display: flex;
+@@ -64,7 +55,7 @@ panel {
+     color: var(--panel-color);
+     background: var(--panel-background);
+     border-radius: var(--panel-border-radius);
+-    border: 1px solid var(--panel-border-color);
++    border: 2px solid var(--panel-border-color);
+     width: var(--panel-width);
+     box-shadow: var(--panel-shadow);
+     margin: var(--panel-shadow-margin);