Index: lams_admin/web/import/importGroups.jsp
===================================================================
diff -u -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1 -rb37f7b42698f0aa6bd5b346a8e9bb4085964c0a7
--- lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
+++ lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision b37f7b42698f0aa6bd5b346a8e9bb4085964c0a7)
@@ -15,7 +15,7 @@
 
 <div id="loading" style="display:none">
 	<h4><fmt:message key="msg.please.wait"/></h4>
-	<p align="center"><img src="<lams:LAMSURL/>/images/loading.gif" alt="loading..." /></p>
+	<p class="text-center"><i class="fa fa-refresh fa-spin fa-2x fa-fw"></i></p>
 </div>
 
 <div id="main-page">
Index: lams_admin/web/import/status.jsp
===================================================================
diff -u -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1 -rb37f7b42698f0aa6bd5b346a8e9bb4085964c0a7
--- lams_admin/web/import/status.jsp	(.../status.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
+++ lams_admin/web/import/status.jsp	(.../status.jsp)	(revision b37f7b42698f0aa6bd5b346a8e9bb4085964c0a7)
@@ -34,7 +34,7 @@
 
 		<div align="center">	
 			<h3><fmt:message key="msg.please.wait"/></h3>
-			<p><img src="<lams:LAMSURL/>/images/loading.gif" alt="loading..." /></p>
+			<p><i class="fa fa-refresh fa-spin fa-3x fa-fw"></i></p>
 <%
 	Integer importTotal = (Integer)SessionManager.getSession().getAttribute(IImportService.STATUS_IMPORT_TOTAL);
 	Integer imported = (Integer)SessionManager.getSession().getAttribute(IImportService.STATUS_IMPORTED);
Index: lams_tool_survey/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r93dd18194b7d614acd0c2fa6e08840194b4f29ee -rb37f7b42698f0aa6bd5b346a8e9bb4085964c0a7
--- lams_tool_survey/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 93dd18194b7d614acd0c2fa6e08840194b4f29ee)
+++ lams_tool_survey/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision b37f7b42698f0aa6bd5b346a8e9bb4085964c0a7)
@@ -26,6 +26,19 @@
 	    <c:out value="${survey.instructions}" escapeXml="false"/>
 	</div>
 	
+		<c:set var="sessionButtons">
+			<c:if test="${sessionMap.survey.reflectOnActivity}">
+				<c:set var="listReflections"><c:url value="/pages/monitoring/listreflections.jsp?toolSessionID=${surveySession.sessionId}"/></c:set>
+				<html:link href="javascript:launchPopup('${listReflections}')" styleClass="btn btn-default ${sessionButtonSize}">
+					<fmt:message key="page.title.monitoring.view.reflection" />
+				</html:link>
+			</c:if>	
+			<html:link href="javascript:exportSurvey(${surveySession.sessionId});" property="exportExcel" styleClass="btn btn-default ${sessionButtonSize} loffset5">
+				<fmt:message key="label.monitoring.button.export.excel" />
+			</html:link>
+		</c:set>
+
+	
 	<c:if test="${empty summaryList}">
 		<lams:Alert type="info" id="no-session-summary" close="false">
 			<fmt:message key="message.monitoring.summary.no.session" />
@@ -45,18 +58,6 @@
 		<c:set var="surveySession"  value="${group.key}"/>
 		<c:set var="questions"  value="${group.value}"/>
 
-		<c:set var="sessionButtons">
-			<c:if test="${sessionMap.survey.reflectOnActivity}">
-				<c:set var="listReflections"><c:url value="/pages/monitoring/listreflections.jsp?toolSessionID=${surveySession.sessionId}"/></c:set>
-				<html:link href="javascript:launchPopup('${listReflections}')" styleClass="btn btn-default ${sessionButtonSize}">
-					<fmt:message key="page.title.monitoring.view.reflection" />
-				</html:link>
-			</c:if>	
-			<html:link href="javascript:exportSurvey(${surveySession.sessionId});" property="exportExcel" styleClass="btn btn-default ${sessionButtonSize} loffset5">
-				<fmt:message key="label.monitoring.button.export.excel" />
-			</html:link>
-		</c:set>
-
 		<c:choose>
 		<c:when test="${sessionMap.isGroupedActivity}">	
 		    <div class="panel panel-default" >
@@ -91,8 +92,8 @@
 					<%-- Only show pie/bar chart when question is single/multiple choics type --%>
 					<c:if test="${question.type != 3}">
 						<c:set var="chartURL" value="${tool}showChart.do?toolSessionID=${surveySession.sessionId}&questionUid=${question.uid}" />
-						<i class="fa fa-lg fa-pie-chart pull-right" title="<fmt:message key='message.view.pie.chart'/>"
-							onclick="javascript:drawChart('pie', 'chartDiv${surveySession.sessionId}_${queStatus.index}', '${chartURL}')"> 
+						<a class="fa fa-lg fa-pie-chart text-primary btn btn-xs btn-primary pull-right" title="<fmt:message key='message.view.pie.chart'/>"
+							onclick="javascript:drawChart('pie', 'chartDiv${surveySession.sessionId}_${queStatus.index}', '${chartURL}')"></a> 
 					</c:if>
 
 				</th>
Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp
===================================================================
diff -u -rff7583ba24a271222b91ab3ecc460b931fe20e37 -rb37f7b42698f0aa6bd5b346a8e9bb4085964c0a7
--- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	(.../AllSessionsSummary.jsp)	(revision ff7583ba24a271222b91ab3ecc460b931fe20e37)
+++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	(.../AllSessionsSummary.jsp)	(revision b37f7b42698f0aa6bd5b346a8e9bb4085964c0a7)
@@ -23,15 +23,13 @@
 			</c:if>			
 			&nbsp;
 			<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${sessionDto.toolSessionId}&toolContentID=${toolContentID}" />
-			<img src='<c:out value="${tool}"/>images/piechart.gif' 
+			<a class="fa fa-pie-chart text-primary btn btn-xs btn-primary" 
 				title="<fmt:message key='label.tip.displayPieChart'/>"
-				style="cursor: pointer;" height="30" border="0"
-				onclick="javascript:drawChart('pie', 'chartDiv${sessionDto.toolSessionId}', '${chartURL}')">
+				onclick="javascript:drawChart('pie', 'chartDiv${sessionDto.toolSessionId}', '${chartURL}')"></a>
 			&nbsp;
-			<img src='<c:out value="${tool}"/>images/columnchart.gif'
+			<a class="fa fa-bar-chart text-primary btn btn-xs btn-primary"
 				title="<fmt:message key='label.tip.displayBarChart'/>" 
-				style="cursor: pointer;" height="30" border="0"
-				onclick="javascript:drawChart('bar', 'chartDiv${sessionDto.toolSessionId}', '${chartURL}')">
+				onclick="javascript:drawChart('bar', 'chartDiv${sessionDto.toolSessionId}', '${chartURL}')"></a>
 		</div>
 	</c:set>