diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/connect/account-abstraction/settings/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/connect/account-abstraction/settings/page.tsx
index 9ed0b0d7c37..776e0d1ad47 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/connect/account-abstraction/settings/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/connect/account-abstraction/settings/page.tsx
@@ -60,6 +60,7 @@ export default async function Page(props: {
         trackingCategory="account-abstraction-project-settings"
         project={project}
         teamId={team.id}
+        teamSlug={team.slug}
         validTeamPlan={getValidTeamPlan(team)}
       />
     </ChakraProviderSetup>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/connect/in-app-wallets/settings/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/connect/in-app-wallets/settings/page.tsx
index 9d495455d6a..6d92ca7c3c3 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/connect/in-app-wallets/settings/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/connect/in-app-wallets/settings/page.tsx
@@ -30,7 +30,7 @@ export default async function Page(props: {
       teamId={team.id}
       trackingCategory="in-app-wallet-project-settings"
       teamSlug={team_slug}
-      validTeamPlan={getValidTeamPlan(team)}
+      teamPlan={getValidTeamPlan(team)}
       smsCountryTiers={smsCountryTiers}
     />
   );
diff --git a/apps/dashboard/src/components/embedded-wallets/Configure/InAppWalletSettingsUI.stories.tsx b/apps/dashboard/src/components/embedded-wallets/Configure/InAppWalletSettingsUI.stories.tsx
index f8f2c934f38..770b98c89e5 100644
--- a/apps/dashboard/src/components/embedded-wallets/Configure/InAppWalletSettingsUI.stories.tsx
+++ b/apps/dashboard/src/components/embedded-wallets/Configure/InAppWalletSettingsUI.stories.tsx
@@ -1,6 +1,6 @@
+import type { Team } from "@/api/team";
 import type { Meta, StoryObj } from "@storybook/react";
 import { projectStub } from "../../../stories/stubs";
-import { mobileViewport } from "../../../stories/utils";
 import { InAppWalletSettingsUI } from "./index";
 
 const meta = {
@@ -16,44 +16,44 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;
 
-export const GrowthPlan: Story = {
+export const FreePlan: Story = {
   args: {
-    canEditAdvancedFeatures: true,
+    currentPlan: "free",
   },
 };
 
-export const FreePlan: Story = {
+export const GrowthPlan: Story = {
   args: {
-    canEditAdvancedFeatures: false,
+    currentPlan: "growth",
   },
 };
 
-export const GrowthPlanMobile: Story = {
+export const AcceleratePlan: Story = {
   args: {
-    canEditAdvancedFeatures: true,
-  },
-  parameters: {
-    viewport: mobileViewport("iphone14"),
+    currentPlan: "accelerate",
   },
 };
 
-export const FreePlanMobile: Story = {
+export const GrowthLegacyPlan: Story = {
   args: {
-    canEditAdvancedFeatures: false,
+    currentPlan: "growth_legacy",
   },
-  parameters: {
-    viewport: mobileViewport("iphone14"),
+};
+
+export const ProPlan: Story = {
+  args: {
+    currentPlan: "pro",
   },
 };
 
 function Variants(props: {
-  canEditAdvancedFeatures: boolean;
+  currentPlan: Team["billingPlan"];
 }) {
   return (
     <div className="mx-auto w-full max-w-[1140px] px-4 py-6">
       <div className="flex flex-col gap-10">
         <InAppWalletSettingsUI
-          canEditAdvancedFeatures={props.canEditAdvancedFeatures}
+          teamPlan={props.currentPlan}
           project={projectStub("foo", "bar")}
           teamId="bar"
           embeddedWalletService={{
diff --git a/apps/dashboard/src/components/embedded-wallets/Configure/index.tsx b/apps/dashboard/src/components/embedded-wallets/Configure/index.tsx
index 1355a8994af..f4678f63655 100644
--- a/apps/dashboard/src/components/embedded-wallets/Configure/index.tsx
+++ b/apps/dashboard/src/components/embedded-wallets/Configure/index.tsx
@@ -41,6 +41,7 @@ import { type UseFormReturn, useFieldArray, useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { upload } from "thirdweb/storage";
 import { toArrFromList } from "utils/string";
+import { planToTierRecordForGating } from "../../settings/Account/Billing/planToTierRecord";
 import { FileInput } from "../../shared/FileInput";
 import CountrySelector from "./sms-country-select/country-selector";
 
@@ -49,7 +50,7 @@ type InAppWalletSettingsPageProps = {
   project: Project;
   teamId: string;
   teamSlug: string;
-  validTeamPlan: Team["billingPlan"];
+  teamPlan: Team["billingPlan"];
   smsCountryTiers: SMSCountryTiers;
 };
 
@@ -113,7 +114,6 @@ export function InAppWalletSettingsPage(props: InAppWalletSettingsPageProps) {
   return (
     <InAppWalletSettingsPageUI
       {...props}
-      canEditAdvancedFeatures={props.validTeamPlan !== "free"}
       updateApiKey={handleUpdateProject}
       isUpdating={updateProject.isPending}
       smsCountryTiers={props.smsCountryTiers}
@@ -123,7 +123,6 @@ export function InAppWalletSettingsPage(props: InAppWalletSettingsPageProps) {
 
 const InAppWalletSettingsPageUI: React.FC<
   InAppWalletSettingsPageProps & {
-    canEditAdvancedFeatures: boolean;
     updateApiKey: (
       projectValues: Partial<Project>,
       trackingData: UpdateAPIKeyTrackingData,
@@ -163,8 +162,7 @@ const InAppWalletSettingsPageUI: React.FC<
 };
 
 export const InAppWalletSettingsUI: React.FC<
-  Omit<InAppWalletSettingsPageProps, "validTeamPlan"> & {
-    canEditAdvancedFeatures: boolean;
+  InAppWalletSettingsPageProps & {
     updateApiKey: (
       projectValues: Partial<Project>,
       trackingData: UpdateAPIKeyTrackingData,
@@ -173,7 +171,6 @@ export const InAppWalletSettingsUI: React.FC<
     embeddedWalletService: ProjectEmbeddedWalletsService;
   }
 > = (props) => {
-  const { canEditAdvancedFeatures } = props;
   const services = props.project.services;
 
   const config = props.embeddedWalletService;
@@ -181,6 +178,13 @@ export const InAppWalletSettingsUI: React.FC<
   const hasCustomBranding =
     !!config.applicationImageUrl?.length || !!config.applicationName?.length;
 
+  const authRequiredPlan = "accelerate";
+
+  // accelerate or higher plan required
+  const canEditSmsCountries =
+    planToTierRecordForGating[props.teamPlan] >=
+    planToTierRecordForGating[authRequiredPlan];
+
   const form = useForm<ApiKeyEmbeddedWalletsValidationSchema>({
     resolver: zodResolver(apiKeyEmbeddedWalletsValidationSchema),
     values: {
@@ -197,7 +201,7 @@ export const InAppWalletSettingsUI: React.FC<
       redirectUrls: (config.redirectUrls || []).join("\n"),
       smsEnabledCountryISOs: config.smsEnabledCountryISOs
         ? config.smsEnabledCountryISOs
-        : canEditAdvancedFeatures
+        : canEditSmsCountries
           ? ["US", "CA"]
           : [],
     },
@@ -269,7 +273,9 @@ export const InAppWalletSettingsUI: React.FC<
         {/* Branding */}
         <BrandingFieldset
           form={form}
-          canEditAdvancedFeatures={canEditAdvancedFeatures}
+          teamPlan={props.teamPlan}
+          teamSlug={props.teamSlug}
+          requiredPlan={authRequiredPlan}
         />
 
         <NativeAppsFieldset form={form} />
@@ -278,22 +284,28 @@ export const InAppWalletSettingsUI: React.FC<
         <Fieldset legend="Authentication">
           <JSONWebTokenFields
             form={form}
-            canEditAdvancedFeatures={canEditAdvancedFeatures}
+            teamPlan={props.teamPlan}
+            teamSlug={props.teamSlug}
+            requiredPlan={authRequiredPlan}
           />
 
           <div className="h-5" />
 
           <AuthEndpointFields
             form={form}
-            canEditAdvancedFeatures={canEditAdvancedFeatures}
+            teamPlan={props.teamPlan}
+            teamSlug={props.teamSlug}
+            requiredPlan={authRequiredPlan}
           />
 
           <div className="h-5" />
 
           <SMSCountryFields
             form={form}
-            canEditAdvancedFeatures={canEditAdvancedFeatures}
             smsCountryTiers={props.smsCountryTiers}
+            teamPlan={props.teamPlan}
+            requiredPlan={authRequiredPlan}
+            teamSlug={props.teamSlug}
           />
         </Fieldset>
 
@@ -310,10 +322,10 @@ export const InAppWalletSettingsUI: React.FC<
 
 function BrandingFieldset(props: {
   form: UseFormReturn<ApiKeyEmbeddedWalletsValidationSchema>;
-  canEditAdvancedFeatures: boolean;
+  teamPlan: Team["billingPlan"];
+  teamSlug: string;
+  requiredPlan: Team["billingPlan"];
 }) {
-  const { form, canEditAdvancedFeatures } = props;
-
   return (
     <Fieldset legend="Branding">
       <SwitchContainer
@@ -322,31 +334,36 @@ function BrandingFieldset(props: {
         description="Pass a custom logo and app name to be used in the emails sent to users."
       >
         <GatedSwitch
-          id="branding-switch"
+          requiredPlan={props.requiredPlan}
+          teamSlug={props.teamSlug}
           trackingLabel="customEmailLogoAndName"
-          checked={!!form.watch("branding") && canEditAdvancedFeatures}
-          upgradeRequired={!canEditAdvancedFeatures}
-          onCheckedChange={(checked) =>
-            form.setValue(
-              "branding",
-              checked
-                ? {
-                    applicationImageUrl: "",
-                    applicationName: "",
-                  }
-                : undefined,
-            )
-          }
+          currentPlan={props.teamPlan}
+          switchProps={{
+            id: "branding-switch",
+            checked: !!props.form.watch("branding"),
+            onCheckedChange: (checked) =>
+              props.form.setValue(
+                "branding",
+                checked
+                  ? {
+                      applicationImageUrl: "",
+                      applicationName: "",
+                    }
+                  : undefined,
+              ),
+          }}
         />
       </SwitchContainer>
 
-      <AdvancedConfigurationContainer
+      <GatedCollapsibleContainer
+        requiredPlan={props.requiredPlan}
+        currentPlan={props.teamPlan}
         className="grid grid-cols-1 gap-6 lg:grid-cols-2"
-        show={canEditAdvancedFeatures && !!form.watch("branding")}
+        isExpanded={!!props.form.watch("branding")}
       >
         {/* Application Image */}
         <FormField
-          control={form.control}
+          control={props.form.control}
           name="branding.applicationImageUrl"
           render={() => (
             <FormItem className="space-y-1">
@@ -358,9 +375,9 @@ function BrandingFieldset(props: {
               </FormDescription>
               <FormControl>
                 <AppImageFormControl
-                  uri={form.watch("branding.applicationImageUrl")}
+                  uri={props.form.watch("branding.applicationImageUrl")}
                   setUri={(uri) => {
-                    form.setValue("branding.applicationImageUrl", uri, {
+                    props.form.setValue("branding.applicationImageUrl", uri, {
                       shouldDirty: true,
                       shouldTouch: true,
                     });
@@ -374,7 +391,7 @@ function BrandingFieldset(props: {
 
         {/* Application Name */}
         <FormField
-          control={form.control}
+          control={props.form.control}
           name="branding.applicationName"
           render={({ field }) => (
             <FormItem>
@@ -391,7 +408,7 @@ function BrandingFieldset(props: {
             </FormItem>
           )}
         />
-      </AdvancedConfigurationContainer>
+      </GatedCollapsibleContainer>
     </Fieldset>
   );
 }
@@ -453,8 +470,10 @@ function AppImageFormControl(props: {
 
 function SMSCountryFields(props: {
   form: UseFormReturn<ApiKeyEmbeddedWalletsValidationSchema>;
-  canEditAdvancedFeatures: boolean;
   smsCountryTiers: SMSCountryTiers;
+  teamPlan: Team["billingPlan"];
+  requiredPlan: Team["billingPlan"];
+  teamSlug: string;
 }) {
   return (
     <div>
@@ -464,31 +483,30 @@ function SMSCountryFields(props: {
         description="Optionally allow users in selected countries to login via SMS OTP."
       >
         <GatedSwitch
-          id="sms-switch"
+          currentPlan={props.teamPlan}
+          requiredPlan={props.requiredPlan}
+          teamSlug={props.teamSlug}
+          switchProps={{
+            id: "sms-switch",
+            checked: !!props.form.watch("smsEnabledCountryISOs").length,
+            onCheckedChange: (checked) =>
+              props.form.setValue(
+                "smsEnabledCountryISOs",
+                checked
+                  ? // by default, enable US and CA only
+                    ["US", "CA"]
+                  : [],
+              ),
+          }}
           trackingLabel="sms"
-          checked={
-            !!props.form.watch("smsEnabledCountryISOs").length &&
-            props.canEditAdvancedFeatures
-          }
-          upgradeRequired={!props.canEditAdvancedFeatures}
-          onCheckedChange={(checked) =>
-            props.form.setValue(
-              "smsEnabledCountryISOs",
-              checked
-                ? // by default, enable US and CA only
-                  ["US", "CA"]
-                : [],
-            )
-          }
         />
       </SwitchContainer>
 
-      <AdvancedConfigurationContainer
+      <GatedCollapsibleContainer
         className="grid grid-cols-1"
-        show={
-          props.canEditAdvancedFeatures &&
-          !!props.form.watch("smsEnabledCountryISOs").length
-        }
+        currentPlan={props.teamPlan}
+        requiredPlan={props.requiredPlan}
+        isExpanded={!!props.form.watch("smsEnabledCountryISOs").length}
       >
         <FormField
           control={props.form.control}
@@ -501,17 +519,17 @@ function SMSCountryFields(props: {
             />
           )}
         />
-      </AdvancedConfigurationContainer>
+      </GatedCollapsibleContainer>
     </div>
   );
 }
 
 function JSONWebTokenFields(props: {
   form: UseFormReturn<ApiKeyEmbeddedWalletsValidationSchema>;
-  canEditAdvancedFeatures: boolean;
+  teamPlan: Team["billingPlan"];
+  teamSlug: string;
+  requiredPlan: Team["billingPlan"];
 }) {
-  const { form, canEditAdvancedFeatures } = props;
-
   return (
     <div>
       <SwitchContainer
@@ -533,32 +551,31 @@ function JSONWebTokenFields(props: {
         }
       >
         <GatedSwitch
-          id="authentication-switch"
-          upgradeRequired={!canEditAdvancedFeatures}
           trackingLabel="customAuthJWT"
-          checked={
-            !!form.watch("customAuthentication") && canEditAdvancedFeatures
-          }
-          onCheckedChange={(checked) => {
-            form.setValue(
-              "customAuthentication",
-              checked
-                ? {
-                    jwksUri: "",
-                    aud: "",
-                  }
-                : undefined,
-            );
+          currentPlan={props.teamPlan}
+          requiredPlan={props.requiredPlan}
+          teamSlug={props.teamSlug}
+          switchProps={{
+            id: "authentication-switch",
+            checked: !!props.form.watch("customAuthentication"),
+            onCheckedChange: (checked) => {
+              props.form.setValue(
+                "customAuthentication",
+                checked ? { jwksUri: "", aud: "" } : undefined,
+              );
+            },
           }}
         />
       </SwitchContainer>
 
-      <AdvancedConfigurationContainer
+      <GatedCollapsibleContainer
         className="grid grid-cols-1 gap-6 lg:grid-cols-2"
-        show={canEditAdvancedFeatures && !!form.watch("customAuthentication")}
+        isExpanded={!!props.form.watch("customAuthentication")}
+        currentPlan={props.teamPlan}
+        requiredPlan={props.requiredPlan}
       >
         <FormField
-          control={form.control}
+          control={props.form.control}
           name="customAuthentication.jwksUri"
           render={({ field }) => (
             <FormItem>
@@ -576,7 +593,7 @@ function JSONWebTokenFields(props: {
         />
 
         <FormField
-          control={form.control}
+          control={props.form.control}
           name="customAuthentication.aud"
           render={({ field }) => (
             <FormItem>
@@ -591,19 +608,19 @@ function JSONWebTokenFields(props: {
             </FormItem>
           )}
         />
-      </AdvancedConfigurationContainer>
+      </GatedCollapsibleContainer>
     </div>
   );
 }
 
 function AuthEndpointFields(props: {
   form: UseFormReturn<ApiKeyEmbeddedWalletsValidationSchema>;
-  canEditAdvancedFeatures: boolean;
+  teamPlan: Team["billingPlan"];
+  teamSlug: string;
+  requiredPlan: Team["billingPlan"];
 }) {
-  const { form, canEditAdvancedFeatures } = props;
-
   const expandCustomAuthEndpointField =
-    form.watch("customAuthEndpoint") !== undefined && canEditAdvancedFeatures;
+    props.form.watch("customAuthEndpoint") !== undefined;
 
   return (
     <div>
@@ -628,28 +645,31 @@ function AuthEndpointFields(props: {
       >
         <GatedSwitch
           trackingLabel="customAuthEndpoint"
-          checked={expandCustomAuthEndpointField}
-          upgradeRequired={!canEditAdvancedFeatures}
-          onCheckedChange={(checked) => {
-            form.setValue(
-              "customAuthEndpoint",
-              checked
-                ? {
-                    authEndpoint: "",
-                    customHeaders: [],
-                  }
-                : undefined,
-            );
+          switchProps={{
+            id: "auth-endpoint-switch",
+            checked: expandCustomAuthEndpointField,
+            onCheckedChange: (checked) => {
+              props.form.setValue(
+                "customAuthEndpoint",
+                checked
+                  ? {
+                      authEndpoint: "",
+                      customHeaders: [],
+                    }
+                  : undefined,
+              );
+            },
           }}
+          currentPlan={props.teamPlan}
+          requiredPlan={props.requiredPlan}
+          teamSlug={props.teamSlug}
         />
       </SwitchContainer>
+
       {/* useFieldArray used on this component - it creates empty customAuthEndpoint.customHeaders array on mount */}
       {/* So only mount if expandCustomAuthEndpointField is true */}
       {expandCustomAuthEndpointField && (
-        <AuthEndpointFieldsContent
-          form={form}
-          canEditAdvancedFeatures={canEditAdvancedFeatures}
-        />
+        <AuthEndpointFieldsContent form={props.form} />
       )}
     </div>
   );
@@ -657,19 +677,16 @@ function AuthEndpointFields(props: {
 
 function AuthEndpointFieldsContent(props: {
   form: UseFormReturn<ApiKeyEmbeddedWalletsValidationSchema>;
-  canEditAdvancedFeatures: boolean;
 }) {
-  const { form } = props;
-
   const customHeaderFields = useFieldArray({
-    control: form.control,
+    control: props.form.control,
     name: "customAuthEndpoint.customHeaders",
   });
 
   return (
     <div className="mt-6 grid grid-cols-1 gap-6 lg:grid-cols-2">
       <FormField
-        control={form.control}
+        control={props.form.control}
         name="customAuthEndpoint.authEndpoint"
         render={({ field }) => (
           <FormItem>
@@ -698,14 +715,14 @@ function AuthEndpointFieldsContent(props: {
                 <Input
                   placeholder="Name"
                   type="text"
-                  {...form.register(
+                  {...props.form.register(
                     `customAuthEndpoint.customHeaders.${customHeaderIdx}.key`,
                   )}
                 />
                 <Input
                   placeholder="Value"
                   type="text"
-                  {...form.register(
+                  {...props.form.register(
                     `customAuthEndpoint.customHeaders.${customHeaderIdx}.value`,
                   )}
                 />
@@ -781,12 +798,18 @@ function NativeAppsFieldset(props: {
   );
 }
 
-function AdvancedConfigurationContainer(props: {
+function GatedCollapsibleContainer(props: {
   children: React.ReactNode;
-  show: boolean;
+  isExpanded: boolean;
   className?: string;
+  requiredPlan: Team["billingPlan"];
+  currentPlan: Team["billingPlan"];
 }) {
-  if (!props.show) {
+  const upgradeRequired =
+    planToTierRecordForGating[props.currentPlan] <
+    planToTierRecordForGating[props.requiredPlan];
+
+  if (!props.isExpanded || upgradeRequired) {
     return null;
   }
 
@@ -800,7 +823,7 @@ function Fieldset(props: {
   return (
     <DynamicHeight>
       <fieldset className="rounded-lg border border-border bg-card p-4 md:p-6">
-        {/* put inside div to remove defualt styles on legend  */}
+        {/* put inside div to remove default styles on legend  */}
         <div className="mb-4 font-semibold text-xl tracking-tight">
           <legend> {props.legend}</legend>
         </div>
diff --git a/apps/dashboard/src/components/settings/Account/Billing/GatedSwitch.stories.tsx b/apps/dashboard/src/components/settings/Account/Billing/GatedSwitch.stories.tsx
index 7c6d3e68a69..1991e7923b2 100644
--- a/apps/dashboard/src/components/settings/Account/Billing/GatedSwitch.stories.tsx
+++ b/apps/dashboard/src/components/settings/Account/Billing/GatedSwitch.stories.tsx
@@ -1,5 +1,14 @@
-import { Separator } from "@/components/ui/separator";
+import type { Team } from "@/api/team";
+import { Label } from "@/components/ui/label";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
 import type { Meta, StoryObj } from "@storybook/react";
+import { useState } from "react";
 import { BadgeContainer } from "../../../../stories/utils";
 import { GatedSwitch } from "./GatedSwitch";
 
@@ -18,41 +27,52 @@ export const AllVariants: Story = {
 };
 
 function Variants() {
-  return (
-    <div className="min-h-dvh bg-background p-7 text-foreground">
-      <div className="mx-auto flex max-w-[500px] flex-col gap-8">
-        <BadgeContainer label="upgradeRequired">
-          <GatedSwitch upgradeRequired />
-        </BadgeContainer>
-
-        <BadgeContainer label="No upgradeRequired">
-          <GatedSwitch upgradeRequired={false} />
-        </BadgeContainer>
+  const [requiredPlan, setRequiredPlan] = useState<
+    "free" | "growth" | "accelerate" | "pro"
+  >("accelerate");
 
-        <BadgeContainer label="No upgradeRequired, disabled">
-          <GatedSwitch upgradeRequired={false} disabled />
-        </BadgeContainer>
-
-        <Separator />
-
-        <BadgeContainer label="upgradeRequired, Checked">
-          <GatedSwitch upgradeRequired checked />
-        </BadgeContainer>
+  const plans: Team["billingPlan"][] = [
+    "free",
+    "starter_legacy",
+    "starter",
+    "growth_legacy",
+    "growth",
+    "accelerate",
+    "pro",
+  ];
 
-        <BadgeContainer label="upgradeRequired, unchecked">
-          <GatedSwitch upgradeRequired checked={false} />
-        </BadgeContainer>
-
-        <Separator />
-
-        <BadgeContainer label="No upgradeRequired, Checked">
-          <GatedSwitch upgradeRequired={false} checked />
-        </BadgeContainer>
+  return (
+    <div className="container flex max-w-5xl flex-col gap-10 py-10">
+      <div className="flex items-center gap-2">
+        <Label>Required Plan</Label>
+        <Select
+          value={requiredPlan}
+          onValueChange={(value) =>
+            setRequiredPlan(value as typeof requiredPlan)
+          }
+        >
+          <SelectTrigger className="w-[180px]">
+            <SelectValue placeholder="Select plan" />
+          </SelectTrigger>
+          <SelectContent>
+            <SelectItem value="free">Free</SelectItem>
+            <SelectItem value="growth">Growth</SelectItem>
+            <SelectItem value="accelerate">Accelerate</SelectItem>
+            <SelectItem value="pro">Pro</SelectItem>
+          </SelectContent>
+        </Select>
+      </div>
 
-        <BadgeContainer label="No upgradeRequired, unchecked">
-          <GatedSwitch upgradeRequired={false} checked={false} />
+      {plans.map((currentPlan) => (
+        <BadgeContainer key={currentPlan} label={`plan: ${currentPlan}`}>
+          <GatedSwitch
+            key={currentPlan}
+            currentPlan={currentPlan}
+            requiredPlan={requiredPlan}
+            teamSlug="foo"
+          />
         </BadgeContainer>
-      </div>
+      ))}
     </div>
   );
 }
diff --git a/apps/dashboard/src/components/settings/Account/Billing/GatedSwitch.tsx b/apps/dashboard/src/components/settings/Account/Billing/GatedSwitch.tsx
index f942f011d3b..dfb688ae7fb 100644
--- a/apps/dashboard/src/components/settings/Account/Billing/GatedSwitch.tsx
+++ b/apps/dashboard/src/components/settings/Account/Billing/GatedSwitch.tsx
@@ -1,47 +1,56 @@
-import { Badge } from "@/components/ui/badge";
+import type { Team } from "@/api/team";
 import { Switch } from "@/components/ui/switch";
 import { ToolTipLabel } from "@/components/ui/tooltip";
 import { TrackedLinkTW } from "@/components/ui/tracked-link";
+import { cn } from "@/lib/utils";
+import { TeamPlanBadge } from "../../../../app/(app)/components/TeamPlanBadge";
+import { planToTierRecordForGating } from "./planToTierRecord";
 
 type SwitchProps = React.ComponentProps<typeof Switch>;
 
-interface GatedSwitchProps extends SwitchProps {
+type GatedSwitchProps = {
   trackingLabel?: string;
-  upgradeRequired: boolean;
-}
+  currentPlan: Team["billingPlan"];
+  requiredPlan: Team["billingPlan"];
+  teamSlug: string;
+  switchProps?: SwitchProps;
+};
 
 export const GatedSwitch: React.FC<GatedSwitchProps> = (
-  allProps: GatedSwitchProps,
+  props: GatedSwitchProps,
 ) => {
-  const { upgradeRequired, trackingLabel, checked, ...props } = allProps;
+  const isUpgradeRequired =
+    planToTierRecordForGating[props.currentPlan] <
+    planToTierRecordForGating[props.requiredPlan];
 
   return (
     <ToolTipLabel
       hoverable
+      contentClassName="max-w-[300px]"
       label={
-        upgradeRequired ? (
-          <div className="w-[220px]">
-            To access this feature, you need to upgrade to the{" "}
+        isUpgradeRequired ? (
+          <span>
+            To access this feature, <br /> Upgrade to the{" "}
             <TrackedLinkTW
               target="_blank"
-              href="/team/~/~/settings/billing"
+              href={`/team/${props.teamSlug}/~/settings/billing`}
               category="advancedFeature"
-              label={trackingLabel}
-              className="text-link-foreground hover:text-foreground"
+              label={props.trackingLabel}
+              className="text-link-foreground capitalize hover:text-foreground"
             >
-              Growth plan
+              {props.requiredPlan} plan
             </TrackedLinkTW>
-            .
-          </div>
+          </span>
         ) : undefined
       }
     >
       <div className="inline-flex items-center gap-2">
-        {upgradeRequired && <Badge>Growth</Badge>}
+        {isUpgradeRequired && <TeamPlanBadge plan={props.requiredPlan} />}
         <Switch
-          checked={checked}
-          disabled={upgradeRequired || props.disabled}
-          {...props}
+          {...props.switchProps}
+          checked={props.switchProps?.checked && !isUpgradeRequired}
+          disabled={props.switchProps?.disabled || isUpgradeRequired}
+          className={cn("disabled:opacity-100", props.switchProps?.className)}
         />
       </div>
     </ToolTipLabel>
diff --git a/apps/dashboard/src/components/settings/Account/Billing/planToTierRecord.ts b/apps/dashboard/src/components/settings/Account/Billing/planToTierRecord.ts
new file mode 100644
index 00000000000..15b412c96fb
--- /dev/null
+++ b/apps/dashboard/src/components/settings/Account/Billing/planToTierRecord.ts
@@ -0,0 +1,13 @@
+import type { Team } from "@/api/team";
+
+// Note: Growth legacy is considered higher tier in this hierarchy
+export const planToTierRecordForGating: Record<Team["billingPlan"], number> = {
+  free: 0,
+  starter_legacy: 1,
+  starter: 2,
+  growth: 3,
+  accelerate: 4,
+  growth_legacy: 5,
+  scale: 6,
+  pro: 7,
+};
diff --git a/apps/dashboard/src/components/settings/ApiKeys/Create/index.tsx b/apps/dashboard/src/components/settings/ApiKeys/Create/index.tsx
index 04e2cc87cc1..14fc97ece6e 100644
--- a/apps/dashboard/src/components/settings/ApiKeys/Create/index.tsx
+++ b/apps/dashboard/src/components/settings/ApiKeys/Create/index.tsx
@@ -32,7 +32,7 @@ import { useMutation } from "@tanstack/react-query";
 import type { ProjectService } from "@thirdweb-dev/service-utils";
 import { SERVICES } from "@thirdweb-dev/service-utils";
 import { useTrack } from "hooks/analytics/useTrack";
-import { ArrowLeftIcon, ExternalLinkIcon } from "lucide-react";
+import { ArrowLeftIcon, ArrowRightIcon } from "lucide-react";
 import { useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
@@ -529,7 +529,7 @@ function CreatedProjectDetails(props: {
             className="min-w-28 gap-2"
           >
             View Project
-            <ExternalLinkIcon className="size-4" />
+            <ArrowRightIcon className="size-4" />
           </Button>
         )}
       </DialogFooter>
diff --git a/apps/dashboard/src/components/smart-wallets/SponsorshipPolicies/index.tsx b/apps/dashboard/src/components/smart-wallets/SponsorshipPolicies/index.tsx
index ad69309bb88..2f528bdb01a 100644
--- a/apps/dashboard/src/components/smart-wallets/SponsorshipPolicies/index.tsx
+++ b/apps/dashboard/src/components/smart-wallets/SponsorshipPolicies/index.tsx
@@ -41,6 +41,7 @@ type AccountAbstractionSettingsPageProps = {
   project: Project;
   trackingCategory: string;
   teamId: string;
+  teamSlug: string;
   validTeamPlan: Team["billingPlan"];
   client: ThirdwebClient;
 };
@@ -548,7 +549,12 @@ export function AccountAbstractionSettingsPage(
           <Flex flexDir="column" gap={4}>
             <div className="flex flex-row items-center justify-between gap-6 lg:gap-12">
               <div>
-                <FormLabel pointerEvents="none">Server verifier</FormLabel>
+                <FormLabel
+                  pointerEvents="none"
+                  htmlFor="server-verifier-switch"
+                >
+                  Server verifier
+                </FormLabel>
                 <Text>
                   Specify your own endpoint that will verify each transaction
                   and decide whether it should be sponsored or not. <br /> This
@@ -566,18 +572,20 @@ export function AccountAbstractionSettingsPage(
               </div>
 
               <GatedSwitch
-                upgradeRequired={props.validTeamPlan === "free"}
-                checked={
-                  form.watch("serverVerifier").enabled &&
-                  props.validTeamPlan !== "free"
-                }
-                onCheckedChange={(checked) => {
-                  form.setValue(
-                    "serverVerifier",
-                    !checked
-                      ? { enabled: false, url: null, headers: null }
-                      : { enabled: true, url: "", headers: [] },
-                  );
+                requiredPlan="accelerate"
+                currentPlan={props.validTeamPlan}
+                teamSlug={props.teamSlug}
+                switchProps={{
+                  id: "server-verifier-switch",
+                  checked: form.watch("serverVerifier").enabled,
+                  onCheckedChange: (checked) => {
+                    form.setValue(
+                      "serverVerifier",
+                      !checked
+                        ? { enabled: false, url: null, headers: null }
+                        : { enabled: true, url: "", headers: [] },
+                    );
+                  },
                 }}
               />
             </div>