Index: lams_central/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -rc14b61c5121849a97cd799b1e2c66201a853cbe5 -r2d222c70de889ebe48b8ffd4feed1a03e5db3972
--- lams_central/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
+++ lams_central/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 2d222c70de889ebe48b8ffd4feed1a03e5db3972)
@@ -65,7 +65,7 @@
 		<lams:errors5/>
 		
 		<div class="container-lg">
-			<div class="card lcard lcard-no-borders shadow mb-3">
+			<div class="card lcard">
 				<div class="card-header lcard-header-button-border">
 					<fmt:message key="${notebookLabelKey}" />
 				</div>
Index: lams_central/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u -rb682c506270a405ed832364386fa691c9599cbaa -r2d222c70de889ebe48b8ffd4feed1a03e5db3972
--- lams_central/web/WEB-INF/tags/WaitForLeader.tag	(.../WaitForLeader.tag)	(revision b682c506270a405ed832364386fa691c9599cbaa)
+++ lams_central/web/WEB-INF/tags/WaitForLeader.tag	(.../WaitForLeader.tag)	(revision 2d222c70de889ebe48b8ffd4feed1a03e5db3972)
@@ -38,7 +38,7 @@
 		<fmt:message key="${waitingForLeaderKey}" />
 	</lams:Alert5>
 
-	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+	<div class="card lcard mt-1">
 		<div class="card-header lcard-header-button-border">
 			<fmt:message key="label.users.from.group" />
 		</div>
Index: lams_learning/web/css/components-learner.scss
===================================================================
diff -u -rc14b61c5121849a97cd799b1e2c66201a853cbe5 -r2d222c70de889ebe48b8ffd4feed1a03e5db3972
--- lams_learning/web/css/components-learner.scss	(.../components-learner.scss)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
+++ lams_learning/web/css/components-learner.scss	(.../components-learner.scss)	(revision 2d222c70de889ebe48b8ffd4feed1a03e5db3972)
@@ -230,19 +230,22 @@
     border-top-left-radius: 1.25rem;
     border-top-right-radius: 0rem;
     border-bottom-right-radius: 1.25rem;
-}
-
-.lcard-no-borders {
     border: 0;
+    box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);//copied from bootstrap .shadow class
+    margin-bottom: 1.5rem;//copied from bootstrap .mb-4 class
 }
 
-.lcard .lcard-header-lg {
+.lcard .card-header {
     border-top-left-radius: 1.25rem;
     border-top-right-radius: 0rem;
     font-size: 1.3rem;
     padding: 1rem;
 }
 
+.font-size-init {
+	font-size: initial;
+}
+
 /* coommented out for now by Andrey
 .lcard .lcard-header-button-border {
     border-bottom: 0.2rem solid var(--bs-primary);
@@ -312,7 +315,6 @@
   text-decoration: inherit;
   margin-left: 5px;
   color: inherit;
-  /*float: right;*/
 }
 
 .btn-refresh {
@@ -325,4 +327,28 @@
   font-weight: normal;
   text-decoration: inherit;
   color: inherit;
+}
+
+.btn-icon-pen {
+  display: inline-block;
+}
+.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;
 }
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tags/Notebook.tag
===================================================================
diff -u -rc14b61c5121849a97cd799b1e2c66201a853cbe5 -r2d222c70de889ebe48b8ffd4feed1a03e5db3972
--- lams_tool_assessment/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision c14b61c5121849a97cd799b1e2c66201a853cbe5)
+++ lams_tool_assessment/web/WEB-INF/tags/Notebook.tag	(.../Notebook.tag)	(revision 2d222c70de889ebe48b8ffd4feed1a03e5db3972)
@@ -65,7 +65,7 @@
 		<lams:errors5/>
 		
 		<div class="container-lg">
-			<div class="card lcard lcard-no-borders shadow mb-3">
+			<div class="card lcard">
 				<div class="card-header lcard-header-button-border">
 					<fmt:message key="${notebookLabelKey}" />
 				</div>
Index: lams_tool_assessment/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u -rb682c506270a405ed832364386fa691c9599cbaa -r2d222c70de889ebe48b8ffd4feed1a03e5db3972
--- lams_tool_assessment/web/WEB-INF/tags/WaitForLeader.tag	(.../WaitForLeader.tag)	(revision b682c506270a405ed832364386fa691c9599cbaa)
+++ lams_tool_assessment/web/WEB-INF/tags/WaitForLeader.tag	(.../WaitForLeader.tag)	(revision 2d222c70de889ebe48b8ffd4feed1a03e5db3972)
@@ -38,7 +38,7 @@
 		<fmt:message key="${waitingForLeaderKey}" />
 	</lams:Alert5>
 
