diff --git a/wise-webapp/src/main/java/com/wisemapping/model/IconFamily.java b/wise-webapp/src/main/java/com/wisemapping/model/IconFamily.java
index c194f20d..b4b5d5bd 100755
--- a/wise-webapp/src/main/java/com/wisemapping/model/IconFamily.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/IconFamily.java
@@ -19,14 +19,11 @@
 package com.wisemapping.model;
 
 public enum IconFamily {
-    FLAG,
-    BULLET,
-    TAG,
+
     //    NUMBER("NUMBER","number_"),
     FACE,
     FUNY,
-    ARROW,
-    ARROWC,
+
     CONN,
     SPORT,
     BULB,
@@ -39,7 +36,12 @@ public enum IconFamily {
     SIGN,
     HARD,
     SOFT,
+    ARROW,
+    ARROWC,
     PEOPLE,
     MAIL,
+    FLAG,
+    BULLET,
+    TAG,
     OBJECT;
 }
diff --git a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java b/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java
index 537bbc97..0c90fa66 100755
--- a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java
@@ -140,7 +140,6 @@ public class MindmapIcons {
     public static final MindmapIcon TIME_HOURGLASS = new MindmapIcon(IconFamily.TIME, "hourglass");
 
 
-    public static final MindmapIcon OBJECT_PENGUIN = new MindmapIcon(IconFamily.OBJECT, "penguin");
     public static final MindmapIcon OBJECT_BELL = new MindmapIcon(IconFamily.OBJECT, "bell");
     public static final MindmapIcon OBJECT_BOMB = new MindmapIcon(IconFamily.OBJECT, "clanbomber");
     public static final MindmapIcon OBJECT_KEY = new MindmapIcon(IconFamily.OBJECT, "key");
@@ -152,6 +151,11 @@ public class MindmapIcons {
     public static final MindmapIcon OBJECT_STAR = new MindmapIcon(IconFamily.OBJECT, "star");
     public static final MindmapIcon OBJECT_WIZARD = new MindmapIcon(IconFamily.OBJECT, "wizard");
     public static final MindmapIcon OBJECT_HOUSE = new MindmapIcon(IconFamily.OBJECT, "house");
+    public static final MindmapIcon OBJECT_CAKE = new MindmapIcon(IconFamily.OBJECT, "cake");
+    public static final MindmapIcon OBJECT_CAMERA= new MindmapIcon(IconFamily.OBJECT, "camera");
+    public static final MindmapIcon OBJECT_PALETTE = new MindmapIcon(IconFamily.OBJECT, "palette");
+    public static final MindmapIcon OBJECT_RAINBOW = new MindmapIcon(IconFamily.OBJECT, "rainbow");
+
 
     public static final MindmapIcon MAIL_ENVELOP = new MindmapIcon(IconFamily.MAIL, "envelop");
     public static final MindmapIcon MAIL_MAILBOX = new MindmapIcon(IconFamily.MAIL, "mailbox");
@@ -181,6 +185,7 @@ public class MindmapIcons {
     public static final MindmapIcon SOFT_FEED = new MindmapIcon(IconFamily.SOFT, "feed");
     public static final MindmapIcon SOFT_FOLDER_EXPORE = new MindmapIcon(IconFamily.SOFT, "folder_explore");
     public static final MindmapIcon SOFT_RSS = new MindmapIcon(IconFamily.SOFT, "rss");
+    public static final MindmapIcon SOFT_PENGUIN = new MindmapIcon(IconFamily.SOFT, "penguin");
 
     public static final MindmapIcon PEOPLE_GROUP = new MindmapIcon(IconFamily.PEOPLE, "group");
     public static final MindmapIcon PEOPLE_MALE = new MindmapIcon(IconFamily.PEOPLE, "male1");
diff --git a/wise-webapp/src/main/webapp/icons/object_cake.png b/wise-webapp/src/main/webapp/icons/object_cake.png
new file mode 100755
index 00000000..4ef151ae
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/object_cake.png differ
diff --git a/wise-webapp/src/main/webapp/icons/object_camera.png b/wise-webapp/src/main/webapp/icons/object_camera.png
new file mode 100755
index 00000000..8536d1a7
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/object_camera.png differ
diff --git a/wise-webapp/src/main/webapp/icons/object_palette.png b/wise-webapp/src/main/webapp/icons/object_palette.png
new file mode 100755
index 00000000..73c5b3f2
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/object_palette.png differ
diff --git a/wise-webapp/src/main/webapp/icons/object_rainbow.png b/wise-webapp/src/main/webapp/icons/object_rainbow.png
new file mode 100755
index 00000000..5ede989a
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/object_rainbow.png differ
diff --git a/wise-webapp/src/main/webapp/icons/object_penguin.png b/wise-webapp/src/main/webapp/icons/soft_penguin.png
similarity index 100%
rename from wise-webapp/src/main/webapp/icons/object_penguin.png
rename to wise-webapp/src/main/webapp/icons/soft_penguin.png
diff --git a/wise-webapp/src/main/webapp/js/IconPanel.js b/wise-webapp/src/main/webapp/js/IconPanel.js
index 104839d4..4e0a4f10 100644
--- a/wise-webapp/src/main/webapp/js/IconPanel.js
+++ b/wise-webapp/src/main/webapp/js/IconPanel.js
@@ -18,9 +18,9 @@
 
 var IconPanel = new Class({
     options:{
-        width:250,
+        width:253,
         initialWidth:0,
-        height:250,
+        height:200,
         content:null,
         panel:null,
         button:null,
diff --git a/wise-webapp/src/main/webapp/js/editor.js b/wise-webapp/src/main/webapp/js/editor.js
index eacf4594..38033213 100644
--- a/wise-webapp/src/main/webapp/js/editor.js
+++ b/wise-webapp/src/main/webapp/js/editor.js
@@ -457,7 +457,7 @@ function afterMindpotLibraryLoading()
 }
 
 function buildIconChooser() {
-    var content = new Element('div').setStyles({width:250,height:250,padding:5});
+    var content = new Element('div').setStyles({width:253,height:200,padding:5});
     var count = 0;
     for (var i = 0; i < mindplot.ImageIcon.prototype.ICON_FAMILIES.length; i = i + 1)
     {
@@ -466,7 +466,7 @@ function buildIconChooser() {
         {
             // Separate icons by line ...
             var familyContent;
-            if ((count % 9) == 0)
+            if ((count % 12) == 0)
             {
                 familyContent = new Element('div').inject(content);
             }
diff --git a/wise-webapp/src/test/java/com/wisemapping/test/model/IconsTest.java b/wise-webapp/src/test/java/com/wisemapping/test/model/IconsTest.java
index 8312d1bf..a039aad1 100644
--- a/wise-webapp/src/test/java/com/wisemapping/test/model/IconsTest.java
+++ b/wise-webapp/src/test/java/com/wisemapping/test/model/IconsTest.java
@@ -12,7 +12,7 @@ import java.util.List;
 
 @Test
 public class IconsTest {
-    final private static String CURRENT_JSON_ICONS = "[{\"id\": \"flag\", \"icons\" : [\"flag_blue\",\"flag_green\",\"flag_orange\",\"flag_pink\",\"flag_purple\",\"flag_yellow\"]},{\"id\": \"bullet\", \"icons\" : [\"bullet_black\",\"bullet_blue\",\"bullet_green\",\"bullet_orange\",\"bullet_red\",\"bullet_pink\",\"bullet_purple\"]},{\"id\": \"tag\", \"icons\" : [\"tag_blue\",\"tag_green\",\"tag_orange\",\"tag_red\",\"tag_pink\",\"tag_yellow\"]},{\"id\": \"face\", \"icons\" : [\"face_plain\",\"face_sad\",\"face_crying\",\"face_smile\",\"face_surprise\",\"face_wink\"]},{\"id\": \"funy\", \"icons\" : [\"funy_angel\",\"funy_devilish\",\"funy_glasses\",\"funy_grin\",\"funy_kiss\",\"funy_monkey\"]},{\"id\": \"arrow\", \"icons\" : [\"arrow_up\",\"arrow_down\",\"arrow_left\",\"arrow_right\"]},{\"id\": \"arrowc\", \"icons\" : [\"arrowc_rotate_anticlockwise\",\"arrowc_rotate_clockwise\",\"arrowc_turn_left\",\"arrowc_turn_right\"]},{\"id\": \"conn\", \"icons\" : [\"conn_connect\",\"conn_disconnect\"]},{\"id\": \"sport\", \"icons\" : [\"sport_basketball\",\"sport_football\",\"sport_golf\",\"sport_raquet\",\"sport_shuttlecock\",\"sport_soccer\",\"sport_tennis\"]},{\"id\": \"bulb\", \"icons\" : [\"bulb_light_on\",\"bulb_light_off\"]},{\"id\": \"thumb\", \"icons\" : [\"thumb_thumb_up\",\"thumb_thumb_down\"]},{\"id\": \"tick\", \"icons\" : [\"tick_tick\",\"tick_cross\"]},{\"id\": \"onoff\", \"icons\" : [\"onoff_clock\",\"onoff_clock_red\",\"onoff_add\",\"onoff_delete\",\"onoff_status_offline\",\"onoff_status_online\"]},{\"id\": \"money\", \"icons\" : [\"money_money\",\"money_dollar\",\"money_euro\",\"money_pound\",\"money_yen\",\"money_coins\",\"money_ruby\"]},{\"id\": \"time\", \"icons\" : [\"time_calendar\",\"time_clock\",\"time_hourglass\"]},{\"id\": \"chart\", \"icons\" : [\"chart_bar\",\"chart_line\",\"chart_curve\",\"chart_pie\",\"chart_organisation\"]},{\"id\": \"sign\", \"icons\" : [\"sign_warning\",\"sign_info\",\"sign_stop\",\"sign_help\",\"sign_cancel\"]},{\"id\": \"hard\", \"icons\" : [\"hard_cd\",\"hard_computer\",\"hard_controller\",\"hard_driver_disk\",\"hard_ipod\",\"hard_keyboard\",\"hard_mouse\",\"hard_printer\"]},{\"id\": \"soft\", \"icons\" : [\"soft_bug\",\"soft_cursor\",\"soft_database_table\",\"soft_database\",\"soft_feed\",\"soft_folder_explore\",\"soft_rss\"]},{\"id\": \"people\", \"icons\" : [\"people_group\",\"people_male1\",\"people_male2\",\"people_female1\",\"people_female2\"]},{\"id\": \"mail\", \"icons\" : [\"mail_envelop\",\"mail_mailbox\",\"mail_edit\",\"mail_list\"]},{\"id\": \"object\", \"icons\" : [\"object_penguin\",\"object_bell\",\"object_clanbomber\",\"object_key\",\"object_pencil\",\"object_phone\",\"object_magnifier\",\"object_clip\",\"object_music\",\"object_star\",\"object_wizard\",\"object_house\"]},]";
+    final private static String CURRENT_JSON_ICONS = "[{\"id\": \"face\", \"icons\" : [\"face_plain\",\"face_sad\",\"face_crying\",\"face_smile\",\"face_surprise\",\"face_wink\"]},{\"id\": \"funy\", \"icons\" : [\"funy_angel\",\"funy_devilish\",\"funy_glasses\",\"funy_grin\",\"funy_kiss\",\"funy_monkey\"]},{\"id\": \"conn\", \"icons\" : [\"conn_connect\",\"conn_disconnect\"]},{\"id\": \"sport\", \"icons\" : [\"sport_basketball\",\"sport_football\",\"sport_golf\",\"sport_raquet\",\"sport_shuttlecock\",\"sport_soccer\",\"sport_tennis\"]},{\"id\": \"bulb\", \"icons\" : [\"bulb_light_on\",\"bulb_light_off\"]},{\"id\": \"thumb\", \"icons\" : [\"thumb_thumb_up\",\"thumb_thumb_down\"]},{\"id\": \"tick\", \"icons\" : [\"tick_tick\",\"tick_cross\"]},{\"id\": \"onoff\", \"icons\" : [\"onoff_clock\",\"onoff_clock_red\",\"onoff_add\",\"onoff_delete\",\"onoff_status_offline\",\"onoff_status_online\"]},{\"id\": \"money\", \"icons\" : [\"money_money\",\"money_dollar\",\"money_euro\",\"money_pound\",\"money_yen\",\"money_coins\",\"money_ruby\"]},{\"id\": \"time\", \"icons\" : [\"time_calendar\",\"time_clock\",\"time_hourglass\"]},{\"id\": \"chart\", \"icons\" : [\"chart_bar\",\"chart_line\",\"chart_curve\",\"chart_pie\",\"chart_organisation\"]},{\"id\": \"sign\", \"icons\" : [\"sign_warning\",\"sign_info\",\"sign_stop\",\"sign_help\",\"sign_cancel\"]},{\"id\": \"hard\", \"icons\" : [\"hard_cd\",\"hard_computer\",\"hard_controller\",\"hard_driver_disk\",\"hard_ipod\",\"hard_keyboard\",\"hard_mouse\",\"hard_printer\"]},{\"id\": \"soft\", \"icons\" : [\"soft_bug\",\"soft_cursor\",\"soft_database_table\",\"soft_database\",\"soft_feed\",\"soft_folder_explore\",\"soft_rss\",\"soft_penguin\"]},{\"id\": \"arrow\", \"icons\" : [\"arrow_up\",\"arrow_down\",\"arrow_left\",\"arrow_right\"]},{\"id\": \"arrowc\", \"icons\" : [\"arrowc_rotate_anticlockwise\",\"arrowc_rotate_clockwise\",\"arrowc_turn_left\",\"arrowc_turn_right\"]},{\"id\": \"people\", \"icons\" : [\"people_group\",\"people_male1\",\"people_male2\",\"people_female1\",\"people_female2\"]},{\"id\": \"mail\", \"icons\" : [\"mail_envelop\",\"mail_mailbox\",\"mail_edit\",\"mail_list\"]},{\"id\": \"flag\", \"icons\" : [\"flag_blue\",\"flag_green\",\"flag_orange\",\"flag_pink\",\"flag_purple\",\"flag_yellow\"]},{\"id\": \"bullet\", \"icons\" : [\"bullet_black\",\"bullet_blue\",\"bullet_green\",\"bullet_orange\",\"bullet_red\",\"bullet_pink\",\"bullet_purple\"]},{\"id\": \"tag\", \"icons\" : [\"tag_blue\",\"tag_green\",\"tag_orange\",\"tag_red\",\"tag_pink\",\"tag_yellow\"]},{\"id\": \"object\", \"icons\" : [\"object_bell\",\"object_clanbomber\",\"object_key\",\"object_pencil\",\"object_phone\",\"object_magnifier\",\"object_clip\",\"object_music\",\"object_star\",\"object_wizard\",\"object_house\",\"object_cake\",\"object_camera\",\"object_palette\",\"object_rainbow\"]},]";
 
     @Test
     void checkImagesByFamily() throws IllegalAccessException {