diff --git a/src/plugins/bluetooth/bluetoothplugin_config.qml b/src/plugins/bluetooth/bluetoothplugin_config.qml
--- a/src/plugins/bluetooth/bluetoothplugin_config.qml
+++ b/src/plugins/bluetooth/bluetoothplugin_config.qml
@@ -18,6 +18,7 @@
 import QtQuick 2.1
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.1
+import org.kde.kirigami 2.5 as Kirigami
 
 import org.kde.bluezqt 1.0 as BluezQt
 
@@ -27,15 +28,17 @@
     Layout.fillWidth: true
     Layout.fillHeight: true
 
-    header: Label {
+    header: Kirigami.Heading {
         text: i18n("Choose a device to send to:")
         visible: root.count !== 0
+        level: 1
     }
     model: BluezQt.DevicesModel { }
 
-    delegate: ItemDelegate {
+    delegate: Kirigami.BasicListItem {
         width: parent.width
         text: Name
+        icon: Icon
         onClicked: root.device = Ubi
         checked: root.device === Ubi
         highlighted: root.device === Ubi
diff --git a/src/plugins/kdeconnect/kdeconnectplugin_config.qml b/src/plugins/kdeconnect/kdeconnectplugin_config.qml
--- a/src/plugins/kdeconnect/kdeconnectplugin_config.qml
+++ b/src/plugins/kdeconnect/kdeconnectplugin_config.qml
@@ -18,24 +18,27 @@
 import QtQuick 2.1
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.1
+import org.kde.kirigami 2.5 as Kirigami
 import org.kde.kdeconnect 1.0
 
 ListView {
     id: root
     property string device: ""
     Layout.fillWidth: true
     Layout.fillHeight: true
 
-    header: Label {
+    header: Kirigami.Heading {
         text: i18nd("purpose_kdeconnect","Choose a device to send to:")
+        level: 1
     }
     model: DevicesModel {
         id: connectDeviceModel
         displayFilter: DevicesModel.Paired | DevicesModel.Reachable
     }
-    delegate: ItemDelegate {
+    delegate: Kirigami.BasicListItem {
         width: parent.width
         text: model.display
+        icon: model.iconName
         onClicked: root.device = deviceId
         checked: root.device === deviceId
         highlighted: root.device === deviceId
diff --git a/src/widgets/JobDialog.qml b/src/widgets/JobDialog.qml
--- a/src/widgets/JobDialog.qml
+++ b/src/widgets/JobDialog.qml
@@ -25,6 +25,7 @@
     id: window
 
     flags: Qt.Dialog
+    title: configuration.pluginName
 
     width: Math.max(screen.width/3, 200)
     height: Math.max(screen.height/2, 300)
@@ -67,17 +68,6 @@
     Component {
         id: configWizardComponent
         Page {
-            header: Label {
-                TextMetrics {
-                    id: fontMetrics
-                }
-                font.weight: Font.Light
-                font.styleName: "Light"
-                font.pointSize: fontMetrics.font.pointSize * 2
-                elide: Text.ElideRight
-                maximumLineCount: 1
-                text: i18n("%1 - %2", window.configuration.pluginName, window.configuration.pluginTypeName)
-            }
             PurposeWizard {
                 id: wiz
                 configuration: window.configuration