diff --git a/plasmoid/package6/contents/ui/CompactRepresentation.qml b/plasmoid/package6/contents/ui/CompactRepresentation.qml
index 6c9b0f2..6b56310 100644
--- a/plasmoid/package6/contents/ui/CompactRepresentation.qml
+++ b/plasmoid/package6/contents/ui/CompactRepresentation.qml
@@ -2,13 +2,14 @@ import QtQuick 2.0
 import QtQuick.Layouts 1.1
 import org.kde.plasma.plasmoid 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.kirigami 2.20 as Kirigami
 
 MouseArea {
     Layout.fillWidth: false
     hoverEnabled: true
     onClicked: plasmoid.expanded = !plasmoid.expanded
 
-    PlasmaCore.IconItem {
+    Kirigami.Icon {
         id: icon
         anchors.fill: parent
         source: plasmoid.statusIcon
diff --git a/plasmoid/package6/contents/ui/DetailItem.qml b/plasmoid/package6/contents/ui/DetailItem.qml
index 4f388fc..6a9c74b 100644
--- a/plasmoid/package6/contents/ui/DetailItem.qml
+++ b/plasmoid/package6/contents/ui/DetailItem.qml
@@ -17,7 +17,7 @@ Item {
         id: detailRow
         width: parent.width
 
-        PlasmaCore.IconItem {
+        Kirigami.Icon {
             source: detailIcon
             Layout.leftMargin: Kirigami.Units.iconSizes.small * 1.1
             Layout.preferredWidth: Kirigami.Units.iconSizes.small
diff --git a/plasmoid/package6/contents/ui/DevicesPage.qml b/plasmoid/package6/contents/ui/DevicesPage.qml
index 06e253d..734243d 100644
--- a/plasmoid/package6/contents/ui/DevicesPage.qml
+++ b/plasmoid/package6/contents/ui/DevicesPage.qml
@@ -34,7 +34,7 @@ Item {
                     RowLayout {
                         Layout.fillWidth: true
 
-                        PlasmaCore.IconItem {
+                        Kirigami.Icon {
                             Layout.preferredWidth: Kirigami.Units.iconSizes.small
                             Layout.preferredHeight: Kirigami.Units.iconSizes.small
                             Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
diff --git a/plasmoid/package6/contents/ui/DirectoriesPage.qml b/plasmoid/package6/contents/ui/DirectoriesPage.qml
index 7504f9b..3e68987 100644
--- a/plasmoid/package6/contents/ui/DirectoriesPage.qml
+++ b/plasmoid/package6/contents/ui/DirectoriesPage.qml
@@ -53,7 +53,7 @@ ColumnLayout {
                         id: itemSummary
                         Layout.fillWidth: true
 
-                        PlasmaCore.IconItem {
+                        Kirigami.Icon {
                             Layout.preferredWidth: units.iconSizes.small
                             Layout.preferredHeight: units.iconSizes.small
                             Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
diff --git a/plasmoid/package6/contents/ui/DownloadsPage.qml b/plasmoid/package6/contents/ui/DownloadsPage.qml
index c12c624..94c7f4b 100644
--- a/plasmoid/package6/contents/ui/DownloadsPage.qml
+++ b/plasmoid/package6/contents/ui/DownloadsPage.qml
@@ -85,7 +85,7 @@ Item {
                             delegate: RowLayout {
                                 width: detailsView.width
 
-                                PlasmaCore.IconItem {
+                                Kirigami.Icon {
                                     Layout.preferredWidth: Kirigami.Units.iconSizes.medium
                                     Layout.preferredHeight: Kirigami.Units.iconSizes.medium
                                     Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
diff --git a/plasmoid/package6/contents/ui/RecentChangesPage.qml b/plasmoid/package6/contents/ui/RecentChangesPage.qml
index 75360d5..213367b 100644
--- a/plasmoid/package6/contents/ui/RecentChangesPage.qml
+++ b/plasmoid/package6/contents/ui/RecentChangesPage.qml
@@ -26,7 +26,7 @@ Item {
                     spacing: 0
                     RowLayout {
                         Layout.fillWidth: true
-                        PlasmaCore.IconItem {
+                        Kirigami.Icon {
                             Layout.preferredWidth: Kirigami.Units.iconSizes.small
                             Layout.preferredHeight: Kirigami.Units.iconSizes.small
                             Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
diff --git a/plasmoid/package6/contents/ui/TabButton.qml b/plasmoid/package6/contents/ui/TabButton.qml
index 2c28298..e20bb18 100644
--- a/plasmoid/package6/contents/ui/TabButton.qml
+++ b/plasmoid/package6/contents/ui/TabButton.qml
@@ -20,7 +20,7 @@ PlasmaComponents3.TabButton {
 
     contentItem: RowLayout {
         spacing: label.visible ? Kirigami.Units.smallSpacing : 0
-        PlasmaCore.ColorScope.inherit: true
+        Kirigami.Theme.inherit: true
         width: parent.width
         Item {
             Layout.fillWidth: true
diff --git a/plasmoid/package6/contents/ui/ToolButton.qml b/plasmoid/package6/contents/ui/ToolButton.qml
index 7578d9f..cda308c 100644
--- a/plasmoid/package6/contents/ui/ToolButton.qml
+++ b/plasmoid/package6/contents/ui/ToolButton.qml
@@ -11,7 +11,7 @@ PlasmaComponents3.ToolButton {
         columns: 2
         columnSpacing: label.visible ? Kirigami.Units.smallSpacing : 0
         verticalItemAlignment: Grid.AlignVCenter
-        PlasmaCore.ColorScope.inherit: true
+        Kirigami.Theme.inherit: true
         Image {
             source: root.icon.source
             cache: false
diff --git a/plasmoid/package6/contents/ui/ToolTipView.qml b/plasmoid/package6/contents/ui/ToolTipView.qml
index 4a72422..f255bbe 100644
--- a/plasmoid/package6/contents/ui/ToolTipView.qml
+++ b/plasmoid/package6/contents/ui/ToolTipView.qml
@@ -7,7 +7,7 @@ import org.kde.kirigami 2.20 as Kirigami
 RowLayout {
     spacing: Kirigami.Units.smallSpacing
 
-    PlasmaCore.IconItem {
+    Kirigami.Icon {
         id: tooltipIcon
         source: plasmoid.statusIcon
         Layout.alignment: Qt.AlignCenter