diff --git a/.gitignore b/.gitignore
index 391ec986..6b17fc81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
 .DS_Store
 yarn-debug.log*
 yarn-error.log*
-*.tgz
\ No newline at end of file
+*.tgz
+.vscode
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2976c5c..7fbb601e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Selectable/expandable `DataTable`
 
+## [0.6.0](https://github.com/IBM/carbon-components-svelte/releases/tag/v0.6.0) - 2020-05-07
+
+- Fix button with icon bug by manually setting `hasIconOnly` in `Button`. This results in a breaking change for icon-only buttons, which now must include `hasIconOnly`
+  ([Issue #174](https://github.com/IBM/carbon-components-svelte/issues/174))
+
 ## [0.5.1](https://github.com/IBM/carbon-components-svelte/releases/tag/v0.5.1) - 2020-05-03
 
 - Fix focus/dispatch bug in `Modal`, `ComposedModal`
diff --git a/src/components/Button/Button.Story.svelte b/src/components/Button/Button.Story.svelte
index 41383af8..a746bc81 100644
--- a/src/components/Button/Button.Story.svelte
+++ b/src/components/Button/Button.Story.svelte
@@ -26,6 +26,7 @@
   };
 
   const iconOnlyProps = {
+    hasIconOnly: true,
     kind,
     disabled,
     size,
diff --git a/src/components/Button/Button.svelte b/src/components/Button/Button.svelte
index 1fc004f4..9f8b5edc 100644
--- a/src/components/Button/Button.svelte
+++ b/src/components/Button/Button.svelte
@@ -6,6 +6,7 @@
   export let href = undefined;
   export let icon = undefined;
   export let iconDescription = undefined;
+  export let hasIconOnly = false;
   export let kind = 'primary';
   export let size = 'default';
   export let style = undefined;
@@ -24,7 +25,6 @@
   $: if (ctx && buttonRef) {
     ctx.declareRef(buttonRef);
   }
-  $: hasIconOnly = !!icon && !$$props.$$slots;
   $: buttonProps = {
     role: 'button',
     type: href && !disabled ? undefined : type,