diff --git a/packages/cozy-search/package.json b/packages/cozy-search/package.json
index 2f063e15e5..eef45a9e98 100644
--- a/packages/cozy-search/package.json
+++ b/packages/cozy-search/package.json
@@ -11,11 +11,8 @@
   },
   "dependencies": {
     "@assistant-ui/react": "^0.12.5",
-    "class-variance-authority": "^0.7.1",
     "classnames": "^2.5.1",
-    "clsx": "^2.1.1",
     "lodash": "^4.17.21",
-    "lucide-react": "^0.563.0",
     "mime-types": "2.1.35",
     "react-type-animation": "3.2.0",
     "rooks": "7.14.1"
@@ -86,7 +83,7 @@
     "directory": "packages/cozy-search"
   },
   "scripts": {
-    "build": "yarn build:clean && yarn build:types && babel --extensions .ts,.tsx,.js,.jsx --ignore '**/*.spec.tsx','**/*.spec.ts','**/*.d.ts' ./src -d ./dist --copy-files",
+    "build": "yarn build:clean && yarn build:types && babel --extensions .ts,.tsx,.js,.jsx --ignore '**/*.spec.tsx','**/*.spec.ts','**/*.spec.js','**/*.spec.jsx','**/*.d.ts' ./src -d ./dist --copy-files",
     "build:clean": "rm -rf ./dist",
     "build:types": "tsc -p tsconfig-build.json",
     "build:watch": "yarn build --watch",
diff --git a/packages/cozy-search/src/actions/delete.jsx b/packages/cozy-search/src/actions/delete.jsx
index b93d32a022..624977d84f 100644
--- a/packages/cozy-search/src/actions/delete.jsx
+++ b/packages/cozy-search/src/actions/delete.jsx
@@ -34,7 +34,7 @@ export const remove = ({ t }) => {
     Component: makeComponent(label, icon),
     displayCondition: () => true,
     action: () => {
-      // TO DO: Add action to remove
+      // TO DO: Add action to remove due to this action does not exist yet in backend, we will implement it later
     }
   }
 }
diff --git a/packages/cozy-search/src/actions/rename.jsx b/packages/cozy-search/src/actions/rename.jsx
index e828fe68c5..2fb831a711 100644
--- a/packages/cozy-search/src/actions/rename.jsx
+++ b/packages/cozy-search/src/actions/rename.jsx
@@ -34,7 +34,7 @@ export const rename = ({ t }) => {
     Component: makeComponent(label, icon),
     displayCondition: () => true,
     action: () => {
-      // TO DO: Add action to remove
+      // TO DO: Add action to rename due to this action does not exist yet in backend, we will implement it later
     }
   }
 }
diff --git a/packages/cozy-search/src/actions/share.jsx b/packages/cozy-search/src/actions/share.jsx
index 409f6db032..5970d029c9 100644
--- a/packages/cozy-search/src/actions/share.jsx
+++ b/packages/cozy-search/src/actions/share.jsx
@@ -34,7 +34,7 @@ export const share = ({ t }) => {
     Component: makeComponent(label, icon),
     displayCondition: () => true,
     action: () => {
-      // TO DO: Add action to remove
+      // TO DO: Add action to share due to this action does not exist yet in backend, we will implement it later
     }
   }
 }
