diff --git a/packages/fether-react/src/Accounts/AccountsList/AccountsList.js b/packages/fether-react/src/Accounts/AccountsList/AccountsList.js
index aa2c3417803afcca81fb37fc4f907a573a52baab..7e3e21f85cf3528de4bb403107ef0eb2a6e942c9 100644
--- a/packages/fether-react/src/Accounts/AccountsList/AccountsList.js
+++ b/packages/fether-react/src/Accounts/AccountsList/AccountsList.js
@@ -96,7 +96,9 @@ class AccountsList extends Component {
                       name={
                         accountsInfo &&
                         accountsInfo[address] &&
-                        accountsInfo[address].name
+                        (accountsInfo[address].name
+                          ? accountsInfo[address].name
+                          : '(No name)')
                       }
                     />
                   </li>
diff --git a/packages/fether-react/src/Tokens/Tokens.js b/packages/fether-react/src/Tokens/Tokens.js
index 76c24c769f9224181e0f40ef317ca2cc7565567e..63b44804c26d7250ea7ff1809f8124f612cb6d43 100644
--- a/packages/fether-react/src/Tokens/Tokens.js
+++ b/packages/fether-react/src/Tokens/Tokens.js
@@ -17,6 +17,10 @@ import TokensList from './TokensList';
   defaultAccount: defaultAccount$
 })
 class Tokens extends PureComponent {
+  handleGoToSettings = () => {
+    this.props.history.push('/settings');
+  };
+
   render () {
     const {
       accountsInfo,
@@ -60,9 +64,9 @@ class Tokens extends PureComponent {
             <Health />
           </div>
           <div className='footer-nav_icons'>
-            <Link to='/settings' className='icon -settings'>
-              Settings
-            </Link>
+            <button className='button -tiny' onClick={this.handleGoToSettings}>
+              Add token
+            </button>
           </div>
         </nav>
       </div>