diff --git a/packages/calcite-components/src/components/date-picker-day/date-picker-day.scss b/packages/calcite-components/src/components/date-picker-day/date-picker-day.scss
index d7fe912ba2e..341824e1a29 100644
--- a/packages/calcite-components/src/components/date-picker-day/date-picker-day.scss
+++ b/packages/calcite-components/src/components/date-picker-day/date-picker-day.scss
@@ -1,3 +1,9 @@
+// AUTO-GENERATED — do not modify. Changes will be overwritten.
+//
+// Internal CSS custom properties for component use only. Overwriting is not recommended.
+//
+// --calcite-internal-day-size
+
 :host {
   @apply cursor-pointer flex relative;
   outline: none;
@@ -27,7 +33,7 @@
   block-size: var(--calcite-internal-day-size);
   outline-color: var(--calcite-color-transparent);
   background-color: var(--calcite-date-picker-day-background-color);
-  color: var(--calcite-date-picker-day-text-color, var(--calcite-color-text-3));
+  color: var(--calcite-date-picker-day-text-color, var(--calcite-color-text-1));
 }
 
 .text {
@@ -58,7 +64,12 @@
 }
 
 :host(:not([current-month])) .day {
-  @apply opacity-disabled;
+  opacity: var(--calcite-opacity-full);
+  color: var(--calcite-color-text-3);
+}
+
+:host(:focus:not([disabled]):not([selected]):not([current-month])) .day {
+  color: var(--calcite-color-text-1);
 }
 
 :host(:hover:not([disabled]):not([selected])) {
@@ -70,8 +81,8 @@
 
 :host(:not([range]):not([selected]).current-day) {
   & .day {
-    color: var(--calcite-date-picker-current-day-text-color, var(--calcite-color-text-1));
-    font-weight: var(--calcite-font-weight-medium);
+    color: var(--calcite-date-picker-current-day-text-color, var(--calcite-color-brand));
+    font-weight: var(--calcite-font-weight-bold);
   }
 }
 
@@ -112,6 +123,12 @@
   }
 }
 
+:host([disabled]) .day {
+  color: var(--calcite-color-text-2);
+  text-decoration-line: line-through;
+  opacity: var(--calcite-opacity-disabled);
+}
+
 @media (forced-colors: active) {
   .day {
     @apply rounded-none;
diff --git a/packages/calcite-components/src/components/date-picker-month/date-picker-month.scss b/packages/calcite-components/src/components/date-picker-month/date-picker-month.scss
index 5c3112f38cf..74342e797f2 100644
--- a/packages/calcite-components/src/components/date-picker-month/date-picker-month.scss
+++ b/packages/calcite-components/src/components/date-picker-month/date-picker-month.scss
@@ -27,7 +27,7 @@
     justify-center
     items-center;
   inline-size: calc(100% / 7);
-  color: var(--calcite-date-picker-week-header-text-color, var(--calcite-color-text-3));
+  color: var(--calcite-date-picker-week-header-text-color, var(--calcite-color-text-2));
 }
 
 .day-container {
diff --git a/packages/calcite-components/src/components/date-picker/date-picker.e2e.ts b/packages/calcite-components/src/components/date-picker/date-picker.e2e.ts
index 8e216ecf033..8bd2e9ce9a3 100644
--- a/packages/calcite-components/src/components/date-picker/date-picker.e2e.ts
+++ b/packages/calcite-components/src/components/date-picker/date-picker.e2e.ts
@@ -1123,7 +1123,7 @@ describe("calcite-date-picker", () => {
         },
         "--calcite-date-picker-day-text-color": {
           selector: "calcite-date-picker",
-          shadowSelector: `calcite-date-picker-month >>> calcite-date-picker-day >>> .day`,
+          shadowSelector: `calcite-date-picker-month >>> calcite-date-picker-day[current-month] >>> .day`,
           targetProp: "color",
         },
         "--calcite-date-picker-day-text-color-hover": {