diff --git a/components/app-sidebar.tsx b/components/app-sidebar.tsx
index 5b08bb5..42abf43 100644
--- a/components/app-sidebar.tsx
+++ b/components/app-sidebar.tsx
@@ -17,6 +17,7 @@ import {
 } from '@/components/ui/sidebar';
 import Link from 'next/link';
 import { Tooltip, TooltipContent, TooltipTrigger } from './ui/tooltip';
+import { ComposioIcon } from '@/components/icons';
 
 export function AppSidebar({ user }: { user: User | undefined }) {
   const router = useRouter();
@@ -35,7 +36,7 @@ export function AppSidebar({ user }: { user: User | undefined }) {
               className="flex flex-row gap-3 items-center"
             >
               <span className="text-lg font-semibold px-2 hover:bg-muted rounded-md cursor-pointer">
-                Chatbot
+                <ComposioIcon />
               </span>
             </Link>
             <Tooltip>
diff --git a/components/chat.tsx b/components/chat.tsx
index 6de6617..6a2ef8b 100644
--- a/components/chat.tsx
+++ b/components/chat.tsx
@@ -39,7 +39,7 @@ export function Chat({
 }) {
   const { mutate } = useSWRConfig();
   const { state: toolbarState } = useToolbarState();
-  
+
   // Create a ref to always have the latest toolbar state
   const toolbarStateRef = useRef(toolbarState);
   useEffect(() => {
@@ -76,7 +76,7 @@ export function Chat({
       const enabledToolkits = Array.from(
         currentToolbarState.enabledToolkitsWithStatus.entries(),
       ).map(([slug, isConnected]) => ({ slug, isConnected }));
-      
+
       return {
         id,
         message: body.messages.at(-1),
diff --git a/components/icons.tsx b/components/icons.tsx
index da76998..029116a 100644
--- a/components/icons.tsx
+++ b/components/icons.tsx
@@ -1,3 +1,5 @@
+import Image from 'next/image';
+
 export const BotIcon = () => {
   return (
     <svg
@@ -56,6 +58,29 @@ export const AttachmentIcon = () => {
   );
 };
 
+export const ComposioIcon = ({ size = 96 }) => {
+  return (
+    <div>
+      <Image
+        style={{ color: 'currentColor' }}
+        src="/assets/icons/composio-logo-light.svg"
+        alt="Composio logo"
+        width={size}
+        height={size}
+        className="block dark:hidden"
+      />
+      <Image
+        style={{ color: 'currentColor' }}
+        src="/assets/icons/composio-logo-dark.svg"
+        alt="Composio logo"
+        width={size}
+        height={size}
+        className="hidden dark:block"
+      />
+    </div>
+  );
+};
+
 export const VercelIcon = ({ size = 17 }) => {
   return (
     <svg
diff --git a/components/suggested-actions.tsx b/components/suggested-actions.tsx
index 6319bf3..1609531 100644
--- a/components/suggested-actions.tsx
+++ b/components/suggested-actions.tsx
@@ -1,14 +1,14 @@
-'use client';
+"use client";
 
-import { motion } from 'framer-motion';
-import { Button } from './ui/button';
-import { memo } from 'react';
-import type { UseChatHelpers } from '@ai-sdk/react';
-import type { VisibilityType } from './visibility-selector';
+import { motion } from "framer-motion";
+import { Button } from "./ui/button";
+import { memo } from "react";
+import type { UseChatHelpers } from "@ai-sdk/react";
+import type { VisibilityType } from "./visibility-selector";
 
 interface SuggestedActionsProps {
   chatId: string;
-  append: UseChatHelpers['append'];
+  append: UseChatHelpers["append"];
   selectedVisibilityType: VisibilityType;
 }
 
@@ -19,24 +19,24 @@ function PureSuggestedActions({
 }: SuggestedActionsProps) {
   const suggestedActions = [
     {
-      title: 'What are the advantages',
-      label: 'of using Next.js?',
-      action: 'What are the advantages of using Next.js?',
+      title: "Read my last 5 emails",
+      label: "and summarize them.",
+      action: "Read my last 5 emails and summarize them.",
     },
     {
-      title: 'Write code to',
-      label: `demonstrate djikstra's algorithm`,
-      action: `Write code to demonstrate djikstra's algorithm`,
+      title: "Star the repository `composiohq/composio`",
+      label: `on GitHub`,
+      action: `Star the repository \`composiohq/composio\` on GitHub`,
     },
     {
-      title: 'Help me write an essay',
-      label: `about silicon valley`,
-      action: `Help me write an essay about silicon valley`,
+      title: "What issues are assigned to me",
+      label: `in Linear. Order by projects.`,
+      action: `What issues are assigned to me in Linear. Order by projects.`,
     },
     {
-      title: 'Fetch my Gmail details',
-      label: 'using the Gmail tool.',
-      action: 'Fetch my Gmail details using the Gmail tool.',
+      title: "Fetch my Gmail details",
+      label: "using the Gmail tool.",
+      action: "Fetch my Gmail details using the Gmail tool.",
     },
   ];
 
@@ -52,15 +52,15 @@ function PureSuggestedActions({
           exit={{ opacity: 0, y: 20 }}
           transition={{ delay: 0.05 * index }}
           key={`suggested-action-${suggestedAction.title}-${index}`}
-          className={index > 1 ? 'hidden sm:block' : 'block'}
+          className={index > 1 ? "hidden sm:block" : "block"}
         >
           <Button
             variant="ghost"
             onClick={async () => {
-              window.history.replaceState({}, '', `/chat/${chatId}`);
+              window.history.replaceState({}, "", `/chat/${chatId}`);
 
               append({
-                role: 'user',
+                role: "user",
                 content: suggestedAction.action,
               });
             }}
diff --git a/components/toolbar.tsx b/components/toolbar.tsx
index 27614ee..edf7ee6 100644
--- a/components/toolbar.tsx
+++ b/components/toolbar.tsx
@@ -34,7 +34,14 @@ import {
   TooltipProvider,
   TooltipTrigger,
 } from '@/components/ui/tooltip';
-import { ExternalLink, Loader2, X, Wrench, Check, Trash2 } from 'lucide-react';
+import {
+  ExternalLink,
+  Loader2,
+  X,
+  LucideWrench,
+  Check,
+  Trash2,
+} from 'lucide-react';
 import { useSession } from 'next-auth/react';
 import { useToast } from '@/hooks/use-toast';
 import { useIsMobile } from '@/hooks/use-mobile';
@@ -530,10 +537,12 @@ export function ToolbarProvider({ children }: { children: React.ReactNode }) {
   // Read from cookie if available, otherwise default to open
   const getInitialState = () => {
     if (typeof window === 'undefined') return true; // Default to open on server
-    const match = document.cookie.match(new RegExp(`(^| )${TOOLBAR_COOKIE_NAME}=([^;]+)`));
+    const match = document.cookie.match(
+      new RegExp(`(^| )${TOOLBAR_COOKIE_NAME}=([^;]+)`),
+    );
     return match ? match[2] === 'true' : true; // Default to open if no cookie
   };
-  
+
   const [_open, _setOpen] = React.useState(getInitialState);
   const open = _open;
   const setOpen = React.useCallback(
@@ -722,7 +731,7 @@ function ToolbarDesktop() {
           {/* Header */}
           <div className="flex items-center justify-between p-4 border-b border-sidebar-border">
             <div className="flex items-center gap-2">
-              <Wrench className="size-4" />
+              <LucideWrench className="size-4" />
               <h2 className="text-base font-semibold">Toolkits</h2>
             </div>
             <ToolbarTrigger />
@@ -872,7 +881,7 @@ function ToolbarMobile() {
         <div className="flex size-full flex-col">
           <SheetHeader className="p-4 border-b">
             <div className="flex items-center gap-2">
-              <Wrench className="size-4" />
+              <LucideWrench className="size-4" />
               <SheetTitle className="text-base">Toolkits</SheetTitle>
             </div>
           </SheetHeader>
@@ -980,7 +989,11 @@ export function ToolBarTrigger() {
             )}
             aria-label="Toggle Toolkits"
           >
-            {open ? <X className="size-5" /> : <Wrench className="size-5" />}
+            {open ? (
+              <X className="size-5" />
+            ) : (
+              <LucideWrench className="size-5" />
+            )}
             <span className="font-medium">Toolkits</span>
             {hasEnabledTools && !open && (
               <span className="absolute -top-1 -right-1 size-3 bg-green-500 rounded-full" />
diff --git a/public/assets/icons/composio-logo-dark.svg b/public/assets/icons/composio-logo-dark.svg
new file mode 100644
index 0000000..a836fba
--- /dev/null
+++ b/public/assets/icons/composio-logo-dark.svg
@@ -0,0 +1,19 @@
+<svg width="677" height="123" viewBox="0 0 677 123" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2_396)">
+<path d="M102.18 33.85L34.5023 20.0087C30.0649 19.0977 25.8919 22.5065 25.8919 27.0322V59.0936V60.798V92.859C25.8919 97.3847 30.0649 100.794 34.5023 99.8829L102.18 86.0415" stroke="white" stroke-width="3.43015" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M49.9235 8.87123C49.9237 2.51319 56.4226 -1.73892 62.2423 0.695182L62.5192 0.816015L62.5254 0.819543L98.7302 17.5403C101.908 18.9726 103.899 22.1461 103.9 25.592V39.7567C103.9 44.9242 99.4988 49.0053 94.3571 48.6075L53.3536 45.5471V74.344L94.3508 71.2834L94.8313 71.2588C99.7553 71.1388 103.898 75.1151 103.869 80.1051V94.2698C103.869 97.7424 101.825 100.869 98.7059 102.32L98.7004 102.321L62.5263 119.012L62.5272 119.013C56.6282 121.743 49.9235 117.443 49.9235 110.962V97.4634C49.6577 97.5681 49.3731 97.6377 49.0742 97.6594L29.0653 99.0999C27.3934 99.22 25.9707 97.8951 25.9704 96.2188V81.3638C25.9705 80.7879 26.1425 80.2477 26.4379 79.7929L9.97728 81.0225H9.97114C4.84357 81.386 0.435072 77.3177 0.435059 72.1708V47.7202C0.435428 42.5512 4.83999 38.4682 9.98351 38.8695H9.98261L26.079 40.0708C26.0092 39.8222 25.9705 39.5609 25.9704 39.2911V23.6428C25.9704 21.3581 28.0142 19.6154 30.2702 19.9764L49.3229 23.0246C49.5323 23.0581 49.7328 23.1153 49.9235 23.1903V8.87123ZM94.6182 74.7039H94.6118L53.3536 77.7837V95.6878L100.44 85.8461V80.0928L100.435 79.8018C100.294 76.8093 97.6708 74.4657 94.6182 74.7039ZM25.3089 43.4532C25.5967 43.9033 25.7639 44.4367 25.764 45.0063V75.413C25.764 75.7655 25.6979 76.1031 25.5815 76.4166L49.9235 74.5998V45.2904L25.3089 43.4532ZM53.3536 42.1073L94.6118 45.1872L94.6182 45.1881L94.9108 45.2031C97.9282 45.2766 100.47 42.8343 100.47 39.7567V33.8024L53.3536 23.9533V42.1073Z" fill="white"/>
+</g>
+<path d="M645.482 102.441C626.178 102.441 614.085 89.4608 614.085 71.044C614.085 52.5164 626.178 39.5359 645.482 39.5359C664.787 39.5359 676.88 52.5164 676.88 71.044C676.88 89.4608 664.787 102.441 645.482 102.441ZM645.482 90.903C654.691 90.903 659.572 83.2479 659.572 71.044C659.572 58.7292 654.691 51.0741 645.482 51.0741C636.274 51.0741 631.392 58.7292 631.392 71.044C631.392 83.2479 636.274 90.903 645.482 90.903Z" fill="white"/>
+<path d="M607.739 32.7689H590.21V16.793H607.739V32.7689ZM607.407 101.111H590.432V40.8678H607.407V101.111Z" fill="white"/>
+<path d="M555.782 102.441C540.915 102.441 529.821 96.1174 527.713 82.9151H544.799C546.019 89.017 551.122 90.903 556.448 90.903C563.881 90.903 567.875 88.4623 567.875 84.5792C567.875 80.9181 565.434 79.1429 557.224 77.2569L546.574 74.9271C535.146 72.4863 528.934 67.161 528.934 58.1745C528.934 46.7473 540.694 39.5359 555.116 39.5359C568.762 39.5359 580.19 45.194 582.852 56.8432H565.767C564.436 53.0711 560.109 51.0741 555.227 51.0741C549.791 51.0741 545.131 53.0711 545.131 56.8432C545.131 60.2824 548.571 61.6138 554.783 62.9451L565.434 65.2749C578.082 68.0485 584.073 73.4848 584.073 83.2479C584.073 95.5627 571.869 102.441 555.782 102.441Z" fill="white"/>
+<path d="M493.572 102.441C474.268 102.441 462.175 89.4608 462.175 71.044C462.175 52.5164 474.268 39.5359 493.572 39.5359C512.877 39.5359 524.969 52.5164 524.969 71.044C524.969 89.4608 512.877 102.441 493.572 102.441ZM493.572 90.903C502.781 90.903 507.662 83.2479 507.662 71.044C507.662 58.7292 502.781 51.0741 493.572 51.0741C484.364 51.0741 479.482 58.7292 479.482 71.044C479.482 83.2479 484.364 90.903 493.572 90.903Z" fill="white"/>
+<path d="M433.747 39.5359C448.613 39.5359 458.598 52.9601 458.598 71.044C458.598 89.1279 448.613 102.441 433.747 102.441C424.427 102.441 416.994 96.7831 413.777 89.017V122.855H396.913V40.8672H413.777V54.4024C416.44 46.5254 423.207 39.5359 433.747 39.5359ZM427.201 90.903C436.409 90.903 441.291 83.2479 441.291 71.044C441.291 58.7292 436.409 51.0741 427.201 51.0741C417.993 51.0741 413.111 58.7292 413.111 71.044C413.111 83.2479 417.993 90.903 427.201 90.903Z" fill="white"/>
+<path d="M368.273 39.5359C381.808 39.5359 387.577 49.4099 387.577 62.9451V63.167V101.11H370.603V66.8281V66.6063C370.603 56.1775 367.386 51.4069 360.396 51.4069C353.407 51.4069 350.078 56.1775 350.078 66.8281V101.11H333.104V66.8281V66.6063C333.104 56.1775 329.886 51.4069 322.897 51.4069C315.908 51.4069 312.579 56.1775 312.579 66.8281V101.11H295.605V40.8672H312.468V53.182C315.353 45.7488 320.789 39.5359 330.996 39.5359C341.425 39.5359 347.194 46.5254 349.302 54.1805C351.964 46.8582 357.733 39.5359 368.273 39.5359Z" fill="white"/>
+<path d="M257.697 102.441C238.393 102.441 226.3 89.4608 226.3 71.044C226.3 52.5164 238.393 39.5359 257.697 39.5359C277.002 39.5359 289.094 52.5164 289.094 71.044C289.094 89.4608 277.002 102.441 257.697 102.441ZM257.697 90.903C266.906 90.903 271.787 83.2479 271.787 71.044C271.787 58.7292 266.906 51.0741 257.697 51.0741C248.489 51.0741 243.607 58.7292 243.607 71.044C243.607 83.2479 248.489 90.903 257.697 90.903Z" fill="white"/>
+<path d="M183.931 102.443C160.633 102.443 142.771 85.801 142.771 58.9525C142.771 32.215 160.522 15.4624 184.042 15.4624C204.012 15.4624 219.322 26.6678 223.76 45.5283H205.454C202.237 36.4308 195.802 29.3304 184.042 29.3304C170.063 29.3304 160.855 40.9796 160.855 58.9525C160.855 77.0364 170.396 88.5746 184.042 88.5746C195.136 88.5746 202.57 82.6946 206.009 72.1549H224.315C218.768 93.0124 203.568 102.443 183.931 102.443Z" fill="white"/>
+<defs>
+<clipPath id="clip0_2_396">
+<rect width="103.863" height="120.12" fill="white" transform="translate(0.435059)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/assets/icons/composio-logo-light.svg b/public/assets/icons/composio-logo-light.svg
new file mode 100644
index 0000000..d2737c0
--- /dev/null
+++ b/public/assets/icons/composio-logo-light.svg
@@ -0,0 +1,19 @@
+<svg width="677" height="123" viewBox="0 0 677 123" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2_368)">
+<path d="M101.745 33.85L34.0673 20.0087C29.6298 19.0977 25.4568 22.5065 25.4568 27.0322V59.0936V60.798V92.859C25.4568 97.3847 29.6298 100.794 34.0673 99.8829L101.745 86.0415" stroke="black" stroke-width="3.43015" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M49.4884 8.87123C49.4886 2.51319 55.9876 -1.73892 61.8072 0.695182L62.0842 0.816015L62.0903 0.819543L98.2952 17.5403C101.472 18.9726 103.464 22.1461 103.465 25.592V39.7567C103.465 44.9242 99.0638 49.0053 93.9221 48.6075L52.9185 45.5471V74.344L93.9158 71.2834L94.3962 71.2588C99.3203 71.1388 103.463 75.1151 103.434 80.1051V94.2698C103.434 97.7424 101.39 100.869 98.2708 102.32L98.2654 102.321L62.0912 119.012L62.0921 119.013C56.1931 121.743 49.4884 117.443 49.4884 110.962V97.4634C49.2226 97.5681 48.9381 97.6377 48.6391 97.6594L28.6303 99.0999C26.9584 99.22 25.5356 97.8951 25.5353 96.2188V81.3638C25.5354 80.7879 25.7074 80.2477 26.0028 79.7929L9.54222 81.0225H9.53608C4.40851 81.386 1.332e-05 77.3177 0 72.1708V47.7202C0.000369179 42.5512 4.40493 38.4682 9.54846 38.8695H9.54755L25.6439 40.0708C25.5742 39.8222 25.5354 39.5609 25.5353 39.2911V23.6428C25.5353 21.3581 27.5792 19.6154 29.8351 19.9764L48.8878 23.0246C49.0973 23.0581 49.2977 23.1153 49.4884 23.1903V8.87123ZM94.1831 74.7039H94.1768L52.9185 77.7837V95.6878L100.005 85.8461V80.0928L99.9994 79.8018C99.8586 76.8093 97.2358 74.4657 94.1831 74.7039ZM24.8739 43.4532C25.1616 43.9033 25.3289 44.4367 25.329 45.0063V75.413C25.329 75.7655 25.2629 76.1031 25.1464 76.4166L49.4884 74.5998V45.2904L24.8739 43.4532ZM52.9185 42.1073L94.1768 45.1872L94.1831 45.1881L94.4757 45.2031C97.4932 45.2766 100.035 42.8343 100.035 39.7567V33.8024L52.9185 23.9533V42.1073Z" fill="black"/>
+</g>
+<path d="M645.048 102.086C625.743 102.086 613.65 89.1053 613.65 70.6886C613.65 52.1609 625.743 39.1804 645.048 39.1804C664.352 39.1804 676.445 52.1609 676.445 70.6886C676.445 89.1053 664.352 102.086 645.048 102.086ZM645.048 90.5476C654.256 90.5476 659.138 82.8924 659.138 70.6886C659.138 58.3738 654.256 50.7186 645.048 50.7186C635.839 50.7186 630.958 58.3738 630.958 70.6886C630.958 82.8924 635.839 90.5476 645.048 90.5476Z" fill="black"/>
+<path d="M607.304 32.4135H589.775V16.4375H607.304V32.4135ZM606.972 100.755H589.997V40.5124H606.972V100.755Z" fill="black"/>
+<path d="M555.346 102.086C540.48 102.086 529.386 95.7619 527.278 82.5596H544.363C545.583 88.6615 550.687 90.5476 556.012 90.5476C563.445 90.5476 567.439 88.1068 567.439 84.2238C567.439 80.5626 564.999 78.7875 556.789 76.9014L546.138 74.5716C534.711 72.1308 528.498 66.8055 528.498 57.819C528.498 46.3918 540.258 39.1804 554.681 39.1804C568.327 39.1804 579.754 44.8386 582.417 56.4877H565.331C564 52.7156 559.673 50.7186 554.792 50.7186C549.355 50.7186 544.696 52.7156 544.696 56.4877C544.696 59.927 548.135 61.2583 554.348 62.5896L564.999 64.9195C577.646 67.6931 583.637 73.1293 583.637 82.8924C583.637 95.2072 571.433 102.086 555.346 102.086Z" fill="black"/>
+<path d="M493.137 102.086C473.833 102.086 461.74 89.1053 461.74 70.6886C461.74 52.1609 473.833 39.1804 493.137 39.1804C512.441 39.1804 524.534 52.1609 524.534 70.6886C524.534 89.1053 512.441 102.086 493.137 102.086ZM493.137 90.5476C502.346 90.5476 507.227 82.8924 507.227 70.6886C507.227 58.3738 502.346 50.7186 493.137 50.7186C483.929 50.7186 479.047 58.3738 479.047 70.6886C479.047 82.8924 483.929 90.5476 493.137 90.5476Z" fill="black"/>
+<path d="M433.312 39.1804C448.178 39.1804 458.163 52.6047 458.163 70.6886C458.163 88.7725 448.178 102.086 433.312 102.086C423.992 102.086 416.559 96.4276 413.342 88.6615V122.499H396.478V40.5117H413.342V54.0469C416.004 46.1699 422.772 39.1804 433.312 39.1804ZM426.766 90.5476C435.974 90.5476 440.856 82.8924 440.856 70.6886C440.856 58.3738 435.974 50.7186 426.766 50.7186C417.558 50.7186 412.676 58.3738 412.676 70.6886C412.676 82.8924 417.558 90.5476 426.766 90.5476Z" fill="black"/>
+<path d="M367.838 39.1804C381.374 39.1804 387.143 49.0544 387.143 62.5896V62.8115V100.754H370.168V66.4727V66.2508C370.168 55.822 366.951 51.0514 359.961 51.0514C352.972 51.0514 349.644 55.822 349.644 66.4727V100.754H332.669V66.4727V66.2508C332.669 55.822 329.452 51.0514 322.462 51.0514C315.473 51.0514 312.144 55.822 312.144 66.4727V100.754H295.17V40.5117H312.033V52.8265C314.918 45.3933 320.354 39.1804 330.561 39.1804C340.99 39.1804 346.759 46.1699 348.867 53.825C351.53 46.5027 357.299 39.1804 367.838 39.1804Z" fill="black"/>
+<path d="M257.262 102.086C237.958 102.086 225.865 89.1053 225.865 70.6886C225.865 52.1609 237.958 39.1804 257.262 39.1804C276.566 39.1804 288.659 52.1609 288.659 70.6886C288.659 89.1053 276.566 102.086 257.262 102.086ZM257.262 90.5476C266.47 90.5476 271.352 82.8924 271.352 70.6886C271.352 58.3738 266.47 50.7186 257.262 50.7186C248.054 50.7186 243.172 58.3738 243.172 70.6886C243.172 82.8924 248.054 90.5476 257.262 90.5476Z" fill="black"/>
+<path d="M183.496 102.087C160.198 102.087 142.336 85.4455 142.336 58.597C142.336 31.8595 160.087 15.1069 183.607 15.1069C203.577 15.1069 218.887 26.3123 223.325 45.1728H205.019C201.802 36.0754 195.367 28.975 183.607 28.975C169.628 28.975 160.419 40.6241 160.419 58.597C160.419 76.6809 169.961 88.2191 183.607 88.2191C194.701 88.2191 202.134 82.3391 205.574 71.7994H223.88C218.332 92.6569 203.133 102.087 183.496 102.087Z" fill="black"/>
+<defs>
+<clipPath id="clip0_2_368">
+<rect width="103.863" height="120.12" fill="white"/>
+</clipPath>
+</defs>
+</svg>