@@ -332,23 +332,31 @@ type IconComponent = ComponentType<SVGProps<SVGSVGElement>>
 export const blockTypeToIconMap: Record<string, IconComponent> = {
   a2a: A2AIcon,
   affinity: AffinityIcon,
+  affinity_v2: AffinityIcon,
   agent: AgentIcon,
   agentmail: AgentMailIcon,
+  agentmail_v2: AgentMailIcon,
   agentphone: AgentPhoneIcon,
+  agentphone_v2: AgentPhoneIcon,
   agiloft: AgiloftIcon,
   ahrefs: AhrefsIcon,
+  ahrefs_v2: AhrefsIcon,
   airtable: AirtableIcon,
   algolia: AlgoliaIcon,
   amplitude: AmplitudeIcon,
   api: ApiIcon,
   api_trigger: ApiIcon,
   apify: ApifyIcon,
+  apify_v2: ApifyIcon,
   apollo: ApolloIcon,
+  apollo_v2: ApolloIcon,
   appconfig: AppConfigIcon,
+  appconfig_v2: AppConfigIcon,
   arxiv: ArxivIcon,
   asana: AsanaIcon,
   ashby: AshbyIcon,
   athena: AthenaIcon,
+  athena_v2: AthenaIcon,
   attio: AttioIcon,
   azure_data_explorer: AzureDataExplorerIcon,
   azure_devops: AzureIcon,
@@ -357,25 +365,36 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   box_v2: BoxCompanyIcon,
   brandfetch: BrandfetchIcon,
   brex: BrexIcon,
+  brex_v2: BrexIcon,
   brightdata: BrightDataIcon,
+  brightdata_v2: BrightDataIcon,
   browser_use: BrowserUseIcon,
+  browser_use_v2: BrowserUseIcon,
   buffer: BufferIcon,
+  buffer_v2: BufferIcon,
   calcom: CalComIcon,
   calendly: CalendlyIcon,
   cbinsights: CbInsightsIcon,
   chat_trigger: Task,
   checkr: CheckrIcon,
   circleback: CirclebackIcon,
+  circleback_v2: CirclebackIcon,
   clay: ClayIcon,
   clerk: ClerkIcon,
+  clerk_v2: ClerkIcon,
   clickhouse: ClickHouseIcon,
   clickup: ClickUpIcon,
   cloudflare: CloudflareIcon,
+  cloudflare_v2: CloudflareIcon,
   cloudformation: CloudFormationIcon,
+  cloudformation_v2: CloudFormationIcon,
   cloudtrail: CloudTrailIcon,
+  cloudtrail_v2: CloudTrailIcon,
   cloudwatch: CloudWatchIcon,
+  cloudwatch_v2: CloudWatchIcon,
   coda: CodaIcon,
   codepipeline: CodePipelineIcon,
+  codepipeline_v2: CodePipelineIcon,
   condition: ConditionalIcon,
   confluence: ConfluenceIcon,
   confluence_v2: ConfluenceIcon,
@@ -385,16 +404,21 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   credential_group: GridOffset,
   crowdstrike: CrowdStrikeIcon,
   crunchbase: CrunchbaseIcon,
+  crunchbase_v2: CrunchbaseIcon,
   cursor: CursorIcon,
   cursor_v2: CursorIcon,
+  cursor_v3: CursorIcon,
   dagster: DagsterIcon,
   databricks: DatabricksIcon,
+  databricks_v2: DatabricksIcon,
   datadog: DatadogIcon,
   datagma: DatagmaIcon,
   daytona: DaytonaIcon,
+  daytona_v2: DaytonaIcon,
   deployments: Rocket,
   devin: DevinIcon,
   discord: DiscordIcon,
+  discord_v2: DiscordIcon,
   docusign: DocuSignIcon,
   downdetector: DowndetectorIcon,
   dropbox: DropboxIcon,
@@ -403,21 +427,27 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   dspy: DsPyIcon,
   dub: DubIcon,
   dub_v2: DubIcon,
+  dub_v3: DubIcon,
   duckduckgo: DuckDuckGoIcon,
   dynamodb: DynamoDBIcon,
+  dynamodb_v2: DynamoDBIcon,
   dynatrace: DynatraceIcon,
   ec2: EC2Icon,
+  ec2_v2: EC2Icon,
   elasticsearch: ElasticsearchIcon,
   elevenlabs: ElevenLabsIcon,
+  elevenlabs_v2: ElevenLabsIcon,
   emailbison: EmailBisonIcon,
   embeddings: EmbeddingsIcon,
   enrich: EnrichSoIcon,
+  enrich_v2: EnrichSoIcon,
   enrichment: EnrichmentIcon,
   enrow: EnrowIcon,
   evaluator: ChartBarIcon,
   exa: ExaAIIcon,
   extend: ExtendIcon,
   extend_v2: ExtendIcon,
+  extend_v3: ExtendIcon,
   fathom: FathomIcon,
   file: DocumentIcon,
   file_v2: DocumentIcon,
@@ -428,11 +458,14 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   firecrawl: FirecrawlIcon,
   fireflies: FirefliesIcon,
   fireflies_v2: FirefliesIcon,
+  fireflies_v3: FirefliesIcon,
   fivetran: FivetranIcon,
   flint: FlintIcon,
+  flint_v2: FlintIcon,
   flow: FlowIcon,
   function: CodeIcon,
   gamma: GammaIcon,
+  gamma_v2: GammaIcon,
   gauge: GaugeIcon,
   generic: WebhookIcon,
   generic_webhook: Webhook,
@@ -478,24 +511,31 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   harmonic: HarmonicIcon,
   helpscout: HelpScoutIcon,
   hex: HexIcon,
+  hex_v2: HexIcon,
   higgsfield: HiggsfieldIcon,
   hubspot: HubspotIcon,
   huggingface: HuggingFaceIcon,
+  huggingface_v2: HuggingFaceIcon,
   human_in_the_loop: HumanInTheLoopIcon,
   human_in_the_loop_v2: HumanInTheLoopIcon,
   hunter: HunterIOIcon,
   iam: IAMIcon,
+  iam_v2: IAMIcon,
   icypeas: IcypeasIcon,
   identity_center: IdentityCenterIcon,
+  identity_center_v2: IdentityCenterIcon,
   image_generator: ImageIcon,
   image_generator_v2: ImageIcon,
   imap: MailServerIcon,
   incidentio: IncidentioIcon,
+  incidentio_v2: IncidentioIcon,
   infisical: InfisicalIcon,
   input_trigger: FormInput,
   instantly: InstantlyIcon,
+  instantly_v2: InstantlyIcon,
   intercom: IntercomIcon,
   intercom_v2: IntercomIcon,
+  intercom_v3: IntercomIcon,
   intune: IntuneIcon,
   jama: JamaIcon,
   jina: JinaAIIcon,
@@ -510,29 +550,37 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   ketch: KetchIcon,
   knowledge: PackageSearchIcon,
   lambda: LambdaIcon,
+  lambda_v2: LambdaIcon,
   langsmith: LangsmithIcon,
+  langsmith_v2: LangsmithIcon,
   latex: LatexIcon,
   launchdarkly: LaunchDarklyIcon,
+  launchdarkly_v2: LaunchDarklyIcon,
   leadmagic: LeadMagicIcon,
   lemlist: LemlistIcon,
   linear: LinearIcon,
   linear_v2: LinearIcon,
   linkedin: LinkedInIcon,
   linkup: LinkupIcon,
   linq: LinqIcon,
+  linq_v2: LinqIcon,
   logfire: LogfireIcon,
   logrocket: LogRocketIcon,
   logs: Library,
   logs_v2: Library,
   loops: LoopsIcon,
+  loops_v2: LoopsIcon,
   luma: LumaIcon,
+  luma_v2: LumaIcon,
   mailchimp: MailchimpIcon,
+  mailchimp_v2: MailchimpIcon,
   mailgun: MailgunIcon,
   managed_agent: ClaudeIcon,
   manageengine_sdp: ManageEngineIcon,
   manual_trigger: Play,
   mcp: McpIcon,
   mem0: Mem0Icon,
+  mem0_v2: Mem0Icon,
   memory: BrainIcon,
   microsoft_ad: AzureIcon,
   microsoft_dataverse: MicrosoftDataverseIcon,
@@ -571,12 +619,14 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   oracle_fusion_financials: OracleIcon,
   oracledb: OracleIcon,
   otter: OtterIcon,
+  otter_v2: OtterIcon,
   outlook: OutlookIcon,
   pagerduty: PagerDutyIcon,
   parallel_ai: ParallelIcon,
   peopledatalabs: PeopleDataLabsIcon,
   perplexity: PerplexityIcon,
   persona: PersonaIcon,
+  persona_v2: PersonaIcon,
   pi: PiIcon,
   pinecone: PineconeIcon,
   pipedrive: PipedriveIcon,
@@ -588,85 +638,109 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   posthog: PosthogIcon,
   powerbi: PowerBIIcon,
   profound: ProfoundIcon,
+  profound_v2: ProfoundIcon,
   prospeo: ProspeoIcon,
   pulse: PulseIcon,
   pulse_v2: PulseIcon,
+  pulse_v3: PulseIcon,
   qdrant: QdrantIcon,
   quartr: QuartrIcon,
+  quartr_v2: QuartrIcon,
   quickbooks: QuickBooksIcon,
   quiver: QuiverIcon,
   quiver_v2: QuiverIcon,
+  quiver_v3: QuiverIcon,
   rabbitmq: RabbitmqIcon,
   railway: RailwayIcon,
   ramp: RampIcon,
   rb2b: RB2BIcon,
+  rb2b_v2: RB2BIcon,
   rds: RDSIcon,
+  rds_v2: RDSIcon,
   reddit: RedditIcon,
   redis: RedisIcon,
   reducto: ReductoIcon,
   reducto_v2: ReductoIcon,
+  reducto_v3: ReductoIcon,
   resend: ResendIcon,
   response: ResponseIcon,
   revenuecat: RevenueCatIcon,
   rippling: RipplingIcon,
+  rippling_v2: RipplingIcon,
   rocketlane: RocketlaneIcon,
+  rocketlane_v2: RocketlaneIcon,
   rootly: RootlyIcon,
   router: ConnectIcon,
   router_v2: ConnectIcon,
   rss: RssIcon,
   s3: S3Icon,
+  s3_v2: S3Icon,
   sailpoint: SailPointIcon,
   salesforce: SalesforceIcon,
   sap_concur: SapConcurIcon,
   sap_s4hana: SapS4HanaIcon,
   schedule: Clock,
   search: SearchIcon,
   secrets_manager: SecretsManagerIcon,
+  secrets_manager_v2: SecretsManagerIcon,
   semrush: SemrushIcon,
   sendblue: SendblueIcon,
   sendgrid: SendgridIcon,
+  sendgrid_v2: SendgridIcon,
   sentry: SentryIcon,
   serper: SerperIcon,
   servicenow: ServiceNowIcon,
   servicenow_v2: ServiceNowIcon,
   ses: SESIcon,
+  ses_v2: SESIcon,
   sftp: SftpIcon,
   sftp_v2: SftpIcon,
   sharepoint: MicrosoftSharepointIcon,
   sharepoint_v2: MicrosoftSharepointIcon,
   shopify: ShopifyIcon,
   sim_workspace_event: SimTriggerIcon,
   similarweb: SimilarwebIcon,
+  similarweb_v2: SimilarwebIcon,
   sixtyfour: SixtyfourIcon,
+  sixtyfour_v2: SixtyfourIcon,
   slack: SlackIcon,
   slack_app: SlackIcon,
   slack_v2: SlackIcon,
   smartlead: SmartleadIcon,
+  smartlead_v2: SmartleadIcon,
   smtp: SmtpIcon,
   snowflake: SnowflakeIcon,
   splunk: SplunkIcon,
   sportmonks: SportmonksIcon,
+  sportmonks_v2: SportmonksIcon,
   sqs: SQSIcon,
+  sqs_v2: SQSIcon,
   square: SquareIcon,
+  square_v2: SquareIcon,
   ssh: SshIcon,
   ssh_v2: SshIcon,
   ssm: SSMIcon,
+  ssm_v2: SSMIcon,
   stagehand: StagehandIcon,
   start_trigger: StartIcon,
   starter: StartIcon,
   stripe: StripeIcon,
   sts: STSIcon,
+  sts_v2: STSIcon,
   stt: STTIcon,
   stt_v2: STTIcon,
   supabase: SupabaseIcon,
   table: Table,
   table_v2: Table,
   tailscale: TailscaleIcon,
+  tailscale_v2: TailscaleIcon,
   tavily: TavilyIcon,
+  tavily_v2: TavilyIcon,
   telegram: TelegramIcon,
   temporal: TemporalIcon,
   textract: TextractIcon,
   textract_v2: TextractIcon,
+  textract_v3: TextractIcon,
   thinking: BrainIcon,
   thrive: ThriveIcon,
   tiktok: TikTokIcon,
@@ -675,13 +749,15 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   translate: TranslateIcon,
   trello: TrelloIcon,
   trigger_dev: TriggerDevIcon,
+  trigger_dev_v2: TriggerDevIcon,
   tts: TTSIcon,
   twilio: TwilioIcon,
   twilio_sms: TwilioIcon,
   twilio_voice: TwilioIcon,
   typeform: TypeformIcon,
   upstash: UpstashIcon,
   uptimerobot: UptimeRobotIcon,
+  uptimerobot_v2: UptimeRobotIcon,
   vanta: VantaIcon,
   variables: VariableIcon,
   vercel: VercelIcon,
@@ -704,9 +780,12 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   workflow_input: WorkflowIcon,
   x: xIcon,
   youcom: YouComIcon,
+  youcom_v2: YouComIcon,
   youtube: YouTubeIcon,
+  youtube_v2: YouTubeIcon,
   zendesk: ZendeskIcon,
   zep: ZepIcon,
+  zep_v2: ZepIcon,
   zerobounce: ZeroBounceIcon,
   zoho_desk: ZohoDeskIcon,
   zoom: ZoomIcon,