diff --git a/lib/tasks/emoji.rake b/lib/tasks/emoji.rake
index 14190b74eb..6ea15b77f3 100644
--- a/lib/tasks/emoji.rake
+++ b/lib/tasks/emoji.rake
@@ -40,7 +40,10 @@ task "emoji:update" => :environment do
 
     code = cells[1].at_css("a")["name"]
 
-    next unless emojis[code]
+    unless emojis[code]
+      code = code.gsub(/_fe0f/, "")
+      next unless emojis[code]
+    end
 
     apple = cell_to_image(cells[4])
     google = cell_to_image(cells[5])
@@ -50,7 +53,7 @@ task "emoji:update" => :environment do
     if WINDOWS_FLAGS.include?(code)
       windows = custom_windows_flag(code)
     else
-      windows = cell_to_image(cells[9])
+      windows = cell_to_image(cells[11])
     end
 
     if apple.blank? || google.blank? || twitter.blank? || one.blank? || windows.blank?
@@ -94,13 +97,16 @@ def custom_windows_flag(code)
 end
 
 def write_emojis(emojis, aliases, style, folder)
-  path = "public/images/emoji/#{folder}/"
+  path = "public/images/emoji/#{folder}"
 
-  FileUtils.rm_f Dir.glob("#{path}/*")
+  # Uncomment to recreate all emojis
+  # FileUtils.rm_f Dir.glob("#{path}/*")
 
   puts folder
 
   emojis.values.each do |emoji|
+    next if emoji[style].nil?
+
     write_emoji("#{path}/#{emoji[:name]}.png", emoji[style])
     if aliases[emoji[:name]]
       aliases[emoji[:name]].each do |new_name|
@@ -113,7 +119,9 @@ def write_emojis(emojis, aliases, style, folder)
 end
 
 def write_emoji(path, emoji)
-  open(path, "wb") { |f| f << emoji }
-  `pngout #{path}`
-  putc "."
+    open(path, "wb") { |f| f << emoji }
+    `pngout #{path}`
+    putc "."
+ensure
+  raise "Failed to write emoji: #{path}" if File.exists?(path) && !File.size?(path)
 end
