diff --git a/images/LICENSE b/images/LICENSE
index ea8c06764..e20f2afce 100644
--- a/images/LICENSE
+++ b/images/LICENSE
@@ -56,3 +56,17 @@ License:    LGPL3+
 Author:     Nuno F. Pinheiro <nuno@oxygen-icons.org>
 Origin:     Oxygen icon theme
             http://www.oxygen-icons.org/
+
+Smuxi-Emoticons/
+----------------
+Filename: *
+License: GPL2
+Author: George Karavasilev <motorslav@gmail.com>
+Origin: gnome-icon-theme
+
+icon_bar.svg
+------------
+Filename: go-next-symbolic.png
+License: GPL2
+Author: George Karavasilev <motorslav@gmail.com>
+Origin: gnome-icon-theme
\ No newline at end of file
diff --git a/images/Smuxi-Emoticons/face-angel-symbolic.png b/images/Smuxi-Emoticons/face-angel-symbolic.png
new file mode 100644
index 000000000..3d4b6eea4
Binary files /dev/null and b/images/Smuxi-Emoticons/face-angel-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-angel-symbolic.svg b/images/Smuxi-Emoticons/face-angel-symbolic.svg
new file mode 100644
index 000000000..c907c98f3
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-angel-symbolic.svg
@@ -0,0 +1,67 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-angel-symbolic.svg">
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-441 -519)"
+     style="fill:#76adb8;fill-opacity:1">
+    <path
+       id="path86756"
+       style="fill:#76adb8;fill-opacity:1"
+       d="m443.19 523.09c-0.75477 1.1172-1.1875 2.4565-1.1875 3.9062 0 3.866 3.134 7 7 7s7-3.134 7-7c0-1.4498-0.43273-2.789-1.1875-3.9062-0.19893 0.13572-0.42444 0.25079-0.625 0.34375-0.85019 0.39407-1.8545 0.5625-2.9375 0.5625h-4.5c-1.083 0-2.0873-0.16843-2.9375-0.5625-0.20056-0.093-0.42607-0.20803-0.625-0.34375zm3.81 1.91c0.55833 0 1.0312 0.47292 1.0312 1.0312v0.96875c0 0.55833-0.47292 1-1.0312 1-0.55833 0-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm4 0c0.55833 0 1 0.47292 1 1.0312v0.96875c0 0.55833-0.44167 1-1 1s-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm-7 3.0625c0.71531 1.0744 2.2352 1.9375 5 1.9375 2.4523 0 4.2108-0.75041 5-1.9375v0.5c0 0.68098-0.8379 2.4062-5 2.4062-3.8808 0-5-1.8737-5-2.4062z" />
+    <path
+       id="rect86760"
+       style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#76adb8;fill-opacity:1"
+       d="m446.75 519c-0.95862 0-1.8266 0.18789-2.5 0.5-0.67336 0.31211-1.25 0.79502-1.25 1.5s0.57664 1.1879 1.25 1.5c0.67336 0.31211 1.5414 0.5 2.5 0.5h4.5c0.95862 0 1.8266-0.18789 2.5-0.5 0.67336-0.31211 1.25-0.79502 1.25-1.5s-0.57664-1.1879-1.25-1.5c-0.67336-0.31211-1.5414-0.5-2.5-0.5h-4.5zm0 1h4.5c0.83424 0 1.5972 0.17611 2.0938 0.40625 0.5 0.23 0.66 0.46 0.66 0.59 0 0.12602-0.15972 0.36361-0.65625 0.59375-0.49 0.23-1.26 0.41-2.09 0.41h-4.5c-0.83424 0-1.5972-0.17611-2.0938-0.40625-0.5-0.23-0.66-0.46-0.66-0.59 0-0.12602 0.15972-0.36361 0.65625-0.59375 0.49-0.23 1.26-0.41 2.09-0.41z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-angel-symbolic_256x256.png b/images/Smuxi-Emoticons/face-angel-symbolic_256x256.png
new file mode 100644
index 000000000..e5cac29a8
Binary files /dev/null and b/images/Smuxi-Emoticons/face-angel-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-angry-symbolic.png b/images/Smuxi-Emoticons/face-angry-symbolic.png
new file mode 100644
index 000000000..7fc657ed4
Binary files /dev/null and b/images/Smuxi-Emoticons/face-angry-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-angry-symbolic.svg b/images/Smuxi-Emoticons/face-angry-symbolic.svg
new file mode 100644
index 000000000..2840db8e6
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-angry-symbolic.svg
@@ -0,0 +1,63 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-angry-symbolic.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="742"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8.1355932"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-461 -519)"
+     style="fill:#ad3838;fill-opacity:1">
+    <path
+       id="path87316"
+       style="fill:#ad3838;fill-opacity:1"
+       d="m469 520c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-4 4.125s0.47388 0.83875 1.25 0.84375h1.75v1.0312c0 0.55616-0.66683 1-1.5 1-0.83315 0-1.5-0.44384-1.5-1zm8 0v1.875c0 0.55616-0.66685 1-1.5 1-0.83317 0-1.5-0.44384-1.5-1v-1.0312h1.7188c0.77612-0.005 1.2812-0.84375 1.2812-0.84375zm-3.97 3.88c3.2558 0 3 0.38381 3 0.76164v0.26609h-6.0312v-0.28818c0-0.34953-0.2246-0.73955 3.0312-0.73955z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-angry-symbolic_256x256.png b/images/Smuxi-Emoticons/face-angry-symbolic_256x256.png
new file mode 100644
index 000000000..a1f0ff8a7
Binary files /dev/null and b/images/Smuxi-Emoticons/face-angry-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-confused-symbolic.png b/images/Smuxi-Emoticons/face-confused-symbolic.png
new file mode 100644
index 000000000..7dd282e3b
Binary files /dev/null and b/images/Smuxi-Emoticons/face-confused-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-confused-symbolic.svg b/images/Smuxi-Emoticons/face-confused-symbolic.svg
new file mode 100644
index 000000000..77dc8d2ba
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-confused-symbolic.svg
@@ -0,0 +1,63 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-confused-symbolic.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-542 -538.97)"
+     style="fill:#a547b4;fill-opacity:1">
+    <path
+       id="path6000"
+       style="fill:#a547b4;fill-opacity:1"
+       d="m550 539.97c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-2 4c0.55833 0 1.0312 0.47292 1.0312 1.0312v0.96875c0 0.55833-0.47292 1-1.0312 1-0.55833 0-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm4 0c0.55833 0 1 0.47292 1 1.0312v0.96875c0 0.55833-0.44167 1-1 1s-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm-5.4064 3.8125c0.0644-0.009-0.27909 0.0131-0.21225 0.0312 4.4808-0.0312 1.45 2.5816 6.5872 2.6434 0.26734 0.0725 0.41625 0.35766 0.34375 0.625-0.0725 0.26736-0.3264 0.41625-0.59375 0.34375-4.9476-0.0138-2.9062-2.7059-6.1875-2.6434-0.26734-0.0725-0.41625-0.35766-0.34375-0.625 0.0544-0.20051 0.21312-0.34894 0.40625-0.375z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-confused-symbolic_256x256.png b/images/Smuxi-Emoticons/face-confused-symbolic_256x256.png
new file mode 100644
index 000000000..9c174182c
Binary files /dev/null and b/images/Smuxi-Emoticons/face-confused-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-cool-symbolic.png b/images/Smuxi-Emoticons/face-cool-symbolic.png
new file mode 100644
index 000000000..b6ee73c6a
Binary files /dev/null and b/images/Smuxi-Emoticons/face-cool-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-cool-symbolic.svg b/images/Smuxi-Emoticons/face-cool-symbolic.svg
new file mode 100644
index 000000000..0b4522bd9
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-cool-symbolic.svg
@@ -0,0 +1,63 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-cool-symbolic.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-461 -539)"
+     style="fill:#eaa023;fill-opacity:1">
+    <path
+       id="path4894"
+       style="fill:#eaa023;fill-opacity:1"
+       d="m469 540c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-5.7812 4.0312c3.9126-0.0377 7.9716-0.00016 11.562 0 0 1.642-1.2497 2.9688-2.7812 2.9688-1.2754 0-2.3326-0.93056-2.6562-2.1875h-0.6875c-0.3237 1.257-1.3809 2.1875-2.6562 2.1875-1.5315 0-2.7812-1.3268-2.7812-2.9688zm0.78125 4.0312c0.71531 1.0744 2.2352 1.9375 5 1.9375 2.4523 0 4.2108-0.75041 5-1.9375v0.5c0 0.68098-0.8379 2.4062-5 2.4062-3.8808 0-5-1.8737-5-2.4062v-0.5z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-cool-symbolic_256x256.png b/images/Smuxi-Emoticons/face-cool-symbolic_256x256.png
new file mode 100644
index 000000000..b55b51aa9
Binary files /dev/null and b/images/Smuxi-Emoticons/face-cool-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-crying-symbolic.png b/images/Smuxi-Emoticons/face-crying-symbolic.png
new file mode 100644
index 000000000..797d07d51
Binary files /dev/null and b/images/Smuxi-Emoticons/face-crying-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-crying-symbolic.svg b/images/Smuxi-Emoticons/face-crying-symbolic.svg
new file mode 100644
index 000000000..ee1f6f8d4
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-crying-symbolic.svg
@@ -0,0 +1,63 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-crying-symbolic.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-621 -519)"
+     style="fill:#a547b4;fill-opacity:1">
+    <path
+       id="path4824"
+       style="fill:#a547b4;fill-opacity:1"
+       d="m629 520c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-2 4c0.55833 0 1.0312 0.40972 1.0312 0.875v0.78125c0 0.46528-0.47292 0.84375-1.0312 0.84375-0.55833 0-1-0.37847-1-0.84375v-0.78125c0-0.46528 0.44167-0.875 1-0.875zm4 0c0.55833 0 1 0.37848 1 0.84375v0.8125c0 0.46527-0.44167 0.84375-1 0.84375s-1-0.37848-1-0.84375v-0.8125c0-0.46527 0.44167-0.84375 1-0.84375zm1.75 2.2812c1.2078 0.44874 2.0463 0.93632 2.2188 1.5625 0.17247 0.62616-0.30586 1.2416-0.9375 1.25-0.51878 0.007-0.7686-0.2154-0.9375-0.875-0.16672-0.66017 0.0828-1.2924-0.34375-1.9375zm-3.7812 2.6875c2.5883 0 3.9688 0.98014 3.9688 1.5625v0.53125c-0.79224-0.69651-3.1869-1-3.9688-1-0.78187 0-3.0184-0.059-3.9688 1v-0.53125c0-0.74472 1.3804-1.5625 3.9688-1.5625z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-crying-symbolic_256x256.png b/images/Smuxi-Emoticons/face-crying-symbolic_256x256.png
new file mode 100644
index 000000000..20fb4670e
Binary files /dev/null and b/images/Smuxi-Emoticons/face-crying-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-devilish-symbolic.png b/images/Smuxi-Emoticons/face-devilish-symbolic.png
new file mode 100644
index 000000000..46de6aae5
Binary files /dev/null and b/images/Smuxi-Emoticons/face-devilish-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-devilish-symbolic.svg b/images/Smuxi-Emoticons/face-devilish-symbolic.svg
new file mode 100644
index 000000000..2bcbdbb80
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-devilish-symbolic.svg
@@ -0,0 +1,63 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-devilish-symbolic.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-441 -539)"
+     style="fill:#f96363;fill-opacity:1">
+    <path
+       id="path5619-4"
+       style="fill:#f96363;fill-opacity:1"
+       d="m449 540c-1.6522 0-3.1777 0.57397-4.375 1.5312-1.1338-0.44386-2.0934-0.94913-2.6875-1.4688l-0.0937 0.59375c-0.0334 0.27084 0.10323 1.513 1.1562 2.75-0.63172 1.0517-1 2.2776-1 3.5938 0 3.866 3.134 7 7 7s7-3.134 7-7c0-1.2906-0.35953-2.4931-0.96875-3.5312 1.011-1.2181 1.1892-2.3894 1.1562-2.6562l-0.0937-0.59375c-0.57868 0.50616-1.4986 0.97101-2.5938 1.4062-0.006-0.005-0.0256 0.005-0.0312 0-1.2151-1.0152-2.762-1.625-4.4689-1.625zm-2 4c0.55833 0 1.0312 0.47292 1.0312 1.0312v0.96875c0 0.55833-0.47292 1-1.0312 1-0.55833 0-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm4 0c0.55833 0 1 0.47292 1 1.0312v0.96875c0 0.55833-0.44167 1-1 1s-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm2 4.9781c-0.0291 0.34377-0.92509 3.0032-4 3.0094-2.7886 0.006-4-2.5584-4-2.9844z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-devilish-symbolic_256x256.png b/images/Smuxi-Emoticons/face-devilish-symbolic_256x256.png
new file mode 100644
index 000000000..c6688444b
Binary files /dev/null and b/images/Smuxi-Emoticons/face-devilish-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-embarrassed-symbolic.png b/images/Smuxi-Emoticons/face-embarrassed-symbolic.png
new file mode 100644
index 000000000..10a2fdfae
Binary files /dev/null and b/images/Smuxi-Emoticons/face-embarrassed-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-embarrassed-symbolic.svg b/images/Smuxi-Emoticons/face-embarrassed-symbolic.svg
new file mode 100644
index 000000000..094921221
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-embarrassed-symbolic.svg
@@ -0,0 +1,63 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-embarrassed-symbolic.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-662 -539)"
+     style="fill:#a547b4;fill-opacity:1">
+    <path
+       id="path7221"
+       style="fill:#a547b4;fill-opacity:1"
+       d="m670 540c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-2.4688 5.1768c0.73437 0 1.4688 0.44603 1.4688 1.3125-1.5-0.33848-3.125 1.7329-3 0 0.0625-0.86647 0.79688-1.3125 1.5312-1.3125zm4.9375 0c0.73437 0 1.4688 0.44603 1.5312 1.3125 0.125 1.7329-1.5-0.33848-3 0 0-0.86647 0.73438-1.3125 1.4688-1.3125zm-5.9991 2.558c0.41493 0 0.75 0.33507 0.75 0.75s-0.33507 0.75-0.75 0.75-0.75-0.33507-0.75-0.75 0.33507-0.75 0.75-0.75zm7.0165 0c0.41493 0 0.75 0.33507 0.75 0.75s-0.33507 0.75-0.75 0.75-0.75-0.33507-0.75-0.75 0.33507-0.75 0.75-0.75zm-4.0902 2.2625h1.1719c0.20621 0 0.54688 0.223 0.54688 0.5s-0.34067 0.51562-0.54688 0.51562h-1.1719c-0.20621 0-0.48438-0.23862-0.48438-0.51562s0.27817-0.5 0.48438-0.5z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-embarrassed-symbolic_256x256.png b/images/Smuxi-Emoticons/face-embarrassed-symbolic_256x256.png
new file mode 100644
index 000000000..337addd4e
Binary files /dev/null and b/images/Smuxi-Emoticons/face-embarrassed-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-kiss-symbolic.png b/images/Smuxi-Emoticons/face-kiss-symbolic.png
new file mode 100644
index 000000000..ba2367a90
Binary files /dev/null and b/images/Smuxi-Emoticons/face-kiss-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-kiss-symbolic.svg b/images/Smuxi-Emoticons/face-kiss-symbolic.svg
new file mode 100644
index 000000000..cf726b6e0
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-kiss-symbolic.svg
@@ -0,0 +1,73 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-kiss-symbolic.svg">
+  <defs
+     id="defs11" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="742"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8.1355932"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-641 -519)"
+     style="fill:#e45094;fill-opacity:1">
+    <g
+       id="g5238"
+       transform="translate(20 -18)"
+       style="fill:#e45094;fill-opacity:1">
+      <path
+         id="path5202"
+         style="fill:#e45094;fill-opacity:1"
+         d="m388 321c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-2.4688 4c0.73437 0 1.4688 0.22506 1.4688 1.0915-2.5607-0.60365-2.4179 1.6887-3 0.22097-0.32026-0.80753 0.79688-1.3125 1.5312-1.3125zm4.9375 0c0.73437 0 1.7046 0.46125 1.5312 1.3125-0.31694 1.5562-0.52773-0.9572-3-0.22097 0-0.86 0.73-1.09 1.47-1.09zm-3.47 3c0.41039-0.01 0.74927 0.13366 1.0312 0.34375 0.28192-0.21009 0.65216-0.3567 1.0625-0.34375 0.63161 0.0199 0.90651 0.7599 0.9062 1.1874-0.00055 0.77497 0.47532 0.76512 1 0.82812-0.63413 0.15122-0.98711 1.2249-0.98438 1.7656 0.005 0.97211-0.93028 1.2559-2.0156 1.25-1.0854-0.004-1.9872-0.25121-1.9844-1.2344 0.001-0.40742-0.35236-1.5906-1.0312-1.7656 0.67889-0.0931 1.0156-0.24993 1.0156-0.85938 0-0.80891 0.52875-1.1603 1-1.1718z"
+         transform="translate(241 217)" />
+      <path
+         id="path5217"
+         style="fill:#e45094;fill-opacity:1"
+         d="m630 547.27c-0.16971 0.0801-0.32084 0.16013-0.322 0.27191-0.0182 0.26976-0.37424 0.48105-0.67205 0.47943-0.29781-0.00078-0.5939-0.20967-0.59392-0.47943 0.00078-0.11178-0.11135-0.18959-0.27191-0.27191 0.5291-0.39533 1.253-0.33834 1.8599 0z" />
+    </g>
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-kiss-symbolic_256x256.png b/images/Smuxi-Emoticons/face-kiss-symbolic_256x256.png
new file mode 100644
index 000000000..ea27d2a85
Binary files /dev/null and b/images/Smuxi-Emoticons/face-kiss-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-laugh-symbolic.png b/images/Smuxi-Emoticons/face-laugh-symbolic.png
new file mode 100644
index 000000000..043c61020
Binary files /dev/null and b/images/Smuxi-Emoticons/face-laugh-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-laugh-symbolic.svg b/images/Smuxi-Emoticons/face-laugh-symbolic.svg
new file mode 100644
index 000000000..0c5e53b2a
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-laugh-symbolic.svg
@@ -0,0 +1,63 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-laugh-symbolic.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-481 -538.97)"
+     style="fill:#eaa023;fill-opacity:1">
+    <path
+       id="path5785"
+       style="fill:#eaa023;fill-opacity:1"
+       d="m489 539.97c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-2.4688 3.7188c0.73437 0 1.4688 0.44603 1.4688 1.3125-1.5-0.33848-3.125 1.7329-3 0 0.0625-0.86647 0.79688-1.3125 1.5312-1.3125zm4.9375 0c0.73437 0 1.4688 0.44603 1.5312 1.3125 0.125 1.7329-1.5-0.33848-3 0 0-0.86647 0.73438-1.3125 1.4688-1.3125zm-7.47 4.31c2 1.3034 7.9871 1.3034 10.031 0l-0.0312 0.53125c-0.0364 0.42971-0.99999 3.375-5 3.4062s-5-2.78-5-3.3125v-0.625z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-laugh-symbolic_256x256.png b/images/Smuxi-Emoticons/face-laugh-symbolic_256x256.png
new file mode 100644
index 000000000..01fd09ff5
Binary files /dev/null and b/images/Smuxi-Emoticons/face-laugh-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-monkey-symbolic.png b/images/Smuxi-Emoticons/face-monkey-symbolic.png
new file mode 100644
index 000000000..46edd12b5
Binary files /dev/null and b/images/Smuxi-Emoticons/face-monkey-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-monkey-symbolic.svg b/images/Smuxi-Emoticons/face-monkey-symbolic.svg
new file mode 100644
index 000000000..eacc1204b
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-monkey-symbolic.svg
@@ -0,0 +1,67 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-monkey-symbolic.svg">
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="742"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8.1355932"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-641 -659)"
+     style="fill:#b98347;fill-opacity:1">
+    <path
+       id="path9123"
+       style="fill:#b98347;fill-opacity:1"
+       d="m648.84 659.03c-1.2273 0.73385-1.0624 1.6325-0.90625 2.0312-1.8073 0.26848-3.5488 1.3112-4.125 3.1875-0.28347-0.21168-0.58797-0.34375-0.9375-0.34375-1.0338 0-1.875 1.0827-1.875 2.375s0.84115 2.3438 1.875 2.3438c0.46667 0 0.88574-0.21164 1.2188-0.5625 2.719-1.2736 7.0925-1.4662 9.875 0.0312 0.31962 0.32225 0.71112 0.53125 1.1562 0.53125 1.0338 0 1.875-1.0514 1.875-2.3438 0-1.2923-0.84115-2.375-1.875-2.375-0.42839 0-0.81111 0.19311-1.125 0.5-0.50745-1.702-1.8398-2.9102-3.8125-3.2812-0.17036-0.63874-0.28432-1.9159 1.625-1.7812-2.1695-0.79311-2.7188 1.625-2.7188 1.625-0.26551-0.11722-0.96537-0.6383-0.25-1.9375zm-1.375 5.0312c0.37988 0 0.71875 0.64637 0.71875 1.4688 0 0.82238-0.33887 1.5-0.71875 1.5s-0.65625-0.67762-0.65625-1.5 0.27637-1.4688 0.65625-1.4688zm3 0c0.37988 0 0.71875 0.64637 0.71875 1.4688 0 0.82238-0.33887 1.5-0.71875 1.5s-0.65625-0.67762-0.65625-1.5 0.27637-1.4688 0.65625-1.4688zm-7.4688 0.90625c0.25587 0 0.47396 0.14945 0.65625 0.34375-0.0332 0.52908-0.0185 1.1183 0.125 1.75-0.19168 0.29374-0.45209 0.5-0.78125 0.5-0.57176 0-1.0312-0.56655-1.0312-1.2812 0-0.7147 0.45949-1.3125 1.0312-1.3125zm12.031 0c0.57182 0 1.0625 0.59772 1.0625 1.3125s-0.49068 1.2812-1.0625 1.2812c-0.37247 0-0.65921-0.26193-0.84375-0.625 0.055-0.48001 0.0368-0.93512 0-1.375 0.18776-0.35024 0.48432-0.59375 0.84375-0.59375z" />
+    <path
+       id="path8939"
+       style="color:#000000;enable-background:new;fill:#b98347;fill-opacity:1"
+       d="m648.97 667.97c-3.88 0-7.0312 1.567-7.0312 3.5s3.1512 3.5 7.0312 3.5 7.0312-1.567 7.0312-3.5-3.1512-3.5-7.0312-3.5zm-4.9688 2.0625s0.36695 2.0312 4.9688 2.0312c4.3866 0 5.0938-2 5.0938-2s-0.0395 2.9766-5.0938 2.9375c-5.1481-0.0398-4.9688-2.9688-4.9688-2.9688z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-monkey-symbolic_256x256.png b/images/Smuxi-Emoticons/face-monkey-symbolic_256x256.png
new file mode 100644
index 000000000..c672fb4fb
Binary files /dev/null and b/images/Smuxi-Emoticons/face-monkey-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-plain-symbolic.png b/images/Smuxi-Emoticons/face-plain-symbolic.png
new file mode 100644
index 000000000..b2b6ac3ab
Binary files /dev/null and b/images/Smuxi-Emoticons/face-plain-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-plain-symbolic.svg b/images/Smuxi-Emoticons/face-plain-symbolic.svg
new file mode 100644
index 000000000..55bdf140a
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-plain-symbolic.svg
@@ -0,0 +1,63 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-plain-symbolic.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-601 -519)"
+     style="fill:#529fc7;fill-opacity:1">
+    <path
+       id="path4930"
+       style="fill:#529fc7;fill-opacity:1"
+       d="m609 520c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-2 4c0.55833 0 1.0312 0.47292 1.0312 1.0312v0.96875c0 0.55833-0.47292 1-1.0312 1-0.55833 0-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm4 0c0.55833 0 1 0.47292 1 1.0312v0.96875c0 0.55833-0.44167 1-1 1s-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm-6.5 5h9c0.277 0 0.5 0.223 0.5 0.5s-0.223 0.5-0.5 0.5h-9c-0.277 0-0.5-0.223-0.5-0.5s0.223-0.5 0.5-0.5z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-plain-symbolic_256x256.png b/images/Smuxi-Emoticons/face-plain-symbolic_256x256.png
new file mode 100644
index 000000000..f86d6439f
Binary files /dev/null and b/images/Smuxi-Emoticons/face-plain-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-raspberry-symbolic.png b/images/Smuxi-Emoticons/face-raspberry-symbolic.png
new file mode 100644
index 000000000..d486d9d49
Binary files /dev/null and b/images/Smuxi-Emoticons/face-raspberry-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-raspberry-symbolic.svg b/images/Smuxi-Emoticons/face-raspberry-symbolic.svg
new file mode 100644
index 000000000..f2a6ad282
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-raspberry-symbolic.svg
@@ -0,0 +1,63 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-raspberry-symbolic.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-581 -539)"
+     style="fill:#eaa023;fill-opacity:1">
+    <path
+       id="path6188"
+       style="fill:#eaa023;fill-opacity:1"
+       d="m589 540c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-2 4c0.55833 0 1.0312 0.47292 1.0312 1.0312v0.96875c0 0.55833-0.47292 1-1.0312 1-0.55833 0-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm4 0c0.55833 0 1 0.47292 1 1.0312v0.96875c0 0.55833-0.44167 1-1 1s-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm-7 4.0625c0.99656 0.6369 4.0165 0.9375 5 0.9375 0.49176 0 1.4286 0.0145 2.4062-0.0937 0.97763-0.10827 1.996-0.35958 2.5938-0.84375v0.5c0 0.44149-0.75339 0.91906-2.1562 1.1875l0.25 0.53125c0.27902 0.60331 0.0833 1.2756-0.4375 1.5312l-0.25 0.125c-0.52084 0.25561-1.1749-0.0293-1.4688-0.625l-0.625-1.2812c-0.0171-0.0347-0.0191-0.0351-0.0312-0.0625-0.0961 0.001-0.18233 0-0.28125 0-3.2558 0-5-0.87374-5-1.4062v-0.5z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-raspberry-symbolic_256x256.png b/images/Smuxi-Emoticons/face-raspberry-symbolic_256x256.png
new file mode 100644
index 000000000..6a0fbf670
Binary files /dev/null and b/images/Smuxi-Emoticons/face-raspberry-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-sad-symbolic.png b/images/Smuxi-Emoticons/face-sad-symbolic.png
new file mode 100644
index 000000000..bf08b57e2
Binary files /dev/null and b/images/Smuxi-Emoticons/face-sad-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-sad-symbolic.svg b/images/Smuxi-Emoticons/face-sad-symbolic.svg
new file mode 100644
index 000000000..18bf109f8
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-sad-symbolic.svg
@@ -0,0 +1,63 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-sad-symbolic.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-461 -519)"
+     style="fill:#a547b4;fill-opacity:1">
+    <path
+       id="path71360"
+       style="fill:#a547b4;fill-opacity:1"
+       d="m469 520c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-2 4c0.55833 0 1.0312 0.47292 1.0312 1.0312v0.96875c0 0.55833-0.47292 1-1.0312 1-0.55833 0-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm4 0c0.55833 0 1 0.47292 1 1.0312v0.96875c0 0.55833-0.44167 1-1 1s-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm3 5.9429c-0.99656-0.6369-4.0165-0.91724-5-0.91724-0.98352 0-3.8046-0.0511-5 0.91724v-0.5c0-0.68098 1.7442-1.4043 5-1.4043s5 0.87179 5 1.4043z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-sad-symbolic_256x256.png b/images/Smuxi-Emoticons/face-sad-symbolic_256x256.png
new file mode 100644
index 000000000..c1da69986
Binary files /dev/null and b/images/Smuxi-Emoticons/face-sad-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-shutmouth-symbolic.png b/images/Smuxi-Emoticons/face-shutmouth-symbolic.png
new file mode 100644
index 000000000..52ade5e65
Binary files /dev/null and b/images/Smuxi-Emoticons/face-shutmouth-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-shutmouth-symbolic.svg b/images/Smuxi-Emoticons/face-shutmouth-symbolic.svg
new file mode 100644
index 000000000..7477a9105
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-shutmouth-symbolic.svg
@@ -0,0 +1,63 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-shutmouth-symbolic.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-521 -539)"
+     style="fill:#a547b4;fill-opacity:1">
+    <path
+       id="path5954"
+       style="fill:#a547b4;fill-opacity:1"
+       d="m529 540c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-2 4c0.55833 0 1.0312 0.47292 1.0312 1.0312v0.96875c0 0.55833-0.47292 1-1.0312 1-0.55833 0-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm4 0c0.55833 0 1 0.47292 1 1.0312v0.96875c0 0.55833-0.44167 1-1 1s-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm-6 4 4 1 4-1c0.0825 0.59047-0.16081 1.054-0.67132 1.1678l-1.3287 0.33217 1.3088 0.32721c0.71468 0.1915 0.69117 0.74919 0.69117 1.1728l-4-1-4 1c-0.0655-0.63125 0.0374-0.98324 0.52023-1.1301l1.48-0.37-1.5-0.34c-0.48-0.12-0.58-0.68-0.5-1.16z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-shutmouth-symbolic_256x256.png b/images/Smuxi-Emoticons/face-shutmouth-symbolic_256x256.png
new file mode 100644
index 000000000..63352af38
Binary files /dev/null and b/images/Smuxi-Emoticons/face-shutmouth-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-sick-symbolic.png b/images/Smuxi-Emoticons/face-sick-symbolic.png
new file mode 100644
index 000000000..fe01aaf15
Binary files /dev/null and b/images/Smuxi-Emoticons/face-sick-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-sick-symbolic.svg b/images/Smuxi-Emoticons/face-sick-symbolic.svg
new file mode 100644
index 000000000..8bc1b6ad1
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-sick-symbolic.svg
@@ -0,0 +1,63 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-sick-symbolic.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-662 -519)"
+     style="fill:#a547b4;fill-opacity:1">
+    <path
+       id="path7113"
+       style="fill:#a547b4;fill-opacity:1"
+       d="m670 520c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-3.6875 3.6875c0.0418 0.003 0.0839 0.007 0.125 0.0312l1.125 0.65625 1.1562-0.65625c0.16541-0.0917 0.34038-0.0211 0.40625 0.15625 0.0659 0.17731-0.0221 0.40825-0.1875 0.5l-0.71875 0.40625 0.71875 0.40625c0.16421 0.0939 0.22441 0.29229 0.15625 0.46875-0.0683 0.17645-0.24204 0.21885-0.40625 0.125l-1.125-0.625-1.1562 0.625c-0.16541 0.0918-0.34036 0.0523-0.40625-0.125-0.0659-0.17731 0.0221-0.40825 0.1875-0.5l0.6875-0.40625-0.6875-0.375c-0.16421-0.0939-0.25566-0.32355-0.1875-0.5 0.0512-0.13233 0.1874-0.20014 0.3125-0.1875zm5.1562 0c0.0418 0.003 0.0839 0.007 0.125 0.0312l1.125 0.65625 1.1562-0.65625c0.16541-0.0917 0.34038-0.0211 0.40625 0.15625 0.0659 0.17731-0.0221 0.40825-0.1875 0.5l-0.71875 0.40625 0.71875 0.40625c0.16421 0.0939 0.25566 0.29229 0.1875 0.46875-0.0683 0.17645-0.27329 0.21885-0.4375 0.125l-1.125-0.65625-1.1562 0.65625c-0.16541 0.0918-0.34036 0.0523-0.40625-0.125-0.0659-0.17731 0.0221-0.40825 0.1875-0.5l0.71875-0.40625-0.71875-0.40625c-0.16421-0.0939-0.25566-0.2923-0.1875-0.46875 0.0512-0.13233 0.1874-0.20014 0.3125-0.1875zm-4.3438 4.3438c0.60381-0.0539 1.2678 0.0911 1.875 0.53125 0.34921 0.22009 0.41248 0.27376 1 0.34375 0.15925 0.0555 0.60706-0.041 1-0.34375 0.28067-0.20469 0.56128-0.29566 0.84375-0.375 1.3093-0.36774 2.5741 0.4362 3.1562 1.25v0.5c-0.51128-0.28582-1.0605-0.59799-1.625-0.78125l0.46875 0.9375c0.32788 0.64742 0.13224 1.399-0.4375 1.6875-0.56975 0.28853-1.2971-0.009-1.625-0.65625l-0.59375-1.1562c-0.051-0.1008-0.0675-0.20871-0.0937-0.3125-0.0265 0.0104-0.0709 0.0278-0.0937 0.0312-0.54153 0.31352-1.5593 0.19637-2 0-0.91691-0.43721-0.90913-0.66739-1.5312-0.6875-0.85242 0.0189-1.8434 0.39879-2.4688 0.9375v-0.5c0.26351-0.67866 1.1186-1.3165 2.125-1.4062z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-sick-symbolic_256x256.png b/images/Smuxi-Emoticons/face-sick-symbolic_256x256.png
new file mode 100644
index 000000000..d9f521cb0
Binary files /dev/null and b/images/Smuxi-Emoticons/face-sick-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-smile-big-symbolic.png b/images/Smuxi-Emoticons/face-smile-big-symbolic.png
new file mode 100644
index 000000000..2449bd20b
Binary files /dev/null and b/images/Smuxi-Emoticons/face-smile-big-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-smile-big-symbolic.svg b/images/Smuxi-Emoticons/face-smile-big-symbolic.svg
new file mode 100644
index 000000000..ed7021710
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-smile-big-symbolic.svg
@@ -0,0 +1,63 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-smile-big-symbolic.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-541 -518.97)"
+     style="fill:#eaa023;fill-opacity:1">
+    <path
+       id="path10549"
+       style="fill:#eaa023;fill-opacity:1"
+       d="m549 519.97c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-2 4c0.55833 0 1.0312 0.47292 1.0312 1.0312v0.96875c0 0.55833-0.47292 1-1.0312 1-0.55833 0-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm4 0c0.55833 0 1 0.47292 1 1.0312v0.96875c0 0.55833-0.44167 1-1 1s-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm-7 4.0312c2 1.3034 7.9871 1.3034 10.031 0l-0.0312 0.53125c-0.0364 0.42971-0.99999 3.375-5 3.4062s-5-2.78-5-3.3125v-0.625z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-smile-big-symbolic_256x256.png b/images/Smuxi-Emoticons/face-smile-big-symbolic_256x256.png
new file mode 100644
index 000000000..d6a312264
Binary files /dev/null and b/images/Smuxi-Emoticons/face-smile-big-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-smile-symbolic.png b/images/Smuxi-Emoticons/face-smile-symbolic.png
new file mode 100644
index 000000000..486d3b032
Binary files /dev/null and b/images/Smuxi-Emoticons/face-smile-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-smile-symbolic.svg b/images/Smuxi-Emoticons/face-smile-symbolic.svg
new file mode 100644
index 000000000..cc29892bb
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-smile-symbolic.svg
@@ -0,0 +1,63 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-smile-symbolic.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="742"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8.1355932"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-441 -519)"
+     style="fill:#eaa023;fill-opacity:1">
+    <path
+       id="path5253"
+       style="fill:#eaa023;fill-opacity:1"
+       d="m449 520c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-2 4c0.55833 0 1.0312 0.47292 1.0312 1.0312v0.96875c0 0.55833-0.47292 1-1.0312 1-0.55833 0-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm4 0c0.55833 0 1 0.47292 1 1.0312v0.96875c0 0.55833-0.44167 1-1 1s-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm-7 4.0698c0.99656 0.6369 4.0165 0.91724 5 0.91724 0.98352 0 3.8046 0.0511 5-0.91724v0.5c0 0.68098-1.7442 1.4043-5 1.4043s-5-0.87179-5-1.4043z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-smile-symbolic_256x256.png b/images/Smuxi-Emoticons/face-smile-symbolic_256x256.png
new file mode 100644
index 000000000..c36fc687c
Binary files /dev/null and b/images/Smuxi-Emoticons/face-smile-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-smirk-symbolic.png b/images/Smuxi-Emoticons/face-smirk-symbolic.png
new file mode 100644
index 000000000..8fd983950
Binary files /dev/null and b/images/Smuxi-Emoticons/face-smirk-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-smirk-symbolic.svg b/images/Smuxi-Emoticons/face-smirk-symbolic.svg
new file mode 100644
index 000000000..009cdd261
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-smirk-symbolic.svg
@@ -0,0 +1,63 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-smirk-symbolic.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-561.05 -539.19)"
+     style="fill:#eaa023;fill-opacity:1">
+    <path
+       id="path6081"
+       style="fill:#eaa023;fill-opacity:1"
+       d="m569.06 540.19c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-2 4c0.55833 0 1.0312 0.47292 1.0312 1.0312v0.96875c0 0.55833-0.47292 1-1.0312 1-0.55833 0-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm4 0c0.55833 0 1 0.47292 1 1.0312v0.96875c0 0.55833-0.44167 1-1 1s-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm-6.4124 2.7188c0.77942 3.3062 4.693 4.4323 7.7053 3.287 0.007 0.59795-0.19508 1.0972-1.1544 1.2859-2.1655 0.4261-5.1608-0.14239-6.68-2.5933-0.6661-1.0746-0.12703-1.6851 0.12914-1.9797z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-smirk-symbolic_256x256.png b/images/Smuxi-Emoticons/face-smirk-symbolic_256x256.png
new file mode 100644
index 000000000..e923af836
Binary files /dev/null and b/images/Smuxi-Emoticons/face-smirk-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-surprised-symbolic.png b/images/Smuxi-Emoticons/face-surprised-symbolic.png
new file mode 100644
index 000000000..faf4571a6
Binary files /dev/null and b/images/Smuxi-Emoticons/face-surprised-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-surprised-symbolic.svg b/images/Smuxi-Emoticons/face-surprised-symbolic.svg
new file mode 100644
index 000000000..eca521e09
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-surprised-symbolic.svg
@@ -0,0 +1,63 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-surprised-symbolic.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-521 -519)"
+     style="fill:#8daa40;fill-opacity:1">
+    <path
+       id="path71360-4"
+       style="fill:#8daa40;fill-opacity:1"
+       d="m529 520c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-2 4c0.55833 0 1.0312 0.47292 1.0312 1.0312v0.96875c0 0.55833-0.47292 1-1.0312 1-0.55833 0-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm4 0c0.55833 0 1 0.47292 1 1.0312v0.96875c0 0.55833-0.44167 1-1 1s-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm-2 4.5938c1.0592 0 1.9291 0.9211 1.9375 2.0312 0 1.1164-0.87235 2.0312-1.9375 2.0312s-1.9375-0.91484-1.9375-2.0312 0.87235-2.0312 1.9375-2.0312z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-surprised-symbolic_256x256.png b/images/Smuxi-Emoticons/face-surprised-symbolic_256x256.png
new file mode 100644
index 000000000..6e5fe10f2
Binary files /dev/null and b/images/Smuxi-Emoticons/face-surprised-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-tired-symbolic.png b/images/Smuxi-Emoticons/face-tired-symbolic.png
new file mode 100644
index 000000000..b9e0b1fb8
Binary files /dev/null and b/images/Smuxi-Emoticons/face-tired-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-tired-symbolic.svg b/images/Smuxi-Emoticons/face-tired-symbolic.svg
new file mode 100644
index 000000000..3f03dbfd4
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-tired-symbolic.svg
@@ -0,0 +1,63 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-tired-symbolic.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-601 -539)"
+     style="fill:#a547b4;fill-opacity:1">
+    <path
+       id="path6411"
+       style="fill:#a547b4;fill-opacity:1"
+       d="m609 540c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-1.375 5.75c0.18146-0.0534 0.34945 0.0626 0.375 0.25 0.0256 0.18743-0.0998 0.3841-0.28125 0.4375l-2.7812 0.8125c-0.18146 0.0534-0.34945-0.0313-0.375-0.21875-0.0256-0.18743 0.0998-0.3841 0.28125-0.4375l2.7812-0.84375zm2.625 0c0.0415-0.006 0.0796-0.0134 0.125 0l2.7812 0.84375c0.18146 0.0534 0.3068 0.25007 0.28125 0.4375-0.0256 0.18743-0.19354 0.27215-0.375 0.21875l-2.7812-0.8125c-0.18146-0.0534-0.3068-0.25007-0.28125-0.4375 0.0192-0.14057 0.12537-0.2334 0.25-0.25zm-4.8438 3.25h7.1875c0.2216 0 0.40625 0.223 0.40625 0.5s-0.18465 0.5-0.40625 0.5h-7.1875c-0.2216 0-0.40625-0.223-0.40625-0.5s0.18465-0.5 0.40625-0.5z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-tired-symbolic_256x256.png b/images/Smuxi-Emoticons/face-tired-symbolic_256x256.png
new file mode 100644
index 000000000..f99f0f561
Binary files /dev/null and b/images/Smuxi-Emoticons/face-tired-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-uncertain-symbolic.png b/images/Smuxi-Emoticons/face-uncertain-symbolic.png
new file mode 100644
index 000000000..1bf96ca82
Binary files /dev/null and b/images/Smuxi-Emoticons/face-uncertain-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-uncertain-symbolic.svg b/images/Smuxi-Emoticons/face-uncertain-symbolic.svg
new file mode 100644
index 000000000..14a7d6c7a
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-uncertain-symbolic.svg
@@ -0,0 +1,63 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-uncertain-symbolic.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-501 -539)"
+     style="fill:#a547b4;fill-opacity:1">
+    <path
+       id="path5861"
+       style="fill:#a547b4;fill-opacity:1"
+       d="m509 540c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-2 4c0.55833 0 1.0312 0.47292 1.0312 1.0312v0.96875c0 0.55833-0.47292 1-1.0312 1-0.55833 0-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm4 0c0.55833 0 1 0.47292 1 1.0312v0.96875c0 0.55833-0.44167 1-1 1s-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm-6 4 8 2v1l-8-2v-1z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-uncertain-symbolic_256x256.png b/images/Smuxi-Emoticons/face-uncertain-symbolic_256x256.png
new file mode 100644
index 000000000..678211c96
Binary files /dev/null and b/images/Smuxi-Emoticons/face-uncertain-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-wink-symbolic.png b/images/Smuxi-Emoticons/face-wink-symbolic.png
new file mode 100644
index 000000000..63a59bc08
Binary files /dev/null and b/images/Smuxi-Emoticons/face-wink-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-wink-symbolic.svg b/images/Smuxi-Emoticons/face-wink-symbolic.svg
new file mode 100644
index 000000000..e7ba5eaba
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-wink-symbolic.svg
@@ -0,0 +1,63 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-wink-symbolic.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-561 -519)"
+     style="fill:#eaa023;fill-opacity:1">
+    <path
+       id="path4734"
+       style="fill:#eaa023;fill-opacity:1"
+       d="m569 520c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-2 4c0.55833 0 1.0312 0.47292 1.0312 1.0312v0.96875c0 0.55833-0.47292 1-1.0312 1-0.55833 0-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm3.4375 1h0.90625c0.5224 0 0.96875 0.21617 0.96875 0.5 0 0.28382-0.44635 0.5-0.96875 0.5h-0.90625c-0.52241 0-0.9375-0.21618-0.9375-0.5 0-0.28383 0.41509-0.5 0.9375-0.5zm-6.4375 3.0625c0.71531 1.0744 2.2352 1.9375 5 1.9375 2.4523 0 4.2108-0.75041 5-1.9375v0.5c0 0.68098-0.8379 2.4062-5 2.4062-3.8808 0-5-1.8737-5-2.4062v-0.5z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-wink-symbolic_256x256.png b/images/Smuxi-Emoticons/face-wink-symbolic_256x256.png
new file mode 100644
index 000000000..0d22ca15c
Binary files /dev/null and b/images/Smuxi-Emoticons/face-wink-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-worried-symbolic.png b/images/Smuxi-Emoticons/face-worried-symbolic.png
new file mode 100644
index 000000000..6abc759aa
Binary files /dev/null and b/images/Smuxi-Emoticons/face-worried-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-worried-symbolic.svg b/images/Smuxi-Emoticons/face-worried-symbolic.svg
new file mode 100644
index 000000000..5c03f7a3c
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-worried-symbolic.svg
@@ -0,0 +1,63 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-worried-symbolic.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-601 -519)"
+     style="fill:#a547b4;fill-opacity:1">
+    <path
+       id="path71360-0"
+       style="fill:#a547b4;fill-opacity:1"
+       d="m609 520c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-2 4c0.55833 0 1.0312 0.47292 1.0312 1.0312v0.96875c0 0.55833-0.47292 1-1.0312 1-0.55833 0-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm4 0c0.55833 0 1 0.47292 1 1.0312v0.96875c0 0.55833-0.44167 1-1 1s-1-0.44167-1-1v-0.96875c0-0.55833 0.44167-1.0312 1-1.0312zm3 5.9429c-0.76555-0.42797-1.6121-0.92076-2.4757-0.93995-0.65285 0.0193-1.2389 0.6539-1.5243 0.69709-0.54153 0.31352-1.5593 0.19637-2 0-0.91691-0.43721-0.92121-0.68027-1.5433-0.70038-0.85242 0.0189-1.8313 0.40453-2.4567 0.94324v-0.5c0.42161-1.0859 2.3808-2.0446 4-0.87083 0.34921 0.22009 0.42727 0.26657 1.0148 0.33656 0.15925 0.0555 0.59227-0.0338 0.98521-0.33659 1.5816-1.1534 3.2922-0.11851 4 0.87086z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-worried-symbolic_256x256.png b/images/Smuxi-Emoticons/face-worried-symbolic_256x256.png
new file mode 100644
index 000000000..853907e86
Binary files /dev/null and b/images/Smuxi-Emoticons/face-worried-symbolic_256x256.png differ
diff --git a/images/Smuxi-Emoticons/face-yawn-symbolic.png b/images/Smuxi-Emoticons/face-yawn-symbolic.png
new file mode 100644
index 000000000..89fb361bb
Binary files /dev/null and b/images/Smuxi-Emoticons/face-yawn-symbolic.png differ
diff --git a/images/Smuxi-Emoticons/face-yawn-symbolic.svg b/images/Smuxi-Emoticons/face-yawn-symbolic.svg
new file mode 100644
index 000000000..bfeb4b37f
--- /dev/null
+++ b/images/Smuxi-Emoticons/face-yawn-symbolic.svg
@@ -0,0 +1,63 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   height="16"
+   width="16"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="face-yawn-symbolic.svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <g
+     id="g71291"
+     transform="translate(-621 -539)"
+     style="fill:#8daa40;fill-opacity:1">
+    <path
+       id="path6445"
+       style="fill:#8daa40;fill-opacity:1"
+       d="m629 540c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-2.4688 3c0.73437 0 1.4688 0.44603 1.4688 1.3125-1.5-0.33848-3.125 1.7329-3 0 0.0625-0.86647 0.79688-1.3125 1.5312-1.3125zm4.9375 0c0.73437 0 1.4688 0.44603 1.5312 1.3125 0.125 1.7329-1.5-0.33848-3 0 0-0.86647 0.73438-1.3125 1.4688-1.3125zm-2.4688 3c1.3807 0 2.5 1.3432 2.5 3s-1.1193 3-2.5 3-2.5-1.3432-2.5-3 1.1193-3 2.5-3z" />
+  </g>
+</svg>
diff --git a/images/Smuxi-Emoticons/face-yawn-symbolic_256x256.png b/images/Smuxi-Emoticons/face-yawn-symbolic_256x256.png
new file mode 100644
index 000000000..71560bcd9
Binary files /dev/null and b/images/Smuxi-Emoticons/face-yawn-symbolic_256x256.png differ
diff --git a/images/go-next-symbolic.png b/images/go-next-symbolic.png
new file mode 100644
index 000000000..3d92ffa75
Binary files /dev/null and b/images/go-next-symbolic.png differ
diff --git a/images/go-next-symbolic.svg b/images/go-next-symbolic.svg
new file mode 100644
index 000000000..d6404df93
--- /dev/null
+++ b/images/go-next-symbolic.svg
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='go-next-symbolic.svg' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' inkscape:version='0.48.4 r9939' version='1.1' width='16' xmlns='http://www.w3.org/2000/svg'>
+  <metadata id='metadata90'>
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer12' inkscape:cx='60.600095' inkscape:cy='425.11648' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='702' inkscape:window-maximized='1' inkscape:window-width='1366' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='1'>
+    <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='120px' originy='530px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+    <inkscape:grid color='#000000' empcolor='#000000' empopacity='0' empspacing='4' enabled='true' id='grid5968' opacity='0.1254902' originx='120px' originy='530px' snapvisiblegridlinesonly='true' spacingx='0.5px' spacingy='0.5px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-121.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' transform='translate(-121.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-121.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' transform='translate(-121.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-121.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-121.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-121.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-121.0002,-747)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-121.0002,-747)'>
+    <path inkscape:connector-curvature='0' d='m 125.78125,749 a 1.0001,1.0001 0 0 0 -0.5,1.71875 L 129.5625,755 l -4.28125,4.28125 a 1.016466,1.016466 0 1 0 1.4375,1.4375 l 5,-5 0.6875,-0.71875 -0.6875,-0.71875 -5,-5 A 1.0001,1.0001 0 0 0 125.78125,749 z' id='path8334' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans'/>
+    
+    <rect height='1' id='rect8338' rx='0' ry='1' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='scale(-1,1)' width='1' x='-126.0002' y='749'/>
+    <rect height='1' id='rect8342' rx='0' ry='1' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='scale(-1,1)' width='1' x='-126.0002' y='760'/>
+  </g>
+</svg>
diff --git a/images/go-next-symbolic_256x256.png b/images/go-next-symbolic_256x256.png
new file mode 100644
index 000000000..08051e5dd
Binary files /dev/null and b/images/go-next-symbolic_256x256.png differ
diff --git a/src/Engine/Config/MessageBuilderSettings.cs b/src/Engine/Config/MessageBuilderSettings.cs
index 92c3b8659..4fa9e6aef 100644
--- a/src/Engine/Config/MessageBuilderSettings.cs
+++ b/src/Engine/Config/MessageBuilderSettings.cs
@@ -323,6 +323,12 @@ static void InitBuiltinSmartLinks()
             BuiltinPatterns.Add(new MessagePatternModel(regex) {
                 LinkFormat = "http://bugzilla.xamarin.com/show_bug.cgi?id={1}"
             });
