Index: lams_central/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r5e0e6c18ca08f6278b97fdd72c05162207700c34 -r5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10
--- lams_central/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 5e0e6c18ca08f6278b97fdd72c05162207700c34)
+++ lams_central/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10)
@@ -14,6 +14,9 @@
 <%@ attribute name="resizeParentFrameName" required="false" rtexprvalue="true"%>
 <%@ attribute name="method" required="false" rtexprvalue="true"%>
 <%@ attribute name="maxWords" required="false" rtexprvalue="true"%>
+<%@ attribute name="ariaLabel" required="false" rtexprvalue="true"%>
+<%@ attribute name="ariaLabelledby" required="false" rtexprvalue="true"%>
+<%@ attribute name="ariaRequired" required="false" rtexprvalue="true"%>
 
 <c:if test="${empty method}">
 	<c:set var="method" value="inline" />
@@ -47,7 +50,11 @@
 	<div class="cke-div">
 </c:if>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+<textarea id="${id}" name="${id}"
+	style="display: none; visibility: hidden; height: 0px;"
+	<c:if test="${not empty ariaLabel}">aria-label="${ariaLabel}"</c:if>
+	<c:if test="${not empty ariaLabelledby}">aria-labelledby="${ariaLabelledby}"</c:if>
+	aria-required="${ariaRequired}" aria-multiline="true">${fixedValue}</textarea>
 
 <c:if test="${not empty placeholder}">
 		<label for="${id}" class="cke-label-floating">${placeholder}</label>
Index: lams_central/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rc14b61c5121849a97cd799b1e2c66201a853cbe5 -r5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10
--- lams_central/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
+++ lams_central/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10)
@@ -54,7 +54,7 @@
 	</lams:Alert5>
 
 	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-refresh mt-3"> 
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
 			<fmt:message key="${buttonTryAgainKey}" />
 		</a>
 	</div>
Index: lams_central/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -r2d222c70de889ebe48b8ffd4feed1a03e5db3972 -r5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10
--- lams_central/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 2d222c70de889ebe48b8ffd4feed1a03e5db3972)
+++ lams_central/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10)
@@ -55,7 +55,6 @@
 	<div id="instructions" class="instructions">
 		<lams:out value="${instructions}" escapeHtml="true" />
 	</div>
-	<hr class="mx-5">
 
 	<form:form action="${formActionUrl}" modelAttribute="${formModelAttribute}" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
 		<c:forTokens items="${hiddenInputs}" delims="," var="hiddenInput"> 
Index: lams_central/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r26a34c350d04eba17d74496a06d0e4664c0925e7 -r5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10
--- lams_central/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 26a34c350d04eba17d74496a06d0e4664c0925e7)
+++ lams_central/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10)
@@ -44,6 +44,7 @@
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
+        <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
Index: lams_central/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r66aaa15469871d9f71cafcfc4222ffa90f2d9bb2 -r5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10
--- lams_central/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 66aaa15469871d9f71cafcfc4222ffa90f2d9bb2)
+++ lams_central/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10)
@@ -197,17 +197,17 @@
 					</c:if>
 				
 					<div class="row">
-						<div class="col-xs-12 col-sm-10">
+						<div class="col-xs-12 col-sm-11">
 							<textarea name="comment" rows="2" id="comment-textarea-${itemRatingDto.itemId}" class="form-control comment-textarea"
 									placeholder="<fmt:message key="label.comment.textarea.tip"/>"></textarea>
 						</div>
-						<div class="col-xs-12 col-sm-2">
-							<button class="btn btn-primary add-comment add-comment-new"
+						<div class="col-xs-12 col-sm-1">
+							<button class="btn btn-success btn-sm add-comment add-comment-new"
 									data-item-id="${itemRatingDto.itemId}"
 									data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
 									data-show-all-comments="${showAllComments}"
 									data-refresh-on-submit="${refreshOnComment}">
-								<i class="fa fa-check"></i>
+								<i class="fa fa-check fa-lg"></i>
 							</button>
 						</div>
 					</div>
Index: lams_central/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u -r2d222c70de889ebe48b8ffd4feed1a03e5db3972 -r5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10
--- lams_central/web/WEB-INF/tags/WaitForLeader.tag	(.../WaitForLeader.tag)	(revision 2d222c70de889ebe48b8ffd4feed1a03e5db3972)
+++ lams_central/web/WEB-INF/tags/WaitForLeader.tag	(.../WaitForLeader.tag)	(revision 5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10)
@@ -67,7 +67,7 @@
 
 	<c:if test="${mode != teacher}">
 		<div class="activity-bottom-buttons">
-			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary btn-refresh">
+			<button name="refreshButton" id="refreshButton" onclick="refresh();" class="btn btn-primary btn-icon-refresh">
 				<fmt:message key="${refreshKey}" />
 			</button>
 		</div>
