diff --git a/lookandfeel/contents/components/ActionButton.qml b/lookandfeel/contents/components/ActionButton.qml
--- a/lookandfeel/contents/components/ActionButton.qml
+++ b/lookandfeel/contents/components/ActionButton.qml
@@ -19,7 +19,7 @@
 
 import QtQuick 2.2
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.components 2.0 as PlasmaComponents
+import org.kde.plasma.extras 2.0 as PlasmaExtras
 
 Item {
     id: root
@@ -48,8 +48,9 @@
         colorGroup: PlasmaCore.ColorScope.colorGroup
         active: mouseArea.containsMouse || root.activeFocus
     }
-    PlasmaComponents.Label {
+    PlasmaExtras.Heading {
         id: label
+        level: 4
         anchors {
             top: icon.bottom
             topMargin: units.smallSpacing
diff --git a/lookandfeel/contents/components/UserDelegate.qml b/lookandfeel/contents/components/UserDelegate.qml
--- a/lookandfeel/contents/components/UserDelegate.qml
+++ b/lookandfeel/contents/components/UserDelegate.qml
@@ -22,7 +22,7 @@
 import QtGraphicalEffects 1.0
 
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.components 2.0 as PlasmaComponents
+import org.kde.plasma.extras 2.0 as PlasmaExtras
 
 Item {
     id: wrapper
@@ -157,11 +157,12 @@
         radius: 4
         samples: 9
         spread: 0.35
-        color: "black" // matches Breeze window decoration and desktopcontainment
+        color: "black"
     }
     
-    PlasmaComponents.Label {
+    PlasmaExtras.Heading {
         id: usernameDelegate
+        level: 4
         anchors {
             bottom: parent.bottom
             horizontalCenter: parent.horizontalCenter