diff --git a/core/src/components/button/test/toolbar/index.html b/core/src/components/button/test/toolbar/index.html
index dfb285316c..426f8b6fce 100644
--- a/core/src/components/button/test/toolbar/index.html
+++ b/core/src/components/button/test/toolbar/index.html
@@ -107,7 +107,7 @@
         </ion-buttons>
         <ion-title>Solid</ion-title>
         <ion-buttons slot="primary">
-          <ion-button fill="solid" color="secondary">
+          <ion-button fill="solid" shape="round" color="secondary">
             Help
             <ion-icon name="help-circle" slot="end"></ion-icon>
           </ion-button>
@@ -126,7 +126,7 @@
         </ion-buttons>
         <ion-title>Solid Activated</ion-title>
         <ion-buttons slot="primary">
-          <ion-button fill="solid" color="secondary" class="activated">
+          <ion-button fill="solid" shape="round" color="secondary" class="activated">
             Help
             <ion-icon name="help-circle" slot="end"></ion-icon>
           </ion-button>
diff --git a/core/src/components/buttons/buttons.ios.scss b/core/src/components/buttons/buttons.ios.scss
index 4503502a8c..554e020bde 100644
--- a/core/src/components/buttons/buttons.ios.scss
+++ b/core/src/components/buttons/buttons.ios.scss
@@ -10,13 +10,16 @@
   --pading-bottom: 0;
   --padding-start: 5px;
   --padding-end: 5px;
-  --border-radius: #{$toolbar-ios-button-border-radius};
   --height: 32px;
 
   font-size: #{$toolbar-ios-button-font-size};
   font-weight: 400;
 }
 
+::slotted(*) .button:not(.button-round) {
+  --border-radius: #{$toolbar-ios-button-border-radius};
+}
+
 :host-context(.ion-color)::slotted(*) .button {
   --ion-color-base: currentColor;
 }
diff --git a/core/src/components/buttons/buttons.md.scss b/core/src/components/buttons/buttons.md.scss
index e0042f62d8..c7713da59a 100644
--- a/core/src/components/buttons/buttons.md.scss
+++ b/core/src/components/buttons/buttons.md.scss
@@ -13,7 +13,6 @@
   --padding-bottom: 0;
   --padding-start: 8px;
   --padding-end: 8px;
-  --border-radius: #{$toolbar-md-button-border-radius};
   --height: 32px;
   --box-shadow: none;
 
@@ -21,6 +20,9 @@
   font-weight: 500;
 }
 
+::slotted(*) .button:not(.button-round) {
+  --border-radius: #{$toolbar-md-button-border-radius};
+}
 
 // Material Design Toolbar Button Icon
 // --------------------------------------------------
diff --git a/core/src/components/toolbar/toolbar.ios.vars.scss b/core/src/components/toolbar/toolbar.ios.vars.scss
index d13347f7e6..afb42ded43 100644
--- a/core/src/components/toolbar/toolbar.ios.vars.scss
+++ b/core/src/components/toolbar/toolbar.ios.vars.scss
@@ -30,9 +30,6 @@ $toolbar-ios-button-background-color:               $toolbar-ios-background-colo
 /// @prop - Background color of the toolbar button when activated
 $toolbar-ios-button-background-color-activated:     $toolbar-ios-color-active !default;
 
-/// @prop - Border radius of the toolbar button
-$toolbar-ios-button-border-radius:                  4px !default;
-
 /// @prop - Font weight of the strong toolbar button
 $toolbar-ios-button-strong-font-weight:             600 !default;
 
diff --git a/core/src/components/toolbar/toolbar.md.vars.scss b/core/src/components/toolbar/toolbar.md.vars.scss
index 04ea37320b..57034228ad 100644
--- a/core/src/components/toolbar/toolbar.md.vars.scss
+++ b/core/src/components/toolbar/toolbar.md.vars.scss
@@ -30,9 +30,6 @@ $toolbar-md-button-background-color:              $toolbar-md-background-color !
 /// @prop - Background color of the toolbar button when activated
 $toolbar-md-button-background-color-activated:    $toolbar-md-color-active !default;
 
-/// @prop - Border radius of the toolbar button
-$toolbar-md-button-border-radius:                 2px !default;
-
 /// @prop - Fill color of the toolbar button icon
 $toolbar-md-button-icon-fill-color:               currentColor !default;