diff --git a/emoji_aliases.txt b/emoji_aliases.txt
index 041096dcb..c37809ded 100644
--- a/emoji_aliases.txt
+++ b/emoji_aliases.txt
@@ -263,4 +263,4 @@ fe82b;unknown_flag # no name -> no name
 
 # Blobmoji sequences
 1f52b_200d_1f4a6_fe0f; 1f52b_200d_2063_fe0f # Water pistol
-1f52b_200d_qf4a7_fe0f; 1f52b_200d_2063_fe0f # Water pistol
+1f52b_200d_1f4a7_fe0f; 1f52b_200d_2063_fe0f # Water pistol
diff --git a/emojicompat/NotoColorEmojiCompat.ttf b/emojicompat/NotoColorEmojiCompat.ttf
index 98e24c0a5..3baf5bff3 100644
Binary files a/emojicompat/NotoColorEmojiCompat.ttf and b/emojicompat/NotoColorEmojiCompat.ttf differ
diff --git a/emojicompat/emoji-zwj-sequences.txt b/emojicompat/emoji-zwj-sequences.txt
new file mode 100644
index 000000000..e760becf5
--- /dev/null
+++ b/emojicompat/emoji-zwj-sequences.txt
@@ -0,0 +1,30 @@
+# © 2017 Unicode®, Inc.
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+
+# Note: this file is not published by Unicode, but since its format follows Unicode's format, it's
+# basically derived from Unicode data files.
+
+# Backward compatibility with earlier platforms that supported these
+1F93C 1F3FB 200D 2640 FE0F                        ; Emoji_ZWJ_Sequence  ; women wrestling: light skin tone
+1F93C 1F3FB 200D 2642 FE0F                        ; Emoji_ZWJ_Sequence  ; men wrestling: light skin tone
+1F93C 1F3FC 200D 2640 FE0F                        ; Emoji_ZWJ_Sequence  ; women wrestling: medium-light skin tone
+1F93C 1F3FC 200D 2642 FE0F                        ; Emoji_ZWJ_Sequence  ; men wrestling: medium-light skin tone
+1F93C 1F3FD 200D 2640 FE0F                        ; Emoji_ZWJ_Sequence  ; women wrestling: medium skin tone
+1F93C 1F3FD 200D 2642 FE0F                        ; Emoji_ZWJ_Sequence  ; men wrestling: medium skin tone
+1F93C 1F3FE 200D 2640 FE0F                        ; Emoji_ZWJ_Sequence  ; women wrestling: medium-dark skin tone
+1F93C 1F3FE 200D 2642 FE0F                        ; Emoji_ZWJ_Sequence  ; men wrestling: medium-dark skin tone
+1F93C 1F3FF 200D 2640 FE0F                        ; Emoji_ZWJ_Sequence  ; women wrestling: dark skin tone
+1F93C 1F3FF 200D 2642 FE0F                        ; Emoji_ZWJ_Sequence  ; men wrestling: dark skin tone
+
+# New Sequences added for Blobmoji
+1F9B8 200D 2063 FE0F                              ; Emoji_ZWJ_Sequence  ; super hero
+1F9B8 200D 2063 FE0F                              ; Emoji_ZWJ_Sequence  ; super villain
+
+1F92A 200D 2063 FE0F                              ; Emoji_ZWJ_Sequence  ; Crazy face (compat)
+1F924 200D 2063 FE0F                              ; Emoji_ZWJ_Sequence  ; Drooling face (compat)
+1F644 200D 2063 FE0F                              ; Emoji_ZWJ_Sequence  ; Face looking up (compat)
+1F52B 200D 2063 FE0F                              ; Emoji_ZWJ_Sequence  ; Water pistol (compat)
+
+1F95A 200D 1F3A8                                  ; Emoji_ZWJ_Sequence  ; Easter egg
+1F928 200D 1F922                                  ; Emoji_ZWJ_Sequence  ; Disgusted face
diff --git a/fonts/NotoColorEmoji.ttf b/fonts/NotoColorEmoji.ttf
index 316899721..916ec8ca1 100644
Binary files a/fonts/NotoColorEmoji.ttf and b/fonts/NotoColorEmoji.ttf differ
diff --git a/png/128/emoji_u1f9fe.png b/png/128/emoji_u1f9fe.png
index 0dbb4a712..dd115058b 100644
Binary files a/png/128/emoji_u1f9fe.png and b/png/128/emoji_u1f9fe.png differ
diff --git a/svg/emoji_u1f9fe.svg b/svg/emoji_u1f9fe.svg
index 6c3326974..c5695f801 100644
--- a/svg/emoji_u1f9fe.svg
+++ b/svg/emoji_u1f9fe.svg
@@ -31,7 +31,7 @@
      inkscape:window-y="-11"
      inkscape:window-x="-11"
      inkscape:cy="91.810295"
-     inkscape:cx="42.172452"
+     inkscape:cx="-48.011284"
      inkscape:zoom="3.6203867"
      showgrid="false"
      id="namedview8"
@@ -514,6 +514,14 @@
   <g
      transform="translate(0,-1.8)"
      id="g4534">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#fbfbfb;fill-opacity:1;stroke:#646464;stroke-width:2.17340326;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
+       id="rect2876"
+       width="69.668694"
+       height="112.44213"
+       x="29.165653"
+       y="9.5789347"
+       rx="2.99751" />
     <g
        id="barcode"
        style="fill:#000000"
@@ -4606,13 +4614,5 @@
          y="144"
          x="132" />
     </g>
-    <rect
-       style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#646464;stroke-width:2.17340326;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
-       id="rect2876"
-       width="69.668694"
-       height="112.44213"
-       x="29.165653"
-       y="9.5789347"
-       rx="2.99751" />
   </g>
 </svg>