Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java
===================================================================
diff -u -r412fe7a30d27bd7402ae872029af8dd655d4a638 -r50551b789065b93152949df172cb9c718962697e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 412fe7a30d27bd7402ae872029af8dd655d4a638)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 50551b789065b93152949df172cb9c718962697e)
@@ -397,6 +397,11 @@
 	    HttpServletResponse response) {
 	String sessionMapID = WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID);
 	((ImageGalleryItemForm) form).setSessionMapID(sessionMapID);
+	
+	// saveUsingLearningAction param is true in case request comes from learning or monitor and the we should use
+	// LearningAction's method to save uploaded image
+	boolean saveUsingLearningAction = WebUtil.readBooleanParam(request, "saveUsingLearningAction", false);
+	request.setAttribute("saveUsingLearningAction", saveUsingLearningAction);
 
 	return mapping.findForward("image");
     }
Index: lams_tool_images/web/includes/javascript/imageGalleryitem.js
===================================================================
diff -u -rb590efa8f4c159b483268a6b5f4417b6f16c37d9 -r50551b789065b93152949df172cb9c718962697e
--- lams_tool_images/web/includes/javascript/imageGalleryitem.js	(.../imageGalleryitem.js)	(revision b590efa8f4c159b483268a6b5f4417b6f16c37d9)
+++ lams_tool_images/web/includes/javascript/imageGalleryitem.js	(.../imageGalleryitem.js)	(revision 50551b789065b93152949df172cb9c718962697e)
@@ -71,7 +71,7 @@
         contentType: false,
     	success: function(data) {
     		//invoke callback function in case image was successfully uploaded
-    		imageUploadedCallback();
+    		imageUploadedCallback(data);
     	},
     	error: function(jqXHR, textStatus, errorMessage) {
     		$('#uploadButtons').show();
@@ -150,7 +150,7 @@
         contentType: false,
     	success: function(data) {
     		//invoke callback function in case image was successfully uploaded
-    		imageUploadedCallback();
+    		imageUploadedCallback(data);
     	},
     	error: function(jqXHR, textStatus, errorMessage) {
     		$('#uploadButtons').show();
Index: lams_tool_images/web/includes/javascript/uploadImageLearning.js
===================================================================
diff -u -rb590efa8f4c159b483268a6b5f4417b6f16c37d9 -r50551b789065b93152949df172cb9c718962697e
--- lams_tool_images/web/includes/javascript/uploadImageLearning.js	(.../uploadImageLearning.js)	(revision b590efa8f4c159b483268a6b5f4417b6f16c37d9)
+++ lams_tool_images/web/includes/javascript/uploadImageLearning.js	(.../uploadImageLearning.js)	(revision 50551b789065b93152949df172cb9c718962697e)
@@ -1,5 +1,5 @@
 //callback method that is invoked after image has been successfully uploaded to the server
-function imageUploadedCallback() {
+function imageUploadedCallback(data) {
    	self.parent.checkNew();
 }
         
Index: lams_tool_images/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r412fe7a30d27bd7402ae872029af8dd655d4a638 -r50551b789065b93152949df172cb9c718962697e
--- lams_tool_images/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 412fe7a30d27bd7402ae872029af8dd655d4a638)
+++ lams_tool_images/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 50551b789065b93152949df172cb9c718962697e)
@@ -43,7 +43,7 @@
         }
         
         //callback method that is invoked after image has been successfully uploaded to the server
-        function imageUploadedCallback() {
+        function imageUploadedCallback(data) {
         	$('#new-image-input-area').html(data);
         }
     </script>
Index: lams_tool_images/web/pages/authoring/parts/addimage.jsp
===================================================================
diff -u -rb590efa8f4c159b483268a6b5f4417b6f16c37d9 -r50551b789065b93152949df172cb9c718962697e
--- lams_tool_images/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision b590efa8f4c159b483268a6b5f4417b6f16c37d9)
+++ lams_tool_images/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision 50551b789065b93152949df172cb9c718962697e)
@@ -1,13 +1,13 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:choose>
-	<c:when test="${sessionMap.mode == 'author'}">
-		<c:set var="FORM_ACTION" value="/authoring/saveOrUpdateImage"/>
+	<c:when test="${saveUsingLearningAction}">
+		<c:set var="FORM_ACTION" value="/learning/saveNewImage.do"/>
 	</c:when>
 	<c:otherwise>
-		<c:set var="FORM_ACTION" value="/learning/saveNewImage.do"/>
+		<c:set var="FORM_ACTION" value="/authoring/saveOrUpdateImage"/>
 	</c:otherwise>
 </c:choose>
-				
+
 <html:form action="${FORM_ACTION}" method="post" styleId="imageGalleryItemForm" enctype="multipart/form-data">
 	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 	<c:set var="sessionMap"	value="${sessionScope[formBean.sessionMapID]}" />
@@ -54,7 +54,6 @@
 						<lams:STRUTS-textarea rows="5" tabindex="2" styleClass="text-area form-control" property="description" />
 					</c:otherwise>
 				</c:choose>
-				
 			</div>
 				
 			<div class="form-group">
Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp
===================================================================
diff -u -rb590efa8f4c159b483268a6b5f4417b6f16c37d9 -r50551b789065b93152949df172cb9c718962697e
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision b590efa8f4c159b483268a6b5f4417b6f16c37d9)
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 50551b789065b93152949df172cb9c718962697e)
@@ -103,7 +103,7 @@
 					</button>
 								
 					<c:if test="${not finishedLock}">
-						<button onclick="javascript:newImageInit('<html:rewrite page='/authoring/newImageInit.do'/>?sessionMapID=${sessionMapID}');"
+						<button onclick="javascript:newImageInit('<html:rewrite page='/authoring/newImageInit.do'/>?sessionMapID=${sessionMapID}&saveUsingLearningAction=true');"
 								class="btn btn-default btn-sm" id="add-new-image-button">  
 							<i class="fa fa-upload"></i> <fmt:message key="label.learning.add.new.image" />
 						</button>
Index: lams_tool_images/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rb590efa8f4c159b483268a6b5f4417b6f16c37d9 -r50551b789065b93152949df172cb9c718962697e
--- lams_tool_images/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision b590efa8f4c159b483268a6b5f4417b6f16c37d9)
+++ lams_tool_images/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 50551b789065b93152949df172cb9c718962697e)
@@ -229,7 +229,7 @@
 <div id="manage-image-buttons">
 	<div class="panel panel-default" >
 		<div class="panel-heading">
-			<button onclick="javascript:newImageInit('<html:rewrite page='/authoring/newImageInit.do'/>?sessionMapID=${sessionMapID}');"
+			<button onclick="javascript:newImageInit('<html:rewrite page='/authoring/newImageInit.do'/>?sessionMapID=${sessionMapID}&saveUsingLearningAction=true');"
 					class="btn btn-default btn-xs loffset5  " id="">  
 				<i class="fa fa-upload"></i> <fmt:message key="label.learning.add.new.image" />
 			</button>