diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java b/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java
index 831a75ff..8f0d5413 100644
--- a/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java
+++ b/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java
@@ -213,7 +213,7 @@ public class ExporterFactory {
                 int index = imgUrl.lastIndexOf("/");
                 elem.removeAttribute("href");
                 if (index != -1) {
-                    final String iconName = imgUrl.substring(index);
+                    final String iconName = imgUrl.substring(index+1);
                     // Hack for backward compatibility . This can be removed in 2012. :)
                     String imgPath;
                     if (imgUrl.contains("images")) {
diff --git a/wise-webapp/src/main/webapp/images/add.png b/wise-webapp/src/main/webapp/images/add.png
new file mode 100755
index 00000000..6332fefe
Binary files /dev/null and b/wise-webapp/src/main/webapp/images/add.png differ
diff --git a/wise-webapp/src/main/webapp/images/chart_curve.png b/wise-webapp/src/main/webapp/images/chart_curve.png
new file mode 100755
index 00000000..01e933a6
Binary files /dev/null and b/wise-webapp/src/main/webapp/images/chart_curve.png differ
diff --git a/wise-webapp/src/main/webapp/images/connect.png b/wise-webapp/src/main/webapp/images/connect.png
new file mode 100755
index 00000000..024138eb
Binary files /dev/null and b/wise-webapp/src/main/webapp/images/connect.png differ
diff --git a/wise-webapp/src/main/webapp/images/lightbulb.png b/wise-webapp/src/main/webapp/images/lightbulb.png
new file mode 100755
index 00000000..d22fde8b
Binary files /dev/null and b/wise-webapp/src/main/webapp/images/lightbulb.png differ
diff --git a/wise-webapp/src/main/webapp/images/money.png b/wise-webapp/src/main/webapp/images/money.png
new file mode 100755
index 00000000..42c52d05
Binary files /dev/null and b/wise-webapp/src/main/webapp/images/money.png differ
diff --git a/wise-webapp/src/main/webapp/images/note.png b/wise-webapp/src/main/webapp/images/note.png
new file mode 100644
index 00000000..ffea2b8b
Binary files /dev/null and b/wise-webapp/src/main/webapp/images/note.png differ
diff --git a/wise-webapp/src/main/webapp/images/thumb_up.png b/wise-webapp/src/main/webapp/images/thumb_up.png
new file mode 100755
index 00000000..2bd16ccf
Binary files /dev/null and b/wise-webapp/src/main/webapp/images/thumb_up.png differ
diff --git a/wise-webapp/src/main/webapp/images/world_link.png b/wise-webapp/src/main/webapp/images/world_link.png
new file mode 100755
index 00000000..b8edc126
Binary files /dev/null and b/wise-webapp/src/main/webapp/images/world_link.png differ