2 files changed, 4 insertions, 2 deletions
diff --git a/src/emoji/EmojiModel.cpp b/src/emoji/EmojiModel.cpp
index 45b3b432..6f9ea9db 100644
--- a/src/emoji/EmojiModel.cpp
+++ b/src/emoji/EmojiModel.cpp
@@ -59,6 +59,8 @@ EmojiModel::data(const QModelIndex &index, int role) const
             return Provider::emoji[index.row()].unicode;
 
         case Qt::ToolTipRole:
+            return Provider::emoji[index.row()].shortName + ", " +
+                   Provider::emoji[index.row()].unicodeName;
         case CompletionModel::SearchRole2:
         case static_cast<int>(EmojiModel::Roles::UnicodeName):
             return Provider::emoji[index.row()].unicodeName;
diff --git a/src/emoji/Provider.cpp b/src/emoji/Provider.cpp
index fc1b8688..f5e7c0e8 100644
--- a/src/emoji/Provider.cpp
+++ b/src/emoji/Provider.cpp
@@ -614,7 +614,7 @@ const QVector<Emoji> emoji::Provider::emoji = {
         QStringLiteral(u"anger symbol"),
         emoji::Emoji::Category::People},
   Emoji{QStringLiteral(u"\U0001F4A5"),
-        QStringLiteral(u"collision"),
+        QStringLiteral(u"boom"),
         QStringLiteral(u"collision"),
         emoji::Emoji::Category::People},
   Emoji{QStringLiteral(u"\U0001F4AB"),
@@ -10560,7 +10560,7 @@ const QVector<Emoji> emoji::Provider::emoji = {
         QStringLiteral(u"balloon"),
         emoji::Emoji::Category::Activity},
   Emoji{QStringLiteral(u"\U0001F389"),
-        QStringLiteral(u"party_popper"),
+        QStringLiteral(u"tada"),
         QStringLiteral(u"party popper"),
         emoji::Emoji::Category::Activity},
   Emoji{QStringLiteral(u"\U0001F38A"),