diff --git a/apps/contacts/apps/web/src/lib/components/FilterBar.svelte b/apps/contacts/apps/web/src/lib/components/FilterBar.svelte
index b4fdfc5a8..df6adce69 100644
--- a/apps/contacts/apps/web/src/lib/components/FilterBar.svelte
+++ b/apps/contacts/apps/web/src/lib/components/FilterBar.svelte
@@ -3,7 +3,7 @@
 	import { onMount } from 'svelte';
 	import { groupsApi, type ContactGroup, type Contact } from '$lib/api/contacts';
 
-	export type ContactFilter = 'all' | 'hasPhone' | 'hasEmail' | 'incomplete';
+	export type ContactFilter = 'all' | 'favorites' | 'hasPhone' | 'hasEmail' | 'incomplete';
 	export type BirthdayFilter = 'all' | 'today' | 'thisWeek' | 'thisMonth';
 
 	interface Props {
@@ -110,7 +110,12 @@
 						<span class="pill-color" style="background: {group.color || '#6366f1'}"></span>
 						{group.name}
 						<svg class="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-							<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+							<path
+								stroke-linecap="round"
+								stroke-linejoin="round"
+								stroke-width="2"
+								d="M6 18L18 6M6 6l12 12"
+							/>
 						</svg>
 					</button>
 				{/if}
@@ -119,7 +124,12 @@
 				<button type="button" class="filter-pill" onclick={() => onContactFilterChange('all')}>
 					{$_(`filters.contact.${contactFilter}`)}
 					<svg class="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-						<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+						<path
+							stroke-linecap="round"
+							stroke-linejoin="round"
+							stroke-width="2"
+							d="M6 18L18 6M6 6l12 12"
+						/>
 					</svg>
 				</button>
 			{/if}
@@ -127,7 +137,12 @@
 				<button type="button" class="filter-pill" onclick={() => onBirthdayFilterChange('all')}>
 					{$_(`filters.birthday.${birthdayFilter}`)}
 					<svg class="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-						<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+						<path
+							stroke-linecap="round"
+							stroke-linejoin="round"
+							stroke-width="2"
+							d="M6 18L18 6M6 6l12 12"
+						/>
 					</svg>
 				</button>
 			{/if}
@@ -135,7 +150,12 @@
 				<button type="button" class="filter-pill" onclick={() => onCompanyChange(null)}>
 					{selectedCompany}
 					<svg class="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-						<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+						<path
+							stroke-linecap="round"
+							stroke-linejoin="round"
+							stroke-width="2"
+							d="M6 18L18 6M6 6l12 12"
+						/>
 					</svg>
 				</button>
 			{/if}
@@ -172,6 +192,7 @@
 					onchange={(e) => onContactFilterChange(e.currentTarget.value as ContactFilter)}
 				>
 					<option value="all">{$_('filters.contact.all')}</option>
+					<option value="favorites">{$_('filters.contact.favorites')}</option>
 					<option value="hasPhone">{$_('filters.contact.hasPhone')}</option>
 					<option value="hasEmail">{$_('filters.contact.hasEmail')}</option>
 					<option value="incomplete">{$_('filters.contact.incomplete')}</option>
diff --git a/packages/shared-ui/src/settings/SettingsDangerButton.svelte b/packages/shared-ui/src/settings/SettingsDangerButton.svelte
index ceeabba0f..23891d98d 100644
--- a/packages/shared-ui/src/settings/SettingsDangerButton.svelte
+++ b/packages/shared-ui/src/settings/SettingsDangerButton.svelte
@@ -30,148 +30,46 @@
 		disabled = false,
 		class: className = '',
 	}: Props = $props();
+
+	// Tailwind classes
+	const baseClasses = 'flex items-center justify-between gap-4 px-5 py-4';
+	const borderClasses = 'border-b border-red-500/[0.12] dark:border-red-500/[0.18] last:border-b-0';
+	const disabledClasses = 'opacity-50 cursor-not-allowed';
+
+	const iconClasses =
+		'flex items-center justify-center flex-shrink-0 w-9 h-9 rounded-[0.625rem] bg-red-500/10 dark:bg-red-500/[0.15] text-red-500 dark:text-red-400 [&>svg]:w-[1.125rem] [&>svg]:h-[1.125rem]';
 </script>
 
 <div
