diff --git a/src/lib/components/Icon.svelte b/src/lib/components/Icon.svelte
index f08f93c7..1f6c6f68 100644
--- a/src/lib/components/Icon.svelte
+++ b/src/lib/components/Icon.svelte
@@ -48,11 +48,11 @@
 </script>
 
 {#if !loading && svgContent}
-  <span 
+  <span
     class="icon {className}"
-    style="width: {typeof size === 'number' ? `${size}px` : size}; 
+    style="width: {typeof size === 'number' ? `${size}px` : size};
            height: {typeof size === 'number' ? `${size}px` : size};
-           color: {color};
+           {color !== 'currentColor' ? `color: ${color};` : ''}
            display: inline-flex;
            align-items: center;
            justify-content: center;"
diff --git a/src/lib/components/ui/Select.svelte b/src/lib/components/ui/Select.svelte
index 3ee5931c..5d2a7c2e 100644
--- a/src/lib/components/ui/Select.svelte
+++ b/src/lib/components/ui/Select.svelte
@@ -58,13 +58,7 @@
 	)
 
 	const selectClasses = $derived(
-		[
-			'select',
-			size,
-			contained && 'contained',
-			fullWidth && 'full',
-			disabled && 'disabled'
-		]
+		['select', size, contained && 'contained', fullWidth && 'full', disabled && 'disabled']
 			.filter(Boolean)
 			.join(' ')
 	)
@@ -94,7 +88,7 @@
 
 		<SelectPrimitive.Root
 			type="single"
-			{...(value !== undefined && value !== null ? { value: String(value) } : {})}
+			{...value !== undefined && value !== null ? { value: String(value) } : {}}
 			onValueChange={handleValueChange}
 			{disabled}
 			items={stringOptions}
@@ -112,7 +106,7 @@
 					{#each options as option}
 						<SelectPrimitive.Item
 							value={String(option.value)}
-							{...(option.disabled !== undefined ? { disabled: option.disabled } : {})}
+							{...option.disabled !== undefined ? { disabled: option.disabled } : {}}
 							class="item"
 						>
 							{#snippet children({ selected })}
@@ -139,7 +133,7 @@
 {:else}
 	<SelectPrimitive.Root
 		type="single"
-		{...(value !== undefined && value !== null ? { value: String(value) } : {})}
+		{...value !== undefined && value !== null ? { value: String(value) } : {}}
 		onValueChange={handleValueChange}
 		{disabled}
 		items={stringOptions}
@@ -157,7 +151,7 @@
 				{#each options as option}
 					<SelectPrimitive.Item
 						value={String(option.value)}
-						{...(option.disabled !== undefined ? { disabled: option.disabled } : {})}
+						{...option.disabled !== undefined ? { disabled: option.disabled } : {}}
 						class="item"
 					>
 						{#snippet children({ selected })}
@@ -305,7 +299,7 @@
 
 		:global(.chevron) {
 			flex-shrink: 0;
-			color: var(--text-secondary);
+			color: var(--text-tertiary);
 			margin-left: auto;
 		}
 	}