diff --git a/app/assets/javascripts/discourse/lib/emoji/groups.js.es6 b/app/assets/javascripts/discourse/lib/emoji/groups.js.es6
index 0d33852b2ec..6f2eaf28028 100644
--- a/app/assets/javascripts/discourse/lib/emoji/groups.js.es6
+++ b/app/assets/javascripts/discourse/lib/emoji/groups.js.es6
@@ -680,7 +680,7 @@ const groups = [
       "tennis",
       "8ball",
       "bowling",
-      "cricket",
+      "cricket_bat_and_ball",
       "field_hockey",
       "ice_hockey",
       "ping_pong",
diff --git a/lib/emoji/db.json b/lib/emoji/db.json
index d899efa1cb3..4036e94a08c 100644
--- a/lib/emoji/db.json
+++ b/lib/emoji/db.json
@@ -2198,7 +2198,7 @@
     },
     {
       "code": "1f3cf",
-      "name": "cricket"
+      "name": "cricket_bat_and_ball"
     },
     {
       "code": "1f3bf",
@@ -6194,7 +6194,7 @@
     "crayon": [
       "lower_left_crayon"
     ],
-    "cricket": [
+    "cricket_bat_and_ball": [
       "cricket_bat_ball"
     ],
     "latin_cross": [
diff --git a/lib/tasks/emoji.rake b/lib/tasks/emoji.rake
index 9957a0e59bd..1ac8e199bee 100644
--- a/lib/tasks/emoji.rake
+++ b/lib/tasks/emoji.rake
@@ -28,7 +28,7 @@ EMOJI_ALIASES ||= {
   "city_sunset" => [ "city_dusk" ],
   "couch_and_lamp" => [ "couch" ],
   "crayon" => [ "lower_left_crayon" ],
-  "cricket" => [ "cricket_bat_ball" ],
+  "cricket_bat_and_ball" => [ "cricket_bat_ball" ],
   "latin_cross" => [ "cross" ],
   "dagger" => [ "dagger_knife" ],
   "desktop_computer" => [ "desktop" ],
diff --git a/public/images/emoji/apple/cricket_bat_and_ball.png b/public/images/emoji/apple/cricket_bat_and_ball.png
new file mode 100644
index 00000000000..798f0499e9d
Binary files /dev/null and b/public/images/emoji/apple/cricket_bat_and_ball.png differ
diff --git a/public/images/emoji/emoji_one/cricket_bat_and_ball.png b/public/images/emoji/emoji_one/cricket_bat_and_ball.png
new file mode 100644
index 00000000000..293f5d891dd
Binary files /dev/null and b/public/images/emoji/emoji_one/cricket_bat_and_ball.png differ
diff --git a/public/images/emoji/facebook_messenger/cricket.png b/public/images/emoji/facebook_messenger/cricket.png
index 8a0bf65a6c7..1e3c9dfa382 100644
Binary files a/public/images/emoji/facebook_messenger/cricket.png and b/public/images/emoji/facebook_messenger/cricket.png differ
diff --git a/public/images/emoji/facebook_messenger/cricket_bat_and_ball.png b/public/images/emoji/facebook_messenger/cricket_bat_and_ball.png
new file mode 100644
index 00000000000..8a0bf65a6c7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cricket_bat_and_ball.png differ
diff --git a/public/images/emoji/google/cricket.png b/public/images/emoji/google/cricket.png
index 98bac43e6c1..46b39fae4a7 100644
Binary files a/public/images/emoji/google/cricket.png and b/public/images/emoji/google/cricket.png differ
diff --git a/public/images/emoji/google/cricket_bat_and_ball.png b/public/images/emoji/google/cricket_bat_and_ball.png
new file mode 100644
index 00000000000..98bac43e6c1
Binary files /dev/null and b/public/images/emoji/google/cricket_bat_and_ball.png differ
diff --git a/public/images/emoji/google_blob/cricket_bat_and_ball.png b/public/images/emoji/google_blob/cricket_bat_and_ball.png
new file mode 100644
index 00000000000..a6bbc03a90c
Binary files /dev/null and b/public/images/emoji/google_blob/cricket_bat_and_ball.png differ
diff --git a/public/images/emoji/twitter/cricket.png b/public/images/emoji/twitter/cricket.png
index 8a0bf65a6c7..1e3c9dfa382 100644
Binary files a/public/images/emoji/twitter/cricket.png and b/public/images/emoji/twitter/cricket.png differ
diff --git a/public/images/emoji/twitter/cricket_bat_and_ball.png b/public/images/emoji/twitter/cricket_bat_and_ball.png
new file mode 100644
index 00000000000..8a0bf65a6c7
Binary files /dev/null and b/public/images/emoji/twitter/cricket_bat_and_ball.png differ
diff --git a/public/images/emoji/win10/cricket_bat_and_ball.png b/public/images/emoji/win10/cricket_bat_and_ball.png
new file mode 100644
index 00000000000..1714e0d8502
Binary files /dev/null and b/public/images/emoji/win10/cricket_bat_and_ball.png differ