diff --git a/emojicompat/NotoColorEmojiCompat.ttf b/emojicompat/NotoColorEmojiCompat.ttf
index e794957c7..2a6905588 100644
Binary files a/emojicompat/NotoColorEmojiCompat.ttf and b/emojicompat/NotoColorEmojiCompat.ttf differ
diff --git a/fonts/NotoColorEmoji.ttf b/fonts/NotoColorEmoji.ttf
index 370ff0bbc..e63e94f0c 100644
Binary files a/fonts/NotoColorEmoji.ttf and b/fonts/NotoColorEmoji.ttf differ
diff --git a/png/128/emoji_u1f6a5.png b/png/128/emoji_u1f6a5.png
index 36396d3d6..de3cc069f 100644
Binary files a/png/128/emoji_u1f6a5.png and b/png/128/emoji_u1f6a5.png differ
diff --git a/png/128/emoji_u1f6a6.png b/png/128/emoji_u1f6a6.png
index 861dfaeff..77d428c06 100644
Binary files a/png/128/emoji_u1f6a6.png and b/png/128/emoji_u1f6a6.png differ
diff --git a/svg/emoji_u1f6a5.svg b/svg/emoji_u1f6a5.svg
index 732971f0c..1392940e7 100644
--- a/svg/emoji_u1f6a5.svg
+++ b/svg/emoji_u1f6a5.svg
@@ -1,14 +1,92 @@
-<svg width="128" height="128" style="enable-background:new 0 0 128 128;" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <g id="图层_1">
-    <path d="M42.89,126h-7.66c-3.48,0-6.3-2.82-6.3-6.3V14.28c0-3.48,2.82-6.3,6.3-6.3h7.66 c3.48,0,6.3,2.82,6.3,6.3V119.7C49.19,123.18,46.37,126,42.89,126z" style="fill:#616161;"/>
-    <g>
-      <path d="M100.84,81.41H32.63c-14.39,0-26.06-11.67-26.06-26.06v0c0-14.39,11.67-26.06,26.06-26.06h68.21 c14.39,0,26.06,11.67,26.06,26.06v0C126.9,69.74,115.23,81.41,100.84,81.41z" style="fill:#757576;"/>
-      <path d="M95.94,76.51H27.72c-14.39,0-26.06-11.67-26.06-26.06v0c0-14.39,11.67-26.06,26.06-26.06h68.21 c14.39,0,26.06,11.67,26.06,26.06v0C122,64.84,110.33,76.51,95.94,76.51z" style="fill:#EDECE4;"/>
-      <g>
-        <circle cx="97.11" cy="50.44" r="14.34" style="fill:#4CAF50;"/>
-        <circle cx="61.83" cy="50.44" r="14.34" style="fill:#FCC21B;"/>
-        <circle cx="26.55" cy="50.44" r="14.34" style="fill:#E43F11;"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   style="enable-background:new 0 0 128 128;"
+   version="1.1"
+   id="svg19"
+   sodipodi:docname="emoji_u1f6a5.svg"
+   inkscape:export-filename="C:\Users\const\git\blobmoji\png\128\emoji_u1f6a5.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata25">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs23" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1046"
+     id="namedview21"
+     showgrid="false"
+     inkscape:zoom="1.84375"
+     inkscape:cx="64"
+     inkscape:cy="64"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g16" />
+  <g
+     id="图层_1">
+    <path
+       d="M42.89,126h-7.66c-3.48,0-6.3-2.82-6.3-6.3V14.28c0-3.48,2.82-6.3,6.3-6.3h7.66 c3.48,0,6.3,2.82,6.3,6.3V119.7C49.19,123.18,46.37,126,42.89,126z"
+       style="fill:#616161;"
+       id="path2" />
+    <g
+       id="g16">
+      <path
+         d="M100.84,81.41H32.63c-14.39,0-26.06-11.67-26.06-26.06v0c0-14.39,11.67-26.06,26.06-26.06h68.21 c14.39,0,26.06,11.67,26.06,26.06v0C126.9,69.74,115.23,81.41,100.84,81.41z"
+         style="fill:#757576;"
+         id="path4" />
+      <path
+         d="M95.94,76.51H27.72c-14.39,0-26.06-11.67-26.06-26.06v0c0-14.39,11.67-26.06,26.06-26.06h68.21 c14.39,0,26.06,11.67,26.06,26.06v0C122,64.84,110.33,76.51,95.94,76.51z"
+         style="fill:#272727;fill-opacity:1"
+         id="path6" />
+      <g
+         id="g14">
+        <circle
+           cx="97.11"
+           cy="50.44"
+           r="14.34"
+           style="fill:#4CAF50;"
+           id="circle8" />
+        <circle
+           cx="61.83"
+           cy="50.44"
+           r="14.34"
+           style="fill:#FCC21B;"
+           id="circle10" />
+        <circle
+           cx="26.55"
+           cy="50.44"
+           r="14.34"
+           style="fill:#E43F11;"
+           id="circle12" />
       </g>
     </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/svg/emoji_u1f6a6.svg b/svg/emoji_u1f6a6.svg
