4 files changed, 25 insertions, 17 deletions

diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp
index 0ffe8050..cec496dc 100644
--- a/launcher/ui/pages/global/LauncherPage.cpp
+++ b/launcher/ui/pages/global/LauncherPage.cpp
@@ -247,16 +247,16 @@ void LauncherPage::applySettings()
     switch (ui->themeComboBox->currentIndex())
     {
     case 0:
-        s->set("IconTheme", "pe_dark");
+        s->set("IconTheme", "pe_colored");
         break;
     case 1:
         s->set("IconTheme", "pe_light");
         break;
     case 2:
-        s->set("IconTheme", "pe_blue");
+        s->set("IconTheme", "pe_dark");
         break;
     case 3:
-        s->set("IconTheme", "pe_colored");
+        s->set("IconTheme", "pe_blue");
         break;
     case 4:
         s->set("IconTheme", "OSX");
@@ -268,10 +268,10 @@ void LauncherPage::applySettings()
         s->set("IconTheme", "flat");
         break;
     case 7:
-        s->set("IconTheme", "custom");
+        s->set("IconTheme", "multimc");
         break;
     case 8:
-        s->set("IconTheme", "multimc");
+        s->set("IconTheme", "custom");
         break;
     }
 
@@ -324,7 +324,7 @@ void LauncherPage::loadSettings()
     m_currentUpdateChannel = s->get("UpdateChannel").toString();
     //FIXME: make generic
     auto theme = s->get("IconTheme").toString();
-    if (theme == "pe_dark")
+    if (theme == "pe_colored")
     {
         ui->themeComboBox->setCurrentIndex(0);
     }
@@ -332,11 +332,11 @@ void LauncherPage::loadSettings()
     {
         ui->themeComboBox->setCurrentIndex(1);
     }
-    else if (theme == "pe_blue")
+    else if (theme == "pe_dark")
     {
         ui->themeComboBox->setCurrentIndex(2);
     }
-    else if (theme == "pe_colored")
+    else if (theme == "pe_blue")
     {
         ui->themeComboBox->setCurrentIndex(3);
     }
diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index 47fed873..59096a28 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -264,7 +264,7 @@
             </property>
             <item>
              <property name="text">
-              <string>Simple (Dark Icons)</string>
+              <string>Simple (Colored Icons)</string>
              </property>
             </item>
             <item>
@@ -274,12 +274,12 @@
             </item>
             <item>
              <property name="text">
-              <string>Simple (Blue Icons)</string>
+              <string>Simple (Dark Icons)</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>Simple (Colored Icons)</string>
+              <string>Simple (Blue Icons)</string>
              </property>
             </item>
             <item>
@@ -294,17 +294,17 @@
             </item>
             <item>
              <property name="text">
-              <string notr="true">Flat</string>
+              <string>Flat</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>Custom</string>
+              <string>Legacy</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>MultiMC</string>
+              <string>Custom</string>
              </property>
             </item>
            </widget>
diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp
index b342accf..e4ad9012 100644
--- a/launcher/ui/pages/instance/ModFolderPage.cpp
+++ b/launcher/ui/pages/instance/ModFolderPage.cpp
@@ -143,11 +143,19 @@ ModFolderPage::ModFolderPage(
     ui(new Ui::ModFolderPage)
 {
     ui->setupUi(this);
+
+    // This is structured like that so that these changes
+    // do not affect the Resouce pack and Shader pack tabs
     if(id == "mods") {
-        auto act = new QAction(tr("Install Mods"), this);
-        ui->actionsToolbar->insertActionBefore(ui->actionView_configs,act);
+        auto act = new QAction(tr("Download mods"), this);
+        act->setToolTip(tr("Download mods from online mod platforms"));
+        ui->actionsToolbar->insertActionBefore(ui->actionAdd, act);
         connect(act, &QAction::triggered, this, &ModFolderPage::on_actionInstall_mods_triggered);
+
+        ui->actionAdd->setText("Add .jar");
+        ui->actionAdd->setToolTip("Add mods via local file");
     }
+
     ui->actionsToolbar->insertSpacer(ui->actionView_configs);
 
     m_inst = inst;
diff --git a/launcher/ui/pages/instance/ModFolderPage.ui b/launcher/ui/pages/instance/ModFolderPage.ui
index 0fb51e84..ab59b0df 100644
--- a/launcher/ui/pages/instance/ModFolderPage.ui
+++ b/launcher/ui/pages/instance/ModFolderPage.ui
@@ -96,7 +96,7 @@
     <string>&amp;Add</string>
    </property>
    <property name="toolTip">
-    <string>Add mods</string>
+    <string>Add</string>
    </property>
   </action>
   <action name="actionRemove">