diff --git a/files/templates/comments.html b/files/templates/comments.html
index 845de0c56..b0d16721f 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -305,7 +305,7 @@
 						{% endif %}
 
 						{% if v and v.admin_level==6 and v.id==c.author_id %}
-							<li class="list-inline-item text-info d-none d-md-inline-block"><a id="distinguish-{{c.id}}" href="javascript:void(0)" onclick="admin_comment('{{c.id}}')"><i class="fas fa-id-badge text-info fa-fw"></i>{{'Undistinguish' if c.distinguish_level else 'Distinguish'}}</a></li>
+							<li class="list-inline-item d-none d-md-inline-block"><a class="text-info" id="distinguish-{{c.id}}" href="javascript:void(0)" onclick="admin_comment('{{c.id}}')"><i class="fas fa-id-badge text-info fa-fw"></i>{{'Undistinguish' if c.distinguish_level else 'Distinguish'}}</a></li>
 						{% endif %}
 
 								
@@ -463,7 +463,7 @@
 
 					{% if v %}
 							{% if v.admin_level>=1 and v.id==c.author_id %}
-								<li class="list-group-item text-info"><a class="d-block" id="distinguish-{{c.id}}" href="javascript:void(0)" onclick="admin_comment('{{c.id}}', )" data-dismiss="modal"><i class="fas fa-id-badge text-info"></i>{{'Undistinguish' if c.distinguish_level else 'Distinguish'}}</a></li>
+								<li class="list-group-item"><a class="text-info d-block" id="distinguish-{{c.id}}" href="javascript:void(0)" onclick="admin_comment('{{c.id}}', )" data-dismiss="modal"><i class="fas fa-id-badge text-info"></i>{{'Undistinguish' if c.distinguish_level else 'Distinguish'}}</a></li>
 							{% endif %}
 							{% if v.admin_level>=3 %}
 								<li class="list-group-item"><a class="text-success d-block" href="javascript:void(0)" onclick="approveComment('{{c.id}}')" data-dismiss="modal"><i class="fas fa-check text-success"></i>Approve</a></li>
diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html
index d9076b446..1db7e398e 100644
--- a/files/templates/emoji_modal.html
+++ b/files/templates/emoji_modal.html
@@ -1,4 +1,5 @@
 <!-- Emoji Selection Modal -->
+<div id="form" class="d-none"></div>
 <div class="modal fade" id="emojiModal" tabindex="-1" role="dialog" aria-labelledby="emojiModalTitle" aria-hidden="true">
 	<div class="modal-dialog modal-dialog-scrollable modal-dialog-centered p-1" role="document">
 		<div class="modal-content" id="emojiTabs">
@@ -46,7 +47,7 @@
 						<div class="tab-pane fade show active" id="emoji-tab-favorite">
 							<div class="d-flex flex-wrap py-3 pl-2" id="EMOJIS_favorite">
 								{% if session.get("favorite_emojis") %}
-									{{session.get("favorite_emojis") | favorite_emojis | safe}}
+									{{session.get("favorite_emojis") | form | favorite_emojis | safe}}
 								{% endif %}								
 							</div>
 						</div>