diff --git a/frappe/public/js/frappe/form/controls/html.js b/frappe/public/js/frappe/form/controls/html.js
index b2f18d4ccc..4cc0e4ab50 100644
--- a/frappe/public/js/frappe/form/controls/html.js
+++ b/frappe/public/js/frappe/form/controls/html.js
@@ -28,5 +28,6 @@ frappe.ui.form.ControlHTML = class ControlHTML extends frappe.ui.form.Control {
 			this.df.options = html;
 			this.html(html);
 		}
+		return Promise.resolve();
 	}
 };
diff --git a/frappe/public/js/frappe/ui/field_group.js b/frappe/public/js/frappe/ui/field_group.js
index cba702407a..c226c4cbfb 100644
--- a/frappe/public/js/frappe/ui/field_group.js
+++ b/frappe/public/js/frappe/ui/field_group.js
@@ -132,7 +132,7 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout {
 			var f = this.fields_dict[key];
 			if (f) {
 				f.set_value(val).then(() => {
-					f.set_input(val);
+					f.set_input?.(val);
 					this.refresh_dependency();
 					resolve();
 				});
diff --git a/frappe/public/scss/desk/report.scss b/frappe/public/scss/desk/report.scss
index f8666602ff..8ed0fb740c 100644
--- a/frappe/public/scss/desk/report.scss
+++ b/frappe/public/scss/desk/report.scss
@@ -104,12 +104,12 @@
 }
 
 .group-by-button.btn-primary-light {
-	color: var(--blue-500);
+	color: var(--text-on-blue);
 }
 
 .group-by-icon.active {
 	use {
-		stroke: var(--blue-500);
+		stroke: var(--text-on-blue);
 	}
 }