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
@@ -41,7 +41,7 @@
     property bool constrainText: true
     signal clicked()
 
-    property real faceSize: Math.min(width, height - usernameDelegate.height - units.largeSpacing)
+    property real faceSize: Math.min(width, height - usernameDelegate.height - units.smallSpacing)
 
     opacity: isCurrent ? 1.0 : 0.5
 
@@ -65,7 +65,11 @@
 
     Item {
         id: imageSource
-        anchors.horizontalCenter: parent.horizontalCenter
+        anchors {
+            bottom: usernameDelegate.top
+            bottomMargin: units.largeSpacing
+            horizontalCenter: parent.horizontalCenter
+        }
         width: faceSize
         height: faceSize
 
@@ -89,8 +93,11 @@
     }
 
     ShaderEffect {
-        anchors.top: parent.top
-        anchors.horizontalCenter: parent.horizontalCenter
+        anchors {
+            bottom: usernameDelegate.top
+            bottomMargin: units.largeSpacing
+            horizontalCenter: parent.horizontalCenter
+        }
 
         width: imageSource.width
         height: imageSource.height
@@ -160,8 +167,9 @@
         color: "black" // matches Breeze window decoration and desktopcontainment
     }
     
-    PlasmaComponents.Label {
+    PlasmaExtras.Heading {
         id: usernameDelegate
+        level: 4
         anchors {
             bottom: parent.bottom
             horizontalCenter: parent.horizontalCenter