diff --git a/frontend/src/app/auth/page.tsx b/frontend/src/app/auth/page.tsx
index 5c092b89..044727ce 100644
--- a/frontend/src/app/auth/page.tsx
+++ b/frontend/src/app/auth/page.tsx
@@ -270,7 +270,6 @@ function LoginContent() {
           <div className="relative flex-1 flex items-center justify-center p-4 lg:p-8">
             <div className="w-full max-w-sm">
               <div className="mb-4 flex items-center flex-col gap-3 sm:gap-4 justify-center">
-                {/* <ReleaseBadge className='mb-2 sm:mb-4' text="Custom Agents, Playbooks, and more!" /> */}
                 <h1 className="text-xl sm:text-2xl font-semibold text-foreground text-center leading-tight">
                   {isSignUp ? 'Create your account' : 'Log into your account'}
                 </h1>
diff --git a/frontend/src/components/dashboard/dashboard-content.tsx b/frontend/src/components/dashboard/dashboard-content.tsx
index 4b56c7ef..b678ec38 100644
--- a/frontend/src/components/dashboard/dashboard-content.tsx
+++ b/frontend/src/components/dashboard/dashboard-content.tsx
@@ -344,11 +344,6 @@ export function DashboardContent() {
       <div className="flex flex-col h-screen w-full overflow-hidden">
         <div className="flex-1 overflow-y-auto">
           <div className="min-h-full flex flex-col">
-            {/* {(
-              <div className="flex justify-center px-4 pt-4 md:pt-8">
-                <ReleaseBadge className='hover:cursor-pointer' text="Custom Agents, Playbooks, and more!" link="/agents?tab=my-agents" />
-              </div>
-            )} */}
             <div className="flex-1 flex items-center justify-center px-4 py-8">
               <div className="w-full max-w-[650px] flex flex-col items-center justify-center space-y-4 md:space-y-6">
                 <div className="flex flex-col items-center text-center w-full">
diff --git a/frontend/src/components/thread/chat-input/chat-input.tsx b/frontend/src/components/thread/chat-input/chat-input.tsx
index 4e84a40e..d6841276 100644
--- a/frontend/src/components/thread/chat-input/chat-input.tsx
+++ b/frontend/src/components/thread/chat-input/chat-input.tsx
@@ -27,7 +27,7 @@ import { useFileDelete } from '@/hooks/react-query/files';
 import { useQueryClient } from '@tanstack/react-query';
 import { ToolCallInput } from './floating-tool-preview';
 import { ChatSnack } from './chat-snack';
-import { Brain, Zap, Database, ArrowDown } from 'lucide-react';
+import { Brain, Zap, Database, ArrowDown, Wrench } from 'lucide-react';
 import { useComposioToolkitIcon } from '@/hooks/react-query/composio/use-composio';
 import { Skeleton } from '@/components/ui/skeleton';
 
@@ -610,6 +610,13 @@ export const ChatInput = memo(forwardRef<ChatInputHandles, ChatInputProps>(
                     </div>
                     <span className="text-xs font-medium">Integrations</span>
                   </button>
+                  <button
+                    onClick={() => setAgentConfigDialog({ open: true, tab: 'tools' })}
+                    className="flex items-center gap-1.5 text-muted-foreground hover:text-foreground transition-all duration-200 px-2.5 py-1.5 rounded-lg hover:bg-muted/50 border border-transparent hover:border-border/30 flex-shrink-0 cursor-pointer relative pointer-events-auto"
+                  >
+                    <Wrench className="h-3.5 w-3.5 flex-shrink-0" />
+                    <span className="text-xs font-medium">Tools</span>
+                  </button>                  
                   <button
                     onClick={() => setAgentConfigDialog({ open: true, tab: 'instructions' })}
                     className="flex items-center gap-1.5 text-muted-foreground hover:text-foreground transition-all duration-200 px-2.5 py-1.5 rounded-lg hover:bg-muted/50 border border-transparent hover:border-border/30 flex-shrink-0 cursor-pointer relative pointer-events-auto"
@@ -624,6 +631,7 @@ export const ChatInput = memo(forwardRef<ChatInputHandles, ChatInputProps>(
                     <Database className="h-3.5 w-3.5 flex-shrink-0" />
                     <span className="text-xs font-medium">Knowledge</span>
                   </button>
+
                   <button
                     onClick={() => setAgentConfigDialog({ open: true, tab: 'triggers' })}
                     className="flex items-center gap-1.5 text-muted-foreground hover:text-foreground transition-all duration-200 px-2.5 py-1.5 rounded-lg hover:bg-muted/50 border border-transparent hover:border-border/30 flex-shrink-0 cursor-pointer relative pointer-events-auto"