diff --git a/imports/NeoChat/Component/Timeline/TimelineContainer.qml b/imports/NeoChat/Component/Timeline/TimelineContainer.qml
index b883d8e25..f5a67209f 100644
--- a/imports/NeoChat/Component/Timeline/TimelineContainer.qml
+++ b/imports/NeoChat/Component/Timeline/TimelineContainer.qml
@@ -79,6 +79,8 @@ QQC2.ItemDelegate {
                 Layout.minimumHeight: Kirigami.Units.gridUnit * 2
                 Layout.maximumWidth: Kirigami.Units.gridUnit * 2
                 Layout.maximumHeight: Kirigami.Units.gridUnit * 2
+                sourceSize.width: Kirigami.Units.gridUnit * 2
+                sourceSize.height: Kirigami.Units.gridUnit * 2
 
                 Layout.alignment: Qt.AlignTop
 
diff --git a/imports/NeoChat/Page/RoomListPage.qml b/imports/NeoChat/Page/RoomListPage.qml
index b6fd70358..50b2d1de6 100644
--- a/imports/NeoChat/Page/RoomListPage.qml
+++ b/imports/NeoChat/Page/RoomListPage.qml
@@ -138,6 +138,8 @@ Kirigami.ScrollablePage {
                 name: model.name || i18n("No Name")
                 implicitWidth: visible ? height : 0
                 visible: Config.showAvatarInTimeline
+                sourceSize.width: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2
+                sourceSize.height: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2
             }
 
             trailing: RowLayout {
diff --git a/imports/NeoChat/Panel/RoomDrawer.qml b/imports/NeoChat/Panel/RoomDrawer.qml
index 4e463d48d..cfd73c807 100644
--- a/imports/NeoChat/Panel/RoomDrawer.qml
+++ b/imports/NeoChat/Panel/RoomDrawer.qml
@@ -196,10 +196,11 @@ Kirigami.OverlayDrawer {
 
                         contentItem: RowLayout {
                             Kirigami.Avatar {
-                                Layout.preferredWidth: height
-                                Layout.fillHeight: true
+                                Layout.preferredWidth: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
+                                Layout.preferredHeight: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
                                 visible: Config.showAvatarInTimeline
-
+                                sourceSize.height: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
+                                sourceSize.width: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
                                 source: avatar ? ("image://mxc/" + avatar) : ""
                                 name: name
                             }