diff --git a/StabilityMatrix.Avalonia/App.axaml b/StabilityMatrix.Avalonia/App.axaml
index bf99f45c..abaec107 100644
--- a/StabilityMatrix.Avalonia/App.axaml
+++ b/StabilityMatrix.Avalonia/App.axaml
@@ -18,6 +18,7 @@
                  <ResourceInclude Source="Styles/Card.axaml"/>
              </ResourceDictionary.MergedDictionaries>
              <x:Double x:Key="ContentDialogMaxWidth">700</x:Double>
+             <FontFamily x:Key="NotoSansJP">avares://StabilityMatrix.Avalonia/Assets/Fonts/NotoSansJP#Noto Sans JP</FontFamily>
          </ResourceDictionary>
      </Application.Resources>
   
diff --git a/StabilityMatrix.Avalonia/Assets.cs b/StabilityMatrix.Avalonia/Assets.cs
index c8707029..6b06b2ea 100644
--- a/StabilityMatrix.Avalonia/Assets.cs
+++ b/StabilityMatrix.Avalonia/Assets.cs
@@ -16,9 +16,6 @@ internal static class Assets
     public static AvaloniaResource AppIconPng { get; } =
         new("avares://StabilityMatrix.Avalonia/Assets/Icon.png");
 
-    public static AvaloniaResource RegionalFontJapanese { get; } =
-        new("avares://StabilityMatrix.Avalonia/Assets/Fonts/NotoSansJP-Variable.ttf");
-
     /// <summary>
     /// Fixed image for models with no images.
     /// </summary>
diff --git a/StabilityMatrix.Avalonia/Assets/Fonts/NotoSansJP-Variable.ttf b/StabilityMatrix.Avalonia/Assets/Fonts/NotoSansJP-Variable.ttf
deleted file mode 100644
index 505477e0..00000000
Binary files a/StabilityMatrix.Avalonia/Assets/Fonts/NotoSansJP-Variable.ttf and /dev/null differ
diff --git a/StabilityMatrix.Avalonia/Assets/Fonts/NotoSansJP/NotoSansJP-Regular.ttf b/StabilityMatrix.Avalonia/Assets/Fonts/NotoSansJP/NotoSansJP-Regular.ttf
new file mode 100644
index 00000000..1583096a
Binary files /dev/null and b/StabilityMatrix.Avalonia/Assets/Fonts/NotoSansJP/NotoSansJP-Regular.ttf differ
diff --git a/StabilityMatrix.Avalonia/Assets/Fonts/NotoSansJP/NotoSansJP-SemiBold.ttf b/StabilityMatrix.Avalonia/Assets/Fonts/NotoSansJP/NotoSansJP-SemiBold.ttf
new file mode 100644
index 00000000..cc72ab30
Binary files /dev/null and b/StabilityMatrix.Avalonia/Assets/Fonts/NotoSansJP/NotoSansJP-SemiBold.ttf differ
diff --git a/StabilityMatrix.Avalonia/Assets/Fonts/NotoSansJP-Variable LICENSE.txt b/StabilityMatrix.Avalonia/Assets/Fonts/NotoSansJP/OFL.txt
similarity index 100%
rename from StabilityMatrix.Avalonia/Assets/Fonts/NotoSansJP-Variable LICENSE.txt
rename to StabilityMatrix.Avalonia/Assets/Fonts/NotoSansJP/OFL.txt
diff --git a/StabilityMatrix.Avalonia/Views/MainWindow.axaml.cs b/StabilityMatrix.Avalonia/Views/MainWindow.axaml.cs
index 71f2520e..57913526 100644
--- a/StabilityMatrix.Avalonia/Views/MainWindow.axaml.cs
+++ b/StabilityMatrix.Avalonia/Views/MainWindow.axaml.cs
@@ -149,7 +149,10 @@ public partial class MainWindow : AppWindowBase
         {
             if (Cultures.Current?.Name == "ja-JP")
             {
-                fonts.Add(Assets.RegionalFontJapanese.UriPath.ToString());
+                var customFont = (Application.Current!.Resources["NotoSansJP"] as FontFamily)!;
+                Resources["ContentControlThemeFontFamily"] = customFont;
+                FontFamily = customFont;
+                return;
             }
             else if (Compat.IsWindows)
             {
@@ -171,16 +174,20 @@ public partial class MainWindow : AppWindowBase
             else
             {
                 Resources["ContentControlThemeFontFamily"] = FontFamily.Default;
+                FontFamily = FontFamily.Default;
                 return;
             }
 
-            Resources["ContentControlThemeFontFamily"] = new FontFamily(string.Join(",", fonts));
+            var fontString = new FontFamily(string.Join(",", fonts));
+            Resources["ContentControlThemeFontFamily"] = fontString;
+            FontFamily = fontString;
         }
         catch (Exception e)
         {
             LogManager.GetCurrentClassLogger().Error(e);
 
             Resources["ContentControlThemeFontFamily"] = FontFamily.Default;
+            FontFamily = FontFamily.Default;
         }
     }
 
diff --git a/StabilityMatrix.Avalonia/Views/SettingsPage.axaml b/StabilityMatrix.Avalonia/Views/SettingsPage.axaml
index c7086102..985ca391 100644
--- a/StabilityMatrix.Avalonia/Views/SettingsPage.axaml
+++ b/StabilityMatrix.Avalonia/Views/SettingsPage.axaml
@@ -39,7 +39,6 @@
                 </ui:SettingsExpander>
                 <ui:SettingsExpander
                     Grid.Row="2"
-                    IsVisible="{Binding SharedState.IsDebugMode}"
                     Margin="8,0,8,4"
                     Header="{x:Static lang:Resources.Label_Language}"
                     IconSource="Character">