diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro
index a9ad2bfa5c..dab7775911 100755
--- a/Qt/PPSSPP.pro
+++ b/Qt/PPSSPP.pro
@@ -13,16 +13,20 @@ lessThan(QT_MAJOR_VERSION, 5) {
 
 # Extra Qt modules
 linux: CONFIG += link_pkgconfig
-win32|greaterThan(QT_MAJOR_VERSION,4): QT += multimedia
-else:linux:packagesExist(QtMultimedia): QT += multimedia
-else {
+linux:lessThan(QT_MAJOR_VERSION,5):!packagesExist(QtMultimedia) {
+	# Ubuntu et al workaround. They forgot QtMultimedia
 	CONFIG += mobility
 	MOBILITY += multimedia
 }
+else: QT += multimedia
+
 greaterThan(QT_MAJOR_VERSION,4): QT += widgets
 
-mobile_platform: MOBILITY += sensors
-symbian: MOBILITY += systeminfo feedback
+mobile_platform {
+	CONFIG += mobility
+	MOBILITY += sensors
+	symbian: MOBILITY += systeminfo feedback
+}
 
 # PPSSPP Libs
 QMAKE_LIBDIR += $$CONFIG_DIR
@@ -90,7 +94,7 @@ INCLUDEPATH += $$P $$P/Common $$P/native
 	SOURCES += $$P/Qt/*.cpp
 	HEADERS += $$P/Qt/*.h
 	FORMS += $$P/Qt/*.ui
-	RESOURCES += $$P/Qt/resources.qrc
+	RESOURCES += $$P/Qt/desktop_assets.qrc
 	INCLUDEPATH += $$P/Qt
 
 	# Translations
@@ -105,9 +109,9 @@ INCLUDEPATH += $$P $$P/Common $$P/native
 	PRE_TARGETDEPS += compiler_lang_make_all
 } else {
 	# Desktop handles the Init separately
+	RESOURCES += $$P/Qt/assets.qrc
 	SOURCES += $$P/UI/NativeApp.cpp
 }
-RESOURCES += assets.qrc
 
 # Packaging
 symbian {
diff --git a/Qt/ctrldisasmview.cpp b/Qt/ctrldisasmview.cpp
index e334d72a72..55625b052e 100644
--- a/Qt/ctrldisasmview.cpp
+++ b/Qt/ctrldisasmview.cpp
@@ -257,7 +257,7 @@ void CtrlDisAsmView::paintEvent(QPaintEvent *)
 	painter.setFont(normalFont);
 
 
-	QImage breakPoint(":/images/breakpoint");
+	QImage breakPoint(":/resources/breakpoint.ico");
 	int i;
 	curAddress&=~(align-1);
 
diff --git a/Qt/desktop_assets.qrc b/Qt/desktop_assets.qrc
new file mode 100644
index 0000000000..89434e8b35
--- /dev/null
+++ b/Qt/desktop_assets.qrc
@@ -0,0 +1,24 @@
+<RCC>
+	<qresource prefix="/">
+		<file alias="assets/ui_atlas.zim">../assets/ui_atlas_lowmem.zim</file>
+		<file alias="assets/ppge_atlas.zim">../assets/ppge_atlas.zim</file>
+		<file alias="assets/lang">../lang</file>
+		<file alias="assets/langregion.ini">../assets/langregion.ini</file>
+		<file alias="assets/unknown.png">../assets/unknown.png</file>
+		<file alias="assets/shaders">../assets/shaders</file>
+		<file alias="assets/flash0/font">../flash0/font</file>
+        <file>languages/ppsspp_de.qm</file>
+        <file>languages/ppsspp_en.qm</file>
+        <file>languages/ppsspp_fr.qm</file>
+        <file>languages/ppsspp_gr.qm</file>
+        <file>languages/ppsspp_hu.qm</file>
+        <file>languages/ppsspp_id.qm</file>
+        <file>languages/ppsspp_pl.qm</file>
+        <file>languages/ppsspp_pt-br.qm</file>
+        <file>languages/ppsspp_ru.qm</file>
+        <file>languages/ppsspp_zh-cn.qm</file>
+        <file>languages/ppsspp_zh-tw.qm</file>
+        <file>resources/breakpointDisable.ico</file>
+        <file>resources/breakpoint.ico</file>
+    </qresource>
+</RCC>
diff --git a/Qt/resources.qrc b/Qt/resources.qrc
deleted file mode 100644
index c4012a239c..0000000000
--- a/Qt/resources.qrc
+++ /dev/null
@@ -1,31 +0,0 @@
-<RCC>
-    <qresource prefix="/images">
-        <file>resources/psp.png</file>
-        <file>resources/psp_map.png</file>
-        <file>resources/psp_rightbtn_red.png</file>
-        <file>resources/psp_smallbtn_red.png</file>
-        <file>resources/psp_down_red.png</file>
-        <file>resources/psp_up_red.png</file>
-        <file>resources/psp_right_red.png</file>
-        <file>resources/psp_left_red.png</file>
-        <file>resources/psp_rt_red.png</file>
-        <file>resources/psp_lt_red.png</file>
-        <file>resources/psp_aright.png</file>
-        <file>resources/psp_adown.png</file>
-        <file>resources/psp_aleft.png</file>
-        <file>resources/psp_aup.png</file>
-        <file alias="breakpointDisable">resources/stop1.ico</file>
-        <file alias="breakpoint">resources/icon1.ico</file>
-    </qresource>
-    <qresource prefix="/">
-        <file>languages/ppsspp_zh-cn.qm</file>
-        <file>languages/ppsspp_en.qm</file>
-        <file>languages/ppsspp_fr.qm</file>
-        <file>languages/ppsspp_pl.qm</file>
-        <file>languages/ppsspp_de.qm</file>
-        <file>languages/ppsspp_zh-tw.qm</file>
-        <file>languages/ppsspp_pt-br.qm</file>
-        <file>languages/ppsspp_id.qm</file>
-        <file>languages/ppsspp_ru.qm</file>
-    </qresource>
-</RCC>
diff --git a/Qt/resources/icon1.ico b/Qt/resources/breakpoint.ico
similarity index 100%
rename from Qt/resources/icon1.ico
rename to Qt/resources/breakpoint.ico
diff --git a/Qt/resources/stop1.ico b/Qt/resources/breakpointDisable.ico
similarity index 100%
rename from Qt/resources/stop1.ico
rename to Qt/resources/breakpointDisable.ico
diff --git a/Qt/resources/psp.png b/Qt/resources/psp.png
deleted file mode 100644
index 7de480766b..0000000000
Binary files a/Qt/resources/psp.png and /dev/null differ
diff --git a/Qt/resources/psp_adown.png b/Qt/resources/psp_adown.png
deleted file mode 100644
index 141664b2a4..0000000000
Binary files a/Qt/resources/psp_adown.png and /dev/null differ
diff --git a/Qt/resources/psp_aleft.png b/Qt/resources/psp_aleft.png
deleted file mode 100644
index 60545be238..0000000000
Binary files a/Qt/resources/psp_aleft.png and /dev/null differ
diff --git a/Qt/resources/psp_aright.png b/Qt/resources/psp_aright.png
deleted file mode 100644
index f951c2bb93..0000000000
Binary files a/Qt/resources/psp_aright.png and /dev/null differ
diff --git a/Qt/resources/psp_aup.png b/Qt/resources/psp_aup.png
deleted file mode 100644
index 8028261674..0000000000
Binary files a/Qt/resources/psp_aup.png and /dev/null differ
diff --git a/Qt/resources/psp_down_red.png b/Qt/resources/psp_down_red.png
deleted file mode 100644
index 0ec28673b2..0000000000
Binary files a/Qt/resources/psp_down_red.png and /dev/null differ
diff --git a/Qt/resources/psp_left_red.png b/Qt/resources/psp_left_red.png
deleted file mode 100644
index 353d9be44b..0000000000
Binary files a/Qt/resources/psp_left_red.png and /dev/null differ
diff --git a/Qt/resources/psp_lt_red.png b/Qt/resources/psp_lt_red.png
deleted file mode 100644
index a44504f1f2..0000000000
Binary files a/Qt/resources/psp_lt_red.png and /dev/null differ
diff --git a/Qt/resources/psp_map.png b/Qt/resources/psp_map.png
deleted file mode 100644
index f164010885..0000000000
Binary files a/Qt/resources/psp_map.png and /dev/null differ
diff --git a/Qt/resources/psp_right_red.png b/Qt/resources/psp_right_red.png
deleted file mode 100644
index 81b809e055..0000000000
Binary files a/Qt/resources/psp_right_red.png and /dev/null differ
diff --git a/Qt/resources/psp_rightbtn_red.png b/Qt/resources/psp_rightbtn_red.png
deleted file mode 100644
index 258822507a..0000000000
Binary files a/Qt/resources/psp_rightbtn_red.png and /dev/null differ
diff --git a/Qt/resources/psp_rt_red.png b/Qt/resources/psp_rt_red.png
deleted file mode 100644
index ce9b87163c..0000000000
Binary files a/Qt/resources/psp_rt_red.png and /dev/null differ
diff --git a/Qt/resources/psp_smallbtn_red.png b/Qt/resources/psp_smallbtn_red.png
deleted file mode 100644
index 4239c46fc5..0000000000
Binary files a/Qt/resources/psp_smallbtn_red.png and /dev/null differ
diff --git a/Qt/resources/psp_up_red.png b/Qt/resources/psp_up_red.png
deleted file mode 100644
index dd6f718a79..0000000000
Binary files a/Qt/resources/psp_up_red.png and /dev/null differ