Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
===================================================================
diff -u -re137553ae8df8ba48da568c79e4deea0f5380d29 -r1873ffca4fc3227607a706a55ac025bff50126c7
--- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java	(.../TBLTemplateController.java)	(revision e137553ae8df8ba48da568c79e4deea0f5380d29)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java	(.../TBLTemplateController.java)	(revision 1873ffca4fc3227607a706a55ac025bff50126c7)
@@ -224,7 +224,7 @@
 			assessmentNumber++;
 		}
 		Long aetoolContentId = createAssessmentToolContent(userDTO, applicationExerciseTitle,
-			data.getText("boilerplate.ae.instructions"), null, true, true, questionsJSONArray);
+			data.getText("boilerplate.ae.instructions"), null, true, false, questionsJSONArray);
 		activities.add(createAssessmentActivity(maxUIID, order++, currentActivityPosition, aetoolContentId,
 			data.contentFolderID, groupingUIID, null, null, applicationExerciseTitle));
 
Index: lams_central/web/authoring/template/tbl/appex.jsp
===================================================================
diff -u -re137553ae8df8ba48da568c79e4deea0f5380d29 -r1873ffca4fc3227607a706a55ac025bff50126c7
--- lams_central/web/authoring/template/tbl/appex.jsp	(.../appex.jsp)	(revision e137553ae8df8ba48da568c79e4deea0f5380d29)
+++ lams_central/web/authoring/template/tbl/appex.jsp	(.../appex.jsp)	(revision 1873ffca4fc3227607a706a55ac025bff50126c7)
@@ -11,7 +11,8 @@
 <!--  Start of panel Appex${appexNumber} -->
  <div class="panel panel-default" id="divappex${appexNumber}" >
      <div class="panel-heading" id="headingAppex${appexNumber}">
-		<c:if test="${appexNumber > 1}"><a href="#" onclick="javascript:deleteAppexDiv('divappex${appexNumber}', '${appexTitleField}');" class="btn btn-default btn-sm pull-right" style="margin-top: -5px" id="deleteAssessmentButton${questionNumber}"><fmt:message key="authoring.fla.delete.button"/></a></c:if>
+		<c:if test="${appexNumber > 1}"><a href="#" onclick="javascript:deleteAppexDiv('divappex${appexNumber}', '${appexTitleField}');" class="btn btn-default btn-sm panel-title-button" id="deleteAssessmentButton${questionNumber}">
+			<i class="fa fa-lg fa-trash-o"></i> <fmt:message key="authoring.fla.delete.button"/></a></c:if>
      	<span class="panel-title collapsable-icon-left">
      		<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapseAppex${appexNumber}" 
 			aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapseAppex${appexNumber}" >&nbsp;
@@ -29,9 +30,9 @@
 		 	<input type="hidden" name="numAssessments${appexNumber}" id="numAssessments${appexNumber}" value="0"/>
 			<div id="divass${appexNumber}"></div>
 			<div class="space-top space-sides">
-				<a href="#" onclick="javascript:createAssessment('essay', 'numAssessments${appexNumber}', 'divass${appexNumber}');" class="btn btn-default"><fmt:message key="authoring.create.essay.question"/></a>
-				<a href="#" onclick="javascript:createAssessment('mcq', 'numAssessments${appexNumber}', 'divass${appexNumber}');" class="btn btn-default"><fmt:message key="authoring.create.mc.question"/></a>
-				<a href="#" onClick="javascript:importQTI('appex${appexNumber}')" class="btn btn-default pull-right"><fmt:message key="authoring.template.basic.import.qti" /></a>
+				<a href="#" onclick="javascript:createAssessment('essay', 'numAssessments${appexNumber}', 'divass${appexNumber}');" class="btn btn-default"><i class="fa fa-plus"></i> <fmt:message key="authoring.create.essay.question"/></a>
+				<a href="#" onclick="javascript:createAssessment('mcq', 'numAssessments${appexNumber}', 'divass${appexNumber}');" class="btn btn-default"><i class="fa fa-plus"></i> <fmt:message key="authoring.create.mc.question"/></a>
+				<a href="#" onClick="javascript:importQTI('appex${appexNumber}')" class="btn btn-default pull-right"><i class="fa fa-upload"></i> <fmt:message key="authoring.template.basic.import.qti" /></a>
 			</div>
 			<div class="space-top space-sides space-bottom">
 				<div class="checkbox"><label for="divappex${appexNumber}NB">
Index: lams_central/web/authoring/template/tbl/tbl.jsp
===================================================================
diff -u -rd0031eadc1ee66ed82eade3ffa5c039016d999eb -r1873ffca4fc3227607a706a55ac025bff50126c7
--- lams_central/web/authoring/template/tbl/tbl.jsp	(.../tbl.jsp)	(revision d0031eadc1ee66ed82eade3ffa5c039016d999eb)
+++ lams_central/web/authoring/template/tbl/tbl.jsp	(.../tbl.jsp)	(revision 1873ffca4fc3227607a706a55ac025bff50126c7)
@@ -210,10 +210,8 @@
 			</div>
 		
 			<span class="voffset10">
