diff --git a/apps/docs/components/icons.tsx b/apps/docs/components/icons.tsx
index ce31daf14f6..812d38ea311 100644
--- a/apps/docs/components/icons.tsx
+++ b/apps/docs/components/icons.tsx
@@ -7538,26 +7538,6 @@ export function BedrockIcon(props: SVGProps<SVGSVGElement>) {
   )
 }
 
-export function TableIcon(props: SVGProps<SVGSVGElement>) {
-  return (
-    <svg
-      xmlns='http://www.w3.org/2000/svg'
-      viewBox='0 0 24 24'
-      fill='none'
-      stroke='currentColor'
-      strokeWidth={2}
-      strokeLinecap='round'
-      strokeLinejoin='round'
-      {...props}
-    >
-      <rect width='18' height='18' x='3' y='3' rx='2' />
-      <path d='M3 9h18' />
-      <path d='M3 15h18' />
-      <path d='M9 3v18' />
-      <path d='M15 3v18' />
-    </svg>
-  )
-}
 export function ReductoIcon(props: SVGProps<SVGSVGElement>) {
   return (
     <svg
diff --git a/apps/docs/components/ui/icon-mapping.ts b/apps/docs/components/ui/icon-mapping.ts
index 562acb5b0bf..55d32137cac 100644
--- a/apps/docs/components/ui/icon-mapping.ts
+++ b/apps/docs/components/ui/icon-mapping.ts
@@ -3,7 +3,7 @@
 // Maps block types to their icon component references
 
 import type { ComponentType, SVGProps } from 'react'
-import { Library, Rocket } from '@sim/emcn/icons'
+import { Library, Rocket, Table } from '@sim/emcn/icons'
 import {
   A2AIcon,
   AgentMailIcon,
@@ -225,7 +225,6 @@ import {
   StagehandIcon,
   StripeIcon,
   SupabaseIcon,
-  TableIcon,
   TailscaleIcon,
   TavilyIcon,
   TelegramIcon,
@@ -518,7 +517,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   stt: STTIcon,
   stt_v2: STTIcon,
   supabase: SupabaseIcon,
-  table: TableIcon,
+  table: Table,
   tailscale: TailscaleIcon,
   tavily: TavilyIcon,
   telegram: TelegramIcon,
diff --git a/apps/sim/app/(landing)/components/features/components/build-callout/components/workflow-showcase/showcase-data.ts b/apps/sim/app/(landing)/components/features/components/build-callout/components/workflow-showcase/showcase-data.ts
index 81099f42ebc..06824548b6a 100644
--- a/apps/sim/app/(landing)/components/features/components/build-callout/components/workflow-showcase/showcase-data.ts
+++ b/apps/sim/app/(landing)/components/features/components/build-callout/components/workflow-showcase/showcase-data.ts
@@ -1,11 +1,5 @@
-import {
-  AgentIcon,
-  AnthropicIcon,
-  GmailIcon,
-  LinearIcon,
-  SlackIcon,
-  TableIcon,
-} from '@/components/icons'
+import { Table as TableIcon } from '@sim/emcn/icons'
+import { AgentIcon, AnthropicIcon, GmailIcon, LinearIcon, SlackIcon } from '@/components/icons'
 import type { BlockDef } from '@/app/(landing)/components/hero/components/hero-visual/workflow-data'
 
 /**
diff --git a/apps/sim/app/(landing)/components/hero/components/hero-platform-loop/stage-data.ts b/apps/sim/app/(landing)/components/hero/components/hero-platform-loop/stage-data.ts
index 4dbaf430bb0..fb43f689326 100644
--- a/apps/sim/app/(landing)/components/hero/components/hero-platform-loop/stage-data.ts
+++ b/apps/sim/app/(landing)/components/hero/components/hero-platform-loop/stage-data.ts
@@ -1,4 +1,5 @@
-import { AgentIcon, CodeIcon, SlackIcon, StartIcon, TableIcon } from '@/components/icons'
+import { Table as TableIcon } from '@sim/emcn/icons'
+import { AgentIcon, CodeIcon, SlackIcon, StartIcon } from '@/components/icons'
 import type { BlockDef } from '@/app/(landing)/components/hero/components/hero-visual/workflow-data'
 import { BLOCK_WIDTH } from '@/app/(landing)/components/hero/components/hero-visual/workflow-data'
 
diff --git a/apps/sim/app/(landing)/enterprise/components/enterprise-platform-loop/stage-data.ts b/apps/sim/app/(landing)/enterprise/components/enterprise-platform-loop/stage-data.ts
index a0eebb24f2c..e90e6ef2410 100644
--- a/apps/sim/app/(landing)/enterprise/components/enterprise-platform-loop/stage-data.ts
+++ b/apps/sim/app/(landing)/enterprise/components/enterprise-platform-loop/stage-data.ts
@@ -1,4 +1,5 @@
-import { AgentIcon, ConditionalIcon, MailIcon, StartIcon, TableIcon } from '@/components/icons'
+import { Table as TableIcon } from '@sim/emcn/icons'
+import { AgentIcon, ConditionalIcon, MailIcon, StartIcon } from '@/components/icons'
 import type { BlockDef } from '@/app/(landing)/components/hero/components/hero-visual/workflow-data'
 
 /**
diff --git a/apps/sim/app/(landing)/solutions/compliance/components/compliance-hero-loop.tsx b/apps/sim/app/(landing)/solutions/compliance/components/compliance-hero-loop.tsx
index 9a842fcd87c..abf89357965 100644
--- a/apps/sim/app/(landing)/solutions/compliance/components/compliance-hero-loop.tsx
+++ b/apps/sim/app/(landing)/solutions/compliance/components/compliance-hero-loop.tsx
@@ -1,6 +1,7 @@
 'use client'
 
-import { AgentIcon, ConditionalIcon, ScheduleIcon, SlackIcon, TableIcon } from '@/components/icons'
+import { Table as TableIcon } from '@sim/emcn/icons'
+import { AgentIcon, ConditionalIcon, ScheduleIcon, SlackIcon } from '@/components/icons'
 import { EnterprisePlatformLoop } from '@/app/(landing)/enterprise/components/enterprise-platform-loop'
 import type { EnterpriseLoopContent } from '@/app/(landing)/enterprise/components/enterprise-platform-loop/stage-data'
 
diff --git a/apps/sim/app/(landing)/solutions/finance/components/finance-hero-loop.tsx b/apps/sim/app/(landing)/solutions/finance/components/finance-hero-loop.tsx
index b9c1bd82b2f..dbdd4098442 100644
--- a/apps/sim/app/(landing)/solutions/finance/components/finance-hero-loop.tsx
+++ b/apps/sim/app/(landing)/solutions/finance/components/finance-hero-loop.tsx
@@ -1,6 +1,7 @@
 'use client'
 
-import { AgentIcon, ConditionalIcon, MailIcon, StartIcon, TableIcon } from '@/components/icons'
+import { Table as TableIcon } from '@sim/emcn/icons'
+import { AgentIcon, ConditionalIcon, MailIcon, StartIcon } from '@/components/icons'
 import { EnterprisePlatformLoop } from '@/app/(landing)/enterprise/components/enterprise-platform-loop'
 import type { EnterpriseLoopContent } from '@/app/(landing)/enterprise/components/enterprise-platform-loop/stage-data'
 
diff --git a/apps/sim/app/(landing)/workflows/components/workflows-editor-loop.tsx b/apps/sim/app/(landing)/workflows/components/workflows-editor-loop.tsx
index bb324d19f4c..ff564048d90 100644
--- a/apps/sim/app/(landing)/workflows/components/workflows-editor-loop.tsx
+++ b/apps/sim/app/(landing)/workflows/components/workflows-editor-loop.tsx
@@ -1,13 +1,7 @@
 'use client'
 
-import {
-  AgentIcon,
-  ConditionalIcon,
-  JiraIcon,
-  SlackIcon,
-  StartIcon,
-  TableIcon,
-} from '@/components/icons'
+import { Table as TableIcon } from '@sim/emcn/icons'
+import { AgentIcon, ConditionalIcon, JiraIcon, SlackIcon, StartIcon } from '@/components/icons'
 import { EditorLoop, type EditorLoopContent } from '@/app/(landing)/components/shared/editor-loop'
 
 /**
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/tool-call-item.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/tool-call-item.tsx
index b00b5bc043a..cfddbb4815c 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/tool-call-item.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/tool-call-item.tsx
@@ -238,7 +238,10 @@ export function ToolCallItem({
   return (
     <div className='flex items-center gap-[6px] pl-6'>
       {BlockIcon && (
-        <BlockIcon className='size-[14px] flex-shrink-0' style={getBareIconStyle(BlockIcon)} />
+        <BlockIcon
+          className='size-[14px] flex-shrink-0 text-[var(--text-icon)]'
+          style={getBareIconStyle(BlockIcon)}
+        />
       )}
       {isExecuting ? (
         <ShimmerText className='text-[13px] [--shimmer-rest:var(--text-secondary)]'>
diff --git a/apps/sim/blocks/blocks/table.ts b/apps/sim/blocks/blocks/table.ts
index e4b90227d41..04f655d1aa0 100644
--- a/apps/sim/blocks/blocks/table.ts
+++ b/apps/sim/blocks/blocks/table.ts
@@ -1,5 +1,5 @@
+import { Table } from '@sim/emcn/icons'
 import { toError } from '@sim/utils/errors'
-import { TableIcon } from '@/components/icons'
 import { TABLE_LIMITS } from '@/lib/table/constants'
 import { filterRulesToFilter, sortRulesToSort } from '@/lib/table/query-builder/converters'
 import type { BlockConfig } from '@/blocks/types'
@@ -201,7 +201,7 @@ export const TableBlock: BlockConfig<TableQueryResponse> = {
   docsLink: 'https://docs.sim.ai/integrations/table',
   category: 'blocks',
   bgColor: '#10B981',
-  icon: TableIcon,
+  icon: Table,
   canvasPresentation: {
     defaultTitle: 'Table',
     /*
diff --git a/apps/sim/blocks/blocks/table_v2.ts b/apps/sim/blocks/blocks/table_v2.ts
index ff569fd40f0..3b8ff6d9fb5 100644
--- a/apps/sim/blocks/blocks/table_v2.ts
+++ b/apps/sim/blocks/blocks/table_v2.ts
@@ -1,5 +1,5 @@
+import { Table } from '@sim/emcn/icons'
 import { toError } from '@sim/utils/errors'
-import { TableIcon } from '@/components/icons'
 import { TABLE_LIMITS } from '@/lib/table/constants'
 import { filterRulesToPredicate, sortRulesToSortSpec } from '@/lib/table/query-builder/converters'
 import { normalizeTablePredicate } from '@/lib/table/query-builder/predicate'
@@ -221,7 +221,7 @@ export const TableV2Block: BlockConfig<TableQueryV2Response> = {
   // and mark v1 `table` superseded.
   preview: true,
   bgColor: '#10B981',
-  icon: TableIcon,
+  icon: Table,
   canvasPresentation: {
     defaultTitle: 'Table',
     /*
diff --git a/apps/sim/components/icons.tsx b/apps/sim/components/icons.tsx
index ce31daf14f6..812d38ea311 100644
--- a/apps/sim/components/icons.tsx
+++ b/apps/sim/components/icons.tsx
@@ -7538,26 +7538,6 @@ export function BedrockIcon(props: SVGProps<SVGSVGElement>) {
   )
 }
 
-export function TableIcon(props: SVGProps<SVGSVGElement>) {
-  return (
-    <svg
-      xmlns='http://www.w3.org/2000/svg'
-      viewBox='0 0 24 24'
-      fill='none'
-      stroke='currentColor'
-      strokeWidth={2}
-      strokeLinecap='round'
-      strokeLinejoin='round'
-      {...props}
-    >
-      <rect width='18' height='18' x='3' y='3' rx='2' />
-      <path d='M3 9h18' />
-      <path d='M3 15h18' />
-      <path d='M9 3v18' />
-      <path d='M15 3v18' />
-    </svg>
-  )
-}
 export function ReductoIcon(props: SVGProps<SVGSVGElement>) {
   return (
     <svg
diff --git a/apps/sim/lib/integrations/icon-mapping.ts b/apps/sim/lib/integrations/icon-mapping.ts
index 0b89a859f2c..5332c38e5c4 100644
--- a/apps/sim/lib/integrations/icon-mapping.ts
+++ b/apps/sim/lib/integrations/icon-mapping.ts
@@ -3,7 +3,7 @@
 // Maps block types to their icon component references for the integrations page
 
 import type { ComponentType, SVGProps } from 'react'
-import { Library, Rocket } from '@sim/emcn/icons'
+import { Library, Rocket, Table } from '@sim/emcn/icons'
 import {
   A2AIcon,
   AgentMailIcon,
@@ -223,7 +223,6 @@ import {
   StagehandIcon,
   StripeIcon,
   SupabaseIcon,
-  TableIcon,
   TailscaleIcon,
   TavilyIcon,
   TelegramIcon,
@@ -497,7 +496,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   sts: STSIcon,
   stt_v2: STTIcon,
   supabase: SupabaseIcon,
-  table: TableIcon,
+  table: Table,
   tailscale: TailscaleIcon,
   tavily: TavilyIcon,
   telegram: TelegramIcon,
diff --git a/apps/sim/triggers/table/poller.ts b/apps/sim/triggers/table/poller.ts
index 8a35e886426..f11cad09806 100644
--- a/apps/sim/triggers/table/poller.ts
+++ b/apps/sim/triggers/table/poller.ts
@@ -1,4 +1,4 @@
-import { TableIcon } from '@/components/icons'
+import { Table } from '@sim/emcn/icons'
 import { requestJson } from '@/lib/api/client/request'
 import { listTablesContract } from '@/lib/api/contracts/tables'
 import type { TableDefinition } from '@/lib/table'
@@ -39,7 +39,7 @@ export const tableNewRowTrigger: TriggerConfig = {
   provider: 'table',
   description: 'Triggers when rows are inserted or updated in a table',
   version: '1.0.0',
-  icon: TableIcon,
+  icon: Table,
 
   subBlocks: [
     {
diff --git a/packages/emcn/src/icons/redo.tsx b/packages/emcn/src/icons/redo.tsx
index b75c282e9ba..46ababf974a 100644
--- a/packages/emcn/src/icons/redo.tsx
+++ b/packages/emcn/src/icons/redo.tsx
@@ -18,14 +18,14 @@ export function Redo(props: SVGProps<SVGSVGElement>) {
       <path
         d='M9.5 4.5H4C2.62 4.5 1.5 5.62 1.5 7C1.5 8.38 2.62 9.5 4 9.5H7'
         stroke='currentColor'
-        strokeWidth='0.85'
+        strokeWidth='0.775'
         strokeLinecap='round'
         strokeLinejoin='round'
       />
       <path
         d='M8 2.5L10 4.5L8 6.5'
         stroke='currentColor'
-        strokeWidth='0.85'
+        strokeWidth='0.775'
         strokeLinecap='round'
         strokeLinejoin='round'
       />
diff --git a/packages/emcn/src/icons/undo.tsx b/packages/emcn/src/icons/undo.tsx
index c3ef3af85f1..bcf094e2fae 100644
--- a/packages/emcn/src/icons/undo.tsx
+++ b/packages/emcn/src/icons/undo.tsx
@@ -18,14 +18,14 @@ export function Undo(props: SVGProps<SVGSVGElement>) {
       <path
         d='M2.5 4.5H8C9.38 4.5 10.5 5.62 10.5 7C10.5 8.38 9.38 9.5 8 9.5H5'
         stroke='currentColor'
-        strokeWidth='0.85'
+        strokeWidth='0.775'
         strokeLinecap='round'
         strokeLinejoin='round'
       />
       <path
         d='M4 2.5L2 4.5L4 6.5'
         stroke='currentColor'
-        strokeWidth='0.85'
+        strokeWidth='0.775'
         strokeLinecap='round'
         strokeLinejoin='round'
       />
diff --git a/packages/emcn/src/icons/zoom-in.tsx b/packages/emcn/src/icons/zoom-in.tsx
index f83e6f5fc24..8c088d78724 100644
--- a/packages/emcn/src/icons/zoom-in.tsx
+++ b/packages/emcn/src/icons/zoom-in.tsx
@@ -20,28 +20,28 @@ export function ZoomIn(props: SVGProps<SVGSVGElement>) {
         cy='5'
         r='3.5'
         stroke='currentColor'
-        strokeWidth='0.85'
+        strokeWidth='0.775'
         strokeLinecap='round'
         strokeLinejoin='round'
       />
       <path
         d='M5 3.5V6.5'
         stroke='currentColor'
-        strokeWidth='0.85'
+        strokeWidth='0.775'
         strokeLinecap='round'
         strokeLinejoin='round'
       />
       <path
         d='M3.5 5H6.5'
         stroke='currentColor'
-        strokeWidth='0.85'
+        strokeWidth='0.775'
         strokeLinecap='round'
         strokeLinejoin='round'
       />
       <path
         d='M7.5 7.5L10.5 10.5'
         stroke='currentColor'
-        strokeWidth='0.85'
+        strokeWidth='0.775'
         strokeLinecap='round'
         strokeLinejoin='round'
       />
diff --git a/packages/emcn/src/icons/zoom-out.tsx b/packages/emcn/src/icons/zoom-out.tsx
index d5a78f8e61e..c39e2cea17e 100644
--- a/packages/emcn/src/icons/zoom-out.tsx
+++ b/packages/emcn/src/icons/zoom-out.tsx
@@ -20,21 +20,21 @@ export function ZoomOut(props: SVGProps<SVGSVGElement>) {
         cy='5'
         r='3.5'
         stroke='currentColor'
-        strokeWidth='0.85'
+        strokeWidth='0.775'
         strokeLinecap='round'
         strokeLinejoin='round'
       />
       <path
         d='M3.5 5H6.5'
         stroke='currentColor'
-        strokeWidth='0.85'
+        strokeWidth='0.775'
         strokeLinecap='round'
         strokeLinejoin='round'
       />
       <path
         d='M7.5 7.5L10.5 10.5'
         stroke='currentColor'
-        strokeWidth='0.85'
+        strokeWidth='0.775'
         strokeLinecap='round'
         strokeLinejoin='round'
       />