From 6f8da05805a747b609eea1b4423a2731c3692748 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Tue, 24 Sep 2019 10:00:05 +0200
Subject: [PATCH] More func. components, Button labelIcon -> icon (req.)
 (#1649)

---
 packages/app-123code/src/Transfer.tsx         |   2 +-
 packages/app-accounts/src/Account.tsx         |   5 +-
 packages/app-accounts/src/Overview.tsx        |   8 +-
 packages/app-accounts/src/Vanity/index.tsx    |  10 +-
 packages/app-accounts/src/modals/Backup.tsx   |   5 +-
 .../app-accounts/src/modals/ChangePass.tsx    |   4 +-
 packages/app-accounts/src/modals/Create.tsx   |   4 +-
 .../src/modals/CreateConfirmation.tsx         |   4 +-
 packages/app-accounts/src/modals/Import.tsx   |   4 +-
 packages/app-accounts/src/modals/Qr.tsx       |   4 +-
 packages/app-accounts/src/modals/Transfer.tsx |   4 +-
 packages/app-address-book/src/Address.tsx     |   5 +-
 packages/app-address-book/src/Overview.tsx    |   2 +-
 .../app-address-book/src/modals/Create.tsx    |   4 +-
 packages/app-claims/src/index.tsx             |   4 +-
 packages/app-contracts/src/Codes/Add.tsx      |   2 +-
 packages/app-contracts/src/Codes/Code.tsx     |   2 +-
 packages/app-contracts/src/Codes/Upload.tsx   |   2 +-
 packages/app-contracts/src/Codes/index.tsx    |   4 +-
 packages/app-contracts/src/Contracts/Add.tsx  |   2 +-
 packages/app-contracts/src/Contracts/Call.tsx |   4 +-
 .../app-contracts/src/Contracts/Contract.tsx  |   4 +-
 .../app-contracts/src/Contracts/index.tsx     |   4 +-
 packages/app-contracts/src/Deploy.tsx         |  10 +-
 packages/app-contracts/src/Modal.tsx          |   2 +-
 packages/app-contracts/src/RemoveABI.tsx      |   4 +-
 packages/app-council/src/Motions/Propose.tsx  |   2 +-
 .../src/Overview/SubmitCandidacy.tsx          |   2 +-
 packages/app-council/src/Overview/Vote.tsx    |   4 +-
 .../app-democracy/src/Overview/Seconding.tsx  |   6 +-
 .../app-democracy/src/Overview/Voting.tsx     |   8 +-
 packages/app-democracy/src/Propose.tsx        |   2 +-
 packages/app-extrinsics/src/Selection.tsx     |   4 +-
 packages/app-generic-asset/src/Assets.tsx     |   2 +-
 packages/app-generic-asset/src/Transfer.tsx   | 144 +++++++--------
 .../app-generic-asset/src/modals/Create.tsx   | 139 +++++----------
 packages/app-js/src/ActionButtons.tsx         |   1 +
 packages/app-settings/src/Developer.tsx       |   4 +-
 packages/app-settings/src/General.tsx         |   4 +-
 .../src/Actions/Account/BondExtra.tsx         |   4 +-
 .../InputValidationUnstakeThreshold.tsx       |  61 +++----
 .../src/Actions/Account/Nominate.tsx          |   4 +-
 .../Actions/Account/SetControllerAccount.tsx  |   4 +-
 .../Actions/Account/SetRewardDestination.tsx  |   4 +-
 .../src/Actions/Account/SetSessionAccount.tsx |   4 +-
 .../src/Actions/Account/Unbond.tsx            |   4 +-
 .../src/Actions/Account/Validate.tsx          |   4 +-
 .../app-staking/src/Actions/Account/index.tsx |   8 +-
 packages/app-staking/src/Actions/Accounts.tsx |   2 +-
 packages/app-staking/src/Actions/NewStake.tsx |   4 +-
 packages/app-sudo/src/SetKey.tsx              |   2 +-
 packages/app-sudo/src/Sudo.tsx                |   2 +-
 packages/app-toolbox/src/Rpc/Selection.tsx    |   2 +-
 packages/app-toolbox/src/Sign.tsx             |   2 +-
 packages/app-toolbox/src/Unlock.tsx           |   4 +-
 .../app-treasury/src/Overview/Approve.tsx     |   2 +-
 .../app-treasury/src/Overview/Propose.tsx     |   2 +-
 packages/app-treasury/src/Settings.tsx        |   4 +-
 packages/react-api/src/with/callDiv.tsx       |  24 ++-
 .../react-components/src/Button/Button.tsx    | 101 +++++------
 .../react-components/src/Button/Group.tsx     |  36 ++--
 packages/react-components/src/Button/types.ts |   3 +-
 packages/react-components/src/Forget.tsx      |   4 +-
 packages/react-components/src/InputFile.tsx   | 167 ++++++++----------
 packages/react-components/src/InputNumber.tsx |   1 +
 packages/react-components/src/Messages.tsx    |   2 +-
 packages/react-components/src/TxButton.tsx    |  12 +-
 packages/react-components/src/TxModal.tsx     |   4 +-
 packages/react-components/src/Voting.tsx      |   2 +-
 packages/react-params/src/Param/Vector.tsx    |   4 +-
 packages/react-signer/src/Modal.tsx           |   4 +-
 71 files changed, 403 insertions(+), 515 deletions(-)

diff --git a/packages/app-123code/src/Transfer.tsx b/packages/app-123code/src/Transfer.tsx
index e945d3a30c..cebe842755 100644
--- a/packages/app-123code/src/Transfer.tsx
+++ b/packages/app-123code/src/Transfer.tsx
@@ -42,8 +42,8 @@ export default class Transfer extends TxComponent<Props, State> {
             <Button.Group>
               <TxButton
                 accountId={accountId}
+                icon='send'
                 label='make transfer'
-                labelIcon='send'
                 params={[recipientId, amount]}
                 tx='balances.transfer'
                 ref={this.button}
diff --git a/packages/app-accounts/src/Account.tsx b/packages/app-accounts/src/Account.tsx
index c6f9407e8c..31b1ede20d 100644
--- a/packages/app-accounts/src/Account.tsx
+++ b/packages/app-accounts/src/Account.tsx
@@ -7,7 +7,7 @@ import { I18nProps } from '@polkadot/react-components/types';
 
 import React, { useState, useEffect } from 'react';
 import styled from 'styled-components';
-import { AddressCard, AddressInfo, Button, ChainLock, Forget, Icon } from '@polkadot/react-components';
+import { AddressCard, AddressInfo, Button, ChainLock, Forget } from '@polkadot/react-components';
 import keyring from '@polkadot/ui-keyring';
 
 import Backup from './modals/Backup';
@@ -101,8 +101,9 @@ function Account ({ address, className, t }: Props): React.ReactElement<Props> {
               </>
             )}
             <Button
+              icon='paper plane'
               isPrimary
-              label={<><Icon name='paper plane' /> {t('send')}</>}
+              label={t('send')}
               onClick={_toggleTransfer}
               size='small'
               tooltip={t('Send funds from this account')}
diff --git a/packages/app-accounts/src/Overview.tsx b/packages/app-accounts/src/Overview.tsx
index 86a3d0aa9e..f8ce3b179a 100644
--- a/packages/app-accounts/src/Overview.tsx
+++ b/packages/app-accounts/src/Overview.tsx
@@ -52,32 +52,32 @@ function Overview ({ accounts = [], onStatusChange, t }: Props): React.ReactElem
       buttons={
         <Button.Group>
           <Button
+            icon='add'
             isPrimary
             label={t('Add account')}
-            labelIcon='add'
             onClick={_toggleCreate}
           />
           <Button.Or />
           <Button
+            icon='sync'
             isPrimary
             label={t('Restore JSON')}
-            labelIcon='sync'
             onClick={_toggleImport}
           />
           <Button.Or />
           <Button
+            icon='qrcode'
             isPrimary
             label={t('Add via Qr')}
-            labelIcon='qrcode'
             onClick={_toggleQr}
           />
           {isLedger() && (
             <>
               <Button.Or />
               <Button
+                icon='question'
                 isPrimary
                 label={t('Query Ledger')}
-                labelIcon='question'
                 onClick={queryLedger}
               />
             </>
diff --git a/packages/app-accounts/src/Vanity/index.tsx b/packages/app-accounts/src/Vanity/index.tsx
index a5b1c4c4f8..73d5ebb12b 100644
--- a/packages/app-accounts/src/Vanity/index.tsx
+++ b/packages/app-accounts/src/Vanity/index.tsx
@@ -95,6 +95,11 @@ class VanityApp extends TxComponent<Props, State> {
     return (
       <Button.Group>
         <Button
+          icon={
+            isRunning
+              ? 'stop'
+              : 'sign-in'
+          }
           isDisabled={!isMatchValid}
           isPrimary={!isRunning}
           onClick={this.toggleStart}
@@ -103,11 +108,6 @@ class VanityApp extends TxComponent<Props, State> {
               ? t('Stop generation')
               : t('Start generation')
           }
-          labelIcon={
-            isRunning
-              ? 'stop'
-              : 'sign-in'
-          }
           ref={this.button}
         />
       </Button.Group>
diff --git a/packages/app-accounts/src/modals/Backup.tsx b/packages/app-accounts/src/modals/Backup.tsx
index 86e0eb0472..663f408c7f 100644
--- a/packages/app-accounts/src/modals/Backup.tsx
+++ b/packages/app-accounts/src/modals/Backup.tsx
@@ -52,17 +52,16 @@ class Backup extends TxComponent<Props, State> {
       <Modal.Actions>
         <Button.Group>
           <Button
+            icon='cancel'
             isNegative
             label={t('Cancel')}
-            labelIcon='cancel'
             onClick={onClose}
           />
           <Button.Or />
           <Button
+            icon='download'
             isDisabled={!isPassValid}
-            isPrimary
             label={t('Download')}
-            labelIcon='download'
             onClick={this.doBackup}
             ref={this.button}
           />
diff --git a/packages/app-accounts/src/modals/ChangePass.tsx b/packages/app-accounts/src/modals/ChangePass.tsx
index 6dd12d64b0..37c86d705e 100644
--- a/packages/app-accounts/src/modals/ChangePass.tsx
+++ b/packages/app-accounts/src/modals/ChangePass.tsx
@@ -55,17 +55,17 @@ class ChangePass extends TxComponent<Props, State> {
       <Modal.Actions>
         <Button.Group>
           <Button
+            icon='cancel'
             isNegative
             label={t('Cancel')}
-            labelIcon='cancel'
             onClick={onClose}
           />
           <Button.Or />
           <Button
+            icon='sign-in'
             isDisabled={!isNewValid || !isOldValid}
             isPrimary
             label={t('Change')}
-            labelIcon='sign-in'
             onClick={this.doChange}
             ref={this.button}
           />
diff --git a/packages/app-accounts/src/modals/Create.tsx b/packages/app-accounts/src/modals/Create.tsx
index 274bac0678..7b01054fde 100644
--- a/packages/app-accounts/src/modals/Create.tsx
+++ b/packages/app-accounts/src/modals/Create.tsx
@@ -170,17 +170,17 @@ class Create extends React.PureComponent<Props, State> {
         <Modal.Actions>
           <Button.Group>
             <Button
+              icon='cancel'
               isNegative
               label={t('Cancel')}
-              labelIcon='cancel'
               onClick={this.onDiscard}
             />
             <Button.Or />
             <Button
+              icon='plus'
               isDisabled={!isValid}
               isPrimary
               label={t('Save')}
-              labelIcon='plus'
               onClick={this.onShowWarning}
             />
           </Button.Group>
diff --git a/packages/app-accounts/src/modals/CreateConfirmation.tsx b/packages/app-accounts/src/modals/CreateConfirmation.tsx
index 83a2cd9e46..2ae9da1454 100644
--- a/packages/app-accounts/src/modals/CreateConfirmation.tsx
+++ b/packages/app-accounts/src/modals/CreateConfirmation.tsx
@@ -38,16 +38,16 @@ function CreateConfirmation ({ address, name, onCommit, onHideWarning, t }: Prop
       <Modal.Actions>
         <Button.Group>
           <Button
+            icon='cancel'
             isNegative
             label={t('Cancel')}
-            labelIcon='cancel'
             onClick={onHideWarning}
           />
           <Button.Or />
           <Button
+            icon='plus'
             isPrimary
             label={t('Create and backup account')}
-            labelIcon='plus'
             onClick={onCommit}
           />
         </Button.Group>
diff --git a/packages/app-accounts/src/modals/Import.tsx b/packages/app-accounts/src/modals/Import.tsx
index 18d8a3c654..a9d0305dcc 100644
--- a/packages/app-accounts/src/modals/Import.tsx
+++ b/packages/app-accounts/src/modals/Import.tsx
@@ -48,18 +48,18 @@ class Import extends TxComponent<Props, State> {
         <Modal.Actions>
           <Button.Group>
             <Button
+              icon='cancel'
               isNegative
               label={t('Cancel')}
-              labelIcon='cancel'
               onClick={onClose}
             />
             <Button.Or />
             <Button
+              icon='sync'
               isDisabled={!isFileValid || !isPassValid}
               isPrimary
               onClick={this.onSave}
               label={t('Restore')}
-              labelIcon='sync'
               ref={this.button}
             />
           </Button.Group>
diff --git a/packages/app-accounts/src/modals/Qr.tsx b/packages/app-accounts/src/modals/Qr.tsx
index b604fe53e1..8e812c5f62 100644
--- a/packages/app-accounts/src/modals/Qr.tsx
+++ b/packages/app-accounts/src/modals/Qr.tsx
@@ -86,18 +86,18 @@ function QrModal ({ className, onClose, onStatusChange, t }: Props): React.React
       <Modal.Actions>
         <Button.Group>
           <Button
+            icon='cancel'
             isNegative
             label={t('Cancel')}
-            labelIcon='cancel'
             onClick={onClose}
           />
           <Button.Or />
           <Button
+            icon='sign-in'
             isDisabled={!scanned || !isNameValid}
             isPrimary
             onClick={_onSave}
             label={t('Create')}
-            labelIcon='sign-in'
           />
         </Button.Group>
       </Modal.Actions>
diff --git a/packages/app-accounts/src/modals/Transfer.tsx b/packages/app-accounts/src/modals/Transfer.tsx
index 0fe3e55b80..cbb66b135f 100644
--- a/packages/app-accounts/src/modals/Transfer.tsx
+++ b/packages/app-accounts/src/modals/Transfer.tsx
@@ -121,19 +121,19 @@ class Transfer extends React.PureComponent<Props, State> {
         <Modal.Actions>
           <Button.Group>
             <Button
+              icon='cancel'
               isNegative
               label={t('Cancel')}
-              labelIcon='cancel'
               onClick={onClose}
             />
             <Button.Or />
             <TxButton
               accountId={senderId}
               extrinsic={extrinsic}
+              icon='send'
               isDisabled={!hasAvailable}
               isPrimary
               label={t('Make Transfer')}
-              labelIcon='send'
               onStart={onClose}
               withSpinner={false}
             />
diff --git a/packages/app-address-book/src/Address.tsx b/packages/app-address-book/src/Address.tsx
index ea02fa849f..ca70569cf1 100644
--- a/packages/app-address-book/src/Address.tsx
+++ b/packages/app-address-book/src/Address.tsx
@@ -8,7 +8,7 @@ import { I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
 import styled from 'styled-components';
-import { AddressCard, AddressInfo, Button, ChainLock, Forget, Icon } from '@polkadot/react-components';
+import { AddressCard, AddressInfo, Button, ChainLock, Forget } from '@polkadot/react-components';
 import keyring from '@polkadot/ui-keyring';
 
 import Transfer from '@polkadot/app-accounts/modals/Transfer';
@@ -69,9 +69,10 @@ class Address extends React.PureComponent<Props, State> {
                 />
               )}
               <Button
+                icon='paper plane'
                 isPrimary
                 key='deposit'
-                label={<><Icon name='paper plane' /> {t('deposit')}</>}
+                label={t('deposit')}
                 onClick={this.toggleTransfer}
                 size='small'
                 tooltip={t('Send funds to this address')}
diff --git a/packages/app-address-book/src/Overview.tsx b/packages/app-address-book/src/Overview.tsx
index 83dca50521..b54cf8209e 100644
--- a/packages/app-address-book/src/Overview.tsx
+++ b/packages/app-address-book/src/Overview.tsx
@@ -30,9 +30,9 @@ function Overview ({ addresses, onStatusChange, t }: Props): React.ReactElement<
       buttons={
         <Button.Group>
           <Button
+            icon='add'
             isPrimary
             label={t('Add contact')}
-            labelIcon='add'
             onClick={_toggleCreate}
           />
         </Button.Group>
diff --git a/packages/app-address-book/src/modals/Create.tsx b/packages/app-address-book/src/modals/Create.tsx
index f0ca105f21..ba12739bf7 100644
--- a/packages/app-address-book/src/modals/Create.tsx
+++ b/packages/app-address-book/src/modals/Create.tsx
@@ -76,18 +76,18 @@ class Create extends React.PureComponent<Props, State> {
         <Modal.Actions>
           <Button.Group>
             <Button
+              icon='cancel'
               isNegative
               onClick={this.onDiscard}
               label={t('Cancel')}
-              labelIcon='cancel'
             />
             <Button.Or />
             <Button
+              icon='save'
               isDisabled={!isValid}
               isPrimary
               onClick={this.onCommit}
               label={t('Save')}
-              labelIcon='save'
             />
           </Button.Group>
         </Modal.Actions>
diff --git a/packages/app-claims/src/index.tsx b/packages/app-claims/src/index.tsx
index 62aa293b46..a44a79ccd7 100644
--- a/packages/app-claims/src/index.tsx
+++ b/packages/app-claims/src/index.tsx
@@ -132,10 +132,10 @@ class App extends TxModal<Props, State> {
               {(step === Step.Account) && (
                 <Button.Group>
                   <Button
+                    icon='sign-in'
                     isPrimary
                     onClick={this.setStep(Step.Sign)}
                     label={t('Continue')}
-                    labelIcon='sign-in'
                   />
                 </Button.Group>
               )}
@@ -171,11 +171,11 @@ class App extends TxModal<Props, State> {
                 {(step === Step.Sign) && (
                   <Button.Group>
                     <Button
+                      icon='sign-in'
                       isDisabled={!accountId || !signature}
                       isPrimary
                       onClick={this.setStep(Step.Claim)}
                       label={t('Confirm claim')}
-                      labelIcon='sign-in'
                     />
                   </Button.Group>
                 )}
diff --git a/packages/app-contracts/src/Codes/Add.tsx b/packages/app-contracts/src/Codes/Add.tsx
index 4756227d7c..7c5437e3a8 100644
--- a/packages/app-contracts/src/Codes/Add.tsx
+++ b/packages/app-contracts/src/Codes/Add.tsx
@@ -65,10 +65,10 @@ class Add extends ContractModal<Props, State> {
       <Button.Group>
         {this.renderCancelButton()}
         <Button
+          icon='save'
           isDisabled={!isValid}
           isPrimary
           label={t('Save')}
-          labelIcon='save'
           onClick={this.onSave}
           ref={this.button}
         />
diff --git a/packages/app-contracts/src/Codes/Code.tsx b/packages/app-contracts/src/Codes/Code.tsx
index ff1df76e8a..d140da93c5 100644
--- a/packages/app-contracts/src/Codes/Code.tsx
+++ b/packages/app-contracts/src/Codes/Code.tsx
@@ -74,9 +74,9 @@ class Contract extends React.PureComponent<Props, State> {
           tooltip={t('Forget this code hash')}
         />
         <Button
+          icon='cloud upload'
           isPrimary
           label={t('deploy')}
-          labelIcon='cloud upload'
           onClick={showDeploy(codeHash)}
           size='small'
           tooltip={t('Deploy this code hash as a smart contract')}
diff --git a/packages/app-contracts/src/Codes/Upload.tsx b/packages/app-contracts/src/Codes/Upload.tsx
index 10b14af83e..3579a8dc51 100644
--- a/packages/app-contracts/src/Codes/Upload.tsx
+++ b/packages/app-contracts/src/Codes/Upload.tsx
@@ -73,10 +73,10 @@ class Upload extends ContractModal<Props, State> {
         {this.renderCancelButton()}
         <TxButton
           accountId={accountId}
+          icon='upload'
           isDisabled={!isValid}
           isPrimary
           label={t('Upload')}
-          labelIcon='upload'
           onClick={this.toggleBusy(true)}
           onSuccess={this.onSuccess}
           onFailed={this.toggleBusy(false)}
diff --git a/packages/app-contracts/src/Codes/index.tsx b/packages/app-contracts/src/Codes/index.tsx
index fd68c8938a..865e4242b0 100644
--- a/packages/app-contracts/src/Codes/index.tsx
+++ b/packages/app-contracts/src/Codes/index.tsx
@@ -39,15 +39,15 @@ class Codes extends React.PureComponent<Props, State> {
           buttons={
             <Button.Group>
               <Button
+                icon='upload'
                 isPrimary
                 label={t('Upload WASM')}
-                labelIcon='upload'
                 onClick={this.showUpload}
               />
               <Button.Or />
               <Button
+                icon='add'
                 label={t('Add an existing code hash')}
-                labelIcon='add'
                 onClick={this.showAdd}
               />
             </Button.Group>
diff --git a/packages/app-contracts/src/Contracts/Add.tsx b/packages/app-contracts/src/Contracts/Add.tsx
index 113ac9352e..4725a196c3 100644
--- a/packages/app-contracts/src/Contracts/Add.tsx
+++ b/packages/app-contracts/src/Contracts/Add.tsx
@@ -78,10 +78,10 @@ class Add extends ContractModal<Props, State> {
       <Button.Group>
         {this.renderCancelButton()}
         <Button
+          icon='save'
           isDisabled={!isValid}
           isPrimary
           label={t('Save')}
-          labelIcon='save'
           onClick={this.onAdd}
           ref={this.button}
         />
diff --git a/packages/app-contracts/src/Contracts/Call.tsx b/packages/app-contracts/src/Contracts/Call.tsx
index 3455c6d9ce..ca83264470 100644
--- a/packages/app-contracts/src/Contracts/Call.tsx
+++ b/packages/app-contracts/src/Contracts/Call.tsx
@@ -189,18 +189,18 @@ class Call extends TxComponent<Props, State> {
     return (
       <Button.Group>
         <Button
+          icon='cancel'
           isNegative
           onClick={this.onClose}
           label={t('Cancel')}
-          labelIcon='cancel'
         />
         <Button.Or />
         <TxButton
           accountId={accountId}
+          icon='sign-in'
           isDisabled={!isValid}
           isPrimary
           label={t('Call')}
-          labelIcon='sign-in'
           onClick={this.toggleBusy}
           onFailed={this.toggleBusy}
           onSuccess={this.toggleBusy}
diff --git a/packages/app-contracts/src/Contracts/Contract.tsx b/packages/app-contracts/src/Contracts/Contract.tsx
index 960b484ec1..b6a0463560 100644
--- a/packages/app-contracts/src/Contracts/Contract.tsx
+++ b/packages/app-contracts/src/Contracts/Contract.tsx
@@ -128,16 +128,16 @@ class Contract extends React.PureComponent<Props, State> {
     return (
       <div className='contracts--Contract-buttons'>
         <Button
+          icon='trash'
           isNegative
           onClick={this.toggleForget}
-          icon='trash'
           size='small'
           tooltip={t('Forget this contract')}
         />
         <Button
+          icon='play'
           isPrimary
           label={t('execute')}
-          labelIcon='play'
           onClick={(): void => onCall(address)}
           size='small'
           tooltip={t('Call a method on this contract')}
diff --git a/packages/app-contracts/src/Contracts/index.tsx b/packages/app-contracts/src/Contracts/index.tsx
index 1562be0f41..5e92afe258 100644
--- a/packages/app-contracts/src/Contracts/index.tsx
+++ b/packages/app-contracts/src/Contracts/index.tsx
@@ -45,18 +45,18 @@ class Contracts extends React.PureComponent<Props, State> {
               {hasCode && (
                 <>
                   <Button
+                    icon='cloud upload'
                     isPrimary
                     label={t('Deploy a code hash')}
-                    labelIcon='cloud upload'
                     onClick={showDeploy()}
                   />
                   <Button.Or />
                 </>
               )}
               <Button
+                icon='add'
                 isPrimary
                 label={t('Add an existing contract')}
-                labelIcon='add'
                 onClick={this.showAdd}
               />
             </Button.Group>
diff --git a/packages/app-contracts/src/Deploy.tsx b/packages/app-contracts/src/Deploy.tsx
index 1f1f7b0ba3..ed69dbfedd 100644
--- a/packages/app-contracts/src/Deploy.tsx
+++ b/packages/app-contracts/src/Deploy.tsx
@@ -202,15 +202,21 @@ class Deploy extends ContractModal<Props, State> {
         {this.renderCancelButton()}
         <TxButton
           accountId={accountId}
+          icon='cloud upload'
           isDisabled={!isValid}
           isPrimary
           label={t('Deploy')}
-          labelIcon='cloud upload'
           onClick={this.toggleBusy(true)}
           onFailed={this.toggleBusy(false)}
           onSuccess={this.onSuccess}
           params={this.constructCall}
-          tx={api.tx.contracts ? (api.tx.contracts.instantiate ? 'contracts.instantiate' : 'contracts.create') : 'contract.create'}
+          tx={
+            api.tx.contracts
+              ? api.tx.contracts.instantiate
+                ? 'contracts.instantiate' // V2 (new)
+                : 'contracts.create' // V2 (old)
+              : 'contract.create' // V1
+          }
           ref={this.button}
         />
       </Button.Group>
diff --git a/packages/app-contracts/src/Modal.tsx b/packages/app-contracts/src/Modal.tsx
index 41d60572d7..1446431308 100644
--- a/packages/app-contracts/src/Modal.tsx
+++ b/packages/app-contracts/src/Modal.tsx
@@ -169,10 +169,10 @@ class ContractModal<P extends ContractModalProps, S extends ContractModalState>
     return (
       <>
         <Button
+          icon='cancel'
           isNegative
           onClick={this.onClose}
           label={t('Cancel')}
-          labelIcon='cancel'
         />
         <Button.Or />
       </>
diff --git a/packages/app-contracts/src/RemoveABI.tsx b/packages/app-contracts/src/RemoveABI.tsx
index 78b3cb2747..1ffbddf8ec 100644
--- a/packages/app-contracts/src/RemoveABI.tsx
+++ b/packages/app-contracts/src/RemoveABI.tsx
@@ -46,14 +46,14 @@ function RemoveABI ({ code, onClose, onRemove, t }: Props): React.ReactElement<P
             isNegative
             onClick={onClose}
             label={t('Cancel')}
-            labelIcon='cancel'
+            icon='cancel'
           />
           <Button.Or />
           <Button
             isPrimary
             onClick={_onRemove}
             label={t('Remove')}
-            labelIcon='trash'
+            icon='trash'
           />
         </Button.Group>
       </Modal.Actions>
diff --git a/packages/app-council/src/Motions/Propose.tsx b/packages/app-council/src/Motions/Propose.tsx
index fa0921e71b..80df58001e 100644
--- a/packages/app-council/src/Motions/Propose.tsx
+++ b/packages/app-council/src/Motions/Propose.tsx
@@ -76,7 +76,7 @@ class Propose extends TxModal<Props, State> {
         <Button
           isPrimary
           label={t('Propose a council motion')}
-          labelIcon='add'
+          icon='add'
           onClick={this.showModal}
         />
       </Button.Group>
diff --git a/packages/app-council/src/Overview/SubmitCandidacy.tsx b/packages/app-council/src/Overview/SubmitCandidacy.tsx
index c4adea33bf..81277311f4 100644
--- a/packages/app-council/src/Overview/SubmitCandidacy.tsx
+++ b/packages/app-council/src/Overview/SubmitCandidacy.tsx
@@ -43,7 +43,7 @@ class SubmitCandidacy extends TxModal<Props, State> {
       <Button
         isPrimary
         label={t('Submit candidacy')}
-        labelIcon='add'
+        icon='add'
         onClick={this.showModal}
       />
     );
diff --git a/packages/app-council/src/Overview/Vote.tsx b/packages/app-council/src/Overview/Vote.tsx
index af05e17679..7e3a72a2d7 100644
--- a/packages/app-council/src/Overview/Vote.tsx
+++ b/packages/app-council/src/Overview/Vote.tsx
@@ -161,7 +161,7 @@ class Vote extends TxModal<Props, State> {
         isDisabled={candidates.length === 0}
         isPrimary
         label={t('Vote')}
-        labelIcon='check'
+        icon='check'
         onClick={this.showModal}
       />
     );
@@ -185,7 +185,7 @@ class Vote extends TxModal<Props, State> {
                   accountId={accountId}
                   isNegative
                   label={t('Retract vote')}
-                  labelIcon='delete'
+                  icon='delete'
                   onSuccess={this.onRetractVote}
                   params={[voterPositions[accountId].globalIndex]}
                   tx='elections.retractVoter'
diff --git a/packages/app-democracy/src/Overview/Seconding.tsx b/packages/app-democracy/src/Overview/Seconding.tsx
index bfd5cc5933..f38eba81b1 100644
--- a/packages/app-democracy/src/Overview/Seconding.tsx
+++ b/packages/app-democracy/src/Overview/Seconding.tsx
@@ -56,7 +56,7 @@ function Seconding ({ allAccounts, depositors, proposalId, t }: Props): React.Re
                 isNegative
                 onClick={_toggleSeconding}
                 label={t('Cancel')}
-                labelIcon='cancel'
+                icon='cancel'
               />
               <Button.Or />
               <TxButton
@@ -64,7 +64,7 @@ function Seconding ({ allAccounts, depositors, proposalId, t }: Props): React.Re
                 isDisabled={!accountId || isDepositor}
                 isPrimary
                 label={t('Second')}
-                labelIcon='sign-in'
+                icon='sign-in'
                 onClick={_toggleSeconding}
                 params={[proposalId]}
                 tx='democracy.second'
@@ -77,7 +77,7 @@ function Seconding ({ allAccounts, depositors, proposalId, t }: Props): React.Re
         <Button
           isPrimary
           label={t('Second proposal')}
-          labelIcon='toggle off'
+          icon='toggle off'
           onClick={_toggleSeconding}
         />
       </div>
diff --git a/packages/app-democracy/src/Overview/Voting.tsx b/packages/app-democracy/src/Overview/Voting.tsx
index 1880d92b5f..ff901325e6 100644
--- a/packages/app-democracy/src/Overview/Voting.tsx
+++ b/packages/app-democracy/src/Overview/Voting.tsx
@@ -61,18 +61,18 @@ function Voting ({ allAccounts, referendumId, t }: Props): React.ReactElement<Pr
           <Modal.Actions>
             <Button.Group>
               <Button
+                icon='cancel'
                 isNegative
-                onClick={_toggleVoting}
                 label={t('Cancel')}
-                labelIcon='cancel'
+                onClick={_toggleVoting}
               />
               <Button.Or />
               <TxButton
                 accountId={accountId}
+                icon='check'
                 isDisabled={!accountId}
                 isPrimary
                 label={t('Vote')}
-                labelIcon='check'
                 onClick={_toggleVoting}
                 params={[referendumId, voteValue]}
                 tx='democracy.vote'
@@ -83,9 +83,9 @@ function Voting ({ allAccounts, referendumId, t }: Props): React.ReactElement<Pr
       )}
       <div className='ui--Row-buttons'>
         <Button
+          icon='check'
           isPrimary
           label={t('Vote')}
-          labelIcon='check'
           onClick={_toggleVoting}
         />
       </div>
diff --git a/packages/app-democracy/src/Propose.tsx b/packages/app-democracy/src/Propose.tsx
index 41fedce6df..1d7470be07 100644
--- a/packages/app-democracy/src/Propose.tsx
+++ b/packages/app-democracy/src/Propose.tsx
@@ -66,7 +66,7 @@ class Propose extends TxComponent<Props, State> {
           <TxButton
             accountId={accountId}
             label={t('Submit Proposal')}
-            labelIcon='sign-in'
+            icon='sign-in'
             tx='democracy.propose'
             isDisabled={!isValid}
             params={[
diff --git a/packages/app-extrinsics/src/Selection.tsx b/packages/app-extrinsics/src/Selection.tsx
index b40a1ea336..88872b3e5e 100644
--- a/packages/app-extrinsics/src/Selection.tsx
+++ b/packages/app-extrinsics/src/Selection.tsx
@@ -79,7 +79,7 @@ class Selection extends TxComponent<Props, State> {
             isDisabled={!isValidUnsigned}
             isUnsigned
             label={t('Submit Unsigned')}
-            labelIcon='sign-in'
+            icon='sign-in'
             extrinsic={extrinsic}
           />
           <Button.Or />
@@ -88,7 +88,7 @@ class Selection extends TxComponent<Props, State> {
             isDisabled={!isValid}
             isPrimary
             label={t('Submit Transaction')}
-            labelIcon='sign-in'
+            icon='sign-in'
             extrinsic={extrinsic}
             ref={this.button}
           />
diff --git a/packages/app-generic-asset/src/Assets.tsx b/packages/app-generic-asset/src/Assets.tsx
index 9ceaaef62d..febd605d50 100644
--- a/packages/app-generic-asset/src/Assets.tsx
+++ b/packages/app-generic-asset/src/Assets.tsx
@@ -34,7 +34,7 @@ function Assets ({ assets, t }: Props): React.ReactElement<Props> {
           <Button
             isPrimary
             label={t('Register Asset')}
-            labelIcon='registered'
+            icon='registered'
             onClick={_toggleCreate}
           />
         </Button.Group>
diff --git a/packages/app-generic-asset/src/Transfer.tsx b/packages/app-generic-asset/src/Transfer.tsx
index e79bfc4585..986ccc0b04 100644
--- a/packages/app-generic-asset/src/Transfer.tsx
+++ b/packages/app-generic-asset/src/Transfer.tsx
@@ -53,10 +53,72 @@ class Transfer extends React.PureComponent<Props> {
   }
 
   public render (): React.ReactNode {
+    const { assets, className, onClose, recipientId: propRecipientId, senderId: propSenderId, t } = this.props;
+    const { extrinsic, hasAvailable, recipientId, senderId, assetId } = this.state;
+    const available = <span className='label'>{t('available ')}</span>;
+    const options = assets
+      ? Object.entries(assets)
+        .map(([id, name]): { value: string; text: string } => ({
+          value: id,
+          text: `${name} (${id})`
+        }))
+      : [];
+
     return (
       <div>
-        {this.renderContent()}
-        {this.renderButtons()}
+        <div className={className}>
+          <InputAddress
+            defaultValue={propSenderId}
+            help={t('The account you will send funds from.')}
+            isDisabled={!!propSenderId}
+            label={t('send from account')}
+            labelExtra={<Available label={available} params={senderId} />}
+            onChange={this.onChangeFrom}
+            type='account'
+          />
+          <InputAddress
+            defaultValue={propRecipientId}
+            help={t('Select a contact or paste the address you want to send funds to.')}
+            isDisabled={!!propRecipientId}
+            label={t('send to address')}
+            labelExtra={<Available label={available} params={recipientId} />}
+            onChange={this.onChangeTo}
+            type='allPlus'
+          />
+          <Dropdown
+            allowAdd
+            help={t('Enter the Asset ID of the token you want to transfer.')}
+            label={t('asset id')}
+            onChange={this.onChangeAssetId}
+            options={options}
+            onAdd={this.onAddAssetId}
+            value={assetId}
+          />
+          <InputBalance
+            help={t('Type the amount you want to transfer. Note that you can select the unit on the right e.g sending 1 mili is equivalent to sending 0.001.')}
+            isError={!hasAvailable}
+            label={t('amount')}
+            onChange={this.onChangeAmount}
+          />
+          <Checks
+            accountId={senderId}
+            extrinsic={extrinsic}
+            isSendable
+            onChange={this.onChangeFees}
+          />
+        </div>
+        <Button.Group>
+          <TxButton
+            accountId={senderId}
+            extrinsic={extrinsic}
+            isDisabled={!hasAvailable}
+            isPrimary
+            label={t('Make Transfer')}
+            icon='send'
+            onStart={onClose}
+            withSpinner={false}
+          />
+        </Button.Group>
       </div>
     );
   }
@@ -86,84 +148,6 @@ class Transfer extends React.PureComponent<Props> {
     });
   }
 
-  private renderButtons (): React.ReactNode {
-    const { onClose, t } = this.props;
-    const { extrinsic, hasAvailable, senderId } = this.state;
-
-    return (
-      <Button.Group>
-        <TxButton
-          accountId={senderId}
-          extrinsic={extrinsic}
-          isDisabled={!hasAvailable}
-          isPrimary
-          label={t('Make Transfer')}
-          labelIcon='send'
-          onStart={onClose}
-          withSpinner={false}
-        />
-      </Button.Group>
-    );
-  }
-
-  private renderContent (): React.ReactNode {
-    const { assets, className, recipientId: propRecipientId, senderId: propSenderId, t } = this.props;
-    const { extrinsic, hasAvailable, recipientId, senderId, assetId } = this.state;
-    const available = <span className='label'>{t('available ')}</span>;
-
-    const options = assets
-      ? Object.entries(assets)
-        .map(([id, name]): { value: string; text: string } => ({
-          value: id,
-          text: `${name} (${id})`
-        }))
-      : [];
-
-    return (
-      <div className={className}>
-        <InputAddress
-          defaultValue={propSenderId}
-          help={t('The account you will send funds from.')}
-          isDisabled={!!propSenderId}
-          label={t('send from account')}
-          labelExtra={<Available label={available} params={senderId} />}
-          onChange={this.onChangeFrom}
-          type='account'
-        />
-        <InputAddress
-          defaultValue={propRecipientId}
-          help={t('Select a contact or paste the address you want to send funds to.')}
-          isDisabled={!!propRecipientId}
-          label={t('send to address')}
-          labelExtra={<Available label={available} params={recipientId} />}
-          onChange={this.onChangeTo}
-          type='allPlus'
-        />
-        <Dropdown
-          allowAdd
-          help={t('Enter the Asset ID of the token you want to transfer.')}
-          label={t('asset id')}
-          onChange={this.onChangeAssetId}
-          options={options}
-          onAdd={this.onAddAssetId}
-          value={assetId}
-        />
-        <InputBalance
-          help={t('Type the amount you want to transfer. Note that you can select the unit on the right e.g sending 1 mili is equivalent to sending 0.001.')}
-          isError={!hasAvailable}
-          label={t('amount')}
-          onChange={this.onChangeAmount}
-        />
-        <Checks
-          accountId={senderId}
-          extrinsic={extrinsic}
-          isSendable
-          onChange={this.onChangeFees}
-        />
-      </div>
-    );
-  }
-
   private onChangeAmount = (amount: BN = new BN(0)): void => {
     this.nextState({ amount });
   }
diff --git a/packages/app-generic-asset/src/modals/Create.tsx b/packages/app-generic-asset/src/modals/Create.tsx
index 524724c100..bf41688c4d 100644
--- a/packages/app-generic-asset/src/modals/Create.tsx
+++ b/packages/app-generic-asset/src/modals/Create.tsx
@@ -2,10 +2,10 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import BN from 'bn.js';
-import React from 'react';
-
 import { I18nProps } from '@polkadot/react-components/types';
+
+import BN from 'bn.js';
+import React, { useState } from 'react';
 import { InputNumber, Button, Input, Modal } from '@polkadot/react-components';
 
 import translate from '../translate';
@@ -15,74 +15,30 @@ export interface ModalProps {
   onRegister: (id: BN, name: string) => void;
 }
 
-type Props = ModalProps & I18nProps;
+interface Props extends ModalProps, I18nProps {}
 
-interface State {
-  assetId: BN;
-  name: string;
-}
+function Create ({ onClose, onRegister, t }: Props): React.ReactElement<Props> {
+  const [assetId, setAssetId] = useState(new BN(0));
+  const [name, setName] = useState('new asset');
 
-class Create extends React.PureComponent<Props, State> {
-  public state: State;
+  const _onChangeAssetId = (assetId: BN | undefined): void => setAssetId(assetId || new BN(0));
+  const _onCommit = (): void => {
+    onRegister(assetId, name);
+    onClose();
+  };
 
-  public constructor (props: Props) {
-    super(props);
-
-    this.state = this.emptyState();
-  }
-
-  public render (): React.ReactNode {
-    const { t } = this.props;
-
-    return (
-      <Modal
-        dimmer='inverted'
-        open
-      >
-        <Modal.Header>{t('Register an Asset')}</Modal.Header>
-        {this.renderContent()}
-        {this.renderButtons()}
-      </Modal>
-    );
-  }
-
-  private renderButtons (): React.ReactNode {
-    const { t } = this.props;
-    const { name } = this.state;
-
-    return (
-      <Modal.Actions>
-        <Button.Group>
-          <Button
-            isNegative
-            onClick={this.onDiscard}
-            label={t('Cancel')}
-            labelIcon='cancel'
-          />
-          <Button.Or />
-          <Button
-            isDisabled={!name}
-            isPrimary
-            onClick={this.onCommit}
-            label={t('Register')}
-            labelIcon='registered'
-          />
-        </Button.Group>
-      </Modal.Actions>
-    );
-  }
-
-  private renderContent (): React.ReactNode {
-    const { t } = this.props;
-    const { assetId, name } = this.state;
-
-    return (
+  return (
+    <Modal
+      dimmer='inverted'
+      open
+    >
+      <Modal.Header>{t('Register an Asset')}</Modal.Header>
       <Modal.Content>
         <InputNumber
           help={t('Enter the Asset ID of the token you want to manage.')}
           label={t('asset id')}
-          onChange={this.onChangeNewAssetId}
-          onEnter={this.onCommit}
+          onChange={_onChangeAssetId}
+          onEnter={_onCommit}
           value={assetId}
         />
         <Input
@@ -90,42 +46,31 @@ class Create extends React.PureComponent<Props, State> {
           help={t('Type the name of this Asset. This name will be used across all the apps. It can be edited later on.')}
           isError={!name}
           label={t('name')}
-          onChange={this.onChangeName}
-          onEnter={this.onCommit}
+          onChange={setName}
+          onEnter={_onCommit}
           value={name}
         />
       </Modal.Content>
-    );
-  }
-
-  private emptyState (): State {
-    return {
-      assetId: new BN(0),
-      name: 'new asset'
-    };
-  }
-
-  private onChangeNewAssetId = (assetId: BN | undefined): void => {
-    this.setState({ assetId: assetId || new BN(0) });
-  }
-
-  private onChangeName = (name: string): void => {
-    this.setState({ name });
-  }
-
-  private onCommit = (): void => {
-    const { onClose, onRegister } = this.props;
-    const { assetId, name } = this.state;
-
-    onRegister(assetId, name);
-    onClose();
-  }
-
-  private onDiscard = (): void => {
-    const { onClose } = this.props;
-
-    onClose();
-  }
+      <Modal.Actions>
+        <Button.Group>
+          <Button
+            isNegative
+            onClick={onClose}
+            label={t('Cancel')}
+            icon='cancel'
+          />
+          <Button.Or />
+          <Button
+            isDisabled={!name}
+            isPrimary
+            onClick={onClose}
+            label={t('Register')}
+            icon='registered'
+          />
+        </Button.Group>
+      </Modal.Actions>
+    </Modal>
+  );
 }
 
 export default translate(Create);
diff --git a/packages/app-js/src/ActionButtons.tsx b/packages/app-js/src/ActionButtons.tsx
index 47893d315f..7f54181340 100644
--- a/packages/app-js/src/ActionButtons.tsx
+++ b/packages/app-js/src/ActionButtons.tsx
@@ -107,6 +107,7 @@ function ActionButtons ({ className, generateLink, isCustomExample, isRunning, r
             withLabel={false}
           />
           <Button
+            icon='save'
             isDisabled={!snippetName.length}
             isPrimary
             label={t('Save snippet to local storage')}
diff --git a/packages/app-settings/src/Developer.tsx b/packages/app-settings/src/Developer.tsx
index 08980788bb..519454b4b1 100644
--- a/packages/app-settings/src/Developer.tsx
+++ b/packages/app-settings/src/Developer.tsx
@@ -78,7 +78,7 @@ class Developer extends React.PureComponent<Props, State> {
             isNegative
             onClick={this.clearTypes}
             label={t('Reset')}
-            labelIcon='sync'
+            icon='sync'
           />
           <Button.Or />
           <Button
@@ -86,7 +86,7 @@ class Developer extends React.PureComponent<Props, State> {
             isPrimary
             onClick={this.saveDeveloper}
             label={t('Save')}
-            labelIcon='save'
+            icon='save'
           />
         </Button.Group>
       </div>
diff --git a/packages/app-settings/src/General.tsx b/packages/app-settings/src/General.tsx
index 8b7987040e..eddd143b90 100644
--- a/packages/app-settings/src/General.tsx
+++ b/packages/app-settings/src/General.tsx
@@ -117,7 +117,7 @@ function General ({ className, isModalContent, onClose, t }: Props): React.React
             <Button
               isNegative
               label={t('Cancel')}
-              labelIcon='cancel'
+              icon='cancel'
               onClick={onClose}
             />
             <Button.Or />
@@ -136,7 +136,7 @@ function General ({ className, isModalContent, onClose, t }: Props): React.React
               ? t('Save & Reload')
               : t('Save')
           }
-          labelIcon='save'
+          icon='save'
         />
       </Button.Group>
     </div>
diff --git a/packages/app-staking/src/Actions/Account/BondExtra.tsx b/packages/app-staking/src/Actions/Account/BondExtra.tsx
index 30d49113c2..c26f2a0208 100644
--- a/packages/app-staking/src/Actions/Account/BondExtra.tsx
+++ b/packages/app-staking/src/Actions/Account/BondExtra.tsx
@@ -75,7 +75,7 @@ class BondExtra extends TxComponent<Props, State> {
               isNegative
               onClick={onClose}
               label={t('Cancel')}
-              labelIcon='cancel'
+              icon='cancel'
             />
             <Button.Or />
             <TxButton
@@ -83,7 +83,7 @@ class BondExtra extends TxComponent<Props, State> {
               isDisabled={!canSubmit}
               isPrimary
               label={t('Bond more')}
-              labelIcon='sign-in'
+              icon='sign-in'
               onClick={onClose}
               extrinsic={extrinsic}
               ref={this.button}
diff --git a/packages/app-staking/src/Actions/Account/InputValidationUnstakeThreshold.tsx b/packages/app-staking/src/Actions/Account/InputValidationUnstakeThreshold.tsx
index 966f9c30fa..42e381035b 100644
--- a/packages/app-staking/src/Actions/Account/InputValidationUnstakeThreshold.tsx
+++ b/packages/app-staking/src/Actions/Account/InputValidationUnstakeThreshold.tsx
@@ -5,7 +5,7 @@
 import { I18nProps } from '@polkadot/react-components/types';
 
 import BN from 'bn.js';
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { Icon } from '@polkadot/react-components';
 
 import translate from '../../translate';
@@ -15,50 +15,35 @@ interface Props extends I18nProps {
   onError: (error: string | null) => void;
 }
 
-interface State {
-  error: string | null;
-}
+function InputValidationUnstakeThreshold ({ onError, t, unstakeThreshold }: Props): React.ReactElement<Props> | null {
+  const [error, setError] = useState<string | null>(null);
 
-class InputValidationUnstakeThreshold extends React.PureComponent<Props, State> {
-  public state: State = {
-    error: null
-  };
+  useEffect((): void => {
+    if (unstakeThreshold) {
+      let newError = null;
 
-  public static getDerivedStateFromProps ({ onError, t, unstakeThreshold }: Props, prevState: State): State | null {
-    let error = null;
+      if (unstakeThreshold.ltn(0)) {
+        newError = t('The Threshold must be a positive number');
+      } else if (unstakeThreshold.gtn(10)) {
+        newError = t('The Threshold must lower than 11');
+      }
 
-    if (!unstakeThreshold) {
-      return null;
+      if (newError !== error) {
+        onError(newError);
+        setError(newError);
+      }
     }
+  }, [unstakeThreshold]);
 
-    if (unstakeThreshold.ltn(0)) {
-      error = t('The Threshold must be a positive number');
-    } else if (unstakeThreshold.gtn(10)) {
-      error = t('The Threshold must lower than 11');
-    }
-
-    if (error === prevState.error || !unstakeThreshold) {
-      return null;
-    }
-
-    onError(error);
-
-    return { error };
+  if (!error) {
+    return null;
   }
 
-  public render (): React.ReactNode {
-    const { error } = this.state;
-
-    if (!error) {
-      return null;
-    }
-
-    return (
-      <article className='warning'>
-        <div><Icon name='warning sign' />{error}</div>
-      </article>
-    );
-  }
+  return (
+    <article className='warning'>
+      <div><Icon name='warning sign' />{error}</div>
+    </article>
+  );
 }
 
 export default translate(InputValidationUnstakeThreshold);
diff --git a/packages/app-staking/src/Actions/Account/Nominate.tsx b/packages/app-staking/src/Actions/Account/Nominate.tsx
index 99d2b154a3..55eeec1100 100644
--- a/packages/app-staking/src/Actions/Account/Nominate.tsx
+++ b/packages/app-staking/src/Actions/Account/Nominate.tsx
@@ -66,7 +66,7 @@ function Nominate ({ controllerId, isOpen, onClose, stashId, stashOptions, t }:
             isNegative
             onClick={onClose}
             label={t('Cancel')}
-            labelIcon='cancel'
+            icon='cancel'
           />
           <Button.Or />
           <TxButton
@@ -76,7 +76,7 @@ function Nominate ({ controllerId, isOpen, onClose, stashId, stashOptions, t }:
             onClick={onClose}
             params={[nominees]}
             label={t('Nominate')}
-            labelIcon='hand paper outline'
+            icon='hand paper outline'
             tx='staking.nominate'
           />
         </Button.Group>
diff --git a/packages/app-staking/src/Actions/Account/SetControllerAccount.tsx b/packages/app-staking/src/Actions/Account/SetControllerAccount.tsx
index 2ba3740674..cc89eac5a4 100644
--- a/packages/app-staking/src/Actions/Account/SetControllerAccount.tsx
+++ b/packages/app-staking/src/Actions/Account/SetControllerAccount.tsx
@@ -90,7 +90,7 @@ class SetControllerAccount extends TxComponent<Props, State> {
               isNegative
               onClick={onClose}
               label={t('Cancel')}
-              labelIcon='cancel'
+              icon='cancel'
             />
             <Button.Or />
             <TxButton
@@ -98,7 +98,7 @@ class SetControllerAccount extends TxComponent<Props, State> {
               isDisabled={!canSubmit}
               isPrimary
               label={t('Set controller')}
-              labelIcon='sign-in'
+              icon='sign-in'
               onClick={onClose}
               params={[controllerId]}
               tx='staking.setController'
diff --git a/packages/app-staking/src/Actions/Account/SetRewardDestination.tsx b/packages/app-staking/src/Actions/Account/SetRewardDestination.tsx
index 0ab8a82d32..09e51ff8cd 100644
--- a/packages/app-staking/src/Actions/Account/SetRewardDestination.tsx
+++ b/packages/app-staking/src/Actions/Account/SetRewardDestination.tsx
@@ -49,7 +49,7 @@ class SetRewardDestination extends TxComponent<Props, State> {
               isNegative
               onClick={onClose}
               label={t('Cancel')}
-              labelIcon='cancel'
+              icon='cancel'
             />
             <Button.Or />
             <TxButton
@@ -57,7 +57,7 @@ class SetRewardDestination extends TxComponent<Props, State> {
               isDisabled={!canSubmit}
               isPrimary
               label={t('Set reward destination')}
-              labelIcon='sign-in'
+              icon='sign-in'
               onClick={onClose}
               params={[destination]}
               tx={'staking.setPayee'}
diff --git a/packages/app-staking/src/Actions/Account/SetSessionAccount.tsx b/packages/app-staking/src/Actions/Account/SetSessionAccount.tsx
index 2244827b34..2b4bcd23ed 100644
--- a/packages/app-staking/src/Actions/Account/SetSessionAccount.tsx
+++ b/packages/app-staking/src/Actions/Account/SetSessionAccount.tsx
@@ -66,7 +66,7 @@ class SetSessionKey extends React.PureComponent<Props, State> {
               isNegative
               onClick={onClose}
               label={t('Cancel')}
-              labelIcon='cancel'
+              icon='cancel'
             />
             <Button.Or />
             <TxButton
@@ -74,7 +74,7 @@ class SetSessionKey extends React.PureComponent<Props, State> {
               isDisabled={hasError}
               isPrimary
               label={t('Set Session Key')}
-              labelIcon='sign-in'
+              icon='sign-in'
               onClick={onClose}
               params={
                 isSubstrateV2
diff --git a/packages/app-staking/src/Actions/Account/Unbond.tsx b/packages/app-staking/src/Actions/Account/Unbond.tsx
index 6a77164738..d832b3172e 100644
--- a/packages/app-staking/src/Actions/Account/Unbond.tsx
+++ b/packages/app-staking/src/Actions/Account/Unbond.tsx
@@ -73,7 +73,7 @@ class Unbond extends TxComponent<Props, State> {
               isNegative
               onClick={onClose}
               label={t('Cancel')}
-              labelIcon='cancel'
+              icon='cancel'
             />
             <Button.Or />
             <TxButton
@@ -81,7 +81,7 @@ class Unbond extends TxComponent<Props, State> {
               isDisabled={!canSubmit}
               isPrimary
               label={t('Unbond')}
-              labelIcon='sign-out'
+              icon='sign-out'
               onClick={onClose}
               params={[maxUnbond]}
               tx='staking.unbond'
diff --git a/packages/app-staking/src/Actions/Account/Validate.tsx b/packages/app-staking/src/Actions/Account/Validate.tsx
index 7fc0b53847..5ee6675ea8 100644
--- a/packages/app-staking/src/Actions/Account/Validate.tsx
+++ b/packages/app-staking/src/Actions/Account/Validate.tsx
@@ -94,7 +94,7 @@ class Validate extends TxComponent<Props, State> {
           <Button
             isNegative
             label={t('Cancel')}
-            labelIcon='cancel'
+            icon='cancel'
             onClick={onClose}
           />
           <Button.Or />
@@ -103,7 +103,7 @@ class Validate extends TxComponent<Props, State> {
             isDisabled={!!unstakeThresholdError}
             isPrimary
             label={t('Validate')}
-            labelIcon='check circle outline'
+            icon='check circle outline'
             onClick={onClose}
             params={[
               isSubstrateV2
diff --git a/packages/app-staking/src/Actions/Account/index.tsx b/packages/app-staking/src/Actions/Account/index.tsx
index 6abfb8dc65..93846e994f 100644
--- a/packages/app-staking/src/Actions/Account/index.tsx
+++ b/packages/app-staking/src/Actions/Account/index.tsx
@@ -365,7 +365,7 @@ class Account extends React.PureComponent<Props, State> {
               ? t('Stop Nominating')
               : t('Stop Validating')
           }
-          labelIcon='stop'
+          icon='stop'
           key='stop'
           tx='staking.chill'
         />
@@ -378,7 +378,7 @@ class Account extends React.PureComponent<Props, State> {
             key='set'
             onClick={this.toggleSetSessionAccount}
             label={t('Set Session Key')}
-            labelIcon='sign-in'
+            icon='sign-in'
           />
         );
       } else {
@@ -388,7 +388,7 @@ class Account extends React.PureComponent<Props, State> {
             key='validate'
             onClick={this.toggleValidate}
             label={t('Validate')}
-            labelIcon='check circle outline'
+            icon='check circle outline'
           />
         );
       }
@@ -400,7 +400,7 @@ class Account extends React.PureComponent<Props, State> {
           key='nominate'
           onClick={this.toggleNominate}
           label={t('Nominate')}
-          labelIcon='hand paper outline'
+          icon='hand paper outline'
         />
       );
     }
diff --git a/packages/app-staking/src/Actions/Accounts.tsx b/packages/app-staking/src/Actions/Accounts.tsx
index a54a62e127..2efcc14009 100644
--- a/packages/app-staking/src/Actions/Accounts.tsx
+++ b/packages/app-staking/src/Actions/Accounts.tsx
@@ -56,7 +56,7 @@ function Accounts ({ allAccounts, allStashes, className, myControllers, recently
           isPrimary
           key='new-stake'
           label={t('New stake')}
-          labelIcon='add'
+          icon='add'
           onClick={_toggleNewStake}
         />
       }
diff --git a/packages/app-staking/src/Actions/NewStake.tsx b/packages/app-staking/src/Actions/NewStake.tsx
index ad7bcef8b5..fdfe215849 100644
--- a/packages/app-staking/src/Actions/NewStake.tsx
+++ b/packages/app-staking/src/Actions/NewStake.tsx
@@ -115,7 +115,7 @@ class NewStake extends TxComponent<Props, State> {
               isNegative
               onClick={onClose}
               label={t('Cancel')}
-              labelIcon='cancel'
+              icon='cancel'
             />
             <Button.Or />
             <TxButton
@@ -123,7 +123,7 @@ class NewStake extends TxComponent<Props, State> {
               isDisabled={!canSubmit}
               isPrimary
               label={t('Bond')}
-              labelIcon='sign-in'
+              icon='sign-in'
               onClick={onClose}
               extrinsic={extrinsic}
               ref={this.button}
diff --git a/packages/app-sudo/src/SetKey.tsx b/packages/app-sudo/src/SetKey.tsx
index f3eccbf5c4..ab10d0abfa 100644
--- a/packages/app-sudo/src/SetKey.tsx
+++ b/packages/app-sudo/src/SetKey.tsx
@@ -65,7 +65,7 @@ class SetKey extends React.PureComponent<Props, State> {
                   isDisabled={!isMine || sudoKey === selected}
                   isPrimary
                   label={t('Reassign')}
-                  labelIcon='sign-in'
+                  icon='sign-in'
                   params={[selected]}
                   tx='sudo.setKey'
                 />
diff --git a/packages/app-sudo/src/Sudo.tsx b/packages/app-sudo/src/Sudo.tsx
index e9da2f46bf..e4a73fd3dc 100644
--- a/packages/app-sudo/src/Sudo.tsx
+++ b/packages/app-sudo/src/Sudo.tsx
@@ -47,7 +47,7 @@ class Propose extends TxComponent<Props, State> {
             <TxButton
               accountId={sudoKey}
               label={t('Submit Sudo')}
-              labelIcon='sign-in'
+              icon='sign-in'
               tx='sudo.sudo'
               isDisabled={!method || !isValid}
               params={method ? [createType('Proposal', method)] : []}
diff --git a/packages/app-toolbox/src/Rpc/Selection.tsx b/packages/app-toolbox/src/Rpc/Selection.tsx
index 8f98d33007..46dc547a22 100644
--- a/packages/app-toolbox/src/Rpc/Selection.tsx
+++ b/packages/app-toolbox/src/Rpc/Selection.tsx
@@ -66,7 +66,7 @@ class Selection extends TxComponent<Props, State> {
             onClick={this.onSubmit}
 
             label={t('Submit RPC call')}
-            labelIcon='sign-in'
+            icon='sign-in'
             ref={this.button}
           />
         </Button.Group>
diff --git a/packages/app-toolbox/src/Sign.tsx b/packages/app-toolbox/src/Sign.tsx
index 934dfa33e9..34a45fe2b2 100644
--- a/packages/app-toolbox/src/Sign.tsx
+++ b/packages/app-toolbox/src/Sign.tsx
@@ -102,7 +102,7 @@ class Sign extends React.PureComponent<Props, State> {
               isPrimary
               onClick={this.toggleUnlock}
               label={t('Unlock account')}
-              labelIcon='unlock'
+              icon='unlock'
             />
           </Button.Group>
         </div>
diff --git a/packages/app-toolbox/src/Unlock.tsx b/packages/app-toolbox/src/Unlock.tsx
index c2a3a54cf5..60b798d41b 100644
--- a/packages/app-toolbox/src/Unlock.tsx
+++ b/packages/app-toolbox/src/Unlock.tsx
@@ -66,14 +66,14 @@ class Unlock extends TxComponent<Props, State> {
             isNegative
             onClick={this.onCancel}
             label={t('Cancel')}
-            labelIcon='cancel'
+            icon='cancel'
           />
           <Button.Or />
           <Button
             isPrimary
             onClick={this.onUnlock}
             label={t('Unlock')}
-            labelIcon='unlock'
+            icon='unlock'
             ref={this.button}
           />
         </Button.Group>
diff --git a/packages/app-treasury/src/Overview/Approve.tsx b/packages/app-treasury/src/Overview/Approve.tsx
index 8d8b75a960..c0dae3e8c6 100644
--- a/packages/app-treasury/src/Overview/Approve.tsx
+++ b/packages/app-treasury/src/Overview/Approve.tsx
@@ -63,7 +63,7 @@ class Approve extends TxModal<Props, State> {
           <Button
             isPrimary
             label={t('Respond')}
-            labelIcon='reply'
+            icon='reply'
             onClick={this.showModal}
           />
         </Button.Group>
diff --git a/packages/app-treasury/src/Overview/Propose.tsx b/packages/app-treasury/src/Overview/Propose.tsx
index 82d6166cec..9f1f0740a6 100644
--- a/packages/app-treasury/src/Overview/Propose.tsx
+++ b/packages/app-treasury/src/Overview/Propose.tsx
@@ -49,7 +49,7 @@ class Propose extends TxModal<Props, State> {
         <Button
           isPrimary
           label={t('Submit a spend proposal')}
-          labelIcon='add'
+          icon='add'
           onClick={this.showModal}
         />
       </Button.Group>
diff --git a/packages/app-treasury/src/Settings.tsx b/packages/app-treasury/src/Settings.tsx
index 302aeff829..78f58c16df 100644
--- a/packages/app-treasury/src/Settings.tsx
+++ b/packages/app-treasury/src/Settings.tsx
@@ -117,7 +117,7 @@ class Settings extends TxComponent<Props, State> {
               <TxButton
                 accountId={accountId}
                 label={t('Submit')}
-                labelIcon='sign-in'
+                icon='sign-in'
                 tx='treasury.configure'
                 params={[
                   proposalBond.toString(),
@@ -145,7 +145,7 @@ class Settings extends TxComponent<Props, State> {
               <TxButton
                 accountId={accountId}
                 label={t('Submit')}
-                labelIcon='sign-in'
+                icon='sign-in'
                 tx='treasury.setPot'
                 params={[pot]}
               />
diff --git a/packages/react-api/src/with/callDiv.tsx b/packages/react-api/src/with/callDiv.tsx
index e181053a33..5dfef8b1b8 100644
--- a/packages/react-api/src/with/callDiv.tsx
+++ b/packages/react-api/src/with/callDiv.tsx
@@ -16,20 +16,16 @@ interface Props<T> extends BaseProps<T> {
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 export default function withCallDiv<T> (endpoint: string, options: Options = {}) {
   return (render: (value?: T) => React.ReactNode, defaultProps: DefaultProps = {}): React.ComponentType<any> => {
-    class Inner extends React.PureComponent<Props<T>> {
-      public render (): React.ReactNode {
-        const { callResult, callUpdated, children, className = defaultProps.className, label = '', style } = this.props;
-
-        return (
-          <div
-            {...defaultProps}
-            className={[className, callUpdated ? 'rx--updated' : undefined].join(' ')}
-            style={style}
-          >
-            {label}{render(callResult)}{children}
-          </div>
-        );
-      }
+    function Inner ({ callResult, callUpdated, children, className = defaultProps.className, label = '', style }: any): React.ReactElement<Props<T>> {
+      return (
+        <div
+          {...defaultProps}
+          className={[className, callUpdated ? 'rx--updated' : undefined].join(' ')}
+          style={style}
+        >
+          {label}{render(callResult)}{children}
+        </div>
+      );
     }
 
     return withCall(endpoint, { ...options, propName: 'callResult' })(Inner);
diff --git a/packages/react-components/src/Button/Button.tsx b/packages/react-components/src/Button/Button.tsx
index 22e013085b..bf403fadad 100644
--- a/packages/react-components/src/Button/Button.tsx
+++ b/packages/react-components/src/Button/Button.tsx
@@ -4,7 +4,7 @@
 
 import { ButtonProps } from './types';
 
-import React from 'react';
+import React, { useState } from 'react';
 import SUIButton from 'semantic-ui-react/dist/commonjs/elements/Button/Button';
 import { isUndefined } from '@polkadot/util';
 
@@ -13,59 +13,50 @@ import Tooltip from '../Tooltip';
 
 let idCounter = 0;
 
-export default class Button extends React.PureComponent<ButtonProps> {
-  private id = `button-${++idCounter}`;
+export default function Button ({ children, className, floated, icon, isBasic = false, isCircular = false, isDisabled = false, isLoading = false, isNegative = false, isPositive = false, isPrimary = false, label, labelPosition, onClick, size, style, tabIndex, tooltip }: ButtonProps): React.ReactElement<ButtonProps> {
+  const [triggerId] = useState(`button-${++idCounter}`);
+  const props = {
+    basic: isBasic,
+    circular: isCircular,
+    className,
+    'data-tip': !!tooltip,
+    'data-for': triggerId,
+    disabled: isDisabled,
+    floated,
+    labelPosition,
+    loading: isLoading,
+    negative: isNegative,
+    onClick,
+    positive: isPositive,
+    primary: isPrimary,
+    size,
+    secondary: !isBasic && !(isPositive || isPrimary || isNegative),
+    style,
+    tabIndex
+  };
 
-  public render (): React.ReactNode {
-    const { children, className, floated, icon, isBasic = false, isCircular = false, isDisabled = false, isLoading = false, isNegative = false, isPositive = false, isPrimary = false, label, labelIcon, labelPosition, onClick, size, style, tabIndex, tooltip } = this.props;
-
-    const props = {
-      basic: isBasic,
-      circular: isCircular,
-      className,
-      'data-tip': !!tooltip,
-      'data-for': this.id,
-      disabled: isDisabled,
-      floated,
-      icon,
-      labelPosition,
-      loading: isLoading,
-      negative: isNegative,
-      onClick,
-      positive: isPositive,
-      primary: isPrimary,
-      size,
-      secondary: !isBasic && !(isPositive || isPrimary || isNegative),
-      style,
-      tabIndex
-    };
-
-    return (
-      <>
-        {
-          isUndefined(label) && isUndefined(children)
-            ? <SUIButton {...props} />
-            : (
-              <SUIButton {...props}>
-                {!!labelIcon && (
-                  <>
-                    <Icon className={labelIcon} />
-                    {'  '}
-                  </>
-                )}
-                {label}
-                {children}
-              </SUIButton>
-            )
-        }
-        {tooltip && (
-          <Tooltip
-            place='top'
-            text={tooltip}
-            trigger={this.id}
-          />
-        )}
-      </>
-    );
-  }
+  return (
+    <>
+      {
+        isUndefined(label) && isUndefined(children)
+          ? <SUIButton {...props} icon={icon} />
+          : (
+            <SUIButton {...props}>
+              {icon && (
+                <><Icon className={icon} />{'  '}</>
+              )}
+              {label}
+              {children}
+            </SUIButton>
+          )
+      }
+      {tooltip && (
+        <Tooltip
+          place='top'
+          text={tooltip}
+          trigger={triggerId}
+        />
+      )}
+    </>
+  );
 }
diff --git a/packages/react-components/src/Button/Group.tsx b/packages/react-components/src/Button/Group.tsx
index 42f9dd5e4b..688725b9bb 100644
--- a/packages/react-components/src/Button/Group.tsx
+++ b/packages/react-components/src/Button/Group.tsx
@@ -11,26 +11,22 @@ import styled from 'styled-components';
 import { classes } from '../util';
 import Divider from './Divider';
 
-class ButtonGroup extends React.PureComponent<GroupProps> {
-  public render (): React.ReactNode {
-    const { children, className, isBasic = false, isCentered = false, style } = this.props;
-
-    return (
-      <div
-        className={classes('ui--Button-Group', isCentered ? 'centered' : '', className)}
-        style={style}
-      >
-        <SUIButton.Group basic={isBasic}>
-          {
-            isBasic
-              ? null
-              : <Divider style={{ padding: '0em' }} />
-          }
-          {children}
-        </SUIButton.Group>
-      </div>
-    );
-  }
+function ButtonGroup ({ children, className, isBasic = false, isCentered = false, style }: GroupProps): React.ReactElement<GroupProps> {
+  return (
+    <div
+      className={classes('ui--Button-Group', isCentered ? 'centered' : '', className)}
+      style={style}
+    >
+      <SUIButton.Group basic={isBasic}>
+        {
+          isBasic
+            ? null
+            : <Divider style={{ padding: '0em' }} />
+        }
+        {children}
+      </SUIButton.Group>
+    </div>
+  );
 }
 
 (ButtonGroup as GroupType).Divider = Divider;
diff --git a/packages/react-components/src/Button/types.ts b/packages/react-components/src/Button/types.ts
index 0141d9012f..3f59a7287b 100644
--- a/packages/react-components/src/Button/types.ts
+++ b/packages/react-components/src/Button/types.ts
@@ -9,7 +9,7 @@ export type Button$Sizes = 'mini' | 'tiny' | 'small' | 'medium' | 'large' | 'big
 export interface ButtonProps extends BareProps {
   children?: React.ReactNode;
   floated?: 'left' | 'right';
-  icon?: string;
+  icon: string;
   isBasic?: boolean;
   isCircular?: boolean;
   isDisabled?: boolean;
@@ -18,7 +18,6 @@ export interface ButtonProps extends BareProps {
   isPositive?: boolean;
   isPrimary?: boolean;
   label?: React.ReactNode;
-  labelIcon?: string;
   labelPosition?: 'left' | 'right';
   onClick?: () => void | Promise<void>;
   ref?: any;
diff --git a/packages/react-components/src/Forget.tsx b/packages/react-components/src/Forget.tsx
index 6f8ef335f0..a82e5df8d4 100644
--- a/packages/react-components/src/Forget.tsx
+++ b/packages/react-components/src/Forget.tsx
@@ -114,14 +114,14 @@ function Forget (props: Props): React.ReactElement<Props> {
             isNegative
             onClick={onClose}
             label={t('Cancel')}
-            labelIcon='cancel'
+            icon='cancel'
           />
           <Button.Or />
           <Button
             isPrimary
             onClick={onForget}
             label={t('Forget')}
-            labelIcon='trash'
+            icon='trash'
           />
         </Button.Group>
       </Modal.Actions>
diff --git a/packages/react-components/src/InputFile.tsx b/packages/react-components/src/InputFile.tsx
index f3541509c1..915ecc207a 100644
--- a/packages/react-components/src/InputFile.tsx
+++ b/packages/react-components/src/InputFile.tsx
@@ -5,7 +5,7 @@
 import { WithTranslation } from 'react-i18next';
 import { BareProps } from './types';
 
-import React from 'react';
+import React, { useRef, useState } from 'react';
 import Dropzone from 'react-dropzone';
 import styled from 'styled-components';
 import { formatNumber } from '@polkadot/util';
@@ -29,11 +29,9 @@ interface Props extends BareProps, WithTranslation {
   withLabel?: boolean;
 }
 
-interface State {
-  file?: {
-    name: string;
-    size: number;
-  };
+interface FileState {
+  name: string;
+  size: number;
 }
 
 interface LoadEvent {
@@ -42,70 +40,16 @@ interface LoadEvent {
   };
 }
 
-class InputFile extends React.PureComponent<Props, State> {
-  private dropZone: any;
-
-  public state: State = {};
-
-  public constructor (props: Props) {
-    super(props);
-
-    this.dropZone = React.createRef();
-  }
-
-  public render (): React.ReactNode {
-    const { accept, className, clearContent, help, isDisabled, isError = false, label, placeholder, t, withEllipsis, withLabel } = this.props;
-    const { file } = this.state;
-
-    const dropZone = (
-      <Dropzone
-        accept={accept}
-        className={classes('ui--InputFile', isError ? 'error' : '', className)}
-        disabled={isDisabled}
-        multiple={false}
-        ref={this.dropZone}
-        onDrop={this.onDrop}
-      >
-        <em className='label'>
-          {
-            !file || clearContent
-              ? placeholder || t('click to select or drag and drop the file here')
-              : placeholder || t('{{name}} ({{size}} bytes)', {
-                replace: {
-                  name: file.name,
-                  size: formatNumber(file.size)
-                }
-              })
-          }
-        </em>
-      </Dropzone>
-    );
-
-    return label ? (
-      <Labelled
-        help={help}
-        label={label}
-        withEllipsis={withEllipsis}
-        withLabel={withLabel}
-      >
-        {dropZone}
-      </Labelled>
-    ) : dropZone;
-  }
-
-  private onDrop = (files: File[]): void => {
-    const { onChange } = this.props;
+function InputFile ({ accept, className, clearContent, help, isDisabled, isError = false, label, onChange, placeholder, t, withEllipsis, withLabel }: Props): React.ReactElement<Props> {
+  const dropRef = useRef<Dropzone | null>(null);
+  const [file, setFile] = useState<FileState | undefined>();
 
+  const _onDrop = (files: File[]): void => {
     files.forEach((file): void => {
       const reader = new FileReader();
 
-      reader.onabort = (): void => {
-        // ignore
-      };
-
-      reader.onerror = (): void => {
-        // ignore
-      };
+      reader.onabort = (): void => {};
+      reader.onerror = (): void => {};
 
       // ummm... events are not properly specified here?
       (reader as any).onload = ({ target: { result } }: LoadEvent): void => {
@@ -114,41 +58,78 @@ class InputFile extends React.PureComponent<Props, State> {
 
         onChange && onChange(data, name);
 
-        if (this.dropZone && this.dropZone.current) {
-          this.setState({
-            file: {
-              name,
-              size: data.length
-            }
+        if (dropRef && dropRef.current) {
+          setFile({
+            name,
+            size: data.length
           });
         }
       };
 
       reader.readAsArrayBuffer(file);
     });
-  }
+  };
+
+  const dropZone = (
+    <Dropzone
+      accept={accept}
+      className={classes('ui--InputFile', isError ? 'error' : '', className)}
+      disabled={isDisabled}
+      multiple={false}
+      ref={dropRef}
+      onDrop={_onDrop}
+    >
+      <em className='label'>
+        {
+          !file || clearContent
+            ? placeholder || t('click to select or drag and drop the file here')
+            : placeholder || t('{{name}} ({{size}} bytes)', {
+              replace: {
+                name: file.name,
+                size: formatNumber(file.size)
+              }
+            })
+        }
+      </em>
+    </Dropzone>
+  );
+
+  return label
+    ? (
+      <Labelled
+        help={help}
+        label={label}
+        withEllipsis={withEllipsis}
+        withLabel={withLabel}
+      >
+        {dropZone}
+      </Labelled>
+    )
+    : dropZone;
 }
 
-export default translate(styled(InputFile)`
-  background: #fff;
-  border: 1px solid rgba(34, 36, 38, 0.15);
-  border-radius: 0.28571429rem;
-  font-size: 1rem;
-  margin: 0.25rem 0;
-  padding: 1rem;
-  width: 100% !important;
+export default translate(
+  styled(InputFile)`
+    background: #fff;
+    border: 1px solid rgba(34, 36, 38, 0.15);
+    border-radius: 0.28571429rem;
+    font-size: 1rem;
+    margin: 0.25rem 0;
+    padding: 1rem;
+    width: 100% !important;
 
-  &.error {
-    background: #fff6f6;
-    border-color: #e0b4b4;
-  }
+    &.error {
+      background: #fff6f6;
+      border-color: #e0b4b4;
+    }
 
-  &:hover {
-    background: #fefefe;
-    cursor: pointer;
-  }
+    &:hover {
+      background: #fefefe;
+      cursor: pointer;
+    }
 
-  .label {
-    color: rgba(0, 0, 0, .6);
-  }
-`);
+    .label {
+      color: rgba(0, 0, 0, .6);
+    }
+  `
+);
diff --git a/packages/react-components/src/InputNumber.tsx b/packages/react-components/src/InputNumber.tsx
index fe615aafec..a2b1bd37a5 100644
--- a/packages/react-components/src/InputNumber.tsx
+++ b/packages/react-components/src/InputNumber.tsx
@@ -148,6 +148,7 @@ class InputNumber extends React.PureComponent<Props, State> {
     return (
       <Button
         className='ui--MaxButton'
+        icon=''
         onClick={this.setToMaxValue}
       >
         Max
diff --git a/packages/react-components/src/Messages.tsx b/packages/react-components/src/Messages.tsx
index 8dcfd80f2a..5bc01cfa08 100644
--- a/packages/react-components/src/Messages.tsx
+++ b/packages/react-components/src/Messages.tsx
@@ -52,7 +52,7 @@ function renderMessage (props: Props, index: number): React.ReactNode {
       isDisabled={!onSelectProp}
       onClick={onSelect(props, index)}
       isPrimary={!!onSelectProp}
-      labelIcon='info'
+      icon='info'
     >
       {name}
       (
diff --git a/packages/react-components/src/TxButton.tsx b/packages/react-components/src/TxButton.tsx
index dc4f14a6eb..a29cfc9159 100644
--- a/packages/react-components/src/TxButton.tsx
+++ b/packages/react-components/src/TxButton.tsx
@@ -29,7 +29,7 @@ interface Props extends ApiProps {
   accountNonce?: Index;
   className?: string;
   extrinsic?: IExtrinsic | SubmittableExtrinsic;
-  icon?: string;
+  icon: string;
   iconSize?: Button$Sizes;
   isBasic?: boolean;
   isDisabled?: boolean;
@@ -37,7 +37,6 @@ interface Props extends ApiProps {
   isPrimary?: boolean;
   isUnsigned?: boolean;
   label: React.ReactNode;
-  labelIcon?: string;
   onClick?: () => any;
   onFailed?: TxFailedCallback;
   onStart?: () => void;
@@ -62,7 +61,7 @@ class TxButtonInner extends React.PureComponent<InnerProps> {
   };
 
   public render (): React.ReactNode {
-    const { accountId, className, icon, iconSize, isBasic, isDisabled, isNegative, isPrimary, isUnsigned, label, labelIcon, tooltip } = this.props;
+    const { accountId, className, icon, iconSize, isBasic, isDisabled, isNegative, isPrimary, isUnsigned, label, tooltip } = this.props;
     const { isSending } = this.state;
     const needsAccount = isUnsigned
       ? false
@@ -77,9 +76,12 @@ class TxButtonInner extends React.PureComponent<InnerProps> {
         isDisabled={isSending || isDisabled || needsAccount}
         isLoading={isSending}
         isNegative={isNegative}
-        isPrimary={isUndefined(isPrimary) ? (!isNegative && !isBasic) : isPrimary}
+        isPrimary={
+          isUndefined(isPrimary)
+            ? (!isNegative && !isBasic)
+            : isPrimary
+        }
         label={label}
-        labelIcon={labelIcon}
         onClick={this.send}
         size={iconSize}
       />
diff --git a/packages/react-components/src/TxModal.tsx b/packages/react-components/src/TxModal.tsx
index ec0e614f86..e6fc1100eb 100644
--- a/packages/react-components/src/TxModal.tsx
+++ b/packages/react-components/src/TxModal.tsx
@@ -157,7 +157,7 @@ export default class TxModal<P extends TxModalProps, S extends TxModalState> ext
         isDisabled={this.isDisabled()}
         isPrimary
         label={this.submitLabel()}
-        labelIcon='sign-in'
+        icon='sign-in'
         onClick={this.onSubmit}
         onFailed={this.onFailed}
         onSuccess={this.onSuccess}
@@ -177,7 +177,7 @@ export default class TxModal<P extends TxModalProps, S extends TxModalState> ext
           isNegative
           onClick={this.hideModal}
           label={t('Cancel')}
-          labelIcon='cancel'
+          icon='cancel'
         />
         <Button.Or />
       </>
diff --git a/packages/react-components/src/Voting.tsx b/packages/react-components/src/Voting.tsx
index 346c28a192..a155126ddc 100644
--- a/packages/react-components/src/Voting.tsx
+++ b/packages/react-components/src/Voting.tsx
@@ -115,7 +115,7 @@ class Voting extends TxModal<Props, State> {
         <Button
           isPrimary
           label={t('Vote')}
-          labelIcon='check'
+          icon='check'
           onClick={this.showModal}
         />
       </div>
diff --git a/packages/react-params/src/Param/Vector.tsx b/packages/react-params/src/Param/Vector.tsx
index 91ad06ecb7..0b5f46fac9 100644
--- a/packages/react-params/src/Param/Vector.tsx
+++ b/packages/react-params/src/Param/Vector.tsx
@@ -102,14 +102,14 @@ class Vector extends React.PureComponent<Props, State> {
           isPrimary
           onClick={this.rowAdd}
           label={t('Add item')}
-          labelIcon='add'
+          icon='add'
         />
         <Button
           isDisabled={values.length === 1}
           isNegative
           onClick={this.rowRemove}
           label={t('Remove item')}
-          labelIcon='minus'
+          icon='minus'
         />
       </div>
     );
diff --git a/packages/react-signer/src/Modal.tsx b/packages/react-signer/src/Modal.tsx
index 77e0cc39e5..9a59354e80 100644
--- a/packages/react-signer/src/Modal.tsx
+++ b/packages/react-signer/src/Modal.tsx
@@ -156,7 +156,7 @@ class Signer extends React.PureComponent<Props, State> {
             }
             tabIndex={3}
             label={t('Cancel')}
-            labelIcon='cancel'
+            icon='cancel'
           />
           {(!isQrVisible || !isQrScanning) && (
             <>
@@ -182,7 +182,7 @@ class Signer extends React.PureComponent<Props, State> {
                           ? t('Sign via Qr')
                           : t('Sign and Submit')
                 }
-                labelIcon={
+                icon={
                   isQrVisible
                     ? 'qrcode'
                     : currentItem.isUnsigned