-			<a href="#" id="createQuestionButton" onclick="javascript:createQuestion('numQuestions', 'divq', 'divquestions', '', '');" class="btn btn-default"><fmt:message key="authoring.create.question"/></a>
-			<a href="#" onClick="javascript:importQTI('mcq', 'mc')" class="btn btn-default pull-right">
-					<fmt:message key="authoring.template.basic.import.qti" /> 
-			</a>
+			<a href="#" id="createQuestionButton" onclick="javascript:createQuestion('numQuestions', 'divq', 'divquestions', '', '');" class="btn btn-default"><i class="fa fa-plus"></i> <fmt:message key="authoring.create.question"/></a>
+			<a href="#" onClick="javascript:importQTI('mcq', 'mc')" class="btn btn-default pull-right">	<i class="fa fa-upload"></i> <fmt:message key="authoring.template.basic.import.qti" /></a>
 			</span>
 			
 	    </div>
@@ -227,7 +225,7 @@
 			<%@ include file="appex.jsp" %>
 			</div> <!--  end panel group -->
 
-			<a href="#" id="createApplicationExerciseButton" onclick="javascript:createApplicationExercise();" class="btn btn-default"><fmt:message key="authoring.create.application.exercise"/></a>
+			<a href="#" id="createApplicationExerciseButton" onclick="javascript:createApplicationExercise();" class="btn btn-default"><i class="fa fa-plus"></i> <fmt:message key="authoring.create.application.exercise"/></a>
 			
 	    </div>
 
Index: lams_central/web/authoring/template/tool/assessmcq.jsp
===================================================================
diff -u -re137553ae8df8ba48da568c79e4deea0f5380d29 -r1873ffca4fc3227607a706a55ac025bff50126c7
--- lams_central/web/authoring/template/tool/assessmcq.jsp	(.../assessmcq.jsp)	(revision e137553ae8df8ba48da568c79e4deea0f5380d29)
+++ lams_central/web/authoring/template/tool/assessmcq.jsp	(.../assessmcq.jsp)	(revision 1873ffca4fc3227607a706a55ac025bff50126c7)
@@ -34,8 +34,8 @@
 	<input type="hidden" name="${containingDivName}assessment${questionNumber}type" id="${containingDivName}assessment${questionNumber}type" value="mcq"/>
 	<lams:CKEditor id="${containingDivName}assessment${questionNumber}" value="${question.text}" contentFolderID="${contentFolderID}" height="100"></lams:CKEditor>
 	
-	<label for="${containingDivName}assessment${questionNumber}mark" class="form-control form-control-inline voffset5"><fmt:message key="label.marks"/></label>
-	<input type="number" step="1" min="1" value="1" name="${containingDivName}assessment${questionNumber}mark" id="${containingDivName}assessment${questionNumber}mark"  class="voffset5"/>
+	<label for="${containingDivName}assessment${questionNumber}mark" class="voffset5"><fmt:message key="label.marks"/></label>
+	<input type="number" step="1" min="1" value="1" name="${containingDivName}assessment${questionNumber}mark" id="${containingDivName}assessment${questionNumber}mark"  class="form-control form-control-inline voffset5"/>
 	
 	<table class="table table-condensed table-no-border">
 	<tr><td></td><td></td>
@@ -93,7 +93,7 @@
 	</c:choose>
 	</div>
 	
-	<div id="${containingDivName}createAssessmentOptionButton${questionNumber}" class="pull-right"><a href="#" onclick="javascript:createAssessmentOption(${questionNumber},${maxOptionCount}, '${containingDivName}');" class="btn btn-default btn-sm"><fmt:message key="authoring.create.option"/></a></div>
+	<div id="${containingDivName}createAssessmentOptionButton${questionNumber}" class="pull-right"><a href="#" onclick="javascript:createAssessmentOption(${questionNumber},${maxOptionCount}, '${containingDivName}');" class="btn btn-default btn-sm"><i class="fa fa-plus"></i> <fmt:message key="authoring.create.option"/></a></div>
 	
 	</div>
 </div>
Index: lams_central/web/authoring/template/tool/assessment.jsp
===================================================================
diff -u -re137553ae8df8ba48da568c79e4deea0f5380d29 -r1873ffca4fc3227607a706a55ac025bff50126c7
--- lams_central/web/authoring/template/tool/assessment.jsp	(.../assessment.jsp)	(revision e137553ae8df8ba48da568c79e4deea0f5380d29)
+++ lams_central/web/authoring/template/tool/assessment.jsp	(.../assessment.jsp)	(revision 1873ffca4fc3227607a706a55ac025bff50126c7)
@@ -29,8 +29,8 @@
 	
 	<lams:CKEditor id="${containingDivName}assessment${questionNumber}" value="${question.text}" contentFolderID="${contentFolderID}" height="100"></lams:CKEditor>
 
