diff --git a/src/accounts/twitter/TwitterAccount.cpp b/src/accounts/twitter/TwitterAccount.cpp
index 6a4074550..750a3e3e9 100644
--- a/src/accounts/twitter/TwitterAccount.cpp
+++ b/src/accounts/twitter/TwitterAccount.cpp
@@ -60,8 +60,8 @@ TwitterAccount::TwitterAccount( const QString &accountId )
 
     m_twitterAuth = QPointer< TomahawkOAuthTwitter >( new TomahawkOAuthTwitter( TomahawkUtils::nam(), this ) );
 
-    m_onlinePixmap = QPixmap( ":/twitter-icon.png" );
-    m_offlinePixmap = QPixmap( ":/twitter-offline-icon.png" );
+    m_onlinePixmap = QPixmap( ":/twitter-account/twitter-icon.png" );
+    m_offlinePixmap = QPixmap( ":/twitter-account/twitter-offline-icon.png" );
 }
 
 
diff --git a/src/accounts/twitter/TwitterAccount.h b/src/accounts/twitter/TwitterAccount.h
index 490f68e4f..6557a4721 100644
--- a/src/accounts/twitter/TwitterAccount.h
+++ b/src/accounts/twitter/TwitterAccount.h
@@ -49,7 +49,7 @@ public:
     QString prettyName() const { return "Twitter"; }
     QString factoryId() const { return "twitteraccount"; }
     QString description() const { return tr( "Connect to your Twitter followers." ); }
-    QPixmap icon() const { return QPixmap( ":/twitter-icon.png" ); }
+    QPixmap icon() const { return QPixmap( ":/twitter-account/twitter-icon.png" ); }
     AccountTypes types() const { return AccountTypes( SipType | StatusPushType ); };
     Account* createAccount( const QString& pluginId = QString() );
 };
diff --git a/src/accounts/twitter/TwitterConfigWidget.ui b/src/accounts/twitter/TwitterConfigWidget.ui
index e50e79d8d..e1d106f48 100644
--- a/src/accounts/twitter/TwitterConfigWidget.ui
+++ b/src/accounts/twitter/TwitterConfigWidget.ui
@@ -50,7 +50,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap resource="resources.qrc">:/twitter-icon.png</pixmap>
+         <pixmap resource="resources.qrc">:/twitter-account/twitter-icon.png</pixmap>
        </property>
       </widget>
      </item>
diff --git a/src/accounts/twitter/resources.qrc b/src/accounts/twitter/resources.qrc
index db832b626..bc05cfdb3 100644
--- a/src/accounts/twitter/resources.qrc
+++ b/src/accounts/twitter/resources.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/">
+    <qresource prefix="/twitter-account">
         <file>twitter-icon.png</file>
         <file>twitter-offline-icon.png</file>
     </qresource>
diff --git a/src/accounts/xmpp/XmppAccount.cpp b/src/accounts/xmpp/XmppAccount.cpp
index 88107557c..54d49204d 100644
--- a/src/accounts/xmpp/XmppAccount.cpp
+++ b/src/accounts/xmpp/XmppAccount.cpp
@@ -47,8 +47,8 @@ XmppAccount::XmppAccount( const QString &accountId )
 
     m_configWidget = QPointer< AccountConfigWidget >( new XmppConfigWidget( this, 0 ) );
 
-    m_onlinePixmap = QPixmap( ":/xmpp-icon.png" );
-    m_offlinePixmap = QPixmap( ":/xmpp-offline-icon.png" );
+    m_onlinePixmap = QPixmap( ":/xmpp-account/xmpp-icon.png" );
+    m_offlinePixmap = QPixmap( ":/xmpp-account/xmpp-offline-icon.png" );
 }
 
 
diff --git a/src/accounts/xmpp/XmppAccount.h b/src/accounts/xmpp/XmppAccount.h
index d32b69dc5..e50f2540f 100644
--- a/src/accounts/xmpp/XmppAccount.h
+++ b/src/accounts/xmpp/XmppAccount.h
@@ -50,7 +50,7 @@ public:
     QString prettyName() const { return "Jabber (XMPP)"; }
     QString description() const { return tr( "Log on to your Jabber/XMPP account to connect to your friends" ); }
     QString factoryId() const { return "xmppaccount"; }
-    QPixmap icon() const { return QPixmap( ":/xmpp-icon.png" ); }
+    QPixmap icon() const { return QPixmap( ":/xmpp-account/xmpp-icon.png" ); }
     AccountTypes types() const { return AccountTypes( SipType | StatusPushType ); };
     Account* createAccount( const QString& pluginId = QString() );
 };
