94 files changed, 953 insertions, 112 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0a4439b..f2ccdab0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -519,6 +519,12 @@ gui/widgets/MCModInfoFrame.ui
 
 set (FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${MULTIMC_SOURCES} ${MULTIMC_UIS})
 
+SET(MULTIMC_QRCS
+resources/backgrounds/backgrounds.qrc
+resources/multimc/multimc.qrc
+resources/instances/instances.qrc
+)
+
 
 ######## Windows resource files ########
 IF(WIN32)
@@ -562,10 +568,10 @@ ENDIF(MultiMC_CODE_COVERAGE)
 
 # Qt 5 stuff
 QT5_WRAP_UI(MULTIMC_UI ${MULTIMC_UIS})
-QT5_ADD_RESOURCES(GRAPHICS_QRC graphics.qrc)
+QT5_ADD_RESOURCES(MULTIMC_RESOURCES ${MULTIMC_QRCS})
 
 # Add common library
-ADD_LIBRARY(MultiMC_common STATIC ${MULTIMC_SOURCES} ${MULTIMC_UI} ${GRAPHICS_QRC})
+ADD_LIBRARY(MultiMC_common STATIC ${MULTIMC_SOURCES} ${MULTIMC_UI} ${MULTIMC_RESOURCES})
 
 # Add executable
 ADD_EXECUTABLE(MultiMC MACOSX_BUNDLE WIN32 main.cpp ${MULTIMC_RCS})
