diff --git a/apps/sim/app/(auth)/login/loading.tsx b/apps/sim/app/(auth)/login/loading.tsx
index 74f7bece6c9..dc95e136385 100644
--- a/apps/sim/app/(auth)/login/loading.tsx
+++ b/apps/sim/app/(auth)/login/loading.tsx
@@ -3,22 +3,22 @@ import { Skeleton } from '@sim/emcn'
 export default function LoginLoading() {
   return (
     <div className='flex flex-col items-center'>
-      <Skeleton className='h-[38px] w-[80px] rounded-[4px]' />
+      <Skeleton className='h-[38px] w-[80px] rounded-sm' />
       <div className='mt-8 w-full space-y-2'>
-        <Skeleton className='h-[14px] w-[40px] rounded-[4px]' />
-        <Skeleton className='h-[44px] w-full rounded-[10px]' />
+        <Skeleton className='h-[14px] w-[40px] rounded-sm' />
+        <Skeleton className='h-[44px] w-full rounded-lg' />
       </div>
       <div className='mt-4 w-full space-y-2'>
-        <Skeleton className='h-[14px] w-[64px] rounded-[4px]' />
-        <Skeleton className='h-[44px] w-full rounded-[10px]' />
+        <Skeleton className='h-[14px] w-[64px] rounded-sm' />
+        <Skeleton className='h-[44px] w-full rounded-lg' />
       </div>
-      <Skeleton className='mt-6 h-[44px] w-full rounded-[10px]' />
-      <Skeleton className='mt-6 h-[1px] w-full rounded-[1px]' />
+      <Skeleton className='mt-6 h-[44px] w-full rounded-lg' />
+      <Skeleton className='mt-6 h-[1px] w-full rounded-full' />
       <div className='mt-6 flex w-full gap-3'>
-        <Skeleton className='h-[44px] flex-1 rounded-[10px]' />
-        <Skeleton className='h-[44px] flex-1 rounded-[10px]' />
+        <Skeleton className='h-[44px] flex-1 rounded-lg' />
+        <Skeleton className='h-[44px] flex-1 rounded-lg' />
       </div>
-      <Skeleton className='mt-6 h-[14px] w-[200px] rounded-[4px]' />
+      <Skeleton className='mt-6 h-[14px] w-[200px] rounded-sm' />
     </div>
   )
 }
diff --git a/apps/sim/app/(auth)/reset-password/loading.tsx b/apps/sim/app/(auth)/reset-password/loading.tsx
index d1910ac0425..ec447a579db 100644
--- a/apps/sim/app/(auth)/reset-password/loading.tsx
+++ b/apps/sim/app/(auth)/reset-password/loading.tsx
@@ -3,14 +3,14 @@ import { Skeleton } from '@sim/emcn'
 export default function ResetPasswordLoading() {
   return (
     <div className='flex flex-col items-center'>
-      <Skeleton className='h-[38px] w-[160px] rounded-[4px]' />
-      <Skeleton className='mt-3 h-[14px] w-[280px] rounded-[4px]' />
+      <Skeleton className='h-[38px] w-[160px] rounded-sm' />
+      <Skeleton className='mt-3 h-[14px] w-[280px] rounded-sm' />
       <div className='mt-8 w-full space-y-2'>
-        <Skeleton className='h-[14px] w-[40px] rounded-[4px]' />
-        <Skeleton className='h-[44px] w-full rounded-[10px]' />
+        <Skeleton className='h-[14px] w-[40px] rounded-sm' />
+        <Skeleton className='h-[44px] w-full rounded-lg' />
       </div>
-      <Skeleton className='mt-6 h-[44px] w-full rounded-[10px]' />
-      <Skeleton className='mt-6 h-[14px] w-[120px] rounded-[4px]' />
+      <Skeleton className='mt-6 h-[44px] w-full rounded-lg' />
+      <Skeleton className='mt-6 h-[14px] w-[120px] rounded-sm' />
     </div>
   )
 }
diff --git a/apps/sim/app/(auth)/signup/loading.tsx b/apps/sim/app/(auth)/signup/loading.tsx
index c1190c8385e..d7fd260a032 100644
--- a/apps/sim/app/(auth)/signup/loading.tsx
+++ b/apps/sim/app/(auth)/signup/loading.tsx
@@ -3,26 +3,26 @@ import { Skeleton } from '@sim/emcn'
 export default function SignupLoading() {
   return (
     <div className='flex flex-col items-center'>
-      <Skeleton className='h-[38px] w-[100px] rounded-[4px]' />
+      <Skeleton className='h-[38px] w-[100px] rounded-sm' />
       <div className='mt-8 w-full space-y-2'>
-        <Skeleton className='h-[14px] w-[40px] rounded-[4px]' />
-        <Skeleton className='h-[44px] w-full rounded-[10px]' />
+        <Skeleton className='h-[14px] w-[40px] rounded-sm' />
+        <Skeleton className='h-[44px] w-full rounded-lg' />
       </div>
       <div className='mt-4 w-full space-y-2'>
-        <Skeleton className='h-[14px] w-[40px] rounded-[4px]' />
-        <Skeleton className='h-[44px] w-full rounded-[10px]' />
+        <Skeleton className='h-[14px] w-[40px] rounded-sm' />
+        <Skeleton className='h-[44px] w-full rounded-lg' />
       </div>
       <div className='mt-4 w-full space-y-2'>
-        <Skeleton className='h-[14px] w-[64px] rounded-[4px]' />
-        <Skeleton className='h-[44px] w-full rounded-[10px]' />
+        <Skeleton className='h-[14px] w-[64px] rounded-sm' />
+        <Skeleton className='h-[44px] w-full rounded-lg' />
       </div>
-      <Skeleton className='mt-6 h-[44px] w-full rounded-[10px]' />
-      <Skeleton className='mt-6 h-[1px] w-full rounded-[1px]' />
+      <Skeleton className='mt-6 h-[44px] w-full rounded-lg' />
+      <Skeleton className='mt-6 h-[1px] w-full rounded-full' />
       <div className='mt-6 flex w-full gap-3'>
-        <Skeleton className='h-[44px] flex-1 rounded-[10px]' />
-        <Skeleton className='h-[44px] flex-1 rounded-[10px]' />
+        <Skeleton className='h-[44px] flex-1 rounded-lg' />
+        <Skeleton className='h-[44px] flex-1 rounded-lg' />
       </div>
-      <Skeleton className='mt-6 h-[14px] w-[220px] rounded-[4px]' />
+      <Skeleton className='mt-6 h-[14px] w-[220px] rounded-sm' />
     </div>
   )
 }
diff --git a/apps/sim/app/(auth)/sso/loading.tsx b/apps/sim/app/(auth)/sso/loading.tsx
index 116e47c136b..6b6c3cf5e42 100644
--- a/apps/sim/app/(auth)/sso/loading.tsx
+++ b/apps/sim/app/(auth)/sso/loading.tsx
@@ -3,14 +3,14 @@ import { Skeleton } from '@sim/emcn'
 export default function SSOLoading() {
   return (
     <div className='flex flex-col items-center'>
-      <Skeleton className='h-[38px] w-[120px] rounded-[4px]' />
-      <Skeleton className='mt-3 h-[14px] w-[260px] rounded-[4px]' />
+      <Skeleton className='h-[38px] w-[120px] rounded-sm' />
+      <Skeleton className='mt-3 h-[14px] w-[260px] rounded-sm' />
       <div className='mt-8 w-full space-y-2'>
-        <Skeleton className='h-[14px] w-[80px] rounded-[4px]' />
-        <Skeleton className='h-[44px] w-full rounded-[10px]' />
+        <Skeleton className='h-[14px] w-[80px] rounded-sm' />
+        <Skeleton className='h-[44px] w-full rounded-lg' />
       </div>
-      <Skeleton className='mt-6 h-[44px] w-full rounded-[10px]' />
-      <Skeleton className='mt-6 h-[14px] w-[120px] rounded-[4px]' />
+      <Skeleton className='mt-6 h-[44px] w-full rounded-lg' />
+      <Skeleton className='mt-6 h-[14px] w-[120px] rounded-sm' />
     </div>
   )
 }
diff --git a/apps/sim/app/(auth)/verify/loading.tsx b/apps/sim/app/(auth)/verify/loading.tsx
index d884048905a..5227fc028b4 100644
--- a/apps/sim/app/(auth)/verify/loading.tsx
+++ b/apps/sim/app/(auth)/verify/loading.tsx
@@ -3,10 +3,10 @@ import { Skeleton } from '@sim/emcn'
 export default function VerifyLoading() {
   return (
     <div className='flex flex-col items-center'>
-      <Skeleton className='h-[38px] w-[180px] rounded-[4px]' />
-      <Skeleton className='mt-3 h-[14px] w-[300px] rounded-[4px]' />
-      <Skeleton className='mt-1 h-[14px] w-[240px] rounded-[4px]' />
-      <Skeleton className='mt-8 h-[44px] w-full rounded-[10px]' />
+      <Skeleton className='h-[38px] w-[180px] rounded-sm' />
+      <Skeleton className='mt-3 h-[14px] w-[300px] rounded-sm' />
+      <Skeleton className='mt-1 h-[14px] w-[240px] rounded-sm' />
+      <Skeleton className='mt-8 h-[44px] w-full rounded-lg' />
     </div>
   )
 }
