diff --git a/src/qml/Display/Main.qml b/src/qml/Display/Main.qml
index cc94534..ad9276e 100644
--- a/src/qml/Display/Main.qml
+++ b/src/qml/Display/Main.qml
@@ -128,7 +128,7 @@ ItemPage {
                     Layout.fillWidth: true
                     model: screen.outputModel
                     orientation: ListView.Horizontal
-                    interactive: true
+                    interactive: false
                     clip: true
 
                     Layout.preferredHeight: currentItem ? currentItem.layout.implicitHeight + FishUI.Units.largeSpacing : 0
diff --git a/src/qml/User/UserDelegateItem.qml b/src/qml/User/UserDelegateItem.qml
index cf7d125..41d4c66 100644
--- a/src/qml/User/UserDelegateItem.qml
+++ b/src/qml/User/UserDelegateItem.qml
@@ -78,9 +78,12 @@ RoundedItem {
 
                     Image {
                         id: _userImage
-                        width: 48
-                        height: 48
-                        sourceSize: Qt.size(width, height)
+
+                        property int iconSize: 48
+
+                        Layout.preferredWidth: iconSize
+                        Layout.preferredHeight: iconSize
+                        sourceSize: source === "image://icontheme/default-user" ? Qt.size(iconSize, iconSize) : undefined
                         source: iconFileName ? "file:///" + iconFileName : "image://icontheme/default-user"
                         visible: status === Image.Ready
                         Layout.alignment: Qt.AlignVCenter