Index: lams_tool_assessment/web/includes/css/assessment.css
===================================================================
diff -u -r3900618a37feede0762b63edea137223d4f19721 -rdbc7ce0bc9f424c489eea4f884879f052dd867f2
--- lams_tool_assessment/web/includes/css/assessment.css	(.../assessment.css)	(revision 3900618a37feede0762b63edea137223d4f19721)
+++ lams_tool_assessment/web/includes/css/assessment.css	(.../assessment.css)	(revision dbc7ce0bc9f424c489eea4f884879f052dd867f2)
@@ -144,22 +144,15 @@
 
 #pager {
 	text-align: center; 
-	padding-top: 60px;
+	font-size: 110%;
 }
 #pager a{
 	margin-left: 10px; 
-	font-size: 130%;
 }
 .color-red {
 	color: red;
 }
 
-.warning-answer-required {
-	background-color: bisque !important;
-	background-image: none !important;
-	border-bottom: 1px solid white !important;
-}
-
 #warning-answers-required, #warning-words-limit, #warning-mark-hedging-wrong-total, .hidden {
 	display: none;
 }
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -r3900618a37feede0762b63edea137223d4f19721 -rdbc7ce0bc9f424c489eea4f884879f052dd867f2
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 3900618a37feede0762b63edea137223d4f19721)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision dbc7ce0bc9f424c489eea4f884879f052dd867f2)
@@ -300,7 +300,7 @@
 				url: "<c:url value='/learning/submitSingleMarkHedgingQuestion.do'/>?sessionMapID=${sessionMapID}&singleMarkHedgingQuestionUid=" + singleMarkHedgingQuestionUid +"&questionIndex="+ questionIndex +"&date=" + new Date().getTime(),
 				target: '#mark-hedging-question-' + singleMarkHedgingQuestionUid,
                 success: function() {
-                	$('#question-area-' + questionIndex).removeClass('warning-answer-required');
+                	$('#question-area-' + questionIndex).removeClass('bg-warning');
                 }
 			});
 		}		
