Index: lams_admin/web/css/admin.scss
===================================================================
diff -u -r85121f2d5a0394c96ef2ad1859c22b82391279b7 -rb311244c55b221fc9f910cf4de25874d13d2296d
--- lams_admin/web/css/admin.scss	(.../admin.scss)	(revision 85121f2d5a0394c96ef2ad1859c22b82391279b7)
+++ lams_admin/web/css/admin.scss	(.../admin.scss)	(revision b311244c55b221fc9f910cf4de25874d13d2296d)
@@ -1,5 +1,9 @@
 @import "_lams_variables.scss";
 
+body.component {
+  background-color: #F8F8F8; /* rgb(248, 248, 248) */
+}
+
 .signupFieldDescription {
 	color: lighten($gray-base, 50%);
 }
Index: lams_central/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -re35d32548668a6cc323a779ee6d9b5c0a567e147 -rb311244c55b221fc9f910cf4de25874d13d2296d
--- lams_central/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision e35d32548668a6cc323a779ee6d9b5c0a567e147)
+++ lams_central/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b311244c55b221fc9f910cf4de25874d13d2296d)
@@ -2,6 +2,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
@@ -50,13 +51,21 @@
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
         <lams:JSImport src="includes/javascript/websocket.js" />
-        <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
         <c:if test="${showHeader}">
+        	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
 	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />');
+	                decoderDiv = $('<div />'),
+	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
+	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
+	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
+	                LABEL_NOT_STARTED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.activity' /></spring:escapeBody>",
+	                LABEL_COMPLETED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.gate' /></spring:escapeBody>",
+	                LABEL_CURRENT_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.gate' /></spring:escapeBody>",
+	                LABEL_NOT_STARTED_GATE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.not.started.gate' /></spring:escapeBody>";
 	            var commandWebsocketHookTrigger = null,
 	                commandWebsocketHook = null;
 	
@@ -87,7 +96,7 @@
 	    	<c:if test="${showHeader}">
 				<div class="offcanvas offcanvas-start" tabindex="-1" id="component-offcanvas" aria-label="<fmt:message key='label.side.menu' />">
 					<div class="offcanvas-body">
-						<button type="button" class="btn-close float-end" data-bs-dismiss="offcanvas" 
+						<button type="button" class="btn-close float-end me-1" data-bs-dismiss="offcanvas" 
 								aria-label="<fmt:message key='label.close' />" 
 								title="<fmt:message key='label.close' />"></button>
 						
@@ -103,7 +112,7 @@
 			                </ul>
 			            </div>
 			
-						<div class="offcanvas-bar lcard pb-3">
+						<div class="offcanvas-bar lcard pb-3 mb-3">
 				            <div class="offcanvas-title py-3" id="offcanvas-progress-bar-title">
 				            	<fmt:message key='label.my.progress'/>
 				            </div>
Index: lams_central/web/WEB-INF/tags/Rating5.tag
===================================================================
diff -u -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c -rb311244c55b221fc9f910cf4de25874d13d2296d
--- lams_central/web/WEB-INF/tags/Rating5.tag	(.../Rating5.tag)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
+++ lams_central/web/WEB-INF/tags/Rating5.tag	(.../Rating5.tag)	(revision b311244c55b221fc9f910cf4de25874d13d2296d)
@@ -196,8 +196,8 @@
 					<div class="d-flex align-items-center">
 						<div class="flex-grow-1">
 							<textarea name="comment" rows="2" id="comment-textarea-${itemRatingDto.itemId}" class="form-control comment-textarea"
-									placeholder="<fmt:message key="label.comment.textarea.tip"/>"
-									aria-label="<fmt:message key="label.comment.textarea.tip"/>"></textarea>
+									placeholder="<fmt:message key="label.rating.textarea.tip"/>"
+									aria-label="<fmt:message key="label.rating.textarea.tip"/>"></textarea>
 						</div>
 						<div>
 							<button class="btn btn-secondary btn-sm add-comment add-comment-new ms-2"
Index: lams_central/web/css/bootstrap5.custom.scss
===================================================================
diff -u -r509e81cd8bc4486fab7de352c4e8cfafd38efe48 -rb311244c55b221fc9f910cf4de25874d13d2296d
--- lams_central/web/css/bootstrap5.custom.scss	(.../bootstrap5.custom.scss)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
+++ lams_central/web/css/bootstrap5.custom.scss	(.../bootstrap5.custom.scss)	(revision b311244c55b221fc9f910cf4de25874d13d2296d)
@@ -13,4 +13,8 @@
 
 :root {
 	--lams-background-gray: #e0e0e0; /* rgb(224, 224, 224) */
+}
+
+.offcanvas{
+	--bs-offcanvas-padding-x: 0.5rem;
 }
