diff --git a/packages/core/src/components/action-sheet/test/basic/index.html b/packages/core/src/components/action-sheet/test/basic/index.html
index 122580355c..2e80a7c13d 100644
--- a/packages/core/src/components/action-sheet/test/basic/index.html
+++ b/packages/core/src/components/action-sheet/test/basic/index.html
@@ -20,12 +20,12 @@
       <ion-content padding>
         <ion-action-sheet-controller></ion-action-sheet-controller>
 
-        <ion-button id="basic" block onclick="presentBasic()">Basic</ion-button>
-        <ion-button id="noBackdropDismiss" block onclick="presentNoBackdropDismiss()">No Backdrop Dismiss</ion-button>
-        <ion-button id="alertFromActionSheet" block onclick="presentAlert()">Alert from Action Sheet</ion-button>
-        <ion-button id="scrollableOptions" block onclick="presentScroll()">Scrollable Options</ion-button>
-        <ion-button id="scrollWithoutCancel" block onclick="presentScrollNoCancel()">Scroll Without Cancel</ion-button>
-        <ion-button id="cancelOnly" block onclick="presentCancelOnly()">Cancel Only</ion-button>
+        <ion-button expand="block" id="basic" onclick="presentBasic()">Basic</ion-button>
+        <ion-button expand="block" id="noBackdropDismiss" onclick="presentNoBackdropDismiss()">No Backdrop Dismiss</ion-button>
+        <ion-button expand="block" id="alertFromActionSheet" onclick="presentAlert()">Alert from Action Sheet</ion-button>
+        <ion-button expand="block" id="scrollableOptions" onclick="presentScroll()">Scrollable Options</ion-button>
+        <ion-button expand="block" id="scrollWithoutCancel" onclick="presentScrollNoCancel()">Scroll Without Cancel</ion-button>
+        <ion-button expand="block" id="cancelOnly" onclick="presentCancelOnly()">Cancel Only</ion-button>
 
       </ion-content>
     </ion-page>
diff --git a/packages/core/src/components/action-sheet/test/translucent/index.html b/packages/core/src/components/action-sheet/test/translucent/index.html
index 0efaec75b7..4a75f5db01 100644
--- a/packages/core/src/components/action-sheet/test/translucent/index.html
+++ b/packages/core/src/components/action-sheet/test/translucent/index.html
@@ -20,12 +20,12 @@
       <ion-content padding>
         <ion-action-sheet-controller></ion-action-sheet-controller>
 
-        <ion-button id="basic" block onclick="presentBasic()">Basic</ion-button>
-        <ion-button id="noBackdropDismiss" block onclick="presentNoBackdropDismiss()">No Backdrop Dismiss</ion-button>
-        <ion-button id="alertFromActionSheet" block onclick="presentAlert()">Alert from Action Sheet</ion-button>
-        <ion-button id="scrollableOptions" block onclick="presentScroll()">Scrollable Options</ion-button>
-        <ion-button id="scrollWithoutCancel" block onclick="presentScrollNoCancel()">Scroll Without Cancel</ion-button>
-        <ion-button id="cancelOnly" block onclick="presentCancelOnly()">Cancel Only</ion-button>
+        <ion-button expand="block" id="basic" onclick="presentBasic()">Basic</ion-button>
+        <ion-button expand="block" id="noBackdropDismiss" onclick="presentNoBackdropDismiss()">No Backdrop Dismiss</ion-button>
+        <ion-button expand="block" id="alertFromActionSheet" onclick="presentAlert()">Alert from Action Sheet</ion-button>
+        <ion-button expand="block" id="scrollableOptions" onclick="presentScroll()">Scrollable Options</ion-button>
+        <ion-button expand="block" id="scrollWithoutCancel" onclick="presentScrollNoCancel()">Scroll Without Cancel</ion-button>
+        <ion-button expand="block" id="cancelOnly" onclick="presentCancelOnly()">Cancel Only</ion-button>
 
         <ion-grid>
           <ion-row>
diff --git a/packages/core/src/components/alert/test/basic/index.html b/packages/core/src/components/alert/test/basic/index.html
index 9fe741fddc..1a9f92b98c 100644
--- a/packages/core/src/components/alert/test/basic/index.html
+++ b/packages/core/src/components/alert/test/basic/index.html
@@ -20,14 +20,14 @@
       <ion-content padding>
         <ion-alert-controller></ion-alert-controller>
 
