diff --git a/src/chatbar/EmojiDelegate.qml b/src/chatbar/EmojiDelegate.qml
index 3ac3b68c0..a38c1b4a2 100644
--- a/src/chatbar/EmojiDelegate.qml
+++ b/src/chatbar/EmojiDelegate.qml
@@ -43,6 +43,9 @@ QQC2.ItemDelegate {
             anchors.fill: parent
             visible: root.emoji.startsWith("mxc") || root.isImage
             source: visible ? root.emoji : ""
+            fillMode: Image.PreserveAspectFit
+            sourceSize.width: width
+            sourceSize.height: height
         }
     }
 
diff --git a/src/chatbar/EmojiPicker.qml b/src/chatbar/EmojiPicker.qml
index 1a169740e..fdd437c60 100644
--- a/src/chatbar/EmojiPicker.qml
+++ b/src/chatbar/EmojiPicker.qml
@@ -201,8 +201,13 @@ ColumnLayout {
             width: root.categoryIconSize
             height: width
             checked: stickerModel.packIndex === model.index
+            padding: Kirigami.Units.largeSpacing
+
             contentItem: Image {
                 source: model.avatarUrl
+                fillMode: Image.PreserveAspectFit
+                sourceSize.width: width
+                sourceSize.height: height
             }
             QQC2.ToolTip.text: model.name
             QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay