diff --git a/src/emoji/EmojiModel.cpp b/src/emoji/EmojiModel.cpp
index 3cb13ff4..45b3b432 100644
--- a/src/emoji/EmojiModel.cpp
+++ b/src/emoji/EmojiModel.cpp
@@ -59,10 +59,10 @@ EmojiModel::data(const QModelIndex &index, int role) const
return Provider::emoji[index.row()].unicode;
case Qt::ToolTipRole:
- case CompletionModel::SearchRole:
+ case CompletionModel::SearchRole2:
case static_cast<int>(EmojiModel::Roles::UnicodeName):
return Provider::emoji[index.row()].unicodeName;
- case CompletionModel::SearchRole2:
+ case CompletionModel::SearchRole:
case static_cast<int>(EmojiModel::Roles::ShortName):
return Provider::emoji[index.row()].shortName;
case static_cast<int>(EmojiModel::Roles::Category):
diff --git a/src/emoji/Provider.cpp b/src/emoji/Provider.cpp
index ab0b1016..9df0f4a5 100644
--- a/src/emoji/Provider.cpp
+++ b/src/emoji/Provider.cpp
@@ -62,7 +62,7 @@ const QVector<Emoji> emoji::Provider::emoji = {
QStringLiteral(u"smiling face with smiling eyes"),
emoji::Emoji::Category::People},
Emoji{QStringLiteral(u"\U0001F607"),
- QStringLiteral(u"smiling_face_with_halo"),
+ QStringLiteral(u"innocent"),
QStringLiteral(u"smiling face with halo"),
emoji::Emoji::Category::People},
Emoji{QStringLiteral(u"\U0001F970"),
@@ -102,7 +102,7 @@ const QVector<Emoji> emoji::Provider::emoji = {
QStringLiteral(u"smiling face with tear"),
emoji::Emoji::Category::People},
Emoji{QStringLiteral(u"\U0001F60B"),
- QStringLiteral(u"face_savoring_food"),
+ QStringLiteral(u"yum"),
QStringLiteral(u"face savoring food"),
emoji::Emoji::Category::People},
Emoji{QStringLiteral(u"\U0001F61B"),
@@ -126,7 +126,7 @@ const QVector<Emoji> emoji::Provider::emoji = {
QStringLiteral(u"money-mouth face"),
emoji::Emoji::Category::People},
Emoji{QStringLiteral(u"\U0001F917"),
- QStringLiteral(u"smiling_face_with_open_hands"),
+ QStringLiteral(u"hugging_face"),
QStringLiteral(u"smiling face with open hands"),
emoji::Emoji::Category::People},
Emoji{QStringLiteral(u"\U0001F92D"),
|