-        <ion-button block onclick="presentAlert()">Alert</ion-button>
-        <ion-button block onclick="presentAlertLongMessage()">Alert Long Message</ion-button>
-        <ion-button block onclick="presentAlertMultipleButtons()">Multiple Buttons (>2)</ion-button>
-        <ion-button block onclick="presentAlertNoMessage()">Alert No Message</ion-button>
-        <ion-button block onclick="presentAlertConfirm()">Confirm</ion-button>
-        <ion-button block onclick="presentAlertPrompt()">Prompt</ion-button>
-        <ion-button block onclick="presentAlertRadio()">Radio</ion-button>
-        <ion-button block onclick="presentAlertCheckbox()">Checkbox</ion-button>
+        <ion-button expand="block" onclick="presentAlert()">Alert</ion-button>
+        <ion-button expand="block" onclick="presentAlertLongMessage()">Alert Long Message</ion-button>
+        <ion-button expand="block" onclick="presentAlertMultipleButtons()">Multiple Buttons (>2)</ion-button>
+        <ion-button expand="block" onclick="presentAlertNoMessage()">Alert No Message</ion-button>
+        <ion-button expand="block" onclick="presentAlertConfirm()">Confirm</ion-button>
+        <ion-button expand="block" onclick="presentAlertPrompt()">Prompt</ion-button>
+        <ion-button expand="block" onclick="presentAlertRadio()">Radio</ion-button>
+        <ion-button expand="block" onclick="presentAlertCheckbox()">Checkbox</ion-button>
       </ion-content>
     </ion-page>
   </ion-app>
diff --git a/packages/core/src/components/alert/test/translucent/index.html b/packages/core/src/components/alert/test/translucent/index.html
index 97f124f597..dc928ecf7e 100644
--- a/packages/core/src/components/alert/test/translucent/index.html
+++ b/packages/core/src/components/alert/test/translucent/index.html
@@ -20,10 +20,10 @@
       <ion-content padding>
         <ion-alert-controller></ion-alert-controller>
 
-        <ion-button block onclick="presentAlert()">Alert</ion-button>
-        <ion-button block color="secondary" onclick="presentAlertLongMessage()">Alert Long Message</ion-button>
-        <ion-button block color="danger" onclick="presentAlertMultipleButtons()">Multiple Buttons (>2)</ion-button>
-        <ion-button block color="light" onclick="presentAlertNoMessage()">Alert No Message</ion-button>
+        <ion-button expand="block" onclick="presentAlert()">Alert</ion-button>
+        <ion-button expand="block" color="secondary" onclick="presentAlertLongMessage()">Alert Long Message</ion-button>
+        <ion-button expand="block" color="danger" onclick="presentAlertMultipleButtons()">Multiple Buttons (>2)</ion-button>
+        <ion-button expand="block" color="light" onclick="presentAlertNoMessage()">Alert No Message</ion-button>
 
         <ion-grid>
           <ion-row>
@@ -39,10 +39,10 @@
           </ion-row>
         </ion-grid>
 
-        <ion-button block color="dark" onclick="presentAlertConfirm()">Confirm</ion-button>
-        <ion-button block color="primary" onclick="presentAlertPrompt()">Prompt</ion-button>
-        <ion-button block color="secondary" onclick="presentAlertRadio()">Radio</ion-button>
-        <ion-button block color="danger" onclick="presentAlertCheckbox()">Checkbox</ion-button>
+        <ion-button expand="block" color="dark" onclick="presentAlertConfirm()">Confirm</ion-button>
+        <ion-button expand="block" color="primary" onclick="presentAlertPrompt()">Prompt</ion-button>
+        <ion-button expand="block" color="secondary" onclick="presentAlertRadio()">Radio</ion-button>
+        <ion-button expand="block" color="danger" onclick="presentAlertCheckbox()">Checkbox</ion-button>
       </ion-content>
     </ion-page>
   </ion-app>
diff --git a/packages/core/src/components/item-sliding/test/basic/index.html b/packages/core/src/components/item-sliding/test/basic/index.html
index 8a59cb3bde..13e2d0deda 100644
--- a/packages/core/src/components/item-sliding/test/basic/index.html
+++ b/packages/core/src/components/item-sliding/test/basic/index.html
@@ -24,9 +24,9 @@
       <ion-content>
 
         <div padding>
