diff --git a/qcma.pro b/qcma.pro
index 0238752..39554d9 100644
--- a/qcma.pro
+++ b/qcma.pro
@@ -66,15 +66,15 @@ PKGCONFIG += libvitamtp libavformat libavcodec libavutil libswscale
 
 QMAKE_CXXFLAGS += -Wno-write-strings -Wall -D__STDC_CONSTANT_MACROS
 
-RESOURCES += \
-    resources/qcmares.qrc
+RESOURCES += qcmares.qrc
 
 OTHER_FILES += \
     resources/xml/psp2-updatelist.xml \
     resources/images/psv_icon.png \
-    README.md \
+    resources/images/psv_icon_16.png \
+    resources/images/qcma.png \
     resources/qcma.desktop \
-    resources/qcma.rc
+    qcma.rc
 
 FORMS += \
     src/forms/configwidget.ui \
diff --git a/resources/qcma.rc b/qcma.rc
similarity index 100%
rename from resources/qcma.rc
rename to qcma.rc
diff --git a/qcmares.qrc b/qcmares.qrc
new file mode 100644
index 0000000..b9e6c18
--- /dev/null
+++ b/qcmares.qrc
@@ -0,0 +1,11 @@
+<RCC>
+    <qresource prefix="/main">
+        <file>resources/xml/psp2-updatelist.xml</file>
+        <file>resources/translations/qcma.es.qm</file>
+        <file>resources/translations/qcma.ja.qm</file>
+        <file>resources/images/psv_icon.png</file>
+        <file>resources/images/psv_icon_16.png</file>
+        <file>resources/images/qcma.png</file>
+        <file>resources/images/edit-clear-locationbar-rtl.png</file>
+    </qresource>
+</RCC>
diff --git a/resources/qcma.desktop b/resources/qcma.desktop
index 66cdeb5..2ffd664 100644
--- a/resources/qcma.desktop
+++ b/resources/qcma.desktop
@@ -5,7 +5,7 @@ GenericName=Content Manager Assistant
 GenericName[es]=Asistente del Gestor de Contenido
 Comment=Content Manager Assistant for the PS Vita
 Comment[es]=Asistente del Gestor de Contenido para PS Vita
-Icon=qcma.png
+Icon=images/qcma.png
 Name=QCMA
 Path=
 StartupNotify=false
diff --git a/resources/qcmares.qrc b/resources/qcmares.qrc
deleted file mode 100644
index 1576176..0000000
--- a/resources/qcmares.qrc
+++ /dev/null
@@ -1,11 +0,0 @@
-<RCC>
-    <qresource prefix="/main">
-        <file>xml/psp2-updatelist.xml</file>
-        <file>translations/qcma.es.qm</file>
-        <file>translations/qcma.ja.qm</file>
-	<file>images/psv_icon.png</file>
-        <file>images/psv_icon_16.png</file>
-        <file>images/qcma.png</file>
-        <file>images/edit-clear-locationbar-rtl.png</file>
-    </qresource>
-</RCC>
diff --git a/src/cmaevent.cpp b/src/cmaevent.cpp
index f08abc7..b70aa54 100644
--- a/src/cmaevent.cpp
+++ b/src/cmaevent.cpp
@@ -478,7 +478,7 @@ void CmaEvent::vitaEventSendHttpObjectFromURL(vita_event_t *event, int eventId)
     if(!file.open(QIODevice::ReadOnly)) {
         if(basename == "psp2-updatelist.xml") {
             qDebug("Found request for update list. Sending cached data");
-            QFile res(":/main/resources/psp2-updatelist.xml");
+            QFile res(":/main/resources/xml/psp2-updatelist.xml");
             res.open(QIODevice::ReadOnly);
             data = res.readAll();
         } else {
diff --git a/src/filterlineedit.cpp b/src/filterlineedit.cpp
index 62b5e54..0119926 100644
--- a/src/filterlineedit.cpp
+++ b/src/filterlineedit.cpp
@@ -26,7 +26,7 @@ FilterLineEdit::FilterLineEdit(QWidget *parent) :
     QLineEdit(parent)
 {
     clearButton = new QToolButton(this);
-    QIcon clearIcon(":/main/images/edit-clear-locationbar-rtl.png");
+    QIcon clearIcon(":/main/resources/images/edit-clear-locationbar-rtl.png");
     clearButton->setIcon(clearIcon);
     clearButton->setCursor(Qt::ArrowCursor);
     clearButton->setStyleSheet("border:none;padding:0px");
diff --git a/src/mainwidget.cpp b/src/mainwidget.cpp
index af518b6..fbe4bc5 100644
--- a/src/mainwidget.cpp
+++ b/src/mainwidget.cpp
@@ -119,7 +119,7 @@ void MainWidget::showAboutDialog()
     about.setWindowTitle(tr("About QCMA"));
     about.setInformativeText(tr("Copyright (C) 2013  Codestation") + "\n");
     about.setStandardButtons(QMessageBox::Ok);
-    about.setIconPixmap(QPixmap(":/main/images/qcma.png"));
+    about.setIconPixmap(QPixmap(":/main/resources/images/qcma.png"));
     about.setDefaultButton(QMessageBox::Ok);
 
     // hack to expand the messagebox minimum size
@@ -164,9 +164,9 @@ void MainWidget::createTrayIcon()
     trayIcon = new QSystemTrayIcon(this);
     trayIcon->setContextMenu(trayIconMenu);
 #ifndef Q_OS_WIN32
-    trayIcon->setIcon(QIcon(":/main/images/psv_icon.png"));
+    trayIcon->setIcon(QIcon(":/main/resources/images/psv_icon.png"));
 #else
-    trayIcon->setIcon(QIcon(":/main/images/psv_icon_16.png"));
+    trayIcon->setIcon(QIcon(":/main/resources/images/psv_icon_16.png"));
 #endif
     trayIcon->show();
     // try to avoid the iconTray Qt bug