2 files changed, 15 insertions, 26 deletions

diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.cpp b/launcher/ui/widgets/ThemeCustomizationWidget.cpp
index 3bfcd821..455cbb7b 100644
--- a/launcher/ui/widgets/ThemeCustomizationWidget.cpp
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.cpp
@@ -73,10 +73,9 @@ void ThemeCustomizationWidget::showFeatures(ThemeFields features) {
 void ThemeCustomizationWidget::applyIconTheme(int index) {
     auto settings = APPLICATION->settings();
     auto originalIconTheme = settings->get("IconTheme").toString();
-    auto& newIconTheme = m_iconThemeOptions[index].first;
-    settings->set("IconTheme", newIconTheme);
-
+    auto newIconTheme = ui->iconsComboBox->currentData().toString();
     if (originalIconTheme != newIconTheme) {
+        settings->set("IconTheme", newIconTheme);
         APPLICATION->applyCurrentlySelectedTheme();
     }
 
@@ -112,12 +111,17 @@ void ThemeCustomizationWidget::loadSettings()
 {
     auto settings = APPLICATION->settings();
 
-    auto iconTheme = settings->get("IconTheme").toString();
-    for (auto& iconThemeFromList : m_iconThemeOptions) {
-        QIcon iconForComboBox = QIcon(QString(":/icons/%1/scalable/settings").arg(iconThemeFromList.first));
-        ui->iconsComboBox->addItem(iconForComboBox, iconThemeFromList.second);
-        if (iconTheme == iconThemeFromList.first) {
-            ui->iconsComboBox->setCurrentIndex(ui->iconsComboBox->count() - 1);
+    {
+        auto currentIconTheme = settings->get("IconTheme").toString();
+        auto iconThemes = APPLICATION->getValidIconThemes();
+        int idx = 0;
+        for (auto iconTheme : iconThemes) {
+            QIcon iconForComboBox = QIcon(iconTheme->path() + "/scalable/settings");
+            ui->iconsComboBox->addItem(iconForComboBox, iconTheme->name(), iconTheme->id());
+            if (currentIconTheme == iconTheme->id()) {
+                ui->iconsComboBox->setCurrentIndex(idx);
+            }
+            idx++;
         }
     }
 
diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.h b/launcher/ui/widgets/ThemeCustomizationWidget.h
index 6c33c3c5..976ede43 100644
--- a/launcher/ui/widgets/ThemeCustomizationWidget.h
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.h
@@ -31,7 +31,7 @@ class ThemeCustomizationWidget : public QWidget {
 
    public:
     explicit ThemeCustomizationWidget(QWidget* parent = nullptr);
-    ~ThemeCustomizationWidget();
+    ~ThemeCustomizationWidget() override;
 
     void showFeatures(ThemeFields features);
 
@@ -53,22 +53,7 @@ class ThemeCustomizationWidget : public QWidget {
    private:
     Ui::ThemeCustomizationWidget* ui;
 
-    //TODO finish implementing
-    QList<std::pair<QString, QString>> m_iconThemeOptions{ 
-        { "pe_colored",     QObject::tr("Simple (Colored Icons)") }, 
-        { "pe_light",       QObject::tr("Simple (Light Icons)") },     
-        { "pe_dark",        QObject::tr("Simple (Dark Icons)") },
-        { "pe_blue",        QObject::tr("Simple (Blue Icons)") },    
-        { "breeze_light",   QObject::tr("Breeze Light") }, 
-        { "breeze_dark",    QObject::tr("Breeze Dark") },
-        { "OSX",            QObject::tr("OSX") },        
-        { "iOS",            QObject::tr("iOS") },          
-        { "flat",           QObject::tr("Flat") },
-        { "flat_white",     QObject::tr("Flat (White)") }, 
-        { "multimc",        QObject::tr("Legacy") },      
-        { "custom",         QObject::tr("Custom") } 
-    };
-    QList<std::pair<QString, QString>> m_catOptions{ 
+    QList<std::pair<QString, QString>> m_catOptions{
         { "kitteh",     QObject::tr("Background Cat (from MultiMC)") }, 
         { "rory",       QObject::tr("Rory ID 11 (drawn by Ashtaka)") }, 
         { "rory-flat",  QObject::tr("Rory ID 11 (flat edition, drawn by Ashtaka)") },