diff --git a/UI/data/themes/Yami.obt b/UI/data/themes/Yami.obt
index 6b482523f..e6056dcd6 100644
--- a/UI/data/themes/Yami.obt
+++ b/UI/data/themes/Yami.obt
@@ -100,6 +100,9 @@
     --border_highlight: "transparent"; /* TODO: Better Accessibility focus state */
     /* TODO: Move Accessibilty Colors to Theme config system */
 
+    /* OS Fixes */
+    --os_mac_font_base_value: 12;
+
     --font_base: calc(1pt * var(--font_base_value));
     --font_small: calc(0.9pt * var(--font_base_value));
     --font_large: calc(1.1pt * var(--font_base_value));
diff --git a/UI/data/themes/Yami_Classic.ovt b/UI/data/themes/Yami_Classic.ovt
index ffc6a863b..608fd6b8c 100644
--- a/UI/data/themes/Yami_Classic.ovt
+++ b/UI/data/themes/Yami_Classic.ovt
@@ -28,6 +28,9 @@
     --spacing_base_value: 2;
     --padding_base_value: 0.25;
 
+    /* OS Fixes */
+    --os_mac_font_base_value: 11;
+
     --icon_base: calc(6px + var(--font_base_value));
 
     --padding_wide: calc(18px + calc(0.25 * var(--padding_base_value)));