diff --git a/application/api/user/routes.py b/application/api/user/routes.py
index 32d76fd7..5c9975fb 100644
--- a/application/api/user/routes.py
+++ b/application/api/user/routes.py
@@ -113,6 +113,20 @@ def ensure_user_doc(user_id):
     return user_doc
 
 
+def resolve_tool_details(tool_ids):
+    tools = user_tools_collection.find(
+        {"_id": {"$in": [ObjectId(tid) for tid in tool_ids]}}
+    )
+    return [
+        {
+            "id": str(tool["_id"]),
+            "name": tool.get("name", ""),
+            "display_name": tool.get("displayName", tool.get("name", "")),
+        }
+        for tool in tools
+    ]
+
+
 def get_vector_store(source_id):
     """
     Get the Vector Store
@@ -1059,6 +1073,7 @@ class GetAgent(Resource):
                 "retriever": agent.get("retriever", ""),
                 "prompt_id": agent.get("prompt_id", ""),
                 "tools": agent.get("tools", []),
+                "tool_details": resolve_tool_details(agent.get("tools", [])),
                 "agent_type": agent.get("agent_type", ""),
                 "status": agent.get("status", ""),
                 "created_at": agent.get("createdAt", ""),
@@ -1108,6 +1123,7 @@ class GetAgents(Resource):
                     "retriever": agent.get("retriever", ""),
                     "prompt_id": agent.get("prompt_id", ""),
                     "tools": agent.get("tools", []),
+                    "tool_details": resolve_tool_details(agent.get("tools", [])),
                     "agent_type": agent.get("agent_type", ""),
                     "status": agent.get("status", ""),
                     "created_at": agent.get("createdAt", ""),
@@ -1511,6 +1527,7 @@ class PinnedAgents(Resource):
                     "retriever": agent.get("retriever", ""),
                     "prompt_id": agent.get("prompt_id", ""),
                     "tools": agent.get("tools", []),
+                    "tool_details": resolve_tool_details(agent.get("tools", [])),
                     "agent_type": agent.get("agent_type", ""),
                     "status": agent.get("status", ""),
                     "created_at": agent.get("createdAt", ""),
@@ -1660,6 +1677,7 @@ class SharedAgent(Resource):
                 "name": shared_agent.get("name", ""),
                 "description": shared_agent.get("description", ""),
                 "tools": shared_agent.get("tools", []),
+                "tool_details": resolve_tool_details(shared_agent.get("tools", [])),
                 "agent_type": shared_agent.get("agent_type", ""),
                 "status": shared_agent.get("status", ""),
                 "created_at": shared_agent.get("createdAt", ""),
@@ -1733,6 +1751,7 @@ class SharedAgents(Resource):
                     "name": agent.get("name", ""),
                     "description": agent.get("description", ""),
                     "tools": agent.get("tools", []),
+                    "tool_details": resolve_tool_details(agent.get("tools", [])),
                     "agent_type": agent.get("agent_type", ""),
                     "status": agent.get("status", ""),
                     "created_at": agent.get("createdAt", ""),
diff --git a/frontend/src/agents/SharedAgentCard.tsx b/frontend/src/agents/SharedAgentCard.tsx
index 9c8160e5..6c778ba4 100644
--- a/frontend/src/agents/SharedAgentCard.tsx
+++ b/frontend/src/agents/SharedAgentCard.tsx
@@ -37,23 +37,23 @@ export default function SharedAgentCard({ agent }: { agent: Agent }) {
           </p>
         )}
       </div>
-      {agent.tools.length > 0 && (
+      {agent.tool_details && agent.tool_details.length > 0 && (
         <div className="mt-8">
           <p className="text-sm font-semibold text-[#212121] dark:text-[#E0E0E0] sm:text-base">
             Connected Tools
           </p>
           <div className="mt-2 flex flex-wrap gap-2">
-            {agent.tools.map((tool, index) => (
+            {agent.tool_details.map((tool, index) => (
               <span
                 key={index}
                 className="flex items-center gap-1 rounded-full bg-bright-gray px-3 py-1 text-xs font-light text-[#212121] dark:bg-dark-charcoal dark:text-[#E0E0E0]"
               >
                 <img
-                  src={`/toolIcons/tool_${tool}.svg`}
-                  alt={`${tool} icon`}
+                  src={`/toolIcons/tool_${tool.name}.svg`}
+                  alt={`${tool.name} icon`}
                   className="h-3 w-3"
                 />{' '}
-                {tool}
+                {tool.name}
               </span>
             ))}
           </div>
diff --git a/frontend/src/agents/types/index.ts b/frontend/src/agents/types/index.ts
index fe3cb418..4a1af145 100644
--- a/frontend/src/agents/types/index.ts
+++ b/frontend/src/agents/types/index.ts
@@ -1,3 +1,9 @@
+export type ToolSummary = {
+  id: string;
+  name: string;
+  display_name: string;
+};
+
 export type Agent = {
   id?: string;
   name: string;
@@ -8,6 +14,7 @@ export type Agent = {
   retriever: string;
   prompt_id: string;
   tools: string[];
+  tool_details?: ToolSummary[];
   agent_type: string;
   status: string;
   key?: string;