diff --git a/packages/main/src/Button.hbs b/packages/main/src/Button.hbs
index 36b5df36a859..98ac68d9cd53 100644
--- a/packages/main/src/Button.hbs
+++ b/packages/main/src/Button.hbs
@@ -25,7 +25,7 @@
 			style="{{styles.icon}}"
 			class="ui5-button-icon"
 			name="{{icon}}"
-			show-tooltip={{showIconTooltip}}
+			?show-tooltip={{showIconTooltip}}
 		></ui5-icon>
 	{{/if}}
 
diff --git a/packages/main/test/pages/Button.html b/packages/main/test/pages/Button.html
index 65f02ff408d5..e1f25fbce374 100644
--- a/packages/main/test/pages/Button.html
+++ b/packages/main/test/pages/Button.html
@@ -192,7 +192,7 @@
 	<br/>
 	<ui5-title>Buttons with tooltip</ui5-title>
 	<br/>
-	<ui5-button icon="home" title="Go home"></ui5-button>
+	<ui5-button icon="message-information" title="Go home"></ui5-button>
 	<ui5-button icon="accept" title="Accept terms & conditions"></ui5-button>
 	<ui5-button icon="action-settings" title="Go to settings"></ui5-button>
 	<ui5-button icon="alert" title="Fire an alert"></ui5-button>