diff --git a/src/config/configureoptionsdialog.cpp b/src/config/configureoptionsdialog.cpp
index 4c67511..4c7da78 100644
--- a/src/config/configureoptionsdialog.cpp
+++ b/src/config/configureoptionsdialog.cpp
@@ -39,6 +39,8 @@
 #include <kcmdlineargs.h>
 #include <KLocalizedString>
 
+#include <QIcon>
+
 #include <config.h>
 
 ConfigureOptionsDialog::ConfigureOptionsDialog(QWidget* parent, const OperationStack& ostack, const QString& name) :
diff --git a/src/gui/applyprogressdialog.cpp b/src/gui/applyprogressdialog.cpp
index 840c954..8806789 100644
--- a/src/gui/applyprogressdialog.cpp
+++ b/src/gui/applyprogressdialog.cpp
@@ -84,8 +84,8 @@ ApplyProgressDialog::ApplyProgressDialog(QWidget* parent, OperationRunner& orunn
 	setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Details);
 
 	dialogWidget().treeTasks().setColumnWidth(0, width() * 0.8);
-	detailsWidget().buttonBrowser().setIcon(KIcon("document-open"));
-	detailsWidget().buttonSave().setIcon(KIcon("document-save"));
+	detailsWidget().buttonBrowser().setIcon(QIcon::fromTheme("document-open"));
+	detailsWidget().buttonSave().setIcon(QIcon::fromTheme("document-save"));
 
 	setupConnections();
 
diff --git a/src/gui/createpartitiontablewidget.cpp b/src/gui/createpartitiontablewidget.cpp
index 0e6b96c..c2c978b 100644
--- a/src/gui/createpartitiontablewidget.cpp
+++ b/src/gui/createpartitiontablewidget.cpp
@@ -19,14 +19,12 @@
 
 #include "gui/createpartitiontablewidget.h"
 
-#include <kiconloader.h>
-
 #include <QIcon>
 
 CreatePartitionTableWidget::CreatePartitionTableWidget(QWidget* parent) :
 	QWidget(parent)
 {
 	setupUi(this);
-	QIcon icon = KIconLoader::global()->loadIcon("dialog-warning", KIconLoader::NoGroup);
+	QIcon icon = QIcon::fromTheme("dialog-warning");
 	iconLabel().setPixmap(icon.pixmap(32, 32));
 }
diff --git a/src/gui/sizedialogbase.cpp b/src/gui/sizedialogbase.cpp
index 83accaf..bf912d6 100644
--- a/src/gui/sizedialogbase.cpp
+++ b/src/gui/sizedialogbase.cpp
@@ -55,7 +55,6 @@ SizeDialogBase::SizeDialogBase(QWidget* parent, Device& d, Partition& part, qint
 	// Cannot use KGuiItem() for the details button due to a KDialog bug -- it has special handling
 	// for the details button text but not if using setButtonGuiItem
 	setButtonText(Details, i18nc("@item:button advanced settings button", "Advanced"));
-	setButtonIcon(Details, KIcon());
 }
 
 void SizeDialogBase::setupDialog()
diff --git a/src/gui/smartdialog.cpp b/src/gui/smartdialog.cpp
index 3f1bded..0bbd59d 100644
--- a/src/gui/smartdialog.cpp
+++ b/src/gui/smartdialog.cpp
@@ -63,7 +63,7 @@ SmartDialog::SmartDialog(QWidget* parent, Device& d) :
 	setCaption(i18nc("@title:window", "SMART Properties: <filename>%1</filename>", device().deviceNode()));
 	setButtons(Close|User1);
 	setButtonText(User1, i18nc("@action:button", "Save SMART Report"));
-	button(User1)->setIcon(KIcon("document-save"));
+	button(User1)->setIcon(QIcon::fromTheme("document-save"));
 
 	setupDialog();
 	setupConnections();