diff --git a/tools/server/webui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentMcpResource.svelte b/tools/server/webui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentMcpResource.svelte
index f8fd83e1ed..7ef28f3f2b 100644
--- a/tools/server/webui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentMcpResource.svelte
+++ b/tools/server/webui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentMcpResource.svelte
@@ -28,6 +28,7 @@
 		if (mimeType.startsWith(MimeTypePrefix.IMAGE) || IMAGE_FILE_EXTENSION_REGEX.test(uri)) {
 			return Image;
 		}
+
 		if (
 			mimeType.includes(MimeTypeIncludes.JSON) ||
 			mimeType.includes(MimeTypeIncludes.JAVASCRIPT) ||
@@ -36,12 +37,15 @@
 		) {
 			return Code;
 		}
+
 		if (mimeType.includes(MimeTypePrefix.TEXT) || TEXT_FILE_EXTENSION_REGEX.test(uri)) {
 			return FileText;
 		}
+
 		if (uri.includes(UriPattern.DATABASE_KEYWORD) || uri.includes(UriPattern.DATABASE_SCHEME)) {
 			return Database;
 		}
+
 		return File;
 	}
 
diff --git a/tools/server/webui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentMcpResourceStored.svelte b/tools/server/webui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentMcpResourceStored.svelte
index 40de04d895..266c5ccd20 100644
--- a/tools/server/webui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentMcpResourceStored.svelte
+++ b/tools/server/webui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentMcpResourceStored.svelte
@@ -29,6 +29,7 @@
 		if (mime.startsWith(MimeTypePrefix.IMAGE) || IMAGE_FILE_EXTENSION_REGEX.test(u)) {
 			return Image;
 		}
+
 		if (
 			mime.includes(MimeTypeIncludes.JSON) ||
 			mime.includes(MimeTypeIncludes.JAVASCRIPT) ||
@@ -37,12 +38,15 @@
 		) {
 			return Code;
 		}
+
 		if (mime.includes(MimeTypePrefix.TEXT) || TEXT_FILE_EXTENSION_REGEX.test(u)) {
 			return FileText;
 		}
+
 		if (u.includes(UriPattern.DATABASE_KEYWORD) || u.includes(UriPattern.DATABASE_SCHEME)) {
 			return Database;
 		}
+
 		return File;
 	}
 
diff --git a/tools/server/webui/src/lib/components/app/chat/ChatForm/ChatFormPromptPicker/ChatFormPromptPickerArgumentForm.svelte b/tools/server/webui/src/lib/components/app/chat/ChatForm/ChatFormPromptPicker/ChatFormPromptPickerArgumentForm.svelte
index ec68c7a28f..03bc70de72 100644
--- a/tools/server/webui/src/lib/components/app/chat/ChatForm/ChatFormPromptPicker/ChatFormPromptPickerArgumentForm.svelte
+++ b/tools/server/webui/src/lib/components/app/chat/ChatForm/ChatFormPromptPicker/ChatFormPromptPickerArgumentForm.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import type { MCPPromptInfo } from '$lib/types';
 	import ChatFormPromptPickerArgumentInput from './ChatFormPromptPickerArgumentInput.svelte';
+	import { Button } from '$lib/components/ui/button';
 
 	interface Props {
 		prompt: MCPPromptInfo;
@@ -65,20 +66,21 @@
 		</div>
 	{/if}
 
-	<div class="flex justify-end gap-2">
-		<button
+	<div class="flex justify-end mt-8 gap-2">
+		<Button
 			type="button"
+			size="sm"
 			onclick={onCancel}
-			class="rounded-lg px-3 py-1.5 text-sm text-muted-foreground hover:bg-accent"
+			variant="secondary"
 		>
 			Cancel
-		</button>
+		</Button>
 
-		<button
+		<Button
+			size="sm"
 			type="submit"
-			class="rounded-lg bg-primary px-3 py-1.5 text-sm text-primary-foreground hover:bg-primary/90"
 		>
 			Use Prompt
-		</button>
+		</Button>
 	</div>
 </form>