diff --git a/graphics.qrc b/graphics.qrc
deleted file mode 100644
index 68d3beed..00000000
--- a/graphics.qrc
+++ /dev/null
@@ -1,51 +0,0 @@
-<RCC>
-    <qresource prefix="/icons/toolbar">
-        <file alias="about">resources/icons/toolbar/about.png</file>
-        <file alias="bug">resources/icons/toolbar/ReportBug.png</file>
-        <file alias="centralmods">resources/icons/toolbar/centralmods.png</file>
-        <file alias="checkupdate">resources/icons/toolbar/checkupdate.png</file>
-        <file alias="help">resources/icons/toolbar/help.png</file>
-        <file alias="new">resources/icons/toolbar/new.png</file>
-        <file alias="copy">resources/icons/toolbar/InstCopy.png</file>
-        <file alias="news">resources/icons/toolbar/NewsIcon.png</file>
-        <file alias="refresh">resources/icons/toolbar/refresh.png</file>
-        <file alias="settings">resources/icons/toolbar/settings.png</file>
-        <file alias="viewfolder">resources/icons/toolbar/viewfolder.png</file>
-        <file alias="cat">resources/icons/toolbar/Cat.png</file>
-        <file alias="noaccount">resources/icons/toolbar/NoAccount.png</file>
-    </qresource>
-    <qresource prefix="/icons/instances">
-        <file alias="brick">resources/icons/instances/brick.png</file>
-        <file alias="chicken">resources/icons/instances/chicken128.png</file>
-        <file alias="creeper">resources/icons/instances/creeper128.png</file>
-        <file alias="derp">resources/icons/instances/derp.png</file>
-        <file alias="diamond">resources/icons/instances/diamond.png</file>
-        <file alias="dirt">resources/icons/instances/dirt.png</file>
-        <file alias="enderman">resources/icons/instances/enderman.png</file>
-        <file alias="enderpearl">resources/icons/instances/enderpearl128.png</file>
-        <file alias="ftb-glow">resources/icons/instances/ftb_glow128.png</file>
-        <file alias="ftb-logo">resources/icons/instances/ftb_logo128.png</file>
-        <file alias="gear">resources/icons/instances/gear128.png</file>
-        <file alias="gold">resources/icons/instances/gold.png</file>
-        <file alias="grass">resources/icons/instances/grass.png</file>
-        <file alias="herobrine">resources/icons/instances/herobrine128.png</file>
-        <file alias="infinity">resources/icons/instances/infinity128.png</file>
-        <file alias="iron">resources/icons/instances/iron.png</file>
-        <file alias="magitech">resources/icons/instances/magitech128.png</file>
-        <file alias="meat">resources/icons/instances/meat128.png</file>
-        <file alias="netherstar">resources/icons/instances/netherstar128.png</file>
-        <file alias="planks">resources/icons/instances/planks.png</file>
-        <file alias="skeleton">resources/icons/instances/skeleton128.png</file>
-        <file alias="squarecreeper">resources/icons/instances/squarecreeper128.png</file>
-        <file alias="steve">resources/icons/instances/steve128.png</file>
-        <file alias="stone">resources/icons/instances/stone.png</file>
-        <file alias="tnt">resources/icons/instances/tnt.png</file>
-    </qresource>
-    <qresource prefix="/icons/multimc">
-        <file alias="scalable/apps/multimc.svg">resources/icons/multimc.svg</file>
-        <file alias="index.theme">resources/XdgIcon.theme</file>
-    </qresource>
-    <qresource prefix="/backgrounds">
-        <file alias="kitteh">resources/catbgrnd2.png</file>
-    </qresource>
-</RCC>
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index cca1ecac..7c8562cd 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -128,7 +128,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
 	// Add the news label to the news toolbar.
 	{
 		newsLabel = new QToolButton();
-		newsLabel->setIcon(QIcon(":/icons/toolbar/news"));
+		newsLabel->setIcon(QIcon::fromTheme("news"));
 		newsLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
 		newsLabel->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
 		ui->newsToolBar->insertWidget(ui->actionMoreNews, newsLabel);
@@ -203,9 +203,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
 	m_statusLeft = new QLabel(tr("No instance selected"), this);
 	m_statusRight = new QLabel(tr("No status available"), this);
 	m_statusRefresh = new QToolButton(this);
+	m_statusRefresh->setCheckable(true);
 	m_statusRefresh->setToolButtonStyle(Qt::ToolButtonIconOnly);
-	m_statusRefresh->setIcon(
-		QPixmap(":/icons/toolbar/refresh").scaled(16, 16, Qt::KeepAspectRatio));
+	m_statusRefresh->setIcon(QIcon::fromTheme("refresh"));
 
 	statusBar()->addPermanentWidget(m_statusLeft, 1);
 	statusBar()->addPermanentWidget(m_statusRight, 0);
@@ -241,8 +241,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
 	accountMenuButton->setMenu(accountMenu);
 	accountMenuButton->setPopupMode(QToolButton::InstantPopup);
 	accountMenuButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-	accountMenuButton->setIcon(
-		QPixmap(":/icons/toolbar/noaccount").scaled(48, 48, Qt::KeepAspectRatio));
+	accountMenuButton->setIcon(QIcon::fromTheme("noaccount"));
 
 	QWidgetAction *accountMenuButtonAction = new QWidgetAction(this);
 	accountMenuButtonAction->setDefaultWidget(accountMenuButton);
@@ -408,7 +407,7 @@ void MainWindow::repopulateAccountsMenu()
 
 	QAction *action = new QAction(tr("No Default Account"), this);
 	action->setCheckable(true);
-	action->setIcon(QPixmap(":/icons/toolbar/noaccount").scaled(48, 48, Qt::KeepAspectRatio));
+	action->setIcon(QIcon::fromTheme("noaccount"));
 	action->setData("");
 	if (active_username.isEmpty())
 	{
@@ -462,8 +461,7 @@ void MainWindow::activeAccountChanged()
 	}
 
 	// Set the icon to the "no account" icon.
-	accountMenuButton->setIcon(
-		QPixmap(":/icons/toolbar/noaccount").scaled(48, 48, Qt::KeepAspectRatio));
+	accountMenuButton->setIcon(QIcon::fromTheme("noaccount"));
 }
 
 bool MainWindow::eventFilter(QObject *obj, QEvent *ev)
@@ -533,8 +531,9 @@ static QString convertStatus(const QString &status)
 
 void MainWindow::reloadStatus()
 {
+	m_statusRefresh->setChecked(true);
 	MMC->statusChecker()->reloadStatus();
-	updateStatusUI();
+	//updateStatusUI();
 }
 
 static QString makeStatusString(const QMap<QString, QString> statuses)
@@ -555,16 +554,7 @@ void MainWindow::updateStatusUI()
 	auto statuses = statusChecker->getStatusEntries();
 
 	QString status = makeStatusString(statuses);
