diff --git a/src/components/Button/Button.Story.svelte b/src/components/Button/Button.Story.svelte
index b6e09c9c..146fe6d5 100644
--- a/src/components/Button/Button.Story.svelte
+++ b/src/components/Button/Button.Story.svelte
@@ -50,7 +50,7 @@
     {:else if story === 'inline'}
       <Button />
     {:else if story === 'icon-only buttons'}
-      <Button {...iconOnlyProps} hasIconOnly />
+      <Button {...iconOnlyProps} />
     {:else if story === 'set of buttons'}
       <div class={cx('--btn-set')}>
         <Button kind="secondary" {...setProps}>Secondary button</Button>
diff --git a/src/components/Button/Button.svelte b/src/components/Button/Button.svelte
index af9b9691..7ba6e1e6 100644
--- a/src/components/Button/Button.svelte
+++ b/src/components/Button/Button.svelte
@@ -11,7 +11,6 @@
   export let type = 'button';
   export let icon = undefined;
   export let iconDescription = undefined;
-  export let hasIconOnly = false;
   export let tooltipPosition = undefined;
   export let tooltipAlignment = undefined;
   export let style = undefined;
@@ -19,6 +18,7 @@
   import { getContext } from 'svelte';
   import { cx } from '../../lib';
 
+  const hasIconOnly = !!icon && !$$props.$$slots;
   const ctx = getContext('ComposedModal');
 
   let buttonRef = undefined;