diff --git a/core/pom.xml b/core/pom.xml
index 9e868b8df..12b6c5f42 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -69,6 +69,34 @@
         </plugins>
     </build>
     <dependencies>
+        <dependency>
+            <groupId>org.igniterealtime.spark</groupId>
+            <artifactId>emoticons</artifactId>
+            <version>${project.version}</version>
+            <classifier>Default.adiumemoticonset</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.igniterealtime.spark</groupId>
+            <artifactId>emoticons</artifactId>
+            <version>${project.version}</version>
+            <classifier>GTalk.AdiumEmoticonset</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.igniterealtime.spark</groupId>
+            <artifactId>emoticons</artifactId>
+            <version>${project.version}</version>
+            <classifier>POPO.adiumemoticonset</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.igniterealtime.spark</groupId>
+            <artifactId>emoticons</artifactId>
+            <version>${project.version}</version>
+            <classifier>sparkEmoticonSet</classifier>
+            <type>zip</type>
+        </dependency>
         <dependency>
             <groupId>org.igniterealtime.smack</groupId>
             <artifactId>smack-core</artifactId>
diff --git a/core/src/assembly/installation-directory.xml b/core/src/assembly/installation-directory.xml
index dca7d8a58..7fddb7009 100644
--- a/core/src/assembly/installation-directory.xml
+++ b/core/src/assembly/installation-directory.xml
@@ -10,6 +10,17 @@
         <dependencySet>
             <outputDirectory>lib</outputDirectory>
             <scope>runtime</scope>
+            <excludes>
+                <exclude>org.igniterealtime.spark:emoticons</exclude>
+            </excludes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>xtra/emoticons</outputDirectory>
+            <scope>runtime</scope>
+            <includes>
+                <include>org.igniterealtime.spark:emoticons</include>
+            </includes>
+            <outputFileNameMapping>${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
         </dependencySet>
     </dependencySets>
 
@@ -19,11 +30,6 @@
             <outputDirectory>lib</outputDirectory>
         </fileSet>
 
-        <fileSet>
-            <directory>${project.basedir}/src/main/xtra/</directory>
-            <outputDirectory>xtra</outputDirectory>
-        </fileSet>
-
         <fileSet>
             <!-- create an empty directory that's named 'plugins' -->
             <directory>src/main/resources/</directory>
@@ -49,4 +55,4 @@
             <fileMode>0755</fileMode>
         </file>
     </files>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/core/src/main/java/org/jivesoftware/spark/ui/MessageEntry.java b/core/src/main/java/org/jivesoftware/spark/ui/MessageEntry.java
index db29ba4c1..760be5aef 100644
--- a/core/src/main/java/org/jivesoftware/spark/ui/MessageEntry.java
+++ b/core/src/main/java/org/jivesoftware/spark/ui/MessageEntry.java
@@ -207,7 +207,7 @@ public class MessageEntry extends TimeStampedEntry
             return false;
         }
 
