diff --git a/assets/prefs.js b/assets/prefs.js
index 8a2898f..5d32eb7 100644
--- a/assets/prefs.js
+++ b/assets/prefs.js
@@ -8,7 +8,7 @@ lockPref("browser.startup.homepage", "about:blank");
 lockPref("toolkit.legacyUserProfileCustomizations.stylesheets", true);
 lockPref("browser.uidensity", 1);
 lockPref("browser.startup.page", 3);
-lockPref("layout.css.system-ui.enabled", false);
+//lockPref("layout.css.system-ui.enabled", false);
 lockPref("privacy.fingerprintingProtection", false);
 lockPref("signon.rememberSignons", false);
 lockPref("browser.download.viewableInternally.typeWasRegistered.jxl", true);
diff --git a/assets/userChrome.css b/assets/userChrome.css
index bf8bc43..e57f563 100644
--- a/assets/userChrome.css
+++ b/assets/userChrome.css
@@ -85,18 +85,6 @@
     display: none;
 }
 
-/* Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1721612 */
-
-@font-face {
-  font-family: system-ui;
-  src: local('SF Pro Display');
-}
-
-@font-face {
-  font-family: -apple-system;
-  src: local('SF Pro Display');
-}
-
 * {
   font-family: system-ui;
 }
diff --git a/assets/userContent.css b/assets/userContent.css
index d1a68de..e69de29 100644
--- a/assets/userContent.css
+++ b/assets/userContent.css
@@ -1,9 +0,0 @@
-@font-face {
-  font-family: system-ui;
-  src: local('SF Pro Display');
-}
-
-@font-face {
-  font-family: -apple-system;
-  src: local('SF Pro Display');
-}
diff --git a/patches/0015-fix-system-ui-font.patch b/patches/0015-fix-system-ui-font.patch
new file mode 100644
index 0000000..d8a5234
--- /dev/null
+++ b/patches/0015-fix-system-ui-font.patch
@@ -0,0 +1,17 @@
+diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp
+--- a/gfx/thebes/gfxFont.cpp
++++ b/gfx/thebes/gfxFont.cpp
+@@ -841,11 +841,11 @@
+ }
+ 
+ void gfxShapedText::AdjustAdvancesForSyntheticBold(float aSynBoldOffset,
+                                                    uint32_t aOffset,
+                                                    uint32_t aLength) {
+-  uint32_t synAppUnitOffset = aSynBoldOffset * mAppUnitsPerDevUnit;
++  int32_t synAppUnitOffset = aSynBoldOffset * mAppUnitsPerDevUnit;
+   CompressedGlyph* charGlyphs = GetCharacterGlyphs();
+   for (uint32_t i = aOffset; i < aOffset + aLength; ++i) {
+     CompressedGlyph* glyphData = charGlyphs + i;
+     if (glyphData->IsSimpleGlyph()) {
+       // simple glyphs ==> just add the advance
+