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 e47417f9..1435b672 100644
--- a/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java
+++ b/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java
@@ -215,9 +215,9 @@ public class ExporterFactory {
                     // Hack for backward compatibility . This can be removed in 2012. :)
                     String imgPath;
                     if (imgUrl.contains("images")) {
-                        imgPath = imgBaseUrl + "../images/" + iconName;
+                        imgPath = imgBaseUrl + "/../images/" + iconName;
                     } else {
-                        imgPath = imgBaseUrl + imgUrl;
+                        imgPath = imgBaseUrl + "/" + imgUrl;
                     }
                     elem.setAttribute("xlink:href", imgPath);
                     elem.appendChild(document.createTextNode(" "));
diff --git a/wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java b/wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java
index 0d074cd3..fd1e27f3 100644
--- a/wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java
+++ b/wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java
@@ -42,7 +42,7 @@ public class ExportTest {
         final ExportProperties properties = ExportProperties.create(format);
         final ExportProperties.ImageProperties imageProperties = (ExportProperties.ImageProperties) properties;
         imageProperties.setSize(ExportProperties.ImageProperties.Size.LARGE);
-        String baseUrl = "file://"+svgFile.getParentFile().getAbsolutePath()+"/../../../main/webapp/icons/";
+        String baseUrl = "file://"+svgFile.getParentFile().getAbsolutePath()+"/../../../main/webapp/icons";
         properties.setBaseImagePath(baseUrl);
 
         // Write content ...