diff --git a/app/assets/javascripts/discourse/lib/emoji/groups.js.es6 b/app/assets/javascripts/discourse/lib/emoji/groups.js.es6
index 627513d1cf6..d343ef6723c 100644
--- a/app/assets/javascripts/discourse/lib/emoji/groups.js.es6
+++ b/app/assets/javascripts/discourse/lib/emoji/groups.js.es6
@@ -1466,7 +1466,6 @@ const groups = [
       "studio_microphone",
       "medal_military",
       "computer_mouse",
-      "mouse_three_button",
       "newspaper_roll",
       "spiral_notepad",
       "oil_drum",
diff --git a/lib/emoji/db.json b/lib/emoji/db.json
index d5619dc4964..adbf45fed8d 100644
--- a/lib/emoji/db.json
+++ b/lib/emoji/db.json
@@ -6344,8 +6344,9 @@
     "artificial_satellite": [
       "satellite_orbital"
     ],
-    "three_button_mouse": [
-      "mouse_three_button"
+    "computer_mouse": [
+      "mouse_three_button",
+      "three_button_mouse"
     ],
     "hocho": [
       "knife"
diff --git a/lib/tasks/emoji.rake b/lib/tasks/emoji.rake
index 104c096b31c..7bb4038f211 100644
--- a/lib/tasks/emoji.rake
+++ b/lib/tasks/emoji.rake
@@ -173,7 +173,7 @@ EMOJI_ALIASES ||= {
   "honeybee" => [ "bee" ],
   "lion" => [ "lion_face" ],
   "artificial_satellite" => [ "satellite_orbital" ],
-  "three_button_mouse" => [ "mouse_three_button" ],
+  "computer_mouse" => [ "mouse_three_button", "three_button_mouse" ],
   "hocho" => [ "knife" ],
   "swimming_man" => [ "swimmer" ],
   "wind_face" => [ "wind_blowing_face" ],
@@ -1677,7 +1677,6 @@ EMOJI_GROUPS ||= [
       "studio_microphone",
       "medal_military",
       "computer_mouse",
-      "mouse_three_button",
       "newspaper_roll",
       "spiral_notepad",
       "oil_drum",
diff --git a/public/images/emoji/apple/mouse_three_button.png b/public/images/emoji/apple/mouse_three_button.png
new file mode 100644
index 00000000000..3899171edc6
Binary files /dev/null and b/public/images/emoji/apple/mouse_three_button.png differ
diff --git a/public/images/emoji/apple/three_button_mouse.png b/public/images/emoji/apple/three_button_mouse.png
new file mode 100644
index 00000000000..3899171edc6
Binary files /dev/null and b/public/images/emoji/apple/three_button_mouse.png differ
diff --git a/public/images/emoji/emoji_one/mouse_three_button.png b/public/images/emoji/emoji_one/mouse_three_button.png
new file mode 100644
index 00000000000..0e9dfa8326a
Binary files /dev/null and b/public/images/emoji/emoji_one/mouse_three_button.png differ
diff --git a/public/images/emoji/emoji_one/three_button_mouse.png b/public/images/emoji/emoji_one/three_button_mouse.png
new file mode 100644
index 00000000000..0e9dfa8326a
Binary files /dev/null and b/public/images/emoji/emoji_one/three_button_mouse.png differ
diff --git a/public/images/emoji/google/mouse_three_button.png b/public/images/emoji/google/mouse_three_button.png
new file mode 100644
index 00000000000..606ada2ed4f
Binary files /dev/null and b/public/images/emoji/google/mouse_three_button.png differ
diff --git a/public/images/emoji/google/three_button_mouse.png b/public/images/emoji/google/three_button_mouse.png
new file mode 100644
index 00000000000..606ada2ed4f
Binary files /dev/null and b/public/images/emoji/google/three_button_mouse.png differ
diff --git a/public/images/emoji/twitter/mouse_three_button.png b/public/images/emoji/twitter/mouse_three_button.png
new file mode 100644
index 00000000000..3a71c800c68
Binary files /dev/null and b/public/images/emoji/twitter/mouse_three_button.png differ
diff --git a/public/images/emoji/twitter/three_button_mouse.png b/public/images/emoji/twitter/three_button_mouse.png
new file mode 100644
index 00000000000..3a71c800c68
Binary files /dev/null and b/public/images/emoji/twitter/three_button_mouse.png differ
diff --git a/public/images/emoji/win10/mouse_three_button.png b/public/images/emoji/win10/mouse_three_button.png
new file mode 100644
index 00000000000..3e39c0f398b
Binary files /dev/null and b/public/images/emoji/win10/mouse_three_button.png differ
diff --git a/public/images/emoji/win10/three_button_mouse.png b/public/images/emoji/win10/three_button_mouse.png
new file mode 100644
index 00000000000..3e39c0f398b
Binary files /dev/null and b/public/images/emoji/win10/three_button_mouse.png differ