diff --git a/resources/images/images.properties b/resources/images/images.properties
index 72361de4f..1d29759ba 100644
--- a/resources/images/images.properties
+++ b/resources/images/images.properties
@@ -327,6 +327,7 @@ service.gui.smileys.SMILEY17=resources/images/impl/gui/common/smileys/default/sm
 service.gui.smileys.SMILEY18=resources/images/impl/gui/common/smileys/default/smiley18.gif
 service.gui.smileys.SMILEY19=resources/images/impl/gui/common/smileys/default/smiley19.gif
 service.gui.smileys.SMILEY20=resources/images/impl/gui/common/smileys/default/smiley20.gif
+service.gui.smileys.SMILEY21=resources/images/impl/gui/common/smileys/default/smiley21.gif
 
 # Look and Feel images
 service.gui.lookandfeel.CLOSE_TAB_ICON=resources/images/impl/gui/buttons/closeTab.png
diff --git a/resources/images/impl/gui/common/smileys/default/smiley21.gif b/resources/images/impl/gui/common/smileys/default/smiley21.gif
new file mode 100644
index 000000000..7fea717bb
Binary files /dev/null and b/resources/images/impl/gui/common/smileys/default/smiley21.gif differ
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/SmileysSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/chat/SmileysSelectorBox.java
index c09760ba2..5506f7b04 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/SmileysSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/SmileysSelectorBox.java
@@ -112,7 +112,9 @@ private Dimension calculateGridDimensions(int itemsCount)
          * Was the intention to have the division produce a real number?
          */
         int gridRowCount = itemsCount / gridColCount;
-        
+        if (itemsCount > gridRowCount*gridColCount)
+            gridColCount++;
+
         return new Dimension(gridColCount, gridRowCount);
     }
 
diff --git a/src/net/java/sip/communicator/impl/replacement/smiley/Resources.java b/src/net/java/sip/communicator/impl/replacement/smiley/Resources.java
index 759185683..ec951e4e8 100644
--- a/src/net/java/sip/communicator/impl/replacement/smiley/Resources.java
+++ b/src/net/java/sip/communicator/impl/replacement/smiley/Resources.java
@@ -68,7 +68,7 @@ public static Collection<Smiley> getDefaultSmileyPack()
             new String[] {"(y)", "(Y)", "(ok)"}, "Ok"));
 
         defaultSmileyList.add(new SmileyImpl("service.gui.smileys.SMILEY11",
-            new String[] {";-)", ";)", ":-)", ":)"}, "Smile"));
+            new String[] {":-)", ":)"}, "Smile"));
 
         defaultSmileyList.add(new SmileyImpl("service.gui.smileys.SMILEY12",
             new String[] {"(blush)"}, "Blushing"));
@@ -97,6 +97,9 @@ public static Collection<Smiley> getDefaultSmileyPack()
         defaultSmileyList.add(new SmileyImpl("service.gui.smileys.SMILEY20",
             new String[] {"(oops)"}, "Oops"));
 
+        defaultSmileyList.add(new SmileyImpl("service.gui.smileys.SMILEY21",
+            new String[] {";-)", ";)"}, "Wink"));
+
         defaultSmileyPack
             = Collections.unmodifiableCollection(defaultSmileyList);