Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
diff -u -rac7bf84996976633e737878c62b1d9b818a990d5 -r9bb68cb1df5f57c18e966963fd308e9a82743671
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision ac7bf84996976633e737878c62b1d9b818a990d5)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision 9bb68cb1df5f57c18e966963fd308e9a82743671)
@@ -191,8 +191,6 @@
 			// create svg, png files on the server
 			getLearningDesignService().createLearningDesignSVG(learningDesignId,
 				SVGGenerator.OUTPUT_FORMAT_SVG);
-			getLearningDesignService().createLearningDesignSVG(learningDesignId,
-				SVGGenerator.OUTPUT_FORMAT_PNG);
 		    }
 		}
 		return mapping.findForward("lessonIntro");
@@ -419,7 +417,7 @@
 	    HttpServletResponse res) throws JDOMException, IOException, TranscoderException {
 	Long learningDesignId = WebUtil.readLongParam(req, CentralConstants.PARAM_LEARNING_DESIGN_ID);
 	Integer format = WebUtil.readIntParam(req, CentralConstants.PARAM_SVG_FORMAT, true);
-	format = format == null ? SVGGenerator.OUTPUT_FORMAT_PNG : format;
+	format = format == null ? SVGGenerator.OUTPUT_FORMAT_SVG : format;
 	Long branchingActivityId = WebUtil.readLongParam(req, "branchingActivityID", true);
 	boolean download = WebUtil.readBooleanParam(req, "download", false);
 	String imagePath = null;
@@ -433,12 +431,12 @@
 	if (download) {
 	    String name = getLearningDesignService()
 		    .getLearningDesignDTO(learningDesignId, getUser().getLocaleLanguage()).getTitle();
-	    name += "." + (format == SVGGenerator.OUTPUT_FORMAT_PNG ? "png" : "svg");
+	    name += "." + "svg";
 	    name = FileUtil.encodeFilenameForDownload(req, name);
 	    res.setContentType("application/x-download");
 	    res.setHeader("Content-Disposition", "attachment;filename=" + name);
 	} else {
-	    res.setContentType(format == SVGGenerator.OUTPUT_FORMAT_PNG ? "image/png" : "image/svg+xml");
+	    res.setContentType("image/svg+xml");
 	}
 	OutputStream output = res.getOutputStream();
 	FileInputStream input = new FileInputStream(imagePath);
Index: lams_central/web/addLesson.jsp
===================================================================
diff -u -r06c6921e9173ff630c99268f69463adf1a5e4834 -r9bb68cb1df5f57c18e966963fd308e9a82743671
--- lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 06c6921e9173ff630c99268f69463adf1a5e4834)
+++ lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 9bb68cb1df5f57c18e966963fd308e9a82743671)
@@ -28,7 +28,7 @@
 			users = ${users},
 			
 			LAMS_URL = '<lams:LAMSURL/>',
-			LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home.do?method=createLearningDesignThumbnail&ldId=',
+			LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home.do?method=createLearningDesignThumbnail&svgFormat=1&ldId=',
 			
 			CANVAS_RESIZE_OPTION_NONE = 0,
 			CANVAS_RESIZE_OPTION_FIT = 1,
Index: lams_central/web/includes/javascript/addLesson.js
===================================================================
diff -u -rdbdc1eb50ed95e921d27000b8d5d52ff9058e5e5 -r9bb68cb1df5f57c18e966963fd308e9a82743671
--- lams_central/web/includes/javascript/addLesson.js	(.../addLesson.js)	(revision dbdc1eb50ed95e921d27000b8d5d52ff9058e5e5)
+++ lams_central/web/includes/javascript/addLesson.js	(.../addLesson.js)	(revision 9bb68cb1df5f57c18e966963fd308e9a82743671)
@@ -14,7 +14,7 @@
 		// show the thumbnail
 		$('#ldScreenshotAuthor').css('display', 'inline');
 		// resize if needed
-		var resized = resizeImage('ldScreenshotAuthor', 477, null);
+		var resized = resizeImage('ldScreenshotAuthor', 477);
 		toggleCanvasResize(resized ? CANVAS_RESIZE_OPTION_FIT
 				: CANVAS_RESIZE_OPTION_NONE);
 	});
