diff --git a/Core/Config.h b/Core/Config.h
index ae9ab8e794..f98545acc7 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -44,6 +44,7 @@ public:
 	bool bEnableLogging;
 #ifdef _WIN32
 	bool bTopMost;
+	std::string sFont;
 #endif
 	// Core
 	bool bIgnoreBadMemAccess;
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index d309637d42..74a9a21f6f 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -372,6 +372,11 @@ void NativeInit(int argc, const char *argv[],
 #endif	
 
 	i18nrepo.LoadIni(g_Config.languageIni);
+	I18NCategory *d = GetI18NCategory("DesktopUI");
+	g_Config.sFont = d->T("Font");
+
+	if(g_Config.sFont == "Font")
+		g_Config.sFont = "Trebuchet MS";
 
 	if (!boot_filename.empty() && stateToLoad != NULL)
 		SaveState::Load(stateToLoad);
@@ -406,9 +411,9 @@ void NativeInitGraphics() {
 
 	// memset(&ui_theme, 0, sizeof(ui_theme));
 	// New style theme
-	ui_theme.uiFont = UI::FontStyle(UBUNTU24, "Trebuchet MS", 20);
-	ui_theme.uiFontSmall = UI::FontStyle(UBUNTU24, "Trebuchet MS", 14);
-	ui_theme.uiFontSmaller = UI::FontStyle(UBUNTU24, "Trebuchet MS", 11);
+	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);
 
 	ui_theme.checkOn = I_CHECKEDBOX;
 	ui_theme.checkOff = I_SQUARE;