diff --git a/discover/qml/AddonsView.qml b/discover/qml/AddonsView.qml
--- a/discover/qml/AddonsView.qml
+++ b/discover/qml/AddonsView.qml
@@ -37,8 +37,8 @@
                     checked: model.checked
                     onClicked: addonsModel.changeState(packageName, checked)
                 }
-                QIconItem {
-                    icon: "applications-other"
+                Kirigami.Icon {
+                    source: "applications-other"
                     smooth: true
                     Layout.minimumWidth: content.implicitHeight
                     Layout.minimumHeight: content.implicitHeight
diff --git a/discover/qml/ApplicationDelegate.qml b/discover/qml/ApplicationDelegate.qml
--- a/discover/qml/ApplicationDelegate.qml
+++ b/discover/qml/ApplicationDelegate.qml
@@ -46,10 +46,9 @@
     Item {
         implicitHeight: Math.max(conts.implicitHeight, resourceIcon.height)
 
-        QIconItem {
+        Kirigami.Icon {
             id: resourceIcon
-            icon: application.icon
-
+            source: application.icon
             readonly property real contHeight: delegateArea.compact ? Kirigami.Units.gridUnit * 4 : Kirigami.Units.gridUnit * 7
             height: contHeight
             width: contHeight
diff --git a/discover/qml/ApplicationPage.qml b/discover/qml/ApplicationPage.qml
--- a/discover/qml/ApplicationPage.qml
+++ b/discover/qml/ApplicationPage.qml
@@ -103,11 +103,11 @@
         RowLayout {
             Layout.fillWidth: true
             spacing: Kirigami.Units.gridUnit
-            QIconItem {
+            Kirigami.Icon {
                 Layout.preferredHeight: 128
                 Layout.preferredWidth: 128
 
-                icon: appInfo.application.icon
+                source: appInfo.application.icon
                 Layout.alignment: Qt.AlignVCenter
             }
             ColumnLayout {
diff --git a/discover/qml/ProgressView.qml b/discover/qml/ProgressView.qml
--- a/discover/qml/ProgressView.qml
+++ b/discover/qml/ProgressView.qml
@@ -80,10 +80,10 @@
                         RowLayout {
                             Layout.fillWidth: true
 
-                            QIconItem {
+                            Kirigami.Icon {
                                 Layout.fillHeight: true
                                 Layout.minimumWidth: height
-                                icon: model.app.icon
+                                source: model.app.icon
                             }
                             Label {
                                 anchors.verticalCenter: parent.verticalCenter
diff --git a/discover/qml/Rating.qml b/discover/qml/Rating.qml
--- a/discover/qml/Rating.qml
+++ b/discover/qml/Rating.qml
@@ -21,6 +21,7 @@
 import QtQuick.Layouts 1.1
 import org.kde.kquickcontrolsaddons 2.0
 import org.kde.discover.app 1.0
+import org.kde.kirigami 2.0 as Kirigami
 
 RowLayout
 {
@@ -38,14 +39,14 @@
     Repeater {
         id: theRepeater
         model: view.rating>0 ? 5 : 0
-        delegate: QIconItem {
+        delegate: Kirigami.Icon {
             Layout.minimumWidth: view.starSize
             Layout.minimumHeight: view.starSize
             Layout.preferredWidth: view.starSize
             Layout.preferredHeight: view.starSize
 
             width: height
-            icon: "rating"
+            source: "rating"
             opacity: (view.editable && mouse.item.containsMouse ? 0.7
                         : index>=view.ratingIndex ? 0.2
                         : 1)
diff --git a/discover/qml/SourcesPage.qml b/discover/qml/SourcesPage.qml
--- a/discover/qml/SourcesPage.qml
+++ b/discover/qml/SourcesPage.qml
@@ -91,8 +91,8 @@
                     model: SourcesModel.actions
 
                     delegate: RowLayout {
-                        QIconItem {
-                            icon: modelData.icon
+                        Kirigami.Icon {
+                            source: modelData.icon
                         }
                         ToolButton {
                             height: parent.height
diff --git a/discover/qml/UpdatesPage.qml b/discover/qml/UpdatesPage.qml
--- a/discover/qml/UpdatesPage.qml
+++ b/discover/qml/UpdatesPage.qml
@@ -96,10 +96,10 @@
                 visible: page.footerLabel !== ""
                 text: page.footerLabel
             }
-            QIconItem {
+            Kirigami.Icon {
                 Layout.alignment: Qt.AlignHCenter
                 visible: page.footerLabel !== ""
-                icon: "update-none"
+                source: "update-none"
                 opacity: 0.3
                 width: 200
                 height: 200
@@ -155,10 +155,10 @@
                         onClicked: model.checked = (model.checked==Qt.Checked ? Qt.Unchecked : Qt.Checked)
                     }
 
-                    QIconItem {
+                    Kirigami.Icon {
                         Layout.fillHeight: true
                         Layout.preferredWidth: height
-                        icon: decoration
+                        source: decoration
                     }
 
                     Label {