Index: lams_learning/web/css/components-learner.scss
===================================================================
diff -u -r2d222c70de889ebe48b8ffd4feed1a03e5db3972 -r5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10
--- lams_learning/web/css/components-learner.scss	(.../components-learner.scss)	(revision 2d222c70de889ebe48b8ffd4feed1a03e5db3972)
+++ lams_learning/web/css/components-learner.scss	(.../components-learner.scss)	(revision 5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10)
@@ -304,51 +304,41 @@
 	font-size: medium;
 }
 
-.na {
-  display: inline-block;
+.div-hover .row {
+	align-items: center;
+	border-top: 1px solid #ddd;
+	padding: 12px;
 }
-.na:after {
-  content: "\f0a9";
-  font-family: FontAwesome;
-  font-style: normal;
-  font-weight: normal;
-  text-decoration: inherit;
-  margin-left: 5px;
-  color: inherit;
+.div-hover .row:hover{
+	background-color: var(--bs-gray-200);
 }
 
-.btn-refresh {
+.na, .btn-icon-refresh, .btn-icon-pen, .btn-icon-return, .btn-icon-previous, .btn-icon-next {
   display: inline-block;
 }
-.btn-refresh:before {
-  content: "\f021";
+.na:after, .btn-icon-refresh:before, .btn-icon-pen:before, .btn-icon-return:before, .btn-icon-previous:before, .btn-icon-next:after {
   font-family: FontAwesome;
   font-style: normal;
   font-weight: normal;
   text-decoration: inherit;
+  margin-left: 5px;
   color: inherit;
 }
-
-.btn-icon-pen {
-  display: inline-block;
+.na:after {
+  content: "\f0a9";
 }
+.btn-icon-refresh:before {
+  content: "\f021";
+}
 .btn-icon-pen:before {
   content: "\f044";
-  font-family: FontAwesome;
-  font-style: normal;
-  font-weight: normal;
-  text-decoration: inherit;
-  color: inherit;
 }
-
-.btn-icon-return {
-  display: inline-block;
-}
 .btn-icon-return:before {
   content: "\f2ea";
-  font-family: FontAwesome;
-  font-style: normal;
-  font-weight: normal;
-  text-decoration: inherit;
-  color: inherit;
+}
+.btn-icon-previous:before {
+  content: "\f100";
+}
+.btn-icon-next:after {
+  content: "\f101";
 }
\ No newline at end of file
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b -r5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10)
@@ -243,7 +243,7 @@
 		<c:if test="${mode != 'teacher'}">
 			<div class="activity-bottom-buttons" id="learner-submit">
 				<c:if test="${!generalLearnerFlowDTO.isLearnerFinished}">
-					<button type="button" class="btn btn-secondary roffset5 float-start"
+					<button type="button" class="btn btn-secondary btn-icon-refresh float-start"
 							onclick="refreshPage('${qaLearningForm.refreshAnswers}');">
 						<fmt:message key="label.refresh" />
 					</button>
Index: lams_tool_scratchie/web/includes/css/scratchie-learning.scss
===================================================================
diff -u -r4cf35e7c4a45c574ba62a76a3dd47ba7495a23f6 -r5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10
--- lams_tool_scratchie/web/includes/css/scratchie-learning.scss	(.../scratchie-learning.scss)	(revision 4cf35e7c4a45c574ba62a76a3dd47ba7495a23f6)
+++ lams_tool_scratchie/web/includes/css/scratchie-learning.scss	(.../scratchie-learning.scss)	(revision 5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10)
@@ -12,14 +12,6 @@
 	border-bottom: none;
 }
 
-.scratches .row {
-	align-items: center;
-	border-top: 1px solid #ddd;
-	padding: 12px;
-}
-.scratches .row:hover{
-	background-color: var(--bs-gray-200);
-}
 .scratches .scartchie-image-col {
 	width: 120px;
 	margin-left: -1rem;
Index: lams_tool_scratchie/web/pages/learning/questionlist.jsp
===================================================================
diff -u -rc14b61c5121849a97cd799b1e2c66201a853cbe5 -r5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10
--- lams_tool_scratchie/web/pages/learning/questionlist.jsp	(.../questionlist.jsp)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
+++ lams_tool_scratchie/web/pages/learning/questionlist.jsp	(.../questionlist.jsp)	(revision 5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10)
@@ -11,18 +11,18 @@
 	<%-- show general burning question --%>
 	<c:if test="${isUserLeader && scratchie.burningQuestionsEnabled || (mode == 'teacher')}">
 		<div class="burning-question-container mb-3">
-			<a data-bs-toggle="collapse" data-bs-target="#burning-question-general" href="#" role="button"
-					<c:if test="${empty sessionMap.generalBurningQuestion}">class="collapsed"</c:if>>
+			<button type="button" data-bs-toggle="collapse" data-bs-target="#burning-question-general"
+					class="btn btn-light btn-sm <c:if test="${empty sessionMap.generalBurningQuestion}">collapsed</c:if>">
 				<span class="if-collapsed">
 					<i class="fa fa-xs fa-regular fa-square-plus" aria-hidden="true"></i>
 				</span>
 	  			<span class="if-not-collapsed">
 	  				<i class="fa fa-xs fa-regular fa-square-minus" aria-hidden="true"></i>
 	  			</span>
 				<fmt:message key="label.general.burning.question" />
-			</a>
+			</button>
 	
-			<div id="burning-question-general" class="collapse <c:if test="${not empty sessionMap.generalBurningQuestion}">show</c:if>">
+			<div id="burning-question-general" class="collapse <c:if test="${not empty sessionMap.generalBurningQuestion}">show</c:if>" pt-2>
 				<textarea rows="5" name="generalBurningQuestion" class="form-control"
 					<c:if test="${mode == 'teacher'}">disabled="disabled"</c:if>
 				>${sessionMap.generalBurningQuestion}</textarea>
Index: lams_tool_scratchie/web/pages/learning/scratchies.jsp
===================================================================
diff -u -r2d222c70de889ebe48b8ffd4feed1a03e5db3972 -r5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10
--- lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision 2d222c70de889ebe48b8ffd4feed1a03e5db3972)
+++ lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision 5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10)
@@ -185,11 +185,11 @@
 			<%--Display Etherpad for each question --%>
 			<c:if test="${isQuestionEtherpadEnabled}">
 				<div class="question-etherpad-container mb-3">
-					<a data-bs-toggle="collapse" data-bs-target="#question-etherpad-${item.uid}" href="#" class="collapsed" role="button" >
+					<button type="button" data-bs-toggle="collapse" data-bs-target="#question-etherpad-${item.uid}" class="collapsed">
 						<span class="if-collapsed"><i class="fa fa-xs fa-regular fa-square-plus" aria-hidden="true"></i></span>
 		  				<span class="if-not-collapsed"><i class="fa fa-xs fa-regular fa-square-minus" aria-hidden="true"></i></span>
 						<fmt:message key="label.etherpad.discussion" />
-					</a>
+					</button>
 					
 					<div id="question-etherpad-${item.uid}" class="question-etherpad-collapse collapse">
 						<div class="card question-etherpad">
@@ -204,12 +204,12 @@
 			<%-- show burning questions --%>
 			<c:if test="${!showResults && scratchie.burningQuestionsEnabled && (isUserLeader || (mode == 'teacher'))}">
 				<div class="burning-question-container mb-3">
-					<a id="bq${item.uid}" data-bs-toggle="collapse" data-bs-target="#burning-question-item${item.uid}" href="#" role="button"
-							<c:if test="${empty item.burningQuestion}">class="collapsed"</c:if>>
+					<button type="button" id="bq${item.uid}" data-bs-toggle="collapse" data-bs-target="#burning-question-item${item.uid}"
+							class="btn btn-light btn-sm <c:if test="${empty item.burningQuestion}">collapsed</c:if>">
 						<span class="if-collapsed"><i class="fa fa-xs fa-regular fa-square-plus" aria-hidden="true"></i></span>
 		  				<span class="if-not-collapsed"><i class="fa fa-xs fa-regular fa-square-minus" aria-hidden="true"></i></span>
 						<fmt:message key="label.burning.question" />
-					</a>
+					</button>
 					
 					<div id="burning-question-item${item.uid}" class="collapse <c:if test="${not empty item.burningQuestion}">show</c:if> p-2">
 						<textarea rows="5" name="burningQuestion${item.uid}" class="form-control" aria-labelledby="questionTitle${questionNumber.count} bq${item.uid}" 
Index: lams_tool_scratchie/web/pages/learning/waitForLeaderTimeLimit.jsp
===================================================================
diff -u -rbbe6b21a663059e2539bc0ea5ce761445b5ae1c1 -r5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10
--- lams_tool_scratchie/web/pages/learning/waitForLeaderTimeLimit.jsp	(.../waitForLeaderTimeLimit.jsp)	(revision bbe6b21a663059e2539bc0ea5ce761445b5ae1c1)
+++ lams_tool_scratchie/web/pages/learning/waitForLeaderTimeLimit.jsp	(.../waitForLeaderTimeLimit.jsp)	(revision 5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10)
@@ -18,7 +18,7 @@
 		</lams:Alert5>
 
 		<div class="activity-bottom-buttons">
-			<button id="refreshButton" name="refreshButton" onclick="refresh();" class="btn btn-primary">
+			<button id="refreshButton" name="refreshButton" onclick="refresh();" class="btn btn-primary btn-icon-refresh">
 				<fmt:message key="label.refresh" />
 			</button>
 		</div>