diff --git a/messagelist/src/utils/configureaggregationsdialog.cpp b/messagelist/src/utils/configureaggregationsdialog.cpp
--- a/messagelist/src/utils/configureaggregationsdialog.cpp
+++ b/messagelist/src/utils/configureaggregationsdialog.cpp
@@ -32,7 +32,6 @@
 #include <QMap>
 
 #include <KLocalizedString>
-#include <KIconLoader>
 #include <QIcon>
 #include <KConfig>
 #include <QFileDialog>
@@ -129,16 +128,14 @@
 
     d->mNewAggregationButton = new QPushButton(i18n("New Aggregation"), base);
     d->mNewAggregationButton->setIcon(QIcon::fromTheme(QStringLiteral("document-new")));
-    d->mNewAggregationButton->setIconSize(QSize(KIconLoader::SizeSmall, KIconLoader::SizeSmall));
     g->addWidget(d->mNewAggregationButton, 0, 1);
 
     connect(d->mNewAggregationButton, &QPushButton::clicked, this, [this]() {
         d->newAggregationButtonClicked();
     });
 
     d->mCloneAggregationButton = new QPushButton(i18n("Clone Aggregation"), base);
     d->mCloneAggregationButton->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy")));
-    d->mCloneAggregationButton->setIconSize(QSize(KIconLoader::SizeSmall, KIconLoader::SizeSmall));
     g->addWidget(d->mCloneAggregationButton, 1, 1);
 
     connect(d->mCloneAggregationButton, &QPushButton::clicked, this, [this]() {
@@ -170,7 +167,6 @@
 
     d->mDeleteAggregationButton = new QPushButton(i18n("Delete Aggregation"), base);
     d->mDeleteAggregationButton->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete")));
-    d->mDeleteAggregationButton->setIconSize(QSize(KIconLoader::SizeSmall, KIconLoader::SizeSmall));
     g->addWidget(d->mDeleteAggregationButton, 6, 1);
 
     connect(d->mDeleteAggregationButton, &QPushButton::clicked, this, [this]() {
diff --git a/messagelist/src/utils/configurethemesdialog.cpp b/messagelist/src/utils/configurethemesdialog.cpp
--- a/messagelist/src/utils/configurethemesdialog.cpp
+++ b/messagelist/src/utils/configurethemesdialog.cpp
@@ -34,7 +34,6 @@
 
 #include <KMessageBox>
 #include <KLocalizedString>
-#include <KIconLoader>
 #include <KConfigGroup>
 #include <QIcon>
 #include <KConfig>
@@ -125,16 +124,14 @@
 
     d->mNewThemeButton = new QPushButton(i18n("New Theme"), base);
     d->mNewThemeButton->setIcon(QIcon::fromTheme(QStringLiteral("document-new")));
-    d->mNewThemeButton->setIconSize(QSize(KIconLoader::SizeSmall, KIconLoader::SizeSmall));
     g->addWidget(d->mNewThemeButton, 0, 1);
 
     connect(d->mNewThemeButton, &QPushButton::clicked, this, [this]() {
         d->newThemeButtonClicked();
     });
 
     d->mCloneThemeButton = new QPushButton(i18n("Clone Theme"), base);
     d->mCloneThemeButton->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy")));
-    d->mCloneThemeButton->setIconSize(QSize(KIconLoader::SizeSmall, KIconLoader::SizeSmall));
     g->addWidget(d->mCloneThemeButton, 1, 1);
 
     connect(d->mCloneThemeButton, &QPushButton::clicked, this, [this]() {
@@ -166,7 +163,6 @@
 
     d->mDeleteThemeButton = new QPushButton(i18n("Delete Theme"), base);
     d->mDeleteThemeButton->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete")));
-    d->mDeleteThemeButton->setIconSize(QSize(KIconLoader::SizeSmall, KIconLoader::SizeSmall));
     g->addWidget(d->mDeleteThemeButton, 6, 1);
 
     connect(d->mDeleteThemeButton, &QPushButton::clicked, this, [this]() {
diff --git a/messagelist/src/widget.cpp b/messagelist/src/widget.cpp
--- a/messagelist/src/widget.cpp
+++ b/messagelist/src/widget.cpp
@@ -38,7 +38,6 @@
 
 #include "messagelist_debug.h"
 #include <QIcon>
-#include <KIconLoader>
 #include <KLocalizedString>
 #include <QMenu>
 #include <KXMLGUIClient>
@@ -505,9 +504,9 @@
     // Set pixmap
     QPixmap pixmap;
     if (selection.size() == 1) {
-        pixmap = QPixmap(DesktopIcon(QStringLiteral("mail-message"), KIconLoader::SizeSmall));
+        pixmap = QIcon::fromTheme(QStringLiteral("mail-message")).pixmap(style()->pixelMetric(QStyle::PM_SmallIconSize));
     } else {
-        pixmap = QPixmap(DesktopIcon(QStringLiteral("document-multiple"), KIconLoader::SizeSmall));
+        pixmap = QIcon::fromTheme(QStringLiteral("document-multiple")).pixmap(style()->pixelMetric(QStyle::PM_SmallIconSize));
     }
 
     // Calculate hotspot (as in Konqueror)
diff --git a/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp b/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp
--- a/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp
+++ b/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp
@@ -48,7 +48,6 @@
 #include <KStandardAction>
 #include <QAction>
 #include <QIcon>
-#include <KIconTheme>
 
 #include <QShortcut>
 #include <QVBoxLayout>
@@ -148,9 +147,6 @@
         popup->addSeparator();
         popup->addAction(KStandardAction::find(this, &MailSourceViewTextBrowser::findText, this));
         //Code from KTextBrowser
-        KIconTheme::assignIconsToContextMenu(isReadOnly() ? KIconTheme::ReadOnlyText
-                                             : KIconTheme::TextEditor,
-                                             popup->actions());
         if (mTextToSpeechInterface->isReady()) {
             popup->addSeparator();
             popup->addAction(QIcon::fromTheme(QStringLiteral(
diff --git a/templateparser/src/CMakeLists.txt b/templateparser/src/CMakeLists.txt
--- a/templateparser/src/CMakeLists.txt
+++ b/templateparser/src/CMakeLists.txt
@@ -51,9 +51,7 @@
     KF5::IdentityManagement
     KF5::MessageCore
     KF5::XmlGui
-    KF5::IconThemes
     KF5::Completion
-    KF5::Libkleo
     KF5::I18n
     KF5::SonnetUi
     KF5::SyntaxHighlighting