\ No newline at end of file
Index: lams_learning/web/css/components-learner.scss
===================================================================
diff -u -r29934b375099b67b06d6515d65c7bb3d72ace59e -rb311244c55b221fc9f910cf4de25874d13d2296d
--- lams_learning/web/css/components-learner.scss	(.../components-learner.scss)	(revision 29934b375099b67b06d6515d65c7bb3d72ace59e)
+++ lams_learning/web/css/components-learner.scss	(.../components-learner.scss)	(revision b311244c55b221fc9f910cf4de25874d13d2296d)
@@ -92,7 +92,7 @@
 
 .component-page-wrapper .offcanvas {
     top: 4.5rem;
-	width: 18rem;
+	width: 20rem;
     max-width: 70rem;
     border-radius: 0 1.2rem 0 0;
     border: thin solid var(--bs-gray-400);
@@ -113,10 +113,6 @@
     left: 1rem;
 }
 
-.component-page-wrapper .offcanvas .progress-bar-items > li {
-    padding: .5rem;
-}
-
 .component-page-wrapper .offcanvas .progress-bar-items > li a {
     color: var(--bs-gray-dark);
 }
@@ -135,6 +131,22 @@
     color: var(--bs-green);
 }
 
+#component-offcanvas .list-group-item {
+	padding: 0;
+
+	.icon {
+		width: 35px;
+		background-color: rgba(211,211,211,0.17);
+		padding: 10px 35px 10px 10px;
+		margin-left: 12px;
+	}
+	
+	.col {
+		padding-left: 0.2rem;
+    	padding-right: 1rem;
+	}
+}
+
 .component-page-wrapper .activity-bottom-buttons {
     margin-top: 1rem;
     display: flex;
Index: lams_learning/web/grouping/show.jsp
===================================================================
diff -u -r56ec8d9806c22331d9483e197f0e270b638471be -rb311244c55b221fc9f910cf4de25874d13d2296d
--- lams_learning/web/grouping/show.jsp	(.../show.jsp)	(revision 56ec8d9806c22331d9483e197f0e270b638471be)
+++ lams_learning/web/grouping/show.jsp	(.../show.jsp)	(revision b311244c55b221fc9f910cf4de25874d13d2296d)
@@ -56,7 +56,7 @@
 				
 				<div>
 					<div class="table-responsive">
-						<div class="ltable table-stripped mb-0">
+						<div class="ltable table-striped mb-0">
 							<c:forEach var="group" items="${groups}">
 								<div class="row">
 									<div class="col-2">
Index: lams_learning/web/includes/javascript/learnerPage.js
===================================================================
diff -u -r9576915785bfd47231fe20f9da6f130d39dc9c34 -rb311244c55b221fc9f910cf4de25874d13d2296d
--- lams_learning/web/includes/javascript/learnerPage.js	(.../learnerPage.js)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
+++ lams_learning/web/includes/javascript/learnerPage.js	(.../learnerPage.js)	(revision b311244c55b221fc9f910cf4de25874d13d2296d)
@@ -13,63 +13,88 @@
             $('.component-page-wrapper .component-page-content #lesson-name').text(result.lessonName);
 
             // draw support activities if they exist
+            const ACTIVITY_ITEM_TEMPLATE = '<li><div class="row align-items-center"><div class="icon"></div><div class="col text-center"></div></div></li>';
             if (result.support) {
-                let supportBarItems = $('.component-page-wrapper .offcanvas #offcanvas-support-bar').removeClass('d-none')
-                    .find('#support-bar-items').empty();
+                let supportBarItems = $('.component-page-wrapper .offcanvas #offcanvas-support-bar')
+                	.removeClass('d-none')
+                    .find('#support-bar-items')
+                    .empty();
                 $.each(result.support, function (activityIndex, activityData) {
-                    let activityItem = $('<li>')
-                        .addClass('list-group-item list-group-item-action progress-bar-item-openable')
-                        .prepend('<i class="fa-solid fa-fw fa-up-right-from-square progress-bar-icon">').appendTo(supportBarItems);
-                    let activityLink = $('<a>').text(activityData.name).attr({
-                        'target': '_blank',
-                        'href': activityData.url,
-                        'role': 'menuitem',
-                        'title': 'Open completed activity'
-                    });
-                    activityItem.append(activityLink);
+                    let activityItem = $(ACTIVITY_ITEM_TEMPLATE)
+                        .addClass('list-group-item list-group-item-action progress-bar-item-openable').appendTo(supportBarItems),
+                        activityIcon = $('<i>').attr({
+	                        'class': 'fa-solid fa-fw fa-lg fa-up-right-from-square progress-bar-icon',
+	                        'title': LABEL_SUPPORT_ACTIVITY
+						}),
+                    	activityLink = $('<a>').text(activityData.name).attr({
+	                        'target': '_blank',
+	                        'href': activityData.url,
+	                        'role': 'menuitem',
+	                        'title': LABEL_CLICK_TO_OPEN
+	                    });
+	                $(".icon", activityItem).prepend(activityIcon);
+	                $(".col", activityItem).append(activityLink);
                 });
             }
 
             let progressBarItems = $('.component-page-wrapper .offcanvas #progress-bar-items').empty(),
                 completedActivityCount = 0;
             $.each(result.activities, function (activityIndex, activityData) {
-                let activityItem = $('<li>')
+                let activityItem = $(ACTIVITY_ITEM_TEMPLATE)
                 		.addClass('list-group-item list-group-item-action')
                 		.appendTo(progressBarItems),
                     activityName = !activityData.name && activityData.type === 'g' ? 'Gate' : activityData.name,
-                    activityIcon = $('<i class="fa-solid fa-fw fa-lg progress-bar-icon"></i>');
+                    activityIcon = $('<i class="fa-fw fa-lg progress-bar-icon"></i>');
+                    $(".icon", activityItem).prepend(activityIcon);
 
+				//current
                 if (activityData.status === 0) {
-                    activityItem.addClass('active').text(activityName).prepend(activityIcon);
+                    activityItem.addClass('active');
+                    $(".col", activityItem).text(activityName);
                     if (activityData.type === 'g') {
-                        activityIcon.addClass('fa-hourglass-half');
+                        activityIcon.addClass('fa-solid fa-unlock')
+                        			.attr('title', LABEL_CURRENT_GATE);
+                        
                     } else {
-                        activityIcon.addClass('fa-pen-to-square');
+                        activityIcon.addClass('fa-regular fa-pen-to-square')
+                        			.attr('title', LABEL_CURRENT_ACTIVITY);
                     }
+                
+                //completed
                 } else if (activityData.status === 1) {
                     completedActivityCount++;
 
-                    activityItem.addClass('progress-bar-item-complete').prepend(activityIcon);
+                    activityItem.addClass('progress-bar-item-complete');
                     if (activityData.type === 'g') {
-                        activityIcon.addClass('fa-hourglass-full');
+                        activityIcon.addClass('fa-solid fa-lock-open')
+                        			.attr('title', LABEL_COMPLETED_GATE);
+                        
                     } else {
-                        activityIcon.addClass('fa-square-check');
+                        activityIcon.addClass('fa-solid fa-square-check')
+                        			.attr('title', LABEL_COMPLETED_ACTIVITY);
                     }
                     if (activityData.url) {
                         let activityLink = $('<a>').text(activityName).attr({
                             'target': '_blank',
                             'href': activityData.url,
                             'role': 'menuitem',
-                            'title': 'Open completed activity'
+                            'title': LABEL_CLICK_TO_OPEN
                         });
-                        activityItem.addClass('progress-bar-item-openable').append(activityLink);
+                        activityItem.addClass('progress-bar-item-openable');
+                        $(".col", activityItem).append(activityLink);
                     }
+                
+                //not yet finished
                 } else {
-                    activityItem.addClass('progress-bar-item-incomplete').text(activityName).prepend(activityIcon);
+                    activityItem.addClass('progress-bar-item-incomplete');
+                    $(".col", activityItem).text(activityName);
                     if (activityData.type === 'g') {
-                        activityIcon.addClass('fa-hourglass-start');
+                        activityIcon.addClass('fa-solid fa-lock')
+                        			.attr('title', LABEL_NOT_STARTED_GATE);
+                        
                     } else {
-                        activityIcon.addClass('fa-square');
+                        activityIcon.addClass('fa-regular fa-square')
+                        			.attr('title', LABEL_NOT_STARTED_ACTIVITY);
                     }
                 }
             });
@@ -139,6 +164,7 @@
     });
 }
 
