diff --git a/src/views/Wallet/views/AccountSummary/components/AddedToken/index.js b/src/views/Wallet/views/AccountSummary/components/AddedToken/index.js
new file mode 100644
index 00000000..3dd66179
--- /dev/null
+++ b/src/views/Wallet/views/AccountSummary/components/AddedToken/index.js
@@ -0,0 +1,98 @@
+import React, { Component } from 'react';
+import styled from 'styled-components';
+import ColorHash from 'color-hash';
+import ScaleText from 'react-scale-text';
+import colors from 'config/colors';
+import Button from 'components/Button';
+import ICONS from 'config/icons';
+import * as stateUtils from 'reducers/utils';
+import BigNumber from 'bignumber.js';
+import PropTypes from 'prop-types';
+
+const TokenWrapper = styled.div`
+    padding: 14px 48px;
+    position: relative;
+    display: flex;
+    align-items: center;
+    border-top: 1px solid ${colors.DIVIDER};
+`;
+
+const TokenIcon = styled.div`
+    width: 36px;
+    height: 36px;
+    border-radius: 50%;
+    margin-right: 10px;
+    line-height: 30px;
+    text-transform: uppercase;
+    user-select: none;
+    text-align: center;
+    padding: 6px;
+    color: ${props => props.textColor};
+    border-color: ${props => props.backgroundColor};
+    background: ${props => props.backgroundColor};
+`;
+
+const P = styled.p`
+    line-height: 24px;
+    padding: 0px;
+    color: inherit;
+`;
+
+const TokenName = styled.div`
+    flex: 1;
+    color: ${colors.TEXT_SECONDARY};
+`;
+
+const TokenBalance = styled.div``;
+
+const RemoveTokenButton = styled(Button)`
+    padding: 0 0 0 10px;
+`;
+
+class AddedToken extends Component<> {
+    getTokenBalance(token) {
+        const pendingAmount = stateUtils.getPendingAmount(this.props.pending, token.symbol, true);
+        const balance = new BigNumber(token.balance).minus(pendingAmount).toString(10);
+        return balance;
+    }
+
+    render() {
+        const bgColor = new ColorHash({ lightness: 0.16 });
+        const textColor = new ColorHash();
+
+        return (
+            <TokenWrapper
+                key={this.props.token.symbol}
+            >
+                <TokenIcon
+                    textColor={textColor.hex(this.props.token.address)}
+                    backgroundColor={bgColor.hex(this.props.token.address)}
+                >
+                    <ScaleText widthOnly>
+                        <P>{this.props.token.symbol}</P>
+                    </ScaleText>
+                </TokenIcon>
+
+                <TokenName>{this.props.token.name}</TokenName>
+                <TokenBalance>{this.getTokenBalance(this.props.token)} {this.props.token.symbol}</TokenBalance>
+                <RemoveTokenButton
+                    isTransparent
+                    onClick={() => this.props.removeToken(this.props.token)}
+                    text=""
+                    icon={{
+                        type: ICONS.CLOSE,
+                        size: 23,
+                    }}
+                />
+            </TokenWrapper>
+        );
+    }
+}
+
+AddedToken.propTypes = {
+    token: PropTypes.object,
+    pending: PropTypes.array,
+    removeToken: PropTypes.func,
+};
+
+export default AddedToken;
diff --git a/src/views/Wallet/views/AccountSummary/components/Tokens/index.js b/src/views/Wallet/views/AccountSummary/components/Tokens/index.js
deleted file mode 100644
index f33ba766..00000000
--- a/src/views/Wallet/views/AccountSummary/components/Tokens/index.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/* @flow */
-
-
-import React from 'react';
-import ColorHash from 'color-hash';
-import ScaleText from 'react-scale-text';
-import * as stateUtils from 'reducers/utils';
-import BigNumber from 'bignumber.js';
-
-import type { Props as BaseProps } from '../../Container';
-
-type Props = {
-    pending: $PropertyType<$ElementType<BaseProps, 'selectedAccount'>, 'pending'>,
-    tokens: $ElementType<BaseProps, 'tokens'>,
-    removeToken: $ElementType<BaseProps, 'removeToken'>
-}
-
-const SummaryTokens = (props: Props) => {
-    if (!props.tokens || props.tokens.length < 1) return null;
-
-    const bgColor = new ColorHash({ lightness: 0.16 });
-    const textColor = new ColorHash();
-
-    const tokens = props.tokens.map((token, index) => {
-        const iconColor = {
-            color: textColor.hex(token.address),
-            background: bgColor.hex(token.address),
-            borderColor: bgColor.hex(token.address),
-        };
-
-        const pendingAmount: BigNumber = stateUtils.getPendingAmount(props.pending, token.symbol, true);
-        const balance: string = new BigNumber(token.balance).minus(pendingAmount).toString(10);
-        return (
-            <div key={index} className="token">
-                <div className="icon" style={iconColor}>
-                    <div className="icon-inner">
-                        <ScaleText widthOnly><p>{ token.symbol }</p></ScaleText>
-                    </div>
-                </div>
-                <div className="name">{ token.name }</div>
-                <div className="balance">{ balance } { token.symbol }</div>
-                <button className="transparent" onClick={event => props.removeToken(token)} />
-            </div>
-        );
-    });
-
-    return (
-        <div>
-            { tokens }
-        </div>
-    );
-};
-
-export default SummaryTokens;
\ No newline at end of file