diff --git a/package.json b/package.json
index cf175dd..9048319 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
         "@ai-sdk/google": "^2.0.19",
         "@ai-sdk/mistral": "^2.0.17",
         "@ai-sdk/openai": "^2.0.44",
-        "@jupyter/chat": "^0.18.2",
+        "@jupyter/chat": "^0.19.0-alpha.2",
         "@jupyterlab/application": "^4.0.0",
         "@jupyterlab/apputils": "^4.5.6",
         "@jupyterlab/cells": "^4.4.6",
diff --git a/src/components/clear-button.tsx b/src/components/clear-button.tsx
index 9a7a929..2f63621 100644
--- a/src/components/clear-button.tsx
+++ b/src/components/clear-button.tsx
@@ -1,4 +1,4 @@
-import { InputToolbarRegistry, TooltippedButton } from '@jupyter/chat';
+import { InputToolbarRegistry, TooltippedIconButton } from '@jupyter/chat';
 
 import ClearIcon from '@mui/icons-material/Clear';
 
@@ -23,18 +23,15 @@ export interface IClearButtonProps
 export function ClearButton(props: IClearButtonProps): JSX.Element {
   const tooltip = 'Clear chat';
   return (
-    <TooltippedButton
+    <TooltippedIconButton
       onClick={props.clearMessages}
       tooltip={tooltip}
-      buttonProps={{
-        size: 'small',
-        variant: 'outlined',
-        color: 'secondary',
+      iconButtonProps={{
         title: tooltip
       }}
     >
       <ClearIcon />
-    </TooltippedButton>
+    </TooltippedIconButton>
   );
 }
 
diff --git a/src/components/model-select.tsx b/src/components/model-select.tsx
index da57263..c2e0521 100644
--- a/src/components/model-select.tsx
+++ b/src/components/model-select.tsx
@@ -101,7 +101,6 @@ export function ModelSelect(props: IModelSelectProps): JSX.Element {
         onClick={() => {}}
         tooltip="No providers configured. Please go to AI Settings to add a provider."
         buttonProps={{
-          size: 'small',
           variant: 'outlined',
           color: 'warning',
           disabled: true,
@@ -109,9 +108,9 @@ export function ModelSelect(props: IModelSelectProps): JSX.Element {
         }}
         sx={{
           minWidth: 'auto',
+          width: 'unset',
           display: 'flex',
-          alignItems: 'center',
-          height: '29px'
+          alignItems: 'center'
         }}
       >
         <Typography
@@ -132,9 +131,6 @@ export function ModelSelect(props: IModelSelectProps): JSX.Element {
         }}
         tooltip={`Current Model: ${currentProviderLabel} - ${currentModel}`}
         buttonProps={{
-          size: 'small',
-          variant: 'contained',
-          color: 'primary',
           title: 'Select AI Model',
           onKeyDown: e => {
             if (e.key !== 'Enter' && e.key !== ' ') {
@@ -147,9 +143,9 @@ export function ModelSelect(props: IModelSelectProps): JSX.Element {
         }}
         sx={{
           minWidth: 'auto',
+          width: 'unset',
           display: 'flex',
-          alignItems: 'center',
-          height: '29px'
+          alignItems: 'center'
         }}
       >
         <Typography
diff --git a/src/components/tool-select.tsx b/src/components/tool-select.tsx
index 24d92b9..500bb76 100644
--- a/src/components/tool-select.tsx
+++ b/src/components/tool-select.tsx
@@ -107,13 +107,13 @@ export function ToolSelect(props: IToolSelectProps): JSX.Element {
 
   return (
     <>
+      {/* TODO: replace it with a TooltippedIconButton when the onClick is fixed */}
       <TooltippedButton
         onClick={e => {
           openMenu(e.currentTarget);
         }}
         tooltip={`Tools (${selectedToolNames.length}/${tools.length} selected)`}
         buttonProps={{
-          size: 'small',
           variant: selectedToolNames.length > 0 ? 'contained' : 'outlined',
           color: 'primary',
           title: 'Select AI Tools',
@@ -132,7 +132,7 @@ export function ToolSelect(props: IToolSelectProps): JSX.Element {
             : {}
         }
       >
-        <BuildIcon />
+        <BuildIcon sx={{ fontSize: 'small' }} />
       </TooltippedButton>
 
       <Menu
diff --git a/yarn.lock b/yarn.lock
index 96f4f07..2d49f6f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2234,9 +2234,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jupyter/chat@npm:^0.18.2":
-  version: 0.18.2
-  resolution: "@jupyter/chat@npm:0.18.2"
+"@jupyter/chat@npm:^0.19.0-alpha.2":
+  version: 0.19.0-alpha.2
+  resolution: "@jupyter/chat@npm:0.19.0-alpha.2"
   dependencies:
     "@emotion/react": ^11.10.5
     "@emotion/styled": ^11.10.5
@@ -2262,7 +2262,7 @@ __metadata:
     clsx: ^2.1.0
     react: ^18.2.0
     react-dom: ^18.2.0
-  checksum: eb345e4404e1d9ade075608238ef96e7ff1f260e817dbe9ed65cdbfb75498f9754ae774ca996f76357020f23b5c514634d058f6e23bf5abdf961dbce76dd2bd9
+  checksum: 9c5d7cd6b2a29944587906e28085cb01dd82e45185b4020474d1eef6386f1bbd6e167439053d6e6281341609f0cfde7efdbb992097cfeb3c61468642995a7bbd
   languageName: node
   linkType: hard
 
@@ -3019,7 +3019,7 @@ __metadata:
     "@ai-sdk/google": ^2.0.19
     "@ai-sdk/mistral": ^2.0.17
     "@ai-sdk/openai": ^2.0.44
-    "@jupyter/chat": ^0.18.2
+    "@jupyter/chat": ^0.19.0-alpha.2
     "@jupyterlab/application": ^4.0.0
     "@jupyterlab/apputils": ^4.5.6
     "@jupyterlab/builder": ^4.0.0