diff --git a/src/gui/PredefinedStatusButton.qml b/src/gui/PredefinedStatusButton.qml
index 3186bb5e12..dabef84ae2 100644
--- a/src/gui/PredefinedStatusButton.qml
+++ b/src/gui/PredefinedStatusButton.qml
@@ -28,7 +28,8 @@ AbstractButton {
     leftPadding: Style.standardSpacing / 2
     rightPadding: Style.standardSpacing / 2
 
-    property real internalSpacing: Style.standardSpacing
+    property int emojiWidth: -1
+    property int internalSpacing: Style.standardSpacing
     property string emoji: ""
 
     background: Rectangle {
@@ -37,15 +38,19 @@ AbstractButton {
     }
 
     contentItem: Row {
-        spacing: internalSpacing
+        spacing: root.internalSpacing
 
         Label {
+            width: root.emojiWidth > 0 ? root.emojiWidth : implicitWidth
             text: emoji
+            horizontalAlignment: Image.AlignHCenter
+            verticalAlignment: Image.AlignVCenter
         }
 
         Label {
             text: root.text
             color: Style.ncTextColor
+            verticalAlignment: Text.AlignVCenter
         }
     }
 }
diff --git a/src/gui/UserStatusSelector.qml b/src/gui/UserStatusSelector.qml
index 68809ae4bd..482505769c 100644
--- a/src/gui/UserStatusSelector.qml
+++ b/src/gui/UserStatusSelector.qml
@@ -141,6 +141,7 @@ ColumnLayout {
             }
 
             RowLayout {
+                id: statusFieldLayout
                 Layout.fillWidth: true
                 spacing: 0
 
@@ -264,9 +265,11 @@ ColumnLayout {
                     model: userStatusSelectorModel.predefinedStatuses
 
                     PredefinedStatusButton {
-                        id: control
                         Layout.fillWidth: true
-                        internalSpacing: Style.standardSpacing + fieldButton.padding + userStatusMessageTextField.padding
+
+                        leftPadding: 0
+                        emojiWidth: fieldButton.width
+                        internalSpacing: statusFieldLayout.spacing + userStatusMessageTextField.leftPadding
 
                         emoji: modelData.icon
                         text: "<b>%1</b> – %2".arg(modelData.message).arg(userStatusSelectorModel.clearAtReadable(modelData))