diff --git a/apps/rowboat/app/projects/[projectId]/entities/agent_config.tsx b/apps/rowboat/app/projects/[projectId]/entities/agent_config.tsx
index 9f57c993..1a7af105 100644
--- a/apps/rowboat/app/projects/[projectId]/entities/agent_config.tsx
+++ b/apps/rowboat/app/projects/[projectId]/entities/agent_config.tsx
@@ -122,10 +122,10 @@ export function AgentConfig({
                         variant="secondary"
                         size="sm"
                         onClick={handleClose}
-                        startContent={<XIcon className="w-4 h-4" />}
-                        aria-label="Close agent config"
+                        showHoverContent={true}
+                        hoverContent="Close"
                     >
-                        Close
+                        <XIcon className="w-4 h-4" />
                     </CustomButton>
                 </div>
             }
diff --git a/apps/rowboat/app/projects/[projectId]/entities/prompt_config.tsx b/apps/rowboat/app/projects/[projectId]/entities/prompt_config.tsx
index a4bd252a..b81c9cf7 100644
--- a/apps/rowboat/app/projects/[projectId]/entities/prompt_config.tsx
+++ b/apps/rowboat/app/projects/[projectId]/entities/prompt_config.tsx
@@ -61,11 +61,10 @@ export function PromptConfig({
                         variant="secondary"
                         size="sm"
                         onClick={handleClose}
-                        startContent={<XIcon className="w-4 h-4" />}
-                        aria-label="Close prompt config"
-                        className="transition-colors"
+                        showHoverContent={true}
+                        hoverContent="Close"
                     >
-                        Close
+                        <XIcon className="w-4 h-4" />
                     </Button>
                 </div>
             }
diff --git a/apps/rowboat/app/projects/[projectId]/entities/tool_config.tsx b/apps/rowboat/app/projects/[projectId]/entities/tool_config.tsx
index 59adca38..8f7ce1fb 100644
--- a/apps/rowboat/app/projects/[projectId]/entities/tool_config.tsx
+++ b/apps/rowboat/app/projects/[projectId]/entities/tool_config.tsx
@@ -256,10 +256,10 @@ export function ToolConfig({
                         variant="secondary"
                         size="sm"
                         onClick={handleClose}
-                        startContent={<XIcon className="w-4 h-4" />}
-                        aria-label="Close tool config"
+                        showHoverContent={true}
+                        hoverContent="Close"
                     >
-                        Close
+                        <XIcon className="w-4 h-4" />
                     </Button>
                 </div>
             }