diff --git a/src/App.tsx b/src/App.tsx
index 47a621a..ea18b14 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,6 +1,7 @@
 import { AuthProvider } from "./auth/AuthContext";
 import { ThemeProvider } from "./hooks/useTheme";
 import { Toaster } from "@/components/ui/sonner";
+import { TooltipProvider } from "@/components/ui/tooltip";
 import { RouterProvider, Route, Redirect, AuthGuard, useRouter } from "./router";
 import { AppShell } from "./components/layout/AppShell";
 import { Login } from "./pages/Login";
@@ -97,8 +98,10 @@ export function App() {
     <RouterProvider>
       <ThemeProvider>
         <AuthProvider>
-          <Routes />
-          <Toaster />
+          <TooltipProvider>
+            <Routes />
+            <Toaster />
+          </TooltipProvider>
         </AuthProvider>
       </ThemeProvider>
     </RouterProvider>
diff --git a/src/components/gateways/VirtualServerDetailsPanel.tsx b/src/components/gateways/VirtualServerDetailsPanel.tsx
index a2e0338..39dce7a 100644
--- a/src/components/gateways/VirtualServerDetailsPanel.tsx
+++ b/src/components/gateways/VirtualServerDetailsPanel.tsx
@@ -4,7 +4,6 @@ import { useIntl } from "react-intl";
 import {
   Activity,
   Box,
-  Copy,
   EllipsisVertical,
   Loader2,
   MessageSquareCode,
@@ -20,13 +19,13 @@ import {
 import { MCPIcon } from "@/components/icons/MCPIcon";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
+import { CopyButton } from "@/components/ui/copy-button";
 import { InlineTagAdd } from "@/components/ui/inline-tag-add";
 import { CopyValue } from "@/components/ui/copy-value";
 import { Input } from "@/components/ui/input";
 import { cn } from "@/lib/utils";
 import type { MCPServer, VirtualServer } from "@/types/server";
 import type { ComponentFilter } from "@/components/gateways/types";
-import { copyToClipboard } from "@/lib/clipboard";
 import {
   buildComponentItems,
   formatServerDateTime,
@@ -586,32 +585,28 @@ export function VirtualServerDetailsPanel({
                             <span className="min-w-0 truncate text-muted-foreground">{title}</span>
                             <span className="flex min-w-0 items-center gap-2 font-mono text-[13px] text-muted-foreground">
                               <span className="truncate">{identifier}</span>
-                              <Button
-                                type="button"
-                                variant="ghost"
-                                size="icon-xs"
-                                aria-label={`Copy ${title}`}
+                              <CopyButton
+                                value={identifier}
+                                label={intl.formatMessage(
+                                  { id: "common.copyValue" },
+                                  { label: title },
+                                )}
                                 className="size-5 text-muted-foreground"
-                                onClick={() => copyToClipboard(identifier)}
-                              >
-                                <Copy className="size-3.5" />
-                              </Button>
+                              />
                             </span>
                           </>
                         ) : (
                           <>
                             <span className="flex min-w-0 items-center gap-2 font-mono text-[13px] text-muted-foreground">
                               <span className="truncate">{identifier}</span>
-                              <Button
-                                type="button"
-                                variant="ghost"
-                                size="icon-xs"
-                                aria-label={`Copy ${identifier}`}
+                              <CopyButton
+                                value={identifier}
+                                label={intl.formatMessage(
+                                  { id: "common.copyValue" },
+                                  { label: identifier },
+                                )}
                                 className="size-5 text-muted-foreground"
-                                onClick={() => copyToClipboard(identifier)}
-                              >
-                                <Copy className="size-3.5" />
-                              </Button>
+                              />
                             </span>
                             <span aria-hidden="true" />
                           </>
diff --git a/src/components/prompts/PromptDefinitionTable.tsx b/src/components/prompts/PromptDefinitionTable.tsx
index ea54d85..5eb75e3 100644
--- a/src/components/prompts/PromptDefinitionTable.tsx
+++ b/src/components/prompts/PromptDefinitionTable.tsx
@@ -1,8 +1,9 @@
-import { Copy, MoreHorizontal } from "lucide-react";
+import { MoreHorizontal } from "lucide-react";
 import { useIntl } from "react-intl";
 
 import type { PromptRead } from "@/generated/types";
 import { Button } from "@/components/ui/button";
+import { CopyButton } from "@/components/ui/copy-button";
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -17,7 +18,6 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table";
-import { copyToClipboard } from "@/lib/clipboard";
 import { truncateMiddle } from "@/components/gateways/utils";
 
 export interface PromptDefinitionTableProps {
@@ -88,22 +88,15 @@ export function PromptDefinitionTable({
                 <span className="min-w-0 truncate font-mono text-xs text-muted-foreground">
                   {truncateMiddle(prompt.id, 40)}
                 </span>
-                <Button
-                  type="button"
-                  variant="ghost"
-                  size="icon-xs"
-                  aria-label={intl.formatMessage(
+                <CopyButton
+                  value={prompt.id}
+                  label={intl.formatMessage(
                     { id: "prompts.details.table.copyPromptId" },
                     { name: prompt.name },
                   )}
+                  iconClassName="size-3"
                   className="ml-4 size-4 shrink-0 text-muted-foreground hover:text-foreground"
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    copyToClipboard(prompt.id);
-                  }}
-                >
-                  <Copy className="size-3" />
-                </Button>
+                />
               </div>
             </TableCell>
 
diff --git a/src/components/prompts/PromptPreviewResult.tsx b/src/components/prompts/PromptPreviewResult.tsx
index ea7ebd5..aa89e7f 100644
--- a/src/components/prompts/PromptPreviewResult.tsx
+++ b/src/components/prompts/PromptPreviewResult.tsx
@@ -60,8 +60,7 @@ export function PromptPreviewResult({ preview }: PromptPreviewResultProps) {
         <CodeBlock
           code={JSON.stringify({ messages: result.rendered.messages ?? [] }, null, 2)}
           language="json"
-          copyLabel="JSON"
-          copiedLabel={intl.formatMessage({ id: "prompts.details.code.copySuccess" })}
+          copyLabel={intl.formatMessage({ id: "common.copyValue" }, { label: "JSON" })}
         />
       )}
 
diff --git a/src/components/prompts/PromptSnippetTabs.tsx b/src/components/prompts/PromptSnippetTabs.tsx
index 922e202..7a1a18b 100644
--- a/src/components/prompts/PromptSnippetTabs.tsx
+++ b/src/components/prompts/PromptSnippetTabs.tsx
@@ -72,8 +72,6 @@ export function PromptSnippetTabs({
     [promptName, args],
   );
 
-  const copiedLabel = intl.formatMessage({ id: "prompts.details.code.copySuccess" });
-
   return (
     <Tabs value={value} onValueChange={onValueChange}>
       <div className="mb-2 flex items-center justify-between gap-4">
@@ -96,7 +94,6 @@ export function PromptSnippetTabs({
               { id: "prompts.details.code.copyAriaLabel" },
               { language: snippet.language },
             )}
-            copiedLabel={copiedLabel}
           />
         </TabsContent>
       ))}
diff --git a/src/components/resources/ResourcePreviewResult.tsx b/src/components/resources/ResourcePreviewResult.tsx
index 03fa805..a09a3d0 100644
--- a/src/components/resources/ResourcePreviewResult.tsx
+++ b/src/components/resources/ResourcePreviewResult.tsx
@@ -159,13 +159,11 @@ function ResourceContentPreview({
   }
 
   if (kind === "code") {
-    const copiedLabel = intl.formatMessage({ id: "resources.details.code.copySuccess" });
     return (
       <CodeBlock
         code={content.text ?? ""}
         language={codeLanguageFor(mimeType)}
         copyLabel={mimeType || "content"}
-        copiedLabel={copiedLabel}
       />
     );
   }
diff --git a/src/components/resources/ResourceTryItTab.tsx b/src/components/resources/ResourceTryItTab.tsx
index 173622d..3fe07a2 100644
--- a/src/components/resources/ResourceTryItTab.tsx
+++ b/src/components/resources/ResourceTryItTab.tsx
@@ -122,7 +122,6 @@ function ResourcePreviewPane({ resource }: { resource: NonNullable<ResourceRead>
     [preview],
   );
 
-  const copiedLabel = intl.formatMessage({ id: "resources.details.code.copySuccess" });
   const rendered = useMemo(
     () => RESOURCE_SNIPPETS.map((spec) => ({ ...spec, text: spec.build({ uri: resolvedUri }) })),
     [resolvedUri],
@@ -154,7 +153,6 @@ function ResourcePreviewPane({ resource }: { resource: NonNullable<ResourceRead>
                   { id: "resources.details.code.copyAriaLabel" },
                   { language: snippet.language },
                 )}
-                copiedLabel={copiedLabel}
               />
             </TabsContent>
           ))}
diff --git a/src/components/resources/ResourcesTable.test.tsx b/src/components/resources/ResourcesTable.test.tsx
index 6bd4d1a..b980857 100644
--- a/src/components/resources/ResourcesTable.test.tsx
+++ b/src/components/resources/ResourcesTable.test.tsx
@@ -36,7 +36,7 @@ describe("ResourcesTable", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     mockOnSelectResource.mockClear();
-    vi.spyOn(clipboardUtils, "copyToClipboard").mockImplementation(() => {});
+    vi.spyOn(clipboardUtils, "copyToClipboard").mockResolvedValue(true);
   });
 
   it("renders table with correct headers", () => {
diff --git a/src/components/resources/ResourcesTable.tsx b/src/components/resources/ResourcesTable.tsx
index 36830f9..bda0e66 100644
--- a/src/components/resources/ResourcesTable.tsx
+++ b/src/components/resources/ResourcesTable.tsx
@@ -1,6 +1,7 @@
 import { useIntl } from "react-intl";
-import { Copy, MoreHorizontal } from "lucide-react";
+import { MoreHorizontal } from "lucide-react";
 import { Button } from "@/components/ui/button";
+import { CopyButton } from "@/components/ui/copy-button";
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -16,7 +17,6 @@ import {
   TableRow,
 } from "@/components/ui/table";
 import type { ResourceRead } from "@/generated/types";
-import { copyToClipboard } from "@/lib/clipboard";
 import { truncateMiddle } from "@/components/gateways/utils";
 
 export function ResourcesTable({
@@ -78,22 +78,15 @@ export function ResourcesTable({
                 <span className="min-w-0 truncate font-mono text-xs text-muted-foreground">
                   {truncateMiddle(resource.uriTemplate || resource.uri, 28)}
                 </span>
-                <Button
-                  type="button"
-                  variant="ghost"
-                  size="icon-xs"
-                  aria-label={intl.formatMessage(
+                <CopyButton
+                  value={resource.uriTemplate || resource.uri}
+                  label={intl.formatMessage(
                     { id: "resources.table.copyUri" },
                     { uri: resource.uriTemplate || resource.uri },
                   )}
+                  iconClassName="size-3"
                   className="ml-4 size-4 shrink-0 text-muted-foreground hover:text-foreground"
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    copyToClipboard(resource.uriTemplate || resource.uri);
-                  }}
-                >
-                  <Copy className="size-3" />
-                </Button>
+                />
               </div>
             </TableCell>
 
@@ -102,19 +95,12 @@ export function ResourcesTable({
                 <span className="min-w-0 truncate font-mono text-xs text-muted-foreground">
                   {truncateMiddle(resource.id, 18)}
                 </span>
-                <Button
-                  type="button"
-                  variant="ghost"
-                  size="icon-xs"
-                  aria-label={intl.formatMessage({ id: "resources.table.copyResourceId" })}
+                <CopyButton
+                  value={resource.id}
+                  label={intl.formatMessage({ id: "resources.table.copyResourceId" })}
+                  iconClassName="size-3"
                   className="ml-4 size-4 shrink-0 text-muted-foreground hover:text-foreground"
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    copyToClipboard(resource.id);
-                  }}
-                >
-                  <Copy className="size-3" />
-                </Button>
+                />
               </div>
             </TableCell>
 
diff --git a/src/components/servers/MCPServerDetailsPanel.tsx b/src/components/servers/MCPServerDetailsPanel.tsx
index d113290..b74a5d2 100644
--- a/src/components/servers/MCPServerDetailsPanel.tsx
+++ b/src/components/servers/MCPServerDetailsPanel.tsx
@@ -4,7 +4,6 @@ import { useIntl } from "react-intl";
 import {
   Activity,
   Box,
-  Copy,
   Globe,
   Loader2,
   MessageSquareCode,
@@ -20,12 +19,12 @@ import {
 } from "@/components/common/VisibilityInfoPopover";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
+import { CopyButton } from "@/components/ui/copy-button";
 import { InlineTagAdd } from "@/components/ui/inline-tag-add";
 import { CopyValue } from "@/components/ui/copy-value";
 import { Input } from "@/components/ui/input";
 import { cn } from "@/lib/utils";
 import type { MCPServer as BaseMCPServer, VirtualServerTag } from "@/types/server";
-import { copyToClipboard } from "@/lib/clipboard";
 import { useQuery } from "@/hooks/useQuery";
 import { TestConnectionPanel } from "./TestConnectionPanel";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
@@ -489,32 +488,28 @@ export function MCPServerDetailsPanel({
                                 </span>
                                 <span className="flex min-w-0 items-center gap-2 font-mono text-[13px] text-muted-foreground">
                                   <span className="truncate">{identifier}</span>
-                                  <Button
-                                    type="button"
-                                    variant="ghost"
-                                    size="icon-xs"
-                                    aria-label={`Copy ${title}`}
+                                  <CopyButton
+                                    value={identifier}
+                                    label={intl.formatMessage(
+                                      { id: "common.copyValue" },
+                                      { label: title },
+                                    )}
                                     className="size-5 text-muted-foreground"
-                                    onClick={() => copyToClipboard(identifier)}
-                                  >
-                                    <Copy className="size-3.5" />
-                                  </Button>
+                                  />
                                 </span>
                               </>
                             ) : (
                               <>
                                 <span className="flex min-w-0 items-center gap-2 font-mono text-[13px] text-muted-foreground">
                                   <span className="truncate">{identifier}</span>
-                                  <Button
-                                    type="button"
-                                    variant="ghost"
-                                    size="icon-xs"
-                                    aria-label={`Copy ${identifier}`}
+                                  <CopyButton
+                                    value={identifier}
+                                    label={intl.formatMessage(
+                                      { id: "common.copyValue" },
+                                      { label: identifier },
+                                    )}
                                     className="size-5 text-muted-foreground"
-                                    onClick={() => copyToClipboard(identifier)}
-                                  >
-                                    <Copy className="size-3.5" />
-                                  </Button>
+                                  />
                                 </span>
                                 <span aria-hidden="true" />
                               </>
diff --git a/src/components/servers/ServersTable.test.tsx b/src/components/servers/ServersTable.test.tsx
index 6ac8f63..192edc7 100644
--- a/src/components/servers/ServersTable.test.tsx
+++ b/src/components/servers/ServersTable.test.tsx
@@ -3,11 +3,16 @@ import { render, screen, fireEvent, waitFor, act } from "@testing-library/react"
 import userEvent from "@testing-library/user-event";
 import { ServersTable } from "./ServersTable";
 import { I18nProvider } from "@/i18n";
+import { TooltipProvider } from "@/components/ui/tooltip";
 import type { MCPServer } from "../../types/server";
 import type { ReactElement } from "react";
 
 function renderTable(ui: ReactElement) {
-  return render(<I18nProvider>{ui}</I18nProvider>);
+  return render(
+    <I18nProvider>
+      <TooltipProvider>{ui}</TooltipProvider>
+    </I18nProvider>,
+  );
 }
 
 // Minimal server factory
@@ -182,7 +187,7 @@ describe("ServersTable", () => {
     await act(async () => {
       await Promise.resolve();
     });
-    expect(screen.getByText("Copied!")).toBeInTheDocument();
+    expect(screen.getByRole("status")).toHaveTextContent("Copied!");
 
     // A second copy before the timeout clears the pending timer first.
     fireEvent.click(copyBtn);
@@ -195,13 +200,12 @@ describe("ServersTable", () => {
     act(() => {
       vi.advanceTimersByTime(1500);
     });
-    expect(screen.queryByText("Copied!")).not.toBeInTheDocument();
+    expect(screen.queryByRole("status")).not.toBeInTheDocument();
 
     vi.useRealTimers();
   });
 
-  it("logs an error when copying to the clipboard fails", async () => {
-    const consoleError = vi.spyOn(console, "error").mockImplementation(() => {});
+  it("shows a failed indicator instead of throwing when copying to the clipboard fails", async () => {
     const writeText = vi.fn().mockRejectedValue(new Error("denied"));
     Object.defineProperty(navigator, "clipboard", {
       value: { writeText },
@@ -216,8 +220,9 @@ describe("ServersTable", () => {
 
     fireEvent.click(screen.getByRole("button", { name: /copy uuid for test server/i }));
 
-    await waitFor(() => expect(consoleError).toHaveBeenCalled());
-    consoleError.mockRestore();
+    await waitFor(() => {
+      expect(screen.getByRole("status")).toHaveTextContent("Copy failed");
+    });
   });
 
   // ── Visibility cell ─────────────────────────────────────────────────────────
diff --git a/src/components/servers/ServersTable.tsx b/src/components/servers/ServersTable.tsx
index 9754af0..4cf90f0 100644
--- a/src/components/servers/ServersTable.tsx
+++ b/src/components/servers/ServersTable.tsx
@@ -1,11 +1,8 @@
-import { useState, useRef, useEffect } from "react";
 import {
-  Copy,
   Building2,
   Lock,
   Users,
   TriangleAlert,
-  Check,
   Activity,
   CircleSlash,
   CircleDashed,
@@ -25,7 +22,7 @@ import { ServerActionsMenu } from "./ServerActionsMenu";
 import type { MCPServer, ServerStatus } from "../../types/server";
 import { Loading } from "../ui/loading";
 import { formatLocalDateTime } from "../../utils/formatDate";
-import { Button } from "@/components/ui/button";
+import { CopyButton } from "@/components/ui/copy-button";
 
 function getLastSeenValue(server: MCPServer): string | undefined {
   return server.lastSeen;
@@ -93,8 +90,6 @@ function getStatusConfig(status: ServerStatus) {
   }
 }
 
-const COPY_FEEDBACK_DURATION_MS = 1500;
-
 interface ServersTableProps {
   servers: MCPServer[];
   isLoading: boolean;
@@ -113,34 +108,6 @@ export function ServersTable({
   onToggleEnabled,
 }: ServersTableProps) {
   const intl = useIntl();
-  const [copiedId, setCopiedId] = useState<string | null>(null);
-  const timeoutRef = useRef<number | null>(null);
-
-  useEffect(() => {
-    return () => {
-      if (timeoutRef.current) {
-        window.clearTimeout(timeoutRef.current);
-      }
-    };
-  }, []);
-
-  const handleCopy = async (value: string) => {
-    try {
-      await navigator.clipboard.writeText(value);
-      setCopiedId(value);
-
-      if (timeoutRef.current) {
-        window.clearTimeout(timeoutRef.current);
-      }
-
-      timeoutRef.current = window.setTimeout(() => {
-        setCopiedId((current) => (current === value ? null : current));
-        timeoutRef.current = null;
-      }, COPY_FEEDBACK_DURATION_MS);
-    } catch (error) {
-      console.error("Failed to copy server id:", error);
-    }
-  };
 
   if (isLoading) {
     return (
@@ -238,32 +205,17 @@ export function ServersTable({
                   {formatLocalDateTime(lastSeen, intl.formatMessage({ id: "mcpServer.neverUsed" }))}
                 </TableCell>
                 <TableCell className="px-4 py-2.5">
-                  <Button
-                    type="button"
-                    variant="ghost"
-                    size="sm"
-                    onClick={() => handleCopy(server.id)}
-                    className="inline-flex items-center gap-2 text-xs text-muted-foreground transition hover:text-foreground"
-                    aria-label={intl.formatMessage(
-                      { id: "mcpServer.table.copyUuid" },
-                      { name: server.name },
-                    )}
-                  >
+                  <div className="inline-flex items-center gap-2 text-xs text-muted-foreground">
                     <span className="max-w-[180px] truncate">{server.id}</span>
-                    {copiedId === server.id ? (
-                      <>
-                        <Check
-                          className="h-3.5 w-3.5 text-emerald-600 dark:text-emerald-400"
-                          aria-hidden="true"
-                        />
-                        <span className="sr-only">
-                          {intl.formatMessage({ id: "mcpServer.table.copied" })}
-                        </span>
-                      </>
-                    ) : (
-                      <Copy className="h-3.5 w-3.5" aria-hidden="true" />
-                    )}
-                  </Button>
+                    <CopyButton
+                      value={server.id}
+                      label={intl.formatMessage(
+                        { id: "mcpServer.table.copyUuid" },
+                        { name: server.name },
+                      )}
+                      iconClassName="h-3.5 w-3.5"
+                    />
+                  </div>
                 </TableCell>
                 <TableCell className="px-4 py-2.5">
                   <div className="inline-flex items-center gap-1.5 text-xs text-muted-foreground">
diff --git a/src/components/servers/TestConnectionPanel.test.tsx b/src/components/servers/TestConnectionPanel.test.tsx
index 582ae3c..dbd28e2 100644
--- a/src/components/servers/TestConnectionPanel.test.tsx
+++ b/src/components/servers/TestConnectionPanel.test.tsx
@@ -1,8 +1,9 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
-import { render, screen, waitFor } from "@testing-library/react";
+import { screen, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { http, HttpResponse } from "msw";
 import { server } from "@/test/mocks/server";
+import { renderWithProviders as render } from "@/test/test-utils";
 import { TestConnectionPanel } from "./TestConnectionPanel";
 
 const TEST_ENDPOINT = "*/v1/mcp-servers/test";
diff --git a/src/components/servers/TestConnectionPanel.tsx b/src/components/servers/TestConnectionPanel.tsx
index 41f1514..56cfa8a 100644
--- a/src/components/servers/TestConnectionPanel.tsx
+++ b/src/components/servers/TestConnectionPanel.tsx
@@ -1,15 +1,16 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { z } from "zod";
 import * as RadioGroupPrimitive from "@radix-ui/react-radio-group";
-import { CircleCheck, CircleAlert, Copy, Info, Loader2 } from "lucide-react";
+import { CircleCheck, CircleAlert, Info, Loader2 } from "lucide-react";
+import { useIntl } from "react-intl";
 import { Button } from "../ui/button";
+import { CopyButton } from "../ui/copy-button";
 import { Input } from "../ui/input";
 import { Label } from "../ui/label";
 import { RadioGroup } from "../ui/radio-group";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "../ui/select";
 import { Textarea } from "../ui/textarea";
 import { JsonHighlighter } from "../ui/json-highlighter";
-import { copyToClipboard } from "@/lib/clipboard";
 import { serversApi } from "@/api/servers";
 import type { GatewayTestRequest, GatewayTestResponse } from "@/generated/types";
 import { parseApiError } from "@/lib/errorUtils";
@@ -123,6 +124,7 @@ function FieldLabel({
 }
 
 export function TestConnectionPanel({ serverUrl }: TestConnectionPanelProps) {
+  const intl = useIntl();
   const [status, setStatus] = useState<TestStatus>("idle");
   const [method, setMethod] = useState<string>("Get");
   const [url, setUrl] = useState<string>(serverUrl);
@@ -439,16 +441,11 @@ export function TestConnectionPanel({ serverUrl }: TestConnectionPanelProps) {
                 aria-live="polite"
               >
                 {responseBodyText && (
-                  <Button
-                    type="button"
-                    variant="ghost"
-                    size="icon-xs"
-                    aria-label="Copy response body"
+                  <CopyButton
+                    value={responseBodyText}
+                    label={intl.formatMessage({ id: "mcpServer.testConnection.copyResponseBody" })}
                     className="absolute right-2 top-2 size-6 bg-background/80 text-muted-foreground backdrop-blur-sm hover:bg-muted hover:text-foreground"
-                    onClick={() => copyToClipboard(responseBodyText)}
-                  >
-                    <Copy className="size-3.5" />
-                  </Button>
+                  />
                 )}
 
                 <div className="flex items-start gap-2 pr-8">
diff --git a/src/components/tokens/TokenCreatedDialog.tsx b/src/components/tokens/TokenCreatedDialog.tsx
index 71b9119..a59b42c 100644
--- a/src/components/tokens/TokenCreatedDialog.tsx
+++ b/src/components/tokens/TokenCreatedDialog.tsx
@@ -1,5 +1,4 @@
-import type { RefObject } from "react";
-import { Copy } from "lucide-react";
+import { useRef, type RefObject } from "react";
 import { useIntl } from "react-intl";
 
 import {
@@ -10,7 +9,7 @@ import {
   DialogTitle,
 } from "@/components/ui/dialog";
 import { Button } from "@/components/ui/button";
-import { copyToClipboard } from "@/lib/clipboard";
+import { CopyButton } from "@/components/ui/copy-button";
 
 interface TokenCreatedDialogProps {
   /** The raw access token to reveal, or null when the dialog is closed. */
@@ -34,6 +33,7 @@ interface TokenCreatedDialogProps {
 export function TokenCreatedDialog({ token, onClose, returnFocusRef }: TokenCreatedDialogProps) {
   const intl = useIntl();
   const isOpen = token !== null;
+  const closeButtonRef = useRef<HTMLButtonElement>(null);
 
   return (
     <Dialog
@@ -44,6 +44,13 @@ export function TokenCreatedDialog({ token, onClose, returnFocusRef }: TokenCrea
     >
       <DialogContent
         className="gap-6 sm:max-w-xl"
+        onOpenAutoFocus={(event) => {
+          // Radix would otherwise auto-focus the first focusable descendant,
+          // the copy button — whose tooltip opens on focus and would eat the
+          // first Escape press instead of the dialog. Focus Close instead.
+          event.preventDefault();
+          closeButtonRef.current?.focus();
+        }}
         onCloseAutoFocus={(event) => {
           const target = returnFocusRef?.current;
           if (!target) return; // No target: leave Radix's default restore alone.
@@ -62,23 +69,20 @@ export function TokenCreatedDialog({ token, onClose, returnFocusRef }: TokenCrea
           </p>
           <div className="flex w-full items-center gap-2 rounded-lg border border-input px-4 py-3">
             <span className="min-w-0 flex-1 truncate font-mono text-sm">{token ?? ""}</span>
-            <Button
-              type="button"
-              variant="ghost"
-              size="icon-xs"
-              className="size-5 shrink-0 text-muted-foreground"
-              aria-label={intl.formatMessage(
+            <CopyButton
+              value={token ?? ""}
+              label={intl.formatMessage(
                 { id: "common.copyValue" },
                 { label: intl.formatMessage({ id: "tokens.created.label" }) },
               )}
-              onClick={() => copyToClipboard(token ?? "")}
-            >
-              <Copy className="size-3.5" />
-            </Button>
+              className="size-5 shrink-0 text-muted-foreground"
+            />
           </div>
         </div>
         <DialogFooter>
-          <Button onClick={onClose}>{intl.formatMessage({ id: "tokens.created.close" })}</Button>
+          <Button ref={closeButtonRef} onClick={onClose}>
+            {intl.formatMessage({ id: "tokens.created.close" })}
+          </Button>
         </DialogFooter>
       </DialogContent>
     </Dialog>
diff --git a/src/components/tools/ToolForm.test.tsx b/src/components/tools/ToolForm.test.tsx
index 12f56f6..64a06fe 100644
--- a/src/components/tools/ToolForm.test.tsx
+++ b/src/components/tools/ToolForm.test.tsx
@@ -6,6 +6,7 @@ import { http, HttpResponse } from "msw";
 import { server } from "@/test/mocks/server";
 import { I18nProvider } from "@/i18n";
 import { AuthProvider } from "@/auth/AuthContext";
+import { TooltipProvider } from "@/components/ui/tooltip";
 import { ToolForm } from "./ToolForm";
 import type { Tool } from "@/types/tool";
 
@@ -42,7 +43,9 @@ function renderForm(props: Partial<React.ComponentProps<typeof ToolForm>> = {})
   return render(
     <AuthProvider>
       <I18nProvider>
-        <ToolForm isOpen={true} onToggle={vi.fn()} onSuccess={vi.fn()} {...props} />
+        <TooltipProvider>
+          <ToolForm isOpen={true} onToggle={vi.fn()} onSuccess={vi.fn()} {...props} />
+        </TooltipProvider>
       </I18nProvider>
     </AuthProvider>,
   );
@@ -243,7 +246,9 @@ describe("ToolForm", () => {
       render(
         <AuthProvider>
           <I18nProvider>
-            <ToolForm isOpen={true} onToggle={onToggle} />
+            <TooltipProvider>
+              <ToolForm isOpen={true} onToggle={onToggle} />
+            </TooltipProvider>
           </I18nProvider>
         </AuthProvider>,
       );
@@ -655,19 +660,15 @@ describe("ToolForm", () => {
         }),
       });
 
-      // Find the second copy button (Output schema)
-      const copyButtons = screen.getAllByRole("button", { name: /Copy output schema/i });
-      const outputCopyBtn =
-        copyButtons.find((btn) => btn.getAttribute("aria-label")?.includes("Copy output schema")) ||
-        copyButtons[0];
+      const outputCopyBtn = screen.getByRole("button", { name: /Copy output schema/i });
 
-      await user.click(outputCopyBtn!);
+      await user.click(outputCopyBtn);
 
       expect(writeTextMock).toHaveBeenCalledWith('{\n  "type": "string"\n}');
 
-      // Wait for Check icon (aria-label="Copied!") to appear
+      // Wait for the copied confirmation to appear
       await waitFor(() => {
-        expect(screen.getByText(/copied/i)).toBeInTheDocument();
+        expect(screen.getByRole("status")).toHaveTextContent("Copied!");
       });
 
       // Restore clipboard
diff --git a/src/components/tools/ToolForm.tsx b/src/components/tools/ToolForm.tsx
index a8a8f81..9dd9216 100644
--- a/src/components/tools/ToolForm.tsx
+++ b/src/components/tools/ToolForm.tsx
@@ -1,8 +1,9 @@
 import { useState, useEffect } from "react";
 import { useIntl } from "react-intl";
-import { ChevronDown, Copy, RefreshCw, Wrench, Zap } from "lucide-react";
+import { ChevronDown, RefreshCw, Wrench, Zap } from "lucide-react";
 import { BackButton } from "@/components/ui/back-button";
 import { Button } from "@/components/ui/button";
+import { CopyButton } from "@/components/ui/copy-button";
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
 import { ToolAdvancedSettings } from "@/components/tools/ToolAdvancedSettings";
@@ -63,8 +64,6 @@ interface ToolFormProps {
 
 export function ToolForm({ isOpen, onToggle, onSuccess, tool }: ToolFormProps) {
   const intl = useIntl();
-  const [copiedInput, setCopiedInput] = useState(false);
-  const [copiedOutput, setCopiedOutput] = useState(false);
   const [showOverwriteConfirm, setShowOverwriteConfirm] = useState(false);
 
   const isEditMode = Boolean(tool);
@@ -146,13 +145,6 @@ export function ToolForm({ isOpen, onToggle, onSuccess, tool }: ToolFormProps) {
     setCustomHeaders,
   ]);
 
-  const handleCopy = (text: string, setCopied: (v: boolean) => void) => {
-    void navigator.clipboard.writeText(text).then(() => {
-      setCopied(true);
-      setTimeout(() => setCopied(false), 1500);
-    });
-  };
-
   const handleCancel = () => {
     onToggle();
   };
@@ -422,21 +414,12 @@ export function ToolForm({ isOpen, onToggle, onSuccess, tool }: ToolFormProps) {
                           placeholder={'{\n  "type": "object",\n  "properties": {}\n}'}
                           spellCheck={false}
                         />
-                        <Button
-                          type="button"
-                          variant="ghost"
-                          size="sm"
-                          aria-label={intl.formatMessage({ id: "tools.form.copyInputSchema" })}
+                        <CopyButton
+                          value={inputSchema}
+                          label={intl.formatMessage({ id: "tools.form.copyInputSchema" })}
+                          iconClassName="h-3.5 w-3.5"
                           className="absolute right-2 top-2 h-6 w-6 p-0 opacity-60 hover:opacity-100"
-                          onClick={() => handleCopy(inputSchema, setCopiedInput)}
-                        >
-                          <Copy className="h-3.5 w-3.5" />
-                          {copiedInput && (
-                            <span className="sr-only">
-                              {intl.formatMessage({ id: "tools.form.copied" })}
-                            </span>
-                          )}
-                        </Button>
+                        />
                       </div>
                     </div>
 
@@ -456,21 +439,12 @@ export function ToolForm({ isOpen, onToggle, onSuccess, tool }: ToolFormProps) {
                           placeholder={'{\n  "type": "object",\n  "properties": {}\n}'}
                           spellCheck={false}
                         />
-                        <Button
-                          type="button"
-                          variant="ghost"
-                          size="sm"
-                          aria-label={intl.formatMessage({ id: "tools.form.copyOutputSchema" })}
+                        <CopyButton
+                          value={outputSchema}
+                          label={intl.formatMessage({ id: "tools.form.copyOutputSchema" })}
+                          iconClassName="h-3.5 w-3.5"
                           className="absolute right-2 top-2 h-6 w-6 p-0 opacity-60 hover:opacity-100"
-                          onClick={() => handleCopy(outputSchema, setCopiedOutput)}
-                        >
-                          <Copy className="h-3.5 w-3.5" />
-                          {copiedOutput && (
-                            <span className="sr-only">
-                              {intl.formatMessage({ id: "tools.form.copied" })}
-                            </span>
-                          )}
-                        </Button>
+                        />
                       </div>
                     </div>
                   </div>
diff --git a/src/components/tools/ToolPreviewResult.tsx b/src/components/tools/ToolPreviewResult.tsx
index daa2309..bee89f6 100644
--- a/src/components/tools/ToolPreviewResult.tsx
+++ b/src/components/tools/ToolPreviewResult.tsx
@@ -88,7 +88,6 @@ export function ToolPreviewResult({ preview }: ToolPreviewResultProps) {
             code={JSON.stringify(response.resolved_arguments, null, 2)}
             language="json"
             copyLabel={intl.formatMessage({ id: "tools.details.preview.copyResolvedArguments" })}
-            copiedLabel={intl.formatMessage({ id: "tools.details.preview.copied" })}
           />
         </section>
       )}
@@ -102,7 +101,6 @@ export function ToolPreviewResult({ preview }: ToolPreviewResultProps) {
             code={JSON.stringify(response, null, 2)}
             language="json"
             copyLabel={intl.formatMessage({ id: "tools.details.preview.copyRawResponse" })}
-            copiedLabel={intl.formatMessage({ id: "tools.details.preview.copied" })}
           />
         </section>
       )}
diff --git a/src/components/tools/ToolSchemaDialog.test.tsx b/src/components/tools/ToolSchemaDialog.test.tsx
index 95e372f..b46c188 100644
--- a/src/components/tools/ToolSchemaDialog.test.tsx
+++ b/src/components/tools/ToolSchemaDialog.test.tsx
@@ -1,6 +1,7 @@
 import { describe, it, expect, vi } from "vitest";
-import { render, screen } from "@testing-library/react";
+import { screen, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
+import { renderWithProviders as render } from "@/test/test-utils";
 import { ToolSchemaDialog } from "./ToolSchemaDialog";
 import * as gatewayUtils from "@/lib/clipboard";
 import type { Tool } from "@/types/tool";
@@ -45,7 +46,7 @@ describe("ToolSchemaDialog", () => {
 
   beforeEach(() => {
     vi.clearAllMocks();
-    vi.spyOn(gatewayUtils, "copyToClipboard").mockImplementation(() => {});
+    vi.spyOn(gatewayUtils, "copyToClipboard").mockResolvedValue(true);
   });
 
   it("renders dialog when open is true", () => {
@@ -260,6 +261,37 @@ describe("ToolSchemaDialog", () => {
     expect(screen.getByText(/array/)).toBeInTheDocument();
   });
 
+  it("moves initial focus to the footer Close button, not a schema copy button", async () => {
+    const tool = createMockTool();
+    render(<ToolSchemaDialog tool={tool} open={true} onOpenChange={mockOnOpenChange} />);
+
+    await waitFor(() => {
+      const allClose = screen.getAllByRole("button", { name: /close/i });
+      const footerClose = allClose.find((btn) => !btn.querySelector("svg"))!;
+      expect(footerClose).toHaveFocus();
+    });
+  });
+
+  it("closes on a single Escape press instead of dismissing a copy button tooltip first", async () => {
+    const user = userEvent.setup();
+    const tool = createMockTool();
+    render(<ToolSchemaDialog tool={tool} open={true} onOpenChange={mockOnOpenChange} />);
+
+    // Wait for the auto-focus redirect to land on Close before pressing Escape,
+    // otherwise focus may still be mid-transition from the default (a copy
+    // button), which is exactly the regression this guards against.
+    await waitFor(() => {
+      const allClose = screen.getAllByRole("button", { name: /close/i });
+      const footerClose = allClose.find((btn) => !btn.querySelector("svg"))!;
+      expect(footerClose).toHaveFocus();
+    });
+
+    await user.keyboard("{Escape}");
+
+    expect(mockOnOpenChange).toHaveBeenCalledTimes(1);
+    expect(mockOnOpenChange).toHaveBeenCalledWith(false);
+  });
+
   it("handles schemas with long text values", () => {
     const tool = createMockTool({
       inputSchema: {
diff --git a/src/components/tools/ToolSchemaDialog.tsx b/src/components/tools/ToolSchemaDialog.tsx
index 2e34e31..e788b12 100644
--- a/src/components/tools/ToolSchemaDialog.tsx
+++ b/src/components/tools/ToolSchemaDialog.tsx
@@ -1,4 +1,6 @@
-import { Copy, Code } from "lucide-react";
+import { useRef } from "react";
+import { Code } from "lucide-react";
+import { useIntl } from "react-intl";
 import {
   Dialog,
   DialogContent,
@@ -8,7 +10,7 @@ import {
   DialogFooter,
 } from "@/components/ui/dialog";
 import { Button } from "@/components/ui/button";
-import { copyToClipboard } from "@/lib/clipboard";
+import { CopyButton } from "@/components/ui/copy-button";
 import { JsonHighlighter } from "@/components/ui/json-highlighter";
 import type { Tool } from "@/types/tool";
 
@@ -25,6 +27,7 @@ function SchemaSection({
   title: string;
   schema: Record<string, unknown> | null | undefined;
 }) {
+  const intl = useIntl();
   const schemaText = schema ? JSON.stringify(schema, null, 2) : "{}";
 
   return (
@@ -36,25 +39,31 @@ function SchemaSection({
             <JsonHighlighter text={schemaText} />
           </code>
         </pre>
-        <Button
-          type="button"
-          variant="ghost"
-          size="icon-xs"
-          aria-label={`Copy ${title.toLowerCase()}`}
+        <CopyButton
+          value={schemaText}
+          label={intl.formatMessage({ id: "common.copyValue" }, { label: title.toLowerCase() })}
           className="absolute right-2 top-2 size-6 bg-neutral-800/80 text-neutral-400 hover:bg-neutral-700 hover:text-neutral-100"
-          onClick={() => copyToClipboard(schemaText)}
-        >
-          <Copy className="size-3.5" />
-        </Button>
+        />
       </div>
     </div>
   );
 }
 
 export function ToolSchemaDialog({ tool, open, onOpenChange }: ToolSchemaDialogProps) {
+  const closeButtonRef = useRef<HTMLButtonElement>(null);
+
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-2xl">
+      <DialogContent
+        className="max-w-2xl"
+        onOpenAutoFocus={(event) => {
+          // Radix would otherwise auto-focus the first focusable descendant,
+          // a schema copy button — whose tooltip opens on focus and would eat
+          // the first Escape press instead of the dialog. Focus Close instead.
+          event.preventDefault();
+          closeButtonRef.current?.focus();
+        }}
+      >
         <DialogHeader>
           <div className="flex items-center gap-2">
             <div
@@ -76,7 +85,12 @@ export function ToolSchemaDialog({ tool, open, onOpenChange }: ToolSchemaDialogP
         </div>
 
         <DialogFooter>
-          <Button type="button" variant="ghost" onClick={() => onOpenChange(false)}>
+          <Button
+            ref={closeButtonRef}
+            type="button"
+            variant="ghost"
+            onClick={() => onOpenChange(false)}
+          >
             Close
           </Button>
         </DialogFooter>
diff --git a/src/components/tools/ToolsTable.test.tsx b/src/components/tools/ToolsTable.test.tsx
index 8d951ed..bf2f867 100644
--- a/src/components/tools/ToolsTable.test.tsx
+++ b/src/components/tools/ToolsTable.test.tsx
@@ -47,7 +47,7 @@ describe("ToolsTable", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     mockOnSelectTool.mockClear();
-    vi.spyOn(gatewayUtils, "copyToClipboard").mockImplementation(() => {});
+    vi.spyOn(gatewayUtils, "copyToClipboard").mockResolvedValue(true);
   });
 
   it("renders table with correct headers", () => {
diff --git a/src/components/tools/ToolsTable.tsx b/src/components/tools/ToolsTable.tsx
index a306e4b..9db952e 100644
--- a/src/components/tools/ToolsTable.tsx
+++ b/src/components/tools/ToolsTable.tsx
@@ -1,7 +1,8 @@
 import { useState } from "react";
 import { useIntl } from "react-intl";
-import { Copy, MoreHorizontal } from "lucide-react";
+import { MoreHorizontal } from "lucide-react";
 import { Button } from "@/components/ui/button";
+import { CopyButton } from "@/components/ui/copy-button";
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -17,7 +18,6 @@ import {
   TableRow,
 } from "@/components/ui/table";
 import type { Tool } from "@/types/tool";
-import { copyToClipboard } from "@/lib/clipboard";
 import { truncateMiddle } from "@/components/gateways/utils";
 import { ToolSchemaDialog } from "@/components/tools/ToolSchemaDialog";
 
@@ -94,22 +94,15 @@ export function ToolsTable({
                   <span className="min-w-0 truncate font-mono text-xs text-muted-foreground">
                     {tool.customName || tool.originalName}
                   </span>
-                  <Button
-                    type="button"
-                    variant="ghost"
-                    size="icon-xs"
-                    aria-label={intl.formatMessage(
+                  <CopyButton
+                    value={tool.customName || tool.originalName}
+                    label={intl.formatMessage(
                       { id: "tools.table.copyName" },
                       { name: tool.customName || tool.originalName },
                     )}
+                    iconClassName="size-3"
                     className="ml-4 size-4 shrink-0 text-muted-foreground hover:text-foreground"
-                    onClick={(e) => {
-                      e.stopPropagation();
-                      copyToClipboard(tool.customName || tool.originalName);
-                    }}
-                  >
-                    <Copy className="size-3" />
-                  </Button>
+                  />
                 </div>
               </TableCell>
 
@@ -118,19 +111,12 @@ export function ToolsTable({
                   <span className="min-w-0 truncate font-mono text-xs text-muted-foreground">
                     {truncateMiddle(tool.id, 18)}
                   </span>
-                  <Button
-                    type="button"
-                    variant="ghost"
-                    size="icon-xs"
-                    aria-label={intl.formatMessage({ id: "tools.table.copyToolId" })}
+                  <CopyButton
+                    value={tool.id}
+                    label={intl.formatMessage({ id: "tools.table.copyToolId" })}
+                    iconClassName="size-3"
                     className="ml-4 size-4 shrink-0 text-muted-foreground hover:text-foreground"
-                    onClick={(e) => {
-                      e.stopPropagation();
-                      copyToClipboard(tool.id);
-                    }}
-                  >
-                    <Copy className="size-3" />
-                  </Button>
+                  />
                 </div>
               </TableCell>
 
diff --git a/src/components/ui/card-tag.test.tsx b/src/components/ui/card-tag.test.tsx
index f2806f9..9a50ead 100644
--- a/src/components/ui/card-tag.test.tsx
+++ b/src/components/ui/card-tag.test.tsx
@@ -1,10 +1,16 @@
+import type { ReactElement } from "react";
 import { describe, it, expect } from "vitest";
 import { render, screen, waitFor } from "@testing-library/react";
 import { CardTag } from "./card-tag";
+import { TooltipProvider } from "@/components/ui/tooltip";
+
+function renderTag(ui: ReactElement) {
+  return render(<TooltipProvider>{ui}</TooltipProvider>);
+}
 
 describe("CardTag", () => {
   it("renders a plain chip with no tooltip trigger by default", () => {
-    render(<CardTag>label</CardTag>);
+    renderTag(<CardTag>label</CardTag>);
 
     const tag = screen.getByText("label");
     expect(tag).toBeInTheDocument();
@@ -13,13 +19,13 @@ describe("CardTag", () => {
   });
 
   it("applies the neutral variant classes", () => {
-    render(<CardTag variant="neutral">mime</CardTag>);
+    renderTag(<CardTag variant="neutral">mime</CardTag>);
 
     expect(screen.getByText("mime")).toHaveClass("bg-neutral-100");
   });
 
   it("exposes an accessible tooltip when tooltip text is provided", async () => {
-    render(<CardTag tooltip="More info">chip</CardTag>);
+    renderTag(<CardTag tooltip="More info">chip</CardTag>);
 
     const trigger = screen.getByText("chip").closest("button");
     expect(trigger).not.toBeNull();
diff --git a/src/components/ui/card-tag.tsx b/src/components/ui/card-tag.tsx
index 468a358..cb16718 100644
--- a/src/components/ui/card-tag.tsx
+++ b/src/components/ui/card-tag.tsx
@@ -2,7 +2,7 @@ import * as React from "react";
 import { cva, type VariantProps } from "class-variance-authority";
 
 import { cn } from "@/lib/utils";
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 
 const cardTagVariants = cva(
   "inline-flex items-center rounded px-1.5 py-1 text-[10px] font-medium leading-none",
@@ -44,14 +44,12 @@ export function CardTag({ className, variant, tooltip, children, ...props }: Car
   }
 
   return (
-    <TooltipProvider>
-      <Tooltip>
-        <TooltipTrigger className="rounded focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring">
-          {tag}
-        </TooltipTrigger>
-        <TooltipContent>{tooltip}</TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
+    <Tooltip>
+      <TooltipTrigger className="rounded focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring">
+        {tag}
+      </TooltipTrigger>
+      <TooltipContent>{tooltip}</TooltipContent>
+    </Tooltip>
   );
 }
 
diff --git a/src/components/ui/code-block.test.tsx b/src/components/ui/code-block.test.tsx
index d0869b3..0ea98f4 100644
--- a/src/components/ui/code-block.test.tsx
+++ b/src/components/ui/code-block.test.tsx
@@ -1,6 +1,7 @@
 import { describe, it, expect, vi } from "vitest";
-import { render, screen } from "@testing-library/react";
+import { screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
+import { renderWithProviders as render } from "@/test/test-utils";
 import { CodeBlock } from "./code-block";
 
 describe("CodeBlock", () => {
@@ -9,18 +10,10 @@ describe("CodeBlock", () => {
     expect(screen.getByText('"a"')).toBeInTheDocument();
   });
 
-  it("invokes onCopy with the raw code when the copy button is clicked", async () => {
-    const user = userEvent.setup();
-    const onCopy = vi.fn();
-    render(<CodeBlock code="hello world" language="bash" copyLabel="bash" onCopy={onCopy} />);
-    await user.click(screen.getByRole("button", { name: /bash/i }));
-    expect(onCopy).toHaveBeenCalledWith("hello world");
-  });
-
-  it("copies to the clipboard and shows a tooltip when copiedLabel is set", async () => {
+  it("copies the code to the clipboard and shows the copied tooltip when the copy button is clicked", async () => {
     const user = userEvent.setup();
     const writeText = vi.spyOn(navigator.clipboard, "writeText").mockResolvedValue();
-    render(<CodeBlock code="hello world" language="bash" copyLabel="bash" copiedLabel="Copied!" />);
+    render(<CodeBlock code="hello world" language="bash" copyLabel="bash" />);
     await user.click(screen.getByRole("button", { name: /bash/i }));
     expect(writeText).toHaveBeenCalledWith("hello world");
     expect(screen.getByRole("tooltip")).toHaveTextContent("Copied!");
diff --git a/src/components/ui/code-block.tsx b/src/components/ui/code-block.tsx
index 190687f..0d8475f 100644
--- a/src/components/ui/code-block.tsx
+++ b/src/components/ui/code-block.tsx
@@ -1,25 +1,15 @@
-import { useEffect, useRef, useState } from "react";
 import { Highlight, themes, type Language } from "prism-react-renderer";
-import { Copy } from "lucide-react";
 
-import { Button } from "@/components/ui/button";
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
-import { copyToClipboard } from "@/lib/clipboard";
+import { CopyButton } from "@/components/ui/copy-button";
 import { cn } from "@/lib/utils";
 
-const COPY_FEEDBACK_DURATION_MS = 1500;
-
 export type CodeBlockLanguage = "bash" | "json" | "python" | "tsx" | "markdown" | "xml" | "text";
 
 export interface CodeBlockProps {
   code: string;
   language: CodeBlockLanguage;
-  /** aria-label for the Copy button. */
+  /** Label for the Copy button, used as both its aria-label and idle tooltip. */
   copyLabel?: string;
-  /** When set, clicking Copy writes to the clipboard and shows this label in a tooltip. */
-  copiedLabel?: string;
-  /** Invoked when the user clicks Copy. Ignored when `copiedLabel` is set. */
-  onCopy?: (code: string) => void;
   /** Hide the built-in Copy affordance. */
   hideCopy?: boolean;
   /** aria-label fallback when `copyLabel` is not supplied. */
@@ -49,50 +39,19 @@ const TOKEN_LANGUAGE: Record<CodeBlockLanguage, Language> = {
  *
  * Token coloring comes from the `vsDark` theme; that pairs reasonably well
  * with the rewrite's neutral-900/950 backgrounds without per-token overrides.
- *
- * This component is intentionally i18n-free — callers pass a translated
- * `copiedLabel` when they want tooltip feedback on copy.
  */
 export function CodeBlock({
   code,
   language,
   copyLabel,
-  copiedLabel,
-  onCopy,
   hideCopy = false,
   copyAriaLabel,
   className,
   padding = "p-4",
 }: CodeBlockProps) {
-  const [copied, setCopied] = useState(false);
-  const timeoutRef = useRef<number | null>(null);
   const prismLanguage = TOKEN_LANGUAGE[language];
   const ariaLabel = copyLabel ?? copyAriaLabel ?? "Copy code";
 
-  useEffect(() => {
-    return () => {
-      if (timeoutRef.current) {
-        window.clearTimeout(timeoutRef.current);
-      }
-    };
-  }, []);
-
-  const handleCopy = () => {
-    if (copiedLabel) {
-      copyToClipboard(code);
-      setCopied(true);
-      if (timeoutRef.current) {
-        window.clearTimeout(timeoutRef.current);
-      }
-      timeoutRef.current = window.setTimeout(() => {
-        setCopied(false);
-        timeoutRef.current = null;
-      }, COPY_FEEDBACK_DURATION_MS);
-      return;
-    }
-    onCopy?.(code);
-  };
-
   return (
     <div className={cn("relative", className)}>
       <Highlight code={code} language={prismLanguage} theme={themes.vsDark}>
@@ -126,29 +85,11 @@ export function CodeBlock({
       </Highlight>
       {!hideCopy && (
         <div className="absolute right-2 top-2">
-          {(() => {
-            const copyButton = (
-              <Button
-                type="button"
-                variant="ghost"
-                size="icon-xs"
-                className="size-7 text-neutral-400 hover:bg-neutral-800 hover:text-neutral-100"
-                aria-label={ariaLabel}
-                onClick={handleCopy}
-              >
-                <Copy className="size-3.5" />
-              </Button>
-            );
-            if (!copiedLabel) return copyButton;
-            return (
-              <TooltipProvider delayDuration={0}>
-                <Tooltip open={copied}>
-                  <TooltipTrigger asChild>{copyButton}</TooltipTrigger>
-                  <TooltipContent side="top">{copiedLabel}</TooltipContent>
-                </Tooltip>
-              </TooltipProvider>
-            );
-          })()}
+          <CopyButton
+            value={code}
+            label={ariaLabel}
+            className="size-7 text-neutral-400 hover:bg-neutral-800 hover:text-neutral-100"
+          />
         </div>
       )}
     </div>
diff --git a/src/components/ui/copy-button.test.tsx b/src/components/ui/copy-button.test.tsx
new file mode 100644
index 0000000..f1b0626
--- /dev/null
+++ b/src/components/ui/copy-button.test.tsx
@@ -0,0 +1,50 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+import { screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { renderWithProviders as render } from "@/test/test-utils";
+import { CopyButton } from "./copy-button";
+
+describe("CopyButton", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it("keeps the idle label as both aria-label and hover tooltip before any click", async () => {
+    const user = userEvent.setup();
+    render(<CopyButton value="abc" label="Copy resource ID" />);
+
+    const button = screen.getByRole("button", { name: "Copy resource ID" });
+    await user.hover(button);
+    expect(await screen.findByRole("tooltip")).toHaveTextContent("Copy resource ID");
+  });
+
+  it("copies the value, shows the Check icon, and announces the copied label once", async () => {
+    const user = userEvent.setup();
+    const writeText = vi.spyOn(navigator.clipboard, "writeText").mockResolvedValue();
+    render(<CopyButton value="abc" label="Copy resource ID" />);
+
+    const button = screen.getByRole("button", { name: "Copy resource ID" });
+    await user.click(button);
+
+    expect(writeText).toHaveBeenCalledWith("abc");
+    expect(button.querySelector("svg")).toHaveClass("text-emerald-600");
+    // aria-label stays fixed; the transient state is announced via a single status region.
+    expect(button).toHaveAttribute("aria-label", "Copy resource ID");
+    expect(screen.getAllByRole("status")).toHaveLength(1);
+    expect(screen.getByRole("status")).toHaveTextContent("Copied!");
+  });
+
+  it("stops the click from bubbling to an ancestor (e.g. a clickable table row)", async () => {
+    const user = userEvent.setup();
+    vi.spyOn(navigator.clipboard, "writeText").mockResolvedValue();
+    const onRowClick = vi.fn();
+    render(
+      <div onClick={onRowClick}>
+        <CopyButton value="abc" label="Copy resource ID" />
+      </div>,
+    );
+
+    await user.click(screen.getByRole("button", { name: "Copy resource ID" }));
+    expect(onRowClick).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/components/ui/copy-button.tsx b/src/components/ui/copy-button.tsx
new file mode 100644
index 0000000..b393c22
--- /dev/null
+++ b/src/components/ui/copy-button.tsx
@@ -0,0 +1,80 @@
+import { useState } from "react";
+import { Check, Copy } from "lucide-react";
+import { useIntl } from "react-intl";
+import type { VariantProps } from "class-variance-authority";
+
+import { Button, buttonVariants } from "@/components/ui/button";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
+import { useCopyToClipboard } from "@/hooks/useCopyToClipboard";
+import { cn } from "@/lib/utils";
+
+export interface CopyButtonProps {
+  /** The value written to the clipboard. */
+  value: string;
+  /** Accessible label and idle hover-tooltip text, e.g. "Copy resource ID". */
+  label: string;
+  size?: VariantProps<typeof buttonVariants>["size"];
+  /** Icon size class. Defaults to the size most call sites use. */
+  iconClassName?: string;
+  className?: string;
+  side?: "top" | "right" | "bottom" | "left";
+}
+
+/**
+ * Icon button that copies `value` to the clipboard and confirms it happened.
+ *
+ * The tooltip stays uncontrolled on hover/focus (so the ordinary "Copy X"
+ * hint keeps working) but is force-opened on copy, so touch users — who never
+ * fire a hover event — still see the confirmation. `aria-label` stays fixed
+ * at `label`; a single `role="status"` region announces the transient
+ * copied/failed state instead, so the two don't double-announce.
+ */
+export function CopyButton({
+  value,
+  label,
+  size = "icon-xs",
+  iconClassName = "size-3.5",
+  className,
+  side = "top",
+}: CopyButtonProps) {
+  const intl = useIntl();
+  const [hoverOpen, setHoverOpen] = useState(false);
+  const { status, copy } = useCopyToClipboard();
+  const copied = status === "copied";
+  const failed = status === "error";
+  const copiedLabel = intl.formatMessage({ id: "common.copied" });
+  const failedLabel = intl.formatMessage({ id: "common.copyFailed" });
+  const tooltipLabel = copied ? copiedLabel : failed ? failedLabel : label;
+
+  return (
+    <>
+      <Tooltip open={copied || failed || hoverOpen} onOpenChange={setHoverOpen} delayDuration={400}>
+        <TooltipTrigger asChild>
+          <Button
+            type="button"
+            variant="ghost"
+            size={size}
+            aria-label={label}
+            className={className}
+            onClick={(e) => {
+              e.stopPropagation();
+              void copy(value);
+            }}
+          >
+            {copied ? (
+              <Check className={cn(iconClassName, "text-emerald-600 dark:text-emerald-400")} />
+            ) : (
+              <Copy className={iconClassName} />
+            )}
+          </Button>
+        </TooltipTrigger>
+        <TooltipContent side={side}>{tooltipLabel}</TooltipContent>
+      </Tooltip>
+      {(copied || failed) && (
+        <span role="status" className="sr-only">
+          {copied ? copiedLabel : failedLabel}
+        </span>
+      )}
+    </>
+  );
+}
diff --git a/src/components/ui/copy-value.tsx b/src/components/ui/copy-value.tsx
index 4aa11e1..edeeba8 100644
--- a/src/components/ui/copy-value.tsx
+++ b/src/components/ui/copy-value.tsx
@@ -1,9 +1,7 @@
-import { Copy } from "lucide-react";
 import { useIntl } from "react-intl";
 
-import { Button } from "@/components/ui/button";
+import { CopyButton } from "@/components/ui/copy-button";
 import { truncateMiddle } from "@/components/gateways/utils";
-import { copyToClipboard } from "@/lib/clipboard";
 
 export interface CopyValueProps {
   /** Human-readable name of the value, used to build the copy button's accessible label. */
@@ -26,16 +24,11 @@ export function CopyValue({ label, value }: CopyValueProps) {
   return (
     <div className="flex min-w-0 items-center gap-2">
       <span className="min-w-0 flex-1 truncate font-mono text-[12px]">{truncateMiddle(value)}</span>
-      <Button
-        type="button"
-        variant="ghost"
-        size="icon-xs"
+      <CopyButton
+        value={value}
+        label={intl.formatMessage({ id: "common.copyValue" }, { label })}
         className="size-5 text-muted-foreground"
-        aria-label={intl.formatMessage({ id: "common.copyValue" }, { label })}
-        onClick={() => copyToClipboard(value)}
-      >
-        <Copy className="size-3.5" />
-      </Button>
+      />
     </div>
   );
 }
diff --git a/src/hooks/useCopyToClipboard.test.ts b/src/hooks/useCopyToClipboard.test.ts
new file mode 100644
index 0000000..59481d9
--- /dev/null
+++ b/src/hooks/useCopyToClipboard.test.ts
@@ -0,0 +1,161 @@
+import { act, renderHook } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import { useCopyToClipboard } from "./useCopyToClipboard";
+
+function setClipboard(writeText: (value: string) => Promise<void>) {
+  Object.defineProperty(navigator, "clipboard", {
+    value: { writeText },
+    writable: true,
+    configurable: true,
+  });
+}
+
+/** A promise plus its resolver/rejecter, so a test can control exactly when it settles. */
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  let reject!: (reason: unknown) => void;
+  const promise = new Promise<T>((res, rej) => {
+    resolve = res;
+    reject = rej;
+  });
+  return { promise, resolve, reject };
+}
+
+describe("useCopyToClipboard", () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  it("starts idle", () => {
+    const { result } = renderHook(() => useCopyToClipboard());
+    expect(result.current.status).toBe("idle");
+  });
+
+  it("sets status to copied on success and resets after the delay", async () => {
+    setClipboard(() => Promise.resolve());
+    const { result } = renderHook(() => useCopyToClipboard(1500));
+
+    await act(async () => {
+      await result.current.copy("value");
+    });
+    expect(result.current.status).toBe("copied");
+
+    act(() => {
+      vi.advanceTimersByTime(1500);
+    });
+    expect(result.current.status).toBe("idle");
+  });
+
+  it("sets status to error on rejection", async () => {
+    setClipboard(() => Promise.reject(new Error("denied")));
+    const { result } = renderHook(() => useCopyToClipboard());
+
+    await act(async () => {
+      await result.current.copy("value");
+    });
+    expect(result.current.status).toBe("error");
+  });
+
+  it("restarts the reset timer on a rapid second click", async () => {
+    setClipboard(() => Promise.resolve());
+    const { result } = renderHook(() => useCopyToClipboard(1500));
+
+    await act(async () => {
+      await result.current.copy("first");
+    });
+    act(() => {
+      vi.advanceTimersByTime(1000);
+    });
+    expect(result.current.status).toBe("copied");
+
+    await act(async () => {
+      await result.current.copy("second");
+    });
+    act(() => {
+      vi.advanceTimersByTime(1000);
+    });
+    // Second click restarted the timer, so it hasn't reset at the 1000ms mark yet.
+    expect(result.current.status).toBe("copied");
+
+    act(() => {
+      vi.advanceTimersByTime(500);
+    });
+    expect(result.current.status).toBe("idle");
+  });
+
+  it("clears the pending timer on unmount", async () => {
+    setClipboard(() => Promise.resolve());
+    const clearTimeoutSpy = vi.spyOn(window, "clearTimeout");
+    const { result, unmount } = renderHook(() => useCopyToClipboard());
+
+    await act(async () => {
+      await result.current.copy("value");
+    });
+    clearTimeoutSpy.mockClear();
+
+    unmount();
+    expect(clearTimeoutSpy).toHaveBeenCalled();
+  });
+
+  it("does not let a stale request clobber a newer one that already settled", async () => {
+    const first = deferred<void>();
+    const second = deferred<void>();
+    let call = 0;
+    setClipboard(() => {
+      call += 1;
+      return call === 1 ? first.promise : second.promise;
+    });
+    const { result } = renderHook(() => useCopyToClipboard());
+
+    let firstCopy!: Promise<boolean>;
+    let secondCopy!: Promise<boolean>;
+    act(() => {
+      firstCopy = result.current.copy("first");
+    });
+    act(() => {
+      secondCopy = result.current.copy("second");
+    });
+
+    // The newer (second) request resolves first...
+    second.resolve();
+    await act(async () => {
+      await secondCopy;
+    });
+    expect(result.current.status).toBe("copied");
+
+    // ...and the older (first) request rejects after it. Since it's stale it
+    // must be ignored rather than flipping status to "error".
+    first.reject(new Error("denied"));
+    await act(async () => {
+      await firstCopy;
+    });
+    expect(result.current.status).toBe("copied");
+  });
+
+  it("ignores a completion that arrives after unmount", async () => {
+    const { promise, resolve } = deferred<void>();
+    setClipboard(() => promise);
+    const setTimeoutSpy = vi.spyOn(window, "setTimeout");
+    const { result, unmount } = renderHook(() => useCopyToClipboard());
+
+    let copyPromise!: Promise<boolean>;
+    act(() => {
+      copyPromise = result.current.copy("value");
+    });
+
+    unmount();
+    resolve();
+    await act(async () => {
+      await copyPromise;
+    });
+
+    // The write finished after teardown, so no state update or reset timer
+    // should have been scheduled.
+    expect(setTimeoutSpy).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/hooks/useCopyToClipboard.ts b/src/hooks/useCopyToClipboard.ts
new file mode 100644
index 0000000..a27eea7
--- /dev/null
+++ b/src/hooks/useCopyToClipboard.ts
@@ -0,0 +1,49 @@
+import { useCallback, useEffect, useRef, useState } from "react";
+
+import { copyToClipboard } from "@/lib/clipboard";
+
+export type CopyStatus = "idle" | "copied" | "error";
+
+/**
+ * Writes a value to the clipboard and exposes transient `copied`/`error`
+ * feedback that resets to `idle` after `resetDelayMs`. A rapid second copy
+ * restarts the timer rather than stacking resets.
+ */
+export function useCopyToClipboard(resetDelayMs = 1500) {
+  const [status, setStatus] = useState<CopyStatus>("idle");
+  const timeoutRef = useRef<number | null>(null);
+  const mountedRef = useRef(true);
+  const requestIdRef = useRef(0);
+
+  useEffect(() => {
+    mountedRef.current = true;
+    return () => {
+      mountedRef.current = false;
+      if (timeoutRef.current) window.clearTimeout(timeoutRef.current);
+    };
+  }, []);
+
+  const copy = useCallback(
+    async (value: string) => {
+      const requestId = ++requestIdRef.current;
+      const ok = await copyToClipboard(value);
+
+      // Ignore this result if a later copy() has since been fired (so an
+      // older request resolving out of order can't clobber newer feedback)
+      // or the component has unmounted (so we don't set state or schedule
+      // an uncleared timer after teardown).
+      if (!mountedRef.current || requestId !== requestIdRef.current) return ok;
+
+      setStatus(ok ? "copied" : "error");
+      if (timeoutRef.current) window.clearTimeout(timeoutRef.current);
+      timeoutRef.current = window.setTimeout(() => {
+        setStatus("idle");
+        timeoutRef.current = null;
+      }, resetDelayMs);
+      return ok;
+    },
+    [resetDelayMs],
+  );
+
+  return { status, copy };
+}
diff --git a/src/i18n/locales/en-US/common.json b/src/i18n/locales/en-US/common.json
index e2d5dab..adc2a1e 100644
--- a/src/i18n/locales/en-US/common.json
+++ b/src/i18n/locales/en-US/common.json
@@ -11,6 +11,8 @@
   "common.button.back": "Back",
   "common.button.submitting": "Submitting...",
   "common.copyValue": "Copy {label}",
+  "common.copied": "Copied!",
+  "common.copyFailed": "Copy failed",
   "common.loading": "Loading...",
   "common.error": "Error",
   "common.success": "Success",
diff --git a/src/i18n/locales/en-US/mcpServer.json b/src/i18n/locales/en-US/mcpServer.json
index 6dc4323..882f785 100644
--- a/src/i18n/locales/en-US/mcpServer.json
+++ b/src/i18n/locales/en-US/mcpServer.json
@@ -43,7 +43,6 @@
   "mcpServer.table.components.resources": "{count, plural, one {# resource} other {# resources}}",
   "mcpServer.table.components.prompts": "{count, plural, one {# prompt} other {# prompts}}",
   "mcpServer.table.copyUuid": "Copy UUID for {name}",
-  "mcpServer.table.copied": "Copied!",
   "mcpServer.table.actions.label": "Actions for {name}",
   "mcpServer.table.actions.openMenu": "Open menu for {name}",
   "mcpServer.table.actions.viewDetails": "View details",
@@ -176,5 +175,6 @@
   "mcpServer.caCert.hint": "Public certificate files only (.pem, .crt, .cer, .cert)",
   "mcpServer.caCert.invalidFiles": "{count, plural, one {Invalid file type: {files}.} other {Invalid file types: {files}.}} Only .pem, .crt, .cer, .cert files are allowed.",
   "mcpServer.caCert.filesSelected": "{count, plural, one {# file selected successfully.} other {# files selected successfully.}}",
-  "mcpServer.caCert.selected": "Selected: {files}"
+  "mcpServer.caCert.selected": "Selected: {files}",
+  "mcpServer.testConnection.copyResponseBody": "Copy response body"
 }
diff --git a/src/i18n/locales/en-US/prompts.json b/src/i18n/locales/en-US/prompts.json
index 6a02765..68646a9 100644
--- a/src/i18n/locales/en-US/prompts.json
+++ b/src/i18n/locales/en-US/prompts.json
@@ -20,7 +20,6 @@
   "prompts.details.code.tab.typescript": "TypeScript",
   "prompts.details.code.copy": "Copy snippet",
   "prompts.details.code.copyAriaLabel": "Copy {language} snippet",
-  "prompts.details.code.copySuccess": "Copied!",
   "prompts.details.preview.run": "Preview",
   "prompts.details.preview.rerun": "Re-run",
   "prompts.details.preview.running": "Rendering...",
diff --git a/src/i18n/locales/en-US/tools.json b/src/i18n/locales/en-US/tools.json
index 6b955f9..da298c4 100644
--- a/src/i18n/locales/en-US/tools.json
+++ b/src/i18n/locales/en-US/tools.json
@@ -126,7 +126,6 @@
   "tools.form.outputSchema": "Output schema",
   "tools.form.copyInputSchema": "Copy input schema",
   "tools.form.copyOutputSchema": "Copy output schema",
-  "tools.form.copied": "Copied!",
   "tools.form.advancedSettings": "Advanced settings",
   "tools.form.cancel": "Cancel",
   "tools.form.button.add": "Add tool",
diff --git a/src/i18n/locales/es-ES/common.json b/src/i18n/locales/es-ES/common.json
index cbbff44..20d4251 100644
--- a/src/i18n/locales/es-ES/common.json
+++ b/src/i18n/locales/es-ES/common.json
@@ -11,6 +11,8 @@
   "common.button.back": "Volver",
   "common.button.submitting": "Enviando...",
   "common.copyValue": "Copiar {label}",
+  "common.copied": "¡Copiado!",
+  "common.copyFailed": "Error al copiar",
   "common.loading": "Cargando...",
   "common.error": "Error",
   "common.success": "Éxito",
diff --git a/src/i18n/locales/es-ES/mcpServer.json b/src/i18n/locales/es-ES/mcpServer.json
index 5512dd8..a9581c9 100644
--- a/src/i18n/locales/es-ES/mcpServer.json
+++ b/src/i18n/locales/es-ES/mcpServer.json
@@ -43,7 +43,6 @@
   "mcpServer.table.components.resources": "{count, plural, one {# recurso} other {# recursos}}",
   "mcpServer.table.components.prompts": "{count, plural, one {# prompt} other {# prompts}}",
   "mcpServer.table.copyUuid": "Copiar UUID de {name}",
-  "mcpServer.table.copied": "¡Copiado!",
   "mcpServer.table.actions.label": "Acciones para {name}",
   "mcpServer.table.actions.openMenu": "Abrir menú de {name}",
   "mcpServer.table.actions.viewDetails": "Ver detalles",
@@ -176,5 +175,6 @@
   "mcpServer.caCert.hint": "Solo archivos de certificado público (.pem, .crt, .cer, .cert)",
   "mcpServer.caCert.invalidFiles": "{count, plural, one {Tipo de archivo no válido: {files}.} other {Tipos de archivo no válidos: {files}.}} Solo se permiten archivos .pem, .crt, .cer y .cert.",
   "mcpServer.caCert.filesSelected": "{count, plural, one {# archivo seleccionado correctamente.} other {# archivos seleccionados correctamente.}}",
-  "mcpServer.caCert.selected": "Seleccionados: {files}"
+  "mcpServer.caCert.selected": "Seleccionados: {files}",
+  "mcpServer.testConnection.copyResponseBody": "Copiar cuerpo de la respuesta"
 }
diff --git a/src/i18n/locales/es-ES/prompts.json b/src/i18n/locales/es-ES/prompts.json
index 2b3b87e..688c32a 100644
--- a/src/i18n/locales/es-ES/prompts.json
+++ b/src/i18n/locales/es-ES/prompts.json
@@ -20,7 +20,6 @@
   "prompts.details.code.tab.typescript": "TypeScript",
   "prompts.details.code.copy": "Copiar fragmento",
   "prompts.details.code.copyAriaLabel": "Copiar fragmento de {language}",
-  "prompts.details.code.copySuccess": "¡Copiado!",
   "prompts.details.preview.run": "Previsualizar",
   "prompts.details.preview.rerun": "Volver a ejecutar",
   "prompts.details.preview.running": "Renderizando...",
diff --git a/src/i18n/locales/es-ES/tools.json b/src/i18n/locales/es-ES/tools.json
index cd43b5b..652aba0 100644
--- a/src/i18n/locales/es-ES/tools.json
+++ b/src/i18n/locales/es-ES/tools.json
@@ -126,7 +126,6 @@
   "tools.form.outputSchema": "Esquema de salida",
   "tools.form.copyInputSchema": "Copiar esquema de entrada",
   "tools.form.copyOutputSchema": "Copiar esquema de salida",
-  "tools.form.copied": "¡Copiado!",
   "tools.form.advancedSettings": "Configuración avanzada",
   "tools.form.cancel": "Cancelar",
   "tools.form.button.add": "Añadir herramienta",
diff --git a/src/i18n/locales/pt-BR/common.json b/src/i18n/locales/pt-BR/common.json
index 017a5b6..55dcda2 100644
--- a/src/i18n/locales/pt-BR/common.json
+++ b/src/i18n/locales/pt-BR/common.json
@@ -11,6 +11,8 @@
   "common.button.back": "Voltar",
   "common.button.submitting": "Enviando...",
   "common.copyValue": "Copiar {label}",
+  "common.copied": "Copiado!",
+  "common.copyFailed": "Falha ao copiar",
   "common.loading": "Carregando...",
   "common.error": "Erro",
   "common.success": "Sucesso",
diff --git a/src/i18n/locales/pt-BR/mcpServer.json b/src/i18n/locales/pt-BR/mcpServer.json
index 8efabfc..df0d342 100644
--- a/src/i18n/locales/pt-BR/mcpServer.json
+++ b/src/i18n/locales/pt-BR/mcpServer.json
@@ -43,7 +43,6 @@
   "mcpServer.table.components.resources": "{count, plural, one {# recurso} other {# recursos}}",
   "mcpServer.table.components.prompts": "{count, plural, one {# prompt} other {# prompts}}",
   "mcpServer.table.copyUuid": "Copiar UUID de {name}",
-  "mcpServer.table.copied": "Copiado!",
   "mcpServer.table.actions.label": "Ações para {name}",
   "mcpServer.table.actions.openMenu": "Abrir menu de {name}",
   "mcpServer.table.actions.viewDetails": "Ver detalhes",
@@ -176,5 +175,6 @@
   "mcpServer.caCert.hint": "Somente arquivos de certificado público (.pem, .crt, .cer, .cert)",
   "mcpServer.caCert.invalidFiles": "{count, plural, one {Tipo de arquivo inválido: {files}.} other {Tipos de arquivo inválidos: {files}.}} Somente arquivos .pem, .crt, .cer e .cert são permitidos.",
   "mcpServer.caCert.filesSelected": "{count, plural, one {# arquivo selecionado com sucesso.} other {# arquivos selecionados com sucesso.}}",
-  "mcpServer.caCert.selected": "Selecionados: {files}"
+  "mcpServer.caCert.selected": "Selecionados: {files}",
+  "mcpServer.testConnection.copyResponseBody": "Copiar corpo da resposta"
 }
diff --git a/src/i18n/locales/pt-BR/prompts.json b/src/i18n/locales/pt-BR/prompts.json
index f0d96dc..0fe5788 100644
--- a/src/i18n/locales/pt-BR/prompts.json
+++ b/src/i18n/locales/pt-BR/prompts.json
@@ -20,7 +20,6 @@
   "prompts.details.code.tab.typescript": "TypeScript",
   "prompts.details.code.copy": "Copiar trecho",
   "prompts.details.code.copyAriaLabel": "Copiar trecho em {language}",
-  "prompts.details.code.copySuccess": "Copiado!",
   "prompts.details.preview.run": "Pré-visualizar",
   "prompts.details.preview.rerun": "Executar novamente",
   "prompts.details.preview.running": "Renderizando...",
diff --git a/src/i18n/locales/pt-BR/tools.json b/src/i18n/locales/pt-BR/tools.json
index 20c9ad3..06b9819 100644
--- a/src/i18n/locales/pt-BR/tools.json
+++ b/src/i18n/locales/pt-BR/tools.json
@@ -126,7 +126,6 @@
   "tools.form.outputSchema": "Esquema de saída",
   "tools.form.copyInputSchema": "Copiar esquema de entrada",
   "tools.form.copyOutputSchema": "Copiar esquema de saída",
-  "tools.form.copied": "Copiado!",
   "tools.form.advancedSettings": "Configurações avançadas",
   "tools.form.cancel": "Cancelar",
   "tools.form.button.add": "Adicionar ferramenta",
diff --git a/src/lib/clipboard.test.ts b/src/lib/clipboard.test.ts
index f06a2c8..cf63d59 100644
--- a/src/lib/clipboard.test.ts
+++ b/src/lib/clipboard.test.ts
@@ -2,26 +2,37 @@ import { describe, expect, it, vi } from "vitest";
 import { copyToClipboard } from "./clipboard";
 
 describe("copyToClipboard", () => {
-  it("calls navigator.clipboard.writeText if available", () => {
-    const writeTextMock = vi.fn();
+  it("writes to navigator.clipboard.writeText and resolves true on success", async () => {
+    const writeTextMock = vi.fn().mockResolvedValue(undefined);
     Object.assign(navigator, {
       clipboard: {
         writeText: writeTextMock,
       },
     });
 
-    copyToClipboard("test-text");
+    await expect(copyToClipboard("test-text")).resolves.toBe(true);
     expect(writeTextMock).toHaveBeenCalledWith("test-text");
   });
 
-  it("does not throw if clipboard is undefined", () => {
+  it("resolves false without throwing when clipboard is undefined", async () => {
     const originalClipboard = navigator.clipboard;
     // @ts-expect-error - testing missing clipboard
     delete navigator.clipboard;
 
-    expect(() => copyToClipboard("test")).not.toThrow();
+    await expect(copyToClipboard("test")).resolves.toBe(false);
 
     // @ts-expect-error - restoring clipboard
     navigator.clipboard = originalClipboard;
   });
+
+  it("resolves false when writeText rejects", async () => {
+    const writeTextMock = vi.fn().mockRejectedValue(new Error("denied"));
+    Object.assign(navigator, {
+      clipboard: {
+        writeText: writeTextMock,
+      },
+    });
+
+    await expect(copyToClipboard("test-text")).resolves.toBe(false);
+  });
 });
diff --git a/src/lib/clipboard.ts b/src/lib/clipboard.ts
index b7c97ce..3f85d2e 100644
--- a/src/lib/clipboard.ts
+++ b/src/lib/clipboard.ts
@@ -1,3 +1,10 @@
-export function copyToClipboard(value: string) {
-  void navigator.clipboard?.writeText(value);
+/** Writes to the clipboard, reporting whether it succeeded. */
+export async function copyToClipboard(value: string): Promise<boolean> {
+  if (!navigator.clipboard) return false;
+  try {
+    await navigator.clipboard.writeText(value);
+    return true;
+  } catch {
+    return false;
+  }
 }
diff --git a/src/pages/Gateways.tsx b/src/pages/Gateways.tsx
index 930f821..8d5f73e 100644
--- a/src/pages/Gateways.tsx
+++ b/src/pages/Gateways.tsx
@@ -7,7 +7,7 @@ import { VirtualServerCard } from "@/components/gateways/VirtualServerCard";
 import { VirtualServerDetailsPanel } from "@/components/gateways/VirtualServerDetailsPanel";
 import { ConfirmDialog } from "@/components/servers/ConfirmDialog";
 import { Loading } from "@/components/ui/loading";
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import {
   deleteVirtualServer,
   setVirtualServerState,
@@ -237,19 +237,17 @@ export function Gateways() {
         <h1 ref={headingRef} tabIndex={-1} className="text-base font-semibold text-foreground">
           {intl.formatMessage({ id: "gateways.title" })}
         </h1>
-        <TooltipProvider>
-          <Tooltip>
-            <TooltipTrigger
-              aria-label={intl.formatMessage({ id: "gateways.titleTooltip.trigger" })}
-              className="rounded text-muted-foreground hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
-            >
-              <Info className="size-4" aria-hidden="true" />
-            </TooltipTrigger>
-            <TooltipContent side="right">
-              {intl.formatMessage({ id: "gateways.titleTooltip" })}
-            </TooltipContent>
-          </Tooltip>
-        </TooltipProvider>
+        <Tooltip>
+          <TooltipTrigger
+            aria-label={intl.formatMessage({ id: "gateways.titleTooltip.trigger" })}
+            className="rounded text-muted-foreground hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+          >
+            <Info className="size-4" aria-hidden="true" />
+          </TooltipTrigger>
+          <TooltipContent side="right">
+            {intl.formatMessage({ id: "gateways.titleTooltip" })}
+          </TooltipContent>
+        </Tooltip>
       </div>
 
       {isLoading && (
diff --git a/src/pages/Resources.test.tsx b/src/pages/Resources.test.tsx
index 95c1477..c5b5ec9 100644
--- a/src/pages/Resources.test.tsx
+++ b/src/pages/Resources.test.tsx
@@ -41,6 +41,7 @@ import { server } from "@/test/mocks/server";
 import { Resources } from "./Resources";
 import { RouterProvider } from "@/router";
 import { I18nProvider } from "@/i18n";
+import { TooltipProvider } from "@/components/ui/tooltip";
 import type { ReactElement } from "react";
 import type { ResourceRead } from "@/generated/types";
 
@@ -73,7 +74,9 @@ function renderWithRouter(ui: ReactElement) {
 
   return render(
     <RouterProvider>
-      <I18nProvider>{ui}</I18nProvider>
+      <I18nProvider>
+        <TooltipProvider>{ui}</TooltipProvider>
+      </I18nProvider>
     </RouterProvider>,
   );
 }
diff --git a/src/pages/Servers.test.tsx b/src/pages/Servers.test.tsx
index 9810e82..6489e0d 100644
--- a/src/pages/Servers.test.tsx
+++ b/src/pages/Servers.test.tsx
@@ -6,6 +6,7 @@ import { toast } from "sonner";
 import { Servers } from "./Servers";
 import { RouterProvider } from "@/router";
 import { I18nProvider } from "@/i18n";
+import { TooltipProvider } from "@/components/ui/tooltip";
 import type { ReactElement } from "react";
 
 // Mock the api client to avoid AbortSignal issues with MSW in Node.js
@@ -70,7 +71,9 @@ function renderWithRouter(ui: ReactElement, path = "/app/servers") {
 
   return render(
     <RouterProvider>
-      <I18nProvider>{ui}</I18nProvider>
+      <I18nProvider>
+        <TooltipProvider>{ui}</TooltipProvider>
+      </I18nProvider>
     </RouterProvider>,
   );
 }
diff --git a/src/pages/Tools.test.tsx b/src/pages/Tools.test.tsx
index 84276d2..53b7ae4 100644
--- a/src/pages/Tools.test.tsx
+++ b/src/pages/Tools.test.tsx
@@ -17,6 +17,7 @@ import { Tools } from "./Tools";
 import { RouterProvider } from "@/router";
 import { I18nProvider } from "@/i18n";
 import { AuthProvider } from "@/auth/AuthContext";
+import { TooltipProvider } from "@/components/ui/tooltip";
 import type { ReactElement } from "react";
 import type { Tool } from "@/types/tool";
 
@@ -64,7 +65,9 @@ function renderWithRouter(ui: ReactElement, path = "/app/tools") {
   return render(
     <AuthProvider>
       <RouterProvider>
-        <I18nProvider>{ui}</I18nProvider>
+        <I18nProvider>
+          <TooltipProvider>{ui}</TooltipProvider>
+        </I18nProvider>
       </RouterProvider>
     </AuthProvider>,
   );
diff --git a/src/test/test-utils.tsx b/src/test/test-utils.tsx
index ef3cee9..b6446e1 100644
--- a/src/test/test-utils.tsx
+++ b/src/test/test-utils.tsx
@@ -1,6 +1,7 @@
 import { ReactElement, ReactNode } from "react";
 import { render, RenderOptions } from "@testing-library/react";
 import { I18nProvider } from "../i18n";
+import { TooltipProvider } from "@/components/ui/tooltip";
 
 // Mock authenticated state by default
 export function setupAuthenticatedTest() {
@@ -10,7 +11,11 @@ export function setupAuthenticatedTest() {
 }
 
 function AllTheProviders({ children }: { children: ReactNode }) {
-  return <I18nProvider>{children}</I18nProvider>;
+  return (
+    <I18nProvider>
+      <TooltipProvider>{children}</TooltipProvider>
+    </I18nProvider>
+  );
 }
 
 export function renderWithProviders(ui: ReactElement, options?: Omit<RenderOptions, "wrapper">) {