Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
diff -u -rd91247d69fe0a8fe3fe1750a0de83d5010fc6ad0 -r4e1b8dc9d2b7895783a8d17465d080e342ad2247
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision d91247d69fe0a8fe3fe1750a0de83d5010fc6ad0)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision 4e1b8dc9d2b7895783a8d17465d080e342ad2247)
@@ -79,6 +79,10 @@
     public static final String ATTR_RESOURCE_REVIEW_URL = "resourceItemReviewUrl";
 
     public static final String ATTR_IS_DOWNLOAD = "isDownload";
+    
+    public static final String ATTR_IS_DISPLAYABLE_IMAGE = "isDisplayableImage";
+    
+    public static final String ATTR_IS_DISPLAYABLE_EMBED = "isDisplayableEmbed";
 
     public static final String ATTR_RESOURCE = "resource";
 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java
===================================================================
diff -u -rd91247d69fe0a8fe3fe1750a0de83d5010fc6ad0 -r4e1b8dc9d2b7895783a8d17465d080e342ad2247
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java	(.../ViewItemController.java)	(revision d91247d69fe0a8fe3fe1750a0de83d5010fc6ad0)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java	(.../ViewItemController.java)	(revision 4e1b8dc9d2b7895783a8d17465d080e342ad2247)
@@ -56,6 +56,9 @@
     @Autowired
     private IResourceService resourceService;
 
+    private static final Set<String> DISPLAYABLE_IMAGE_EXTENSIONS = Set.of(".jpg", ".jpeg", ".png", ".gif", ".bmp");
+    private static final Set<String> DISPLAYABLE_EMBED_EXTENSIONS = Set.of(".pdf");
+
     /**
      * Display main frame to display item content in monitoring
      */
@@ -131,10 +134,21 @@
 	    return "error";
 	}
 
+	boolean isDownload = item.getType() == ResourceConstants.RESOURCE_TYPE_FILE;
+	request.setAttribute(ResourceConstants.ATTR_IS_DOWNLOAD, isDownload);
+	String lowercaseFileName = isDownload && StringUtils.isNotBlank(item.getFileName())
+		? item.getFileName().toLowerCase()
+		: null;
+	boolean isDisplayableImage = lowercaseFileName != null
+		&& DISPLAYABLE_IMAGE_EXTENSIONS.stream().anyMatch(ext -> lowercaseFileName.endsWith(ext));
+	request.setAttribute(ResourceConstants.ATTR_IS_DISPLAYABLE_IMAGE, isDisplayableImage);
+	boolean isDisplayableEmbed = lowercaseFileName != null
+		&& DISPLAYABLE_EMBED_EXTENSIONS.stream().anyMatch(ext -> lowercaseFileName.endsWith(ext));
+	request.setAttribute(ResourceConstants.ATTR_IS_DISPLAYABLE_EMBED, isDisplayableEmbed);
+
 	String reviewUrl = getReviewUrl(item, sessionMapID);
 	request.setAttribute(ResourceConstants.ATTR_RESOURCE_REVIEW_URL, reviewUrl);
-	request.setAttribute(ResourceConstants.ATTR_IS_DOWNLOAD,
-		item.getType() == ResourceConstants.RESOURCE_TYPE_FILE);
+
 	request.setAttribute(ResourceConstants.ATTR_RESOURCE_INSTRUCTION, item.getInstructions());
 	request.setAttribute(ResourceConstants.ATTR_ALLOW_COMMENTS, item.isAllowComments());
 	request.setAttribute(ResourceConstants.ATTR_ALLOW_RATING, item.isAllowRating());
@@ -228,7 +242,7 @@
 		}
 		break;
 	    case ResourceConstants.RESOURCE_TYPE_FILE:
-		url = "/download/?uuid=" + item.getFileUuid() + "&preferDownload=true";
+		url = "/download/?uuid=" + item.getFileUuid();
 		break;
 	}
 	return url;