-	<div class="card lcard lcard-no-borders shadow mb-3 mt-1">
+	<div class="card lcard mt-1">
 		<div class="card-header lcard-header-button-border">
 			<fmt:message key="label.users.from.group" />
 		</div>
Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
===================================================================
diff -u -ra69390a3d4a6fdfe442a3a6e8b6e3c306b49b612 -r2d222c70de889ebe48b8ffd4feed1a03e5db3972
--- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision a69390a3d4a6fdfe442a3a6e8b6e3c306b49b612)
+++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 2d222c70de889ebe48b8ffd4feed1a03e5db3972)
@@ -7,8 +7,8 @@
 
 		<c:if test="${questionEntry.key == answerEntry.key}">
 
-			<div class="card lcard lcard-no-borders shadow my-4" id="question<c:out value='${questionEntry.key}' />" aria-label="question">
-				<div class="card-header lcard-header lcard-header-button-border">
+			<div class="card lcard mt-4" id="question<c:out value='${questionEntry.key}' />" aria-label="question">
+				<div class="card-header">
 					<c:if test="${generalLearnerFlowDTO.mapQuestionContentLearner.size() !=1}"><c:out value="${questionEntry.key}" />. </c:if>  <c:out value="${questionEntry.value.name}" escapeXml="false" />
 				</div>
 
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b -r2d222c70de889ebe48b8ffd4feed1a03e5db3972
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 2d222c70de889ebe48b8ffd4feed1a03e5db3972)
@@ -41,10 +41,8 @@
 			<form:hidden path="totalQuestionCount" />
 
 			<c:forEach var="questionEntry" items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
-
-
-				<div class="card lcard lcard-no-borders shadow mb-3 my-4" id="questions${questionEntry.key}">
-					<div class="card-header ">
+				<div class="card lcard mt-4" id="questions${questionEntry.key}">
+					<div class="card-header">
 						<strong>
 							<c:if test="${generalLearnerFlowDTO.mapQuestionContentLearner.size() != 1}">${questionEntry.key}.&nbsp;</c:if> <c:out value="${questionEntry.value.name}" escapeXml="false" />
 						</strong>
Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
===================================================================
diff -u -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b -r2d222c70de889ebe48b8ffd4feed1a03e5db3972
--- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b)
+++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision 2d222c70de889ebe48b8ffd4feed1a03e5db3972)
@@ -8,8 +8,8 @@
 
 	<c:if test="${questionEntry.key == generalLearnerFlowDTO.currentQuestionIndex}">
 		
-		<div class="card lcard lcard-no-borders shadow my-4" id="question<c:out value='${questionEntry.key}' />" aria-label="question">
-			<div class="card-header lcard-header lcard-header-button-border">
+		<div class="card lcard mt-4" id="question<c:out value='${questionEntry.key}' />" aria-label="question">
+			<div class="card-header">
 				<div class="card-title">
 					<c:if test="${generalLearnerFlowDTO.mapQuestionContentLearner.size() != 1}"><c:out value="${questionEntry.key}" />.&nbsp;</c:if> <c:out value="${questionEntry.value.name}" escapeXml="false" />
 				</div>
Index: lams_tool_leader/web/pages/learning/leaderselection.jsp
===================================================================
diff -u -r4cf35e7c4a45c574ba62a76a3dd47ba7495a23f6 -r2d222c70de889ebe48b8ffd4feed1a03e5db3972
--- lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 4cf35e7c4a45c574ba62a76a3dd47ba7495a23f6)
+++ lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 2d222c70de889ebe48b8ffd4feed1a03e5db3972)
@@ -112,7 +112,7 @@
 			</c:otherwise>
 		</c:choose>
 
-		<div class="card lcard lcard-no-borders shadow my-3">
+		<div class="card lcard mt-3">
 			<div class="card-header">
 				<fmt:message key="label.users.from.group" />
 			</div>
@@ -132,28 +132,28 @@
 		</div>
 
 		<div id="actionbuttons" class="activity-bottom-buttons">
-				<c:if test="${!isSelectLeaderActive}">
-					<button type="button" class="btn btn-primary na" id="finishButton">
-						<span class="nextActivity"> <c:choose>
-								<c:when test="${isLastActivity}">
-									<fmt:message key="button.submit" />
-								</c:when>
-								<c:otherwise>
-									<fmt:message key="button.finish" />
-								</c:otherwise>
-							</c:choose>
-						</span>
-					</button>
-				</c:if>
-
-				<button type="button" onclick="location.reload();" class="btn btn-secondary me-2 d-flex align-items-center">
-					<i class="fa fa-refresh me-1"></i> 
-					<span class="d-none d-sm-block">
-						<fmt:message key="label.refresh" />
-					</span>
+			<c:if test="${!isSelectLeaderActive}">
+				<button type="button" class="btn btn-primary na" id="finishButton">
+					<c:choose>
+						<c:when test="${isLastActivity}">
+							<fmt:message key="button.submit" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="button.finish" />
+						</c:otherwise>
+					</c:choose>
 				</button>
