Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r58ed561cba4e5e1bb760598c774a11e191958f84 -rea84ea14e7f2401f2339486e30799bf0b4d5e0c9
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 58ed561cba4e5e1bb760598c774a11e191958f84)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ea84ea14e7f2401f2339486e30799bf0b4d5e0c9)
@@ -299,6 +299,8 @@
 label.activity.completion  =End of activity
 label.notifications  =Notifications
 label.ask.for.hedging.justification  =Ask for hedging justification?
+label.required.field=Field is required
+label.answer.required=Answer is required
 
 
 #======= End labels: Exported 291 labels for en AU =====
Index: lams_tool_assessment/web/common/header.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -rea84ea14e7f2401f2339486e30799bf0b4d5e0c9
--- lams_tool_assessment/web/common/header.jsp	(.../header.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/common/header.jsp	(.../header.jsp)	(revision ea84ea14e7f2401f2339486e30799bf0b4d5e0c9)
@@ -11,5 +11,4 @@
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
-<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentcommon.js'/>"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
\ No newline at end of file
Index: lams_tool_assessment/web/common/tabbedheader.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -rea84ea14e7f2401f2339486e30799bf0b4d5e0c9
--- lams_tool_assessment/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision ea84ea14e7f2401f2339486e30799bf0b4d5e0c9)
@@ -11,7 +11,6 @@
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>   
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
-<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentcommon.js'/>"></script> 
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script> 
 
 	
Fisheye: Tag ea84ea14e7f2401f2339486e30799bf0b4d5e0c9 refers to a dead (removed) revision in file `lams_tool_assessment/web/includes/javascript/assessmentcommon.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
===================================================================
diff -u -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271 -rea84ea14e7f2401f2339486e30799bf0b4d5e0c9
--- lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
+++ lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision ea84ea14e7f2401f2339486e30799bf0b4d5e0c9)
@@ -128,7 +128,7 @@
 				<div class="form-group">
 				    <label for="title">
 				    	<fmt:message key="label.authoring.basic.question.name"/>
-				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="title" styleId="title" styleClass="form-control" tabindex="1"/>
 				</div>
@@ -144,7 +144,7 @@
 				<div class="form-group">
 				    <label for="defaultGrade">
 				    	<fmt:message key="label.authoring.basic.default.question.grade" />
-				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
 				</div>
@@ -180,19 +180,14 @@
 				    </label>
 				    <html:text property="minWordsLimit" styleId="min-words-limit"/>
 				</div>
-					
-				<div class="form-group">
-					<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('general-feedback');" />
 
-					<a href="javascript:toggleVisibility('general-feedback');" >
-						<fmt:message key="label.authoring.basic.general.feedback" />
-					</a>
-					
-					<div id="general-feedback" class="initially-hidden form-group">
+				<div class="generalFeedback">
+				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
+					<div id="general-feedback"  class="collapse form-group">
 						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}" />
 					</div>
 				</div>
-
+					
 			</html:form>
 			
 			<div class="voffset10 pull-right">
Index: lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
===================================================================
diff -u -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271 -rea84ea14e7f2401f2339486e30799bf0b4d5e0c9
--- lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
+++ lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision ea84ea14e7f2401f2339486e30799bf0b4d5e0c9)
@@ -115,7 +115,7 @@
 				<div class="form-group">
 				    <label for="title">
 				    	<fmt:message key="label.authoring.basic.question.name"/>
-				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="title" styleId="title" styleClass="form-control" tabindex="1"/>
 				</div>
@@ -131,7 +131,7 @@
 				<div class="form-group">
 				    <label for="defaultGrade">
 				    	<fmt:message key="label.authoring.basic.default.question.grade" />
-				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
 				</div>
@@ -143,15 +143,10 @@
 					</label>
 				</div>
 				
-				<div class="form-group">
-					<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('general-feedback');" />
-
-					<a href="javascript:toggleVisibility('general-feedback');" >
-						<fmt:message key="label.authoring.basic.general.feedback" />
-					</a>
-					
-					<div id="general-feedback" class="initially-hidden">
-						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}"/>
+				<div class="generalFeedback">
+				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
+					<div id="general-feedback"  class="collapse form-group">
+						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}" />
 					</div>
 				</div>
 	
@@ -184,15 +179,13 @@
 				</a>
 			</form>
 			
+			
 			<!-- Overall feedback -->
-			<div class="form-group">
-				<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('overall-feedback');" />
-
-				<a href="javascript:toggleVisibility('overall-feedback');" >
-					<fmt:message key="label.authoring.choice.overall.feedback" />
-				</a>
-				
-				<div id="overall-feedback" class="initially-hidden">
+			<br/>
+			<div class="overallFeedback">
+			  <a data-toggle="collapse" data-target="#overall-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.choice.overall.feedback" /></a>
+			
+				<div id="overall-feedback" class="collapse">
 					<div class="form-group">
 						<label for="feedbackOnCorrectOutsideForm">
 							<fmt:message key="label.authoring.choice.feedback.on.correct" />
@@ -216,7 +209,7 @@
 				</div>
 			</div>
 
-			<div class="voffset10 pull-right">
+			<div class="form-group voffset10 pull-right">
 			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
 					<fmt:message key="label.cancel" />
 				</a>
Index: lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
===================================================================
diff -u -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271 -rea84ea14e7f2401f2339486e30799bf0b4d5e0c9
--- lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
+++ lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision ea84ea14e7f2401f2339486e30799bf0b4d5e0c9)
@@ -118,7 +118,7 @@
 				<div class="form-group">
 				    <label for="title">
 				    	<fmt:message key="label.authoring.basic.question.name"/>
-				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="title" styleId="title" styleClass="form-control" tabindex="1"/>
 				</div>
@@ -134,15 +134,15 @@
 				<div class="form-group">
 				    <label for="defaultGrade">
 				    	<fmt:message key="label.authoring.basic.default.question.grade" />
-				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
 				</div>
 				
 				<div class="form-group">
 				    <label for="penaltyFactor">
 				    	<fmt:message key="label.authoring.basic.penalty.factor" />
-						<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+						  <i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="penaltyFactor" styleClass="form-control short-input-text input-sm"/>
 				</div>
@@ -154,18 +154,13 @@
 					</label>
 				</div>
 				
-				<div class="form-group">
-					<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('general-feedback');" />
-
-					<a href="javascript:toggleVisibility('general-feedback');" >
-						<fmt:message key="label.authoring.basic.general.feedback" />
-					</a>
-					
-					<div id="general-feedback" class="initially-hidden">
-						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}"/>
-					</div>	
+				<div class="generalFeedback">
+				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
+					<div id="general-feedback"  class="collapse form-group">
+						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}" />
+					</div>
 				</div>
-	
+						
 				<div class="checkbox">
 					<label for="shuffle">
 						<html:checkbox property="shuffle" styleId="shuffle"/>
Index: lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
===================================================================
diff -u -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271 -rea84ea14e7f2401f2339486e30799bf0b4d5e0c9
--- lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
+++ lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision ea84ea14e7f2401f2339486e30799bf0b4d5e0c9)
@@ -138,7 +138,7 @@
 				<div class="form-group">
 				    <label for="title">
 				    	<fmt:message key="label.authoring.basic.question.name"/>
-				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="title" styleId="title" styleClass="form-control" tabindex="1"/>
 				</div>
@@ -154,15 +154,15 @@
 				<div class="form-group">
 				    <label for="defaultGrade">
 				    	<fmt:message key="label.authoring.basic.default.question.grade" />
-				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
 				</div>
 				
 				<div class="form-group">
 				    <label for="penaltyFactor">
 				    	<fmt:message key="label.authoring.basic.penalty.factor" />
-						<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+						  <i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="penaltyFactor" styleClass="form-control short-input-text input-sm"/>
 				</div>
@@ -174,15 +174,10 @@
 					</label>
 				</div>
 				
-				<div class="form-group">
-					<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('general-feedback');" />
-
-					<a href="javascript:toggleVisibility('general-feedback');" >
-						<fmt:message key="label.authoring.basic.general.feedback" />
-					</a>
-					
-					<div id="general-feedback" class="initially-hidden">
-						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}"	contentFolderID="${formBean.contentFolderID}"/>
+				<div class="generalFeedback">
+				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
+					<div id="general-feedback"  class="collapse form-group">
+						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}" />
 					</div>
 				</div>
 				
@@ -227,14 +222,10 @@
 			</form>
 			
 			<!-- Overall feedback -->
-			<div class="form-group">
-				<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('overall-feedback');" />
+			<div class="overallFeedback">
+			  <a data-toggle="collapse" data-target="#overall-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.choice.overall.feedback" /></a>
 
-				<a href="javascript:toggleVisibility('overall-feedback');" >
-					<fmt:message key="label.authoring.choice.overall.feedback" />
-				</a>
-				
-				<div id="overall-feedback" class="initially-hidden">
+				<div id="overall-feedback" class="collapse">				
 				<div class="form-group">
 						<label for="feedbackOnCorrectOutsideForm">
 							<fmt:message key="label.authoring.choice.feedback.on.correct" />
@@ -257,7 +248,8 @@
 					</div>
 				</div>
 			</div>
-
+			
+		<br/>
 			<div class="voffset10 pull-right">
 			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
 					<fmt:message key="label.cancel" />
Index: lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
===================================================================
diff -u -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271 -rea84ea14e7f2401f2339486e30799bf0b4d5e0c9
--- lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
+++ lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision ea84ea14e7f2401f2339486e30799bf0b4d5e0c9)
@@ -185,7 +185,7 @@
 				<div class="form-group">
 				    <label for="title">
 				    	<fmt:message key="label.authoring.basic.question.name"/>
-				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="title" styleId="title" styleClass="form-control" tabindex="1"/>
 				</div>
@@ -201,15 +201,15 @@
 				<div class="form-group">
 				    <label for="defaultGrade">
 				    	<fmt:message key="label.authoring.basic.default.question.grade" />
-				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
 				</div>
 				
 				<div class="form-group">
 				    <label for="penaltyFactor">
 				    	<fmt:message key="label.authoring.basic.penalty.factor" />
-						<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+						  <i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="penaltyFactor" styleClass="form-control short-input-text input-sm"/>
 				</div>
@@ -221,17 +221,12 @@
 					</label>
 				</div>
 				
-				<div class="form-group">
-					<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('general-feedback');" />
-
-					<a href="javascript:toggleVisibility('general-feedback');" >
-						<fmt:message key="label.authoring.basic.general.feedback" />
-					</a>
-					
-					<div id="general-feedback" class="initially-hidden">
-						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}"/>
+  			<div class="generalFeedback">
+				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
+					<div id="general-feedback"  class="collapse form-group">
+						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}" />
 					</div>
-				</div>
+				</div>				
 				
 				<h5 class="voffset20">
 					<fmt:message key="label.authoring.numerical.answers" />
Index: lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
===================================================================
diff -u -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271 -rea84ea14e7f2401f2339486e30799bf0b4d5e0c9
--- lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
+++ lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision ea84ea14e7f2401f2339486e30799bf0b4d5e0c9)
@@ -118,7 +118,7 @@
 				<div class="form-group">
 				    <label for="title">
 				    	<fmt:message key="label.authoring.basic.question.name"/>
-				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="title" styleId="title" styleClass="form-control" tabindex="1"/>
 				</div>
@@ -134,15 +134,15 @@
 				<div class="form-group">
 				    <label for="defaultGrade">
 				    	<fmt:message key="label.authoring.basic.default.question.grade" />
-				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
 				</div>
 				
 				<div class="form-group">
 				    <label for="penaltyFactor">
 				    	<fmt:message key="label.authoring.basic.penalty.factor" />
-						<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+						  <i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="penaltyFactor" styleClass="form-control short-input-text input-sm"/>
 				</div>
@@ -154,15 +154,10 @@
 					</label>
 				</div>
 				
-				<div class="form-group">
-					<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('general-feedback');" />
-
-					<a href="javascript:toggleVisibility('general-feedback');" >
-						<fmt:message key="label.authoring.basic.general.feedback" />
-					</a>
-					
-					<div id="general-feedback" class="initially-hidden">
-						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}"/> 
+				<div class="generalFeedback">
+				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
+					<div id="general-feedback"  class="collapse form-group">
+						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}" />
 					</div>
 				</div>
 				
@@ -182,14 +177,10 @@
 			</form>
 						
 			<!-- Overall feedback -->
-			<div class="form-group">
-				<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('overall-feedback');" />
+			<div class="overallFeedback">
+			  <a data-toggle="collapse" data-target="#overall-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.choice.overall.feedback" /></a>
 
-				<a href="javascript:toggleVisibility('overall-feedback');" >
-					<fmt:message key="label.authoring.choice.overall.feedback" />
-				</a>
-				
-				<div id="overall-feedback" class="initially-hidden">
+				<div id="overall-feedback" class="collapse">				
 					<div class="form-group">
 						<label for="feedbackOnCorrectOutsideForm">
 							<fmt:message key="label.authoring.choice.feedback.on.correct" />
@@ -205,7 +196,7 @@
 					</div>
 				</div>
 			</div>
-
+		  <br/>
 			<div class="voffset10 pull-right">
 			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
 					<fmt:message key="label.cancel" />
Index: lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
===================================================================
diff -u -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271 -rea84ea14e7f2401f2339486e30799bf0b4d5e0c9
--- lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
+++ lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision ea84ea14e7f2401f2339486e30799bf0b4d5e0c9)
@@ -123,7 +123,7 @@
 				<div class="form-group">
 				    <label for="title">
 				    	<fmt:message key="label.authoring.basic.question.name"/>
-				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="* <fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="title" styleId="title" styleClass="form-control" tabindex="1"/>
 				</div>
@@ -139,15 +139,15 @@
 				<div class="form-group">
 				    <label for="defaultGrade">
 				    	<fmt:message key="label.authoring.basic.default.question.grade" />
-				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
 				</div>
 				
 				<div class="form-group">
 				    <label for="penaltyFactor">
 				    	<fmt:message key="label.authoring.basic.penalty.factor" />
-						<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+						<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="penaltyFactor" styleClass="form-control short-input-text input-sm"/>
 				</div>
@@ -159,18 +159,13 @@
 					</label>
 				</div>
 				
-				<div class="form-group">
-					<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('general-feedback');" />
-
-					<a href="javascript:toggleVisibility('general-feedback');" >
-						<fmt:message key="label.authoring.basic.general.feedback" />
-					</a>
-					
-					<div id="general-feedback" class="initially-hidden">
-						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}"/>
+				<div class="generalFeedback">
+				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
+					<div id="general-feedback"  class="collapse form-group">
+						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}" />
 					</div>
 				</div>
-				
+									
 				<div class="form-inline form-group">
 					<label for="caseSensitive">
 						<fmt:message key="label.authoring.short.answer.case.sensitivity" />
Index: lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp
===================================================================
diff -u -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271 -rea84ea14e7f2401f2339486e30799bf0b4d5e0c9
--- lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
+++ lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision ea84ea14e7f2401f2339486e30799bf0b4d5e0c9)
@@ -96,7 +96,7 @@
 				<div class="form-group">
 				    <label for="title">
 				    	<fmt:message key="label.authoring.basic.question.name"/>
-				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="title" styleId="title" styleClass="form-control" tabindex="1"/>
 				</div>
@@ -112,15 +112,15 @@
 				<div class="form-group">
 				    <label for="defaultGrade">
 				    	<fmt:message key="label.authoring.basic.default.question.grade" />
-				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
 				</div>
 				
 				<div class="form-group">
 				    <label for="penaltyFactor">
 				    	<fmt:message key="label.authoring.basic.penalty.factor" />
-						<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+						<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 				    </label>
 				    <html:text property="penaltyFactor" styleClass="form-control short-input-text input-sm"/>
 				</div>
@@ -132,15 +132,10 @@
 					</label>
 				</div>
 				
-				<div class="form-group">
-					<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('general-feedback');" />
-
-					<a href="javascript:toggleVisibility('general-feedback');" >
-						<fmt:message key="label.authoring.basic.general.feedback" />
-					</a>
-					
-					<div id="general-feedback" class="initially-hidden">
-						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}"/>
+				<div class="generalFeedback">
+				  <a data-toggle="collapse" data-target="#general-feedback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
+					<div id="general-feedback"  class="collapse form-group">
+						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}" />
 					</div>
 				</div>
 				
Index: lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -rea84ea14e7f2401f2339486e30799bf0b4d5e0c9
--- lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision ea84ea14e7f2401f2339486e30799bf0b4d5e0c9)
@@ -9,7 +9,6 @@
 <div class="panel panel-default voffset5">
 	<div class="panel-heading panel-title">
 		<fmt:message key="label.authoring.basic.question.list.title" />
-		<img src="${ctxPath}/includes/images/indicator.gif"	style="display:none" id="referencesArea_Busy" />
 	</div>
 
 	<table class="table table-condensed" id="referencesTable">
Index: lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -rea84ea14e7f2401f2339486e30799bf0b4d5e0c9
--- lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(.../allquestions.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(.../allquestions.jsp)	(revision ea84ea14e7f2401f2339486e30799bf0b4d5e0c9)
@@ -14,7 +14,7 @@
 									
 						<c:if test="${question.answerRequired}">
 							<span class="asterisk">
-								<img title="* <fmt:message key="label.authoring.answer.required"/>" alt="<fmt:message key="label.authoring.answer.required"/>" src="${ctxPath}/includes/images/req.gif" />
+								<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.answer.required"/>" alt="<fmt:message key="label.answer.required"/>"></i>
 							</span>
 						</c:if>