diff --git a/public/images/emoji/apple/hash.png b/public/images/emoji/apple/hash.png
index e69de29bb2..64f9f55964 100644
Binary files a/public/images/emoji/apple/hash.png and b/public/images/emoji/apple/hash.png differ
diff --git a/public/images/emoji/apple/keycap_star.png b/public/images/emoji/apple/keycap_star.png
index e69de29bb2..f847acf58c 100644
Binary files a/public/images/emoji/apple/keycap_star.png and b/public/images/emoji/apple/keycap_star.png differ
diff --git a/public/images/emoji/apple/zero.png b/public/images/emoji/apple/zero.png
index e69de29bb2..4b2b38dce0 100644
Binary files a/public/images/emoji/apple/zero.png and b/public/images/emoji/apple/zero.png differ
diff --git a/public/images/emoji/emoji_one/hash.png b/public/images/emoji/emoji_one/hash.png
index e69de29bb2..1efc8cc6e3 100644
Binary files a/public/images/emoji/emoji_one/hash.png and b/public/images/emoji/emoji_one/hash.png differ
diff --git a/public/images/emoji/emoji_one/keycap_star.png b/public/images/emoji/emoji_one/keycap_star.png
index e69de29bb2..8ed4edab8f 100644
Binary files a/public/images/emoji/emoji_one/keycap_star.png and b/public/images/emoji/emoji_one/keycap_star.png differ
diff --git a/public/images/emoji/emoji_one/zero.png b/public/images/emoji/emoji_one/zero.png
index e69de29bb2..8123d5e090 100644
Binary files a/public/images/emoji/emoji_one/zero.png and b/public/images/emoji/emoji_one/zero.png differ
diff --git a/public/images/emoji/google/hash.png b/public/images/emoji/google/hash.png
index e69de29bb2..706a31c13b 100644
Binary files a/public/images/emoji/google/hash.png and b/public/images/emoji/google/hash.png differ
diff --git a/public/images/emoji/google/keycap_star.png b/public/images/emoji/google/keycap_star.png
index e69de29bb2..bc41c667b2 100644
Binary files a/public/images/emoji/google/keycap_star.png and b/public/images/emoji/google/keycap_star.png differ
diff --git a/public/images/emoji/google/zero.png b/public/images/emoji/google/zero.png
index e69de29bb2..ce02394db0 100644
Binary files a/public/images/emoji/google/zero.png and b/public/images/emoji/google/zero.png differ
diff --git a/public/images/emoji/twitter/hash.png b/public/images/emoji/twitter/hash.png
index e69de29bb2..5309b3d0c9 100644
Binary files a/public/images/emoji/twitter/hash.png and b/public/images/emoji/twitter/hash.png differ
diff --git a/public/images/emoji/twitter/keycap_star.png b/public/images/emoji/twitter/keycap_star.png
index e69de29bb2..2bfefce2be 100644
Binary files a/public/images/emoji/twitter/keycap_star.png and b/public/images/emoji/twitter/keycap_star.png differ
diff --git a/public/images/emoji/twitter/zero.png b/public/images/emoji/twitter/zero.png
index e69de29bb2..f4244918d5 100644
Binary files a/public/images/emoji/twitter/zero.png and b/public/images/emoji/twitter/zero.png differ
diff --git a/public/images/emoji/win10/eight.png b/public/images/emoji/win10/eight.png
index 941ddf7da0..4fe4c5f23e 100644
Binary files a/public/images/emoji/win10/eight.png and b/public/images/emoji/win10/eight.png differ
diff --git a/public/images/emoji/win10/five.png b/public/images/emoji/win10/five.png
index f8b21706da..1e284bf610 100644
Binary files a/public/images/emoji/win10/five.png and b/public/images/emoji/win10/five.png differ
diff --git a/public/images/emoji/win10/four.png b/public/images/emoji/win10/four.png
index 3a22419dc5..a5d7e4f82e 100644
Binary files a/public/images/emoji/win10/four.png and b/public/images/emoji/win10/four.png differ
diff --git a/public/images/emoji/win10/hash.png b/public/images/emoji/win10/hash.png
index e69de29bb2..7d06801e1f 100644
Binary files a/public/images/emoji/win10/hash.png and b/public/images/emoji/win10/hash.png differ
diff --git a/public/images/emoji/win10/nine.png b/public/images/emoji/win10/nine.png
index 655f80a7f9..290dc7fe93 100644
Binary files a/public/images/emoji/win10/nine.png and b/public/images/emoji/win10/nine.png differ
diff --git a/public/images/emoji/win10/one.png b/public/images/emoji/win10/one.png
index eba530a82c..95e3c094c8 100644
Binary files a/public/images/emoji/win10/one.png and b/public/images/emoji/win10/one.png differ
diff --git a/public/images/emoji/win10/seven.png b/public/images/emoji/win10/seven.png
index c1329dd773..1c839c4e10 100644
Binary files a/public/images/emoji/win10/seven.png and b/public/images/emoji/win10/seven.png differ
diff --git a/public/images/emoji/win10/six.png b/public/images/emoji/win10/six.png
index 8e4b23b3ba..8e8a805e87 100644
Binary files a/public/images/emoji/win10/six.png and b/public/images/emoji/win10/six.png differ
diff --git a/public/images/emoji/win10/three.png b/public/images/emoji/win10/three.png
index bf930925c4..9cb4d40b0f 100644
Binary files a/public/images/emoji/win10/three.png and b/public/images/emoji/win10/three.png differ
diff --git a/public/images/emoji/win10/two.png b/public/images/emoji/win10/two.png
index 5a7e481947..da3eb230b7 100644
Binary files a/public/images/emoji/win10/two.png and b/public/images/emoji/win10/two.png differ
diff --git a/public/images/emoji/win10/zero.png b/public/images/emoji/win10/zero.png
index e69de29bb2..e5b08a1267 100644
Binary files a/public/images/emoji/win10/zero.png and b/public/images/emoji/win10/zero.png differ