diff --git a/apps/sim/app/(auth)/verify/verify-content.tsx b/apps/sim/app/(auth)/verify/verify-content.tsx
index 88d1c2e9d67..b13d3ce432d 100644
--- a/apps/sim/app/(auth)/verify/verify-content.tsx
+++ b/apps/sim/app/(auth)/verify/verify-content.tsx
@@ -149,8 +149,8 @@ function VerificationFormFallback() {
   return (
     <div className='text-center'>
       <div className='animate-pulse'>
-        <div className='mx-auto mb-4 h-8 w-48 rounded bg-[var(--surface-4)]' />
-        <div className='mx-auto h-4 w-64 rounded bg-[var(--surface-4)]' />
+        <div className='mx-auto mb-4 h-8 w-48 rounded-sm bg-[var(--surface-4)]' />
+        <div className='mx-auto h-4 w-64 rounded-sm bg-[var(--surface-4)]' />
       </div>
     </div>
   )
diff --git a/apps/sim/app/(interfaces)/chat/[identifier]/loading.tsx b/apps/sim/app/(interfaces)/chat/[identifier]/loading.tsx
index 405a06bc0e7..8393900a280 100644
--- a/apps/sim/app/(interfaces)/chat/[identifier]/loading.tsx
+++ b/apps/sim/app/(interfaces)/chat/[identifier]/loading.tsx
@@ -8,10 +8,10 @@ export default function ChatLoading() {
       <div className='border-[var(--border-1)] border-b px-4 py-3'>
         <div className='mx-auto flex max-w-3xl items-center justify-between'>
           <div className='flex items-center gap-[12px]'>
-            <Skeleton className='size-[28px] rounded-[6px]' />
-            <Skeleton className='h-[18px] w-[120px] rounded-[4px]' />
+            <Skeleton className='size-[28px] rounded-md' />
+            <Skeleton className='h-[18px] w-[120px] rounded-sm' />
           </div>
-          <Skeleton className='h-[28px] w-[80px] rounded-[6px]' />
+          <Skeleton className='h-[28px] w-[80px] rounded-md' />
         </div>
       </div>
       <div className='flex min-h-0 flex-1 items-center justify-center px-4'>
@@ -24,16 +24,16 @@ export default function ChatLoading() {
             <div className='mt-8 w-full space-y-8'>
               <div className='space-y-2'>
                 <Skeleton className='h-4 w-16' />
-                <Skeleton className='h-10 w-full rounded-[10px]' />
+                <Skeleton className='h-10 w-full rounded-lg' />
               </div>
-              <Skeleton className='h-10 w-full rounded-[10px]' />
+              <Skeleton className='h-10 w-full rounded-lg' />
             </div>
           </div>
         </div>
       </div>
       <div className='relative p-3 pb-4 md:p-4 md:pb-6'>
         <div className='relative mx-auto max-w-3xl md:max-w-[748px]'>
-          <Skeleton className='h-[48px] w-full rounded-[12px]' />
+          <Skeleton className='h-[48px] w-full rounded-xl' />
         </div>
       </div>
     </div>
diff --git a/apps/sim/app/(interfaces)/chat/components/input/input.tsx b/apps/sim/app/(interfaces)/chat/components/input/input.tsx
index 0554b38bed5..0555fe6411a 100644
--- a/apps/sim/app/(interfaces)/chat/components/input/input.tsx
+++ b/apps/sim/app/(interfaces)/chat/components/input/input.tsx
@@ -172,7 +172,7 @@ export const ChatInput: React.FC<{
               {attachedFiles.map((file) => (
                 <Tooltip.Root key={file.id}>
                   <Tooltip.Trigger asChild>
-                    <div className='group relative size-[56px] shrink-0 cursor-pointer overflow-hidden rounded-[8px] border border-[var(--border-1)] bg-[var(--surface-3)]'>
+                    <div className='group relative size-[56px] shrink-0 cursor-pointer overflow-hidden rounded-lg border border-[var(--border-1)] bg-[var(--surface-3)]'>
                       {file.dataUrl ? (
                         <img
                           src={file.dataUrl}
diff --git a/apps/sim/app/(interfaces)/chat/components/loading-state/loading-state.tsx b/apps/sim/app/(interfaces)/chat/components/loading-state/loading-state.tsx
index 5f7270578cd..9f4c2c0b0c6 100644
--- a/apps/sim/app/(interfaces)/chat/components/loading-state/loading-state.tsx
+++ b/apps/sim/app/(interfaces)/chat/components/loading-state/loading-state.tsx
@@ -18,9 +18,9 @@ export function ChatLoadingState() {
             <div className='mt-8 w-full space-y-8'>
               <div className='space-y-2'>
                 <Skeleton className='h-4 w-16' />
-                <Skeleton className='h-10 w-full rounded-[10px]' />
+                <Skeleton className='h-10 w-full rounded-lg' />
               </div>
-              <Skeleton className='h-10 w-full rounded-[10px]' />
+              <Skeleton className='h-10 w-full rounded-lg' />
             </div>
           </div>
         </div>
diff --git a/apps/sim/app/(interfaces)/chat/components/message/components/markdown-renderer.tsx b/apps/sim/app/(interfaces)/chat/components/message/components/markdown-renderer.tsx
index dd6199e063e..616dfda617e 100644
--- a/apps/sim/app/(interfaces)/chat/components/message/components/markdown-renderer.tsx
+++ b/apps/sim/app/(interfaces)/chat/components/message/components/markdown-renderer.tsx
@@ -101,7 +101,7 @@ const COMPONENTS = {
   },
 
   inlineCode: ({ children }: { children?: React.ReactNode }) => (
-    <code className='rounded bg-[var(--surface-5)] px-1 py-0.5 font-mono text-[var(--text-primary)] text-inherit'>
+    <code className='rounded-sm bg-[var(--surface-5)] px-1 py-0.5 font-mono text-[var(--text-primary)] text-inherit'>
       {children}
     </code>
   ),
diff --git a/apps/sim/app/(interfaces)/chat/components/message/message.tsx b/apps/sim/app/(interfaces)/chat/components/message/message.tsx
index 9458ed16be7..95cb39bf938 100644
--- a/apps/sim/app/(interfaces)/chat/components/message/message.tsx
+++ b/apps/sim/app/(interfaces)/chat/components/message/message.tsx
@@ -192,7 +192,7 @@ export const ClientChatMessage = memo(function ClientChatMessage({
                         />
                       ) : (
                         <>
-                          <div className='flex size-10 shrink-0 items-center justify-center rounded bg-[var(--surface-3)] md:size-12'>
+                          <div className='flex size-10 shrink-0 items-center justify-center rounded-sm bg-[var(--surface-3)] md:size-12'>
                             {getFileIcon(attachment.type)}
                           </div>
                           <div className='min-w-0 flex-1'>
diff --git a/apps/sim/app/(interfaces)/resume/[workflowId]/[executionId]/loading.tsx b/apps/sim/app/(interfaces)/resume/[workflowId]/[executionId]/loading.tsx
index 37d6027a3cb..e725843d701 100644
--- a/apps/sim/app/(interfaces)/resume/[workflowId]/[executionId]/loading.tsx
+++ b/apps/sim/app/(interfaces)/resume/[workflowId]/[executionId]/loading.tsx
@@ -5,34 +5,34 @@ export default function ResumeLoading() {
     <div className='bg-background'>
       <div className='border-b px-4 py-3'>
         <div className='mx-auto flex max-w-[1200px] items-center justify-between'>
-          <Skeleton className='h-[24px] w-[80px] rounded-[4px]' />
-          <Skeleton className='h-[28px] w-[100px] rounded-[6px]' />
+          <Skeleton className='h-[24px] w-[80px] rounded-sm' />
+          <Skeleton className='h-[28px] w-[100px] rounded-md' />
         </div>
       </div>
       <div className='mx-auto max-w-[1200px] px-6 py-8'>
         <div className='grid grid-cols-[280px_1fr] gap-6'>
           <div className='space-y-[8px]'>
-            <Skeleton className='h-[20px] w-[120px] rounded-[4px]' />
+            <Skeleton className='h-[20px] w-[120px] rounded-sm' />
             {Array.from({ length: 3 }).map((_, i) => (
-              <Skeleton key={i} className='h-[48px] w-full rounded-[8px]' />
+              <Skeleton key={i} className='h-[48px] w-full rounded-lg' />
             ))}
           </div>
-          <div className='rounded-[8px] border p-6'>
-            <Skeleton className='h-[24px] w-[200px] rounded-[4px]' />
-            <Skeleton className='mt-[12px] h-[16px] w-[320px] rounded-[4px]' />
+          <div className='rounded-lg border p-6'>
+            <Skeleton className='h-[24px] w-[200px] rounded-sm' />
+            <Skeleton className='mt-[12px] h-[16px] w-[320px] rounded-sm' />
             <div className='mt-[24px] space-y-[16px]'>
               <div className='space-y-[8px]'>
-                <Skeleton className='h-[14px] w-[80px] rounded-[4px]' />
-                <Skeleton className='h-[40px] w-full rounded-[8px]' />
+                <Skeleton className='h-[14px] w-[80px] rounded-sm' />
+                <Skeleton className='h-[40px] w-full rounded-lg' />
               </div>
               <div className='space-y-[8px]'>
-                <Skeleton className='h-[14px] w-[100px] rounded-[4px]' />
-                <Skeleton className='h-[80px] w-full rounded-[8px]' />
+                <Skeleton className='h-[14px] w-[100px] rounded-sm' />
+                <Skeleton className='h-[80px] w-full rounded-lg' />
               </div>
             </div>
             <div className='mt-[24px] flex gap-[12px]'>
-              <Skeleton className='h-[40px] w-[120px] rounded-[8px]' />
-              <Skeleton className='h-[40px] w-[120px] rounded-[8px]' />
+              <Skeleton className='h-[40px] w-[120px] rounded-lg' />
+              <Skeleton className='h-[40px] w-[120px] rounded-lg' />
             </div>
           </div>
         </div>
diff --git a/apps/sim/app/(interfaces)/resume/[workflowId]/[executionId]/resume-page-client.tsx b/apps/sim/app/(interfaces)/resume/[workflowId]/[executionId]/resume-page-client.tsx
index bb09919dc63..15c8d2ee86a 100644
--- a/apps/sim/app/(interfaces)/resume/[workflowId]/[executionId]/resume-page-client.tsx
+++ b/apps/sim/app/(interfaces)/resume/[workflowId]/[executionId]/resume-page-client.tsx
@@ -158,7 +158,7 @@ function renderStructuredValuePreview(value: unknown) {
   const { text: stringValue, truncated } = truncateForPreview(String(value))
   return (
     <div className='max-w-full'>
-      <div className='inline-flex max-w-full rounded-[6px] border border-[var(--border)] bg-[var(--surface-5)] px-2 py-1 font-mono text-[var(--text-primary)] text-caption leading-4 [white-space:pre-wrap] [word-break:break-word]'>
+      <div className='inline-flex max-w-full rounded-md border border-[var(--border)] bg-[var(--surface-5)] px-2 py-1 font-mono text-[var(--text-primary)] text-caption leading-4 [white-space:pre-wrap] [word-break:break-word]'>
         {truncated ? `${stringValue}…` : stringValue}
       </div>
       {truncated && (
@@ -800,7 +800,7 @@ export default function ResumeExecutionPage({
         {/* Main Layout */}
         <div className='grid grid-cols-[280px_1fr] gap-6'>
           {/* Pause Points List */}
-          <div className='overflow-hidden rounded-[8px] border border-[var(--border)] bg-[var(--surface-1)]'>
+          <div className='overflow-hidden rounded-lg border border-[var(--border)] bg-[var(--surface-1)]'>
             <div className='border-[var(--border)] border-b px-4 py-3'>
               <Label>Pause Points</Label>
             </div>
@@ -832,17 +832,17 @@ export default function ResumeExecutionPage({
           {/* Detail Panel */}
           <div>
             {loadingDetail && !selectedDetail ? (
-              <div className='flex h-[200px] items-center justify-center rounded-[8px] border border-[var(--border)] bg-[var(--surface-1)]'>
+              <div className='flex h-[200px] items-center justify-center rounded-lg border border-[var(--border)] bg-[var(--surface-1)]'>
                 <span className='text-[var(--text-secondary)] text-small'>Loading…</span>
               </div>
             ) : !selectedContextId ? (
-              <div className='flex h-[200px] items-center justify-center rounded-[8px] border border-[var(--border)] bg-[var(--surface-1)]'>
+              <div className='flex h-[200px] items-center justify-center rounded-lg border border-[var(--border)] bg-[var(--surface-1)]'>
                 <span className='text-[var(--text-secondary)] text-small'>
                   Select a pause point
                 </span>
               </div>
             ) : !selectedDetail ? (
-              <div className='flex h-[200px] items-center justify-center rounded-[8px] border border-[var(--border)] bg-[var(--surface-1)]'>
+              <div className='flex h-[200px] items-center justify-center rounded-lg border border-[var(--border)] bg-[var(--surface-1)]'>
                 <span className='text-[var(--text-secondary)] text-small'>
                   Could not load details
                 </span>
@@ -850,7 +850,7 @@ export default function ResumeExecutionPage({
             ) : (
               <div className='flex flex-col gap-4'>
                 {/* Status Header */}
-                <div className='flex items-center justify-between rounded-[8px] border border-[var(--border)] bg-[var(--surface-1)] px-4 py-3'>
+                <div className='flex items-center justify-between rounded-lg border border-[var(--border)] bg-[var(--surface-1)] px-4 py-3'>
                   <div>
                     <Label>{getBlockName(selectedDetail.pausePoint)}</Label>
                     <p className='mt-[2px] text-[var(--text-muted)] text-caption'>
@@ -868,7 +868,7 @@ export default function ResumeExecutionPage({
                 </div>
 
                 {selectedDetail.pausePoint.automaticResumeWaitingReason && (
-                  <div className='rounded-[8px] border border-[var(--border)] bg-[var(--surface-1)] px-4 py-3'>
+                  <div className='rounded-lg border border-[var(--border)] bg-[var(--surface-1)] px-4 py-3'>
                     <Label>Waiting to resume automatically</Label>
                     <p className='mt-1 text-[var(--text-secondary)] text-small'>
                       {selectedDetail.pausePoint.automaticResumeWaitingReason}
@@ -881,7 +881,7 @@ export default function ResumeExecutionPage({
 
                 {/* Already resolved - show form fields with submitted values */}
                 {selectedStatus === 'resumed' || selectedStatus === 'failed' ? (
-                  <div className='overflow-hidden rounded-[8px] border border-[var(--border)] bg-[var(--surface-1)]'>
+                  <div className='overflow-hidden rounded-lg border border-[var(--border)] bg-[var(--surface-1)]'>
                     <div className='border-[var(--border)] border-b px-4 py-3'>
                       <Label>Resume Form</Label>
                     </div>
@@ -932,7 +932,7 @@ export default function ResumeExecutionPage({
                   <>
                     {/* Display Data */}
                     {responseStructureRows.length > 0 ? (
-                      <div className='overflow-hidden rounded-[8px] border border-[var(--border)] bg-[var(--surface-1)]'>
+                      <div className='overflow-hidden rounded-lg border border-[var(--border)] bg-[var(--surface-1)]'>
                         <div className='border-[var(--border)] border-b px-4 py-3'>
                           <Label>Display Data</Label>
                         </div>
@@ -958,7 +958,7 @@ export default function ResumeExecutionPage({
                         </div>
                       </div>
                     ) : (
-                      <div className='overflow-hidden rounded-[8px] border border-[var(--border)] bg-[var(--surface-1)]'>
+                      <div className='overflow-hidden rounded-lg border border-[var(--border)] bg-[var(--surface-1)]'>
                         <div className='border-[var(--border)] border-b px-4 py-3'>
                           <Label>Display Data</Label>
                         </div>
@@ -972,7 +972,7 @@ export default function ResumeExecutionPage({
 
                     {/* Resume Form */}
                     {isHumanMode && hasInputFormat ? (
-                      <div className='overflow-hidden rounded-[8px] border border-[var(--border)] bg-[var(--surface-1)]'>
+                      <div className='overflow-hidden rounded-lg border border-[var(--border)] bg-[var(--surface-1)]'>
                         <div className='border-[var(--border)] border-b px-4 py-3'>
                           <Label>Resume Form</Label>
                         </div>
@@ -1001,7 +1001,7 @@ export default function ResumeExecutionPage({
                         </div>
                       </div>
                     ) : (
-                      <div className='overflow-hidden rounded-[8px] border border-[var(--border)] bg-[var(--surface-1)]'>
+                      <div className='overflow-hidden rounded-lg border border-[var(--border)] bg-[var(--surface-1)]'>
                         <div className='border-[var(--border)] border-b px-4 py-3'>
                           <Label>Resume Input (JSON)</Label>
                         </div>
diff --git a/apps/sim/app/_styles/globals.css b/apps/sim/app/_styles/globals.css
index 78b947eac66..2e265b5b08e 100644
--- a/apps/sim/app/_styles/globals.css
+++ b/apps/sim/app/_styles/globals.css
@@ -191,6 +191,9 @@
   --radius-sm: calc(var(--radius) - 4px);
   --radius-md: calc(var(--radius) - 2px);
   --radius-lg: var(--radius);
+  --radius-xl: 0.75rem;
+  --radius-2xl: 1rem;
+  --radius-3xl: 1.5rem;
 
   /**
    * These names intentionally match the app's own `:root` custom properties, so
diff --git a/apps/sim/app/cli/auth/cli-auth-view.tsx b/apps/sim/app/cli/auth/cli-auth-view.tsx
index f7865af95da..33469cc3306 100644
--- a/apps/sim/app/cli/auth/cli-auth-view.tsx
+++ b/apps/sim/app/cli/auth/cli-auth-view.tsx
@@ -94,7 +94,7 @@ export function CliAuthView() {
         description='Approve only if the code below matches the one in your terminal.'
       />
       <div className='space-y-4'>
-        <div className='flex items-center justify-center rounded-[10px] border border-[var(--border-1)] py-5'>
+        <div className='flex items-center justify-center rounded-lg border border-[var(--border-1)] py-5'>
           {/* `pl` offsets the trailing letter-space `tracking` adds after the last glyph, which would otherwise pull the code left of optical center. */}
           <code className='pl-[0.2em] font-mono text-[28px] text-[var(--text-primary)] leading-none tracking-[0.2em]'>
             {request.pairing}
diff --git a/apps/sim/app/cli/auth/loading.tsx b/apps/sim/app/cli/auth/loading.tsx
index e6a96d20127..911ae79010e 100644
--- a/apps/sim/app/cli/auth/loading.tsx
+++ b/apps/sim/app/cli/auth/loading.tsx
@@ -11,11 +11,11 @@ import { AuthShell } from '@/app/(auth)/components'
 export function CliAuthLoading() {
   return (
     <div className='flex w-full flex-col items-center'>
-      <Skeleton className='h-[38px] w-[280px] rounded-[4px]' />
-      <Skeleton className='mt-1 h-[23px] w-[360px] rounded-[4px]' />
-      <Skeleton className='h-[23px] w-[240px] rounded-[4px]' />
-      <Skeleton className='mt-6 h-[70px] w-full rounded-[10px]' />
-      <Skeleton className='mt-4 h-9 w-full rounded-[10px]' />
+      <Skeleton className='h-[38px] w-[280px] rounded-sm' />
+      <Skeleton className='mt-1 h-[23px] w-[360px] rounded-sm' />
+      <Skeleton className='h-[23px] w-[240px] rounded-sm' />
+      <Skeleton className='mt-6 h-[70px] w-full rounded-lg' />
+      <Skeleton className='mt-4 h-9 w-full rounded-lg' />
     </div>
   )
 }
diff --git a/apps/sim/app/invite/[id]/loading.tsx b/apps/sim/app/invite/[id]/loading.tsx
index b26abbbaf59..31e3d619994 100644
--- a/apps/sim/app/invite/[id]/loading.tsx
+++ b/apps/sim/app/invite/[id]/loading.tsx
@@ -3,11 +3,11 @@ import { Skeleton } from '@sim/emcn'
 export default function InviteLoading() {
   return (
     <div className='flex flex-col items-center justify-center'>
-      <Skeleton className='size-[48px] rounded-[12px]' />
-      <Skeleton className='mt-[16px] h-[24px] w-[200px] rounded-[4px]' />
-      <Skeleton className='mt-[8px] h-[14px] w-[280px] rounded-[4px]' />
-      <Skeleton className='mt-[4px] h-[14px] w-[240px] rounded-[4px]' />
-      <Skeleton className='mt-[24px] h-[44px] w-[200px] rounded-[10px]' />
+      <Skeleton className='size-[48px] rounded-xl' />
+      <Skeleton className='mt-[16px] h-[24px] w-[200px] rounded-sm' />
+      <Skeleton className='mt-[8px] h-[14px] w-[280px] rounded-sm' />
+      <Skeleton className='mt-[4px] h-[14px] w-[240px] rounded-sm' />
+      <Skeleton className='mt-[24px] h-[44px] w-[200px] rounded-lg' />
     </div>
   )
 }
diff --git a/apps/sim/app/unsubscribe/loading.tsx b/apps/sim/app/unsubscribe/loading.tsx
index 5f625c75bbd..e5a3aa10a8f 100644
--- a/apps/sim/app/unsubscribe/loading.tsx
+++ b/apps/sim/app/unsubscribe/loading.tsx
@@ -3,11 +3,11 @@ import { Skeleton } from '@sim/emcn'
 export default function UnsubscribeLoading() {
   return (
     <div className='flex flex-col items-center justify-center'>
-      <Skeleton className='size-[48px] rounded-[12px]' />
-      <Skeleton className='mt-[16px] h-[24px] w-[180px] rounded-[4px]' />
-      <Skeleton className='mt-[8px] h-[14px] w-[300px] rounded-[4px]' />
-      <Skeleton className='mt-[4px] h-[14px] w-[260px] rounded-[4px]' />
-      <Skeleton className='mt-[24px] h-[44px] w-[200px] rounded-[10px]' />
+      <Skeleton className='size-[48px] rounded-xl' />
+      <Skeleton className='mt-[16px] h-[24px] w-[180px] rounded-sm' />
+      <Skeleton className='mt-[8px] h-[14px] w-[300px] rounded-sm' />
+      <Skeleton className='mt-[4px] h-[14px] w-[260px] rounded-sm' />
+      <Skeleton className='mt-[24px] h-[44px] w-[200px] rounded-lg' />
     </div>
   )
 }
diff --git a/apps/sim/app/workspace/[workspaceId]/components/folders/use-row-drag-ghost.ts b/apps/sim/app/workspace/[workspaceId]/components/folders/use-row-drag-ghost.ts
index ee37ca45a8c..a7bc8d07fc3 100644
--- a/apps/sim/app/workspace/[workspaceId]/components/folders/use-row-drag-ghost.ts
+++ b/apps/sim/app/workspace/[workspaceId]/components/folders/use-row-drag-ghost.ts
@@ -11,7 +11,7 @@ import { useCallback, useEffect, useMemo, useRef } from 'react'
  * the label inherit the app font and match the row it was lifted from.
  */
 const DRAG_GHOST_STYLE =
-  'position:fixed;top:-500px;left:0;display:inline-flex;align-items:center;padding:4px 10px;background:var(--surface-active);border:1px solid var(--border);border-radius:8px;font-size:13px;color:var(--text-body);white-space:nowrap;pointer-events:none;box-shadow:var(--shadow-medium);z-index:var(--z-toast)'
+  'position:fixed;top:-500px;left:0;display:inline-flex;align-items:center;padding:4px 10px;background:var(--surface-active);border:1px solid var(--border);border-radius:var(--radius-lg);font-size:13px;color:var(--text-body);white-space:nowrap;pointer-events:none;box-shadow:var(--shadow-medium);z-index:var(--z-toast)'
 
 const DRAG_GHOST_LABEL_STYLE = 'max-width:200px;overflow:hidden;text-overflow:ellipsis'
 
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/image.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/image.tsx
index d6623e648d6..7f9ac01de9c 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/image.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/image.tsx
@@ -286,7 +286,7 @@ export function ResizableImageView({ node, selected, editor, getPos }: ReactNode
           onPointerDown={startResize}
           className='absolute right-0 bottom-0 flex size-10 cursor-nwse-resize touch-none items-end justify-end p-1 sm:size-8'
         >
-          <span className='size-3 rounded-[3px] border border-[var(--bg)] bg-[var(--brand-secondary)]' />
+          <span className='size-3 rounded-sm border border-[var(--bg)] bg-[var(--brand-secondary)]' />
         </Button>
       )}
     </NodeViewWrapper>
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/menus/suggestion-menu-chrome.ts b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/menus/suggestion-menu-chrome.ts
index 918934aa0e1..353c615db0d 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/menus/suggestion-menu-chrome.ts
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/menus/suggestion-menu-chrome.ts
@@ -17,7 +17,7 @@ export const SUGGESTION_SCROLL_CLASS = 'max-h-[240px] scroll-py-1.5 overflow-y-a
 /** A selectable row: icon + label, 14px icon in `--text-icon`, truncating label. The `img` rules
  * size custom-block image icons (rendered as `<img>`, so the `svg` rules never reach them). */
 export const SUGGESTION_ITEM_CLASS =
-  'relative flex w-full min-w-0 cursor-pointer select-none items-center gap-2 rounded-[5px] px-2 py-1.5 text-left text-[var(--text-body)] text-caption outline-hidden transition-colors [&>span]:min-w-0 [&>span]:truncate [&_svg]:pointer-events-none [&_svg]:size-[14px] [&_svg]:shrink-0 [&_svg]:text-[var(--text-icon)] [&_img]:pointer-events-none [&_img]:size-[14px] [&_img]:shrink-0'
+  'relative flex w-full min-w-0 cursor-pointer select-none items-center gap-2 rounded-sm px-2 py-1.5 text-left text-[var(--text-body)] text-caption outline-hidden transition-colors [&>span]:min-w-0 [&>span]:truncate [&_svg]:pointer-events-none [&_svg]:size-[14px] [&_svg]:shrink-0 [&_svg]:text-[var(--text-icon)] [&_img]:pointer-events-none [&_img]:size-[14px] [&_img]:shrink-0'
 
 /** A group heading above a run of rows. */
 export const SUGGESTION_GROUP_LABEL_CLASS =
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/rich-markdown-editor.css b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/rich-markdown-editor.css
index 3b6cc3f2b85..5f02b74d874 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/rich-markdown-editor.css
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/rich-markdown-editor.css
@@ -28,7 +28,7 @@
 .rich-markdown-nodes img {
   max-width: 100%;
   height: auto;
-  border-radius: 8px;
+  border-radius: var(--radius-lg);
   border: var(--border-width) solid var(--border);
 }
 
@@ -37,7 +37,7 @@
 .rich-markdown-nodes .ProseMirror-selectednode {
   outline: 2px solid var(--brand-secondary);
   outline-offset: 2px;
-  border-radius: 4px;
+  border-radius: var(--radius-sm);
 }
 
 /* An image is its own framed element; ring the image itself so the indicator hugs the picture
@@ -226,7 +226,7 @@
   height: 16px;
   margin: 0;
   border: var(--border-width) solid var(--border-1);
-  border-radius: 3px;
+  border-radius: var(--radius-sm);
   background: transparent;
   cursor: pointer;
 }
@@ -258,7 +258,7 @@
   font-family: var(--font-martian-mono, ui-monospace, monospace);
   font-size: 0.875em;
   background: var(--surface-5);
-  border-radius: 4px;
+  border-radius: var(--radius-sm);
   padding: 0.125rem 0.375rem;
 }
 
@@ -279,7 +279,7 @@
 .rich-markdown-prose pre,
 .rich-markdown-prose .mermaid-diagram-frame {
   background: var(--surface-5);
-  border-radius: 8px;
+  border-radius: var(--radius-lg);
   padding: 1rem;
   overflow-x: auto;
 }
@@ -341,12 +341,12 @@
 }
 
 .rich-markdown-nodes .raw-markdown-block {
-  border-radius: 8px;
+  border-radius: var(--radius-lg);
   padding: 0.75rem 1rem;
 }
 
 .rich-markdown-nodes .raw-markdown-inline {
-  border-radius: 4px;
+  border-radius: var(--radius-sm);
   padding: 0.0625rem 0.3rem;
 }
 
@@ -373,7 +373,7 @@
 .rich-markdown-nodes img.rich-leaf-in-selection {
   outline: 2px solid var(--selection-bg);
   outline-offset: 2px;
-  border-radius: 4px;
+  border-radius: var(--radius-sm);
 }
 
 /* Borders, padding, typography, and header fill come from document-table.css — the chrome shared
@@ -442,7 +442,7 @@
 .rich-markdown-nodes mark {
   background-color: color-mix(in srgb, var(--color-amber-400) 40%, transparent);
   color: inherit;
-  border-radius: 2px;
+  border-radius: var(--radius-xs);
   padding: 0 0.1em;
   margin: 0 -0.1em;
   box-decoration-break: clone;
@@ -513,7 +513,7 @@
   left: -1px;
   width: 8px;
   height: 5px;
-  border-radius: 2px 2px 2px 0;
+  border-radius: var(--radius-xs) var(--radius-xs) var(--radius-xs) 0;
   background-color: var(--caret-color);
   transition: opacity 0.2s ease;
 }
@@ -551,7 +551,7 @@
   max-width: 10rem;
   overflow: hidden;
   padding: 0.1rem 0.35rem;
-  border-radius: 2px 2px 2px 0;
+  border-radius: var(--radius-xs) var(--radius-xs) var(--radius-xs) 0;
   /* 11px = the `text-xs` the canvas/tables presence tags use, for pixel parity. */
   font-size: 11px;
   font-weight: 500;
@@ -576,13 +576,13 @@
 .rich-markdown-nodes .collaboration-carets__caret--flip .collaboration-carets__label {
   left: auto;
   right: -1px;
-  border-radius: 2px 2px 0 2px;
+  border-radius: var(--radius-xs) var(--radius-xs) 0 var(--radius-xs);
 }
 
 /* Remote text selection: a rounded translucent tint of the collaborator's identity
  * color (the alpha fill is set inline by selectionRender). */
 .rich-markdown-nodes .collaboration-carets__selection {
-  border-radius: 2px;
+  border-radius: var(--radius-xs);
   pointer-events: none;
 }
 
@@ -591,7 +591,7 @@
 .rich-markdown-nodes .rich-find-match {
   background-color: var(--highlight-match-bg);
   color: var(--highlight-match-text);
-  border-radius: 2px;
+  border-radius: var(--radius-xs);
 }
 
 /* The active hit is a stronger fill of the same hue, never a ring: an outline drawn
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/browser-agent-icon.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/browser-agent-icon.tsx
index 5bf1c53ac4d..925e6451401 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/browser-agent-icon.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/browser-agent-icon.tsx
@@ -127,7 +127,7 @@ function BrowserAgentFavicon({ url, canLoad }: BrowserAgentFaviconProps) {
           referrerPolicy='no-referrer'
           alt=''
           className={cn(
-            'size-full rounded-[3px]',
+            'size-full rounded-sm',
             status !== 'loaded' && 'pointer-events-none absolute opacity-0'
           )}
           onLoad={() => setStatus('loaded')}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/chat-content.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/chat-content.tsx
index 958b6b893bf..cdd5a769f06 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/chat-content.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/chat-content.tsx
@@ -334,7 +334,7 @@ const MARKDOWN_COMPONENTS = {
           className={cn(
             'text-[var(--text-primary)]',
             kind
-              ? 'not-prose inline-flex items-baseline gap-1 rounded-[5px] bg-[var(--surface-5)] px-[5px] no-underline transition-colors hover-hover:bg-[var(--surface-6)]'
+              ? 'not-prose inline-flex items-baseline gap-1 rounded-sm bg-[var(--surface-5)] px-[5px] no-underline transition-colors hover-hover:bg-[var(--surface-6)]'
               : 'underline decoration-dashed underline-offset-4'
           )}
           onClick={(e) => {
@@ -415,7 +415,7 @@ const MARKDOWN_COMPONENTS = {
   },
   inlineCode({ children }: { children?: React.ReactNode }) {
     return (
-      <code className='whitespace-normal rounded bg-[var(--surface-5)] px-1.5 py-0.5 font-mono font-normal text-[var(--text-primary)] not-italic before:content-none after:content-none'>
+      <code className='whitespace-normal rounded-sm bg-[var(--surface-5)] px-1.5 py-0.5 font-mono font-normal text-[var(--text-primary)] not-italic before:content-none after:content-none'>
         {children}
       </code>
     )
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/external-link.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/external-link.tsx
index fd9661d2151..11829e5bef2 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/external-link.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/external-link.tsx
@@ -71,7 +71,7 @@ export function ExternalLink({ href, hostname, children }: ExternalLinkProps) {
           <img
             src={faviconUrl(hostname, 32)}
             alt=''
-            className='relative top-[0.5px] mr-[2px] inline size-[12px] rounded-[3px]'
+            className='relative top-[0.5px] mr-[2px] inline size-[12px] rounded-sm'
             onError={hideBrokenFavicon}
           />
           <span className='underline decoration-[color:var(--text-muted)] underline-offset-4 transition-colors group-hover:decoration-[color:var(--text-primary)]'>
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/message-sources/message-sources.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/message-sources/message-sources.tsx
index 305a02b97fe..1f1d029d321 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/message-sources/message-sources.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/message-sources/message-sources.tsx
@@ -7,7 +7,7 @@ import type { SourceTagData } from '@/app/workspace/[workspaceId]/home/component
 
 /** The action-row button, matching the copy and vote buttons beside it with room for a count. */
 const BUTTON_CLASSES =
-  'flex h-[26px] items-center gap-1 rounded-[6px] px-1.5 text-[var(--text-icon)] text-caption transition-colors hover-hover:bg-[var(--surface-hover)] focus-visible:outline-hidden data-[state=open]:bg-[var(--surface-active)] data-[state=open]:hover-hover:bg-[var(--surface-active)]'
+  'flex h-[26px] items-center gap-1 rounded-md px-1.5 text-[var(--text-icon)] text-caption transition-colors hover-hover:bg-[var(--surface-hover)] focus-visible:outline-hidden data-[state=open]:bg-[var(--surface-active)] data-[state=open]:hover-hover:bg-[var(--surface-active)]'
 
 interface MessageSourcesProps {
   sources: readonly SourceTagData[]
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/resource-mention.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/resource-mention.tsx
index a6f685cd35f..0e72032d065 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/resource-mention.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/resource-mention.tsx
@@ -9,7 +9,7 @@ interface ResourceMentionProps {
 
 export function ResourceMention({ icon, title, onSelect }: ResourceMentionProps) {
   const classes =
-    'inline-flex items-baseline gap-1 rounded-[5px] bg-[var(--surface-5)] px-[5px] align-baseline font-[inherit] text-[inherit] leading-[inherit]'
+    'inline-flex items-baseline gap-1 rounded-sm bg-[var(--surface-5)] px-[5px] align-baseline font-[inherit] text-[inherit] leading-[inherit]'
   const content = (
     <>
       {icon}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-card/source-card.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-card/source-card.tsx
index b339c1a91fc..3729be3d831 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-card/source-card.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-card/source-card.tsx
@@ -145,7 +145,7 @@ export function SourceCard({ source, query, onSummarize, dense = false }: Source
     <img
       src={faviconUrl(hostname, 32)}
       alt=''
-      className='size-[16px] rounded-[3px]'
+      className='size-[16px] rounded-sm'
       onError={hideBrokenFavicon}
     />
   ) : null
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-chip/source-chip.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-chip/source-chip.tsx
index 8d4540d4b9e..31332c215dd 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-chip/source-chip.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-chip/source-chip.tsx
@@ -75,7 +75,7 @@ export function SourceChip({ source }: SourceChipProps) {
             <img
               src={faviconUrl(hostname, 32)}
               alt=''
-              className='size-[12px] shrink-0 rounded-[3px]'
+              className='size-[12px] shrink-0 rounded-sm'
               onError={hideBrokenFavicon}
             />
           ) : null}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/components/mothership-chat-skeleton/mothership-chat-skeleton.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/components/mothership-chat-skeleton/mothership-chat-skeleton.tsx
index 9b32c21b1dd..8c4714a5c1e 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/components/mothership-chat-skeleton/mothership-chat-skeleton.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/components/mothership-chat-skeleton/mothership-chat-skeleton.tsx
@@ -27,24 +27,24 @@ export function MothershipChatSkeleton({
   return (
     <div className={styles.content}>
       <div className={styles.userRow}>
-        <Skeleton className='h-[40px] w-[55%] rounded-[16px]' />
+        <Skeleton className='h-[40px] w-[55%] rounded-2xl' />
       </div>
 
       <div className='space-y-3'>
-        <Skeleton className='h-[14px] w-[90%] rounded-[4px]' />
-        <Skeleton className='h-[14px] w-[75%] rounded-[4px]' />
-        <Skeleton className='h-[14px] w-[82%] rounded-[4px]' />
-        <Skeleton className='h-[14px] w-[40%] rounded-[4px]' />
+        <Skeleton className='h-[14px] w-[90%] rounded-sm' />
+        <Skeleton className='h-[14px] w-[75%] rounded-sm' />
+        <Skeleton className='h-[14px] w-[82%] rounded-sm' />
+        <Skeleton className='h-[14px] w-[40%] rounded-sm' />
       </div>
 
       <div className={styles.userRow}>
-        <Skeleton className='h-[32px] w-[40%] rounded-[16px]' />
+        <Skeleton className='h-[32px] w-[40%] rounded-2xl' />
       </div>
 
       <div className='space-y-3'>
-        <Skeleton className='h-[14px] w-[85%] rounded-[4px]' />
-        <Skeleton className='h-[14px] w-[70%] rounded-[4px]' />
-        <Skeleton className='h-[14px] w-[60%] rounded-[4px]' />
+        <Skeleton className='h-[14px] w-[85%] rounded-sm' />
+        <Skeleton className='h-[14px] w-[70%] rounded-sm' />
+        <Skeleton className='h-[14px] w-[60%] rounded-sm' />
       </div>
     </div>
   )
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx
index 07254879b4f..e57b3c8f0f2 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx
@@ -142,7 +142,7 @@ const LAYOUT_STYLES = {
     rowGap: 'pb-6',
     userRow: 'flex flex-col items-end gap-[6px] pt-3',
     attachmentWidth: 'max-w-[70%]',
-    userBubble: 'max-w-[70%] overflow-hidden rounded-[16px] bg-[var(--surface-5)] px-3.5 py-2',
+    userBubble: 'max-w-[70%] overflow-hidden rounded-2xl bg-[var(--surface-5)] px-3.5 py-2',
     assistantRow: 'group/msg',
     footer: 'shrink-0 px-[24px] pb-[16px]',
     footerInner: 'mx-auto max-w-chat',
@@ -154,7 +154,7 @@ const LAYOUT_STYLES = {
     rowGap: 'pb-4',
     userRow: 'flex flex-col items-end gap-[6px] pt-2',
     attachmentWidth: 'max-w-[85%]',
-    userBubble: 'max-w-[85%] overflow-hidden rounded-[16px] bg-[var(--surface-5)] px-3 py-2',
+    userBubble: 'max-w-[85%] overflow-hidden rounded-2xl bg-[var(--surface-5)] px-3 py-2',
     assistantRow: 'group/msg',
     footer: 'shrink-0 px-3 pb-3',
     footerInner: '',
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-page-issue.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-page-issue.tsx
index 199aa2b8be9..6c8299d27a0 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-page-issue.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-page-issue.tsx
@@ -148,7 +148,7 @@ export function BrowserPageIssueView({ issue, onReload, focusRecovery }: Browser
         <h2
           ref={headingRef}
           id='browser-page-issue-heading'
-          className='rounded-[4px] font-medium text-[var(--text-primary)] text-base outline-hidden focus-visible:outline focus-visible:outline-2 focus-visible:outline-[var(--border-1)]'
+          className='rounded-sm font-medium text-[var(--text-primary)] text-base outline-hidden focus-visible:outline focus-visible:outline-2 focus-visible:outline-[var(--border-1)]'
           tabIndex={-1}
         >
           {copy.headline}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-session.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-session.tsx
index f3aa734a126..da9baa8aa3d 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-session.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-session.tsx
@@ -117,7 +117,7 @@ function BrowserSuggestionIcon({ suggestion }: { suggestion: UrlSuggestion }) {
     <img
       src={source}
       alt=''
-      className='size-4 shrink-0 rounded-[3px]'
+      className='size-4 shrink-0 rounded-sm'
       onError={() => setFailed(true)}
     />
   )
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/resource-content.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/resource-content.tsx
index 5b6560b4eae..ed7e839a13d 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/resource-content.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/resource-content.tsx
@@ -804,7 +804,7 @@ function EmbeddedFolder({ workspaceId, folderId }: EmbeddedFolderProps) {
               key={w.id}
               type='button'
               onClick={() => openInternalLink(`/workspace/${workspaceId}/w/${w.id}`)}
-              className='flex items-center gap-2 rounded-[6px] px-3 py-2 text-left transition-colors hover:bg-[var(--surface-4)]'
+              className='flex items-center gap-2 rounded-md px-3 py-2 text-left transition-colors hover:bg-[var(--surface-4)]'
             >
               <WorkflowIcon className='size-[14px] shrink-0 text-[var(--text-icon)]' />
               <OverflowText label={w.name} className='text-[var(--text-primary)] text-small' />
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/browser-tab-icon.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/browser-tab-icon.tsx
index cb0d6042c20..432ea7f74e9 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/browser-tab-icon.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/browser-tab-icon.tsx
@@ -64,7 +64,7 @@ export function BrowserTabIcon({ tabId, scopeId, className }: BrowserTabIconProp
               src={faviconUrl(hostname, 32)}
               alt=''
               className={cn(
-                'size-[16px] rounded-[3px]',
+                'size-[16px] rounded-sm',
                 !faviconLoaded && 'pointer-events-none absolute opacity-0'
               )}
               onLoad={() => setFavicon({ hostname, status: 'loaded' })}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/queued-messages/queued-messages.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/queued-messages/queued-messages.tsx
index 466afe3e7de..57a8c63949b 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/queued-messages/queued-messages.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/queued-messages/queued-messages.tsx
@@ -49,7 +49,7 @@ export function QueuedMessages({
   return (
     <div
       ref={containerRef}
-      className='-mb-3 mx-3.5 overflow-hidden rounded-t-[16px] border border-[var(--border-1)] border-b-0 bg-[var(--surface-3)] pb-3'
+      className='-mb-3 mx-3.5 overflow-hidden rounded-t-2xl border border-[var(--border-1)] border-b-0 bg-[var(--surface-3)] pb-3'
     >
       <button
         type='button'
@@ -97,7 +97,7 @@ export function QueuedMessages({
                 </div>
 
                 {msg.fileAttachments && msg.fileAttachments.length > 0 && (
-                  <span className='inline-flex min-w-0 max-w-[40%] shrink items-center gap-1 rounded-[5px] bg-[var(--surface-5)] px-[5px] py-0.5 text-[var(--text-primary)] text-small'>
+                  <span className='inline-flex min-w-0 max-w-[40%] shrink items-center gap-1 rounded-sm bg-[var(--surface-5)] px-[5px] py-0.5 text-[var(--text-primary)] text-small'>
                     <Paperclip className='size-[12px] shrink-0 text-[var(--text-icon)]' />
                     {isNarrow ? (
                       <span className='shrink-0 text-[var(--text-secondary)]'>
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-message-content/user-message-content.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/user-message-content/user-message-content.tsx
index d807f00a5be..d10445eed98 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-message-content/user-message-content.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-message-content/user-message-content.tsx
@@ -105,7 +105,7 @@ function computeIntegrationRanges(text: string, taken: MentionRange[]): MentionR
 
 function MentionHighlight({ context }: { context: ChatMessageContext }) {
   return (
-    <span className='inline-flex items-baseline gap-1 rounded-[5px] bg-[var(--surface-5)] px-[5px]'>
+    <span className='inline-flex items-baseline gap-1 rounded-sm bg-[var(--surface-5)] px-[5px]'>
       <ContextMentionIcon
         context={context}
         className='relative top-0.5 size-[12px] shrink-0 text-[var(--text-icon)]'
diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/[documentId]/components/document-tags-modal/document-tags-modal.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/[documentId]/components/document-tags-modal/document-tags-modal.tsx
index 3f8f9bec003..06912e37498 100644
--- a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/[documentId]/components/document-tags-modal/document-tags-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/[documentId]/components/document-tags-modal/document-tags-modal.tsx
@@ -15,7 +15,6 @@ import {
   handleKeyboardActivation,
   Label,
 } from '@sim/emcn'
-import { Trash } from '@sim/emcn/icons'
 import { createLogger } from '@sim/logger'
 import { formatDate } from '@sim/utils/formatting'
 import {
@@ -27,6 +26,7 @@ import {
 } from '@/lib/knowledge/constants'
 import type { DocumentTag } from '@/lib/knowledge/tags/types'
 import type { DocumentData } from '@/lib/knowledge/types'
+import { KnowledgeTagRow } from '@/app/workspace/[workspaceId]/knowledge/components/knowledge-tag-row'
 import {
   type TagDefinition,
   useKnowledgeBaseTagDefinitions,
@@ -385,40 +385,24 @@ export function DocumentTagsModal({
           <div className='space-y-2'>
             {documentTags.map((tag, index) => (
               <div key={tag.displayName} className='space-y-2'>
-                <div
+                <KnowledgeTagRow
                   role='button'
                   tabIndex={0}
-                  className='flex cursor-pointer items-center gap-2 rounded-sm border p-2 hover-hover:bg-[var(--surface-2)]'
                   onClick={() => startEditingTag(index)}
                   onKeyDown={(event) => {
                     if (event.target !== event.currentTarget) return
                     handleKeyboardActivation(event, () => startEditingTag(index))
                   }}
-                >
-                  <span className='min-w-0 truncate text-[var(--text-primary)] text-caption'>
-                    {tag.displayName}
-                  </span>
-                  <span className='rounded-[3px] bg-[var(--surface-3)] px-1.5 py-0.5 text-[var(--text-muted)] text-micro'>
-                    {FIELD_TYPE_LABELS[tag.fieldType] || tag.fieldType}
-                  </span>
-                  <div className='mb-[-1.5px] h-[14px] w-[1.25px] shrink-0 rounded-full bg-[var(--border-1)]' />
-                  <span className='min-w-0 flex-1 truncate text-[var(--text-muted)] text-caption'>
-                    {formatValueForDisplay(tag.value, tag.fieldType)}
-                  </span>
-                  <div className='flex shrink-0 items-center gap-1'>
-                    <Button
-                      aria-label='Remove tag'
-                      variant='ghost'
-                      onClick={(e) => {
-                        e.stopPropagation()
-                        handleRemoveTag(index)
-                      }}
-                      className='size-4 p-0 text-[var(--text-muted)] hover-hover:text-[var(--text-error)]'
-                    >
-                      <Trash className='size-3' />
-                    </Button>
-                  </div>
-                </div>
+                  name={tag.displayName}
+                  typeLabel={FIELD_TYPE_LABELS[tag.fieldType] || tag.fieldType}
+                  detail={formatValueForDisplay(tag.value, tag.fieldType)}
+                  truncateDetail
+                  removeLabel='Remove tag'
+                  onRemove={(e) => {
+                    e.stopPropagation()
+                    handleRemoveTag(index)
+                  }}
+                />
 
                 {editingTagIndex === index && (
                   <div className='space-y-2 rounded-md border p-3'>
diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/base-tags-modal/base-tags-modal.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/base-tags-modal/base-tags-modal.tsx
index 46163ac91ea..8278f269f57 100644
--- a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/base-tags-modal/base-tags-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/base-tags-modal/base-tags-modal.tsx
@@ -14,7 +14,6 @@ import {
   type ComboboxOption,
   handleKeyboardActivation,
 } from '@sim/emcn'
-import { Trash } from '@sim/emcn/icons'
 import { createLogger } from '@sim/logger'
 import { getDocumentIcon } from '@/components/icons/document-icons'
 import type { TagUsageData } from '@/lib/api/contracts/knowledge'
@@ -24,6 +23,7 @@ import {
   SUPPORTED_FIELD_TYPES,
   TAG_SLOT_CONFIG,
 } from '@/lib/knowledge/constants'
+import { KnowledgeTagRow } from '@/app/workspace/[workspaceId]/knowledge/components/knowledge-tag-row'
 import {
   type TagDefinition,
   useKnowledgeBaseTagDefinitions,
@@ -270,41 +270,28 @@ export function BaseTagsModal({ open, onOpenChange, knowledgeBaseId }: BaseTagsM
               {kbTagDefinitions.map((tag) => {
                 const usage = getTagUsage(tag.tagSlot)
                 return (
-                  <div
+                  <KnowledgeTagRow
                     key={tag.id}
                     role='button'
                     tabIndex={0}
-                    className='flex cursor-pointer items-center gap-2 rounded-sm border p-2 hover-hover:bg-[var(--surface-2)]'
                     onClick={() => handleViewDocuments(tag)}
                     onKeyDown={(event) => {
                       if (event.target !== event.currentTarget) return
                       handleKeyboardActivation(event, () => handleViewDocuments(tag))
                     }}
-                  >
-                    <span className='min-w-0 truncate text-[var(--text-primary)] text-caption'>
-                      {tag.displayName}
-                    </span>
-                    <span className='rounded-[3px] bg-[var(--surface-3)] px-1.5 py-0.5 text-[var(--text-muted)] text-micro'>
-                      {FIELD_TYPE_LABELS[tag.fieldType] || tag.fieldType}
-                    </span>
-                    <div className='mb-[-1.5px] h-[14px] w-[1.25px] shrink-0 rounded-full bg-[var(--border-1)]' />
-                    <span className='min-w-0 flex-1 text-[var(--text-muted)] text-caption'>
-                      {usage.documentCount} document{usage.documentCount !== 1 ? 's' : ''}
-                    </span>
-                    <div className='flex shrink-0 items-center gap-1'>
-                      <Button
-                        aria-label='Delete Tag'
-                        variant='ghost'
-                        onClick={(e) => {
-                          e.stopPropagation()
-                          handleDeleteTagClick(tag)
-                        }}
-                        className='size-4 p-0 text-[var(--text-muted)] hover-hover:text-[var(--text-error)]'
-                      >
-                        <Trash className='size-3' />
-                      </Button>
-                    </div>
-                  </div>
+                    name={tag.displayName}
+                    typeLabel={FIELD_TYPE_LABELS[tag.fieldType] || tag.fieldType}
+                    detail={
+                      <>
+                        {usage.documentCount} document{usage.documentCount !== 1 ? 's' : ''}
+                      </>
+                    }
+                    removeLabel='Delete Tag'
+                    onRemove={(e) => {
+                      e.stopPropagation()
+                      handleDeleteTagClick(tag)
+                    }}
+                  />
                 )
               })}
 
diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/components/knowledge-tag-row.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/components/knowledge-tag-row.tsx
new file mode 100644
index 00000000000..69539708cc0
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/knowledge/components/knowledge-tag-row.tsx
@@ -0,0 +1,55 @@
+import type { HTMLAttributes, MouseEventHandler, ReactNode } from 'react'
+import { Button, cn } from '@sim/emcn'
+import { Trash } from '@sim/emcn/icons'
+
+interface KnowledgeTagRowProps
+  extends Omit<HTMLAttributes<HTMLDivElement>, 'children' | 'className'> {
+  name: string
+  typeLabel: string
+  detail: ReactNode
+  truncateDetail?: boolean
+  removeLabel: string
+  onRemove: MouseEventHandler<HTMLButtonElement>
+}
+
+/** Shared tag summary; callers retain activation, keyboard and removal behavior. */
+export function KnowledgeTagRow({
+  name,
+  typeLabel,
+  detail,
+  truncateDetail = false,
+  removeLabel,
+  onRemove,
+  ...props
+}: KnowledgeTagRowProps) {
+  return (
+    <div
+      {...props}
+      className='flex cursor-pointer items-center gap-2 rounded-sm border p-2 hover-hover:bg-[var(--surface-2)]'
+    >
+      <span className='min-w-0 truncate text-[var(--text-primary)] text-caption'>{name}</span>
+      <span className='rounded-sm bg-[var(--surface-3)] px-1.5 py-0.5 text-[var(--text-muted)] text-micro'>
+        {typeLabel}
+      </span>
+      <div className='mb-[-1.5px] h-[14px] w-[1.25px] shrink-0 rounded-full bg-[var(--border-1)]' />
+      <span
+        className={cn(
+          'min-w-0 flex-1 text-[var(--text-muted)] text-caption',
+          truncateDetail && 'truncate'
+        )}
+      >
+        {detail}
+      </span>
+      <div className='flex shrink-0 items-center gap-1'>
+        <Button
+          aria-label={removeLabel}
+          variant='ghost-destructive-muted'
+          onClick={onRemove}
+          size='icon'
+        >
+          <Trash className='size-3' />
+        </Button>
+      </div>
+    </div>
+  )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/components/status-bar/status-bar.tsx b/apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/components/status-bar/status-bar.tsx
index b4010129495..14f5f928171 100644
--- a/apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/components/status-bar/status-bar.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/components/status-bar/status-bar.tsx
@@ -85,7 +85,7 @@ function StatusBarInner({
               role='button'
               tabIndex={0}
               aria-pressed={isSelected}
-              className={`h-6 flex-1 rounded-[3px] ${color} ${hoverBrightness} cursor-pointer transition-all ${
+              className={`h-6 flex-1 rounded-sm ${color} ${hoverBrightness} cursor-pointer transition-all ${
                 isSelected
                   ? 'relative z-10 scale-105 shadow-xs ring-1 ring-[var(--text-secondary)]'
                   : 'relative z-0'
diff --git a/apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/components/workflows-list/workflows-list.tsx b/apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/components/workflows-list/workflows-list.tsx
index 36c542bc386..8ada4a5fad7 100644
--- a/apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/components/workflows-list/workflows-list.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/components/workflows-list/workflows-list.tsx
@@ -28,7 +28,7 @@ function WorkflowsListInner({
   return (
     <div className='flex h-full flex-col overflow-hidden rounded-md bg-[var(--surface-2)] dark:bg-[var(--surface-1)]'>
       {/* Table header */}
-      <div className='shrink-0 rounded-t-[6px] bg-[var(--surface-3)] px-6 py-2.5 dark:bg-[var(--surface-3)]'>
+      <div className='shrink-0 rounded-t-md bg-[var(--surface-3)] px-6 py-2.5 dark:bg-[var(--surface-3)]'>
         <div className='flex items-center gap-4'>
           <span className='w-[160px] shrink-0 text-[var(--text-tertiary)] text-caption'>
             Workflow
diff --git a/apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/dashboard.tsx b/apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/dashboard.tsx
index 9a009452d21..f816e380cfc 100644
--- a/apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/dashboard.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/dashboard.tsx
@@ -408,7 +408,7 @@ function DashboardInner({ stats, isLoading, error, searchQuery }: DashboardProps
                 </span>
               )}
             </div>
-            <div className='flex-1 overflow-y-auto rounded-t-[6px] bg-[var(--surface-2)] px-3.5 py-2.5 dark:bg-[var(--surface-1)]'>
+            <div className='flex-1 overflow-y-auto rounded-t-md bg-[var(--surface-2)] px-3.5 py-2.5 dark:bg-[var(--surface-1)]'>
               {globalDetails ? (
                 <LineChart
                   data={globalDetails.executionCounts}
@@ -433,7 +433,7 @@ function DashboardInner({ stats, isLoading, error, searchQuery }: DashboardProps
                 </span>
               )}
             </div>
-            <div className='flex-1 overflow-y-auto rounded-t-[6px] bg-[var(--surface-2)] px-3.5 py-2.5 dark:bg-[var(--surface-1)]'>
+            <div className='flex-1 overflow-y-auto rounded-t-md bg-[var(--surface-2)] px-3.5 py-2.5 dark:bg-[var(--surface-1)]'>
               {globalDetails ? (
                 <LineChart
                   data={globalDetails.failureCounts}
@@ -458,7 +458,7 @@ function DashboardInner({ stats, isLoading, error, searchQuery }: DashboardProps
                 </span>
               )}
             </div>
-            <div className='flex-1 overflow-y-auto rounded-t-[6px] bg-[var(--surface-2)] px-3.5 py-2.5 dark:bg-[var(--surface-1)]'>
+            <div className='flex-1 overflow-y-auto rounded-t-md bg-[var(--surface-2)] px-3.5 py-2.5 dark:bg-[var(--surface-1)]'>
               {globalDetails ? (
                 <LineChart
                   data={globalDetails.latencies}
diff --git a/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/log-details.tsx b/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/log-details.tsx
index b3a28c53f71..d949dc48c76 100644
--- a/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/log-details.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/log-details.tsx
@@ -517,7 +517,7 @@ export function LogDetailsContent({ log, onActiveTabChange }: LogDetailsContentP
                       target='_blank'
                       rel='noopener noreferrer'
                       prefetch={false}
-                      className='-mx-1.5 -my-0.5 group flex w-fit min-w-0 max-w-[calc(100%+0.75rem)] items-center gap-1.5 rounded-[5px] px-1.5 py-0.5 transition-colors hover-hover:bg-[var(--surface-active)] focus-visible:bg-[var(--surface-active)] focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-[color-mix(in_srgb,var(--text-muted)_30%,transparent)]'
+                      className='-mx-1.5 -my-0.5 group flex w-fit min-w-0 max-w-[calc(100%+0.75rem)] items-center gap-1.5 rounded-sm px-1.5 py-0.5 transition-colors hover-hover:bg-[var(--surface-active)] focus-visible:bg-[var(--surface-active)] focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-[color-mix(in_srgb,var(--text-muted)_30%,transparent)]'
                     >
                       <span className='inline-grid size-[14px] shrink-0 place-items-center'>
                         <Workflow className='col-start-1 row-start-1 size-[14px] text-[var(--text-icon)] opacity-100 blur-none transition-[opacity,filter,transform] duration-200 ease-in-out group-hover:scale-[0.25] group-hover:opacity-0 group-hover:blur-[2px] group-focus-visible:scale-[0.25] group-focus-visible:opacity-0 group-focus-visible:blur-[2px] motion-reduce:transition-none' />
diff --git a/apps/sim/app/workspace/[workspaceId]/logs/logs.tsx b/apps/sim/app/workspace/[workspaceId]/logs/logs.tsx
index a1dd5a25dfe..8e46423c8f0 100644
--- a/apps/sim/app/workspace/[workspaceId]/logs/logs.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/logs/logs.tsx
@@ -195,7 +195,7 @@ function getColorIcon(color: string): React.ComponentType<{ className?: string }
 
   const ColorIcon = ({ className }: { className?: string }) => (
     <div
-      className={cn(className, 'shrink-0 rounded-[3px]')}
+      className={cn(className, 'shrink-0 rounded-sm')}
       style={{
         backgroundColor: color,
         width: 10,
@@ -1469,7 +1469,7 @@ function LogsFilterPanel({ searchQuery, onSearchQueryChange }: LogsFilterPanelPr
             <span className='flex w-full min-w-0 items-center gap-1.5 text-[var(--text-primary)]'>
               {selectedStatusColor && (
                 <div
-                  className='shrink-0 rounded-[3px]'
+                  className='shrink-0 rounded-sm'
                   style={{ backgroundColor: selectedStatusColor, width: 8, height: 8 }}
                 />
               )}
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/sandboxes/components/sandbox-editor.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/sandboxes/components/sandbox-editor.tsx
index 595ca1e45c7..0ae26090ab8 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/sandboxes/components/sandbox-editor.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/sandboxes/components/sandbox-editor.tsx
@@ -242,7 +242,7 @@ export function SandboxStatus({
                 {showLog ? 'Hide log' : 'Show log'}
               </Chip>
               {showLog && (
-                <pre className='max-h-64 overflow-auto whitespace-pre-wrap rounded-[8px] bg-[var(--surface-3)] p-3 text-[var(--text-muted)] text-caption'>
+                <pre className='max-h-64 overflow-auto whitespace-pre-wrap rounded-lg bg-[var(--surface-3)] p-3 text-[var(--text-muted)] text-caption'>
                   {sandbox.errorDetail}
                 </pre>
               )}
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/team-management/components/no-organization-view/no-organization-view.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/team-management/components/no-organization-view/no-organization-view.tsx
index 82c1009e63d..02f9d04c382 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/team-management/components/no-organization-view/no-organization-view.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/team-management/components/no-organization-view/no-organization-view.tsx
@@ -84,7 +84,7 @@ export function NoOrganizationView({
             <div>
               <Label htmlFor='orgSlug'>Team URL</Label>
               <div className='mt-1 flex items-center'>
-                <div className='rounded-l-[6px] border border-[var(--border-1)] border-r-0 bg-[var(--surface-4)] px-3 py-1.5 text-[var(--text-muted)] text-small'>
+                <div className='rounded-l-md border border-[var(--border-1)] border-r-0 bg-[var(--surface-4)] px-3 py-1.5 text-[var(--text-muted)] text-small'>
                   sim.ai/team/
                 </div>
                 <ChipInput
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/cells/cell-render.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/cells/cell-render.tsx
index 6e9045f2bd4..bb468ac963d 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/cells/cell-render.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/cells/cell-render.tsx
@@ -412,7 +412,7 @@ export function CellRender({ kind, isEditing }: CellRenderProps): React.ReactEle
             alt=''
             width={12}
             height={12}
-            className='shrink-0 rounded-[2px]'
+            className='shrink-0 rounded-xs'
             onError={(e) => {
               e.currentTarget.style.display = 'none'
             }}
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/column-header-menu.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/column-header-menu.tsx
index 6ba6ebfa820..19ab7b1c0c3 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/column-header-menu.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/column-header-menu.tsx
@@ -178,7 +178,7 @@ export const ColumnHeaderMenu = React.memo(function ColumnHeaderMenu({
       ghost.textContent = ghostLabel
       ghost.className = 'text-small'
       ghost.style.cssText =
-        'position:absolute;top:-9999px;padding:4px 8px;background:var(--bg);border:1px solid var(--border);border-radius:4px;white-space:nowrap;color:var(--text-primary)'
+        'position:absolute;top:-9999px;padding:4px 8px;background:var(--bg);border:1px solid var(--border);border-radius:var(--radius-sm);white-space:nowrap;color:var(--text-primary)'
       document.body.appendChild(ghost)
       e.dataTransfer.setDragImage(ghost, ghost.offsetWidth / 2, ghost.offsetHeight / 2)
       requestAnimationFrame(() => ghost.parentNode?.removeChild(ghost))
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/workflow-group-meta-cell.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/workflow-group-meta-cell.tsx
index 69c159e585b..0c760235c2b 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/workflow-group-meta-cell.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/headers/workflow-group-meta-cell.tsx
@@ -475,7 +475,7 @@ export function WorkflowGroupMetaCell({
     ghost.textContent = name
     ghost.className = 'text-xs'
     ghost.style.cssText =
-      'position:absolute;top:-9999px;padding:4px 8px;background:var(--bg);border:1px solid var(--border);border-radius:4px;white-space:nowrap;color:var(--text-primary)'
+      'position:absolute;top:-9999px;padding:4px 8px;background:var(--bg);border:1px solid var(--border);border-radius:var(--radius-sm);white-space:nowrap;color:var(--text-primary)'
     document.body.appendChild(ghost)
     e.dataTransfer.setDragImage(ghost, ghost.offsetWidth / 2, ghost.offsetHeight / 2)
     requestAnimationFrame(() => ghost.parentNode?.removeChild(ghost))
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/components/chat-message/chat-message.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/components/chat-message/chat-message.tsx
index f0389e64ad4..65069778cbd 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/components/chat-message/chat-message.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/components/chat-message/chat-message.tsx
@@ -79,7 +79,7 @@ export function ChatMessage({ message }: ChatMessageProps) {
         )}
 
         {formattedContent && !formattedContent.startsWith('Uploaded') && (
-          <div className='rounded-[4px] border border-[var(--border-1)] bg-[var(--surface-5)] px-[8px] py-[6px] transition-all duration-200'>
+          <div className='rounded-sm border border-[var(--border-1)] bg-[var(--surface-5)] px-[8px] py-[6px] transition-all duration-200'>
             <div className='whitespace-pre-wrap break-words font-sans text-[var(--text-primary)] text-sm leading-[1.25rem]'>
               <WordWrap text={formattedContent} />
             </div>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/diff-controls/diff-controls.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/diff-controls/diff-controls.tsx
index adc95e4e4ef..7b80ab05388 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/diff-controls/diff-controls.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/diff-controls/diff-controls.tsx
@@ -95,7 +95,7 @@ export const DiffControls = memo(function DiffControls() {
           }}
         >
           Accept
-          <kbd className='ml-2 rounded border border-white/20 bg-white/10 px-1.5 py-0.5 font-medium font-sans text-micro'>
+          <kbd className='ml-2 rounded-sm border border-white/20 bg-white/10 px-1.5 py-0.5 font-medium font-sans text-micro'>
             ⇧⌘<span className='translate-y-[-1px]'>⏎</span>
           </kbd>
         </button>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/condition-input/condition-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/condition-input/condition-input.tsx
index 5169f4697fd..67aeef659ff 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/condition-input/condition-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/condition-input/condition-input.tsx
@@ -946,10 +946,10 @@ export function ConditionInput({
               className={cn(
                 'flex items-center justify-between overflow-hidden bg-transparent px-2.5 py-[5px]',
                 isRouterMode
-                  ? 'rounded-t-[4px] border-[var(--border-1)] border-b'
+                  ? 'rounded-t-sm border-[var(--border-1)] border-b'
                   : isElseConditionTitle(block.title)
                     ? 'rounded-sm border-0'
-                    : 'rounded-t-[4px] border-[var(--border-1)] border-b'
+                    : 'rounded-t-sm border-[var(--border-1)] border-b'
               )}
             >
               <span className='text-[var(--text-tertiary)] text-sm'>
@@ -1020,12 +1020,12 @@ export function ConditionInput({
                 <Tooltip.Root>
                   <Tooltip.Trigger asChild>
                     <Button
-                      variant='ghost'
+                      variant='ghost-destructive'
                       onClick={() => removeBlock(block.id)}
                       disabled={
                         isPreview || disabled || conditionalBlocks.length <= (isRouterMode ? 1 : 2)
                       }
-                      className='h-auto p-0 text-[var(--text-error)] hover-hover:text-[var(--text-error)]'
+                      className='h-auto p-0'
                     >
                       <Trash className='size-[14px]' />
                       <span className='sr-only'>Delete Block</span>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx
index bf2b4bdb42d..b5abcaf47a4 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx
@@ -274,10 +274,10 @@ export function DocumentTagEntry({
           <span className='sr-only'>Add Tag</span>
         </Button>
         <Button
-          variant='ghost'
+          variant='ghost-destructive'
           onClick={() => removeTag(tag.id)}
           disabled={isReadOnly}
-          className='h-auto p-0 text-[var(--text-error)] hover-hover:text-[var(--text-error)]'
+          className='h-auto p-0'
         >
           <Trash className='size-[14px]' />
           <span className='sr-only'>Delete Tag</span>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/eval-input/eval-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/eval-input/eval-input.tsx
index 6c659aff3dc..703028a1b40 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/eval-input/eval-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/eval-input/eval-input.tsx
@@ -138,7 +138,7 @@ export function EvalInput({
   }
 
   const renderMetricHeader = (metric: EvalMetric, index: number) => (
-    <div className='flex items-center justify-between overflow-hidden rounded-t-[4px] border-[var(--border-1)] border-b bg-[var(--surface-4)] px-2.5 py-[5px]'>
+    <div className='flex items-center justify-between overflow-hidden rounded-t-sm border-[var(--border-1)] border-b bg-[var(--surface-4)] px-2.5 py-[5px]'>
       <span className='text-[var(--text-tertiary)] text-sm'>Metric {index + 1}</span>
       <div className='flex items-center gap-2'>
         <Tooltip.Root key={`add-${metric.id}`}>
@@ -159,10 +159,10 @@ export function EvalInput({
         <Tooltip.Root key={`remove-${metric.id}`}>
           <Tooltip.Trigger asChild>
             <Button
-              variant='ghost'
+              variant='ghost-destructive'
               onClick={() => removeMetric(metric.id)}
               disabled={isPreview || disabled || metrics.length === 1}
-              className='h-auto p-0 text-[var(--text-error)] hover-hover:text-[var(--text-error)]'
+              className='h-auto p-0'
             >
               <Trash className='size-[14px]' />
               <span className='sr-only'>Delete Metric</span>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/components/filter-rule-row.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/components/filter-rule-row.tsx
index 7a4545c0426..d41572a72d6 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/components/filter-rule-row.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/components/filter-rule-row.tsx
@@ -142,10 +142,10 @@ export function FilterRuleRow({
           <span className='sr-only'>Add Condition</span>
         </Button>
         <Button
-          variant='ghost'
+          variant='ghost-destructive'
           onClick={() => onRemove(rule.id)}
           disabled={isReadOnly}
-          className='h-auto p-0 text-[var(--text-error)] hover-hover:text-[var(--text-error)]'
+          className='h-auto p-0'
         >
           <Trash className='size-[14px]' />
           <span className='sr-only'>Delete Condition</span>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx
index 9ddea5c5fce..b5ca52dd694 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx
@@ -266,13 +266,13 @@ export function KnowledgeTagFilters({
           <span className='sr-only'>Add Filter</span>
         </Button>
         <Button
-          variant='ghost'
+          variant='ghost-destructive'
           onClick={(e) => {
             e.stopPropagation()
             removeFilter(filter.id)
           }}
           disabled={isReadOnly}
-          className='h-auto p-0 text-[var(--text-error)] hover-hover:text-[var(--text-error)]'
+          className='h-auto p-0'
         >
           <Trash className='size-[14px]' />
           <span className='sr-only'>Delete Filter</span>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/messages-input/messages-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/messages-input/messages-input.tsx
index 3dcdd9347b8..501f6aab1ec 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/messages-input/messages-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/messages-input/messages-input.tsx
@@ -614,7 +614,7 @@ export function MessagesInput({
                         type='button'
                         disabled={isPreview || disabled}
                         className={cn(
-                          'group -ml-1.5 -my-1 flex items-center gap-1 rounded px-1.5 py-1 text-[var(--text-primary)] text-small leading-none transition-colors hover-hover:bg-[var(--surface-5)] hover-hover:text-[var(--text-secondary)]',
+                          'group -ml-1.5 -my-1 flex items-center gap-1 rounded-sm px-1.5 py-1 text-[var(--text-primary)] text-small leading-none transition-colors hover-hover:bg-[var(--surface-5)] hover-hover:text-[var(--text-secondary)]',
                           (isPreview || disabled) &&
                             'cursor-default hover-hover:bg-transparent hover-hover:text-[var(--text-primary)]'
                         )}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/model-fallback-list/model-fallback-list.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/model-fallback-list/model-fallback-list.tsx
index de1caa66d55..3c527c360e9 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/model-fallback-list/model-fallback-list.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/model-fallback-list/model-fallback-list.tsx
@@ -124,7 +124,7 @@ const FallbackRow = memo(function FallbackRow({
 
   return (
     <div data-fallback-row-id={row.id} className='min-w-0 rounded-sm border border-[var(--border)]'>
-      <div className='flex items-center justify-between gap-2 rounded-t-[4px] bg-[var(--surface-4)] px-2 py-1'>
+      <div className='flex items-center justify-between gap-2 rounded-t-sm bg-[var(--surface-4)] px-2 py-1'>
         <span className='text-[var(--text-secondary)] text-small'>{ordinalChoiceLabel(index)}</span>
         <div className='flex shrink-0 items-center gap-1'>
           {canMove && (
@@ -179,7 +179,7 @@ const FallbackRow = memo(function FallbackRow({
         </div>
       </div>
 
-      <div className='flex flex-col gap-2.5 rounded-b-[4px] border-[var(--border)] border-t bg-[var(--surface-2)] p-2'>
+      <div className='flex flex-col gap-2.5 rounded-b-sm border-[var(--border)] border-t bg-[var(--surface-2)] p-2'>
         <Combobox
           options={modelOptions}
           value={row.model}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-input/selector-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-input/selector-input.tsx
index 6f1ea112c87..f9bc9bf8ede 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-input/selector-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-input/selector-input.tsx
@@ -77,7 +77,7 @@ export function SelectorInput({
     return (
       <Tooltip.Root>
         <Tooltip.Trigger asChild>
-          <div className='w-full rounded border p-4 text-center text-muted-foreground text-sm'>
+          <div className='w-full rounded-sm border p-4 text-center text-muted-foreground text-sm'>
             Selector not supported for service: {serviceId}
           </div>
         </Tooltip.Trigger>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/skill-input/skill-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/skill-input/skill-input.tsx
index dea669b0d4e..1becdfeeafd 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/skill-input/skill-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/skill-input/skill-input.tsx
@@ -161,7 +161,7 @@ export function SkillInput({
                 className='group relative flex flex-col overflow-hidden rounded-sm border border-[var(--border-1)] transition-all duration-200 ease-in-out'
               >
                 <div
-                  className='flex cursor-pointer items-center justify-between gap-2 rounded-t-[4px] bg-[var(--surface-4)] px-2 py-[6.5px]'
+                  className='flex cursor-pointer items-center justify-between gap-2 rounded-t-sm bg-[var(--surface-4)] px-2 py-[6.5px]'
                   onClick={() => {
                     if (fullSkill && !disabled && !isPreview) {
                       setEditingSkillId(fullSkill.id)
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/components/sort-rule-row.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/components/sort-rule-row.tsx
index 9c13ee26ecd..329adbef3c6 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/components/sort-rule-row.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/components/sort-rule-row.tsx
@@ -101,10 +101,10 @@ export function SortRuleRow({
           <span className='sr-only'>Add Sort</span>
         </Button>
         <Button
-          variant='ghost'
+          variant='ghost-destructive'
           onClick={() => onRemove(rule.id)}
           disabled={isReadOnly}
-          className='h-auto p-0 text-[var(--text-error)] hover-hover:text-[var(--text-error)]'
+          className='h-auto p-0'
         >
           <Trash className='size-[14px]' />
           <span className='sr-only'>Delete Sort</span>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/starter/input-format.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/starter/input-format.tsx
index ab93a862a07..8502854b75d 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/starter/input-format.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/starter/input-format.tsx
@@ -422,10 +422,10 @@ export function FieldFormat({
           <span className='sr-only'>Add {title}</span>
         </Button>
         <Button
-          variant='ghost'
+          variant='ghost-destructive'
           onClick={() => removeField(field.id)}
           disabled={isReadOnly}
-          className='h-auto p-0 text-[var(--text-error)] hover-hover:text-[var(--text-error)] hover-hover:opacity-90'
+          className='h-auto p-0 hover-hover:opacity-90'
         >
           <Trash className='size-[14px]' />
           <span className='sr-only'>Delete Field</span>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/text/text.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/text/text.tsx
index f9327663ac3..8bebd8bed5b 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/text/text.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/text/text.tsx
@@ -33,7 +33,7 @@ export function Text({ blockId, subBlockId, content, className }: TextProps) {
         className={`rounded-md border bg-[var(--surface-2)] p-4 shadow-xs ${className || ''}`}
       >
         <div
-          className='max-w-none break-words text-[var(--text-secondary)] text-sm [&_a]:text-[var(--brand-secondary)] [&_a]:underline [&_a]:underline-offset-2 [&_a]:hover-hover:brightness-110 [&_code]:rounded [&_code]:bg-[var(--surface-5)] [&_code]:px-1 [&_code]:py-0.5 [&_code]:text-[var(--text-tertiary)] [&_code]:text-xs [&_strong]:font-medium [&_strong]:text-[var(--text-primary)] [&_ul]:ml-5 [&_ul]:list-disc [&_ul]:marker:text-[var(--text-muted)]'
+          className='max-w-none break-words text-[var(--text-secondary)] text-sm [&_a]:text-[var(--brand-secondary)] [&_a]:underline [&_a]:underline-offset-2 [&_a]:hover-hover:brightness-110 [&_code]:rounded-sm [&_code]:bg-[var(--surface-5)] [&_code]:px-1 [&_code]:py-0.5 [&_code]:text-[var(--text-tertiary)] [&_code]:text-xs [&_strong]:font-medium [&_strong]:text-[var(--text-primary)] [&_ul]:ml-5 [&_ul]:list-disc [&_ul]:marker:text-[var(--text-muted)]'
           dangerouslySetInnerHTML={{ __html: content }}
         />
       </div>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx
index 54b7d751123..1044d2392d5 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx
@@ -1635,7 +1635,7 @@ export const ToolInput = memo(function ToolInput({
             >
               <div
                 className={cn(
-                  'flex items-center justify-between gap-2 rounded-t-[4px] bg-[var(--surface-4)] px-2 py-[6.5px]',
+                  'flex items-center justify-between gap-2 rounded-t-sm bg-[var(--surface-4)] px-2 py-[6.5px]',
                   (isCustomTool || hasToolBody) && 'cursor-pointer',
                   showToolControl && isToolDisabled && 'opacity-50 grayscale'
                 )}
@@ -1813,7 +1813,7 @@ export const ToolInput = memo(function ToolInput({
               </div>
 
               {isExpandedForDisplay && (
-                <div className='flex flex-col gap-2.5 overflow-visible rounded-b-[4px] border-[var(--border-1)] border-t bg-[var(--surface-2)] p-2'>
+                <div className='flex flex-col gap-2.5 overflow-visible rounded-b-sm border-[var(--border-1)] border-t bg-[var(--surface-2)] p-2'>
                   {showToolControl && (
                     <>
                       <ToolUsageControl
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/variables-input/variables-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/variables-input/variables-input.tsx
index bb9352bef92..5ce53f38f50 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/variables-input/variables-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/variables-input/variables-input.tsx
@@ -428,13 +428,13 @@ export function VariablesInput({
                       <span className='sr-only'>Add Variable</span>
                     </Button>
                     <Button
-                      variant='ghost'
+                      variant='ghost-destructive'
                       onClick={(e) => {
                         e.stopPropagation()
                         removeAssignment(assignment.id)
                       }}
                       disabled={isReadOnly}
-                      className='h-auto p-0 text-[var(--text-error)] hover-hover:text-[var(--text-error)]'
+                      className='h-auto p-0'
                     >
                       <Trash className='size-[14px]' />
                       <span className='sr-only'>Delete Variable</span>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/components/drag-preview.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/components/drag-preview.ts
index 0c7d85480b1..43215c2a7d2 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/components/drag-preview.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/components/drag-preview.ts
@@ -19,7 +19,7 @@ export function createDragPreview(info: DragItemInfo): HTMLElement {
   preview.style.cssText = `
     width: 250px;
     background: var(--surface-1);
-    border-radius: 8px;
+    border-radius: var(--radius-lg);
     padding: 8px 9px;
     display: flex;
     align-items: center;
@@ -37,7 +37,7 @@ export function createDragPreview(info: DragItemInfo): HTMLElement {
     : document.createElement('div')
   iconContainer.style.width = '24px'
   iconContainer.style.height = '24px'
-  iconContainer.style.borderRadius = '6px'
+  iconContainer.style.borderRadius = 'var(--radius-md)'
   iconContainer.style.display = 'flex'
   iconContainer.style.alignItems = 'center'
   iconContainer.style.justifyContent = 'center'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/components/output-panel/output-panel.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/components/output-panel/output-panel.tsx
index 7eb787be542..6b2e755fe12 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/components/output-panel/output-panel.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/components/output-panel/output-panel.tsx
@@ -493,7 +493,7 @@ export const OutputPanel = React.memo(function OutputPanel({
         {/* Search Overlay */}
         {isOutputSearchActive && (
           <div
-            className='absolute top-[30px] right-[8px] z-30 flex h-[34px] items-center gap-1.5 rounded-b-[4px] border border-[var(--border)] border-t-0 bg-[var(--bg)] px-1.5 shadow-xs'
+            className='absolute top-[30px] right-[8px] z-30 flex h-[34px] items-center gap-1.5 rounded-b-sm border border-[var(--border)] border-t-0 bg-[var(--bg)] px-1.5 shadow-xs'
             onClick={(e) => e.stopPropagation()}
             data-toolbar-root
             data-search-active='true'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/variables/variables.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/variables/variables.tsx
index 0baf5e457a5..6b2ee09e620 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/variables/variables.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/variables/variables.tsx
@@ -128,12 +128,12 @@ function VariableHeader({
         )}
       </div>
       <Button
-        variant='ghost'
+        variant='ghost-destructive'
         onClick={(e) => {
           e.stopPropagation()
           onRemove()
         }}
-        className='h-auto p-0 text-[var(--text-error)] hover-hover:text-[var(--text-error)]'
+        className='h-auto p-0'
         disabled={readOnly}
         aria-label={`Delete ${variable.name || `variable ${index + 1}`}`}
       >
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor/preview-editor.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor/preview-editor.tsx
index c7c6880bf90..468f622020a 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor/preview-editor.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor/preview-editor.tsx
@@ -1064,7 +1064,7 @@ function PreviewEditorContent({
     return (
       <div className='relative flex h-full w-full flex-col overflow-hidden border-[var(--border)] border-l bg-[var(--surface-1)]'>
         {/* Header - styled like subflow header */}
-        <div className='mx-[-1px] flex shrink-0 items-center gap-2 rounded-b-[4px] border-[var(--border)] border-x border-b bg-[var(--surface-4)] px-3 py-1.5'>
+        <div className='mx-[-1px] flex shrink-0 items-center gap-2 rounded-b-sm border-[var(--border)] border-x border-b bg-[var(--surface-4)] px-3 py-1.5'>
           <BlockTile blockType={block.type} size='lg' />
           <OverflowText label={subflowName} className='flex-1 text-[var(--text-primary)] text-sm' />
           {onClose && (
@@ -1096,7 +1096,7 @@ function PreviewEditorContent({
   if (!blockConfig) {
     return (
       <div className='flex h-full w-full flex-col overflow-hidden border-[var(--border)] border-l bg-[var(--surface-1)]'>
-        <div className='mx-[-1px] flex items-center gap-2 rounded-b-[4px] border-[var(--border)] border-x border-b bg-[var(--surface-4)] px-3 py-1.5'>
+        <div className='mx-[-1px] flex items-center gap-2 rounded-b-sm border-[var(--border)] border-x border-b bg-[var(--surface-4)] px-3 py-1.5'>
           <div className='flex size-[18px] items-center justify-center rounded-sm bg-[var(--surface-3)]' />
           <span className='text-[var(--text-primary)] text-sm'>
             {block.name || 'Unknown Block'}
@@ -1154,7 +1154,7 @@ function PreviewEditorContent({
   return (
     <div className='relative flex h-full w-full flex-col overflow-hidden border-[var(--border)] border-l bg-[var(--surface-1)]'>
       {/* Header - styled like editor */}
-      <div className='mx-[-1px] flex shrink-0 items-center gap-2 rounded-b-[4px] border-[var(--border)] border-x border-b bg-[var(--surface-4)] px-3 py-1.5'>
+      <div className='mx-[-1px] flex shrink-0 items-center gap-2 rounded-b-sm border-[var(--border)] border-x border-b bg-[var(--surface-4)] px-3 py-1.5'>
         {block.type !== 'note' && <BlockTile blockType={block.type} size='lg' />}
         <OverflowText
           label={block.name || blockConfig.name}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/block/block.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/block/block.tsx
index 04dfea0021a..ad003bd759e 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/block/block.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/block/block.tsx
@@ -60,9 +60,8 @@ interface SubBlockValueEntry {
 const HANDLE_STYLES = {
   horizontal: 'border-none! bg-[var(--surface-7)]! h-5! w-[7px]! rounded-xs!',
   right:
-    'z-[10]! border-none! bg-[var(--workflow-edge)]! h-5! w-[7px]! rounded-r-[2px]! rounded-l-none!',
-  error:
-    'z-[10]! border-none! bg-[var(--text-error)]! h-[7px]! w-6! rounded-b-[2px]! rounded-t-none!',
+    'z-[10]! border-none! bg-[var(--workflow-edge)]! h-5! w-[7px]! rounded-r-xs! rounded-l-none!',
+  error: 'z-[10]! border-none! bg-[var(--text-error)]! h-[7px]! w-6! rounded-b-xs! rounded-t-none!',
 } as const
 
 /** Reusable style object for error handles positioned at bottom-right */
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-footer/sidebar-footer.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-footer/sidebar-footer.tsx
index 1da14a9bf22..8dbbd981ea7 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-footer/sidebar-footer.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-footer/sidebar-footer.tsx
@@ -292,7 +292,7 @@ export function SidebarFooter({
               onSelect={handleUpdateSelect}
               disabled={updateState.status === 'downloading'}
             >
-              <img src='/favicon/favicon-32x32.png' alt='' className='size-[14px] rounded-[3px]' />
+              <img src='/favicon/favicon-32x32.png' alt='' className='size-[14px] rounded-sm' />
               {desktopUpdateActionLabel(updateState)}
             </DropdownMenuItem>
             <DropdownMenuSeparator />
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/utils.ts b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/utils.ts
index 9f358b9a265..613f4cb8f4c 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/utils.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/utils.ts
@@ -51,7 +51,7 @@ export function createSidebarDragGhost(label: string, icon?: SidebarDragGhostIco
     padding: 4px 10px;
     background: var(--surface-active);
     border: 1px solid rgba(255,255,255,0.08);
-    border-radius: 8px;
+    border-radius: var(--radius-lg);
     font-family: system-ui, -apple-system, sans-serif;
     font-size: 13px;
     color: var(--text-body);
diff --git a/apps/sim/blocks/custom/custom-block-icon.tsx b/apps/sim/blocks/custom/custom-block-icon.tsx
index e767dbadf76..c482727e8f8 100644
--- a/apps/sim/blocks/custom/custom-block-icon.tsx
+++ b/apps/sim/blocks/custom/custom-block-icon.tsx
@@ -34,7 +34,7 @@ export function makeImageIcon(url: string): BlockIcon {
       src={url}
       alt=''
       style={style}
-      className={cn('size-full rounded-[4px] object-contain', className)}
+      className={cn('size-full rounded-sm object-contain', className)}
     />
   ))
   // double-cast-allowed: an <img> renderer must satisfy the SVG-typed BlockIcon slot
diff --git a/apps/sim/ee/credential-groups/components/slack-managed-users-modal.tsx b/apps/sim/ee/credential-groups/components/slack-managed-users-modal.tsx
index aee93dc4b36..99d65bf3993 100644
--- a/apps/sim/ee/credential-groups/components/slack-managed-users-modal.tsx
+++ b/apps/sim/ee/credential-groups/components/slack-managed-users-modal.tsx
@@ -436,7 +436,7 @@ export function SlackManagedUsersModal({
             )
           ) : isLoading ? (
             <div className='flex flex-col gap-[9px] px-2'>
-              <Skeleton className='h-4 w-24 rounded' />
+              <Skeleton className='h-4 w-24 rounded-sm' />
               <Skeleton className='h-[30px] w-full rounded-lg' />
             </div>
           ) : noBots ? (
diff --git a/packages/emcn/src/components/button/button.tsx b/packages/emcn/src/components/button/button.tsx
index db6d0c7fb9a..9665eba3a03 100644
--- a/packages/emcn/src/components/button/button.tsx
+++ b/packages/emcn/src/components/button/button.tsx
@@ -37,6 +37,16 @@ const buttonVariants = cva(
         destructive:
           'bg-[var(--text-error)] text-white hover-hover:text-white hover-hover:brightness-106',
         ghost: 'text-[var(--text-secondary)] hover-hover:text-[var(--text-primary)]',
+        /**
+         * Destructive action without a filled surface; stays red on hover.
+         * @example <Button variant='ghost-destructive'>Delete</Button>
+         */
+        'ghost-destructive': 'text-[var(--text-error)] hover-hover:text-[var(--text-error)]',
+        /**
+         * Muted destructive action that turns red on hover.
+         * @example <Button variant='ghost-destructive-muted'>Remove</Button>
+         */
+        'ghost-destructive-muted': 'text-[var(--text-muted)] hover-hover:text-[var(--text-error)]',
         subtle:
           'text-[var(--text-body)] hover-hover:text-[var(--text-body)] hover-hover:bg-[var(--surface-4)]',
         'ghost-secondary': 'text-[var(--text-muted)] hover-hover:text-[var(--text-primary)]',
diff --git a/packages/workflow-renderer/src/note/note-block-view.tsx b/packages/workflow-renderer/src/note/note-block-view.tsx
index 6b71def6fb5..b62759366c8 100644
--- a/packages/workflow-renderer/src/note/note-block-view.tsx
+++ b/packages/workflow-renderer/src/note/note-block-view.tsx
@@ -108,7 +108,7 @@ const NOTE_REMARK_PLUGINS = [remarkGfm, remarkBreaks]
  */
 const NOTE_TASK_CHECKBOX_CLASS = [
   'mt-[3px] inline-grid size-[16px] shrink-0 appearance-none place-content-center',
-  'rounded-[3px] border border-[var(--border-1)] bg-transparent',
+  'rounded-sm border border-[var(--border-1)] bg-transparent',
   'checked:border-[var(--text-primary)] checked:bg-[var(--text-primary)]',
   "checked:after:size-[10px] checked:after:bg-[var(--surface-2)] checked:after:content-['']",
   'checked:after:[clip-path:polygon(14%_44%,0_65%,50%_100%,100%_16%,80%_0%,43%_62%)]',
@@ -251,14 +251,14 @@ const NOTE_COMPONENTS = {
     />
   ),
   inlineCode: ({ children }: { children?: ReactNode }) => (
-    <code className='whitespace-normal rounded bg-black/10 px-1 py-0.5 font-mono text-current text-xs'>
+    <code className='whitespace-normal rounded-sm bg-black/10 px-1 py-0.5 font-mono text-current text-xs'>
       {children}
     </code>
   ),
   code: ({ children, className, ...props }: { children?: ReactNode; className?: string }) => (
     <code
       {...props}
-      className='block whitespace-pre-wrap break-words rounded bg-black/15 p-2 text-current text-xs'
+      className='block whitespace-pre-wrap break-words rounded-sm bg-black/15 p-2 text-current text-xs'
     >
       {children}
     </code>
diff --git a/packages/workflow-renderer/src/workflow-block/workflow-block-view.tsx b/packages/workflow-renderer/src/workflow-block/workflow-block-view.tsx
index cae87070f2f..f9a6414258b 100644
--- a/packages/workflow-renderer/src/workflow-block/workflow-block-view.tsx
+++ b/packages/workflow-renderer/src/workflow-block/workflow-block-view.tsx
@@ -957,7 +957,7 @@ export function WorkflowBlockView({
             )}
             {showErrorRow && (
               <div
-                className='flex h-[24px] shrink-0 items-center justify-between rounded-[6px] bg-[var(--surface-5)] pr-1 pl-2 dark:bg-[var(--surface-4)]'
+                className='flex h-[24px] shrink-0 items-center justify-between rounded-md bg-[var(--surface-5)] pr-1 pl-2 dark:bg-[var(--surface-4)]'
                 /* The card is a drag handle and the row holds a control, so the
                    pointer must not start a node drag here. */
                 onPointerDown={(event) => event.stopPropagation()}