-	class="settings-danger-button {border ? 'settings-danger-button--border' : ''} {disabled
-		? 'settings-danger-button--disabled'
-		: ''} {className}"
+	class="{baseClasses} {border ? borderClasses : ''} {disabled ? disabledClasses : ''} {className}"
 >
-	<div class="settings-danger-button__content">
+	<div class="flex items-center gap-3 flex-1 min-w-0">
 		{#if icon}
-			<span class="settings-danger-button__icon">
+			<span class={iconClasses}>
 				{@render icon()}
 			</span>
 		{/if}
-		<div class="settings-danger-button__text">
-			<span class="settings-danger-button__label">{label}</span>
+		<div class="flex flex-col gap-0.5 min-w-0">
+			<span class="text-[0.9375rem] font-medium text-gray-700 dark:text-gray-100">{label}</span>
 			{#if description}
-				<span class="settings-danger-button__description">{description}</span>
+				<span class="text-[0.8125rem] text-gray-500 dark:text-gray-400 leading-snug"
+					>{description}</span
+				>
 			{/if}
 		</div>
 	</div>
 
-	<button type="button" {onclick} class="settings-danger-button__button" {disabled}>
+	<button
+		type="button"
+		{onclick}
+		class="px-4 py-2 text-sm font-medium text-red-500 dark:text-red-400
+			bg-red-500/10 dark:bg-red-500/[0.15] border border-red-500/20 dark:border-red-500/25
+			rounded-lg cursor-pointer flex-shrink-0 transition-all duration-200
+			hover:bg-red-500/20 dark:hover:bg-red-500/25 hover:border-red-500/30 dark:hover:border-red-500/35
+			focus-visible:outline-2 focus-visible:outline-red-500/40 focus-visible:outline-offset-2
+			disabled:cursor-not-allowed"
+		{disabled}
+	>
 		{buttonText || label}
 	</button>
 </div>
-
-<style>
-	.settings-danger-button {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		gap: 1rem;
-		padding: 1rem 1.25rem;
-	}
-
-	.settings-danger-button--border {
-		border-bottom: 1px solid rgba(239, 68, 68, 0.12);
-	}
-
-	:global(.dark) .settings-danger-button--border {
-		border-bottom-color: rgba(239, 68, 68, 0.18);
-	}
-
-	.settings-danger-button--border:last-child {
-		border-bottom: none;
-	}
-
-	.settings-danger-button--disabled {
-		opacity: 0.5;
-		cursor: not-allowed;
-	}
-
-	.settings-danger-button__content {
-		display: flex;
-		align-items: center;
-		gap: 0.75rem;
-		flex: 1;
-		min-width: 0;
-	}
-
-	.settings-danger-button__icon {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-shrink: 0;
-		width: 2.25rem;
-		height: 2.25rem;
-		border-radius: 0.625rem;
-		background: rgba(239, 68, 68, 0.1);
-		color: hsl(var(--destructive));
-	}
-
-	:global(.dark) .settings-danger-button__icon {
-		background: rgba(239, 68, 68, 0.15);
-	}
-
-	.settings-danger-button__icon :global(svg) {
-		width: 1.125rem;
-		height: 1.125rem;
-	}
-
-	.settings-danger-button__text {
-		display: flex;
-		flex-direction: column;
-		gap: 0.125rem;
-		min-width: 0;
-	}
-
-	.settings-danger-button__label {
-		font-size: 0.9375rem;
-		font-weight: 500;
-		color: #374151;
-	}
-
-	:global(.dark) .settings-danger-button__label {
-		color: #f3f4f6;
-	}
-
-	.settings-danger-button__description {
-		font-size: 0.8125rem;
-		color: #6b7280;
-		line-height: 1.4;
-	}
-
-	:global(.dark) .settings-danger-button__description {
-		color: #9ca3af;
-	}
-
-	.settings-danger-button__button {
-		padding: 0.5rem 1rem;
-		font-size: 0.875rem;
-		font-weight: 500;
-		color: hsl(var(--destructive));
-		background: rgba(239, 68, 68, 0.1);
-		border: 1px solid rgba(239, 68, 68, 0.2);
-		border-radius: 0.5rem;
-		cursor: pointer;
-		flex-shrink: 0;
-		transition: all 0.2s ease;
-	}
-
-	:global(.dark) .settings-danger-button__button {
-		background: rgba(239, 68, 68, 0.15);
-		border-color: rgba(239, 68, 68, 0.25);
-	}
-
-	.settings-danger-button__button:hover:not(:disabled) {
-		background: rgba(239, 68, 68, 0.2);
-		border-color: rgba(239, 68, 68, 0.3);
-	}
-
-	:global(.dark) .settings-danger-button__button:hover:not(:disabled) {
-		background: rgba(239, 68, 68, 0.25);
-		border-color: rgba(239, 68, 68, 0.35);
-	}
-
-	.settings-danger-button__button:disabled {
-		cursor: not-allowed;
-	}
-
-	.settings-danger-button__button:focus-visible {
-		outline: 2px solid rgba(239, 68, 68, 0.4);
-		outline-offset: 2px;
-	}
-</style>
diff --git a/packages/shared-ui/src/settings/SettingsDangerZone.svelte b/packages/shared-ui/src/settings/SettingsDangerZone.svelte
index 648126fb6..32e0350d9 100644
--- a/packages/shared-ui/src/settings/SettingsDangerZone.svelte
+++ b/packages/shared-ui/src/settings/SettingsDangerZone.svelte
@@ -13,55 +13,16 @@
 	let { title = 'Danger Zone', class: className = '', children }: Props = $props();
 </script>
 
-<section class="settings-danger-zone {className}">
-	<header class="settings-danger-zone__header">
-		<h2 class="settings-danger-zone__title">{title}</h2>
+<section
+	class="bg-red-500/[0.08] dark:bg-red-500/[0.12] backdrop-blur-xl border border-red-500/20 dark:border-red-500/25 rounded-2xl overflow-hidden shadow-md {className}"
+>
+	<header
+		class="px-5 py-4 border-b border-red-500/[0.15] dark:border-red-500/20 bg-red-500/10 dark:bg-red-500/[0.15]"
+	>
+		<h2 class="text-base font-semibold text-red-500 dark:text-red-400 m-0">{title}</h2>
 	</header>
 
-	<div class="settings-danger-zone__content">
+	<div class="flex flex-col">
 		{@render children()}
 	</div>
 </section>
-
-<style>
-	.settings-danger-zone {
-		/* Glass effect with danger tint */
-		background: rgba(239, 68, 68, 0.08);
-		backdrop-filter: blur(12px);
-		-webkit-backdrop-filter: blur(12px);
-		border: 1px solid rgba(239, 68, 68, 0.2);
-		border-radius: 1rem;
-		overflow: hidden;
-		box-shadow:
-			0 4px 6px -1px rgba(239, 68, 68, 0.1),
-			0 2px 4px -1px rgba(239, 68, 68, 0.06);
-	}
-
-	:global(.dark) .settings-danger-zone {
-		background: rgba(239, 68, 68, 0.12);
-		border-color: rgba(239, 68, 68, 0.25);
-	}
-
-	.settings-danger-zone__header {
-		padding: 1rem 1.25rem;
-		border-bottom: 1px solid rgba(239, 68, 68, 0.15);
-		background: rgba(239, 68, 68, 0.1);
-	}
-
-	:global(.dark) .settings-danger-zone__header {
-		border-bottom-color: rgba(239, 68, 68, 0.2);
-		background: rgba(239, 68, 68, 0.15);
-	}
-
-	.settings-danger-zone__title {
-		font-size: 1rem;
-		font-weight: 600;
-		color: hsl(var(--destructive));
-		margin: 0;
-	}
-
-	.settings-danger-zone__content {
-		display: flex;
-		flex-direction: column;
-	}
-</style>
diff --git a/packages/shared-ui/src/settings/SettingsNumberInput.svelte b/packages/shared-ui/src/settings/SettingsNumberInput.svelte
index 2098a061b..9d82deb30 100644
--- a/packages/shared-ui/src/settings/SettingsNumberInput.svelte
+++ b/packages/shared-ui/src/settings/SettingsNumberInput.svelte
@@ -61,30 +61,45 @@
 			onchange(clampedValue);
 		}
 	}
