diff --git a/ui/admin/app/components/composed/typography.tsx b/ui/admin/app/components/composed/typography.tsx
index 97b8864fc..29a8a2366 100644
--- a/ui/admin/app/components/composed/typography.tsx
+++ b/ui/admin/app/components/composed/typography.tsx
@@ -11,10 +11,12 @@ import {
 export function Truncate({
 	children,
 	className,
+	classNames,
 	asChild,
 	disableTooltip,
 	tooltipContent = children,
 	clamp = true,
+	clampLength = 1,
 }: {
 	children: React.ReactNode;
 	className?: string;
@@ -22,11 +24,25 @@ export function Truncate({
 	disableTooltip?: boolean;
 	tooltipContent?: React.ReactNode;
 	clamp?: boolean;
+	clampLength?: 1 | 2 | 3;
+	classNames?: {
+		root?: string;
+	};
 }) {
 	const Comp = asChild ? Slot : "p";
 
 	const content = (
-		<Comp className={cn({ "line-clamp-1": clamp, truncate: !clamp })}>
+		<Comp
+			className={cn(
+				{
+					"line-clamp-1": clamp && clampLength === 1,
+					"line-clamp-2": clamp && clampLength === 2,
+					"line-clamp-3": clamp && clampLength === 3,
+					truncate: !clamp,
+				},
+				classNames?.root
+			)}
+		>
 			{children}
 		</Comp>
 	);
diff --git a/ui/admin/app/components/tools/list/ToolCard.tsx b/ui/admin/app/components/tools/list/ToolCard.tsx
index 4f8418c3a..434413270 100644
--- a/ui/admin/app/components/tools/list/ToolCard.tsx
+++ b/ui/admin/app/components/tools/list/ToolCard.tsx
@@ -1,8 +1,9 @@
 import { ToolReference } from "~/lib/model/toolReferences";
 import { cn } from "~/lib/utils/cn";
 
+import { Truncate } from "~/components/composed/typography";
 import { ToolIcon } from "~/components/tools/ToolIcon";
-import { ToolDropdown } from "~/components/tools/list/ToolDropdown";
+import { ToolCardActions } from "~/components/tools/list/ToolCardActions";
 import { Button } from "~/components/ui/button";
 import { Card, CardContent, CardHeader } from "~/components/ui/card";
 import {
@@ -26,11 +27,7 @@ export function ToolCard({
 			})}
 		>
 			<CardHeader className="flex flex-row items-center justify-between space-y-0 px-2.5 pb-0 pt-2">
-				{!tool.builtin || tool?.metadata?.oauth ? (
-					<ToolDropdown tool={tool} />
-				) : (
-					<div className="h-8 w-6" />
-				)}
+				<ToolCardActions tool={tool} />
 				<div className="pr-2">
 					{tool.error ? (
 						<Popover>
@@ -55,21 +52,33 @@ export function ToolCard({
 					)}
 				</div>
 			</CardHeader>
-			<CardContent className="flex flex-col items-center gap-4">
+			<CardContent className="flex flex-col items-center gap-2 text-center">
 				<ToolIcon
 					className="h-16 w-16"
 					disableTooltip
 					name={tool?.name ?? ""}
 					icon={tool?.metadata?.icon}
 				/>
-				<div className="line-clamp-1 text-center text-lg font-semibold">
-					{tool.name}
-				</div>
-				<p className="line-clamp-2 text-center text-sm">{tool.description}</p>
+				<Truncate className="text-lg font-semibold">{tool.name}</Truncate>
+				<Truncate
+					classNames={{
+						root: "leading-5",
+					}}
+					className="text-sm"
+					clampLength={2}
+				>
+					{tool.description}
+				</Truncate>
 				{!tool.builtin && tool.reference && (
-					<p className="line-clamp-2 text-wrap break-all text-center text-sm">
+					<Truncate
+						classNames={{
+							root: "leading-5",
+						}}
+						className="text-wrap break-all text-sm"
+						clampLength={2}
+					>
 						{tool.reference}
-					</p>
+					</Truncate>
 				)}
 			</CardContent>
 		</Card>
diff --git a/ui/admin/app/components/tools/list/ToolDropdown.tsx b/ui/admin/app/components/tools/list/ToolCardActions.tsx
similarity index 77%
rename from ui/admin/app/components/tools/list/ToolDropdown.tsx
rename to ui/admin/app/components/tools/list/ToolCardActions.tsx
index 99bb80b46..8121e7ec1 100644
--- a/ui/admin/app/components/tools/list/ToolDropdown.tsx
+++ b/ui/admin/app/components/tools/list/ToolCardActions.tsx
@@ -6,10 +6,12 @@ import { mutate } from "swr";
 import { OAuthProvider } from "~/lib/model/oauthApps/oauth-helpers";
 import { ToolReference } from "~/lib/model/toolReferences";
 import { ToolReferenceService } from "~/lib/service/api/toolreferenceService";
+import { cn } from "~/lib/utils";
 
 import { ConfirmationDialog } from "~/components/composed/ConfirmationDialog";
 import { CustomOauthAppDetail } from "~/components/oauth-apps/CustomOauthAppDetail";
 import { OAuthAppDetail } from "~/components/oauth-apps/OAuthAppDetail";
+import { LoadingSpinner } from "~/components/ui/LoadingSpinner";
 import { Button } from "~/components/ui/button";
 import {
 	DropdownMenu,
@@ -20,12 +22,9 @@ import {
 import { useConfirmationDialog } from "~/hooks/component-helpers/useConfirmationDialog";
 import { useOAuthAppList } from "~/hooks/oauthApps/useOAuthApps";
 import { useAsync } from "~/hooks/useAsync";
+import { usePollSingleTool } from "~/hooks/usePollSingleTool";
 
-type ToolDropdownProps = {
-	tool: ToolReference;
-};
-
-export function ToolDropdown({ tool }: ToolDropdownProps) {
+export function ToolCardActions({ tool }: { tool: ToolReference }) {
 	const [configureAuthOpen, setConfigureAuthOpen] = useState(false);
 	const { dialogProps, interceptAsync } = useConfirmationDialog();
 
@@ -38,13 +37,25 @@ export function ToolDropdown({ tool }: ToolDropdownProps) {
 	const deleteTool = useAsync(ToolReferenceService.deleteToolReference, {
 		onSuccess: () => {
 			toast.success("Tool has been deleted.");
-			mutate(ToolReferenceService.getToolReferencesCategoryMap.key("tool"));
+			mutate(ToolReferenceService.getToolReferences.key("tool"));
 		},
 		onError: () => {
 			toast.error("Something went wrong");
 		},
 	});
 
+	const { startPolling, isPolling } = usePollSingleTool(tool.id);
+
+	const forceRefresh = useAsync(
+		ToolReferenceService.forceRefreshToolReference,
+		{
+			onSuccess: () => {
+				toast.success("Tool reference force refreshed");
+				startPolling();
+			},
+		}
+	);
+
 	const handleDelete = () =>
 		interceptAsync(() => deleteTool.executeAsync(tool.id));
 
@@ -60,17 +71,21 @@ export function ToolDropdown({ tool }: ToolDropdownProps) {
 			<DropdownMenu>
 				<DropdownMenuTrigger asChild>
 					<Button variant="ghost" size="icon-sm">
-						{requiresConfiguration ? (
+						{forceRefresh.isLoading || isPolling ? (
+							<LoadingSpinner />
+						) : requiresConfiguration ? (
 							<TriangleAlertIcon className="text-warning" />
 						) : (
 							<SettingsIcon />
 						)}
 					</Button>
 				</DropdownMenuTrigger>
-				<DropdownMenuContent className="w-56" side="bottom" align="start">
+				<DropdownMenuContent className="w-56" side="top" align="start">
 					{!tool.error && toolOauthMetadata && (
 						<DropdownMenuItem
-							className="flex items-center gap-1"
+							className={cn("flex items-center gap-1", {
+								"text-warning": requiresConfiguration,
+							})}
 							onClick={() => {
 								setConfigureAuthOpen(true);
 							}}
@@ -81,6 +96,9 @@ export function ToolDropdown({ tool }: ToolDropdownProps) {
 							Configure OAuth
 						</DropdownMenuItem>
 					)}
+					<DropdownMenuItem onClick={() => forceRefresh.execute(tool.id)}>
+						Refresh Tool
+					</DropdownMenuItem>
 					{!tool.builtin && (
 						<DropdownMenuItem
 							className="text-destructive"
diff --git a/ui/admin/app/components/tools/toolGrid/ToolCard.tsx b/ui/admin/app/components/tools/toolGrid/ToolCard.tsx
deleted file mode 100644
index d66ef4e24..000000000
--- a/ui/admin/app/components/tools/toolGrid/ToolCard.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import { Trash } from "lucide-react";
-
-import { ToolReference } from "~/lib/model/toolReferences";
-import { cn, timeSince } from "~/lib/utils";
-
-import { ConfirmationDialog } from "~/components/composed/ConfirmationDialog";
-import { Truncate } from "~/components/composed/typography";
-import { ToolIcon } from "~/components/tools/ToolIcon";
-import { ToolCardActions } from "~/components/tools/toolGrid/ToolCardActions";
-import { Badge } from "~/components/ui/badge";
-import { Button } from "~/components/ui/button";
-import {
-	Card,
-	CardContent,
-	CardFooter,
-	CardHeader,
-} from "~/components/ui/card";
-import {
-	Tooltip,
-	TooltipContent,
-	TooltipTrigger,
-} from "~/components/ui/tooltip";
-
-interface ToolCardProps {
-	tool: ToolReference;
-	onDelete: (id: string) => void;
-}
-
-export function ToolCard({ tool, onDelete }: ToolCardProps) {
-	return (
-		<Card
-			className={cn("flex h-full flex-col", {
-				"border-2 border-primary": tool.metadata?.bundle,
-				"border-2 border-error": tool.error,
-			})}
-		>
-			<CardHeader className="flex flex-row justify-between space-y-0 pb-2">
-				<h4 className="flex flex-wrap items-center gap-x-2">
-					<div className="flex flex-nowrap gap-x-2">
-						<ToolIcon
-							className="h-5 w-5 min-w-5"
-							name={tool.name}
-							icon={tool.metadata?.icon}
-						/>
-						<Truncate>{tool.name}</Truncate>
-					</div>
-					{tool.error && (
-						<Tooltip>
-							<TooltipTrigger>
-								<Badge className="pointer-events-none mb-1 bg-error">
-									Failed
-								</Badge>
-							</TooltipTrigger>
-							<TooltipContent className="max-w-xs border border-error bg-error-foreground text-foreground">
-								<p>{tool.error}</p>
-							</TooltipContent>
-						</Tooltip>
-					)}
-					{tool.metadata?.bundle && (
-						<Badge className="pointer-events-none">Bundle</Badge>
-					)}
-				</h4>
-
-				<ToolCardActions tool={tool} />
-			</CardHeader>
-			<CardContent className="flex-grow">
-				{!tool.builtin && (
-					<Truncate className="max-w-full">{tool.reference}</Truncate>
-				)}
-				<p className="mt-2 line-clamp-2 text-sm text-muted-foreground">
-					{tool.description || "No description available"}
-				</p>
-			</CardContent>
-			<CardFooter className="flex h-14 items-center justify-between pt-2">
-				<small className="text-muted-foreground">
-					{timeSince(new Date(tool.created))} ago
-				</small>
-
-				{!tool.builtin && (
-					<ConfirmationDialog
-						title="Delete Tool Reference"
-						description="Are you sure you want to delete this tool reference? This action cannot be undone."
-						onConfirm={() => onDelete(tool.id)}
-						confirmProps={{
-							variant: "destructive",
-							children: "Delete",
-						}}
-					>
-						<Button variant="ghost" size="icon">
-							<Trash className="h-5 w-5" />
-						</Button>
-					</ConfirmationDialog>
-				)}
-			</CardFooter>
-		</Card>
-	);
-}
diff --git a/ui/admin/app/components/tools/toolGrid/ToolGrid.tsx b/ui/admin/app/components/tools/toolGrid/ToolGrid.tsx
deleted file mode 100644
index fd0f17504..000000000
--- a/ui/admin/app/components/tools/toolGrid/ToolGrid.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { useCallback, useEffect, useState } from "react";
-
-import {
-	CustomToolsToolCategory,
-	ToolCategoryMap,
-	ToolReference,
-} from "~/lib/model/toolReferences";
-
-import { CategoryHeader } from "~/components/tools/toolGrid/CategoryHeader";
-import { CategoryTools } from "~/components/tools/toolGrid/CategoryTools";
-import { useDebounce } from "~/hooks/useDebounce";
-
-interface ToolGridProps {
-	toolCategories: ToolCategoryMap;
-	filter: string;
-	onDelete: (id: string) => void;
-}
-
-export function ToolGrid({ toolCategories, filter, onDelete }: ToolGridProps) {
-	const [filteredResults, setFilteredResults] =
-		useState<ToolCategoryMap>(toolCategories);
-
-	const filterCategories = useCallback(
-		(searchTerm: string) => {
-			const result: ToolCategoryMap = {};
-			for (const [category, { tools, bundleTool }] of Object.entries(
-				toolCategories
-			)) {
-				const sortedTools = tools.sort((a, b) => a.name.localeCompare(b.name));
-				const toolsWithBundle = bundleTool
-					? [bundleTool, ...sortedTools]
-					: sortedTools;
-				const filteredTools = toolsWithBundle.filter((tool) =>
-					[tool.name, tool.metadata?.category, tool.description]
-						.filter((x) => !!x)
-						.join("|")
-						.toLowerCase()
-						.includes(searchTerm.toLowerCase())
-				);
-				if (filteredTools.length > 0) {
-					result[category] = {
-						tools: filteredTools,
-						bundleTool: bundleTool,
-					};
-				}
-			}
-			setFilteredResults(result);
-		},
-		[toolCategories]
-	);
-
-	const debouncedFilter = useDebounce(filterCategories, 150);
-
-	useEffect(() => {
-		debouncedFilter(filter);
-	}, [filter, debouncedFilter]);
-
-	if (!Object.entries(filteredResults).length) {
-		return <p>No tools found...</p>;
-	}
-
-	const customToolsCategory = filteredResults[CustomToolsToolCategory];
-	return (
-		<div className="space-y-8 pb-16">
-			{customToolsCategory &&
-				renderToolCategory(CustomToolsToolCategory, customToolsCategory.tools)}
-			{Object.entries(filteredResults).map(
-				([category, { tools, bundleTool }]) => {
-					if (category === CustomToolsToolCategory) return null;
-					return renderToolCategory(category, tools, bundleTool?.description);
-				}
-			)}
-		</div>
-	);
-
-	function renderToolCategory(
-		category: string,
-		tools: ToolReference[],
-		description = ""
-	) {
-		if (!tools.length) return null;
-		return (
-			<div key={category} className="space-y-4">
-				<CategoryHeader
-					category={category}
-					description={description}
-					tools={tools}
-				/>
-				<CategoryTools tools={tools} onDelete={onDelete} />
-			</div>
-		);
-	}
-}