Index: lams_admin/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_admin/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_admin/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_admin/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_admin/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_admin/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_central/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_central/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_central/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_central/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_central/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_central/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_gradebook/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_gradebook/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_gradebook/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_gradebook/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_gradebook/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_gradebook/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_learning/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_learning/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_learning/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_learning/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_learning/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_learning/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_learning/web/css/components-learner.scss
===================================================================
diff -u -ra8263ea52078fa1af6b0ce96f77bac8e3427849e -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_learning/web/css/components-learner.scss	(.../components-learner.scss)	(revision a8263ea52078fa1af6b0ce96f77bac8e3427849e)
+++ lams_learning/web/css/components-learner.scss	(.../components-learner.scss)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -300,3 +300,29 @@
 	text-align: center;
 	font-size: medium;
 }
+
+.na {
+  display: inline-block;
+}
+.na:after {
+  content: "\f0a9";
+  font-family: FontAwesome;
+  font-style: normal;
+  font-weight: normal;
+  text-decoration: inherit;
+  margin-left: 5px;
+  color: inherit;
+  /*float: right;*/
+}
+
+.btn-refresh {
+  display: inline-block;
+}
+.btn-refresh:before {
+  content: "\f021";
+  font-family: FontAwesome;
+  font-style: normal;
+  font-weight: normal;
+  text-decoration: inherit;
+  color: inherit;
+}
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_monitoring/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_monitoring/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_monitoring/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_monitoring/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_monitoring/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_assessment/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_assessment/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_assessment/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_assessment/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_assessment/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_assessment/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_chat/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_chat/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_chat/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_chat/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_chat/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_chat/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_daco/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_daco/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_daco/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_daco/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_daco/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_daco/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_doku/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_doku/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_doku/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_doku/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_doku/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_doku/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_forum/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_forum/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_forum/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_forum/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_forum/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_forum/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_gmap/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_gmap/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_gmap/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_gmap/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_gmap/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_gmap/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_images/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_images/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_images/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_images/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_images/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_images/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_imscc/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_imscc/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_imscc/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_imscc/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_imscc/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_imscc/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_lamc/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_lamc/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_lamc/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_lamc/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_lamc/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_lamc/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_laqa/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_laqa/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_laqa/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_laqa/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_laqa/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_laqa/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_larsrc/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_larsrc/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_larsrc/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_larsrc/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_larsrc/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_larsrc/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_leader/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_leader/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_leader/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_leader/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_leader/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_leader/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_mindmap/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_mindmap/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_mindmap/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_mindmap/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_mindmap/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_mindmap/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_nb/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_nb/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_nb/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_nb/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_nb/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_nb/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_notebook/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_notebook/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_notebook/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_notebook/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_notebook/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_notebook/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_pixlr/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_pixlr/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_pixlr/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_pixlr/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_pixlr/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_pixlr/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_preview/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_preview/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_preview/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_preview/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_preview/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_preview/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_sbmt/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_sbmt/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_sbmt/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_sbmt/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_sbmt/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_sbmt/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_scratchie/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_scratchie/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_scratchie/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_scratchie/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_scratchie/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_scratchie/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_scratchie/web/pages/learning/questionlist.jsp
===================================================================
diff -u -rffe8b9f99cc1b92f42365c50928dc3040183c545 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_scratchie/web/pages/learning/questionlist.jsp	(.../questionlist.jsp)	(revision ffe8b9f99cc1b92f42365c50928dc3040183c545)
+++ lams_tool_scratchie/web/pages/learning/questionlist.jsp	(.../questionlist.jsp)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -36,13 +36,13 @@
 		<c:choose>
 			<c:when test="${isUserLeader && sessionMap.reflectOn}">
 				<input type="hidden" name="method" id="method" value="newReflection">
-				<button name="finishButton" id="finishButton" onclick="return finish(false);" class="btn btn-primary">
+				<button name="finishButton" id="finishButton" onclick="return finish(false);" class="btn btn-primary na">
 					<fmt:message key="label.continue" />
 				</button>
 			</c:when>
 			<c:otherwise>
 				<input type="hidden" name="method" id="method" value="showResults">
-				<button name="finishButton" id="finishButton" onclick="return finish(false);" class="btn btn-primary">
+				<button name="finishButton" id="finishButton" onclick="return finish(false);" class="btn btn-primary na">
 					<fmt:message key="label.submit" />
 				</button>
 			</c:otherwise>
Index: lams_tool_scribe/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_scribe/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_scribe/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_scribe/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_scribe/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_scribe/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_spreadsheet/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_spreadsheet/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_spreadsheet/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_survey/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_survey/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_survey/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_survey/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_survey/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_survey/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_task/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_task/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_task/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_task/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_task/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_task/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_vote/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_vote/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_vote/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_vote/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_vote/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_vote/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_whiteboard/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_whiteboard/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_whiteboard/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_whiteboard/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_whiteboard/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_whiteboard/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_wiki/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_wiki/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_wiki/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_wiki/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_wiki/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_wiki/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_tool_zoom/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_zoom/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_zoom/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_tool_zoom/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_tool_zoom/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_tool_zoom/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>
 	
Index: lams_www/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_www/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_www/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_www/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -rc14b61c5121849a97cd799b1e2c66201a853cbe5
--- lams_www/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a)
+++ lams_www/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
@@ -24,25 +24,24 @@
 </c:if>
 
 <%@ attribute name="notebookLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
-<%-- Default value for I18N keys --%> 
 <c:if test="${empty notebookLabelKey}">
 	<c:set var="notebookLabelKey" value="label.notebook" />
 </c:if>
+<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty finishButtonLabelKey}">
 	<c:set var="finishButtonLabelKey" value="label.submit" />
 </c:if>
+<%@ attribute name="nextActivityButtonLabelKey" required="false" rtexprvalue="true"%>
 <c:if test="${empty nextActivityButtonLabelKey}">
-	<c:set var="nextActivityButtonLabelKey" value="label.finish" />
+	<c:set var="nextActivityButtonLabelKey" value="label.finished" />
 </c:if>
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
-		checkNextGateActivity('finishButton', '${toolSessionID}', '', submitForm);
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', submitForm);
 		
 		function disableFinishButton() {
-			document.getElementById("finishButton").disabled = true;
+			document.getElementById("finish-button").disabled = true;
 		}
 		function submitForm() {
 			var f = document.getElementById('reflectionForm');
@@ -79,7 +78,7 @@
 			</div>
 	
 			<div class="activity-bottom-buttons">
-				<button name="finishButton" id="finishButton" class="btn btn-primary">
+				<button name="finishButton" id="finish-button" class="btn btn-primary na">
 					<c:choose>
 						<c:when test="${!isNextActivityButtonSupported || isLastActivity}">
 							<fmt:message key="${finishButtonLabelKey}" />
@@ -90,7 +89,6 @@
 					</c:choose>
 				</buttun>
 			</div>
-		
 		</div>
 	</form:form>