diff --git a/mindplot/src/main/javascript/ImageIcon.js b/mindplot/src/main/javascript/ImageIcon.js
index 2d30cb63..693f31da 100644
--- a/mindplot/src/main/javascript/ImageIcon.js
+++ b/mindplot/src/main/javascript/ImageIcon.js
@@ -149,5 +149,6 @@ mindplot.ImageIcon.prototype.getUiId = function()
 
 
 
-mindplot.ImageIcon.prototype.ICON_FAMILIES = [{"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"]},{"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": "mail", "icons" : ["mail_envelop","mail_mailbox","mail_edit"]},{"id": "object", "icons" : ["object_penguin","object_bell","object_clanbomber","object_key","object_pencil","object_phone","object_magnifier","object_clip","object_music","object_cd","object_star","object_wizard","object_house"]}]
+mindplot.ImageIcon.prototype.ICON_FAMILIES = [{"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"]}]
+
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconConverter.java b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconConverter.java
index f341d3ff..2842266a 100755
--- a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconConverter.java
+++ b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconConverter.java
@@ -46,7 +46,8 @@ final public class FreemindIconConverter {
 
     @Nullable
     public static String toFreemindId(@NotNull String iconId) {
-        return iconToFreeId.get(MindmapIcons.findById(iconId));
+        String result = iconToFreeId.get(MindmapIcons.findById(iconId));
+        return result != null ? result : iconId;
     }
 
 
@@ -76,6 +77,7 @@ final public class FreemindIconConverter {
         // Map arrow icons ...
         iconToFreeId.put(MindmapIcons.ARROW_RIGHT, "back");
         iconToFreeId.put(MindmapIcons.ARROW_LEFT, "forward");
+        iconToFreeId.put(MindmapIcons.ONOFF_DELETE, "closed");
 
         // Map smile icons ...
         iconToFreeId.put(MindmapIcons.FACE_PLAIN, "smiley-neutral");
@@ -91,12 +93,13 @@ final public class FreemindIconConverter {
         iconToFreeId.put(MindmapIcons.OBJECT_CLIP, "attach");
         iconToFreeId.put(MindmapIcons.OBJECT_MUSIC, "knotify");
         iconToFreeId.put(MindmapIcons.OBJECT_HOUSE, "gohome");
-
+        iconToFreeId.put(MindmapIcons.ONOFF_STATUS_ONLINE, "licq");
 
         // Sign mapping ...
         iconToFreeId.put(MindmapIcons.SIGN_WARNING, "messagebox_warning");
         iconToFreeId.put(MindmapIcons.SIGN_STOP, "stop-sign");
 
+
         // Mail mappings
         iconToFreeId.put(MindmapIcons.MAIL_ENVELOP, "Mail");
         iconToFreeId.put(MindmapIcons.MAIL_MAILBOX, "korn");
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 050b1290..c194f20d 100755
--- a/wise-webapp/src/main/java/com/wisemapping/model/IconFamily.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/IconFamily.java
@@ -37,6 +37,9 @@ public enum IconFamily {
     TIME,
     CHART,
     SIGN,
+    HARD,
+    SOFT,
+    PEOPLE,
     MAIL,
     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 0211646d..537bbc97 100755
--- a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java
@@ -24,7 +24,7 @@ import java.lang.IllegalStateException;
 import java.lang.reflect.Field;
 import java.util.*;
 
-@SuppressWarnings("all")
+@SuppressWarnings({"UnusedDeclaration"})
 public class MindmapIcons {
 
     private static Map<IconFamily, List<MindmapIcon>> iconsByFamily;
@@ -39,6 +39,7 @@ public class MindmapIcons {
     public static final MindmapIcon THUMB__UP = new MindmapIcon(IconFamily.THUMB, "thumb_up");
     public static final MindmapIcon THUMB_DOWN = new MindmapIcon(IconFamily.THUMB, "thumb_down");
 
+
     public static final MindmapIcon ARROW_UP = new MindmapIcon(IconFamily.ARROW, "up");
     public static final MindmapIcon ARROW_DOWN = new MindmapIcon(IconFamily.ARROW, "down");
     public static final MindmapIcon ARROW_LEFT = new MindmapIcon(IconFamily.ARROW, "left");
@@ -72,6 +73,9 @@ public class MindmapIcons {
     public static final MindmapIcon ONOFF_CLOCK__RED = new MindmapIcon(IconFamily.ONOFF, "clock_red");
     public static final MindmapIcon ONOFF_ADD = new MindmapIcon(IconFamily.ONOFF, "add");
     public static final MindmapIcon ONOFF_DELETE = new MindmapIcon(IconFamily.ONOFF, "delete");
+    public static final MindmapIcon ONOFF_STATUS_OFFLINE = new MindmapIcon(IconFamily.ONOFF, "status_offline");
+    public static final MindmapIcon ONOFF_STATUS_ONLINE = new MindmapIcon(IconFamily.ONOFF, "status_online");
+
 
     public static final MindmapIcon TAG_BLUE = new MindmapIcon(IconFamily.TAG, "blue");
     public static final MindmapIcon TAG_GREEN = new MindmapIcon(IconFamily.TAG, "green");
@@ -145,7 +149,6 @@ public class MindmapIcons {
     public static final MindmapIcon OBJECT_MAGNIFIER = new MindmapIcon(IconFamily.OBJECT, "magnifier");
     public static final MindmapIcon OBJECT_CLIP = new MindmapIcon(IconFamily.OBJECT, "clip");
     public static final MindmapIcon OBJECT_MUSIC = new MindmapIcon(IconFamily.OBJECT, "music");
-    public static final MindmapIcon OBJECT_CD = new MindmapIcon(IconFamily.OBJECT, "cd");
     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");
@@ -153,12 +156,37 @@ public class MindmapIcons {
     public static final MindmapIcon MAIL_ENVELOP = new MindmapIcon(IconFamily.MAIL, "envelop");
     public static final MindmapIcon MAIL_MAILBOX = new MindmapIcon(IconFamily.MAIL, "mailbox");
     public static final MindmapIcon MAIL_EDIT = new MindmapIcon(IconFamily.MAIL, "edit");
+    public static final MindmapIcon MAIL_LIST = new MindmapIcon(IconFamily.MAIL, "list");
+
 
     public static final MindmapIcon SIGN_WARNING = new MindmapIcon(IconFamily.SIGN, "warning");
     public static final MindmapIcon SIGN_INFO = new MindmapIcon(IconFamily.SIGN, "info");
     public static final MindmapIcon SIGN_STOP = new MindmapIcon(IconFamily.SIGN, "stop");
     public static final MindmapIcon SIGN_HELP = new MindmapIcon(IconFamily.SIGN, "help");
-    public static final MindmapIcon SIGN_CANCEL = new MindmapIcon(IconFamily.SIGN   , "cancel");
+    public static final MindmapIcon SIGN_CANCEL = new MindmapIcon(IconFamily.SIGN, "cancel");
+
+    public static final MindmapIcon HARD_CD = new MindmapIcon(IconFamily.HARD, "cd");
+    public static final MindmapIcon HARD_COMPUTER = new MindmapIcon(IconFamily.HARD, "computer");
+    public static final MindmapIcon HARD_CONTROLLER = new MindmapIcon(IconFamily.HARD, "controller");
+    public static final MindmapIcon HARD_DRIVER_DISK = new MindmapIcon(IconFamily.HARD, "driver_disk");
+    public static final MindmapIcon HARD_IPOD = new MindmapIcon(IconFamily.HARD, "ipod");
+    public static final MindmapIcon HARD_KEYBOARD = new MindmapIcon(IconFamily.HARD, "keyboard");
+    public static final MindmapIcon HARD_MOUSE = new MindmapIcon(IconFamily.HARD, "mouse");
+    public static final MindmapIcon HARD_PRINTER = new MindmapIcon(IconFamily.HARD, "printer");
+
+    public static final MindmapIcon SOFT_BUG = new MindmapIcon(IconFamily.SOFT, "bug");
+    public static final MindmapIcon SOFT_CURSOR = new MindmapIcon(IconFamily.SOFT, "cursor");
+    public static final MindmapIcon SOFT_DATABASE_TABLE = new MindmapIcon(IconFamily.SOFT, "database_table");
+    public static final MindmapIcon SOFT_DATABASE = new MindmapIcon(IconFamily.SOFT, "database");
+    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 PEOPLE_GROUP = new MindmapIcon(IconFamily.PEOPLE, "group");
+    public static final MindmapIcon PEOPLE_MALE = new MindmapIcon(IconFamily.PEOPLE, "male1");
+    public static final MindmapIcon PEOPLE_MALE2 = new MindmapIcon(IconFamily.PEOPLE, "male2");
+    public static final MindmapIcon PEOPLE_FEMALE = new MindmapIcon(IconFamily.PEOPLE, "female1");
+    public static final MindmapIcon PEOPLE_FEMALE2 = new MindmapIcon(IconFamily.PEOPLE, "female2");
 
     @NotNull
     public static List<MindmapIcon> getIconByFamily(@NotNull IconFamily family) {
diff --git a/wise-webapp/src/main/webapp/icons/delNode.png b/wise-webapp/src/main/webapp/icons/delNode.png
deleted file mode 100644
index 69baa4bc..00000000
Binary files a/wise-webapp/src/main/webapp/icons/delNode.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/object_cd.png b/wise-webapp/src/main/webapp/icons/hard_cd.png
similarity index 100%
rename from wise-webapp/src/main/webapp/icons/object_cd.png
rename to wise-webapp/src/main/webapp/icons/hard_cd.png
diff --git a/wise-webapp/src/main/webapp/icons/hard_computer.png b/wise-webapp/src/main/webapp/icons/hard_computer.png
new file mode 100755
index 00000000..9bc37dce
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/hard_computer.png differ
diff --git a/wise-webapp/src/main/webapp/icons/hard_controller.png b/wise-webapp/src/main/webapp/icons/hard_controller.png
new file mode 100755
index 00000000..5cf76ed0
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/hard_controller.png differ
diff --git a/wise-webapp/src/main/webapp/icons/hard_drive_cd.png b/wise-webapp/src/main/webapp/icons/hard_drive_cd.png
new file mode 100755
index 00000000..1850b701
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/hard_drive_cd.png differ
diff --git a/wise-webapp/src/main/webapp/icons/hard_driver_disk.png b/wise-webapp/src/main/webapp/icons/hard_driver_disk.png
new file mode 100755
index 00000000..99d532e8
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/hard_driver_disk.png differ
diff --git a/wise-webapp/src/main/webapp/icons/hard_ipod.png b/wise-webapp/src/main/webapp/icons/hard_ipod.png
new file mode 100755
index 00000000..3f768da5
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/hard_ipod.png differ
diff --git a/wise-webapp/src/main/webapp/icons/hard_keyboard.png b/wise-webapp/src/main/webapp/icons/hard_keyboard.png
new file mode 100755
index 00000000..898d402d
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/hard_keyboard.png differ
diff --git a/wise-webapp/src/main/webapp/icons/hard_mouse.png b/wise-webapp/src/main/webapp/icons/hard_mouse.png
new file mode 100755
index 00000000..63a92fa9
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/hard_mouse.png differ
diff --git a/wise-webapp/src/main/webapp/icons/hard_printer.png b/wise-webapp/src/main/webapp/icons/hard_printer.png
new file mode 100755
index 00000000..a350d187
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/hard_printer.png differ
diff --git a/wise-webapp/src/main/webapp/icons/mail_list.png b/wise-webapp/src/main/webapp/icons/mail_list.png
new file mode 100755
index 00000000..abcd9368
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/mail_list.png differ
diff --git a/wise-webapp/src/main/webapp/icons/onoff_status_offline.png b/wise-webapp/src/main/webapp/icons/onoff_status_offline.png
new file mode 100755
index 00000000..a88261a6
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/onoff_status_offline.png differ
diff --git a/wise-webapp/src/main/webapp/icons/onoff_status_online.png b/wise-webapp/src/main/webapp/icons/onoff_status_online.png
new file mode 100755
index 00000000..947bd4b6
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/onoff_status_online.png differ
diff --git a/wise-webapp/src/main/webapp/icons/people_female1.png b/wise-webapp/src/main/webapp/icons/people_female1.png
new file mode 100755
index 00000000..7c71de03
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/people_female1.png differ
diff --git a/wise-webapp/src/main/webapp/icons/people_female2.png b/wise-webapp/src/main/webapp/icons/people_female2.png
new file mode 100755
index 00000000..30383c2d
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/people_female2.png differ
diff --git a/wise-webapp/src/main/webapp/icons/people_group.png b/wise-webapp/src/main/webapp/icons/people_group.png
new file mode 100755
index 00000000..7fb4e1f1
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/people_group.png differ
diff --git a/wise-webapp/src/main/webapp/icons/people_male1.png b/wise-webapp/src/main/webapp/icons/people_male1.png
new file mode 100755
index 00000000..b3454e15
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/people_male1.png differ
diff --git a/wise-webapp/src/main/webapp/icons/people_male2.png b/wise-webapp/src/main/webapp/icons/people_male2.png
new file mode 100755
index 00000000..79f35ccb
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/people_male2.png differ
diff --git a/wise-webapp/src/main/webapp/icons/sign_closed.png b/wise-webapp/src/main/webapp/icons/sign_closed.png
new file mode 100755
index 00000000..08f24936
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/sign_closed.png differ
diff --git a/wise-webapp/src/main/webapp/icons/soft_bug.png b/wise-webapp/src/main/webapp/icons/soft_bug.png
new file mode 100755
index 00000000..2d5fb90e
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/soft_bug.png differ
diff --git a/wise-webapp/src/main/webapp/icons/soft_cursor.png b/wise-webapp/src/main/webapp/icons/soft_cursor.png
new file mode 100755
index 00000000..532f532d
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/soft_cursor.png differ
diff --git a/wise-webapp/src/main/webapp/icons/soft_database.png b/wise-webapp/src/main/webapp/icons/soft_database.png
new file mode 100755
index 00000000..3d09261a
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/soft_database.png differ
diff --git a/wise-webapp/src/main/webapp/icons/soft_database_table.png b/wise-webapp/src/main/webapp/icons/soft_database_table.png
new file mode 100755
index 00000000..693709cb
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/soft_database_table.png differ
diff --git a/wise-webapp/src/main/webapp/icons/soft_feed.png b/wise-webapp/src/main/webapp/icons/soft_feed.png
new file mode 100755
index 00000000..315c4f4f
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/soft_feed.png differ
diff --git a/wise-webapp/src/main/webapp/icons/soft_folder_explore.png b/wise-webapp/src/main/webapp/icons/soft_folder_explore.png
new file mode 100755
index 00000000..0ba93918
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/soft_folder_explore.png differ
diff --git a/wise-webapp/src/main/webapp/icons/soft_rss.png b/wise-webapp/src/main/webapp/icons/soft_rss.png
new file mode 100755
index 00000000..1dc6ff30
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/soft_rss.png differ
diff --git a/wise-webapp/src/main/webapp/icons/soft_stuff_folder.png b/wise-webapp/src/main/webapp/icons/soft_stuff_folder.png
new file mode 100755
index 00000000..784e8fa4
Binary files /dev/null and b/wise-webapp/src/main/webapp/icons/soft_stuff_folder.png differ
diff --git a/wise-webapp/src/main/webapp/js/IconPanel.js b/wise-webapp/src/main/webapp/js/IconPanel.js
index 171d692c..104839d4 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:190,
+        width:250,
         initialWidth:0,
-        height:145,
+        height:250,
         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 bf6814c8..eacf4594 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:330,height:340,padding:5});
+    var content = new Element('div').setStyles({width:250,height:250,padding:5});
     var count = 0;
     for (var i = 0; i < mindplot.ImageIcon.prototype.ICON_FAMILIES.length; i = i + 1)
     {
diff --git a/wise-webapp/src/test/data/freemind/icons.mmr b/wise-webapp/src/test/data/freemind/icons.mmr
index 30863439..bae0223d 100644
--- a/wise-webapp/src/test/data/freemind/icons.mmr
+++ b/wise-webapp/src/test/data/freemind/icons.mmr
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node TEXT="This is the root node" STYLE="elipse" ID="ID_0"><node TEXT="Simbols" POSITION="right" ID="ID_1"><node TEXT="Warning" POSITION="right" ID="ID_2"><icon BUILTIN="messagebox_warning"/></node><node TEXT="No Ok" POSITION="right" ID="ID_3"><icon BUILTIN="button_cancel"/></node><node TEXT="Ok" POSITION="right" ID="ID_4"><icon BUILTIN="button_ok"/></node><node TEXT="Info" POSITION="right" ID="ID_5"><icon BUILTIN="info"/></node><node TEXT="No Entry" POSITION="right" ID="ID_6"/><node TEXT="Stop" POSITION="right" ID="ID_7"><icon BUILTIN="stop-sign"/></node><node TEXT="Lamp" POSITION="right" ID="ID_8"><icon BUILTIN="idea"/></node><node TEXT="! Simbol" POSITION="right" ID="ID_9"/><node TEXT="Question Mark" POSITION="right" ID="ID_10"><icon BUILTIN="help"/></node></node><node TEXT="Numbers" POSITION="left" ID="ID_11" FOLDED="true"><node TEXT="1" POSITION="left" ID="ID_12"><icon BUILTIN="full-1"/></node><node TEXT="2" POSITION="left" ID="ID_13"><icon BUILTIN="full-2"/></node><node TEXT="3" POSITION="left" ID="ID_14"><icon BUILTIN="full-3"/></node><node TEXT="4" POSITION="left" ID="ID_15"><icon BUILTIN="full-4"/></node><node TEXT="5" POSITION="left" ID="ID_16"><icon BUILTIN="full-5"/></node><node TEXT="6" POSITION="left" ID="ID_17"><icon BUILTIN="full-6"/></node><node TEXT="7" POSITION="left" ID="ID_18"/><node TEXT="8" POSITION="left" ID="ID_19"/><node TEXT="9" POSITION="left" ID="ID_20"/><node TEXT="0" POSITION="left" ID="ID_21"><icon BUILTIN="full-0"/></node></node><node TEXT="Trafic" POSITION="right" ID="ID_22"><node TEXT="Read" POSITION="right" ID="ID_23"/><node TEXT="Green" POSITION="right" ID="ID_24"/><node TEXT="Yellow" POSITION="right" ID="ID_25"/></node><node TEXT="Arrow" POSITION="left" ID="ID_26" FOLDED="true"><node TEXT="Back" POSITION="left" ID="ID_27"><icon BUILTIN="back"/></node><node TEXT="Forward" POSITION="left" ID="ID_28"><icon BUILTIN="forward"/></node><node TEXT="Up" POSITION="left" ID="ID_29"><icon BUILTIN="up"/></node><node TEXT="Down" POSITION="left" ID="ID_30"><icon BUILTIN="down"/></node></node><node TEXT="Smiles" POSITION="right" ID="ID_31" FOLDED="true"><node TEXT="Smile" POSITION="right" ID="ID_32"><icon BUILTIN="ksmiletris"/></node><node TEXT="No Mind" POSITION="right" ID="ID_33"><icon BUILTIN="smiley-neutral"/></node><node TEXT="Surprise" POSITION="right" ID="ID_34"><icon BUILTIN="smiley-oh"/></node><node TEXT="Sad" POSITION="right" ID="ID_35"/><node TEXT="Angry" POSITION="right" ID="ID_36"/></node><node TEXT="People" POSITION="left" ID="ID_37" FOLDED="true"><node TEXT="Family" POSITION="left" ID="ID_38"/><node TEXT="Female1" POSITION="left" ID="ID_39"/><node TEXT="Female2" POSITION="left" ID="ID_40"/><node TEXT="Male1" POSITION="left" ID="ID_41"/><node TEXT="Male2" POSITION="left" ID="ID_42"/><node TEXT="Females" POSITION="left" ID="ID_43"/><node TEXT="Group" POSITION="left" ID="ID_44"/></node><node TEXT="Flags" POSITION="right" ID="ID_45" FOLDED="true"><node TEXT="Black" POSITION="right" ID="ID_46"/><node TEXT="Blue" POSITION="right" ID="ID_47"><icon BUILTIN="flag-blue"/></node><node TEXT="Green" POSITION="right" ID="ID_48"><icon BUILTIN="flag-green"/></node><node TEXT="Orange" POSITION="right" ID="ID_49"><icon BUILTIN="flag-orange"/></node><node TEXT="Pink" POSITION="right" ID="ID_50"><icon BUILTIN="flag-pink"/></node><node TEXT="Red" POSITION="right" ID="ID_51"/><node TEXT="Yellow" POSITION="right" ID="ID_52"><icon BUILTIN="flag-yellow"/></node></node><node TEXT="Time" POSITION="left" ID="ID_53" FOLDED="true"><node TEXT="Calendar" POSITION="left" ID="ID_54"><icon BUILTIN="calendar"/></node><node TEXT="Digial Clock" POSITION="left" ID="ID_55"><icon BUILTIN="clock"/></node><node TEXT="Hourglass" POSITION="left" ID="ID_56"><icon BUILTIN="hourglass"/></node></node><node TEXT="Suff" POSITION="right" ID="ID_57"><node TEXT="Broken" POSITION="right" ID="ID_58"/><node TEXT="WiseIcon" POSITION="right" ID="ID_59"/><node TEXT="ICQ/Flower" POSITION="right" ID="ID_60"/><node TEXT="Linux/Pinguin" POSITION="right" ID="ID_61"><icon BUILTIN="penguin"/></node><node TEXT="Star" POSITION="right" ID="ID_62"><icon BUILTIN="bookmark"/></node><node TEXT="Reminder" POSITION="right" ID="ID_63"><icon BUILTIN="bell"/></node><node TEXT="Zoom" POSITION="right" ID="ID_64"><icon BUILTIN="xmag"/></node><node TEXT="Magic" POSITION="right" ID="ID_65"><icon BUILTIN="wizard"/></node><node TEXT="Music" POSITION="right" ID="ID_66"><icon BUILTIN="knotify"/></node><node TEXT="Pen" POSITION="right" ID="ID_67"><icon BUILTIN="pencil"/></node><node TEXT="Key" POSITION="right" ID="ID_68"><icon BUILTIN="password"/></node><node TEXT="House" POSITION="right" ID="ID_69"><icon BUILTIN="gohome"/></node><node TEXT="Phone" POSITION="right" ID="ID_70"><icon BUILTIN="kaddressbook"/></node><node TEXT="Do not Forget" POSITION="right" ID="ID_71"/><node TEXT="Bomb" POSITION="right" ID="ID_72"><icon BUILTIN="clanbomber"/></node><node TEXT="Clip" POSITION="right" ID="ID_73"><icon BUILTIN="attach"/></node></node><node TEXT="Mail" POSITION="left" ID="ID_74"><node TEXT="Envelop" POSITION="left" ID="ID_75"><icon BUILTIN="Mail"/></node><node TEXT="E-Mail" POSITION="left" ID="ID_76"/><node TEXT="List" POSITION="left" ID="ID_77"/><node TEXT="Refine" POSITION="left" ID="ID_78"><icon BUILTIN="edit"/></node><node TEXT="Mailbox" POSITION="left" ID="ID_79"><icon BUILTIN="korn"/></node></node></node></map>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node TEXT="This is the root node" STYLE="elipse" ID="ID_0"><node TEXT="Simbols" POSITION="right" ID="ID_1"><node TEXT="Warning" POSITION="right" ID="ID_2"><icon BUILTIN="messagebox_warning"/></node><node TEXT="No Ok" POSITION="right" ID="ID_3"><icon BUILTIN="button_cancel"/></node><node TEXT="Ok" POSITION="right" ID="ID_4"><icon BUILTIN="button_ok"/></node><node TEXT="Info" POSITION="right" ID="ID_5"><icon BUILTIN="info"/></node><node TEXT="No Entry" POSITION="right" ID="ID_6"><icon BUILTIN="closed"/></node><node TEXT="Stop" POSITION="right" ID="ID_7"><icon BUILTIN="stop-sign"/></node><node TEXT="Lamp" POSITION="right" ID="ID_8"><icon BUILTIN="idea"/></node><node TEXT="! Simbol" POSITION="right" ID="ID_9"/><node TEXT="Question Mark" POSITION="right" ID="ID_10"><icon BUILTIN="help"/></node></node><node TEXT="Numbers" POSITION="left" ID="ID_11" FOLDED="true"><node TEXT="1" POSITION="left" ID="ID_12"><icon BUILTIN="full-1"/></node><node TEXT="2" POSITION="left" ID="ID_13"><icon BUILTIN="full-2"/></node><node TEXT="3" POSITION="left" ID="ID_14"><icon BUILTIN="full-3"/></node><node TEXT="4" POSITION="left" ID="ID_15"><icon BUILTIN="full-4"/></node><node TEXT="5" POSITION="left" ID="ID_16"><icon BUILTIN="full-5"/></node><node TEXT="6" POSITION="left" ID="ID_17"><icon BUILTIN="full-6"/></node><node TEXT="7" POSITION="left" ID="ID_18"/><node TEXT="8" POSITION="left" ID="ID_19"/><node TEXT="9" POSITION="left" ID="ID_20"/><node TEXT="0" POSITION="left" ID="ID_21"><icon BUILTIN="full-0"/></node></node><node TEXT="Trafic" POSITION="right" ID="ID_22"><node TEXT="Read" POSITION="right" ID="ID_23"/><node TEXT="Green" POSITION="right" ID="ID_24"/><node TEXT="Yellow" POSITION="right" ID="ID_25"/></node><node TEXT="Arrow" POSITION="left" ID="ID_26" FOLDED="true"><node TEXT="Back" POSITION="left" ID="ID_27"><icon BUILTIN="back"/></node><node TEXT="Forward" POSITION="left" ID="ID_28"><icon BUILTIN="forward"/></node><node TEXT="Up" POSITION="left" ID="ID_29"><icon BUILTIN="up"/></node><node TEXT="Down" POSITION="left" ID="ID_30"><icon BUILTIN="down"/></node></node><node TEXT="Smiles" POSITION="right" ID="ID_31" FOLDED="true"><node TEXT="Smile" POSITION="right" ID="ID_32"><icon BUILTIN="ksmiletris"/></node><node TEXT="No Mind" POSITION="right" ID="ID_33"><icon BUILTIN="smiley-neutral"/></node><node TEXT="Surprise" POSITION="right" ID="ID_34"><icon BUILTIN="smiley-oh"/></node><node TEXT="Sad" POSITION="right" ID="ID_35"/><node TEXT="Angry" POSITION="right" ID="ID_36"/></node><node TEXT="People" POSITION="left" ID="ID_37" FOLDED="true"><node TEXT="Family" POSITION="left" ID="ID_38"/><node TEXT="Female1" POSITION="left" ID="ID_39"><icon BUILTIN="female1"/></node><node TEXT="Female2" POSITION="left" ID="ID_40"><icon BUILTIN="female2"/></node><node TEXT="Male1" POSITION="left" ID="ID_41"><icon BUILTIN="male1"/></node><node TEXT="Male2" POSITION="left" ID="ID_42"><icon BUILTIN="male2"/></node><node TEXT="Females" POSITION="left" ID="ID_43"/><node TEXT="Group" POSITION="left" ID="ID_44"><icon BUILTIN="group"/></node></node><node TEXT="Flags" POSITION="right" ID="ID_45" FOLDED="true"><node TEXT="Black" POSITION="right" ID="ID_46"/><node TEXT="Blue" POSITION="right" ID="ID_47"><icon BUILTIN="flag-blue"/></node><node TEXT="Green" POSITION="right" ID="ID_48"><icon BUILTIN="flag-green"/></node><node TEXT="Orange" POSITION="right" ID="ID_49"><icon BUILTIN="flag-orange"/></node><node TEXT="Pink" POSITION="right" ID="ID_50"><icon BUILTIN="flag-pink"/></node><node TEXT="Red" POSITION="right" ID="ID_51"/><node TEXT="Yellow" POSITION="right" ID="ID_52"><icon BUILTIN="flag-yellow"/></node></node><node TEXT="Time" POSITION="left" ID="ID_53" FOLDED="true"><node TEXT="Calendar" POSITION="left" ID="ID_54"><icon BUILTIN="calendar"/></node><node TEXT="Digial Clock" POSITION="left" ID="ID_55"><icon BUILTIN="clock"/></node><node TEXT="Hourglass" POSITION="left" ID="ID_56"><icon BUILTIN="hourglass"/></node></node><node TEXT="Suff" POSITION="right" ID="ID_57"><node TEXT="Broken" POSITION="right" ID="ID_58"/><node TEXT="WiseIcon" POSITION="right" ID="ID_59"/><node TEXT="ICQ/Flower" POSITION="right" ID="ID_60"><icon BUILTIN="licq"/></node><node TEXT="Linux/Pinguin" POSITION="right" ID="ID_61"><icon BUILTIN="penguin"/></node><node TEXT="Star" POSITION="right" ID="ID_62"><icon BUILTIN="bookmark"/></node><node TEXT="Reminder" POSITION="right" ID="ID_63"><icon BUILTIN="bell"/></node><node TEXT="Zoom" POSITION="right" ID="ID_64"><icon BUILTIN="xmag"/></node><node TEXT="Magic" POSITION="right" ID="ID_65"><icon BUILTIN="wizard"/></node><node TEXT="Music" POSITION="right" ID="ID_66"><icon BUILTIN="knotify"/></node><node TEXT="Pen" POSITION="right" ID="ID_67"><icon BUILTIN="pencil"/></node><node TEXT="Key" POSITION="right" ID="ID_68"><icon BUILTIN="password"/></node><node TEXT="House" POSITION="right" ID="ID_69"><icon BUILTIN="gohome"/></node><node TEXT="Phone" POSITION="right" ID="ID_70"><icon BUILTIN="kaddressbook"/></node><node TEXT="Do not Forget" POSITION="right" ID="ID_71"/><node TEXT="Bomb" POSITION="right" ID="ID_72"><icon BUILTIN="clanbomber"/></node><node TEXT="Clip" POSITION="right" ID="ID_73"><icon BUILTIN="attach"/></node></node><node TEXT="Mail" POSITION="left" ID="ID_74"><node TEXT="Envelop" POSITION="left" ID="ID_75"><icon BUILTIN="Mail"/></node><node TEXT="E-Mail" POSITION="left" ID="ID_76"/><node TEXT="List" POSITION="left" ID="ID_77"><icon BUILTIN="list"/></node><node TEXT="Refine" POSITION="left" ID="ID_78"><icon BUILTIN="edit"/></node><node TEXT="Mailbox" POSITION="left" ID="ID_79"><icon BUILTIN="korn"/></node></node></node></map>
\ No newline at end of file
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 b70e53c9..8312d1bf 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\"]},{\"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\": \"mail\", \"icons\" : [\"mail_envelop\",\"mail_mailbox\",\"mail_edit\"]},{\"id\": \"object\", \"icons\" : [\"object_penguin\",\"object_bell\",\"object_clanbomber\",\"object_key\",\"object_pencil\",\"object_phone\",\"object_magnifier\",\"object_clip\",\"object_music\",\"object_cd\",\"object_star\",\"object_wizard\",\"object_house\"]},]";
+    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\"]},]";
 
     @Test
     void checkImagesByFamily() throws IllegalAccessException {
@@ -60,7 +60,6 @@ public class IconsTest {
             result.append("]},");
         }
         result.append("]");
-        System.out.println(result.toString());
         Assert.assertEquals(result.toString(), CURRENT_JSON_ICONS, "Some change has been introduced in the icons library. Please, check the IconIcons.js and update the variable.mindplot.ImageIcon.prototype.ICON_FAMILIES");
 
     }