diff --git a/ShareX.HelpersLib/Controls/MenuButton.cs b/ShareX.HelpersLib/Controls/MenuButton.cs
index d097d065f..89d43111d 100644
--- a/ShareX.HelpersLib/Controls/MenuButton.cs
+++ b/ShareX.HelpersLib/Controls/MenuButton.cs
@@ -67,9 +67,12 @@ protected override void OnPaint(PaintEventArgs pevent)
                 int arrowX = ClientRectangle.Width - 14;
                 int arrowY = (ClientRectangle.Height / 2) - 1;
 
-                Brush brush = Enabled ? SystemBrushes.ControlText : SystemBrushes.ControlDark;
-                Point[] arrows = new Point[] { new Point(arrowX, arrowY), new Point(arrowX + 7, arrowY), new Point(arrowX + 3, arrowY + 4) };
-                pevent.Graphics.FillPolygon(brush, arrows);
+                Color color = Enabled ? ForeColor : SystemColors.ControlDark;
+                using (Brush brush = new SolidBrush(color))
+                {
+                    Point[] arrows = new Point[] { new Point(arrowX, arrowY), new Point(arrowX + 7, arrowY), new Point(arrowX + 3, arrowY + 4) };
+                    pevent.Graphics.FillPolygon(brush, arrows);
+                }
             }
         }
     }
diff --git a/ShareX.HelpersLib/ShareXResources.cs b/ShareX.HelpersLib/ShareXResources.cs
index 3fdf4aaf3..ecc13da12 100644
--- a/ShareX.HelpersLib/ShareXResources.cs
+++ b/ShareX.HelpersLib/ShareXResources.cs
@@ -101,6 +101,11 @@ private static void ApplyDarkThemeToControl(Control control)
             switch (control)
             {
                 case Button btn:
+                    btn.FlatStyle = FlatStyle.Flat;
+                    btn.FlatAppearance.BorderColor = DarkBorderColor;
+                    btn.ForeColor = DarkTextColor;
+                    btn.BackColor = DarkBackgroundVariantColor;
+                    return;
                 case CheckBox cb when cb.Appearance == Appearance.Button:
                     // Buttons looks better with system colors
                     control.ForeColor = SystemColors.ControlText;