diff --git a/frontend/src/lib/components/DateField.svelte b/frontend/src/lib/components/DateField.svelte
index e3ac321..c2b8acd 100644
--- a/frontend/src/lib/components/DateField.svelte
+++ b/frontend/src/lib/components/DateField.svelte
@@ -60,7 +60,7 @@
 	>
 		<div class="flex items-center">
 			<p
-				class="font-semibold text-slate-600 dark:text-gray-300 py-2 transition-colors duration-200"
+				class="font-semibold text-slate-600 dark:text-gray-400 py-2 transition-colors duration-200"
 			>
 				<slot />
 			</p>
@@ -71,9 +71,9 @@
 			{/if}
 			{#if optional === true}
 				<div
-					class="bg-gray-100 dark:bg-gray-700 ml-2 px-2 rounded-md transition-colors duration-200 h-6 flex items-center"
+					class="bg-gray-100 dark:bg-gray-800/60 ml-2 px-2 rounded-md transition-colors duration-200 h-6 flex items-center"
 				>
-					<p class="text-slate-600 dark:text-gray-300 text-xs transition-colors duration-200">
+					<p class="text-slate-600 dark:text-gray-400 text-xs transition-colors duration-200">
 						optional
 					</p>
 				</div>
@@ -92,7 +92,7 @@
 		{required}
 		{disabled}
 		autocomplete="off"
-		class="rounded-md text-center py-2 pl-2 text-gray-600 dark:text-gray-200 border border-transparent dark:border-gray-600 focus:outline-none focus:border-solid focus:border-slate-400 dark:focus:border-blue-500 focus:bg-gray-100 dark:focus:bg-gray-600 bg-grayblue-light dark:bg-gray-700 font-normal transition-colors duration-200"
+		class="date-field-input rounded-md text-center py-2 pl-2 text-gray-600 dark:text-gray-300 border border-transparent dark:border-gray-700/60 focus:outline-none focus:border-solid focus:border-slate-400 dark:focus:border-highlight-blue/80 focus:bg-gray-100 dark:focus:bg-gray-700/60 bg-grayblue-light dark:bg-gray-900/60 font-normal transition-colors duration-200"
 		class:text-left={textAlign == 'left'}
 		class:text-center={textAlign == 'center'}
 		class:text-right={textAlign == 'right'}
@@ -101,3 +101,38 @@
 		class:w-60={inputWidth === 'large'}
 	/>
 </div>
+
+<style>
+	/* Override browser default styling for date inputs */
+	:global(.date-field-input::-webkit-calendar-picker-indicator) {
+		background: transparent;
+		color: inherit;
+	}
+
+	:global(.date-field-input::-webkit-datetime-edit) {
+		background: transparent !important;
+		color: inherit;
+	}
+
+	:global(.date-field-input::-webkit-datetime-edit-fields-wrapper) {
+		background: transparent !important;
+	}
+
+	:global(.date-field-input::-webkit-datetime-edit-text) {
+		color: inherit;
+		background: transparent !important;
+	}
+
+	:global(.date-field-input::-webkit-datetime-edit-month-field),
+	:global(.date-field-input::-webkit-datetime-edit-day-field),
+	:global(.date-field-input::-webkit-datetime-edit-year-field) {
+		background: transparent !important;
+		color: inherit;
+	}
+
+	/* Dark mode specific overrides */
+	:global(.dark .date-field-input::-webkit-calendar-picker-indicator) {
+		filter: invert(1);
+		opacity: 0.7;
+	}
+</style>
diff --git a/frontend/src/lib/components/DateTimeField.svelte b/frontend/src/lib/components/DateTimeField.svelte
index 38df170..5f19a94 100644
--- a/frontend/src/lib/components/DateTimeField.svelte
+++ b/frontend/src/lib/components/DateTimeField.svelte
@@ -112,7 +112,7 @@
 	class:w-60={labelWidth === 'large'}
 >
 	<div class="flex items-center">
-		<p class="font-semibold text-slate-600 dark:text-gray-300 py-2 transition-colors duration-200">
+		<p class="font-semibold text-slate-600 dark:text-gray-400 py-2 transition-colors duration-200">
 			<slot />
 		</p>
 		{#if toolTipText.length > 0}
@@ -122,9 +122,9 @@
 		{/if}
 		{#if optional === true}
 			<div
-				class="bg-gray-100 dark:bg-gray-700 ml-2 px-2 rounded-md transition-colors duration-200 h-6 flex items-center"
+				class="bg-gray-100 dark:bg-gray-800/60 ml-2 px-2 rounded-md transition-colors duration-200 h-6 flex items-center"
 			>
-				<p class="text-slate-600 dark:text-gray-300 text-xs">optional</p>
+				<p class="text-slate-600 dark:text-gray-400 text-xs">optional</p>
 			</div>
 		{/if}
 	</div>
@@ -141,7 +141,7 @@
 		{readonly}
 		{required}
 		autocomplete="off"
-		class="w-44 rounded-md py-2 pl-2 text-gray-600 dark:text-gray-300 border border-transparent focus:outline-none focus:border-solid focus:border-slate-400 dark:focus:border-gray-500 focus:bg-gray-100 dark:focus:bg-gray-600 bg-grayblue-light dark:bg-gray-700 font-normal transition-colors duration-200"
+		class="date-input w-44 rounded-md py-2 pl-2 text-gray-600 dark:text-gray-300 border border-transparent dark:border-gray-700/60 focus:outline-none focus:border-solid focus:border-slate-400 dark:focus:border-highlight-blue/80 focus:bg-gray-100 dark:focus:bg-gray-700/60 bg-grayblue-light dark:bg-gray-900/60 font-normal transition-colors duration-200"
 		class:opacity-90={readonly}
 	/>
 	<input
@@ -155,8 +155,49 @@
 		{readonly}
 		{required}
 		autocomplete="off"
-		class="ml-2 rounded-md py-2 pl-2 text-gray-600 dark:text-gray-300 text-center border border-transparent focus:outline-none focus:border-solid focus:border-slate-400 dark:focus:border-gray-500 focus:bg-gray-100 dark:focus:bg-gray-600 bg-grayblue-light dark:bg-gray-700 font-normal transition-colors duration-200"
+		class="time-input ml-2 rounded-md py-2 pl-2 text-gray-600 dark:text-gray-300 text-center border border-transparent dark:border-gray-700/60 focus:outline-none focus:border-solid focus:border-slate-400 dark:focus:border-highlight-blue/80 focus:bg-gray-100 dark:focus:bg-gray-700/60 bg-grayblue-light dark:bg-gray-900/60 font-normal transition-colors duration-200"
 		class:bg-yellow-200={readonly}
 		class:dark:bg-yellow-700={readonly}
 	/>
 </div>
+
+<style>
+	/* Override browser default styling for date inputs */
+	:global(.date-input::-webkit-calendar-picker-indicator) {
+		background: transparent;
+		color: inherit;
+	}
+
+	:global(.date-input::-webkit-datetime-edit),
+	:global(.time-input::-webkit-datetime-edit) {
+		background: transparent !important;
+		color: inherit;
+	}
+
+	:global(.date-input::-webkit-datetime-edit-fields-wrapper),
+	:global(.time-input::-webkit-datetime-edit-fields-wrapper) {
+		background: transparent !important;
+	}
+
+	:global(.date-input::-webkit-datetime-edit-text),
+	:global(.time-input::-webkit-datetime-edit-text) {
+		color: inherit;
+		background: transparent !important;
+	}
+
+	:global(.date-input::-webkit-datetime-edit-month-field),
+	:global(.date-input::-webkit-datetime-edit-day-field),
+	:global(.date-input::-webkit-datetime-edit-year-field),
+	:global(.time-input::-webkit-datetime-edit-hour-field),
+	:global(.time-input::-webkit-datetime-edit-minute-field),
+	:global(.time-input::-webkit-datetime-edit-ampm-field) {
+		background: transparent !important;
+		color: inherit;
+	}
+
+	/* Dark mode specific overrides */
+	:global(.dark .date-input::-webkit-calendar-picker-indicator) {
+		filter: invert(1);
+		opacity: 0.7;
+	}
+</style>