diff --git a/app/assets/javascripts/discourse/lib/emoji/groups.js.es6 b/app/assets/javascripts/discourse/lib/emoji/groups.js.es6
index d5ebe6d1e34..627513d1cf6 100644
--- a/app/assets/javascripts/discourse/lib/emoji/groups.js.es6
+++ b/app/assets/javascripts/discourse/lib/emoji/groups.js.es6
@@ -426,7 +426,6 @@ const groups = [
       "tornado",
       "sun_behind_large_cloud",
       "sun_behind_rain_cloud",
-      "white_sun_small_cloud",
       "comet",
       "crab",
       "dove",
diff --git a/lib/emoji/db.json b/lib/emoji/db.json
index 5fe508cf8e4..d5619dc4964 100644
--- a/lib/emoji/db.json
+++ b/lib/emoji/db.json
@@ -6134,7 +6134,7 @@
       "white_sun_rain_cloud",
       "white_sun_behind_cloud_with_rain"
     ],
-    "white_sun_small_cloud": [
+    "partly_sunny": [
       "white_sun_small_cloud",
       "white_sun_with_small_cloud"
     ],
diff --git a/public/images/emoji/apple/white_sun_small_cloud.png b/public/images/emoji/apple/white_sun_small_cloud.png
new file mode 100644
index 00000000000..b31de05a28f
Binary files /dev/null and b/public/images/emoji/apple/white_sun_small_cloud.png differ
diff --git a/public/images/emoji/apple/white_sun_with_small_cloud.png b/public/images/emoji/apple/white_sun_with_small_cloud.png
new file mode 100644
index 00000000000..b31de05a28f
Binary files /dev/null and b/public/images/emoji/apple/white_sun_with_small_cloud.png differ
diff --git a/public/images/emoji/emoji_one/white_sun_small_cloud.png b/public/images/emoji/emoji_one/white_sun_small_cloud.png
new file mode 100644
index 00000000000..e100b05d5b3
Binary files /dev/null and b/public/images/emoji/emoji_one/white_sun_small_cloud.png differ
diff --git a/public/images/emoji/emoji_one/white_sun_with_small_cloud.png b/public/images/emoji/emoji_one/white_sun_with_small_cloud.png
new file mode 100644
index 00000000000..e100b05d5b3
Binary files /dev/null and b/public/images/emoji/emoji_one/white_sun_with_small_cloud.png differ
diff --git a/public/images/emoji/google/white_sun_small_cloud.png b/public/images/emoji/google/white_sun_small_cloud.png
new file mode 100644
index 00000000000..ca30e8990bd
Binary files /dev/null and b/public/images/emoji/google/white_sun_small_cloud.png differ
diff --git a/public/images/emoji/google/white_sun_with_small_cloud.png b/public/images/emoji/google/white_sun_with_small_cloud.png
new file mode 100644
index 00000000000..ca30e8990bd
Binary files /dev/null and b/public/images/emoji/google/white_sun_with_small_cloud.png differ
diff --git a/public/images/emoji/twitter/white_sun_small_cloud.png b/public/images/emoji/twitter/white_sun_small_cloud.png
new file mode 100644
index 00000000000..544e6eafea7
Binary files /dev/null and b/public/images/emoji/twitter/white_sun_small_cloud.png differ
diff --git a/public/images/emoji/twitter/white_sun_with_small_cloud.png b/public/images/emoji/twitter/white_sun_with_small_cloud.png
new file mode 100644
index 00000000000..544e6eafea7
Binary files /dev/null and b/public/images/emoji/twitter/white_sun_with_small_cloud.png differ
diff --git a/public/images/emoji/win10/white_sun_small_cloud.png b/public/images/emoji/win10/white_sun_small_cloud.png
new file mode 100644
index 00000000000..c8f11a93af2
Binary files /dev/null and b/public/images/emoji/win10/white_sun_small_cloud.png differ
diff --git a/public/images/emoji/win10/white_sun_with_small_cloud.png b/public/images/emoji/win10/white_sun_with_small_cloud.png
new file mode 100644
index 00000000000..c8f11a93af2
Binary files /dev/null and b/public/images/emoji/win10/white_sun_with_small_cloud.png differ