-        final Icon emotion = EmoticonManager.getInstance().getEmoticonImage( imageKey.toLowerCase() );
+        final Icon emotion = EmoticonManager.getInstance().getEmoticonImage( imageKey );
         if ( emotion == null )
         {
             return false;
diff --git a/core/src/main/xtra/emoticons/Default.adiumemoticonset.zip b/core/src/main/xtra/emoticons/Default.adiumemoticonset.zip
deleted file mode 100644
index 0ac42bdc8..000000000
Binary files a/core/src/main/xtra/emoticons/Default.adiumemoticonset.zip and /dev/null differ
diff --git a/core/src/main/xtra/emoticons/GTalk.AdiumEmoticonset.zip b/core/src/main/xtra/emoticons/GTalk.AdiumEmoticonset.zip
deleted file mode 100644
index 0491c46f9..000000000
Binary files a/core/src/main/xtra/emoticons/GTalk.AdiumEmoticonset.zip and /dev/null differ
diff --git a/core/src/main/xtra/emoticons/POPO.adiumemoticonset.zip b/core/src/main/xtra/emoticons/POPO.adiumemoticonset.zip
deleted file mode 100644
index 9d78e35ed..000000000
Binary files a/core/src/main/xtra/emoticons/POPO.adiumemoticonset.zip and /dev/null differ
diff --git a/core/src/main/xtra/emoticons/sparkEmoticonSet.zip b/core/src/main/xtra/emoticons/sparkEmoticonSet.zip
deleted file mode 100644
index 701aebeda..000000000
Binary files a/core/src/main/xtra/emoticons/sparkEmoticonSet.zip and /dev/null differ
diff --git a/emoticons/pom.xml b/emoticons/pom.xml
new file mode 100644
index 000000000..c62812572
--- /dev/null
+++ b/emoticons/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2017 Ignite Realtime Foundation. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.igniterealtime.spark</groupId>
+        <artifactId>parent</artifactId>
+        <version>2.9.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>emoticons</artifactId>
+    <name>Spark Emoticons</name>
+    <description>Sets of emoticons used by Spark.</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.0.0</version>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/assembly/Default.adiumemoticonset.xml</descriptor>
+                        <descriptor>src/assembly/GTalk.AdiumEmoticonset.xml</descriptor>
+                        <descriptor>src/assembly/POPO.adiumemoticonset.xml</descriptor>
+                        <descriptor>src/assembly/sparkEmoticonSet.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/emoticons/src/assembly/Default.adiumemoticonset.xml b/emoticons/src/assembly/Default.adiumemoticonset.xml
new file mode 100644
index 000000000..1d79ec1ad
--- /dev/null
+++ b/emoticons/src/assembly/Default.adiumemoticonset.xml
@@ -0,0 +1,32 @@
+<!--
+  ~ Copyright (c) 2017 Ignite Realtime Foundation. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+    <id>Default.adiumemoticonset</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}/src/main/Default.adiumemoticonset</directory>
+            <outputDirectory>Default.adiumemoticonset</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/emoticons/src/assembly/GTalk.AdiumEmoticonset.xml b/emoticons/src/assembly/GTalk.AdiumEmoticonset.xml
new file mode 100644
index 000000000..c27b1c546
--- /dev/null
+++ b/emoticons/src/assembly/GTalk.AdiumEmoticonset.xml
@@ -0,0 +1,32 @@
+<!--
+  ~ Copyright (c) 2017 Ignite Realtime Foundation. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+    <id>GTalk.AdiumEmoticonset</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}/src/main/GTalk.AdiumEmoticonset</directory>
+            <outputDirectory>GTalk.AdiumEmoticonset</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/emoticons/src/assembly/POPO.adiumemoticonset.xml b/emoticons/src/assembly/POPO.adiumemoticonset.xml
new file mode 100644
index 000000000..b091caa17
--- /dev/null
+++ b/emoticons/src/assembly/POPO.adiumemoticonset.xml
@@ -0,0 +1,32 @@
+<!--
+  ~ Copyright (c) 2017 Ignite Realtime Foundation. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+    <id>POPO.adiumemoticonset</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}/src/main/POPO.adiumemoticonset</directory>
+            <outputDirectory>POPO.adiumemoticonset</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/emoticons/src/assembly/sparkEmoticonSet.xml b/emoticons/src/assembly/sparkEmoticonSet.xml
new file mode 100644
index 000000000..eec499dce
--- /dev/null
+++ b/emoticons/src/assembly/sparkEmoticonSet.xml
@@ -0,0 +1,32 @@
+<!--
+  ~ Copyright (c) 2017 Ignite Realtime Foundation. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+    <id>sparkEmoticonSet</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}/src/main/sparkEmoticonSet</directory>
+            <outputDirectory>sparkEmoticonSet</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/emoticons/src/main/Default.adiumemoticonset/Emoticons.plist b/emoticons/src/main/Default.adiumemoticonset/Emoticons.plist
new file mode 100644
index 000000000..8ee6a18f9
--- /dev/null
+++ b/emoticons/src/main/Default.adiumemoticonset/Emoticons.plist
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+<key>SparkSetVersion</key>
+<integer>1</integer>
+<key>Emoticons</key>
+<dict>
+<key>angry.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>&gt;:o</string>
+        <string>&gt;:-o</string>
+        <string>&gt;:O</string>
+        <string>&gt;:-O</string>
+        <string></string>
+    </array>
+    <key>Name</key>
+    <string>Angry</string>
+</dict>
+<key>blush.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:-[</string>
+    </array>
+    <key>Name</key>
+    <string>Blush</string>
+</dict>
+<key>confused.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>?:|</string>
+    </array>
+    <key>Name</key>
+    <string>Confused</string>
+</dict>
+<key>cool.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>B-)</string>
+	<string>&#x1f60e;</string>
+    </array>
+    <key>Name</key>
+    <string>Cool</string>
+</dict>
+<key>cry.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:'(</string>
+        <string></string>
+    </array>
+    <key>Name</key>
+    <string>Cry</string>
+</dict>
+<key>devil.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>]:)</string>
+    </array>
+    <key>Name</key>
+    <string>Devil</string>
+</dict>
+<key>grin.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:-D</string>
+        <string>:D</string>
+	<string>&#x1f604;</string>
+	<string>&#x1f603;</string>
+	<string>&#x1f602;</string>
+	<string>&#x1f601;</string>
+	<string>&#x1f600;</string>
+        <string></string>
+    </array>
+    <key>Name</key>
+    <string>Grin</string>
+</dict>
+<key>happy.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:-)</string>
+    </array>
+    <key>Name</key>
+    <string>Happy</string>
+</dict>
+<key>laugh.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:^0</string>
+	<string>&#x1f605;</string>
+	<string>&#x1f606;</string>
+    </array>
+    <key>Name</key>
+    <string>Laugh</string>
+</dict>
+<key>love.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:x</string>
+	<string>&#x1f60d;</string>
+	<string>&#x1f618;</string>
+    </array>
+    <key>Name</key>
+    <string>Love</string>
+</dict>
+<key>mischief.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>;\</string>
+    </array>
+    <key>Name</key>
+    <string>Mischief</string>
+</dict>
+<key>sad.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:-(</string>
+        <string>:(</string>
+	<string>&#x2639;</string>
+        <string></string>
+    </array>
+    <key>Name</key>
+    <string>Sad</string>
+</dict>
+<key>happy.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:-)</string>
+        <string>:)</string>
+	<string>&#x1f60a;</string>
+	<string>&#x1f642;</string>
+        <string>&#x263a;</string>
+        <string></string>
+    </array>
+    <key>Name</key>
+    <string>Smile</string>
+</dict>
+<key>plain.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:|</string>
+        <string></string>
+    </array>
+    <key>Name</key>
+    <string>Plain</string>
+</dict>
+<key>shocked.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:0</string>
+        <string></string>
+    </array>
+    <key>Name</key>
+    <string>Shocked</string>
+</dict>
+<key>silly.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:-p</string>
+        <string>:-P</string>
+        <string>:P</string>
+        <string>:p</string>
+	<string>&#x1f60b;</string>
+	<string>&#x1f61c;</string>
+	<string>&#x1f61d;</string>
+        <string></string>
+    </array>
+    <key>Name</key>
+    <string>Tongue</string>
+</dict>
+<key>wink.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>;-)</string>
+        <string>;)</string>
+	<string>&#x1f609;</string>
+        <string></string>
+    </array>
+    <key>Name</key>
+    <string>Wink</string>
+</dict>
+<key>alert.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>(!)</string>
+    </array>
+    <key>Name</key>
+    <string>Alert</string>
+</dict>
+
+
+<key>info.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>(i)</string>
+    </array>
+    <key>Name</key>
+    <string>Info</string>
+</dict>
+
+<key>minus.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>(-)</string>
+    </array>
+    <key>Name</key>
+    <string>Minus</string>
+</dict>
+
+<key>plus.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>(+)</string>
+    </array>
+    <key>Name</key>
+    <string>Plus</string>
+</dict>
+
+<key>heart.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>(heart)</string>
+    </array>
+    <key>Name</key>
+    <string>Heart</string>
+</dict>
+</dict>
+</dict>
+</plist>
diff --git a/emoticons/src/main/Default.adiumemoticonset/alert.png b/emoticons/src/main/Default.adiumemoticonset/alert.png
new file mode 100644
index 000000000..c37bd062e
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/alert.png differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/angry.png b/emoticons/src/main/Default.adiumemoticonset/angry.png
new file mode 100644
index 000000000..02a3f0161
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/angry.png differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/blush.png b/emoticons/src/main/Default.adiumemoticonset/blush.png
new file mode 100644
index 000000000..82e7456d8
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/blush.png differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/confused.png b/emoticons/src/main/Default.adiumemoticonset/confused.png
new file mode 100644
index 000000000..d5e4be299
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/confused.png differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/cool.png b/emoticons/src/main/Default.adiumemoticonset/cool.png
new file mode 100644
index 000000000..090464c8a
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/cool.png differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/cry.png b/emoticons/src/main/Default.adiumemoticonset/cry.png
new file mode 100644
index 000000000..f34b7fddd
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/cry.png differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/devil.png b/emoticons/src/main/Default.adiumemoticonset/devil.png
new file mode 100644
index 000000000..57e60eedc
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/devil.png differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/eyeRoll.gif b/emoticons/src/main/Default.adiumemoticonset/eyeRoll.gif
new file mode 100644
index 000000000..0e8270737
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/eyeRoll.gif differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/grin.png b/emoticons/src/main/Default.adiumemoticonset/grin.png
new file mode 100644
index 000000000..3932d475f
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/grin.png differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/happy.png b/emoticons/src/main/Default.adiumemoticonset/happy.png
new file mode 100644
index 000000000..ae922204a
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/happy.png differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/heart.png b/emoticons/src/main/Default.adiumemoticonset/heart.png
new file mode 100644
index 000000000..d9ee53e59
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/heart.png differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/info.png b/emoticons/src/main/Default.adiumemoticonset/info.png
new file mode 100644
index 000000000..12cd1aef9
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/info.png differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/laugh.png b/emoticons/src/main/Default.adiumemoticonset/laugh.png
new file mode 100644
index 000000000..1574cc384
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/laugh.png differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/love.png b/emoticons/src/main/Default.adiumemoticonset/love.png
new file mode 100644
index 000000000..d5580218e
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/love.png differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/minus.png b/emoticons/src/main/Default.adiumemoticonset/minus.png
new file mode 100644
index 000000000..08f249365
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/minus.png differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/mischief.png b/emoticons/src/main/Default.adiumemoticonset/mischief.png
new file mode 100644
index 000000000..5da82ffcf
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/mischief.png differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/party.gif b/emoticons/src/main/Default.adiumemoticonset/party.gif
new file mode 100644
index 000000000..e43f28089
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/party.gif differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/plain.png b/emoticons/src/main/Default.adiumemoticonset/plain.png
new file mode 100644
index 000000000..2a0459185
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/plain.png differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/plus.png b/emoticons/src/main/Default.adiumemoticonset/plus.png
new file mode 100644
index 000000000..6332fefea
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/plus.png differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/sad.png b/emoticons/src/main/Default.adiumemoticonset/sad.png
new file mode 100644
index 000000000..d336ce2bc
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/sad.png differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/shocked.png b/emoticons/src/main/Default.adiumemoticonset/shocked.png
new file mode 100644
index 000000000..b02c7bcc3
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/shocked.png differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/silly.png b/emoticons/src/main/Default.adiumemoticonset/silly.png
new file mode 100644
index 000000000..7688458af
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/silly.png differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/sleepy.gif b/emoticons/src/main/Default.adiumemoticonset/sleepy.gif
new file mode 100644
index 000000000..d40769fb6
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/sleepy.gif differ
diff --git a/emoticons/src/main/Default.adiumemoticonset/wink.png b/emoticons/src/main/Default.adiumemoticonset/wink.png
new file mode 100644
index 000000000..aa25da943
Binary files /dev/null and b/emoticons/src/main/Default.adiumemoticonset/wink.png differ
diff --git a/emoticons/src/main/GTalk.AdiumEmoticonset/Emoticons.plist b/emoticons/src/main/GTalk.AdiumEmoticonset/Emoticons.plist
new file mode 100644
index 000000000..8c6f32926
--- /dev/null
+++ b/emoticons/src/main/GTalk.AdiumEmoticonset/Emoticons.plist
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>AdiumSetVersion</key>
+		<integer>1</integer>
+		<key>Emoticons</key>
+		<dict>
+			<key>angry.gif</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>X-(</string>
+					<string>X(</string>
+
+
+				</array>
+				<key>Name</key>
+				<string>Angry Face</string>
+			</dict>
+			<key>shocked.gif</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:-O</string>
+					<string>:-o</string>
+					<string>:O</string>
+					<string>:o</string>
+					<string></string>
+				</array>
+				<key>Name</key>
+				<string>Shock</string>
+			</dict>
+			<key>cool.gif</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>B-)</string>
+					<string>B)</string>
+					<string>&#x1f60e;</string>
+				</array>
+				<key>Name</key>
+				<string>Cool</string>
+			</dict>
+			<key>Cry.gif</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:'(</string>
+				</array>
+				<key>Name</key>
+				<string>Cry</string>
+			</dict>
+			<key>smile.gif</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>=)</string>
+					<string>:)</string>
+					<string>&#x263a;</string>
+					<string>&#x1f60a;</string>
+					<string>&#x1f642;</string>
+				</array>
+				<key>Name</key>
+				<string>Smile</string>
+
+
+			</dict>
+			<key>rockout.gif</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>\m/</string>
+				</array>
+				<key>Name</key>
+				<string>Rockout</string>
+			</dict>
+			<key>Grin.gif</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:D</string>
+					<string>=D</string>
+					<string>:'D</string>
+					<string>='D</string>
+					<string>&#x1f604;</string>
+					<string>&#x1f603;</string> 			
+					<string>&#x1f602;</string> 			
+					<string>&#x1f601;</string> 			
+					<string>&#x1f600;</string> 
+					<string>&#x1f605;</string>
+					<string>&#x1f606;</string>
+				</array>
+				<key>Name</key>
+				<string>Grin</string>
+			</dict>
+			<key>frown.gif</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:(</string>
+					<string>=(</string>
+					<string>&#x2639;</string>
+				</array>
+				<key>Name</key>
+				<string>Frown</string>
+			</dict>
+			<key>wink.gif</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>;)</string>
+					<string>;-)</string>
+					<string>&#x1f609;</string>
+				</array>
+				<key>Name</key>
+				<string>Wink</string>
+			</dict>
+			<key>tongue.gif</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:P</string>
+					<string>:p</string>
+					<string>:-P</string>
+					<string>:-p</string>
+					<string>=P</string>
+					<string>=p</string>
+					<string>&#x1f60b;</string>
+					<string>&#x1f61c;</string>
+					<string>&#x1f61d;</string>
+				</array>
+				<key>Name</key>
+				<string>Tongue</string>
+			</dict>
+			<key>straightface.gif</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:-|</string>
+					<string>:|</string>
+				</array>
+				<key>Name</key>
+				<string>Straight</string>
+			</dict>
+			<key>slant.gif</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:-/</string>
+					<string>:/</string>
+
+				</array>
+				<key>Name</key>
+				<string>Slant</string>
+			</dict>
+			<key>Monkey.gif</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:(|)</string>
+					<string>(monkey)</string>
+				</array>
+				<key>Name</key>
+				<string>Monkey</string>
+
+
+			</dict>
+			<key>Heart.gif</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>&lt;3</string>
+				</array>
+				<key>Name</key>
+				<string>Heart</string>
+
+
+			</dict>
+		</dict>
+	</dict>
+</plist>
diff --git a/emoticons/src/main/GTalk.AdiumEmoticonset/angry.gif b/emoticons/src/main/GTalk.AdiumEmoticonset/angry.gif
new file mode 100644
index 000000000..8f5f8b379
Binary files /dev/null and b/emoticons/src/main/GTalk.AdiumEmoticonset/angry.gif differ
diff --git a/emoticons/src/main/GTalk.AdiumEmoticonset/cool.gif b/emoticons/src/main/GTalk.AdiumEmoticonset/cool.gif
new file mode 100644
index 000000000..4cc5c90a5
Binary files /dev/null and b/emoticons/src/main/GTalk.AdiumEmoticonset/cool.gif differ
diff --git a/emoticons/src/main/GTalk.AdiumEmoticonset/cry.gif b/emoticons/src/main/GTalk.AdiumEmoticonset/cry.gif
new file mode 100644
index 000000000..3da2d7b3b
Binary files /dev/null and b/emoticons/src/main/GTalk.AdiumEmoticonset/cry.gif differ
diff --git a/emoticons/src/main/GTalk.AdiumEmoticonset/frown.gif b/emoticons/src/main/GTalk.AdiumEmoticonset/frown.gif
new file mode 100644
index 000000000..be497edd7
Binary files /dev/null and b/emoticons/src/main/GTalk.AdiumEmoticonset/frown.gif differ
diff --git a/emoticons/src/main/GTalk.AdiumEmoticonset/grin.gif b/emoticons/src/main/GTalk.AdiumEmoticonset/grin.gif
new file mode 100644
index 000000000..7d3d0b941
Binary files /dev/null and b/emoticons/src/main/GTalk.AdiumEmoticonset/grin.gif differ
diff --git a/emoticons/src/main/GTalk.AdiumEmoticonset/heart.gif b/emoticons/src/main/GTalk.AdiumEmoticonset/heart.gif
new file mode 100644
index 000000000..7b6ad4843
Binary files /dev/null and b/emoticons/src/main/GTalk.AdiumEmoticonset/heart.gif differ
diff --git a/emoticons/src/main/GTalk.AdiumEmoticonset/monkey.gif b/emoticons/src/main/GTalk.AdiumEmoticonset/monkey.gif
new file mode 100644
index 000000000..05228ce17
Binary files /dev/null and b/emoticons/src/main/GTalk.AdiumEmoticonset/monkey.gif differ
diff --git a/emoticons/src/main/GTalk.AdiumEmoticonset/rockout.gif b/emoticons/src/main/GTalk.AdiumEmoticonset/rockout.gif
new file mode 100644
index 000000000..d534028ea
Binary files /dev/null and b/emoticons/src/main/GTalk.AdiumEmoticonset/rockout.gif differ
diff --git a/emoticons/src/main/GTalk.AdiumEmoticonset/shocked.gif b/emoticons/src/main/GTalk.AdiumEmoticonset/shocked.gif
new file mode 100644
index 000000000..7296d6c9a
Binary files /dev/null and b/emoticons/src/main/GTalk.AdiumEmoticonset/shocked.gif differ
diff --git a/emoticons/src/main/GTalk.AdiumEmoticonset/slant.gif b/emoticons/src/main/GTalk.AdiumEmoticonset/slant.gif
new file mode 100644
index 000000000..cd7c5e2a6
Binary files /dev/null and b/emoticons/src/main/GTalk.AdiumEmoticonset/slant.gif differ
diff --git a/emoticons/src/main/GTalk.AdiumEmoticonset/smile.gif b/emoticons/src/main/GTalk.AdiumEmoticonset/smile.gif
new file mode 100644
index 000000000..b7f4ac646
Binary files /dev/null and b/emoticons/src/main/GTalk.AdiumEmoticonset/smile.gif differ
diff --git a/emoticons/src/main/GTalk.AdiumEmoticonset/straightface.gif b/emoticons/src/main/GTalk.AdiumEmoticonset/straightface.gif
new file mode 100644
index 000000000..07e25ac8b
Binary files /dev/null and b/emoticons/src/main/GTalk.AdiumEmoticonset/straightface.gif differ
diff --git a/emoticons/src/main/GTalk.AdiumEmoticonset/tongue.gif b/emoticons/src/main/GTalk.AdiumEmoticonset/tongue.gif
new file mode 100644
index 000000000..810a58433
Binary files /dev/null and b/emoticons/src/main/GTalk.AdiumEmoticonset/tongue.gif differ
diff --git a/emoticons/src/main/GTalk.AdiumEmoticonset/wink.gif b/emoticons/src/main/GTalk.AdiumEmoticonset/wink.gif
new file mode 100644
index 000000000..8a5f56fe9
Binary files /dev/null and b/emoticons/src/main/GTalk.AdiumEmoticonset/wink.gif differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/.DS_Store b/emoticons/src/main/POPO.adiumemoticonset/.DS_Store
new file mode 100644
index 000000000..5008ddfcf
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/.DS_Store differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/Emoticons.plist b/emoticons/src/main/POPO.adiumemoticonset/Emoticons.plist
new file mode 100644
index 000000000..7e2955a37
--- /dev/null
+++ b/emoticons/src/main/POPO.adiumemoticonset/Emoticons.plist
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>AdiumSetVersion</key>
+		<integer>1</integer>
+		<key>Emoticons</key>
+		<dict>
+			<key>choler.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>&gt;:o</string>
+					<string>:-@</string>
+					<string>X(</string>
+				</array>
+				<key>Name</key>
+				<string>Angry</string>
+			</dict>
+			<key>boss.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>8-)</string>
+					<string>(H)</string>
+					<string>&#x1f60e;</string>
+					<string>B-)</string>
+				</array>
+				<key>Name</key>
+				<string>Cool</string>
+			</dict>
+			<key>too_sad.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:'(</string>
+					<string>:'-(</string>
+					<string>:((</string>
+					<string>:-((</string>
+				</array>
+				<key>Name</key>
+				<string>Crying</string>
+			</dict>
+			<key>confuse.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:-\</string>
+					<string>:-S</string>
+				</array>
+				<key>Name</key>
+				<string>Confused</string>
+			</dict>
+			<key>embarrassed.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:-[</string>
+					<string>:[</string>
+					<string>:-$</string>
+					<string>:&quot;&gt;</string>
+				</array>
+				<key>Name</key>
+				<string>Embarassed</string>
+			</dict>
+			<key>beat_brick.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:-!</string>
+				</array>
+				<key>Name</key>
+				<string>Faux Pas</string>
+			</dict>
+			<key>sad.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:-(</string>
+					<string>:(</string>
+					<string>&#x2639;</string>
+				</array>
+				<key>Name</key>
+				<string>Frown</string>
+			</dict>
+			<key>big_smile.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:-D</string>
+					<string>:D</string>
+					<string>&#x1f604;</string>
+					<string>&#x1f603;</string>
+					<string>&#x1f602;</string>
+					<string>&#x1f601;</string>
+					<string>&#x1f600;</string>
+					<string>&#x1f605;</string>
+					<string>&#x1f606;</string>
+				</array>
+				<key>Name</key>
+				<string>Grin</string>
+			</dict>
+			<key>adore.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>O:-)</string>
+					<string>O:)</string>
+					<string>o:-)</string>
+					<string>o:)</string>
+					<string>(A)</string>
+				</array>
+				<key>Name</key>
+				<string>Innocent</string>
+			</dict>
+			<key>sweet_kiss.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:-*</string>
+					<string>(K)</string>
+					<string>&#x1f619;</string>
+					<string>&#x1f618;</string>
+					<string>&#x1f617;</string>
+					<string>&#x1f61a;</string>
+				</array>
+				<key>Name</key>
+				<string>Kiss</string>
+			</dict>
+			<key>canny.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:-x</string>
+					<string>:-X</string>
+					<string>:-#</string>
+				</array>
+				<key>Name</key>
+				<string>Lips are Sealed</string>
+			</dict>
+			<key>smile.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:-)</string>
+					<string>:)</string>
+					<string>&#x1f60a;</string>
+					<string>&#x1f642;</string>
+					<string>&#x263a;</string>
+				</array>
+				<key>Name</key>
+				<string>Smile</string>
+			</dict>
+			<key>waaaht.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>=-o</string>
+					<string>=-O</string>
+				</array>
+				<key>Name</key>
+				<string>Surprised</string>
+			</dict>
+			<key>amazed.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:-|</string>
+				</array>
+				<key>Name</key>
+				<string>Straight Face</string>
+			</dict>
+			<key>thbbbpt.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:-P</string>
+					<string>:-p</string>
+					<string>:p</string>
+					<string>:P</string>
+					<string>&#x1f60b;</string>
+					<string>&#x1f61c;</string>
+					<string>&#x1f61d;</string>
+				</array>
+				<key>Name</key>
+				<string>Sticking Out Tongue</string>
+			</dict>
+			<key>look_down.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>;-)</string>
+					<string>;)</string>
+					<string>&#x1f609;</string>
+				</array>
+				<key>Name</key>
+				<string>Wink</string>
+			</dict>
+			<key>tire.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>(:|</string>
+				</array>
+				<key>Name</key>
+				<string>Yawn</string>
+			</dict>
+			<key>matrix.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:neo:</string>
+					<string>:matrix:</string>
+				</array>
+				<key>Name</key>
+				<string>Neo</string>
+			</dict>
+			<key>spidy.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:spider-man:</string>
+					<string>:spidy:</string>
+				</array>
+				<key>Name</key>
+				<string>Spider-Man</string>
+			</dict>
+			<key>hell_boy.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:hellboy:</string>
+					<string>:evil:</string>
+					<string>:devil:</string>
+				</array>
+				<key>Name</key>
+				<string>Hellboy</string>
+			</dict>
+			<key>doubt.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:doubt:</string>
+				</array>
+				<key>Name</key>
+				<string>Doubt</string>
+			</dict>
+			<key>sure.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:sure:</string>
+				</array>
+				<key>Name</key>
+				<string>Sure</string>
+			</dict>
+			<key>stilldreaming.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:dreaming:</string>
+				</array>
+				<key>Name</key>
+				<string>Dreaming</string>
+			</dict>
+			<key>hungry.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:hungry:</string>
+				</array>
+				<key>Name</key>
+				<string>Hungry</string>
+			</dict>
+			<key>oops.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:oops:</string>
+					<string>:ops:</string>
+				</array>
+				<key>Name</key>
+				<string>Oops</string>
+			</dict>
+			<key>ah.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:ah:</string>
+					<string>:argh:</string>
+					<string>:scream:</string>
+				</array>
+				<key>Name</key>
+				<string>Ah</string>
+			</dict>
+			<key>surrender.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:surrender:</string>
+					<string>:giveup:</string>
+				</array>
+				<key>Name</key>
+				<string>Surrender</string>
+			</dict>
+			<key>byebye.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:bye:</string>
+					<string>:byebye:</string>
+				</array>
+				<key>Name</key>
+				<string>Bye</string>
+			</dict>
+			<key>misdoubt.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:misdoubt:</string>
+					<string>:suspect:</string>
+				</array>
+				<key>Name</key>
+				<string>Misdoubt</string>
+			</dict>
+			<key>afterboom.png</key>
+			<dict>
+				<key>Equivalents</key>
+				<array>
+					<string>:afterboom:</string>
+					<string>:boom:</string>
+				</array>
+				<key>Name</key>
+				<string>Boom</string>
+			</dict>
+		</dict>
+	</dict>
+</plist>
diff --git a/emoticons/src/main/POPO.adiumemoticonset/adore.png b/emoticons/src/main/POPO.adiumemoticonset/adore.png
new file mode 100644
index 000000000..31756b1d8
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/adore.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/afterboom.png b/emoticons/src/main/POPO.adiumemoticonset/afterboom.png
new file mode 100644
index 000000000..9f6f12bb2
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/afterboom.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/ah.png b/emoticons/src/main/POPO.adiumemoticonset/ah.png
new file mode 100644
index 000000000..b3fcd497a
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/ah.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/amazed.png b/emoticons/src/main/POPO.adiumemoticonset/amazed.png
new file mode 100644
index 000000000..a99d3e894
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/amazed.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/beat_brick.png b/emoticons/src/main/POPO.adiumemoticonset/beat_brick.png
new file mode 100644
index 000000000..1c9169eee
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/beat_brick.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/big_smile.png b/emoticons/src/main/POPO.adiumemoticonset/big_smile.png
new file mode 100644
index 000000000..8e4774d2d
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/big_smile.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/boss.png b/emoticons/src/main/POPO.adiumemoticonset/boss.png
new file mode 100644
index 000000000..1ad0c9c4f
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/boss.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/byebye.png b/emoticons/src/main/POPO.adiumemoticonset/byebye.png
new file mode 100644
index 000000000..68d0d4279
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/byebye.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/canny.png b/emoticons/src/main/POPO.adiumemoticonset/canny.png
new file mode 100644
index 000000000..d7ac401dc
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/canny.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/choler.png b/emoticons/src/main/POPO.adiumemoticonset/choler.png
new file mode 100644
index 000000000..e8a100017
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/choler.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/confuse.png b/emoticons/src/main/POPO.adiumemoticonset/confuse.png
new file mode 100644
index 000000000..aad969eef
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/confuse.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/doubt.png b/emoticons/src/main/POPO.adiumemoticonset/doubt.png
new file mode 100644
index 000000000..4707ae041
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/doubt.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/embarrassed.png b/emoticons/src/main/POPO.adiumemoticonset/embarrassed.png
new file mode 100644
index 000000000..43878be62
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/embarrassed.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/hell_boy.png b/emoticons/src/main/POPO.adiumemoticonset/hell_boy.png
new file mode 100644
index 000000000..fc5020794
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/hell_boy.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/hungry.png b/emoticons/src/main/POPO.adiumemoticonset/hungry.png
new file mode 100644
index 000000000..41787f1f9
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/hungry.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/look_down.png b/emoticons/src/main/POPO.adiumemoticonset/look_down.png
new file mode 100644
index 000000000..18b0f3eb1
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/look_down.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/matrix.png b/emoticons/src/main/POPO.adiumemoticonset/matrix.png
new file mode 100644
index 000000000..39bb5fd1c
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/matrix.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/misdoubt.png b/emoticons/src/main/POPO.adiumemoticonset/misdoubt.png
new file mode 100644
index 000000000..001a1ddfa
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/misdoubt.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/oops.png b/emoticons/src/main/POPO.adiumemoticonset/oops.png
new file mode 100644
index 000000000..655edfb60
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/oops.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/sad.png b/emoticons/src/main/POPO.adiumemoticonset/sad.png
new file mode 100644
index 000000000..eddfa8f03
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/sad.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/smile.png b/emoticons/src/main/POPO.adiumemoticonset/smile.png
new file mode 100644
index 000000000..e0ba8c43a
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/smile.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/spidy.png b/emoticons/src/main/POPO.adiumemoticonset/spidy.png
new file mode 100644
index 000000000..bea3063cb
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/spidy.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/stilldreaming.png b/emoticons/src/main/POPO.adiumemoticonset/stilldreaming.png
new file mode 100644
index 000000000..7afe30cfc
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/stilldreaming.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/sure.png b/emoticons/src/main/POPO.adiumemoticonset/sure.png
new file mode 100644
index 000000000..aa27614a4
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/sure.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/surrender.png b/emoticons/src/main/POPO.adiumemoticonset/surrender.png
new file mode 100644
index 000000000..b70105e74
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/surrender.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/sweet_kiss.png b/emoticons/src/main/POPO.adiumemoticonset/sweet_kiss.png
new file mode 100644
index 000000000..ae81cef46
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/sweet_kiss.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/thbbbpt.png b/emoticons/src/main/POPO.adiumemoticonset/thbbbpt.png
new file mode 100644
index 000000000..afaf9558a
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/thbbbpt.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/tire.png b/emoticons/src/main/POPO.adiumemoticonset/tire.png
new file mode 100644
index 000000000..9930253fd
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/tire.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/too_sad.png b/emoticons/src/main/POPO.adiumemoticonset/too_sad.png
new file mode 100644
index 000000000..0feb0cec5
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/too_sad.png differ
diff --git a/emoticons/src/main/POPO.adiumemoticonset/waaaht.png b/emoticons/src/main/POPO.adiumemoticonset/waaaht.png
new file mode 100644
index 000000000..d611bc066
Binary files /dev/null and b/emoticons/src/main/POPO.adiumemoticonset/waaaht.png differ
diff --git a/emoticons/src/main/sparkEmoticonSet/Emoticons.plist b/emoticons/src/main/sparkEmoticonSet/Emoticons.plist
new file mode 100644
index 000000000..8ee6a18f9
--- /dev/null
+++ b/emoticons/src/main/sparkEmoticonSet/Emoticons.plist
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+<key>SparkSetVersion</key>
+<integer>1</integer>
+<key>Emoticons</key>
+<dict>
+<key>angry.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>&gt;:o</string>
+        <string>&gt;:-o</string>
+        <string>&gt;:O</string>
+        <string>&gt;:-O</string>
+        <string></string>
+    </array>
+    <key>Name</key>
+    <string>Angry</string>
+</dict>
+<key>blush.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:-[</string>
+    </array>
+    <key>Name</key>
+    <string>Blush</string>
+</dict>
+<key>confused.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>?:|</string>
+    </array>
+    <key>Name</key>
+    <string>Confused</string>
+</dict>
+<key>cool.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>B-)</string>
+	<string>&#x1f60e;</string>
+    </array>
+    <key>Name</key>
+    <string>Cool</string>
+</dict>
+<key>cry.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:'(</string>
+        <string></string>
+    </array>
+    <key>Name</key>
+    <string>Cry</string>
+</dict>
+<key>devil.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>]:)</string>
+    </array>
+    <key>Name</key>
+    <string>Devil</string>
+</dict>
+<key>grin.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:-D</string>
+        <string>:D</string>
+	<string>&#x1f604;</string>
+	<string>&#x1f603;</string>
+	<string>&#x1f602;</string>
+	<string>&#x1f601;</string>
+	<string>&#x1f600;</string>
+        <string></string>
+    </array>
+    <key>Name</key>
+    <string>Grin</string>
+</dict>
+<key>happy.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:-)</string>
+    </array>
+    <key>Name</key>
+    <string>Happy</string>
+</dict>
+<key>laugh.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:^0</string>
+	<string>&#x1f605;</string>
+	<string>&#x1f606;</string>
+    </array>
+    <key>Name</key>
+    <string>Laugh</string>
+</dict>
+<key>love.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:x</string>
+	<string>&#x1f60d;</string>
+	<string>&#x1f618;</string>
+    </array>
+    <key>Name</key>
+    <string>Love</string>
+</dict>
+<key>mischief.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>;\</string>
+    </array>
+    <key>Name</key>
+    <string>Mischief</string>
+</dict>
+<key>sad.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:-(</string>
+        <string>:(</string>
+	<string>&#x2639;</string>
+        <string></string>
+    </array>
+    <key>Name</key>
+    <string>Sad</string>
+</dict>
+<key>happy.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:-)</string>
+        <string>:)</string>
+	<string>&#x1f60a;</string>
+	<string>&#x1f642;</string>
+        <string>&#x263a;</string>
+        <string></string>
+    </array>
+    <key>Name</key>
+    <string>Smile</string>
+</dict>
+<key>plain.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:|</string>
+        <string></string>
+    </array>
+    <key>Name</key>
+    <string>Plain</string>
+</dict>
+<key>shocked.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:0</string>
+        <string></string>
+    </array>
+    <key>Name</key>
+    <string>Shocked</string>
+</dict>
+<key>silly.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>:-p</string>
+        <string>:-P</string>
+        <string>:P</string>
+        <string>:p</string>
+	<string>&#x1f60b;</string>
+	<string>&#x1f61c;</string>
+	<string>&#x1f61d;</string>
+        <string></string>
+    </array>
+    <key>Name</key>
+    <string>Tongue</string>
+</dict>
+<key>wink.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>;-)</string>
+        <string>;)</string>
+	<string>&#x1f609;</string>
+        <string></string>
+    </array>
+    <key>Name</key>
+    <string>Wink</string>
+</dict>
+<key>alert.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>(!)</string>
+    </array>
+    <key>Name</key>
+    <string>Alert</string>
+</dict>
+
+
+<key>info.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>(i)</string>
+    </array>
+    <key>Name</key>
+    <string>Info</string>
+</dict>
+
+<key>minus.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>(-)</string>
+    </array>
+    <key>Name</key>
+    <string>Minus</string>
+</dict>
+
+<key>plus.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>(+)</string>
+    </array>
+    <key>Name</key>
+    <string>Plus</string>
+</dict>
+
+<key>heart.png</key>
+<dict>
+    <key>Equivalents</key>
+    <array>
+        <string>(heart)</string>
+    </array>
+    <key>Name</key>
+    <string>Heart</string>
+</dict>
+</dict>
+</dict>
+</plist>
diff --git a/emoticons/src/main/sparkEmoticonSet/angry.png b/emoticons/src/main/sparkEmoticonSet/angry.png
new file mode 100644
index 000000000..02a3f0161
Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/angry.png differ
diff --git a/emoticons/src/main/sparkEmoticonSet/blush.png b/emoticons/src/main/sparkEmoticonSet/blush.png
new file mode 100644
index 000000000..82e7456d8
Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/blush.png differ
diff --git a/emoticons/src/main/sparkEmoticonSet/confused.png b/emoticons/src/main/sparkEmoticonSet/confused.png
new file mode 100644
index 000000000..d5e4be299
Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/confused.png differ
diff --git a/emoticons/src/main/sparkEmoticonSet/cool.png b/emoticons/src/main/sparkEmoticonSet/cool.png
new file mode 100644
index 000000000..090464c8a
Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/cool.png differ
diff --git a/emoticons/src/main/sparkEmoticonSet/cry.png b/emoticons/src/main/sparkEmoticonSet/cry.png
new file mode 100644
index 000000000..f34b7fddd
Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/cry.png differ
diff --git a/emoticons/src/main/sparkEmoticonSet/devil.png b/emoticons/src/main/sparkEmoticonSet/devil.png
new file mode 100644
index 000000000..57e60eedc
Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/devil.png differ
diff --git a/emoticons/src/main/sparkEmoticonSet/eyeRoll.gif b/emoticons/src/main/sparkEmoticonSet/eyeRoll.gif
new file mode 100644
index 000000000..0e8270737
Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/eyeRoll.gif differ
diff --git a/emoticons/src/main/sparkEmoticonSet/grin.png b/emoticons/src/main/sparkEmoticonSet/grin.png
new file mode 100644
index 000000000..3932d475f
Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/grin.png differ
diff --git a/emoticons/src/main/sparkEmoticonSet/happy.png b/emoticons/src/main/sparkEmoticonSet/happy.png
new file mode 100644
index 000000000..ae922204a
Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/happy.png differ
diff --git a/emoticons/src/main/sparkEmoticonSet/laugh.png b/emoticons/src/main/sparkEmoticonSet/laugh.png
new file mode 100644
index 000000000..1574cc384
Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/laugh.png differ
diff --git a/emoticons/src/main/sparkEmoticonSet/love.png b/emoticons/src/main/sparkEmoticonSet/love.png
new file mode 100644
index 000000000..d5580218e
Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/love.png differ
diff --git a/emoticons/src/main/sparkEmoticonSet/mischief.png b/emoticons/src/main/sparkEmoticonSet/mischief.png
new file mode 100644
index 000000000..5da82ffcf
Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/mischief.png differ
diff --git a/emoticons/src/main/sparkEmoticonSet/party.gif b/emoticons/src/main/sparkEmoticonSet/party.gif
new file mode 100644
index 000000000..e43f28089
Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/party.gif differ
diff --git a/emoticons/src/main/sparkEmoticonSet/plain.png b/emoticons/src/main/sparkEmoticonSet/plain.png
new file mode 100644
index 000000000..2a0459185
Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/plain.png differ
diff --git a/emoticons/src/main/sparkEmoticonSet/sad.png b/emoticons/src/main/sparkEmoticonSet/sad.png
new file mode 100644
index 000000000..d336ce2bc
Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/sad.png differ
diff --git a/emoticons/src/main/sparkEmoticonSet/shocked.png b/emoticons/src/main/sparkEmoticonSet/shocked.png
new file mode 100644
index 000000000..b02c7bcc3
Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/shocked.png differ
diff --git a/emoticons/src/main/sparkEmoticonSet/silly.png b/emoticons/src/main/sparkEmoticonSet/silly.png
new file mode 100644
index 000000000..7688458af
Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/silly.png differ
diff --git a/emoticons/src/main/sparkEmoticonSet/sleepy.gif b/emoticons/src/main/sparkEmoticonSet/sleepy.gif
new file mode 100644
index 000000000..d40769fb6
Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/sleepy.gif differ
diff --git a/emoticons/src/main/sparkEmoticonSet/wink.png b/emoticons/src/main/sparkEmoticonSet/wink.png
new file mode 100644
index 000000000..aa25da943
Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/wink.png differ
diff --git a/pom.xml b/pom.xml
index a4e8abb76..c37a4df0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,6 +68,7 @@
 
     <modules>
         <module>core</module>
+        <module>emoticons</module>
         <module>plugins/assembly-descriptor</module>
         <!--<module>plugins/battleships</module>-->
         <module>plugins/apple</module>