diff --git a/src/components/WalletViewContainer/index.js b/src/components/WalletViewContainer/index.js
deleted file mode 100644
index a9f47e61..00000000
--- a/src/components/WalletViewContainer/index.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import styled from 'styled-components';
-import colors from 'config/colors';
-import { FONT_SIZE, FONT_WEIGHT, FONT_FAMILY } from 'config/variables';
-
-const Wrapper = styled.div`
-   padding:
-`;
-
-const Textarea = ({
-    className,
-    placeholder = '',
-    value,
-    customStyle = {},
-    onFocus,
-    onBlur,
-    isDisabled,
-    onChange,
-    isError,
-    topLabel,
-}) => (
-    <Wrapper>
-        {topLabel && (
-            <TopLabel>{topLabel}</TopLabel>
-        )}
-        <StyledTextarea
-            className={className}
-            disabled={isDisabled}
-            style={customStyle}
-            onFocus={onFocus}
-            onBlur={onBlur}
-            value={value}
-            placeholder={placeholder}
-            onChange={onChange}
-            isError={isError}
-        />
-    </Wrapper>
-);
-
-Textarea.propTypes = {
-    className: PropTypes.string,
-    isError: PropTypes.bool,
-    onFocus: PropTypes.func,
-    onBlur: PropTypes.func,
-    onChange: PropTypes.func,
-    customStyle: PropTypes.string,
-    placeholder: PropTypes.string,
-    value: PropTypes.string,
-    isDisabled: PropTypes.bool,
-    topLabel: PropTypes.node,
-};
-
-export default Textarea;
diff --git a/src/views/Wallet/components/Content/index.js b/src/views/Wallet/components/Content/index.js
new file mode 100644
index 00000000..1b2ef54e
--- /dev/null
+++ b/src/views/Wallet/components/Content/index.js
@@ -0,0 +1,24 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import styled from 'styled-components';
+
+const Wrapper = styled.div`
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    padding: 40px 35px 40px 35px;
+`;
+
+const Content = ({
+    children,
+}) => (
+    <Wrapper>
+        {children}
+    </Wrapper>
+);
+
+Content.propTypes = {
+    children: PropTypes.element,
+};
+
+export default Content;
diff --git a/src/views/Wallet/index.js b/src/views/Wallet/index.js
index 29b76ca9..ff9777d9 100644
--- a/src/views/Wallet/index.js
+++ b/src/views/Wallet/index.js
@@ -77,7 +77,6 @@ const Body = styled.div`
     display: flex;
     flex: 1;
     flex-direction: column;
-    padding: 40px 35px 40px 35px;
 `;
 
 const Wallet = (props: WalletContainerProps) => (
diff --git a/src/views/Wallet/views/Account/Receive/index.js b/src/views/Wallet/views/Account/Receive/index.js
index fd3694ed..ec173725 100644
--- a/src/views/Wallet/views/Account/Receive/index.js
+++ b/src/views/Wallet/views/Account/Receive/index.js
@@ -5,6 +5,7 @@ import { H2 } from 'components/Heading';
 import Button from 'components/Button';
 import Icon from 'components/Icon';
 import ICONS from 'config/icons';
+import Content from 'views/Wallet/components/Content';
 import colors from 'config/colors';
 
 import Tooltip from 'components/Tooltip';
@@ -142,79 +143,81 @@ const AccountReceive = (props: Props) => {
 
     return (
         <SelectedAccount {...props}>
-            <Wrapper>
-                <H2>Receive Ethereum or tokens</H2>
-                <AddressWrapper
-                    isShowingQrCode={addressVerified || addressUnverified}
-                >
-                    {isAddressVerifying && (
-                        <AddressInfoText>Confirm address on TREZOR</AddressInfoText>
-                    )}
-                    {((addressVerified || addressUnverified) && !isAddressVerifying) && (
-                        <Tooltip
-                            placement="bottomRight"
-                            content={(
-                                <React.Fragment>
-                                    {addressUnverified ? (
-                                        <React.Fragment>
+            <Content>
+                <Wrapper>
+                    <H2>Receive Ethereum or tokens</H2>
+                    <AddressWrapper
+                        isShowingQrCode={addressVerified || addressUnverified}
+                    >
+                        {isAddressVerifying && (
+                            <AddressInfoText>Confirm address on TREZOR</AddressInfoText>
+                        )}
+                        {((addressVerified || addressUnverified) && !isAddressVerifying) && (
+                            <Tooltip
+                                placement="bottomRight"
+                                content={(
+                                    <React.Fragment>
+                                        {addressUnverified ? (
+                                            <React.Fragment>
                                             Unverified address.
-                                            <br />
-                                            {device.connected && device.available ? 'Show on TREZOR' : 'Connect your TREZOR to verify it.'}
-                                        </React.Fragment>
-                                    ) : (
-                                        <React.Fragment>
-                                            {device.connected ? 'Show on TREZOR' : 'Connect your TREZOR to verify address.'}
-                                        </React.Fragment>
-                                    )}
-                                </React.Fragment>
-                            )}
+                                                <br />
+                                                {device.connected && device.available ? 'Show on TREZOR' : 'Connect your TREZOR to verify it.'}
+                                            </React.Fragment>
+                                        ) : (
+                                            <React.Fragment>
+                                                {device.connected ? 'Show on TREZOR' : 'Connect your TREZOR to verify address.'}
+                                            </React.Fragment>
+                                        )}
+                                    </React.Fragment>
+                                )}
+                            >
+                                <EyeButton
+                                    isTransparent
+                                    onClick={() => props.showAddress(account.addressPath)}
+                                >
+                                    <Icon
+                                        icon={addressUnverified ? ICONS.EYE_CROSSED : ICONS.EYE}
+                                        color={addressUnverified ? colors.ERROR_PRIMARY : colors.TEXT_PRIMARY}
+                                    />
+                                </EyeButton>
+                            </Tooltip>
+                        )}
+                        <ValueWrapper
+                            isHidden={isAddressHidden}
+                            isVerifying={isAddressVerifying}
                         >
-                            <EyeButton
-                                isTransparent
+                            {address}
+                        </ValueWrapper>
+                        {isAddressVerifying && (
+                            <AddressInfoText>{account.network} account #{account.index + 1}</AddressInfoText>
+                        )}
+                        {(addressVerified || addressUnverified) && (
+                            <React.Fragment>
+                                <Label>QR code</Label>
+                                <StyledQRCode
+                                    bgColor="#FFFFFF"
+                                    fgColor="#000000"
+                                    level="Q"
+                                    style={{ width: 150 }}
+                                    value={account.address}
+                                />
+                            </React.Fragment>
+                        )}
+                        {!(addressVerified || addressUnverified) && (
+                            <ShowAddressButton
                                 onClick={() => props.showAddress(account.addressPath)}
+                                isDisabled={device.connected && !discovery.completed}
                             >
-                                <Icon
-                                    icon={addressUnverified ? ICONS.EYE_CROSSED : ICONS.EYE}
-                                    color={addressUnverified ? colors.ERROR_PRIMARY : colors.TEXT_PRIMARY}
+                                <ShowAddressIcon
+                                    icon={ICONS.EYE}
+                                    color={colors.WHITE}
                                 />
-                            </EyeButton>
-                        </Tooltip>
-                    )}
-                    <ValueWrapper
-                        isHidden={isAddressHidden}
-                        isVerifying={isAddressVerifying}
-                    >
-                        {address}
-                    </ValueWrapper>
-                    {isAddressVerifying && (
-                        <AddressInfoText>{account.network} account #{account.index + 1}</AddressInfoText>
-                    )}
-                    {(addressVerified || addressUnverified) && (
-                        <React.Fragment>
-                            <Label>QR code</Label>
-                            <StyledQRCode
-                                bgColor="#FFFFFF"
-                                fgColor="#000000"
-                                level="Q"
-                                style={{ width: 150 }}
-                                value={account.address}
-                            />
-                        </React.Fragment>
-                    )}
-                    {!(addressVerified || addressUnverified) && (
-                        <ShowAddressButton
-                            onClick={() => props.showAddress(account.addressPath)}
-                            isDisabled={device.connected && !discovery.completed}
-                        >
-                            <ShowAddressIcon
-                                icon={ICONS.EYE}
-                                color={colors.WHITE}
-                            />
                             Show full address
-                        </ShowAddressButton>
-                    )}
-                </AddressWrapper>
-            </Wrapper>
+                            </ShowAddressButton>
+                        )}
+                    </AddressWrapper>
+                </Wrapper>
+            </Content>
         </SelectedAccount>
     );
 };
diff --git a/src/views/Wallet/views/Account/Send/index.js b/src/views/Wallet/views/Account/Send/index.js
index 520129a9..4a659e5f 100644
--- a/src/views/Wallet/views/Account/Send/index.js
+++ b/src/views/Wallet/views/Account/Send/index.js
@@ -12,6 +12,7 @@ import { FONT_SIZE, FONT_WEIGHT, TRANSITION } from 'config/variables';
 import colors from 'config/colors';
 import P from 'components/Paragraph';
 import { H2 } from 'components/Heading';
+import Content from 'views/Wallet/components/Content';
 import SelectedAccount from 'views/Wallet/components/SelectedAccount';
 import type { Token } from 'flowtype';
 import AdvancedForm from './components/AdvancedForm';
@@ -230,148 +231,150 @@ const AccountSend = (props: Props) => {
 
     return (
         <SelectedAccount {...props}>
-            <Wrapper>
-                <H2>Send Ethereum or tokens</H2>
-                <InputRow>
-                    <Input
-                        state={getAddressInputState(address, errors.address, warnings.address)}
-                        autoComplete="off"
-                        autoCorrect="off"
-                        autoCapitalize="off"
-                        spellCheck="false"
-                        topLabel="Address"
-                        bottomText={errors.address || warnings.address || infos.address}
-                        value={address}
-                        onChange={event => onAddressChange(event.target.value)}
-                    />
-                </InputRow>
-
-                <InputRow>
-                    <Input
-                        state={getAmountInputState(errors.amount, warnings.amount)}
-                        autoComplete="off"
-                        autoCorrect="off"
-                        autoCapitalize="off"
-                        spellCheck="false"
-                        topLabel="Amount"
-                        value={amount}
-                        onChange={event => onAmountChange(event.target.value)}
-                        bottomText={errors.amount || warnings.amount || infos.amount}
-                        sideAddons={[
-                            (
-                                <SetMaxAmountButton
-                                    key="icon"
-                                    onClick={() => onSetMax()}
-                                    isActive={setMax}
-                                >
-                                    {!setMax && (
-                                        <Icon
-                                            icon={ICONS.TOP}
-                                            size={25}
-                                            color={colors.TEXT_SECONDARY}
-                                        />
-                                    )}
-                                    {setMax && (
-                                        <Icon
-                                            icon={ICONS.CHECKED}
-                                            size={25}
-                                            color={colors.WHITE}
-                                        />
-                                    )}
+            <Content>
+                <Wrapper>
+                    <H2>Send Ethereum or tokens</H2>
+                    <InputRow>
+                        <Input
+                            state={getAddressInputState(address, errors.address, warnings.address)}
+                            autoComplete="off"
+                            autoCorrect="off"
+                            autoCapitalize="off"
+                            spellCheck="false"
+                            topLabel="Address"
+                            bottomText={errors.address || warnings.address || infos.address}
+                            value={address}
+                            onChange={event => onAddressChange(event.target.value)}
+                        />
+                    </InputRow>
+
+                    <InputRow>
+                        <Input
+                            state={getAmountInputState(errors.amount, warnings.amount)}
+                            autoComplete="off"
+                            autoCorrect="off"
+                            autoCapitalize="off"
+                            spellCheck="false"
+                            topLabel="Amount"
+                            value={amount}
+                            onChange={event => onAmountChange(event.target.value)}
+                            bottomText={errors.amount || warnings.amount || infos.amount}
+                            sideAddons={[
+                                (
+                                    <SetMaxAmountButton
+                                        key="icon"
+                                        onClick={() => onSetMax()}
+                                        isActive={setMax}
+                                    >
+                                        {!setMax && (
+                                            <Icon
+                                                icon={ICONS.TOP}
+                                                size={25}
+                                                color={colors.TEXT_SECONDARY}
+                                            />
+                                        )}
+                                        {setMax && (
+                                            <Icon
+                                                icon={ICONS.CHECKED}
+                                                size={25}
+                                                color={colors.WHITE}
+                                            />
+                                        )}
                                     Set max
-                                </SetMaxAmountButton>
-                            ),
-                            (
-                                <CurrencySelect
-                                    key="currency"
-                                    isSearchable={false}
-                                    isClearable={false}
-                                    defaultValue={tokensSelectData[0]}
-                                    isDisabled={tokensSelectData.length < 2}
-                                    onChange={onCurrencyChange}
-                                    options={tokensSelectData}
-                                />
-                            ),
-                        ]}
-                    />
-                </InputRow>
-
-                <InputRow>
-                    <FeeLabelWrapper>
-                        <FeeLabel>Fee</FeeLabel>
-                        {gasPriceNeedsUpdate && (
-                            <UpdateFeeWrapper>
-                                <Icon
-                                    icon={ICONS.WARNING}
-                                    color={colors.WARNING_PRIMARY}
-                                    size={20}
-                                />
+                                    </SetMaxAmountButton>
+                                ),
+                                (
+                                    <CurrencySelect
+                                        key="currency"
+                                        isSearchable={false}
+                                        isClearable={false}
+                                        defaultValue={tokensSelectData[0]}
+                                        isDisabled={tokensSelectData.length < 2}
+                                        onChange={onCurrencyChange}
+                                        options={tokensSelectData}
+                                    />
+                                ),
+                            ]}
+                        />
+                    </InputRow>
+
+                    <InputRow>
+                        <FeeLabelWrapper>
+                            <FeeLabel>Fee</FeeLabel>
+                            {gasPriceNeedsUpdate && (
+                                <UpdateFeeWrapper>
+                                    <Icon
+                                        icon={ICONS.WARNING}
+                                        color={colors.WARNING_PRIMARY}
+                                        size={20}
+                                    />
                                 Recommended fees updated. <StyledLink onClick={updateFeeLevels} isGreen>Click here to use them</StyledLink>
-                            </UpdateFeeWrapper>
-                        )}
-                    </FeeLabelWrapper>
-                    <Select
-                        isSearchable={false}
-                        isClearable={false}
-                        value={selectedFeeLevel}
-                        onChange={onFeeLevelChange}
-                        options={feeLevels}
-                        formatOptionLabel={option => (
-                            <FeeOptionWrapper>
-                                <P>{option.value}</P>
-                                <P>{option.label}</P>
-                            </FeeOptionWrapper>
-                        )}
-                    />
-                </InputRow>
-
-                <ToggleAdvancedSettingsWrapper
-                    isAdvancedSettingsHidden={isAdvancedSettingsHidden}
-                >
-                    <ToggleAdvancedSettingsButton
-                        isTransparent
-                        onClick={toggleAdvanced}
-                    >
-                        Advanced settings
-                        <AdvancedSettingsIcon
-                            icon={ICONS.ARROW_DOWN}
-                            color={colors.TEXT_SECONDARY}
-                            size={24}
-                            isActive={advanced}
-                            canAnimate
+                                </UpdateFeeWrapper>
+                            )}
+                        </FeeLabelWrapper>
+                        <Select
+                            isSearchable={false}
+                            isClearable={false}
+                            value={selectedFeeLevel}
+                            onChange={onFeeLevelChange}
+                            options={feeLevels}
+                            formatOptionLabel={option => (
+                                <FeeOptionWrapper>
+                                    <P>{option.value}</P>
+                                    <P>{option.label}</P>
+                                </FeeOptionWrapper>
+                            )}
                         />
-                    </ToggleAdvancedSettingsButton>
+                    </InputRow>
 
-                    {isAdvancedSettingsHidden && (
-                        <SendButton
-                            isDisabled={isSendButtonDisabled}
-                            isAdvancedSettingsHidden={isAdvancedSettingsHidden}
-                            onClick={() => onSend()}
+                    <ToggleAdvancedSettingsWrapper
+                        isAdvancedSettingsHidden={isAdvancedSettingsHidden}
+                    >
+                        <ToggleAdvancedSettingsButton
+                            isTransparent
+                            onClick={toggleAdvanced}
                         >
-                            {sendButtonText}
-                        </SendButton>
+                        Advanced settings
+                            <AdvancedSettingsIcon
+                                icon={ICONS.ARROW_DOWN}
+                                color={colors.TEXT_SECONDARY}
+                                size={24}
+                                isActive={advanced}
+                                canAnimate
+                            />
+                        </ToggleAdvancedSettingsButton>
+
+                        {isAdvancedSettingsHidden && (
+                            <SendButton
+                                isDisabled={isSendButtonDisabled}
+                                isAdvancedSettingsHidden={isAdvancedSettingsHidden}
+                                onClick={() => onSend()}
+                            >
+                                {sendButtonText}
+                            </SendButton>
+                        )}
+                    </ToggleAdvancedSettingsWrapper>
+
+                    {advanced && (
+                        <AdvancedForm {...props}>
+                            <SendButton
+                                isDisabled={isSendButtonDisabled}
+                                onClick={() => onSend()}
+                            >
+                                {sendButtonText}
+                            </SendButton>
+                        </AdvancedForm>
                     )}
-                </ToggleAdvancedSettingsWrapper>
 
-                {advanced && (
-                    <AdvancedForm {...props}>
-                        <SendButton
-                            isDisabled={isSendButtonDisabled}
-                            onClick={() => onSend()}
-                        >
-                            {sendButtonText}
-                        </SendButton>
-                    </AdvancedForm>
-                )}
-
-                {props.selectedAccount.pending.length > 0 && (
-                    <PendingTransactions
-                        pending={props.selectedAccount.pending}
-                        tokens={props.selectedAccount.tokens}
-                        network={network}
-                    />
-                )}
-            </Wrapper>
+                    {props.selectedAccount.pending.length > 0 && (
+                        <PendingTransactions
+                            pending={props.selectedAccount.pending}
+                            tokens={props.selectedAccount.tokens}
+                            network={network}
+                        />
+                    )}
+                </Wrapper>
+            </Content>
         </SelectedAccount>
     );
 };
diff --git a/src/views/Wallet/views/Account/SignVerify/index.js b/src/views/Wallet/views/Account/SignVerify/index.js
index 9e9bf142..d04e3b4f 100644
--- a/src/views/Wallet/views/Account/SignVerify/index.js
+++ b/src/views/Wallet/views/Account/SignVerify/index.js
@@ -2,6 +2,7 @@ import React from 'react';
 import styled from 'styled-components';
 import Input from 'components/inputs/Input';
 import Textarea from 'components/Textarea';
+import Content from 'views/Wallet/components/Content';
 
 import { H2 } from 'components/Heading';
 import colors from 'config/colors';
@@ -35,26 +36,28 @@ const Label = styled.div`
 `;
 
 const AccountSignVerify = () => (
-    <Wrapper>
-        <Sign>
-            <StyledH2>Sign message</StyledH2>
-            <Label>Message</Label>
-            <Textarea rows="4" maxLength="255" />
-            <Label>Address</Label>
-            <Input type="text" />
-            <Label>Signature</Label>
-            <Textarea rows="4" maxLength="255" readOnly="readonly" />
-        </Sign>
-        <Verify>
-            <StyledH2>Verify message</StyledH2>
-            <Label>Message</Label>
-            <Textarea rows="4" maxLength="255" />
-            <Label>Address</Label>
-            <Input type="text" />
-            <Label>Signature</Label>
-            <Textarea rows="4" maxLength="255" />
-        </Verify>
-    </Wrapper>
+    <Content>
+        <Wrapper>
+            <Sign>
+                <StyledH2>Sign message</StyledH2>
+                <Label>Message</Label>
+                <Textarea rows="4" maxLength="255" />
+                <Label>Address</Label>
+                <Input type="text" />
+                <Label>Signature</Label>
+                <Textarea rows="4" maxLength="255" readOnly="readonly" />
+            </Sign>
+            <Verify>
+                <StyledH2>Verify message</StyledH2>
+                <Label>Message</Label>
+                <Textarea rows="4" maxLength="255" />
+                <Label>Address</Label>
+                <Input type="text" />
+                <Label>Signature</Label>
+                <Textarea rows="4" maxLength="255" />
+            </Verify>
+        </Wrapper>
+    </Content>
 );
 
 export default AccountSignVerify;
\ No newline at end of file
diff --git a/src/views/Wallet/views/Account/Summary/index.js b/src/views/Wallet/views/Account/Summary/index.js
index 889e8c92..bccf787f 100644
--- a/src/views/Wallet/views/Account/Summary/index.js
+++ b/src/views/Wallet/views/Account/Summary/index.js
@@ -8,6 +8,7 @@ import { AsyncSelect } from 'components/Select';
 import ICONS from 'config/icons';
 import colors from 'config/colors';
 import Tooltip from 'components/Tooltip';
+import Content from 'views/Wallet/components/Content';
 
 import CoinLogo from 'components/images/CoinLogo';
 import * as stateUtils from 'reducers/utils';
@@ -77,84 +78,86 @@ const AccountSummary = (props: Props) => {
 
     return (
         <SelectedAccount {...props}>
-            <AccountHeading>
-                <AccountName>
-                    <StyledCoinLogo coinNetwork={account.network} />
-                    <H2>Account #{parseInt(account.index, 10) + 1}</H2>
-                </AccountName>
-                <Link
-                    target="_blank"
-                    rel="noreferrer noopener"
-                    href={explorerLink}
-                    isGray
-                >See full transaction history
-                </Link>
-            </AccountHeading>
-            <AccountBalance
-                coin={network}
-                summary={props.summary}
-                balance={balance}
-                network={network.network}
-                fiat={props.fiat}
-                localStorage={props.localStorage}
-            />
-            <H2Wrapper>
-                <H2>Tokens</H2>
-                <StyledTooltip
-                    maxWidth={200}
-                    placement="top"
-                    content="Insert token name, symbol or address to be able to send it."
-                >
-                    <StyledIcon
-                        icon={ICONS.HELP}
-                        color={colors.TEXT_SECONDARY}
-                        size={24}
-                    />
-                </StyledTooltip>
-            </H2Wrapper>
-            {/* 0x58cda554935e4a1f2acbe15f8757400af275e084 Lahod */}
-            {/* 0x58cda554935e4a1f2acbe15f8757400af275e084 T01 */}
-
-            {/* TOOO: AsyncSelect is lagging when dropdown menu must show more than 200 items */}
-            {/* TODO: Input's box-shadow  */}
-            <AsyncSelectWrapper>
-                <AsyncSelect
-                    isSearchable
-                    defaultOptions
-                    value={null}
-                    isMulti={false}
-                    placeholder="Search for the token"
-                    loadingMessage={() => 'Loading...'}
-                    noOptionsMessage={() => 'Token not found'}
-                    onChange={(token) => {
-                        const isAdded = tokens.find(t => t.symbol === token.symbol);
-                        if (!isAdded) {
-                            props.addToken(token, account);
-                        }
-                    }}
-                    loadOptions={input => props.loadTokens(input, account.network)}
-                    formatOptionLabel={(option) => {
-                        const isAdded = tokens.find(t => t.symbol === option.symbol);
-                        if (isAdded) {
-                            return `${option.name} (Already added)`;
-                        }
-                        return option.name;
-                    }}
-                    getOptionLabel={option => option.name}
-                    getOptionValue={option => option.symbol}
+            <Content>
+                <AccountHeading>
+                    <AccountName>
+                        <StyledCoinLogo coinNetwork={account.network} />
+                        <H2>Account #{parseInt(account.index, 10) + 1}</H2>
+                    </AccountName>
+                    <Link
+                        target="_blank"
+                        rel="noreferrer noopener"
+                        href={explorerLink}
+                        isGray
+                    >See full transaction history
+                    </Link>
+                </AccountHeading>
+                <AccountBalance
+                    coin={network}
+                    summary={props.summary}
+                    balance={balance}
+                    network={network.network}
+                    fiat={props.fiat}
+                    localStorage={props.localStorage}
                 />
-            </AsyncSelectWrapper>
-
-            <AddedTokensWrapper>
-                {tokens.map(token => (
-                    <AddedToken
-                        key={token.symbol}
-                        token={token}
-                        pending={pending}
-                        removeToken={props.removeToken}
+                <H2Wrapper>
+                    <H2>Tokens</H2>
+                    <StyledTooltip
+                        maxWidth={200}
+                        placement="top"
+                        content="Insert token name, symbol or address to be able to send it."
+                    >
+                        <StyledIcon
+                            icon={ICONS.HELP}
+                            color={colors.TEXT_SECONDARY}
+                            size={24}
+                        />
+                    </StyledTooltip>
+                </H2Wrapper>
+                {/* 0x58cda554935e4a1f2acbe15f8757400af275e084 Lahod */}
+                {/* 0x58cda554935e4a1f2acbe15f8757400af275e084 T01 */}
+
+                {/* TOOO: AsyncSelect is lagging when dropdown menu must show more than 200 items */}
+                {/* TODO: Input's box-shadow  */}
+                <AsyncSelectWrapper>
+                    <AsyncSelect
+                        isSearchable
+                        defaultOptions
+                        value={null}
+                        isMulti={false}
+                        placeholder="Search for the token"
+                        loadingMessage={() => 'Loading...'}
+                        noOptionsMessage={() => 'Token not found'}
+                        onChange={(token) => {
+                            const isAdded = tokens.find(t => t.symbol === token.symbol);
+                            if (!isAdded) {
+                                props.addToken(token, account);
+                            }
+                        }}
+                        loadOptions={input => props.loadTokens(input, account.network)}
+                        formatOptionLabel={(option) => {
+                            const isAdded = tokens.find(t => t.symbol === option.symbol);
+                            if (isAdded) {
+                                return `${option.name} (Already added)`;
+                            }
+                            return option.name;
+                        }}
+                        getOptionLabel={option => option.name}
+                        getOptionValue={option => option.symbol}
                     />
-                ))}
-            </AddedTokensWrapper>
+                </AsyncSelectWrapper>
+
+                <AddedTokensWrapper>
+                    {tokens.map(token => (
+                        <AddedToken
+                            key={token.symbol}
+                            token={token}
+                            pending={pending}
+                            removeToken={props.removeToken}
+                        />
+                    ))}
+                </AddedTokensWrapper>
+            </Content>
         </SelectedAccount>
     );
 };
diff --git a/src/views/Wallet/views/Dashboard/index.js b/src/views/Wallet/views/Dashboard/index.js
index ac811dee..3fde163b 100644
--- a/src/views/Wallet/views/Dashboard/index.js
+++ b/src/views/Wallet/views/Dashboard/index.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
 import { connect } from 'react-redux';
+import Content from 'views/Wallet/components/Content';
 
 import { H2 } from 'components/Heading';
 import DashboardImg from 'images/dashboard.png';
@@ -27,14 +28,16 @@ const P = styled.p`
 `;
 
 const Dashboard = () => (
-    <Wrapper>
-        <H2>Dashboard</H2>
-        <Row>
-            <H2>Please select your coin</H2>
-            <P>You will gain access to recieving &amp; sending selected coin</P>
-            <img src={DashboardImg} height="34" width="auto" alt="Dashboard" />
-        </Row>
-    </Wrapper>
+    <Content>
+        <Wrapper>
+            <H2>Dashboard</H2>
+            <Row>
+                <H2>Please select your coin</H2>
+                <P>You will gain access to recieving &amp; sending selected coin</P>
+                <img src={DashboardImg} height="34" width="auto" alt="Dashboard" />
+            </Row>
+        </Wrapper>
+    </Content>
 );
 
 export default connect(null, null)(Dashboard);
diff --git a/src/views/Wallet/views/DeviceSettings/index.js b/src/views/Wallet/views/DeviceSettings/index.js
index c35ce3aa..b557c944 100644
--- a/src/views/Wallet/views/DeviceSettings/index.js
+++ b/src/views/Wallet/views/DeviceSettings/index.js
@@ -7,6 +7,7 @@ import Button from 'components/Button';
 import P from 'components/Paragraph';
 import Link from 'components/Link';
 import ICONS from 'config/icons';
+import Content from 'views/Wallet/components/Content';
 import { connect } from 'react-redux';
 
 const Section = styled.section`
@@ -30,20 +31,22 @@ const StyledP = styled(P)`
 `;
 
 const DeviceSettings = () => (
-    <Section>
-        <Row>
-            <Icon
-                size={60}
-                color={colors.WARNING_PRIMARY}
-                icon={ICONS.WARNING}
-            />
-            <H2>Device settings is under construction</H2>
-            <StyledP isSmaller>Please use Bitcoin wallet interface to change your device settings</StyledP>
-            <Link href="https://wallet.trezor.io/">
-                <Button>Take me to the Bitcoin wallet</Button>
-            </Link>
-        </Row>
-    </Section>
+    <Content>
+        <Section>
+            <Row>
+                <Icon
+                    size={60}
+                    color={colors.WARNING_PRIMARY}
+                    icon={ICONS.WARNING}
+                />
+                <H2>Device settings is under construction</H2>
+                <StyledP isSmaller>Please use Bitcoin wallet interface to change your device settings</StyledP>
+                <Link href="https://wallet.trezor.io/">
+                    <Button>Take me to the Bitcoin wallet</Button>
+                </Link>
+            </Row>
+        </Section>
+    </Content>
 );
 
 export default connect(null, null)(DeviceSettings);
diff --git a/src/views/Wallet/views/WalletSettings/index.js b/src/views/Wallet/views/WalletSettings/index.js
index 2ea20ad3..dead180e 100644
--- a/src/views/Wallet/views/WalletSettings/index.js
+++ b/src/views/Wallet/views/WalletSettings/index.js
@@ -1,13 +1,16 @@
 import styled from 'styled-components';
 import React from 'react';
 import { connect } from 'react-redux';
+import Content from 'views/Wallet/components/Content';
 
 const Wrapper = styled.div``;
 
 const WalletSettings = () => (
-    <Wrapper>
-        Wallet settings
-    </Wrapper>
+    <Content>
+        <Wrapper>
+            Wallet settings
+        </Wrapper>
+    </Content>
 );
 
 export default connect(null, null)(WalletSettings);
diff --git a/webpack/production.babel.js b/webpack/production.babel.js
index bc6919f1..63294226 100644
--- a/webpack/production.babel.js
+++ b/webpack/production.babel.js
@@ -65,7 +65,7 @@ module.exports = {
     plugins: [
         new webpack.DefinePlugin({
             'process.env.BUILD': JSON.stringify(process.env.BUILD),
-            COMMITHASH: JSON.stringify(gitRevisionPlugin.commithash())
+            COMMITHASH: JSON.stringify(gitRevisionPlugin.commithash()),
         }),
         new HtmlWebpackPlugin({
             chunks: ['index'],