diff --git a/wise-webapp/src/main/java/com/wisemapping/controller/ExportController.java b/wise-webapp/src/main/java/com/wisemapping/controller/ExportController.java
index 0feb446f..dc51bd8e 100644
--- a/wise-webapp/src/main/java/com/wisemapping/controller/ExportController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/controller/ExportController.java
@@ -131,7 +131,7 @@ public class ExportController extends BaseMultiActionController {
             baseUrl = "http://www.wisemapping.com/images";
         } else {
             final ServletContext servletContext = this.getServletContext();
-            baseUrl = "file://" + servletContext.getRealPath("/icons/");
+            baseUrl = "file://" + servletContext.getRealPath("/icons/")+"/";
         }
         properties.setBaseImagePath(baseUrl);
     }
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 e32a9d23..9b9af051 100644
--- a/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java
+++ b/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java
@@ -286,7 +286,8 @@ public class ExporterFactory {
 
         // Add namespace...
         result = result.replaceFirst("<svg ", "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" ");
-        result = result.replaceAll("/<image([^>]+)//?>/", "<image$1></image>");
+        result = result.replaceAll("<image([^>]+)>", "<image$1/>");
+        result = result.replaceAll("<image([^>]+)//+>", "<image$1></image>");
         return result.toCharArray();
     }