1 files changed, 3 insertions, 1 deletions
diff --git a/Swift/QtUI/QtEmojiCell.cpp b/Swift/QtUI/QtEmojiCell.cpp
index 4932ece..3f2c652 100644
--- a/Swift/QtUI/QtEmojiCell.cpp
+++ b/Swift/QtUI/QtEmojiCell.cpp
@@ -1,41 +1,43 @@
 /*
  * Copyright (c) 2016-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/QtEmojiCell.h>
 
 #include <QFont>
 #include <QFontMetrics>
 #include <QPushButton>
 #include <QString>
 
 #include <SwifTools/EmojiMapper.h>
 
 namespace Swift {
     QtEmojiCell::QtEmojiCell(QString shortname, QString text, QWidget* parent) :  QPushButton(parent) {
         setText(text);
         QFont font = this->font();
         font.setPointSize(22);
         font.setBold(true);
         setFont(font);
 
-        setFixedWidth(fontMetrics().width("\xF0\x9F\x98\x83")+5);
+        const auto boundingRect = fontMetrics().boundingRect("\xF0\x9F\x98\x83");
+        setFixedWidth(qMax(boundingRect.width(), boundingRect.height()));
+        setFixedHeight(qMax(boundingRect.width(), boundingRect.height()));
 
         setFlat(true);
         setToolTip(shortname);
         connect(this, SIGNAL(clicked()), this, SLOT(handleEmojiClicked()));
     }
 
     QtEmojiCell::QtEmojiCell(const QtEmojiCell& b) : QtEmojiCell(b.toolTip(), b.text()) {
     }
 
     QtEmojiCell::~QtEmojiCell() {
     }
 
     void QtEmojiCell::handleEmojiClicked () {
         emit emojiClicked(text());
     }
 
 }