diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index a8bfd52e3..dbf55f425 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -1489,12 +1489,9 @@ std::shared_ptr<JavaInstallList> Application::javalist()
     return m_javalist;
 }
 
-QIcon Application::getThemedIcon(const QString& name)
+QIcon Application::logo()
 {
-    if (name == "logo") {
-        return QIcon(":/" + BuildConfig.LAUNCHER_SVGFILENAME);
-    }
-    return QIcon::fromTheme(name);
+    return QIcon(":/" + BuildConfig.LAUNCHER_SVGFILENAME);
 }
 
 bool Application::openJsonEditor(const QString& filename)
diff --git a/launcher/Application.h b/launcher/Application.h
index 52a84b461..0fd733b50 100644
--- a/launcher/Application.h
+++ b/launcher/Application.h
@@ -116,7 +116,7 @@ class Application : public QApplication {
 
     qint64 timeSinceStart() const { return m_startTime.msecsTo(QDateTime::currentDateTime()); }
 
-    QIcon getThemedIcon(const QString& name);
+    QIcon logo();
 
     ThemeManager* themeManager() { return m_themeManager.get(); }
 
diff --git a/launcher/VersionProxyModel.cpp b/launcher/VersionProxyModel.cpp
index 950b2276a..32048db8e 100644
--- a/launcher/VersionProxyModel.cpp
+++ b/launcher/VersionProxyModel.cpp
@@ -37,9 +37,9 @@
 #include "VersionProxyModel.h"
 #include <Version.h>
 #include <meta/VersionList.h>
+#include <QIcon>
 #include <QPixmapCache>
 #include <QSortFilterProxyModel>
-#include "Application.h"
 
 class VersionFilterModel : public QSortFilterProxyModel {
     Q_OBJECT
@@ -206,11 +206,11 @@ QVariant VersionProxyModel::data(const QModelIndex& index, int role) const
             if (column == Name && hasRecommended) {
                 auto recommenced = sourceModel()->data(parentIndex, BaseVersionList::RecommendedRole);
                 if (recommenced.toBool()) {
-                    return APPLICATION->getThemedIcon("star");
+                    return QIcon::fromTheme("star");
                 } else if (hasLatest) {
                     auto latest = sourceModel()->data(parentIndex, BaseVersionList::LatestRole);
                     if (latest.toBool()) {
-                        return APPLICATION->getThemedIcon("bug");
+                        return QIcon::fromTheme("bug");
                     }
                 }
                 QPixmap pixmap;
diff --git a/launcher/minecraft/ShortcutUtils.cpp b/launcher/minecraft/ShortcutUtils.cpp
index 0336a9512..ec4ebb31a 100644
--- a/launcher/minecraft/ShortcutUtils.cpp
+++ b/launcher/minecraft/ShortcutUtils.cpp
@@ -123,7 +123,7 @@ bool createInstanceShortcut(const Shortcut& shortcut, const QString& filePath)
 
     // part of fix for weird bug involving the window icon being replaced
     // dunno why it happens, but parent 2-line fix seems to be enough, so w/e
-    auto appIcon = APPLICATION->getThemedIcon("logo");
+    auto appIcon = APPLICATION->logo();
 
     QFile iconFile(iconPath);
     if (!iconFile.open(QFile::WriteOnly)) {
diff --git a/launcher/minecraft/mod/DataPackFolderModel.cpp b/launcher/minecraft/mod/DataPackFolderModel.cpp
index 45cf1271f..1a2badd77 100644
--- a/launcher/minecraft/mod/DataPackFolderModel.cpp
+++ b/launcher/minecraft/mod/DataPackFolderModel.cpp
@@ -42,7 +42,6 @@
 #include <QIcon>
 #include <QStyle>
 
-#include "Application.h"
 #include "Version.h"
 
 #include "minecraft/mod/tasks/LocalDataPackParseTask.h"
@@ -92,7 +91,7 @@ QVariant DataPackFolderModel::data(const QModelIndex& index, int role) const
             }
         case Qt::DecorationRole: {
             if (column == NameColumn && (at(row).isSymLinkUnder(instDirPath()) || at(row).isMoreThanOneHardLink()))
-                return APPLICATION->getThemedIcon("status-yellow");
+                return QIcon::fromTheme("status-yellow");
             if (column == ImageColumn) {
                 return at(row).image({ 32, 32 }, Qt::AspectRatioMode::KeepAspectRatioByExpanding);
             }
diff --git a/launcher/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp
index b613e0af1..45ec76f19 100644
--- a/launcher/minecraft/mod/ModFolderModel.cpp
+++ b/launcher/minecraft/mod/ModFolderModel.cpp
@@ -49,8 +49,6 @@
 #include <QUrl>
 #include <QUuid>
 
-#include "Application.h"
-
 #include "minecraft/mod/tasks/LocalModParseTask.h"
 
 ModFolderModel::ModFolderModel(const QDir& dir, BaseInstance* instance, bool is_indexed, bool create_dir, QObject* parent)
@@ -132,7 +130,7 @@ QVariant ModFolderModel::data(const QModelIndex& index, int role) const
             return m_resources[row]->internal_id();
         case Qt::DecorationRole: {
             if (column == NameColumn && (at(row).isSymLinkUnder(instDirPath()) || at(row).isMoreThanOneHardLink()))
-                return APPLICATION->getThemedIcon("status-yellow");
+                return QIcon::fromTheme("status-yellow");
             if (column == ImageColumn) {
                 return at(row).icon({ 32, 32 }, Qt::AspectRatioMode::KeepAspectRatioByExpanding);
             }
diff --git a/launcher/minecraft/mod/ResourceFolderModel.cpp b/launcher/minecraft/mod/ResourceFolderModel.cpp
index f93002f06..2b4f9eb14 100644
--- a/launcher/minecraft/mod/ResourceFolderModel.cpp
+++ b/launcher/minecraft/mod/ResourceFolderModel.cpp
@@ -503,7 +503,7 @@ QVariant ResourceFolderModel::data(const QModelIndex& index, int role) const
             return m_resources[row]->internal_id();
         case Qt::DecorationRole: {
             if (column == NameColumn && (at(row).isSymLinkUnder(instDirPath()) || at(row).isMoreThanOneHardLink()))
-                return APPLICATION->getThemedIcon("status-yellow");
+                return QIcon::fromTheme("status-yellow");
 
             return {};
         }
@@ -709,8 +709,7 @@ SortType ResourceFolderModel::columnToSortKey(size_t column) const
 }
 
 /* Standard Proxy Model for createFilterProxyModel */
-bool ResourceFolderModel::ProxyModel::filterAcceptsRow(int source_row,
-                                                                     [[maybe_unused]] const QModelIndex& source_parent) const
+bool ResourceFolderModel::ProxyModel::filterAcceptsRow(int source_row, [[maybe_unused]] const QModelIndex& source_parent) const
 {
     auto* model = qobject_cast<ResourceFolderModel*>(sourceModel());
     if (!model)
diff --git a/launcher/minecraft/mod/ResourcePackFolderModel.cpp b/launcher/minecraft/mod/ResourcePackFolderModel.cpp
index d9f27a043..df572484b 100644
--- a/launcher/minecraft/mod/ResourcePackFolderModel.cpp
+++ b/launcher/minecraft/mod/ResourcePackFolderModel.cpp
@@ -41,7 +41,6 @@
 #include <QIcon>
 #include <QStyle>
 
-#include "Application.h"
 #include "Version.h"
 
 #include "minecraft/mod/tasks/LocalDataPackParseTask.h"
@@ -96,7 +95,7 @@ QVariant ResourcePackFolderModel::data(const QModelIndex& index, int role) const
             }
         case Qt::DecorationRole: {
             if (column == NameColumn && (at(row).isSymLinkUnder(instDirPath()) || at(row).isMoreThanOneHardLink()))
-                return APPLICATION->getThemedIcon("status-yellow");
+                return QIcon::fromTheme("status-yellow");
             if (column == ImageColumn) {
                 return at(row).image({ 32, 32 }, Qt::AspectRatioMode::KeepAspectRatioByExpanding);
             }
diff --git a/launcher/minecraft/mod/TexturePackFolderModel.cpp b/launcher/minecraft/mod/TexturePackFolderModel.cpp
index 8b89b45cd..57c5f8ee9 100644
--- a/launcher/minecraft/mod/TexturePackFolderModel.cpp
+++ b/launcher/minecraft/mod/TexturePackFolderModel.cpp
@@ -33,10 +33,6 @@
  *      See the License for the specific language governing permissions and
  *      limitations under the License.
  */
-#include <QCoreApplication>
-
-#include "Application.h"
-
 #include "TexturePackFolderModel.h"
 
 #include "minecraft/mod/tasks/LocalTexturePackParseTask.h"
@@ -98,7 +94,7 @@ QVariant TexturePackFolderModel::data(const QModelIndex& index, int role) const
             return m_resources[row]->internal_id();
         case Qt::DecorationRole: {
             if (column == NameColumn && (at(row).isSymLinkUnder(instDirPath()) || at(row).isMoreThanOneHardLink()))
-                return APPLICATION->getThemedIcon("status-yellow");
+                return QIcon::fromTheme("status-yellow");
             if (column == ImageColumn) {
                 return at(row).image({ 32, 32 }, Qt::AspectRatioMode::KeepAspectRatioByExpanding);
             }
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index d89224504..3cec0ae53 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -148,7 +148,7 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
 {
     ui->setupUi(this);
 
-    setWindowIcon(APPLICATION->getThemedIcon("logo"));
+    setWindowIcon(APPLICATION->logo());
     setWindowTitle(APPLICATION->applicationDisplayName());
 #ifndef QT_NO_ACCESSIBILITY
     setAccessibleName(BuildConfig.LAUNCHER_DISPLAYNAME);
@@ -165,7 +165,7 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
         // qt designer will delete it when you save the file >:(
         changeIconButton = new LabeledToolButton(this);
         changeIconButton->setObjectName(QStringLiteral("changeIconButton"));
-        changeIconButton->setIcon(APPLICATION->getThemedIcon("news"));
+        changeIconButton->setIcon(QIcon::fromTheme("news"));
         changeIconButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
         connect(changeIconButton, &QToolButton::clicked, this, &MainWindow::on_actionChangeInstIcon_triggered);
         ui->instanceToolBar->insertWidgetBefore(ui->actionLaunchInstance, changeIconButton);
@@ -277,7 +277,7 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
     {
         m_newsChecker.reset(new NewsChecker(APPLICATION->network(), BuildConfig.NEWS_RSS_URL));
         newsLabel = new QToolButton();
-        newsLabel->setIcon(APPLICATION->getThemedIcon("news"));
+        newsLabel->setIcon(QIcon::fromTheme("news"));
         newsLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
         newsLabel->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
         newsLabel->setFocusPolicy(Qt::NoFocus);
@@ -684,7 +684,7 @@ void MainWindow::repopulateAccountsMenu()
             if (!face.isNull()) {
                 action->setIcon(face);
             } else {
-                action->setIcon(APPLICATION->getThemedIcon("noaccount"));
+                action->setIcon(QIcon::fromTheme("noaccount"));
             }
 
             const int highestNumberKey = 9;
@@ -755,7 +755,7 @@ void MainWindow::defaultAccountChanged()
         ui->actionAccountsButton->setText(profileLabel);
         auto face = account->getFace();
         if (face.isNull()) {
-            ui->actionAccountsButton->setIcon(APPLICATION->getThemedIcon("noaccount"));
+            ui->actionAccountsButton->setIcon(QIcon::fromTheme("noaccount"));
         } else {
             ui->actionAccountsButton->setIcon(face);
         }
@@ -763,7 +763,7 @@ void MainWindow::defaultAccountChanged()
     }
 
     // Set the icon to the "no account" icon.
-    ui->actionAccountsButton->setIcon(APPLICATION->getThemedIcon("noaccount"));
+    ui->actionAccountsButton->setIcon(QIcon::fromTheme("noaccount"));
     ui->actionAccountsButton->setText(tr("Accounts"));
 }
 
diff --git a/launcher/ui/ViewLogWindow.cpp b/launcher/ui/ViewLogWindow.cpp
index c0c56f3ee..f4390e2f1 100644
--- a/launcher/ui/ViewLogWindow.cpp
+++ b/launcher/ui/ViewLogWindow.cpp
@@ -8,7 +8,7 @@ ViewLogWindow::ViewLogWindow(QWidget* parent)
     : QMainWindow(parent), m_page(new OtherLogsPage("launcher-logs", tr("Launcher Logs"), "Launcher-Logs", nullptr, parent))
 {
     setAttribute(Qt::WA_DeleteOnClose);
-    setWindowIcon(APPLICATION->getThemedIcon("log"));
+    setWindowIcon(QIcon::fromTheme("log"));
     setWindowTitle(tr("View Launcher Logs"));
     setCentralWidget(m_page);
     setMinimumSize(m_page->size());
diff --git a/launcher/ui/dialogs/AboutDialog.cpp b/launcher/ui/dialogs/AboutDialog.cpp
index 5b7d44ff7..0f3067719 100644
--- a/launcher/ui/dialogs/AboutDialog.cpp
+++ b/launcher/ui/dialogs/AboutDialog.cpp
@@ -147,7 +147,7 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent), ui(new Ui::AboutDia
 
     ui->urlLabel->setOpenExternalLinks(true);
 
-    ui->icon->setPixmap(APPLICATION->getThemedIcon("logo").pixmap(64));
+    ui->icon->setPixmap(APPLICATION->logo().pixmap(64));
     ui->title->setText(launcherName);
 
     ui->versionLabel->setText(BuildConfig.printableVersionString());
diff --git a/launcher/ui/dialogs/CreateShortcutDialog.cpp b/launcher/ui/dialogs/CreateShortcutDialog.cpp
index 5cfe33c7f..574881ad0 100644
--- a/launcher/ui/dialogs/CreateShortcutDialog.cpp
+++ b/launcher/ui/dialogs/CreateShortcutDialog.cpp
@@ -38,7 +38,6 @@
 #include <QLayout>
 #include <QPushButton>
 
-#include "Application.h"
 #include "BuildConfig.h"
 #include "CreateShortcutDialog.h"
 #include "ui_CreateShortcutDialog.h"
@@ -112,7 +111,7 @@ CreateShortcutDialog::CreateShortcutDialog(InstancePtr instance, QWidget* parent
             if (account->isInUse())
                 profileLabel = tr("%1 (in use)").arg(profileLabel);
             auto face = account->getFace();
-            QIcon icon = face.isNull() ? APPLICATION->getThemedIcon("noaccount") : face;
+            QIcon icon = face.isNull() ? QIcon::fromTheme("noaccount") : face;
             ui->accountSelectionBox->addItem(profileLabel, account->profileName());
             ui->accountSelectionBox->setItemIcon(i, icon);
             if (defaultAccount == account)
diff --git a/launcher/ui/dialogs/InstallLoaderDialog.cpp b/launcher/ui/dialogs/InstallLoaderDialog.cpp
index 7082125f2..552b83776 100644
--- a/launcher/ui/dialogs/InstallLoaderDialog.cpp
+++ b/launcher/ui/dialogs/InstallLoaderDialog.cpp
@@ -53,7 +53,7 @@ class InstallLoaderPage : public VersionSelectWidget, public BasePage {
 
     QString id() const override { return uid; }
     QString displayName() const override { return name; }
-    QIcon icon() const override { return APPLICATION->getThemedIcon(iconName); }
+    QIcon icon() const override { return QIcon::fromTheme(iconName); }
 
     void openedImpl() override
     {
diff --git a/launcher/ui/dialogs/NewInstanceDialog.cpp b/launcher/ui/dialogs/NewInstanceDialog.cpp
index 9e74cd7ac..5542f6986 100644
--- a/launcher/ui/dialogs/NewInstanceDialog.cpp
+++ b/launcher/ui/dialogs/NewInstanceDialog.cpp
@@ -74,7 +74,7 @@ NewInstanceDialog::NewInstanceDialog(const QString& initialGroup,
 {
     ui->setupUi(this);
 
-    setWindowIcon(APPLICATION->getThemedIcon("new"));
+    setWindowIcon(QIcon::fromTheme("new"));
 
     InstIconKey = "default";
     ui->iconButton->setIcon(APPLICATION->icons()->getIcon(InstIconKey));
diff --git a/launcher/ui/dialogs/ProfileSetupDialog.cpp b/launcher/ui/dialogs/ProfileSetupDialog.cpp
index 0b5e1a784..af8b26c66 100644
--- a/launcher/ui/dialogs/ProfileSetupDialog.cpp
+++ b/launcher/ui/dialogs/ProfileSetupDialog.cpp
@@ -55,9 +55,9 @@ ProfileSetupDialog::ProfileSetupDialog(MinecraftAccountPtr accountToSetup, QWidg
     ui->setupUi(this);
     ui->errorLabel->setVisible(false);
 
-    goodIcon = APPLICATION->getThemedIcon("status-good");
-    yellowIcon = APPLICATION->getThemedIcon("status-yellow");
-    badIcon = APPLICATION->getThemedIcon("status-bad");
+    goodIcon = QIcon::fromTheme("status-good");
+    yellowIcon = QIcon::fromTheme("status-yellow");
+    badIcon = QIcon::fromTheme("status-bad");
 
     static const QRegularExpression s_permittedNames("[a-zA-Z0-9_]{3,16}");
     auto nameEdit = ui->nameEdit;
diff --git a/launcher/ui/dialogs/ResourceDownloadDialog.cpp b/launcher/ui/dialogs/ResourceDownloadDialog.cpp
index 191feeb88..3015ae6e7 100644
--- a/launcher/ui/dialogs/ResourceDownloadDialog.cpp
+++ b/launcher/ui/dialogs/ResourceDownloadDialog.cpp
@@ -59,7 +59,7 @@ ResourceDownloadDialog::ResourceDownloadDialog(QWidget* parent, const std::share
 
     resize(static_cast<int>(std::max(0.5 * parent->width(), 400.0)), static_cast<int>(std::max(0.75 * parent->height(), 400.0)));
 
-    setWindowIcon(APPLICATION->getThemedIcon("new"));
+    setWindowIcon(QIcon::fromTheme("new"));
 
     // Bonk Qt over its stupid head and make sure it understands which button is the default one...
     // See: https://stackoverflow.com/questions/24556831/qbuttonbox-set-default-button
diff --git a/launcher/ui/dialogs/ReviewMessageBox.cpp b/launcher/ui/dialogs/ReviewMessageBox.cpp
index 96cc8149f..c5f7b5fbe 100644
--- a/launcher/ui/dialogs/ReviewMessageBox.cpp
+++ b/launcher/ui/dialogs/ReviewMessageBox.cpp
@@ -1,8 +1,6 @@
 #include "ReviewMessageBox.h"
 #include "ui_ReviewMessageBox.h"
 
-#include "Application.h"
-
 #include <QPushButton>
 
 ReviewMessageBox::ReviewMessageBox(QWidget* parent, [[maybe_unused]] QString const& title, [[maybe_unused]] QString const& icon)
@@ -56,7 +54,7 @@ void ReviewMessageBox::appendResource(ResourceInformation&& info)
 
         itemTop->insertChildren(1, { customPathItem });
 
-        itemTop->setIcon(1, QIcon(APPLICATION->getThemedIcon("status-yellow")));
+        itemTop->setIcon(1, QIcon(QIcon::fromTheme("status-yellow")));
         itemTop->setToolTip(
             childIndx++,
             tr("This file will be downloaded to a folder location different from the default, possibly due to its loader requiring it."));
diff --git a/launcher/ui/dialogs/UpdateAvailableDialog.cpp b/launcher/ui/dialogs/UpdateAvailableDialog.cpp
index 810a1f089..f288fe760 100644
--- a/launcher/ui/dialogs/UpdateAvailableDialog.cpp
+++ b/launcher/ui/dialogs/UpdateAvailableDialog.cpp
@@ -22,7 +22,6 @@
 
 #include "UpdateAvailableDialog.h"
 #include <QPushButton>
-#include "Application.h"
 #include "BuildConfig.h"
 #include "Markdown.h"
 #include "StringUtils.h"
@@ -41,7 +40,7 @@ UpdateAvailableDialog::UpdateAvailableDialog(const QString& currentVersion,
     ui->headerLabel->setText(tr("A new version of %1 is available!").arg(launcherName));
     ui->versionAvailableLabel->setText(
         tr("Version %1 is now available - you have %2 . Would you like to download it now?").arg(availableVersion).arg(currentVersion));
-    ui->icon->setPixmap(APPLICATION->getThemedIcon("checkupdate").pixmap(64));
+    ui->icon->setPixmap(QIcon::fromTheme("checkupdate").pixmap(64));
 
     auto releaseNotesHtml = markdownToHTML(releaseNotes);
     ui->releaseNotes->setHtml(StringUtils::htmlListPatch(releaseNotesHtml));
diff --git a/launcher/ui/java/InstallJavaDialog.cpp b/launcher/ui/java/InstallJavaDialog.cpp
index 4a628b003..1db4971f4 100644
--- a/launcher/ui/java/InstallJavaDialog.cpp
+++ b/launcher/ui/java/InstallJavaDialog.cpp
@@ -97,7 +97,7 @@ class InstallJavaPage : public QWidget, public BasePage {
 
     QString id() const override { return uid; }
     QString displayName() const override { return name; }
-    QIcon icon() const override { return APPLICATION->getThemedIcon(iconName); }
+    QIcon icon() const override { return QIcon::fromTheme(iconName); }
 
     void openedImpl() override
     {
diff --git a/launcher/ui/pages/global/APIPage.h b/launcher/ui/pages/global/APIPage.h
index 9252a9ab3..7a22aa069 100644
--- a/launcher/ui/pages/global/APIPage.h
+++ b/launcher/ui/pages/global/APIPage.h
@@ -39,7 +39,6 @@
 
 #include <QWidget>
 
-#include <Application.h>
 #include "ui/pages/BasePage.h"
 
 namespace Ui {
@@ -54,7 +53,7 @@ class APIPage : public QWidget, public BasePage {
     ~APIPage();
 
     QString displayName() const override { return tr("Services"); }
-    QIcon icon() const override { return APPLICATION->getThemedIcon("worlds"); }
+    QIcon icon() const override { return QIcon::fromTheme("worlds"); }
     QString id() const override { return "apis"; }
     QString helpPage() const override { return "APIs"; }
     virtual bool apply() override;
diff --git a/launcher/ui/pages/global/AccountListPage.h b/launcher/ui/pages/global/AccountListPage.h
index 7bd5101c0..2841b9456 100644
--- a/launcher/ui/pages/global/AccountListPage.h
+++ b/launcher/ui/pages/global/AccountListPage.h
@@ -41,7 +41,6 @@
 
 #include "ui/pages/BasePage.h"
 
-#include "Application.h"
 #include "minecraft/auth/AccountList.h"
 
 namespace Ui {
@@ -59,9 +58,9 @@ class AccountListPage : public QMainWindow, public BasePage {
     QString displayName() const override { return tr("Accounts"); }
     QIcon icon() const override
     {
-        auto icon = APPLICATION->getThemedIcon("accounts");
+        auto icon = QIcon::fromTheme("accounts");
         if (icon.isNull()) {
-            icon = APPLICATION->getThemedIcon("noaccount");
+            icon = QIcon::fromTheme("noaccount");
         }
         return icon;
     }
diff --git a/launcher/ui/pages/global/AppearancePage.h b/launcher/ui/pages/global/AppearancePage.h
index 29b2d34bf..2220db2cd 100644
--- a/launcher/ui/pages/global/AppearancePage.h
+++ b/launcher/ui/pages/global/AppearancePage.h
@@ -37,7 +37,6 @@
 
 #include <QDialog>
 #include <QLayout>
-#include "Application.h"
 #include "java/JavaChecker.h"
 #include "translations/TranslationsModel.h"
 #include "ui/pages/BasePage.h"
@@ -53,7 +52,7 @@ class AppearancePage : public AppearanceWidget, public BasePage {
     explicit AppearancePage(QWidget* parent = nullptr) : AppearanceWidget(false, parent) { layout()->setContentsMargins(0, 0, 6, 0); }
 
     QString displayName() const override { return tr("Appearance"); }
-    QIcon icon() const override { return APPLICATION->getThemedIcon("appearance"); }
+    QIcon icon() const override { return QIcon::fromTheme("appearance"); }
     QString id() const override { return "appearance-settings"; }
     QString helpPage() const override { return "Launcher-settings"; }
 
diff --git a/launcher/ui/pages/global/ExternalToolsPage.h b/launcher/ui/pages/global/ExternalToolsPage.h
index 377488ccf..702ace557 100644
--- a/launcher/ui/pages/global/ExternalToolsPage.h
+++ b/launcher/ui/pages/global/ExternalToolsPage.h
@@ -37,7 +37,6 @@
 
 #include <QWidget>
 
-#include <Application.h>
 #include "ui/pages/BasePage.h"
 
 namespace Ui {
@@ -54,9 +53,9 @@ class ExternalToolsPage : public QWidget, public BasePage {
     QString displayName() const override { return tr("Tools"); }
     QIcon icon() const override
     {
-        auto icon = APPLICATION->getThemedIcon("externaltools");
+        auto icon = QIcon::fromTheme("externaltools");
         if (icon.isNull()) {
-            icon = APPLICATION->getThemedIcon("loadermods");
+            icon = QIcon::fromTheme("loadermods");
         }
         return icon;
     }
diff --git a/launcher/ui/pages/global/JavaPage.h b/launcher/ui/pages/global/JavaPage.h
index b30fa22e3..79a3d1b96 100644
--- a/launcher/ui/pages/global/JavaPage.h
+++ b/launcher/ui/pages/global/JavaPage.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <Application.h>
 #include <QObjectPtr.h>
 #include <QDialog>
 #include <QStringListModel>
@@ -57,7 +56,7 @@ class JavaPage : public QWidget, public BasePage {
     ~JavaPage();
 
     QString displayName() const override { return tr("Java"); }
-    QIcon icon() const override { return APPLICATION->getThemedIcon("java"); }
+    QIcon icon() const override { return QIcon::fromTheme("java"); }
     QString id() const override { return "java-settings"; }
     QString helpPage() const override { return "Java-settings"; }
     void retranslate() override;
diff --git a/launcher/ui/pages/global/LanguagePage.cpp b/launcher/ui/pages/global/LanguagePage.cpp
index af6fc1727..f4be75782 100644
--- a/launcher/ui/pages/global/LanguagePage.cpp
+++ b/launcher/ui/pages/global/LanguagePage.cpp
@@ -37,6 +37,7 @@
 #include "LanguagePage.h"
 
 #include <QVBoxLayout>
+#include "Application.h"
 #include "ui/widgets/LanguageSelectionWidget.h"
 
 LanguagePage::LanguagePage(QWidget* parent) : QWidget(parent)
diff --git a/launcher/ui/pages/global/LanguagePage.h b/launcher/ui/pages/global/LanguagePage.h
index ff7ce7ddc..b376e1cf2 100644
--- a/launcher/ui/pages/global/LanguagePage.h
+++ b/launcher/ui/pages/global/LanguagePage.h
@@ -36,7 +36,6 @@
 
 #pragma once
 
-#include <Application.h>
 #include <QWidget>
 #include <memory>
 #include "ui/pages/BasePage.h"
@@ -51,7 +50,7 @@ class LanguagePage : public QWidget, public BasePage {
     virtual ~LanguagePage();
 
     QString displayName() const override { return tr("Language"); }
-    QIcon icon() const override { return APPLICATION->getThemedIcon("language"); }
+    QIcon icon() const override { return QIcon::fromTheme("language"); }
     QString id() const override { return "language-settings"; }
     QString helpPage() const override { return "Language-settings"; }
     bool apply() override;
diff --git a/launcher/ui/pages/global/LauncherPage.h b/launcher/ui/pages/global/LauncherPage.h
index d76c84b63..263bf08bb 100644
--- a/launcher/ui/pages/global/LauncherPage.h
+++ b/launcher/ui/pages/global/LauncherPage.h
@@ -38,7 +38,6 @@
 #include <QDialog>
 #include <memory>
 
-#include <Application.h>
 #include <translations/TranslationsModel.h>
 #include "java/JavaChecker.h"
 #include "ui/pages/BasePage.h"
@@ -58,7 +57,7 @@ class LauncherPage : public QWidget, public BasePage {
     ~LauncherPage();
 
     QString displayName() const override { return tr("General"); }
-    QIcon icon() const override { return APPLICATION->getThemedIcon("settings"); }
+    QIcon icon() const override { return QIcon::fromTheme("settings"); }
     QString id() const override { return "launcher-settings"; }
     QString helpPage() const override { return "Launcher-settings"; }
     bool apply() override;
diff --git a/launcher/ui/pages/global/MinecraftPage.h b/launcher/ui/pages/global/MinecraftPage.h
index b21862536..c21d59a6b 100644
--- a/launcher/ui/pages/global/MinecraftPage.h
+++ b/launcher/ui/pages/global/MinecraftPage.h
@@ -38,7 +38,6 @@
 #include <QDialog>
 #include <memory>
 
-#include "Application.h"
 #include "java/JavaChecker.h"
 #include "ui/pages/BasePage.h"
 #include "ui/widgets/MinecraftSettingsWidget.h"
@@ -53,7 +52,7 @@ class MinecraftPage : public MinecraftSettingsWidget, public BasePage {
     ~MinecraftPage() override {}
 
     QString displayName() const override { return tr("Minecraft"); }
-    QIcon icon() const override { return APPLICATION->getThemedIcon("minecraft"); }
+    QIcon icon() const override { return QIcon::fromTheme("minecraft"); }
     QString id() const override { return "minecraft-settings"; }
     QString helpPage() const override { return "Minecraft-settings"; }
     bool apply() override
diff --git a/launcher/ui/pages/global/ProxyPage.h b/launcher/ui/pages/global/ProxyPage.h
index 26118f181..8689a5c80 100644
--- a/launcher/ui/pages/global/ProxyPage.h
+++ b/launcher/ui/pages/global/ProxyPage.h
@@ -40,7 +40,6 @@
 #include <QDialog>
 #include <memory>
 
-#include <Application.h>
 #include "ui/pages/BasePage.h"
 
 namespace Ui {
@@ -55,7 +54,7 @@ class ProxyPage : public QWidget, public BasePage {
     ~ProxyPage();
 
     QString displayName() const override { return tr("Proxy"); }
-    QIcon icon() const override { return APPLICATION->getThemedIcon("proxy"); }
+    QIcon icon() const override { return QIcon::fromTheme("proxy"); }
     QString id() const override { return "proxy-settings"; }
     QString helpPage() const override { return "Proxy-settings"; }
     bool apply() override;
diff --git a/launcher/ui/pages/instance/DataPackPage.h b/launcher/ui/pages/instance/DataPackPage.h
index b71ed2965..bed84540a 100644
--- a/launcher/ui/pages/instance/DataPackPage.h
+++ b/launcher/ui/pages/instance/DataPackPage.h
@@ -29,7 +29,7 @@ class DataPackPage : public ExternalResourcesPage {
     explicit DataPackPage(BaseInstance* instance, std::shared_ptr<DataPackFolderModel> model, QWidget* parent = nullptr);
 
     QString displayName() const override { return QObject::tr("Data Packs"); }
-    QIcon icon() const override { return APPLICATION->getThemedIcon("datapacks"); }
+    QIcon icon() const override { return QIcon::fromTheme("datapacks"); }
     QString id() const override { return "datapacks"; }
     QString helpPage() const override { return "Data-packs"; }
     bool shouldDisplay() const override { return true; }
diff --git a/launcher/ui/pages/instance/GameOptionsPage.h b/launcher/ui/pages/instance/GameOptionsPage.h
index a132843e7..43f91976c 100644
--- a/launcher/ui/pages/instance/GameOptionsPage.h
+++ b/launcher/ui/pages/instance/GameOptionsPage.h
@@ -38,7 +38,6 @@
 #include <QString>
 #include <QWidget>
 
-#include <Application.h>
 #include "ui/pages/BasePage.h"
 
 namespace Ui {
@@ -59,7 +58,7 @@ class GameOptionsPage : public QWidget, public BasePage {
     void closedImpl() override;
 
     virtual QString displayName() const override { return tr("Game Options"); }
-    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("settings"); }
+    virtual QIcon icon() const override { return QIcon::fromTheme("settings"); }
     virtual QString id() const override { return "gameoptions"; }
     virtual QString helpPage() const override { return "Game-Options-management"; }
     void retranslate() override;
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.h b/launcher/ui/pages/instance/InstanceSettingsPage.h
index 2c507e84b..aca47e2c7 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.h
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.h
@@ -36,7 +36,6 @@
 #pragma once
 
 #include <QWidget>
-#include "Application.h"
 #include "BaseInstance.h"
 #include "ui/pages/BasePage.h"
 #include "ui/widgets/MinecraftSettingsWidget.h"
@@ -53,7 +52,7 @@ class InstanceSettingsPage : public MinecraftSettingsWidget, public BasePage {
     }
     ~InstanceSettingsPage() override {}
     QString displayName() const override { return tr("Settings"); }
-    QIcon icon() const override { return APPLICATION->getThemedIcon("instance-settings"); }
+    QIcon icon() const override { return QIcon::fromTheme("instance-settings"); }
     QString id() const override { return "settings"; }
     bool apply() override
     {
diff --git a/launcher/ui/pages/instance/LogPage.h b/launcher/ui/pages/instance/LogPage.h
index b4d74fb9c..636a8b70d 100644
--- a/launcher/ui/pages/instance/LogPage.h
+++ b/launcher/ui/pages/instance/LogPage.h
@@ -38,7 +38,6 @@
 #include <QIdentityProxyModel>
 #include <QWidget>
 
-#include <Application.h>
 #include "BaseInstance.h"
 #include "launch/LaunchTask.h"
 #include "ui/pages/BasePage.h"
@@ -67,7 +66,7 @@ class LogPage : public QWidget, public BasePage {
     explicit LogPage(InstancePtr instance, QWidget* parent = 0);
     virtual ~LogPage();
     virtual QString displayName() const override { return tr("Minecraft Log"); }
-    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("log"); }
+    virtual QIcon icon() const override { return QIcon::fromTheme("log"); }
     virtual QString id() const override { return "console"; }
     virtual bool apply() override;
     virtual QString helpPage() const override { return "Minecraft-Logs"; }
diff --git a/launcher/ui/pages/instance/ManagedPackPage.cpp b/launcher/ui/pages/instance/ManagedPackPage.cpp
index d46f0f8d5..e97935650 100644
--- a/launcher/ui/pages/instance/ManagedPackPage.cpp
+++ b/launcher/ui/pages/instance/ManagedPackPage.cpp
@@ -166,7 +166,7 @@ QString ManagedPackPage::displayName() const
 
 QIcon ManagedPackPage::icon() const
 {
-    return APPLICATION->getThemedIcon(m_inst->getManagedPackType());
+    return QIcon::fromTheme(m_inst->getManagedPackType());
 }
 
 QString ManagedPackPage::helpPage() const
diff --git a/launcher/ui/pages/instance/ModFolderPage.h b/launcher/ui/pages/instance/ModFolderPage.h
index 9b9665571..b33992470 100644
--- a/launcher/ui/pages/instance/ModFolderPage.h
+++ b/launcher/ui/pages/instance/ModFolderPage.h
@@ -52,7 +52,7 @@ class ModFolderPage : public ExternalResourcesPage {
     void setFilter(const QString& filter) { m_fileSelectionFilter = filter; }
 
     virtual QString displayName() const override { return tr("Mods"); }
-    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("loadermods"); }
+    virtual QIcon icon() const override { return QIcon::fromTheme("loadermods"); }
     virtual QString id() const override { return "mods"; }
     virtual QString helpPage() const override { return "Loader-mods"; }
 
@@ -83,7 +83,7 @@ class CoreModFolderPage : public ModFolderPage {
     virtual ~CoreModFolderPage() = default;
 
     virtual QString displayName() const override { return tr("Core Mods"); }
-    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("coremods"); }
+    virtual QIcon icon() const override { return QIcon::fromTheme("coremods"); }
     virtual QString id() const override { return "coremods"; }
     virtual QString helpPage() const override { return "Core-mods"; }
 
@@ -97,7 +97,7 @@ class NilModFolderPage : public ModFolderPage {
     virtual ~NilModFolderPage() = default;
 
     virtual QString displayName() const override { return tr("Nilmods"); }
-    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("coremods"); }
+    virtual QIcon icon() const override { return QIcon::fromTheme("coremods"); }
     virtual QString id() const override { return "nilmods"; }
     virtual QString helpPage() const override { return "Nilmods"; }
 
diff --git a/launcher/ui/pages/instance/NotesPage.h b/launcher/ui/pages/instance/NotesPage.h
index 3351d25fc..f11e2ad7c 100644
--- a/launcher/ui/pages/instance/NotesPage.h
+++ b/launcher/ui/pages/instance/NotesPage.h
@@ -37,7 +37,6 @@
 
 #include <QWidget>
 
-#include <Application.h>
 #include "BaseInstance.h"
 #include "ui/pages/BasePage.h"
 
@@ -54,9 +53,9 @@ class NotesPage : public QWidget, public BasePage {
     virtual QString displayName() const override { return tr("Notes"); }
     virtual QIcon icon() const override
     {
-        auto icon = APPLICATION->getThemedIcon("notes");
+        auto icon = QIcon::fromTheme("notes");
         if (icon.isNull())
-            icon = APPLICATION->getThemedIcon("news");
+            icon = QIcon::fromTheme("news");
         return icon;
     }
     virtual QString id() const override { return "notes"; }
diff --git a/launcher/ui/pages/instance/OtherLogsPage.h b/launcher/ui/pages/instance/OtherLogsPage.h
index fbf9991e1..9fc0ba3b9 100644
--- a/launcher/ui/pages/instance/OtherLogsPage.h
+++ b/launcher/ui/pages/instance/OtherLogsPage.h
@@ -57,7 +57,7 @@ class OtherLogsPage : public QWidget, public BasePage {
 
     QString id() const override { return m_id; }
     QString displayName() const override { return m_displayName; }
-    QIcon icon() const override { return APPLICATION->getThemedIcon("log"); }
+    QIcon icon() const override { return QIcon::fromTheme("log"); }
     QString helpPage() const override { return m_helpPage; }
     void retranslate() override;
 
diff --git a/launcher/ui/pages/instance/ResourcePackPage.h b/launcher/ui/pages/instance/ResourcePackPage.h
index 40fe10b79..0ad24fc45 100644
--- a/launcher/ui/pages/instance/ResourcePackPage.h
+++ b/launcher/ui/pages/instance/ResourcePackPage.h
@@ -51,7 +51,7 @@ class ResourcePackPage : public ExternalResourcesPage {
     explicit ResourcePackPage(MinecraftInstance* instance, std::shared_ptr<ResourcePackFolderModel> model, QWidget* parent = 0);
 
     QString displayName() const override { return tr("Resource Packs"); }
-    QIcon icon() const override { return APPLICATION->getThemedIcon("resourcepacks"); }
+    QIcon icon() const override { return QIcon::fromTheme("resourcepacks"); }
     QString id() const override { return "resourcepacks"; }
     QString helpPage() const override { return "Resource-packs"; }
 
diff --git a/launcher/ui/pages/instance/ScreenshotsPage.cpp b/launcher/ui/pages/instance/ScreenshotsPage.cpp
index 082b44308..9aa7ea50a 100644
--- a/launcher/ui/pages/instance/ScreenshotsPage.cpp
+++ b/launcher/ui/pages/instance/ScreenshotsPage.cpp
@@ -134,7 +134,7 @@ class FilterModel : public QIdentityProxyModel {
     {
         m_thumbnailingPool.setMaxThreadCount(4);
         m_thumbnailCache = std::make_shared<SharedIconCache>();
-        m_thumbnailCache->add("placeholder", APPLICATION->getThemedIcon("screenshot-placeholder"));
+        m_thumbnailCache->add("placeholder", QIcon::fromTheme("screenshot-placeholder"));
         connect(&watcher, &QFileSystemWatcher::fileChanged, this, &FilterModel::fileChanged);
     }
     virtual ~FilterModel()
diff --git a/launcher/ui/pages/instance/ScreenshotsPage.h b/launcher/ui/pages/instance/ScreenshotsPage.h
index bb127b429..b9c750a1f 100644
--- a/launcher/ui/pages/instance/ScreenshotsPage.h
+++ b/launcher/ui/pages/instance/ScreenshotsPage.h
@@ -37,7 +37,6 @@
 
 #include <QMainWindow>
 
-#include <Application.h>
 #include "ui/pages/BasePage.h"
 
 #include "settings/Setting.h"
@@ -67,7 +66,7 @@ class ScreenshotsPage : public QMainWindow, public BasePage {
 
     virtual bool eventFilter(QObject*, QEvent*) override;
     virtual QString displayName() const override { return tr("Screenshots"); }
-    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("screenshots"); }
+    virtual QIcon icon() const override { return QIcon::fromTheme("screenshots"); }
     virtual QString id() const override { return "screenshots"; }
     virtual QString helpPage() const override { return "Screenshots-management"; }
     virtual bool apply() override { return !m_uploadActive; }
diff --git a/launcher/ui/pages/instance/ServersPage.cpp b/launcher/ui/pages/instance/ServersPage.cpp
index d1f39bb88..f616a5b22 100644
--- a/launcher/ui/pages/instance/ServersPage.cpp
+++ b/launcher/ui/pages/instance/ServersPage.cpp
@@ -36,6 +36,7 @@
  */
 
 #include "ServersPage.h"
+#include "Application.h"
 #include "ServerPingTask.h"
 #include "ui/dialogs/CustomMessageBox.h"
 #include "ui_ServersPage.h"
@@ -319,7 +320,7 @@ class ServersModel : public QAbstractListModel {
                             if (px.loadFromData(bytes))
                                 return QIcon(px);
                         }
-                        return APPLICATION->getThemedIcon("unknown_server");
+                        return QIcon::fromTheme("unknown_server");
                     }
                     case 1:
                         return m_servers[row].m_address;
diff --git a/launcher/ui/pages/instance/ServersPage.h b/launcher/ui/pages/instance/ServersPage.h
index 77710d6cc..49a746245 100644
--- a/launcher/ui/pages/instance/ServersPage.h
+++ b/launcher/ui/pages/instance/ServersPage.h
@@ -39,7 +39,7 @@
 #include <QMainWindow>
 #include <QString>
 
-#include <Application.h>
+#include "BaseInstance.h"
 #include "ui/pages/BasePage.h"
 
 #include "settings/Setting.h"
@@ -63,7 +63,7 @@ class ServersPage : public QMainWindow, public BasePage {
     void closedImpl() override;
 
     virtual QString displayName() const override { return tr("Servers"); }
-    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("server"); }
+    virtual QIcon icon() const override { return QIcon::fromTheme("server"); }
     virtual QString id() const override { return "servers"; }
     virtual QString helpPage() const override { return "Servers-management"; }
     void retranslate() override;
diff --git a/launcher/ui/pages/instance/ShaderPackPage.h b/launcher/ui/pages/instance/ShaderPackPage.h
index 128c48ae7..c6ae3bc24 100644
--- a/launcher/ui/pages/instance/ShaderPackPage.h
+++ b/launcher/ui/pages/instance/ShaderPackPage.h
@@ -48,7 +48,7 @@ class ShaderPackPage : public ExternalResourcesPage {
     ~ShaderPackPage() override = default;
 
     QString displayName() const override { return tr("Shader Packs"); }
-    QIcon icon() const override { return APPLICATION->getThemedIcon("shaderpacks"); }
+    QIcon icon() const override { return QIcon::fromTheme("shaderpacks"); }
     QString id() const override { return "shaderpacks"; }
     QString helpPage() const override { return "shader-packs"; }
 
diff --git a/launcher/ui/pages/instance/TexturePackPage.h b/launcher/ui/pages/instance/TexturePackPage.h
index 3ebca3e87..2c92212b9 100644
--- a/launcher/ui/pages/instance/TexturePackPage.h
+++ b/launcher/ui/pages/instance/TexturePackPage.h
@@ -51,7 +51,7 @@ class TexturePackPage : public ExternalResourcesPage {
     explicit TexturePackPage(MinecraftInstance* instance, std::shared_ptr<TexturePackFolderModel> model, QWidget* parent = nullptr);
 
     QString displayName() const override { return tr("Texture packs"); }
-    QIcon icon() const override { return APPLICATION->getThemedIcon("resourcepacks"); }
+    QIcon icon() const override { return QIcon::fromTheme("resourcepacks"); }
     QString id() const override { return "texturepacks"; }
     QString helpPage() const override { return "Texture-packs"; }
 
diff --git a/launcher/ui/pages/instance/VersionPage.cpp b/launcher/ui/pages/instance/VersionPage.cpp
index d355f38fb..ef5427a00 100644
--- a/launcher/ui/pages/instance/VersionPage.cpp
+++ b/launcher/ui/pages/instance/VersionPage.cpp
@@ -91,12 +91,12 @@ class IconProxy : public QIdentityProxyModel {
             if (!var.isNull()) {
                 auto string = var.toString();
                 if (string == "warning") {
-                    return APPLICATION->getThemedIcon("status-yellow");
+                    return QIcon::fromTheme("status-yellow");
                 } else if (string == "error") {
-                    return APPLICATION->getThemedIcon("status-bad");
+                    return QIcon::fromTheme("status-bad");
                 }
             }
-            return APPLICATION->getThemedIcon("status-good");
+            return QIcon::fromTheme("status-good");
         }
         return var;
     }
diff --git a/launcher/ui/pages/instance/WorldListPage.cpp b/launcher/ui/pages/instance/WorldListPage.cpp
index 31f3bfd3e..c7eaf94a0 100644
--- a/launcher/ui/pages/instance/WorldListPage.cpp
+++ b/launcher/ui/pages/instance/WorldListPage.cpp
@@ -48,10 +48,10 @@
 #include <QKeyEvent>
 #include <QMenu>
 #include <QMessageBox>
+#include <QPushButton>
 #include <QSortFilterProxyModel>
 #include <QTreeView>
 #include <Qt>
-#include <QPushButton>
 
 #include "FileSystem.h"
 #include "tools/MCEditTool.h"
@@ -77,7 +77,7 @@ class WorldListProxyModel : public QSortFilterProxyModel {
             auto iconFile = worlds->data(sourceIndex, WorldList::IconFileRole).toString();
             if (iconFile.isNull()) {
                 // NOTE: Minecraft uses the same placeholder for servers AND worlds
-                return APPLICATION->getThemedIcon("unknown_server");
+                return QIcon::fromTheme("unknown_server");
             }
             return QIcon(iconFile);
         }
diff --git a/launcher/ui/pages/instance/WorldListPage.h b/launcher/ui/pages/instance/WorldListPage.h
index 08cf7dc5f..9b931066d 100644
--- a/launcher/ui/pages/instance/WorldListPage.h
+++ b/launcher/ui/pages/instance/WorldListPage.h
@@ -37,7 +37,6 @@
 
 #include <QMainWindow>
 
-#include <Application.h>
 #include <LoggedProcess.h>
 #include "minecraft/MinecraftInstance.h"
 #include "ui/pages/BasePage.h"
@@ -57,7 +56,7 @@ class WorldListPage : public QMainWindow, public BasePage {
     virtual ~WorldListPage();
 
     virtual QString displayName() const override { return tr("Worlds"); }
-    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("worlds"); }
+    virtual QIcon icon() const override { return QIcon::fromTheme("worlds"); }
     virtual QString id() const override { return "worlds"; }
     virtual QString helpPage() const override { return "Worlds"; }
     virtual bool shouldDisplay() const override;
diff --git a/launcher/ui/pages/modplatform/CustomPage.h b/launcher/ui/pages/modplatform/CustomPage.h
index c5d6d5af5..2bfb1de29 100644
--- a/launcher/ui/pages/modplatform/CustomPage.h
+++ b/launcher/ui/pages/modplatform/CustomPage.h
@@ -37,7 +37,7 @@
 
 #include <QWidget>
 
-#include <Application.h>
+#include "BaseVersion.h"
 #include "tasks/Task.h"
 #include "ui/pages/BasePage.h"
 
@@ -54,7 +54,7 @@ class CustomPage : public QWidget, public BasePage {
     explicit CustomPage(NewInstanceDialog* dialog, QWidget* parent = 0);
     virtual ~CustomPage();
     virtual QString displayName() const override { return tr("Custom"); }
-    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("minecraft"); }
+    virtual QIcon icon() const override { return QIcon::fromTheme("minecraft"); }
     virtual QString id() const override { return "vanilla"; }
     virtual QString helpPage() const override { return "Vanilla-platform"; }
     virtual bool shouldDisplay() const override;
diff --git a/launcher/ui/pages/modplatform/ImportPage.h b/launcher/ui/pages/modplatform/ImportPage.h
index 70d7736eb..1119e709a 100644
--- a/launcher/ui/pages/modplatform/ImportPage.h
+++ b/launcher/ui/pages/modplatform/ImportPage.h
@@ -37,7 +37,6 @@
 
 #include <QWidget>
 
-#include <Application.h>
 #include "tasks/Task.h"
 #include "ui/pages/BasePage.h"
 
@@ -54,7 +53,7 @@ class ImportPage : public QWidget, public BasePage {
     explicit ImportPage(NewInstanceDialog* dialog, QWidget* parent = 0);
     virtual ~ImportPage();
     virtual QString displayName() const override { return tr("Import"); }
-    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("viewfolder"); }
+    virtual QIcon icon() const override { return QIcon::fromTheme("viewfolder"); }
     virtual QString id() const override { return "import"; }
     virtual QString helpPage() const override { return "Zip-import"; }
     virtual bool shouldDisplay() const override;
diff --git a/launcher/ui/pages/modplatform/ResourceModel.cpp b/launcher/ui/pages/modplatform/ResourceModel.cpp
index 5ea70789e..eea7af25e 100644
--- a/launcher/ui/pages/modplatform/ResourceModel.cpp
+++ b/launcher/ui/pages/modplatform/ResourceModel.cpp
@@ -65,7 +65,7 @@ auto ResourceModel::data(const QModelIndex& index, int role) const -> QVariant
                     icon_or_none.has_value())
                     return icon_or_none.value();
 
-                return APPLICATION->getThemedIcon("screenshot-placeholder");
+                return QIcon::fromTheme("screenshot-placeholder");
             } else {
                 return {};
             }
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp b/launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp
index 9e2e7a2ca..c5fec48d7 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp
@@ -61,7 +61,7 @@ QVariant ListModel::data(const QModelIndex& index, int role) const
             if (m_logoMap.contains(pack.safeName)) {
                 return (m_logoMap.value(pack.safeName));
             }
-            auto icon = APPLICATION->getThemedIcon("atlauncher-placeholder");
+            auto icon = QIcon::fromTheme("atlauncher-placeholder");
 
             auto url = QString(BuildConfig.ATL_DOWNLOAD_SERVER_URL + "launcher/images/%1").arg(pack.safeName);
             ((ListModel*)this)->requestLogo(pack.safeName, url);
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlPage.h b/launcher/ui/pages/modplatform/atlauncher/AtlPage.h
index 556e90b1d..8c8bf53b3 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlPage.h
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlPage.h
@@ -41,7 +41,6 @@
 #include <modplatform/atlauncher/ATLPackInstallTask.h>
 #include <QWidget>
 
-#include "Application.h"
 #include "ui/pages/modplatform/ModpackProviderBasePage.h"
 
 namespace Ui {
@@ -57,7 +56,7 @@ class AtlPage : public QWidget, public ModpackProviderBasePage {
     explicit AtlPage(NewInstanceDialog* dialog, QWidget* parent = 0);
     virtual ~AtlPage();
     virtual QString displayName() const override { return "ATLauncher"; }
-    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("atlauncher"); }
+    virtual QIcon icon() const override { return QIcon::fromTheme("atlauncher"); }
     virtual QString id() const override { return "atl"; }
     virtual QString helpPage() const override { return "ATL-platform"; }
     virtual bool shouldDisplay() const override;
diff --git a/launcher/ui/pages/modplatform/flame/FlameModel.cpp b/launcher/ui/pages/modplatform/flame/FlameModel.cpp
index ea051bd39..e5d880dca 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModel.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlameModel.cpp
@@ -50,7 +50,7 @@ QVariant ListModel::data(const QModelIndex& index, int role) const
             if (m_logoMap.contains(pack->logoName)) {
                 return (m_logoMap.value(pack->logoName));
             }
-            QIcon icon = APPLICATION->getThemedIcon("screenshot-placeholder");
+            QIcon icon = QIcon::fromTheme("screenshot-placeholder");
             ((ListModel*)this)->requestLogo(pack->logoName, pack->logoUrl);
             return icon;
         }
diff --git a/launcher/ui/pages/modplatform/flame/FlamePage.h b/launcher/ui/pages/modplatform/flame/FlamePage.h
index 2252efa07..eb763229f 100644
--- a/launcher/ui/pages/modplatform/flame/FlamePage.h
+++ b/launcher/ui/pages/modplatform/flame/FlamePage.h
@@ -37,7 +37,6 @@
 
 #include <QWidget>
 
-#include <Application.h>
 #include <QTimer>
 #include "modplatform/ModIndex.h"
 #include "ui/pages/modplatform/ModpackProviderBasePage.h"
@@ -61,7 +60,7 @@ class FlamePage : public QWidget, public ModpackProviderBasePage {
     explicit FlamePage(NewInstanceDialog* dialog, QWidget* parent = 0);
     virtual ~FlamePage();
     virtual QString displayName() const override { return "CurseForge"; }
-    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("flame"); }
+    virtual QIcon icon() const override { return QIcon::fromTheme("flame"); }
     virtual QString id() const override { return "flame"; }
     virtual QString helpPage() const override { return "Flame-platform"; }
     virtual bool shouldDisplay() const override;
diff --git a/launcher/ui/pages/modplatform/flame/FlameResourcePages.h b/launcher/ui/pages/modplatform/flame/FlameResourcePages.h
index 19f3731c7..d4b697ae0 100644
--- a/launcher/ui/pages/modplatform/flame/FlameResourcePages.h
+++ b/launcher/ui/pages/modplatform/flame/FlameResourcePages.h
@@ -40,7 +40,6 @@
 #pragma once
 
 #include <ui/pages/modplatform/DataPackPage.h>
-#include "Application.h"
 
 #include "modplatform/ResourceAPI.h"
 
@@ -58,7 +57,7 @@ static inline QString displayName()
 }
 static inline QIcon icon()
 {
-    return APPLICATION->getThemedIcon("flame");
+    return QIcon::fromTheme("flame");
 }
 static inline QString id()
 {
@@ -181,8 +180,6 @@ class FlameShaderPackPage : public ShaderPackResourcePage {
     void openUrl(const QUrl& url) override;
 };
 
-
-
 class FlameDataPackPage : public DataPackResourcePage {
     Q_OBJECT
 
diff --git a/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h b/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h
index c00a93dfa..25b900f97 100644
--- a/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h
+++ b/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h
@@ -23,7 +23,6 @@
 #include <QTreeView>
 #include <QWidget>
 
-#include <Application.h>
 #include "modplatform/import_ftb/PackHelpers.h"
 #include "ui/pages/modplatform/ModpackProviderBasePage.h"
 #include "ui/pages/modplatform/import_ftb/ListModel.h"
@@ -42,7 +41,7 @@ class ImportFTBPage : public QWidget, public ModpackProviderBasePage {
     explicit ImportFTBPage(NewInstanceDialog* dialog, QWidget* parent = 0);
     virtual ~ImportFTBPage();
     QString displayName() const override { return tr("FTB App Import"); }
-    QIcon icon() const override { return APPLICATION->getThemedIcon("ftb_logo"); }
+    QIcon icon() const override { return QIcon::fromTheme("ftb_logo"); }
     QString id() const override { return "import_ftb"; }
     QString helpPage() const override { return "FTB-import"; }
     bool shouldDisplay() const override { return true; }
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
index efa9bd3bc..eb95b291c 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
+++ b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
@@ -173,7 +173,7 @@ QVariant ListModel::data(const QModelIndex& index, int role) const
             if (m_logoMap.contains(pack.logo)) {
                 return (m_logoMap.value(pack.logo));
             }
-            QIcon icon = APPLICATION->getThemedIcon("screenshot-placeholder");
+            QIcon icon = QIcon::fromTheme("screenshot-placeholder");
             ((ListModel*)this)->requestLogo(pack.logo);
             return icon;
         }
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/Page.h b/launcher/ui/pages/modplatform/legacy_ftb/Page.h
index fc789971f..db70ae79e 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/Page.h
+++ b/launcher/ui/pages/modplatform/legacy_ftb/Page.h
@@ -39,7 +39,6 @@
 #include <QTreeView>
 #include <QWidget>
 
-#include <Application.h>
 #include "QObjectPtr.h"
 #include "modplatform/legacy_ftb/PackFetchTask.h"
 #include "modplatform/legacy_ftb/PackHelpers.h"
@@ -64,7 +63,7 @@ class Page : public QWidget, public ModpackProviderBasePage {
     explicit Page(NewInstanceDialog* dialog, QWidget* parent = 0);
     virtual ~Page();
     QString displayName() const override { return "FTB Legacy"; }
-    QIcon icon() const override { return APPLICATION->getThemedIcon("ftb_logo"); }
+    QIcon icon() const override { return QIcon::fromTheme("ftb_logo"); }
     QString id() const override { return "legacy_ftb"; }
     QString helpPage() const override { return "FTB-legacy"; }
     bool shouldDisplay() const override;
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
index bf6215356..acd321d4b 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
@@ -36,6 +36,7 @@
 
 #include "ModrinthModel.h"
 
+#include "Application.h"
 #include "BuildConfig.h"
 #include "Json.h"
 #include "modplatform/ModIndex.h"
@@ -91,7 +92,7 @@ auto ModpackListModel::data(const QModelIndex& index, int role) const -> QVarian
             if (m_logoMap.contains(pack->logoName))
                 return m_logoMap.value(pack->logoName);
 
-            QIcon icon = APPLICATION->getThemedIcon("screenshot-placeholder");
+            QIcon icon = QIcon::fromTheme("screenshot-placeholder");
             ((ModpackListModel*)this)->requestLogo(pack->logoName, pack->logoUrl);
             return icon;
         }
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
index 600500c6d..4ca41a3e0 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
@@ -36,7 +36,6 @@
 
 #pragma once
 
-#include "Application.h"
 #include "modplatform/ModIndex.h"
 #include "modplatform/modrinth/ModrinthAPI.h"
 #include "ui/dialogs/NewInstanceDialog.h"
@@ -64,7 +63,7 @@ class ModrinthPage : public QWidget, public ModpackProviderBasePage {
     ~ModrinthPage() override;
 
     QString displayName() const override { return tr("Modrinth"); }
-    QIcon icon() const override { return APPLICATION->getThemedIcon("modrinth"); }
+    QIcon icon() const override { return QIcon::fromTheme("modrinth"); }
     QString id() const override { return "modrinth"; }
     QString helpPage() const override { return "Modrinth-platform"; }
 
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.h b/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.h
index cb0f4d85c..3f41a3d5e 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.h
@@ -38,8 +38,6 @@
 
 #pragma once
 
-#include "Application.h"
-
 #include "modplatform/ResourceAPI.h"
 
 #include "ui/pages/modplatform/DataPackPage.h"
@@ -57,7 +55,7 @@ static inline QString displayName()
 }
 static inline QIcon icon()
 {
-    return APPLICATION->getThemedIcon("modrinth");
+    return QIcon::fromTheme("modrinth");
 }
 static inline QString id()
 {
diff --git a/launcher/ui/pages/modplatform/technic/TechnicModel.cpp b/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
index c425044a2..62bad833b 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
+++ b/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
@@ -71,7 +71,7 @@ QVariant Technic::ListModel::data(const QModelIndex& index, int role) const
             if (m_logoMap.contains(pack.logoName)) {
                 return (m_logoMap.value(pack.logoName));
             }
-            QIcon icon = APPLICATION->getThemedIcon("screenshot-placeholder");
+            QIcon icon = QIcon::fromTheme("screenshot-placeholder");
             ((ListModel*)this)->requestLogo(pack.logoName, pack.logoUrl);
             return icon;
         }
diff --git a/launcher/ui/pages/modplatform/technic/TechnicPage.h b/launcher/ui/pages/modplatform/technic/TechnicPage.h
index 71b6390ef..a131a6db1 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicPage.h
+++ b/launcher/ui/pages/modplatform/technic/TechnicPage.h
@@ -38,7 +38,6 @@
 #include <QTimer>
 #include <QWidget>
 
-#include <Application.h>
 #include "TechnicData.h"
 #include "net/NetJob.h"
 #include "ui/pages/modplatform/ModpackProviderBasePage.h"
@@ -61,7 +60,7 @@ class TechnicPage : public QWidget, public ModpackProviderBasePage {
     explicit TechnicPage(NewInstanceDialog* dialog, QWidget* parent = 0);
     virtual ~TechnicPage();
     virtual QString displayName() const override { return "Technic"; }
-    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("technic"); }
+    virtual QIcon icon() const override { return QIcon::fromTheme("technic"); }
     virtual QString id() const override { return "technic"; }
     virtual QString helpPage() const override { return "Technic-platform"; }
     virtual bool shouldDisplay() const override;
diff --git a/launcher/ui/widgets/JavaWizardWidget.cpp b/launcher/ui/widgets/JavaWizardWidget.cpp
index 6158dc7a3..955bc5334 100644
--- a/launcher/ui/widgets/JavaWizardWidget.cpp
+++ b/launcher/ui/widgets/JavaWizardWidget.cpp
@@ -33,9 +33,9 @@ JavaWizardWidget::JavaWizardWidget(QWidget* parent) : QWidget(parent)
 {
     m_availableMemory = Sys::getSystemRam() / Sys::mebibyte;
 
-    goodIcon = APPLICATION->getThemedIcon("status-good");
-    yellowIcon = APPLICATION->getThemedIcon("status-yellow");
-    badIcon = APPLICATION->getThemedIcon("status-bad");
+    goodIcon = QIcon::fromTheme("status-good");
+    yellowIcon = QIcon::fromTheme("status-yellow");
+    badIcon = QIcon::fromTheme("status-bad");
     m_memoryTimer = new QTimer(this);
     setupUi();
 
@@ -532,7 +532,7 @@ void JavaWizardWidget::updateThresholds()
 
     {
         auto height = m_labelMaxMemIcon->fontInfo().pixelSize();
-        QIcon icon = APPLICATION->getThemedIcon(iconName);
+        QIcon icon = QIcon::fromTheme(iconName);
         QPixmap pix = icon.pixmap(height, height);
         m_labelMaxMemIcon->setPixmap(pix);
     }
diff --git a/launcher/ui/widgets/MinecraftSettingsWidget.cpp b/launcher/ui/widgets/MinecraftSettingsWidget.cpp
index 9c8e2b405..b738cab74 100644
--- a/launcher/ui/widgets/MinecraftSettingsWidget.cpp
+++ b/launcher/ui/widgets/MinecraftSettingsWidget.cpp
@@ -500,7 +500,7 @@ void MinecraftSettingsWidget::updateAccountsMenu(const SettingsObject& settings)
         QIcon face = account->getFace();
 
         if (face.isNull())
-            face = APPLICATION->getThemedIcon("noaccount");
+            face = QIcon::fromTheme("noaccount");
 
         m_ui->instanceAccountSelector->addItem(face, account->profileName(), i);
         if (i == accountIndex)
diff --git a/launcher/ui/widgets/PageContainer.cpp b/launcher/ui/widgets/PageContainer.cpp
index e3054c17a..cffda086c 100644
--- a/launcher/ui/widgets/PageContainer.cpp
+++ b/launcher/ui/widgets/PageContainer.cpp
@@ -228,7 +228,7 @@ void PageContainer::showPage(int row)
     } else {
         m_pageStack->setCurrentIndex(0);
         m_header->setText(QString());
-        m_iconHeader->setIcon(APPLICATION->getThemedIcon("bug"));
+        m_iconHeader->setIcon(QIcon::fromTheme("bug"));
     }
 }