diff --git a/packages/clay-css/src/scss/cadmin/variables/_date-picker.scss b/packages/clay-css/src/scss/cadmin/variables/_date-picker.scss
index 77f9d8a0df..287ab99faf 100644
--- a/packages/clay-css/src/scss/cadmin/variables/_date-picker.scss
+++ b/packages/clay-css/src/scss/cadmin/variables/_date-picker.scss
@@ -56,7 +56,7 @@ $cadmin-date-picker-nav-btn-monospaced: map-deep-merge(
 $cadmin-date-picker-nav-select: () !default;
 $cadmin-date-picker-nav-select: map-deep-merge(
 	(
-		bg: transparent,
+		background-color: transparent,
 		border-color: transparent,
 		color: $cadmin-secondary,
 		font-size: $cadmin-font-size-sm,
@@ -65,12 +65,18 @@ $cadmin-date-picker-nav-select: map-deep-merge(
 		padding-bottom: 0,
 		padding-left: 8px,
 		padding-top: 0,
-		hover-bg: $cadmin-gray-200,
-		hover-color: $cadmin-gray-900,
-		focus-bg: $cadmin-gray-200,
-		focus-color: $cadmin-gray-900,
-		disabled-bg: transparent,
-		disabled-color: $cadmin-input-disabled-color,
+		hover: (
+			background-color: $cadmin-gray-200,
+			color: $cadmin-gray-900,
+		),
+		focus: (
+			background-color: $cadmin-gray-200,
+			color: $cadmin-gray-900,
+		),
+		disabled: (
+			background-color: transparent,
+			color: $cadmin-input-disabled-color,
+		),
 	),
 	$cadmin-date-picker-nav-select
 );
diff --git a/packages/clay-css/src/scss/cadmin/variables/_forms.scss b/packages/clay-css/src/scss/cadmin/variables/_forms.scss
index aad27b2502..3c2a05bfe5 100644
--- a/packages/clay-css/src/scss/cadmin/variables/_forms.scss
+++ b/packages/clay-css/src/scss/cadmin/variables/_forms.scss
@@ -582,9 +582,9 @@ $cadmin-input-select: map-deep-merge(
 		),
 		disabled: (
 			background-image: $cadmin-input-select-icon-disabled,
-		),
-		disabled-option: (
-			cursor: $cadmin-disabled-cursor,
+			option: (
+				cursor: $cadmin-disabled-cursor,
+			),
 		),
 		option: (
 			cursor: $cadmin-input-select-cursor,