Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java,v
diff -u -r1.122 -r1.123
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	23 Oct 2014 11:55:10 -0000	1.122
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	16 Jan 2015 15:23:10 -0000	1.123
@@ -662,6 +662,9 @@
 		File svgFile = new File(svgPath);
 		if (svgFile.canRead()){
 		    FileUtils.copyFile(svgFile, new File(destinationPath));
+		    // remove the file as its icons refer to LAMS Community server instead of local resources
+		    // and should not be used in Monitoring
+		    svgFile.delete();
 		}
 		
 		destinationPath = FileUtil.getFullPath(contentDir, ExportToolContentService.PNG_IMAGE_FILE_NAME);
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java,v
diff -u -r1.32 -r1.33
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java	16 Jul 2014 20:17:16 -0000	1.32
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java	16 Jan 2015 15:23:10 -0000	1.33
@@ -389,9 +389,11 @@
 	}
 
 	String fileExtension;
-	if ((imageFormat == SVGGenerator.OUTPUT_FORMAT_SVG)
-		|| (imageFormat == SVGGenerator.OUTPUT_FORMAT_SVG_LAMS_COMMUNITY)) {
+	if (imageFormat == SVGGenerator.OUTPUT_FORMAT_SVG) {
 	    fileExtension = ".svg";
+	} else if (imageFormat == SVGGenerator.OUTPUT_FORMAT_SVG_LAMS_COMMUNITY){
+	    // mark it as a special version of SVG as it contains icons that refer to LAMS Community server
+	    fileExtension = ".export.svg";
 	} else {
 	    fileExtension = ".png";
 	}