diff --git a/frappe/public/icons/timeless/icon-right-arrow.svg b/frappe/public/icons/timeless/icon-right-arrow.svg
deleted file mode 100644
index 1e044d0e4d..0000000000
--- a/frappe/public/icons/timeless/icon-right-arrow.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="6" height="8" viewBox="0 0 6 8" fill="none" xmlns="http://www.w3.org/2000/svg">
-	<path d="M1.25 7.5L4.75 4L1.25 0.5" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
\ No newline at end of file
diff --git a/frappe/public/scss/common/buttons.scss b/frappe/public/scss/common/buttons.scss
index c8cd374937..591dc5bba6 100644
--- a/frappe/public/scss/common/buttons.scss
+++ b/frappe/public/scss/common/buttons.scss
@@ -78,8 +78,9 @@
 
 .btn.btn-primary {
 	background-color: var(--primary-color);
+	color: var(--white);
 	white-space: nowrap;
-	--icon-stroke: white;
+	--icon-stroke: currentColor;
 	--icon-fill-bg: var(--primary-color);
 }
 
diff --git a/frappe/public/scss/desk/breadcrumb.scss b/frappe/public/scss/desk/breadcrumb.scss
index 9bccb4b5a9..6324e6f012 100644
--- a/frappe/public/scss/desk/breadcrumb.scss
+++ b/frappe/public/scss/desk/breadcrumb.scss
@@ -12,7 +12,7 @@
 		font-size: var(--text-md);
 		margin-right: 10px;
 		&:before {
-			content: url('/assets/frappe/icons/timeless/icon-right-arrow.svg');
+			content: var(--right-arrow-svg);
 			display: inline-block;
 			margin-right: 10px;
 		}
diff --git a/frappe/public/scss/desk/css_variables.scss b/frappe/public/scss/desk/css_variables.scss
index 735165ba6f..21b4ac6c1d 100644
--- a/frappe/public/scss/desk/css_variables.scss
+++ b/frappe/public/scss/desk/css_variables.scss
@@ -50,6 +50,7 @@ $input-height: 28px !default;
 
 	// input
 	--input-height: #{$input-height};
+	--input-disabled-bg: var(--gray-200);
 
 	// timeline
 	--timeline-item-icon-size: 34px;
@@ -60,4 +61,6 @@ $input-height: 28px !default;
 
 	// skeleton
 	--skeleton-bg: var(--gray-100);
+
+	--right-arrow-svg: url("data: image/svg+xml;utf8, <svg width='6' height='8' viewBox='0 0 6 8' fill='none' xmlns='http://www.w3.org/2000/svg'><path d='M1.25 7.5L4.75 4L1.25 0.5' stroke='%231F272E' stroke-linecap='round' stroke-linejoin='round'/></svg>");
 }
diff --git a/frappe/public/scss/desk/dark.scss b/frappe/public/scss/desk/dark.scss
index 3639a07664..7bbf582af0 100644
--- a/frappe/public/scss/desk/dark.scss
+++ b/frappe/public/scss/desk/dark.scss
@@ -72,6 +72,9 @@
 	--highlight-color: var(--gray-700);
 	--yellow-highlight-color: var(--yellow-700);
 
+	// input
+	--input-disabled-bg: none;
+
 	.frappe-card {
 		.btn-default {
 			background-color: var(--bg-color);
@@ -142,4 +145,6 @@
 
 	// skeleton
 	--skeleton-bg: var(--gray-800);
+
+	--right-arrow-svg: url("data: image/svg+xml;utf8, <svg width='6' height='8' viewBox='0 0 6 8' fill='none' xmlns='http://www.w3.org/2000/svg'><path d='M1.25 7.5L4.75 4L1.25 0.5' stroke='white' stroke-linecap='round' stroke-linejoin='round'/></svg>");
 }
diff --git a/frappe/public/scss/desk/variables.scss b/frappe/public/scss/desk/variables.scss
index 4f43f22b9d..57a117cd31 100644
--- a/frappe/public/scss/desk/variables.scss
+++ b/frappe/public/scss/desk/variables.scss
@@ -60,11 +60,12 @@ $link-color: var(--text-color);
 // input
 $input-bg: var(--control-bg);
 $input-placeholder-color: var(--gray-500);
-$input-disabled-bg: var(--gray-200);
+$input-disabled-bg: var(--input-disabled-bg);
 $input-color: var(--text-color);
 $input-box-shadow: none;
 $input-focus-border-color: var(--gray-500);
 $input-border-radius: var(--border-radius);
+$input-btn-focus-width: 2px;
 
 // dropdown
 $dropdown-color: var(--text-color);
@@ -134,9 +135,9 @@ $grid-breakpoints: (
   2xl: 1440px
 ) !default;
 
-@import 'dark';
 @import 'typography';
 @import '~bootstrap/scss/functions';
 @import '~bootstrap/scss/variables';
 @import "~bootstrap/scss/mixins";
 @import 'css_variables';
+@import 'dark';