diff --git a/frontend/src/lib/components/copilot/StepInputGen.svelte b/frontend/src/lib/components/copilot/StepInputGen.svelte
index 6452bcdde7..dd731215ea 100644
--- a/frontend/src/lib/components/copilot/StepInputGen.svelte
+++ b/frontend/src/lib/components/copilot/StepInputGen.svelte
@@ -1,3 +1,14 @@
+<script lang="ts" module>
+	export function stepInputGenButtonClasses(selected: boolean) {
+		return twMerge(
+			'text-violet-500 dark:text-violet-400 border',
+			selected
+				? 'bg-green-50 hover:bg-green-50 dark:bg-green-400/15 dark:hover:bg-green-400/15 text-green-800 border-green-200 dark:border-green-300/60 dark:text-green-400 '
+				: 'hover:bg-violet-50 border-violet-100 dark:hover:bg-violet-400/15 dark:border-violet-400/20'
+		)
+	}
+</script>
+
 <script lang="ts">
 	import { Check, Loader2, Wand2 } from 'lucide-svelte'
 	import Button from '../common/button/Button.svelte'
@@ -212,10 +223,7 @@ Only return the expression without any wrapper.`
 			size="xs"
 			color="light"
 			btnClasses={twMerge(
-				'text-violet-500 dark:text-violet-400 border border-violet-100 dark:border-gray-700 dark:hover:bg-surface-hover',
-				!loading && generatedContent.length > 0
-					? 'bg-green-100 text-green-800 hover:bg-green-100 dark:text-green-400 dark:bg-green-700 dark:hover:bg-green-700'
-					: '',
+				stepInputGenButtonClasses(!loading && generatedContent.length > 0),
 				btnClass
 			)}
 			on:click={() => {
diff --git a/frontend/src/lib/components/copilot/StepInputsGen.svelte b/frontend/src/lib/components/copilot/StepInputsGen.svelte
index e2a69da06c..9605c78399 100644
--- a/frontend/src/lib/components/copilot/StepInputsGen.svelte
+++ b/frontend/src/lib/components/copilot/StepInputsGen.svelte
@@ -18,6 +18,7 @@
 	import FlowCopilotInputsModal from './FlowCopilotInputsModal.svelte'
 	import type { Flow } from '$lib/gen'
 	import { twMerge } from 'tailwind-merge'
+	import { stepInputGenButtonClasses } from './StepInputGen.svelte'
 
 	let loading = false
 	export let pickableProperties: PickableProperties | undefined = undefined
@@ -178,12 +179,9 @@ input_name2: expression2
 		<Button
 			size="xs"
 			color="light"
-			wrapperClasses="flex-1 border rounded-md"
+			wrapperClasses="flex-1"
 			btnClasses={twMerge(
-				'text-violet-800 dark:text-violet-400',
-				!loading && Object.keys($generatedExprs || {}).length > 0
-					? 'bg-green-100 text-green-800 hover:bg-green-100 dark:text-green-400 dark:bg-green-700 dark:hover:bg-green-700'
-					: ''
+				stepInputGenButtonClasses(!loading && Object.keys($generatedExprs || {}).length > 0)
 			)}
 			on:mouseenter={(ev) => {
 				if (out) {
@@ -220,12 +218,13 @@ input_name2: expression2
 			floatingConfig={{
 				placement: 'top-end'
 			}}
+			class="w-full"
 		>
 			<svelte:fragment slot="trigger">
 				<Button
 					size="xs"
 					color="light"
-					btnClasses="text-violet-800 dark:text-violet-400"
+					btnClasses="text-violet-800 dark:text-violet-400 border border-violet-200 hover:bg-violet-50"
 					nonCaptureEvent
 					startIcon={{
 						icon: Wand2
diff --git a/frontend/src/lib/components/workspaceSettings/AISettings.svelte b/frontend/src/lib/components/workspaceSettings/AISettings.svelte
index 06afffee6f..eb2832c68e 100644
--- a/frontend/src/lib/components/workspaceSettings/AISettings.svelte
+++ b/frontend/src/lib/components/workspaceSettings/AISettings.svelte
@@ -105,7 +105,8 @@
 				code_completion_model,
 				default_model,
 				custom_prompts: Object.keys(custom_prompts).length > 0 ? custom_prompts : undefined,
-				max_tokens_per_model: Object.keys(maxTokensPerModel).length > 0 ? maxTokensPerModel : undefined
+				max_tokens_per_model:
+					Object.keys(maxTokensPerModel).length > 0 ? maxTokensPerModel : undefined
 			}
 			await WorkspaceService.editCopilotConfig({
 				workspace: $workspaceStore!,
@@ -228,9 +229,9 @@
 										: provider}
 									initialValue={aiProviders[provider].resource_path}
 									bind:value={
-										() => aiProviders[provider].resource_path,
+										() => aiProviders[provider].resource_path || undefined,
 										(v) => {
-											aiProviders[provider].resource_path = v
+											aiProviders[provider].resource_path = v ?? ''
 											onAiProviderChange(provider as AIProvider)
 										}
 									}