diff --git a/files/assets/js/comments_admin.js b/files/assets/js/comments_admin.js
index ff4222c1b..73dd4a613 100644
--- a/files/assets/js/comments_admin.js
+++ b/files/assets/js/comments_admin.js
@@ -1,75 +1,44 @@
-function removeComment(post_id,button1,button2) {
+function removeComment(post_id,button1,button2,cls) {
 	url="/remove_comment/"+post_id
 
 	post(url)
 
-	try {
-		document.getElementById("comment-"+post_id+"-only").classList.add("banned");
-	} catch(e) {
-		document.getElementById("context").classList.add("banned");
+	if (window.location.pathname == '/admin/reported/comments')
+	{
+		document.getElementById("post-info-"+post_id).remove()
+		document.getElementById("comment-"+post_id).remove()
 	}
-
-	var button=document.getElementById("remove-"+post_id);
-	button.onclick=function(){approveComment(post_id)};
-	button.innerHTML='<i class="fas fa-clipboard-check"></i>Approve'
-
-	if (typeof button1 !== 'undefined') {
-		document.getElementById(button1).classList.toggle("d-md-block");
-		document.getElementById(button2).classList.toggle("d-md-block");
+	else
+	{
+		try {
+			document.getElementById("comment-"+post_id+"-only").classList.add("banned");
+		} catch(e) {
+			document.getElementById("context").classList.add("banned");
+		}
+		document.getElementById(button1).classList.toggle(cls);
+		document.getElementById(button2).classList.toggle(cls);
 	}
 };
 
-function approveComment(post_id,button1,button2) {
+function approveComment(post_id,button1,button2,cls) {
 	url="/approve_comment/"+post_id
 
 	post(url)
 
-	try {
-		document.getElementById("comment-"+post_id+"-only").classList.remove("banned");
-	} catch(e) {
-		document.getElementById("context").classList.remove("banned");
+	if (window.location.pathname == '/admin/reported/comments')
+	{
+		document.getElementById("post-info-"+post_id).remove()
+		document.getElementById("comment-"+post_id).remove()
 	}
-
-	var button=document.getElementById("remove-"+post_id);
-	button.onclick=function(){removeComment(post_id)};
-	button.innerHTML='<i class="fas fa-trash-alt"></i>Remove'
-
-	if (typeof button1 !== 'undefined') {
-		document.getElementById(button1).classList.toggle("d-md-block");
-		document.getElementById(button2).classList.toggle("d-md-block");
-	}
-}
-
-
-function removeComment2(post_id,button1,button2) {
-	url="/remove_comment/"+post_id
-
-	post(url)
-
-	document.getElementById("comment-"+post_id+"-only").classList.add("banned");
-	var button=document.getElementById("remove-"+post_id);
-	button.onclick=function(){approveComment(post_id)};
-	button.innerHTML='<i class="fas fa-clipboard-check"></i>Approve'
-
-	if (typeof button1 !== 'undefined') {
-		document.getElementById(button1).classList.toggle("d-none");
-		document.getElementById(button2).classList.toggle("d-none");
-	}
-};
-
-function approveComment2(post_id,button1,button2) {
-	url="/approve_comment/"+post_id
-
-	post(url)
-
-	document.getElementById("comment-"+post_id+"-only").classList.remove("banned");
-	var button=document.getElementById("remove-"+post_id);
-	button.onclick=function(){removeComment(post_id)};
-	button.innerHTML='<i class="fas fa-trash-alt"></i>Remove'
-
-	if (typeof button1 !== 'undefined') {
-		document.getElementById(button1).classList.toggle("d-none");
-		document.getElementById(button2).classList.toggle("d-none");
+	else
+	{
+		try {
+			document.getElementById("comment-"+post_id+"-only").classList.remove("banned");
+		} catch(e) {
+			document.getElementById("context").classList.remove("banned");
+		}
+		document.getElementById(button1).classList.toggle(cls);
+		document.getElementById(button2).classList.toggle(cls);
 	}
 }
 
diff --git a/files/templates/comments.html b/files/templates/comments.html
index e3687899b..1548c566c 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -71,7 +71,7 @@
 {% endif %}
 
 {% if standalone and level==1 %}
-<div class="post-info mb-1 mr-2 {% if request.path.startswith('/notifications') %}mt-5{% else %}mt-3{% endif %}">
+<div id="post-info-{{c.id}}" class="post-info mb-1 mr-2 {% if request.path.startswith('/notifications') %}mt-5{% else %}mt-3{% endif %}">
 	{% if c.post and c.post.over_18 %}<span class="badge badge-danger text-small-extra mr-1">+18</span>{% endif %}
 	<span class="align-top">
 	{% if c.post %}
@@ -459,13 +459,8 @@
 
 
 {% if v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}
-{% if "/reported/" in request.path %}
-	<button class="dropdown-item list-inline-item text-success" onclick="approveComment('{{c.id}}')"><i class="fas fa-check text-success fa-fw"></i>Approve</button>
-	<button class="dropdown-item list-inline-item text-danger" onclick="removeComment('{{c.id}}')"><i class="fas fa-ban text-danger fa-fw"></i>Remove</button>
-{% else %}
-	<button id="approve-{{c.id}}" class="dropdown-item list-inline-item d-none {% if c.is_banned %}d-md-block{% endif %} text-success" onclick="approveComment('{{c.id}}','approve-{{c.id}}','remove-{{c.id}}')"><i class="fas fa-check text-success fa-fw"></i>Approve</button>
-	<button id="remove-{{c.id}}" class="dropdown-item list-inline-item d-none {% if not c.is_banned %}d-md-block{% endif %} text-danger" onclick="removeComment('{{c.id}}','approve-{{c.id}}','remove-{{c.id}}')"><i class="fas fa-ban text-danger fa-fw"></i>Remove</button>
-{% endif %}
+	<button id="approve-{{c.id}}" class="dropdown-item list-inline-item d-none {% if c.is_banned or "/reported/" in request.path %}d-md-block{% endif %} text-success" onclick="approveComment('{{c.id}}','approve-{{c.id}}','remove-{{c.id}}','d-md-block')"><i class="fas fa-check text-success fa-fw"></i>Approve</button>
+	<button id="remove-{{c.id}}" class="dropdown-item list-inline-item d-none {% if not c.is_banned %}d-md-block{% endif %} text-danger" onclick="removeComment('{{c.id}}','approve-{{c.id}}','remove-{{c.id}}','d-md-block')"><i class="fas fa-ban text-danger fa-fw"></i>Remove</button>
 {% endif %}
 
 {% if c.post %}
@@ -708,13 +703,8 @@
 							<a id="unban2-{{c.id}}" class="{% if not c.author.is_banned %}d-none{% endif %} list-group-item text-success" role="button" onclick="post_toast(this,'/unban_user/{{c.author_id}}','ban2-{{c.id}}','unban2-{{c.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-user-minus fa-fw text-success mr-2"></i>Unban user</a>
 						{% endif %}
 						{% if v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}
-							{% if "/reported/" in request.path %}
-								<a class="list-group-item text-danger" role="button" onclick="removeComment2('{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-ban text-danger mr-2"></i>Remove</a>
-								<a class="list-group-item text-success" role="button" onclick="approveComment2('{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-check text-success mr-2"></i>Approve</a>
-							{% else %}
-								<a id="remove2-{{c.id}}" class="{% if c.is_banned %}d-none{% endif %} list-group-item text-danger" role="button" onclick="removeComment2('{{c.id}}','approve2-{{c.id}}','remove2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-ban text-danger mr-2"></i>Remove</a>
-								<a id="approve2-{{c.id}}" class="{% if not c.is_banned %}d-none{% endif %} list-group-item text-success" role="button" onclick="approveComment2('{{c.id}}','approve2-{{c.id}}','remove2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-check text-success mr-2"></i>Approve</a>
-							{% endif %}
+							<a id="remove2-{{c.id}}" class="{% if c.is_banned %}d-none{% endif %} list-group-item text-danger" role="button" onclick="removeComment('{{c.id}}','approve2-{{c.id}}','remove2-{{c.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-ban text-danger mr-2"></i>Remove</a>
+							<a id="approve2-{{c.id}}" class="{% if not c.is_banned or "/reported/" in request.path %}d-none{% endif %} list-group-item text-success" role="button" onclick="approveComment('{{c.id}}','approve2-{{c.id}}','remove2-{{c.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-check text-success mr-2"></i>Approve</a>
 						{% endif %}
 
 						{% if c.oauth_app and v.admin_level >= PERMS['APPS_MODERATION'] %}