From 74202ce1fc9a2fd46b6d20df450d61a3fdd87ca5 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathvikku@gmail.com>
Date: Wed, 12 Nov 2025 17:36:28 -0800
Subject: [PATCH 1/7] fix(sheets): file selector had incorrect provider (#1958)

---
 .../components/file-selector/file-selector-input.tsx     | 9 +++++----
 .../components/sub-block/hooks/use-foreign-credential.ts | 2 +-
 apps/sim/blocks/blocks/google_sheets.ts                  | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/file-selector/file-selector-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/file-selector/file-selector-input.tsx
index 03e988821e9..64c4255c27c 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/file-selector/file-selector-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/file-selector/file-selector-input.tsx
@@ -87,9 +87,11 @@ export function FileSelectorInput({
   const foreignCheckProvider = subBlock.serviceId
     ? getProviderIdFromServiceId(subBlock.serviceId)
     : (subBlock.provider as string) || ''
+  const normalizedCredentialId = coerceToIdString(connectedCredential)
+  const providerForForeignCheck = foreignCheckProvider || (subBlock.provider as string) || undefined
   const { isForeignCredential } = useForeignCredential(
-    subBlock.provider || subBlock.serviceId || 'outlook',
-    (connectedCredential as string) || ''
+    providerForForeignCheck,
+    normalizedCredentialId
   )
 
   // Get provider-specific values
@@ -123,8 +125,7 @@ export function FileSelectorInput({
 
   const credentialDependencySatisfied = (() => {
     if (!dependsOn.includes('credential')) return true
-    const normalizedCredential = coerceToIdString(connectedCredential)
-    if (!normalizedCredential || normalizedCredential.trim().length === 0) {
+    if (!normalizedCredentialId || normalizedCredentialId.trim().length === 0) {
       return false
     }
     if (isForeignCredential) {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-foreign-credential.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-foreign-credential.ts
index 39474efc547..727b09da22d 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-foreign-credential.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-foreign-credential.ts
@@ -17,7 +17,7 @@ export function useForeignCredential(
       setLoading(true)
       setError(null)
       try {
-        if (!normalizedCredentialId) {
+        if (!normalizedProvider || !normalizedCredentialId) {
           if (!cancelled) setIsForeign(false)
           return
         }
diff --git a/apps/sim/blocks/blocks/google_sheets.ts b/apps/sim/blocks/blocks/google_sheets.ts
index dfb0f9faeb3..4af33ed2c7a 100644
--- a/apps/sim/blocks/blocks/google_sheets.ts
+++ b/apps/sim/blocks/blocks/google_sheets.ts
@@ -48,8 +48,8 @@ export const GoogleSheetsBlock: BlockConfig<GoogleSheetsResponse> = {
       title: 'Select Sheet',
       type: 'file-selector',
       canonicalParamId: 'spreadsheetId',
-      provider: 'google-drive',
-      serviceId: 'google-drive',
+      provider: 'google-sheets',
+      serviceId: 'google-sheets',
       requiredScopes: [
         'https://www.googleapis.com/auth/drive.readonly',
         'https://www.googleapis.com/auth/drive.file',

From f9e822f6c8145fed322b514a6eb3853ad4676504 Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Wed, 12 Nov 2025 17:51:58 -0800
Subject: [PATCH 2/7] feat(docs): added docs analytics drizzle ods (#1957)

* feat(docs): added docs analytics drizzle ods

* fix build
---
 apps/docs/app/[lang]/layout.tsx                               | 4 ++--
 apps/docs/package.json                                        | 1 -
 .../settings-modal/components/shared/usage-header.tsx         | 3 ++-
 bun.lock                                                      | 3 ---
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/apps/docs/app/[lang]/layout.tsx b/apps/docs/app/[lang]/layout.tsx
index 5e9216796f1..c08bc3d877c 100644
--- a/apps/docs/app/[lang]/layout.tsx
+++ b/apps/docs/app/[lang]/layout.tsx
@@ -13,7 +13,6 @@ import { Navbar } from '@/components/navbar/navbar'
 import { i18n } from '@/lib/i18n'
 import { source } from '@/lib/source'
 import '../global.css'
-import { Analytics } from '@vercel/analytics/next'
 
 const inter = Inter({
   subsets: ['latin'],
@@ -94,6 +93,8 @@ export default async function Layout({ children, params }: LayoutProps) {
           type='application/ld+json'
           dangerouslySetInnerHTML={{ __html: JSON.stringify(structuredData) }}
         />
+        {/* OneDollarStats Analytics - CDN script handles everything automatically */}
+        <script defer src='https://assets.onedollarstats.com/stonks.js' />
       </head>
       <body className='flex min-h-screen flex-col font-sans'>
         <RootProvider i18n={provider(lang)}>
@@ -132,7 +133,6 @@ export default async function Layout({ children, params }: LayoutProps) {
           >
             {children}
           </DocsLayout>
-          <Analytics />
         </RootProvider>
       </body>
     </html>
diff --git a/apps/docs/package.json b/apps/docs/package.json
index 12f73d90457..e5aa2f92f9c 100644
--- a/apps/docs/package.json
+++ b/apps/docs/package.json
@@ -12,7 +12,6 @@
   },
   "dependencies": {
     "@tabler/icons-react": "^3.31.0",
-    "@vercel/analytics": "1.5.0",
     "@vercel/og": "^0.6.5",
     "clsx": "^2.1.1",
     "fumadocs-core": "15.8.2",
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/shared/usage-header.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/shared/usage-header.tsx
index 22fccd993b2..a7e7d1f1878 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/shared/usage-header.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/shared/usage-header.tsx
@@ -1,7 +1,8 @@
 'use client'
 
 import type { ReactNode } from 'react'
-import { Badge, Progress } from '@/components/ui'
+import { Badge } from '@/components/emcn'
+import { Progress } from '@/components/ui'
 import { cn } from '@/lib/utils'
 
 const GRADIENT_BADGE_STYLES =
diff --git a/bun.lock b/bun.lock
index d2b807b9393..a9d2d91243a 100644
--- a/bun.lock
+++ b/bun.lock
@@ -31,7 +31,6 @@
       "version": "0.0.0",
       "dependencies": {
         "@tabler/icons-react": "^3.31.0",
-        "@vercel/analytics": "1.5.0",
         "@vercel/og": "^0.6.5",
         "clsx": "^2.1.1",
         "fumadocs-core": "15.8.2",
@@ -1379,8 +1378,6 @@
 
     "@ungap/structured-clone": ["@ungap/structured-clone@1.3.0", "", {}, "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g=="],
 
-    "@vercel/analytics": ["@vercel/analytics@1.5.0", "", { "peerDependencies": { "@remix-run/react": "^2", "@sveltejs/kit": "^1 || ^2", "next": ">= 13", "react": "^18 || ^19 || ^19.0.0-rc", "svelte": ">= 4", "vue": "^3", "vue-router": "^4" }, "optionalPeers": ["@remix-run/react", "@sveltejs/kit", "next", "react", "svelte", "vue", "vue-router"] }, "sha512-MYsBzfPki4gthY5HnYN7jgInhAZ7Ac1cYDoRWFomwGHWEX7odTEzbtg9kf/QSo7XEsEAqlQugA6gJ2WS2DEa3g=="],
-
     "@vercel/og": ["@vercel/og@0.6.8", "", { "dependencies": { "@resvg/resvg-wasm": "2.4.0", "satori": "0.12.2", "yoga-wasm-web": "0.3.3" } }, "sha512-e4kQK9mP8ntpo3dACWirGod/hHv4qO5JMj9a/0a2AZto7b4persj5YP7t1Er372gTtYFTYxNhMx34jRvHooglw=="],
 
     "@vitejs/plugin-react": ["@vitejs/plugin-react@4.7.0", "", { "dependencies": { "@babel/core": "^7.28.0", "@babel/plugin-transform-react-jsx-self": "^7.27.1", "@babel/plugin-transform-react-jsx-source": "^7.27.1", "@rolldown/pluginutils": "1.0.0-beta.27", "@types/babel__core": "^7.20.5", "react-refresh": "^0.17.0" }, "peerDependencies": { "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0" } }, "sha512-gUu9hwfWvvEDBBmgtAowQCojwZmJ5mcLn3aufeCsitijs3+f2NsrPtlAWIR6OPiqljl96GVCUbLe0HyqIpVaoA=="],

From 6513cbb7c1e0be87431bbe38b8f85219bd3f50ae Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathvikku@gmail.com>
Date: Wed, 12 Nov 2025 17:57:04 -0800
Subject: [PATCH 3/7] fix provider for docs selector (#1959)

---
 apps/sim/blocks/blocks/google_docs.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/sim/blocks/blocks/google_docs.ts b/apps/sim/blocks/blocks/google_docs.ts
index 1076247aeb9..1b261155b68 100644
--- a/apps/sim/blocks/blocks/google_docs.ts
+++ b/apps/sim/blocks/blocks/google_docs.ts
@@ -47,8 +47,8 @@ export const GoogleDocsBlock: BlockConfig<GoogleDocsResponse> = {
       title: 'Select Document',
       type: 'file-selector',
       canonicalParamId: 'documentId',
-      provider: 'google-drive',
-      serviceId: 'google-drive',
+      provider: 'google-docs',
+      serviceId: 'google-docs',
       requiredScopes: [],
       mimeType: 'application/vnd.google-apps.document',
       placeholder: 'Select a document',
@@ -82,8 +82,8 @@ export const GoogleDocsBlock: BlockConfig<GoogleDocsResponse> = {
       title: 'Select Parent Folder',
       type: 'file-selector',
       canonicalParamId: 'folderId',
-      provider: 'google-drive',
-      serviceId: 'google-drive',
+      provider: 'google-docs',
+      serviceId: 'google-docs',
       requiredScopes: [],
       mimeType: 'application/vnd.google-apps.folder',
       placeholder: 'Select a parent folder',

From d50aefcc68f32ef75203bccd9cf98d3ed91357ce Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathvikku@gmail.com>
Date: Wed, 12 Nov 2025 18:50:58 -0800
Subject: [PATCH 4/7] fix(custom-tools): updates to legacy + copilot generated
 custom tools  (#1960)

* fix(custom-tools): updates to existing tools

* don't reorder custom tools in modal based on edit time

* restructure custom tools to persist copilot generated tools

* fix tests
---
 apps/sim/app/api/tools/custom/route.test.ts   |  48 +++++-
 apps/sim/app/api/tools/custom/route.ts        | 101 ++-----------
 .../components/tool-input/tool-input.tsx      |   8 +
 apps/sim/lib/custom-tools/operations.ts       | 138 ++++++++++++++++++
 .../lib/workflows/custom-tools-persistence.ts |  94 ++++--------
 5 files changed, 228 insertions(+), 161 deletions(-)
 create mode 100644 apps/sim/lib/custom-tools/operations.ts

diff --git a/apps/sim/app/api/tools/custom/route.test.ts b/apps/sim/app/api/tools/custom/route.test.ts
index b9c79446984..60cdd1e4d1d 100644
--- a/apps/sim/app/api/tools/custom/route.test.ts
+++ b/apps/sim/app/api/tools/custom/route.test.ts
@@ -70,6 +70,7 @@ describe('Custom Tools API Routes', () => {
   const mockSelect = vi.fn()
   const mockFrom = vi.fn()
   const mockWhere = vi.fn()
+  const mockOrderBy = vi.fn()
   const mockInsert = vi.fn()
   const mockValues = vi.fn()
   const mockUpdate = vi.fn()
@@ -84,10 +85,23 @@ describe('Custom Tools API Routes', () => {
     // Reset all mock implementations
     mockSelect.mockReturnValue({ from: mockFrom })
     mockFrom.mockReturnValue({ where: mockWhere })
-    // where() can be called with limit() or directly awaited
-    // Create a mock query builder that supports both patterns
+    // where() can be called with orderBy(), limit(), or directly awaited
+    // Create a mock query builder that supports all patterns
     mockWhere.mockImplementation((condition) => {
-      // Return an object that is both awaitable and has a limit() method
+      // Return an object that is both awaitable and has orderBy() and limit() methods
+      const queryBuilder = {
+        orderBy: mockOrderBy,
+        limit: mockLimit,
+        then: (resolve: (value: typeof sampleTools) => void) => {
+          resolve(sampleTools)
+          return queryBuilder
+        },
+        catch: (reject: (error: Error) => void) => queryBuilder,
+      }
+      return queryBuilder
+    })
+    mockOrderBy.mockImplementation(() => {
+      // orderBy returns an awaitable query builder
       const queryBuilder = {
         limit: mockLimit,
         then: (resolve: (value: typeof sampleTools) => void) => {
@@ -120,9 +134,22 @@ describe('Custom Tools API Routes', () => {
           const txMockUpdate = vi.fn().mockReturnValue({ set: mockSet })
           const txMockDelete = vi.fn().mockReturnValue({ where: mockWhere })
 
-          // Transaction where() should also support the query builder pattern
+          // Transaction where() should also support the query builder pattern with orderBy
+          const txMockOrderBy = vi.fn().mockImplementation(() => {
+            const queryBuilder = {
+              limit: mockLimit,
+              then: (resolve: (value: typeof sampleTools) => void) => {
+                resolve(sampleTools)
+                return queryBuilder
+              },
+              catch: (reject: (error: Error) => void) => queryBuilder,
+            }
+            return queryBuilder
+          })
+
           const txMockWhere = vi.fn().mockImplementation((condition) => {
             const queryBuilder = {
+              orderBy: txMockOrderBy,
               limit: mockLimit,
               then: (resolve: (value: typeof sampleTools) => void) => {
                 resolve(sampleTools)
@@ -201,6 +228,7 @@ describe('Custom Tools API Routes', () => {
         or: vi.fn().mockImplementation((...conditions) => ({ operator: 'or', conditions })),
         isNull: vi.fn().mockImplementation((field) => ({ field, operator: 'isNull' })),
         ne: vi.fn().mockImplementation((field, value) => ({ field, value, operator: 'ne' })),
+        desc: vi.fn().mockImplementation((field) => ({ field, operator: 'desc' })),
       }
     })
 
@@ -208,6 +236,11 @@ describe('Custom Tools API Routes', () => {
     vi.doMock('@/lib/utils', () => ({
       generateRequestId: vi.fn().mockReturnValue('test-request-id'),
     }))
+
+    // Mock custom tools operations
+    vi.doMock('@/lib/custom-tools/operations', () => ({
+      upsertCustomTools: vi.fn().mockResolvedValue(sampleTools),
+    }))
   })
 
   afterEach(() => {
@@ -224,8 +257,10 @@ describe('Custom Tools API Routes', () => {
         'http://localhost:3000/api/tools/custom?workspaceId=workspace-123'
       )
 
-      // Simulate DB returning tools
-      mockWhere.mockReturnValueOnce(Promise.resolve(sampleTools))
+      // Simulate DB returning tools with orderBy chain
+      mockWhere.mockReturnValueOnce({
+        orderBy: mockOrderBy.mockReturnValueOnce(Promise.resolve(sampleTools)),
+      })
 
       // Import handler after mocks are set up
       const { GET } = await import('@/app/api/tools/custom/route')
@@ -243,6 +278,7 @@ describe('Custom Tools API Routes', () => {
       expect(mockSelect).toHaveBeenCalled()
       expect(mockFrom).toHaveBeenCalled()
       expect(mockWhere).toHaveBeenCalled()
+      expect(mockOrderBy).toHaveBeenCalled()
     })
 
     it('should handle unauthorized access', async () => {
diff --git a/apps/sim/app/api/tools/custom/route.ts b/apps/sim/app/api/tools/custom/route.ts
index e1531f7c701..b76d85896ed 100644
--- a/apps/sim/app/api/tools/custom/route.ts
+++ b/apps/sim/app/api/tools/custom/route.ts
@@ -1,9 +1,10 @@
 import { db } from '@sim/db'
 import { customTools, workflow } from '@sim/db/schema'
-import { and, eq, isNull, ne, or } from 'drizzle-orm'
+import { and, desc, eq, isNull, or } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkHybridAuth } from '@/lib/auth/hybrid'
+import { upsertCustomTools } from '@/lib/custom-tools/operations'
 import { createLogger } from '@/lib/logs/console/logger'
 import { getUserEntityPermissions } from '@/lib/permissions/utils'
 import { generateRequestId } from '@/lib/utils'
@@ -101,6 +102,7 @@ export async function GET(request: NextRequest) {
       .select()
       .from(customTools)
       .where(or(...conditions))
+      .orderBy(desc(customTools.createdAt))
 
     return NextResponse.json({ data: result }, { status: 200 })
   } catch (error) {
@@ -150,96 +152,15 @@ export async function POST(req: NextRequest) {
         return NextResponse.json({ error: 'Write permission required' }, { status: 403 })
       }
 
-      // Use a transaction for multi-step database operations
-      return await db.transaction(async (tx) => {
-        // Process each tool: either update existing or create new
-        for (const tool of tools) {
-          const nowTime = new Date()
-
-          if (tool.id) {
-            // Check if tool exists and belongs to the workspace
-            const existingTool = await tx
-              .select()
-              .from(customTools)
-              .where(and(eq(customTools.id, tool.id), eq(customTools.workspaceId, workspaceId)))
-              .limit(1)
-
-            if (existingTool.length > 0) {
-              // Tool exists - check if name changed and if new name conflicts
-              if (existingTool[0].title !== tool.title) {
-                // Check for duplicate name in workspace (excluding current tool)
-                const duplicateTool = await tx
-                  .select()
-                  .from(customTools)
-                  .where(
-                    and(
-                      eq(customTools.workspaceId, workspaceId),
-                      eq(customTools.title, tool.title),
-                      ne(customTools.id, tool.id)
-                    )
-                  )
-                  .limit(1)
-
-                if (duplicateTool.length > 0) {
-                  return NextResponse.json(
-                    {
-                      error: `A tool with the name "${tool.title}" already exists in this workspace`,
-                    },
-                    { status: 400 }
-                  )
-                }
-              }
-
-              // Update existing tool
-              await tx
-                .update(customTools)
-                .set({
-                  title: tool.title,
-                  schema: tool.schema,
-                  code: tool.code,
-                  updatedAt: nowTime,
-                })
-                .where(and(eq(customTools.id, tool.id), eq(customTools.workspaceId, workspaceId)))
-              continue
-            }
-          }
-
-          // Creating new tool - check for duplicate names in workspace
-          const duplicateTool = await tx
-            .select()
-            .from(customTools)
-            .where(and(eq(customTools.workspaceId, workspaceId), eq(customTools.title, tool.title)))
-            .limit(1)
-
-          if (duplicateTool.length > 0) {
-            return NextResponse.json(
-              { error: `A tool with the name "${tool.title}" already exists in this workspace` },
-              { status: 400 }
-            )
-          }
-
-          // Create new tool
-          const newToolId = tool.id || crypto.randomUUID()
-          await tx.insert(customTools).values({
-            id: newToolId,
-            workspaceId,
-            userId,
-            title: tool.title,
-            schema: tool.schema,
-            code: tool.code,
-            createdAt: nowTime,
-            updatedAt: nowTime,
-          })
-        }
-
-        // Fetch and return the created/updated tools
-        const resultTools = await tx
-          .select()
-          .from(customTools)
-          .where(eq(customTools.workspaceId, workspaceId))
-
-        return NextResponse.json({ success: true, data: resultTools })
+      // Use the extracted upsert function
+      const resultTools = await upsertCustomTools({
+        tools,
+        workspaceId,
+        userId,
+        requestId,
       })
+
+      return NextResponse.json({ success: true, data: resultTools })
     } catch (validationError) {
       if (validationError instanceof z.ZodError) {
         logger.warn(`[${requestId}] Invalid custom tools data`, {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/tool-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/tool-input.tsx
index c0979f3ed07..2b5f0f7d73d 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/tool-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/tool-input.tsx
@@ -477,6 +477,7 @@ export function ToolInput({
   const [draggedIndex, setDraggedIndex] = useState<number | null>(null)
   const [dragOverIndex, setDragOverIndex] = useState<number | null>(null)
   const customTools = useCustomToolsStore((state) => state.getAllTools())
+  const fetchCustomTools = useCustomToolsStore((state) => state.fetchTools)
   const subBlockStore = useSubBlockStore()
 
   // MCP tools integration
@@ -487,6 +488,13 @@ export function ToolInput({
     refreshTools,
   } = useMcpTools(workspaceId)
 
+  // Fetch custom tools on mount
+  useEffect(() => {
+    if (workspaceId) {
+      fetchCustomTools(workspaceId)
+    }
+  }, [workspaceId, fetchCustomTools])
+
   // Get the current model from the 'model' subblock
   const modelValue = useSubBlockStore.getState().getValue(blockId, 'model')
   const model = typeof modelValue === 'string' ? modelValue : ''
diff --git a/apps/sim/lib/custom-tools/operations.ts b/apps/sim/lib/custom-tools/operations.ts
new file mode 100644
index 00000000000..f3be5379840
--- /dev/null
+++ b/apps/sim/lib/custom-tools/operations.ts
@@ -0,0 +1,138 @@
+import { db } from '@sim/db'
+import { customTools } from '@sim/db/schema'
+import { and, desc, eq, isNull } from 'drizzle-orm'
+import { createLogger } from '@/lib/logs/console/logger'
+import { generateRequestId } from '@/lib/utils'
+
+const logger = createLogger('CustomToolsOperations')
+
+/**
+ * Internal function to create/update custom tools
+ * Can be called from API routes or internal services
+ */
+export async function upsertCustomTools(params: {
+  tools: Array<{
+    id?: string
+    title: string
+    schema: any
+    code: string
+  }>
+  workspaceId: string
+  userId: string
+  requestId?: string
+}) {
+  const { tools, workspaceId, userId, requestId = generateRequestId() } = params
+
+  // Use a transaction for multi-step database operations
+  return await db.transaction(async (tx) => {
+    // Process each tool: either update existing or create new
+    for (const tool of tools) {
+      const nowTime = new Date()
+
+      if (tool.id) {
+        // First, check if tool exists in the workspace
+        const existingWorkspaceTool = await tx
+          .select()
+          .from(customTools)
+          .where(and(eq(customTools.id, tool.id), eq(customTools.workspaceId, workspaceId)))
+          .limit(1)
+
+        if (existingWorkspaceTool.length > 0) {
+          // Tool exists in workspace
+          const newFunctionName = tool.schema?.function?.name
+          if (!newFunctionName) {
+            throw new Error('Tool schema must include a function name')
+          }
+
+          // Check if function name has changed
+          if (tool.id !== newFunctionName) {
+            throw new Error(
+              `Cannot change function name from "${tool.id}" to "${newFunctionName}". Please create a new tool instead.`
+            )
+          }
+
+          // Update existing workspace tool
+          await tx
+            .update(customTools)
+            .set({
+              title: tool.title,
+              schema: tool.schema,
+              code: tool.code,
+              updatedAt: nowTime,
+            })
+            .where(and(eq(customTools.id, tool.id), eq(customTools.workspaceId, workspaceId)))
+          continue
+        }
+
+        // Check if this is a legacy tool (no workspaceId, belongs to user)
+        const existingLegacyTool = await tx
+          .select()
+          .from(customTools)
+          .where(
+            and(
+              eq(customTools.id, tool.id),
+              isNull(customTools.workspaceId),
+              eq(customTools.userId, userId)
+            )
+          )
+          .limit(1)
+
+        if (existingLegacyTool.length > 0) {
+          // Legacy tool found - update it without migrating to workspace
+          await tx
+            .update(customTools)
+            .set({
+              title: tool.title,
+              schema: tool.schema,
+              code: tool.code,
+              updatedAt: nowTime,
+            })
+            .where(eq(customTools.id, tool.id))
+
+          logger.info(`[${requestId}] Updated legacy tool ${tool.id}`)
+          continue
+        }
+      }
+
+      // Creating new tool - use function name as ID for consistency
+      const functionName = tool.schema?.function?.name
+      if (!functionName) {
+        throw new Error('Tool schema must include a function name')
+      }
+
+      // Check for duplicate function names in workspace
+      const duplicateFunction = await tx
+        .select()
+        .from(customTools)
+        .where(and(eq(customTools.workspaceId, workspaceId), eq(customTools.id, functionName)))
+        .limit(1)
+
+      if (duplicateFunction.length > 0) {
+        throw new Error(
+          `A tool with the function name "${functionName}" already exists in this workspace`
+        )
+      }
+
+      // Create new tool using function name as ID
+      await tx.insert(customTools).values({
+        id: functionName,
+        workspaceId,
+        userId,
+        title: tool.title,
+        schema: tool.schema,
+        code: tool.code,
+        createdAt: nowTime,
+        updatedAt: nowTime,
+      })
+    }
+
+    // Fetch and return the created/updated tools
+    const resultTools = await tx
+      .select()
+      .from(customTools)
+      .where(eq(customTools.workspaceId, workspaceId))
+      .orderBy(desc(customTools.createdAt))
+
+    return resultTools
+  })
+}
diff --git a/apps/sim/lib/workflows/custom-tools-persistence.ts b/apps/sim/lib/workflows/custom-tools-persistence.ts
index c5e20d6cc40..dba18dcb235 100644
--- a/apps/sim/lib/workflows/custom-tools-persistence.ts
+++ b/apps/sim/lib/workflows/custom-tools-persistence.ts
@@ -1,6 +1,4 @@
-import { db } from '@sim/db'
-import { customTools } from '@sim/db/schema'
-import { and, eq } from 'drizzle-orm'
+import { upsertCustomTools } from '@/lib/custom-tools/operations'
 import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('CustomToolsPersistence')
@@ -91,7 +89,7 @@ export function extractCustomToolsFromWorkflowState(workflowState: any): CustomT
 }
 
 /**
- * Persist custom tools to the database
+ * Persist custom tools to the database using the upsert function
  * Creates new tools or updates existing ones
  */
 export async function persistCustomToolsToDatabase(
@@ -113,70 +111,36 @@ export async function persistCustomToolsToDatabase(
   const errors: string[] = []
   let saved = 0
 
-  try {
-    await db.transaction(async (tx) => {
-      for (const tool of customToolsList) {
-        try {
-          // Extract the base identifier (without 'custom_' prefix) for database storage
-          // If toolId exists and has the prefix, strip it; otherwise use title as base
-          let baseId: string
-          if (tool.toolId) {
-            baseId = tool.toolId.startsWith('custom_')
-              ? tool.toolId.replace('custom_', '')
-              : tool.toolId
-          } else {
-            // Use title as the base identifier (agent handler will add 'custom_' prefix)
-            baseId = tool.title
-          }
+  // Filter out tools without function names
+  const validTools = customToolsList.filter((tool) => {
+    if (!tool.schema?.function?.name) {
+      logger.warn(`Skipping custom tool without function name: ${tool.title}`)
+      return false
+    }
+    return true
+  })
 
-          const nowTime = new Date()
-
-          // Check if tool already exists in this workspace
-          const existingTool = await tx
-            .select()
-            .from(customTools)
-            .where(and(eq(customTools.id, baseId), eq(customTools.workspaceId, workspaceId)))
-            .limit(1)
-
-          if (existingTool.length === 0) {
-            // Create new tool
-            await tx.insert(customTools).values({
-              id: baseId,
-              workspaceId,
-              userId,
-              title: tool.title,
-              schema: tool.schema,
-              code: tool.code,
-              createdAt: nowTime,
-              updatedAt: nowTime,
-            })
-
-            logger.info(`Created custom tool: ${tool.title}`, { toolId: baseId, workspaceId })
-            saved++
-          } else {
-            // Update existing tool in workspace (workspace members can update)
-            await tx
-              .update(customTools)
-              .set({
-                title: tool.title,
-                schema: tool.schema,
-                code: tool.code,
-                updatedAt: nowTime,
-              })
-              .where(and(eq(customTools.id, baseId), eq(customTools.workspaceId, workspaceId)))
-
-            logger.info(`Updated custom tool: ${tool.title}`, { toolId: baseId, workspaceId })
-            saved++
-          }
-        } catch (error) {
-          const errorMsg = `Failed to persist tool ${tool.title}: ${error instanceof Error ? error.message : String(error)}`
-          logger.error(errorMsg, { error })
-          errors.push(errorMsg)
-        }
-      }
+  if (validTools.length === 0) {
+    return { saved: 0, errors: [] }
+  }
+
+  try {
+    // Call the upsert function from lib
+    await upsertCustomTools({
+      tools: validTools.map((tool) => ({
+        id: tool.schema.function.name, // Use function name as ID for updates
+        title: tool.title,
+        schema: tool.schema,
+        code: tool.code,
+      })),
+      workspaceId,
+      userId,
     })
+
+    saved = validTools.length
+    logger.info(`Persisted ${saved} custom tool(s)`, { workspaceId })
   } catch (error) {
-    const errorMsg = `Transaction failed while persisting custom tools: ${error instanceof Error ? error.message : String(error)}`
+    const errorMsg = `Failed to persist custom tools: ${error instanceof Error ? error.message : String(error)}`
     logger.error(errorMsg, { error })
     errors.push(errorMsg)
   }

From 07e803cfdda3860aebe72bbc83954ffdd5648a18 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathvikku@gmail.com>
Date: Wed, 12 Nov 2025 21:46:00 -0800
Subject: [PATCH 5/7] fix(slack): remove update message incorrect canonical
 param (#1964)

* fix(slack): send message tool

* add logging

* add more logs

* add more logs

* fix canonical param
---
 apps/sim/blocks/blocks/slack.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/sim/blocks/blocks/slack.ts b/apps/sim/blocks/blocks/slack.ts
index 461f9c6fdeb..c0ff5dadfcc 100644
--- a/apps/sim/blocks/blocks/slack.ts
+++ b/apps/sim/blocks/blocks/slack.ts
@@ -229,7 +229,6 @@ export const SlackBlock: BlockConfig<SlackResponse> = {
       id: 'updateText',
       title: 'New Message Text',
       type: 'long-input',
-      canonicalParamId: 'text',
       placeholder: 'Enter new message text (supports Slack mrkdwn)',
       condition: {
         field: 'operation',
@@ -316,6 +315,7 @@ export const SlackBlock: BlockConfig<SlackResponse> = {
           operation,
           channel,
           manualChannel,
+          text,
           title,
           content,
           limit,
@@ -359,10 +359,10 @@ export const SlackBlock: BlockConfig<SlackResponse> = {
         // Handle operation-specific params
         switch (operation) {
           case 'send': {
-            if (!rest.text) {
+            if (!text || text.trim() === '') {
               throw new Error('Message text is required for send operation')
             }
-            baseParams.text = rest.text
+            baseParams.text = text
             // Add thread_ts if provided
             if (threadTs) {
               baseParams.thread_ts = threadTs

From 304fb28baf68abb43f3f120d82e35df385326f31 Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Wed, 12 Nov 2025 21:46:26 -0800
Subject: [PATCH 6/7] improvement(templates): add share button, serve public
 templates routes for unauthenticated users and workspace one for
 authenticated users, improve settings style and organization (#1962)

* improvement(templates): add share button, serve public templates routes for unauthenticated users and workspace one for authenticated users, improve settings style and organization

* fix lint

---------

Co-authored-by: Vikhyath Mondreti <vikhyath@simstudio.ai>
---
 apps/sim/app/templates/[id]/layout.tsx        |  44 ++
 apps/sim/app/templates/[id]/page.tsx          |   4 +
 apps/sim/app/templates/[id]/template.tsx      | 142 ++--
 .../templates/components/navigation-tabs.tsx  |  33 -
 .../templates/components/template-card.tsx    | 691 +++++++-----------
 apps/sim/app/templates/layout-client.tsx      |  12 +
 apps/sim/app/templates/layout.tsx             |  15 +-
 apps/sim/app/templates/page.tsx               | 125 ++--
 apps/sim/app/templates/templates.tsx          | 352 ++++-----
 .../[workspaceId]/templates/[id]/page.tsx     |   6 +-
 .../[workspaceId]/templates/page.tsx          |   4 +-
 .../template-deploy/template-deploy.tsx       |  57 +-
 .../components/shared/usage-header.tsx        |  50 +-
 .../settings-modal/components/sso/sso.tsx     |  94 ++-
 .../components/subscription/subscription.tsx  |   2 +-
 .../member-invitation-card.tsx                | 245 +++----
 .../components/team-members/team-members.tsx  |  43 +-
 .../team-seats-overview.tsx                   |  82 ++-
 .../components/team-usage/team-usage.tsx      |   2 +-
 .../team-management/team-management.tsx       | 220 +++---
 .../sidebar/hooks/use-workspace-management.ts |  17 +-
 .../w/components/sidebar/sidebar.tsx          |  13 +-
 .../emcn/components/combobox/combobox.tsx     |  21 +-
 .../emcn/components/popover/popover.tsx       |   2 +-
 apps/sim/components/ui/dialog.tsx             |   4 +-
 .../components/user-avatar/user-avatar.tsx    |  66 ++
 apps/sim/middleware.ts                        |   5 +
 apps/sim/stores/organization/types.ts         |   1 +
 28 files changed, 1134 insertions(+), 1218 deletions(-)
 create mode 100644 apps/sim/app/templates/[id]/layout.tsx
 delete mode 100644 apps/sim/app/templates/components/navigation-tabs.tsx
 create mode 100644 apps/sim/app/templates/layout-client.tsx
 create mode 100644 apps/sim/components/user-avatar/user-avatar.tsx

diff --git a/apps/sim/app/templates/[id]/layout.tsx b/apps/sim/app/templates/[id]/layout.tsx
new file mode 100644
index 00000000000..ed557f2b2fd
--- /dev/null
+++ b/apps/sim/app/templates/[id]/layout.tsx
@@ -0,0 +1,44 @@
+import { db } from '@sim/db'
+import { permissions, workspace } from '@sim/db/schema'
+import { and, desc, eq } from 'drizzle-orm'
+import { redirect } from 'next/navigation'
+import { getSession } from '@/lib/auth'
+
+export const dynamic = 'force-dynamic'
+export const revalidate = 0
+
+interface TemplateLayoutProps {
+  children: React.ReactNode
+  params: Promise<{
+    id: string
+  }>
+}
+
+/**
+ * Template detail layout (public scope).
+ * - If user is authenticated, redirect to workspace-scoped template detail.
+ * - Otherwise render the public template detail children.
+ */
+export default async function TemplateDetailLayout({ children, params }: TemplateLayoutProps) {
+  const { id } = await params
+  const session = await getSession()
+
+  if (session?.user?.id) {
+    const userWorkspaces = await db
+      .select({
+        workspace: workspace,
+      })
+      .from(permissions)
+      .innerJoin(workspace, eq(permissions.entityId, workspace.id))
+      .where(and(eq(permissions.userId, session.user.id), eq(permissions.entityType, 'workspace')))
+      .orderBy(desc(workspace.createdAt))
+      .limit(1)
+
+    if (userWorkspaces.length > 0) {
+      const firstWorkspace = userWorkspaces[0].workspace
+      redirect(`/workspace/${firstWorkspace.id}/templates/${id}`)
+    }
+  }
+
+  return children
+}
diff --git a/apps/sim/app/templates/[id]/page.tsx b/apps/sim/app/templates/[id]/page.tsx
index f2a33359306..04792164fcd 100644
--- a/apps/sim/app/templates/[id]/page.tsx
+++ b/apps/sim/app/templates/[id]/page.tsx
@@ -1,5 +1,9 @@
 import TemplateDetails from './template'
 
+/**
+ * Public template detail page for unauthenticated users.
+ * Authenticated-user redirect is handled in templates/[id]/layout.tsx.
+ */
 export default function TemplatePage() {
   return <TemplateDetails />
 }
diff --git a/apps/sim/app/templates/[id]/template.tsx b/apps/sim/app/templates/[id]/template.tsx
index 89badf8fb5f..1d7ccf55168 100644
--- a/apps/sim/app/templates/[id]/template.tsx
+++ b/apps/sim/app/templates/[id]/template.tsx
@@ -9,12 +9,20 @@ import {
   Globe,
   Linkedin,
   Mail,
+  Share2,
   Star,
   User,
 } from 'lucide-react'
 import { useParams, useRouter, useSearchParams } from 'next/navigation'
 import ReactMarkdown from 'react-markdown'
-import { Button } from '@/components/emcn'
+import {
+  Button,
+  Copy,
+  Popover,
+  PopoverContent,
+  PopoverItem,
+  PopoverTrigger,
+} from '@/components/emcn'
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -23,6 +31,7 @@ import {
 } from '@/components/ui/dropdown-menu'
 import { useSession } from '@/lib/auth-client'
 import { createLogger } from '@/lib/logs/console/logger'
+import { getBaseUrl } from '@/lib/urls/utils'
 import { cn } from '@/lib/utils'
 import type { CredentialRequirement } from '@/lib/workflows/credential-extractor'
 import type { Template } from '@/app/templates/templates'
@@ -63,7 +72,7 @@ export default function TemplateDetails({ isWorkspaceContext = false }: Template
   >([])
   const [isLoadingWorkspaces, setIsLoadingWorkspaces] = useState(false)
   const [showWorkspaceSelectorForEdit, setShowWorkspaceSelectorForEdit] = useState(false)
-  const [showWorkspaceSelectorForUse, setShowWorkspaceSelectorForUse] = useState(false)
+  const [sharePopoverOpen, setSharePopoverOpen] = useState(false)
 
   const currentUserId = session?.user?.id || null
 
@@ -351,8 +360,6 @@ export default function TemplateDetails({ isWorkspaceContext = false }: Template
     // In workspace context, use current workspace directly
     if (isWorkspaceContext && workspaceId) {
       handleWorkspaceSelectForUse(workspaceId)
-    } else {
-      setShowWorkspaceSelectorForUse(true)
     }
   }
 
@@ -415,7 +422,6 @@ export default function TemplateDetails({ isWorkspaceContext = false }: Template
     if (isUsing || !template) return
 
     setIsUsing(true)
-    setShowWorkspaceSelectorForUse(false)
     try {
       const response = await fetch(`/api/templates/${template.id}/use`, {
         method: 'POST',
@@ -518,6 +524,57 @@ export default function TemplateDetails({ isWorkspaceContext = false }: Template
     }
   }
 
+  /**
+   * Shares the template to X (Twitter)
+   */
+  const handleShareToTwitter = () => {
+    if (!template) return
+
+    setSharePopoverOpen(false)
+    const templateUrl = `${getBaseUrl()}/templates/${template.id}`
+
+    let tweetText = `🚀 Check out this workflow template: ${template.name}`
+
+    if (template.details?.tagline) {
+      const taglinePreview =
+        template.details.tagline.length > 100
+          ? `${template.details.tagline.substring(0, 100)}...`
+          : template.details.tagline
+      tweetText += `\n\n${taglinePreview}`
+    }
+
+    const maxTextLength = 280 - 23 - 1
+    if (tweetText.length > maxTextLength) {
+      tweetText = `${tweetText.substring(0, maxTextLength - 3)}...`
+    }
+
+    const twitterUrl = `https://twitter.com/intent/tweet?text=${encodeURIComponent(tweetText)}&url=${encodeURIComponent(templateUrl)}`
+    window.open(twitterUrl, '_blank', 'noopener,noreferrer')
+  }
+
+  /**
+   * Shares the template to LinkedIn.
+   */
+  const handleShareToLinkedIn = () => {
+    if (!template) return
+
+    setSharePopoverOpen(false)
+    const templateUrl = `${getBaseUrl()}/templates/${template.id}`
+    const linkedInUrl = `https://www.linkedin.com/sharing/share-offsite/?url=${encodeURIComponent(templateUrl)}`
+    window.open(linkedInUrl, '_blank', 'noopener,noreferrer')
+  }
+
+  const handleCopyLink = async () => {
+    setSharePopoverOpen(false)
+    const templateUrl = `${getBaseUrl()}/templates/${template?.id}`
+    try {
+      await navigator.clipboard.writeText(templateUrl)
+      logger.info('Template link copied to clipboard')
+    } catch (error) {
+      logger.error('Failed to copy link:', error)
+    }
+  }
+
   return (
     <div className={cn('flex min-h-screen flex-col', isWorkspaceContext && 'pl-64')}>
       <div className='flex flex-1 overflow-hidden'>
@@ -530,7 +587,7 @@ export default function TemplateDetails({ isWorkspaceContext = false }: Template
               className='flex items-center gap-[6px] font-medium text-[#ADADAD] text-[14px] transition-colors hover:text-white'
             >
               <ArrowLeft className='h-[14px] w-[14px]' />
-              <span>Back</span>
+              <span>More Templates</span>
             </button>
           </div>
 
@@ -622,7 +679,7 @@ export default function TemplateDetails({ isWorkspaceContext = false }: Template
                 <>
                   {!currentUserId ? (
                     <Button
-                      variant='active'
+                      variant='primary'
                       onClick={() => {
                         const callbackUrl =
                           isWorkspaceContext && workspaceId
@@ -645,48 +702,39 @@ export default function TemplateDetails({ isWorkspaceContext = false }: Template
                     >
                       {isUsing ? 'Creating...' : 'Use template'}
                     </Button>
-                  ) : (
-                    <DropdownMenu
-                      open={showWorkspaceSelectorForUse}
-                      onOpenChange={setShowWorkspaceSelectorForUse}
-                    >
-                      <DropdownMenuTrigger asChild>
-                        <Button
-                          variant='primary'
-                          onClick={() => setShowWorkspaceSelectorForUse(true)}
-                          disabled={isUsing || isLoadingWorkspaces}
-                          className='h-[32px] rounded-[6px] px-[16px] text-[#FFFFFF] text-[14px]'
-                        >
-                          {isUsing ? 'Creating...' : isLoadingWorkspaces ? 'Loading...' : 'Use'}
-                          <ChevronDown className='ml-2 h-4 w-4' />
-                        </Button>
-                      </DropdownMenuTrigger>
-                      <DropdownMenuContent align='end' className='w-56'>
-                        {workspaces.length === 0 ? (
-                          <DropdownMenuItem disabled className='text-muted-foreground text-sm'>
-                            No workspaces with write access
-                          </DropdownMenuItem>
-                        ) : (
-                          workspaces.map((workspace) => (
-                            <DropdownMenuItem
-                              key={workspace.id}
-                              onClick={() => handleWorkspaceSelectForUse(workspace.id)}
-                              className='flex cursor-pointer items-center justify-between'
-                            >
-                              <div className='flex flex-col'>
-                                <span className='font-medium text-sm'>{workspace.name}</span>
-                                <span className='text-muted-foreground text-xs capitalize'>
-                                  {workspace.permissions} access
-                                </span>
-                              </div>
-                            </DropdownMenuItem>
-                          ))
-                        )}
-                      </DropdownMenuContent>
-                    </DropdownMenu>
-                  )}
+                  ) : null}
                 </>
               )}
+
+              {/* Share button */}
+              <Popover open={sharePopoverOpen} onOpenChange={setSharePopoverOpen}>
+                <PopoverTrigger asChild>
+                  <Button variant='active' className='h-[32px] rounded-[6px] px-[12px]'>
+                    <Share2 className='h-[14px] w-[14px]' />
+                  </Button>
+                </PopoverTrigger>
+                <PopoverContent align='end' side='bottom' sideOffset={8}>
+                  <PopoverItem onClick={handleCopyLink}>
+                    <Copy className='h-3 w-3' />
+                    <span>Copy link</span>
+                  </PopoverItem>
+                  <PopoverItem onClick={handleShareToTwitter}>
+                    <svg
+                      className='h-3 w-3'
+                      viewBox='0 0 24 24'
+                      fill='currentColor'
+                      xmlns='http://www.w3.org/2000/svg'
+                    >
+                      <path d='M18.244 2.25h3.308l-7.227 8.26 8.502 11.24H16.17l-5.214-6.817L4.99 21.75H1.68l7.73-8.835L1.254 2.25H8.08l4.713 6.231zm-1.161 17.52h1.833L7.084 4.126H5.117z' />
+                    </svg>
+                    <span>Share on X</span>
+                  </PopoverItem>
+                  <PopoverItem onClick={handleShareToLinkedIn}>
+                    <Linkedin className='h-3 w-3' />
+                    <span>Share on LinkedIn</span>
+                  </PopoverItem>
+                </PopoverContent>
+              </Popover>
             </div>
           </div>
 
diff --git a/apps/sim/app/templates/components/navigation-tabs.tsx b/apps/sim/app/templates/components/navigation-tabs.tsx
deleted file mode 100644
index f3a6271f101..00000000000
--- a/apps/sim/app/templates/components/navigation-tabs.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { cn } from '@/lib/utils'
-
-interface NavigationTab {
-  id: string
-  label: string
-  count?: number
-}
-
-interface NavigationTabsProps {
-  tabs: NavigationTab[]
-  activeTab?: string
-  onTabClick?: (tabId: string) => void
-  className?: string
-}
-
-export function NavigationTabs({ tabs, activeTab, onTabClick, className }: NavigationTabsProps) {
-  return (
-    <div className={cn('flex items-center gap-2', className)}>
-      {tabs.map((tab, index) => (
-        <button
-          key={tab.id}
-          onClick={() => onTabClick?.(tab.id)}
-          className={cn(
-            'flex h-[38px] items-center gap-1 rounded-[14px] px-3 font-[440] font-sans text-muted-foreground text-sm transition-all duration-200',
-            activeTab === tab.id ? 'bg-secondary' : 'bg-transparent hover:bg-secondary/50'
-          )}
-        >
-          <span>{tab.label}</span>
-        </button>
-      ))}
-    </div>
-  )
-}
diff --git a/apps/sim/app/templates/components/template-card.tsx b/apps/sim/app/templates/components/template-card.tsx
index 2d930f067ac..5acafd05b25 100644
--- a/apps/sim/app/templates/components/template-card.tsx
+++ b/apps/sim/app/templates/components/template-card.tsx
@@ -1,116 +1,14 @@
-import { useState } from 'react'
-import {
-  Award,
-  BarChart3,
-  Bell,
-  BookOpen,
-  Bot,
-  Brain,
-  Briefcase,
-  Calculator,
-  ChartNoAxesColumn,
-  Cloud,
-  Code,
-  Cpu,
-  CreditCard,
-  Database,
-  DollarSign,
-  Edit,
-  FileText,
-  Folder,
-  Globe,
-  HeadphonesIcon,
-  Layers,
-  Lightbulb,
-  LineChart,
-  Mail,
-  Megaphone,
-  MessageSquare,
-  NotebookPen,
-  Phone,
-  Play,
-  Search,
-  Server,
-  Settings,
-  ShoppingCart,
-  Star,
-  Target,
-  TrendingUp,
-  User,
-  Users,
-  Workflow,
-  Wrench,
-  Zap,
-} from 'lucide-react'
+import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { Star, User } from 'lucide-react'
 import { useParams, useRouter } from 'next/navigation'
-import { Badge } from '@/components/ui/badge'
 import { createLogger } from '@/lib/logs/console/logger'
 import { cn } from '@/lib/utils'
+import { WorkflowPreview } from '@/app/workspace/[workspaceId]/w/components/workflow-preview/workflow-preview'
 import { getBlock } from '@/blocks/registry'
+import type { WorkflowState } from '@/stores/workflows/workflow/types'
 
 const logger = createLogger('TemplateCard')
 
-// Icon mapping for template icons
-const iconMap = {
-  // Content & Documentation
-  FileText,
-  NotebookPen,
-  BookOpen,
-  Edit,
-
-  // Analytics & Charts
-  BarChart3,
-  LineChart,
-  TrendingUp,
-  Target,
-
-  // Database & Storage
-  Database,
-  Server,
-  Cloud,
-  Folder,
-
-  // Marketing & Communication
-  Megaphone,
-  Mail,
-  MessageSquare,
-  Phone,
-  Bell,
-
-  // Sales & Finance
-  DollarSign,
-  CreditCard,
-  Calculator,
-  ShoppingCart,
-  Briefcase,
-
-  // Support & Service
-  HeadphonesIcon,
-  User,
-  Users,
-  Settings,
-  Wrench,
-
-  // AI & Technology
-  Bot,
-  Brain,
-  Cpu,
-  Code,
-  Zap,
-
-  // Workflow & Process
-  Workflow,
-  Search,
-  Play,
-  Layers,
-
-  // General
-  Lightbulb,
-  Star,
-  Globe,
-  Award,
-}
-
 interface TemplateCardProps {
   id: string
   title: string
@@ -119,78 +17,56 @@ interface TemplateCardProps {
   authorImageUrl?: string | null
   usageCount: string
   stars?: number
+  icon?: React.ReactNode | string
+  iconColor?: string
   blocks?: string[]
-  tags?: string[]
+  onClick?: () => void
   className?: string
-  state?: {
-    blocks?: Record<string, { type: string; name?: string }>
-  }
+  // Workflow state for rendering preview
+  state?: WorkflowState
   isStarred?: boolean
+  // Optional callback when template is successfully used (for closing modals, etc.)
+  onTemplateUsed?: () => void
+  // Callback when star state changes (for parent state updates)
   onStarChange?: (templateId: string, isStarred: boolean, newStarCount: number) => void
+  // User authentication status
   isAuthenticated?: boolean
-  onTemplateUsed?: () => void
-  status?: 'pending' | 'approved' | 'rejected'
-  isSuperUser?: boolean
-  onApprove?: (templateId: string) => void
-  onReject?: (templateId: string) => void
 }
 
-// Skeleton component for loading states
+/**
+ * Skeleton component for loading states
+ */
 export function TemplateCardSkeleton({ className }: { className?: string }) {
   return (
-    <div className={cn('rounded-[8px] border bg-card shadow-xs', 'flex h-[142px]', className)}>
-      {/* Left side - Info skeleton */}
-      <div className='flex min-w-0 flex-1 flex-col justify-between p-4'>
-        {/* Top section skeleton */}
-        <div className='space-y-2'>
-          <div className='flex min-w-0 items-center justify-between gap-2.5'>
-            <div className='flex min-w-0 items-center gap-2.5'>
-              {/* Icon skeleton */}
-              <div className='h-5 w-5 flex-shrink-0 animate-pulse rounded-md bg-gray-200' />
-              {/* Title skeleton */}
-              <div className='h-4 w-32 animate-pulse rounded bg-gray-200' />
-            </div>
-
-            {/* Star and Use button skeleton */}
-            <div className='flex flex-shrink-0 items-center gap-3'>
-              <div className='h-4 w-4 animate-pulse rounded bg-gray-200' />
-              <div className='h-6 w-10 animate-pulse rounded-md bg-gray-200' />
-            </div>
-          </div>
-
-          {/* Description skeleton */}
-          <div className='space-y-1.5'>
-            <div className='h-3 w-full animate-pulse rounded bg-gray-200' />
-            <div className='h-3 w-4/5 animate-pulse rounded bg-gray-200' />
-            <div className='h-3 w-3/5 animate-pulse rounded bg-gray-200' />
-          </div>
-        </div>
-
-        {/* Bottom section skeleton */}
-        <div className='flex min-w-0 items-center gap-1.5 pt-1.5'>
-          <div className='h-3 w-6 animate-pulse rounded bg-gray-200' />
-          <div className='h-3 w-16 animate-pulse rounded bg-gray-200' />
-          <div className='h-2 w-1 animate-pulse rounded bg-gray-200' />
-          <div className='h-3 w-3 animate-pulse rounded bg-gray-200' />
-          <div className='h-3 w-8 animate-pulse rounded bg-gray-200' />
-          {/* Stars section - hidden on smaller screens */}
-          <div className='hidden flex-shrink-0 items-center gap-1.5 sm:flex'>
-            <div className='h-2 w-1 animate-pulse rounded bg-gray-200' />
-            <div className='h-3 w-3 animate-pulse rounded bg-gray-200' />
-            <div className='h-3 w-6 animate-pulse rounded bg-gray-200' />
-          </div>
+    <div className={cn('h-[268px] w-full rounded-[8px] bg-[#202020] p-[8px]', className)}>
+      {/* Workflow preview skeleton */}
+      <div className='h-[180px] w-full animate-pulse rounded-[6px] bg-gray-700' />
+
+      {/* Title and blocks row skeleton */}
+      <div className='mt-[14px] flex items-center justify-between'>
+        <div className='h-4 w-32 animate-pulse rounded bg-gray-700' />
+        <div className='flex items-center gap-[-4px]'>
+          {Array.from({ length: 3 }).map((_, index) => (
+            <div
+              key={index}
+              className='h-[18px] w-[18px] animate-pulse rounded-[4px] bg-gray-700'
+            />
+          ))}
         </div>
       </div>
 
-      {/* Right side - Block Icons skeleton */}
-      <div className='flex w-16 flex-col items-center justify-center gap-2 rounded-r-[8px] border-border border-l bg-secondary p-2'>
-        {Array.from({ length: 3 }).map((_, index) => (
-          <div
-            key={index}
-            className='animate-pulse rounded bg-gray-200'
-            style={{ width: '30px', height: '30px' }}
-          />
-        ))}
+      {/* Creator and stats row skeleton */}
+      <div className='mt-[14px] flex items-center justify-between'>
+        <div className='flex items-center gap-[8px]'>
+          <div className='h-[14px] w-[14px] animate-pulse rounded-full bg-gray-700' />
+          <div className='h-3 w-20 animate-pulse rounded bg-gray-700' />
+        </div>
+        <div className='flex items-center gap-[6px]'>
+          <div className='h-3 w-3 animate-pulse rounded bg-gray-700' />
+          <div className='h-3 w-6 animate-pulse rounded bg-gray-700' />
+          <div className='h-3 w-3 animate-pulse rounded bg-gray-700' />
+          <div className='h-3 w-6 animate-pulse rounded bg-gray-700' />
+        </div>
       </div>
     </div>
   )
@@ -211,13 +87,59 @@ const extractBlockTypesFromState = (state?: {
   return [...new Set(blockTypes)]
 }
 
-// Utility function to get block display name
+// Utility function to get the full block config for colored icon display
 const getBlockConfig = (blockType: string) => {
   const block = getBlock(blockType)
   return block
 }
 
-export function TemplateCard({
+/**
+ * Normalize an arbitrary workflow-like object into a valid WorkflowState for preview rendering.
+ * Ensures required fields exist: blocks with required properties, edges array, loops and parallels maps.
+ */
+function normalizeWorkflowState(input?: any): WorkflowState | null {
+  if (!input || !input.blocks) return null
+
+  const normalizedBlocks: WorkflowState['blocks'] = {}
+  for (const [id, raw] of Object.entries<any>(input.blocks || {})) {
+    if (!raw || !raw.type) continue
+    normalizedBlocks[id] = {
+      id: raw.id ?? id,
+      type: raw.type,
+      name: raw.name ?? raw.type,
+      position: raw.position ?? { x: 0, y: 0 },
+      subBlocks: raw.subBlocks ?? {},
+      outputs: raw.outputs ?? {},
+      enabled: typeof raw.enabled === 'boolean' ? raw.enabled : true,
+      horizontalHandles: raw.horizontalHandles,
+      height: raw.height,
+      advancedMode: raw.advancedMode,
+      triggerMode: raw.triggerMode,
+      data: raw.data ?? {},
+      layout: raw.layout,
+    }
+  }
+
+  const normalized: WorkflowState = {
+    blocks: normalizedBlocks,
+    edges: Array.isArray(input.edges) ? input.edges : [],
+    loops: input.loops ?? {},
+    parallels: input.parallels ?? {},
+    lastSaved: input.lastSaved,
+    lastUpdate: input.lastUpdate,
+    metadata: input.metadata,
+    variables: input.variables,
+    isDeployed: input.isDeployed,
+    deployedAt: input.deployedAt,
+    deploymentStatuses: input.deploymentStatuses,
+    needsRedeployment: input.needsRedeployment,
+    dragStartPosition: input.dragStartPosition ?? null,
+  }
+
+  return normalized
+}
+
+function TemplateCardInner({
   id,
   title,
   description,
@@ -225,18 +147,16 @@ export function TemplateCard({
   authorImageUrl,
   usageCount,
   stars = 0,
+  icon,
+  iconColor = 'bg-blue-500',
   blocks = [],
-  tags = [],
+  onClick,
   className,
   state,
   isStarred = false,
+  onTemplateUsed,
   onStarChange,
   isAuthenticated = true,
-  onTemplateUsed,
-  status,
-  isSuperUser,
-  onApprove,
-  onReject,
 }: TemplateCardProps) {
   const router = useRouter()
   const params = useParams()
@@ -245,17 +165,39 @@ export function TemplateCard({
   const [localIsStarred, setLocalIsStarred] = useState(isStarred)
   const [localStarCount, setLocalStarCount] = useState(stars)
   const [isStarLoading, setIsStarLoading] = useState(false)
-  const [isApproving, setIsApproving] = useState(false)
-  const [isRejecting, setIsRejecting] = useState(false)
+
+  // Memoize normalized workflow state to avoid recalculation on every render
+  const normalizedState = useMemo(() => normalizeWorkflowState(state), [state])
+
+  // Use IntersectionObserver to defer rendering the heavy WorkflowPreview until in viewport
+  const previewRef = useRef<HTMLDivElement | null>(null)
+  const [isInView, setIsInView] = useState(false)
+
+  useEffect(() => {
+    if (!previewRef.current) return
+    const observer = new IntersectionObserver(
+      ([entry]) => {
+        if (entry.isIntersecting) {
+          setIsInView(true)
+          observer.disconnect()
+        }
+      },
+      { root: null, rootMargin: '200px', threshold: 0 }
+    )
+    observer.observe(previewRef.current)
+    return () => observer.disconnect()
+  }, [])
 
   // Extract block types from state if provided, otherwise use the blocks prop
   // Filter out starter blocks in both cases and sort for consistent rendering
-  const blockTypes = state
-    ? extractBlockTypesFromState(state)
-    : blocks.filter((blockType) => blockType !== 'starter').sort()
-
-  // Determine if we're in a workspace context
-  const workspaceId = params?.workspaceId as string | undefined
+  // Memoized to prevent recalculation on every render
+  const blockTypes = useMemo(
+    () =>
+      state
+        ? extractBlockTypesFromState(state)
+        : blocks.filter((blockType) => blockType !== 'starter').sort(),
+    [state, blocks]
+  )
 
   // Handle star toggle with optimistic updates
   const handleStarClick = async (e: React.MouseEvent) => {
@@ -311,305 +253,162 @@ export function TemplateCard({
   }
 
   /**
-   * Handles template use action
-   * - In workspace context: Creates workflow instance via API
-   * - Outside workspace: Navigates to template detail page
+   * Get the appropriate template detail page URL based on context.
+   * If we're in a workspace context, navigate to the workspace template page.
+   * Otherwise, navigate to the global template page.
+   * Memoized to avoid recalculation on every render.
    */
-  const handleUseClick = async (e: React.MouseEvent) => {
-    e.stopPropagation()
-
+  const templateUrl = useMemo(() => {
+    const workspaceId = params?.workspaceId as string | undefined
     if (workspaceId) {
-      // Workspace context: Use API to create workflow instance
-      try {
-        const response = await fetch(`/api/templates/${id}/use`, {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ workspaceId }),
-        })
-
-        if (response.ok) {
-          const data = await response.json()
-          logger.info('Template use API response:', data)
-
-          if (!data.workflowId) {
-            logger.error('No workflowId returned from API:', data)
-            return
-          }
-
-          const workflowUrl = `/workspace/${workspaceId}/w/${data.workflowId}`
-          logger.info('Template used successfully, navigating to:', workflowUrl)
-
-          if (onTemplateUsed) {
-            onTemplateUsed()
-          }
-
-          window.location.href = workflowUrl
-        } else {
-          const errorText = await response.text()
-          logger.error('Failed to use template:', response.statusText, errorText)
-        }
-      } catch (error) {
-        logger.error('Error using template:', error)
-      }
-    } else {
-      // Non-workspace context: Navigate to template detail page
-      router.push(`/templates/${id}`)
+      return `/workspace/${workspaceId}/templates/${id}`
     }
-  }
+    return `/templates/${id}`
+  }, [params?.workspaceId, id])
 
   /**
-   * Handles card click navigation
-   * - In workspace context: Navigate to workspace template detail
-   * - Outside workspace: Navigate to global template detail
+   * Handle use button click - navigate to template detail page
    */
-  const handleCardClick = (e: React.MouseEvent) => {
-    const target = e.target as HTMLElement
-    if (target.closest('button') || target.closest('[data-action]')) {
-      return
-    }
-
-    if (workspaceId) {
-      router.push(`/workspace/${workspaceId}/templates/${id}`)
-    } else {
-      router.push(`/templates/${id}`)
-    }
-  }
+  const handleUseClick = useCallback(
+    (e: React.MouseEvent) => {
+      e.stopPropagation()
+      router.push(templateUrl)
+    },
+    [router, templateUrl]
+  )
 
   /**
-   * Handles template approval (super user only)
+   * Handle card click - navigate to template detail page
    */
-  const handleApprove = async (e: React.MouseEvent) => {
-    e.stopPropagation()
-    if (isApproving || !onApprove) return
-
-    setIsApproving(true)
-    try {
-      const response = await fetch(`/api/templates/${id}/approve`, {
-        method: 'POST',
-      })
-
-      if (response.ok) {
-        onApprove(id)
-      } else {
-        logger.error('Failed to approve template:', response.statusText)
+  const handleCardClick = useCallback(
+    (e: React.MouseEvent) => {
+      // Don't navigate if clicking on action buttons
+      const target = e.target as HTMLElement
+      if (target.closest('button') || target.closest('[data-action]')) {
+        return
       }
-    } catch (error) {
-      logger.error('Error approving template:', error)
-    } finally {
-      setIsApproving(false)
-    }
-  }
 
-  /**
-   * Handles template rejection (super user only)
-   */
-  const handleReject = async (e: React.MouseEvent) => {
-    e.stopPropagation()
-    if (isRejecting || !onReject) return
-
-    setIsRejecting(true)
-    try {
-      const response = await fetch(`/api/templates/${id}/reject`, {
-        method: 'POST',
-      })
-
-      if (response.ok) {
-        onReject(id)
-      } else {
-        logger.error('Failed to reject template:', response.statusText)
-      }
-    } catch (error) {
-      logger.error('Error rejecting template:', error)
-    } finally {
-      setIsRejecting(false)
-    }
-  }
+      router.push(templateUrl)
+    },
+    [router, templateUrl]
+  )
 
   return (
     <div
       onClick={handleCardClick}
-      className={cn(
-        'group cursor-pointer rounded-[8px] border bg-card shadow-xs transition-shadow duration-200 hover:border-border/80 hover:shadow-sm',
-        'flex h-[142px]',
-        className
-      )}
+      className={cn('w-full cursor-pointer rounded-[8px] bg-[#202020] p-[8px]', className)}
     >
-      {/* Left side - Info */}
-      <div className='flex min-w-0 flex-1 flex-col justify-between p-4'>
-        {/* Top section */}
-        <div className='space-y-2'>
-          <div className='flex min-w-0 items-center justify-between gap-2.5'>
-            <div className='flex min-w-0 items-center gap-2.5'>
-              {/* Template name */}
-              <h3 className='truncate font-medium font-sans text-card-foreground text-sm leading-tight'>
-                {title}
-              </h3>
-            </div>
-
-            {/* Actions */}
-            <div className='flex flex-shrink-0 items-center gap-2'>
-              {/* Super user approval buttons for pending templates */}
-              {isSuperUser && status === 'pending' ? (
-                <>
-                  <button
-                    onClick={handleApprove}
-                    disabled={isApproving}
-                    className={cn(
-                      'rounded-[8px] px-3 py-1 font-medium font-sans text-white text-xs transition-colors duration-200',
-                      'bg-green-600 hover:bg-green-700 disabled:opacity-50'
-                    )}
-                  >
-                    {isApproving ? '...' : 'Approve'}
-                  </button>
-                  <button
-                    onClick={handleReject}
-                    disabled={isRejecting}
-                    className={cn(
-                      'rounded-[8px] px-3 py-1 font-medium font-sans text-white text-xs transition-colors duration-200',
-                      'bg-red-600 hover:bg-red-700 disabled:opacity-50'
-                    )}
-                  >
-                    {isRejecting ? '...' : 'Reject'}
-                  </button>
-                </>
-              ) : (
-                <>
-                  {/* Star button - only for authenticated users */}
-                  {isAuthenticated && (
-                    <Star
-                      onClick={handleStarClick}
-                      className={cn(
-                        'h-4 w-4 cursor-pointer transition-colors duration-50',
-                        localIsStarred
-                          ? 'fill-yellow-500 text-yellow-500'
-                          : 'text-muted-foreground hover:fill-yellow-500 hover:text-yellow-500',
-                        isStarLoading && 'opacity-50'
-                      )}
-                    />
-                  )}
-                  <button
-                    onClick={handleUseClick}
-                    className={cn(
-                      'rounded-[8px] px-3 py-1 font-medium font-sans text-white text-xs transition-[background-color,box-shadow] duration-200',
-                      'bg-[var(--brand-primary-hex)] hover:bg-[var(--brand-primary-hover-hex)]',
-                      'shadow-[0_0_0_0_var(--brand-primary-hex)] hover:shadow-[0_0_0_4px_rgba(127,47,255,0.15)]'
-                    )}
-                  >
-                    Use
-                  </button>
-                </>
-              )}
-            </div>
-          </div>
-
-          {/* Description */}
-          <p className='line-clamp-2 break-words font-sans text-muted-foreground text-xs leading-relaxed'>
-            {description}
-          </p>
-
-          {/* Tags */}
-          {tags && tags.length > 0 && (
-            <div className='mt-1 flex flex-wrap gap-1'>
-              {tags.slice(0, 3).map((tag, index) => (
-                <Badge
-                  key={index}
-                  variant='secondary'
-                  className='h-5 border-0 bg-muted/60 px-1.5 text-[10px] hover:bg-muted/80'
-                >
-                  {tag}
-                </Badge>
-              ))}
-              {tags.length > 3 && (
-                <Badge
-                  variant='secondary'
-                  className='h-5 border-0 bg-muted/60 px-1.5 text-[10px] hover:bg-muted/80'
-                >
-                  +{tags.length - 3}
-                </Badge>
-              )}
-            </div>
-          )}
-        </div>
-
-        {/* Bottom section */}
-        <div className='flex min-w-0 items-center gap-1.5 pt-1.5 font-sans text-muted-foreground text-xs'>
-          {authorImageUrl ? (
-            <div className='h-3 w-3 flex-shrink-0 overflow-hidden rounded-full'>
-              <img src={authorImageUrl} alt={author} className='h-full w-full object-cover' />
-            </div>
-          ) : (
-            <User className='h-3 w-3 flex-shrink-0' />
-          )}
-          <span className='min-w-0 truncate'>{author}</span>
-          <span className='flex-shrink-0'>•</span>
-          <ChartNoAxesColumn className='h-3 w-3 flex-shrink-0' />
-          <span className='flex-shrink-0'>{usageCount}</span>
-          {/* Stars section - hidden on smaller screens when space is constrained */}
-          <div className='hidden flex-shrink-0 items-center gap-1.5 sm:flex'>
-            <span>•</span>
-            <Star className='h-3 w-3' />
-            <span>{localStarCount}</span>
-          </div>
-        </div>
+      {/* Workflow Preview */}
+      <div
+        ref={previewRef}
+        className='pointer-events-none h-[180px] w-full overflow-hidden rounded-[6px]'
+      >
+        {normalizedState && isInView ? (
+          <WorkflowPreview
+            workflowState={normalizedState}
+            showSubBlocks={false}
+            height={180}
+            width='100%'
+            isPannable={false}
+            defaultZoom={0.8}
+            fitPadding={0.2}
+          />
+        ) : (
+          <div className='h-full w-full bg-[#2A2A2A]' />
+        )}
       </div>
 
-      {/* Right side - Block Icons */}
-      <div className='flex w-16 flex-col items-center justify-center gap-2 rounded-r-[8px] border-border border-l bg-secondary p-2'>
-        {blockTypes.length > 3 ? (
-          <>
-            {/* Show first 2 blocks when there are more than 3 */}
-            {blockTypes.slice(0, 2).map((blockType, index) => {
-              const blockConfig = getBlockConfig(blockType)
-              if (!blockConfig) return null
-
-              return (
-                <div key={index} className='flex items-center justify-center'>
+      {/* Title and Blocks Row */}
+      <div className='mt-[10px] flex items-center justify-between'>
+        {/* Template Name */}
+        <h3 className='truncate pr-[8px] pl-[2px] font-medium text-[16px] text-white'>{title}</h3>
+
+        {/* Block Icons */}
+        <div className='flex flex-shrink-0'>
+          {blockTypes.length > 4 ? (
+            <>
+              {/* Show first 3 blocks when there are more than 4 */}
+              {blockTypes.slice(0, 3).map((blockType, index) => {
+                const blockConfig = getBlockConfig(blockType)
+                if (!blockConfig) return null
+
+                return (
                   <div
-                    className='flex flex-shrink-0 items-center justify-center rounded-[8px]'
+                    key={index}
+                    className='flex h-[18px] w-[18px] flex-shrink-0 items-center justify-center rounded-[4px]'
                     style={{
                       backgroundColor: blockConfig.bgColor || 'gray',
-                      width: '30px',
-                      height: '30px',
+                      marginLeft: index > 0 ? '-4px' : '0',
                     }}
                   >
-                    <blockConfig.icon className='h-4 w-4 text-white' />
+                    <blockConfig.icon className='h-[10px] w-[10px] text-white' />
                   </div>
-                </div>
-              )
-            })}
-            {/* Show +n block for remaining blocks */}
-            <div className='flex items-center justify-center'>
+                )
+              })}
+              {/* Show +n for remaining blocks */}
               <div
-                className='flex flex-shrink-0 items-center justify-center rounded-[8px] bg-muted-foreground'
-                style={{ width: '30px', height: '30px' }}
+                className='flex h-[18px] w-[18px] flex-shrink-0 items-center justify-center rounded-[4px] bg-[#4A4A4A]'
+                style={{ marginLeft: '-4px' }}
               >
-                <span className='font-medium text-white text-xs'>+{blockTypes.length - 2}</span>
+                <span className='font-medium text-[10px] text-white'>+{blockTypes.length - 3}</span>
               </div>
-            </div>
-          </>
-        ) : (
-          /* Show all blocks when 3 or fewer */
-          blockTypes.map((blockType, index) => {
-            const blockConfig = getBlockConfig(blockType)
-            if (!blockConfig) return null
+            </>
+          ) : (
+            /* Show all blocks when 4 or fewer */
+            blockTypes.map((blockType, index) => {
+              const blockConfig = getBlockConfig(blockType)
+              if (!blockConfig) return null
 
-            return (
-              <div key={index} className='flex items-center justify-center'>
+              return (
                 <div
-                  className='flex flex-shrink-0 items-center justify-center rounded-[8px]'
+                  key={index}
+                  className='flex h-[18px] w-[18px] flex-shrink-0 items-center justify-center rounded-[4px]'
                   style={{
                     backgroundColor: blockConfig.bgColor || 'gray',
-                    width: '30px',
-                    height: '30px',
+                    marginLeft: index > 0 ? '-4px' : '0',
                   }}
                 >
-                  <blockConfig.icon className='h-4 w-4 text-white' />
+                  <blockConfig.icon className='h-[10px] w-[10px] text-white' />
                 </div>
-              </div>
-            )
-          })
-        )}
+              )
+            })
+          )}
+        </div>
+      </div>
+
+      {/* Creator and Stats Row */}
+      <div className='mt-[10px] flex items-center justify-between'>
+        {/* Creator Info */}
+        <div className='flex items-center gap-[8px]'>
+          {authorImageUrl ? (
+            <div className='h-[26px] w-[26px] flex-shrink-0 overflow-hidden rounded-full'>
+              <img src={authorImageUrl} alt={author} className='h-full w-full object-cover' />
+            </div>
+          ) : (
+            <div className='flex h-[26px] w-[26px] flex-shrink-0 items-center justify-center rounded-full bg-[#4A4A4A]'>
+              <User className='h-[18px] w-[18px] text-[#888888]' />
+            </div>
+          )}
+          <span className='truncate font-medium text-[#888888] text-[12px]'>{author}</span>
+        </div>
+
+        {/* Stats */}
+        <div className='flex flex-shrink-0 items-center gap-[6px] font-medium text-[#888888] text-[12px]'>
+          <User className='h-[12px] w-[12px]' />
+          <span>{usageCount}</span>
+          <Star
+            onClick={handleStarClick}
+            className={cn(
+              'h-[12px] w-[12px] cursor-pointer transition-colors',
+              localIsStarred ? 'fill-yellow-500 text-yellow-500' : 'text-[#888888]',
+              isStarLoading && 'opacity-50'
+            )}
+          />
+          <span>{localStarCount}</span>
+        </div>
       </div>
     </div>
   )
 }
+
+export const TemplateCard = memo(TemplateCardInner)
diff --git a/apps/sim/app/templates/layout-client.tsx b/apps/sim/app/templates/layout-client.tsx
new file mode 100644
index 00000000000..70514288819
--- /dev/null
+++ b/apps/sim/app/templates/layout-client.tsx
@@ -0,0 +1,12 @@
+'use client'
+
+import { Tooltip } from '@/components/emcn'
+import { season } from '@/app/fonts/season/season'
+
+export default function TemplatesLayoutClient({ children }: { children: React.ReactNode }) {
+  return (
+    <Tooltip.Provider delayDuration={600} skipDelayDuration={0}>
+      <div className={`${season.variable} font-season`}>{children}</div>
+    </Tooltip.Provider>
+  )
+}
diff --git a/apps/sim/app/templates/layout.tsx b/apps/sim/app/templates/layout.tsx
index 306ad11c604..d1078c07931 100644
--- a/apps/sim/app/templates/layout.tsx
+++ b/apps/sim/app/templates/layout.tsx
@@ -1,12 +1,9 @@
-'use client'
-
-import { Tooltip } from '@/components/emcn'
-import { season } from '@/app/fonts/season/season'
+import TemplatesLayoutClient from './layout-client'
 
+/**
+ * Templates layout - server component wrapper for client layout.
+ * Redirect logic is handled by individual pages to preserve paths.
+ */
 export default function TemplatesLayout({ children }: { children: React.ReactNode }) {
-  return (
-    <Tooltip.Provider delayDuration={600} skipDelayDuration={0}>
-      <div className={`${season.variable} font-season`}>{children}</div>
-    </Tooltip.Provider>
-  )
+  return <TemplatesLayoutClient>{children}</TemplatesLayoutClient>
 }
diff --git a/apps/sim/app/templates/page.tsx b/apps/sim/app/templates/page.tsx
index e159b42125d..c233949a45f 100644
--- a/apps/sim/app/templates/page.tsx
+++ b/apps/sim/app/templates/page.tsx
@@ -1,99 +1,66 @@
 import { db } from '@sim/db'
-import { settings, templateCreators, templateStars, templates, user } from '@sim/db/schema'
-import { and, desc, eq, sql } from 'drizzle-orm'
+import { permissions, templateCreators, templates, workspace } from '@sim/db/schema'
+import { and, desc, eq } from 'drizzle-orm'
+import { redirect } from 'next/navigation'
 import { getSession } from '@/lib/auth'
 import type { Template } from '@/app/templates/templates'
 import Templates from '@/app/templates/templates'
 
+/**
+ * Public templates list page.
+ * Redirects authenticated users to their workspace-scoped templates page.
+ * Allows unauthenticated users to view templates for SEO and discovery.
+ */
 export default async function TemplatesPage() {
   const session = await getSession()
 
-  // Check if user is a super user and if super user mode is enabled
-  let effectiveSuperUser = false
+  // Authenticated users: redirect to workspace-scoped templates
   if (session?.user?.id) {
-    const currentUser = await db
-      .select({ isSuperUser: user.isSuperUser })
-      .from(user)
-      .where(eq(user.id, session.user.id))
-      .limit(1)
-    const userSettings = await db
-      .select({ superUserModeEnabled: settings.superUserModeEnabled })
-      .from(settings)
-      .where(eq(settings.userId, session.user.id))
+    const userWorkspaces = await db
+      .select({
+        workspace: workspace,
+      })
+      .from(permissions)
+      .innerJoin(workspace, eq(permissions.entityId, workspace.id))
+      .where(and(eq(permissions.userId, session.user.id), eq(permissions.entityType, 'workspace')))
+      .orderBy(desc(workspace.createdAt))
       .limit(1)
 
-    const isSuperUser = currentUser[0]?.isSuperUser || false
-    const superUserModeEnabled = userSettings[0]?.superUserModeEnabled ?? true
-
-    // Effective super user = database status AND UI mode enabled
-    effectiveSuperUser = isSuperUser && superUserModeEnabled
+    if (userWorkspaces.length > 0) {
+      const firstWorkspace = userWorkspaces[0].workspace
+      redirect(`/workspace/${firstWorkspace.id}/templates`)
+    }
   }
 
-  // Fetch templates based on user status
-  let templatesData
-
-  if (session?.user?.id) {
-    // Build where condition based on super user status
-    const whereCondition = effectiveSuperUser ? undefined : eq(templates.status, 'approved')
-
-    // Logged-in users: include star status
-    templatesData = await db
-      .select({
-        id: templates.id,
-        workflowId: templates.workflowId,
-        name: templates.name,
-        details: templates.details,
-        creatorId: templates.creatorId,
-        creator: templateCreators,
-        views: templates.views,
-        stars: templates.stars,
-        status: templates.status,
-        tags: templates.tags,
-        requiredCredentials: templates.requiredCredentials,
-        state: templates.state,
-        createdAt: templates.createdAt,
-        updatedAt: templates.updatedAt,
-        isStarred: sql<boolean>`CASE WHEN ${templateStars.id} IS NOT NULL THEN true ELSE false END`,
-      })
-      .from(templates)
-      .leftJoin(
-        templateStars,
-        and(eq(templateStars.templateId, templates.id), eq(templateStars.userId, session.user.id))
-      )
-      .leftJoin(templateCreators, eq(templates.creatorId, templateCreators.id))
-      .where(whereCondition)
-      .orderBy(desc(templates.views), desc(templates.createdAt))
-  } else {
-    // Non-logged-in users: only approved templates, no star status
-    templatesData = await db
-      .select({
-        id: templates.id,
-        workflowId: templates.workflowId,
-        name: templates.name,
-        details: templates.details,
-        creatorId: templates.creatorId,
-        creator: templateCreators,
-        views: templates.views,
-        stars: templates.stars,
-        status: templates.status,
-        tags: templates.tags,
-        requiredCredentials: templates.requiredCredentials,
-        state: templates.state,
-        createdAt: templates.createdAt,
-        updatedAt: templates.updatedAt,
-      })
-      .from(templates)
-      .leftJoin(templateCreators, eq(templates.creatorId, templateCreators.id))
-      .where(eq(templates.status, 'approved'))
-      .orderBy(desc(templates.views), desc(templates.createdAt))
-      .then((rows) => rows.map((row) => ({ ...row, isStarred: false })))
-  }
+  // Unauthenticated users: show public templates
+  const templatesData = await db
+    .select({
+      id: templates.id,
+      workflowId: templates.workflowId,
+      name: templates.name,
+      details: templates.details,
+      creatorId: templates.creatorId,
+      creator: templateCreators,
+      views: templates.views,
+      stars: templates.stars,
+      status: templates.status,
+      tags: templates.tags,
+      requiredCredentials: templates.requiredCredentials,
+      state: templates.state,
+      createdAt: templates.createdAt,
+      updatedAt: templates.updatedAt,
+    })
+    .from(templates)
+    .leftJoin(templateCreators, eq(templates.creatorId, templateCreators.id))
+    .where(eq(templates.status, 'approved'))
+    .orderBy(desc(templates.views), desc(templates.createdAt))
+    .then((rows) => rows.map((row) => ({ ...row, isStarred: false })))
 
   return (
     <Templates
       initialTemplates={templatesData as unknown as Template[]}
-      currentUserId={session?.user?.id || null}
-      isSuperUser={effectiveSuperUser}
+      currentUserId={null}
+      isSuperUser={false}
     />
   )
 }
diff --git a/apps/sim/app/templates/templates.tsx b/apps/sim/app/templates/templates.tsx
index eb28fb5373e..3ef375716ad 100644
--- a/apps/sim/app/templates/templates.tsx
+++ b/apps/sim/app/templates/templates.tsx
@@ -1,13 +1,12 @@
 'use client'
 
-import { useState } from 'react'
-import { ArrowLeft, Search } from 'lucide-react'
+import { useEffect, useMemo, useState } from 'react'
+import { Layout, Search } from 'lucide-react'
 import { useRouter } from 'next/navigation'
-import { Button } from '@/components/ui/button'
+import { Button } from '@/components/emcn'
 import { Input } from '@/components/ui/input'
 import { createLogger } from '@/lib/logs/console/logger'
 import type { CredentialRequirement } from '@/lib/workflows/credential-extractor'
-import { NavigationTabs } from '@/app/templates/components/navigation-tabs'
 import { TemplateCard, TemplateCardSkeleton } from '@/app/templates/components/template-card'
 import type { WorkflowState } from '@/stores/workflows/workflow/types'
 import type { CreatorProfileDetails } from '@/types/creator-profile'
@@ -60,11 +59,30 @@ export default function Templates({
   const [templates, setTemplates] = useState<Template[]>(initialTemplates)
   const [loading, setLoading] = useState(false)
 
-  const handleTabClick = (tabId: string) => {
-    setActiveTab(tabId)
-  }
+  // Redirect authenticated users to workspace templates
+  useEffect(() => {
+    if (currentUserId) {
+      const redirectToWorkspace = async () => {
+        try {
+          const response = await fetch('/api/workspaces')
+          if (response.ok) {
+            const data = await response.json()
+            const defaultWorkspace = data.workspaces?.[0]
+            if (defaultWorkspace) {
+              router.push(`/workspace/${defaultWorkspace.id}/templates`)
+            }
+          }
+        } catch (error) {
+          logger.error('Error redirecting to workspace:', error)
+        }
+      }
+      redirectToWorkspace()
+    }
+  }, [currentUserId, router])
 
-  // Handle star change callback from template card
+  /**
+   * Update star status for a template
+   */
   const handleStarChange = (templateId: string, isStarred: boolean, newStarCount: number) => {
     setTemplates((prevTemplates) =>
       prevTemplates.map((template) =>
@@ -73,239 +91,137 @@ export default function Templates({
     )
   }
 
-  const matchesSearch = (template: Template) => {
-    if (!searchQuery) return true
+  /**
+   * Filter templates based on active tab and search query
+   * Memoized to prevent unnecessary recalculations on render
+   */
+  const filteredTemplates = useMemo(() => {
     const query = searchQuery.toLowerCase()
-    return (
-      template.name.toLowerCase().includes(query) ||
-      template.details?.tagline?.toLowerCase().includes(query) ||
-      template.creator?.name?.toLowerCase().includes(query)
-    )
-  }
-
-  const ownedTemplates = currentUserId
-    ? templates.filter(
-        (template) =>
-          template.creator?.referenceType === 'user' &&
-          template.creator?.referenceId === currentUserId
-      )
-    : []
-  const starredTemplates = currentUserId
-    ? templates.filter(
-        (template) =>
-          template.isStarred &&
-          !(
-            template.creator?.referenceType === 'user' &&
-            template.creator?.referenceId === currentUserId
-          )
-      )
-    : []
-
-  const filteredOwnedTemplates = ownedTemplates.filter(matchesSearch)
-  const filteredStarredTemplates = starredTemplates.filter(matchesSearch)
-
-  const galleryTemplates = templates
-    .filter((template) => template.status === 'approved')
-    .filter(matchesSearch)
-
-  const pendingTemplates = templates
-    .filter((template) => template.status === 'pending')
-    .filter(matchesSearch)
 
-  // Helper function to render template cards
-  const renderTemplateCard = (template: Template) => (
-    <TemplateCard
-      key={template.id}
-      id={template.id}
-      title={template.name}
-      description={template.details?.tagline || ''}
-      author={template.creator?.name || 'Unknown'}
-      authorImageUrl={template.creator?.profileImageUrl || null}
-      usageCount={template.views.toString()}
-      stars={template.stars}
-      tags={template.tags}
-      state={template.state as { blocks?: Record<string, { type: string; name?: string }> }}
-      isStarred={template.isStarred}
-      onStarChange={handleStarChange}
-      isAuthenticated={!!currentUserId}
-    />
-  )
-
-  // Render skeleton cards for loading state
-  const renderSkeletonCards = () => {
-    return Array.from({ length: 8 }).map((_, index) => (
-      <TemplateCardSkeleton key={`skeleton-${index}`} />
-    ))
-  }
-
-  // Calculate counts for tabs
-  const yourTemplatesCount = ownedTemplates.length + starredTemplates.length
-  const galleryCount = templates.filter((template) => template.status === 'approved').length
-  const pendingCount = templates.filter((template) => template.status === 'pending').length
-
-  // Build tabs based on user status
-  const navigationTabs = [
-    {
-      id: 'gallery',
-      label: 'Gallery',
-      count: galleryCount,
-    },
-    ...(currentUserId
-      ? [
-          {
-            id: 'your',
-            label: 'Your Templates',
-            count: yourTemplatesCount,
-          },
-        ]
-      : []),
-    ...(isSuperUser
-      ? [
-          {
-            id: 'pending',
-            label: 'Pending',
-            count: pendingCount,
-          },
-        ]
-      : []),
-  ]
-
-  // Show tabs if there's more than one tab
-  const showTabs = navigationTabs.length > 1
-
-  const handleBackToWorkspace = async () => {
-    try {
-      const response = await fetch('/api/workspaces')
-      if (response.ok) {
-        const data = await response.json()
-        const defaultWorkspace = data.workspaces?.[0]
-        if (defaultWorkspace) {
-          router.push(`/workspace/${defaultWorkspace.id}`)
-        }
+    return templates.filter((template) => {
+      // Filter by tab - only gallery and pending for public page
+      const tabMatch =
+        activeTab === 'gallery' ? template.status === 'approved' : template.status === 'pending'
+
+      if (!tabMatch) return false
+
+      // Filter by search query
+      if (!query) return true
+
+      const searchableText = [template.name, template.details?.tagline, template.creator?.name]
+        .filter(Boolean)
+        .join(' ')
+        .toLowerCase()
+
+      return searchableText.includes(query)
+    })
+  }, [templates, activeTab, searchQuery])
+
+  /**
+   * Get empty state message based on current filters
+   * Memoized to prevent unnecessary recalculations on render
+   */
+  const emptyState = useMemo(() => {
+    if (searchQuery) {
+      return {
+        title: 'No templates found',
+        description: 'Try a different search term',
       }
-    } catch (error) {
-      logger.error('Error navigating to workspace:', error)
     }
-  }
+
+    const messages = {
+      pending: {
+        title: 'No pending templates',
+        description: 'New submissions will appear here',
+      },
+      gallery: {
+        title: 'No templates available',
+        description: 'Templates will appear once approved',
+      },
+    }
+
+    return messages[activeTab as keyof typeof messages] || messages.gallery
+  }, [searchQuery, activeTab])
 
   return (
     <div className='flex h-[100vh] flex-col'>
       <div className='flex flex-1 overflow-hidden'>
-        <div className='flex flex-1 flex-col overflow-auto p-6'>
-          {/* Header with Back Button */}
-          <div className='mb-6'>
-            {currentUserId && (
-              <Button
-                variant='ghost'
-                size='sm'
-                onClick={handleBackToWorkspace}
-                className='-ml-2 mb-4 text-muted-foreground hover:text-foreground'
-              >
-                <ArrowLeft className='mr-2 h-4 w-4' />
-                Back to Workspace
-              </Button>
-            )}
-            <h1 className='mb-2 font-sans font-semibold text-3xl text-foreground tracking-[0.01em]'>
-              Templates
-            </h1>
-            <p className='font-[350] font-sans text-muted-foreground text-sm leading-[1.5] tracking-[0.01em]'>
-              Grab a template and start building, or make
-              <br />
-              one from scratch.
+        <div className='flex flex-1 flex-col overflow-auto px-[24px] pt-[24px] pb-[24px]'>
+          <div>
+            <div className='flex items-start gap-[12px]'>
+              <div className='flex h-[26px] w-[26px] items-center justify-center rounded-[6px] border border-[#7A5F11] bg-[#514215]'>
+                <Layout className='h-[14px] w-[14px] text-[#FBBC04]' />
+              </div>
+              <h1 className='font-medium text-[18px]'>Templates</h1>
+            </div>
+            <p className='mt-[10px] font-base text-[#888888] text-[14px]'>
+              Grab a template and start building, or make one from scratch.
             </p>
           </div>
 
-          {/* Search */}
-          <div className='mb-6 flex items-center justify-between'>
-            <div className='flex h-9 w-[460px] items-center gap-2 rounded-lg border bg-transparent pr-2 pl-3'>
-              <Search className='h-4 w-4 text-muted-foreground' strokeWidth={2} />
+          <div className='mt-[14px] flex items-center justify-between'>
+            <div className='flex h-[32px] w-[400px] items-center gap-[6px] rounded-[8px] bg-[var(--surface-5)] px-[8px]'>
+              <Search className='h-[14px] w-[14px] text-[var(--text-subtle)]' />
               <Input
-                placeholder='Search templates...'
+                placeholder='Search'
                 value={searchQuery}
                 onChange={(e) => setSearchQuery(e.target.value)}
-                className='flex-1 border-0 bg-transparent px-0 font-normal font-sans text-base text-foreground leading-none placeholder:text-muted-foreground focus-visible:ring-0 focus-visible:ring-offset-0'
+                className='flex-1 border-0 bg-transparent px-0 font-medium text-[var(--text-secondary)] text-small leading-none placeholder:text-[var(--text-subtle)] focus-visible:ring-0 focus-visible:ring-offset-0'
               />
             </div>
+            <div className='flex items-center gap-[8px]'>
+              <Button
+                variant={activeTab === 'gallery' ? 'active' : 'default'}
+                className='h-[32px] rounded-[6px]'
+                onClick={() => setActiveTab('gallery')}
+              >
+                Gallery
+              </Button>
+              {isSuperUser && (
+                <Button
+                  variant={activeTab === 'pending' ? 'active' : 'default'}
+                  className='h-[32px] rounded-[6px]'
+                  onClick={() => setActiveTab('pending')}
+                >
+                  Pending
+                </Button>
+              )}
+            </div>
           </div>
 
-          {/* Navigation - only show if multiple tabs */}
-          {showTabs && (
-            <div className='mb-6'>
-              <NavigationTabs
-                tabs={navigationTabs}
-                activeTab={activeTab}
-                onTabClick={handleTabClick}
-              />
-            </div>
-          )}
+          <div className='mt-[24px] h-[1px] w-full border-[var(--border)] border-t' />
 
-          {loading ? (
-            <div className='grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4'>
-              {renderSkeletonCards()}
-            </div>
-          ) : activeTab === 'your' ? (
-            filteredOwnedTemplates.length === 0 && filteredStarredTemplates.length === 0 ? (
-              <div className='flex h-64 items-center justify-center rounded-lg border border-muted-foreground/25 border-dashed bg-muted/20'>
+          <div className='mt-[24px] grid grid-cols-1 gap-x-[20px] gap-y-[40px] md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4'>
+            {loading ? (
+              Array.from({ length: 8 }).map((_, index) => (
+                <TemplateCardSkeleton key={`skeleton-${index}`} />
+              ))
+            ) : filteredTemplates.length === 0 ? (
+              <div className='col-span-full flex h-64 items-center justify-center rounded-lg border border-muted-foreground/25 border-dashed bg-muted/20'>
                 <div className='text-center'>
-                  <p className='font-medium text-muted-foreground text-sm'>
-                    {searchQuery ? 'No templates found' : 'No templates yet'}
-                  </p>
-                  <p className='mt-1 text-muted-foreground/70 text-xs'>
-                    {searchQuery
-                      ? 'Try a different search term'
-                      : 'Create or star templates to see them here'}
-                  </p>
+                  <p className='font-medium text-muted-foreground text-sm'>{emptyState.title}</p>
+                  <p className='mt-1 text-muted-foreground/70 text-xs'>{emptyState.description}</p>
                 </div>
               </div>
             ) : (
-              <div className='space-y-8'>
-                {filteredOwnedTemplates.length > 0 && (
-                  <section>
-                    <h2 className='mb-3 font-semibold text-lg'>Your Templates</h2>
-                    <div className='grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4'>
-                      {filteredOwnedTemplates.map((template) => renderTemplateCard(template))}
-                    </div>
-                  </section>
-                )}
-
-                {filteredStarredTemplates.length > 0 && (
-                  <section>
-                    <h2 className='mb-3 font-semibold text-lg'>Starred Templates</h2>
-                    <div className='grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4'>
-                      {filteredStarredTemplates.map((template) => renderTemplateCard(template))}
-                    </div>
-                  </section>
-                )}
-              </div>
-            )
-          ) : (
-            <div className='grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4'>
-              {(activeTab === 'gallery' ? galleryTemplates : pendingTemplates).length === 0 ? (
-                <div className='col-span-full flex h-64 items-center justify-center rounded-lg border border-muted-foreground/25 border-dashed bg-muted/20'>
-                  <div className='text-center'>
-                    <p className='font-medium text-muted-foreground text-sm'>
-                      {searchQuery
-                        ? 'No templates found'
-                        : activeTab === 'pending'
-                          ? 'No pending templates'
-                          : 'No templates available'}
-                    </p>
-                    <p className='mt-1 text-muted-foreground/70 text-xs'>
-                      {searchQuery
-                        ? 'Try a different search term'
-                        : activeTab === 'pending'
-                          ? 'New submissions will appear here'
-                          : 'Templates will appear once approved'}
-                    </p>
-                  </div>
-                </div>
-              ) : (
-                (activeTab === 'gallery' ? galleryTemplates : pendingTemplates).map((template) =>
-                  renderTemplateCard(template)
-                )
-              )}
-            </div>
-          )}
+              filteredTemplates.map((template) => (
+                <TemplateCard
+                  key={template.id}
+                  id={template.id}
+                  title={template.name}
+                  description={template.details?.tagline || ''}
+                  author={template.creator?.name || 'Unknown'}
+                  authorImageUrl={template.creator?.profileImageUrl || null}
+                  usageCount={template.views.toString()}
+                  stars={template.stars}
+                  state={template.state}
+                  isStarred={template.isStarred}
+                  onStarChange={handleStarChange}
+                  isAuthenticated={!!currentUserId}
+                />
+              ))
+            )}
+          </div>
         </div>
       </div>
     </div>
diff --git a/apps/sim/app/workspace/[workspaceId]/templates/[id]/page.tsx b/apps/sim/app/workspace/[workspaceId]/templates/[id]/page.tsx
index 4ff6373ac05..98408c23dcf 100644
--- a/apps/sim/app/workspace/[workspaceId]/templates/[id]/page.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/templates/[id]/page.tsx
@@ -16,12 +16,12 @@ interface TemplatePageProps {
  * Uses the shared TemplateDetails component with workspace context.
  */
 export default async function TemplatePage({ params }: TemplatePageProps) {
-  const { workspaceId } = await params
+  const { workspaceId, id } = await params
   const session = await getSession()
 
-  // Require authentication
+  // Redirect unauthenticated users to public template detail page
   if (!session?.user?.id) {
-    redirect('/login')
+    redirect(`/templates/${id}`)
   }
 
   // Verify workspace membership
diff --git a/apps/sim/app/workspace/[workspaceId]/templates/page.tsx b/apps/sim/app/workspace/[workspaceId]/templates/page.tsx
index e87419eee57..3605f98cd0d 100644
--- a/apps/sim/app/workspace/[workspaceId]/templates/page.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/templates/page.tsx
@@ -21,9 +21,9 @@ export default async function TemplatesPage({ params }: TemplatesPageProps) {
   const { workspaceId } = await params
   const session = await getSession()
 
-  // Require authentication
+  // Redirect unauthenticated users to public templates page
   if (!session?.user?.id) {
-    redirect('/login')
+    redirect('/templates')
   }
 
   // Verify workspace membership
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/template-deploy/template-deploy.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/template-deploy/template-deploy.tsx
index c78c4bf06f9..de096f89ab6 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/template-deploy/template-deploy.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/template-deploy/template-deploy.tsx
@@ -2,11 +2,11 @@
 
 import { useEffect, useState } from 'react'
 import { zodResolver } from '@hookform/resolvers/zod'
-import { CheckCircle2, Loader2, Plus, Trash2 } from 'lucide-react'
+import { CheckCircle2, Loader2, Plus } from 'lucide-react'
 import { useForm } from 'react-hook-form'
 import { z } from 'zod'
+import { Badge, Button, Input, Textarea, Trash } from '@/components/emcn'
 import {
-  Button,
   Dialog,
   DialogContent,
   DialogHeader,
@@ -17,13 +17,11 @@ import {
   FormItem,
   FormLabel,
   FormMessage,
-  Input,
   Select,
   SelectContent,
   SelectItem,
   SelectTrigger,
   SelectValue,
-  Textarea,
 } from '@/components/ui'
 import { TagInput } from '@/components/ui/tag-input'
 import { useSession } from '@/lib/auth-client'
@@ -273,18 +271,23 @@ export function TemplateDeploy({ workflowId, onDeploymentComplete }: TemplateDep
   return (
     <div className='space-y-4'>
       {existingTemplate && (
-        <div className='flex items-center justify-between rounded-lg border border-border/50 bg-muted/30 px-4 py-3'>
-          <div className='flex items-center gap-3'>
-            <CheckCircle2 className='h-4 w-4 text-green-600 dark:text-green-400' />
-            <div className='flex items-center gap-2'>
-              <span className='font-medium text-sm'>Template Connected</span>
+        <div className='flex items-center justify-between rounded-[8px] border border-[var(--border)] bg-[var(--surface-3)] px-[16px] py-[12px]'>
+          <div className='flex items-center gap-[12px]'>
+            <CheckCircle2 className='h-[16px] w-[16px] text-green-600 dark:text-green-400' />
+            <div className='flex items-center gap-[8px]'>
+              <span className='font-medium text-[14px] text-[var(--text-primary)]'>
+                Template Connected
+              </span>
               {existingTemplate.status === 'pending' && (
-                <span className='rounded-md bg-yellow-100 px-2 py-0.5 font-medium text-xs text-yellow-700 dark:bg-yellow-900 dark:text-yellow-300'>
+                <Badge
+                  variant='outline'
+                  className='border-yellow-300 bg-yellow-100 text-yellow-700 dark:border-yellow-700 dark:bg-yellow-900 dark:text-yellow-300'
+                >
                   Under Review
-                </span>
+                </Badge>
               )}
               {existingTemplate.status === 'approved' && existingTemplate.views > 0 && (
-                <span className='text-muted-foreground text-xs'>
+                <span className='font-medium text-[12px] text-[var(--text-tertiary)]'>
                   • {existingTemplate.views} views
                   {existingTemplate.stars > 0 && ` • ${existingTemplate.stars} stars`}
                 </span>
@@ -294,11 +297,10 @@ export function TemplateDeploy({ workflowId, onDeploymentComplete }: TemplateDep
           <Button
             type='button'
             variant='ghost'
-            size='sm'
             onClick={() => setShowDeleteDialog(true)}
-            className='h-8 px-2 text-muted-foreground hover:text-red-600 dark:hover:text-red-400'
+            className='h-[32px] px-[8px] text-[var(--text-muted)] hover:text-red-600 dark:hover:text-red-400'
           >
-            <Trash2 className='h-4 w-4' />
+            <Trash className='h-[14px] w-[14px]' />
           </Button>
         </div>
       )}
@@ -362,8 +364,6 @@ export function TemplateDeploy({ workflowId, onDeploymentComplete }: TemplateDep
                     <Button
                       type='button'
                       variant='outline'
-                      size='sm'
-                      className='gap-2'
                       onClick={() => {
                         try {
                           const event = new CustomEvent('open-settings', {
@@ -377,9 +377,10 @@ export function TemplateDeploy({ workflowId, onDeploymentComplete }: TemplateDep
                           })
                         }
                       }}
+                      className='gap-[8px]'
                     >
-                      <Plus className='h-4 w-4 text-muted-foreground' />
-                      <span className='text-muted-foreground'>Create a Creator Profile</span>
+                      <Plus className='h-[14px] w-[14px] text-[var(--text-muted)]' />
+                      <span className='text-[var(--text-muted)]'>Create a Creator Profile</span>
                     </Button>
                   </div>
                 ) : (
@@ -432,7 +433,7 @@ export function TemplateDeploy({ workflowId, onDeploymentComplete }: TemplateDep
             )}
           />
 
-          <div className='flex justify-end gap-2 border-t pt-4'>
+          <div className='flex justify-end gap-[8px] border-[var(--border)] border-t pt-[16px]'>
             {existingTemplate && (
               <Button
                 type='button'
@@ -445,12 +446,12 @@ export function TemplateDeploy({ workflowId, onDeploymentComplete }: TemplateDep
             )}
             <Button
               type='submit'
+              variant='primary'
               disabled={isSubmitting || !form.formState.isValid}
-              className='bg-purple-600 hover:bg-purple-700'
             >
               {isSubmitting ? (
                 <>
-                  <Loader2 className='mr-2 h-4 w-4 animate-spin' />
+                  <Loader2 className='mr-[8px] h-[14px] w-[14px] animate-spin' />
                   {existingTemplate ? 'Updating...' : 'Publishing...'}
                 </>
               ) : existingTemplate ? (
@@ -465,19 +466,21 @@ export function TemplateDeploy({ workflowId, onDeploymentComplete }: TemplateDep
 
       {showDeleteDialog && (
         <div className='fixed inset-0 z-50 flex items-center justify-center bg-black/50'>
-          <div className='w-full max-w-md rounded-lg bg-background p-6 shadow-lg'>
-            <h3 className='mb-4 font-semibold text-lg'>Delete Template?</h3>
-            <p className='mb-6 text-muted-foreground text-sm'>
+          <div className='w-full max-w-md rounded-[8px] bg-[var(--surface-3)] p-[24px] shadow-lg'>
+            <h3 className='mb-[16px] font-semibold text-[18px] text-[var(--text-primary)]'>
+              Delete Template?
+            </h3>
+            <p className='mb-[24px] text-[14px] text-[var(--text-secondary)]'>
               This will permanently delete your template. This action cannot be undone.
             </p>
-            <div className='flex justify-end gap-2'>
+            <div className='flex justify-end gap-[8px]'>
               <Button variant='outline' onClick={() => setShowDeleteDialog(false)}>
                 Cancel
               </Button>
               <Button
                 onClick={handleDelete}
                 disabled={isDeleting}
-                className='bg-red-600 hover:bg-red-700'
+                className='bg-red-600 text-white hover:bg-red-700'
               >
                 {isDeleting ? 'Deleting...' : 'Delete'}
               </Button>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/shared/usage-header.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/shared/usage-header.tsx
index a7e7d1f1878..5d1c90cf1ce 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/shared/usage-header.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/shared/usage-header.tsx
@@ -2,12 +2,14 @@
 
 import type { ReactNode } from 'react'
 import { Badge } from '@/components/emcn'
-import { Progress } from '@/components/ui'
 import { cn } from '@/lib/utils'
 
 const GRADIENT_BADGE_STYLES =
   'gradient-text h-[1.125rem] rounded-[6px] border-gradient-primary/20 bg-gradient-to-b from-gradient-primary via-gradient-secondary to-gradient-primary px-2 py-0 font-medium text-xs cursor-pointer'
 
+// Constants matching UsageIndicator
+const PILL_COUNT = 8
+
 interface UsageHeaderProps {
   title: string
   gradientTitle?: boolean
@@ -43,17 +45,22 @@ export function UsageHeader({
 }: UsageHeaderProps) {
   const progress = progressValue ?? (limit > 0 ? Math.min((current / limit) * 100, 100) : 0)
 
+  // Calculate filled pills based on usage percentage
+  const filledPillsCount = Math.ceil((progress / 100) * PILL_COUNT)
+  const isAlmostOut = filledPillsCount === PILL_COUNT
+
   return (
     <div className='rounded-[8px] border bg-background p-3 shadow-xs'>
       <div className='space-y-2'>
+        {/* Top row */}
         <div className='flex items-center justify-between'>
           <div className='flex items-center gap-2'>
             <span
               className={cn(
-                'font-medium text-sm',
+                'font-medium text-[12px]',
                 gradientTitle
                   ? 'gradient-text bg-gradient-to-b from-gradient-primary via-gradient-secondary to-gradient-primary'
-                  : 'text-foreground'
+                  : 'text-[#FFFFFF]'
               )}
             >
               {title}
@@ -67,25 +74,42 @@ export function UsageHeader({
               <span className='text-muted-foreground text-xs'>({seatsText})</span>
             ) : null}
           </div>
-          <div className='flex items-center gap-1 text-xs tabular-nums'>
+          <div className='flex items-center gap-[4px] text-xs tabular-nums'>
             {isBlocked ? (
-              <span className='text-muted-foreground'>Payment required</span>
+              <span className='font-medium text-[#B1B1B1] text-[12px]'>Payment required</span>
             ) : (
               <>
-                <span className='text-muted-foreground'>${current.toFixed(2)}</span>
-                <span className='text-muted-foreground'>/</span>
-                {rightContent ?? <span className='text-muted-foreground'>${limit}</span>}
+                <span className='font-medium text-[#B1B1B1] text-[12px] tabular-nums'>
+                  ${current.toFixed(2)}
+                </span>
+                <span className='font-medium text-[#B1B1B1] text-[12px]'>/</span>
+                {rightContent ?? (
+                  <span className='font-medium text-[#B1B1B1] text-[12px] tabular-nums'>
+                    ${limit}
+                  </span>
+                )}
               </>
             )}
           </div>
         </div>
 
-        <Progress
-          value={isBlocked ? 100 : progress}
-          className='h-2'
-          indicatorClassName='bg-black dark:bg-white'
-        />
+        {/* Pills row - matching UsageIndicator */}
+        <div className='flex items-center gap-[4px]'>
+          {Array.from({ length: PILL_COUNT }).map((_, i) => {
+            const isFilled = i < filledPillsCount
+            return (
+              <div
+                key={i}
+                className='h-[6px] flex-1 rounded-[2px]'
+                style={{
+                  backgroundColor: isFilled ? (isAlmostOut ? '#ef4444' : '#34B5FF') : '#414141',
+                }}
+              />
+            )
+          })}
+        </div>
 
+        {/* Status messages */}
         {isBlocked && (
           <div className='flex items-center justify-between rounded-[6px] bg-destructive/10 px-2 py-1'>
             <span className='text-destructive text-xs'>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/sso/sso.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/sso/sso.tsx
index a52bfdecf6c..e70e325a6ed 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/sso/sso.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/sso/sso.tsx
@@ -2,7 +2,8 @@
 
 import { useEffect, useState } from 'react'
 import { Check, ChevronDown, Copy, Eye, EyeOff } from 'lucide-react'
-import { Alert, AlertDescription, Button, Input, Label } from '@/components/ui'
+import { Button, Combobox } from '@/components/emcn'
+import { Alert, AlertDescription, Input, Label } from '@/components/ui'
 import { Skeleton } from '@/components/ui/skeleton'
 import { useSession } from '@/lib/auth-client'
 import { isBillingEnabled } from '@/lib/environment'
@@ -535,7 +536,7 @@ export function SSO() {
             // SSO Provider Status View
             <div className='space-y-4'>
               {providers.map((provider) => (
-                <div key={provider.id} className='rounded-[12px] border border-border p-6'>
+                <div key={provider.id} className='rounded-[8px] bg-muted/30 p-4'>
                   <div className='flex items-start justify-between gap-3'>
                     <div className='flex-1'>
                       <h3 className='font-medium text-base'>Single Sign-On Provider</h3>
@@ -545,10 +546,9 @@ export function SSO() {
                     </div>
                     <div className='flex items-center space-x-2'>
                       <Button
-                        variant='outline'
-                        size='sm'
+                        variant='ghost'
                         onClick={() => handleReconfigure(provider)}
-                        className='rounded-[8px]'
+                        className='h-8'
                       >
                         Reconfigure
                       </Button>
@@ -609,12 +609,12 @@ export function SSO() {
               {hasProviders && (
                 <div className='mb-4'>
                   <Button
-                    variant='outline'
+                    variant='ghost'
                     onClick={() => {
                       setShowConfigForm(false)
                       setIsEditing(false)
                     }}
-                    className='rounded-[8px]'
+                    className='h-8'
                   >
                     ← Back to SSO Status
                   </Button>
@@ -626,14 +626,14 @@ export function SSO() {
                 {/* Provider Type Selection */}
                 <div className='space-y-1'>
                   <Label>Provider Type</Label>
-                  <div className='flex rounded-[10px] border border-input bg-background p-1'>
+                  <div className='flex gap-2 rounded-[10px] border border-[var(--border-muted)] bg-[var(--surface-3)] p-1'>
                     <button
                       type='button'
                       className={cn(
-                        'flex-1 rounded-[6px] px-3 py-2 font-medium text-sm transition-colors',
+                        'flex-1 rounded-[6px] px-3 py-2 font-medium text-sm transition-all',
                         formData.providerType === 'oidc'
-                          ? 'bg-primary text-primary-foreground'
-                          : 'text-muted-foreground hover:text-foreground'
+                          ? 'bg-[var(--surface-1)] text-[var(--text-primary)] shadow-sm ring-1 ring-[var(--border-muted)]'
+                          : 'text-muted-foreground hover:bg-[var(--surface-2)] hover:text-foreground'
                       )}
                       onClick={() => handleInputChange('providerType', 'oidc')}
                     >
@@ -642,10 +642,10 @@ export function SSO() {
                     <button
                       type='button'
                       className={cn(
-                        'flex-1 rounded-[6px] px-3 py-2 font-medium text-sm transition-colors',
+                        'flex-1 rounded-[6px] px-3 py-2 font-medium text-sm transition-all',
                         formData.providerType === 'saml'
-                          ? 'bg-primary text-primary-foreground'
-                          : 'text-muted-foreground hover:text-foreground'
+                          ? 'bg-[var(--surface-1)] text-[var(--text-primary)] shadow-sm ring-1 ring-[var(--border-muted)]'
+                          : 'text-muted-foreground hover:bg-[var(--surface-2)] hover:text-foreground'
                       )}
                       onClick={() => handleInputChange('providerType', 'saml')}
                     >
@@ -661,24 +661,21 @@ export function SSO() {
 
                 <div className='space-y-1'>
                   <Label htmlFor='provider-id'>Provider ID</Label>
-                  <select
-                    id='provider-id'
+                  <Combobox
                     value={formData.providerId}
-                    onChange={(e) => handleInputChange('providerId', e.target.value)}
+                    onChange={(value: string) => handleInputChange('providerId', value)}
+                    options={TRUSTED_SSO_PROVIDERS.map((id) => ({
+                      label: id,
+                      value: id,
+                    }))}
+                    placeholder='Select a provider ID'
+                    editable={true}
                     className={cn(
-                      'w-full rounded-[10px] border border-input bg-background px-3 py-2 text-sm ring-offset-background transition-colors focus:border-gray-400 focus:ring-2 focus:ring-gray-100',
                       showErrors &&
                         errors.providerId.length > 0 &&
                         'border-red-500 focus:border-red-500 focus:ring-red-100 focus-visible:ring-red-500'
                     )}
-                  >
-                    <option value=''>Select a provider ID</option>
-                    {TRUSTED_SSO_PROVIDERS.map((providerId) => (
-                      <option key={providerId} value={providerId}>
-                        {providerId}
-                      </option>
-                    ))}
-                  </select>
+                  />
                   {showErrors && errors.providerId.length > 0 && (
                     <div className='mt-1 text-[#DC2626] text-[12px] leading-tight dark:text-[#F87171]'>
                       <p>{errors.providerId.join(' ')}</p>
@@ -808,16 +805,20 @@ export function SSO() {
                               'border-red-500 focus:border-red-500 focus:ring-red-100 focus-visible:ring-red-500'
                           )}
                         />
-                        <button
-                          type='button'
+                        <Button
+                          variant='ghost'
                           onClick={() => setShowClientSecret((s) => !s)}
-                          className='-translate-y-1/2 absolute top-1/2 right-3 text-gray-500 transition hover:text-gray-700'
+                          className='-translate-y-1/2 absolute top-1/2 right-3 h-6 w-6 rounded-[4px] p-0 text-muted-foreground hover:text-foreground'
                           aria-label={
                             showClientSecret ? 'Hide client secret' : 'Show client secret'
                           }
                         >
-                          {showClientSecret ? <EyeOff size={18} /> : <Eye size={18} />}
-                        </button>
+                          {showClientSecret ? (
+                            <EyeOff className='h-4 w-4' />
+                          ) : (
+                            <Eye className='h-4 w-4' />
+                          )}
+                        </Button>
                       </div>
                       {showErrors && errors.clientSecret.length > 0 && (
                         <div className='mt-1 text-[#DC2626] text-[12px] leading-tight dark:text-[#F87171]'>
@@ -1011,7 +1012,7 @@ export function SSO() {
 
                 <Button
                   type='submit'
-                  className='w-full rounded-[10px]'
+                  className='h-9 w-full'
                   disabled={isLoading || hasAnyErrors(errors) || !isFormValid()}
                 >
                   {isLoading
@@ -1029,29 +1030,18 @@ export function SSO() {
                 <p className='text-muted-foreground text-xs'>
                   Configure this URL in your identity provider as the callback/redirect URI
                 </p>
-                <div className='relative'>
-                  <Input
-                    id='callback-url'
-                    readOnly
-                    value={callbackUrl}
-                    autoComplete='off'
-                    autoCapitalize='none'
-                    spellCheck={false}
-                    className='h-9 w-full cursor-text pr-10 font-mono text-xs focus-visible:ring-2 focus-visible:ring-primary/20'
-                    onClick={(e) => (e.target as HTMLInputElement).select()}
-                  />
-                  <button
-                    type='button'
+                <div className='relative flex h-9 items-center rounded-[8px] bg-muted px-3 pr-10'>
+                  <code className='flex-1 truncate font-mono text-foreground text-xs'>
+                    {callbackUrl}
+                  </code>
+                  <Button
+                    variant='ghost'
                     onClick={copyCallback}
                     aria-label='Copy callback URL'
-                    className='-translate-y-1/2 absolute top-1/2 right-3 rounded p-1 text-muted-foreground transition hover:text-foreground'
+                    className='absolute right-1 h-6 w-6 rounded-[4px] p-0 text-muted-foreground hover:text-foreground'
                   >
-                    {copied ? (
-                      <Check className='h-4 w-4 text-green-500' />
-                    ) : (
-                      <Copy className='h-4 w-4' />
-                    )}
-                  </button>
+                    {copied ? <Check className='h-4 w-4' /> : <Copy className='h-4 w-4' />}
+                  </Button>
                 </div>
               </div>
             </>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/subscription.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/subscription.tsx
index c87d2dcfb55..2e41a0956a9 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/subscription.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/subscription.tsx
@@ -437,7 +437,7 @@ export function Subscription({ onOpenChange }: SubscriptionProps) {
   return (
     <div className='px-6 pt-4 pb-4'>
       <div className='flex flex-col gap-2'>
-        {/* Current Plan & Usage Overview - Styled like usage-indicator */}
+        {/* Current Plan & Usage Overview */}
         <div className='mb-2'>
           <UsageHeader
             title={formatPlanName(subscription.plan)}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/team-management/components/member-invitation-card/member-invitation-card.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/team-management/components/member-invitation-card/member-invitation-card.tsx
index 704da28864b..c8b9727c1ef 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/team-management/components/member-invitation-card/member-invitation-card.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/team-management/components/member-invitation-card/member-invitation-card.tsx
@@ -1,11 +1,8 @@
 import React, { useMemo, useState } from 'react'
-import { CheckCircle } from 'lucide-react'
-import { Alert, AlertDescription } from '@/components/ui/alert'
+import { CheckCircle, ChevronDown } from 'lucide-react'
+import { Button, Input, Label } from '@/components/emcn'
 import { Badge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
 import { Checkbox } from '@/components/ui/checkbox'
-import { Input } from '@/components/ui/input'
-import { Label } from '@/components/ui/label'
 import { quickValidateEmail } from '@/lib/email/validation'
 import { cn } from '@/lib/utils'
 
@@ -140,127 +137,120 @@ export function MemberInvitationCard({
   }
 
   return (
-    <div className='space-y-4'>
-      {/* Header - clean like account page */}
-      <div>
-        <h4 className='font-medium text-sm'>Invite Team Members</h4>
-        <p className='text-muted-foreground text-xs'>
-          Add new members to your team and optionally give them access to specific workspaces
-        </p>
-      </div>
+    <div className='rounded-lg border border-[var(--border-muted)] bg-[var(--surface-3)] p-4'>
+      <div className='space-y-3'>
+        {/* Header */}
+        <div>
+          <h4 className='font-medium text-sm'>Invite Team Members</h4>
+          <p className='text-muted-foreground text-xs'>
+            Add new members to your team and optionally give them access to specific workspaces
+          </p>
+        </div>
 
-      {/* Main invitation input - clean layout */}
-      <div className='flex items-start gap-3'>
-        <div className='flex-1'>
-          <div>
+        {/* Main invitation input */}
+        <div className='flex items-start gap-2'>
+          <div className='flex-1'>
             <Input
               placeholder='Enter email address'
               value={inviteEmail}
               onChange={handleEmailChange}
               disabled={isInviting || !hasAvailableSeats}
-              className={cn('w-full', emailError && 'border-red-500 focus-visible:ring-red-500')}
+              className={cn(emailError && 'border-red-500 focus-visible:ring-red-500')}
             />
-            <div className='h-4 pt-1'>
-              {emailError && (
-                <p className='text-[#DC2626] text-[12px] leading-tight dark:text-[#F87171]'>
-                  {emailError}
-                </p>
-              )}
-            </div>
+            {emailError && (
+              <p className='mt-1 text-[#DC2626] text-[11px] leading-tight dark:text-[#F87171]'>
+                {emailError}
+              </p>
+            )}
           </div>
+          <Button
+            variant='ghost'
+            onClick={() => {
+              setShowWorkspaceInvite(!showWorkspaceInvite)
+              if (!showWorkspaceInvite) {
+                onLoadUserWorkspaces()
+              }
+            }}
+            disabled={isInviting || !hasAvailableSeats}
+          >
+            <ChevronDown
+              className={cn(
+                'h-3.5 w-3.5 transition-transform',
+                showWorkspaceInvite && 'rotate-180'
+              )}
+            />
+            Workspaces
+          </Button>
+          <Button
+            variant='secondary'
+            onClick={handleInviteClick}
+            disabled={!inviteEmail || isInviting || !hasAvailableSeats}
+          >
+            {isInviting ? <ButtonSkeleton /> : hasAvailableSeats ? 'Invite' : 'No Seats'}
+          </Button>
         </div>
-        <Button
-          variant='outline'
-          size='sm'
-          onClick={() => {
-            setShowWorkspaceInvite(!showWorkspaceInvite)
-            if (!showWorkspaceInvite) {
-              onLoadUserWorkspaces()
-            }
-          }}
-          disabled={isInviting || !hasAvailableSeats}
-          className='h-9 shrink-0 rounded-[8px] text-sm'
-        >
-          {showWorkspaceInvite ? 'Hide' : 'Add'} Workspaces
-        </Button>
-        <Button
-          size='sm'
-          onClick={handleInviteClick}
-          disabled={!inviteEmail || isInviting || !hasAvailableSeats}
-          className='h-9 shrink-0 rounded-[8px]'
-        >
-          {isInviting ? <ButtonSkeleton /> : null}
-          {hasAvailableSeats ? 'Invite' : 'No Seats'}
-        </Button>
-      </div>
 
-      {showWorkspaceInvite && (
-        <div className='space-y-4'>
-          <div className='flex items-center justify-between'>
-            <div className='flex items-center gap-2'>
-              <h5 className='font-medium text-xs'>Workspace Access</h5>
-              <Badge variant='outline' className='h-[1.125rem] rounded-[6px] px-2 py-0 text-xs'>
-                Optional
-              </Badge>
+        {/* Workspace selection - collapsible */}
+        {showWorkspaceInvite && (
+          <div className='space-y-3 rounded-md border border-[var(--border-muted)] bg-[var(--surface-2)] p-3'>
+            <div className='flex items-center justify-between'>
+              <div className='flex items-center gap-2'>
+                <h5 className='font-medium text-xs'>Workspace Access</h5>
+                <span className='text-[11px] text-muted-foreground'>(Optional)</span>
+              </div>
+              {selectedCount > 0 && (
+                <span className='text-muted-foreground text-xs'>{selectedCount} selected</span>
+              )}
             </div>
-            {selectedCount > 0 && (
-              <span className='text-muted-foreground text-xs'>{selectedCount} selected</span>
-            )}
-          </div>
-          <p className='text-muted-foreground text-xs leading-relaxed'>
-            Grant access to specific workspaces. You can modify permissions later.
-          </p>
 
-          {userWorkspaces.length === 0 ? (
-            <div className='rounded-md border border-dashed py-8 text-center'>
-              <p className='text-muted-foreground text-sm'>No workspaces available</p>
-              <p className='mt-1 text-muted-foreground text-xs'>
-                You need admin access to workspaces to invite members
-              </p>
-            </div>
-          ) : (
-            <div className='max-h-48 space-y-2 overflow-y-auto'>
-              {userWorkspaces.map((workspace) => {
-                const isSelected = selectedWorkspaces.some((w) => w.workspaceId === workspace.id)
-                const selectedWorkspace = selectedWorkspaces.find(
-                  (w) => w.workspaceId === workspace.id
-                )
+            {userWorkspaces.length === 0 ? (
+              <div className='py-4 text-center'>
+                <p className='text-muted-foreground text-xs'>No workspaces available</p>
+              </div>
+            ) : (
+              <div className='max-h-48 space-y-1.5 overflow-y-auto'>
+                {userWorkspaces.map((workspace) => {
+                  const isSelected = selectedWorkspaces.some((w) => w.workspaceId === workspace.id)
+                  const selectedWorkspace = selectedWorkspaces.find(
+                    (w) => w.workspaceId === workspace.id
+                  )
 
-                return (
-                  <div key={workspace.id} className='flex items-center justify-between gap-2 py-1'>
-                    <div className='min-w-0 flex-1'>
-                      <div className='flex items-center gap-2'>
-                        <Checkbox
-                          id={`workspace-${workspace.id}`}
-                          checked={isSelected}
-                          onCheckedChange={(checked) => {
-                            if (checked) {
-                              onWorkspaceToggle(workspace.id, 'read')
-                            } else {
-                              onWorkspaceToggle(workspace.id, '')
-                            }
-                          }}
-                          disabled={isInviting}
-                        />
-                        <Label
-                          htmlFor={`workspace-${workspace.id}`}
-                          className='cursor-pointer font-medium text-sm'
-                        >
-                          {workspace.name}
-                        </Label>
-                        {workspace.isOwner && (
-                          <Badge
-                            variant='outline'
-                            className='h-[1.125rem] rounded-[6px] px-2 py-0 text-xs'
+                  return (
+                    <div
+                      key={workspace.id}
+                      className='flex items-center justify-between gap-2 rounded-md px-2 py-1.5 hover:bg-[var(--surface-3)]'
+                    >
+                      <div className='min-w-0 flex-1'>
+                        <div className='flex items-center gap-2'>
+                          <Checkbox
+                            id={`workspace-${workspace.id}`}
+                            checked={isSelected}
+                            onCheckedChange={(checked) => {
+                              if (checked) {
+                                onWorkspaceToggle(workspace.id, 'read')
+                              } else {
+                                onWorkspaceToggle(workspace.id, '')
+                              }
+                            }}
+                            disabled={isInviting}
+                          />
+                          <Label
+                            htmlFor={`workspace-${workspace.id}`}
+                            className='cursor-pointer text-xs'
                           >
-                            Owner
-                          </Badge>
-                        )}
+                            {workspace.name}
+                          </Label>
+                          {workspace.isOwner && (
+                            <Badge
+                              variant='outline'
+                              className='h-[1.125rem] rounded-[6px] px-2 py-0 text-[10px]'
+                            >
+                              Owner
+                            </Badge>
+                          )}
+                        </div>
                       </div>
-                    </div>
 
-                    {/* Always reserve space for permission selector to maintain consistent layout */}
-                    <div className='flex h-[30px] w-32 flex-shrink-0 items-center justify-end gap-2'>
                       {isSelected && (
                         <PermissionSelector
                           value={
@@ -276,24 +266,25 @@ export function MemberInvitationCard({
                         />
                       )}
                     </div>
-                  </div>
-                )
-              })}
-            </div>
-          )}
-        </div>
-      )}
+                  )
+                })}
+              </div>
+            )}
+          </div>
+        )}
 
-      {inviteSuccess && (
-        <Alert className='rounded-[8px] border-green-200 bg-green-50 text-green-800 dark:border-green-800/50 dark:bg-green-950/20 dark:text-green-300'>
-          <CheckCircle className='h-4 w-4 text-green-600 dark:text-green-400' />
-          <AlertDescription>
-            Invitation sent successfully
-            {selectedCount > 0 &&
-              ` with access to ${selectedCount} workspace${selectedCount !== 1 ? 's' : ''}`}
-          </AlertDescription>
-        </Alert>
-      )}
+        {/* Success message */}
+        {inviteSuccess && (
+          <div className='flex items-start gap-2 rounded-md bg-green-500/10 p-2.5 text-green-600 dark:text-green-400'>
+            <CheckCircle className='h-4 w-4 flex-shrink-0' />
+            <p className='text-xs'>
+              Invitation sent successfully
+              {selectedCount > 0 &&
+                ` with access to ${selectedCount} workspace${selectedCount !== 1 ? 's' : ''}`}
+            </p>
+          </div>
+        )}
+      </div>
     </div>
   )
 }
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/team-management/components/team-members/team-members.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/team-management/components/team-members/team-members.tsx
index b4ebe14bdb2..99e2d8f386e 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/team-management/components/team-members/team-members.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/team-management/components/team-members/team-members.tsx
@@ -1,7 +1,8 @@
 import { useEffect, useState } from 'react'
-import { LogOut, UserX, X } from 'lucide-react'
-import { Tooltip } from '@/components/emcn'
-import { Button } from '@/components/ui/button'
+import { UserX, X } from 'lucide-react'
+import { Button, Tooltip } from '@/components/emcn'
+import { Button as UIButton } from '@/components/ui/button'
+import { UserAvatar } from '@/components/user-avatar/user-avatar'
 import { createLogger } from '@/lib/logs/console/logger'
 import type { Invitation, Member, Organization } from '@/stores/organization'
 
@@ -20,6 +21,8 @@ interface BaseItem {
   name: string
   email: string
   avatarInitial: string
+  avatarUrl?: string | null
+  userId?: string
   usage: string
 }
 
@@ -95,6 +98,8 @@ export function TeamMembers({
         name,
         email: member.user?.email || '',
         avatarInitial: name.charAt(0).toUpperCase(),
+        avatarUrl: member.user?.image,
+        userId: member.user?.id,
         usage: `$${usageAmount.toFixed(2)}`,
         role: member.role,
         member,
@@ -118,6 +123,8 @@ export function TeamMembers({
         name: emailPrefix,
         email: invitation.email,
         avatarInitial: emailPrefix.charAt(0).toUpperCase(),
+        avatarUrl: null,
+        userId: invitation.email, // Use email as fallback for color generation
         usage: '-',
         invitation,
       }
@@ -163,15 +170,12 @@ export function TeamMembers({
             {/* Member info */}
             <div className='flex flex-1 items-center gap-3'>
               {/* Avatar */}
-              <div
-                className={`flex h-8 w-8 items-center justify-center rounded-full font-medium text-sm ${
-                  item.type === 'member'
-                    ? 'bg-primary/10 text-muted-foreground'
-                    : 'bg-muted text-muted-foreground'
-                }`}
-              >
-                {item.avatarInitial}
-              </div>
+              <UserAvatar
+                userId={item.userId || item.email}
+                userName={item.name}
+                avatarUrl={item.avatarUrl}
+                size={32}
+              />
 
               {/* Name and email */}
               <div className='min-w-0 flex-1'>
@@ -223,14 +227,14 @@ export function TeamMembers({
                 item.email !== currentUserEmail && (
                   <Tooltip.Root>
                     <Tooltip.Trigger asChild>
-                      <Button
+                      <UIButton
                         variant='outline'
                         size='sm'
                         onClick={() => onRemoveMember(item.member)}
                         className='h-8 w-8 rounded-[8px] p-0'
                       >
                         <UserX className='h-4 w-4' />
-                      </Button>
+                      </UIButton>
                     </Tooltip.Trigger>
                     <Tooltip.Content side='left'>Remove Member</Tooltip.Content>
                   </Tooltip.Root>
@@ -240,7 +244,7 @@ export function TeamMembers({
               {isAdminOrOwner && item.type === 'invitation' && (
                 <Tooltip.Root>
                   <Tooltip.Trigger asChild>
-                    <Button
+                    <UIButton
                       variant='outline'
                       size='sm'
                       onClick={() => handleCancelInvitation(item.invitation.id)}
@@ -252,7 +256,7 @@ export function TeamMembers({
                       ) : (
                         <X className='h-4 w-4' />
                       )}
-                    </Button>
+                    </UIButton>
                   </Tooltip.Trigger>
                   <Tooltip.Content side='left'>
                     {cancellingInvitations.has(item.invitation.id)
@@ -268,10 +272,9 @@ export function TeamMembers({
 
       {/* Leave Organization button */}
       {canLeaveOrganization && (
-        <div className='border-t pt-4'>
+        <div className='mt-4 border-[var(--border-muted)] border-t pt-4'>
           <Button
-            variant='outline'
-            size='default'
+            variant='default'
             onClick={() => {
               if (!currentUserMember?.user?.id) {
                 logger.error('Cannot leave organization: missing user ID', { currentUserMember })
@@ -279,9 +282,7 @@ export function TeamMembers({
               }
               onRemoveMember(currentUserMember)
             }}
-            className='w-full hover:bg-muted'
           >
-            <LogOut className='mr-2 h-4 w-4' />
             Leave Organization
           </Button>
         </div>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/team-management/components/team-seats-overview/team-seats-overview.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/team-management/components/team-seats-overview/team-seats-overview.tsx
index 2c077ea04e5..f748c934630 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/team-management/components/team-seats-overview/team-seats-overview.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/team-management/components/team-seats-overview/team-seats-overview.tsx
@@ -1,10 +1,11 @@
 import { Building2 } from 'lucide-react'
+import { Badge } from '@/components/emcn'
 import { Button } from '@/components/ui/button'
-import { Progress } from '@/components/ui/progress'
 import { Skeleton } from '@/components/ui/skeleton'
-import { DEFAULT_TEAM_TIER_COST_LIMIT } from '@/lib/billing/constants'
 import { checkEnterprisePlan } from '@/lib/billing/subscriptions/utils'
-import { env } from '@/lib/env'
+import { cn } from '@/lib/utils'
+
+const PILL_COUNT = 8
 
 type Subscription = {
   id: string
@@ -93,56 +94,59 @@ export function TeamSeatsOverview({
     )
   }
 
+  const totalSeats = subscriptionData.seats || 0
+  const isEnterprise = checkEnterprisePlan(subscriptionData)
+
   return (
     <div className='rounded-[8px] border bg-background p-3 shadow-xs'>
       <div className='space-y-2'>
-        {/* Seats info and usage - matching team usage layout */}
+        {/* Top row - matching UsageHeader */}
         <div className='flex items-center justify-between'>
           <div className='flex items-center gap-2'>
-            <span className='font-medium text-sm'>Seats</span>
-            {!checkEnterprisePlan(subscriptionData) ? (
-              <span className='text-muted-foreground text-xs'>
-                (${env.TEAM_TIER_COST_LIMIT ?? DEFAULT_TEAM_TIER_COST_LIMIT}/month each)
-              </span>
-            ) : null}
+            <span className='font-medium text-[#FFFFFF] text-[12px]'>Seats</span>
+            {!isEnterprise && (
+              <Badge
+                className='gradient-text h-[1.125rem] cursor-pointer rounded-[6px] border-gradient-primary/20 bg-gradient-to-b from-gradient-primary via-gradient-secondary to-gradient-primary px-2 py-0 font-medium text-xs'
+                onClick={onAddSeatDialog}
+              >
+                Add Seats
+              </Badge>
+            )}
           </div>
-          <div className='flex items-center gap-1 text-xs tabular-nums'>
-            <span className='text-muted-foreground'>{usedSeats} used</span>
-            <span className='text-muted-foreground'>/</span>
-            <span className='text-muted-foreground'>{subscriptionData.seats || 0} total</span>
+          <div className='flex items-center gap-[4px] text-xs tabular-nums'>
+            <span className='font-medium text-[#B1B1B1] text-[12px] tabular-nums'>
+              {usedSeats} used
+            </span>
+            <span className='font-medium text-[#B1B1B1] text-[12px]'>/</span>
+            <span className='font-medium text-[#B1B1B1] text-[12px] tabular-nums'>
+              {totalSeats} total
+            </span>
           </div>
         </div>
 
-        {/* Progress Bar - matching team usage component */}
-        <Progress value={(usedSeats / (subscriptionData.seats || 1)) * 100} className='h-2' />
+        {/* Pills row - one pill per seat */}
+        <div className='flex items-center gap-[4px]'>
+          {Array.from({ length: totalSeats }).map((_, i) => {
+            const isFilled = i < usedSeats
+            return (
+              <div
+                key={i}
+                className={cn(
+                  'h-[6px] flex-1 rounded-full transition-colors',
+                  isFilled ? 'bg-[#4285F4]' : 'bg-[#2C2C2C]'
+                )}
+              />
+            )
+          })}
+        </div>
 
-        {/* Action buttons - below the usage display */}
-        {checkEnterprisePlan(subscriptionData) ? (
-          <div className='text-center'>
+        {/* Enterprise message */}
+        {isEnterprise && (
+          <div className='pt-1 text-center'>
             <p className='text-muted-foreground text-xs'>
               Contact support for enterprise usage limit changes
             </p>
           </div>
-        ) : (
-          <div className='flex gap-2 pt-1'>
-            <Button
-              variant='outline'
-              size='sm'
-              onClick={onReduceSeats}
-              disabled={(subscriptionData.seats || 0) <= 1 || isLoading}
-              className='h-8 flex-1 rounded-[8px]'
-            >
-              Remove Seat
-            </Button>
-            <Button
-              size='sm'
-              onClick={onAddSeatDialog}
-              disabled={isLoading}
-              className='h-8 flex-1 rounded-[8px]'
-            >
-              Add Seat
-            </Button>
-          </div>
         )}
       </div>
     </div>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/team-management/components/team-usage/team-usage.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/team-management/components/team-usage/team-usage.tsx
index 59a0a76fe73..5e8b6b2ccf3 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/team-management/components/team-usage/team-usage.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/team-management/components/team-usage/team-usage.tsx
@@ -147,7 +147,7 @@ export function TeamUsage({ hasAdminAccess }: TeamUsageProps) {
             onLimitUpdated={handleLimitUpdated}
           />
         ) : (
-          <span className='text-muted-foreground text-xs tabular-nums'>
+          <span className='font-medium text-[#B1B1B1] text-[12px] tabular-nums'>
             ${currentCap.toFixed(0)}
           </span>
         )
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/team-management/team-management.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/team-management/team-management.tsx
index ee0218c1d98..bf510143919 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/team-management/team-management.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/team-management/team-management.tsx
@@ -12,7 +12,6 @@ import {
   TeamMembers,
   TeamSeats,
   TeamSeatsOverview,
-  TeamUsage,
 } from '@/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/team-management/components'
 import { generateSlug, useOrganizationStore } from '@/stores/organization'
 import { useSubscriptionStore } from '@/stores/subscription/store'
@@ -275,112 +274,149 @@ export function TeamManagement() {
   }
 
   return (
-    <div className='flex h-full flex-col px-6 pt-4 pb-4'>
-      <div className='flex flex-1 flex-col gap-6 overflow-y-auto'>
+    <div className='flex h-full flex-col'>
+      <div className='flex flex-1 flex-col overflow-y-auto px-6 pt-4 pb-4'>
         {error && (
-          <Alert variant='destructive' className='rounded-[8px]'>
+          <Alert variant='destructive' className='mb-4 rounded-[8px]'>
             <AlertTitle>Error</AlertTitle>
             <AlertDescription>{error}</AlertDescription>
           </Alert>
         )}
 
-        {/* Team Usage Overview */}
-        <TeamUsage hasAdminAccess={adminOrOwner} />
-
-        {/* Team Billing Information (only show for Team Plan, not Enterprise) */}
-        {hasTeamPlan && !hasEnterprisePlan && (
-          <div className='rounded-[8px] border bg-blue-50/50 p-4 shadow-xs dark:bg-blue-950/20'>
-            <div className='space-y-3'>
-              <h4 className='font-medium text-sm'>How Team Billing Works</h4>
-              <ul className='ml-4 list-disc space-y-2 text-muted-foreground text-xs'>
-                <li>
-                  Your team is billed a minimum of $
-                  {(subscriptionData?.seats || 0) *
-                    (env.TEAM_TIER_COST_LIMIT ?? DEFAULT_TEAM_TIER_COST_LIMIT)}
-                  /month for {subscriptionData?.seats || 0} licensed seats
-                </li>
-                <li>All team member usage is pooled together from a shared limit</li>
-                <li>
-                  When pooled usage exceeds the limit, all members are blocked from using the
-                  service
-                </li>
-                <li>You can increase the usage limit to allow for higher usage</li>
-                <li>
-                  Any usage beyond the minimum seat cost is billed as overage at the end of the
-                  billing period
-                </li>
-              </ul>
-            </div>
+        {/* Seats Overview - Full Width */}
+        {adminOrOwner && (
+          <div className='mb-4'>
+            <TeamSeatsOverview
+              subscriptionData={subscriptionData}
+              isLoadingSubscription={isLoadingSubscription}
+              usedSeats={usedSeats.used}
+              isLoading={isLoading}
+              onConfirmTeamUpgrade={confirmTeamUpgrade}
+              onReduceSeats={handleReduceSeats}
+              onAddSeatDialog={handleAddSeatDialog}
+            />
           </div>
         )}
 
-        {/* Team Seats Overview */}
-        {adminOrOwner && (
-          <TeamSeatsOverview
-            subscriptionData={subscriptionData}
-            isLoadingSubscription={isLoadingSubscription}
-            usedSeats={usedSeats.used}
-            isLoading={isLoading}
-            onConfirmTeamUpgrade={confirmTeamUpgrade}
-            onReduceSeats={handleReduceSeats}
-            onAddSeatDialog={handleAddSeatDialog}
+        {/* Main Content: Team Members */}
+        <div className='mb-4'>
+          <TeamMembers
+            organization={activeOrganization}
+            currentUserEmail={session?.user?.email ?? ''}
+            isAdminOrOwner={adminOrOwner}
+            onRemoveMember={handleRemoveMember}
+            onCancelInvitation={cancelInvitation}
           />
-        )}
-
-        {/* Team Members */}
-        <TeamMembers
-          organization={activeOrganization}
-          currentUserEmail={session?.user?.email ?? ''}
-          isAdminOrOwner={adminOrOwner}
-          onRemoveMember={handleRemoveMember}
-          onCancelInvitation={cancelInvitation}
-        />
+        </div>
 
-        {/* Single Organization Notice */}
+        {/* Action: Invite New Members */}
         {adminOrOwner && (
-          <div className='mt-4 rounded-lg bg-muted/50 p-3'>
-            <p className='text-muted-foreground text-xs'>
-              <span className='font-medium'>Note:</span> Users can only be part of one organization
-              at a time. They must leave their current organization before joining another.
-            </p>
+          <div className='mb-4'>
+            <MemberInvitationCard
+              inviteEmail={inviteEmail}
+              setInviteEmail={setInviteEmail}
+              isInviting={isInviting}
+              showWorkspaceInvite={showWorkspaceInvite}
+              setShowWorkspaceInvite={setShowWorkspaceInvite}
+              selectedWorkspaces={selectedWorkspaces}
+              userWorkspaces={userWorkspaces}
+              onInviteMember={handleInviteMember}
+              onLoadUserWorkspaces={() => loadUserWorkspaces(session?.user?.id)}
+              onWorkspaceToggle={handleWorkspaceToggle}
+              inviteSuccess={inviteSuccess}
+              availableSeats={Math.max(0, (subscriptionData?.seats || 0) - usedSeats.used)}
+              maxSeats={subscriptionData?.seats || 0}
+            />
           </div>
         )}
 
-        {/* Member Invitation Card */}
-        {adminOrOwner && (
-          <MemberInvitationCard
-            inviteEmail={inviteEmail}
-            setInviteEmail={setInviteEmail}
-            isInviting={isInviting}
-            showWorkspaceInvite={showWorkspaceInvite}
-            setShowWorkspaceInvite={setShowWorkspaceInvite}
-            selectedWorkspaces={selectedWorkspaces}
-            userWorkspaces={userWorkspaces}
-            onInviteMember={handleInviteMember}
-            onLoadUserWorkspaces={() => loadUserWorkspaces(session?.user?.id)}
-            onWorkspaceToggle={handleWorkspaceToggle}
-            inviteSuccess={inviteSuccess}
-            availableSeats={Math.max(0, (subscriptionData?.seats || 0) - usedSeats.used)}
-            maxSeats={subscriptionData?.seats || 0}
-          />
-        )}
-      </div>
-
-      {/* Team Information Section - pinned to bottom of modal */}
-      <div className='mt-6 flex-shrink-0 border-t pt-6'>
-        <div className='space-y-3 text-xs'>
-          <div className='flex justify-between'>
-            <span className='text-muted-foreground'>Team ID:</span>
-            <span className='font-mono'>{activeOrganization.id}</span>
-          </div>
-          <div className='flex justify-between'>
-            <span className='text-muted-foreground'>Created:</span>
-            <span>{new Date(activeOrganization.createdAt).toLocaleDateString()}</span>
-          </div>
-          <div className='flex justify-between'>
-            <span className='text-muted-foreground'>Your Role:</span>
-            <span className='font-medium capitalize'>{userRole}</span>
-          </div>
+        {/* Additional Info - Subtle and collapsed */}
+        <div className='space-y-3'>
+          {/* Single Organization Notice */}
+          {adminOrOwner && (
+            <div className='rounded-lg border border-[var(--border-muted)] bg-[var(--surface-3)] p-3'>
+              <p className='text-muted-foreground text-xs'>
+                <span className='font-medium'>Note:</span> Users can only be part of one
+                organization at a time.
+              </p>
+            </div>
+          )}
+
+          {/* Team Information */}
+          <details className='group rounded-lg border border-[var(--border-muted)] bg-[var(--surface-3)]'>
+            <summary className='flex cursor-pointer items-center justify-between p-3 font-medium text-sm hover:bg-[var(--surface-4)]'>
+              <span>Team Information</span>
+              <svg
+                className='h-4 w-4 transition-transform group-open:rotate-180'
+                fill='none'
+                viewBox='0 0 24 24'
+                stroke='currentColor'
+              >
+                <path
+                  strokeLinecap='round'
+                  strokeLinejoin='round'
+                  strokeWidth={2}
+                  d='M19 9l-7 7-7-7'
+                />
+              </svg>
+            </summary>
+            <div className='space-y-2 border-[var(--border-muted)] border-t p-3 text-xs'>
+              <div className='flex justify-between'>
+                <span className='text-muted-foreground'>Team ID:</span>
+                <span className='font-mono text-[10px]'>{activeOrganization.id}</span>
+              </div>
+              <div className='flex justify-between'>
+                <span className='text-muted-foreground'>Created:</span>
+                <span>{new Date(activeOrganization.createdAt).toLocaleDateString()}</span>
+              </div>
+              <div className='flex justify-between'>
+                <span className='text-muted-foreground'>Your Role:</span>
+                <span className='font-medium capitalize'>{userRole}</span>
+              </div>
+            </div>
+          </details>
+
+          {/* Team Billing Information (only show for Team Plan, not Enterprise) */}
+          {hasTeamPlan && !hasEnterprisePlan && (
+            <details className='group rounded-lg border border-[var(--border-muted)] bg-[var(--surface-3)]'>
+              <summary className='flex cursor-pointer items-center justify-between p-3 font-medium text-sm hover:bg-[var(--surface-4)]'>
+                <span>Billing Information</span>
+                <svg
+                  className='h-4 w-4 transition-transform group-open:rotate-180'
+                  fill='none'
+                  viewBox='0 0 24 24'
+                  stroke='currentColor'
+                >
+                  <path
+                    strokeLinecap='round'
+                    strokeLinejoin='round'
+                    strokeWidth={2}
+                    d='M19 9l-7 7-7-7'
+                  />
+                </svg>
+              </summary>
+              <div className='border-[var(--border-muted)] border-t p-3'>
+                <ul className='ml-4 list-disc space-y-2 text-muted-foreground text-xs'>
+                  <li>
+                    Your team is billed a minimum of $
+                    {(subscriptionData?.seats || 0) *
+                      (env.TEAM_TIER_COST_LIMIT ?? DEFAULT_TEAM_TIER_COST_LIMIT)}
+                    /month for {subscriptionData?.seats || 0} licensed seats
+                  </li>
+                  <li>All team member usage is pooled together from a shared limit</li>
+                  <li>
+                    When pooled usage exceeds the limit, all members are blocked from using the
+                    service
+                  </li>
+                  <li>You can increase the usage limit to allow for higher usage</li>
+                  <li>
+                    Any usage beyond the minimum seat cost is billed as overage at the end of the
+                    billing period
+                  </li>
+                </ul>
+              </div>
+            </details>
+          )}
         </div>
       </div>
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workspace-management.ts b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workspace-management.ts
index 586a4cbace9..6c50bc00f93 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workspace-management.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workspace-management.ts
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
-import { useRouter } from 'next/navigation'
+import { usePathname, useRouter } from 'next/navigation'
 import { createLogger } from '@/lib/logs/console/logger'
 import { generateWorkspaceName } from '@/lib/naming'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
@@ -32,6 +32,7 @@ export function useWorkspaceManagement({
   sessionUserId,
 }: UseWorkspaceManagementProps) {
   const router = useRouter()
+  const pathname = usePathname()
   const { switchToWorkspace } = useWorkflowRegistry()
 
   // Workspace management state
@@ -45,12 +46,14 @@ export function useWorkspaceManagement({
   // Refs to avoid dependency issues
   const workspaceIdRef = useRef<string>(workspaceId)
   const routerRef = useRef<ReturnType<typeof useRouter>>(router)
+  const pathnameRef = useRef<string | null>(pathname || null)
   const activeWorkspaceRef = useRef<Workspace | null>(null)
   const isInitializedRef = useRef<boolean>(false)
 
   // Update refs when values change
   workspaceIdRef.current = workspaceId
   routerRef.current = router
+  pathnameRef.current = pathname || null
   activeWorkspaceRef.current = activeWorkspace
 
   /**
@@ -189,7 +192,17 @@ export function useWorkspaceManagement({
       try {
         // Switch workspace and update URL
         await switchToWorkspace(workspace.id)
-        routerRef.current?.push(`/workspace/${workspace.id}/w`)
+        const currentPath = pathnameRef.current || ''
+        // Preserve templates route if user is on templates or template detail
+        const templateDetailMatch = currentPath.match(/^\/workspace\/[^/]+\/templates\/([^/]+)$/)
+        if (templateDetailMatch) {
+          const templateId = templateDetailMatch[1]
+          routerRef.current?.push(`/workspace/${workspace.id}/templates/${templateId}`)
+        } else if (/^\/workspace\/[^/]+\/templates$/.test(currentPath)) {
+          routerRef.current?.push(`/workspace/${workspace.id}/templates`)
+        } else {
+          routerRef.current?.push(`/workspace/${workspace.id}/w`)
+        }
         logger.info(`Switched to workspace: ${workspace.name} (${workspace.id})`)
       } catch (error) {
         logger.error('Error switching workspace:', error)
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx
index bc5687e6f3c..7f6251b6d73 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx
@@ -347,13 +347,22 @@ export function Sidebar() {
       try {
         // Switch workspace and update URL
         await switchToWorkspace(workspace.id)
-        routerRef.current?.push(`/workspace/${workspace.id}/w`)
+        const currentPath = pathname || ''
+        const templateDetailMatch = currentPath.match(/^\/workspace\/[^/]+\/templates\/([^/]+)$/)
+        if (templateDetailMatch) {
+          const templateId = templateDetailMatch[1]
+          routerRef.current?.push(`/workspace/${workspace.id}/templates/${templateId}`)
+        } else if (/^\/workspace\/[^/]+\/templates$/.test(currentPath)) {
+          routerRef.current?.push(`/workspace/${workspace.id}/templates`)
+        } else {
+          routerRef.current?.push(`/workspace/${workspace.id}/w`)
+        }
         logger.info(`Switched to workspace: ${workspace.name} (${workspace.id})`)
       } catch (error) {
         logger.error('Error switching workspace:', error)
       }
     },
-    [switchToWorkspace] // Removed activeWorkspace and router dependencies
+    [switchToWorkspace, pathname] // include pathname
   )
 
   /**
diff --git a/apps/sim/components/emcn/components/combobox/combobox.tsx b/apps/sim/components/emcn/components/combobox/combobox.tsx
index a6606448c36..96efbaeb291 100644
--- a/apps/sim/components/emcn/components/combobox/combobox.tsx
+++ b/apps/sim/components/emcn/components/combobox/combobox.tsx
@@ -439,7 +439,26 @@ const Combobox = forwardRef<HTMLDivElement, ComboboxProps>(
               }
             }}
           >
-            <PopoverScrollArea className='max-h-48 p-[4px]'>
+            <PopoverScrollArea
+              className='!flex-none max-h-48 p-[4px]'
+              onWheelCapture={(e) => {
+                // Ensure wheel events are captured and don't get blocked by parent handlers
+                const target = e.currentTarget
+                const { scrollTop, scrollHeight, clientHeight } = target
+                const delta = e.deltaY
+                const isScrollingDown = delta > 0
+                const isScrollingUp = delta < 0
+
+                // Check if we're at scroll boundaries
+                const isAtTop = scrollTop === 0
+                const isAtBottom = scrollTop + clientHeight >= scrollHeight - 1
+
+                // Only stop propagation if we can scroll in the requested direction
+                if ((isScrollingDown && !isAtBottom) || (isScrollingUp && !isAtTop)) {
+                  e.stopPropagation()
+                }
+              }}
+            >
               <div ref={dropdownRef} role='listbox'>
                 {isLoading ? (
                   <div className='flex items-center justify-center py-[14px]'>
diff --git a/apps/sim/components/emcn/components/popover/popover.tsx b/apps/sim/components/emcn/components/popover/popover.tsx
index 0b9972312b7..bbe480abf0e 100644
--- a/apps/sim/components/emcn/components/popover/popover.tsx
+++ b/apps/sim/components/emcn/components/popover/popover.tsx
@@ -278,7 +278,7 @@ const PopoverContent = React.forwardRef<
           sticky='partial'
           {...restProps}
           className={cn(
-            'z-[9999999] flex flex-col overflow-hidden rounded-[8px] bg-[var(--surface-3)] px-[5.5px] py-[5px] text-foreground outline-none dark:bg-[var(--surface-3)]',
+            'z-[10000001] flex flex-col overflow-hidden rounded-[8px] bg-[var(--surface-3)] px-[5.5px] py-[5px] text-foreground outline-none dark:bg-[var(--surface-3)]',
             // If width is constrained by the caller, ensure inner flexible text truncates by default.
             hasUserWidthConstraint && '[&_.flex-1]:truncate',
             className
diff --git a/apps/sim/components/ui/dialog.tsx b/apps/sim/components/ui/dialog.tsx
index 0be3076631e..ab299dfc76b 100644
--- a/apps/sim/components/ui/dialog.tsx
+++ b/apps/sim/components/ui/dialog.tsx
@@ -29,7 +29,7 @@ const DialogOverlay = React.forwardRef<
     <DialogPrimitive.Overlay
       ref={ref}
       className={cn(
-        'data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-white/50 data-[state=closed]:animate-out data-[state=open]:animate-in dark:bg-black/50',
+        'data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-[10000000] bg-white/50 data-[state=closed]:animate-out data-[state=open]:animate-in dark:bg-black/50',
         className
       )}
       style={{ backdropFilter: 'blur(1.5px)', ...style }}
@@ -70,7 +70,7 @@ const DialogContent = React.forwardRef<
       <DialogPrimitive.Content
         ref={ref}
         className={cn(
-          'data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] fixed top-[50%] left-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 rounded-[8px] border border-[var(--border-muted)] bg-[var(--surface-3)] p-6 shadow-lg duration-200 data-[state=closed]:animate-out data-[state=open]:animate-in dark:bg-[var(--surface-3)]',
+          'data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] fixed top-[50%] left-[50%] z-[10000000] grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 rounded-[8px] border border-[var(--border-muted)] bg-[var(--surface-3)] p-6 shadow-lg duration-200 data-[state=closed]:animate-out data-[state=open]:animate-in dark:bg-[var(--surface-3)]',
           className
         )}
         onInteractOutside={(e) => {
diff --git a/apps/sim/components/user-avatar/user-avatar.tsx b/apps/sim/components/user-avatar/user-avatar.tsx
new file mode 100644
index 00000000000..1c57332e93d
--- /dev/null
+++ b/apps/sim/components/user-avatar/user-avatar.tsx
@@ -0,0 +1,66 @@
+'use client'
+
+import { type CSSProperties, useEffect, useState } from 'react'
+import Image from 'next/image'
+import { getUserColor } from '@/app/workspace/[workspaceId]/w/utils/get-user-color'
+
+interface UserAvatarProps {
+  userId: string
+  userName?: string | null
+  avatarUrl?: string | null
+  size?: number
+  className?: string
+}
+
+/**
+ * Reusable user avatar component with error handling for image loading.
+ * Falls back to colored circle with initials if image fails to load or is not available.
+ */
+export function UserAvatar({
+  userId,
+  userName,
+  avatarUrl,
+  size = 32,
+  className = '',
+}: UserAvatarProps) {
+  const [imageError, setImageError] = useState(false)
+  const color = getUserColor(userId)
+  const initials = userName ? userName.charAt(0).toUpperCase() : '?'
+  const hasAvatar = Boolean(avatarUrl) && !imageError
+
+  // Reset error state when avatar URL changes
+  useEffect(() => {
+    setImageError(false)
+  }, [avatarUrl])
+
+  const fontSize = Math.max(10, size / 2.5)
+
+  return (
+    <div
+      className={`relative flex flex-shrink-0 items-center justify-center overflow-hidden rounded-full font-semibold text-white ${className}`}
+      style={
+        {
+          background: hasAvatar ? undefined : color,
+          width: `${size}px`,
+          height: `${size}px`,
+          fontSize: `${fontSize}px`,
+        } as CSSProperties
+      }
+    >
+      {hasAvatar && avatarUrl ? (
+        <Image
+          src={avatarUrl}
+          alt={userName ? `${userName}'s avatar` : 'User avatar'}
+          fill
+          sizes={`${size}px`}
+          className='object-cover'
+          referrerPolicy='no-referrer'
+          unoptimized={avatarUrl.startsWith('http')}
+          onError={() => setImageError(true)}
+        />
+      ) : (
+        initials
+      )}
+    </div>
+  )
+}
diff --git a/apps/sim/middleware.ts b/apps/sim/middleware.ts
index 0d9e2055068..a922ab9feb0 100644
--- a/apps/sim/middleware.ts
+++ b/apps/sim/middleware.ts
@@ -157,6 +157,11 @@ export async function middleware(request: NextRequest) {
   }
 
   if (url.pathname.startsWith('/workspace')) {
+    // Allow public access to workspace template pages - they handle their own redirects
+    if (url.pathname.match(/^\/workspace\/[^/]+\/templates/)) {
+      return NextResponse.next()
+    }
+
     if (!hasActiveSession) {
       return NextResponse.redirect(new URL('/login', request.url))
     }
diff --git a/apps/sim/stores/organization/types.ts b/apps/sim/stores/organization/types.ts
index e61f7cde2fb..333c193ac9a 100644
--- a/apps/sim/stores/organization/types.ts
+++ b/apps/sim/stores/organization/types.ts
@@ -2,6 +2,7 @@ export interface User {
   name?: string
   email?: string
   id?: string
+  image?: string | null
 }
 
 export interface Member {

From 4e5b8344333577d93929500f96ed2f7928f44024 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathvikku@gmail.com>
Date: Wed, 12 Nov 2025 22:16:13 -0800
Subject: [PATCH 7/7] fix(onedrive): incorrect canonical param (#1966)

* fix(onedrive): incorrect canonical param

* fix download file

* fix

* fix

* Revert "fix"

This reverts commit f68ccd75fdf9f66ff9e3e07840145ba952d3f851.

* Revert "fix"

This reverts commit f3d8acee7d84e41cdac4ad7943da6dda34c51cfa.
---
 apps/sim/blocks/blocks/onedrive.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/sim/blocks/blocks/onedrive.ts b/apps/sim/blocks/blocks/onedrive.ts
index 08a140fed76..9751a05964a 100644
--- a/apps/sim/blocks/blocks/onedrive.ts
+++ b/apps/sim/blocks/blocks/onedrive.ts
@@ -284,7 +284,6 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
       id: 'downloadFileName',
       title: 'File Name Override',
       type: 'short-input',
-      canonicalParamId: 'fileName',
       placeholder: 'Optional: Override the filename',
       condition: { field: 'operation', value: 'download' },
     },
@@ -350,7 +349,7 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
         }
       },
       params: (params) => {
-        const { credential, folderId, fileId, mimeType, values, ...rest } = params
+        const { credential, folderId, fileId, mimeType, values, downloadFileName, ...rest } = params
 
         let parsedValues
         try {
@@ -367,6 +366,7 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
           fileId: fileId || undefined,
           pageSize: rest.pageSize ? Number.parseInt(rest.pageSize as string, 10) : undefined,
           mimeType: mimeType,
+          ...(downloadFileName && { fileName: downloadFileName }),
         }
       },
     },