@@ -473,44 +473,44 @@
 				return true;
 				
 			} else {
-				//remove .warning-answer-required from all questions
-				$('[id^=question-area-]').removeClass('warning-answer-required');
+				//remove .bg-warning from all questions
+				$('[id^=question-area-]').removeClass('bg-warning');
 				$('#warning-answers-required').hide();
 				$('#warning-words-limit').hide();
 				$('#warning-mark-hedging-wrong-total').hide();
 				
 				if (missingRequiredQuestions.length != 0) {
-					//add .warning-answer-required class to those needs to be filled
+					//add .bg-warning class to those needs to be filled
 					for (i = 0; i < missingRequiredQuestions.length; i++) {
-					    $("#question-area-" + missingRequiredQuestions[i]).addClass('warning-answer-required');
+					    $("#question-area-" + missingRequiredQuestions[i]).find(".panel-body").addClass('bg-warning');
 					}
 					//show alert message as well
 					$("#warning-answers-required").show();
 					
 				}
 				
 				if (maxWordsLimitExceededQuestions.length != 0) {
-					//add .warning-answer-required class to those needs to be filled
+					//add .bg-warning class to those needs to be filled
 					for (i = 0; i < maxWordsLimitExceededQuestions.length; i++) {
-					    $("#question-area-" + maxWordsLimitExceededQuestions[i]).addClass('warning-answer-required');
+					    $("#question-area-" + maxWordsLimitExceededQuestions[i]).find(".panel-body").addClass('bg-warning');
 					}
 					//show alert message as well
 					$("#warning-words-limit").show();		
 				}
 				
 				if (minWordsLimitNotReachedQuestions.length != 0) {
-					//add .warning-answer-required class to those needs to be filled
+					//add .bg-warning class to those needs to be filled
 					for (i = 0; i < minWordsLimitNotReachedQuestions.length; i++) {
-					    $("#question-area-" + minWordsLimitNotReachedQuestions[i]).addClass('warning-answer-required');
+					    $("#question-area-" + minWordsLimitNotReachedQuestions[i]).find(".panel-body").addClass('bg-warning');
 					}
 					//show alert message as well
 					$("#warning-words-limit").show();		
 				}
 				
 				if (markHedgingWrongTotalQuestions.length != 0) {
-					//add .warning-answer-required class to those needs to be filled
+					//add .bg-warning class to those needs to be filled
 					for (i = 0; i < markHedgingWrongTotalQuestions.length; i++) {
-					    $("#question-area-" + markHedgingWrongTotalQuestions[i]).addClass('warning-answer-required');
+					    $("#question-area-" + markHedgingWrongTotalQuestions[i]).find(".panel-body").addClass('bg-warning');
 					}
 					//show alert message as well
 					$("#warning-mark-hedging-wrong-total").show();		
@@ -603,47 +603,41 @@
 		
 		<%-- Reflection entry --%>
 		<c:if test="${sessionMap.reflectOn && (sessionMap.userFinished || !hasEditRight ) && finishedLock}">
-			<div class="voffset10">
-				<div class="row">
-					 <div class="col-xs12">
-					 	 <div class="panel panel-default">
+		 	 <div class="panel panel-default">
+	
+				 	<div class="panel-heading panel-title">
+				 		<fmt:message key="label.export.reflection" />
+				 	</div>
+				 	
+				 	<div class="panel-body">
+					 	<div class="panel">
+					 		<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
+						</div>
+						
+						<div class="form-group">
+							<c:choose>
+								<c:when test="${empty sessionMap.reflectEntry}">
+									<p>
+										<em> <fmt:message key="message.no.reflection.available" />	</em>
+									</p>
+								</c:when>
+								<c:otherwise>
+									<p>
+										<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
+									</p>
+								</c:otherwise>
+							</c:choose>
 			
-						 	<div class="panel-heading panel-title">
-						 		<fmt:message key="label.export.reflection" />
-						 	</div>
-						 	
-						 	<div class="panel-body">
-							 	<div class="panel">
-							 		<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
-								</div>
-								
-								<div class="form-group">
-									<c:choose>
-										<c:when test="${empty sessionMap.reflectEntry}">
-											<p>
-												<em> <fmt:message key="message.no.reflection.available" />	</em>
-											</p>
-										</c:when>
-										<c:otherwise>
-											<p>
-												<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
-											</p>
-										</c:otherwise>
-									</c:choose>
-					
-									<c:if test="${(mode != 'teacher') && hasEditRight}">
-										<html:button property="FinishButton" onclick="return continueReflect()" 
-												styleClass="btn btn-sm btn-default pull-left voffset10">
-											<fmt:message key="label.edit" />
-										</html:button>
-									</c:if>
-								</div>
-				
-							</div>
+							<c:if test="${(mode != 'teacher') && hasEditRight}">
+								<html:button property="FinishButton" onclick="return continueReflect()" 
+										styleClass="btn btn-sm btn-default pull-left voffset10">
+									<fmt:message key="label.edit" />
+								</html:button>
+							</c:if>
 						</div>
+		
 					</div>
 				</div>
-			</div>
 		</c:if>
 
 		<c:if test="${mode != 'teacher'}">
Index: lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
===================================================================
diff -u -r3900618a37feede0762b63edea137223d4f19721 -rdbc7ce0bc9f424c489eea4f884879f052dd867f2
--- lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(.../allquestions.jsp)	(revision 3900618a37feede0762b63edea137223d4f19721)
+++ lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(.../allquestions.jsp)	(revision dbc7ce0bc9f424c489eea4f884879f052dd867f2)
@@ -1,6 +1,4 @@
 <%@ include file="/common/taglibs.jsp"%>
-<div class="row no-gutter">
-	<div class="col-xs-12">
 		<form id="answers" name="answers" method="post" action="<c:url value='/learning/submitAll.do?sessionMapID=${sessionMapID}'/>">
 			<c:forEach var="question" items="${sessionMap.pagedQuestions[pageNumber-1]}" varStatus="status">
 						
@@ -61,12 +59,10 @@
 				</div>
 			</c:forEach>
 		</form>
-	</div>
-</div>
 		
 <!--Paging-->
 <c:if test="${fn:length(sessionMap.pagedQuestions) > 1}">
-	<div id="pager">
+	<div id="pager" class="voffset10">
 		<fmt:message key="label.learning.page" />
 		<c:forEach var="questions" items="${sessionMap.pagedQuestions}" varStatus="status">
 			<c:choose>
Index: lams_tool_assessment/web/pages/learning/parts/markhedging.jsp
===================================================================
diff -u -r3900618a37feede0762b63edea137223d4f19721 -rdbc7ce0bc9f424c489eea4f884879f052dd867f2
--- lams_tool_assessment/web/pages/learning/parts/markhedging.jsp	(.../markhedging.jsp)	(revision 3900618a37feede0762b63edea137223d4f19721)
+++ lams_tool_assessment/web/pages/learning/parts/markhedging.jsp	(.../markhedging.jsp)	(revision dbc7ce0bc9f424c489eea4f884879f052dd867f2)
@@ -14,10 +14,10 @@
 					<td class="complete-item-gif">
 					
 						<c:if test="${assessment.allowRightAnswersAfterQuestion && option.correct}">
-							<img src="<html:rewrite page='/includes/images/completeitem.gif'/>">
+							<i class="fa fa-check"></i>
 						</c:if>
 						<c:if test="${assessment.allowWrongAnswersAfterQuestion && !option.correct}">
-							<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>">
+							<i class="fa fa-times"></i>
 						</c:if>
 							
 					</td>
Index: lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp
===================================================================
diff -u -r3900618a37feede0762b63edea137223d4f19721 -rdbc7ce0bc9f424c489eea4f884879f052dd867f2
--- lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp	(.../matchingpairs.jsp)	(revision 3900618a37feede0762b63edea137223d4f19721)
+++ lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp	(.../matchingpairs.jsp)	(revision dbc7ce0bc9f424c489eea4f884879f052dd867f2)
@@ -12,10 +12,10 @@
 					<td class="complete-item-gif">
 					
 						<c:if test="${assessment.allowRightAnswersAfterQuestion && (option.answerInt == option.uid)}">
-							<img src="<html:rewrite page='/includes/images/completeitem.gif'/>">	
+							<i class="fa fa-check"></i>	
 						</c:if>
 						<c:if test="${assessment.allowWrongAnswersAfterQuestion && (option.answerInt != -1) && (option.answerInt != option.uid)}">
-							<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>">	
+							<i class="fa fa-times"></i>	
 						</c:if>
 							
 					</td>		
Index: lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp
===================================================================
diff -u -r3900618a37feede0762b63edea137223d4f19721 -rdbc7ce0bc9f424c489eea4f884879f052dd867f2
--- lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp	(.../multiplechoice.jsp)	(revision 3900618a37feede0762b63edea137223d4f19721)
+++ lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp	(.../multiplechoice.jsp)	(revision dbc7ce0bc9f424c489eea4f884879f052dd867f2)
@@ -19,10 +19,10 @@
 					<td class="complete-item-gif">
 					
 						<c:if test="${assessment.allowRightAnswersAfterQuestion && option.answerBoolean && (option.grade > 0)}">
-							<img src="<html:rewrite page='/includes/images/completeitem.gif'/>">
+							<i class="fa fa-check"></i>
 						</c:if>
 						<c:if test="${assessment.allowWrongAnswersAfterQuestion && option.answerBoolean && (option.grade <= 0)}">
-							<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>">
+							<i class="fa fa-times"></i>	
 						</c:if>
 							
 					</td>
Index: lams_tool_assessment/web/pages/learning/parts/numerical.jsp
===================================================================
diff -u -r3900618a37feede0762b63edea137223d4f19721 -rdbc7ce0bc9f424c489eea4f884879f052dd867f2
--- lams_tool_assessment/web/pages/learning/parts/numerical.jsp	(.../numerical.jsp)	(revision 3900618a37feede0762b63edea137223d4f19721)
+++ lams_tool_assessment/web/pages/learning/parts/numerical.jsp	(.../numerical.jsp)	(revision dbc7ce0bc9f424c489eea4f884879f052dd867f2)
@@ -11,10 +11,10 @@
 				<td class="complete-item-gif">
 				
 					<c:if test="${assessment.allowRightAnswersAfterQuestion && question.answerBoolean}">
-						<img src="<html:rewrite page='/includes/images/completeitem.gif'/>">	
+						<i class="fa fa-check"></i>	
 					</c:if>			
 					<c:if test="${assessment.allowWrongAnswersAfterQuestion && !question.answerBoolean}">
-						<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>">
+						<i class="fa fa-times"></i>	
 					</c:if>
 					
 				</td>
Index: lams_tool_assessment/web/pages/learning/parts/ordering.jsp
===================================================================
diff -u -r3900618a37feede0762b63edea137223d4f19721 -rdbc7ce0bc9f424c489eea4f884879f052dd867f2
--- lams_tool_assessment/web/pages/learning/parts/ordering.jsp	(.../ordering.jsp)	(revision 3900618a37feede0762b63edea137223d4f19721)
+++ lams_tool_assessment/web/pages/learning/parts/ordering.jsp	(.../ordering.jsp)	(revision dbc7ce0bc9f424c489eea4f884879f052dd867f2)
@@ -19,10 +19,10 @@
 				<c:if test="${finishedLock}">
 					<td class="complete-item-gif">
 						<c:if test="${assessment.allowRightAnswersAfterQuestion && (option.sequenceId == ordStatus.index)}">
-							<img src="<html:rewrite page='/includes/images/completeitem.gif'/>">	
+							<i class="fa fa-check"></i>	
 						</c:if>
 						<c:if test="${assessment.allowWrongAnswersAfterQuestion && (option.sequenceId != ordStatus.index)}">
-							<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>">	
+							<i class="fa fa-times"></i>	
 						</c:if>
 							
 					</td>		
@@ -36,24 +36,13 @@
 				<c:if test="${(mode != 'teacher') || !hasEditRight}">
 					<td style="text-align: center; width: 20px;">
 						<c:if test="${not ordStatus.first and !finishedLock}">
-							<img src="<html:rewrite page='/includes/images/uparrow.gif'/>"
-								border="0" title="<fmt:message key="label.authoring.basic.up"/>"
-								onclick="upOption(${question.uid},${ordStatus.index})">
-							<c:if test="${ordStatus.last}">
-								<img src="<html:rewrite page='/includes/images/downarrow_disabled.gif'/>"
-									border="0" title="<fmt:message key="label.authoring.basic.down"/>">
-							</c:if>
+							<i class="fa fa-angle-up" title="<fmt:message key="label.authoring.basic.up"/>" 
+								onclick="upOption(${question.uid},${ordStatus.index})"></i>	
 						</c:if>
 			
 						<c:if test="${not ordStatus.last and !finishedLock}">
-							<c:if test="${ordStatus.first}">
-								<img src="<html:rewrite page='/includes/images/uparrow_disabled.gif'/>"
-									border="0" title="<fmt:message key="label.authoring.basic.up"/>">
-							</c:if>
-			
-							<img src="<html:rewrite page='/includes/images/downarrow.gif'/>"
-								border="0" title="<fmt:message key="label.authoring.basic.down"/>"
-								onclick="downOption(${question.uid},${ordStatus.index})">
+							<i class="fa fa-angle-down" title="<fmt:message key="label.authoring.basic.down"/>"
+								onclick="downOption(${question.uid},${ordStatus.index})"></i>	
 						</c:if>
 					</td>
 				</c:if>			
Index: lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp
===================================================================
diff -u -r3900618a37feede0762b63edea137223d4f19721 -rdbc7ce0bc9f424c489eea4f884879f052dd867f2
--- lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp	(.../shortanswer.jsp)	(revision 3900618a37feede0762b63edea137223d4f19721)
+++ lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp	(.../shortanswer.jsp)	(revision dbc7ce0bc9f424c489eea4f884879f052dd867f2)
@@ -10,10 +10,10 @@
 			<c:if test="${finishedLock}">
 				<td class="complete-item-gif">
 					<c:if test="${assessment.allowRightAnswersAfterQuestion && question.answerBoolean}">
-						<img src="<html:rewrite page='/includes/images/completeitem.gif'/>">	
+						<i class="fa fa-check"></i>
 					</c:if>			
 					<c:if test="${assessment.allowWrongAnswersAfterQuestion && !question.answerBoolean}">
-						<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>">
+						<i class="fa fa-times"></i>
 					</c:if>	
 				</td>
 			</c:if>	
Index: lams_tool_assessment/web/pages/learning/parts/truefalse.jsp
===================================================================
diff -u -r3900618a37feede0762b63edea137223d4f19721 -rdbc7ce0bc9f424c489eea4f884879f052dd867f2
--- lams_tool_assessment/web/pages/learning/parts/truefalse.jsp	(.../truefalse.jsp)	(revision 3900618a37feede0762b63edea137223d4f19721)
+++ lams_tool_assessment/web/pages/learning/parts/truefalse.jsp	(.../truefalse.jsp)	(revision dbc7ce0bc9f424c489eea4f884879f052dd867f2)
@@ -16,10 +16,10 @@
 					
 						<c:choose>
 							<c:when test="${question.correctAnswer}">
-								<img src="<html:rewrite page='/includes/images/completeitem.gif'/>">	
+								<i class="fa fa-check"></i>
 							</c:when>
 							<c:otherwise>
-								<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>">	
+								<i class="fa fa-times"></i>	
 							</c:otherwise>		
 						</c:choose>					
 					
@@ -47,10 +47,10 @@
 					
 						<c:choose>
 							<c:when test="${!question.correctAnswer}">
-								<img src="<html:rewrite page='/includes/images/completeitem.gif'/>">	
+								<i class="fa fa-check"></i>	
 							</c:when>
 							<c:otherwise>
-								<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>">	
+								<i class="fa fa-times"></i>	
 							</c:otherwise>		
 						</c:choose>					
 					</c:if>