diff --git a/src/accounts/xmpp/XmppConfigWidget.ui b/src/accounts/xmpp/XmppConfigWidget.ui
index 953a4627a..8e16eaced 100644
--- a/src/accounts/xmpp/XmppConfigWidget.ui
+++ b/src/accounts/xmpp/XmppConfigWidget.ui
@@ -35,7 +35,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap resource="resources.qrc">:/xmpp-icon.png</pixmap>
+         <pixmap resource="resources.qrc">:/xmpp-account/xmpp-icon.png</pixmap>
        </property>
       </widget>
      </item>
diff --git a/src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp b/src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp
index 61a3aa3df..1b41ff133 100644
--- a/src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp
+++ b/src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp
@@ -40,7 +40,7 @@ GoogleWrapperFactory::createAccount( const QString& pluginId )
 QPixmap
 GoogleWrapperFactory::icon() const
 {
-    return QPixmap( ":/gmail-logo.png" );
+    return QPixmap( ":/google-account/gmail-logo.png" );
 }
 
 GoogleWrapperSip::GoogleWrapperSip( Account* account )
@@ -90,13 +90,13 @@ GoogleWrapper::GoogleWrapper ( const QString& pluginID )
     config->m_ui->emailLabel->setText( tr( "Google Address:" ) );
     config->m_ui->xmppBlurb->setText( tr( "Enter your Google login to connect with your friends using Tomahawk!" ) );
     config->m_ui->xmppUsername->setPlaceholderText( tr( "username@gmail.com" ) );
-    config->m_ui->logoLabel->setPixmap( QPixmap( ":/gmail-logo.png" ) );
+    config->m_ui->logoLabel->setPixmap( QPixmap( ":/google-account/gmail-logo.png" ) );
     config->m_ui->xmppServer->setText( "talk.google.com" );
     config->m_ui->xmppPort->setValue( 5222 );
     config->m_ui->groupBoxXmppAdvanced->hide();
 
-    m_onlinePixmap = QPixmap( ":/gmail-logo.png" );
-    m_offlinePixmap = QPixmap( ":/gmail-offline-logo.png" );
+    m_onlinePixmap = QPixmap( ":/google-account/gmail-logo.png" );
+    m_offlinePixmap = QPixmap( ":/google-account/gmail-offline-logo.png" );
 }
 
 GoogleWrapper::~GoogleWrapper()
diff --git a/src/accounts/xmpp/googlewrapper/resources.qrc b/src/accounts/xmpp/googlewrapper/resources.qrc
index 7c85f6b38..483dbf43c 100644
--- a/src/accounts/xmpp/googlewrapper/resources.qrc
+++ b/src/accounts/xmpp/googlewrapper/resources.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/">
+    <qresource prefix="/google-account">
         <file>gmail-logo.png</file>
         <file>gmail-offline-logo.png</file>
     </qresource>
diff --git a/src/accounts/xmpp/resources.qrc b/src/accounts/xmpp/resources.qrc
index 70888b9cf..d4daf9d08 100644
--- a/src/accounts/xmpp/resources.qrc
+++ b/src/accounts/xmpp/resources.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/">
+    <qresource prefix="/xmpp-account">
         <file>xmpp-icon.png</file>
         <file>xmpp-offline-icon.png</file>
     </qresource>
diff --git a/src/accounts/zeroconf/ConfigWidget.ui b/src/accounts/zeroconf/ConfigWidget.ui
index 84390fa37..5d2ec2c22 100644
--- a/src/accounts/zeroconf/ConfigWidget.ui
+++ b/src/accounts/zeroconf/ConfigWidget.ui
@@ -38,7 +38,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap resource="resources.qrc">:/zeroconf-icon.png</pixmap>
+         <pixmap resource="resources.qrc">:/zeroconf-account/zeroconf-icon.png</pixmap>
        </property>
       </widget>
      </item>
diff --git a/src/accounts/zeroconf/ZeroconfAccount.cpp b/src/accounts/zeroconf/ZeroconfAccount.cpp
index 6a750e52d..2b9c28377 100644
--- a/src/accounts/zeroconf/ZeroconfAccount.cpp
+++ b/src/accounts/zeroconf/ZeroconfAccount.cpp
@@ -31,7 +31,7 @@ ZeroconfFactory::ZeroconfFactory()
 {
 #ifndef ENABLE_HEADLESS
     if ( s_icon == 0 )
-        s_icon = new QPixmap( ":/zeroconf-icon.png" );
+        s_icon = new QPixmap( ":/zeroconf-account/zeroconf-icon.png" );
 #endif
 }
 
diff --git a/src/accounts/zeroconf/resources.qrc b/src/accounts/zeroconf/resources.qrc
index 32e3d457e..f13534d03 100644
--- a/src/accounts/zeroconf/resources.qrc
+++ b/src/accounts/zeroconf/resources.qrc
@@ -1,5 +1,5 @@
 <!DOCTYPE RCC><RCC version="1.0">
-<qresource>
+<qresource prefix="/zeroconf-account">
 <file>zeroconf-icon.png</file>
 </qresource>
 </RCC>