diff --git a/packages/fether-react/src/Accounts/CreateAccount/AccountName/AccountName.js b/packages/fether-react/src/Accounts/CreateAccount/AccountName/AccountName.js
index 1659aee96f7c66e38c655dd1f3d09d6cb7f48bd1..39385988175f03f863e00ffc88e96f369f2fac33 100644
--- a/packages/fether-react/src/Accounts/CreateAccount/AccountName/AccountName.js
+++ b/packages/fether-react/src/Accounts/CreateAccount/AccountName/AccountName.js
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 import React, { Component } from 'react';
-import { AccountCard, Card, FormField } from 'fether-ui';
+import { AccountCard, Card, Form as FetherForm } from 'fether-ui';
 import Blockies from 'react-blockies';
 import { inject, observer } from 'mobx-react';
 import { Link } from 'react-router-dom';
@@ -79,7 +79,7 @@ class AccountName extends Component {
         <div className='text'>
           <p>Please give this account a name:</p>
         </div>
-        <FormField
+        <FetherForm.Field
           label='Name'
           onChange={this.handleChangeName}
           required
diff --git a/packages/fether-react/src/Accounts/CreateAccount/AccountPassword/AccountPassword.js b/packages/fether-react/src/Accounts/CreateAccount/AccountPassword/AccountPassword.js
index 6870f8c9a214bc279f86fc7e0c483bd8a857cb50..9423fdf6e1ecae57eedb025fe3082493426093a9 100644
--- a/packages/fether-react/src/Accounts/CreateAccount/AccountPassword/AccountPassword.js
+++ b/packages/fether-react/src/Accounts/CreateAccount/AccountPassword/AccountPassword.js
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 import React, { Component } from 'react';
-import { AccountCard, FormField } from 'fether-ui';
+import { AccountCard, Form as FetherForm } from 'fether-ui';
 import { inject, observer } from 'mobx-react';
 
 @inject('createAccountStore')
@@ -55,7 +55,7 @@ class AccountPassword extends Component {
               <p>Secure your account with a password:</p>
             </div>
 
-            <FormField
+            <FetherForm.Field
               label='Password'
               onChange={this.handlePasswordChange}
               required
@@ -63,7 +63,7 @@ class AccountPassword extends Component {
               value={password}
             />
 
-            <FormField
+            <FetherForm.Field
               label='Confirm'
               onChange={this.handleConfirmChange}
               required
diff --git a/packages/fether-react/src/Accounts/CreateAccount/AccountRewritePhrase/AccountRewritePhrase.js b/packages/fether-react/src/Accounts/CreateAccount/AccountRewritePhrase/AccountRewritePhrase.js
index e50ea6ef11e3bb04f006a94819233a46645963cc..b50af0ece61e4308aac817eb06abd32f9849444b 100644
--- a/packages/fether-react/src/Accounts/CreateAccount/AccountRewritePhrase/AccountRewritePhrase.js
+++ b/packages/fether-react/src/Accounts/CreateAccount/AccountRewritePhrase/AccountRewritePhrase.js
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 import React, { Component } from 'react';
-import { AccountCard, FormField } from 'fether-ui';
+import { AccountCard, Form as FetherForm } from 'fether-ui';
 import debounce from 'lodash/debounce';
 import { inject, observer } from 'mobx-react';
 
@@ -77,11 +77,12 @@ class AccountRewritePhrase extends Component {
                 </p>
               )}
             </div>
-            <FormField
-              input={
-                <textarea onChange={this.handleChange} required value={value} />
-              }
+            <FetherForm.Field
+              as='textarea'
               label='Recovery phrase'
+              onChange={this.handleChange}
+              required
+              value={value}
             />
 
             <nav className='form-nav -space-around'>
diff --git a/packages/fether-react/src/Onboarding/Onboarding.js b/packages/fether-react/src/Onboarding/Onboarding.js
index 5ea7e02e1c860a1d78389246c46ae4baa1a11b2b..e818005648a5efb9a8cc82968bb3e97d17f8662d 100644
--- a/packages/fether-react/src/Onboarding/Onboarding.js
+++ b/packages/fether-react/src/Onboarding/Onboarding.js
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 import React, { Component } from 'react';
-import { FormField, Header } from 'fether-ui';
+import { Form as FetherForm, Header } from 'fether-ui';
 import { inject, observer } from 'mobx-react';
 import ReactMarkdown from 'react-markdown';
 
@@ -54,14 +54,11 @@ class Onboarding extends Component {
 
         <div className='window_content'>
           <div className='box -padded'>
-            <FormField
-              input={
-                <ReactMarkdown
-                  className='terms-and-conditions'
-                  renderers={reactMarkdownOptions}
-                  source={this.state.markdown}
-                />
-              }
+            <FetherForm.Field
+              as={ReactMarkdown}
+              className='terms-and-conditions'
+              renderers={reactMarkdownOptions}
+              source={this.state.markdown}
               label='Please read carefully'
             />
           </div>
diff --git a/packages/fether-react/src/assets/sass/components/_account.scss b/packages/fether-react/src/assets/sass/components/_account.scss
index dd6d9bb0734398e6ec03c61f6d9ed7c09a41e799..a5a8f370e0ea06a4186f26377a9d8d8621a3c082 100644
--- a/packages/fether-react/src/assets/sass/components/_account.scss
+++ b/packages/fether-react/src/assets/sass/components/_account.scss
@@ -39,6 +39,7 @@
   .account_name {
     color: $black;
     font-weight: 500;
+    margin-bottom: 0.1rem;
   }
 
   .account_address {
diff --git a/packages/fether-react/src/stores/sendStore.spec.js b/packages/fether-react/src/stores/sendStore.spec.js
index c0d8113cd350bfa1f1daf7d0c07f08cbe2e060cd..3eb0bab6cc64a5179ebb25bbc6c65a66200c7d9b 100644
--- a/packages/fether-react/src/stores/sendStore.spec.js
+++ b/packages/fether-react/src/stores/sendStore.spec.js
@@ -37,13 +37,6 @@ jest.mock('./parityStore', () => ({
   }
 }));
 
-jest.mock('./tokensStore', () => ({
-  tokens: {
-    ETH: { decimals: 18 },
-    foo: { decimals: 18 }
-  }
-}));
-
 const mockTx = {
   amount: 0.01, // In Ether or in token
   gasPrice: 4, // in Gwei
@@ -117,9 +110,13 @@ describe('method send', () => {
     sendStore.setTx(mockTx);
   });
 
-  test.skip('should call transfer$ if the token is Erc20 and subscribe to it', () => {
+  test('should call makeContract$ if the token is Erc20 ', () => {
     sendStore.send(mockErc20Token);
-    expect(sendStore.contract.transfer$).toHaveBeenCalled();
+    expect(lightJs.makeContract$).toHaveBeenCalled();
+  });
+
+  test.skip('should call transfer$ if the token is Erc20 and subscribe to it', () => {
+    // TODO
   });
 
   test('should call post$ if the token is ETH  and subscribe to it', () => {
diff --git a/packages/fether-ui/src/AccountCard/Address/Address.js b/packages/fether-ui/src/AccountCard/Address/Address.js
index 9c1c5edb955f5bfe548d50c2b9739f86fa288e59..7aa7ab89941f58e83c344f5dffd40f3169bc2f54 100644
--- a/packages/fether-ui/src/AccountCard/Address/Address.js
+++ b/packages/fether-ui/src/AccountCard/Address/Address.js
@@ -18,7 +18,7 @@ export const Address = ({ address, short, ...otherProps }) => (
         address
       )
     ) : (
-      <Placeholder height={18} width={100} />
+      <Placeholder height={14} width={100} />
     )}
   </div>
 );
diff --git a/packages/fether-ui/src/ClickToCopy/ClickToCopy.js b/packages/fether-ui/src/ClickToCopy/ClickToCopy.js
index dad2824317eb610366c90ba1079827e4a2056866..b6822c342ef2c67117167690bab41b09f3dde3ff 100644
--- a/packages/fether-ui/src/ClickToCopy/ClickToCopy.js
+++ b/packages/fether-ui/src/ClickToCopy/ClickToCopy.js
@@ -38,7 +38,7 @@ export class ClickToCopy extends PureComponent {
   handleResetCopied = () => this.setState({ copied: false });
 
   render () {
-    const { children, label, ...otherProps } = this.props;
+    const { children, label, textToCopy, ...otherProps } = this.props;
     const { copied } = this.state;
 
     return (
diff --git a/packages/fether-ui/src/Form/Field/Field.js b/packages/fether-ui/src/Form/Field/Field.js
index b16817143ae3869523f324dee0c96c81aa8b545c..ae6350cd52ba8fdf5e34e146ad3491dd9f9b9d63 100644
--- a/packages/fether-ui/src/Form/Field/Field.js
+++ b/packages/fether-ui/src/Form/Field/Field.js
@@ -21,7 +21,9 @@ export const Field = ({
       content={meta && (meta.error || meta.submitError)}
       inverted
       on='click'
-      open={meta && !meta.pristine && !meta.valid && !meta.dirtySinceLastSubmit}
+      open={
+        !!meta && !meta.pristine && !meta.valid && !meta.dirtySinceLastSubmit
+      }
       position='top center'
       size='mini'
       trigger={<T {...input} {...otherProps} />}