+            // Emocitons
+            regex = new Regex(@"(o|>|3)?:[)o(]|:([()\/D|*$Ppx?oO]|<{1,2}|8\)|'\()|\^_\^|-_-|B\||;\)",
+                              RegexOptions.Compiled);
+            BuiltinPatterns.Add(new MessagePatternModel(regex) {
+            MessagePartType = typeof(ImageMessagePartModel)
+            });
 
             // TODO: msgid -> http://mid.gmane.org/{1}
             // TODO: ISSN/ISBN
diff --git a/src/Frontend-GNOME/EmoticonButton.cs b/src/Frontend-GNOME/EmoticonButton.cs
new file mode 100644
index 000000000..76f255746
--- /dev/null
+++ b/src/Frontend-GNOME/EmoticonButton.cs
@@ -0,0 +1,78 @@
+// Smuxi - Smart MUltipleXed Irc
+//
+// Copyright (c) 2014 jamesaxl
+//
+// Full GPL License: <http://www.gnu.org/licenses/gpl.txt>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+using System;
+
+namespace Smuxi.Frontend.Gnome
+{
+    public class EmoticonButton : Gtk.Button
+    {
+        private Entry Entry { get; set; }
+        private string Symbol { get; set; }
+        private EmoticonsWindow EmoticonsWindow { get; set; }
+
+        public EmoticonButton (EmoticonsWindow emoticonsWindow, Entry entry, string emoticonSymbol, Gdk.Pixbuf emoticonImage, string emoticonName)
+        {
+            Entry = entry;
+            EmoticonsWindow = emoticonsWindow;
+            if (Entry == null) {
+                throw new ArgumentNullException("Entry");
+            }
+            if (EmoticonsWindow == null) {
+                throw new ArgumentNullException("EmoticonsWindow");
+            }
+            Relief = Gtk.ReliefStyle.None;
+            TooltipText = emoticonName;
+            Symbol = emoticonSymbol;
+            var img = new Gtk.Image();
+            img.Pixbuf = emoticonImage;
+            Image = img;
+            Clicked += OnClicked;
+        }
+
+        public EmoticonButton (EmoticonsWindow emoticonsWindow, Entry entry, string emoticonSymbol, string emoticonName)
+        {
+            Entry = entry;
+            EmoticonsWindow = emoticonsWindow;
+            if (Entry == null) {
+                throw new ArgumentNullException("Entry");
+            }
+            if (EmoticonsWindow == null) {
+                throw new ArgumentNullException("EmoticonsWindow");
+            }
+            Relief = Gtk.ReliefStyle.None;
+            TooltipText = emoticonName;
+            Symbol = emoticonSymbol;
+            var font = Pango.FontDescription.FromString("Serif Bold 24");
+            var sybmbolLabel = new Gtk.Label(emoticonSymbol);
+            sybmbolLabel.ModifyFont(font);
+            Label = emoticonSymbol;
+            Clicked += OnClicked;
+        }
+
+        private void OnClicked(object obj, EventArgs args)
+        {
+            var action = Symbol;
+            var iterInstert = Entry.Buffer.EndIter;
+            Entry.Buffer.Insert(ref iterInstert, action);
+            Entry.HasFocus = true;
+            EmoticonsWindow.Hide();
+        }
+    }
+}
diff --git a/src/Frontend-GNOME/EmoticonSticker.cs b/src/Frontend-GNOME/EmoticonSticker.cs
new file mode 100644
index 000000000..3c6f28ac6
--- /dev/null
+++ b/src/Frontend-GNOME/EmoticonSticker.cs
@@ -0,0 +1,72 @@
+// Smuxi - Smart MUltipleXed Irc
+//
+// Copyright (c) 2014 jamesaxl
+//
+// Full GPL License: <http://www.gnu.org/licenses/gpl.txt>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+using System;
+
+namespace Smuxi.Frontend.Gnome
+{
+	public class EmoticonSticker : Gtk.EventBox
+    {
+        private EmoticonsWindow EmoticonsWindow { get; set; }
+        private Entry Entry { get; set; }
+        private MainWindow MainWindow { get; set; }
+        private EmoticonStore EmoticonStore { get; set; }
+        public bool OpenedEmoticonWindow { get; set; }
+
+		public EmoticonSticker(Entry entry, MainWindow mainWindow, EmoticonStore emoticonStore)
+        {
+            Entry = entry;
+            MainWindow = mainWindow;
+            EmoticonStore = emoticonStore;
+            if (Entry == null) {
+                throw new ArgumentNullException("Entry");
+            }
+            if (MainWindow == null) {
+                throw new ArgumentNullException("MainWindow");
+            }
+            if (EmoticonStore == null) {
+                throw new ArgumentNullException("EmoticonStore");
+            }
+            OpenedEmoticonWindow = false;
+            var emoticonSticker = new Gtk.Image();
+            emoticonSticker.Pixbuf = emoticonStore.GetEmoticonImage("smile", 20);
+            Add(emoticonSticker);
+            ButtonPressEvent += OnClicked;
+            EmoticonsWindow = new EmoticonsWindow(Entry, MainWindow, EmoticonStore, this);
+        }
+
+        private void OnClicked(object obj, EventArgs args)
+        {
+            if (!OpenedEmoticonWindow) {
+                int alx;
+                int aly;
+                var alh = Allocation.Y - 160;
+                GdkWindow.GetOrigin(out alx, out aly);
+                EmoticonsWindow.Decorated = false;
+                EmoticonsWindow.KeepAbove = true;
+                EmoticonsWindow.Move(alx, aly + alh);
+                EmoticonsWindow.ShowAll();
+                OpenedEmoticonWindow = true;
+            } else {
+                EmoticonsWindow.Hide();
+                OpenedEmoticonWindow = false;
+            }
+        }
+    }
+}
diff --git a/src/Frontend-GNOME/EmoticonStore.cs b/src/Frontend-GNOME/EmoticonStore.cs
new file mode 100644
index 000000000..a322e438a
--- /dev/null
+++ b/src/Frontend-GNOME/EmoticonStore.cs
@@ -0,0 +1,69 @@
+// Smuxi - Smart MUltipleXed Irc
+//
+// Copyright (c) 2014 jamesaxl
+//
+// Full GPL License: <http://www.gnu.org/licenses/gpl.txt>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+using System;
+using System.Collections.Generic;
+
+namespace Smuxi.Frontend.Gnome
+{
+    public class EmoticonStore : Dictionary<string, string>
+    {
+        public EmoticonStore()
+        {
+            Add("o:)", "angel");
+            Add(">:o", "angry");
+            Add(":/", "confused");
+            Add("B|", "cool");
+            Add(":'(", "crying");
+            Add("3:)", "devilish");
+            Add(">:(", "embarrassed");
+            Add(":*", "kiss");
+            Add("^_^", "laugh");
+            Add(":8)", "monkey");
+            Add(":|", "plain");
+            Add(":P", "raspberry");
+            Add(":p", "raspberry");
+            Add(":(", "sad");
+            Add(":x", "shutmouth");
+            Add(":$", "sick");
+            Add(":D", "smile-big");
+            Add(":)", "smile");
+            Add(":?", "smirk");
+            Add(":o", "surprised");
+            Add("-_-", "tired");
+            Add(":<", "uncertain");
+            Add(";)", "wink");
+            Add(":<<", "worried");
+            Add(":O", "yawn");
+        }
+
+        public Gdk.Pixbuf GetEmoticonImage(string emoticonName, int size = 16 )
+        {
+            var emoticonImage = Frontend.LoadIcon("face- " + emoticonName + "-symbolic", size, "face-" + emoticonName + "-symbolic_256x256.png");
+            return emoticonImage;
+        }
+
+        public bool TryGetImage(string emoticonSymbol)
+        {
+            if (this.ContainsKey(emoticonSymbol))
+                return true;
+            return false;
+        }
+    }
+}
diff --git a/src/Frontend-GNOME/EmoticonsWindow.cs b/src/Frontend-GNOME/EmoticonsWindow.cs
new file mode 100644
index 000000000..877eda7a1
--- /dev/null
+++ b/src/Frontend-GNOME/EmoticonsWindow.cs
@@ -0,0 +1,96 @@
+// Smuxi - Smart MUltipleXed Irc
+//
+// Copyright (c) 2014 jamesaxl
+//
+// Full GPL License: <http://www.gnu.org/licenses/gpl.txt>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Smuxi.Frontend.Gnome
+{
+    public class EmoticonsWindow : Gtk.Window
+    {
+        private Entry Entry { get; set; }
+        private EmoticonStore EmoticonStore { get; set; }
+        private EmoticonSticker EmoticonSticker { get; set; }
+
+        public EmoticonsWindow(Entry entry, MainWindow mainWindow, EmoticonStore emoticonStore, EmoticonSticker emoticonSticker)
+            : base(Gtk.WindowType.Popup)
+        {
+            EmoticonStore = emoticonStore;
+            Entry = entry;
+            EmoticonSticker = emoticonSticker;
+            if(EmoticonStore == null){
+                throw new ArgumentNullException("EmoticonStore");
+            }
+            if(Entry == null){
+                throw new ArgumentNullException("Entry");
+            }
+            if(EmoticonSticker == null){
+                throw new ArgumentNullException("EmoticonSticker");
+            }
+            var emoticonNoteBook = new Gtk.Notebook();
+            var emoticonsTableImage = new Gtk.Table(3,8,true);
+            var emoticonsTableSymbol = new Gtk.Table(3,8,true);
+            var emoticonButtonSymbolList = new List<EmoticonButton>();
+            var emoticonButtonImageList = new List<EmoticonButton>();
+
+            foreach (var emoticon in EmoticonStore) {
+                emoticonButtonImageList.Add(new EmoticonButton(this, Entry, emoticon.Key, EmoticonStore.GetEmoticonImage(emoticon.Value, 24), emoticon.Value));
+                emoticonButtonSymbolList.Add(new EmoticonButton(this, Entry, emoticon.Key, emoticon.Value));
+            }
+
+            for (var i = 0; i <= 23; i++) {
+                if (i < 8) {
+                    emoticonsTableImage.Attach(emoticonButtonImageList [i], (uint) i, (uint) i + 1, 0, 1);
+                    emoticonsTableSymbol.Attach(emoticonButtonSymbolList [i], (uint) i, (uint) i + 1, 0, 1);
+                } else if (i >= 8 && i <= 15) {
+                    var pos = (uint) i - 8;
+                    emoticonsTableImage.Attach(emoticonButtonImageList [i], pos, pos + 1, 1, 2);
+                    emoticonsTableSymbol.Attach(emoticonButtonSymbolList [i], pos, pos + 1, 1, 2);
+                } else if (i >= 16 && i <= 23) {
+                    var pos = (uint) i - 16;
+                    emoticonsTableImage.Attach(emoticonButtonImageList[i], pos, pos + 1, 2, 3);
+                    emoticonsTableSymbol.Attach(emoticonButtonSymbolList[i], pos, pos + 1, 2, 3);
+                }
+            }
+
+            var imageTabLabel = new Gtk.Image();
+            var symbolTabLabel = new Gtk.Label(":)");
+            imageTabLabel.Pixbuf = EmoticonStore.GetEmoticonImage("smile", 24);
+            var font = Pango.FontDescription.FromString("Serif Bold 24");
+            symbolTabLabel.ModifyFont(font);
+            emoticonNoteBook.AppendPage(emoticonsTableImage, imageTabLabel);
+            emoticonNoteBook.AppendPage(emoticonsTableSymbol, symbolTabLabel);
+            emoticonNoteBook.SetTabLabelPacking(emoticonsTableImage, true, false, Gtk.PackType.Start);
+            emoticonNoteBook.SetTabLabelPacking(emoticonsTableSymbol, true, false, Gtk.PackType.Start);
+            Add(emoticonNoteBook);
+            mainWindow.FocusOutEvent += HideEmoticonsWindow;
+            mainWindow.FocusChildSet += HideEmoticonsWindow;
+            Entry.FocusInEvent += HideEmoticonsWindow;
+            Hidden += delegate(object sender, EventArgs e) {
+                EmoticonSticker.OpenedEmoticonWindow = false;
+            };
+        }
+
+        private void HideEmoticonsWindow(object obj, EventArgs args)
+        {
+            Hide();
+        }
+    }
+}
diff --git a/src/Frontend-GNOME/MainWindow.cs b/src/Frontend-GNOME/MainWindow.cs
index 4b872745a..974340de6 100644
--- a/src/Frontend-GNOME/MainWindow.cs
+++ b/src/Frontend-GNOME/MainWindow.cs
@@ -70,6 +70,7 @@ public class MainWindow : Gtk.Window
         public bool IsMinimized { get; private set; }
         public bool IsMaximized { get; private set; }
         public int WindowWidth { get; private set; }
