diff --git a/front/components/PlansTables.tsx b/front/components/PlansTables.tsx
index 38abdad81d6c..49e5b338ff80 100644
--- a/front/components/PlansTables.tsx
+++ b/front/components/PlansTables.tsx
@@ -2,6 +2,7 @@ import { Button, PriceTable, RocketIcon, SparklesIcon } from "@dust-tt/sparkle";
 import { Tab } from "@headlessui/react";
 import React from "react";
 
+import { PRO_PLAN_SEAT_29_CODE } from "@app/lib/plans/plan_codes";
 import { classNames } from "@app/lib/utils";
 import { PlanType } from "@app/types/plan";
 
@@ -30,7 +31,7 @@ function FreePriceTable({ size }: { size: "sm" | "xs" }) {
       <PriceTable.Item label="Privacy and Data Security" />
       <PriceTable.Item label="Advanced LLM models (GPT-4, Claude…)" />
       <PriceTable.Item label="Unlimited custom assistants" />
-      <PriceTable.Item label="100 assistant messages" variant="dash" />
+      <PriceTable.Item label="50 assistant messages" variant="dash" />
       <PriceTable.Item label="50 documents as data sources" variant="dash" />
       <PriceTable.Item label="No connections" variant="xmark" />
     </PriceTable>
@@ -74,13 +75,13 @@ function ProPriceTable({
       <PriceTable.Item label="Assistants can execute actions" />
       <PriceTable.Item label="Workspace role and permissions" variant="dash" />
       <PriceTable.ActionContainer>
-        {plan && plan.code !== "PRO_PLAN_SEAT_29" && (
+        {plan.code !== PRO_PLAN_SEAT_29_CODE && (
           <Button
             variant="primary"
             size={biggerButtonSize}
             label="Start now"
             icon={RocketIcon}
-            disabled={isProcessing || plan.code === "PRO_PLAN_SEAT_29"}
+            disabled={isProcessing || plan.code === PRO_PLAN_SEAT_29_CODE}
             onClick={onClick}
           />
         )}
diff --git a/front/lib/plans/enterprise_plans.ts b/front/lib/plans/enterprise_plans.ts
index c9f3dca0d67e..8831809d3c89 100644
--- a/front/lib/plans/enterprise_plans.ts
+++ b/front/lib/plans/enterprise_plans.ts
@@ -1,6 +1,7 @@
 import { Attributes } from "sequelize";
 
 import { Plan } from "@app/lib/models";
+import { ENT_PLAN_FAKE_CODE } from "@app/lib/plans/plan_codes";
 
 export type PlanAttributes = Omit<
   Attributes<Plan>,
@@ -17,10 +18,6 @@ export type PlanAttributes = Omit<
  * As entreprise plans are custom, we won't create them in this file, but directly from Poké.
  */
 
-/**
- * ENT_PLAN_FAKE is not subscribable and is only used to display the Enterprise plan in the UI (hence it's not stored on the db).
- */
-export const ENT_PLAN_FAKE_CODE = "ENT_PLAN_FAKE_CODE";
 export const ENT_PLAN_FAKE_DATA: PlanAttributes = {
   code: ENT_PLAN_FAKE_CODE,
   name: "Entreprise",
diff --git a/front/lib/plans/free_plans.ts b/front/lib/plans/free_plans.ts
index 0dc1ab075225..7faa4817ce8d 100644
--- a/front/lib/plans/free_plans.ts
+++ b/front/lib/plans/free_plans.ts
@@ -1,6 +1,10 @@
 import { Attributes } from "sequelize";
 
 import { Plan } from "@app/lib/models";
+import {
+  FREE_TEST_PLAN_CODE,
+  FREE_UPGRADED_PLAN_CODE,
+} from "@app/lib/plans/plan_codes";
 
 export type PlanAttributes = Omit<
   Attributes<Plan>,
@@ -16,10 +20,6 @@ export type PlanAttributes = Omit<
  * This file about Free plans.
  */
 
-// Current free plans:
-export const FREE_TEST_PLAN_CODE = "FREE_TEST_PLAN";
-export const FREE_UPGRADED_PLAN_CODE = "FREE_UPGRADED_PLAN";
-
 /**
  * FREE_TEST plan is our default plan: this is the plan used by all workspaces until they subscribe to a plan.
  * It is not stored in the database (as we don't create a subsription).
@@ -29,7 +29,7 @@ export const FREE_TEST_PLAN_DATA: PlanAttributes = {
   name: "Free",
   stripeProductId: null,
   billingType: "free",
-  maxMessages: 100,
+  maxMessages: 50,
   maxUsersInWorkspace: 1,
   isSlackbotAllowed: false,
   isManagedSlackAllowed: false,
diff --git a/front/lib/plans/plan_codes.ts b/front/lib/plans/plan_codes.ts
new file mode 100644
index 000000000000..6f62d0b1e043
--- /dev/null
+++ b/front/lib/plans/plan_codes.ts
@@ -0,0 +1,11 @@
+// Current free plans:
+export const FREE_UPGRADED_PLAN_CODE = "FREE_UPGRADED_PLAN";
+export const FREE_TEST_PLAN_CODE = "FREE_TEST_PLAN";
+
+// Current pro plans:
+export const PRO_PLAN_SEAT_29_CODE = "PRO_PLAN_SEAT_29";
+
+/**
+ * ENT_PLAN_FAKE is not subscribable and is only used to display the Enterprise plan in the UI (hence it's not stored on the db).
+ */
+export const ENT_PLAN_FAKE_CODE = "ENT_PLAN_FAKE_CODE";
diff --git a/front/lib/plans/pro_plans.ts b/front/lib/plans/pro_plans.ts
index 2e987d61829c..fa0275fb1082 100644
--- a/front/lib/plans/pro_plans.ts
+++ b/front/lib/plans/pro_plans.ts
@@ -3,6 +3,8 @@ import { Attributes } from "sequelize";
 import { isDevelopment } from "@app/lib/development";
 import { Plan } from "@app/lib/models";
 
+import { PRO_PLAN_SEAT_29_CODE } from "./plan_codes";
+
 export type PlanAttributes = Omit<
   Attributes<Plan>,
   "id" | "createdAt" | "updatedAt"
@@ -17,23 +19,19 @@ export type PlanAttributes = Omit<
  * This file about Pro plans.
  */
 
-// Current pro plans:
-export const PRO_PLAN_MAU_29_CODE = "PRO_PLAN_MAU_29";
-export const PRO_PLAN_FIXED_1000_CODE = "PRO_PLAN_FIXED_1000";
-
 /**
  * Paid plans are stored in the database.
  * We can update existing plans or add new one but never remove anything from this list.
  * Entreprise custom plans will be created from Poké.
  */
 
-const PRO_PLANS_DATA: PlanAttributes[] = [
-  {
-    code: "PRO_PLAN_SEAT_29",
+const PRO_PLANS_DATA: PlanAttributes[] = [];
+
+if (isDevelopment()) {
+  PRO_PLANS_DATA.push({
+    code: PRO_PLAN_SEAT_29_CODE,
     name: "Pro",
-    stripeProductId: isDevelopment()
-      ? "prod_OvrzyxfSDz5Jqd" // Pro plan in Stripe Test env
-      : "prod_OvrkkwZwLUOlpx", // Pro plan in Stripe Prod env
+    stripeProductId: "prod_OwKvN4XrUwFw5a",
     billingType: "per_seat",
     maxMessages: -1,
     maxUsersInWorkspace: 1000,
@@ -45,8 +43,8 @@ const PRO_PLANS_DATA: PlanAttributes[] = [
     maxDataSourcesCount: -1,
     maxDataSourcesDocumentsCount: -1,
     maxDataSourcesDocumentsSizeMb: 2,
-  },
-];
+  });
+}
 
 /**
  * Function to call when we edit something in FREE_PLANS_DATA to update the database. It will create or update the plans.
diff --git a/front/lib/plans/subscription.ts b/front/lib/plans/subscription.ts
index 2d6f8f46e969..48ee7d68a883 100644
--- a/front/lib/plans/subscription.ts
+++ b/front/lib/plans/subscription.ts
@@ -1,12 +1,11 @@
 import { Authenticator } from "@app/lib/auth";
 import { front_sequelize } from "@app/lib/databases";
 import { Plan, Subscription, Workspace } from "@app/lib/models";
+import { FREE_TEST_PLAN_DATA, PlanAttributes } from "@app/lib/plans/free_plans";
 import {
   FREE_TEST_PLAN_CODE,
-  FREE_TEST_PLAN_DATA,
   FREE_UPGRADED_PLAN_CODE,
-  PlanAttributes,
-} from "@app/lib/plans/free_plans";
+} from "@app/lib/plans/plan_codes";
 import {
   createCheckoutSession,
   updateStripeSubscriptionQuantity,
diff --git a/front/migrations/20231023_create_plan_subscriptions.ts b/front/migrations/20231023_create_plan_subscriptions.ts
index 7c73e22a16d1..0a699a372b79 100644
--- a/front/migrations/20231023_create_plan_subscriptions.ts
+++ b/front/migrations/20231023_create_plan_subscriptions.ts
@@ -1,7 +1,7 @@
 import { Op } from "sequelize";
 
 import { Plan, Subscription, Workspace } from "@app/lib/models";
-import { FREE_UPGRADED_PLAN_CODE } from "@app/lib/plans/free_plans";
+import { FREE_UPGRADED_PLAN_CODE } from "@app/lib/plans/plan_codes";
 import { generateModelSId } from "@app/lib/utils";
 
 async function main() {
diff --git a/front/pages/api/stripe/webhook.ts b/front/pages/api/stripe/webhook.ts
index fa0fa7d5784e..10c90c53b347 100644
--- a/front/pages/api/stripe/webhook.ts
+++ b/front/pages/api/stripe/webhook.ts
@@ -101,7 +101,7 @@ async function handler(
               },
               `[Stripe Webhook] Received checkout.session.completed with status "${session.status}". Ignoring event.`
             );
-            return;
+            return res.status(200).json({ success: true });
           }
           if (session.status !== "complete") {
             logger.error(
@@ -113,7 +113,7 @@ async function handler(
               },
               `[Stripe Webhook] Received checkout.session.completed with unkown status "${session.status}". Ignoring event.`
             );
-            return;
+            return res.status(200).json({ success: true });
           }
 
           try {
@@ -142,7 +142,7 @@ async function handler(
               );
             }
 
-            return await front_sequelize.transaction(async (t) => {
+            await front_sequelize.transaction(async (t) => {
               const now = new Date();
               const activeSubscription = await Subscription.findOne({
                 where: { workspaceId: workspace.id, status: "active" },
@@ -188,6 +188,8 @@ async function handler(
                 { transaction: t }
               );
             });
+
+            return res.status(200).json({ success: true });
           } catch (error) {
             logger.error(
               {
@@ -199,6 +201,7 @@ async function handler(
               },
               "Error creating subscription."
             );
+
             return apiError(req, res, {
               status_code: 500,
               api_error: {
@@ -267,7 +270,7 @@ async function handler(
         // Unhandled event type
       }
 
-      return;
+      return res.status(200).json({ success: true });
 
     default:
       return apiError(req, res, {
diff --git a/front/pages/poke/[wId]/index.tsx b/front/pages/poke/[wId]/index.tsx
index 91043bba9999..5f770b7e8d14 100644
--- a/front/pages/poke/[wId]/index.tsx
+++ b/front/pages/poke/[wId]/index.tsx
@@ -10,6 +10,7 @@ import { getDataSources } from "@app/lib/api/data_sources";
 import { Authenticator, getSession, getUserFromSession } from "@app/lib/auth";
 import { ConnectorsAPI } from "@app/lib/connectors_api";
 import { CoreAPI } from "@app/lib/core_api";
+import { FREE_TEST_PLAN_CODE } from "@app/lib/plans/plan_codes";
 import { timeAgoFrom } from "@app/lib/utils";
 import { DataSourceType } from "@app/types/data_source";
 import { PlanType } from "@app/types/plan";
@@ -253,8 +254,6 @@ const WorkspacePage = ({
     (ds) => !!ds.connectorProvider
   );
 
-  const FREE_TEST_PLAN_CODE = "FREE_TEST_PLAN";
-
   return (
     <div className="min-h-screen bg-structure-50">
       <PokeNavbar />
diff --git a/front/pages/w/[wId]/builder/data-sources/[name]/index.tsx b/front/pages/w/[wId]/builder/data-sources/[name]/index.tsx
index f29fa9a994a1..e5d834b327ed 100644
--- a/front/pages/w/[wId]/builder/data-sources/[name]/index.tsx
+++ b/front/pages/w/[wId]/builder/data-sources/[name]/index.tsx
@@ -245,8 +245,8 @@ function StandardDataSourceView({
               <div className="relative mt-0 flex-none">
                 <Popup
                   show={showDocumentsLimitPopup}
-                  chipLabel="Free plan"
-                  description={`You have reached the limit of documents per data source (${plan.limits.dataSources.documents.count} documents). Upgrade to a paid plan for unlimited documents and data sources.`}
+                  chipLabel={`${plan.name} plan`}
+                  description={`You have reached the limit of documents per data source (${plan.limits.dataSources.documents.count} documents). Upgrade your plan for unlimited documents and data sources.`}
                   buttonLabel="Check Dust plans"
                   buttonClick={() => {
                     void router.push(`/w/${owner.sId}/subscription`);
@@ -341,11 +341,13 @@ function SlackBotEnableView({
   readOnly,
   isAdmin,
   dataSource,
+  plan,
 }: {
   owner: WorkspaceType;
   readOnly: boolean;
   isAdmin: boolean;
   dataSource: DataSourceType;
+  plan: PlanType;
 }) {
   const { botEnabled, mutateBotEnabled } = useConnectorBotEnabled({
     owner: owner,
@@ -353,9 +355,9 @@ function SlackBotEnableView({
   });
 
   const sendNotification = useContext(SendNotificationsContext);
-
+  const router = useRouter();
   const [loading, setLoading] = useState(false);
-
+  const [showNoSlackBotPopup, setShowNoSlackBotPopup] = useState(false);
   const handleSetBotEnabled = async (botEnabled: boolean) => {
     setLoading(true);
     const res = await fetch(
@@ -389,14 +391,31 @@ function SlackBotEnableView({
         title="Slack Bot"
         visual={<ContextItem.Visual visual={SlackLogo} />}
         action={
-          <SliderToggle
-            size="sm"
-            onClick={async () => {
-              await handleSetBotEnabled(!botEnabled);
-            }}
-            selected={botEnabled || false}
-            disabled={readOnly || !isAdmin || loading}
-          />
+          <div className="relative">
+            <SliderToggle
+              size="sm"
+              onClick={async () => {
+                if (!plan.limits.assistant.isSlackBotAllowed)
+                  setShowNoSlackBotPopup(true);
+                else await handleSetBotEnabled(!botEnabled);
+              }}
+              selected={botEnabled || false}
+              disabled={readOnly || !isAdmin || loading}
+            />
+            <Popup
+              show={showNoSlackBotPopup}
+              className="absolute bottom-8 right-0"
+              chipLabel={`${plan.name} plan`}
+              description="Your plan does not allow for the Slack bot to be enabled. Upgrade your plan to chat with Dust assistants on Slack."
+              buttonLabel="Check Dust plans"
+              buttonClick={() => {
+                void router.push(`/w/${owner.sId}/subscription`);
+              }}
+              onClose={() => {
+                setShowNoSlackBotPopup(false);
+              }}
+            />
+          </div>
         }
       >
         <ContextItem.Description>
@@ -435,6 +454,7 @@ function ManagedDataSourceView({
   connector,
   nangoConfig,
   githubAppUrl,
+  plan,
 }: {
   owner: WorkspaceType;
   readOnly: boolean;
@@ -448,6 +468,7 @@ function ManagedDataSourceView({
     googleDriveConnectorId: string;
   };
   githubAppUrl: string;
+  plan: PlanType;
 }) {
   const router = useRouter();
 
@@ -670,7 +691,7 @@ function ManagedDataSourceView({
 
             {connectorProvider === "slack" && (
               <SlackBotEnableView
-                {...{ owner, readOnly, isAdmin, dataSource }}
+                {...{ owner, readOnly, isAdmin, dataSource, plan }}
               />
             )}
           </>
@@ -751,6 +772,7 @@ export default function DataSourceView({
             connector,
             nangoConfig,
             githubAppUrl,
+            plan,
           }}
         />
       ) : (
diff --git a/front/pages/w/[wId]/builder/data-sources/managed.tsx b/front/pages/w/[wId]/builder/data-sources/managed.tsx
index e3886c329d3f..304d3632bb53 100644
--- a/front/pages/w/[wId]/builder/data-sources/managed.tsx
+++ b/front/pages/w/[wId]/builder/data-sources/managed.tsx
@@ -29,7 +29,7 @@ import {
 import { githubAuth } from "@app/lib/github_auth";
 import { timeAgoFrom } from "@app/lib/utils";
 import { DataSourceType } from "@app/types/data_source";
-import { ManageDataSourcesLimitsType } from "@app/types/plan";
+import { PlanType } from "@app/types/plan";
 import { UserType, WorkspaceType } from "@app/types/user";
 
 const {
@@ -62,7 +62,7 @@ export const getServerSideProps: GetServerSideProps<{
   readOnly: boolean;
   isAdmin: boolean;
   integrations: DataSourceIntegration[];
-  planConnectionsLimits: ManageDataSourcesLimitsType;
+  plan: PlanType;
   gaTrackingId: string;
   nangoConfig: {
     publicKey: string;
@@ -213,7 +213,7 @@ export const getServerSideProps: GetServerSideProps<{
       readOnly,
       isAdmin,
       integrations,
-      planConnectionsLimits: plan.limits.connections,
+      plan,
       gaTrackingId: GA_TRACKING_ID,
       nangoConfig: {
         publicKey: NANGO_PUBLIC_KEY,
@@ -232,11 +232,12 @@ export default function DataSourcesView({
   readOnly,
   isAdmin,
   integrations,
-  planConnectionsLimits,
+  plan,
   gaTrackingId,
   nangoConfig,
   githubAppUrl,
 }: InferGetServerSidePropsType<typeof getServerSideProps>) {
+  const planConnectionsLimits = plan.limits.connections;
   const [localIntegrations, setLocalIntegrations] = useState(integrations);
 
   const [isLoadingByProvider, setIsLoadingByProvider] = useState<
@@ -536,8 +537,8 @@ export default function DataSourcesView({
                         showUpgradePopupForProvider === ds.connectorProvider
                       }
                       className="absolute bottom-8 right-0"
-                      chipLabel="Free plan"
-                      description="Unlock this managed data source by upgrading to a paid plan."
+                      chipLabel={`${plan.name} plan`}
+                      description="Unlock this managed data source by upgrading your plan."
                       buttonLabel="Check Dust plans"
                       buttonClick={() => {
                         void router.push(`/w/${owner.sId}/subscription`);
diff --git a/front/pages/w/[wId]/builder/data-sources/static.tsx b/front/pages/w/[wId]/builder/data-sources/static.tsx
index 5538ca6ce135..80994559336d 100644
--- a/front/pages/w/[wId]/builder/data-sources/static.tsx
+++ b/front/pages/w/[wId]/builder/data-sources/static.tsx
@@ -138,8 +138,8 @@ export default function DataSourcesView({
             />
             <Popup
               show={showDatasourceLimitPopup}
-              chipLabel="Free plan"
-              description={`You have reached the limit of data sources (${plan.limits.dataSources.count} data sources). Upgrade to a paid plan for unlimited documents and data sources.`}
+              chipLabel={`${plan.name} plan`}
+              description={`You have reached the limit of data sources (${plan.limits.dataSources.count} data sources). Upgrade your plan for unlimited datasources.`}
               buttonLabel="Check Dust plans"
               buttonClick={() => {
                 void router.push(`/w/${owner.sId}/subscription`);
diff --git a/front/pages/w/[wId]/members/index.tsx b/front/pages/w/[wId]/members/index.tsx
index b1a7550bebca..fdbca2c3973b 100644
--- a/front/pages/w/[wId]/members/index.tsx
+++ b/front/pages/w/[wId]/members/index.tsx
@@ -11,10 +11,12 @@ import {
   Modal,
   Page,
   PlusIcon,
+  Popup,
   Searchbar,
 } from "@dust-tt/sparkle";
 import { UsersIcon } from "@heroicons/react/20/solid";
 import { GetServerSideProps, InferGetServerSidePropsType } from "next";
+import { useRouter } from "next/router";
 import React, { useContext, useState } from "react";
 import { useSWRConfig } from "swr";
 
@@ -27,9 +29,11 @@ import {
   getUserFromSession,
   RoleType,
 } from "@app/lib/auth";
+import { FREE_TEST_PLAN_CODE } from "@app/lib/plans/plan_codes";
 import { useMembers, useWorkspaceInvitations } from "@app/lib/swr";
 import { classNames, isEmailValid } from "@app/lib/utils";
 import { MembershipInvitationType } from "@app/types/membership_invitation";
+import { PlanType } from "@app/types/plan";
 import { UserType, WorkspaceType } from "@app/types/user";
 
 const { GA_TRACKING_ID = "", URL = "" } = process.env;
@@ -39,6 +43,7 @@ const CLOSING_ANIMATION_DURATION = 200;
 export const getServerSideProps: GetServerSideProps<{
   user: UserType | null;
   owner: WorkspaceType;
+  plan: PlanType;
   gaTrackingId: string;
   url: string;
 }> = async (context) => {
@@ -48,9 +53,9 @@ export const getServerSideProps: GetServerSideProps<{
     session,
     context.params?.wId as string
   );
-
+  const plan = auth.plan();
   const owner = auth.workspace();
-  if (!owner || !auth.isAdmin()) {
+  if (!owner || !auth.isAdmin() || !plan) {
     return {
       notFound: true,
     };
@@ -60,6 +65,7 @@ export const getServerSideProps: GetServerSideProps<{
     props: {
       user,
       owner,
+      plan,
       gaTrackingId: GA_TRACKING_ID,
       url: URL,
     },
@@ -69,13 +75,15 @@ export const getServerSideProps: GetServerSideProps<{
 export default function WorkspaceAdmin({
   user,
   owner,
+  plan,
   gaTrackingId,
   url,
 }: InferGetServerSidePropsType<typeof getServerSideProps>) {
   const inviteLink =
     owner.allowedDomain !== null ? `${url}/w/${owner.sId}/join` : null;
+  const router = useRouter();
+  const [showNoInviteLinkPopup, setShowNoInviteLinkPopup] = useState(false);
   const [inviteSettingsModalOpen, setInviteSettingsModalOpen] = useState(false);
-
   return (
     <AppLayout
       user={user}
@@ -134,13 +142,28 @@ export default function WorkspaceAdmin({
                     }}
                   />
                 </div>
-                <div className="flex-none">
+                <div className="relative flex-none">
                   <Button
                     variant="secondary"
                     label="Settings"
                     size="sm"
                     icon={Cog6ToothIcon}
-                    onClick={() => setInviteSettingsModalOpen(true)}
+                    onClick={() => {
+                      if (plan.code === FREE_TEST_PLAN_CODE)
+                        setShowNoInviteLinkPopup(true);
+                      else setInviteSettingsModalOpen(true);
+                    }}
+                  />
+                  <Popup
+                    show={showNoInviteLinkPopup}
+                    chipLabel="Free plan"
+                    description="You cannot create an invitation link with the free plan. Upgrade your plan to invite other members."
+                    buttonLabel="Check Dust plans"
+                    buttonClick={() => {
+                      void router.push(`/w/${owner.sId}/subscription`);
+                    }}
+                    className="absolute bottom-8 right-0"
+                    onClose={() => setShowNoInviteLinkPopup(false)}
                   />
                 </div>
               </div>
@@ -159,6 +182,7 @@ export default function WorkspaceAdmin({
       builder: "amber",
       user: "emerald",
     };
+    const [showNoInviteEmailPopup, setShowNoInviteEmailPopup] = useState(false);
     const [searchText, setSearchText] = useState("");
     const { members, isMembersLoading } = useMembers(owner);
     const { invitations, isInvitationsLoading } =
@@ -239,13 +263,28 @@ export default function WorkspaceAdmin({
                 name={""}
               />
             </div>
-            <div className="flex-none">
+            <div className="relative flex-none">
               <Button
                 variant="primary"
                 label="Invite members"
                 size="sm"
                 icon={PlusIcon}
-                onClick={() => setInviteEmailModalOpen(true)}
+                onClick={() => {
+                  if (plan.code === FREE_TEST_PLAN_CODE)
+                    setShowNoInviteEmailPopup(true);
+                  else setInviteEmailModalOpen(true);
+                }}
+              />
+              <Popup
+                show={showNoInviteEmailPopup}
+                chipLabel="Free plan"
+                description="You cannot invite other members with the free plan. Upgrade your plan for unlimited members."
+                buttonLabel="Check Dust plans"
+                buttonClick={() => {
+                  void router.push(`/w/${owner.sId}/subscription`);
+                }}
+                className="absolute bottom-8 right-0"
+                onClose={() => setShowNoInviteEmailPopup(false)}
               />
             </div>
           </div>
diff --git a/front/pages/w/[wId]/subscription/index.tsx b/front/pages/w/[wId]/subscription/index.tsx
index 913ce4f0c6e9..4f5c58a4c13a 100644
--- a/front/pages/w/[wId]/subscription/index.tsx
+++ b/front/pages/w/[wId]/subscription/index.tsx
@@ -15,6 +15,10 @@ import AppLayout from "@app/components/sparkle/AppLayout";
 import { subNavigationAdmin } from "@app/components/sparkle/navigation";
 import { SendNotificationsContext } from "@app/components/sparkle/Notification";
 import { Authenticator, getSession, getUserFromSession } from "@app/lib/auth";
+import {
+  FREE_TEST_PLAN_CODE,
+  PRO_PLAN_SEAT_29_CODE,
+} from "@app/lib/plans/plan_codes";
 import { PlanType } from "@app/types/plan";
 import { UserType, WorkspaceType } from "@app/types/user";
 
@@ -114,10 +118,10 @@ export default function Subscription({
     setIsProcessing(false);
   }
 
-  const chipColor = plan.code === "FREE_TEST_PLAN" ? "emerald" : "sky";
+  const chipColor = plan.code === FREE_TEST_PLAN_CODE ? "emerald" : "sky";
 
   const onClickProPlan = async () =>
-    await handleSubscribeToPlan("PRO_PLAN_SEAT_29");
+    await handleSubscribeToPlan(PRO_PLAN_SEAT_29_CODE);
   const onClickEnterprisePlan = () => {
     window.open("mailto:team@dust.tt?subject=Upgrading to Enteprise plan");
   };
diff --git a/front/prompt/global_agent_helper_prompt.md b/front/prompt/global_agent_helper_prompt.md
index cc44559fc35a..8ca3fc38facd 100644
--- a/front/prompt/global_agent_helper_prompt.md
+++ b/front/prompt/global_agent_helper_prompt.md
@@ -142,7 +142,7 @@ To configure the @dust assistant, got to `Admin` > `Assistants` and click on the
 - creation of custom workflows
 - create and use the assistants on a data source with up to 32 documents of 750KB each.
 - access to GPT4
-- 100 messages limit
+- 50 messages limit
 
 ### **Dust Paid plans**
 
diff --git a/sparkle/package-lock.json b/sparkle/package-lock.json
index cefc2b57f48d..7e09f9015df9 100644
--- a/sparkle/package-lock.json
+++ b/sparkle/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@dust-tt/sparkle",
-  "version": "0.2.32",
+  "version": "0.2.34",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@dust-tt/sparkle",
-      "version": "0.2.32",
+      "version": "0.2.34",
       "license": "ISC",
       "dependencies": {
         "@headlessui/react": "^1.7.17"
diff --git a/sparkle/package.json b/sparkle/package.json
index 19fff197576f..d0d49874c7f8 100644
--- a/sparkle/package.json
+++ b/sparkle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dust-tt/sparkle",
-  "version": "0.2.32",
+  "version": "0.2.34",
   "scripts": {
     "build": "rm -rf dist && rollup -c",
     "build:with-tw-base": "rollup -c --environment INCLUDE_TW_BASE:true",
diff --git a/sparkle/src/_index.ts b/sparkle/src/_index.ts
index 0f5f32612def..86cc404c2193 100644
--- a/sparkle/src/_index.ts
+++ b/sparkle/src/_index.ts
@@ -58,6 +58,9 @@ export { IconToggleButton };
 import { Tooltip } from "./components/Tooltip";
 export { Tooltip };
 
+import { ContentMessage } from "./components/ContentMessage";
+export { ContentMessage };
+
 import { Avatar } from "./components/Avatar";
 export { Avatar };
 
diff --git a/sparkle/src/components/ContentMessage.tsx b/sparkle/src/components/ContentMessage.tsx
new file mode 100644
index 000000000000..5507142f350d
--- /dev/null
+++ b/sparkle/src/components/ContentMessage.tsx
@@ -0,0 +1,38 @@
+import React from "react";
+
+import { classNames } from "@sparkle/lib/utils";
+
+import { Icon, InformationCircleIcon } from "..";
+
+export interface ContentMessageProps {
+  title: string;
+  children: React.ReactNode;
+  className?: string;
+}
+
+export function ContentMessage({
+  title,
+  children,
+  className = "",
+}: ContentMessageProps) {
+  return (
+    <div
+      className={classNames(
+        "s-flex s-max-w-[500px] s-gap-2 s-rounded-2xl s-border s-border-amber-100 s-bg-amber-50 s-p-4",
+        className
+      )}
+    >
+      <Icon
+        size="md"
+        visual={InformationCircleIcon}
+        className="s-text-amber-600"
+      />
+      <div className="s-flex s-flex-col s-gap-1">
+        <div className="s-text-base s-font-semibold s-text-amber-600">
+          {title}
+        </div>
+        <div className="s-text-sm s-text-element-800">{children}</div>
+      </div>
+    </div>
+  );
+}
diff --git a/sparkle/src/components/Input.tsx b/sparkle/src/components/Input.tsx
index 51313e31a73e..b2c76bb572d1 100644
--- a/sparkle/src/components/Input.tsx
+++ b/sparkle/src/components/Input.tsx
@@ -2,9 +2,28 @@ import React from "react";
 
 import { classNames } from "@sparkle/lib/utils";
 
+type InputProps = {
+  placeholder: string;
+  size?: "sm" | "md";
+  value: string | null;
+  onChange?: (value: string) => void;
+  error?: string | null;
+  showErrorLabel?: boolean;
+  name: string;
+  isPassword?: boolean;
+  disabled?: boolean;
+  className?: string;
+};
+
+const sizeInputClasses = {
+  sm: "s-text-base s-rounded-md s-py-1.5 s-pl-4 s-pr-8",
+  md: "s-text-lg s-rounded-lg s-py-2 s-pl-4 s-pr-10",
+};
+
 export function Input({
   placeholder,
   value,
+  size = "sm",
   onChange,
   error,
   showErrorLabel = false,
@@ -12,17 +31,7 @@ export function Input({
   isPassword = false,
   disabled = false,
   className = "",
-}: {
-  placeholder: string;
-  value: string | null;
-  onChange?: (value: string) => void;
-  error?: string | null;
-  showErrorLabel?: boolean;
-  name: string;
-  isPassword?: boolean;
-  disabled?: boolean;
-  className?: string;
-}) {
+}: InputProps) {
   return (
     <div className="s-flex s-flex-col s-gap-1 s-p-px">
       <input
@@ -30,10 +39,10 @@ export function Input({
         name={name}
         id={name}
         className={classNames(
-          "s-border-0 s-text-base s-outline-none s-ring-1 focus:s-outline-none focus:s-ring-2",
+          "s-w-full s-border-0 s-outline-none s-ring-1 focus:s-outline-none focus:s-ring-2",
           "s-bg-structure-50 s-text-element-900 s-placeholder-element-600",
           "dark:s-bg-structure-50-dark dark:s-text-element-800-dark dark:s-placeholder-element-600-dark",
-          "s-w-full s-rounded-md s-py-1.5 s-pl-4 s-pr-8",
+          sizeInputClasses[size],
           "s-transition-all s-duration-300 s-ease-out",
           className ?? "",
           !error
diff --git a/sparkle/src/components/Popup.tsx b/sparkle/src/components/Popup.tsx
index 8404e5c93f21..eb3c3b5d34c2 100644
--- a/sparkle/src/components/Popup.tsx
+++ b/sparkle/src/components/Popup.tsx
@@ -38,15 +38,20 @@ export function Popup({
       leaveFrom="s-opacity-100"
       leaveTo="s-opacity-0"
       className={classNames(
-        "s-z-30 s-flex s-w-64 s-flex-col s-gap-3 s-rounded-lg s-border s-border-amber-100 s-bg-amber-50 s-p-4 s-shadow-lg",
+        "relative s-z-30 s-flex s-w-64 s-flex-col s-gap-3 s-rounded-xl s-border s-border-pink-100 s-bg-pink-50 s-p-4 s-shadow-xl",
         className || ""
       )}
     >
       <div className="s-flex">
-        <Chip color="red">{chipLabel}</Chip>
+        <Chip color="pink">{chipLabel}</Chip>
         {onClose && (
-          <div className="s-flex s-grow s-items-start s-justify-end">
-            <IconButton icon={XMark} onClick={onClose} />
+          <div className="-s-mr-1 -s-mt-1 s-flex s-grow s-items-start s-justify-end">
+            <IconButton
+              icon={XMark}
+              onClick={onClose}
+              variant="secondary"
+              size="sm"
+            />
           </div>
         )}
       </div>
diff --git a/sparkle/src/stories/ContentMessage.stories.tsx b/sparkle/src/stories/ContentMessage.stories.tsx
new file mode 100644
index 000000000000..0529ab1609be
--- /dev/null
+++ b/sparkle/src/stories/ContentMessage.stories.tsx
@@ -0,0 +1,33 @@
+import type { Meta } from "@storybook/react";
+import React from "react";
+
+import { ContentMessage } from "../index_with_tw_base";
+
+const meta = {
+  title: "Atoms/ContentMessage",
+  component: ContentMessage,
+} satisfies Meta<typeof ContentMessage>;
+
+export default meta;
+
+export const ContentExample = () => (
+  <div className="s-flex s-flex-col s-gap-4">
+    <ContentMessage title="This is a title">
+      This is a message. It can be multiple lines long.
+    </ContentMessage>
+  </div>
+);
+
+export const ContentExampleMultiLine = () => (
+  <div className="s-flex s-flex-col s-gap-4">
+    <ContentMessage title="This is a title">
+      <div className="s-flex s-flex-col s-gap-y-3">
+        <div>This is a message. It can be multiple lines long.</div>
+        <div>
+          Another paragraph in the content message with al long line and some{" "}
+          <strong>strong text</strong>.
+        </div>
+      </div>
+    </ContentMessage>
+  </div>
+);
diff --git a/sparkle/src/stories/Input.stories.tsx b/sparkle/src/stories/Input.stories.tsx
index f4df857d68f8..e5b630b1d1e4 100644
--- a/sparkle/src/stories/Input.stories.tsx
+++ b/sparkle/src/stories/Input.stories.tsx
@@ -11,33 +11,68 @@ const meta = {
 export default meta;
 
 export const InputExample = () => (
-  <div className="s-grid s-grid-cols-3 s-gap-4">
-    <Input placeholder="placeholder" name="input" value={null} />
-    <Input
-      placeholder="placeholder"
-      name="input"
-      value={"value"}
-      error={"errored because it's a very long message"}
-      showErrorLabel
-    />
-    <Input
-      placeholder="placeholder"
-      name="input"
-      value={"value"}
-      error={"errored"}
-    />
-    <Input
-      placeholder="placeholder"
-      name="input"
-      value={"value"}
-      error={"errored because it's a very long message"}
-      showErrorLabel
-    />
-    <Input
-      placeholder="placeholder"
-      name="input"
-      value={"disabled"}
-      showErrorLabel
-    />
+  <div className="s-flex s-flex-col s-gap-20">
+    <div className="s-grid s-grid-cols-3 s-gap-4">
+      <Input placeholder="placeholder" name="input" value={null} />
+      <Input
+        placeholder="placeholder"
+        name="input"
+        value={"value"}
+        error={"errored because it's a very long message"}
+        showErrorLabel
+      />
+      <Input
+        placeholder="placeholder"
+        name="input"
+        value={"value"}
+        error={"errored"}
+      />
+      <Input
+        placeholder="placeholder"
+        name="input"
+        value={"value"}
+        error={"errored because it's a very long message"}
+        showErrorLabel
+      />
+      <Input
+        placeholder="placeholder"
+        name="input"
+        value={"disabled"}
+        showErrorLabel
+      />
+    </div>
+    <div className="s-grid s-grid-cols-3 s-gap-4">
+      <Input placeholder="placeholder" name="input" value={null} size="md" />
+      <Input
+        placeholder="placeholder"
+        name="input"
+        size="md"
+        value={"value"}
+        error={"errored because it's a very long message"}
+        showErrorLabel
+      />
+      <Input
+        placeholder="placeholder"
+        name="input"
+        size="md"
+        value={"value"}
+        error={"errored"}
+      />
+      <Input
+        placeholder="placeholder"
+        name="input"
+        size="md"
+        value={"value"}
+        error={"errored because it's a very long message"}
+        showErrorLabel
+      />
+      <Input
+        placeholder="placeholder"
+        name="input"
+        size="md"
+        value={"disabled"}
+        showErrorLabel
+      />
+    </div>
   </div>
 );