From 4d0b593a65bddf083fdc6923d07131506b28ba19 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandy@ionic.io>
Date: Wed, 22 May 2019 11:01:51 -0400
Subject: [PATCH 1/3] fix(button): do not apply a width if there is button text
 with an icon

fixes #18329
---
 core/src/components/button/button.tsx         |  2 +-
 .../components/toolbar/test/spec/index.html   | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/core/src/components/button/button.tsx b/core/src/components/button/button.tsx
index 0d3166bde7b..10493a8b309 100644
--- a/core/src/components/button/button.tsx
+++ b/core/src/components/button/button.tsx
@@ -135,7 +135,7 @@ export class Button implements ComponentInterface {
   }
 
   private get hasIcon() {
-    return !!this.el.querySelector('ion-icon');
+    return !!this.el.querySelector('ion-icon[slot="icon-only"]');
   }
 
   private get hasIconOnly() {
diff --git a/core/src/components/toolbar/test/spec/index.html b/core/src/components/toolbar/test/spec/index.html
index 439b5b8dd97..280d7d07e57 100644
--- a/core/src/components/toolbar/test/spec/index.html
+++ b/core/src/components/toolbar/test/spec/index.html
@@ -242,6 +242,36 @@
 
     </ion-content>
 
+    <ion-footer>
+      <ion-toolbar>
+        <ion-title>
+          Click to Add Text
+        </ion-title>
+        <ion-buttons slot="end">
+          <ion-button id="changeText" onClick="toggleText()">
+            <ion-icon slot="start" name="refresh"></ion-icon>
+          </ion-button>
+        </ion-buttons>
+      </ion-toolbar>
+    </ion-footer>
+
+    <script>
+      const button = document.getElementById('changeText');
+
+      function toggleText() {
+        const hasText = button.querySelector('#childText');
+
+        if (hasText) {
+          button.removeChild(hasText);
+        } else {
+          var text = document.createElement('span');
+          text.innerHTML = 'Toggle';
+          text.id = 'childText';
+          button.appendChild(text, button);
+        }
+      }
+    </script>
+
     <style>
       ion-toolbar {
         margin-bottom: 10px;

From ad0b4a5de2877c48ec6b7c6aca8196daca7787d5 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandy@ionic.io>
Date: Wed, 22 May 2019 11:12:53 -0400
Subject: [PATCH 2/3] fix(button): remove unneeded functions

---
 core/src/components/button/button.tsx | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/core/src/components/button/button.tsx b/core/src/components/button/button.tsx
index 10493a8b309..4475e1374e2 100644
--- a/core/src/components/button/button.tsx
+++ b/core/src/components/button/button.tsx
@@ -130,16 +130,8 @@ export class Button implements ComponentInterface {
     }
   }
 
-  private get hasLabel() {
-    return this.el.textContent !== null && this.el.textContent.trim() !== '';
-  }
-
-  private get hasIcon() {
-    return !!this.el.querySelector('ion-icon[slot="icon-only"]');
-  }
-
   private get hasIconOnly() {
-    return this.hasIcon && !this.hasLabel;
+    return !!this.el.querySelector('ion-icon[slot="icon-only"]');
   }
 
   private get rippleType() {

From 4652b0852fda50a7f367925f88bc97abecbd8029 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandy@ionic.io>
Date: Wed, 22 May 2019 11:26:52 -0400
Subject: [PATCH 3/3] test(toolbar): add missing slots

---
 core/src/components/toolbar/test/spec/index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/components/toolbar/test/spec/index.html b/core/src/components/toolbar/test/spec/index.html
index 280d7d07e57..4a6510855ac 100644
--- a/core/src/components/toolbar/test/spec/index.html
+++ b/core/src/components/toolbar/test/spec/index.html
@@ -117,12 +117,12 @@
         </ion-buttons>
         <ion-buttons slot="primary">
           <ion-button>
-            <ion-icon name="star"></ion-icon>
+            <ion-icon slot="icon-only" name="star"></ion-icon>
           </ion-button>
         </ion-buttons>
         <ion-buttons slot="secondary">
           <ion-button>
-            <ion-icon name="call"></ion-icon>
+            <ion-icon slot="icon-only" name="call"></ion-icon>
           </ion-button>
         </ion-buttons>
         <ion-buttons slot="start">
@@ -138,12 +138,12 @@
         </ion-buttons>
         <ion-buttons slot="primary">
           <ion-button>
-            <ion-icon name="star"></ion-icon>
+            <ion-icon slot="icon-only" name="star"></ion-icon>
           </ion-button>
         </ion-buttons>
         <ion-buttons slot="secondary">
           <ion-button>
-            <ion-icon name="call"></ion-icon>
+            <ion-icon slot="icon-only" name="call"></ion-icon>
           </ion-button>
         </ion-buttons>
         <ion-buttons slot="start">