+//TODO:remove this not-used function
 function toggleProgressBar(forceClose) {
     let pageContent = $('.component-page-wrapper .component-page-content'),
         progressBar = $('.component-page-wrapper .offcanvas'),
Index: lams_learning/web/optionsActivity.jsp
===================================================================
diff -u -r1d0ce1be34aebddea7bb2f201c2d10220384aa59 -rb311244c55b221fc9f910cf4de25874d13d2296d
--- lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision 1d0ce1be34aebddea7bb2f201c2d10220384aa59)
+++ lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision b311244c55b221fc9f910cf4de25874d13d2296d)
@@ -190,7 +190,7 @@
 		</form:form>
 		
 		<c:if test="${optionsActivityForm.minimumLimitReached or isPreview}">
-			<div class="activity-bottom-buttons">
+			<div class="activity-bottom-buttons mt-5">
 				<form:form action="/lams/learning/CompleteActivity.do" modelAttribute="messageForm" method="post" id="messageForm">
 					<input type="hidden" name="lams_token" value="<c:out value='${lams_token}' />">
 					<input type="hidden" name="activityID" value="<c:out value='${optionsActivityForm.activityID}' />">
Index: lams_tool_chat/web/includes/css/chat.scss
===================================================================
diff -u -r3fd5fa647e9810deef15109ccf423e7db0315c08 -rb311244c55b221fc9f910cf4de25874d13d2296d
--- lams_tool_chat/web/includes/css/chat.scss	(.../chat.scss)	(revision 3fd5fa647e9810deef15109ccf423e7db0315c08)
+++ lams_tool_chat/web/includes/css/chat.scss	(.../chat.scss)	(revision b311244c55b221fc9f910cf4de25874d13d2296d)
@@ -2,7 +2,6 @@
  
 /* ==================== COMMON ==================== */
 .message {
-	font-size: 12px;
 	padding-bottom: 4px;
 }
 
