diff --git a/.yarn/cache/@carbon-icons-npm-10.48.3-faa4525a9d-daba81eefe.zip b/.yarn/cache/@carbon-icons-npm-10.48.4-9a7ee86222-6581b1cc41.zip
similarity index 98%
rename from .yarn/cache/@carbon-icons-npm-10.48.3-faa4525a9d-daba81eefe.zip
rename to .yarn/cache/@carbon-icons-npm-10.48.4-9a7ee86222-6581b1cc41.zip
index ee3e9bc68f8..a96e0561315 100644
Binary files a/.yarn/cache/@carbon-icons-npm-10.48.3-faa4525a9d-daba81eefe.zip and b/.yarn/cache/@carbon-icons-npm-10.48.4-9a7ee86222-6581b1cc41.zip differ
diff --git a/packages/carbon-web-components/package.json b/packages/carbon-web-components/package.json
index edf773fa0f0..5b485b37035 100644
--- a/packages/carbon-web-components/package.json
+++ b/packages/carbon-web-components/package.json
@@ -94,7 +94,7 @@
     "@babel/template": "~7.12.0",
     "@babel/traverse": "~7.23.7",
     "@carbon/icon-helpers": "10.47.0",
-    "@carbon/icons": "10.48.3",
+    "@carbon/icons": "10.48.4",
     "@open-wc/semantic-dom-diff": "~0.18.0",
     "@percy-io/in-percy": "^0.1.11",
     "@percy/cli": "^1.27.4",
diff --git a/packages/styles/scss/components/button/_button.scss b/packages/styles/scss/components/button/_button.scss
index 03f15a05328..377ac607cf3 100644
--- a/packages/styles/scss/components/button/_button.scss
+++ b/packages/styles/scss/components/button/_button.scss
@@ -1,5 +1,5 @@
 /**
-* Copyright IBM Corp. 2016, 2023
+* Copyright IBM Corp. 2016, 2024
 *
 * This source code is licensed under the Apache-2.0 license found in the
 * LICENSE file in the root directory of this source tree.
@@ -8,17 +8,25 @@
 @use '@carbon/styles/scss/config' as *;
 @use '@carbon/styles/scss/spacing' as *;
 @use '@carbon/styles/scss/theme' as *;
+@use '@carbon/styles/scss/layout' as *;
+@use '@carbon/styles/scss/components/button' as *;
 @use '../../globals/vars' as *;
-@use '../../../../carbon-web-components/src/components/button/button';
 
 @mixin button {
   :host(#{$c4d-prefix}-button) {
-    @extend :host(#{$prefix}-button);
+    @include emit-layout-tokens();
+
+    display: inline-flex;
 
     svg {
       @extend .#{$prefix}--btn__icon;
     }
 
+    .#{$prefix}--btn {
+      flex-grow: 1;
+      max-inline-size: 100%;
+    }
+
     .#{$prefix}--btn--hidden {
       display: none;
       visibility: hidden;
diff --git a/packages/styles/scss/components/expressive-modal/_expressive-modal.scss b/packages/styles/scss/components/expressive-modal/_expressive-modal.scss
index fbb4bcf3a0a..8e70caa0624 100644
--- a/packages/styles/scss/components/expressive-modal/_expressive-modal.scss
+++ b/packages/styles/scss/components/expressive-modal/_expressive-modal.scss
@@ -81,7 +81,7 @@
   }
 
   :host(#{$c4d-prefix}-expressive-modal-close-button) {
-    @extend .#{$prefix}--modal-close-button;
+    @extend .#{$prefix}--modal-close-button !optional;
 
     .#{$prefix}--modal-close {
       position: fixed;
diff --git a/packages/web-components/package.json b/packages/web-components/package.json
index 384a0264d4f..3425811ce39 100644
--- a/packages/web-components/package.json
+++ b/packages/web-components/package.json
@@ -132,7 +132,7 @@
     "@babel/traverse": "~7.23.7",
     "@carbon/ibmdotcom-services-store": "1.53.0",
     "@carbon/icon-helpers": "10.47.0",
-    "@carbon/icons": "10.48.3",
+    "@carbon/icons": "10.48.4",
     "@carbon/icons-react": "^11.33.0",
     "@carbon/pictograms-react": "11.58.0",
     "@carbon/react": "1.53.0",
diff --git a/yarn.lock b/yarn.lock
index f74cc94f722..81fb2b3b602 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3432,7 +3432,7 @@ __metadata:
     "@carbon/ibmdotcom-styles": "npm:2.5.0"
     "@carbon/ibmdotcom-utilities": "npm:2.5.0"
     "@carbon/icon-helpers": "npm:10.47.0"
-    "@carbon/icons": "npm:10.48.3"
+    "@carbon/icons": "npm:10.48.4"
     "@carbon/icons-react": "npm:^11.33.0"
     "@carbon/layout": "npm:11.21.0"
     "@carbon/motion": "npm:11.17.0"
@@ -3613,10 +3613,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/icons@npm:10.48.3":
-  version: 10.48.3
-  resolution: "@carbon/icons@npm:10.48.3"
-  checksum: 10/daba81eefe1f738d28765b6ecc92a0d393a3739eb3d2a04fb71488e0b0f53cf5ee86ccbc04439a29c198c80d574ed7c2163b2c56237bc6c3249df47711597df1
+"@carbon/icons@npm:10.48.4":
+  version: 10.48.4
+  resolution: "@carbon/icons@npm:10.48.4"
+  dependencies:
+    "@ibm/telemetry-js": "npm:^1.2.1"
+  checksum: 10/6581b1cc4137dd005987f69b92691228d1879ba90713b836a9c4537a1d5bc0ae13b219c8d2ad971fab2177cd0e22f3ea643230e77e2031bf5977bfb6debd2e20
   languageName: node
   linkType: hard
 
@@ -3774,7 +3776,7 @@ __metadata:
     "@babel/traverse": "npm:~7.23.7"
     "@carbon/ibm-products-styles": "npm:^2.30.1"
     "@carbon/icon-helpers": "npm:10.47.0"
-    "@carbon/icons": "npm:10.48.3"
+    "@carbon/icons": "npm:10.48.4"
     "@carbon/styles": "npm:1.53.0"
     "@floating-ui/dom": "npm:^1.6.3"
     "@ibm/telemetry-js": "npm:^1.2.1"