+			</c:if>
+
+			<button type="button" onclick="location.reload();"
+				class="btn btn-secondary me-2 d-flex align-items-center">
+				<i class="fa fa-refresh me-1"></i> 
+				<span class="d-none d-sm-block">
+					<fmt:message key="label.refresh" />
+				</span>
+			</button>
 		</div>
-			
+
 	</div>
 
 	<!-- leaderSelection dialog -->
@@ -173,7 +173,7 @@
 						<c:out value="${content.instructions}" escapeXml="false" />
 					</div>
 						
-					<div class="card lcard lcard-no-borders shadow mt-3 mb-3">
+					<div class="card lcard mt-3">
 						<div class="card-header">
 							<fmt:message key="label.users.from.group" />
 						</div>
Index: lams_tool_nb/web/message.jsp
===================================================================
diff -u -r25c7ffad9e4afe99bbf18ad47a779ec5558254ff -r2d222c70de889ebe48b8ffd4feed1a03e5db3972
--- lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision 25c7ffad9e4afe99bbf18ad47a779ec5558254ff)
+++ lams_tool_nb/web/message.jsp	(.../message.jsp)	(revision 2d222c70de889ebe48b8ffd4feed1a03e5db3972)
@@ -36,16 +36,14 @@
 				</c:when>
 				<c:otherwise>
 					<button type="button" class="btn btn-primary" id="finishButton" onclick="submitForm('finish')">
-						<span class="nextActivity">
-							<c:choose>
-								<c:when test="${isLastActivity}">
-									<fmt:message key="button.submit" />
-								</c:when>
-								<c:otherwise>
-									<fmt:message key="button.finish" />
-								</c:otherwise>
-							</c:choose>
-						</span>
+						<c:choose>
+							<c:when test="${isLastActivity}">
+								<fmt:message key="button.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.finish" />
+							</c:otherwise>
+						</c:choose>
 					</button>
 				</c:otherwise>
 			</c:choose>
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -r78d4b7fda7982f0f9957d6ab206ce9c741f2eea1 -r2d222c70de889ebe48b8ffd4feed1a03e5db3972
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 78d4b7fda7982f0f9957d6ab206ce9c741f2eea1)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 2d222c70de889ebe48b8ffd4feed1a03e5db3972)
@@ -115,8 +115,8 @@
 					<input type="hidden" name="tmpFileUploadId" value="${learnerForm.tmpFileUploadId}" />
 
 					<!--File path row -->
-					<div class="card lcard lcard-no-borders shadow">
-						<div class="card-header lcard-header-lg lcard-header-button-border">
+					<div class="card lcard">
+						<div class="card-header">
 							<fmt:message key="label.learner.upload" />
 						</div>
 
@@ -178,10 +178,10 @@
 
 					<div role="list" class="mt-2 mb-4" aria-labelledby="submittedFiles">
 						<c:forEach var="file" items="${learner.filesUploaded}" varStatus="status">
-							<div role="listitem" class="card lcard lcard-no-borders shadow mb-3 mt-4">
+							<div role="listitem" class="card lcard mt-4">
 								<!--The name of the File -->
 								<c:if test="${file.currentLearner}">
-									<div class="card-header ">
+									<div class="card-header">
 										<c:set var="downloadURL">
 											<c:url value="/download?uuid=${file.displayUuid}&versionID=${file.versionID}&preferDownload=true" />
 										</c:set>
Index: lams_tool_scratchie/web/pages/learning/scratchies.jsp
===================================================================
diff -u -rbefcbcc85e9673de8236395435f2232a4e962f96 -r2d222c70de889ebe48b8ffd4feed1a03e5db3972
--- lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision befcbcc85e9673de8236395435f2232a4e962f96)
+++ lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision 2d222c70de889ebe48b8ffd4feed1a03e5db3972)
@@ -13,9 +13,9 @@
 </c:if>
 
 <c:forEach var="item" items="${sessionMap.itemList}" varStatus="questionNumber">
-	<div class="card lcard lcard-no-borders shadow my-4" id="question${questionNumber.count}" aria-label="question">
+	<div class="card lcard mt-4" id="question${questionNumber.count}" aria-label="question">
 		
-		<div class="card-header lcard-header lcard-header-button-border lead" id="questionTitle${questionNumber.count}">
+		<div class="card-header" id="questionTitle${questionNumber.count}">
 	        ${questionNumber.count})&nbsp;
 	        <c:if test="${not sessionMap.hideTitles}">
 	        	<c:out value="${item.qbQuestion.name}" escapeXml="true" />