diff --git a/Common/Render/Text/draw_text_cocoa.mm b/Common/Render/Text/draw_text_cocoa.mm
index 3ed8043710..18acdf9b34 100644
--- a/Common/Render/Text/draw_text_cocoa.mm
+++ b/Common/Render/Text/draw_text_cocoa.mm
@@ -32,8 +32,6 @@ enum {
 	MAX_TEXT_HEIGHT = 512
 };
 
-#define APPLE_FONT "RobotoCondensed-Regular"
-
 // for future OpenEmu support
 #ifndef PPSSPP_FONT_BUNDLE
 #define PPSSPP_FONT_BUNDLE [NSBundle mainBundle]
diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp
index 32c6cea58c..ce303dc63b 100644
--- a/UI/EmuScreen.cpp
+++ b/UI/EmuScreen.cpp
@@ -1862,9 +1862,9 @@ void EmuScreen::runImDebugger() {
 
 			// Read the TTF font
 			size_t propSize = 0;
-			uint8_t *propFontData = g_VFS.ReadFile("Roboto-Condensed.ttf", &propSize);
+			const uint8_t *propFontData = g_VFS.ReadFile("Roboto_Condensed-Regular.ttf", &propSize);
 			size_t fixedSize = 0;
-			uint8_t *fixedFontData = g_VFS.ReadFile("Inconsolata-Medium.ttf", &fixedSize);
+			const uint8_t *fixedFontData = g_VFS.ReadFile("Inconsolata-Regular.ttf", &fixedSize);
 			// This call works even if fontData is nullptr, in which case the font just won't get loaded.
 			// This takes ownership of the font array.
 			ImGui_ImplThin3d_Init(draw, propFontData, propSize, fixedFontData, fixedSize);
diff --git a/android/ab.cmd b/android/ab.cmd
index 3071406b2b..06f21acfaf 100644
--- a/android/ab.cmd
+++ b/android/ab.cmd
@@ -5,7 +5,7 @@ xcopy ..\assets\shaders assets\shaders\ /s /y <d.txt
 xcopy ..\assets\themes assets\themes\ /s /y <d.txt
 xcopy ..\assets\ui_images assets\ui_images\ /s /y <d.txt
 copy ..\assets\*.ini assets\
-copy ..\assets\Roboto-Condensed.ttf assets\Roboto-Condensed.ttf
+copy ..\assets\*.ttf assets\
 copy ..\assets\*.png assets\
 copy ..\assets\*.zim assets\
 copy ..\assets\*.meta assets\
diff --git a/android/ab.sh b/android/ab.sh
index 761fc088b9..7960da08e8 100755
--- a/android/ab.sh
+++ b/android/ab.sh
@@ -7,7 +7,7 @@ cp -r ../assets/debugger assets/
 cp -r ../assets/upload assets/
 cp -r ../assets/ui_images assets/
 cp ../assets/*.ini assets/
-cp ../assets/Roboto-Condensed.ttf assets/Roboto-Condensed.ttf
+cp ../assets/*.ttf assets/
 cp ../assets/*.png assets/
 cp ../assets/*.zim assets/
 cp ../assets/*.meta assets/
diff --git a/android/buildassets.sh b/android/buildassets.sh
index bee0b662ae..bd7384ad16 100644
--- a/android/buildassets.sh
+++ b/android/buildassets.sh
@@ -7,7 +7,7 @@ cp ../assets/*.zim assets/
 cp ../assets/*.meta assets/
 cp ../assets/*.wav assets/
 cp ../assets/*.ini assets/
-cp ../assets/Roboto-Condensed.ttf assets/
+cp ../assets/*.ttf assets/
 cp -r ../assets/flash0 assets/
 cp -r ../assets/lang assets/
 cp -r ../assets/ui_images assets/
diff --git a/asciifont_atlasscript.txt b/asciifont_atlasscript.txt
index 72573b94f7..8813187a27 100644
--- a/asciifont_atlasscript.txt
+++ b/asciifont_atlasscript.txt
@@ -1,2 +1,2 @@
 2048
-font UBUNTU24 assets/Roboto-Condensed.ttf UWERS 34 -2
+font UBUNTU24 assets/Roboto_Condensed-Regular.ttf UWERS 34 -2
diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini
index f9d3f4c53b..3f8cb175e4 100644
--- a/assets/lang/de_DE.ini
+++ b/assets/lang/de_DE.ini
@@ -191,7 +191,6 @@ Refresh interval = Aktualisierungsintervall
 Auto Max Quality = Autom. Max. &Qualität
 Buy PPSSPP Gold = Goldversion kaufen
 Copy PSP memory base address = PSP-Speicherplatz und -Adresse kopieren
-Font = Roboto Condensed
 About PPSSPP... = Über PPSSPP...
 Auto = Autom.
 Backend = Grafik-Backend
diff --git a/font_atlasscript.txt b/font_atlasscript.txt
index fdae07e372..a5f47d022e 100644
--- a/font_atlasscript.txt
+++ b/font_atlasscript.txt
@@ -1,3 +1,3 @@
 2048
-font UBUNTU24 assets/Roboto-Condensed.ttf UWERS 34 -2
+font UBUNTU24 assets/Roboto_Condensed-Regular.ttf UWERS 34 -2
 font UBUNTU24 C:/dev/ARIALUNI.ttf UWEhkcRGHKVTeS 30 0
diff --git a/ios/Launch Screen.storyboard b/ios/Launch Screen.storyboard
index 00ac8f6f7a..763750eda1 100644
--- a/ios/Launch Screen.storyboard	
+++ b/ios/Launch Screen.storyboard	
@@ -8,8 +8,8 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
-        <array key="Roboto-Condensed.ttf">
-            <string>Roboto-Condensed</string>
+        <array key="Roboto_Condensed-Regular.ttf">
+            <string>Roboto_Condensed-Regular</string>
         </array>
     </customFonts>
     <scenes>