diff --git a/packages/cozy-search/src/components/Assistant/AssistantAvatar.jsx b/packages/cozy-search/src/components/Assistant/AssistantAvatar.jsx
index 14a5194876..ba625cd779 100644
--- a/packages/cozy-search/src/components/Assistant/AssistantAvatar.jsx
+++ b/packages/cozy-search/src/components/Assistant/AssistantAvatar.jsx
@@ -9,7 +9,7 @@ import styles from './styles.styl'
 import { DEFAULT_ASSISTANT } from '../constants'
 
 const AssistantAvatar = ({ assistant, isSmall, className }) => {
-  if (!assistant) return
+  if (!assistant) return null
 
   if (assistant.id !== DEFAULT_ASSISTANT.id && !assistant.icon) {
     return (
diff --git a/packages/cozy-search/src/components/Assistant/AssistantContainer.jsx b/packages/cozy-search/src/components/Assistant/AssistantContainer.jsx
index 98691be725..a0c620784c 100644
--- a/packages/cozy-search/src/components/Assistant/AssistantContainer.jsx
+++ b/packages/cozy-search/src/components/Assistant/AssistantContainer.jsx
@@ -2,13 +2,13 @@ import cx from 'classnames'
 import React from 'react'
 
 import flag from 'cozy-flags'
-import Divider from 'cozy-ui/transpiled/react/Divider'
+import { useCozyTheme } from 'cozy-ui-plus/dist/providers/CozyTheme'
 
 import { useAssistant } from '../AssistantProvider'
 import styles from './styles.styl'
 import PrettyScrollbar from '../Containers/PrettyScrollbar'
 import Conversation from '../Conversations/Conversation'
-import CozyAssistantRuntimeProvider from '../CozyAssistantRuntimeProvider'
+import CozyAssistantRuntimeProviderWithErrorBoundary from '../CozyAssistantRuntimeProvider'
 import SearchConversation from '../Search/SearchConversation'
 import Sidebar from '../Sidebar'
 import TwakeKnowledgePanel from '../TwakeKnowledges/TwakeKnowledgePanel'
@@ -19,6 +19,7 @@ const AssistantContainer = () => {
     openedKnowledgePanel,
     setOpenedKnowledgePanel
   } = useAssistant()
+  const { type: theme } = useCozyTheme()
 
   return (
     <div
@@ -27,23 +28,26 @@ const AssistantContainer = () => {
         styles['assistant-container']
       )}
     >
-      <Sidebar className="u-w-5 u-pb-1 u-bg-white" />
+      <Sidebar className="u-w-5 u-pb-0-t u-pb-1" />
 
-      <Divider orientation="vertical" flexItem />
-
-      <PrettyScrollbar className="u-flex-auto u-flex u-flex-column u-pb-1 u-ov-hidden u-bg-white">
+      <PrettyScrollbar className="u-flex-auto u-flex u-flex-column u-pb-0-t u-pb-1 u-ov-hidden">
         {isOpenSearchConversation &&
         flag('cozy.search-conversation.enabled') ? (
           <SearchConversation />
         ) : (
-          <CozyAssistantRuntimeProvider>
+          <CozyAssistantRuntimeProviderWithErrorBoundary>
             <Conversation />
-          </CozyAssistantRuntimeProvider>
+          </CozyAssistantRuntimeProviderWithErrorBoundary>
         )}
       </PrettyScrollbar>
 
       {openedKnowledgePanel && flag('cozy.source-knowledge.enabled') && (
-        <div className="u-ml-half u-h-100 u-maw-7">
+        <div
+          className={cx(
+            'u-h-100 u-maw-7 u-pl-half',
+            styles[`knowledge-panel--${theme}`]
+          )}
+        >
           <TwakeKnowledgePanel
             onClose={() => setOpenedKnowledgePanel(undefined)}
           />
diff --git a/packages/cozy-search/src/components/Assistant/AssistantSelection.jsx b/packages/cozy-search/src/components/Assistant/AssistantSelection.jsx
index faa34f0c98..6c9cf9f7ee 100644
--- a/packages/cozy-search/src/components/Assistant/AssistantSelection.jsx
+++ b/packages/cozy-search/src/components/Assistant/AssistantSelection.jsx
@@ -1,13 +1,16 @@
 import cx from 'classnames'
-import React, { useState, useRef } from 'react'
+import React, { useState, useRef, useEffect } from 'react'
+import { useI18n } from 'twake-i18n'
 
 import { useQuery } from 'cozy-client'
 import ActionsMenu from 'cozy-ui/transpiled/react/ActionsMenu'
 import ActionsMenuItem from 'cozy-ui/transpiled/react/ActionsMenu/ActionsMenuItem'
 import Chips from 'cozy-ui/transpiled/react/Chips'
 import Icon from 'cozy-ui/transpiled/react/Icon'
+import DropdownIcon from 'cozy-ui/transpiled/react/Icons/Dropdown'
 import PlusIcon from 'cozy-ui/transpiled/react/Icons/Plus'
 import Typography from 'cozy-ui/transpiled/react/Typography'
+import { useBreakpoints } from 'cozy-ui/transpiled/react/providers/Breakpoints'
 
 import styles from './styles.styl'
 import { useAssistant } from '../AssistantProvider'
@@ -16,7 +19,9 @@ import { buildAssistantsQuery } from '../queries'
 import AssistantAvatar from './AssistantAvatar'
 import AssistantSelectionItem from './AssistantSelectionItem'
 
-const AssistantSelection = ({ className }) => {
+const AssistantSelection = ({ className, disabled }) => {
+  const { t } = useI18n()
+  const { isMobile } = useBreakpoints()
   const buttonRef = useRef(null)
   const [open, setOpen] = useState(false)
   const {
@@ -28,11 +33,18 @@ const AssistantSelection = ({ className }) => {
     setSelectedAssistantId
   } = useAssistant()
 
+  useEffect(() => {
+    if (disabled) {
+      setOpen(false)
+    }
+  }, [disabled])
+
   const assistantsQuery = buildAssistantsQuery()
   const assistants =
     useQuery(assistantsQuery.definition, assistantsQuery.options)?.data || []
 
   const handleClick = () => {
+    if (disabled) return
     setOpen(true)
   }
 
@@ -60,9 +72,16 @@ const AssistantSelection = ({ className }) => {
               assistant={selectedAssistant}
             />
           }
-          label={selectedAssistant.name}
+          label={
+            isMobile ? (
+              <Icon className={styles['dropdown-icon']} icon={DropdownIcon} />
+            ) : (
+              selectedAssistant.name
+            )
+          }
           clickable
           onClick={handleClick}
+          disabled={disabled}
         />
       </div>
       {open && (
@@ -101,7 +120,9 @@ const AssistantSelection = ({ className }) => {
           >
             <div className="u-flex u-flex-items-center">
               <Icon icon={PlusIcon} className={styles['create-icon']} />
-              <Typography variant="body1">Create Assistant</Typography>
+              <Typography variant="body1">
+                {t('assistant_create.title')}
+              </Typography>
             </div>
           </ActionsMenuItem>
         </ActionsMenu>
diff --git a/packages/cozy-search/src/components/Assistant/AssistantSelectionItem.jsx b/packages/cozy-search/src/components/Assistant/AssistantSelectionItem.jsx
index 877016e281..c437b0e38f 100644
--- a/packages/cozy-search/src/components/Assistant/AssistantSelectionItem.jsx
+++ b/packages/cozy-search/src/components/Assistant/AssistantSelectionItem.jsx
@@ -1,12 +1,15 @@
-import React from 'react'
+import cx from 'classnames'
+import React, { useMemo } from 'react'
 
 import ActionsMenuItem from 'cozy-ui/transpiled/react/ActionsMenu/ActionsMenuItem'
+import Badge from 'cozy-ui/transpiled/react/Badge'
 import Icon from 'cozy-ui/transpiled/react/Icon'
 import IconButton from 'cozy-ui/transpiled/react/IconButton'
 import CheckIcon from 'cozy-ui/transpiled/react/Icons/Check'
 import PenIcon from 'cozy-ui/transpiled/react/Icons/Pen'
 import TrashIcon from 'cozy-ui/transpiled/react/Icons/Trash'
 import Typography from 'cozy-ui/transpiled/react/Typography'
+import { useBreakpoints } from 'cozy-ui/transpiled/react/providers/Breakpoints'
 
 import styles from './styles.styl'
 import AssistantAvatar from '../Assistant/AssistantAvatar'
@@ -21,6 +24,8 @@ const AssistantSelectionItem = ({
   setIsOpenEditAssistant,
   disableActions = false
 }) => {
+  const { isMobile } = useBreakpoints()
+
   const handleSelect = assistant => {
     onSelect(assistant)
     onClose()
@@ -40,17 +45,43 @@ const AssistantSelectionItem = ({
     e.stopPropagation()
   }
 
+  const isSelected = useMemo(
+    () => selectedAssistant?.id === assistant.id,
+    [selectedAssistant?.id, assistant.id]
+  )
+
   return (
     <ActionsMenuItem
       onClick={() => handleSelect(assistant)}
       className={styles['menu-item']}
     >
       <div className="u-flex u-flex-items-center">
-        <AssistantAvatar assistant={assistant} />
+        {isMobile && isSelected ? (
+          <Badge
+            badgeContent={
+              <Icon
+                icon={CheckIcon}
+                size={10}
+                className={styles['selected-item--mobile']}
+              />
+            }
+            variant="standard"
+            size="small"
+            anchorOrigin={{
+              vertical: 'bottom',
+              horizontal: 'right'
+            }}
+            overlap="circular"
+          >
+            <AssistantAvatar assistant={assistant} />
+          </Badge>
+        ) : (
+          <AssistantAvatar assistant={assistant} />
+        )}
         <Typography variant="body1">{assistant.name}</Typography>
       </div>
       <div className="u-flex u-flex-items-center u-flex-justify-between">
-        {selectedAssistant?.id === assistant.id && (
+        {isSelected && !isMobile && (
           <Icon icon={CheckIcon} className="u-success" />
         )}
         {!disableActions && (
@@ -58,7 +89,11 @@ const AssistantSelectionItem = ({
             <IconButton
               aria-label="Edit assistant"
               size="small"
-              className={styles['menu-item-icon-button']}
+              className={cx({
+                [styles['menu-item-icon-button']]:
+                  !isMobile || (!isSelected && isMobile),
+                'u-db': isSelected && isMobile
+              })}
               onClick={handleEdit}
             >
               <Icon icon={PenIcon} color="var(--primaryColor)" />
@@ -66,7 +101,11 @@ const AssistantSelectionItem = ({
             <IconButton
               aria-label="Delete assistant"
               size="small"
-              className={styles['menu-item-icon-button']}
+              className={cx({
+                [styles['menu-item-icon-button']]:
+                  !isMobile || (!isSelected && isMobile),
+                'u-db': isSelected && isMobile
+              })}
               onClick={handleDelete}
             >
               <Icon icon={TrashIcon} className="u-error" />
diff --git a/packages/cozy-search/src/components/Assistant/styles.styl b/packages/cozy-search/src/components/Assistant/styles.styl
index 7e6efedb85..ad7072d5ca 100644
--- a/packages/cozy-search/src/components/Assistant/styles.styl
+++ b/packages/cozy-search/src/components/Assistant/styles.styl
@@ -1,6 +1,13 @@
 .assistant-container
   z-index 1
 
+  .knowledge-panel
+    &--light
+      background-color var(--primaryBackgroundLight)
+
+    &--dark
+      background-color var(--greyA400)
+
 .trigger-button
   border-radius 20px
   padding 4px 12px
@@ -36,4 +43,13 @@
   display none !important
 
 .create-icon
-  margin-right 8px
+  margin-right 0.5rem
+
+.dropdown-icon
+  margin-top 0.25rem
+
+.selected-item--mobile
+  padding 1px
+  border-radius 100%
+  color var(--white)
+  background-color var(--malachite)
diff --git a/packages/cozy-search/src/components/AssistantProvider.d.ts b/packages/cozy-search/src/components/AssistantProvider.d.ts
new file mode 100644
index 0000000000..2fa4653be1
--- /dev/null
+++ b/packages/cozy-search/src/components/AssistantProvider.d.ts
@@ -0,0 +1,43 @@
+import React from 'react'
+
+export interface AssistantState {
+  message: Record<string, string>
+  status: 'idle' | 'writing' | 'pending'
+  messagesId: string[]
+}
+
+export interface TwakeKnowledgeState {
+  drive: { id: string; name: string }[]
+  mail: { id: string; name: string }[]
+  chat: { id: string; name: string }[]
+}
+
+export interface AssistantContextValue {
+  assistantState: AssistantState
+  isOpenCreateAssistant: boolean
+  isOpenDeleteAssistant: boolean
+  isOpenEditAssistant: boolean
+  assistantIdInAction: string | null
+  selectedAssistantId: string
+  isOpenSearchConversation: boolean
+  openedKnowledgePanel: string | null
+  selectedTwakeKnowledge: TwakeKnowledgeState
+  setAssistantIdInAction: (id: string | null) => void
+  setIsOpenDeleteAssistant: (isOpen: boolean) => void
+  setAssistantState: React.Dispatch<React.SetStateAction<AssistantState>>
+  clearAssistant: () => void
+  onAssistantExecute: (
+    params: { value: string; conversationId: string },
+    callback?: () => void
+  ) => Promise<void>
+  setIsOpenCreateAssistant: (isOpen: boolean) => void
+  setIsOpenEditAssistant: (isOpen: boolean) => void
+  setSelectedAssistantId: (id: string) => void
+  setIsOpenSearchConversation: (isOpen: boolean) => void
+  setOpenedKnowledgePanel: (panel: string | null) => void
+  setSelectedTwakeKnowledge: React.Dispatch<
+    React.SetStateAction<TwakeKnowledgeState>
+  >
+}
+
+export function useAssistant(): AssistantContextValue
diff --git a/packages/cozy-search/src/components/AssistantProvider.jsx b/packages/cozy-search/src/components/AssistantProvider.jsx
index 525db3f8b8..d13663e70d 100644
--- a/packages/cozy-search/src/components/AssistantProvider.jsx
+++ b/packages/cozy-search/src/components/AssistantProvider.jsx
@@ -11,6 +11,9 @@ import { CHAT_EVENTS_DOCTYPE, CHAT_CONVERSATIONS_DOCTYPE } from './queries'
 
 export const AssistantContext = React.createContext()
 
+/**
+ * @returns {import('./AssistantProvider').AssistantContextValue}
+ */
 export const useAssistant = () => {
   const context = useContext(AssistantContext)
 
diff --git a/packages/cozy-search/src/components/Conversations/ConversationBar.jsx b/packages/cozy-search/src/components/Conversations/ConversationBar.jsx
index 6be732dc40..b894a71975 100644
--- a/packages/cozy-search/src/components/Conversations/ConversationBar.jsx
+++ b/packages/cozy-search/src/components/Conversations/ConversationBar.jsx
@@ -1,4 +1,5 @@
 import { ComposerPrimitive } from '@assistant-ui/react'
+import cx from 'classnames'
 import React, { useRef } from 'react'
 import { useI18n } from 'twake-i18n'
 
@@ -19,7 +20,8 @@ const ConversationBar = ({
   isRunning,
   onKeyDown,
   onSend,
-  onCancel
+  onCancel,
+  ...props
 }) => {
   const { t } = useI18n()
   const { isMobile } = useBreakpoints()
@@ -51,7 +53,10 @@ const ConversationBar = ({
   return (
     <div className="u-w-100 u-maw-7 u-mh-auto">
       <SearchBar
-        className={styles['conversationBar']}
+        {...props}
+        className={cx(styles['conversationBar'], {
+          [styles['conversationBar--mobile']]: isMobile
+        })}
         icon={null}
         size="auto"
         placeholder={t('assistant.search.placeholder')}
diff --git a/packages/cozy-search/src/components/Conversations/ConversationComposer.jsx b/packages/cozy-search/src/components/Conversations/ConversationComposer.jsx
index ffbbeaee40..86eba09cba 100644
--- a/packages/cozy-search/src/components/Conversations/ConversationComposer.jsx
+++ b/packages/cozy-search/src/components/Conversations/ConversationComposer.jsx
@@ -4,6 +4,7 @@ import {
   useThread,
   useComposer
 } from '@assistant-ui/react'
+import cx from 'classnames'
 import React, { useCallback } from 'react'
 
 import flag from 'cozy-flags'
@@ -18,6 +19,7 @@ const ConversationComposer = () => {
   const { isMobile } = useBreakpoints()
   const composerRuntime = useComposerRuntime()
   const isRunning = useThread(state => state.isRunning)
+  const isThreadEmpty = useThread(state => state.messages.length === 0)
   const { setOpenedKnowledgePanel } = useAssistant()
 
   const value = useComposer(state => state.text)
@@ -48,8 +50,14 @@ const ConversationComposer = () => {
   )
 
   return (
-    <ComposerPrimitive.Root className="u-w-100 u-maw-7 u-mh-auto">
+    <ComposerPrimitive.Root
+      className={cx('u-w-100 u-maw-7 u-mh-auto', {
+        'u-card u-bxz u-elevation-1': isMobile
+      })}
+    >
       <ConversationBar
+        elevation={isMobile ? 0 : 1}
+        disabledHover={!!isMobile}
         value={value}
         isEmpty={isEmpty}
         isRunning={isRunning}
@@ -59,7 +67,9 @@ const ConversationComposer = () => {
       />
 
       <div className="u-flex u-flex-items-center u-flex-justify-between u-mt-1">
-        {flag('cozy.create-assistant.enabled') && <AssistantSelection />}
+        {flag('cozy.create-assistant.enabled') && (
+          <AssistantSelection disabled={!isThreadEmpty} />
+        )}
         {flag('cozy.source-knowledge.enabled') && (
           <TwakeKnowledgeSelector
             onSelectTwakeKnowledge={setOpenedKnowledgePanel}
diff --git a/packages/cozy-search/src/components/Conversations/ConversationListItem.jsx b/packages/cozy-search/src/components/Conversations/ConversationListItem.jsx
index a4ad45cb05..83618edcab 100644
--- a/packages/cozy-search/src/components/Conversations/ConversationListItem.jsx
+++ b/packages/cozy-search/src/components/Conversations/ConversationListItem.jsx
@@ -3,14 +3,14 @@ import React from 'react'
 import { useI18n } from 'twake-i18n'
 
 import flag from 'cozy-flags'
-import Icon from 'cozy-ui/transpiled/react/Icon'
-import AssistantIcon from 'cozy-ui/transpiled/react/Icons/Assistant'
 import ListItem from 'cozy-ui/transpiled/react/ListItem'
 import ListItemText from 'cozy-ui/transpiled/react/ListItemText'
 import Typography from 'cozy-ui/transpiled/react/Typography'
+import { useCozyTheme } from 'cozy-ui-plus/dist/providers/CozyTheme'
 
 import ConversationActions from './ConversationActions'
 import styles from './styles.styl'
+import AssistantAvatar from '../Assistant/AssistantAvatar'
 import {
   formatConversationDate,
   getDescriptionOfConversation,
@@ -23,6 +23,7 @@ const ConversationListItem = ({
   onOpenConversation
 }) => {
   const { t, lang } = useI18n()
+  const { type: theme } = useCozyTheme()
 
   return (
     <ListItem
@@ -32,7 +33,7 @@ const ConversationListItem = ({
         'u-bdrs-4 u-ov-hidden u-mb-half',
         styles['conversation-list-item'],
         {
-          [styles['conversation-list-item--selected']]: selected
+          [styles[`conversation-list-item--selected--${theme}`]]: selected
         }
       )}
       selected={selected}
@@ -62,7 +63,11 @@ const ConversationListItem = ({
               variant="h6"
               className="u-flex u-flex-items-center u-coolGrey"
             >
-              <Icon icon={AssistantIcon} className="u-mr-half" />
+              <AssistantAvatar
+                assistant={conversation.assistant}
+                className="u-mr-half"
+                isSmall
+              />
               {formatConversationDate(
                 conversation.cozyMetadata?.updatedAt,
                 t,
diff --git a/packages/cozy-search/src/components/Conversations/ConversationListItemWider.jsx b/packages/cozy-search/src/components/Conversations/ConversationListItemWider.jsx
index b330c60896..7d79745882 100644
--- a/packages/cozy-search/src/components/Conversations/ConversationListItemWider.jsx
+++ b/packages/cozy-search/src/components/Conversations/ConversationListItemWider.jsx
@@ -3,15 +3,15 @@ import React from 'react'
 import { useI18n } from 'twake-i18n'
 
 import flag from 'cozy-flags'
-import Icon from 'cozy-ui/transpiled/react/Icon'
-import ImageIcon from 'cozy-ui/transpiled/react/Icons/Image'
 import ListItem from 'cozy-ui/transpiled/react/ListItem'
 import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon'
 import ListItemText from 'cozy-ui/transpiled/react/ListItemText'
 import Typography from 'cozy-ui/transpiled/react/Typography'
+import { useCozyTheme } from 'cozy-ui-plus/dist/providers/CozyTheme'
 
 import ConversationActions from './ConversationActions'
 import styles from './styles.styl'
+import AssistantAvatar from '../Assistant/AssistantAvatar'
 import {
   formatConversationDate,
   getDescriptionOfConversation,
@@ -26,6 +26,7 @@ const ConversationListItemWider = ({
   onOpenConversation
 }) => {
   const { t, lang } = useI18n()
+  const { type: theme } = useCozyTheme()
 
   return (
     <ListItem
@@ -34,12 +35,19 @@ const ConversationListItemWider = ({
       onClick={() => onOpenConversation(conversation._id)}
       className={cx(
         'u-bdrs-0 u-ov-hidden u-flex u-flex-items-center u-flex-justify-between u-w-100',
-        styles['conversation-list-item']
+        styles['conversation-list-item'],
+        {
+          [styles[`conversation-list-item--selected--${theme}`]]: selected
+        }
       )}
       selected={selected}
     >
       <ListItemIcon>
-        <Icon icon={ImageIcon} />
+        <AssistantAvatar
+          assistant={conversation.assistant}
+          className="u-mr-half"
+          isSmall
+        />
       </ListItemIcon>
       <ListItemText
         primary={
diff --git a/packages/cozy-search/src/components/Conversations/styles.styl b/packages/cozy-search/src/components/Conversations/styles.styl
index 1da5d74794..f6c3e80ea2 100644
--- a/packages/cozy-search/src/components/Conversations/styles.styl
+++ b/packages/cozy-search/src/components/Conversations/styles.styl
@@ -8,6 +8,12 @@
     +gt-mobile()
       max-height 178px
 
+    &--mobile
+      border 0
+      background-color transparent !important
+      border-color transparent !important
+
+
 .conversationBar-input
   max-height 80px
 
@@ -91,4 +97,8 @@
     right 12px
 
   &--selected
-    background var(--grey100) !important
+    &--light
+      background var(--grey100) !important
+
+    &--dark
+      background var(--grey900) !important
diff --git a/packages/cozy-search/src/components/CozyAssistantRuntimeProvider.tsx b/packages/cozy-search/src/components/CozyAssistantRuntimeProvider.tsx
index 9621c9aa82..60689f00a4 100644
--- a/packages/cozy-search/src/components/CozyAssistantRuntimeProvider.tsx
+++ b/packages/cozy-search/src/components/CozyAssistantRuntimeProvider.tsx
@@ -23,8 +23,11 @@ import { useParams } from 'react-router-dom'
 import { useI18n } from 'twake-i18n'
 
 import { useClient, useQuery, isQueryLoading } from 'cozy-client'
+import Minilog from 'cozy-minilog'
 import useRealtime from 'cozy-realtime/dist/useRealtime'
+import Button from 'cozy-ui/transpiled/react/Buttons'
 import Spinner from 'cozy-ui/transpiled/react/Spinner'
+import Typography from 'cozy-ui/transpiled/react/Typography'
 
 import { createCozyRealtimeChatAdapter } from './adapters/CozyRealtimeChatAdapter'
 import { StreamBridge } from './adapters/StreamBridge'
@@ -34,6 +37,10 @@ import {
   CHAT_CONVERSATIONS_DOCTYPE,
   buildChatConversationQueryById
 } from './queries'
+import { useAssistant } from './AssistantProvider'
+import { DEFAULT_ASSISTANT } from './constants'
+
+const log = Minilog('🔍 [CozyAssistantRuntimeProvider]')
 
 interface ConversationMessage {
   id: string
@@ -45,6 +52,13 @@ interface ConversationMessage {
 interface Conversation {
   _id: string
   messages?: ConversationMessage[]
+  relationships?: {
+    assistant?: {
+      data: {
+        _id: string
+      }
+    }
+  }
 }
 
 interface CozyAssistantRuntimeProviderProps {
@@ -73,6 +87,7 @@ const ConversationLoader = ({
 }: CozyAssistantRuntimeProviderProps & {
   conversationId: string
 }): JSX.Element | null => {
+  const { setSelectedAssistantId } = useAssistant()
   const conversationQuery = buildChatConversationQueryById(conversationId)
   const queryResult = useQuery(
     conversationQuery.definition,
@@ -86,6 +101,15 @@ const ConversationLoader = ({
     [conversation?.messages]
   )
 
+  useEffect(() => {
+    setSelectedAssistantId(
+      conversation?.relationships?.assistant?.data?._id || DEFAULT_ASSISTANT.id
+    )
+  }, [
+    conversation?.relationships?.assistant?.data?._id,
+    setSelectedAssistantId
+  ])
+
   if (isLoading) {
     return (
       <div className="u-flex u-flex-items-center u-flex-justify-center u-h-100 u-w-100">
@@ -119,6 +143,7 @@ const CozyAssistantRuntimeProviderInner = ({
   const messagesIdRef = useRef<string[]>([])
   const cancelledMessageIdsRef = useRef<Set<string>>(new Set())
   const currentStreamingMessageIdRef = useRef<string | null>(null)
+  const { selectedAssistantId } = useAssistant()
 
   useEffect(() => {
     messagesIdRef.current = initialMessages
@@ -128,35 +153,45 @@ const CozyAssistantRuntimeProviderInner = ({
 
   useEffect(() => {
     streamBridgeRef.current.setCleanupCallback(() => {
-      if (currentStreamingMessageIdRef.current) {
-        cancelledMessageIdsRef.current.add(currentStreamingMessageIdRef.current)
-        currentStreamingMessageIdRef.current = null
+      try {
+        if (currentStreamingMessageIdRef.current) {
+          cancelledMessageIdsRef.current.add(
+            currentStreamingMessageIdRef.current
+          )
+          currentStreamingMessageIdRef.current = null
+        }
+      } catch (error) {
+        log.error('Error during StreamBridge cleanup callback:', error)
       }
     })
   }, [])
 
   const handleConversationChange = useCallback(
     (res: Conversation) => {
-      if (res._id === conversationId && res.messages) {
-        const newIds = res.messages.map(m => m.id)
-        const lastAssistantMsg = res.messages
-          .filter(m => m.role === 'assistant')
-          .pop()
-        if (
-          lastAssistantMsg &&
-          !messagesIdRef.current.includes(lastAssistantMsg.id)
-        ) {
+      try {
+        if (res._id === conversationId && res.messages) {
+          const newIds = res.messages.map(m => m.id)
+          const lastAssistantMsg = res.messages
+            .filter(m => m.role === 'assistant')
+            .pop()
           if (
-            currentStreamingMessageIdRef.current &&
-            currentStreamingMessageIdRef.current !== lastAssistantMsg.id
+            lastAssistantMsg &&
+            !messagesIdRef.current.includes(lastAssistantMsg.id)
           ) {
-            cancelledMessageIdsRef.current.add(
-              currentStreamingMessageIdRef.current
-            )
+            if (
+              currentStreamingMessageIdRef.current &&
+              currentStreamingMessageIdRef.current !== lastAssistantMsg.id
+            ) {
+              cancelledMessageIdsRef.current.add(
+                currentStreamingMessageIdRef.current
+              )
+            }
+            currentStreamingMessageIdRef.current = lastAssistantMsg.id
           }
-          currentStreamingMessageIdRef.current = lastAssistantMsg.id
+          messagesIdRef.current = newIds
         }
-        messagesIdRef.current = newIds
+      } catch (error) {
+        log.error('Error handling conversation change:', error)
       }
     },
     [conversationId]
@@ -184,6 +219,9 @@ const CozyAssistantRuntimeProviderInner = ({
           content?: string
         }) => {
           if (cancelledMessageIdsRef.current.has(res._id)) {
+            if (res.object === 'done') {
+              cancelledMessageIdsRef.current.delete(res._id)
+            }
             return
           }
 
@@ -201,13 +239,17 @@ const CozyAssistantRuntimeProviderInner = ({
             currentStreamingMessageIdRef.current = res._id
           }
 
-          if (res.object === 'delta' && res.content !== undefined) {
-            streamBridgeRef.current.onDelta(conversationId, res.content)
-          }
+          try {
+            if (res.object === 'delta' && res.content !== undefined) {
+              streamBridgeRef.current.onDelta(conversationId, res.content)
+            }
 
-          if (res.object === 'done') {
-            streamBridgeRef.current.onDone(conversationId)
-            currentStreamingMessageIdRef.current = null
+            if (res.object === 'done') {
+              streamBridgeRef.current.onDone(conversationId)
+              currentStreamingMessageIdRef.current = null
+            }
+          } catch (error) {
+            log.error('Error handling chat real-time event:', error)
           }
         }
       }
@@ -223,11 +265,12 @@ const CozyAssistantRuntimeProviderInner = ({
             typeof createCozyRealtimeChatAdapter
           >[0]['client'],
           conversationId,
-          streamBridge: streamBridgeRef.current
+          streamBridge: streamBridgeRef.current,
+          assistantId: selectedAssistantId
         },
         t
       ),
-    [client, conversationId, t]
+    [client, conversationId, selectedAssistantId, t]
   )
 
   const runtime = useLocalRuntime(adapter, {
@@ -237,7 +280,11 @@ const CozyAssistantRuntimeProviderInner = ({
   useEffect(() => {
     const streamBridge = streamBridgeRef.current
     return () => {
-      streamBridge.cleanup(conversationId)
+      try {
+        streamBridge.cleanup(conversationId)
+      } catch (error) {
+        log.error('Error cleaning up StreamBridge on unmount:', error)
+      }
     }
   }, [conversationId])
 
@@ -268,4 +315,59 @@ const CozyAssistantRuntimeProvider = ({
   )
 }
 
-export default CozyAssistantRuntimeProvider
+class CozyAssistantErrorBoundary extends React.Component<
+  { children: ReactNode; t: (key: string) => string },
+  { hasError: boolean; error: Error | null }
+> {
+  constructor(props: { children: ReactNode; t: (key: string) => string }) {
+    super(props)
+    this.state = { hasError: false, error: null }
+  }
+
+  static getDerivedStateFromError(error: Error): {
+    hasError: boolean
+    error: Error
+  } {
+    return { hasError: true, error }
+  }
+
+  componentDidCatch(error: Error, errorInfo: React.ErrorInfo): void {
+    log.error('Assistant Runtime UI crashed:', error, errorInfo)
+  }
+
+  handleRetry = (): void => {
+    this.setState({ hasError: false, error: null })
+  }
+
+  render(): ReactNode {
+    if (this.state.hasError) {
+      return (
+        <div className="u-flex u-flex-column u-flex-items-center u-flex-justify-center u-h-100 u-w-100 u-ta-center">
+          <Typography variant="h4" className="u-mb-1" color="error">
+            {this.props.t('assistant.default_error')}
+          </Typography>
+          <Button
+            label={this.props.t('assistant.actions.reload')}
+            onClick={this.handleRetry}
+            variant="secondary"
+          />
+        </div>
+      )
+    }
+
+    return this.props.children
+  }
+}
+
+const CozyAssistantRuntimeProviderWithErrorBoundary = (
+  props: CozyAssistantRuntimeProviderProps
+): JSX.Element | null => {
+  const { t } = useI18n()
+  return (
+    <CozyAssistantErrorBoundary t={t}>
+      <CozyAssistantRuntimeProvider {...props} />
+    </CozyAssistantErrorBoundary>
+  )
+}
+
+export default CozyAssistantRuntimeProviderWithErrorBoundary
diff --git a/packages/cozy-search/src/components/CreateAssistantSteps/ProviderSelectionStep.jsx b/packages/cozy-search/src/components/CreateAssistantSteps/ProviderSelectionStep.jsx
index 3eea08ba8f..70f9680d32 100644
--- a/packages/cozy-search/src/components/CreateAssistantSteps/ProviderSelectionStep.jsx
+++ b/packages/cozy-search/src/components/CreateAssistantSteps/ProviderSelectionStep.jsx
@@ -1,8 +1,10 @@
+import cx from 'classnames'
 import React from 'react'
 import { useI18n } from 'twake-i18n'
 
 import Alert from 'cozy-ui/transpiled/react/Alert'
 import Typography from 'cozy-ui/transpiled/react/Typography'
+import { useBreakpoints } from 'cozy-ui/transpiled/react/providers/Breakpoints'
 
 import Provider from './Provider'
 import providers from './providers.json'
@@ -10,12 +12,17 @@ import styles from './styles.styl'
 
 const ProviderSelectionStep = ({ selectedProvider, onSelect }) => {
   const { t } = useI18n()
+  const { isMobile } = useBreakpoints()
   return (
-    <div className={`u-flex u-flex-column ${styles.ModelSelectionStep}`}>
+    <div className={cx('u-flex u-flex-column', styles.ModelSelectionStep)}>
       <Typography variant="body1" className="u-mb-1 u-c-text-secondary">
         {t('assistant_create.steps.provider_selection.description')}
       </Typography>
-      <div className={styles['grid-container']}>
+      <div
+        className={cx(styles['grid-container'], {
+          [styles['grid-container--mobile']]: isMobile
+        })}
+      >
         {providers.map(provider => (
           <Provider
             key={provider.id}
diff --git a/packages/cozy-search/src/components/CreateAssistantSteps/styles.styl b/packages/cozy-search/src/components/CreateAssistantSteps/styles.styl
index 2259489df2..f7a0cf9b8f 100644
--- a/packages/cozy-search/src/components/CreateAssistantSteps/styles.styl
+++ b/packages/cozy-search/src/components/CreateAssistantSteps/styles.styl
@@ -17,6 +17,9 @@
     grid-template-columns 1fr 1fr
     gap 16px
 
+    &--mobile
+      grid-template-columns 1fr
+
   & .model-card
     border-radius 16px
     border 1px solid #E5E5E5
diff --git a/packages/cozy-search/src/components/Messages/AssistantMessage.jsx b/packages/cozy-search/src/components/Messages/AssistantMessage.jsx
index b6dd010c64..7158f8e0eb 100644
--- a/packages/cozy-search/src/components/Messages/AssistantMessage.jsx
+++ b/packages/cozy-search/src/components/Messages/AssistantMessage.jsx
@@ -12,11 +12,11 @@ import { TwakeAssistantIcon } from '../AssistantIcon/TwakeAssistantIcon'
 const AssistantMessage = () => {
   const { t } = useI18n()
 
-  const isRunning = useMessage(s => s.status?.type === 'running')
+  const isThinking = useMessage(s => s.status?.type === 'requires-action')
 
   return (
     <MessagePrimitive.Root className="u-mt-1-half u-mr-3">
-      {isRunning && (
+      {isThinking && (
         <Box display="flex" alignItems="center" gridGap={12}>
           <Icon
             icon={TwakeAssistantIcon}
diff --git a/packages/cozy-search/src/components/Messages/UserMessage.jsx b/packages/cozy-search/src/components/Messages/UserMessage.jsx
index 62bccd1629..4d63e96640 100644
--- a/packages/cozy-search/src/components/Messages/UserMessage.jsx
+++ b/packages/cozy-search/src/components/Messages/UserMessage.jsx
@@ -4,16 +4,20 @@ import React from 'react'
 
 import Card from 'cozy-ui/transpiled/react/Card'
 import Typography from 'cozy-ui/transpiled/react/Typography'
+import { useCozyTheme } from 'cozy-ui-plus/dist/providers/CozyTheme'
 
 import styles from './styles.styl'
 
 const UserMessage = () => {
+  const { type: theme } = useCozyTheme()
+
   return (
     <MessagePrimitive.Root className="u-mt-1">
       <Card
         className={cx(
-          'u-bg-paleGrey u-bdrs-5 u-bdw-0 u-ml-auto u-p-half',
-          styles['cozyThread-user-messages']
+          'u-bdrs-5 u-bdw-0 u-ml-auto u-p-half',
+          styles['cozyThread-user-messages'],
+          styles[`cozyThread-user-messages--${theme}`]
         )}
       >
         <MessagePrimitive.Parts
diff --git a/packages/cozy-search/src/components/Messages/styles.styl b/packages/cozy-search/src/components/Messages/styles.styl
index f113e9ec7c..1d4dac27fb 100644
--- a/packages/cozy-search/src/components/Messages/styles.styl
+++ b/packages/cozy-search/src/components/Messages/styles.styl
@@ -1,3 +1,9 @@
 .cozyThread-user-messages
   max-width 50%
   width fit-content
+
+  &--light
+    background var(--grey100)
+
+  &--dark
+    background var(--grey900)
diff --git a/packages/cozy-search/src/components/Search/NotFoundConversation.jsx b/packages/cozy-search/src/components/Search/NotFoundConversation.jsx
new file mode 100644
index 0000000000..d6bf5a1545
--- /dev/null
+++ b/packages/cozy-search/src/components/Search/NotFoundConversation.jsx
@@ -0,0 +1,26 @@
+import React from 'react'
+import { useI18n } from 'twake-i18n'
+
+import Icon from 'cozy-ui/transpiled/react/Icon'
+import AssistantIcon from 'cozy-ui/transpiled/react/Icons/Assistant'
+import Typography from 'cozy-ui/transpiled/react/Typography'
+
+const NotFoundConversation = () => {
+  const { t } = useI18n()
+
+  return (
+    <div className="u-flex u-flex-column u-flex-items-center u-flex-justify-center u-h-100 u-w-100 u-ta-center">
+      <div className="u-flex u-flex-items-center u-flex-justify-center u-w-3 u-h-3 u-bdrs-circle u-mb-1">
+        <Icon icon={AssistantIcon} color="textSecondary" size="24" />
+      </div>
+      <Typography variant="h4" className="u-mb-1">
+        {t('assistant.search_conversation.not_found_title')}
+      </Typography>
+      <Typography variant="body1" color="textSecondary" className="u-maw-20">
+        {t('assistant.search_conversation.not_found_desc')}
+      </Typography>
+    </div>
+  )
+}
+
+export default NotFoundConversation
diff --git a/packages/cozy-search/src/components/Search/SearchConversation.jsx b/packages/cozy-search/src/components/Search/SearchConversation.jsx
index c023d0f17b..2faa06ddf9 100644
--- a/packages/cozy-search/src/components/Search/SearchConversation.jsx
+++ b/packages/cozy-search/src/components/Search/SearchConversation.jsx
@@ -1,59 +1,133 @@
-import React, { useMemo, useState } from 'react'
+import cx from 'classnames'
+import debounce from 'lodash/debounce'
+import escapeRegExp from 'lodash/escapeRegExp'
+import React, { useEffect, useMemo, useState } from 'react'
 import { useI18n } from 'twake-i18n'
 
-import { useQuery } from 'cozy-client'
 import Button from 'cozy-ui/transpiled/react/Buttons'
+import Dialog from 'cozy-ui/transpiled/react/Dialog'
+import Divider from 'cozy-ui/transpiled/react/Divider'
 import Icon from 'cozy-ui/transpiled/react/Icon'
+import IconButton from 'cozy-ui/transpiled/react/IconButton'
+import CrossIcon from 'cozy-ui/transpiled/react/Icons/Cross'
 import PlusIcon from 'cozy-ui/transpiled/react/Icons/Plus'
 import SearchBar from 'cozy-ui/transpiled/react/SearchBar'
+import Spinner from 'cozy-ui/transpiled/react/Spinner'
 import Typography from 'cozy-ui/transpiled/react/Typography'
+import { useBreakpoints } from 'cozy-ui/transpiled/react/providers/Breakpoints'
 
+import NotFoundConversation from './NotFoundConversation'
 import { groupConversationsByDate } from './helpers'
+import styles from './styles.styl'
 import useConversation from '../../hooks/useConversation'
+import useFetchConversations from '../../hooks/useFetchConversations'
+import { useAssistant } from '../AssistantProvider'
 import ConversationList from '../Conversations/ConversationList'
 import ConversationListItemWider from '../Conversations/ConversationListItemWider'
-import { buildChatConversationsQuery } from '../queries'
+
+const SearchConversationContainer = ({ children, isMobile }) =>
+  !isMobile ? (
+    <div className="u-w-100 u-h-100 u-flex u-flex-items-center u-flex-justify-center">
+      {children}
+    </div>
+  ) : (
+    <Dialog fullScreen open className="u-w-100 u-h-100">
+      {children}
+    </Dialog>
+  )
 
 const SearchConversation = () => {
   const { t } = useI18n()
+  const { isMobile } = useBreakpoints()
+  const [query, setQuery] = useState(undefined)
+  const [searchStr, setSearchStr] = useState('')
+
   const { createNewConversation, goToConversation } = useConversation()
+  const { setIsOpenSearchConversation } = useAssistant()
+  const { conversations, isLoading } = useFetchConversations({ query })
 
-  const conversationsQuery = useMemo(() => buildChatConversationsQuery(), [])
-  const { data: conversations } = useQuery(
-    conversationsQuery.definition,
-    conversationsQuery.options
+  const groupedConversations = useMemo(
+    () => groupConversationsByDate(conversations || []),
+    [conversations]
   )
 
-  const [query, setQuery] = useState('')
+  const debouncedFetchConversations = useMemo(
+    () =>
+      debounce(async value => {
+        // FIXME: This fallback query is highly inefficient.
+        // It bypasses index usage, forcing CouchDB to scan the entire database,
+        // deserialize every document, and then evaluate the regex via `$elemMatch`.
+        // Furthermore, it restricts us from doing fuzzy-search.
+        // We need a dedicated task to migrate this to an efficient client-side search approach.
+        const fetchQuery = value
+          ? {
+              messages: {
+                $elemMatch: {
+                  content: {
+                    $regex: escapeRegExp(value)
+                  }
+                }
+              }
+            }
+          : undefined
+        setQuery(fetchQuery)
+      }, 300),
+    [setQuery]
+  )
 
-  const filteredConversations = useMemo(() => {
-    if (!conversations) return []
-    if (!query) return conversations
+  useEffect(() => {
+    return () => {
+      debouncedFetchConversations.cancel()
+    }
+  }, [debouncedFetchConversations])
 
-    const lowerQuery = query.toLowerCase()
-    return conversations.filter(conversation =>
-      conversation.messages?.some(msg =>
-        msg.content?.toLowerCase().includes(lowerQuery)
-      )
-    )
-  }, [conversations, query])
-
-  const groupedConversations = useMemo(
-    () => groupConversationsByDate(filteredConversations),
-    [filteredConversations]
-  )
+  const handleSearchChange = e => {
+    const newQuery = e.target.value
+    setSearchStr(newQuery)
+    debouncedFetchConversations(newQuery)
+  }
 
   return (
-    <div className="u-w-100 u-h-100 u-flex u-flex-items-center u-flex-justify-center">
-      <div className="u-maw-7 u-ph-half u-h-100 u-flex u-flex-column u-flex-items-start u-ov-hidden">
-        <div className="u-w-100 u-mv-2">
-          <SearchBar
-            className="u-mb-2 u-w-100"
-            placeholder={t('assistant.search_conversation.placeholder')}
-            size="medium"
-            value={query}
-            onChange={e => setQuery(e.target.value)}
-          />
+    <SearchConversationContainer isMobile={isMobile}>
+      <div
+        className={cx(
+          'u-h-100 u-flex u-flex-column u-flex-items-start u-ov-hidden',
+          {
+            'u-w-7 u-mh-half': !isMobile
+          }
+        )}
+      >
+        <div
+          className={cx('u-w-100', {
+            'u-mv-2': !isMobile
+          })}
+        >
+          <div className="u-flex u-flex-items-center">
+            <SearchBar
+              elevation={isMobile ? 0 : 1}
+              disabledHover={!!isMobile}
+              disabledClear={!!isMobile}
+              className={cx('u-w-100', styles['search-bar--mobile'], {
+                'u-mb-2': !isMobile
+              })}
+              placeholder={t('assistant.search_conversation.placeholder')}
+              size={isMobile ? 'small' : 'medium'}
+              value={searchStr}
+              onChange={handleSearchChange}
+            />
+
+            {isMobile && (
+              <IconButton
+                size="small"
+                onClick={() => setIsOpenSearchConversation(false)}
+                aria-label={t('assistant.search_conversation.close')}
+              >
+                <Icon icon={CrossIcon} />
+              </IconButton>
+            )}
+          </div>
+
+          {isMobile && <Divider className="u-mb-half" />}
 
           <Button
             label={t('assistant.search_conversation.new_chat')}
@@ -62,51 +136,71 @@ const SearchConversation = () => {
             startIcon={<Icon icon={PlusIcon} />}
             onClick={createNewConversation}
             size="large"
-            className="u-bdrs-6"
+            className="u-ml-half-t u-bdrs-6"
           />
         </div>
 
-        <div className="u-ov-auto u-flex-auto">
-          {groupedConversations.today?.length > 0 && (
+        <div className="u-ov-auto u-flex-auto u-w-100 u-pos-relative">
+          {isLoading ? (
+            <div className="u-flex u-flex-items-center u-flex-justify-center u-p-2">
+              <Spinner size="xxlarge" />
+            </div>
+          ) : searchStr ? (
+            <ConversationList
+              divider={true}
+              disableAction={true}
+              conversations={conversations}
+              onOpenConversation={goToConversation}
+              ItemComponent={ConversationListItemWider}
+            />
+          ) : (
             <>
-              <Typography
-                variant="subtitle1"
-                color="textSecondary"
-                className="u-mb-half"
-              >
-                {t('assistant.search_conversation.recent')}
-              </Typography>
-              <ConversationList
-                divider={true}
-                disableAction={true}
-                conversations={groupedConversations.today}
-                onOpenConversation={goToConversation}
-                ItemComponent={ConversationListItemWider}
-              />
+              {groupedConversations.today?.length > 0 && (
+                <>
+                  <Typography
+                    variant="subtitle1"
+                    color="textSecondary"
+                    className="u-mb-half u-ml-half-t"
+                  >
+                    {t('assistant.search_conversation.recent')}
+                  </Typography>
+                  <ConversationList
+                    divider={true}
+                    disableAction={true}
+                    conversations={groupedConversations.today}
+                    onOpenConversation={goToConversation}
+                    ItemComponent={ConversationListItemWider}
+                  />
+                </>
+              )}
+
+              {groupedConversations.older?.length > 0 && (
+                <>
+                  <Typography
+                    variant="subtitle1"
+                    color="textSecondary"
+                    className="u-mt-1 u-mb-half u-ml-half-t"
+                  >
+                    {t('assistant.search_conversation.older')}
+                  </Typography>
+                  <ConversationList
+                    divider={true}
+                    disableAction={true}
+                    conversations={groupedConversations.older}
+                    onOpenConversation={goToConversation}
+                    ItemComponent={ConversationListItemWider}
+                  />
+                </>
+              )}
             </>
           )}
 
-          {groupedConversations.older?.length > 0 && (
-            <>
-              <Typography
-                variant="subtitle1"
-                color="textSecondary"
-                className="u-mt-1 u-mb-half"
-              >
-                {t('assistant.search_conversation.older')}
-              </Typography>
-              <ConversationList
-                divider={true}
-                disableAction={true}
-                conversations={groupedConversations.older}
-                onOpenConversation={goToConversation}
-                ItemComponent={ConversationListItemWider}
-              />
-            </>
+          {!isLoading && conversations?.length === 0 && (
+            <NotFoundConversation />
           )}
         </div>
       </div>
-    </div>
+    </SearchConversationContainer>
   )
 }
 
diff --git a/packages/cozy-search/src/components/Search/helpers.spec.js b/packages/cozy-search/src/components/Search/helpers.spec.js
new file mode 100644
index 0000000000..5503ec84de
--- /dev/null
+++ b/packages/cozy-search/src/components/Search/helpers.spec.js
@@ -0,0 +1,71 @@
+import { groupConversationsByDate } from './helpers'
+
+describe('groupConversationsByDate', () => {
+  let OriginalDate
+
+  beforeEach(() => {
+    OriginalDate = global.Date
+    global.Date = class extends OriginalDate {
+      constructor(...args) {
+        if (args.length) return new OriginalDate(...args)
+        return new OriginalDate('2023-11-20T12:00:00Z')
+      }
+    }
+    global.Date.now = jest.fn(() =>
+      new OriginalDate('2023-11-20T12:00:00Z').getTime()
+    )
+  })
+
+  afterEach(() => {
+    global.Date = OriginalDate
+  })
+
+  it('returns empty groups for null or undefined input', () => {
+    expect(groupConversationsByDate(null)).toEqual({ today: [], older: [] })
+    expect(groupConversationsByDate(undefined)).toEqual({
+      today: [],
+      older: []
+    })
+  })
+
+  it('groups conversations into today and older', () => {
+    const mockConversations = [
+      {
+        id: '1',
+        cozyMetadata: {
+          updatedAt: new OriginalDate(2023, 10, 20, 14, 0).toISOString()
+        }
+      }, // Today
+      {
+        id: '2',
+        cozyMetadata: {
+          updatedAt: new OriginalDate(2023, 10, 20, 8, 0).toISOString()
+        }
+      }, // Today
+      {
+        id: '3',
+        cozyMetadata: {
+          updatedAt: new OriginalDate(2023, 10, 19, 23, 59).toISOString()
+        }
+      }, // Older
+      {
+        id: '4',
+        cozyMetadata: {
+          updatedAt: new OriginalDate(2022, 0, 1, 12, 0).toISOString()
+        }
+      }, // Older
+      { id: '5' } // Missing cozyMetadata (Date.now() fallback -> Today)
+    ]
+
+    const result = groupConversationsByDate(mockConversations)
+
+    expect(result.today).toHaveLength(3)
+    expect(result.today[0].id).toBe('1')
+    expect(result.today[1].id).toBe('2')
+    expect(result.today[2].id).toBe('5')
+
+    expect(result.older).toHaveLength(2)
+    expect(result.older[0].id).toBe('3')
+    expect(result.older[1].id).toBe('4')
+  })
+})
diff --git a/packages/cozy-search/src/components/Search/styles.styl b/packages/cozy-search/src/components/Search/styles.styl
index fb32312c76..c04ae664c2 100644
--- a/packages/cozy-search/src/components/Search/styles.styl
+++ b/packages/cozy-search/src/components/Search/styles.styl
@@ -8,3 +8,8 @@
 
 .search-bar-icon
     opacity 0.42
+
+.search-bar--mobile
+  border 0
+  background-color transparent !important
+  border-color transparent !important
diff --git a/packages/cozy-search/src/components/Sidebar/index.jsx b/packages/cozy-search/src/components/Sidebar/index.jsx
index 85eb3ea36c..712196602a 100644
--- a/packages/cozy-search/src/components/Sidebar/index.jsx
+++ b/packages/cozy-search/src/components/Sidebar/index.jsx
@@ -3,21 +3,25 @@ import React, { useState } from 'react'
 import { useParams } from 'react-router-dom'
 import { useI18n } from 'twake-i18n'
 
-import { useQuery } from 'cozy-client'
 import flag from 'cozy-flags'
 import Button from 'cozy-ui/transpiled/react/Buttons'
+import Divider from 'cozy-ui/transpiled/react/Divider'
 import Icon from 'cozy-ui/transpiled/react/Icon'
 import IconButton from 'cozy-ui/transpiled/react/IconButton'
 import BurgerIcon from 'cozy-ui/transpiled/react/Icons/Burger'
+import CrossSmallIcon from 'cozy-ui/transpiled/react/Icons/CrossSmall'
 import SearchIcon from 'cozy-ui/transpiled/react/Icons/Magnifier'
 import PlusIcon from 'cozy-ui/transpiled/react/Icons/Plus'
+import LoadMore from 'cozy-ui/transpiled/react/LoadMore'
 import Typography from 'cozy-ui/transpiled/react/Typography'
+import { useBreakpoints } from 'cozy-ui/transpiled/react/providers/Breakpoints'
 
+import styles from './styles.styl'
 import useConversation from '../../hooks/useConversation'
+import useFetchConversations from '../../hooks/useFetchConversations'
 import { useAssistant } from '../AssistantProvider'
 import PrettyScrollbar from '../Containers/PrettyScrollbar'
 import ConversationList from '../Conversations/ConversationList'
-import { buildChatConversationsQuery } from '../queries'
 
 const Sidebar = ({ className }) => {
   const { t } = useI18n()
@@ -25,13 +29,10 @@ const Sidebar = ({ className }) => {
   const { createNewConversation, goToConversation } = useConversation()
   const { isOpenSearchConversation, setIsOpenSearchConversation } =
     useAssistant()
-  const [sidebarOpen, setSidebarOpen] = useState(true)
+  const { isMobile } = useBreakpoints()
+  const [sidebarOpen, setSidebarOpen] = useState(!isMobile)
 
-  const conversationsQuery = buildChatConversationsQuery()
-  const { data: conversations } = useQuery(
-    conversationsQuery.definition,
-    conversationsQuery.options
-  )
+  const { conversations, hasMore, fetchMore } = useFetchConversations()
 
   const onToggleSidebar = () => {
     setSidebarOpen(!sidebarOpen)
@@ -39,70 +40,114 @@ const Sidebar = ({ className }) => {
 
   const onToggleSearch = () => {
     setIsOpenSearchConversation(!isOpenSearchConversation)
+    if (isMobile) {
+      setSidebarOpen(false)
+    }
   }
 
   return (
-    <div
-      className={cx('u-flex u-flex-column u-h-100 u-bdw-1', className, {
-        'u-w-auto': !sidebarOpen
-      })}
-    >
-      <div className="u-flex u-flex-items-center u-flex-justify-between u-ph-half u-pv-1">
-        <IconButton
-          size="medium"
-          className={cx('u-bdrs-6', {
-            'u-bg-primaryBackgroundLight': sidebarOpen
-          })}
-          onClick={onToggleSidebar}
-        >
-          <Icon icon={BurgerIcon} />
-        </IconButton>
-        {sidebarOpen && flag('cozy.search-conversation.enabled') && (
-          <IconButton
-            size="medium"
-            className="u-bdrs-6"
-            onClick={onToggleSearch}
-          >
-            <Icon icon={SearchIcon} />
-          </IconButton>
-        )}
-      </div>
-      <div className="u-ph-half u-pb-half">
-        {sidebarOpen ? (
-          <Button
-            className="u-w-100 u-bdrs-6"
-            label={t('assistant.sidebar.create_new')}
-            startIcon={<Icon icon={PlusIcon} />}
-            fullWidth
-            variant="primary"
-            onClick={createNewConversation}
-          />
-        ) : (
+    <>
+      <div
+        className={cx('u-flex u-flex-column u-h-100 u-bdw-1', className, {
+          'u-w-auto': !sidebarOpen,
+          [styles['sidebar-container']]: sidebarOpen,
+          'u-left-0 u-pos-absolute': isMobile
+        })}
+      >
+        <div className="u-flex u-flex-items-center u-flex-justify-between u-ph-half u-pv-1">
           <IconButton
             size="medium"
-            className="u-bg-primaryColor u-white u-bdrs-6"
-            onClick={createNewConversation}
+            className={cx('u-bdrs-6 u-p-0')}
+            onClick={onToggleSidebar}
+            aria-label={t('assistant.sidebar.toggle_sidebar')}
           >
-            <Icon icon={PlusIcon} />
+            <Button
+              component="div"
+              variant={sidebarOpen ? 'ghost' : 'text'}
+              className="u-miw-auto u-w-2-half u-h-2-half u-bdrs-6"
+              classes={{ label: 'u-flex u-w-auto' }}
+              label={<Icon icon={BurgerIcon} aria-hidden="true" />}
+            />
           </IconButton>
+          <div>
+            {sidebarOpen && flag('cozy.search-conversation.enabled') && (
+              <IconButton
+                size="medium"
+                className="u-bdrs-6"
+                onClick={onToggleSearch}
+                aria-label={t('assistant.sidebar.toggle_search')}
+              >
+                <Icon icon={SearchIcon} aria-hidden="true" />
+              </IconButton>
+            )}
+            {sidebarOpen && isMobile && (
+              <IconButton
+                size="medium"
+                className="u-bdrs-6"
+                onClick={onToggleSidebar}
+                aria-label={t('assistant.sidebar.close_sidebar')}
+              >
+                <Icon icon={CrossSmallIcon} aria-hidden="true" />
+              </IconButton>
+            )}
+          </div>
+        </div>
+        <div className="u-ph-half u-pb-half">
+          {sidebarOpen ? (
+            <Button
+              className="u-w-100 u-bdrs-6"
+              label={t('assistant.sidebar.create_new')}
+              startIcon={<Icon icon={PlusIcon} />}
+              fullWidth
+              variant="primary"
+              onClick={createNewConversation}
+            />
+          ) : isMobile ? null : (
+            <IconButton
+              size="medium"
+              className="u-bg-primaryColor u-white u-bdrs-6"
+              onClick={createNewConversation}
+              aria-label={t('assistant.sidebar.create_new')}
+            >
+              <Icon icon={PlusIcon} aria-hidden="true" />
+            </IconButton>
+          )}
+        </div>
+
+        {sidebarOpen && (
+          <>
+            <Typography variant="h6" className="u-ml-1 u-p-half">
+              {t('assistant.sidebar.recent_chats')}
+            </Typography>
+            <PrettyScrollbar className="u-flex-auto u-ov-auto u-ph-half u-pb-half">
+              <ConversationList
+                conversations={conversations}
+                currentConversationId={currentConversationId}
+                onOpenConversation={goToConversation}
+              />
+              {hasMore && (
+                <div className="u-flex u-flex-items-center u-flex-justify-center u-mt-1">
+                  <LoadMore
+                    fetchMore={fetchMore}
+                    label={t(
+                      'assistant.sidebar.conversation.actions.load_more'
+                    )}
+                  />
+                </div>
+              )}
+            </PrettyScrollbar>
+          </>
         )}
       </div>
-
-      {sidebarOpen && (
-        <>
-          <Typography variant="h6" className="u-ml-1 u-p-half">
-            {t('assistant.sidebar.recent_chats')}
-          </Typography>
-          <PrettyScrollbar className="u-flex-auto u-ov-auto u-ph-half u-pb-half">
-            <ConversationList
-              conversations={conversations}
-              currentConversationId={currentConversationId}
-              onOpenConversation={goToConversation}
-            />
-          </PrettyScrollbar>
-        </>
+      {isMobile && sidebarOpen && (
+        <div
+          className={styles['sidebar-overlay--mobile']}
+          onClick={onToggleSidebar}
+          aria-hidden="true"
+        ></div>
       )}
-    </div>
+      {sidebarOpen && !isMobile && <Divider orientation="vertical" flexItem />}
+    </>
   )
 }
 
diff --git a/packages/cozy-search/src/components/Sidebar/styles.styl b/packages/cozy-search/src/components/Sidebar/styles.styl
new file mode 100644
index 0000000000..61ebb5725f
--- /dev/null
+++ b/packages/cozy-search/src/components/Sidebar/styles.styl
@@ -0,0 +1,12 @@
+.sidebar-container
+  background-color var(--paperBackgroundColor)
+  z-index calc(var(--zIndex-modal) + 30)
+
+.sidebar-overlay--mobile
+  background-color var(--actionColorActive)
+  position fixed
+  top 0
+  right 0
+  left 0
+  bottom 0
+  z-index calc(var(--zIndex-modal) + 20)
diff --git a/packages/cozy-search/src/components/TwakeKnowledges/TwakeKnowledgePanel.jsx b/packages/cozy-search/src/components/TwakeKnowledges/TwakeKnowledgePanel.jsx
index c109338778..c26c3713a1 100644
--- a/packages/cozy-search/src/components/TwakeKnowledges/TwakeKnowledgePanel.jsx
+++ b/packages/cozy-search/src/components/TwakeKnowledges/TwakeKnowledgePanel.jsx
@@ -3,11 +3,14 @@ import React, { useState, useEffect } from 'react'
 import { useI18n } from 'twake-i18n'
 
 import Button from 'cozy-ui/transpiled/react/Buttons'
+import Dialog from 'cozy-ui/transpiled/react/Dialog'
 import Icon from 'cozy-ui/transpiled/react/Icon'
 import IconButton from 'cozy-ui/transpiled/react/IconButton'
 import CrossIcon from 'cozy-ui/transpiled/react/Icons/Cross'
+import Paper from 'cozy-ui/transpiled/react/Paper'
 import SearchBar from 'cozy-ui/transpiled/react/SearchBar'
 import Typography from 'cozy-ui/transpiled/react/Typography'
+import { useBreakpoints } from 'cozy-ui/transpiled/react/providers/Breakpoints'
 
 import { useAssistant } from '../AssistantProvider'
 import ChatKnowledge from './ChatKnowledge'
@@ -18,8 +21,48 @@ import TChat from '../../assets/tchat.png'
 import TDrive from '../../assets/tdrive.png'
 import TMail from '../../assets/tmail.png'
 
+const PANEL_CONFIG = {
+  drive: {
+    title: 'assistant.twake_knowledges.title_drive',
+    desc: 'assistant.twake_knowledges.desc_drive',
+    icon: TDrive,
+    Component: DriveKnowledge,
+    actionLabel: 'assistant.twake_knowledges.select_folders'
+  },
+  mail: {
+    title: 'assistant.twake_knowledges.title_mail',
+    desc: 'assistant.twake_knowledges.desc_mail',
+    icon: TMail,
+    Component: MailKnowledge,
+    actionLabel: 'assistant.twake_knowledges.select_emails'
+  },
+  chat: {
+    title: 'assistant.twake_knowledges.title_chat',
+    desc: 'assistant.twake_knowledges.desc_chat',
+    icon: TChat,
+    Component: ChatKnowledge,
+    actionLabel: 'assistant.twake_knowledges.select_messages'
+  }
+}
+
+const TwakeKnowledgePanelContainer = ({ children, isMobile }) =>
+  !isMobile ? (
+    <Paper
+      elevation={0}
+      square={true}
+      className={cx(styles['source-panel'], 'u-h-100')}
+    >
+      {children}
+    </Paper>
+  ) : (
+    <Dialog fullScreen open>
+      {children}
+    </Dialog>
+  )
+
 const TwakeKnowledgePanel = ({ onClose }) => {
   const { t } = useI18n()
+  const { isMobile } = useBreakpoints()
   const {
     openedKnowledgePanel,
     selectedTwakeKnowledge,
@@ -56,84 +99,20 @@ const TwakeKnowledgePanel = ({ onClose }) => {
     onClose()
   }
 
-  const renderContent = () => {
-    switch (openedKnowledgePanel) {
-      case 'drive':
-        return (
-          <DriveKnowledge
-            selectedItems={selectedItems}
-            onToggleItems={handleToggleItems}
-            onClearItems={handleClearItems}
-          />
-        )
-      case 'mail':
-        return (
-          <MailKnowledge
-            selectedItems={selectedItems}
-            onToggleItems={handleToggleItems}
-            onClearItems={handleClearItems}
-          />
-        )
-      case 'chat':
-        return (
-          <ChatKnowledge
-            selectedItems={selectedItems}
-            onToggleItems={handleToggleItems}
-            onClearItems={handleClearItems}
-          />
-        )
-      default:
-        return null
-    }
-  }
+  const config = PANEL_CONFIG[openedKnowledgePanel]
 
-  const getTitle = () => {
-    switch (openedKnowledgePanel) {
-      case 'drive':
-        return t('assistant.twake_knowledges.title_drive')
-      case 'mail':
-        return t('assistant.twake_knowledges.title_mail')
-      case 'chat':
-        return t('assistant.twake_knowledges.title_chat')
-      default:
-        return t('assistant.twake_knowledges.title_default')
-    }
-  }
+  if (!openedKnowledgePanel || !config) return null
 
-  const getDescription = () => {
-    switch (openedKnowledgePanel) {
-      case 'drive':
-        return t('assistant.twake_knowledges.desc_drive')
-      case 'mail':
-        return t('assistant.twake_knowledges.desc_mail')
-      case 'chat':
-        return t('assistant.twake_knowledges.desc_chat')
-      default:
-        return ''
-    }
-  }
-
-  const getIcon = () => {
-    switch (openedKnowledgePanel) {
-      case 'drive':
-        return TDrive
-      case 'mail':
-        return TMail
-      case 'chat':
-        return TChat
-      default:
-        return null
-    }
-  }
+  const { title, desc, icon: IconImg, Component, actionLabel } = config
 
   if (!openedKnowledgePanel) return null
 
   return (
-    <div className={cx(styles['source-panel'], 'u-h-100')}>
+    <TwakeKnowledgePanelContainer isMobile={isMobile}>
       <div className={styles['source-panel-header']}>
         <Typography variant="h4" className="u-flex u-flex-items-center">
-          <img src={getIcon()} alt="" className="u-mr-1" />
-          {getTitle()}
+          <img src={IconImg} alt="" className="u-mr-1" />
+          {t(title)}
         </Typography>
         <IconButton onClick={onClose}>
           <Icon icon={CrossIcon} />
@@ -142,7 +121,7 @@ const TwakeKnowledgePanel = ({ onClose }) => {
 
       <div className={styles['source-panel-description']}>
         <Typography variant="body2" color="textSecondary">
-          {getDescription()}
+          {t(desc)}
         </Typography>
       </div>
 
@@ -153,7 +132,13 @@ const TwakeKnowledgePanel = ({ onClose }) => {
         />
       </div>
 
-      <div className={styles['source-panel-content']}>{renderContent()}</div>
+      <div className={styles['source-panel-content']}>
+        <Component
+          selectedItems={selectedItems}
+          onToggleItems={handleToggleItems}
+          onClearItems={handleClearItems}
+        />
+      </div>
 
       <div className={styles['source-panel-footer']}>
         <div className="u-flex u-flex-justify-between u-flex-items-end u-flex-gap-half">
@@ -173,19 +158,13 @@ const TwakeKnowledgePanel = ({ onClose }) => {
           />
           <Button
             variant="primary"
-            label={
-              openedKnowledgePanel === 'drive'
-                ? t('assistant.twake_knowledges.select_folders')
-                : openedKnowledgePanel === 'mail'
-                ? t('assistant.twake_knowledges.select_emails')
-                : t('assistant.twake_knowledges.select_messages')
-            }
+            label={t(actionLabel)}
             onClick={handleConfirm}
             disabled={selectedItems.length === 0}
           />
         </div>
       </div>
-    </div>
+    </TwakeKnowledgePanelContainer>
   )
 }
 
diff --git a/packages/cozy-search/src/components/TwakeKnowledges/TwakeKnowledgeSelector.jsx b/packages/cozy-search/src/components/TwakeKnowledges/TwakeKnowledgeSelector.jsx
index a8b75b9d96..e3e9bb8b75 100644
--- a/packages/cozy-search/src/components/TwakeKnowledges/TwakeKnowledgeSelector.jsx
+++ b/packages/cozy-search/src/components/TwakeKnowledges/TwakeKnowledgeSelector.jsx
@@ -4,6 +4,8 @@ import { useI18n } from 'twake-i18n'
 
 import flag from 'cozy-flags'
 import Chip from 'cozy-ui/transpiled/react/Chips'
+import Typography from 'cozy-ui/transpiled/react/Typography'
+import { useBreakpoints } from 'cozy-ui/transpiled/react/providers/Breakpoints'
 
 import styles from './styles.styl'
 import TChat from '../../assets/tchat.png'
@@ -13,6 +15,7 @@ import { useAssistant } from '../AssistantProvider'
 
 const TwakeKnowledgeSelector = ({ onSelectTwakeKnowledge }) => {
   const { t } = useI18n()
+  const { isMobile } = useBreakpoints()
   const { openedKnowledgePanel, selectedTwakeKnowledge } = useAssistant()
   const twakeKnowledges = [
     {
@@ -37,6 +40,9 @@ const TwakeKnowledgeSelector = ({ onSelectTwakeKnowledge }) => {
 
   return (
     <div className="u-flex u-flex-row u-flex-wrap u-flex-items-center u-flex-justify-end">
+      <Typography className="u-mr-half u-db-t u-dn u-fz-tiny u-coolGrey">
+        {t('assistant.twake_knowledges.search_in')}
+      </Typography>
       {twakeKnowledges
         .filter(twakeKnowledge => twakeKnowledge.display)
         .map((twakeKnowledge, index) => {
@@ -45,9 +51,15 @@ const TwakeKnowledgeSelector = ({ onSelectTwakeKnowledge }) => {
             selectedTwakeKnowledge[twakeKnowledge.id].length
           return (
             <Chip
+              aria-label={twakeKnowledge.label}
               key={twakeKnowledge.id}
               icon={
-                <img src={twakeKnowledge.icon} className="u-h-1 u-ml-half" />
+                <img
+                  alt=""
+                  aria-hidden="true"
+                  src={twakeKnowledge.icon}
+                  className="u-h-1 u-mh-half-t u-ml-half"
+                />
               }
               deleteIcon={
                 numberOfSelectedItems > 0 ? (
@@ -62,7 +74,7 @@ const TwakeKnowledgeSelector = ({ onSelectTwakeKnowledge }) => {
                 ) : null
               }
               onDelete={numberOfSelectedItems > 0 ? () => {} : null}
-              label={twakeKnowledge.label}
+              label={isMobile ? '' : twakeKnowledge.label}
               clickable
               variant={
                 isSelected || numberOfSelectedItems > 0 ? 'ghost' : 'default'
diff --git a/packages/cozy-search/src/components/TwakeKnowledges/styles.styl b/packages/cozy-search/src/components/TwakeKnowledges/styles.styl
index 68816568e9..34587eb527 100644
--- a/packages/cozy-search/src/components/TwakeKnowledges/styles.styl
+++ b/packages/cozy-search/src/components/TwakeKnowledges/styles.styl
@@ -3,14 +3,12 @@
   border-radius 0
   display flex
   flex-direction column
-  background-color var(--paperBackgroundColor)
 
 .source-panel-header
   display flex
   justify-content space-between
   align-items center
   padding 16px 20px 0
-  background-color var(--paperBackgroundColor)
   flex-shrink 0
 
 .source-panel-description
@@ -37,7 +35,6 @@
 .source-panel-footer
   padding 16px 20px
   border-top 1px solid var(--dividerColor)
-  background-color var(--paperBackgroundColor)
   flex-shrink 0
 
 .section-header
diff --git a/packages/cozy-search/src/components/Views/AssistantView.jsx b/packages/cozy-search/src/components/Views/AssistantView.jsx
index e9414fe4da..b2baf546f9 100644
--- a/packages/cozy-search/src/components/Views/AssistantView.jsx
+++ b/packages/cozy-search/src/components/Views/AssistantView.jsx
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import React from 'react'
 
+import { useBreakpoints } from 'cozy-ui/transpiled/react/providers/Breakpoints'
 import CozyTheme from 'cozy-ui-plus/dist/providers/CozyTheme'
 
 import AssistantProvider, { useAssistant } from '../AssistantProvider'
@@ -19,12 +20,16 @@ const AssistantView = () => {
     isOpenDeleteAssistant,
     setIsOpenDeleteAssistant
   } = useAssistant()
+  const { isMobile } = useBreakpoints()
 
   return (
     <div
       className={cx(
         'u-w-100 u-flex u-flex-column u-ov-hidden',
-        styles['assistantWrapper']
+        styles['assistantWrapper'],
+        {
+          'u-ph-1-t u-pb-1-t u-bxz': isMobile
+        }
       )}
     >
       <AssistantContainer />
diff --git a/packages/cozy-search/src/components/Views/CreateAssistantDialog.jsx b/packages/cozy-search/src/components/Views/CreateAssistantDialog.jsx
index a2338bcd2e..edf0f81b31 100644
--- a/packages/cozy-search/src/components/Views/CreateAssistantDialog.jsx
+++ b/packages/cozy-search/src/components/Views/CreateAssistantDialog.jsx
@@ -14,6 +14,7 @@ import Icon from 'cozy-ui/transpiled/react/Icon'
 import IconButton from 'cozy-ui/transpiled/react/IconButton'
 import CrossIcon from 'cozy-ui/transpiled/react/Icons/Cross'
 import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert'
+import { useBreakpoints } from 'cozy-ui/transpiled/react/providers/Breakpoints'
 
 import { locales } from '../../locales'
 import AssistantDialogContent from '../CreateAssistantSteps/AssistantDialogContent'
@@ -28,6 +29,7 @@ const CreateAssistantDialog = ({ open, onClose }) => {
   const { t } = useI18n()
   const client = useClient()
   const { showAlert } = useAlert()
+  const { isMobile } = useBreakpoints()
 
   const {
     step,
@@ -67,6 +69,7 @@ const CreateAssistantDialog = ({ open, onClose }) => {
       open={open}
       onClose={onClose}
       maxWidth="lg"
+      fullScreen={!!isMobile}
       className={styles.CreateAssistantDialog}
     >
       <DialogTitle disableTypography={true}>{getTitle()}</DialogTitle>
diff --git a/packages/cozy-search/src/components/Views/EditAssistantDialog.jsx b/packages/cozy-search/src/components/Views/EditAssistantDialog.jsx
index 4046cad194..50a624fa98 100644
--- a/packages/cozy-search/src/components/Views/EditAssistantDialog.jsx
+++ b/packages/cozy-search/src/components/Views/EditAssistantDialog.jsx
@@ -14,6 +14,7 @@ import Icon from 'cozy-ui/transpiled/react/Icon'
 import IconButton from 'cozy-ui/transpiled/react/IconButton'
 import CrossIcon from 'cozy-ui/transpiled/react/Icons/Cross'
 import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert'
+import { useBreakpoints } from 'cozy-ui/transpiled/react/providers/Breakpoints'
 
 import { locales } from '../../locales'
 import { useAssistant } from '../AssistantProvider'
@@ -31,6 +32,7 @@ const EditAssistantDialog = ({ open, onClose }) => {
   const client = useClient()
   const { assistantIdInAction } = useAssistant()
   const { showAlert } = useAlert()
+  const { isMobile } = useBreakpoints()
 
   const {
     step,
@@ -105,6 +107,7 @@ const EditAssistantDialog = ({ open, onClose }) => {
       open={open}
       onClose={onClose}
       maxWidth="lg"
+      fullScreen={!!isMobile}
       className={styles.CreateAssistantDialog}
     >
       <DialogTitle disableTypography={true}>{getTitle()}</DialogTitle>
diff --git a/packages/cozy-search/src/components/adapters/CozyRealtimeChatAdapter.ts b/packages/cozy-search/src/components/adapters/CozyRealtimeChatAdapter.ts
index 90365575a9..fb0791b081 100644
--- a/packages/cozy-search/src/components/adapters/CozyRealtimeChatAdapter.ts
+++ b/packages/cozy-search/src/components/adapters/CozyRealtimeChatAdapter.ts
@@ -31,6 +31,7 @@ export interface CozyRealtimeChatAdapterOptions {
   client: CozyClient
   conversationId: string
   streamBridge: StreamBridge
+  assistantId?: string
 }
 
 /**
@@ -66,7 +67,7 @@ export const createCozyRealtimeChatAdapter = (
     messages,
     abortSignal
   }: ChatModelRunOptions): AsyncGenerator<ChatModelRunResult> {
-    const { client, conversationId, streamBridge } = options
+    const { client, conversationId, streamBridge, assistantId } = options
 
     const userQuery = findUserQuery(messages)
     if (!userQuery) {
@@ -78,10 +79,14 @@ export const createCozyRealtimeChatAdapter = (
 
     try {
       // Note: For reload, this sends the same query again to regenerate
+      yield {
+        content: [{ type: 'text', text: '' }],
+        status: { type: 'requires-action', reason: 'tool-calls' }
+      }
       await client.stackClient.fetchJSON(
         'POST',
         `/ai/chat/conversations/${conversationId}`,
-        { q: userQuery }
+        { q: userQuery, assistantId }
       )
 
       let fullText = ''
diff --git a/packages/cozy-search/src/components/adapters/StreamBridge.spec.ts b/packages/cozy-search/src/components/adapters/StreamBridge.spec.ts
new file mode 100644
index 0000000000..d987ab635f
--- /dev/null
+++ b/packages/cozy-search/src/components/adapters/StreamBridge.spec.ts
@@ -0,0 +1,82 @@
+import { StreamBridge } from './StreamBridge'
+
+describe('StreamBridge', () => {
+  let bridge: StreamBridge
+
+  beforeEach(() => {
+    bridge = new StreamBridge()
+  })
+
+  it('should create an async iterable iterator', () => {
+    const iterator = bridge.createStream('convo_1')
+    expect(typeof iterator.next).toBe('function')
+    expect(iterator[Symbol.asyncIterator]).toBeDefined()
+  })
+
+  it('should push deltas and yield them from the iterator', async () => {
+    const iterator = bridge.createStream('convo_1')
+
+    bridge.onDelta('convo_1', 'Hello ')
+    bridge.onDelta('convo_1', 'world!')
+
+    const first = await iterator.next()
+    expect(first).toEqual({ value: 'Hello ', done: false })
+
+    const second = await iterator.next()
+    expect(second).toEqual({ value: 'world!', done: false })
+  })
+
+  it('should mark the stream as done when complete is called', async () => {
+    const iterator = bridge.createStream('convo_1')
+
+    bridge.onDelta('convo_1', 'done chunk')
+    bridge.onDone('convo_1')
+
+    const first = await iterator.next()
+    expect(first).toEqual({ value: 'done chunk', done: false })
+
+    const second = await iterator.next()
+    expect(second.done).toBe(true)
+  })
+
+  it('should reject the iterator when an error occurs', async () => {
+    const iterator = bridge.createStream('convo_1')
+    const error = new Error('Socket disconnected')
+
+    bridge.onError('convo_1', error)
+
+    await expect(iterator.next()).rejects.toThrow('Socket disconnected')
+  })
+
+  it('should call the cleanup callback and mark the stream complete on cleanup', async () => {
+    const cleanupSpy = jest.fn()
+    bridge.setCleanupCallback(cleanupSpy)
+
+    const iterator = bridge.createStream('convo_1')
+    bridge.cleanup('convo_1')
+
+    expect(cleanupSpy).toHaveBeenCalledTimes(1)
+    expect(bridge.hasStream('convo_1')).toBe(false)
+
+    // The iterator should be marked done
+    const result = await iterator.next()
+    expect(result.done).toBe(true)
+  })
+
+  it('multiple unresolved next calls should reject to prevent concurrency issues', async () => {
+    const iterator = bridge.createStream('convo_1')
+
+    // Call next twice concurrently
+    const p1 = iterator.next()
+    const p2 = iterator.next()
+
+    await expect(p2).rejects.toThrow(
+      'StreamBridge: concurrent next() calls are not supported'
+    )
+
+    // Fulfill the first one
+    bridge.onDelta('convo_1', 'ok')
+    const res1 = await p1
+    expect(res1).toEqual({ value: 'ok', done: false })
+  })
+})
diff --git a/packages/cozy-search/src/components/constants.js b/packages/cozy-search/src/components/constants.js
index 591e85d931..2a6771b456 100644
--- a/packages/cozy-search/src/components/constants.js
+++ b/packages/cozy-search/src/components/constants.js
@@ -2,3 +2,5 @@ export const DEFAULT_ASSISTANT = {
   id: 'ai_assistant',
   name: 'AI Assistant'
 }
+
+export const FETCH_CONVERSATIONS_LIMIT = 50
diff --git a/packages/cozy-search/src/components/helpers.spec.js b/packages/cozy-search/src/components/helpers.spec.js
index 2a450dcff8..0050fb1926 100644
--- a/packages/cozy-search/src/components/helpers.spec.js
+++ b/packages/cozy-search/src/components/helpers.spec.js
@@ -1,4 +1,11 @@
-import { sanitizeChatContent } from './helpers'
+import {
+  sanitizeChatContent,
+  formatConversationDate,
+  getNameOfConversation,
+  getDescriptionOfConversation
+} from './helpers'
+
+jest.mock('cozy-flags', () => jest.fn(() => true), { virtual: true })
 
 describe('sanitizeChatContent', () => {
   it('should return empty string for empty content', () => {
@@ -41,3 +48,92 @@ describe('sanitizeChatContent', () => {
     expect(sanitizeChatContent(text)).toBe(text)
   })
 })
+
+describe('formatConversationDate', () => {
+  const mockT = jest.fn(key => key)
+  const mockDate = new Date('2023-11-20T12:00:00Z')
+  let OriginalDate
+  let dateSpy
+
+  beforeEach(() => {
+    OriginalDate = global.Date
+    dateSpy = jest.spyOn(global, 'Date').mockImplementation(function (...args) {
+      if (args.length) {
+        return new OriginalDate(...args)
+      }
+      return mockDate
+    })
+    dateSpy.now = jest.fn(() => mockDate.getTime())
+  })
+
+  afterEach(() => {
+    dateSpy.mockRestore()
+    mockT.mockClear()
+  })
+
+  it('returns empty string for invalid dates', () => {
+    expect(formatConversationDate(null, mockT, 'en-US')).toBe('')
+    expect(formatConversationDate('not date', mockT, 'en-US')).toBe('')
+  })
+
+  it('formats today as "Today, HH:mm"', () => {
+    const today = new Date('2023-11-20T08:30:00Z').toISOString()
+    const result = formatConversationDate(today, mockT, 'en-US')
+
+    expect(result).toMatch(/assistant\.time\.today/)
+    expect(result).toMatch(/\d{1,2}:\d{2}/)
+  })
+
+  it('formats yesterday as "Yesterday, HH:mm"', () => {
+    const yesterday = new Date('2023-11-19T14:45:00Z').toISOString()
+    const result = formatConversationDate(yesterday, mockT, 'en-US')
+
+    expect(result).toMatch(/assistant\.time\.yesterday/)
+    expect(result).toMatch(/\d{1,2}:\d{2}/)
+  })
+
+  it('formats older dates as formatted short date strings', () => {
+    const older = new Date('2022-01-05T10:00:00Z').toISOString()
+    const result = formatConversationDate(older, mockT, 'en-US')
+
+    expect(result).toContain('2022')
+    expect(result).toContain('Jan')
+  })
+})
+
+describe('getNameOfConversation', () => {
+  it('returns undefined if messages array is empty or missing', () => {
+    expect(getNameOfConversation({})).toBeUndefined()
+    expect(getNameOfConversation({ messages: [] })).toBeUndefined()
+    expect(
+      getNameOfConversation({ messages: [{ content: 'Hi' }] })
+    ).toBeUndefined()
+  })
+
+  it('returns the content of the second to last message', () => {
+    const convo = {
+      messages: [
+        { role: 'user', content: 'What is the sum?' },
+        { role: 'assistant', content: 'It is 4' }
+      ]
+    }
+    expect(getNameOfConversation(convo)).toBe('What is the sum?')
+  })
+})
+
+describe('getDescriptionOfConversation', () => {
+  it('returns undefined if messages array is empty or missing', () => {
+    expect(getDescriptionOfConversation({})).toBeUndefined()
+    expect(getDescriptionOfConversation({ messages: [] })).toBeUndefined()
+  })
+
+  it('returns the content of the last message', () => {
+    const convo = {
+      messages: [
+        { role: 'user', content: 'What is the sum?' },
+        { role: 'assistant', content: 'It is 4' }
+      ]
+    }
+    expect(getDescriptionOfConversation(convo)).toBe('It is 4')
+  })
+})
diff --git a/packages/cozy-search/src/components/queries.js b/packages/cozy-search/src/components/queries.js
index 1c0b7729b8..83972b8d78 100644
--- a/packages/cozy-search/src/components/queries.js
+++ b/packages/cozy-search/src/components/queries.js
@@ -1,5 +1,7 @@
 import { Q, fetchPolicies } from 'cozy-client'
 
+import { FETCH_CONVERSATIONS_LIMIT } from './constants'
+
 const CONTACTS_DOCTYPE = 'io.cozy.contacts'
 export const CHAT_CONVERSATIONS_DOCTYPE = 'io.cozy.ai.chat.conversations'
 export const CHAT_EVENTS_DOCTYPE = 'io.cozy.ai.chat.events'
@@ -66,15 +68,17 @@ export const buildAssistantByIdQuery = id => ({
 
 export const buildChatConversationsQuery = () => {
   return {
-    definition: () =>
+    definition: ({ bookmark, query = {} }) =>
       Q(CHAT_CONVERSATIONS_DOCTYPE)
-        .where({})
+        .where(query)
         .indexFields(['cozyMetadata.updatedAt'])
         .sortBy([{ 'cozyMetadata.updatedAt': 'desc' }])
-        .limitBy(50),
-    options: {
-      as: CHAT_CONVERSATIONS_DOCTYPE + '/recent',
+        .include(['assistant'])
+        .offsetBookmark(bookmark)
+        .limitBy(FETCH_CONVERSATIONS_LIMIT),
+    options: ({ query = {} }) => ({
+      as: `${CHAT_CONVERSATIONS_DOCTYPE}/recent-${JSON.stringify(query)}`,
       fetchPolicy: defaultFetchPolicy
-    }
+    })
   }
 }
diff --git a/packages/cozy-search/src/components/styles.styl b/packages/cozy-search/src/components/styles.styl
index d053d690ee..eb8f61cfbb 100644
--- a/packages/cozy-search/src/components/styles.styl
+++ b/packages/cozy-search/src/components/styles.styl
@@ -18,4 +18,4 @@
     padding-bottom calc(1rem + var(--flagship-bottom-height))
 
 .assistantWrapper
-  height calc(100vh - 48px)
+  height calc(100dvh - 3rem - 1px) // 3rem is topbar height, 1px is divider height
diff --git a/packages/cozy-search/src/hooks/useConversation.jsx b/packages/cozy-search/src/hooks/useConversation.jsx
index dee4cd036a..a28d5796c9 100644
--- a/packages/cozy-search/src/hooks/useConversation.jsx
+++ b/packages/cozy-search/src/hooks/useConversation.jsx
@@ -9,17 +9,10 @@ const useConversation = () => {
   const { setIsOpenSearchConversation } = useAssistant()
 
   const goToConversation = conversationId => {
-    const parts = location.pathname.split('/')
-    const assistantIndex = parts.findIndex(part => part === 'assistant')
-
-    if (assistantIndex === -1) {
-      parts.push('assistant', conversationId)
-    } else if (parts.length > assistantIndex + 1) {
-      parts[assistantIndex + 1] = conversationId
-    } else {
-      parts.push(conversationId)
-    }
-    const newPathname = parts.join('/')
+    // Extract base path safely by identifying the start of '/assistant' if it exists.
+    const match = location.pathname.match(/^(.*?)(\/assistant(\/|$).*|$)/)
+    const basePath = (match?.[1] || location.pathname).replace(/\/$/, '')
+    const newPathname = `${basePath}/assistant/${conversationId}`
 
     setIsOpenSearchConversation(false)
 
diff --git a/packages/cozy-search/src/hooks/useConversation.spec.jsx b/packages/cozy-search/src/hooks/useConversation.spec.jsx
new file mode 100644
index 0000000000..fe461d0ca8
--- /dev/null
+++ b/packages/cozy-search/src/hooks/useConversation.spec.jsx
@@ -0,0 +1,121 @@
+import { renderHook, act } from '@testing-library/react-hooks'
+
+import useConversation from './useConversation'
+
+const mockNavigate = jest.fn()
+let mockLocation = {
+  pathname: '/',
+  search: '',
+  hash: ''
+}
+
+jest.mock('react-router-dom', () => ({
+  useNavigate: () => mockNavigate,
+  useLocation: () => mockLocation
+}))
+
+const mockSetIsOpenSearchConversation = jest.fn()
+jest.mock('../components/AssistantProvider', () => ({
+  useAssistant: () => ({
+    setIsOpenSearchConversation: mockSetIsOpenSearchConversation
+  })
+}))
+
+jest.mock('../components/helpers', () => ({
+  makeConversationId: () => 'mock-id-123'
+}))
+
+describe('useConversation', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+    mockLocation = {
+      pathname: '/',
+      search: '',
+      hash: ''
+    }
+  })
+
+  describe('goToConversation', () => {
+    it('appends /assistant/id to a base url', () => {
+      mockLocation.pathname = '/drive/folders/123'
+      const { result } = renderHook(() => useConversation())
+
+      act(() => {
+        result.current.goToConversation('convo-456')
+      })
+
+      expect(mockSetIsOpenSearchConversation).toHaveBeenCalledWith(false)
+      expect(mockNavigate).toHaveBeenCalledWith({
+        pathname: '/drive/folders/123/assistant/convo-456',
+        search: '',
+        hash: ''
+      })
+    })
+
+    it('replaces existing /assistant/... path intelligently', () => {
+      mockLocation.pathname = '/drive/folders/123/assistant/old-convo-789'
+      const { result } = renderHook(() => useConversation())
+
+      act(() => {
+        result.current.goToConversation('new-convo-000')
+      })
+
+      expect(mockNavigate).toHaveBeenCalledWith({
+        pathname: '/drive/folders/123/assistant/new-convo-000',
+        search: '',
+        hash: ''
+      })
+    })
+
+    it('handles trailing slashes on base path correctly', () => {
+      mockLocation.pathname = '/drive/folders/123/'
+      const { result } = renderHook(() => useConversation())
+
+      act(() => {
+        result.current.goToConversation('convo-456')
+      })
+
+      expect(mockNavigate).toHaveBeenCalledWith({
+        pathname: '/drive/folders/123/assistant/convo-456',
+        search: '',
+        hash: ''
+      })
+    })
+
+    it('preserves search query and hash fragments', () => {
+      mockLocation = {
+        pathname: '/base',
+        search: '?foo=bar',
+        hash: '#section1'
+      }
+      const { result } = renderHook(() => useConversation())
+
+      act(() => {
+        result.current.goToConversation('convo-1')
+      })
+
+      expect(mockNavigate).toHaveBeenCalledWith({
+        pathname: '/base/assistant/convo-1',
+        search: '?foo=bar',
+        hash: '#section1'
+      })
+    })
+  })
+
+  describe('createNewConversation', () => {
+    it('creates a new conversation using makeConversationId', () => {
+      mockLocation.pathname = '/docs'
+      const { result } = renderHook(() => useConversation())
+
+      act(() => {
+        result.current.createNewConversation()
+      })
+
+      expect(mockNavigate).toHaveBeenCalledWith({
+        pathname: '/docs/assistant/mock-id-123',
+        search: '',
+        hash: ''
+      })
+    })
+  })
+})
diff --git a/packages/cozy-search/src/hooks/useFetchConversations.js b/packages/cozy-search/src/hooks/useFetchConversations.js
new file mode 100644
index 0000000000..0ed9d4d45e
--- /dev/null
+++ b/packages/cozy-search/src/hooks/useFetchConversations.js
@@ -0,0 +1,119 @@
+import isEqual from 'lodash/isEqual'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+
+import { useClient } from 'cozy-client'
+import Minilog from 'cozy-minilog'
+
+import { DEFAULT_ASSISTANT } from '../components/constants'
+import { buildChatConversationsQuery } from '../components/queries'
+
+const log = Minilog('[useFetchConversations]')
+
+/**
+ * We use `client.query` manually instead of the `useQuery` hook from cozy-client
+ * because `useQuery` currently drops the `included` array from its output state.
+ * Without `included`, we cannot easily map the `assistant` relationship to each conversation.
+ *
+ * For more details on the cozy-client issue, see:
+ * https://github.com/linagora/cozy-client/issues/1083
+ *
+ * @typedef {Object} Assistant
+ * @property {string} _id
+ * @property {string} name
+ * @property {string} [icon]
+ *
+ * @typedef {Object} ConversationWithAssistant
+ * @property {string} _id
+ * @property {Array} messages
+ * @property {Assistant} assistant - The assistant object bolted on from the query's `included` relationships, or the DEFAULT_ASSISTANT fallback.
+ *
+ * @param {Object} [props={}]
+ * @param {Object} [props.query={}] - Optional query filters to pass to `where()`
+ *
+ * @returns {{
+ *   conversations: ConversationWithAssistant[],
+ *   hasMore: boolean,
+ *   bookmark: string|null,
+ *   isLoading: boolean,
+ *   fetchMore: function(): Promise<void>,
+ *   fetchConversations: function(string|null, Object): Promise<void>
+ * }}
+ */
+const useFetchConversations = ({ query = {} } = {}) => {
+  const client = useClient()
+  const [conversations, setConversations] = useState([])
+  const [hasMore, setHasMore] = useState(false)
+  const [bookmark, setBookmark] = useState(null)
+  const [isLoading, setIsLoading] = useState(false)
+  const previousQueryRef = useRef()
+  const latestRequestIdRef = useRef(0)
+
+  const conversationsQuery = useMemo(() => buildChatConversationsQuery(), [])
+
+  const fetchConversations = useCallback(
+    async (bookmark = null, fetchQuery) => {
+      const requestId = ++latestRequestIdRef.current
+      setIsLoading(true)
+      try {
+        const response = await client.query(
+          conversationsQuery.definition({
+            bookmark,
+            query: fetchQuery
+          })
+        )
+        if (requestId !== latestRequestIdRef.current) return
+
+        const combinedData =
+          response.data?.map(conversation => ({
+            ...conversation,
+            assistant:
+              response.included?.find(
+                included =>
+                  included._id ===
+                  conversation.relationships?.assistant?.data?._id
+              ) || DEFAULT_ASSISTANT
+          })) || []
+
+        setConversations(prev =>
+          !bookmark ? combinedData : [...prev, ...combinedData]
+        )
+        setHasMore(response.next)
+        setBookmark(response.bookmark)
+      } catch (error) {
+        log.error('Error fetching conversations:', error)
+      } finally {
+        if (requestId === latestRequestIdRef.current) {
+          setIsLoading(false)
+        }
+      }
+    },
+    [client, conversationsQuery]
+  )
+
+  useEffect(() => {
+    if (!isEqual(previousQueryRef.current, query)) {
+      setConversations([])
+      setHasMore(false)
+      setBookmark(null)
+      previousQueryRef.current = query
+      fetchConversations(null, query)
+    }
+  }, [query, fetchConversations])
+
+  const fetchMore = useCallback(async () => {
+    if (hasMore) {
+      await fetchConversations(bookmark, previousQueryRef.current)
+    }
+  }, [hasMore, bookmark, fetchConversations])
+
+  return {
+    conversations,
+    hasMore,
+    bookmark,
+    isLoading,
+    fetchMore,
+    fetchConversations
+  }
+}
+
+export default useFetchConversations
diff --git a/packages/cozy-search/src/hooks/useFetchConversations.spec.js b/packages/cozy-search/src/hooks/useFetchConversations.spec.js
new file mode 100644
index 0000000000..011e021249
--- /dev/null
+++ b/packages/cozy-search/src/hooks/useFetchConversations.spec.js
@@ -0,0 +1,256 @@
+import { render, act } from '@testing-library/react'
+import React from 'react'
+
+import { useClient } from 'cozy-client'
+
+import useFetchConversations from './useFetchConversations'
+
+jest.mock('cozy-client', () => ({
+  useClient: jest.fn(),
+  Q: jest.fn(() => ({
+    getByIds: jest.fn(),
+    getById: jest.fn(),
+    where: jest.fn().mockReturnThis(),
+    include: jest.fn().mockReturnThis(),
+    indexFields: jest.fn().mockReturnThis(),
+    sortBy: jest.fn().mockReturnThis(),
+    offsetBookmark: jest.fn().mockReturnThis(),
+    limitBy: jest.fn().mockReturnThis()
+  })),
+  fetchPolicies: {
+    olderThan: jest.fn()
+  }
+}))
+
+jest.mock(
+  'cozy-minilog',
+  () => () => ({
+    error: jest.fn(),
+    info: jest.fn()
+  }),
+  { virtual: true }
+)
+
+const mockClient = {
+  query: jest.fn()
+}
+
+describe('useFetchConversations', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+    mockClient.query.mockReset()
+    useClient.mockReturnValue(mockClient)
+  })
+
+  it('initializes with empty conversations and not loading', () => {
+    let hookResult = {}
+    const TestComponent = () => {
+      hookResult.current = useFetchConversations()
+      return null
+    }
+    act(() => {
+      render(<TestComponent />)
+    })
+
+    expect(hookResult.current.conversations).toEqual([])
+    expect(hookResult.current.hasMore).toBe(false)
+    expect(hookResult.current.isLoading).toBe(true) // Starts loading immediately due to useEffect
+  })
+
+  it('fetches conversations on mount and resolves relationships', async () => {
+    const mockResponse = {
+      data: [
+        {
+          _id: 'conv1',
+          relationships: { assistant: { data: { _id: 'ast1' } } }
+        },
+        { _id: 'conv2', relationships: {} }
+      ],
+      included: [{ _id: 'ast1', name: 'Mock Assistant', icon: 'mock.png' }],
+      next: true,
+      bookmark: 'bmk123'
+    }
+
+    mockClient.query.mockResolvedValueOnce(mockResponse)
+
+    let hookResult = {}
+    const TestComponent = () => {
+      hookResult.current = useFetchConversations()
+      return null
+    }
+    act(() => {
+      render(<TestComponent />)
+    })
+
+    expect(hookResult.current.isLoading).toBe(true)
+
+    await act(async () => {
+      await new Promise(resolve => setTimeout(resolve, 10))
+    })
+
+    expect(mockClient.query).toHaveBeenCalledTimes(1)
+    expect(hookResult.current.isLoading).toBe(false)
+    expect(hookResult.current.hasMore).toBe(true)
+    expect(hookResult.current.bookmark).toBe('bmk123')
+
+    // Check relationship mapping
+    expect(hookResult.current.conversations).toHaveLength(2)
+    expect(hookResult.current.conversations[0].assistant.name).toBe(
+      'Mock Assistant'
+    )
+    // Fallback DEFAULT_ASSISTANT
+    expect(hookResult.current.conversations[1].assistant.id).toBe(
+      'ai_assistant'
+    )
+  })
+
+  it('fetchMore loads next bookmark and concatenates results', async () => {
+    const firstPage = {
+      data: [{ _id: 'c1' }],
+      next: true,
+      bookmark: 'bmk1'
+    }
+    const secondPage = {
+      data: [{ _id: 'c2' }],
+      next: false,
+      bookmark: null
+    }
+
+    mockClient.query
+      .mockResolvedValueOnce(firstPage)
+      .mockResolvedValueOnce(secondPage)
+
+    let hookResult = {}
+    const TestComponent = () => {
+      hookResult.current = useFetchConversations()
+      return null
+    }
+    act(() => {
+      render(<TestComponent />)
+    })
+
+    await act(async () => {
+      await new Promise(resolve => setTimeout(resolve, 10))
+    }) // wait for initial load
+
+    expect(hookResult.current.conversations).toHaveLength(1)
+    expect(hookResult.current.bookmark).toBe('bmk1')
+    expect(hookResult.current.hasMore).toBe(true)
+
+    // Trigger fetchMore
+    act(() => {
+      hookResult.current.fetchMore()
+    })
+
+    expect(hookResult.current.isLoading).toBe(true)
+    await act(async () => {
+      await new Promise(resolve => setTimeout(resolve, 10))
+    })
+
+    expect(hookResult.current.conversations).toHaveLength(2)
+    expect(hookResult.current.conversations[1]._id).toBe('c2')
+    expect(hookResult.current.hasMore).toBe(false)
+    expect(hookResult.current.bookmark).toBe(null)
+  })
+
+  it('handles query parameter changes gracefully by resetting state', async () => {
+    const initialQuery = { title: 'First' }
+    const newQuery = { title: 'Second' }
+
+    mockClient.query.mockResolvedValue({
+      data: [{ _id: 'c1' }],
+      next: true,
+      bookmark: 'bmk1'
+    })
+
+    let hookResult
+    const TestComponent = ({ query }) => {
+      hookResult = useFetchConversations({ query })
+      return null
+    }
+
+    let rerender
+    act(() => {
+      const utils = render(<TestComponent query={initialQuery} />)
+      rerender = utils.rerender
+    })
+
+    await act(async () => {
+      await new Promise(resolve => setTimeout(resolve, 10))
+    })
+    expect(hookResult.conversations).toHaveLength(1)
+
+    // Render with new query
+    mockClient.query.mockResolvedValueOnce({
+      data: [{ _id: 'c2' }],
+      next: false,
+      bookmark: null
+    })
+
+    act(() => {
+      rerender(<TestComponent query={newQuery} />)
+    })
+
+    // It should immediately be loading and wipe state
+    expect(hookResult.isLoading).toBe(true)
+
+    await act(async () => {
+      await new Promise(resolve => setTimeout(resolve, 10))
+    })
+
+    // Now populated with new query results
+    expect(hookResult.conversations[0]._id).toBe('c2')
+    expect(mockClient.query).toHaveBeenCalledTimes(2)
+  })
+
+  it('ignores stale responses using request IDs', async () => {
+    // We simulate a slow response that resolves AFTER a fast response
+    // First request is slow
+    const slowResponsePromise = new Promise(resolve => {
+      setTimeout(() => resolve({ data: [{ _id: 'stale' }], next: false }), 50)
+    })
+
+    // Second request is fast
+    const fastResponsePromise = Promise.resolve({
+      data: [{ _id: 'fresh' }],
+      next: false
+    })
+
+    mockClient.query
+      .mockReturnValueOnce(slowResponsePromise)
+      .mockReturnValueOnce(fastResponsePromise)
+
+    let hookResult
+    const TestComponent = ({ query }) => {
+      hookResult = useFetchConversations({ query })
+      return null
+    }
+
+    let rerender
+    act(() => {
+      const utils = render(<TestComponent query="query1" />)
+      rerender = utils.rerender
+    })
+
+    // Immediately trigger a new query
+    act(() => {
+      rerender(<TestComponent query="query2" />)
+    })
+
+    // Wait for the fast response to resolve
+    await act(async () => {
+      await new Promise(resolve => setTimeout(resolve, 10))
+    })
+
+    // Ensure it's the fresh data
+    expect(hookResult.conversations[0]._id).toBe('fresh')
+
+    // Wait a bit longer for the slow response to resolve
+    await act(async () => {
+      await new Promise(resolve => setTimeout(resolve, 60))
+    })
+
+    // Data should not have been overwritten by the stale response
+    expect(hookResult.conversations[0]._id).toBe('fresh')
+  })
+})
diff --git a/packages/cozy-search/src/locales/en.json b/packages/cozy-search/src/locales/en.json
index e63b43012c..d26e48b7f0 100644
--- a/packages/cozy-search/src/locales/en.json
+++ b/packages/cozy-search/src/locales/en.json
@@ -26,12 +26,16 @@
     },
     "sidebar": {
       "create_new": "New Chat",
+      "toggle_sidebar": "Toggle sidebar",
+      "toggle_search": "Toggle search",
+      "close_sidebar": "Close sidebar",
       "recent_chats": "Recent Chats",
       "conversation": {
         "actions": {
           "delete": "Delete",
           "rename": "Rename",
-          "share": "Share"
+          "share": "Share",
+          "load_more": "Load more"
         }
       }
     },
@@ -46,7 +50,10 @@
       "placeholder": "Search in your conversations...",
       "new_chat": "New Chat",
       "recent": "Recent Conversations",
-      "older": "Older"
+      "older": "Older",
+      "not_found_title": "No conversations found",
+      "not_found_desc": "Click \"New Chat\" to begin a conversation or select from your recent chats",
+      "close": "Close"
     },
     "message": {
       "welcome": "How can I help you today?",
@@ -77,7 +84,8 @@
       "sent": "Sent",
       "draft": "Draft",
       "outbox": "Outbox",
-      "spam": "Spam"
+      "spam": "Spam",
+      "search_in": "Search in"
     }
   },
   "assistant_create": {
diff --git a/packages/cozy-search/src/locales/fr.json b/packages/cozy-search/src/locales/fr.json
index 2658a4d41f..8fbf7ac6ed 100644
--- a/packages/cozy-search/src/locales/fr.json
+++ b/packages/cozy-search/src/locales/fr.json
@@ -26,12 +26,16 @@
     },
     "sidebar": {
       "create_new": "Nouveau chat",
+      "toggle_sidebar": "Basculer la barre latérale",
+      "toggle_search": "Basculer la recherche",
+      "close_sidebar": "Fermer la barre latérale",
       "recent_chats": "Conversations récentes",
       "conversation": {
         "actions": {
           "delete": "Supprimer",
           "rename": "Renommer",
-          "share": "Partager"
+          "share": "Partager",
+          "load_more": "Charger plus"
         }
       }
     },
@@ -46,7 +50,10 @@
       "placeholder": "Rechercher dans vos conversations...",
       "new_chat": "Nouvelle conversation",
       "recent": "Conversations récentes",
-      "older": "Plus ancien"
+      "older": "Plus ancien",
+      "not_found_title": "Aucune conversation trouvée",
+      "not_found_desc": "Cliquez sur \"Nouvelle conversation\" pour commencer une conversation ou sélectionnez parmi vos discussions récentes",
+      "close": "Fermer"
     },
     "message": {
       "welcome": "Comment puis-je vous aider aujourd'hui ?",
@@ -77,7 +84,8 @@
       "sent": "Envoyé",
       "draft": "Brouillon",
       "outbox": "Boîte d'envoi",
-      "spam": "Spam"
+      "spam": "Spam",
+      "search_in": "Rechercher dans"
     }
   },
   "assistant_create": {
diff --git a/packages/cozy-search/src/locales/ru.json b/packages/cozy-search/src/locales/ru.json
index aa9b066e19..ab716943c6 100644
--- a/packages/cozy-search/src/locales/ru.json
+++ b/packages/cozy-search/src/locales/ru.json
@@ -19,12 +19,16 @@
     },
     "sidebar": {
       "create_new": "Новый чат",
+      "toggle_sidebar": "Переключить боковую панель",
+      "toggle_search": "Переключить поиск",
+      "close_sidebar": "Закрыть боковую панель",
       "recent_chats": "Недавние переписки",
       "conversation": {
         "actions": {
           "delete": "Удалить",
           "rename": "Переименовать",
-          "share": "Поделиться"
+          "share": "Поделиться",
+          "load_more": "Загрузить еще"
         }
       }
     },
@@ -39,7 +43,10 @@
       "placeholder": "Поиск в переписках...",
       "new_chat": "Новый чат",
       "recent": "Недавние переписки",
-      "older": "Старые"
+      "older": "Старые",
+      "not_found_title": "Переписок не найдено",
+      "not_found_desc": "Нажмите \"Новый чат\", чтобы начать переписку, или выберите из ваших недавних переписок",
+      "close": "Закрыть"
     },
     "actions": {
       "copy": "Копировать",
@@ -77,7 +84,8 @@
       "sent": "Отправленные",
       "draft": "Черновики",
       "outbox": "Исходящие",
-      "spam": "Спам"
+      "spam": "Спам",
+      "search_in": "Поиск в"
     }
   },
   "assistant_create": {
diff --git a/packages/cozy-search/src/locales/vi.json b/packages/cozy-search/src/locales/vi.json
index 2318e35910..22ff6b3233 100644
--- a/packages/cozy-search/src/locales/vi.json
+++ b/packages/cozy-search/src/locales/vi.json
@@ -26,12 +26,16 @@
     },
     "sidebar": {
       "create_new": "Cuộc trò chuyện mới",
+      "toggle_sidebar": "Bật/tắt thanh bên",
+      "toggle_search": "Bật/tắt tìm kiếm",
+      "close_sidebar": "Đóng thanh bên",
       "recent_chats": "Cuộc trò chuyện gần đây",
       "conversation": {
         "actions": {
           "delete": "Xóa",
           "rename": "Đổi tên",
-          "share": "Chia sẻ"
+          "share": "Chia sẻ",
+          "load_more": "Tải thêm"
         }
       }
     },
@@ -50,7 +54,10 @@
       "placeholder": "Tìm kiếm trong các cuộc trò chuyện...",
       "new_chat": "Cuộc trò chuyện mới",
       "recent": "Cuộc trò chuyện gần đây",
-      "older": "Cũ hơn"
+      "older": "Cũ hơn",
+      "not_found_title": "Không tìm thấy cuộc trò chuyện nào",
+      "not_found_desc": "Nhấp vào \"Cuộc trò chuyện mới\" để bắt đầu một cuộc trò chuyện hoặc chọn từ các cuộc trò chuyện gần đây của bạn",
+      "close": "Đóng"
     },
     "twake_knowledges": {
       "chat": "Chat",
@@ -77,7 +84,8 @@
       "sent": "Đã gửi",
       "draft": "Nháp",
       "outbox": "Hộp thư đi",
-      "spam": "Thư rác"
+      "spam": "Thư rác",
+      "search_in": "Tìm kiếm trong"
     }
   },
   "assistant_create": {
diff --git a/packages/cozy-search/tests/jest.config.js b/packages/cozy-search/tests/jest.config.js
index 99ae05bde4..f14548379a 100644
--- a/packages/cozy-search/tests/jest.config.js
+++ b/packages/cozy-search/tests/jest.config.js
@@ -9,6 +9,7 @@ const config = {
   coveragePathIgnorePatterns: ['./tests'],
   rootDir: '../',
   testMatch: ['./**/*.spec.{ts,tsx,js}'],
+  testPathIgnorePatterns: ['/node_modules/', '/dist/'],
   coverageThreshold: {
     global: {
       branches: 80,
diff --git a/yarn.lock b/yarn.lock
index 9f9d529409..f7f81fa4ee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15705,15 +15705,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"class-variance-authority@npm:^0.7.1":
-  version: 0.7.1
-  resolution: "class-variance-authority@npm:0.7.1"
-  dependencies:
-    clsx: "npm:^2.1.1"
-  checksum: 10c0/0f438cea22131808b99272de0fa933c2532d5659773bfec0c583de7b3f038378996d3350683426b8e9c74a6286699382106d71fbec52f0dd5fbb191792cccb5b
-  languageName: node
-  linkType: hard
-
 "classnames@npm:^2.2.5, classnames@npm:^2.2.6, classnames@npm:^2.5.1":
   version: 2.5.1
   resolution: "classnames@npm:2.5.1"
@@ -15902,13 +15893,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"clsx@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "clsx@npm:2.1.1"
-  checksum: 10c0/c4c8eb865f8c82baab07e71bfa8897c73454881c4f99d6bc81585aecd7c441746c1399d08363dc096c550cceaf97bd4ce1e8854e1771e9998d9f94c4fe075839
-  languageName: node
-  linkType: hard
-
 "cmd-shim@npm:6.0.3, cmd-shim@npm:^6.0.0":
   version: 6.0.3
   resolution: "cmd-shim@npm:6.0.3"
@@ -17994,9 +17978,7 @@ __metadata:
     babel-plugin-module-resolver: "npm:^4.0.0"
     babel-plugin-tsconfig-paths: "npm:^1.0.3"
     babel-preset-cozy-app: "npm:^2.8.4"
-    class-variance-authority: "npm:^0.7.1"
     classnames: "npm:^2.5.1"
-    clsx: "npm:^2.1.1"
     cozy-bar: "npm:^29.0.0"
     cozy-client: "npm:^60.21.0"
     cozy-device-helper: "npm:^4.0.3"
@@ -18011,7 +17993,6 @@ __metadata:
     cross-fetch: "npm:^4.0.0"
     jest: "npm:27.5.1"
     lodash: "npm:^4.17.21"
-    lucide-react: "npm:^0.563.0"
     mime-types: "npm:2.1.35"
     react: "npm:18.2.0"
     react-dom: "npm:18.2.0"
@@ -29438,15 +29419,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lucide-react@npm:^0.563.0":
-  version: 0.563.0
-  resolution: "lucide-react@npm:0.563.0"
-  peerDependencies:
-    react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0
-  checksum: 10c0/4a2027be255755d64ce18040062426dec07a5da920c000d9cd330e383fa10716a584c927dc03e91daccc6e05f6f486d4f49d1bd009e5f7763aa6fcf704806554
-  languageName: node
-  linkType: hard
-
 "lunr@npm:^2.3.6":
   version: 2.3.6
   resolution: "lunr@npm:2.3.6"