diff --git a/app/assets/javascripts/discourse/lib/emoji/groups.js.es6 b/app/assets/javascripts/discourse/lib/emoji/groups.js.es6
index 627513d1cf6..deb93d2414b 100644
--- a/app/assets/javascripts/discourse/lib/emoji/groups.js.es6
+++ b/app/assets/javascripts/discourse/lib/emoji/groups.js.es6
@@ -701,7 +701,6 @@ const groups = [
       "rotating_light",
       "taxi",
       "oncoming_taxi",
-      "automobile",
       "oncoming_automobile",
       "blue_car",
       "truck",
diff --git a/lib/emoji/db.json b/lib/emoji/db.json
index d5619dc4964..c94c60e5bbc 100644
--- a/lib/emoji/db.json
+++ b/lib/emoji/db.json
@@ -6450,8 +6450,9 @@
     "new_moon": [
       "moon"
     ],
-    "automobile": [
-      "car"
+    "oncoming_automobile": [
+      "car",
+      "automobile"
     ],
     "fleur_de_lis": [
       "fleur-de-lis"
diff --git a/lib/tasks/emoji.rake b/lib/tasks/emoji.rake
index 104c096b31c..9c3e1fa3117 100644
--- a/lib/tasks/emoji.rake
+++ b/lib/tasks/emoji.rake
@@ -208,7 +208,7 @@ EMOJI_ALIASES ||= {
   "tipping_hand_woman" => [ "information_desk_person" ],
   "rowing_man" => [ "rowboat" ],
   "new_moon" => [ "moon" ],
-  "automobile" => [ "car" ],
+  "oncoming_automobile" => [ "car", "automobile" ],
   "fleur_de_lis" => [ "fleur-de-lis" ],
 }
 
@@ -912,7 +912,6 @@ EMOJI_GROUPS ||= [
       "rotating_light",
       "taxi",
       "oncoming_taxi",
-      "automobile",
       "oncoming_automobile",
       "blue_car",
       "truck",
diff --git a/public/images/emoji/apple/automobile.png b/public/images/emoji/apple/automobile.png
new file mode 100644
index 00000000000..80e24f234bc
Binary files /dev/null and b/public/images/emoji/apple/automobile.png differ
diff --git a/public/images/emoji/apple/car.png b/public/images/emoji/apple/car.png
new file mode 100644
index 00000000000..80e24f234bc
Binary files /dev/null and b/public/images/emoji/apple/car.png differ
diff --git a/public/images/emoji/emoji_one/automobile.png b/public/images/emoji/emoji_one/automobile.png
new file mode 100644
index 00000000000..a5f65e3832d
Binary files /dev/null and b/public/images/emoji/emoji_one/automobile.png differ
diff --git a/public/images/emoji/emoji_one/car.png b/public/images/emoji/emoji_one/car.png
new file mode 100644
index 00000000000..a5f65e3832d
Binary files /dev/null and b/public/images/emoji/emoji_one/car.png differ
diff --git a/public/images/emoji/google/automobile.png b/public/images/emoji/google/automobile.png
new file mode 100644
index 00000000000..56f5cddc276
Binary files /dev/null and b/public/images/emoji/google/automobile.png differ
diff --git a/public/images/emoji/google/car.png b/public/images/emoji/google/car.png
new file mode 100644
index 00000000000..56f5cddc276
Binary files /dev/null and b/public/images/emoji/google/car.png differ
diff --git a/public/images/emoji/twitter/automobile.png b/public/images/emoji/twitter/automobile.png
new file mode 100644
index 00000000000..2fbf351b838
Binary files /dev/null and b/public/images/emoji/twitter/automobile.png differ
diff --git a/public/images/emoji/twitter/car.png b/public/images/emoji/twitter/car.png
new file mode 100644
index 00000000000..2fbf351b838
Binary files /dev/null and b/public/images/emoji/twitter/car.png differ
diff --git a/public/images/emoji/win10/automobile.png b/public/images/emoji/win10/automobile.png
new file mode 100644
index 00000000000..701127a6f3f
Binary files /dev/null and b/public/images/emoji/win10/automobile.png differ
diff --git a/public/images/emoji/win10/car.png b/public/images/emoji/win10/car.png
new file mode 100644
index 00000000000..701127a6f3f
Binary files /dev/null and b/public/images/emoji/win10/car.png differ