-	if(statusChecker->isLoadingStatus())
-	{
-		m_statusRefresh->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-		m_statusRefresh->setText(tr("Loading..."));
-	}
-	else
-	{
-		m_statusRefresh->setToolButtonStyle(Qt::ToolButtonIconOnly);
-		m_statusRefresh->setText(tr(""));
-	}
+	m_statusRefresh->setChecked(false);
 
 	m_statusRight->setText(status);
 
@@ -574,8 +564,7 @@ void MainWindow::updateStatusUI()
 void MainWindow::updateStatusFailedUI()
 {
 	m_statusRight->setText(makeStatusString(QMap<QString, QString>()));
-	m_statusRefresh->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-	m_statusRefresh->setText(tr("Failed."));
+	m_statusRefresh->setChecked(false);
 
 	statusTimer.start(60 * 1000);
 }
diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index 16e72c2f..5653907e 100644
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -14,7 +14,7 @@
    <string>MultiMC 5</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../graphics.qrc">
+   <iconset resource="../resources/multimc/multimc.qrc">
     <normaloff>:/icons/multimc/scalable/apps/multimc.svg</normaloff>:/icons/multimc/scalable/apps/multimc.svg</iconset>
   </property>
   <widget class="QWidget" name="centralWidget">
@@ -152,8 +152,7 @@
   </widget>
   <action name="actionAddInstance">
    <property name="icon">
-    <iconset resource="../graphics.qrc">
-     <normaloff>:/icons/toolbar/new</normaloff>:/icons/toolbar/new</iconset>
+    <iconset theme="new"/>
    </property>
    <property name="text">
     <string>Add Instance</string>
@@ -167,8 +166,7 @@
   </action>
   <action name="actionViewInstanceFolder">
    <property name="icon">
-    <iconset resource="../graphics.qrc">
-     <normaloff>:/icons/toolbar/viewfolder</normaloff>:/icons/toolbar/viewfolder</iconset>
+    <iconset theme="viewfolder"/>
    </property>
    <property name="text">
     <string>View Instance Folder</string>
@@ -182,8 +180,7 @@
   </action>
   <action name="actionRefresh">
    <property name="icon">
-    <iconset resource="../graphics.qrc">
-     <normaloff>:/icons/toolbar/refresh</normaloff>:/icons/toolbar/refresh</iconset>
+    <iconset theme="refresh"/>
    </property>
    <property name="text">
     <string>Refresh</string>
@@ -197,8 +194,7 @@
   </action>
   <action name="actionViewCentralModsFolder">
    <property name="icon">
-    <iconset resource="../graphics.qrc">
-     <normaloff>:/icons/toolbar/centralmods</normaloff>:/icons/toolbar/centralmods</iconset>
+    <iconset theme="centralmods"/>
    </property>
    <property name="text">
     <string>View Central Mods Folder</string>
@@ -212,8 +208,7 @@
   </action>
   <action name="actionCheckUpdate">
    <property name="icon">
-    <iconset resource="../graphics.qrc">
-     <normaloff>:/icons/toolbar/checkupdate</normaloff>:/icons/toolbar/checkupdate</iconset>
+    <iconset theme="checkupdate"/>
    </property>
    <property name="text">
     <string>Check for Updates</string>
@@ -227,8 +222,7 @@
   </action>
   <action name="actionSettings">
    <property name="icon">
-    <iconset resource="../graphics.qrc">
-     <normaloff>:/icons/toolbar/settings</normaloff>:/icons/toolbar/settings</iconset>
+    <iconset theme="settings"/>
    </property>
    <property name="text">
     <string>Settings</string>
@@ -245,8 +239,7 @@
   </action>
   <action name="actionReportBug">
    <property name="icon">
-    <iconset resource="../graphics.qrc">
-     <normaloff>:/icons/toolbar/bug</normaloff>:/icons/toolbar/bug</iconset>
+    <iconset theme="bug"/>
    </property>
    <property name="text">
     <string>Report a Bug</string>
@@ -260,8 +253,7 @@
   </action>
   <action name="actionMoreNews">
    <property name="icon">
