diff --git a/mindplot/src/main/javascript/ImageIcon.js b/mindplot/src/main/javascript/ImageIcon.js
index 74de5e14..c1984e4d 100644
--- a/mindplot/src/main/javascript/ImageIcon.js
+++ b/mindplot/src/main/javascript/ImageIcon.js
@@ -36,7 +36,7 @@ mindplot.ImageIcon = function(iconModel, topic, designer) {
 
     var container = new Element('div');
     var removeImage = new Element('img');
-    removeImage.src = "../icons/bin.png";
+    removeImage.src = "../images/bin.png";
     removeImage.inject(container);
 
     if (!designer._viewMode)
@@ -286,17 +286,17 @@ mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_PIN
 mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_YELLOW] = "../icons/tag_yellow.png";
 mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_TAG_PURPLE] = "../icons/tag_purple.png";
 //FACES
-mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_ANGEL] = "../icons/face-angel.png";
-mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_DEVIL] = "../icons/face-devilish.png";
-mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_GLASSES] = "../icons/face-glasses.png";
-mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_KISS] = "../icons/face-kiss.png";
-mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_MONKEY] = "../icons/face-monkey.png";
-mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_PLAIN] = "../icons/face-plain.png";
-mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_CRYING] = "../icons/face-crying.png";
-mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_SAD] = "../icons/face-sad.png";
-mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_SMILE] = "../icons/face-smile.png";
-mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_SURPRISE] = "../icons/face-surprise.png";
-mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_WINK] = "../icons/face-wink.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_ANGEL] = "../icons/face-_angel.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_DEVIL] = "../icons/face_devilish.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_GLASSES] = "../icons/face_glasses.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_KISS] = "../icons/face_kiss.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_FUNY_MONKEY] = "../icons/face_monkey.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_PLAIN] = "../icons/face_plain.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_CRYING] = "../icons/face_crying.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_SAD] = "../icons/face_sad.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_SMILE] = "../icons/face_smile.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_SURPRISE] = "../icons/face_surprise.png";
+mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_FACE_WINK] = "../icons/face_wink.png";
 
 //ARROWS
 mindplot.ImageIcon.prototype.ICON_IMAGE_MAP[mindplot.ImageIcon.ICON_TYPE_ARROW_UP] = "../icons/arrow_up.png";
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 56a6f4bf..84b88ced 100755
--- a/wise-webapp/src/main/java/com/wisemapping/model/IconFamily.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/IconFamily.java
@@ -24,7 +24,6 @@ public enum IconFamily {
     TAG("TAG","tag_"),
     NUMBER("NUMBER","number_"),
     SMILEY("FACE","face_"),
-    FACE_FUNY("FACEFUNY","facefuny_"),
     ARROW("ARROW","arrow_"),
     ARROWC("ARROWC","arrowc_"),
     CONN("CONN","conn_"),
diff --git a/wise-webapp/src/main/webapp/icons/face-angel.png b/wise-webapp/src/main/webapp/icons/face_angel.png
similarity index 100%
rename from wise-webapp/src/main/webapp/icons/face-angel.png
rename to wise-webapp/src/main/webapp/icons/face_angel.png
diff --git a/wise-webapp/src/main/webapp/icons/face-crying.png b/wise-webapp/src/main/webapp/icons/face_crying.png
similarity index 100%
rename from wise-webapp/src/main/webapp/icons/face-crying.png
rename to wise-webapp/src/main/webapp/icons/face_crying.png
diff --git a/wise-webapp/src/main/webapp/icons/face-devilish.png b/wise-webapp/src/main/webapp/icons/face_devilish.png
similarity index 100%
rename from wise-webapp/src/main/webapp/icons/face-devilish.png
rename to wise-webapp/src/main/webapp/icons/face_devilish.png
diff --git a/wise-webapp/src/main/webapp/icons/face-glasses.png b/wise-webapp/src/main/webapp/icons/face_glasses.png
similarity index 100%
rename from wise-webapp/src/main/webapp/icons/face-glasses.png
rename to wise-webapp/src/main/webapp/icons/face_glasses.png
diff --git a/wise-webapp/src/main/webapp/icons/face-grin.png b/wise-webapp/src/main/webapp/icons/face_grin.png
similarity index 100%
rename from wise-webapp/src/main/webapp/icons/face-grin.png
rename to wise-webapp/src/main/webapp/icons/face_grin.png
diff --git a/wise-webapp/src/main/webapp/icons/face-kiss.png b/wise-webapp/src/main/webapp/icons/face_kiss.png
similarity index 100%
rename from wise-webapp/src/main/webapp/icons/face-kiss.png
rename to wise-webapp/src/main/webapp/icons/face_kiss.png
diff --git a/wise-webapp/src/main/webapp/icons/face-monkey.png b/wise-webapp/src/main/webapp/icons/face_monkey.png
similarity index 100%
rename from wise-webapp/src/main/webapp/icons/face-monkey.png
rename to wise-webapp/src/main/webapp/icons/face_monkey.png
diff --git a/wise-webapp/src/main/webapp/icons/face-plain.png b/wise-webapp/src/main/webapp/icons/face_plain.png
similarity index 100%
rename from wise-webapp/src/main/webapp/icons/face-plain.png
rename to wise-webapp/src/main/webapp/icons/face_plain.png
diff --git a/wise-webapp/src/main/webapp/icons/face-sad.png b/wise-webapp/src/main/webapp/icons/face_sad.png
similarity index 100%
rename from wise-webapp/src/main/webapp/icons/face-sad.png
rename to wise-webapp/src/main/webapp/icons/face_sad.png
diff --git a/wise-webapp/src/main/webapp/icons/face-smile-big.png b/wise-webapp/src/main/webapp/icons/face_smile-big.png
similarity index 100%
rename from wise-webapp/src/main/webapp/icons/face-smile-big.png
rename to wise-webapp/src/main/webapp/icons/face_smile-big.png
diff --git a/wise-webapp/src/main/webapp/icons/face-smile.png b/wise-webapp/src/main/webapp/icons/face_smile.png
similarity index 100%
rename from wise-webapp/src/main/webapp/icons/face-smile.png
rename to wise-webapp/src/main/webapp/icons/face_smile.png
diff --git a/wise-webapp/src/main/webapp/icons/face-surprise.png b/wise-webapp/src/main/webapp/icons/face_surprise.png
similarity index 100%
rename from wise-webapp/src/main/webapp/icons/face-surprise.png
rename to wise-webapp/src/main/webapp/icons/face_surprise.png
diff --git a/wise-webapp/src/main/webapp/icons/face-wink.png b/wise-webapp/src/main/webapp/icons/face_wink.png
similarity index 100%
rename from wise-webapp/src/main/webapp/icons/face-wink.png
rename to wise-webapp/src/main/webapp/icons/face_wink.png
diff --git a/wise-webapp/src/main/webapp/images/ruby.png b/wise-webapp/src/main/webapp/images/ruby.png
deleted file mode 100755
index f763a168..00000000
Binary files a/wise-webapp/src/main/webapp/images/ruby.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/tick.png b/wise-webapp/src/main/webapp/images/tick.png
deleted file mode 100755
index a9925a06..00000000
Binary files a/wise-webapp/src/main/webapp/images/tick.png and /dev/null differ
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
new file mode 100644
index 00000000..4bb5f547
--- /dev/null
+++ b/wise-webapp/src/test/java/com/wisemapping/test/model/IconsTest.java
@@ -0,0 +1,47 @@
+package com.wisemapping.test.model;
+
+
+import com.wisemapping.model.IconFamily;
+import com.wisemapping.model.MindmapIcon;
+import com.wisemapping.model.MindmapIcons;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.util.List;
+
+@Test
+public class IconsTest {
+    @Test
+    void checkImagesByFamily() throws IllegalAccessException {
+        List<MindmapIcon> iconByFamily = MindmapIcons.getIconByFamily(IconFamily.BULLET);
+        Assert.assertEquals(iconByFamily.size(), 7);
+    }
+
+
+    @Test
+    void checkPngFile() throws IllegalAccessException {
+
+        IconFamily[] values = IconFamily.values();
+        for (IconFamily family : values) {
+            final List<MindmapIcon> iconByFamily = MindmapIcons.getIconByFamily(family);
+            for (MindmapIcon mindmapIcon : iconByFamily) {
+                final String pngName = mindmapIcon.getId() + ".png";
+                File file = new File("src/main/webapp/icons/", pngName);
+                if (!file.exists()) {
+                    System.err.println("File not found:" + pngName);
+                }
+//                else {
+//                    System.err.println("Found:" + pngName);
+//                }
+
+            }
+
+
+        }
+
+
+    }
+
+
+}
diff --git a/wise-webapp/src/test/java/com/wisemapping/test/model/ImagesTest.java b/wise-webapp/src/test/java/com/wisemapping/test/model/ImagesTest.java
deleted file mode 100644
index e01a518e..00000000
--- a/wise-webapp/src/test/java/com/wisemapping/test/model/ImagesTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.wisemapping.test.model;
-
-
-import com.wisemapping.model.IconFamily;
-import com.wisemapping.model.MindmapIcon;
-import com.wisemapping.model.MindmapIcons;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.util.List;
-
-@Test
-public class ImagesTest {
-    @Test
-    void checkImagesByFamily() throws IllegalAccessException {
-        List<MindmapIcon> iconByFamily = MindmapIcons.getIconByFamily(IconFamily.BULLET);
-        Assert.assertEquals(iconByFamily.size(), 7);
-    }
-
-}