diff --git a/SPD-classes/src/main/java/com/watabou/noosa/RenderedText.java b/SPD-classes/src/main/java/com/watabou/noosa/RenderedText.java
index 839527180..bebb7f24a 100644
--- a/SPD-classes/src/main/java/com/watabou/noosa/RenderedText.java
+++ b/SPD-classes/src/main/java/com/watabou/noosa/RenderedText.java
@@ -239,7 +239,8 @@ public class RenderedText extends Image {
 	}
 
 	public static void setFont(String asset){
-		font = Typeface.createFromAsset(Game.instance.getAssets(), asset);
+		if (asset == null) font = null;
+		else font = Typeface.createFromAsset(Game.instance.getAssets(), asset);
 		clearCache();
 	}
 
diff --git a/core/src/main/assets/font.ttf b/core/src/main/assets/font.ttf
deleted file mode 100644
index 0e58508a6..000000000
Binary files a/core/src/main/assets/font.ttf and /dev/null differ
diff --git a/core/src/main/assets/pixelfont.ttf b/core/src/main/assets/pixelfont.ttf
index c2ced1729..63da98246 100644
Binary files a/core/src/main/assets/pixelfont.ttf and b/core/src/main/assets/pixelfont.ttf differ
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java
index df78f0d75..08ce2f2a1 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java
@@ -243,7 +243,7 @@ public class ShatteredPixelDungeon extends Game {
 		if (classicFont()) {
 			RenderedText.setFont("pixelfont.ttf");
 		} else {
-			RenderedText.setFont("font.ttf");
+			RenderedText.setFont( null );
 		}
 	}
 
@@ -484,7 +484,7 @@ public class ShatteredPixelDungeon extends Game {
 		if (classic) {
 			RenderedText.setFont("pixelfont.ttf");
 		} else {
-			RenderedText.setFont("font.ttf");
+			RenderedText.setFont( null );
 		}
 	}
 
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java
index 2f7c39759..7d5806708 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java
@@ -270,7 +270,7 @@ public class WndSettings extends WndTabbed {
 			slots.setRect(0, chkFlipTags.bottom() + GAP_TINY, WIDTH, SLIDER_HEIGHT);
 			add(slots);
 
-			CheckBox chkFont = new CheckBox(Messages.get(this, "smooth_font")){
+			CheckBox chkFont = new CheckBox(Messages.get(this, "system_font")){
 				@Override
 				protected void onClick() {
 					super.onClick();
diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows.properties b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows.properties
index ca301a71b..59c99084a 100644
--- a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows.properties
+++ b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/windows/windows.properties
@@ -101,7 +101,7 @@ windows.wndsettings$uitab.center=Center
 windows.wndsettings$uitab.flip_toolbar=Flip Toolbar
 windows.wndsettings$uitab.flip_indicators=Flip Indicators
 windows.wndsettings$uitab.quickslots=Quickslots
-windows.wndsettings$uitab.smooth_font=Smooth Font
+windows.wndsettings$uitab.system_font=System Font
 windows.wndsettings$audiotab.music_vol=Music Volume
 windows.wndsettings$audiotab.music_mute=Mute Music
 windows.wndsettings$audiotab.sfx_vol=SFX Volume