diff --git a/src/app/components/button/button.ts b/src/app/components/button/button.ts
index e44c9df85d0..d5fd182a74f 100755
--- a/src/app/components/button/button.ts
+++ b/src/app/components/button/button.ts
@@ -393,7 +393,7 @@ export class Button implements AfterContentInit {
             'p-button-vertical': (this.iconPos === 'top' || this.iconPos === 'bottom') && this.label,
             'p-disabled': this.disabled || this.loading,
             'p-button-loading': this.loading,
-            'p-button-loading-label-only': this.loading && !this.icon && this.label && !this.loadingIcon && this.iconPos === 'left'
+            'p-button-loading-label-only': this.loading && !(this.icon || this.iconTemplate) && this.label && !this.loadingIcon && this.iconPos === 'left'
         };
     }
 
diff --git a/src/assets/components/themes/lara-dark-blue/theme.css b/src/assets/components/themes/lara-dark-blue/theme.css
index 33ad5c0ef40..995a456df12 100644
--- a/src/assets/components/themes/lara-dark-blue/theme.css
+++ b/src/assets/components/themes/lara-dark-blue/theme.css
@@ -2017,6 +2017,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {
diff --git a/src/assets/components/themes/lara-dark-indigo/theme.css b/src/assets/components/themes/lara-dark-indigo/theme.css
index 9d04bc203fa..b5372c44029 100644
--- a/src/assets/components/themes/lara-dark-indigo/theme.css
+++ b/src/assets/components/themes/lara-dark-indigo/theme.css
@@ -2017,6 +2017,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {
diff --git a/src/assets/components/themes/lara-dark-purple/theme.css b/src/assets/components/themes/lara-dark-purple/theme.css
index 1ffb4125821..856b6495229 100644
--- a/src/assets/components/themes/lara-dark-purple/theme.css
+++ b/src/assets/components/themes/lara-dark-purple/theme.css
@@ -2017,6 +2017,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {
diff --git a/src/assets/components/themes/lara-dark-teal/theme.css b/src/assets/components/themes/lara-dark-teal/theme.css
index eff12911f8f..3c9ca16e74c 100644
--- a/src/assets/components/themes/lara-dark-teal/theme.css
+++ b/src/assets/components/themes/lara-dark-teal/theme.css
@@ -2017,6 +2017,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {
diff --git a/src/assets/components/themes/lara-light-blue/theme.css b/src/assets/components/themes/lara-light-blue/theme.css
index e62127009cf..7d29b98e463 100644
--- a/src/assets/components/themes/lara-light-blue/theme.css
+++ b/src/assets/components/themes/lara-light-blue/theme.css
@@ -2017,6 +2017,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {
diff --git a/src/assets/components/themes/lara-light-indigo/theme.css b/src/assets/components/themes/lara-light-indigo/theme.css
index 38247252a02..5c899ae493e 100644
--- a/src/assets/components/themes/lara-light-indigo/theme.css
+++ b/src/assets/components/themes/lara-light-indigo/theme.css
@@ -2017,6 +2017,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {
diff --git a/src/assets/components/themes/lara-light-purple/theme.css b/src/assets/components/themes/lara-light-purple/theme.css
index dcfa0f72034..b1c5af7f1ce 100644
--- a/src/assets/components/themes/lara-light-purple/theme.css
+++ b/src/assets/components/themes/lara-light-purple/theme.css
@@ -2017,6 +2017,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {
diff --git a/src/assets/components/themes/lara-light-teal/theme.css b/src/assets/components/themes/lara-light-teal/theme.css
index b34d1f4eae3..814ef09d77b 100644
--- a/src/assets/components/themes/lara-light-teal/theme.css
+++ b/src/assets/components/themes/lara-light-teal/theme.css
@@ -2017,6 +2017,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {
diff --git a/src/assets/components/themes/soho-dark/theme.css b/src/assets/components/themes/soho-dark/theme.css
index b186da5fc3e..b96ea2b404a 100644
--- a/src/assets/components/themes/soho-dark/theme.css
+++ b/src/assets/components/themes/soho-dark/theme.css
@@ -2023,6 +2023,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {
diff --git a/src/assets/components/themes/soho-light/theme.css b/src/assets/components/themes/soho-light/theme.css
index 381243ccabc..1a5b88cb58b 100644
--- a/src/assets/components/themes/soho-light/theme.css
+++ b/src/assets/components/themes/soho-light/theme.css
@@ -2023,6 +2023,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {
diff --git a/src/assets/components/themes/tailwind-light/theme.css b/src/assets/components/themes/tailwind-light/theme.css
index 8744dc46792..b82e500cdab 100644
--- a/src/assets/components/themes/tailwind-light/theme.css
+++ b/src/assets/components/themes/tailwind-light/theme.css
@@ -2028,6 +2028,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {
diff --git a/src/assets/showcase/styles/layout/landing/themes/lara-dark-blue/theme.css b/src/assets/showcase/styles/layout/landing/themes/lara-dark-blue/theme.css
index 34cd15ec696..a7e0c34164c 100644
--- a/src/assets/showcase/styles/layout/landing/themes/lara-dark-blue/theme.css
+++ b/src/assets/showcase/styles/layout/landing/themes/lara-dark-blue/theme.css
@@ -868,6 +868,7 @@
 .landing-themes .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .landing-themes .p-button.p-button-icon-only .p-button-icon-left,
 .landing-themes .p-button.p-button-icon-only .p-button-icon-right {
diff --git a/src/assets/showcase/styles/layout/landing/themes/lara-light-blue/theme.css b/src/assets/showcase/styles/layout/landing/themes/lara-light-blue/theme.css
index 2c586f320b5..57f4697a15d 100644
--- a/src/assets/showcase/styles/layout/landing/themes/lara-light-blue/theme.css
+++ b/src/assets/showcase/styles/layout/landing/themes/lara-light-blue/theme.css
@@ -865,6 +865,7 @@
 .landing-themes .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .landing-themes .p-button.p-button-icon-only .p-button-icon-left,
 .landing-themes .p-button.p-button-icon-only .p-button-icon-right {