diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro
index 3ffef25dcb..b296777795 100755
--- a/Qt/PPSSPP.pro
+++ b/Qt/PPSSPP.pro
@@ -27,7 +27,7 @@ win32 {
 	LIBS += -lCore -lCommon -lNative -lwinmm -lws2_32
 }
 linux {
-	LIBS += -L. -lCore -lCommon -lNative -ldl -lz
+	LIBS += -L. -lCore -lCommon -lNative -ldl
 	PRE_TARGETDEPS += ./libCommon.a ./libCore.a ./libNative.a
 	!mobile_platform {
 		CONFIG += link_pkgconfig
@@ -38,6 +38,8 @@ linux {
 		FFMPEG_DIR=../ffmpeg/linux/x86_64/lib/
 		LIBS += $${FFMPEG_DIR}libavformat.a $${FFMPEG_DIR}libavcodec.a $${FFMPEG_DIR}libavutil.a $${FFMPEG_DIR}libswresample.a $${FFMPEG_DIR}libswscale.a
 	}
+	# put this at the end avoids problems with some compilers
+	LIBS += -lz
 }
 
 # Main
diff --git a/Qt/QtHost.cpp b/Qt/QtHost.cpp
index c1ca575fd6..650a4ddc55 100644
--- a/Qt/QtHost.cpp
+++ b/Qt/QtHost.cpp
@@ -359,9 +359,15 @@ void NativeInitGraphics()
 	theme.checkOn = I_CHECKEDBOX;
 	theme.checkOff = I_SQUARE;
 
-	ui_theme.uiFont = UBUNTU24;
-	ui_theme.uiFontSmall = UBUNTU24;
-	ui_theme.uiFontSmaller = UBUNTU24;
+#ifdef _WIN32
+	ui_theme.uiFont = UI::FontStyle(UBUNTU24, g_Config.sFont.c_str(), 22);
+	ui_theme.uiFontSmall = UI::FontStyle(UBUNTU24, g_Config.sFont.c_str(), 15);
+	ui_theme.uiFontSmaller = UI::FontStyle(UBUNTU24, g_Config.sFont.c_str(), 12);
+#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;
 	ui_theme.whiteImage = I_SOLIDWHITE;