Index: lams_admin/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_admin/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_admin/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_central/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_central/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_central/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_central/web/css/_jquery.jRating_base.scss
===================================================================
diff -u -reda89b58885d3360b28c25096188f47952aff317 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_central/web/css/_jquery.jRating_base.scss	(.../_jquery.jRating_base.scss)	(revision eda89b58885d3360b28c25096188f47952aff317)
+++ lams_central/web/css/_jquery.jRating_base.scss	(.../_jquery.jRating_base.scss)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -56,18 +56,22 @@
 .rating-stars-holder {text-align: center;}
 .rating-stars-caption {padding-top: 6px; font-size: 12px}
 .rating-stars, .rating-stars-disabled {margin: 0px auto; min-height: 20px;}
+
 .add-comment {
-	background-image: url('../images/tick.png');
-	width:16px !important;
-	height:16px;
-	cursor: pointer;
-	float: right !important;
-	margin-top: 20px;
+	margin-top: 30px;
 }
-.rating-comment{
+
+.comment-textarea {
+	margin: 0 auto 15px auto;
+	width: 90%;
+}
+
+.rating-comment {
 	padding: 15px;
-	margin: 10px 0;
+	width: 80%;
+	margin: 15px auto;
 }
+
 .rating-info{
 	margin-top: 0;
 	margin-bottom: 12px;
Index: lams_gradebook/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_gradebook/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_gradebook/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_learning/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_learning/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_learning/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_monitoring/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_monitoring/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_monitoring/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_assessment/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_assessment/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_assessment/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_chat/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_chat/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_chat/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_daco/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_daco/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_daco/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_doku/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_doku/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_doku/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_doku/web/pages/learning/galleryWalk.jsp
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_doku/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_doku/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -41,7 +41,7 @@
 			}
 
 			.comment-textarea {
-				margin-bottom: 15px;
+				height: 100px !important;
 			}
 		</style>
 
Index: lams_tool_forum/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_forum/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_forum/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_gmap/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_gmap/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_gmap/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_images/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_images/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_images/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_imscc/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_imscc/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_imscc/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_lamc/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_lamc/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_lamc/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_laqa/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_laqa/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_laqa/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_larsrc/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_larsrc/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_larsrc/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_leader/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_leader/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_leader/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_mindmap/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_mindmap/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_mindmap/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_nb/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_nb/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_nb/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_notebook/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_notebook/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_notebook/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_pixlr/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_pixlr/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_pixlr/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_preview/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_preview/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_preview/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_sbmt/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_sbmt/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_sbmt/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_scratchie/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_scratchie/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_scratchie/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_scribe/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_scribe/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_scribe/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_spreadsheet/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_survey/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_survey/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_survey/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_task/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_task/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_task/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_vote/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_vote/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_vote/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_whiteboard/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_whiteboard/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_whiteboard/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_wiki/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_wiki/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_wiki/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_tool_zoom/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_tool_zoom/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_tool_zoom/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>
 
Index: lams_www/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r959f663f5d378d09ce193c52e9900ea865956f79 -raf97dd6e299364ba8f77c1ab3fddf2cd04018e0b
--- lams_www/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 959f663f5d378d09ce193c52e9900ea865956f79)
+++ lams_www/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision af97dd6e299364ba8f77c1ab3fddf2cd04018e0b)
@@ -167,7 +167,7 @@
 
 <%--Comments area---------------------------------------%>
 <c:if test="${isCommentsEnabled}">
-	<div id="comments-area-${itemRatingDto.itemId}" class="comments-area">
+	<div id="comments-area-${itemRatingDto.itemId}">
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser or (showAllComments and not empty commentLeftByUser)}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -184,7 +184,7 @@
 			</c:when>
 
 			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
-				<div id="add-comment-area-${itemRatingDto.itemId}" class="add-comment-area">
+				<div id="add-comment-area-${itemRatingDto.itemId}">
 
 					<!-- Comment min words limit -->
 					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
@@ -196,16 +196,20 @@
 						</lams:Alert>
 					</c:if>
 
-					<div class="no-gutter">
-						<div class="col-xs-12 col-sm-11 ">
+					<div class="row">
+						<div class="col-xs-12 col-sm-10">
 							<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="button add-comment add-comment-new col-xs-12 col-sm-1"
-							 data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}"
-							 data-show-all-comments="${showAllComments}"
-							 data-refresh-on-submit="${refreshOnComment}">
+						<div class="col-xs-12 col-sm-2">
+							<button class="btn btn-primary add-comment add-comment-new" style=""
+									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>
+							</button>
 						</div>
 					</div>