@@ -318,19 +318,19 @@
 
 // ********** LESSON TAB FUNCTIONS **********
 
-function resizeImage(id, width, height) {
-	var resized = false;
-	var elem = $('#' + id);
-
-	if (width != null && elem.width() > width) {
-		elem.css('width', width);
-		resized = true;
+function resizeImage(id, width) {
+	var elem = $('#' + id),
+		elemWidth = elem.width();
+	
+	if (width != null && elemWidth > width) {
+		elem.css({
+			'width'  : width,
+			// compute ratio same as width change
+			'height' : Math.round(elem.height() * (width / elemWidth))
+		});
+		return true;
 	}
-	if (height != null && elem.height() > height) {
-		elem.css('height', height);
-		resized = true;
-	}
-	return resized;
+	return false;
 }
 
 
@@ -349,7 +349,7 @@
 					toggleCanvasResize(CANVAS_RESIZE_OPTION_FULL)
 				});
 		toggleCanvasResizeLink.css('display', 'inline');
-		resizeImage('ldScreenshotAuthor', 477, null);
+		resizeImage('ldScreenshotAuthor', 477);
 		break;
 	case CANVAS_RESIZE_OPTION_FULL:
 		toggleCanvasResizeLink.html(CANVAS_RESIZE_LABEL_FIT).one('click',
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -r6f765690f68ed125b45563796ce4501e2e002417 -r9bb68cb1df5f57c18e966963fd308e9a82743671
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 6f765690f68ed125b45563796ce4501e2e002417)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 9bb68cb1df5f57c18e966963fd308e9a82743671)
@@ -2544,7 +2544,7 @@
 						});
 					});
 					
-					GeneralLib.saveLearningDesignImages();
+					GeneralLib.saveLearningDesignImage();
 					
 					if (response.validation.length == 0) {
 						alert(LABELS.SAVE_SUCCESSFUL);
@@ -2566,9 +2566,9 @@
 	
 	
 	/**
-	 * Stores SVG and PNG LD thumbnails on server.
+	 * Stores SVG LD thumbnail on server.
 	 */
-	saveLearningDesignImages : function() {
+	saveLearningDesignImage : function() {
 		$.ajax({
 			type : 'POST',
 			url : LAMS_URL + 'authoring/author.do',
@@ -2579,16 +2579,6 @@
 				'image' : MenuLib.exportSVG()
 			}
 		});
-		$.ajax({
-			type : 'POST',
-			url : LAMS_URL + 'authoring/author.do',
-			data : {
-				'method' : 'saveLearningDesignImage',
-				'learningDesignID' : layout.ld.learningDesignID,
-				'extension' : 'PNG',
-				'image' : MenuLib.exportPNG()
-			}
-		});
 	},
 	
 
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
diff -u -r9cbdee7e760314789856424c9b4e8e4e4fb70db7 -r9bb68cb1df5f57c18e966963fd308e9a82743671
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision 9cbdee7e760314789856424c9b4e8e4e4fb70db7)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision 9bb68cb1df5f57c18e966963fd308e9a82743671)
@@ -193,8 +193,6 @@
 
     public static final String SVG_IMAGE_FILE_NAME = "learning_design.svg";
 
-    public static final String PNG_IMAGE_FILE_NAME = "learning_design.png";
-
     private static final String ERROR_TOOL_NOT_FOUND = "error.import.matching.tool.not.found";
 
     private static final String ERROR_SERVICE_ERROR = "error.import.tool.service.fail";
@@ -656,13 +654,6 @@
 		    // and should not be used in Monitoring
 		    svgFile.delete();
 		}
-
-		destinationPath = FileUtil.getFullPath(contentDir, ExportToolContentService.PNG_IMAGE_FILE_NAME);
-		String pngPath = service.createLearningDesignSVG(learningDesignId, SVGGenerator.OUTPUT_FORMAT_PNG);
-		File pngFile = new File(pngPath);
-		if (pngFile.canRead()) {
-		    FileUtils.copyFile(pngFile, new File(destinationPath));
-		}
 	    }
 
 	    log.debug("Learning design xml export success");