-	<label for="${containingDivName}assessment${questionNumber}mark" class="form-control form-control-inline voffset5"><fmt:message key="label.marks"/></label>
-	<input type="number" step="1" min="1" value="1" name="${containingDivName}assessment${questionNumber}mark" id="${containingDivName}assessment${questionNumber}mark"  class="voffset5"/>
+	<label for="${containingDivName}assessment${questionNumber}mark" class="voffset5"><fmt:message key="label.marks"/></label>
+	<input type="number" step="1" min="1" value="1" name="${containingDivName}assessment${questionNumber}mark" id="${containingDivName}assessment${questionNumber}mark"  class="form-control form-control-inline voffset5"/>
 	
 	</div>
 </div>
Index: lams_central/web/authoring/template/tool/mcquestion.jsp
===================================================================
diff -u -re137553ae8df8ba48da568c79e4deea0f5380d29 -r1873ffca4fc3227607a706a55ac025bff50126c7
--- lams_central/web/authoring/template/tool/mcquestion.jsp	(.../mcquestion.jsp)	(revision e137553ae8df8ba48da568c79e4deea0f5380d29)
+++ lams_central/web/authoring/template/tool/mcquestion.jsp	(.../mcquestion.jsp)	(revision 1873ffca4fc3227607a706a55ac025bff50126c7)
@@ -16,7 +16,8 @@
 
 <div class="panel panel-default">
 	<div class="panel-heading">
-		<c:if test="${questionNumber > 1}"><a href="#" onclick="javascript:deleteMCQDiv('divq${questionNumber}', '${questionTitleField}');" class="btn btn-default btn-sm pull-right" style="margin-top: -5px" id="deleteAssessmentButton${questionNumber}"><fmt:message key="authoring.fla.delete.button"/></a></c:if>
+		<c:if test="${questionNumber > 1}"><a href="#" onclick="javascript:deleteMCQDiv('divq${questionNumber}', '${questionTitleField}');" class="btn btn-default btn-sm panel-title-button" id="deleteAssessmentButton${questionNumber}">
+			<i class="fa fa-lg fa-trash-o"></i> <fmt:message key="authoring.fla.delete.button"/></a></c:if>
 		<div class="panel-title">		
 		${questionNumber eq 1 ? "<label class=\"required\">" : ""}
 			<span class="hoverEdit" name="${questionTitleDisplay}" id="${questionTitleDisplay}" ><c:out value="${questionTitle}" /></span><span>&nbsp;</span><i class='fa fa-sm fa-pencil'></i>
@@ -84,7 +85,7 @@
 		</c:choose>
 		</div>
 		
-		<div id="createOptionButton${questionNumber}" class="pull-right"><a href="#" onclick="javascript:createOption(${questionNumber},${maxOptionCount});" class="btn btn-default btn-sm"><fmt:message key="authoring.create.option"/></a></div>
+		<div id="createOptionButton${questionNumber}" class="pull-right"><a href="#" onclick="javascript:createOption(${questionNumber},${maxOptionCount});" class="btn btn-default btn-sm"><i class="fa fa-plus"></i> <fmt:message key="authoring.create.option"/></a></div>
 	</div>		
 </div>
 
Index: lams_central/web/css/_authoring_base.scss
===================================================================
diff -u -r08a2133f0cddf6ef58bdd8bd6ea21c6d73cc354f -r1873ffca4fc3227607a706a55ac025bff50126c7
--- lams_central/web/css/_authoring_base.scss	(.../_authoring_base.scss)	(revision 08a2133f0cddf6ef58bdd8bd6ea21c6d73cc354f)
+++ lams_central/web/css/_authoring_base.scss	(.../_authoring_base.scss)	(revision 1873ffca4fc3227607a706a55ac025bff50126c7)
@@ -556,16 +556,26 @@
 
 #rootwizard {
 	.required:after {
-	  content: "*";
-	  font-style: normal;
-	  font-weight: normal;
-	  text-decoration: inherit;
-	  margin-left: 5px; 
+		content: "\f069";
+		font-family: FontAwesome;
+	    font-size: smaller;
+		font-style: normal;
+		font-weight: normal;
+		text-decoration: inherit;
+		margin-left: 5px; 
+		color: $brand-primary;
   }
   
 	.panel-title .required {
 		font-weight: 500;
 	}
+
+	.panel-title-button {
+		margin-top: -5px;
+		margin-right: 4px;
+		width: 100px; // Make a similar size to the Add Option question above on the AppEx screen
+		float: right;
+	}
 }
 
 #rootwizard .container {