-          <ion-button block onclick="toggleSliding()">Toggle sliding</ion-button>
-          <ion-button block onclick="toggleDynamicOptions()">Toggle Dynamic Options</ion-button>
-          <ion-button block onclick="closeOpened()">Close Opened Items</ion-button>
+          <ion-button expand="block" onclick="toggleSliding()">Toggle sliding</ion-button>
+          <ion-button expand="block" onclick="toggleDynamicOptions()">Toggle Dynamic Options</ion-button>
+          <ion-button expand="block" onclick="closeOpened()">Close Opened Items</ion-button>
         </div>
 
         <ion-list id="list">
diff --git a/packages/core/src/components/loading/test/basic/index.html b/packages/core/src/components/loading/test/basic/index.html
index 101005d1c8..ce5f0ad831 100644
--- a/packages/core/src/components/loading/test/basic/index.html
+++ b/packages/core/src/components/loading/test/basic/index.html
@@ -18,10 +18,10 @@
       </ion-header>
 
       <ion-content padding>
-        <ion-button block onclick="presentLoading()" class="e2eShowLoading">Show Loading</ion-button>
-        <ion-button block onclick="presentLoadingWithOptions({duration: 2000, content: 'Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ea voluptatibus quibusdam eum nihil optio, ullam accusamus magni, nobis suscipit reprehenderit, sequi quam amet impedit. Accusamus dolorem voluptates laborum dolor obcaecati.'})">Show Loading with long content</ion-button>
-        <ion-button block onclick="presentLoadingWithOptions({duration: 2000, message: 'Loading Please Wait...', spinner: 'hide'})">Show Loading with no spinner</ion-button>
-        <ion-button block onclick="presentLoadingWithOptions({duration: 5000, message: 'Loading Please Wait...', translucent: true})">Show Loading with translucent</ion-button>
+        <ion-button expand="block" onclick="presentLoading()" class="e2eShowLoading">Show Loading</ion-button>
+        <ion-button expand="block" onclick="presentLoadingWithOptions({duration: 2000, content: 'Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ea voluptatibus quibusdam eum nihil optio, ullam accusamus magni, nobis suscipit reprehenderit, sequi quam amet impedit. Accusamus dolorem voluptates laborum dolor obcaecati.'})">Show Loading with long content</ion-button>
+        <ion-button expand="block" onclick="presentLoadingWithOptions({duration: 2000, message: 'Loading Please Wait...', spinner: 'hide'})">Show Loading with no spinner</ion-button>
+        <ion-button expand="block" onclick="presentLoadingWithOptions({duration: 5000, message: 'Loading Please Wait...', translucent: true})">Show Loading with translucent</ion-button>
         <ion-loading-controller></ion-loading-controller>
 
         <ion-grid>
diff --git a/packages/core/src/components/popover/test/basic/index.html b/packages/core/src/components/popover/test/basic/index.html
index 5c641b3de7..541fc19576 100644
--- a/packages/core/src/components/popover/test/basic/index.html
+++ b/packages/core/src/components/popover/test/basic/index.html
@@ -23,10 +23,10 @@
       </ion-header>
 
       <ion-content padding>
-        <ion-button class="e2eShowPopover" block onclick="presentPopover({ component: 'profile-page', ev: event })">Show Popover</ion-button>
-        <ion-button block onclick="presentPopover({ component: 'translucent-page', ev: event, translucent: true })">Show Translucent Popover</ion-button>
-        <ion-button block color="secondary" onclick="presentPopover({ component: 'list-page', ev: event })">Show Long List Popover</ion-button>
-        <ion-button block color="danger" onclick="presentPopover({ component: 'profile-page' })">No Event Popover</ion-button>
+        <ion-button class="e2eShowPopover" expand="block" onclick="presentPopover({ component: 'profile-page', ev: event })">Show Popover</ion-button>
+        <ion-button expand="block" onclick="presentPopover({ component: 'translucent-page', ev: event, translucent: true })">Show Translucent Popover</ion-button>
+        <ion-button expand="block" color="secondary" onclick="presentPopover({ component: 'list-page', ev: event })">Show Long List Popover</ion-button>
+        <ion-button expand="block" color="danger" onclick="presentPopover({ component: 'profile-page' })">No Event Popover</ion-button>
 
         <ion-popover-controller></ion-popover-controller>
       </ion-content>
diff --git a/packages/core/src/components/searchbar/test/basic/index.html b/packages/core/src/components/searchbar/test/basic/index.html
index d8c38f0d5f..6c51e9d38e 100644
--- a/packages/core/src/components/searchbar/test/basic/index.html
+++ b/packages/core/src/components/searchbar/test/basic/index.html
@@ -93,14 +93,14 @@
         </ion-searchbar>
 
         <p padding>
