diff --git a/app/src/main/assets/fonts/FontChineseSimplified.ttf b/app/src/main/assets/fonts/FontChineseSimplified.ttf
index 2e31d024..dfef2992 100644
Binary files a/app/src/main/assets/fonts/FontChineseSimplified.ttf and b/app/src/main/assets/fonts/FontChineseSimplified.ttf differ
diff --git a/app/src/main/assets/fonts/FontChineseTraditional.ttf b/app/src/main/assets/fonts/FontChineseTraditional.ttf
index 563872c7..39b4a327 100644
Binary files a/app/src/main/assets/fonts/FontChineseTraditional.ttf and b/app/src/main/assets/fonts/FontChineseTraditional.ttf differ
diff --git a/app/src/main/assets/fonts/FontExtendedChineseSimplified.ttf b/app/src/main/assets/fonts/FontExtendedChineseSimplified.ttf
index 278ad8aa..dfef2992 100644
Binary files a/app/src/main/assets/fonts/FontExtendedChineseSimplified.ttf and b/app/src/main/assets/fonts/FontExtendedChineseSimplified.ttf differ
diff --git a/app/src/main/assets/fonts/FontKorean.ttf b/app/src/main/assets/fonts/FontKorean.ttf
index 2e31d024..1281c144 100644
Binary files a/app/src/main/assets/fonts/FontKorean.ttf and b/app/src/main/assets/fonts/FontKorean.ttf differ
diff --git a/app/src/main/assets/fonts/FontStandard.ttf b/app/src/main/assets/fonts/FontStandard.ttf
index 2e31d024..32b38a8d 100644
Binary files a/app/src/main/assets/fonts/FontStandard.ttf and b/app/src/main/assets/fonts/FontStandard.ttf differ
diff --git a/app/src/main/assets/fonts/README.md b/app/src/main/assets/fonts/README.md
index 6069f1c6..12adec54 100644
--- a/app/src/main/assets/fonts/README.md
+++ b/app/src/main/assets/fonts/README.md
@@ -1,4 +1,3 @@
-#### Skyline FOSS Shared Fonts: (Credit to [FearlessTobi/yuzu_system_archives](https://github.com/FearlessTobi/yuzu_system_archives) for font choice)
-* [FontStandard](FontStandard.ttf), [FontKorean](FontKorean.ttf), [FontChineseSimplified](FontChineseSimplified.ttf) and [FontChineseTraditional](FontChineseTraditional.ttf) are using [Open Sans Regular](https://fonts.google.com/specimen/Open+Sans), which is licensed under [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)
+#### Skyline FOSS Shared Fonts: 
+* [FontStandard](FontStandard.ttf), [FontKorean](FontKorean.ttf), [FontChineseSimplified](FontChineseSimplified.ttf), [FontChineseTraditional](FontChineseTraditional.ttf) and [FontExtendedChineseSimplified](FontExtendedChineseSimplified.ttf) are using [Noto Sans CJK](https://github.com/googlefonts/noto-cjk), which is licensed under [Open Font License](https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL)
 * [FontNintendoExtended](FontNintendoExtended.ttf) is using [Roboto](https://fonts.google.com/specimen/Roboto), which is licensed under [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)
-* [FontExtendedChineseSimplified](FontExtendedChineseSimplified.ttf) is using [Source Sans Pro](https://fonts.google.com/specimen/Source+Sans+Pro), which is licensed under [Open Font License](https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index accd86aa..933f3239 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -176,9 +176,8 @@
     <string name="ktstd_description">Kotlin Standard Library provides convenience functions in Kotlin</string>
     <string name="dagger_description">Dagger provides a framework for compile-time dependency injection</string>
     <string name="mtico_description">Material Design Icons provides consistent iconography throughout the application</string>
-    <string name="open_sans_description">Open Sans is used as our FOSS shared font replacement for Latin, Korean and Chinese</string>
+    <string name="noto_sans_description">Noto Sans is used as our FOSS shared font replacement for Latin, Japanese, Korean and (Traditional) Chinese</string>
     <string name="roboto_description">Roboto is used as our FOSS shared font replacement for Nintendo\'s extended character set</string>
-    <string name="source_sans_pro_description">Source Sans Pro is used as our FOSS shared font replacement for Nintendo\'s extended Chinese character set</string>
     <!-- Software Keyboard -->
     <string name="input_hint">Input Text</string>
     <!-- Misc -->
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index db9314fe..1d1276ec 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -280,20 +280,15 @@
             app:summary="@string/mtico_description"
             app:title="Material Design Icons" />
         <emu.skyline.preference.LicensePreference
-            app:libraryCopyright="Copyright 2020 The Open Sans Project Authors (https://github.com/googlefonts/opensans)"
-            app:libraryLicense="@string/apache2_license"
-            app:libraryUrl="https://fonts.google.com/specimen/Open+Sans"
-            app:summary="@string/open_sans_description"
-            app:title="Open Sans" />
+            app:libraryCopyright="Copyright 2018 The Noto Project Authors (github.com/googlei18n/noto-fonts)"
+            app:libraryLicense="@string/sil_open_font_license"
+            app:libraryUrl="https://github.com/googlefonts/noto-cjk"
+            app:summary="@string/noto_sans_description"
+            app:title="Noto Sans" />
         <emu.skyline.preference.LicensePreference
             app:libraryLicense="@string/apache2_license"
             app:libraryUrl="https://fonts.google.com/specimen/Roboto"
             app:summary="@string/roboto_description"
             app:title="Roboto" />
-        <emu.skyline.preference.LicensePreference
-            app:libraryLicense="@string/sil_open_font_license"
-            app:libraryUrl="https://fonts.google.com/specimen/Source+Sans+Pro"
-            app:summary="@string/source_sans_pro_description"
-            app:title="Source Sans Pro" />
     </PreferenceCategory>
 </androidx.preference.PreferenceScreen>