diff --git a/front/components/EmptyCallToAction.tsx b/front/components/EmptyCallToAction.tsx
index 2f4ae58143f8..4074b268422a 100644
--- a/front/components/EmptyCallToAction.tsx
+++ b/front/components/EmptyCallToAction.tsx
@@ -1,4 +1,4 @@
-import { Button } from "@dust-tt/sparkle";
+import { Button, PlusIcon } from "@dust-tt/sparkle";
 import Link from "next/link";
 import type { ComponentType, MouseEvent } from "react";
 import React from "react";
@@ -8,7 +8,7 @@ import { classNames } from "@app/lib/utils";
 export function EmptyCallToAction({
   label,
   disabled = false,
-  icon,
+  icon = PlusIcon,
   href,
   onClick,
 }: {
@@ -21,7 +21,7 @@ export function EmptyCallToAction({
   const button = (
     <Button
       disabled={disabled}
-      size="sm"
+      size="md"
       label={label}
       variant="primary"
       icon={icon}
@@ -31,7 +31,7 @@ export function EmptyCallToAction({
   return (
     <div
       className={classNames(
-        "flex h-full min-h-40 items-center justify-center rounded-lg bg-structure-50"
+        "flex h-full min-h-48 items-center justify-center rounded-lg bg-structure-50"
       )}
     >
       {href ? <Link href={href}>{button}</Link> : button}
diff --git a/front/components/assistant_builder/ActionScreen.tsx b/front/components/assistant_builder/ActionScreen.tsx
index afcd08103cc9..879d1efd52f2 100644
--- a/front/components/assistant_builder/ActionScreen.tsx
+++ b/front/components/assistant_builder/ActionScreen.tsx
@@ -195,12 +195,6 @@ export default function ActionScreen({
     }
   };
 
-  const noDataSources = !(
-    configurableDataSources.length === 0 &&
-    Object.keys(builderState.dataSourceConfigurations).length === 0
-  );
-  const noDustApp = dustApps.length === 0;
-
   return (
     <>
       <AssistantBuilderDustAppModal
@@ -340,137 +334,142 @@ export default function ActionScreen({
 
         {getActionType(builderState.actionMode) === "USE_DATA_SOURCES" && (
           <>
-            {noDataSources ? (
-              <ContentMessage
-                title="You don't have any Data source available"
-                variant="warning"
-              >
-                <div className="flex flex-col gap-y-3">
-                  {(() => {
-                    switch (owner.role) {
-                      case "admin":
-                        return (
-                          <div>
-                            <strong>
-                              Visit the "Connections", "Websites" and "Folders"
-                              sections in the Build panel to add new data
-                              sources.
-                            </strong>
-                          </div>
-                        );
-                      case "builder":
-                        return (
-                          <div>
-                            <strong>
-                              Only Admins can activate Connections. You can add
-                              Data Sources by visiting the "Websites" and
-                              "Folders" sections in the Build panel.
-                            </strong>
-                          </div>
-                        );
-                      case "user":
-                        return (
-                          <div>
-                            <strong>
-                              Contact an Admin or Builder to activate
-                              Connections, add public Websites or create
-                              Folders.
-                            </strong>
-                          </div>
-                        );
-                      case "none":
-                        return <></>;
-                      default:
-                        assertNever(owner.role);
+            <div className="flex flex-row items-center space-x-2">
+              <div className="text-sm font-semibold text-element-900">
+                Method:
+              </div>
+              <DropdownMenu>
+                <DropdownMenu.Button>
+                  <Button
+                    type="select"
+                    labelVisible={true}
+                    label={
+                      SEARCH_MODE_SPECIFICATIONS[
+                        getSearchMode(builderState.actionMode)
+                      ].label
                     }
-                  })()}
-                </div>
-              </ContentMessage>
-            ) : (
-              <div className="flex flex-row items-center space-x-2">
-                <div className="text-sm font-semibold text-element-900">
-                  Method:
-                </div>
-                <DropdownMenu>
-                  <DropdownMenu.Button>
-                    <Button
-                      type="select"
-                      labelVisible={true}
-                      label={
-                        SEARCH_MODE_SPECIFICATIONS[
-                          getSearchMode(builderState.actionMode)
-                        ].label
-                      }
-                      icon={
-                        SEARCH_MODE_SPECIFICATIONS[
-                          getSearchMode(builderState.actionMode)
-                        ].icon
-                      }
-                      variant="tertiary"
-                      hasMagnifying={false}
-                      size="sm"
+                    icon={
+                      SEARCH_MODE_SPECIFICATIONS[
+                        getSearchMode(builderState.actionMode)
+                      ].icon
+                    }
+                    variant="tertiary"
+                    hasMagnifying={false}
+                    size="sm"
+                  />
+                </DropdownMenu.Button>
+                <DropdownMenu.Items origin="topLeft" width={260}>
+                  {SEARCH_MODES.filter((key) => {
+                    const flag = SEARCH_MODE_SPECIFICATIONS[key].flag;
+                    console.log(owner.flags);
+                    return flag === null || owner.flags.includes(flag);
+                  }).map((key) => (
+                    <DropdownMenu.Item
+                      key={key}
+                      label={SEARCH_MODE_SPECIFICATIONS[key].label}
+                      icon={SEARCH_MODE_SPECIFICATIONS[key].icon}
+                      description={SEARCH_MODE_SPECIFICATIONS[key].description}
+                      onClick={() => {
+                        setEdited(true);
+                        setBuilderState((state) => ({
+                          ...state,
+                          actionMode:
+                            SEARCH_MODE_SPECIFICATIONS[key].actionMode,
+                        }));
+                      }}
                     />
-                  </DropdownMenu.Button>
-                  <DropdownMenu.Items origin="topLeft" width={260}>
-                    {SEARCH_MODES.filter((key) => {
-                      const flag = SEARCH_MODE_SPECIFICATIONS[key].flag;
-                      console.log(owner.flags);
-                      return flag === null || owner.flags.includes(flag);
-                    }).map((key) => (
-                      <DropdownMenu.Item
-                        key={key}
-                        label={SEARCH_MODE_SPECIFICATIONS[key].label}
-                        icon={SEARCH_MODE_SPECIFICATIONS[key].icon}
-                        description={
-                          SEARCH_MODE_SPECIFICATIONS[key].description
-                        }
-                        onClick={() => {
-                          setEdited(true);
-                          setBuilderState((state) => ({
-                            ...state,
-                            actionMode:
-                              SEARCH_MODE_SPECIFICATIONS[key].actionMode,
-                          }));
-                        }}
-                      />
-                    ))}
-                  </DropdownMenu.Items>
-                </DropdownMenu>
-              </div>
-            )}
+                  ))}
+                </DropdownMenu.Items>
+              </DropdownMenu>
+            </div>
+            {configurableDataSources.length === 0 &&
+              Object.keys(builderState.dataSourceConfigurations).length ===
+                0 && (
+                <ContentMessage title="You don't have any active Data source">
+                  <div className="flex flex-col gap-y-3">
+                    <div>
+                      Assistants can incorporate existing company data and
+                      knowledge to formulate answers.
+                    </div>
+                    <div>
+                      There are two types of data sources:{" "}
+                      <strong>Folders</strong> (Files you can upload) and{" "}
+                      <strong>Connections</strong> (Automatically synchronized
+                      with platforms like Notion, Slack, ...).
+                    </div>
+                    {(() => {
+                      switch (owner.role) {
+                        case "admin":
+                          return (
+                            <div>
+                              <strong>
+                                Visit the "Connections" and "Folders" sections
+                                in the Assistants panel to add new data sources.
+                              </strong>
+                            </div>
+                          );
+                        case "builder":
+                          return (
+                            <div>
+                              <strong>
+                                Only Admins can activate Connections.
+                                <br />
+                                You can add Data Sources by visiting "Folders"
+                                in the Assistants panel.
+                              </strong>
+                            </div>
+                          );
+                        case "user":
+                          return (
+                            <div>
+                              <strong>
+                                Only Admins and Builders can activate
+                                Connections or create Folders.
+                              </strong>
+                            </div>
+                          );
+                        case "none":
+                          return <></>;
+                        default:
+                          ((x: never) => {
+                            throw new Error("Unkonwn role " + x);
+                          })(owner.role);
+                      }
+                    })()}
+                  </div>
+                </ContentMessage>
+              )}
           </>
         )}
 
         <ActionModeSection show={builderState.actionMode === "GENERIC"}>
-          <div className="pb-16"></div>
-        </ActionModeSection>
-
-        <ActionModeSection
-          show={
-            builderState.actionMode === "RETRIEVAL_SEARCH" && !noDataSources
-          }
-        >
-          <DataSourceSelectionSection
-            dataSourceConfigurations={builderState.dataSourceConfigurations}
-            openDataSourceModal={() => {
-              setShowDataSourcesModal(true);
-            }}
-            canAddDataSource={configurableDataSources.length > 0}
-            onManageDataSource={(name) => {
-              setDataSourceToManage(
-                builderState.dataSourceConfigurations[name]
-              );
-              setShowDataSourcesModal(true);
-            }}
-            onDelete={deleteDataSource}
-          />
+          <div className="text-sm text-element-700">
+            No action is set. The assistant will use the instructions only to
+            answer.
+          </div>
         </ActionModeSection>
 
         <ActionModeSection
-          show={
-            builderState.actionMode === "RETRIEVAL_EXHAUSTIVE" && !noDataSources
-          }
+          show={builderState.actionMode === "RETRIEVAL_EXHAUSTIVE"}
         >
+          <div>
+            The assistant will include as many documents as possible from the
+            data sources, using reverse chronological order.
+          </div>
+          <div className="grid grid-cols-2 gap-8">
+            <div className="col-span-1">
+              <strong>
+                <span className="text-warning-500">Warning!</span> Assistants
+                are limited in the amount of data they can process.
+              </strong>{" "}
+              Select data sources with care, and limit processing to the
+              shortest relevant time frame.
+            </div>
+            <div className="col-span-1">
+              <strong>Note:</strong> The available data sources are managed by
+              administrators.
+            </div>
+          </div>
           <DataSourceSelectionSection
             dataSourceConfigurations={builderState.dataSourceConfigurations}
             openDataSourceModal={() => {
@@ -548,13 +547,80 @@ export default function ActionScreen({
         </ActionModeSection>
 
         <ActionModeSection
-          show={builderState.actionMode === "TABLES_QUERY" && !noDataSources}
+          show={builderState.actionMode === "RETRIEVAL_SEARCH"}
         >
+          <div>
+            The assistant will perform a search on the selected data sources,
+            and run the instructions on the results.{" "}
+            <span className="font-semibold">
+              It’s the best approach with large quantities of data.
+            </span>
+          </div>
+          <div className="grid grid-cols-2 gap-4">
+            <div>
+              <p>
+                <strong>Select your sources with care</strong> The quality of
+                the answers to specific questions will depend on the quality of
+                the data.
+              </p>
+              <p className="mt-1">
+                <strong>
+                  You can narrow your search on most recent documents
+                </strong>{" "}
+                by adding instructions in your prompt such as 'Only search in
+                documents from the last 3 months', 'Only look at data from the
+                last 2 days', etc.
+              </p>
+            </div>
+            <div>
+              <p>
+                <strong>Note:</strong> The available data sources are managed by
+                administrators.
+              </p>
+            </div>
+          </div>
+
+          <DataSourceSelectionSection
+            dataSourceConfigurations={builderState.dataSourceConfigurations}
+            openDataSourceModal={() => {
+              setShowDataSourcesModal(true);
+            }}
+            canAddDataSource={configurableDataSources.length > 0}
+            onManageDataSource={(name) => {
+              setDataSourceToManage(
+                builderState.dataSourceConfigurations[name]
+              );
+              setShowDataSourcesModal(true);
+            }}
+            onDelete={deleteDataSource}
+          />
+        </ActionModeSection>
+
+        <ActionModeSection show={builderState.actionMode === "DUST_APP_RUN"}>
+          <div className="text-sm text-element-700">
+            The assistant will execute a Dust Application of your design before
+            answering. The output of the app (last block) is injected in context
+            for the model to generate an answer. The inputs of the app will be
+            automatically generated from the context of the conversation based
+            on the descriptions you provided in the application's input block
+            dataset schema.
+          </div>
+          <DustAppSelectionSection
+            show={builderState.actionMode === "DUST_APP_RUN"}
+            dustAppConfiguration={builderState.dustAppConfiguration}
+            openDustAppModal={() => {
+              setShowDustAppsModal(true);
+            }}
+            onDelete={deleteDustApp}
+            canSelectDustApp={dustApps.length !== 0}
+          />
+        </ActionModeSection>
+
+        <ActionModeSection show={builderState.actionMode === "TABLES_QUERY"}>
           <div className="text-sm text-element-700">
             The assistant will generate a SQL query from your request, execute
             it on the tables selected and use the results to generate an answer.
           </div>
-
           <TablesSelectionSection
             show={builderState.actionMode === "TABLES_QUERY"}
             tablesQueryConfiguration={builderState.tablesQueryConfiguration}
@@ -575,72 +641,6 @@ export default function ActionScreen({
             canSelectTable={dataSources.length !== 0}
           />
         </ActionModeSection>
-
-        <ActionModeSection show={builderState.actionMode === "DUST_APP_RUN"}>
-          {noDustApp ? (
-            <ContentMessage
-              title="You don't have any Dust Application available"
-              variant="warning"
-            >
-              <div className="flex flex-col gap-y-3">
-                {(() => {
-                  switch (owner.role) {
-                    case "admin":
-                    case "builder":
-                      return (
-                        <div>
-                          <strong>
-                            Visit the "Developer Tools" section in the Build
-                            panel to build your first Dust Application.
-                          </strong>
-                        </div>
-                      );
-                    case "user":
-                      return (
-                        <div>
-                          <strong>
-                            Only Admins and Builders can build Dust
-                            Applications.
-                          </strong>
-                        </div>
-                      );
-                    case "none":
-                      return <></>;
-                    default:
-                      assertNever(owner.role);
-                  }
-                })()}
-              </div>
-            </ContentMessage>
-          ) : (
-            <>
-              <div className="text-sm text-element-700">
-                The assistant will execute a{" "}
-                <a
-                  className="font-bold"
-                  href="https://docs.dust.tt"
-                  target="_blank"
-                >
-                  Dust Application
-                </a>{" "}
-                of your design before replying. The output of the app (last
-                block) is injected in context for the model to generate an
-                answer. The inputs of the app will be automatically generated
-                from the context of the conversation based on the descriptions
-                you provided in the application's input block dataset schema.
-              </div>
-              <DustAppSelectionSection
-                show={builderState.actionMode === "DUST_APP_RUN"}
-                dustAppConfiguration={builderState.dustAppConfiguration}
-                openDustAppModal={() => {
-                  setShowDustAppsModal(true);
-                }}
-                onDelete={deleteDustApp}
-                canSelectDustApp={dustApps.length !== 0}
-              />
-            </>
-          )}
-        </ActionModeSection>
       </div>
     </>
   );
diff --git a/front/components/assistant_builder/AssistantBuilder.tsx b/front/components/assistant_builder/AssistantBuilder.tsx
index 2647d2fecb32..d9de3cabb401 100644
--- a/front/components/assistant_builder/AssistantBuilder.tsx
+++ b/front/components/assistant_builder/AssistantBuilder.tsx
@@ -552,15 +552,36 @@ export default function AssistantBuilder({
                 );
               case "actions":
                 return (
-                  <ActionScreen
-                    owner={owner}
-                    builderState={builderState}
-                    setBuilderState={setBuilderState}
-                    setEdited={setEdited}
-                    dataSources={dataSources}
-                    dustApps={dustApps}
-                    timeFrameError={timeFrameError}
-                  />
+                  <>
+                    <ActionScreen
+                      owner={owner}
+                      builderState={builderState}
+                      setBuilderState={setBuilderState}
+                      setEdited={setEdited}
+                      dataSources={dataSources}
+                      dustApps={dustApps}
+                      timeFrameError={timeFrameError}
+                    />
+                    <div className="flex flex-row items-start pt-8">
+                      <div className="flex flex-col gap-4">
+                        {slackDataSource &&
+                          isBuilder(owner) &&
+                          builderState.scope !== "private" &&
+                          initialBuilderState?.scope !== "private" && (
+                            <SlackIntegration
+                              slackDataSource={slackDataSource}
+                              owner={owner}
+                              onSave={(channels) => {
+                                setEdited(true);
+                                setSelectedSlackChannels(channels);
+                              }}
+                              existingSelection={selectedSlackChannels}
+                              assistantHandle={builderState.handle ?? undefined}
+                            />
+                          )}
+                      </div>
+                    </div>
+                  </>
                 );
               case "naming":
                 return (
@@ -1035,7 +1056,6 @@ function TryModalInBuilder({
   );
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function SlackIntegration({
   slackDataSource,
   owner,
diff --git a/front/components/assistant_builder/DataSourceSelectionSection.tsx b/front/components/assistant_builder/DataSourceSelectionSection.tsx
index 469a342e431a..df564dcf06c4 100644
--- a/front/components/assistant_builder/DataSourceSelectionSection.tsx
+++ b/front/components/assistant_builder/DataSourceSelectionSection.tsx
@@ -3,6 +3,7 @@ import {
   CloudArrowDownIcon,
   Cog6ToothIcon,
   ContextItem,
+  PlusIcon,
   TrashIcon,
 } from "@dust-tt/sparkle";
 
@@ -29,8 +30,11 @@ export default function DataSourceSelectionSection({
   onDelete?: (name: string) => void;
 }) {
   return (
-    <div className="overflow-hidden pt-6">
+    <div className="overflow-hidden">
       <div className="flex flex-row items-start">
+        <div className="pb-3 text-sm font-bold text-element-900">
+          Select Data Sources:
+        </div>
         <div className="flex-grow" />
         {Object.keys(dataSourceConfigurations).length > 0 && (
           <Button
@@ -38,6 +42,7 @@ export default function DataSourceSelectionSection({
             label="Add data sources"
             variant="primary"
             size="sm"
+            icon={PlusIcon}
             onClick={openDataSourceModal}
             disabled={!canAddDataSource}
             hasMagnifying={false}
@@ -46,9 +51,9 @@ export default function DataSourceSelectionSection({
       </div>
       {!Object.keys(dataSourceConfigurations).length ? (
         <EmptyCallToAction
-          label="Select Data Sources"
-          onClick={openDataSourceModal}
+          label="Add Data Sources"
           disabled={!canAddDataSource}
+          onClick={openDataSourceModal}
         />
       ) : (
         <ContextItem.List className="mt-6 border-b border-t border-structure-200">
diff --git a/front/components/assistant_builder/DustAppSelectionSection.tsx b/front/components/assistant_builder/DustAppSelectionSection.tsx
index 7c76061f6f2e..e60dd6dd1e43 100644
--- a/front/components/assistant_builder/DustAppSelectionSection.tsx
+++ b/front/components/assistant_builder/DustAppSelectionSection.tsx
@@ -41,6 +41,11 @@ export default function DustAppSelectionSection({
       }}
     >
       <div>
+        <div className="flex flex-row items-start">
+          <div className="pb-3 text-sm font-bold text-element-900">
+            Select a Dust App:
+          </div>
+        </div>
         {!dustAppConfiguration ? (
           <EmptyCallToAction
             label="Select Dust App"
diff --git a/front/components/assistant_builder/TablesSelectionSection.tsx b/front/components/assistant_builder/TablesSelectionSection.tsx
index 4c46958fa585..1e43b82e803f 100644
--- a/front/components/assistant_builder/TablesSelectionSection.tsx
+++ b/front/components/assistant_builder/TablesSelectionSection.tsx
@@ -44,6 +44,9 @@ export default function TablesSelectionSection({
     >
       <div>
         <div className="flex flex-row items-start">
+          <div className="pb-3 text-sm font-bold text-element-900">
+            Select Tables:
+          </div>
           <div className="flex-grow" />
           {Object.keys(tablesQueryConfiguration).length > 0 && (
             <Button
@@ -60,7 +63,7 @@ export default function TablesSelectionSection({
         </div>
         {!Object.keys(tablesQueryConfiguration).length ? (
           <EmptyCallToAction
-            label="Select Tables"
+            label="Add Tables"
             disabled={!canSelectTable}
             onClick={openTableModal}
           />
diff --git a/front/pages/w/[wId]/builder/assistants/index.tsx b/front/pages/w/[wId]/builder/assistants/index.tsx
index 028a8b86c05f..07dacea504d4 100644
--- a/front/pages/w/[wId]/builder/assistants/index.tsx
+++ b/front/pages/w/[wId]/builder/assistants/index.tsx
@@ -251,7 +251,6 @@ export default function WorkspaceAssistants({
                   <EmptyCallToAction
                     href={`/w/${owner.sId}/builder/assistants/new?flow=workspace_assistants`}
                     label="Create an Assistant"
-                    icon={PlusIcon}
                   />
                 </div>
               )
diff --git a/front/pages/w/[wId]/builder/data-sources/public-urls.tsx b/front/pages/w/[wId]/builder/data-sources/public-urls.tsx
index ced61cce5fdb..e7ed7077c078 100644
--- a/front/pages/w/[wId]/builder/data-sources/public-urls.tsx
+++ b/front/pages/w/[wId]/builder/data-sources/public-urls.tsx
@@ -174,7 +174,6 @@ export default function DataSourcesView({
           <EmptyCallToAction
             label="Create a new Public URL"
             onClick={handleCreateDataSource}
-            icon={PlusIcon}
           />
         )}
 
diff --git a/front/pages/w/[wId]/builder/data-sources/static.tsx b/front/pages/w/[wId]/builder/data-sources/static.tsx
index acef9ec705a7..00a79eb97286 100644
--- a/front/pages/w/[wId]/builder/data-sources/static.tsx
+++ b/front/pages/w/[wId]/builder/data-sources/static.tsx
@@ -146,7 +146,6 @@ export default function DataSourcesView({
         ) : (
           <EmptyCallToAction
             label="Create a new Folder"
-            icon={PlusIcon}
             onClick={async () => {
               await handleCreateDataSource();
             }}