Index: lams_tool_daco/web/pages/learning/addRecord.jsp
===================================================================
diff -u -r9576915785bfd47231fe20f9da6f130d39dc9c34 -rb311244c55b221fc9f910cf4de25874d13d2296d
--- lams_tool_daco/web/pages/learning/addRecord.jsp	(.../addRecord.jsp)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
+++ lams_tool_daco/web/pages/learning/addRecord.jsp	(.../addRecord.jsp)	(revision b311244c55b221fc9f910cf4de25874d13d2296d)
@@ -37,20 +37,22 @@
 		</lams:Alert5>
 	</c:if>
 	
-	<lams:Alert5 id="minRecords" type="info" close="true">		
-		<c:if test="${not (empty daco.minRecords or daco.minRecords eq 0)}">
-			<fmt:message key="error.record.notenough">
-				<fmt:param value="${daco.minRecords}" />
-			</fmt:message>
-		</c:if>
-					
-		<c:if test="${not (empty daco.maxRecords or daco.maxRecords eq 0)}">
-			<br />
-			<fmt:message key="error.record.toomuch">
-				<fmt:param value="${daco.maxRecords}" />
-			</fmt:message>
-		</c:if>
-	</lams:Alert5>
+	<c:if test="${not (empty daco.minRecords or daco.minRecords eq 0) || not (empty daco.maxRecords or daco.maxRecords eq 0)}">
+		<lams:Alert5 id="minRecords" type="info" close="true">		
+			<c:if test="${not (empty daco.minRecords or daco.minRecords eq 0)}">
+				<fmt:message key="error.record.notenough">
+					<fmt:param value="${daco.minRecords}" />
+				</fmt:message>
+			</c:if>
+						
+			<c:if test="${not (empty daco.maxRecords or daco.maxRecords eq 0)}">
+				<br />
+				<fmt:message key="error.record.toomuch">
+					<fmt:param value="${daco.maxRecords}" />
+				</fmt:message>
+			</c:if>
+		</lams:Alert5>
+	</c:if>
 
 	<c:if test="${not finishedLock }">
 	
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -r1ca8633aea1d461a727b7e31c4493a21bfdff073 -rb311244c55b221fc9f910cf4de25874d13d2296d
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 1ca8633aea1d461a727b7e31c4493a21bfdff073)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision b311244c55b221fc9f910cf4de25874d13d2296d)
@@ -314,7 +314,7 @@
                             <button type="button" onClick="javascript:completeItem(${item.uid})"
                                     class="complete-item-button btn btn-success no-shadow ms-2">
                                 <i class="fa-solid fa-pen-to-square fa-xl me-1"></i>
-                                <fmt:message key="label.completed" />
+                                <fmt:message key="label.mark.completed" />
                             </button>
                         </c:if>
 
Index: lams_tool_scratchie/web/includes/css/scratchie-learning.scss
===================================================================
diff -u -rc7e47ec4e4d6a14b2bab1af3de564b012f80f6b0 -rb311244c55b221fc9f910cf4de25874d13d2296d
--- lams_tool_scratchie/web/includes/css/scratchie-learning.scss	(.../scratchie-learning.scss)	(revision c7e47ec4e4d6a14b2bab1af3de564b012f80f6b0)
+++ lams_tool_scratchie/web/includes/css/scratchie-learning.scss	(.../scratchie-learning.scss)	(revision b311244c55b221fc9f910cf4de25874d13d2296d)
@@ -97,7 +97,12 @@
 
 .bq-title {
 	text-decoration: underline;
+	color: rgb(255, 255, 255)	
 }
