diff --git a/frontend/ui/device.lua b/frontend/ui/device.lua
index f75923bb3..4d77e520f 100644
--- a/frontend/ui/device.lua
+++ b/frontend/ui/device.lua
@@ -8,7 +8,7 @@ Device = {
 
 function Device:getModel()
 	local std_out = io.popen("grep 'MX' /proc/cpuinfo | cut -d':' -f2 | awk {'print $2'}", "r")
-	local cpu_mod = std_out:read()	
+	local cpu_mod = std_out:read()
 	if not cpu_mod then
 		local ret = os.execute("grep 'Hardware : Mario Platform' /proc/cpuinfo", "r")
 		if ret ~= 0 then
@@ -122,7 +122,7 @@ function Device:usbPlugIn()
 	if self.charging_mode == false and self.screen_saver_mode == false then
 		Screen:saveCurrentBB()
 		--UIManager:show(InfoMessage:new{
-			--text = "Going into USB mode... ", 
+			--text = "Going into USB mode... ",
 			--timeout = 2,
 		--})
 		--util.sleep(1)
diff --git a/frontend/ui/font.lua b/frontend/ui/font.lua
index 3d9ec96cb..836508e2a 100644
--- a/frontend/ui/font.lua
+++ b/frontend/ui/font.lua
@@ -5,9 +5,10 @@ Font = {
 		-- default font for menu contents
 		cfont = "droid/DroidSansFallback.ttf",
 		-- default font for title
-		tfont = "NimbusSanL-BoldItal.cff",
+		--tfont = "NimbusSanL-BoldItal.cff",
+		tfont = "droid/DroidSansFallback.ttf",
 		-- default font for footer
-		ffont = "droid/DroidSans.ttf",
+		ffont = "droid/DroidSansFallback.ttf",
 
 		-- default font for reading position info
 		rifont = "droid/DroidSans.ttf",