diff --git a/web/cashtab/src/components/App.js b/web/cashtab/src/components/App.js
--- a/web/cashtab/src/components/App.js
+++ b/web/cashtab/src/components/App.js
@@ -1,5 +1,7 @@
 import React from 'react';
 import 'antd/dist/antd.less';
+import { Spin } from 'antd';
+import { CashLoadingIcon } from '@components/Common/CustomIcons';
 import '../index.css';
 import styled, { ThemeProvider, createGlobalStyle } from 'styled-components';
 import { theme } from '@assets/styles/theme';
@@ -201,7 +203,7 @@
 
 const App = () => {
     const ContextValue = React.useContext(WalletContext);
-    const { wallet, tokens } = ContextValue;
+    const { wallet, loading, tokens } = ContextValue;
 
     const hasTab = checkForTokenById(
         tokens,
@@ -215,84 +217,86 @@
     return (
         <ThemeProvider theme={theme}>
             <GlobalStyle />
-            <CustomApp>
-                <WalletBody>
-                    <WalletCtn>
-                        <HeaderCtn>
-                            <CashTabLogo src={CashTab} alt="cashtab" />
-                            {hasTab && (
-                                <EasterEgg src={TabCash} alt="tabcash" />
-                            )}
-                            <a
-                                href="https://e.cash/"
-                                target="_blank"
-                                rel="noopener noreferrer"
-                            >
-                                <AbcLogo src={ABC} alt="abc" />
-                            </a>
-                        </HeaderCtn>
-                        <WalletLabel name={wallet.name}></WalletLabel>
-                        <Switch>
-                            <Route path="/wallet">
-                                <Wallet />
-                            </Route>
-                            <Route path="/tokens">
-                                <Tokens />
-                            </Route>
-                            <Route path="/send">
-                                <Send />
-                            </Route>
-                            <Route
-                                path="/send-token/:tokenId"
-                                render={props => (
-                                    <SendToken
-                                        tokenId={props.match.params.tokenId}
-                                    />
+            <Spin spinning={loading} indicator={CashLoadingIcon}>
+                <CustomApp>
+                    <WalletBody>
+                        <WalletCtn>
+                            <HeaderCtn>
+                                <CashTabLogo src={CashTab} alt="cashtab" />
+                                {hasTab && (
+                                    <EasterEgg src={TabCash} alt="tabcash" />
                                 )}
-                            />
-                            <Route path="/configure">
-                                <Configure />
-                            </Route>
-                            <Redirect exact from="/" to="/wallet" />
-                            <Route component={NotFound} />
-                        </Switch>
-                    </WalletCtn>
-                    {wallet ? (
-                        <Footer>
-                            <NavButton
-                                active={selectedKey === 'wallet'}
-                                onClick={() => history.push('/wallet')}
-                            >
-                                <FolderOpenFilled />
-                                Wallet
-                            </NavButton>
+                                <a
+                                    href="https://e.cash/"
+                                    target="_blank"
+                                    rel="noopener noreferrer"
+                                >
+                                    <AbcLogo src={ABC} alt="abc" />
+                                </a>
+                            </HeaderCtn>
+                            <WalletLabel name={wallet.name}></WalletLabel>
+                            <Switch>
+                                <Route path="/wallet">
+                                    <Wallet />
+                                </Route>
+                                <Route path="/tokens">
+                                    <Tokens />
+                                </Route>
+                                <Route path="/send">
+                                    <Send />
+                                </Route>
+                                <Route
+                                    path="/send-token/:tokenId"
+                                    render={props => (
+                                        <SendToken
+                                            tokenId={props.match.params.tokenId}
+                                        />
+                                    )}
+                                />
+                                <Route path="/configure">
+                                    <Configure />
+                                </Route>
+                                <Redirect exact from="/" to="/wallet" />
+                                <Route component={NotFound} />
+                            </Switch>
+                        </WalletCtn>
+                        {wallet ? (
+                            <Footer>
+                                <NavButton
+                                    active={selectedKey === 'wallet'}
+                                    onClick={() => history.push('/wallet')}
+                                >
+                                    <FolderOpenFilled />
+                                    Wallet
+                                </NavButton>
 
-                            <NavButton
-                                active={selectedKey === 'tokens'}
-                                onClick={() => history.push('/tokens')}
-                            >
-                                <AppstoreAddOutlined />
-                                Tokens
-                            </NavButton>
+                                <NavButton
+                                    active={selectedKey === 'tokens'}
+                                    onClick={() => history.push('/tokens')}
+                                >
+                                    <AppstoreAddOutlined />
+                                    Tokens
+                                </NavButton>
 
-                            <NavButton
-                                active={selectedKey === 'send'}
-                                onClick={() => history.push('/send')}
-                            >
-                                <CaretRightOutlined />
-                                Send
-                            </NavButton>
-                            <NavButton
-                                active={selectedKey === 'configure'}
-                                onClick={() => history.push('/configure')}
-                            >
-                                <SettingFilled />
-                                Settings
-                            </NavButton>
-                        </Footer>
-                    ) : null}
-                </WalletBody>
-            </CustomApp>
+                                <NavButton
+                                    active={selectedKey === 'send'}
+                                    onClick={() => history.push('/send')}
+                                >
+                                    <CaretRightOutlined />
+                                    Send
+                                </NavButton>
+                                <NavButton
+                                    active={selectedKey === 'configure'}
+                                    onClick={() => history.push('/configure')}
+                                >
+                                    <SettingFilled />
+                                    Settings
+                                </NavButton>
+                            </Footer>
+                        ) : null}
+                    </WalletBody>
+                </CustomApp>
+            </Spin>
         </ThemeProvider>
     );
 };
diff --git a/web/cashtab/src/components/Configure/Configure.js b/web/cashtab/src/components/Configure/Configure.js
--- a/web/cashtab/src/components/Configure/Configure.js
+++ b/web/cashtab/src/components/Configure/Configure.js
@@ -1,7 +1,7 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import React, { useState, useEffect } from 'react';
 import styled from 'styled-components';
-import { Collapse, Form, Input, Modal, Spin, Alert } from 'antd';
+import { Collapse, Form, Input, Modal, Alert } from 'antd';
 import {
     PlusSquareOutlined,
     WalletFilled,
@@ -20,7 +20,6 @@
 } from '@components/Common/PrimaryButton';
 import {
     CashLoader,
-    CashLoadingIcon,
     ThemedCopyOutlined,
     ThemedWalletOutlined,
     ThemedDollarOutlined,
@@ -167,7 +166,7 @@
 
 const Configure = () => {
     const ContextValue = React.useContext(WalletContext);
-    const { wallet, loading, apiError } = ContextValue;
+    const { wallet, apiError } = ContextValue;
 
     const {
         addNewSavedWallet,
@@ -381,242 +380,230 @@
     };
 
     return (
-        <Spin spinning={loading} indicator={CashLoadingIcon}>
-            <StyledConfigure>
-                {walletToBeRenamed !== null && (
-                    <Modal
-                        title={`Rename Wallet ${walletToBeRenamed.name}`}
-                        visible={showRenameWalletModal}
-                        onOk={changeWalletName}
-                        onCancel={() => cancelRenameWallet()}
-                    >
-                        <AntdFormWrapper>
-                            <Form style={{ width: 'auto' }}>
-                                <Form.Item
-                                    validateStatus={
-                                        newWalletNameIsValid === null ||
-                                        newWalletNameIsValid
-                                            ? ''
-                                            : 'error'
-                                    }
-                                    help={
-                                        newWalletNameIsValid === null ||
-                                        newWalletNameIsValid
-                                            ? ''
-                                            : 'Wallet name must be a string between 1 and 24 characters long'
-                                    }
-                                >
-                                    <Input
-                                        prefix={<WalletFilled />}
-                                        placeholder="Enter new wallet name"
-                                        name="newName"
-                                        value={newWalletName}
-                                        onChange={e => handleWalletNameInput(e)}
-                                    />
-                                </Form.Item>
-                            </Form>
-                        </AntdFormWrapper>
-                    </Modal>
-                )}
-                {walletToBeDeleted !== null && (
-                    <Modal
-                        title={`Are you sure you want to delete wallet "${walletToBeDeleted.name}"?`}
-                        visible={showDeleteWalletModal}
-                        onOk={deleteSelectedWallet}
-                        onCancel={() => cancelDeleteWallet()}
-                    >
-                        <AntdFormWrapper>
-                            <Form style={{ width: 'auto' }}>
-                                <Form.Item
-                                    validateStatus={
-                                        walletDeleteValid === null ||
-                                        walletDeleteValid
-                                            ? ''
-                                            : 'error'
-                                    }
-                                    help={
-                                        walletDeleteValid === null ||
-                                        walletDeleteValid
-                                            ? ''
-                                            : 'Your confirmation phrase must match exactly'
-                                    }
-                                >
-                                    <Input
-                                        prefix={<WalletFilled />}
-                                        placeholder={`Type "delete ${walletToBeDeleted.name}" to confirm`}
-                                        name="walletToBeDeletedInput"
-                                        value={confirmationOfWalletToBeDeleted}
-                                        onChange={e =>
-                                            handleWalletToDeleteInput(e)
+        <StyledConfigure>
+            {walletToBeRenamed !== null && (
+                <Modal
+                    title={`Rename Wallet ${walletToBeRenamed.name}`}
+                    visible={showRenameWalletModal}
+                    onOk={changeWalletName}
+                    onCancel={() => cancelRenameWallet()}
+                >
+                    <AntdFormWrapper>
+                        <Form style={{ width: 'auto' }}>
+                            <Form.Item
+                                validateStatus={
+                                    newWalletNameIsValid === null ||
+                                    newWalletNameIsValid
+                                        ? ''
+                                        : 'error'
+                                }
+                                help={
+                                    newWalletNameIsValid === null ||
+                                    newWalletNameIsValid
+                                        ? ''
+                                        : 'Wallet name must be a string between 1 and 24 characters long'
+                                }
+                            >
+                                <Input
+                                    prefix={<WalletFilled />}
+                                    placeholder="Enter new wallet name"
+                                    name="newName"
+                                    value={newWalletName}
+                                    onChange={e => handleWalletNameInput(e)}
+                                />
+                            </Form.Item>
+                        </Form>
+                    </AntdFormWrapper>
+                </Modal>
+            )}
+            {walletToBeDeleted !== null && (
+                <Modal
+                    title={`Are you sure you want to delete wallet "${walletToBeDeleted.name}"?`}
+                    visible={showDeleteWalletModal}
+                    onOk={deleteSelectedWallet}
+                    onCancel={() => cancelDeleteWallet()}
+                >
+                    <AntdFormWrapper>
+                        <Form style={{ width: 'auto' }}>
+                            <Form.Item
+                                validateStatus={
+                                    walletDeleteValid === null ||
+                                    walletDeleteValid
+                                        ? ''
+                                        : 'error'
+                                }
+                                help={
+                                    walletDeleteValid === null ||
+                                    walletDeleteValid
+                                        ? ''
+                                        : 'Your confirmation phrase must match exactly'
+                                }
+                            >
+                                <Input
+                                    prefix={<WalletFilled />}
+                                    placeholder={`Type "delete ${walletToBeDeleted.name}" to confirm`}
+                                    name="walletToBeDeletedInput"
+                                    value={confirmationOfWalletToBeDeleted}
+                                    onChange={e => handleWalletToDeleteInput(e)}
+                                />
+                            </Form.Item>
+                        </Form>
+                    </AntdFormWrapper>
+                </Modal>
+            )}
+            <h2>
+                <ThemedCopyOutlined /> Backup your wallet
+            </h2>
+            <Alert
+                style={{ marginBottom: '12px' }}
+                description="Your seed phrase is the only way to restore your wallet. Write it down. Keep it safe."
+                type="warning"
+                showIcon
+            />
+            {wallet && wallet.mnemonic && (
+                <StyledCollapse>
+                    <Panel header="Click to reveal seed phrase" key="1">
+                        <p className="notranslate">
+                            {wallet && wallet.mnemonic ? wallet.mnemonic : ''}
+                        </p>
+                    </Panel>
+                </StyledCollapse>
+            )}
+            <StyledSpacer />
+            <h2>
+                <ThemedWalletOutlined /> Manage Wallets
+            </h2>
+            {apiError ? (
+                <>
+                    <CashLoader />
+                    <p style={{ color: 'red' }}>
+                        <b>An error occured on our end. Reconnecting...</b>
+                    </p>
+                </>
+            ) : (
+                <>
+                    <PrimaryButton onClick={() => updateSavedWalletsOnCreate()}>
+                        <PlusSquareOutlined /> New Wallet
+                    </PrimaryButton>
+                    <SecondaryButton onClick={() => openSeedInput(!seedInput)}>
+                        <ImportOutlined /> Import Wallet
+                    </SecondaryButton>
+                    {seedInput && (
+                        <>
+                            <p>
+                                Copy and paste your mnemonic seed phrase below
+                                to import an existing wallet
+                            </p>
+                            <AntdFormWrapper>
+                                <Form style={{ width: 'auto' }}>
+                                    <Form.Item
+                                        validateStatus={
+                                            isValidMnemonic === null ||
+                                            isValidMnemonic
+                                                ? ''
+                                                : 'error'
                                         }
-                                    />
-                                </Form.Item>
-                            </Form>
-                        </AntdFormWrapper>
-                    </Modal>
-                )}
-                <h2>
-                    <ThemedCopyOutlined /> Backup your wallet
-                </h2>
-                <Alert
-                    style={{ marginBottom: '12px' }}
-                    description="Your seed phrase is the only way to restore your wallet. Write it down. Keep it safe."
-                    type="warning"
-                    showIcon
-                />
-                {wallet && wallet.mnemonic && (
+                                        help={
+                                            isValidMnemonic === null ||
+                                            isValidMnemonic
+                                                ? ''
+                                                : 'Valid mnemonic seed phrase required'
+                                        }
+                                    >
+                                        <Input
+                                            prefix={<LockOutlined />}
+                                            type="email"
+                                            placeholder="mnemonic (seed phrase)"
+                                            name="mnemonic"
+                                            autoComplete="off"
+                                            onChange={e => handleChange(e)}
+                                            required
+                                        />
+                                    </Form.Item>
+                                    <SmartButton
+                                        disabled={!isValidMnemonic}
+                                        onClick={() => submit()}
+                                    >
+                                        Import
+                                    </SmartButton>
+                                </Form>
+                            </AntdFormWrapper>
+                        </>
+                    )}
+                </>
+            )}
+            {savedWallets && savedWallets.length > 0 && (
+                <>
                     <StyledCollapse>
-                        <Panel header="Click to reveal seed phrase" key="1">
-                            <p className="notranslate">
-                                {wallet && wallet.mnemonic
-                                    ? wallet.mnemonic
-                                    : ''}
-                            </p>
+                        <Panel header="Saved wallets" key="2">
+                            <AWRow>
+                                <h3>{wallet.name}</h3>
+                                <h4>Currently active</h4>
+                            </AWRow>
+                            <div>
+                                {savedWallets.map(sw => (
+                                    <SWRow key={sw.name}>
+                                        <SWName>
+                                            <h3>{sw.name}</h3>
+                                        </SWName>
+
+                                        <SWButtonCtn>
+                                            <Edit
+                                                onClick={() =>
+                                                    showPopulatedRenameWalletModal(
+                                                        sw,
+                                                    )
+                                                }
+                                            />
+                                            <Trashcan
+                                                onClick={() =>
+                                                    showPopulatedDeleteWalletModal(
+                                                        sw,
+                                                    )
+                                                }
+                                            />
+                                            <button
+                                                onClick={() =>
+                                                    updateSavedWalletsOnLoad(sw)
+                                                }
+                                            >
+                                                Activate
+                                            </button>
+                                        </SWButtonCtn>
+                                    </SWRow>
+                                ))}
+                            </div>
                         </Panel>
                     </StyledCollapse>
-                )}
-                <StyledSpacer />
-                <h2>
-                    <ThemedWalletOutlined /> Manage Wallets
-                </h2>
-                {apiError ? (
-                    <>
-                        <CashLoader />
-                        <p style={{ color: 'red' }}>
-                            <b>An error occured on our end. Reconnecting...</b>
-                        </p>
-                    </>
-                ) : (
-                    <>
-                        <PrimaryButton
-                            onClick={() => updateSavedWalletsOnCreate()}
-                        >
-                            <PlusSquareOutlined /> New Wallet
-                        </PrimaryButton>
-                        <SecondaryButton
-                            onClick={() => openSeedInput(!seedInput)}
-                        >
-                            <ImportOutlined /> Import Wallet
-                        </SecondaryButton>
-                        {seedInput && (
-                            <>
-                                <p>
-                                    Copy and paste your mnemonic seed phrase
-                                    below to import an existing wallet
-                                </p>
-                                <AntdFormWrapper>
-                                    <Form style={{ width: 'auto' }}>
-                                        <Form.Item
-                                            validateStatus={
-                                                isValidMnemonic === null ||
-                                                isValidMnemonic
-                                                    ? ''
-                                                    : 'error'
-                                            }
-                                            help={
-                                                isValidMnemonic === null ||
-                                                isValidMnemonic
-                                                    ? ''
-                                                    : 'Valid mnemonic seed phrase required'
-                                            }
-                                        >
-                                            <Input
-                                                prefix={<LockOutlined />}
-                                                type="email"
-                                                placeholder="mnemonic (seed phrase)"
-                                                name="mnemonic"
-                                                autoComplete="off"
-                                                onChange={e => handleChange(e)}
-                                                required
-                                            />
-                                        </Form.Item>
-                                        <SmartButton
-                                            disabled={!isValidMnemonic}
-                                            onClick={() => submit()}
-                                        >
-                                            Import
-                                        </SmartButton>
-                                    </Form>
-                                </AntdFormWrapper>
-                            </>
-                        )}
-                    </>
-                )}
-                {savedWallets && savedWallets.length > 0 && (
-                    <>
-                        <StyledCollapse>
-                            <Panel header="Saved wallets" key="2">
-                                <AWRow>
-                                    <h3>{wallet.name}</h3>
-                                    <h4>Currently active</h4>
-                                </AWRow>
-                                <div>
-                                    {savedWallets.map(sw => (
-                                        <SWRow key={sw.name}>
-                                            <SWName>
-                                                <h3>{sw.name}</h3>
-                                            </SWName>
-
-                                            <SWButtonCtn>
-                                                <Edit
-                                                    onClick={() =>
-                                                        showPopulatedRenameWalletModal(
-                                                            sw,
-                                                        )
-                                                    }
-                                                />
-                                                <Trashcan
-                                                    onClick={() =>
-                                                        showPopulatedDeleteWalletModal(
-                                                            sw,
-                                                        )
-                                                    }
-                                                />
-                                                <button
-                                                    onClick={() =>
-                                                        updateSavedWalletsOnLoad(
-                                                            sw,
-                                                        )
-                                                    }
-                                                >
-                                                    Activate
-                                                </button>
-                                            </SWButtonCtn>
-                                        </SWRow>
-                                    ))}
-                                </div>
-                            </Panel>
-                        </StyledCollapse>
-                    </>
-                )}
-                <StyledSpacer />
-                <h2>
-                    <ThemedDollarOutlined /> Fiat Currency
-                </h2>
-                <AntdFormWrapper>
-                    <CurrencySelectDropdown
-                        defaultValue={
-                            cashtabSettings && cashtabSettings.fiatCurrency
-                                ? cashtabSettings.fiatCurrency
-                                : 'usd'
-                        }
-                        onChange={fiatCode =>
-                            changeCashtabSettings('fiatCurrency', fiatCode)
-                        }
-                    />
-                </AntdFormWrapper>
-                <StyledSpacer />[
-                <SettingsLink
-                    type="link"
-                    href="https://docs.cashtabapp.com/docs/"
-                    target="_blank"
-                    rel="noreferrer"
-                >
-                    Documentation
-                </SettingsLink>
-                ]
-            </StyledConfigure>
-        </Spin>
+                </>
+            )}
+            <StyledSpacer />
+            <h2>
+                <ThemedDollarOutlined /> Fiat Currency
+            </h2>
+            <AntdFormWrapper>
+                <CurrencySelectDropdown
+                    defaultValue={
+                        cashtabSettings && cashtabSettings.fiatCurrency
+                            ? cashtabSettings.fiatCurrency
+                            : 'usd'
+                    }
+                    onChange={fiatCode =>
+                        changeCashtabSettings('fiatCurrency', fiatCode)
+                    }
+                />
+            </AntdFormWrapper>
+            <StyledSpacer />[
+            <SettingsLink
+                type="link"
+                href="https://docs.cashtabapp.com/docs/"
+                target="_blank"
+                rel="noreferrer"
+            >
+                Documentation
+            </SettingsLink>
+            ]
+        </StyledConfigure>
     );
 };
 
diff --git a/web/cashtab/src/components/Configure/__tests__/__snapshots__/Configure.test.js.snap b/web/cashtab/src/components/Configure/__tests__/__snapshots__/Configure.test.js.snap
--- a/web/cashtab/src/components/Configure/__tests__/__snapshots__/Configure.test.js.snap
+++ b/web/cashtab/src/components/Configure/__tests__/__snapshots__/Configure.test.js.snap
@@ -2,79 +2,98 @@
 
 exports[`Configure with a wallet 1`] = `
 <div
-  className="ant-spin-nested-loading"
+  className="sc-kGXeez ldTGry"
 >
-  <div>
+  <h2>
+    <span
+      aria-label="copy"
+      className="anticon anticon-copy sc-htpNat fLtATP"
+      role="img"
+    >
+      <svg
+        aria-hidden="true"
+        data-icon="copy"
+        fill="currentColor"
+        focusable="false"
+        height="1em"
+        viewBox="64 64 896 896"
+        width="1em"
+      >
+        <path
+          d="M832 64H296c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h496v688c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8V96c0-17.7-14.3-32-32-32zM704 192H192c-17.7 0-32 14.3-32 32v530.7c0 8.5 3.4 16.6 9.4 22.6l173.3 173.3c2.2 2.2 4.7 4 7.4 5.5v1.9h4.2c3.5 1.3 7.2 2 11 2H704c17.7 0 32-14.3 32-32V224c0-17.7-14.3-32-32-32zM350 856.2L263.9 770H350v86.2zM664 888H414V746c0-22.1-17.9-40-40-40H232V264h432v624z"
+        />
+      </svg>
+    </span>
+     Backup your wallet
+  </h2>
+  <div
+    className="ant-alert ant-alert-warning ant-alert-with-description"
+    data-show={true}
+    role="alert"
+    style={
+      Object {
+        "marginBottom": "12px",
+      }
+    }
+  >
+    <span
+      aria-label="exclamation-circle"
+      className="anticon anticon-exclamation-circle ant-alert-icon"
+      role="img"
+    >
+      <svg
+        aria-hidden="true"
+        data-icon="exclamation-circle"
+        fill="currentColor"
+        focusable="false"
+        height="1em"
+        viewBox="64 64 896 896"
+        width="1em"
+      >
+        <path
+          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"
+        />
+        <path
+          d="M464 688a48 48 0 1096 0 48 48 0 10-96 0zm24-112h48c4.4 0 8-3.6 8-8V296c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v272c0 4.4 3.6 8 8 8z"
+        />
+      </svg>
+    </span>
     <div
-      className="ant-spin ant-spin-spinning"
+      className="ant-alert-content"
     >
-      <span
-        aria-label="loading"
-        className="anticon anticon-loading anticon-spin cashLoadingIcon ant-spin-dot"
-        role="img"
+      <div
+        className="ant-alert-message"
+      />
+      <div
+        className="ant-alert-description"
       >
-        <svg
-          aria-hidden="true"
-          data-icon="loading"
-          fill="currentColor"
-          focusable="false"
-          height="1em"
-          viewBox="0 0 1024 1024"
-          width="1em"
-        >
-          <path
-            d="M988 548c-19.9 0-36-16.1-36-36 0-59.4-11.6-117-34.6-171.3a440.45 440.45 0 00-94.3-139.9 437.71 437.71 0 00-139.9-94.3C629 83.6 571.4 72 512 72c-19.9 0-36-16.1-36-36s16.1-36 36-36c69.1 0 136.2 13.5 199.3 40.3C772.3 66 827 103 874 150c47 47 83.9 101.8 109.7 162.7 26.7 63.1 40.2 130.2 40.2 199.3.1 19.9-16 36-35.9 36z"
-          />
-        </svg>
-      </span>
+        Your seed phrase is the only way to restore your wallet. Write it down. Keep it safe.
+      </div>
     </div>
   </div>
   <div
-    className="ant-spin-container ant-spin-blur"
+    className="ant-collapse ant-collapse-icon-position-left sc-bdVaJa AfOYf"
+    role={null}
   >
     <div
-      className="sc-kGXeez ldTGry"
+      className="ant-collapse-item"
     >
-      <h2>
-        <span
-          aria-label="copy"
-          className="anticon anticon-copy sc-htpNat fLtATP"
-          role="img"
-        >
-          <svg
-            aria-hidden="true"
-            data-icon="copy"
-            fill="currentColor"
-            focusable="false"
-            height="1em"
-            viewBox="64 64 896 896"
-            width="1em"
-          >
-            <path
-              d="M832 64H296c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h496v688c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8V96c0-17.7-14.3-32-32-32zM704 192H192c-17.7 0-32 14.3-32 32v530.7c0 8.5 3.4 16.6 9.4 22.6l173.3 173.3c2.2 2.2 4.7 4 7.4 5.5v1.9h4.2c3.5 1.3 7.2 2 11 2H704c17.7 0 32-14.3 32-32V224c0-17.7-14.3-32-32-32zM350 856.2L263.9 770H350v86.2zM664 888H414V746c0-22.1-17.9-40-40-40H232V264h432v624z"
-            />
-          </svg>
-        </span>
-         Backup your wallet
-      </h2>
       <div
-        className="ant-alert ant-alert-warning ant-alert-with-description"
-        data-show={true}
-        role="alert"
-        style={
-          Object {
-            "marginBottom": "12px",
-          }
-        }
+        aria-expanded={false}
+        className="ant-collapse-header"
+        onClick={[Function]}
+        onKeyPress={[Function]}
+        role="button"
+        tabIndex={0}
       >
         <span
-          aria-label="exclamation-circle"
-          className="anticon anticon-exclamation-circle ant-alert-icon"
+          aria-label="right"
+          className="anticon anticon-right ant-collapse-arrow"
           role="img"
         >
           <svg
             aria-hidden="true"
-            data-icon="exclamation-circle"
+            data-icon="right"
             fill="currentColor"
             focusable="false"
             height="1em"
@@ -82,154 +101,195 @@
             width="1em"
           >
             <path
-              d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"
-            />
-            <path
-              d="M464 688a48 48 0 1096 0 48 48 0 10-96 0zm24-112h48c4.4 0 8-3.6 8-8V296c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v272c0 4.4 3.6 8 8 8z"
+              d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"
             />
           </svg>
         </span>
-        <div
-          className="ant-alert-content"
-        >
-          <div
-            className="ant-alert-message"
-          />
-          <div
-            className="ant-alert-description"
-          >
-            Your seed phrase is the only way to restore your wallet. Write it down. Keep it safe.
-          </div>
-        </div>
+        Click to reveal seed phrase
       </div>
-      <div
-        className="ant-collapse ant-collapse-icon-position-left sc-bdVaJa AfOYf"
-        role={null}
+    </div>
+  </div>
+  <div
+    className="sc-kpOJdX eglhol"
+  />
+  <h2>
+    <span
+      aria-label="wallet"
+      className="anticon anticon-wallet sc-ifAKCX cYbSut"
+      role="img"
+    >
+      <svg
+        aria-hidden="true"
+        data-icon="wallet"
+        fill="currentColor"
+        focusable="false"
+        height="1em"
+        viewBox="64 64 896 896"
+        width="1em"
       >
-        <div
-          className="ant-collapse-item"
-        >
-          <div
-            aria-expanded={false}
-            className="ant-collapse-header"
-            onClick={[Function]}
-            onKeyPress={[Function]}
-            role="button"
-            tabIndex={0}
-          >
-            <span
-              aria-label="right"
-              className="anticon anticon-right ant-collapse-arrow"
-              role="img"
-            >
-              <svg
-                aria-hidden="true"
-                data-icon="right"
-                fill="currentColor"
-                focusable="false"
-                height="1em"
-                viewBox="64 64 896 896"
-                width="1em"
-              >
-                <path
-                  d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"
-                />
-              </svg>
-            </span>
-            Click to reveal seed phrase
-          </div>
-        </div>
-      </div>
+        <path
+          d="M880 112H144c-17.7 0-32 14.3-32 32v736c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V144c0-17.7-14.3-32-32-32zm-40 464H528V448h312v128zm0 264H184V184h656v200H496c-17.7 0-32 14.3-32 32v192c0 17.7 14.3 32 32 32h344v200zM580 512a40 40 0 1080 0 40 40 0 10-80 0z"
+        />
+      </svg>
+    </span>
+     Manage Wallets
+  </h2>
+  <button
+    className="sc-VigVT RpRhe"
+    onClick={[Function]}
+  >
+    <span
+      aria-label="plus-square"
+      className="anticon anticon-plus-square"
+      role="img"
+    >
+      <svg
+        aria-hidden="true"
+        data-icon="plus-square"
+        fill="currentColor"
+        focusable="false"
+        height="1em"
+        viewBox="64 64 896 896"
+        width="1em"
+      >
+        <path
+          d="M328 544h152v152c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V544h152c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8H544V328c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v152H328c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8z"
+        />
+        <path
+          d="M880 112H144c-17.7 0-32 14.3-32 32v736c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V144c0-17.7-14.3-32-32-32zm-40 728H184V184h656v656z"
+        />
+      </svg>
+    </span>
+     New Wallet
+  </button>
+  <button
+    className="sc-jTzLTM bLkbAy"
+    onClick={[Function]}
+  >
+    <span
+      aria-label="import"
+      className="anticon anticon-import"
+      role="img"
+    >
+      <svg
+        aria-hidden="true"
+        data-icon="import"
+        fill="currentColor"
+        focusable="false"
+        height="1em"
+        viewBox="64 64 896 896"
+        width="1em"
+      >
+        <path
+          d="M888.3 757.4h-53.8c-4.2 0-7.7 3.5-7.7 7.7v61.8H197.1V197.1h629.8v61.8c0 4.2 3.5 7.7 7.7 7.7h53.8c4.2 0 7.7-3.4 7.7-7.7V158.7c0-17-13.7-30.7-30.7-30.7H158.7c-17 0-30.7 13.7-30.7 30.7v706.6c0 17 13.7 30.7 30.7 30.7h706.6c17 0 30.7-13.7 30.7-30.7V765.1c0-4.3-3.5-7.7-7.7-7.7zM902 476H588v-76c0-6.7-7.8-10.5-13-6.3l-141.9 112a8 8 0 000 12.6l141.9 112c5.3 4.2 13 .4 13-6.3v-76h314c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8z"
+        />
+      </svg>
+    </span>
+     Import Wallet
+  </button>
+  <div
+    className="sc-kpOJdX eglhol"
+  />
+  <h2>
+    <span
+      aria-label="dollar"
+      className="anticon anticon-dollar sc-bxivhb ctLIog"
+      role="img"
+    >
+      <svg
+        aria-hidden="true"
+        data-icon="dollar"
+        fill="currentColor"
+        focusable="false"
+        height="1em"
+        viewBox="64 64 896 896"
+        width="1em"
+      >
+        <path
+          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372zm47.7-395.2l-25.4-5.9V348.6c38 5.2 61.5 29 65.5 58.2.5 4 3.9 6.9 7.9 6.9h44.9c4.7 0 8.4-4.1 8-8.8-6.1-62.3-57.4-102.3-125.9-109.2V263c0-4.4-3.6-8-8-8h-28.1c-4.4 0-8 3.6-8 8v33c-70.8 6.9-126.2 46-126.2 119 0 67.6 49.8 100.2 102.1 112.7l24.7 6.3v142.7c-44.2-5.9-69-29.5-74.1-61.3-.6-3.8-4-6.6-7.9-6.6H363c-4.7 0-8.4 4-8 8.7 4.5 55 46.2 105.6 135.2 112.1V761c0 4.4 3.6 8 8 8h28.4c4.4 0 8-3.6 8-8.1l-.2-31.7c78.3-6.9 134.3-48.8 134.3-124-.1-69.4-44.2-100.4-109-116.4zm-68.6-16.2c-5.6-1.6-10.3-3.1-15-5-33.8-12.2-49.5-31.9-49.5-57.3 0-36.3 27.5-57 64.5-61.7v124zM534.3 677V543.3c3.1.9 5.9 1.6 8.8 2.2 47.3 14.4 63.2 34.4 63.2 65.1 0 39.1-29.4 62.6-72 66.4z"
+        />
+      </svg>
+    </span>
+     Fiat Currency
+  </h2>
+  <div
+    className="sc-iwsKbI dmHKdG"
+  >
+    <div
+      className="ant-select select-after ant-select-single ant-select-show-arrow"
+      onBlur={[Function]}
+      onFocus={[Function]}
+      onKeyDown={[Function]}
+      onKeyUp={[Function]}
+      onMouseDown={[Function]}
+      style={
+        Object {
+          "width": "100%",
+        }
+      }
+    >
       <div
-        className="sc-kpOJdX eglhol"
-      />
-      <h2>
-        <span
-          aria-label="wallet"
-          className="anticon anticon-wallet sc-ifAKCX cYbSut"
-          role="img"
-        >
-          <svg
-            aria-hidden="true"
-            data-icon="wallet"
-            fill="currentColor"
-            focusable="false"
-            height="1em"
-            viewBox="64 64 896 896"
-            width="1em"
-          >
-            <path
-              d="M880 112H144c-17.7 0-32 14.3-32 32v736c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V144c0-17.7-14.3-32-32-32zm-40 464H528V448h312v128zm0 264H184V184h656v200H496c-17.7 0-32 14.3-32 32v192c0 17.7 14.3 32 32 32h344v200zM580 512a40 40 0 1080 0 40 40 0 10-80 0z"
-            />
-          </svg>
-        </span>
-         Manage Wallets
-      </h2>
-      <button
-        className="sc-VigVT RpRhe"
+        className="ant-select-selector"
         onClick={[Function]}
+        onMouseDown={[Function]}
       >
         <span
-          aria-label="plus-square"
-          className="anticon anticon-plus-square"
-          role="img"
+          className="ant-select-selection-search"
         >
-          <svg
-            aria-hidden="true"
-            data-icon="plus-square"
-            fill="currentColor"
-            focusable="false"
-            height="1em"
-            viewBox="64 64 896 896"
-            width="1em"
-          >
-            <path
-              d="M328 544h152v152c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V544h152c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8H544V328c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v152H328c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8z"
-            />
-            <path
-              d="M880 112H144c-17.7 0-32 14.3-32 32v736c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V144c0-17.7-14.3-32-32-32zm-40 728H184V184h656v656z"
-            />
-          </svg>
+          <input
+            aria-activedescendant="rc_select_TEST_OR_SSR_list_0"
+            aria-autocomplete="list"
+            aria-controls="rc_select_TEST_OR_SSR_list"
+            aria-haspopup="listbox"
+            aria-owns="rc_select_TEST_OR_SSR_list"
+            autoComplete="off"
+            className="ant-select-selection-search-input"
+            id="rc_select_TEST_OR_SSR"
+            onChange={[Function]}
+            onCompositionEnd={[Function]}
+            onCompositionStart={[Function]}
+            onKeyDown={[Function]}
+            onMouseDown={[Function]}
+            onPaste={[Function]}
+            readOnly={true}
+            role="combobox"
+            style={
+              Object {
+                "opacity": 0,
+              }
+            }
+            type="search"
+            unselectable="on"
+            value=""
+          />
         </span>
-         New Wallet
-      </button>
-      <button
-        className="sc-jTzLTM bLkbAy"
-        onClick={[Function]}
-      >
         <span
-          aria-label="import"
-          className="anticon anticon-import"
-          role="img"
+          className="ant-select-selection-item"
+          title="US Dollar ($)"
         >
-          <svg
-            aria-hidden="true"
-            data-icon="import"
-            fill="currentColor"
-            focusable="false"
-            height="1em"
-            viewBox="64 64 896 896"
-            width="1em"
-          >
-            <path
-              d="M888.3 757.4h-53.8c-4.2 0-7.7 3.5-7.7 7.7v61.8H197.1V197.1h629.8v61.8c0 4.2 3.5 7.7 7.7 7.7h53.8c4.2 0 7.7-3.4 7.7-7.7V158.7c0-17-13.7-30.7-30.7-30.7H158.7c-17 0-30.7 13.7-30.7 30.7v706.6c0 17 13.7 30.7 30.7 30.7h706.6c17 0 30.7-13.7 30.7-30.7V765.1c0-4.3-3.5-7.7-7.7-7.7zM902 476H588v-76c0-6.7-7.8-10.5-13-6.3l-141.9 112a8 8 0 000 12.6l141.9 112c5.3 4.2 13 .4 13-6.3v-76h314c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8z"
-            />
-          </svg>
+          US Dollar ($)
         </span>
-         Import Wallet
-      </button>
-      <div
-        className="sc-kpOJdX eglhol"
-      />
-      <h2>
+      </div>
+      <span
+        aria-hidden={true}
+        className="ant-select-arrow"
+        onMouseDown={[Function]}
+        style={
+          Object {
+            "WebkitUserSelect": "none",
+            "userSelect": "none",
+          }
+        }
+        unselectable="on"
+      >
         <span
-          aria-label="dollar"
-          className="anticon anticon-dollar sc-bxivhb ctLIog"
+          aria-label="down"
+          className="anticon anticon-down ant-select-suffix"
           role="img"
         >
           <svg
             aria-hidden="true"
-            data-icon="dollar"
+            data-icon="down"
             fill="currentColor"
             focusable="false"
             height="1em"
@@ -237,315 +297,282 @@
             width="1em"
           >
             <path
-              d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372zm47.7-395.2l-25.4-5.9V348.6c38 5.2 61.5 29 65.5 58.2.5 4 3.9 6.9 7.9 6.9h44.9c4.7 0 8.4-4.1 8-8.8-6.1-62.3-57.4-102.3-125.9-109.2V263c0-4.4-3.6-8-8-8h-28.1c-4.4 0-8 3.6-8 8v33c-70.8 6.9-126.2 46-126.2 119 0 67.6 49.8 100.2 102.1 112.7l24.7 6.3v142.7c-44.2-5.9-69-29.5-74.1-61.3-.6-3.8-4-6.6-7.9-6.6H363c-4.7 0-8.4 4-8 8.7 4.5 55 46.2 105.6 135.2 112.1V761c0 4.4 3.6 8 8 8h28.4c4.4 0 8-3.6 8-8.1l-.2-31.7c78.3-6.9 134.3-48.8 134.3-124-.1-69.4-44.2-100.4-109-116.4zm-68.6-16.2c-5.6-1.6-10.3-3.1-15-5-33.8-12.2-49.5-31.9-49.5-57.3 0-36.3 27.5-57 64.5-61.7v124zM534.3 677V543.3c3.1.9 5.9 1.6 8.8 2.2 47.3 14.4 63.2 34.4 63.2 65.1 0 39.1-29.4 62.6-72 66.4z"
+              d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"
             />
           </svg>
         </span>
-         Fiat Currency
-      </h2>
-      <div
-        className="sc-iwsKbI dmHKdG"
-      >
-        <div
-          className="ant-select select-after ant-select-single ant-select-show-arrow"
-          onBlur={[Function]}
-          onFocus={[Function]}
-          onKeyDown={[Function]}
-          onKeyUp={[Function]}
-          onMouseDown={[Function]}
-          style={
-            Object {
-              "width": "100%",
-            }
-          }
-        >
-          <div
-            className="ant-select-selector"
-            onClick={[Function]}
-            onMouseDown={[Function]}
-          >
-            <span
-              className="ant-select-selection-search"
-            >
-              <input
-                aria-activedescendant="rc_select_TEST_OR_SSR_list_0"
-                aria-autocomplete="list"
-                aria-controls="rc_select_TEST_OR_SSR_list"
-                aria-haspopup="listbox"
-                aria-owns="rc_select_TEST_OR_SSR_list"
-                autoComplete="off"
-                className="ant-select-selection-search-input"
-                id="rc_select_TEST_OR_SSR"
-                onChange={[Function]}
-                onCompositionEnd={[Function]}
-                onCompositionStart={[Function]}
-                onKeyDown={[Function]}
-                onMouseDown={[Function]}
-                onPaste={[Function]}
-                readOnly={true}
-                role="combobox"
-                style={
-                  Object {
-                    "opacity": 0,
-                  }
-                }
-                type="search"
-                unselectable="on"
-                value=""
-              />
-            </span>
-            <span
-              className="ant-select-selection-item"
-              title="US Dollar ($)"
-            >
-              US Dollar ($)
-            </span>
-          </div>
-          <span
-            aria-hidden={true}
-            className="ant-select-arrow"
-            onMouseDown={[Function]}
-            style={
-              Object {
-                "WebkitUserSelect": "none",
-                "userSelect": "none",
-              }
-            }
-            unselectable="on"
-          >
-            <span
-              aria-label="down"
-              className="anticon anticon-down ant-select-suffix"
-              role="img"
-            >
-              <svg
-                aria-hidden="true"
-                data-icon="down"
-                fill="currentColor"
-                focusable="false"
-                height="1em"
-                viewBox="64 64 896 896"
-                width="1em"
-              >
-                <path
-                  d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"
-                />
-              </svg>
-            </span>
-          </span>
-        </div>
-      </div>
-      <div
-        className="sc-kpOJdX eglhol"
-      />
-      [
-      <a
-        className="sc-jzJRlG lcaLuD"
-        href="https://docs.cashtabapp.com/docs/"
-        rel="noreferrer"
-        target="_blank"
-        type="link"
-      >
-        Documentation
-      </a>
-      ]
+      </span>
     </div>
   </div>
+  <div
+    className="sc-kpOJdX eglhol"
+  />
+  [
+  <a
+    className="sc-jzJRlG lcaLuD"
+    href="https://docs.cashtabapp.com/docs/"
+    rel="noreferrer"
+    target="_blank"
+    type="link"
+  >
+    Documentation
+  </a>
+  ]
 </div>
 `;
 
 exports[`Configure without a wallet 1`] = `
 <div
-  className="ant-spin-nested-loading"
+  className="sc-kGXeez ldTGry"
 >
-  <div>
+  <h2>
+    <span
+      aria-label="copy"
+      className="anticon anticon-copy sc-htpNat fLtATP"
+      role="img"
+    >
+      <svg
+        aria-hidden="true"
+        data-icon="copy"
+        fill="currentColor"
+        focusable="false"
+        height="1em"
+        viewBox="64 64 896 896"
+        width="1em"
+      >
+        <path
+          d="M832 64H296c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h496v688c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8V96c0-17.7-14.3-32-32-32zM704 192H192c-17.7 0-32 14.3-32 32v530.7c0 8.5 3.4 16.6 9.4 22.6l173.3 173.3c2.2 2.2 4.7 4 7.4 5.5v1.9h4.2c3.5 1.3 7.2 2 11 2H704c17.7 0 32-14.3 32-32V224c0-17.7-14.3-32-32-32zM350 856.2L263.9 770H350v86.2zM664 888H414V746c0-22.1-17.9-40-40-40H232V264h432v624z"
+        />
+      </svg>
+    </span>
+     Backup your wallet
+  </h2>
+  <div
+    className="ant-alert ant-alert-warning ant-alert-with-description"
+    data-show={true}
+    role="alert"
+    style={
+      Object {
+        "marginBottom": "12px",
+      }
+    }
+  >
+    <span
+      aria-label="exclamation-circle"
+      className="anticon anticon-exclamation-circle ant-alert-icon"
+      role="img"
+    >
+      <svg
+        aria-hidden="true"
+        data-icon="exclamation-circle"
+        fill="currentColor"
+        focusable="false"
+        height="1em"
+        viewBox="64 64 896 896"
+        width="1em"
+      >
+        <path
+          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"
+        />
+        <path
+          d="M464 688a48 48 0 1096 0 48 48 0 10-96 0zm24-112h48c4.4 0 8-3.6 8-8V296c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v272c0 4.4 3.6 8 8 8z"
+        />
+      </svg>
+    </span>
     <div
-      className="ant-spin ant-spin-spinning"
+      className="ant-alert-content"
     >
-      <span
-        aria-label="loading"
-        className="anticon anticon-loading anticon-spin cashLoadingIcon ant-spin-dot"
-        role="img"
+      <div
+        className="ant-alert-message"
+      />
+      <div
+        className="ant-alert-description"
       >
-        <svg
-          aria-hidden="true"
-          data-icon="loading"
-          fill="currentColor"
-          focusable="false"
-          height="1em"
-          viewBox="0 0 1024 1024"
-          width="1em"
-        >
-          <path
-            d="M988 548c-19.9 0-36-16.1-36-36 0-59.4-11.6-117-34.6-171.3a440.45 440.45 0 00-94.3-139.9 437.71 437.71 0 00-139.9-94.3C629 83.6 571.4 72 512 72c-19.9 0-36-16.1-36-36s16.1-36 36-36c69.1 0 136.2 13.5 199.3 40.3C772.3 66 827 103 874 150c47 47 83.9 101.8 109.7 162.7 26.7 63.1 40.2 130.2 40.2 199.3.1 19.9-16 36-35.9 36z"
-          />
-        </svg>
-      </span>
+        Your seed phrase is the only way to restore your wallet. Write it down. Keep it safe.
+      </div>
     </div>
   </div>
   <div
-    className="ant-spin-container ant-spin-blur"
+    className="sc-kpOJdX eglhol"
+  />
+  <h2>
+    <span
+      aria-label="wallet"
+      className="anticon anticon-wallet sc-ifAKCX cYbSut"
+      role="img"
+    >
+      <svg
+        aria-hidden="true"
+        data-icon="wallet"
+        fill="currentColor"
+        focusable="false"
+        height="1em"
+        viewBox="64 64 896 896"
+        width="1em"
+      >
+        <path
+          d="M880 112H144c-17.7 0-32 14.3-32 32v736c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V144c0-17.7-14.3-32-32-32zm-40 464H528V448h312v128zm0 264H184V184h656v200H496c-17.7 0-32 14.3-32 32v192c0 17.7 14.3 32 32 32h344v200zM580 512a40 40 0 1080 0 40 40 0 10-80 0z"
+        />
+      </svg>
+    </span>
+     Manage Wallets
+  </h2>
+  <button
+    className="sc-VigVT RpRhe"
+    onClick={[Function]}
+  >
+    <span
+      aria-label="plus-square"
+      className="anticon anticon-plus-square"
+      role="img"
+    >
+      <svg
+        aria-hidden="true"
+        data-icon="plus-square"
+        fill="currentColor"
+        focusable="false"
+        height="1em"
+        viewBox="64 64 896 896"
+        width="1em"
+      >
+        <path
+          d="M328 544h152v152c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V544h152c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8H544V328c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v152H328c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8z"
+        />
+        <path
+          d="M880 112H144c-17.7 0-32 14.3-32 32v736c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V144c0-17.7-14.3-32-32-32zm-40 728H184V184h656v656z"
+        />
+      </svg>
+    </span>
+     New Wallet
+  </button>
+  <button
+    className="sc-jTzLTM bLkbAy"
+    onClick={[Function]}
+  >
+    <span
+      aria-label="import"
+      className="anticon anticon-import"
+      role="img"
+    >
+      <svg
+        aria-hidden="true"
+        data-icon="import"
+        fill="currentColor"
+        focusable="false"
+        height="1em"
+        viewBox="64 64 896 896"
+        width="1em"
+      >
+        <path
+          d="M888.3 757.4h-53.8c-4.2 0-7.7 3.5-7.7 7.7v61.8H197.1V197.1h629.8v61.8c0 4.2 3.5 7.7 7.7 7.7h53.8c4.2 0 7.7-3.4 7.7-7.7V158.7c0-17-13.7-30.7-30.7-30.7H158.7c-17 0-30.7 13.7-30.7 30.7v706.6c0 17 13.7 30.7 30.7 30.7h706.6c17 0 30.7-13.7 30.7-30.7V765.1c0-4.3-3.5-7.7-7.7-7.7zM902 476H588v-76c0-6.7-7.8-10.5-13-6.3l-141.9 112a8 8 0 000 12.6l141.9 112c5.3 4.2 13 .4 13-6.3v-76h314c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8z"
+        />
+      </svg>
+    </span>
+     Import Wallet
+  </button>
+  <div
+    className="sc-kpOJdX eglhol"
+  />
+  <h2>
+    <span
+      aria-label="dollar"
+      className="anticon anticon-dollar sc-bxivhb ctLIog"
+      role="img"
+    >
+      <svg
+        aria-hidden="true"
+        data-icon="dollar"
+        fill="currentColor"
+        focusable="false"
+        height="1em"
+        viewBox="64 64 896 896"
+        width="1em"
+      >
+        <path
+          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372zm47.7-395.2l-25.4-5.9V348.6c38 5.2 61.5 29 65.5 58.2.5 4 3.9 6.9 7.9 6.9h44.9c4.7 0 8.4-4.1 8-8.8-6.1-62.3-57.4-102.3-125.9-109.2V263c0-4.4-3.6-8-8-8h-28.1c-4.4 0-8 3.6-8 8v33c-70.8 6.9-126.2 46-126.2 119 0 67.6 49.8 100.2 102.1 112.7l24.7 6.3v142.7c-44.2-5.9-69-29.5-74.1-61.3-.6-3.8-4-6.6-7.9-6.6H363c-4.7 0-8.4 4-8 8.7 4.5 55 46.2 105.6 135.2 112.1V761c0 4.4 3.6 8 8 8h28.4c4.4 0 8-3.6 8-8.1l-.2-31.7c78.3-6.9 134.3-48.8 134.3-124-.1-69.4-44.2-100.4-109-116.4zm-68.6-16.2c-5.6-1.6-10.3-3.1-15-5-33.8-12.2-49.5-31.9-49.5-57.3 0-36.3 27.5-57 64.5-61.7v124zM534.3 677V543.3c3.1.9 5.9 1.6 8.8 2.2 47.3 14.4 63.2 34.4 63.2 65.1 0 39.1-29.4 62.6-72 66.4z"
+        />
+      </svg>
+    </span>
+     Fiat Currency
+  </h2>
+  <div
+    className="sc-iwsKbI dmHKdG"
   >
     <div
-      className="sc-kGXeez ldTGry"
+      className="ant-select select-after ant-select-single ant-select-show-arrow"
+      onBlur={[Function]}
+      onFocus={[Function]}
+      onKeyDown={[Function]}
+      onKeyUp={[Function]}
+      onMouseDown={[Function]}
+      style={
+        Object {
+          "width": "100%",
+        }
+      }
     >
-      <h2>
-        <span
-          aria-label="copy"
-          className="anticon anticon-copy sc-htpNat fLtATP"
-          role="img"
-        >
-          <svg
-            aria-hidden="true"
-            data-icon="copy"
-            fill="currentColor"
-            focusable="false"
-            height="1em"
-            viewBox="64 64 896 896"
-            width="1em"
-          >
-            <path
-              d="M832 64H296c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h496v688c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8V96c0-17.7-14.3-32-32-32zM704 192H192c-17.7 0-32 14.3-32 32v530.7c0 8.5 3.4 16.6 9.4 22.6l173.3 173.3c2.2 2.2 4.7 4 7.4 5.5v1.9h4.2c3.5 1.3 7.2 2 11 2H704c17.7 0 32-14.3 32-32V224c0-17.7-14.3-32-32-32zM350 856.2L263.9 770H350v86.2zM664 888H414V746c0-22.1-17.9-40-40-40H232V264h432v624z"
-            />
-          </svg>
-        </span>
-         Backup your wallet
-      </h2>
       <div
-        className="ant-alert ant-alert-warning ant-alert-with-description"
-        data-show={true}
-        role="alert"
-        style={
-          Object {
-            "marginBottom": "12px",
-          }
-        }
+        className="ant-select-selector"
+        onClick={[Function]}
+        onMouseDown={[Function]}
       >
         <span
-          aria-label="exclamation-circle"
-          className="anticon anticon-exclamation-circle ant-alert-icon"
-          role="img"
-        >
-          <svg
-            aria-hidden="true"
-            data-icon="exclamation-circle"
-            fill="currentColor"
-            focusable="false"
-            height="1em"
-            viewBox="64 64 896 896"
-            width="1em"
-          >
-            <path
-              d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"
-            />
-            <path
-              d="M464 688a48 48 0 1096 0 48 48 0 10-96 0zm24-112h48c4.4 0 8-3.6 8-8V296c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v272c0 4.4 3.6 8 8 8z"
-            />
-          </svg>
-        </span>
-        <div
-          className="ant-alert-content"
+          className="ant-select-selection-search"
         >
-          <div
-            className="ant-alert-message"
+          <input
+            aria-activedescendant="rc_select_TEST_OR_SSR_list_0"
+            aria-autocomplete="list"
+            aria-controls="rc_select_TEST_OR_SSR_list"
+            aria-haspopup="listbox"
+            aria-owns="rc_select_TEST_OR_SSR_list"
+            autoComplete="off"
+            className="ant-select-selection-search-input"
+            id="rc_select_TEST_OR_SSR"
+            onChange={[Function]}
+            onCompositionEnd={[Function]}
+            onCompositionStart={[Function]}
+            onKeyDown={[Function]}
+            onMouseDown={[Function]}
+            onPaste={[Function]}
+            readOnly={true}
+            role="combobox"
+            style={
+              Object {
+                "opacity": 0,
+              }
+            }
+            type="search"
+            unselectable="on"
+            value=""
           />
-          <div
-            className="ant-alert-description"
-          >
-            Your seed phrase is the only way to restore your wallet. Write it down. Keep it safe.
-          </div>
-        </div>
-      </div>
-      <div
-        className="sc-kpOJdX eglhol"
-      />
-      <h2>
-        <span
-          aria-label="wallet"
-          className="anticon anticon-wallet sc-ifAKCX cYbSut"
-          role="img"
-        >
-          <svg
-            aria-hidden="true"
-            data-icon="wallet"
-            fill="currentColor"
-            focusable="false"
-            height="1em"
-            viewBox="64 64 896 896"
-            width="1em"
-          >
-            <path
-              d="M880 112H144c-17.7 0-32 14.3-32 32v736c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V144c0-17.7-14.3-32-32-32zm-40 464H528V448h312v128zm0 264H184V184h656v200H496c-17.7 0-32 14.3-32 32v192c0 17.7 14.3 32 32 32h344v200zM580 512a40 40 0 1080 0 40 40 0 10-80 0z"
-            />
-          </svg>
         </span>
-         Manage Wallets
-      </h2>
-      <button
-        className="sc-VigVT RpRhe"
-        onClick={[Function]}
-      >
         <span
-          aria-label="plus-square"
-          className="anticon anticon-plus-square"
-          role="img"
+          className="ant-select-selection-item"
+          title="US Dollar ($)"
         >
-          <svg
-            aria-hidden="true"
-            data-icon="plus-square"
-            fill="currentColor"
-            focusable="false"
-            height="1em"
-            viewBox="64 64 896 896"
-            width="1em"
-          >
-            <path
-              d="M328 544h152v152c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V544h152c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8H544V328c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v152H328c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8z"
-            />
-            <path
-              d="M880 112H144c-17.7 0-32 14.3-32 32v736c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V144c0-17.7-14.3-32-32-32zm-40 728H184V184h656v656z"
-            />
-          </svg>
+          US Dollar ($)
         </span>
-         New Wallet
-      </button>
-      <button
-        className="sc-jTzLTM bLkbAy"
-        onClick={[Function]}
+      </div>
+      <span
+        aria-hidden={true}
+        className="ant-select-arrow"
+        onMouseDown={[Function]}
+        style={
+          Object {
+            "WebkitUserSelect": "none",
+            "userSelect": "none",
+          }
+        }
+        unselectable="on"
       >
         <span
-          aria-label="import"
-          className="anticon anticon-import"
-          role="img"
-        >
-          <svg
-            aria-hidden="true"
-            data-icon="import"
-            fill="currentColor"
-            focusable="false"
-            height="1em"
-            viewBox="64 64 896 896"
-            width="1em"
-          >
-            <path
-              d="M888.3 757.4h-53.8c-4.2 0-7.7 3.5-7.7 7.7v61.8H197.1V197.1h629.8v61.8c0 4.2 3.5 7.7 7.7 7.7h53.8c4.2 0 7.7-3.4 7.7-7.7V158.7c0-17-13.7-30.7-30.7-30.7H158.7c-17 0-30.7 13.7-30.7 30.7v706.6c0 17 13.7 30.7 30.7 30.7h706.6c17 0 30.7-13.7 30.7-30.7V765.1c0-4.3-3.5-7.7-7.7-7.7zM902 476H588v-76c0-6.7-7.8-10.5-13-6.3l-141.9 112a8 8 0 000 12.6l141.9 112c5.3 4.2 13 .4 13-6.3v-76h314c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8z"
-            />
-          </svg>
-        </span>
-         Import Wallet
-      </button>
-      <div
-        className="sc-kpOJdX eglhol"
-      />
-      <h2>
-        <span
-          aria-label="dollar"
-          className="anticon anticon-dollar sc-bxivhb ctLIog"
+          aria-label="down"
+          className="anticon anticon-down ant-select-suffix"
           role="img"
         >
           <svg
             aria-hidden="true"
-            data-icon="dollar"
+            data-icon="down"
             fill="currentColor"
             focusable="false"
             height="1em"
@@ -553,119 +580,26 @@
             width="1em"
           >
             <path
-              d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372zm47.7-395.2l-25.4-5.9V348.6c38 5.2 61.5 29 65.5 58.2.5 4 3.9 6.9 7.9 6.9h44.9c4.7 0 8.4-4.1 8-8.8-6.1-62.3-57.4-102.3-125.9-109.2V263c0-4.4-3.6-8-8-8h-28.1c-4.4 0-8 3.6-8 8v33c-70.8 6.9-126.2 46-126.2 119 0 67.6 49.8 100.2 102.1 112.7l24.7 6.3v142.7c-44.2-5.9-69-29.5-74.1-61.3-.6-3.8-4-6.6-7.9-6.6H363c-4.7 0-8.4 4-8 8.7 4.5 55 46.2 105.6 135.2 112.1V761c0 4.4 3.6 8 8 8h28.4c4.4 0 8-3.6 8-8.1l-.2-31.7c78.3-6.9 134.3-48.8 134.3-124-.1-69.4-44.2-100.4-109-116.4zm-68.6-16.2c-5.6-1.6-10.3-3.1-15-5-33.8-12.2-49.5-31.9-49.5-57.3 0-36.3 27.5-57 64.5-61.7v124zM534.3 677V543.3c3.1.9 5.9 1.6 8.8 2.2 47.3 14.4 63.2 34.4 63.2 65.1 0 39.1-29.4 62.6-72 66.4z"
+              d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"
             />
           </svg>
         </span>
-         Fiat Currency
-      </h2>
-      <div
-        className="sc-iwsKbI dmHKdG"
-      >
-        <div
-          className="ant-select select-after ant-select-single ant-select-show-arrow"
-          onBlur={[Function]}
-          onFocus={[Function]}
-          onKeyDown={[Function]}
-          onKeyUp={[Function]}
-          onMouseDown={[Function]}
-          style={
-            Object {
-              "width": "100%",
-            }
-          }
-        >
-          <div
-            className="ant-select-selector"
-            onClick={[Function]}
-            onMouseDown={[Function]}
-          >
-            <span
-              className="ant-select-selection-search"
-            >
-              <input
-                aria-activedescendant="rc_select_TEST_OR_SSR_list_0"
-                aria-autocomplete="list"
-                aria-controls="rc_select_TEST_OR_SSR_list"
-                aria-haspopup="listbox"
-                aria-owns="rc_select_TEST_OR_SSR_list"
-                autoComplete="off"
-                className="ant-select-selection-search-input"
-                id="rc_select_TEST_OR_SSR"
-                onChange={[Function]}
-                onCompositionEnd={[Function]}
-                onCompositionStart={[Function]}
-                onKeyDown={[Function]}
-                onMouseDown={[Function]}
-                onPaste={[Function]}
-                readOnly={true}
-                role="combobox"
-                style={
-                  Object {
-                    "opacity": 0,
-                  }
-                }
-                type="search"
-                unselectable="on"
-                value=""
-              />
-            </span>
-            <span
-              className="ant-select-selection-item"
-              title="US Dollar ($)"
-            >
-              US Dollar ($)
-            </span>
-          </div>
-          <span
-            aria-hidden={true}
-            className="ant-select-arrow"
-            onMouseDown={[Function]}
-            style={
-              Object {
-                "WebkitUserSelect": "none",
-                "userSelect": "none",
-              }
-            }
-            unselectable="on"
-          >
-            <span
-              aria-label="down"
-              className="anticon anticon-down ant-select-suffix"
-              role="img"
-            >
-              <svg
-                aria-hidden="true"
-                data-icon="down"
-                fill="currentColor"
-                focusable="false"
-                height="1em"
-                viewBox="64 64 896 896"
-                width="1em"
-              >
-                <path
-                  d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"
-                />
-              </svg>
-            </span>
-          </span>
-        </div>
-      </div>
-      <div
-        className="sc-kpOJdX eglhol"
-      />
-      [
-      <a
-        className="sc-jzJRlG lcaLuD"
-        href="https://docs.cashtabapp.com/docs/"
-        rel="noreferrer"
-        target="_blank"
-        type="link"
-      >
-        Documentation
-      </a>
-      ]
+      </span>
     </div>
   </div>
+  <div
+    className="sc-kpOJdX eglhol"
+  />
+  [
+  <a
+    className="sc-jzJRlG lcaLuD"
+    href="https://docs.cashtabapp.com/docs/"
+    rel="noreferrer"
+    target="_blank"
+    type="link"
+  >
+    Documentation
+  </a>
+  ]
 </div>
 `;
diff --git a/web/cashtab/src/components/Wallet/Wallet.js b/web/cashtab/src/components/Wallet/Wallet.js
--- a/web/cashtab/src/components/Wallet/Wallet.js
+++ b/web/cashtab/src/components/Wallet/Wallet.js
@@ -388,9 +388,7 @@
     return (
         <>
             {loading ? (
-                <LoadingCtn>
-                    <LoadingOutlined />
-                </LoadingCtn>
+                <LoadingCtn />
             ) : (
                 <>{wallet.Path1899 ? <WalletInfo /> : <OnBoarding />}</>
             )}