diff --git a/frappe/templates/discussions/discussions.js b/frappe/templates/discussions/discussions.js
index dab6287a24..c786583fa6 100644
--- a/frappe/templates/discussions/discussions.js
+++ b/frappe/templates/discussions/discussions.js
@@ -263,6 +263,7 @@ const hide_sidebar = () => {
 	$(".discussions-sidebar").addClass("hide");
 	$("#discussion-group").removeClass("hide");
 	$(".search-field").addClass("hide");
+	$(".reply").addClass("hide");
 };
 
 const back_to_sidebar = () => {
@@ -270,6 +271,7 @@ const back_to_sidebar = () => {
 	$("#discussion-group").addClass("hide");
 	$(".discussion-on-page").collapse("hide");
 	$(".search-field").removeClass("hide");
+	$(".reply").removeClass("hide");
 };
 
 const perform_action = (e) => {
diff --git a/frappe/templates/discussions/discussions_section.html b/frappe/templates/discussions/discussions_section.html
index 075fe489cf..2565d80883 100644
--- a/frappe/templates/discussions/discussions_section.html
+++ b/frappe/templates/discussions/discussions_section.html
@@ -28,7 +28,7 @@
 			{% endfor %}
 		</div>
 
-		<div class="mr-2 hide" id="discussion-group">
+		<div class="hide" id="discussion-group">
 			{% for topic in topics %}
 			{% include "frappe/templates/discussions/reply_section.html" %}
 			{% endfor %}
@@ -41,7 +41,7 @@
 		{% else %}
 		<div class="empty-state">
 			<div>
-			  <img class="icon icon-xl" src="/assets/school/icons/comment.svg">
+			  <img class="icon icon-xl" src="/assets/frappe/icons/timeless/message.svg">
 			</div>
 			<div class="empty-state-text">
 			  <div class="empty-state-heading">{{ empty_state_title }}</div>
diff --git a/frappe/templates/discussions/reply_card.html b/frappe/templates/discussions/reply_card.html
index 1bf3b41358..d9eb1da25c 100644
--- a/frappe/templates/discussions/reply_card.html
+++ b/frappe/templates/discussions/reply_card.html
@@ -23,11 +23,11 @@
 			</svg>
 			<ul class="dropdown-menu" aria-labelledby="dropdownMenuButton">
 				<li>
-					<a class="dropdown-item" data-action="edit"> {{ _("Edit") }} </a>
+					<a class="dropdown-item small" data-action="edit"> {{ _("Edit") }} </a>
 				</li>
 				{% if index != 1 %}
 				<li>
-					<a class="dropdown-item" data-action="delete"> {{ _("Delete") }} </a>
+					<a class="dropdown-item small" data-action="delete"> {{ _("Delete") }} </a>
 				</li>
 				{% endif %}
 			</ul>
diff --git a/frappe/templates/discussions/reply_section.html b/frappe/templates/discussions/reply_section.html
index da3c95737a..23320835de 100644
--- a/frappe/templates/discussions/reply_section.html
+++ b/frappe/templates/discussions/reply_section.html
@@ -11,7 +11,7 @@
 	<div class="reply-section-header">
 		{% if not single_thread %}
 		<div class="back-button">
-			<svg class="icon icon-md">
+			<svg class="icon icon-md mr-0">
 				<use class="" href="#icon-left"></use>
 			</svg>
 		</div>
@@ -30,7 +30,7 @@
 	{% if frappe.session.user == "Guest" or (condition is defined and not condition) %}
 	<div class="empty-state">
 		<div>
-		  <img class="icon icon-xl" src="/assets/school/icons/comment.svg">
+		  <img class="icon icon-xl" src="/assets/frappe/icons/timeless/message.svg">
 		</div>
 		<div class="empty-state-text">
 		  <div class="empty-state-heading">{{ _("Want to discuss?") }}</div>