diff --git a/smileys/TwitterEmojiSVG/1f600.svg b/smileys/TwitterEmojiSVG/1f600.svg
index f9ab378be..9efb1da2e 100644
--- a/smileys/TwitterEmojiSVG/1f600.svg
+++ b/smileys/TwitterEmojiSVG/1f600.svg
@@ -1 +1,87 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 47.5 47.5" style="enable-background:new 0 0 47.5 47.5;" id="svg2" xml:space="preserve"><defs id="defs6"><clipPath id="clipPath18"><path d="M 0,38 38,38 38,0 0,0 0,38 z" id="path20"/></clipPath></defs><g transform="matrix(1.25,0,0,-1.25,0,47.5)" id="g12"><g id="g14"><g clip-path="url(#clipPath18)" id="g16"><g transform="translate(37,19)" id="g22"><path d="m 0,0 c 0,-9.941 -8.059,-18 -18,-18 -9.941,0 -18,8.059 -18,18 0,9.941 8.059,18 18,18 C -8.059,18 0,9.941 0,0" id="path24" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(19,16)" id="g26"><path d="m 0,0 c -3.623,0 -6.027,0.422 -9,1 -0.679,0.131 -2,0 -2,-2 0,-4 4.595,-9 11,-9 6.404,0 11,5 11,9 C 11,1 9.679,1.132 9,1 6.027,0.422 3.623,0 0,0" id="path28" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(11,24)" id="g30"><path d="M 0,0 C 0,0 0,2 2,2 4,2 4,0 4,0 l 0,-2 c 0,0 0,-2 -2,-2 -2,0 -2,2 -2,2 l 0,2 z" id="path32" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(23,24)" id="g34"><path d="M 0,0 C 0,0 0,2 2,2 4,2 4,0 4,0 l 0,-2 c 0,0 0,-2 -2,-2 -2,0 -2,2 -2,2 l 0,2 z" id="path36" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(10,15)" id="g38"><path d="m 0,0 c 0,0 3,-1 9,-1 6,0 9,1 9,1 0,0 -2,-4 -9,-4 -7,0 -9,4 -9,4" id="path40" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g></g></g></g></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   version="1.1"
+   width="47.5"
+   height="47.5"
+   id="svg3129"
+   xml:space="preserve"><metadata
+     id="metadata3135"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs3133"><linearGradient
+       id="linearGradient5377"><stop
+         id="stop5379"
+         style="stop-color:#020000;stop-opacity:1"
+         offset="0" /></linearGradient><clipPath
+       id="clipPath3143"><path
+         d="M 0,38 38,38 38,0 0,0 0,38 z"
+         id="path3145" /></clipPath></defs><g
+     transform="matrix(1.25,0,0,-1.25,0,47.5)"
+     id="g3137"
+     style="display:inline"><g
+       id="g3139"><g
+         clip-path="url(#clipPath3143)"
+         id="g3141"><g
+           transform="translate(37,19)"
+           id="g3147"><path
+             d="m 0,0 c 0,-9.941 -8.059,-18 -18,-18 -9.941,0 -18,8.059 -18,18 0,9.941 8.059,18 18,18 C -8.059,18 0,9.941 0,0"
+             id="path3149"
+             style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+           transform="translate(19,16)"
+           id="g3151" /><g
+           transform="translate(11,24)"
+           id="g3155"><path
+             d="M 0,0 C 0,0 0,2 2,2 4,2 4,0 4,0 l 0,-2 c 0,0 0,-2 -2,-2 -2,0 -2,2 -2,2 l 0,2 z"
+             id="path3157"
+             style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+           transform="translate(23,24)"
+           id="g3159"><path
+             d="M 0,0 C 0,0 0,2 2,2 4,2 4,0 4,0 l 0,-2 c 0,0 0,-2 -2,-2 -2,0 -2,2 -2,2 l 0,2 z"
+             id="path3161"
+             style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+           transform="translate(10,15)"
+           id="g3163"><path
+             d="m -1.0247056,0.56928088 c 0,0 3.3225925,-1.87814548 9.9677775,-1.87814548 6.6451851,0 9.9677771,1.87814548 9.9677771,1.87814548 0,0 -2.215061,-10.56528318 -9.9677771,-10.56528318 -7.7527158,0 -9.9677775,10.56528318 -9.9677775,10.56528318"
+             id="path3165"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+             d="m -1.0247056,0.56928088 c 0,0 3.3358667,-1.87814548 10.0076002,-1.87814548 6.6717334,0 10.0075994,1.87814548 10.0075994,1.87814548 0,0 -2.22391,-10.56528318 -10.0075994,-10.56528318 -7.783689,0 -10.0076002,10.56528318 -10.0076002,10.56528318"
+             id="path5383"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g></g></g></g><g
+     transform="matrix(1.25,0,0,-1.25,0,47.5)"
+     id="g5385"
+     style="display:inline"><g
+       id="g5387"><g
+         clip-path="url(#clipPath3143)"
+         id="g5389"><g
+           transform="translate(37,19)"
+           id="g5391" /><g
+           transform="translate(19,16)"
+           id="g5395" /><g
+           transform="translate(11,24)"
+           id="g5397"><path
+             d="M 0,0 C 0,0 0,2 2,2 4,2 4,0 4,0 l 0,-2 c 0,0 0,-2 -2,-2 -2,0 -2,2 -2,2 l 0,2 z"
+             id="path5399"
+             style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+           transform="translate(23,24)"
+           id="g5401"><path
+             d="M 0,0 C 0,0 0,2 2,2 4,2 4,0 4,0 l 0,-2 c 0,0 0,-2 -2,-2 -2,0 -2,2 -2,2 l 0,2 z"
+             id="path5403"
+             style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+           transform="translate(10,15)"
+           id="g5405"><path
+             d="m -1.0247056,0.56928088 c 0,0 3.3225925,-1.87814548 9.9677775,-1.87814548 6.6451851,0 9.9677771,1.87814548 9.9677771,1.87814548 0,0 -2.215061,-10.56528318 -9.9677771,-10.56528318 -7.7527158,0 -9.9677775,10.56528318 -9.9677775,10.56528318"
+             id="path5407"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+             d="m -2.956909,2.1794504 c 0,0 4.0062627,-2.16437849 12.0187882,-2.16437849 8.0125248,0 12.0187838,2.16437849 12.0187838,2.16437849 0,0 -2.67084,-12.1754527 -12.0187838,-12.1754527 -9.34794657,0 -12.0187882,12.1754527 -12.0187882,12.1754527"
+             id="path5409"
+             style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+             d="m -1.4668034,0.77055209 c 0,0 3.5165029,-1.73502897 10.5495083,-1.73502897 7.0330041,0 10.5495051,1.73502897 10.5495051,1.73502897 0,0 -2.344334,-9.76019849 -10.5495051,-9.76019849 -8.20517324,0 -10.5495083,9.76019849 -10.5495083,9.76019849"
+             id="path5411"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g></g></g></g></svg>
\ No newline at end of file
diff --git a/smileys/TwitterEmojiSVG/1f601.svg b/smileys/TwitterEmojiSVG/1f601.svg
index aa13017b2..6edf59247 100644
--- a/smileys/TwitterEmojiSVG/1f601.svg
+++ b/smileys/TwitterEmojiSVG/1f601.svg
@@ -1 +1,54 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 47.5 47.5" style="enable-background:new 0 0 47.5 47.5;" id="svg2" xml:space="preserve"><defs id="defs6"><clipPath id="clipPath18"><path d="M 0,38 38,38 38,0 0,0 0,38 z" id="path20"/></clipPath></defs><g transform="matrix(1.25,0,0,-1.25,0,47.5)" id="g12"><g id="g14"><g clip-path="url(#clipPath18)" id="g16"><g transform="translate(36,18)" id="g22"><path d="m 0,0 c 0,-9.389 -7.611,-17 -17,-17 -9.388,0 -17,7.611 -17,17 0,9.388 7.612,17 17,17 C -7.611,17 0,9.388 0,0" id="path24" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(28,16)" id="g26"><path d="m 0,0 -18.5,0 0,-0.051 C -20.471,-0.299 -22,-1.962 -22,-4 c 0,-2.038 1.529,-3.701 3.5,-3.949 L -18.5,-8 0,-8 c 2.21,0 4,1.791 4,4 0,2.209 -1.79,4 -4,4" id="path28" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(28,14)" id="g30"><path d="m 0,0 -18,0 c -1.104,0 -2,-0.896 -2,-2 0,-1.104 0.896,-2 2,-2 l 18,0 c 1.104,0 2,0.896 2,2 0,1.104 -0.896,2 -2,2" id="path32" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><path d="m 20,9 -2,0 0,5 2,0 0,-5 z" id="path34" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none"/><path d="m 27,9 -2,0 0,5 2,0 0,-5 z" id="path36" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none"/><path d="m 13,10 -2,0 0,5 2,0 0,-5 z" id="path38" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none"/><g transform="translate(17,18)" id="g40"><path d="M 0,0 C -0.419,0 -0.809,0.265 -0.949,0.684 -1.152,1.283 -1.966,3 -3,3 -4.062,3 -4.888,1.173 -5.051,0.684 -5.226,0.16 -5.79,-0.124 -6.316,0.052 -6.84,0.226 -7.124,0.792 -6.949,1.316 -6.823,1.693 -5.645,5 -3,5 -0.355,5 0.823,1.693 0.949,1.316 1.124,0.792 0.84,0.226 0.316,0.052 0.211,0.017 0.104,0 0,0" id="path42" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g><g transform="translate(27,18)" id="g44"><path d="M 0,0 C -0.419,0 -0.809,0.265 -0.948,0.684 -1.151,1.283 -1.967,3 -3,3 -4.062,3 -4.889,1.173 -5.052,0.684 -5.227,0.16 -5.788,-0.124 -6.316,0.052 -6.84,0.226 -7.123,0.792 -6.948,1.316 -6.823,1.693 -5.645,5 -3,5 -0.355,5 0.823,1.693 0.948,1.316 1.123,0.792 0.84,0.226 0.316,0.052 0.211,0.017 0.104,0 0,0" id="path46" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g></g></g></g></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   version="1.1"
+   width="47.5"
+   height="47.5"
+   id="svg7392"
+   xml:space="preserve"><metadata
+     id="metadata7398"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs7396"><clipPath
+       id="clipPath7406"><path
+         d="M 0,38 38,38 38,0 0,0 0,38 z"
+         id="path7408" /></clipPath></defs><g
+     id="layer1"><path
+       d="m 46.25,23.75 c 0,12.42625 -10.07375,22.5 -22.5,22.5 -12.42625,0 -22.5,-10.07375 -22.5,-22.5 0,-12.42625 10.07375,-22.5 22.5,-22.5 12.42625,0 22.5,10.07375 22.5,22.5"
+       id="path3149"
+       style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" /></g><g
+     transform="matrix(1.25,0,0,-1.25,0,47.5)"
+     id="g7400"
+     style="display:inline"><g
+       transform="matrix(1.3309711,0,0,1,-6.0467761,0)"
+       id="g7402"><g
+         clip-path="url(#clipPath7406)"
+         id="g7404"><g
+           transform="translate(36,18)"
+           id="g7410" /><g
+           transform="translate(28,16)"
+           id="g7414" /><g
+           transform="translate(28,14)"
+           id="g7418" /><g
+           transform="translate(17,18)"
+           id="g7428"><path
+             d="M 0,0 C -0.419,0 -0.809,0.265 -0.949,0.684 -1.152,1.283 -1.966,3 -3,3 -4.062,3 -4.888,1.173 -5.051,0.684 -5.226,0.16 -5.79,-0.124 -6.316,0.052 -6.84,0.226 -7.124,0.792 -6.949,1.316 -6.823,1.693 -5.645,5 -3,5 -0.355,5 0.823,1.693 0.949,1.316 1.124,0.792 0.84,0.226 0.316,0.052 0.211,0.017 0.104,0 0,0"
+             id="path7430"
+             style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+           transform="translate(27,18)"
+           id="g7432"><path
+             d="M 0,0 C -0.419,0 -0.809,0.265 -0.948,0.684 -1.151,1.283 -1.967,3 -3,3 -4.062,3 -4.889,1.173 -5.052,0.684 -5.227,0.16 -5.788,-0.124 -6.316,0.052 -6.84,0.226 -7.123,0.792 -6.948,1.316 -6.823,1.693 -5.645,5 -3,5 -0.355,5 0.823,1.693 0.948,1.316 1.123,0.792 0.84,0.226 0.316,0.052 0.211,0.017 0.104,0 0,0"
+             id="path7434"
+             style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g></g></g><path
+       d="m 6.9812139,15.920253 c 0,0 4.0062631,-2.164378 12.0187881,-2.164378 8.012525,0 12.018784,2.164378 12.018784,2.164378 0,0 -2.67084,-12.175453 -12.018784,-12.175453 -9.3479461,0 -12.0187881,12.175453 -12.0187881,12.175453"
+       id="path5409"
+       style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" /><path
+       d="m 8.4713199,14.511355 c 0,0 3.5165031,-1.735029 10.5495081,-1.735029 7.033004,0 10.549505,1.735029 10.549505,1.735029 0,0 -2.344334,-9.760199 -10.549505,-9.760199 -8.205173,0 -10.5495081,9.760199 -10.5495081,9.760199"
+       id="path5411"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" /></g></svg>
\ No newline at end of file
diff --git a/smileys/TwitterEmojiSVG/emoticons.xml b/smileys/TwitterEmojiSVG/emoticons.xml
index 23cdb5673..ac942e5d4 100644
--- a/smileys/TwitterEmojiSVG/emoticons.xml
+++ b/smileys/TwitterEmojiSVG/emoticons.xml
@@ -12,8 +12,6 @@
     </emoticon>
     <emoticon file="1f601">
         <string>😁</string>
-        <string>:-D</string>
-        <string>:D</string>
     </emoticon>
     <emoticon file="1f602">
         <string>😂</string>
@@ -21,6 +19,8 @@
     </emoticon>
     <emoticon file="1f603">
         <string>😃</string>
+	<string>:-D</string>
+        <string>:D</string>
     </emoticon>
     <emoticon file="1f604">
         <string>😄</string>