diff --git a/frappe/public/build.json b/frappe/public/build.json
index fe1d467a39..3a1e2a664f 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -90,7 +90,6 @@
 		"public/less/desk.less",
 		"public/less/module.less",
 		"public/less/flex.less",
-		"public/less/notifications.less",
 		"public/less/link_preview.less",
 		"public/less/form.less",
 		"public/less/mobile.less",
diff --git a/frappe/public/js/frappe/form/controls/color.js b/frappe/public/js/frappe/form/controls/color.js
index f954002b33..8efde67e50 100644
--- a/frappe/public/js/frappe/form/controls/color.js
+++ b/frappe/public/js/frappe/form/controls/color.js
@@ -35,8 +35,8 @@ frappe.ui.form.ControlColor = frappe.ui.form.ControlData.extend({
 	set_formatted_input: function(value) {
 		this._super(value);
 
-		if (!value) value = '#FFFFFF';
-		const contrast    = frappe.ui.color.get_contrast_color(value);
+		if (!value) value = '#F4F5F5';
+		const contrast = frappe.ui.color.get_contrast_color(value);
 
 		this.$input.css({
 			"background-color": value, "color": contrast
diff --git a/frappe/public/js/frappe/ui/filters/edit_filter.html b/frappe/public/js/frappe/ui/filters/edit_filter.html
index a09817a8c7..59185f3d4a 100644
--- a/frappe/public/js/frappe/ui/filters/edit_filter.html
+++ b/frappe/public/js/frappe/ui/filters/edit_filter.html
@@ -12,7 +12,7 @@
 			<div class="filter-field"></div>
 			<div class="text-muted small filter-description"></div>
 		</div>
-		<div class="col-sm-1">
+		<div class="col-sm-1 text-center">
 			<span class="remove-filter">
 				<svg class="icon icon-sm">
 					<use href="#icon-close" class="close"></use>
diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index 14c089fe39..209fa8485e 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -406,6 +406,8 @@ frappe.ui.filter_utils = {
 	},
 
 	get_selected_value(field, condition) {
+		if (!field) return;
+
 		let val = field.get_value();
 
 		if (typeof val === 'string') {
diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js
index 36d19398e3..571edd0ce9 100644
--- a/frappe/public/js/frappe/ui/filters/filter_list.js
+++ b/frappe/public/js/frappe/ui/filters/filter_list.js
@@ -64,7 +64,6 @@ frappe.ui.FilterGroup = class {
 
 			if (!this.wrapper) {
 				this.wrapper = $('.filter-popover');
-				console.log('shownn', this.filters);
 				if (hide_empty_filters) {
 					this.toggle_empty_filters(false);
 					this.add_filters_to_popover(this.filters);
@@ -76,8 +75,8 @@ frappe.ui.FilterGroup = class {
 		});
 
 		this.filter_button.on('hidden.bs.popover', (e) => {
-			this.on_change();
 			this.update_filters();
+			this.on_change();
 		});
 
 		$(window).on('hashchange', () => {
@@ -243,7 +242,9 @@ frappe.ui.FilterGroup = class {
 	}
 
 	update_filters() {
-		this.filters = this.filters.filter((f) => f.field); // remove hidden filters
+		// remove hidden filters and undefined filters
+		this.filters.map(f => !f.get_selected_value() && f.remove());
+		this.filters = this.filters.filter(f => f.get_selected_value() && f.field);
 		this.update_filter_button();
 		this.filters.length === 0 &&
 			this.toggle_empty_filters(true);
diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index cb7b080ccf..31f0881391 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -473,7 +473,7 @@ export default class ChartWidget extends Widget {
 		/* eslint-disable indent */
 		this.chart_actions = $(`<div class="chart-actions dropdown pull-right">
 			<button data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn btn-xs btn-secondary">
-				${frappe.utils.icon('dot-horizontal')}
+				‧‧‧
 			</button>
 			<ul class="dropdown-menu dropdown-menu-right">
 				${actions
diff --git a/frappe/public/less/controls.less b/frappe/public/less/controls.less
index 19b916e036..0259140652 100644
--- a/frappe/public/less/controls.less
+++ b/frappe/public/less/controls.less
@@ -110,25 +110,6 @@
 	}
 }
 
-.frappe-control[data-fieldtype="Select"] .control-input {
-	position: relative;
-
-	select {
-		/* for Firefox */
-		-moz-appearance: none;
-		/* for Chrome */
-		-webkit-appearance: none;
-	}
-
-	.icon {
-		position: absolute;
-		top: 8px;
-		height: 15px;
-		right: 12px;
-		pointer-events: none;
-	}
-}
-
 /* duration control */
 
 .duration-picker {
diff --git a/frappe/public/scss/controls.scss b/frappe/public/scss/controls.scss
index b73bbd2850..89612c6fdc 100644
--- a/frappe/public/scss/controls.scss
+++ b/frappe/public/scss/controls.scss
@@ -28,4 +28,26 @@
 
 .frappe-control {
 	font-size: var(--text-md);
+}
+
+.frappe-control[data-fieldtype="Select"] .control-input {
+	position: relative;
+
+	select {
+		/* for Firefox */
+		-moz-appearance: none;
+		/* for Chrome */
+		-webkit-appearance: none;
+	}
+
+	.icon {
+		position: absolute;
+		top: 8px;
+		height: 15px;
+		right: 12px;
+		pointer-events: none;
+		use {
+			stroke: var(--text-muted);
+		}
+	}
 }
\ No newline at end of file
diff --git a/frappe/public/scss/dark.scss b/frappe/public/scss/dark.scss
index f449396cc6..89fdb76fe5 100644
--- a/frappe/public/scss/dark.scss
+++ b/frappe/public/scss/dark.scss
@@ -36,6 +36,7 @@
 	--border-color: var(--gray-700);
 	--dark-border-color: var(--gray-600);
 	--highlight-color: var(--gray-700);
+	--yellow-highlight-color: var(--yellow-700);
 
 	.frappe-card {
 		.btn-default {
diff --git a/frappe/public/scss/filters.scss b/frappe/public/scss/filters.scss
index 8e3ec46878..efbbb8543e 100644
--- a/frappe/public/scss/filters.scss
+++ b/frappe/public/scss/filters.scss
@@ -48,8 +48,6 @@
 	}
 
 	.divider {
-		margin-right: -10px;
-		margin-left: -10px;
 		background-color: var(--border-color);
 	}
 }
diff --git a/frappe/public/scss/grid.scss b/frappe/public/scss/grid.scss
index 8a4d021636..a88a2d6dba 100644
--- a/frappe/public/scss/grid.scss
+++ b/frappe/public/scss/grid.scss
@@ -40,7 +40,7 @@
 	// padding: 10px 15px;
 
 	&.highlight {
-		background-color: var(--yellow-50);
+		background-color: var(--yellow-highlight-color);
 	}
 
 	&.sortable-handle {
diff --git a/frappe/public/scss/list.scss b/frappe/public/scss/list.scss
index 71f058a1b1..4b3682d65b 100644
--- a/frappe/public/scss/list.scss
+++ b/frappe/public/scss/list.scss
@@ -79,9 +79,9 @@ body.no-list-sidebar {
 	flex-direction: column;
 	outline: none;
 
-	// &:focus {
-	//		background-color: $light-yellow;
-	// }
+	&:focus {
+		background-color: var(--yellow-highlight-color);
+	}
 }
 
 .list-row {
diff --git a/frappe/public/scss/variables.scss b/frappe/public/scss/variables.scss
index 362e36583a..b4d6469fb1 100644
--- a/frappe/public/scss/variables.scss
+++ b/frappe/public/scss/variables.scss
@@ -181,6 +181,7 @@ $card-box-shadow: 0px 0px 1px rgba(17, 43, 66, 0.16), 0px 1px 3px rgba(17, 43, 6
 	--border-color: var(--gray-100);
 	--dark-border-color: var(--gray-300);
 	--highlight-color: var(--gray-50);
+	--yellow-highlight-color: var(--yellow-50);
 
 	// Border Sizes
 	--border-radius-sm: 4px;