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
@@ -41,7 +41,7 @@
     property int fontSize: config.fontSize
     signal clicked()
 
-    property real faceSize: Math.min(width, height - usernameDelegate.height - units.smallSpacing)
+    property real faceSize: units.gridUnit * 7
 
     opacity: isCurrent ? 1.0 : 0.5
 
diff --git a/lookandfeel/contents/logout/Logout.qml b/lookandfeel/contents/logout/Logout.qml
--- a/lookandfeel/contents/logout/Logout.qml
+++ b/lookandfeel/contents/logout/Logout.qml
@@ -117,7 +117,7 @@
         onClicked: root.cancelRequested()
     }
     UserDelegate {
-        width: units.iconSizes.enormous
+        width: units.gridUnit * 7
         height: width
         nameFontSize: theme.defaultFont.pointSize + 2
         anchors {