Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java,v
diff -u -r1.47 -r1.48
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	2 Jul 2015 21:39:04 -0000	1.47
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	27 Jul 2015 19:54:13 -0000	1.48
@@ -909,20 +909,30 @@
 	
 	for (LinkedHashSet<AssessmentQuestion> questionsForOnePage : pagedQuestions) {
 	    for (AssessmentQuestion question : questionsForOnePage) {
+		
+		//find corresponding questionResult
 		for (AssessmentQuestionResult questionResult : result.getQuestionResults()) {
 		    if (question.getUid().equals(questionResult.getAssessmentQuestion().getUid())) {
+			
+			//copy questionResult's info to the question
 			question.setMark(questionResult.getMark());
 			question.setResponseSubmitted(questionResult.getFinishDate() != null);
 			question.setPenalty(questionResult.getPenalty());
-
 			question.setQuestionFeedback(null);
 			for (AssessmentQuestionOption option : question.getOptions()) {
 			    if (option.getUid().equals(questionResult.getSubmittedOptionUid())) {
 				question.setQuestionFeedback(option.getFeedback());
 				break;
 			    }
 			}
+			//required for showing right/wrong answers icons on results page correctly 
+			if (question.getType() == AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER
+				|| question.getType() == AssessmentConstants.QUESTION_TYPE_NUMERICAL) {
+			    boolean isAnsweredCorrectly = questionResult.getSubmittedOptionUid() != null;
+			    question.setAnswerBoolean(isAnsweredCorrectly);
+			}
 
+			//required for markandpenalty area and if it's on - on question's summary page
 			List<Object[]> questionResults = service.getAssessmentQuestionResultList(assessment.getUid(),
 				userId, question.getUid());
 			question.setQuestionResults(questionResults);
Index: lams_tool_assessment/web/pages/learning/parts/numerical.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/parts/numerical.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_assessment/web/pages/learning/parts/numerical.jsp	26 Jul 2014 00:00:05 -0000	1.11
+++ lams_tool_assessment/web/pages/learning/parts/numerical.jsp	27 Jul 2015 19:54:13 -0000	1.12
@@ -9,10 +9,10 @@
 		<c:if test="${finishedLock}">
 			<td class="complete-item-gif">
 			
-				<c:if test="${assessment.allowRightAnswersAfterQuestion && (question.mark > 0)}">
+				<c:if test="${assessment.allowRightAnswersAfterQuestion && question.answerBoolean}">
 					<img src="<html:rewrite page='/includes/images/completeitem.gif'/>">	
 				</c:if>			
-				<c:if test="${assessment.allowWrongAnswersAfterQuestion && !(question.mark > 0)}">
+				<c:if test="${assessment.allowWrongAnswersAfterQuestion && !question.answerBoolean}">
 					<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>">
 				</c:if>
 				
Index: lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp	26 Jul 2014 00:00:05 -0000	1.11
+++ lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp	27 Jul 2015 19:54:13 -0000	1.12
@@ -6,23 +6,24 @@
 
 <table class="question-table">
 	<tr>
+	
 		<c:if test="${finishedLock}">
 			<td class="complete-item-gif">
-			
-				<c:if test="${assessment.allowRightAnswersAfterQuestion && (question.mark > 0)}">
+				<c:if test="${assessment.allowRightAnswersAfterQuestion && question.answerBoolean}">
 					<img src="<html:rewrite page='/includes/images/completeitem.gif'/>">	
 				</c:if>			
-				<c:if test="${assessment.allowWrongAnswersAfterQuestion && !(question.mark > 0)}">
+				<c:if test="${assessment.allowWrongAnswersAfterQuestion && !question.answerBoolean}">
 					<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>">
-				</c:if>			
-		
-			</td>		
+				</c:if>	
+			</td>
 		</c:if>	
+		
 		<td class="reg-padding">
 			<input type="text" name="question${status.index}" value="<c:out value='${question.answerString}' />" styleClass="noBorder" size="70"
 				<c:if test="${isEditingDisabled}">disabled="disabled"</c:if>
 			/>	
 		</td>
+		
 	</tr>
 </table>