-          <ion-button block (click)="changeValue()">Change Value</ion-button>
+          <ion-button expand="block" (click)="changeValue()">Change Value</ion-button>
         </p>
 
       <div padding-horizontal>
-          <ion-button block onClick="toggleProp()">Toggle Property</ion-button>
+          <ion-button expand="block" onClick="toggleProp()">Toggle Property</ion-button>
         </div>
         <div padding>
-          <ion-button block color="secondary" onClick="toggleAttr()">Toggle Attribute</ion-button>
+          <ion-button expand="block" color="secondary" onClick="toggleAttr()">Toggle Attribute</ion-button>
         </div>
 
         <script>
diff --git a/packages/core/src/components/segment/test/basic/index.html b/packages/core/src/components/segment/test/basic/index.html
index 7b8664a184..e2c7b13a06 100644
--- a/packages/core/src/components/segment/test/basic/index.html
+++ b/packages/core/src/components/segment/test/basic/index.html
@@ -80,10 +80,10 @@
         </div>
 
         <div padding-horizontal>
-          <ion-button block onClick="toggleDisabled()">Toggle Disabled</ion-button>
+          <ion-button expand="block" onClick="toggleDisabled()">Toggle Disabled</ion-button>
         </div>
         <div padding>
-          <ion-button block color="secondary" onClick="toggleValue()">Toggle Value</ion-button>
+          <ion-button expand="block" color="secondary" onClick="toggleValue()">Toggle Value</ion-button>
         </div>
 
         <script>
diff --git a/packages/core/src/components/toast/test/basic/index.html b/packages/core/src/components/toast/test/basic/index.html
index 7aa7ae0847..5c62259005 100644
--- a/packages/core/src/components/toast/test/basic/index.html
+++ b/packages/core/src/components/toast/test/basic/index.html
@@ -18,13 +18,13 @@
       </ion-header>
 
       <ion-content padding>
-        <ion-button block class="e2eShowBottomToast" onclick="presentToast('bottom')">Show Toast Bottom</ion-button>
-        <ion-button block onclick="presentToast('top')">Show Toast Top</ion-button>
-        <ion-button block onclick="presentToast('middle')">Show Toast Middle</ion-button>
-        <ion-button block onclick="presentToastWithOptions({message: 'Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ea voluptatibus quibusdam eum nihil optio, ullam accusamus magni, nobis suscipit reprehenderit, sequi quam amet impedit. Accusamus dolorem voluptates laborum dolor obcaecati.', duration: 2000})">Show Toast with long message</ion-button>
-        <ion-button block onclick="presentToastWithOptions({message: 'click to close', showCloseButton: true})">Show Toast with Close Button</ion-button>
-        <ion-button block onclick="presentToastWithOptions({message: 'click to close', showCloseButton: true, closeButtonText: 'closing time'})">Show Toast with Custom Close Button Text</ion-button>
-        <ion-button block onclick="presentToastWithOptions({message: 'click to close', showCloseButton: true, translucent: true})">Show Translucent Toast</ion-button>
+        <ion-button expand="block" class="e2eShowBottomToast" onclick="presentToast('bottom')">Show Toast Bottom</ion-button>
+        <ion-button expand="block" onclick="presentToast('top')">Show Toast Top</ion-button>
+        <ion-button expand="block" onclick="presentToast('middle')">Show Toast Middle</ion-button>
+        <ion-button expand="block" onclick="presentToastWithOptions({message: 'Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ea voluptatibus quibusdam eum nihil optio, ullam accusamus magni, nobis suscipit reprehenderit, sequi quam amet impedit. Accusamus dolorem voluptates laborum dolor obcaecati.', duration: 2000})">Show Toast with long message</ion-button>
+        <ion-button expand="block" onclick="presentToastWithOptions({message: 'click to close', showCloseButton: true})">Show Toast with Close Button</ion-button>
+        <ion-button expand="block" onclick="presentToastWithOptions({message: 'click to close', showCloseButton: true, closeButtonText: 'closing time'})">Show Toast with Custom Close Button Text</ion-button>
+        <ion-button expand="block" onclick="presentToastWithOptions({message: 'click to close', showCloseButton: true, translucent: true})">Show Translucent Toast</ion-button>
         <ion-toast-controller></ion-toast-controller>
 
         <ion-grid>