+.bq-title:hover {
+	color: rgb(255, 255, 255);
+}
+
 	
 .fake-validation-input {
 	visibility: hidden;
@@ -118,7 +123,6 @@
 }
 
 .scratched {
-
 	.icon-mask,
 	.letter-mask {
 		stroke-dashoffset: 0;
Index: lams_tool_scratchie/web/pages/learning/questionlist.jsp
===================================================================
diff -u -r261520f042046fcb6f4f85c596495e3ea98311aa -rb311244c55b221fc9f910cf4de25874d13d2296d
--- lams_tool_scratchie/web/pages/learning/questionlist.jsp	(.../questionlist.jsp)	(revision 261520f042046fcb6f4f85c596495e3ea98311aa)
+++ lams_tool_scratchie/web/pages/learning/questionlist.jsp	(.../questionlist.jsp)	(revision b311244c55b221fc9f910cf4de25874d13d2296d)
@@ -12,7 +12,7 @@
 	<c:if test="${isUserLeader && scratchie.burningQuestionsEnabled || (mode == 'teacher')}">
 		<div class="burning-question-container mb-3">
 			<button type="button" data-bs-toggle="collapse" data-bs-target="#burning-question-general"
-					class="btn btn-light btn-sm mb-2 <c:if test="${empty sessionMap.generalBurningQuestion}">collapsed</c:if>">
+					class="btn btn-light card-subheader mb-2 <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>
Index: lams_tool_scratchie/web/pages/learning/scratchies.jsp
===================================================================
diff -u -rdf26095fede71a40145385ab3f73c9d2f981e11b -rb311244c55b221fc9f910cf4de25874d13d2296d
--- lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision df26095fede71a40145385ab3f73c9d2f981e11b)
+++ lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision b311244c55b221fc9f910cf4de25874d13d2296d)
@@ -230,7 +230,7 @@
 			<c:if test="${!showResults && scratchie.burningQuestionsEnabled && (isUserLeader || (mode == 'teacher'))}">
 				<div class="burning-question-container mb-2 mt-4">
 					<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>">
+							class="btn btn-light card-subheader <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" />
Index: lams_tool_task/web/pages/learning/learning.jsp
===================================================================
diff -u -r81f928586161dd03042b6353f68c7d7b8279ccde -rb311244c55b221fc9f910cf4de25874d13d2296d
--- lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 81f928586161dd03042b6353f68c7d7b8279ccde)
+++ lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision b311244c55b221fc9f910cf4de25874d13d2296d)
@@ -147,7 +147,7 @@
 					if (eval(i.data("waiting-for-comment"))) {
 						i.parent().replaceWith( '<button type="button" onClick="javascript:completeItem(' + itemUid + ')" class="complete-item-button btn btn-success no-shadow">' + 
 											'<i class="fa-solid fa-pen-to-square fa-xl me-1"></i>' +
-											'<fmt:message key="label.completed" />' +
+											'<fmt:message key="label.mark.completed" />' +
 										'</button> '
 						);
 					}
Index: lams_tool_task/web/pages/learning/parts/itemlist.jsp
===================================================================
diff -u -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581 -rb311244c55b221fc9f910cf4de25874d13d2296d
--- lams_tool_task/web/pages/learning/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
+++ lams_tool_task/web/pages/learning/parts/itemlist.jsp	(.../itemlist.jsp)	(revision b311244c55b221fc9f910cf4de25874d13d2296d)
@@ -41,13 +41,14 @@
 								<button type="button" onClick="javascript:completeItem(${item.uid})"
 										class="complete-item-button btn btn-success no-shadow">
 									<i class="fa-solid fa-pen-to-square fa-xl me-1"></i>
-									<fmt:message key="label.completed" />
+									<fmt:message key="label.mark.completed" />
 								</button>
 							</c:when>
 
 							<c:otherwise>
 								<span class="text-bg-danger p-1 rounded-pill">
 									<i id="item-faminus-${item.uid}" class="fa fa-lg fa-minus" 
+											title="<fmt:message key="label.complete.required.activities" />"
 											data-waiting-for-comment="${(mode != 'teacher') && (not finishedLock) && (not taskList.sequentialOrder || itemDTO.previousTaskCompleted) 
 											&& !itemDTO.commentRequirementsMet && itemDTO.attachmentRequirementsMet}"></i>
 								</span>