index 13420d49d..33d6bff37 100644
--- a/svg/emoji_u1f6a6.svg
+++ b/svg/emoji_u1f6a6.svg
@@ -1,17 +1,99 @@
-<svg width="128" height="128" style="enable-background:new 0 0 128 128;" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <g id="图层_1">
-    <g>
-      <path d="M31.98,46.21v-7.66c0-3.48,2.82-6.3,6.3-6.3h66.4c3.48,0,6.3,2.82,6.3,6.3v7.66 c0,3.48-2.82,6.3-6.3,6.3h-66.4C34.8,52.51,31.98,49.69,31.98,46.21z" style="fill:#616161;"/>
-      <path d="M31.98,94.42v-7.66c0-3.48,2.82-6.3,6.3-6.3h66.4c3.48,0,6.3,2.82,6.3,6.3v7.66 c0,3.48-2.82,6.3-6.3,6.3h-66.4C34.8,100.71,31.98,97.89,31.98,94.42z" style="fill:#616161;"/>
-      <g>
-        <path d="M74.06,99.46V31.25C74.06,16.85,62.39,5.18,48,5.18h0c-14.39,0-26.06,11.67-26.06,26.06v68.21 c0,14.39,11.67,26.06,26.06,26.06h0C62.39,125.52,74.06,113.85,74.06,99.46z" style="fill:#757576;"/>
-        <path d="M68.76,96.75V28.54c0-14.39-11.67-26.06-26.06-26.06h0c-14.39,0-26.06,11.67-26.06,26.06v68.21 c0,14.39,11.67,26.06,26.06,26.06h0C57.09,122.82,68.76,111.15,68.76,96.75z" style="fill:#EDECE4;"/>
-        <g>
-          <circle cx="42.7" cy="97.93" r="14.34" style="fill:#4CAF50;"/>
-          <circle cx="42.7" cy="62.65" r="14.34" style="fill:#FCC21B;"/>
-          <circle cx="42.7" cy="27.37" r="14.34" style="fill:#E43F11;"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   style="enable-background:new 0 0 128 128;"
+   version="1.1"
+   id="svg23"
+   sodipodi:docname="emoji_u1f6a6.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   inkscape:export-filename="C:\Users\const\git\blobmoji\png\128\emoji_u1f6a6.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <metadata
+     id="metadata29">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs27" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1046"
+     id="namedview25"
+     showgrid="false"
+     inkscape:zoom="1.84375"
+     inkscape:cx="64"
+     inkscape:cy="64"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g18" />
+  <g
+     id="图层_1">
+    <g
+       id="g20">
+      <path
+         d="M31.98,46.21v-7.66c0-3.48,2.82-6.3,6.3-6.3h66.4c3.48,0,6.3,2.82,6.3,6.3v7.66 c0,3.48-2.82,6.3-6.3,6.3h-66.4C34.8,52.51,31.98,49.69,31.98,46.21z"
+         style="fill:#616161;"
+         id="path2" />
+      <path
+         d="M31.98,94.42v-7.66c0-3.48,2.82-6.3,6.3-6.3h66.4c3.48,0,6.3,2.82,6.3,6.3v7.66 c0,3.48-2.82,6.3-6.3,6.3h-66.4C34.8,100.71,31.98,97.89,31.98,94.42z"
+         style="fill:#616161;"
+         id="path4" />
+      <g
+         id="g18">
+        <path
+           d="M74.06,99.46V31.25C74.06,16.85,62.39,5.18,48,5.18h0c-14.39,0-26.06,11.67-26.06,26.06v68.21 c0,14.39,11.67,26.06,26.06,26.06h0C62.39,125.52,74.06,113.85,74.06,99.46z"
+           style="fill:#757576;"
+           id="path6" />
+        <path
+           d="M68.76,96.75V28.54c0-14.39-11.67-26.06-26.06-26.06h0c-14.39,0-26.06,11.67-26.06,26.06v68.21 c0,14.39,11.67,26.06,26.06,26.06h0C57.09,122.82,68.76,111.15,68.76,96.75z"
+           style="fill:#272727;fill-opacity:1"
+           id="path8" />
+        <g
+           id="g16">
+          <circle
+             cx="42.7"
+             cy="97.93"
+             r="14.34"
+             style="fill:#4CAF50;"
+             id="circle10" />
+          <circle
+             cx="42.7"
+             cy="62.65"
+             r="14.34"
+             style="fill:#FCC21B;"
+             id="circle12" />
+          <circle
+             cx="42.7"
+             cy="27.37"
+             r="14.34"
+             style="fill:#E43F11;"
+             id="circle14" />
         </g>
       </g>
     </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>