-    <iconset resource="../graphics.qrc">
-     <normaloff>:/icons/toolbar/news</normaloff>:/icons/toolbar/news</iconset>
+    <iconset theme="news"/>
    </property>
    <property name="text">
     <string>More News</string>
@@ -278,8 +270,7 @@
   </action>
   <action name="actionAbout">
    <property name="icon">
-    <iconset resource="../graphics.qrc">
-     <normaloff>:/icons/toolbar/about</normaloff>:/icons/toolbar/about</iconset>
+    <iconset theme="about"/>
    </property>
    <property name="text">
     <string>About MultiMC</string>
@@ -332,7 +323,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="../graphics.qrc">
+    <iconset resource="../resources/instances/instances.qrc">
      <normaloff>:/icons/instances/infinity</normaloff>:/icons/instances/infinity</iconset>
    </property>
    <property name="text">
@@ -472,8 +463,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="../graphics.qrc">
-     <normaloff>:/icons/toolbar/cat</normaloff>:/icons/toolbar/cat</iconset>
+    <iconset theme="cat"/>
    </property>
    <property name="text">
     <string>Meow</string>
@@ -484,8 +474,7 @@
   </action>
   <action name="actionCopyInstance">
    <property name="icon">
-    <iconset resource="../graphics.qrc">
-     <normaloff>:/icons/toolbar/copy</normaloff>:/icons/toolbar/copy</iconset>
+    <iconset theme="copy"/>
    </property>
    <property name="text">
     <string>Copy Instance</string>
@@ -508,7 +497,9 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
-  <include location="../graphics.qrc"/>
+  <include location="../resources/instances/instances.qrc"/>
+  <include location="../resources/multimc/multimc.qrc"/>
+  <include location="../resources/backgrounds/backgrounds.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/main.cpp b/main.cpp
index c91af978..181d7299 100644
--- a/main.cpp
+++ b/main.cpp
@@ -4,6 +4,7 @@
 int main_gui(MultiMC &app)
 {
 	// show main window
+	QIcon::setThemeName("multimc");
 	MainWindow mainWin;
 	mainWin.restoreState(QByteArray::fromBase64(MMC->settings()->get("MainWindowState").toByteArray()));
 	mainWin.restoreGeometry(QByteArray::fromBase64(MMC->settings()->get("MainWindowGeometry").toByteArray()));
@@ -18,7 +19,9 @@ int main(int argc, char *argv[])
 	// initialize Qt
 	MultiMC app(argc, argv);
 
-	Q_INIT_RESOURCE(graphics);
+	Q_INIT_RESOURCE(instances);
+	Q_INIT_RESOURCE(multimc);
+	Q_INIT_RESOURCE(backgrounds);
 
 	switch (app.status())
 	{
diff --git a/resources/icons/MultiMC.ico b/resources/MultiMC.ico
index 734af0fb..734af0fb 100644
--- a/resources/icons/MultiMC.ico
+++ b/resources/MultiMC.ico
diff --git a/resources/XdgIcon.theme b/resources/XdgIcon.theme
deleted file mode 100644
index ad26482e..00000000
--- a/resources/XdgIcon.theme
+++ /dev/null
@@ -1,12 +0,0 @@
-[Icon Theme]
-Name=MultiMC
-Comment=MultiMC Default Icons
-Inherits=default
-Directories=scalable/apps
-
-[scalable/apps]
-Size=48
-Type=scalable
-MinSize=1
-MaxSize=512
-Context=Applications
diff --git a/resources/backgrounds/backgrounds.qrc b/resources/backgrounds/backgrounds.qrc
new file mode 100644
index 00000000..55de139e
--- /dev/null
+++ b/resources/backgrounds/backgrounds.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+    <qresource prefix="/backgrounds">
+        <file alias="kitteh">catbgrnd2.png</file>
+    </qresource>
+</RCC>
diff --git a/resources/catbgrnd2.png b/resources/backgrounds/catbgrnd2.png
index 2b949e0b..2b949e0b 100644
--- a/resources/catbgrnd2.png
+++ b/resources/backgrounds/catbgrnd2.png
diff --git a/resources/icons/instances/brick.png b/resources/instances/brick.png
index 0b534366..0b534366 100644
--- a/resources/icons/instances/brick.png
+++ b/