diff --git a/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiController.kt b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiController.kt
index 2042b4f989..7aad96d55c 100644
--- a/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiController.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiController.kt
@@ -111,7 +111,7 @@ class AutocompleteEmojiController @Inject constructor(
 
     companion object {
         // Count of standard emoji matches
-        const val STANDARD_EMOJI_MAX = 9
+        const val STANDARD_EMOJI_MAX = 7
         // Count of emojis for the current room's image pack
         const val CUSTOM_THIS_ROOM_MAX = 8
         // Count of emojis per other image pack
diff --git a/vector/src/main/res/layout/item_autocomplete_emoji.xml b/vector/src/main/res/layout/item_autocomplete_emoji.xml
index e6b7199ba7..3df0d920a1 100644
--- a/vector/src/main/res/layout/item_autocomplete_emoji.xml
+++ b/vector/src/main/res/layout/item_autocomplete_emoji.xml
@@ -20,6 +20,7 @@
         android:layout_gravity="center_vertical"
         android:maxLines="1"
         android:textColor="?vctr_content_secondary"
+        android:textSize="@dimen/text_size_body"
         android:ellipsize="end"
         android:visibility="gone"
         tools:text="@string/custom_emotes_this_room" />