Index: lams_tool_larsrc/web/pages/itemreview/itemContent.jsp
===================================================================
diff -u -re14fec2fc48a58cfcabe375deb903a3cecfabe3f -r4e1b8dc9d2b7895783a8d17465d080e342ad2247
--- lams_tool_larsrc/web/pages/itemreview/itemContent.jsp	(.../itemContent.jsp)	(revision e14fec2fc48a58cfcabe375deb903a3cecfabe3f)
+++ lams_tool_larsrc/web/pages/itemreview/itemContent.jsp	(.../itemContent.jsp)	(revision 4e1b8dc9d2b7895783a8d17465d080e342ad2247)
@@ -70,7 +70,7 @@
 	
 	<div class="content-panel">
 		<div class="text-center">
-			<a href="<c:url value='${resourceItemReviewUrl}' />" class="download-button hidden btn btn-primary">
+			<a href="<c:url value='${resourceItemReviewUrl}' />&preferDownload=true" class="download-button hidden btn btn-primary">
 				<fmt:message key="label.download" />
 			</a>
 			<a href="${resourceItemReviewUrl}" target="_blank" class="embedded-open-button hidden btn btn-default btn-sm pull-right">
@@ -82,6 +82,13 @@
 		<i title="<fmt:message key='open.in.new.window' />" class="new-window-icon fa fa-1 hidden fa-external-link" aria-hidden="true"></i>
 		<div class="embedded-description"></div>
 		<div class="embedded-content"></div>
+		
+		<c:if test="${isDisplayableImage}">
+			<img src="<c:url value='${resourceItemReviewUrl}' />&preferDownload=false" class="embedded-image" />
+		</c:if>
+		<c:if test="${isDisplayableEmbed}">
+			<embed src="<c:url value='${resourceItemReviewUrl}' />&preferDownload=false" class="embedded-file"  />
+		</c:if>
 	</div>
 	<hr>
 	<c:if test="${mode eq 'learner' or mode eq 'author'}">
Index: lams_tool_larsrc/web/pages/itemreview/mainframe.jsp
===================================================================
diff -u -r481ed8ec5d8be97b26fe79e8699f5b1da423af37 -r4e1b8dc9d2b7895783a8d17465d080e342ad2247
--- lams_tool_larsrc/web/pages/itemreview/mainframe.jsp	(.../mainframe.jsp)	(revision 481ed8ec5d8be97b26fe79e8699f5b1da423af37)
+++ lams_tool_larsrc/web/pages/itemreview/mainframe.jsp	(.../mainframe.jsp)	(revision 4e1b8dc9d2b7895783a8d17465d080e342ad2247)
@@ -26,6 +26,20 @@
 	 	.embedded-description {
 	 		padding: 0.5em;
 	 	}
+	 	
+	 	.embedded-file {
+	 		text-align: center;
+	 		margin: auto;
+	 	}
+	 	
+	 	.embedded-file img {
+	 		max-width: 800px;
+	 	}
+	 	
+	 	.embedded-file embed {
+	 		width: 800px;
+	 		min-height: 600px;
+	 	}
 	</style>
 
 	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -r48bba38252989321a2cf02ada0b76f8b765b4542 -r4e1b8dc9d2b7895783a8d17465d080e342ad2247
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 48bba38252989321a2cf02ada0b76f8b765b4542)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 4e1b8dc9d2b7895783a8d17465d080e342ad2247)
@@ -35,7 +35,21 @@
 	 	.embedded-description {
 	 		padding: 0.5em;
 	 	}
+	 		 	
+	 	.embedded-file {
+	 		text-align: center;
+	 		margin: auto;
+	 	}
 	 	
+	 	.embedded-file img {
+	 		max-width: 800px;
+	 	}
+	 	
+	 	.embedded-file embed {
+	 		width: 800px;
+	 		min-height: 600px;
+	 	}
+	 	
 	 	.delete-item-button {
 	 		margin-left: 5px;
 	 		cursor: pointer;