Index: lams_central/web/comments5/allview.jsp
===================================================================
diff -u -r3282e8325662ca873b88ceb07e627315d415a2c6 -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581
--- lams_central/web/comments5/allview.jsp	(.../allview.jsp)	(revision 3282e8325662ca873b88ceb07e627315d415a2c6)
+++ lams_central/web/comments5/allview.jsp	(.../allview.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
@@ -1,6 +1,18 @@
-<!-- Wraps up both the sticky and non-sticky comments. Used for page refresh and changing the sort.
- -->
+<!-- Wraps up both the sticky and non-sticky comments. Used for page refresh and changing the sort.-->
 
+<div class="mb-2 float-end">
+	<select id="sortMenu" name="sortMenu" class="form-control float-end w-auto">
+		<option value='0'
+			<c:if test='${sessionMap.sortBy == 0}'>selected</c:if>>
+				<fmt:message key="label.newest.first" />
+		</option>
+		<option value='1'
+				<c:if test='${sessionMap.sortBy == 1}'>selected</c:if>>
+			<fmt:message key="label.top.comments" />
+		</option>
+	</select>
+</div>
+
 <!--  if sticky comments exists, they need to be displayed first, but do not clobber the non sticky threads! -->
 <c:set var="nonsticky" value="${commentThread}" />
 <c:set var="commentThread" value="${sticky}" />
Index: lams_central/web/comments5/allviewwrapper.jsp
===================================================================
diff -u -r3282e8325662ca873b88ceb07e627315d415a2c6 -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581
--- lams_central/web/comments5/allviewwrapper.jsp	(.../allviewwrapper.jsp)	(revision 3282e8325662ca873b88ceb07e627315d415a2c6)
+++ lams_central/web/comments5/allviewwrapper.jsp	(.../allviewwrapper.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
@@ -6,6 +6,7 @@
 
 <!-- Wraps up allview.jsp for refresh/sort change. -->
 <script type="text/javascript" src="${lams}includes/javascript/jquery.treetable.js"></script>
+
 <%@ include file="allview.jsp"%>
 
 
Index: lams_central/web/comments5/anonymouscheckbox.jsp
===================================================================
diff -u -r3282e8325662ca873b88ceb07e627315d415a2c6 -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581
--- lams_central/web/comments5/anonymouscheckbox.jsp	(.../anonymouscheckbox.jsp)	(revision 3282e8325662ca873b88ceb07e627315d415a2c6)
+++ lams_central/web/comments5/anonymouscheckbox.jsp	(.../anonymouscheckbox.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
@@ -17,7 +17,7 @@
 	</c:when>
 
 	<c:otherwise>
-		<div class="form-check mt-2">
+		<div class="form-check form-check-reverse mt-2">
 			<input type="checkbox" id="${anonymousCheckboxName}" class="form-check-input"
 				name="${anonymousCheckboxName}" value="true" ${anonymousCheckboxChecked ? 'checked="checked"' : ''}
 				aria-description='<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.anonymous.tooltip"/></spring:escapeBody>'
Index: lams_central/web/comments5/comments.jsp
===================================================================
diff -u -reb8468afcebf13f633fa953b178b4a609b568c74 -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581
--- lams_central/web/comments5/comments.jsp	(.../comments.jsp)	(revision eb8468afcebf13f633fa953b178b4a609b568c74)
+++ lams_central/web/comments5/comments.jsp	(.../comments.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
@@ -115,66 +115,43 @@
 		return false;
 	}
 </script>
-
-<div class="mt-4">
-	<c:if test='${not sessionMap.readOnly}'>
-		<div class="comments mb-2">
+	
+<c:if test='${not sessionMap.readOnly}'>
+	<div class="card lcard mb-4">
+	<div class="card-body">
+		<div class="comments my-3">
 			<div class="comment-entry">
 				<form id="newForm" method="GET" action="<lams:LAMSURL />comments/newComment.do">
-					<div class="mb-2 float-end">
-						<select id="sortMenu" name="sortMenu" class="form-control float-end w-auto">
-							<option value='0'
-								<c:if test='${sessionMap.sortBy == 0}'>selected</c:if>>
-								<fmt:message key="label.newest.first" />
-							</option>
-							<option value='1'
-								<c:if test='${sessionMap.sortBy == 1}'>selected</c:if>>
-								<fmt:message key="label.top.comments" />
-							</option>
-						</select>
-					</div>
-		
-					<textarea class="form-control" placeholder="..." id="newFormBody"
-						maxlength="<%=CommentConstants.MAX_BODY_LENGTH + 2%>" name="body" class="comment" aria-label="comment"
-					></textarea>
-		
 					<input type="hidden" id="sessionMapID" name="sessionMapID" value="${sessionMapID}" />
 					<input type="hidden" name="newUI" value="true" />
-		
-					<div class="clearfix my-2">
-						<c:if test="${sessionMap.anonymous}">
-							<div class="float-start">
-								<c:set var="anonymousCheckboxChecked" value="" />
-								<c:set var="anonymousCheckboxName" value="commentAnonymousNew" />
-								<%@include file="anonymouscheckbox.jsp"%>
-							</div>
-						</c:if>
-			
+					
+					<textarea class="form-control" placeholder="..." id="newFormBody"
+						maxlength="<%=CommentConstants.MAX_BODY_LENGTH + 2%>" name="body" class="comment" aria-label="comment"></textarea>
+					
+					<div class="clearfix mt-3">
 						<button type="button" onclick="javascript:newCommentSubmit();"
-							class="btn btn-secondary btn-sm float-end" id="newCommentSubmitButton"
-						>
+								class="btn btn-secondary btn-sm float-end btn-icon-comment" id="newCommentSubmitButton">
 							<fmt:message key="label.post" />
-							<i class="fa-regular fa-paper-plane ms-1"></i>
 						</button>
+						
 						<button type="button" onclick="javascript:clearNewForm();"
-							class="btn btn-secondary btn-sm float-end me-2"
-						>
-							<i class="fa fa-cancel me-1"></i>
+								class="btn btn-secondary btn-sm btn-icon-cancel float-end me-2">
 							<fmt:message key="label.cancel" />
 						</button>
 					</div>
-					
-					<div class="text-center">
-						<button type="button" onclick="javascript:refreshComments();" class="btn btn-secondary btn-sm btn-icon-refresh"> 
-							<fmt:message key="label.refresh"/>
-						</button>
-					</div>
+						
+					<c:if test="${sessionMap.anonymous}">
+						<c:set var="anonymousCheckboxChecked" value="" />
+						<c:set var="anonymousCheckboxName" value="commentAnonymousNew" />
+						<%@include file="anonymouscheckbox.jsp"%>
+					</c:if>
 				</form>
 			</div>
 		</div>
-	</c:if>
-
-	<div id="commentDiv" class="mt-1">
-		<%@ include file="allview.jsp"%>
 	</div>
+	</div>
+</c:if>
+
+<div id="commentDiv" class="mt-1">
+	<%@ include file="allview.jsp"%>
 </div>
\ No newline at end of file
Index: lams_central/web/comments5/edit.jsp
===================================================================
diff -u -r3282e8325662ca873b88ceb07e627315d415a2c6 -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581
--- lams_central/web/comments5/edit.jsp	(.../edit.jsp)	(revision 3282e8325662ca873b88ceb07e627315d415a2c6)
+++ lams_central/web/comments5/edit.jsp	(.../edit.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
@@ -1,5 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.comments.CommentConstants"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
 <script type="text/javascript">
 	// The treetable code uses the clicks to expand and collapse the replies but then 
@@ -68,7 +69,9 @@
 	}
 </script>
 
-<div class="comment-entry form-group mt-1">
+<div class="card lcard m-2">
+<div class="card-body">
+<div class="comment-entry form-group">
 	<form id="editForm" method="GET" action="<lams:LAMSURL />comments/updateTopicInline.do">
 		<textarea class="form-control" id="editFormBody" maxlength="<%=CommentConstants.MAX_BODY_LENGTH + 2%>" name="body"
 			class="comment"
@@ -77,34 +80,25 @@
 		<input type="hidden" id="commentUid" name="commentUid" value="${commentUid}"/>
 		<input type="hidden" name="newUI" value="true" />
 
-		<div class="row mt-1">
-			<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-		
-		 	<c:choose>
-			 	<c:when test="${sessionMap.anonymous}">
-				 	<%-- Post Anonymously? --%>
-					<div class="col-12 col-sm-6">
-						<c:set var="anonymousCheckboxChecked" value="${comment.comment.anonymous}"/>
-						<c:set var="anonymousCheckboxName" value="commentAnonymousEdit"/>
-						<%@include file="anonymouscheckbox.jsp" %>
-				 	</div>
+		<div class="mt-3">
+			<div class="clearfix">
+				<button type="button" onclick="javascript:editCommentSubmit();" class="btn btn-sm btn-secondary float-end btn-icon-comment" id="editCommentSubmitButton">
+					<fmt:message key="label.post" />
+				</button>
 				
-					<%-- Cancel / Edit Buttons --%>
-					<div class="col-12 col-sm-6">
-				</c:when>
-				<c:otherwise>
-					<div class="col-12">
-				</c:otherwise>
-			</c:choose>
+				<button type="button" onclick="javascript:cancelEdit();" class="btn btn-sm btn-secondary btn-icon-cancel float-end me-1">
+					<fmt:message key="label.cancel" />
+				</button>
+			</div>
 			
-			<button type="button" onclick="javascript:editCommentSubmit();" class="btn btn-sm btn-secondary float-end" id="editCommentSubmitButton">
-				<i class="fa fa-comment me-1"></i>
-				<fmt:message key="label.post" />
-			</button>
-			<button type="button" onclick="javascript:cancelEdit();" class="btn btn-sm btn-secondary float-end me-1">
-				<i class="fa fa-cancel me-1"></i>
-				<fmt:message key="label.cancel" />
-			</button>
+			<%-- Post Anonymously? --%>
+			<c:if test="${sessionMap.anonymous}">
+				<c:set var="anonymousCheckboxChecked" value="${comment.comment.anonymous}"/>
+				<c:set var="anonymousCheckboxName" value="commentAnonymousEdit"/>
+				<%@include file="anonymouscheckbox.jsp"%>
+			</c:if>
 		</div>
 	</form>
 </div>
+</div>
+</div>
\ No newline at end of file
Index: lams_central/web/comments5/msgview.jsp
===================================================================
diff -u -r3282e8325662ca873b88ceb07e627315d415a2c6 -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581
--- lams_central/web/comments5/msgview.jsp	(.../msgview.jsp)	(revision 3282e8325662ca873b88ceb07e627315d415a2c6)
+++ lams_central/web/comments5/msgview.jsp	(.../msgview.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
@@ -106,12 +106,12 @@
 				</c:if>
 
 				<hr class="msg-hr">
-				<div class="msg-footer">
+				<div class="float-end">
 					<c:if test='${not sessionMap.readOnly}'>
 						<c:set var="replytopic">
 							<lams:LAMSURL />comments/newReplyTopic.do?newUI=true&sessionMapID=${sessionMapID}&parentUid=${commentDto.comment.uid}
 						</c:set>
-						<button type="button" onclick="javascript:createReply(${commentDto.comment.uid}, '${replytopic}');" class="btn btn-sm btn-secondary comment">
+						<button type="button" onclick="javascript:createReply(${commentDto.comment.uid}, '${replytopic}');" class="btn btn-sm btn-light comment">
 							Reply
 						</button>
              			 &middot; 
@@ -121,7 +121,7 @@
 						<c:set var="edittopic">
 							<lams:LAMSURL />comments/editTopic.do?newUI=true&sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&create=${commentDto.comment.created.time}
 						</c:set>
-						<button type="button" onclick="javascript:createEdit(${commentDto.comment.uid}, '${edittopic}');" class="btn btn-sm btn-secondary comment">
+						<button type="button" onclick="javascript:createEdit(${commentDto.comment.uid}, '${edittopic}');" class="btn btn-sm btn-light comment">
 							Edit
 						</button>
               			&middot; 
Index: lams_central/web/comments5/reply.jsp
===================================================================
diff -u -r3282e8325662ca873b88ceb07e627315d415a2c6 -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581
--- lams_central/web/comments5/reply.jsp	(.../reply.jsp)	(revision 3282e8325662ca873b88ceb07e627315d415a2c6)
+++ lams_central/web/comments5/reply.jsp	(.../reply.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
@@ -1,5 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.comments.CommentConstants"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
 <script type="text/javascript">
 	// The treetable code uses the clicks to expand and collapse the replies but then 
@@ -68,7 +69,9 @@
 	}
 </script>
 
-<div class="comment-entry form-group mt-1">
+<div class="card lcard m-2">
+<div class="card-body">
+<div class="comment-entry form-group">
 	<form id="replyForm" method="GET" action="<lams:LAMSURL />comments/replyTopicInline.do">
 		<textarea class="form-control my-2" id="replyFormBody" maxlength="<%=CommentConstants.MAX_BODY_LENGTH + 2%>" name="body"
 			class="comment"
@@ -77,36 +80,26 @@
 		<input type="hidden" id="parentUid" name="parentUid" value="${parentUid}" />
 		<input type="hidden" name="newUI" value="true" />
 
-		<div class="row mt-1">
-			<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+		<div class="mt-3">
+			<div class="clearfix">
+				<button type="button" onclick="javascript:replyFormSubmit();" class="btn btn-sm btn-secondary float-end btn-icon-comment" id="replyCommentSubmitButton">
+					<fmt:message key="label.post" />
+				</button>
+				
+				<button type="button" onclick="javascript:cancelReply();" class="btn btn-sm btn-secondary btn-icon-cancel float-end me-2">
+					<fmt:message key="label.cancel" />
+				</button>
+			</div>
 
-			<c:choose>
-				<c:when test="${sessionMap.anonymous}">
-					<%-- Post Anonymously? --%>
-					<div class="col-12 col-sm-6">
-						<c:set var="anonymousCheckboxChecked" value="" />
-						<c:set var="anonymousCheckboxName" value="commentAnonymousReply" />
-						<%@include file="anonymouscheckbox.jsp"%>
-					</div>
-
-					<%-- Cancel / Edit Buttons --%>
-					<div class="col-12 col-sm-6">
-				</c:when>
-				<c:otherwise>
-					<div class="col-12">
-				</c:otherwise>
-			</c:choose>
-
-			<button type="button" onclick="javascript:replyFormSubmit();" class="btn btn-sm btn-secondary float-end" id="replyCommentSubmitButton">
-				<i class="fa fa-comment me-1"></i>
-				<fmt:message key="label.post" />
-			</button>
-			&nbsp;
-			<button type="button" onclick="javascript:cancelReply();" class="btn btn-sm btn-secondary float-end me-1">
-				<i class="fa fa-cancel me-1"></i>
-				<fmt:message key="label.cancel" />
-			</button>
+			<%-- Post Anonymously? --%>
+			<c:if test="${sessionMap.anonymous}">
+				<c:set var="anonymousCheckboxChecked" value="" />
+				<c:set var="anonymousCheckboxName" value="commentAnonymousReply" />
+				<%@include file="anonymouscheckbox.jsp"%>
+			</c:if>
 		</div>
 
 	</form>
 </div>
+</div>
+</div>
\ No newline at end of file
Index: lams_central/web/comments5/topicview.jsp
===================================================================
diff -u -r3282e8325662ca873b88ceb07e627315d415a2c6 -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581
--- lams_central/web/comments5/topicview.jsp	(.../topicview.jsp)	(revision 3282e8325662ca873b88ceb07e627315d415a2c6)
+++ lams_central/web/comments5/topicview.jsp	(.../topicview.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
@@ -1,15 +1,13 @@
 <%@ page import="org.lamsfoundation.lams.comments.CommentConstants"%>
-
 <c:set var="maxThreadUid" value="0"/>
 <c:set var="minThreadLike" value="-1"/>
 <c:set var="messageTablename" value=""/>
-<c:set var="indent" value="10"/>
-
+<c:set var="indent" value="20"/>
 <c:set var="show"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.show" /></spring:escapeBody></c:set>
 <c:set var="hide"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.hide" /></spring:escapeBody></c:set>
 <c:set var="prompt"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.showhide.prompt" /></spring:escapeBody></c:set>
 <c:set var="tableCommand">expandable:true,initialState:'expanded',
-	expanderTemplate:'<button type="button" class="btn btn-sm btn-secondary text-nowrap my-1 py-0 px-1"><span style="margin-left:20px">${prompt}</span></button>',
+	expanderTemplate:'<button type="button" class="btn btn-sm btn-light text-nowrap my-2 py-0 px-1 ms-2"><span style="margin-left:20px">${prompt}</span></button>',
 	stringCollapse:'${hide}',
 	stringExpand:'${show}',
 	clickableNodeNames:false,
@@ -21,7 +19,7 @@
 	}
 </c:set>
 <c:set var="tableCommandSticky">expandable:true,initialState:'collapsed',
-	expanderTemplate:'<button type="button" class="btn btn-sm btn-secondary text-nowrap my-1 py-0 px-1"><span style="margin-left:20px">${prompt}</span></a>',
+	expanderTemplate:'<button type="button" class="btn btn-sm btn-light text-nowrap my-2 py-0 px-1 ms-2"><span style="margin-left:20px">${prompt}</span></a>',
 	stringCollapse:'${hide}',
 	stringExpand:'${show}',
 	clickableNodeNames:false,
@@ -50,6 +48,7 @@
 			// set up the new reply area
 			var replyDiv = document.createElement("div");
 			replyDiv.id = 'reply';
+			replyDiv.className = 'pt-5 clearfix';
 
 			var parentDiv = document.getElementById('pb-msg'+commentUid);
 			parentDiv.appendChild(replyDiv);
@@ -67,6 +66,7 @@
 			// set up the new reply area
 			var editDiv = document.createElement("div");
 			editDiv.id = 'edit';
+			editDiv.className = 'pt-5 clearfix';
 
 			var parentDiv = document.getElementById('pb-msg'+commentUid);
 			parentDiv.appendChild(editDiv);
@@ -200,12 +200,20 @@
 </c:if>
 
 <c:if test='${maxThreadUid > 0 && ! noMorePages}'>
-	<div class="text-center">
+	<div class="text-center d-none">
 		<c:set var="more">
 			<lams:LAMSURL />/comments/viewTopic.do?newUI=true&pageLastId=${maxThreadUid}&likeCount=${minThreadLike}&pageSize=${sessionMap.pageSize}&sessionMapID=${sessionMapID}
 		</c:set>
 		<a href="<c:out value="${more}"/>" class="btn btn-sm btn-light">
 			<fmt:message key="label.show.more.messages" />
 		</a>
 	</div>
+	
+	<div class="text-center">
+		<button type="button" onclick="javascript:refreshComments();" class="btn btn-light btn-sm btn-icon-refresh"> 
+			<fmt:message key="label.refresh"/>
+		</button>
+	</div>
 </c:if>
+
+					
Index: lams_central/web/css/components.scss
===================================================================
diff -u -r3ba91bf6af0c899b09538daa1e334db009825bf1 -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581
--- lams_central/web/css/components.scss	(.../components.scss)	(revision 3ba91bf6af0c899b09538daa1e334db009825bf1)
+++ lams_central/web/css/components.scss	(.../components.scss)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
@@ -643,6 +643,44 @@
 	content: "\f078";
 }
 
+/*----------buttons with icons ----------------*/ 
+
+.na, .btn-icon-refresh, .btn-icon-pen, .btn-icon-return, .btn-icon-previous, .btn-icon-next, .btn-icon-comment, .btn-icon-cancel {
+	display: inline-block;
+}
+.na:after, .btn-icon-refresh:before, .btn-icon-pen:before, .btn-icon-return:before, .btn-icon-previous:before, .btn-icon-next:after, .btn-icon-comment:after, .btn-icon-cancel:before {
+	font-family: FontAwesome;
+	font-style: normal;
+	font-weight: normal;
+	text-decoration: inherit;
+	margin-left: 0.25rem;
+	color: inherit;
+}
+.na:after {
+	content: "\f0a9";
+}
+.btn-icon-refresh:before {
+	content: "\f021";
+}
+.btn-icon-pen:before {
+	content: "\f044";
+}
+.btn-icon-return:before {
+	content: "\f2ea";
+}
+.btn-icon-previous:before {
+	content: "\f100";
+}
+.btn-icon-next:after {
+	content: "\f101";
+}
+.btn-icon-comment:after {
+	content: "\f1d8";
+}
+.btn-icon-cancel:before {
+	content: "\f05e";
+}
+
 /*----------slider----------------*/
 
 .bootstrap-slider input[type="range"] {
Index: lams_learning/web/css/components-learner.scss
===================================================================
diff -u -r3ba91bf6af0c899b09538daa1e334db009825bf1 -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581
--- lams_learning/web/css/components-learner.scss	(.../components-learner.scss)	(revision 3ba91bf6af0c899b09538daa1e334db009825bf1)
+++ lams_learning/web/css/components-learner.scss	(.../components-learner.scss)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
@@ -321,36 +321,6 @@
 	background-color: var(--bs-gray-200);
 }
 
-.na, .btn-icon-refresh, .btn-icon-pen, .btn-icon-return, .btn-icon-previous, .btn-icon-next {
-  display: inline-block;
-}
-.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;
-}
-.na:after {
-  content: "\f0a9";
-}
-.btn-icon-refresh:before {
-  content: "\f021";
-}
-.btn-icon-pen:before {
-  content: "\f044";
-}
-.btn-icon-return:before {
-  content: "\f2ea";
-}
-.btn-icon-previous:before {
-  content: "\f100";
-}
-.btn-icon-next:after {
-  content: "\f101";
-}
-
 .sbox {
   border-bottom: 2px solid $gray-lighter;
   border-radius: 0px;
Index: lams_tool_chat/web/pages/learning/learning.jsp
===================================================================
diff -u -reb8468afcebf13f633fa953b178b4a609b568c74 -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581
--- lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision eb8468afcebf13f633fa953b178b4a609b568c74)
+++ lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
@@ -76,9 +76,8 @@
 							<textarea id="sendMessageArea" rows="2" class="form-control shadow rounded" autofocus></textarea>
 						</div>
 						<div id="sendMessageButtonCell" class="ms-2">
-							<button id="sendMessageButton" class="btn btn-secondary" type="button" onclick="javascript:sendChatToolMessage()">
+							<button id="sendMessageButton" class="btn btn-secondary btn-icon-comment" type="button" onclick="javascript:sendChatToolMessage()">
 								<fmt:message key="button.send"/>
-								<i class="fa-regular fa-paper-plane ms-1"></i>
 							</button>
 						</div>
 					</div>
Index: lams_tool_images/web/pages/authoring/parts/addimage5.jsp
===================================================================
diff -u -r994d5bec48c15103f6659201a83e5f5a9aca657d -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581
--- lams_tool_images/web/pages/authoring/parts/addimage5.jsp	(.../addimage5.jsp)	(revision 994d5bec48c15103f6659201a83e5f5a9aca657d)
+++ lams_tool_images/web/pages/authoring/parts/addimage5.jsp	(.../addimage5.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
@@ -58,9 +58,10 @@
 			</div>
 		
 			<div id="uploadButtons" class="mt-3 float-end">
-			    <button type="button" onclick="javascript:cancelImageGalleryItem()" class="btn btn-sm btn-secondary me-2">
-					<i class="fa fa-cancel me-1"></i> <fmt:message key="label.cancel" /> 
+			    <button type="button" onclick="javascript:cancelImageGalleryItem()" class="btn btn-sm btn-secondary btn-icon-cancel me-2">
+					<fmt:message key="label.cancel" /> 
 				</button>
+				
 				<button type="button" id="addImageBtn" onclick="javascript:submitImageGalleryItem()" class="btn btn-sm btn-secondary button-add-item">
 					<i class="fa fa-upload me-1"></i> <fmt:message key="label.authoring.basic.add.image" /> 
 				</button>
Index: lams_tool_larsrc/web/pages/learning/addfile.jsp
===================================================================
diff -u -r06770d77acb444693664d588e5d2e8570adb96aa -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581
--- lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision 06770d77acb444693664d588e5d2e8570adb96aa)
+++ lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
@@ -37,8 +37,7 @@
 		
 		<lams:WaitingSpinner id="itemAttachmentArea_Busy"/>	
 		<div id="buttons" class="float-end mt-2">
-	 		<button type="button" name="goback" onclick="javascript:cancel()" class="btn btn-sm btn-secondary" id="cancelButton">
-	 			<i class="fa fa-cancel"></i>
+	 		<button type="button" name="goback" onclick="javascript:cancel()" class="btn btn-sm btn-secondary btn-icon-cancel" id="cancelButton">
 				<fmt:message key="button.cancel" />
 			</button>&nbsp;
 			<button type="submit" class="btn btn-sm btn-secondary btn-disable-on-submit" id="submitButton">
Index: lams_tool_larsrc/web/pages/learning/addurl.jsp
===================================================================
diff -u -r06770d77acb444693664d588e5d2e8570adb96aa -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581
--- lams_tool_larsrc/web/pages/learning/addurl.jsp	(.../addurl.jsp)	(revision 06770d77acb444693664d588e5d2e8570adb96aa)
+++ lams_tool_larsrc/web/pages/learning/addurl.jsp	(.../addurl.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
@@ -46,10 +46,10 @@
 			</div>
 
 			<div id="buttons" class="float-end" >
-				<button type="button" name="goback" onclick="javascript:cancel()" class="btn btn-sm btn-secondary" id="cancelButton">
-					<i class="fa fa-cancel"></i>
+				<button type="button" name="goback" onclick="javascript:cancel()" class="btn btn-sm btn-secondary btn-icon-cancel" id="cancelButton">
 					<fmt:message key="button.cancel" />
 				</button>&nbsp;
+				
 				<button type="submit" class="btn btn-sm btn-secondary btn-disable-on-submit" id="submitButton">
 					<i class="fa fa-plus"></i>
 					<fmt:message key="button.add" />
Index: lams_tool_task/web/pages/learning/parts/addtask.jsp
===================================================================
diff -u -r0ed980d10740b8dbc056b9bba997826776c8c470 -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581
--- lams_tool_task/web/pages/learning/parts/addtask.jsp	(.../addtask.jsp)	(revision 0ed980d10740b8dbc056b9bba997826776c8c470)
+++ lams_tool_task/web/pages/learning/parts/addtask.jsp	(.../addtask.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
@@ -58,8 +58,7 @@
 
 				<div class="mt-3 float-end">
 					<lams:ImgButtonWrapper>
-						<button onclick="cancel();" class="btn btn-sm btn-secondary btn-disable-on-submit"> 
-							<i class="fa fa-cancel"></i>
+						<button onclick="cancel();" class="btn btn-sm btn-secondary btn-disable-on-submit btn-icon-cancel"> 
 							<fmt:message key="label.cancel" />
 						</button>
 						
Index: lams_tool_task/web/pages/learning/parts/commentlist.jsp
===================================================================
diff -u -r0ed980d10740b8dbc056b9bba997826776c8c470 -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581
--- lams_tool_task/web/pages/learning/parts/commentlist.jsp	(.../commentlist.jsp)	(revision 0ed980d10740b8dbc056b9bba997826776c8c470)
+++ lams_tool_task/web/pages/learning/parts/commentlist.jsp	(.../commentlist.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
@@ -57,9 +57,8 @@
 		</label>
 		<textarea name="comment-${itemUid}" id="comment-${itemUid}" class="form-control me-2" rows="2"></textarea>
 
-		<button type="button" class="btn btn-secondary btn-disable-on-submit" onclick="addNewComment(${itemUid})">
+		<button type="button" class="btn btn-secondary btn-disable-on-submit btn-icon-comment" onclick="addNewComment(${itemUid})">
 			<fmt:message key="label.preview.post" />
-			<i class="fa-regular fa-paper-plane ms-1"></i>
 		</button>
 	</div>
 </c:if>
Index: lams_tool_task/web/pages/learning/parts/itemlist.jsp
===================================================================
diff -u -r0ed980d10740b8dbc056b9bba997826776c8c470 -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581
--- lams_tool_task/web/pages/learning/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 0ed980d10740b8dbc056b9bba997826776c8c470)
+++ lams_tool_task/web/pages/learning/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
@@ -22,9 +22,9 @@
 								</span>
 							</c:if>
 							
-						<c:if test="${item.required}">
-							<i class="fa-solid fa-asterisk text-danger ms-2" title="<fmt:message key='label.monitoring.tasksummary.task.required.to.finish'/>"></i>
-						</c:if>
+							<c:if test="${item.required}">
+								<i class="fa-solid fa-asterisk text-danger ms-2" title="<fmt:message key='label.monitoring.tasksummary.task.required.to.finish'/>"></i>
+							</c:if>
 						</button>
 					</span>