diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index d5dc9f8e93..3f698ed6a6 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -641,11 +641,15 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 		const me = this;
 		let filter_no = this.filter_row_length - 1;
 		if (this.filters[filter_no]) {
-			this.$collapse_button = $(`<div>${frappe.utils.icon("chevron-down", "md")}</div>`);
+			this.$collapse_button = $(`<div>${frappe.utils.icon("chevron-down")}</div>`);
 			$(this.filters[filter_no].wrapper).append(this.$collapse_button);
 			$(this.filters[filter_no].wrapper).css("display", "flex");
 			$(this.filters[filter_no].wrapper).css("align-items", "center");
-			$(this.filters[filter_no].wrapper).css("gap", "5px");
+			$(this.filters[filter_no].wrapper).css("gap", "16px");
+
+			this.$collapse_button.addClass("btn");
+			this.$collapse_button.addClass("btn-xs");
+			this.$collapse_button.addClass("btn-secondary");
 			this.$collapse_button.on("click", function () {
 				me.toggle_filter_visiblity();
 			});
diff --git a/frappe/public/scss/common/buttons.scss b/frappe/public/scss/common/buttons.scss
index f32e97fe9b..dcb8e68e38 100644
--- a/frappe/public/scss/common/buttons.scss
+++ b/frappe/public/scss/common/buttons.scss
@@ -6,7 +6,7 @@
 
 .btn {
 	border: none;
-	&:not(.btn-md):not(.btn-lg) {
+	&:not(.btn-md):not(.btn-lg):not(.btn-xs) {
 		padding: 4px 8px;
 	}
 	border-radius: var(--border-radius);
diff --git a/frappe/public/scss/common/global.scss b/frappe/public/scss/common/global.scss
index d2f5eb777e..cc18d7622a 100644
--- a/frappe/public/scss/common/global.scss
+++ b/frappe/public/scss/common/global.scss
@@ -71,6 +71,8 @@ body {
 		-moz-appearance: none;
 		/* for Chrome */
 		-webkit-appearance: none;
+
+		padding-right: 28px;
 	}
 
 	.select-icon {
diff --git a/frappe/public/scss/desk/report.scss b/frappe/public/scss/desk/report.scss
index e696951231..27c8610ab1 100644
--- a/frappe/public/scss/desk/report.scss
+++ b/frappe/public/scss/desk/report.scss
@@ -6,7 +6,7 @@
 
 	.page-form {
 		.form-group {
-			padding: 0px var(--padding-sm);
+			padding: 0px 16px 0px 0px;
 			margin: var(--margin-sm) 0px;
 		}
 	}