diff --git a/src/components/AppWrapper.jsx b/src/components/AppWrapper.jsx
index e0bc2f989..36b42de31 100644
--- a/src/components/AppWrapper.jsx
+++ b/src/components/AppWrapper.jsx
@@ -16,7 +16,7 @@ import configureStore from 'store/configureStore'
 import { RealtimePlugin } from 'cozy-realtime'
 // import { isFlagshipApp } from 'cozy-device-helper'
 
-import { DataProxyProvider } from 'dataproxy/DataProxyProvider'
+import { DataProxyProvider } from 'cozy-dataproxy-lib'
 import { useWallpaperContext } from 'hooks/useWallpaperContext'
 
 import schema from '../schema'
diff --git a/src/components/Assistant/AssistantDesktopWrapper.jsx b/src/components/Assistant/AssistantDesktopWrapper.jsx
new file mode 100644
index 000000000..784344fb9
--- /dev/null
+++ b/src/components/Assistant/AssistantDesktopWrapper.jsx
@@ -0,0 +1,24 @@
+import React from 'react'
+
+import CozyTheme from 'cozy-ui/transpiled/react/providers/CozyTheme'
+
+import { AssistantDesktop } from 'cozy-dataproxy-lib'
+
+export const AssistantDesktopWrapper = () => {
+  return (
+    <CozyTheme variant="normal">
+      <div className="app-list-wrapper u-mh-auto u-mb-3">
+        <AssistantDesktop
+          componentsProps={{
+            SearchBarDesktop: {
+              elevation: true,
+              hasHalfBorderRadius: true
+            }
+          }}
+        />
+      </div>
+    </CozyTheme>
+  )
+}
+
+export default AssistantDesktopWrapper
diff --git a/src/components/Assistant/AssistantMobileWrapper.jsx b/src/components/Assistant/AssistantMobileWrapper.jsx
new file mode 100644
index 000000000..f85f2e738
--- /dev/null
+++ b/src/components/Assistant/AssistantMobileWrapper.jsx
@@ -0,0 +1,39 @@
+import cx from 'classnames'
+import React from 'react'
+
+import { getFlagshipMetadata } from 'cozy-device-helper'
+import flag from 'cozy-flags'
+
+import CozyTheme, {
+  useCozyTheme
+} from 'cozy-ui/transpiled/react/providers/CozyTheme'
+
+import styles from './styles.styl'
+
+import { useWallpaperContext } from 'hooks/useWallpaperContext'
+import { AssistantMobile } from 'cozy-dataproxy-lib'
+
+export const AssistantMobileWrapper = () => {
+  const { type } = useCozyTheme()
+
+  const {
+    data: { isCustomWallpaper }
+  } = useWallpaperContext()
+
+  return (
+    <CozyTheme variant="normal">
+      <div
+        className={cx(styles['mobile-assistant'], {
+          [styles[`mobile-assistant--${type}`]]: !isCustomWallpaper,
+          [styles['mobile-assistant--offset']]: flag('home.fab.button.enabled'),
+          [styles['mobile-assistant--immersive']]:
+            getFlagshipMetadata().immersive
+        })}
+      >
+        <AssistantMobile isCustomWallpaper={isCustomWallpaper} />
+      </div>
+    </CozyTheme>
+  )
+}
+
+export default AssistantMobileWrapper
diff --git a/src/components/Assistant/styles.styl b/src/components/Assistant/styles.styl
new file mode 100644
index 000000000..7fb5a8c07
--- /dev/null
+++ b/src/components/Assistant/styles.styl
@@ -0,0 +1,18 @@
+.mobile-assistant
+  position fixed
+  bottom 0
+  right 0
+  left 0
+  padding 1rem
+
+  &--light
+    background-color #E9F4FF
+
+  &--dark
+    background-color #142536
+
+  &--offset
+    padding-right 4.5rem
+
+  &--immersive
+    padding-bottom calc(1rem + var(--flagship-bottom-height))
diff --git a/src/components/Home.jsx b/src/components/Home.jsx
index ef8558f8f..9d77b1b04 100644
--- a/src/components/Home.jsx
+++ b/src/components/Home.jsx
@@ -7,8 +7,8 @@ import { CozyConfirmDialogProvider } from 'cozy-harvest-lib'
 import { getFlagshipMetadata } from 'cozy-device-helper'
 import { Main, Content } from 'cozy-ui/transpiled/react/Layout'
 import { useBreakpoints } from 'cozy-ui/transpiled/react/providers/Breakpoints'
+import { AssistantDesktopWrapper } from 'components/Assistant/AssistantDesktopWrapper'
 
-import AssistantWrapperDesktop from 'assistant/AssistantWrapperDesktop'
 import Applications from 'components/Applications'
 import ScrollToTopOnMount from 'components/ScrollToTopOnMount'
 import Services from 'components/Services'
@@ -28,7 +28,7 @@ const Home = ({ setAppsReady, wrapper }) => {
         <ScrollToTopOnMount target={wrapper} />
         {pathname === '/connected' && <Announcements />}
         {flag('cozy.searchbar.enabled') && !isMobile && (
-          <AssistantWrapperDesktop />
+          <AssistantDesktopWrapper />
         )}
         <Content
           className={cx('u-flex u-flex-column u-ph-1', {
diff --git a/src/containers/App.jsx b/src/containers/App.jsx
index db090c5c6..dfb0bf1ee 100644
--- a/src/containers/App.jsx
+++ b/src/containers/App.jsx
@@ -13,9 +13,9 @@ import Spinner from 'cozy-ui/transpiled/react/Spinner'
 import { Main } from 'cozy-ui/transpiled/react/Layout'
 import { useCozyTheme } from 'cozy-ui/transpiled/react/providers/CozyTheme'
 
-import AssistantWrapperMobile from 'assistant/AssistantWrapperMobile'
-import AssistantDialog from 'assistant/Views/AssistantDialog'
-import SearchDialog from 'assistant/Views/SearchDialog'
+import { AssistantMobileWrapper } from 'components/Assistant/AssistantMobileWrapper'
+import { AssistantDialog } from 'cozy-dataproxy-lib'
+import { SearchDialog } from 'cozy-dataproxy-lib'
 import AddButton from 'components/AddButton/AddButton'
 import Corner from 'components/HeroHeader/Corner'
 import Failure from 'components/Failure'
@@ -199,7 +199,7 @@ const App = ({ accounts, konnectors, triggers }) => {
         </div>
         <FooterLogo />
       </MainView>
-      {showAssistantForMobile && <AssistantWrapperMobile />}
+      {showAssistantForMobile && <AssistantMobileWrapper />}
       {isFlagshipApp() && <DefaultRedirectionSnackbar />}
       {flag(FLAG_FAB_BUTTON_ENABLED) && isMobile && <AddButton />}
     </>