diff --git a/android/gradle.properties b/android/gradle.properties
index e6443382b31fab5fc027b99dc079154f78f27d0b..d965699510bdf71e00b8f08fe1031cef79d05911 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,5 +1,5 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-app.versionName=0.0.28
-app.versionCode=28
+app.versionName=0.0.29
+app.versionCode=29
diff --git a/fastlane/metadata/android/en-US/changelogs/29.txt b/fastlane/metadata/android/en-US/changelogs/29.txt
new file mode 100644
index 0000000000000000000000000000000000000000..445d67a445d67f98962ab52e7e80904de9678280
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/29.txt
@@ -0,0 +1 @@
+Shuffle emojis like colors.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/29.txt b/fastlane/metadata/android/fr-FR/changelogs/29.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a9dae394acffd044ebde927e332267149007b76f
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/29.txt
@@ -0,0 +1 @@
+Mélange les emojis en plus des couleurs.
diff --git a/lib/ui/painters/game_board_painter.dart b/lib/ui/painters/game_board_painter.dart
index 57dd7415ba17805cfeb45072c88fe1ef952f7f23..2b99234219598ca5d9d1a66b27f72e0e1c33056b 100644
--- a/lib/ui/painters/game_board_painter.dart
+++ b/lib/ui/painters/game_board_painter.dart
@@ -186,8 +186,12 @@ class GameBoardPainter extends CustomPainter {
 
     // draw content
     if (contentStrings != null) {
+      final int emojiIndex =
+          cellValue - 1 + game.shuffledColors[0] + 2 * game.shuffledColors[1];
+      final String text = contentStrings[emojiIndex % contentStrings.length];
+
       final textSpan = TextSpan(
-        text: contentStrings[cellValue - 1],
+        text: text,
         style: TextStyle(
           color: Colors.black,
           fontSize: 4 + cellSize / 2,
diff --git a/pubspec.lock b/pubspec.lock
index 17cf66c4a3b44bd2559e16ea322b1ad9ddaf42fb..f689e87236ba44207c981f4a2feaae7cb31895bf 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -353,10 +353,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: "1d9158c616048c38f712a6646e317a3426da10e884447626167240d45209cbad"
+      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.5.1"
   win32:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index b757e8b459979085a0ccd6926006c69dd39a1115..4f9bb6cd1c30d159190ed700375025b5ea55c64a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: Jeweled Game
 
 publish_to: 'none'
 
-version: 0.0.28+28
+version: 0.0.29+29
 
 environment:
   sdk: '^3.0.0'