+        public EmoticonStore EmoticonStore { get; set; }
 
         public bool CaretMode {
             get {
@@ -137,6 +138,7 @@ public MainWindow() : base("Smuxi")
         {
             // restore window size / position
             int width, heigth;
+            EmoticonStore = new EmoticonStore();
             if (Frontend.FrontendConfig[Frontend.UIName + "/Interface/Width"] != null) {
                 width  = (int) Frontend.FrontendConfig[Frontend.UIName + "/Interface/Width"];
             } else {
@@ -246,7 +248,16 @@ public MainWindow() : base("Smuxi")
                 };
                 args.Requisition = bestSize;
             };
+            var eb = new Gtk.EventBox();
+            var iconBar = new Gtk.Image();
+            iconBar.Pixbuf = Frontend.LoadIcon("go-next-symbolic", 16, "go-next-symbolic.png");
+            var bottom = new Gtk.HBox(false, 0);
+            eb.Add(bottom);
+            var EmoticonSticker = new EmoticonSticker(Entry, this, EmoticonStore);
             entryScrolledWindow.Add(Entry);
+            bottom.PackStart(EmoticonSticker,false, true, 1);
+            bottom.PackStart(entryScrolledWindow,true, true,1);
+            bottom.PackStart(iconBar,false, true, 1);
 
             ProgressBar = new Gtk.ProgressBar();
             StatusHBox = new Gtk.HBox();
@@ -280,7 +291,7 @@ public MainWindow() : base("Smuxi")
                 }
             };
             entryPaned.Pack1(treeviewPaned, true, false);
