From 8357abd45508795c5247fd0530c8f7f0c3bbe69c Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 10 Apr 2020 11:18:41 +0200
Subject: [PATCH] Added prefix to resources to avoid accidental override

---
 .../crypto/verification/VerificationEmoji.kt  | 128 +++++++++---------
 ...plane.xml => ic_verification_airplane.xml} |   0
 ..._anchor.xml => ic_verification_anchor.xml} |   0
 ...ic_apple.xml => ic_verification_apple.xml} |   0
 .../{ic_ball.xml => ic_verification_ball.xml} |   0
 ..._banana.xml => ic_verification_banana.xml} |   0
 .../{ic_bell.xml => ic_verification_bell.xml} |   0
 ...icycle.xml => ic_verification_bicycle.xml} |   0
 .../{ic_book.xml => ic_verification_book.xml} |   0
 ...rfly.xml => ic_verification_butterfly.xml} |   0
 ..._cactus.xml => ic_verification_cactus.xml} |   0
 .../{ic_cake.xml => ic_verification_cake.xml} |   0
 .../{ic_cat.xml => ic_verification_cat.xml}   |   0
 ...ic_clock.xml => ic_verification_clock.xml} |   0
 ...ic_cloud.xml => ic_verification_cloud.xml} |   0
 .../{ic_corn.xml => ic_verification_corn.xml} |   0
 .../{ic_dog.xml => ic_verification_dog.xml}   |   0
 ...phant.xml => ic_verification_elephant.xml} |   0
 .../{ic_fire.xml => ic_verification_fire.xml} |   0
 .../{ic_fish.xml => ic_verification_fish.xml} |   0
 .../{ic_flag.xml => ic_verification_flag.xml} |   0
 ..._flower.xml => ic_verification_flower.xml} |   0
 ..._folder.xml => ic_verification_folder.xml} |   0
 .../{ic_gift.xml => ic_verification_gift.xml} |   0
 ...lasses.xml => ic_verification_glasses.xml} |   0
 ...ic_globe.xml => ic_verification_globe.xml} |   0
 ..._guitar.xml => ic_verification_guitar.xml} |   0
 ..._hammer.xml => ic_verification_hammer.xml} |   0
 .../{ic_hat.xml => ic_verification_hat.xml}   |   0
 ...hone.xml => ic_verification_headphone.xml} |   0
 ...ic_heart.xml => ic_verification_heart.xml} |   0
 ...ic_horse.xml => ic_verification_horse.xml} |   0
 ...lass.xml => ic_verification_hourglass.xml} |   0
 .../{ic_key.xml => ic_verification_key.xml}   |   0
 ...ulb.xml => ic_verification_light_bulb.xml} |   0
 .../{ic_lion.xml => ic_verification_lion.xml} |   0
 .../{ic_lock.xml => ic_verification_lock.xml} |   0
 .../{ic_moon.xml => ic_verification_moon.xml} |   0
 ...hroom.xml => ic_verification_mushroom.xml} |   0
 ...ctopus.xml => ic_verification_octopus.xml} |   0
 ...ic_panda.xml => ic_verification_panda.xml} |   0
 ...clip.xml => ic_verification_paperclip.xml} |   0
 ..._pencil.xml => ic_verification_pencil.xml} |   0
 ...enguin.xml => ic_verification_penguin.xml} |   0
 ...ic_phone.xml => ic_verification_phone.xml} |   0
 .../{ic_pig.xml => ic_verification_pig.xml}   |   0
 .../{ic_pin.xml => ic_verification_pin.xml}   |   0
 ...ic_pizza.xml => ic_verification_pizza.xml} |   0
 ..._rabbit.xml => ic_verification_rabbit.xml} |   0
 ...ic_robot.xml => ic_verification_robot.xml} |   0
 ..._rocket.xml => ic_verification_rocket.xml} |   0
 ...ooster.xml => ic_verification_rooster.xml} |   0
 ...ic_santa.xml => ic_verification_santa.xml} |   0
 ...ssors.xml => ic_verification_scissors.xml} |   0
 ..._smiley.xml => ic_verification_smiley.xml} |   0
 ...rry.xml => ic_verification_strawberry.xml} |   0
 ...s_up.xml => ic_verification_thumbs_up.xml} |   0
 ...ic_train.xml => ic_verification_train.xml} |   0
 .../{ic_tree.xml => ic_verification_tree.xml} |   0
 ..._trophy.xml => ic_verification_trophy.xml} |   0
 ...rumpet.xml => ic_verification_trumpet.xml} |   0
 ..._turtle.xml => ic_verification_turtle.xml} |   0
 ...rella.xml => ic_verification_umbrella.xml} |   0
 ...nicorn.xml => ic_verification_unicorn.xml} |   0
 ..._wrench.xml => ic_verification_wrench.xml} |   0
 .../src/main/res/layout/item_emoji_verif.xml  |   2 +-
 66 files changed, 65 insertions(+), 65 deletions(-)
 rename matrix-sdk-android/src/main/res/drawable/{ic_airplane.xml => ic_verification_airplane.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_anchor.xml => ic_verification_anchor.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_apple.xml => ic_verification_apple.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_ball.xml => ic_verification_ball.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_banana.xml => ic_verification_banana.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_bell.xml => ic_verification_bell.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_bicycle.xml => ic_verification_bicycle.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_book.xml => ic_verification_book.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_butterfly.xml => ic_verification_butterfly.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_cactus.xml => ic_verification_cactus.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_cake.xml => ic_verification_cake.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_cat.xml => ic_verification_cat.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_clock.xml => ic_verification_clock.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_cloud.xml => ic_verification_cloud.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_corn.xml => ic_verification_corn.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_dog.xml => ic_verification_dog.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_elephant.xml => ic_verification_elephant.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_fire.xml => ic_verification_fire.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_fish.xml => ic_verification_fish.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_flag.xml => ic_verification_flag.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_flower.xml => ic_verification_flower.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_folder.xml => ic_verification_folder.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_gift.xml => ic_verification_gift.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_glasses.xml => ic_verification_glasses.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_globe.xml => ic_verification_globe.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_guitar.xml => ic_verification_guitar.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_hammer.xml => ic_verification_hammer.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_hat.xml => ic_verification_hat.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_headphone.xml => ic_verification_headphone.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_heart.xml => ic_verification_heart.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_horse.xml => ic_verification_horse.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_hourglass.xml => ic_verification_hourglass.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_key.xml => ic_verification_key.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_light_bulb.xml => ic_verification_light_bulb.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_lion.xml => ic_verification_lion.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_lock.xml => ic_verification_lock.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_moon.xml => ic_verification_moon.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_mushroom.xml => ic_verification_mushroom.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_octopus.xml => ic_verification_octopus.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_panda.xml => ic_verification_panda.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_paperclip.xml => ic_verification_paperclip.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_pencil.xml => ic_verification_pencil.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_penguin.xml => ic_verification_penguin.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_phone.xml => ic_verification_phone.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_pig.xml => ic_verification_pig.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_pin.xml => ic_verification_pin.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_pizza.xml => ic_verification_pizza.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_rabbit.xml => ic_verification_rabbit.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_robot.xml => ic_verification_robot.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_rocket.xml => ic_verification_rocket.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_rooster.xml => ic_verification_rooster.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_santa.xml => ic_verification_santa.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_scissors.xml => ic_verification_scissors.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_smiley.xml => ic_verification_smiley.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_strawberry.xml => ic_verification_strawberry.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_thumbs_up.xml => ic_verification_thumbs_up.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_train.xml => ic_verification_train.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_tree.xml => ic_verification_tree.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_trophy.xml => ic_verification_trophy.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_trumpet.xml => ic_verification_trumpet.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_turtle.xml => ic_verification_turtle.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_umbrella.xml => ic_verification_umbrella.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_unicorn.xml => ic_verification_unicorn.xml} (100%)
 rename matrix-sdk-android/src/main/res/drawable/{ic_wrench.xml => ic_verification_wrench.xml} (100%)

diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationEmoji.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationEmoji.kt
index 8da633acf9..396b609f41 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationEmoji.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationEmoji.kt
@@ -20,69 +20,69 @@ import im.vector.matrix.android.api.session.crypto.verification.EmojiRepresentat
 
 internal fun getEmojiForCode(code: Int): EmojiRepresentation {
     return when (code % 64) {
-        0             -> EmojiRepresentation("🐶", R.string.verification_emoji_dog, R.drawable.ic_dog)
-        1             -> EmojiRepresentation("🐱", R.string.verification_emoji_cat, R.drawable.ic_cat)
-        2             -> EmojiRepresentation("🦁", R.string.verification_emoji_lion, R.drawable.ic_lion)
-        3             -> EmojiRepresentation("🐎", R.string.verification_emoji_horse, R.drawable.ic_horse)
-        4             -> EmojiRepresentation("🦄", R.string.verification_emoji_unicorn, R.drawable.ic_unicorn)
-        5             -> EmojiRepresentation("🐷", R.string.verification_emoji_pig, R.drawable.ic_pig)
-        6             -> EmojiRepresentation("🐘", R.string.verification_emoji_elephant, R.drawable.ic_elephant)
-        7             -> EmojiRepresentation("🐰", R.string.verification_emoji_rabbit, R.drawable.ic_rabbit)
-        8             -> EmojiRepresentation("🐼", R.string.verification_emoji_panda, R.drawable.ic_panda)
-        9             -> EmojiRepresentation("🐓", R.string.verification_emoji_rooster, R.drawable.ic_rooster)
-        10            -> EmojiRepresentation("🐧", R.string.verification_emoji_penguin, R.drawable.ic_penguin)
-        11            -> EmojiRepresentation("🐢", R.string.verification_emoji_turtle, R.drawable.ic_turtle)
-        12            -> EmojiRepresentation("🐟", R.string.verification_emoji_fish, R.drawable.ic_fish)
-        13            -> EmojiRepresentation("🐙", R.string.verification_emoji_octopus, R.drawable.ic_octopus)
-        14            -> EmojiRepresentation("🦋", R.string.verification_emoji_butterfly, R.drawable.ic_butterfly)
-        15            -> EmojiRepresentation("🌷", R.string.verification_emoji_flower, R.drawable.ic_flower)
-        16            -> EmojiRepresentation("🌳", R.string.verification_emoji_tree, R.drawable.ic_tree)
-        17            -> EmojiRepresentation("🌵", R.string.verification_emoji_cactus, R.drawable.ic_cactus)
-        18            -> EmojiRepresentation("🍄", R.string.verification_emoji_mushroom, R.drawable.ic_mushroom)
-        19            -> EmojiRepresentation("🌏", R.string.verification_emoji_globe, R.drawable.ic_globe)
-        20            -> EmojiRepresentation("🌙", R.string.verification_emoji_moon, R.drawable.ic_moon)
-        21            -> EmojiRepresentation("☁️", R.string.verification_emoji_cloud, R.drawable.ic_cloud)
-        22            -> EmojiRepresentation("🔥", R.string.verification_emoji_fire, R.drawable.ic_fire)
-        23            -> EmojiRepresentation("🍌", R.string.verification_emoji_banana, R.drawable.ic_banana)
-        24            -> EmojiRepresentation("🍎", R.string.verification_emoji_apple, R.drawable.ic_apple)
-        25            -> EmojiRepresentation("🍓", R.string.verification_emoji_strawberry, R.drawable.ic_strawberry)
-        26            -> EmojiRepresentation("🌽", R.string.verification_emoji_corn, R.drawable.ic_corn)
-        27            -> EmojiRepresentation("🍕", R.string.verification_emoji_pizza, R.drawable.ic_pizza)
-        28            -> EmojiRepresentation("🎂", R.string.verification_emoji_cake, R.drawable.ic_cake)
-        29            -> EmojiRepresentation("❤️", R.string.verification_emoji_heart, R.drawable.ic_heart)
-        30            -> EmojiRepresentation("🙂", R.string.verification_emoji_smiley, R.drawable.ic_smiley)
-        31            -> EmojiRepresentation("🤖", R.string.verification_emoji_robot, R.drawable.ic_robot)
-        32            -> EmojiRepresentation("🎩", R.string.verification_emoji_hat, R.drawable.ic_hat)
-        33            -> EmojiRepresentation("👓", R.string.verification_emoji_glasses, R.drawable.ic_glasses)
-        34            -> EmojiRepresentation("🔧", R.string.verification_emoji_wrench, R.drawable.ic_wrench)
-        35            -> EmojiRepresentation("🎅", R.string.verification_emoji_santa, R.drawable.ic_santa)
-        36            -> EmojiRepresentation("👍", R.string.verification_emoji_thumbsup, R.drawable.ic_thumbs_up)
-        37            -> EmojiRepresentation("☂️", R.string.verification_emoji_umbrella, R.drawable.ic_umbrella)
-        38            -> EmojiRepresentation("⌛", R.string.verification_emoji_hourglass, R.drawable.ic_hourglass)
-        39            -> EmojiRepresentation("⏰", R.string.verification_emoji_clock, R.drawable.ic_clock)
-        40            -> EmojiRepresentation("🎁", R.string.verification_emoji_gift, R.drawable.ic_gift)
-        41            -> EmojiRepresentation("💡", R.string.verification_emoji_lightbulb, R.drawable.ic_light_bulb)
-        42            -> EmojiRepresentation("📕", R.string.verification_emoji_book, R.drawable.ic_book)
-        43            -> EmojiRepresentation("✏️", R.string.verification_emoji_pencil, R.drawable.ic_pencil)
-        44            -> EmojiRepresentation("📎", R.string.verification_emoji_paperclip, R.drawable.ic_paperclip)
-        45            -> EmojiRepresentation("✂️", R.string.verification_emoji_scissors, R.drawable.ic_scissors)
-        46            -> EmojiRepresentation("🔒", R.string.verification_emoji_lock, R.drawable.ic_lock)
-        47            -> EmojiRepresentation("🔑", R.string.verification_emoji_key, R.drawable.ic_key)
-        48            -> EmojiRepresentation("🔨", R.string.verification_emoji_hammer, R.drawable.ic_hammer)
-        49            -> EmojiRepresentation("☎️", R.string.verification_emoji_telephone, R.drawable.ic_phone)
-        50            -> EmojiRepresentation("🏁", R.string.verification_emoji_flag, R.drawable.ic_flag)
-        51            -> EmojiRepresentation("🚂", R.string.verification_emoji_train, R.drawable.ic_train)
-        52            -> EmojiRepresentation("🚲", R.string.verification_emoji_bicycle, R.drawable.ic_bicycle)
-        53            -> EmojiRepresentation("✈️", R.string.verification_emoji_airplane, R.drawable.ic_airplane)
-        54            -> EmojiRepresentation("🚀", R.string.verification_emoji_rocket, R.drawable.ic_rocket)
-        55            -> EmojiRepresentation("🏆", R.string.verification_emoji_trophy, R.drawable.ic_trophy)
-        56            -> EmojiRepresentation("⚽", R.string.verification_emoji_ball, R.drawable.ic_ball)
-        57            -> EmojiRepresentation("🎸", R.string.verification_emoji_guitar, R.drawable.ic_guitar)
-        58            -> EmojiRepresentation("🎺", R.string.verification_emoji_trumpet, R.drawable.ic_trumpet)
-        59            -> EmojiRepresentation("🔔", R.string.verification_emoji_bell, R.drawable.ic_bell)
-        60            -> EmojiRepresentation("⚓", R.string.verification_emoji_anchor, R.drawable.ic_anchor)
-        61            -> EmojiRepresentation("🎧", R.string.verification_emoji_headphone, R.drawable.ic_headphone)
-        62            -> EmojiRepresentation("📁", R.string.verification_emoji_folder, R.drawable.ic_folder)
-        /* 63 */ else -> EmojiRepresentation("📌", R.string.verification_emoji_pin, R.drawable.ic_pin)
+        0             -> EmojiRepresentation("🐶", R.string.verification_emoji_dog, R.drawable.ic_verification_dog)
+        1             -> EmojiRepresentation("🐱", R.string.verification_emoji_cat, R.drawable.ic_verification_cat)
+        2             -> EmojiRepresentation("🦁", R.string.verification_emoji_lion, R.drawable.ic_verification_lion)
+        3             -> EmojiRepresentation("🐎", R.string.verification_emoji_horse, R.drawable.ic_verification_horse)
+        4             -> EmojiRepresentation("🦄", R.string.verification_emoji_unicorn, R.drawable.ic_verification_unicorn)
+        5             -> EmojiRepresentation("🐷", R.string.verification_emoji_pig, R.drawable.ic_verification_pig)
+        6             -> EmojiRepresentation("🐘", R.string.verification_emoji_elephant, R.drawable.ic_verification_elephant)
+        7             -> EmojiRepresentation("🐰", R.string.verification_emoji_rabbit, R.drawable.ic_verification_rabbit)
+        8             -> EmojiRepresentation("🐼", R.string.verification_emoji_panda, R.drawable.ic_verification_panda)
+        9             -> EmojiRepresentation("🐓", R.string.verification_emoji_rooster, R.drawable.ic_verification_rooster)
+        10            -> EmojiRepresentation("🐧", R.string.verification_emoji_penguin, R.drawable.ic_verification_penguin)
+        11            -> EmojiRepresentation("🐢", R.string.verification_emoji_turtle, R.drawable.ic_verification_turtle)
+        12            -> EmojiRepresentation("🐟", R.string.verification_emoji_fish, R.drawable.ic_verification_fish)
+        13            -> EmojiRepresentation("🐙", R.string.verification_emoji_octopus, R.drawable.ic_verification_octopus)
+        14            -> EmojiRepresentation("🦋", R.string.verification_emoji_butterfly, R.drawable.ic_verification_butterfly)
+        15            -> EmojiRepresentation("🌷", R.string.verification_emoji_flower, R.drawable.ic_verification_flower)
+        16            -> EmojiRepresentation("🌳", R.string.verification_emoji_tree, R.drawable.ic_verification_tree)
+        17            -> EmojiRepresentation("🌵", R.string.verification_emoji_cactus, R.drawable.ic_verification_cactus)
+        18            -> EmojiRepresentation("🍄", R.string.verification_emoji_mushroom, R.drawable.ic_verification_mushroom)
+        19            -> EmojiRepresentation("🌏", R.string.verification_emoji_globe, R.drawable.ic_verification_globe)
+        20            -> EmojiRepresentation("🌙", R.string.verification_emoji_moon, R.drawable.ic_verification_moon)
+        21            -> EmojiRepresentation("☁️", R.string.verification_emoji_cloud, R.drawable.ic_verification_cloud)
+        22            -> EmojiRepresentation("🔥", R.string.verification_emoji_fire, R.drawable.ic_verification_fire)
+        23            -> EmojiRepresentation("🍌", R.string.verification_emoji_banana, R.drawable.ic_verification_banana)
+        24            -> EmojiRepresentation("🍎", R.string.verification_emoji_apple, R.drawable.ic_verification_apple)
+        25            -> EmojiRepresentation("🍓", R.string.verification_emoji_strawberry, R.drawable.ic_verification_strawberry)
+        26            -> EmojiRepresentation("🌽", R.string.verification_emoji_corn, R.drawable.ic_verification_corn)
+        27            -> EmojiRepresentation("🍕", R.string.verification_emoji_pizza, R.drawable.ic_verification_pizza)
+        28            -> EmojiRepresentation("🎂", R.string.verification_emoji_cake, R.drawable.ic_verification_cake)
+        29            -> EmojiRepresentation("❤️", R.string.verification_emoji_heart, R.drawable.ic_verification_heart)
+        30            -> EmojiRepresentation("🙂", R.string.verification_emoji_smiley, R.drawable.ic_verification_smiley)
+        31            -> EmojiRepresentation("🤖", R.string.verification_emoji_robot, R.drawable.ic_verification_robot)
+        32            -> EmojiRepresentation("🎩", R.string.verification_emoji_hat, R.drawable.ic_verification_hat)
+        33            -> EmojiRepresentation("👓", R.string.verification_emoji_glasses, R.drawable.ic_verification_glasses)
+        34            -> EmojiRepresentation("🔧", R.string.verification_emoji_wrench, R.drawable.ic_verification_wrench)
+        35            -> EmojiRepresentation("🎅", R.string.verification_emoji_santa, R.drawable.ic_verification_santa)
+        36            -> EmojiRepresentation("👍", R.string.verification_emoji_thumbsup, R.drawable.ic_verification_thumbs_up)
+        37            -> EmojiRepresentation("☂️", R.string.verification_emoji_umbrella, R.drawable.ic_verification_umbrella)
+        38            -> EmojiRepresentation("⌛", R.string.verification_emoji_hourglass, R.drawable.ic_verification_hourglass)
+        39            -> EmojiRepresentation("⏰", R.string.verification_emoji_clock, R.drawable.ic_verification_clock)
+        40            -> EmojiRepresentation("🎁", R.string.verification_emoji_gift, R.drawable.ic_verification_gift)
+        41            -> EmojiRepresentation("💡", R.string.verification_emoji_lightbulb, R.drawable.ic_verification_light_bulb)
+        42            -> EmojiRepresentation("📕", R.string.verification_emoji_book, R.drawable.ic_verification_book)
+        43            -> EmojiRepresentation("✏️", R.string.verification_emoji_pencil, R.drawable.ic_verification_pencil)
+        44            -> EmojiRepresentation("📎", R.string.verification_emoji_paperclip, R.drawable.ic_verification_paperclip)
+        45            -> EmojiRepresentation("✂️", R.string.verification_emoji_scissors, R.drawable.ic_verification_scissors)
+        46            -> EmojiRepresentation("🔒", R.string.verification_emoji_lock, R.drawable.ic_verification_lock)
+        47            -> EmojiRepresentation("🔑", R.string.verification_emoji_key, R.drawable.ic_verification_key)
+        48            -> EmojiRepresentation("🔨", R.string.verification_emoji_hammer, R.drawable.ic_verification_hammer)
+        49            -> EmojiRepresentation("☎️", R.string.verification_emoji_telephone, R.drawable.ic_verification_phone)
+        50            -> EmojiRepresentation("🏁", R.string.verification_emoji_flag, R.drawable.ic_verification_flag)
+        51            -> EmojiRepresentation("🚂", R.string.verification_emoji_train, R.drawable.ic_verification_train)
+        52            -> EmojiRepresentation("🚲", R.string.verification_emoji_bicycle, R.drawable.ic_verification_bicycle)
+        53            -> EmojiRepresentation("✈️", R.string.verification_emoji_airplane, R.drawable.ic_verification_airplane)
+        54            -> EmojiRepresentation("🚀", R.string.verification_emoji_rocket, R.drawable.ic_verification_rocket)
+        55            -> EmojiRepresentation("🏆", R.string.verification_emoji_trophy, R.drawable.ic_verification_trophy)
+        56            -> EmojiRepresentation("⚽", R.string.verification_emoji_ball, R.drawable.ic_verification_ball)
+        57            -> EmojiRepresentation("🎸", R.string.verification_emoji_guitar, R.drawable.ic_verification_guitar)
+        58            -> EmojiRepresentation("🎺", R.string.verification_emoji_trumpet, R.drawable.ic_verification_trumpet)
+        59            -> EmojiRepresentation("🔔", R.string.verification_emoji_bell, R.drawable.ic_verification_bell)
+        60            -> EmojiRepresentation("⚓", R.string.verification_emoji_anchor, R.drawable.ic_verification_anchor)
+        61            -> EmojiRepresentation("🎧", R.string.verification_emoji_headphone, R.drawable.ic_verification_headphone)
+        62            -> EmojiRepresentation("📁", R.string.verification_emoji_folder, R.drawable.ic_verification_folder)
+        /* 63 */ else -> EmojiRepresentation("📌", R.string.verification_emoji_pin, R.drawable.ic_verification_pin)
     }
 }
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_airplane.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_airplane.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_airplane.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_airplane.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_anchor.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_anchor.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_anchor.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_anchor.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_apple.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_apple.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_apple.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_apple.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_ball.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_ball.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_ball.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_ball.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_banana.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_banana.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_banana.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_banana.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_bell.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_bell.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_bell.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_bell.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_bicycle.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_bicycle.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_bicycle.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_bicycle.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_book.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_book.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_book.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_book.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_butterfly.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_butterfly.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_butterfly.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_butterfly.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_cactus.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_cactus.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_cactus.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_cactus.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_cake.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_cake.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_cake.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_cake.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_cat.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_cat.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_cat.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_cat.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_clock.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_clock.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_clock.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_clock.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_cloud.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_cloud.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_cloud.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_cloud.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_corn.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_corn.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_corn.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_corn.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_dog.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_dog.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_dog.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_dog.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_elephant.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_elephant.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_elephant.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_elephant.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_fire.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_fire.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_fire.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_fire.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_fish.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_fish.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_fish.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_fish.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_flag.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_flag.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_flag.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_flag.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_flower.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_flower.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_flower.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_flower.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_folder.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_folder.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_folder.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_folder.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_gift.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_gift.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_gift.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_gift.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_glasses.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_glasses.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_glasses.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_glasses.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_globe.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_globe.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_globe.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_globe.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_guitar.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_guitar.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_guitar.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_guitar.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_hammer.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_hammer.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_hammer.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_hammer.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_hat.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_hat.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_hat.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_hat.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_headphone.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_headphone.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_headphone.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_headphone.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_heart.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_heart.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_heart.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_heart.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_horse.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_horse.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_horse.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_horse.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_hourglass.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_hourglass.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_hourglass.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_hourglass.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_key.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_key.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_key.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_key.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_light_bulb.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_light_bulb.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_light_bulb.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_light_bulb.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_lion.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_lion.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_lion.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_lion.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_lock.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_lock.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_lock.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_lock.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_moon.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_moon.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_moon.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_moon.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_mushroom.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_mushroom.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_mushroom.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_mushroom.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_octopus.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_octopus.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_octopus.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_octopus.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_panda.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_panda.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_panda.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_panda.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_paperclip.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_paperclip.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_paperclip.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_paperclip.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_pencil.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_pencil.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_pencil.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_pencil.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_penguin.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_penguin.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_penguin.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_penguin.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_phone.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_phone.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_phone.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_phone.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_pig.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_pig.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_pig.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_pig.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_pin.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_pin.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_pin.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_pin.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_pizza.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_pizza.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_pizza.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_pizza.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_rabbit.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_rabbit.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_rabbit.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_rabbit.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_robot.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_robot.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_robot.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_robot.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_rocket.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_rocket.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_rocket.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_rocket.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_rooster.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_rooster.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_rooster.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_rooster.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_santa.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_santa.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_santa.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_santa.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_scissors.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_scissors.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_scissors.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_scissors.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_smiley.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_smiley.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_smiley.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_smiley.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_strawberry.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_strawberry.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_strawberry.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_strawberry.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_thumbs_up.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_thumbs_up.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_thumbs_up.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_thumbs_up.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_train.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_train.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_train.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_train.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_tree.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_tree.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_tree.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_tree.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_trophy.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_trophy.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_trophy.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_trophy.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_trumpet.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_trumpet.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_trumpet.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_trumpet.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_turtle.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_turtle.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_turtle.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_turtle.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_umbrella.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_umbrella.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_umbrella.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_umbrella.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_unicorn.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_unicorn.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_unicorn.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_unicorn.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_wrench.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_wrench.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_wrench.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_wrench.xml
diff --git a/vector/src/main/res/layout/item_emoji_verif.xml b/vector/src/main/res/layout/item_emoji_verif.xml
index 8ffeed3e3e..ff883e6de1 100644
--- a/vector/src/main/res/layout/item_emoji_verif.xml
+++ b/vector/src/main/res/layout/item_emoji_verif.xml
@@ -25,7 +25,7 @@
         android:layout_margin="2dp"
         android:layout_height="54dp"
         android:layout_gravity="center"
-        android:src="@drawable/ic_lion"
+        android:src="@drawable/ic_verification_cactus"
         tools:visibility="visible"
         android:visibility="gone"
         tools:ignore="SpUsage"