diff --git a/frontend/src/components/tools/ToolPicker.tsx b/frontend/src/components/tools/ToolPicker.tsx
index 3c2b9218e..fc750f549 100644
--- a/frontend/src/components/tools/ToolPicker.tsx
+++ b/frontend/src/components/tools/ToolPicker.tsx
@@ -141,7 +141,7 @@ const ToolPicker = ({ selectedToolKey, onSelect, filteredTools, isSearching = fa
             {searchGroups.length === 0 ? (
               <NoToolsFound />
             ) : (
-                      searchGroups.map(group => renderToolButtons(t, group, selectedToolKey, onSelect, true, false, filteredTools))
+                      searchGroups.map(group => renderToolButtons(t, group, selectedToolKey, onSelect, true, false, filteredTools, true))
             )}
           </Stack>
         ) : (
@@ -186,6 +186,7 @@ const ToolPicker = ({ selectedToolKey, onSelect, filteredTools, isSearching = fa
                           tool={tool}
                           isSelected={selectedToolKey === id}
                           onSelect={onSelect}
+                          hasStars
                         />
                       ))}
                     </div>
@@ -202,6 +203,7 @@ const ToolPicker = ({ selectedToolKey, onSelect, filteredTools, isSearching = fa
                           tool={tool}
                           isSelected={selectedToolKey === id}
                           onSelect={onSelect}
+                          hasStars
                         />
                       ))}
                     </div>
@@ -242,7 +244,7 @@ const ToolPicker = ({ selectedToolKey, onSelect, filteredTools, isSearching = fa
             <Box ref={allToolsRef} w="100%">
               <Stack p="sm" gap="xs">
                         {allSection?.subcategories.map((sc: any) =>
-                          renderToolButtons(t, sc, selectedToolKey, onSelect, true, false)
+                          renderToolButtons(t, sc, selectedToolKey, onSelect, true, false, undefined, true)
                         )}
               </Stack>
             </Box>
diff --git a/frontend/src/components/tools/shared/renderToolButtons.tsx b/frontend/src/components/tools/shared/renderToolButtons.tsx
index a6cb63961..5a84c16f3 100644
--- a/frontend/src/components/tools/shared/renderToolButtons.tsx
+++ b/frontend/src/components/tools/shared/renderToolButtons.tsx
@@ -14,7 +14,8 @@ export const renderToolButtons = (
   onSelect: (id: string) => void,
   showSubcategoryHeader: boolean = true,
   disableNavigation: boolean = false,
-  searchResults?: Array<{ item: [string, any]; matchedText?: string }>
+  searchResults?: Array<{ item: [string, any]; matchedText?: string }>,
+  hasStars: boolean = false
 ) => {
   // Create a map of matched text for quick lookup
   const matchedTextMap = new Map<string, string>();
@@ -42,6 +43,7 @@ export const renderToolButtons = (
                       onSelect={onSelect}
                       disableNavigation={disableNavigation}
                       matchedSynonym={matchedSynonym}
+                      hasStars={hasStars}
                     />
                   );
         })}
diff --git a/frontend/src/components/tools/toolPicker/ToolButton.tsx b/frontend/src/components/tools/toolPicker/ToolButton.tsx
index 2eb3eddfe..4a86a5d85 100644
--- a/frontend/src/components/tools/toolPicker/ToolButton.tsx
+++ b/frontend/src/components/tools/toolPicker/ToolButton.tsx
@@ -22,9 +22,10 @@ interface ToolButtonProps {
   rounded?: boolean;
   disableNavigation?: boolean;
   matchedSynonym?: string;
+  hasStars?: boolean;
 }
 
-const ToolButton: React.FC<ToolButtonProps> = ({ id, tool, isSelected, onSelect, disableNavigation = false, matchedSynonym }) => {
+const ToolButton: React.FC<ToolButtonProps> = ({ id, tool, isSelected, onSelect, disableNavigation = false, matchedSynonym, hasStars = false }) => {
   const { t } = useTranslation();
   // Special case: read and multiTool are navigational tools that are always available
   const isUnavailable = !tool.component && !tool.link && id !== 'read' && id !== 'multiTool';
@@ -169,7 +170,7 @@ const ToolButton: React.FC<ToolButtonProps> = ({ id, tool, isSelected, onSelect,
     </Button>
   );
 
-  const star = !isUnavailable ? (
+  const star = hasStars && !isUnavailable ? (
     <ActionIcon
       variant="subtle"
       radius="xl"