-            entryPaned.Pack2(entryScrolledWindow, false, false);
+            entryPaned.Pack2(eb, false, false);
 
             Gtk.VBox vbox = new Gtk.VBox();
             vbox.PackStart(MenuWidget, false, false, 0);
diff --git a/src/Frontend-GNOME/Makefile.am b/src/Frontend-GNOME/Makefile.am
index e1a79fb69..35a97360b 100644
--- a/src/Frontend-GNOME/Makefile.am
+++ b/src/Frontend-GNOME/Makefile.am
@@ -124,6 +124,10 @@ FILES = \
 	IndicateManager.cs \
 	Main.cs \
 	MainWindow.cs \
+	EmoticonButton.cs \
+	EmoticonSticker.cs \
+	EmoticonsWindow.cs \
+	EmoticonStore.cs \
 	NetworkManager.cs \
 	NotImplementedMessageDialog.cs \
 	Notebook.cs \
@@ -201,7 +205,56 @@ RESOURCES = \
 	$(top_srcdir)/images/group-chat_256x256.png \
 	$(top_srcdir)/images/person-chat_256x256.png \
 	$(top_srcdir)/images/protocol-chat_256x256.png \
-	$(top_srcdir)/images/session-chat_256x256.png 
+	$(top_srcdir)/images/session-chat_256x256.png \
+	$(top_srcdir)/images/go-next-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-angel-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-angry-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-confused-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-cool-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-crying-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-devilish-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-embarrassed-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-kiss-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-laugh-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-monkey-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-plain-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-raspberry-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-sad-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-shutmouth-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-sick-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-smile-big-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-smile-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-smirk-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-surprised-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-tired-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-uncertain-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-wink-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-worried-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-yawn-symbolic.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-angel.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-angry.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-confused.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-cool.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-crying.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-devilish.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-embarrassed.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-kiss.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-laugh.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-monkey.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-plain.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-raspberry.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-sad.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-shutmouth.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-sick.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-smile-big.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-smile.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-smirk.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-surprised.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-tired.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-uncertain.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-wink.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-worried.png \
+	$(top_srcdir)/images/Smuxi-Emoticons/face-yawn.png
 
 EXTRAS = \
 	smuxi-frontend-gnome.in \
