diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index 2b9c36ee46..db8afc7331 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -376,7 +376,9 @@ void NativeInit(int argc, const char *argv[],
 	// Note to translators: do not translate this/add this to PPSSPP-lang's files. 
 	// It's intended to be custom for every user. 
 	// Only add it to your own personal copies of PPSSPP.
+#ifdef _WIN32
 	g_Config.sFont = d->T("Font", "Trebuchet MS");
+#endif
 
 	if (!boot_filename.empty() && stateToLoad != NULL)
 		SaveState::Load(stateToLoad);
@@ -411,9 +413,15 @@ void NativeInitGraphics() {
 
 	// memset(&ui_theme, 0, sizeof(ui_theme));
 	// New style theme
+#ifdef _WIN32
 	ui_theme.uiFont = UI::FontStyle(UBUNTU24, g_Config.sFont.c_str(), 20);
 	ui_theme.uiFontSmall = UI::FontStyle(UBUNTU24, g_Config.sFont.c_str(), 14);
 	ui_theme.uiFontSmaller = UI::FontStyle(UBUNTU24, g_Config.sFont.c_str(), 11);
+#else
+	ui_theme.uiFont = UI::FontStyle(UBUNTU24, "", 20);
+	ui_theme.uiFontSmall = UI::FontStyle(UBUNTU24, "", 14);
+	ui_theme.uiFontSmaller = UI::FontStyle(UBUNTU24, "", 11);
+#endif
 
 	ui_theme.checkOn = I_CHECKEDBOX;
 	ui_theme.checkOff = I_SQUARE;
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index 805d4461b1..72adfa8b50 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -308,7 +308,9 @@ namespace MainWindow
 
 	void TranslateMenus() {
 		if(menusAreTranslated) return;
-		
+		menusAreTranslated = true;
+
+
 		const char *desktopUI = "DesktopUI";
 		const char *mainMenu = "MainMenu";
 		const char *graphics = "Graphics";
@@ -316,6 +318,7 @@ namespace MainWindow
 		const char *audio = "Audio";
 		const char *general = "General";
 		const char *pause = "Pause";
+		return;
 
 		// File menu
 		TranslateMenuItem(ID_FILE_LOAD, mainMenu);
@@ -409,7 +412,6 @@ namespace MainWindow
 		TranslateSubMenuHeader(menu, graphics, "Texture Filtering", MENU_OPTIONS, SUBMENU_TEXTURE_FILTERING);
 		TranslateSubMenuHeader(menu, graphics, "Texture Scaling", MENU_OPTIONS, SUBMENU_TEXTURE_SCALING);
 
-		menusAreTranslated = true;
 		DrawMenuBar(hwndMain);
 	}
 
diff --git a/native b/native
index ed48ad9c22..685a1f7e6f 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit ed48ad9c223794126939bfdd8a1b5a0023096a9c
+Subproject commit 685a1f7e6f13a4809b3dc1fb845c16a7402c1bff