diff --git a/.github/workflows/chromatic-deploy.yml b/.github/workflows/chromatic-deploy.yml
new file mode 100644
index 00000000000..fd2eadc2713
--- /dev/null
+++ b/.github/workflows/chromatic-deploy.yml
@@ -0,0 +1,49 @@
+# .github/workflows/chromatic-deploy.yml
+name: Chromatic Deploy
+
+on:
+  push:
+    branches:
+      - master
+      - staging
+      - dev
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  actions: write
+  contents: read
+
+jobs:
+  changed-files:
+    runs-on: ubuntu-latest
+    name: changed-files
+    outputs:
+      all_changed_files: ${{ steps.changed-files.outputs.all_changed_files }}
+      any_changed: ${{ steps.changed-files.outputs.any_changed }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v44
+        with:
+          files: |
+            src/components/**/*
+            src/pages/**/*
+            src/layouts/**/*
+            src/@chakra-ui/**/*
+            .storybook/**/*
+            tailwind.config.ts
+            src/styles/**/*
+
+  chromatic:
+    name: Run visual tests
+    needs: [changed-files]
+    if: ${{ needs.changed-files.outputs.any_changed == 'true' }}
+    uses: ./.github/workflows/chromatic.yml
+    secrets: inherit
diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml
index 3054c265b98..33366802e7d 100644
--- a/.github/workflows/chromatic.yml
+++ b/.github/workflows/chromatic.yml
@@ -1,45 +1,41 @@
 # .github/workflows/chromatic.yml
-
-# Workflow name
 name: Chromatic Publish and Testing
 
-# Event for the workflow
-on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - ready_for_review
-    paths:
-      # Only run on file changes in any of these paths
-      - "src/components/**/*"
-      - "src/pages/**/*"
-      - "src/layouts/**/*"
-      - "src/@chakra-ui/**/*"
-      - ".storybook/**/*"
-      - "tailwind.config.ts"
-      - "src/styles/**/*"
+on: workflow_call
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-chromatic
+  cancel-in-progress: true
+
+permissions:
+  actions: write
+  contents: read
 
 # List of jobs
 jobs:
-  chromatic-deployment:
-    # Operating System
+  chromatic:
+    name: Chromatic
     runs-on: ubuntu-latest
-    # Job steps
     steps:
-      # 👇 Version 2 of the action
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0 # 👈 Required to retrieve git history
-      - name: Install deps
-        # 👇 Install dependencies with the same package manager used in the project (replace it as needed), e.g. yarn, npm, pnpm
+      - name: ⎔ Setup node
+        uses: actions/setup-node@v4
+        with:
+          cache: npm
+          cache-dependency-path: ./package.json
+          node-version: 20
+      - name: 📥 Install deps
         run: yarn
-      - name: Publish to Chromatic
-        # 👇 Adds Chromatic as a step in the workflow
-        uses: chromaui/action@v1
+      - name: Build Storybook
+        run: npm run build-storybook
+      - name: ⚡ Run chromatic
+        uses: chromaui/action@latest
         # Options required for Chromatic's GitHub Action
         with:
           projectToken: fee8e66c9916
+          onlyChanged: true
           # 👇 Only fail if Storybook contains stories that error
           exitZeroOnChanges: true
diff --git a/netlify.toml b/netlify.toml
index 68ed495e03a..e4a926e9a53 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -9,6 +9,9 @@
   # Default build command.
   command = "yarn build"
 
+  # Skip build
+  ignore = "exit 0"
+
 [build.environment]
   NEXT_FORCE_EDGE_IMAGES="true"
 
diff --git a/src/@chakra-ui/components/Button.ts b/src/@chakra-ui/components/Button.ts
index 1b51d328012..7e0011999de 100644
--- a/src/@chakra-ui/components/Button.ts
+++ b/src/@chakra-ui/components/Button.ts
@@ -12,7 +12,7 @@ const ICON_SELECTOR = "& svg"
 
 const baseStyle = defineStyle({
   borderRadius: "base",
-  border: "1px",
+  border: "3px",
   color: "primary.base",
   fontWeight: "normal",
   lineHeight: "1.6",