diff --git a/src/Frontend-GNOME/Views/Chats/ChatView.cs b/src/Frontend-GNOME/Views/Chats/ChatView.cs
index 7c822170b..d8765bfda 100644
--- a/src/Frontend-GNOME/Views/Chats/ChatView.cs
+++ b/src/Frontend-GNOME/Views/Chats/ChatView.cs
@@ -291,6 +291,7 @@ public ChatView(ChatModel chat)
 
             IsAutoScrolling = true;
             MessageTextView tv = new MessageTextView();
+            tv.EmoticonStore = Frontend.MainWindow.EmoticonStore;
             _EndMark = tv.Buffer.CreateMark("end", tv.Buffer.EndIter, false); 
             tv.ShowTimestamps = true;
             tv.ShowMarkerline = true;
diff --git a/src/Frontend-GNOME/Views/MessageTextView.cs b/src/Frontend-GNOME/Views/MessageTextView.cs
index 2305ea84c..96389a254 100644
--- a/src/Frontend-GNOME/Views/MessageTextView.cs
+++ b/src/Frontend-GNOME/Views/MessageTextView.cs
@@ -51,6 +51,7 @@ public class MessageTextView : Gtk.TextView
         private Gdk.Color    _MarkerlineColor = new Gdk.Color(255, 0, 0);
         private int          _MarkerlineBufferPosition;
         private int          _BufferLines = -1;
+        public EmoticonStore EmoticonStore{ get; set; }
 
         Gtk.TextTag BoldTag { get; set; }
         Gtk.TextTag ItalicTag { get; set; }
@@ -357,6 +358,14 @@ public void AddMessage(MessageModel msg, bool addLinebreak, bool showTimestamps)
                     tags.Add(LinkTag);
 
                     buffer.InsertWithTags(ref iter, linkText, tags.ToArray());
+                } else if (msgPart is ImageMessagePartModel) {
+                    var imgMsgPart = (ImageMessagePartModel) msgPart;
+                    if (EmoticonStore.TryGetImage(imgMsgPart.ImageFileName)) {
+                        var imgPixbuf = EmoticonStore.GetEmoticonImage(EmoticonStore [imgMsgPart.ImageFileName]);
+                        buffer.InsertPixbuf(ref iter, imgPixbuf);
+                    } else {
+                        buffer.Insert(ref iter, imgMsgPart.ImageFileName);
+                    }
                 } else if (msgPart is TextMessagePartModel) {
                     var tags = new List<Gtk.TextTag>();
                     TextMessagePartModel fmsgti = (TextMessagePartModel) msgPart;