+
+	// Tailwind classes
+	const baseClasses = 'flex items-center justify-between gap-4 px-5 py-4';
+	const borderClasses = 'border-b border-black/[0.08] dark:border-white/10 last:border-b-0';
+	const disabledClasses = 'opacity-50 cursor-not-allowed';
+
+	const iconClasses =
+		'flex items-center justify-center flex-shrink-0 w-9 h-9 rounded-[0.625rem] bg-black/[0.04] dark:bg-white/[0.08] text-primary [&>svg]:w-[1.125rem] [&>svg]:h-[1.125rem]';
 </script>
 
 <div
-	class="settings-number {border ? 'settings-number--border' : ''} {disabled
-		? 'settings-number--disabled'
-		: ''} {className}"
+	class="{baseClasses} {border ? borderClasses : ''} {disabled ? disabledClasses : ''} {className}"
 >
-	<div class="settings-number__content">
+	<div class="flex items-center gap-3 flex-1 min-w-0">
 		{#if icon}
-			<span class="settings-number__icon">
+			<span class={iconClasses}>
 				{@render icon()}
 			</span>
 		{/if}
-		<div class="settings-number__text">
-			<span class="settings-number__label">{label}</span>
+		<div class="flex flex-col gap-0.5 min-w-0">
+			<span class="text-[0.9375rem] font-medium text-gray-700 dark:text-gray-100">{label}</span>
 			{#if description}
-				<span class="settings-number__description">{description}</span>
+				<span class="text-[0.8125rem] text-gray-500 dark:text-gray-400 leading-snug"
+					>{description}</span
+				>
 			{/if}
 		</div>
 	</div>
 
 	<input
 		type="number"
-		class="settings-number__input"
+		class="w-20 px-3 py-2 text-sm font-medium text-gray-700 dark:text-gray-100 text-center
+			bg-black/[0.04] dark:bg-white/[0.08] border border-black/10 dark:border-white/[0.15]
+			rounded-lg transition-all duration-200
+			hover:border-black/20 dark:hover:border-white/25 hover:bg-black/[0.06] dark:hover:bg-white/[0.12]
+			focus-visible:outline-2 focus-visible:outline-primary/40 focus-visible:outline-offset-2 focus-visible:border-primary
+			disabled:cursor-not-allowed disabled:opacity-60
+			placeholder:text-gray-400 dark:placeholder:text-gray-500 placeholder:font-normal
+			[appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
 		value={value ?? ''}
 		oninput={handleInput}
 		{min}
@@ -95,147 +110,3 @@
 		aria-label={label}
 	/>
 </div>
-
-<style>
-	.settings-number {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		gap: 1rem;
-		padding: 1rem 1.25rem;
-	}
-
-	.settings-number--border {
-		border-bottom: 1px solid rgba(0, 0, 0, 0.08);
-	}
-
-	:global(.dark) .settings-number--border {
-		border-bottom-color: rgba(255, 255, 255, 0.1);
-	}
-
-	.settings-number--border:last-child {
-		border-bottom: none;
-	}
-
-	.settings-number--disabled {
-		opacity: 0.5;
-		cursor: not-allowed;
-	}
-
-	.settings-number__content {
-		display: flex;
-		align-items: center;
-		gap: 0.75rem;
-		flex: 1;
-		min-width: 0;
-	}
-
-	.settings-number__icon {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-shrink: 0;
-		width: 2.25rem;
-		height: 2.25rem;
-		border-radius: 0.625rem;
-		background: rgba(0, 0, 0, 0.04);
-		color: hsl(var(--primary));
-	}
-
-	:global(.dark) .settings-number__icon {
-		background: rgba(255, 255, 255, 0.08);
-	}
-
-	.settings-number__icon :global(svg) {
-		width: 1.125rem;
-		height: 1.125rem;
-	}
-
-	.settings-number__text {
-		display: flex;
-		flex-direction: column;
-		gap: 0.125rem;
-		min-width: 0;
-	}
-
-	.settings-number__label {
-		font-size: 0.9375rem;
-		font-weight: 500;
-		color: #374151;
-	}
-
-	:global(.dark) .settings-number__label {
-		color: #f3f4f6;
-	}
-
-	.settings-number__description {
-		font-size: 0.8125rem;
-		color: #6b7280;
-		line-height: 1.4;
-	}
-
-	:global(.dark) .settings-number__description {
-		color: #9ca3af;
-	}
-
-	/* Number Input - Glass style */
-	.settings-number__input {
-		width: 5rem;
-		padding: 0.5rem 0.75rem;
-		font-size: 0.875rem;
-		font-weight: 500;
-		color: #374151;
-		text-align: center;
-		background-color: rgba(0, 0, 0, 0.04);
-		border: 1px solid rgba(0, 0, 0, 0.1);
-		border-radius: 0.5rem;
-		transition: all 0.2s ease;
-	}
-
-	:global(.dark) .settings-number__input {
-		color: #f3f4f6;
-		background-color: rgba(255, 255, 255, 0.08);
-		border-color: rgba(255, 255, 255, 0.15);
-	}
-
-	.settings-number__input:hover:not(:disabled) {
-		border-color: rgba(0, 0, 0, 0.2);
-		background-color: rgba(0, 0, 0, 0.06);
-	}
-
-	:global(.dark) .settings-number__input:hover:not(:disabled) {
-		border-color: rgba(255, 255, 255, 0.25);
-		background-color: rgba(255, 255, 255, 0.12);
-	}
-
-	.settings-number__input:focus-visible {
-		outline: 2px solid hsl(var(--primary) / 0.4);
-		outline-offset: 2px;
-		border-color: hsl(var(--primary));
-	}
-
-	.settings-number__input:disabled {
-		cursor: not-allowed;
-		opacity: 0.6;
-	}
-
-	.settings-number__input::placeholder {
-		color: #9ca3af;
-		font-weight: 400;
-	}
-
-	:global(.dark) .settings-number__input::placeholder {
-		color: #6b7280;
-	}
-
-	/* Hide spinner buttons */
-	.settings-number__input::-webkit-outer-spin-button,
-	.settings-number__input::-webkit-inner-spin-button {
-		-webkit-appearance: none;
-		margin: 0;
-	}
-
-	.settings-number__input[type='number'] {
-		-moz-appearance: textfield;
-	}
-</style>
diff --git a/packages/shared-ui/src/settings/SettingsPage.svelte b/packages/shared-ui/src/settings/SettingsPage.svelte
index 5131b047e..693ead145 100644
--- a/packages/shared-ui/src/settings/SettingsPage.svelte
+++ b/packages/shared-ui/src/settings/SettingsPage.svelte
@@ -24,63 +24,17 @@
 	};
 </script>
 
-<div class="settings-page {className}">
-	<div class="settings-page__container {maxWidthClasses[maxWidth]}">
-		<header class="settings-page__header">
-			<h1 class="settings-page__title">{title}</h1>
+<div class="min-h-[calc(100vh-4rem)] p-8 px-4 sm:px-6 bg-background {className}">
+	<div class="mx-auto {maxWidthClasses[maxWidth]}">
+		<header class="mb-8">
+			<h1 class="text-2xl sm:text-[1.75rem] font-bold text-foreground m-0">{title}</h1>
 			{#if subtitle}
-				<p class="settings-page__subtitle">{subtitle}</p>
+				<p class="text-sm text-muted-foreground mt-1">{subtitle}</p>
 			{/if}
 		</header>
 
-		<div class="settings-page__content">
+		<div class="flex flex-col gap-6">
 			{@render children()}
 		</div>
 	</div>
 </div>
-
-<style>
-	.settings-page {
-		min-height: calc(100vh - 4rem);
-		padding: 2rem 1rem;
-		background-color: hsl(var(--background));
-	}
-
-	.settings-page__container {
-		margin-left: auto;
-		margin-right: auto;
-	}
-
-	.settings-page__header {
-		margin-bottom: 2rem;
-	}
-
-	.settings-page__title {
-		font-size: 1.5rem;
-		font-weight: 700;
-		color: hsl(var(--foreground));
-		margin: 0;
-	}
-
-	.settings-page__subtitle {
-		font-size: 0.875rem;
-		color: hsl(var(--muted-foreground));
-		margin: 0.25rem 0 0 0;
-	}
-
-	.settings-page__content {
-		display: flex;
-		flex-direction: column;
-		gap: 1.5rem;
-	}
-
-	@media (min-width: 640px) {
-		.settings-page {
-			padding: 2rem 1.5rem;
-		}
-
-		.settings-page__title {
-			font-size: 1.75rem;
-		}
-	}
-</style>
diff --git a/packages/shared-ui/src/settings/SettingsTimeInput.svelte b/packages/shared-ui/src/settings/SettingsTimeInput.svelte
index 74c4ef370..7b1ad85b3 100644
--- a/packages/shared-ui/src/settings/SettingsTimeInput.svelte
+++ b/packages/shared-ui/src/settings/SettingsTimeInput.svelte
@@ -52,31 +52,46 @@
 	function handleClear() {
 		onchange(null);
 	}
+
+	// Tailwind classes
+	const baseClasses = 'flex items-center justify-between gap-4 px-5 py-4';
+	const borderClasses = 'border-b border-black/[0.08] dark:border-white/10 last:border-b-0';
+	const disabledClasses = 'opacity-50 cursor-not-allowed';
+
+	const iconClasses =
+		'flex items-center justify-center flex-shrink-0 w-9 h-9 rounded-[0.625rem] bg-black/[0.04] dark:bg-white/[0.08] text-primary [&>svg]:w-[1.125rem] [&>svg]:h-[1.125rem]';
 </script>
 
 <div
-	class="settings-time {border ? 'settings-time--border' : ''} {disabled
-		? 'settings-time--disabled'
-		: ''} {className}"
+	class="{baseClasses} {border ? borderClasses : ''} {disabled ? disabledClasses : ''} {className}"
 >
-	<div class="settings-time__content">
+	<div class="flex items-center gap-3 flex-1 min-w-0">
 		{#if icon}
-			<span class="settings-time__icon">
+			<span class={iconClasses}>
 				{@render icon()}
 			</span>
 		{/if}
-		<div class="settings-time__text">
-			<span class="settings-time__label">{label}</span>
+		<div class="flex flex-col gap-0.5 min-w-0">
+			<span class="text-[0.9375rem] font-medium text-gray-700 dark:text-gray-100">{label}</span>
 			{#if description}
-				<span class="settings-time__description">{description}</span>
+				<span class="text-[0.8125rem] text-gray-500 dark:text-gray-400 leading-snug"
+					>{description}</span
+				>
 			{/if}
 		</div>
 	</div>
 
-	<div class="settings-time__input-wrapper">
+	<div class="flex items-center gap-1">
 		<input
 			type="time"
-			class="settings-time__input"
+			class="w-24 px-3 py-2 text-sm font-medium text-gray-700 dark:text-gray-100 text-center
+				bg-black/[0.04] dark:bg-white/[0.08] border border-black/10 dark:border-white/[0.15]
+				rounded-lg transition-all duration-200
+				hover:border-black/20 dark:hover:border-white/25 hover:bg-black/[0.06] dark:hover:bg-white/[0.12]
+				focus-visible:outline-2 focus-visible:outline-primary/40 focus-visible:outline-offset-2 focus-visible:border-primary
+				disabled:cursor-not-allowed disabled:opacity-60
+				[&::-webkit-calendar-picker-indicator]:opacity-50 [&::-webkit-calendar-picker-indicator]:cursor-pointer
+				dark:[&::-webkit-calendar-picker-indicator]:invert dark:[&::-webkit-calendar-picker-indicator]:opacity-70"
 			value={value ?? ''}
 			oninput={handleInput}
 			{placeholder}
@@ -86,7 +101,9 @@
 		{#if value}
 			<button
 				type="button"
-				class="settings-time__clear"
+				class="flex items-center justify-center w-7 h-7 p-0 text-gray-500 dark:text-gray-400 bg-transparent border-none rounded-md cursor-pointer transition-all duration-200
+					hover:text-red-500 hover:bg-red-500/10 dark:hover:bg-red-500/20
+					disabled:cursor-not-allowed disabled:opacity-50"
 				onclick={handleClear}
 				aria-label="Clear time"
 				{disabled}
@@ -109,179 +126,3 @@
 		{/if}
 	</div>
 </div>
-
-<style>
-	.settings-time {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		gap: 1rem;
-		padding: 1rem 1.25rem;
-	}
-
-	.settings-time--border {
-		border-bottom: 1px solid rgba(0, 0, 0, 0.08);
-	}
-
-	:global(.dark) .settings-time--border {
-		border-bottom-color: rgba(255, 255, 255, 0.1);
-	}
-
-	.settings-time--border:last-child {
-		border-bottom: none;
-	}
-
-	.settings-time--disabled {
-		opacity: 0.5;
-		cursor: not-allowed;
-	}
-
-	.settings-time__content {
-		display: flex;
-		align-items: center;
-		gap: 0.75rem;
-		flex: 1;
-		min-width: 0;
-	}
-
-	.settings-time__icon {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-shrink: 0;
-		width: 2.25rem;
-		height: 2.25rem;
-		border-radius: 0.625rem;
-		background: rgba(0, 0, 0, 0.04);
-		color: hsl(var(--primary));
-	}
-
-	:global(.dark) .settings-time__icon {
-		background: rgba(255, 255, 255, 0.08);
-	}
-
-	.settings-time__icon :global(svg) {
-		width: 1.125rem;
-		height: 1.125rem;
-	}
-
-	.settings-time__text {
-		display: flex;
-		flex-direction: column;
-		gap: 0.125rem;
-		min-width: 0;
-	}
-
-	.settings-time__label {
-		font-size: 0.9375rem;
-		font-weight: 500;
-		color: #374151;
-	}
-
-	:global(.dark) .settings-time__label {
-		color: #f3f4f6;
-	}
-
-	.settings-time__description {
-		font-size: 0.8125rem;
-		color: #6b7280;
-		line-height: 1.4;
-	}
-
-	:global(.dark) .settings-time__description {
-		color: #9ca3af;
-	}
-
-	/* Input wrapper */
-	.settings-time__input-wrapper {
-		display: flex;
-		align-items: center;
-		gap: 0.25rem;
-	}
-
-	/* Time Input - Glass style */
-	.settings-time__input {
-		width: 6rem;
-		padding: 0.5rem 0.75rem;
-		font-size: 0.875rem;
-		font-weight: 500;
-		color: #374151;
-		text-align: center;
-		background-color: rgba(0, 0, 0, 0.04);
-		border: 1px solid rgba(0, 0, 0, 0.1);
-		border-radius: 0.5rem;
-		transition: all 0.2s ease;
-	}
-
-	:global(.dark) .settings-time__input {
-		color: #f3f4f6;
-		background-color: rgba(255, 255, 255, 0.08);
-		border-color: rgba(255, 255, 255, 0.15);
-	}
-
-	.settings-time__input:hover:not(:disabled) {
-		border-color: rgba(0, 0, 0, 0.2);
-		background-color: rgba(0, 0, 0, 0.06);
-	}
-
-	:global(.dark) .settings-time__input:hover:not(:disabled) {
-		border-color: rgba(255, 255, 255, 0.25);
-		background-color: rgba(255, 255, 255, 0.12);
-	}
-
-	.settings-time__input:focus-visible {
-		outline: 2px solid hsl(var(--primary) / 0.4);
-		outline-offset: 2px;
-		border-color: hsl(var(--primary));
-	}
-
-	.settings-time__input:disabled {
-		cursor: not-allowed;
-		opacity: 0.6;
-	}
-
-	/* Clear button */
-	.settings-time__clear {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		width: 1.75rem;
-		height: 1.75rem;
-		padding: 0;
-		color: #6b7280;
-		background: transparent;
-		border: none;
-		border-radius: 0.375rem;
-		cursor: pointer;
-		transition: all 0.2s ease;
-	}
-
-	.settings-time__clear:hover:not(:disabled) {
-		color: #ef4444;
-		background-color: rgba(239, 68, 68, 0.1);
-	}
-
-	:global(.dark) .settings-time__clear {
-		color: #9ca3af;
-	}
-
-	:global(.dark) .settings-time__clear:hover:not(:disabled) {
-		color: #ef4444;
-		background-color: rgba(239, 68, 68, 0.2);
-	}
-
-	.settings-time__clear:disabled {
-		cursor: not-allowed;
-		opacity: 0.5;
-	}
-
-	/* Style the time input appearance */
-	.settings-time__input::-webkit-calendar-picker-indicator {
-		filter: invert(0.5);
-		cursor: pointer;
-	}
-
-	:global(.dark) .settings-time__input::-webkit-calendar-picker-indicator {
-		filter: invert(0.7);
-	}
-</style>