diff --git a/web/cashtab/src/assets/download.svg b/web/cashtab/src/assets/download.svg
new file mode 100644
--- /dev/null
+++ b/web/cashtab/src/assets/download.svg
@@ -0,0 +1 @@
+<svg viewBox="64 64 896 896" focusable="false"><path d="M505.7 661a8 8 0 0012.6 0l112-141.7c4.1-5.2.4-12.9-6.3-12.9h-74.1V168c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v338.3H400c-6.7 0-10.4 7.7-6.3 12.9l112 141.8zM878 626h-60c-4.4 0-8 3.6-8 8v154H214V634c0-4.4-3.6-8-8-8h-60c-4.4 0-8 3.6-8 8v198c0 17.7 14.3 32 32 32h684c17.7 0 32-14.3 32-32V634c0-4.4-3.6-8-8-8z" /></svg>
\ No newline at end of file
diff --git a/web/cashtab/src/assets/plus.svg b/web/cashtab/src/assets/plus.svg
new file mode 100644
--- /dev/null
+++ b/web/cashtab/src/assets/plus.svg
@@ -0,0 +1 @@
+<svg viewBox="64 64 896 896" focusable="false"><defs><style /></defs><path d="M482 152h60q8 0 8 8v704q0 8-8 8h-60q-8 0-8-8V160q0-8 8-8z" /><path d="M176 474h672q8 0 8 8v60q0 8-8 8H176q-8 0-8-8v-60q0-8 8-8z" /></svg>
\ No newline at end of file
diff --git a/web/cashtab/src/components/Airdrop/__tests__/__snapshots__/Airdrop.test.js.snap b/web/cashtab/src/components/Airdrop/__tests__/__snapshots__/Airdrop.test.js.snap
--- a/web/cashtab/src/components/Airdrop/__tests__/__snapshots__/Airdrop.test.js.snap
+++ b/web/cashtab/src/components/Airdrop/__tests__/__snapshots__/Airdrop.test.js.snap
@@ -3,15 +3,15 @@
 exports[`Wallet with BCH balances 1`] = `
 Array [
   <div
-    className="sc-eHgmQL esgeHR"
+    className="sc-jWBwVP cbXqTI"
   >
     <h4
-      className="sc-gipzik gGlSHN"
+      className="sc-Rmtcm eLIA"
     >
       MigrationTestAlpha
     </h4>
     <div
-      className="sc-brqgnP jHOLle"
+      className="sc-jAaTju Vyslf"
     >
       You currently have 0 
       XEC
@@ -21,7 +21,7 @@
   </div>,
   <br />,
   <div
-    className="sc-iAyFgw eRQdeW"
+    className="sc-eHgmQL kvZwAq"
   >
     <div
       className="ant-row"
@@ -33,10 +33,10 @@
         style={Object {}}
       >
         <div
-          className="sc-kGXeez fexpdX"
+          className="sc-dxgOiQ iPcCXY"
         >
           <div
-            className="ant-collapse ant-collapse-icon-position-left sc-dxgOiQ kHtnVB"
+            className="ant-collapse ant-collapse-icon-position-left sc-jKJlTe bEMpDk"
             role={null}
             style={
               Object {
@@ -77,7 +77,7 @@
                   </span>
                 </div>
                 <div
-                  className="sc-kgoBCf kVSTZj"
+                  className="sc-kpOJdX kAzjOl"
                 >
                   XEC Airdrop Calculator
                 </div>
@@ -94,15 +94,15 @@
 exports[`Wallet with BCH balances and tokens 1`] = `
 Array [
   <div
-    className="sc-eHgmQL esgeHR"
+    className="sc-jWBwVP cbXqTI"
   >
     <h4
-      className="sc-gipzik gGlSHN"
+      className="sc-Rmtcm eLIA"
     >
       MigrationTestAlpha
     </h4>
     <div
-      className="sc-brqgnP jHOLle"
+      className="sc-jAaTju Vyslf"
     >
       You currently have 0 
       XEC
@@ -112,7 +112,7 @@
   </div>,
   <br />,
   <div
-    className="sc-iAyFgw eRQdeW"
+    className="sc-eHgmQL kvZwAq"
   >
     <div
       className="ant-row"
@@ -124,10 +124,10 @@
         style={Object {}}
       >
         <div
-          className="sc-kGXeez fexpdX"
+          className="sc-dxgOiQ iPcCXY"
         >
           <div
-            className="ant-collapse ant-collapse-icon-position-left sc-dxgOiQ kHtnVB"
+            className="ant-collapse ant-collapse-icon-position-left sc-jKJlTe bEMpDk"
             role={null}
             style={
               Object {
@@ -168,7 +168,7 @@
                   </span>
                 </div>
                 <div
-                  className="sc-kgoBCf kVSTZj"
+                  className="sc-kpOJdX kAzjOl"
                 >
                   XEC Airdrop Calculator
                 </div>
@@ -185,15 +185,15 @@
 exports[`Wallet with BCH balances and tokens and state field 1`] = `
 Array [
   <div
-    className="sc-eHgmQL esgeHR"
+    className="sc-jWBwVP cbXqTI"
   >
     <h4
-      className="sc-gipzik gGlSHN"
+      className="sc-Rmtcm eLIA"
     >
       MigrationTestAlpha
     </h4>
     <div
-      className="sc-jWBwVP gdMlXD"
+      className="sc-cMljjf coNPHF"
     >
       0.06
        
@@ -202,7 +202,7 @@
   </div>,
   <br />,
   <div
-    className="sc-iAyFgw eRQdeW"
+    className="sc-eHgmQL kvZwAq"
   >
     <div
       className="ant-row"
@@ -214,10 +214,10 @@
         style={Object {}}
       >
         <div
-          className="sc-kGXeez fexpdX"
+          className="sc-dxgOiQ iPcCXY"
         >
           <div
-            className="ant-collapse ant-collapse-icon-position-left sc-dxgOiQ kHtnVB"
+            className="ant-collapse ant-collapse-icon-position-left sc-jKJlTe bEMpDk"
             role={null}
             style={
               Object {
@@ -258,7 +258,7 @@
                   </span>
                 </div>
                 <div
-                  className="sc-kgoBCf kVSTZj"
+                  className="sc-kpOJdX kAzjOl"
                 >
                   XEC Airdrop Calculator
                 </div>
@@ -275,15 +275,15 @@
 exports[`Wallet without BCH balance 1`] = `
 Array [
   <div
-    className="sc-eHgmQL esgeHR"
+    className="sc-jWBwVP cbXqTI"
   >
     <h4
-      className="sc-gipzik gGlSHN"
+      className="sc-Rmtcm eLIA"
     >
       MigrationTestAlpha
     </h4>
     <div
-      className="sc-brqgnP jHOLle"
+      className="sc-jAaTju Vyslf"
     >
       You currently have 0 
       XEC
@@ -293,7 +293,7 @@
   </div>,
   <br />,
   <div
-    className="sc-iAyFgw eRQdeW"
+    className="sc-eHgmQL kvZwAq"
   >
     <div
       className="ant-row"
@@ -305,10 +305,10 @@
         style={Object {}}
       >
         <div
-          className="sc-kGXeez fexpdX"
+          className="sc-dxgOiQ iPcCXY"
         >
           <div
-            className="ant-collapse ant-collapse-icon-position-left sc-dxgOiQ kHtnVB"
+            className="ant-collapse ant-collapse-icon-position-left sc-jKJlTe bEMpDk"
             role={null}
             style={
               Object {
@@ -349,7 +349,7 @@
                   </span>
                 </div>
                 <div
-                  className="sc-kgoBCf kVSTZj"
+                  className="sc-kpOJdX kAzjOl"
                 >
                   XEC Airdrop Calculator
                 </div>
@@ -366,10 +366,10 @@
 exports[`Without wallet defined 1`] = `
 Array [
   <div
-    className="sc-eHgmQL esgeHR"
+    className="sc-jWBwVP cbXqTI"
   >
     <div
-      className="sc-brqgnP jHOLle"
+      className="sc-jAaTju Vyslf"
     >
       You currently have 0 
       XEC
@@ -379,7 +379,7 @@
   </div>,
   <br />,
   <div
-    className="sc-iAyFgw eRQdeW"
+    className="sc-eHgmQL kvZwAq"
   >
     <div
       className="ant-row"
@@ -391,10 +391,10 @@
         style={Object {}}
       >
         <div
-          className="sc-kGXeez fexpdX"
+          className="sc-dxgOiQ iPcCXY"
         >
           <div
-            className="ant-collapse ant-collapse-icon-position-left sc-dxgOiQ kHtnVB"
+            className="ant-collapse ant-collapse-icon-position-left sc-jKJlTe bEMpDk"
             role={null}
             style={
               Object {
@@ -435,7 +435,7 @@
                   </span>
                 </div>
                 <div
-                  className="sc-kgoBCf kVSTZj"
+                  className="sc-kpOJdX kAzjOl"
                 >
                   XEC Airdrop Calculator
                 </div>
diff --git a/web/cashtab/src/components/Common/CustomIcons.js b/web/cashtab/src/components/Common/CustomIcons.js
--- a/web/cashtab/src/components/Common/CustomIcons.js
+++ b/web/cashtab/src/components/Common/CustomIcons.js
@@ -22,7 +22,8 @@
 import { ReactComponent as LinkSolid } from 'assets/external-link-square-alt.svg';
 import { ReactComponent as Airdrop } from 'assets/airdrop-icon.svg';
 import { ReactComponent as Pdf } from 'assets/file-pdf.svg';
-
+import { ReactComponent as Plus } from 'assets/plus.svg';
+import { ReactComponent as Download } from 'assets/download.svg';
 export const CashLoadingIcon = <LoadingOutlined className="cashLoadingIcon" />;
 
 export const CashReceivedNotificationIcon = () => (
@@ -94,6 +95,20 @@
     width: 1.3em;
 `;
 
+export const ThemedPlusOutlined = styled(Plus)`
+    fill: ${props => props.theme.contrast};
+    padding: 0.15rem 0rem 0.18rem 0rem;
+    height: 1.3em;
+    width: 1.3em;
+`;
+
+export const ThemedDownloadOutlined = styled(Download)`
+    fill: ${props => props.theme.contrast};
+    padding: 0.15rem 0rem 0.18rem 0rem;
+    height: 1.3em;
+    width: 1.3em;
+`;
+
 export const LoadingBlock = styled.div`
     width: 100%;
     display: flex;
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
@@ -44,6 +44,8 @@
     ThemedSettingOutlined,
     ThemedContactsOutlined,
     ThemedContactSendOutlined,
+    ThemedPlusOutlined,
+    ThemedDownloadOutlined,
 } from 'components/Common/CustomIcons';
 import { ReactComponent as Trashcan } from 'assets/trashcan.svg';
 import { ReactComponent as Edit } from 'assets/edit.svg';
@@ -320,7 +322,22 @@
     }
 `;
 
+const ContactListBtnCtn = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 4px;
+`;
+
+const ExpandedBtnText = styled.span`
+    @media (max-width: 335px) {
+        display: none;
+    }
+`;
+
 const ContactListBtn = styled.button`
+    display: flex;
+    justify-content: center;
     align-items: center;
     cursor: pointer;
     background: transparent;
@@ -329,6 +346,7 @@
     color: #fff;
     border-radius: 3px;
     opacity: 0.6;
+    gap: 3px;
     transition: all 200ms ease-in-out;
     @media (max-width: 500px) {
         width: 100%;
@@ -339,6 +357,9 @@
         background: ${props => props.theme.eCashBlue};
         border-color: ${props => props.theme.eCashBlue};
     }
+    svg {
+        fill: ${props => props.theme.contrast} !important;
+    }
 `;
 
 const AWRow = styled.div`
@@ -1710,29 +1731,39 @@
                                             </div>
                                         )}
                                         {/* Export button will only show when there are contacts */}
-                                        {contactListArray &&
-                                            contactListArray.length > 0 && (
-                                                <ContactListBtn
-                                                    onClick={() =>
-                                                        exportContactList(
-                                                            contactListArray,
-                                                        )
-                                                    }
-                                                >
-                                                    Export contacts
-                                                </ContactListBtn>
-                                            )}
-                                        <br />
-                                        <br />
-                                        <ContactListBtn
-                                            onClick={() =>
-                                                setShowManualAddContactModal(
-                                                    true,
-                                                )
-                                            }
-                                        >
-                                            New Contact
-                                        </ContactListBtn>
+                                        <ContactListBtnCtn>
+                                            {contactListArray &&
+                                                contactListArray.length > 0 && (
+                                                    <ContactListBtn
+                                                        onClick={() =>
+                                                            exportContactList(
+                                                                contactListArray,
+                                                            )
+                                                        }
+                                                    >
+                                                        <ThemedDownloadOutlined />
+                                                        <ExpandedBtnText>
+                                                            Download
+                                                        </ExpandedBtnText>
+                                                        CSV
+                                                    </ContactListBtn>
+                                                )}
+                                            <br />
+                                            <br />
+                                            <ContactListBtn
+                                                onClick={() =>
+                                                    setShowManualAddContactModal(
+                                                        true,
+                                                    )
+                                                }
+                                            >
+                                                <ThemedPlusOutlined />
+                                                <ExpandedBtnText>
+                                                    Add
+                                                </ExpandedBtnText>
+                                                Contact
+                                            </ContactListBtn>
+                                        </ContactListBtnCtn>
                                     </Form>
                                 </AntdFormWrapper>
                             </Panel>
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,10 +2,10 @@
 
 exports[`Wallet with BCH balances and tokens 1`] = `
 <div
-  className="sc-fjdhpX bSjMdT"
+  className="sc-cSHVUG jkzHCz"
 >
   <div
-    className="sc-fAjcbJ jTFLYa"
+    className="sc-cHGsZl exGvdx"
   >
     <h2>
       <span
@@ -72,7 +72,7 @@
       </div>
     </div>
     <div
-      className="sc-caSCKo bZftbI"
+      className="sc-TOsTZ iGtEPf"
     />
     <h2>
       <span
@@ -97,7 +97,7 @@
        Manage Wallets
     </h2>
     <button
-      className="sc-jAaTju dvdlmc"
+      className="sc-gPEVay fIifAs"
       onClick={[Function]}
     >
       <span
@@ -125,7 +125,7 @@
        New Wallet
     </button>
     <button
-      className="sc-jDwBTQ htrvtM"
+      className="sc-iRbamj eDAZIV"
       onClick={[Function]}
     >
       <span
@@ -159,7 +159,7 @@
         style={Object {}}
       >
         <div
-          className="ant-collapse ant-collapse-icon-position-left sc-eNQAEJ fEfbki"
+          className="ant-collapse ant-collapse-icon-position-left sc-kEYyzF BStYT"
           role={null}
           style={
             Object {
@@ -206,7 +206,7 @@
       </div>
     </div>
     <div
-      className="sc-caSCKo bZftbI"
+      className="sc-TOsTZ iGtEPf"
     />
     <h2>
       <span
@@ -231,7 +231,7 @@
        Fiat Currency
     </h2>
     <div
-      className="sc-jWBwVP einKSv"
+      className="sc-cMljjf rFbSm"
     >
       <div
         className="ant-select select-after ant-select-single ant-select-show-arrow"
@@ -323,7 +323,7 @@
       </div>
     </div>
     <div
-      className="sc-caSCKo bZftbI"
+      className="sc-TOsTZ iGtEPf"
     />
     <h2>
       <span
@@ -348,7 +348,7 @@
        General Settings
     </h2>
     <div
-      className="sc-gisBJw cUrPBI"
+      className="sc-kgAjT dYHIBL"
     >
       <div
         className="title"
@@ -407,7 +407,7 @@
       </span>
     </div>
     <div
-      className="sc-gisBJw cUrPBI"
+      className="sc-kgAjT dYHIBL"
     >
       <div
         className="SendConfirm"
@@ -470,11 +470,11 @@
       </button>
     </div>
     <div
-      className="sc-caSCKo bZftbI"
+      className="sc-TOsTZ iGtEPf"
     />
     [
     <a
-      className="sc-jlyJG dvLWBt"
+      className="sc-csuQGl ezYjbJ"
       href="https://docs.cashtab.com/docs/"
       rel="noreferrer"
       target="_blank"
@@ -489,10 +489,10 @@
 
 exports[`Without wallet defined 1`] = `
 <div
-  className="sc-fjdhpX bSjMdT"
+  className="sc-cSHVUG jkzHCz"
 >
   <div
-    className="sc-fAjcbJ jTFLYa"
+    className="sc-cHGsZl exGvdx"
   >
     <h2>
       <span
@@ -559,7 +559,7 @@
       </div>
     </div>
     <div
-      className="sc-caSCKo bZftbI"
+      className="sc-TOsTZ iGtEPf"
     />
     <h2>
       <span
@@ -584,7 +584,7 @@
        Manage Wallets
     </h2>
     <button
-      className="sc-jAaTju dvdlmc"
+      className="sc-gPEVay fIifAs"
       onClick={[Function]}
     >
       <span
@@ -612,7 +612,7 @@
        New Wallet
     </button>
     <button
-      className="sc-jDwBTQ htrvtM"
+      className="sc-iRbamj eDAZIV"
       onClick={[Function]}
     >
       <span
@@ -646,7 +646,7 @@
         style={Object {}}
       >
         <div
-          className="ant-collapse ant-collapse-icon-position-left sc-eNQAEJ fEfbki"
+          className="ant-collapse ant-collapse-icon-position-left sc-kEYyzF BStYT"
           role={null}
           style={
             Object {
@@ -693,7 +693,7 @@
       </div>
     </div>
     <div
-      className="sc-caSCKo bZftbI"
+      className="sc-TOsTZ iGtEPf"
     />
     <h2>
       <span
@@ -718,7 +718,7 @@
        Fiat Currency
     </h2>
     <div
-      className="sc-jWBwVP einKSv"
+      className="sc-cMljjf rFbSm"
     >
       <div
         className="ant-select select-after ant-select-single ant-select-show-arrow"
@@ -810,7 +810,7 @@
       </div>
     </div>
     <div
-      className="sc-caSCKo bZftbI"
+      className="sc-TOsTZ iGtEPf"
     />
     <h2>
       <span
@@ -835,7 +835,7 @@
        General Settings
     </h2>
     <div
-      className="sc-gisBJw cUrPBI"
+      className="sc-kgAjT dYHIBL"
     >
       <div
         className="title"
@@ -894,7 +894,7 @@
       </span>
     </div>
     <div
-      className="sc-gisBJw cUrPBI"
+      className="sc-kgAjT dYHIBL"
     >
       <div
         className="SendConfirm"
@@ -957,11 +957,11 @@
       </button>
     </div>
     <div
-      className="sc-caSCKo bZftbI"
+      className="sc-TOsTZ iGtEPf"
     />
     [
     <a
-      className="sc-jlyJG dvLWBt"
+      className="sc-csuQGl ezYjbJ"
       href="https://docs.cashtab.com/docs/"
       rel="noreferrer"
       target="_blank"
diff --git a/web/cashtab/src/components/Home/__tests__/__snapshots__/Home.test.js.snap b/web/cashtab/src/components/Home/__tests__/__snapshots__/Home.test.js.snap
--- a/web/cashtab/src/components/Home/__tests__/__snapshots__/Home.test.js.snap
+++ b/web/cashtab/src/components/Home/__tests__/__snapshots__/Home.test.js.snap
@@ -248,13 +248,13 @@
           onClick={[Function]}
         >
           <div
-            className="sc-kEYyzF hdwThf"
+            className="sc-iAyFgw fIykat"
           >
             <div
-              className="sc-hMqMXs kbeXyQ"
+              className="sc-kkGfuU bUZIBS"
             >
               <div
-                className="sc-eNQAEJ fYyIyU"
+                className="sc-kEYyzF edBbzK"
               />
               <h4>
                 TBS
@@ -357,18 +357,18 @@
 
 exports[`Without wallet defined 1`] = `
 <div
-  className="sc-dxgOiQ cWRZZO"
+  className="sc-jKJlTe dtdOPB"
 >
   <h2>
     Welcome to Cashtab!
   </h2>
   <p
-    className="sc-ckVGcZ gYVrKF"
+    className="sc-eNQAEJ jDkKnj"
   >
     Cashtab is an
      
     <a
-      className="sc-jKJlTe icnQEd"
+      className="sc-hMqMXs JqwcT"
       href="https://github.com/bitcoin-abc/bitcoin-abc"
       rel="noreferrer"
       target="_blank"
@@ -384,7 +384,7 @@
     Want to learn more?
      
     <a
-      className="sc-jKJlTe icnQEd"
+      className="sc-hMqMXs JqwcT"
       href="https://docs.cashtab.com/docs/"
       rel="noreferrer"
       target="_blank"
@@ -393,7 +393,7 @@
     </a>
   </p>
   <button
-    className="sc-chPdSV bWFpkA"
+    className="sc-kGXeez fPsebQ"
     onClick={[Function]}
   >
     <span
@@ -421,7 +421,7 @@
      New Wallet
   </button>
   <button
-    className="sc-kgoBCf hCCasR"
+    className="sc-kpOJdX jLOxVU"
     onClick={[Function]}
   >
     <span
diff --git a/web/cashtab/src/components/Receive/__tests__/__snapshots__/Receive.test.js.snap b/web/cashtab/src/components/Receive/__tests__/__snapshots__/Receive.test.js.snap
--- a/web/cashtab/src/components/Receive/__tests__/__snapshots__/Receive.test.js.snap
+++ b/web/cashtab/src/components/Receive/__tests__/__snapshots__/Receive.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`Wallet with BCH balances 1`] = `
 <div
-  className="sc-Rmtcm ggWhsG"
+  className="sc-hzDkRC jpmyIp"
 >
   <h2>
     Receive 
@@ -19,7 +19,7 @@
     }
   >
     <div
-      className="sc-hMqMXs kePvzG"
+      className="sc-kkGfuU glXUgJ"
       style={
         Object {
           "display": "none",
@@ -39,7 +39,7 @@
       </span>
     </div>
     <svg
-      className="sc-eNQAEJ kHsxgJ"
+      className="sc-kEYyzF gsdwMY"
       height={210}
       id="borderedQRCode"
       shapeRendering="crispEdges"
@@ -65,7 +65,7 @@
       />
     </svg>
     <div
-      className="sc-iAyFgw goUWhE notranslate"
+      className="sc-eHgmQL btMJHq notranslate"
     >
       <input
         readOnly={true}
@@ -74,34 +74,34 @@
         value="ecash:qzagy47mvh6qxkvcn3acjnz73rkhkc6y7ccxkrr6zd"
       />
       <span
-        className="sc-kEYyzF bVAZnO"
+        className="sc-iAyFgw eTfFuJ"
       >
         ecash:
       </span>
       <span
-        className="sc-kkGfuU dQkPqj"
+        className="sc-hSdWYo gBAUha"
       >
         qzagy47m
       </span>
       vh6qxkvcn3acjnz73rkhkc6y7c
       <span
-        className="sc-kkGfuU dQkPqj"
+        className="sc-hSdWYo gBAUha"
       >
         cxkrr6zd
       </span>
     </div>
   </div>
   <div
-    className="sc-bRBYWo dWFgdQ"
+    className="sc-jhAzac iUZUeb"
   >
     <div
-      className="sc-hzDkRC jtinbH"
+      className="sc-fBuWsC cFysrL"
       onClick={[Function]}
     >
       XEC
     </div>
     <div
-      className="sc-hzDkRC jtinbH nonactiveBtn"
+      className="sc-fBuWsC cFysrL nonactiveBtn"
       onClick={[Function]}
     >
       eToken
@@ -112,7 +112,7 @@
 
 exports[`Wallet with BCH balances and tokens 1`] = `
 <div
-  className="sc-Rmtcm ggWhsG"
+  className="sc-hzDkRC jpmyIp"
 >
   <h2>
     Receive 
@@ -129,7 +129,7 @@
     }
   >
     <div
-      className="sc-hMqMXs kePvzG"
+      className="sc-kkGfuU glXUgJ"
       style={
         Object {
           "display": "none",
@@ -149,7 +149,7 @@
       </span>
     </div>
     <svg
-      className="sc-eNQAEJ kHsxgJ"
+      className="sc-kEYyzF gsdwMY"
       height={210}
       id="borderedQRCode"
       shapeRendering="crispEdges"
@@ -175,7 +175,7 @@
       />
     </svg>
     <div
-      className="sc-iAyFgw goUWhE notranslate"
+      className="sc-eHgmQL btMJHq notranslate"
     >
       <input
         readOnly={true}
@@ -184,34 +184,34 @@
         value="ecash:qzagy47mvh6qxkvcn3acjnz73rkhkc6y7ccxkrr6zd"
       />
       <span
-        className="sc-kEYyzF bVAZnO"
+        className="sc-iAyFgw eTfFuJ"
       >
         ecash:
       </span>
       <span
-        className="sc-kkGfuU dQkPqj"
+        className="sc-hSdWYo gBAUha"
       >
         qzagy47m
       </span>
       vh6qxkvcn3acjnz73rkhkc6y7c
       <span
-        className="sc-kkGfuU dQkPqj"
+        className="sc-hSdWYo gBAUha"
       >
         cxkrr6zd
       </span>
     </div>
   </div>
   <div
-    className="sc-bRBYWo dWFgdQ"
+    className="sc-jhAzac iUZUeb"
   >
     <div
-      className="sc-hzDkRC jtinbH"
+      className="sc-fBuWsC cFysrL"
       onClick={[Function]}
     >
       XEC
     </div>
     <div
-      className="sc-hzDkRC jtinbH nonactiveBtn"
+      className="sc-fBuWsC cFysrL nonactiveBtn"
       onClick={[Function]}
     >
       eToken
@@ -222,7 +222,7 @@
 
 exports[`Wallet with BCH balances and tokens and state field 1`] = `
 <div
-  className="sc-Rmtcm ggWhsG"
+  className="sc-hzDkRC jpmyIp"
 >
   <h2>
     Receive 
@@ -239,7 +239,7 @@
     }
   >
     <div
-      className="sc-hMqMXs kePvzG"
+      className="sc-kkGfuU glXUgJ"
       style={
         Object {
           "display": "none",
@@ -259,7 +259,7 @@
       </span>
     </div>
     <svg
-      className="sc-eNQAEJ kHsxgJ"
+      className="sc-kEYyzF gsdwMY"
       height={210}
       id="borderedQRCode"
       shapeRendering="crispEdges"
@@ -285,7 +285,7 @@
       />
     </svg>
     <div
-      className="sc-iAyFgw goUWhE notranslate"
+      className="sc-eHgmQL btMJHq notranslate"
     >
       <input
         readOnly={true}
@@ -294,34 +294,34 @@
         value="ecash:qzagy47mvh6qxkvcn3acjnz73rkhkc6y7ccxkrr6zd"
       />
       <span
-        className="sc-kEYyzF bVAZnO"
+        className="sc-iAyFgw eTfFuJ"
       >
         ecash:
       </span>
       <span
-        className="sc-kkGfuU dQkPqj"
+        className="sc-hSdWYo gBAUha"
       >
         qzagy47m
       </span>
       vh6qxkvcn3acjnz73rkhkc6y7c
       <span
-        className="sc-kkGfuU dQkPqj"
+        className="sc-hSdWYo gBAUha"
       >
         cxkrr6zd
       </span>
     </div>
   </div>
   <div
-    className="sc-bRBYWo dWFgdQ"
+    className="sc-jhAzac iUZUeb"
   >
     <div
-      className="sc-hzDkRC jtinbH"
+      className="sc-fBuWsC cFysrL"
       onClick={[Function]}
     >
       XEC
     </div>
     <div
-      className="sc-hzDkRC jtinbH nonactiveBtn"
+      className="sc-fBuWsC cFysrL nonactiveBtn"
       onClick={[Function]}
     >
       eToken
@@ -332,7 +332,7 @@
 
 exports[`Wallet without BCH balance 1`] = `
 <div
-  className="sc-Rmtcm ggWhsG"
+  className="sc-hzDkRC jpmyIp"
 >
   <h2>
     Receive 
@@ -349,7 +349,7 @@
     }
   >
     <div
-      className="sc-hMqMXs kePvzG"
+      className="sc-kkGfuU glXUgJ"
       style={
         Object {
           "display": "none",
@@ -369,7 +369,7 @@
       </span>
     </div>
     <svg
-      className="sc-eNQAEJ kHsxgJ"
+      className="sc-kEYyzF gsdwMY"
       height={210}
       id="borderedQRCode"
       shapeRendering="crispEdges"
@@ -395,7 +395,7 @@
       />
     </svg>
     <div
-      className="sc-iAyFgw goUWhE notranslate"
+      className="sc-eHgmQL btMJHq notranslate"
     >
       <input
         readOnly={true}
@@ -404,34 +404,34 @@
         value="ecash:qzagy47mvh6qxkvcn3acjnz73rkhkc6y7ccxkrr6zd"
       />
       <span
-        className="sc-kEYyzF bVAZnO"
+        className="sc-iAyFgw eTfFuJ"
       >
         ecash:
       </span>
       <span
-        className="sc-kkGfuU dQkPqj"
+        className="sc-hSdWYo gBAUha"
       >
         qzagy47m
       </span>
       vh6qxkvcn3acjnz73rkhkc6y7c
       <span
-        className="sc-kkGfuU dQkPqj"
+        className="sc-hSdWYo gBAUha"
       >
         cxkrr6zd
       </span>
     </div>
   </div>
   <div
-    className="sc-bRBYWo dWFgdQ"
+    className="sc-jhAzac iUZUeb"
   >
     <div
-      className="sc-hzDkRC jtinbH"
+      className="sc-fBuWsC cFysrL"
       onClick={[Function]}
     >
       XEC
     </div>
     <div
-      className="sc-hzDkRC jtinbH nonactiveBtn"
+      className="sc-fBuWsC cFysrL nonactiveBtn"
       onClick={[Function]}
     >
       eToken
@@ -442,18 +442,18 @@
 
 exports[`Without wallet defined 1`] = `
 <div
-  className="sc-dxgOiQ cWRZZO"
+  className="sc-jKJlTe dtdOPB"
 >
   <h2>
     Welcome to Cashtab!
   </h2>
   <p
-    className="sc-ckVGcZ gYVrKF"
+    className="sc-eNQAEJ jDkKnj"
   >
     Cashtab is an
      
     <a
-      className="sc-jKJlTe icnQEd"
+      className="sc-hMqMXs JqwcT"
       href="https://github.com/bitcoin-abc/bitcoin-abc"
       rel="noreferrer"
       target="_blank"
@@ -469,7 +469,7 @@
     Want to learn more?
      
     <a
-      className="sc-jKJlTe icnQEd"
+      className="sc-hMqMXs JqwcT"
       href="https://docs.cashtab.com/docs/"
       rel="noreferrer"
       target="_blank"
@@ -478,7 +478,7 @@
     </a>
   </p>
   <button
-    className="sc-chPdSV bWFpkA"
+    className="sc-kGXeez fPsebQ"
     onClick={[Function]}
   >
     <span
@@ -506,7 +506,7 @@
      New Wallet
   </button>
   <button
-    className="sc-kgoBCf hCCasR"
+    className="sc-kpOJdX jLOxVU"
     onClick={[Function]}
   >
     <span
diff --git a/web/cashtab/src/components/Send/__tests__/__snapshots__/Send.test.js.snap b/web/cashtab/src/components/Send/__tests__/__snapshots__/Send.test.js.snap
--- a/web/cashtab/src/components/Send/__tests__/__snapshots__/Send.test.js.snap
+++ b/web/cashtab/src/components/Send/__tests__/__snapshots__/Send.test.js.snap
@@ -3,15 +3,15 @@
 exports[`Wallet with BCH balances 1`] = `
 Array [
   <div
-    className="sc-eHgmQL esgeHR"
+    className="sc-jWBwVP cbXqTI"
   >
     <h4
-      className="sc-gipzik gGlSHN"
+      className="sc-Rmtcm eLIA"
     >
       MigrationTestAlpha
     </h4>
     <div
-      className="sc-brqgnP jHOLle"
+      className="sc-jAaTju Vyslf"
     >
       You currently have 0 
       XEC
@@ -20,7 +20,7 @@
     </div>
   </div>,
   <div
-    className="sc-iAyFgw eRQdeW"
+    className="sc-eHgmQL kvZwAq"
   >
     <div
       className="ant-row"
@@ -43,15 +43,15 @@
           }
         >
           <div
-            className="sc-fBuWsC jgvAbf"
+            className="sc-dVhcbM hjOMtW"
           >
             <label
-              className="sc-hSdWYo bWWjLk"
+              className="sc-cvbbAY gzZtxq"
             >
               Send to
             </label>
             <div
-              className="sc-jzJRlG kGXhCS"
+              className="sc-kAzzGY gNSAFi"
             >
               <div
                 className="ant-row ant-form-item ant-form-item-with-help"
@@ -126,7 +126,7 @@
                             className="ant-input-group-addon"
                           >
                             <span
-                              className="sc-VigVT jPrdqZ"
+                              className="sc-fjdhpX lnKJWB"
                               onClick={[Function]}
                             >
                               <span
@@ -168,12 +168,12 @@
               </div>
             </div>
             <label
-              className="sc-hSdWYo bWWjLk"
+              className="sc-cvbbAY gzZtxq"
             >
               Amount
             </label>
             <div
-              className="sc-jzJRlG kGXhCS"
+              className="sc-kAzzGY gNSAFi"
             >
               <div
                 className="ant-row ant-form-item ant-form-item-with-help"
@@ -320,7 +320,7 @@
                           </span>
                         </div>
                         <span
-                          className="sc-kAzzGY hVyOwU"
+                          className="sc-kgoBCf geHQWv"
                           disabled={false}
                           onClick={[Function]}
                           style={
@@ -351,17 +351,17 @@
             </div>
           </div>
           <div
-            className="sc-jhAzac czfDUS"
+            className="sc-fMiknA dMCiTY"
           >
             <h3
-              className="sc-fMiknA eYsQBU"
+              className="sc-eqIVtm dDdwQv"
             >
               0
                
               XEC
             </h3>
             <div
-              className="sc-gPEVay bOUoOT"
+              className="sc-jlyJG evBTb"
             >
               =
                
@@ -376,16 +376,16 @@
             }
           >
             <button
-              className="sc-eNQAEJ dOAXiV"
+              className="sc-kEYyzF fEPvzM"
             >
               Send
             </button>
           </div>
           <div
-            className="sc-kGXeez fexpdX"
+            className="sc-dxgOiQ iPcCXY"
           >
             <div
-              className="ant-collapse ant-collapse-icon-position-left sc-dxgOiQ kHtnVB"
+              className="ant-collapse ant-collapse-icon-position-left sc-jKJlTe bEMpDk"
               role={null}
               style={
                 Object {
@@ -426,7 +426,7 @@
                     </span>
                   </div>
                   <div
-                    className="sc-kgoBCf kVSTZj"
+                    className="sc-kpOJdX kAzjOl"
                   >
                     Advanced
                   </div>
@@ -438,10 +438,10 @@
       </div>
     </div>
     <div
-      className="sc-kGXeez fexpdX"
+      className="sc-dxgOiQ iPcCXY"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-left sc-dxgOiQ kHtnVB"
+        className="ant-collapse ant-collapse-icon-position-left sc-jKJlTe bEMpDk"
         role={null}
         style={
           Object {
@@ -482,7 +482,7 @@
               </span>
             </div>
             <div
-              className="sc-kgoBCf kVSTZj"
+              className="sc-kpOJdX kAzjOl"
             >
               Sign Message
             </div>
@@ -491,10 +491,10 @@
       </div>
     </div>
     <div
-      className="sc-kGXeez fexpdX"
+      className="sc-dxgOiQ iPcCXY"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-left sc-dxgOiQ kHtnVB"
+        className="ant-collapse ant-collapse-icon-position-left sc-jKJlTe bEMpDk"
         role={null}
         style={
           Object {
@@ -535,7 +535,7 @@
               </span>
             </div>
             <div
-              className="sc-kgoBCf kVSTZj"
+              className="sc-kpOJdX kAzjOl"
             >
               Verify Message
             </div>
@@ -550,15 +550,15 @@
 exports[`Wallet with BCH balances and tokens 1`] = `
 Array [
   <div
-    className="sc-eHgmQL esgeHR"
+    className="sc-jWBwVP cbXqTI"
   >
     <h4
-      className="sc-gipzik gGlSHN"
+      className="sc-Rmtcm eLIA"
     >
       MigrationTestAlpha
     </h4>
     <div
-      className="sc-brqgnP jHOLle"
+      className="sc-jAaTju Vyslf"
     >
       You currently have 0 
       XEC
@@ -567,7 +567,7 @@
     </div>
   </div>,
   <div
-    className="sc-iAyFgw eRQdeW"
+    className="sc-eHgmQL kvZwAq"
   >
     <div
       className="ant-row"
@@ -590,15 +590,15 @@
           }
         >
           <div
-            className="sc-fBuWsC jgvAbf"
+            className="sc-dVhcbM hjOMtW"
           >
             <label
-              className="sc-hSdWYo bWWjLk"
+              className="sc-cvbbAY gzZtxq"
             >
               Send to
             </label>
             <div
-              className="sc-jzJRlG kGXhCS"
+              className="sc-kAzzGY gNSAFi"
             >
               <div
                 className="ant-row ant-form-item ant-form-item-with-help"
@@ -673,7 +673,7 @@
                             className="ant-input-group-addon"
                           >
                             <span
-                              className="sc-VigVT jPrdqZ"
+                              className="sc-fjdhpX lnKJWB"
                               onClick={[Function]}
                             >
                               <span
@@ -715,12 +715,12 @@
               </div>
             </div>
             <label
-              className="sc-hSdWYo bWWjLk"
+              className="sc-cvbbAY gzZtxq"
             >
               Amount
             </label>
             <div
-              className="sc-jzJRlG kGXhCS"
+              className="sc-kAzzGY gNSAFi"
             >
               <div
                 className="ant-row ant-form-item ant-form-item-with-help"
@@ -867,7 +867,7 @@
                           </span>
                         </div>
                         <span
-                          className="sc-kAzzGY hVyOwU"
+                          className="sc-kgoBCf geHQWv"
                           disabled={false}
                           onClick={[Function]}
                           style={
@@ -898,17 +898,17 @@
             </div>
           </div>
           <div
-            className="sc-jhAzac czfDUS"
+            className="sc-fMiknA dMCiTY"
           >
             <h3
-              className="sc-fMiknA eYsQBU"
+              className="sc-eqIVtm dDdwQv"
             >
               0
                
               XEC
             </h3>
             <div
-              className="sc-gPEVay bOUoOT"
+              className="sc-jlyJG evBTb"
             >
               =
                
@@ -923,16 +923,16 @@
             }
           >
             <button
-              className="sc-eNQAEJ dOAXiV"
+              className="sc-kEYyzF fEPvzM"
             >
               Send
             </button>
           </div>
           <div
-            className="sc-kGXeez fexpdX"
+            className="sc-dxgOiQ iPcCXY"
           >
             <div
-              className="ant-collapse ant-collapse-icon-position-left sc-dxgOiQ kHtnVB"
+              className="ant-collapse ant-collapse-icon-position-left sc-jKJlTe bEMpDk"
               role={null}
               style={
                 Object {
@@ -973,7 +973,7 @@
                     </span>
                   </div>
                   <div
-                    className="sc-kgoBCf kVSTZj"
+                    className="sc-kpOJdX kAzjOl"
                   >
                     Advanced
                   </div>
@@ -985,10 +985,10 @@
       </div>
     </div>
     <div
-      className="sc-kGXeez fexpdX"
+      className="sc-dxgOiQ iPcCXY"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-left sc-dxgOiQ kHtnVB"
+        className="ant-collapse ant-collapse-icon-position-left sc-jKJlTe bEMpDk"
         role={null}
         style={
           Object {
@@ -1029,7 +1029,7 @@
               </span>
             </div>
             <div
-              className="sc-kgoBCf kVSTZj"
+              className="sc-kpOJdX kAzjOl"
             >
               Sign Message
             </div>
@@ -1038,10 +1038,10 @@
       </div>
     </div>
     <div
-      className="sc-kGXeez fexpdX"
+      className="sc-dxgOiQ iPcCXY"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-left sc-dxgOiQ kHtnVB"
+        className="ant-collapse ant-collapse-icon-position-left sc-jKJlTe bEMpDk"
         role={null}
         style={
           Object {
@@ -1082,7 +1082,7 @@
               </span>
             </div>
             <div
-              className="sc-kgoBCf kVSTZj"
+              className="sc-kpOJdX kAzjOl"
             >
               Verify Message
             </div>
@@ -1097,15 +1097,15 @@
 exports[`Wallet with BCH balances and tokens and state field 1`] = `
 Array [
   <div
-    className="sc-eHgmQL esgeHR"
+    className="sc-jWBwVP cbXqTI"
   >
     <h4
-      className="sc-gipzik gGlSHN"
+      className="sc-Rmtcm eLIA"
     >
       MigrationTestAlpha
     </h4>
     <div
-      className="sc-jWBwVP gdMlXD"
+      className="sc-cMljjf coNPHF"
     >
       0.06
        
@@ -1113,7 +1113,7 @@
     </div>
   </div>,
   <div
-    className="sc-iAyFgw eRQdeW"
+    className="sc-eHgmQL kvZwAq"
   >
     <div
       className="ant-row"
@@ -1136,15 +1136,15 @@
           }
         >
           <div
-            className="sc-fBuWsC jgvAbf"
+            className="sc-dVhcbM hjOMtW"
           >
             <label
-              className="sc-hSdWYo bWWjLk"
+              className="sc-cvbbAY gzZtxq"
             >
               Send to
             </label>
             <div
-              className="sc-jzJRlG kGXhCS"
+              className="sc-kAzzGY gNSAFi"
             >
               <div
                 className="ant-row ant-form-item ant-form-item-with-help"
@@ -1219,7 +1219,7 @@
                             className="ant-input-group-addon"
                           >
                             <span
-                              className="sc-VigVT jPrdqZ"
+                              className="sc-fjdhpX lnKJWB"
                               onClick={[Function]}
                             >
                               <span
@@ -1261,12 +1261,12 @@
               </div>
             </div>
             <label
-              className="sc-hSdWYo bWWjLk"
+              className="sc-cvbbAY gzZtxq"
             >
               Amount
             </label>
             <div
-              className="sc-jzJRlG kGXhCS"
+              className="sc-kAzzGY gNSAFi"
             >
               <div
                 className="ant-row ant-form-item ant-form-item-with-help"
@@ -1413,7 +1413,7 @@
                           </span>
                         </div>
                         <span
-                          className="sc-kAzzGY hVyOwU"
+                          className="sc-kgoBCf geHQWv"
                           disabled={false}
                           onClick={[Function]}
                           style={
@@ -1444,17 +1444,17 @@
             </div>
           </div>
           <div
-            className="sc-jhAzac czfDUS"
+            className="sc-fMiknA dMCiTY"
           >
             <h3
-              className="sc-fMiknA eYsQBU"
+              className="sc-eqIVtm dDdwQv"
             >
               0
                
               XEC
             </h3>
             <div
-              className="sc-gPEVay bOUoOT"
+              className="sc-jlyJG evBTb"
             >
               =
                
@@ -1469,17 +1469,17 @@
             }
           >
             <button
-              className="sc-ckVGcZ hUbpO"
+              className="sc-eNQAEJ cQeDXN"
               onClick={[Function]}
             >
               Send
             </button>
           </div>
           <div
-            className="sc-kGXeez fexpdX"
+            className="sc-dxgOiQ iPcCXY"
           >
             <div
-              className="ant-collapse ant-collapse-icon-position-left sc-dxgOiQ kHtnVB"
+              className="ant-collapse ant-collapse-icon-position-left sc-jKJlTe bEMpDk"
               role={null}
               style={
                 Object {
@@ -1520,7 +1520,7 @@
                     </span>
                   </div>
                   <div
-                    className="sc-kgoBCf kVSTZj"
+                    className="sc-kpOJdX kAzjOl"
                   >
                     Advanced
                   </div>
@@ -1532,10 +1532,10 @@
       </div>
     </div>
     <div
-      className="sc-kGXeez fexpdX"
+      className="sc-dxgOiQ iPcCXY"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-left sc-dxgOiQ kHtnVB"
+        className="ant-collapse ant-collapse-icon-position-left sc-jKJlTe bEMpDk"
         role={null}
         style={
           Object {
@@ -1576,7 +1576,7 @@
               </span>
             </div>
             <div
-              className="sc-kgoBCf kVSTZj"
+              className="sc-kpOJdX kAzjOl"
             >
               Sign Message
             </div>
@@ -1585,10 +1585,10 @@
       </div>
     </div>
     <div
-      className="sc-kGXeez fexpdX"
+      className="sc-dxgOiQ iPcCXY"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-left sc-dxgOiQ kHtnVB"
+        className="ant-collapse ant-collapse-icon-position-left sc-jKJlTe bEMpDk"
         role={null}
         style={
           Object {
@@ -1629,7 +1629,7 @@
               </span>
             </div>
             <div
-              className="sc-kgoBCf kVSTZj"
+              className="sc-kpOJdX kAzjOl"
             >
               Verify Message
             </div>
@@ -1644,15 +1644,15 @@
 exports[`Wallet without BCH balance 1`] = `
 Array [
   <div
-    className="sc-eHgmQL esgeHR"
+    className="sc-jWBwVP cbXqTI"
   >
     <h4
-      className="sc-gipzik gGlSHN"
+      className="sc-Rmtcm eLIA"
     >
       MigrationTestAlpha
     </h4>
     <div
-      className="sc-brqgnP jHOLle"
+      className="sc-jAaTju Vyslf"
     >
       You currently have 0 
       XEC
@@ -1661,7 +1661,7 @@
     </div>
   </div>,
   <div
-    className="sc-iAyFgw eRQdeW"
+    className="sc-eHgmQL kvZwAq"
   >
     <div
       className="ant-row"
@@ -1684,15 +1684,15 @@
           }
         >
           <div
-            className="sc-fBuWsC jgvAbf"
+            className="sc-dVhcbM hjOMtW"
           >
             <label
-              className="sc-hSdWYo bWWjLk"
+              className="sc-cvbbAY gzZtxq"
             >
               Send to
             </label>
             <div
-              className="sc-jzJRlG kGXhCS"
+              className="sc-kAzzGY gNSAFi"
             >
               <div
                 className="ant-row ant-form-item ant-form-item-with-help"
@@ -1767,7 +1767,7 @@
                             className="ant-input-group-addon"
                           >
                             <span
-                              className="sc-VigVT jPrdqZ"
+                              className="sc-fjdhpX lnKJWB"
                               onClick={[Function]}
                             >
                               <span
@@ -1809,12 +1809,12 @@
               </div>
             </div>
             <label
-              className="sc-hSdWYo bWWjLk"
+              className="sc-cvbbAY gzZtxq"
             >
               Amount
             </label>
             <div
-              className="sc-jzJRlG kGXhCS"
+              className="sc-kAzzGY gNSAFi"
             >
               <div
                 className="ant-row ant-form-item ant-form-item-with-help"
@@ -1961,7 +1961,7 @@
                           </span>
                         </div>
                         <span
-                          className="sc-kAzzGY hVyOwU"
+                          className="sc-kgoBCf geHQWv"
                           disabled={false}
                           onClick={[Function]}
                           style={
@@ -1992,17 +1992,17 @@
             </div>
           </div>
           <div
-            className="sc-jhAzac czfDUS"
+            className="sc-fMiknA dMCiTY"
           >
             <h3
-              className="sc-fMiknA eYsQBU"
+              className="sc-eqIVtm dDdwQv"
             >
               0
                
               XEC
             </h3>
             <div
-              className="sc-gPEVay bOUoOT"
+              className="sc-jlyJG evBTb"
             >
               =
                
@@ -2017,16 +2017,16 @@
             }
           >
             <button
-              className="sc-eNQAEJ dOAXiV"
+              className="sc-kEYyzF fEPvzM"
             >
               Send
             </button>
           </div>
           <div
-            className="sc-kGXeez fexpdX"
+            className="sc-dxgOiQ iPcCXY"
           >
             <div
-              className="ant-collapse ant-collapse-icon-position-left sc-dxgOiQ kHtnVB"
+              className="ant-collapse ant-collapse-icon-position-left sc-jKJlTe bEMpDk"
               role={null}
               style={
                 Object {
@@ -2067,7 +2067,7 @@
                     </span>
                   </div>
                   <div
-                    className="sc-kgoBCf kVSTZj"
+                    className="sc-kpOJdX kAzjOl"
                   >
                     Advanced
                   </div>
@@ -2079,10 +2079,10 @@
       </div>
     </div>
     <div
-      className="sc-kGXeez fexpdX"
+      className="sc-dxgOiQ iPcCXY"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-left sc-dxgOiQ kHtnVB"
+        className="ant-collapse ant-collapse-icon-position-left sc-jKJlTe bEMpDk"
         role={null}
         style={
           Object {
@@ -2123,7 +2123,7 @@
               </span>
             </div>
             <div
-              className="sc-kgoBCf kVSTZj"
+              className="sc-kpOJdX kAzjOl"
             >
               Sign Message
             </div>
@@ -2132,10 +2132,10 @@
       </div>
     </div>
     <div
-      className="sc-kGXeez fexpdX"
+      className="sc-dxgOiQ iPcCXY"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-left sc-dxgOiQ kHtnVB"
+        className="ant-collapse ant-collapse-icon-position-left sc-jKJlTe bEMpDk"
         role={null}
         style={
           Object {
@@ -2176,7 +2176,7 @@
               </span>
             </div>
             <div
-              className="sc-kgoBCf kVSTZj"
+              className="sc-kpOJdX kAzjOl"
             >
               Verify Message
             </div>
@@ -2191,10 +2191,10 @@
 exports[`Without wallet defined 1`] = `
 Array [
   <div
-    className="sc-eHgmQL esgeHR"
+    className="sc-jWBwVP cbXqTI"
   >
     <div
-      className="sc-brqgnP jHOLle"
+      className="sc-jAaTju Vyslf"
     >
       You currently have 0 
       XEC
@@ -2203,7 +2203,7 @@
     </div>
   </div>,
   <div
-    className="sc-iAyFgw eRQdeW"
+    className="sc-eHgmQL kvZwAq"
   >
     <div
       className="ant-row"
@@ -2226,15 +2226,15 @@
           }
         >
           <div
-            className="sc-fBuWsC jgvAbf"
+            className="sc-dVhcbM hjOMtW"
           >
             <label
-              className="sc-hSdWYo bWWjLk"
+              className="sc-cvbbAY gzZtxq"
             >
               Send to
             </label>
             <div
-              className="sc-jzJRlG kGXhCS"
+              className="sc-kAzzGY gNSAFi"
             >
               <div
                 className="ant-row ant-form-item ant-form-item-with-help"
@@ -2309,7 +2309,7 @@
                             className="ant-input-group-addon"
                           >
                             <span
-                              className="sc-VigVT jPrdqZ"
+                              className="sc-fjdhpX lnKJWB"
                               onClick={[Function]}
                             >
                               <span
@@ -2351,12 +2351,12 @@
               </div>
             </div>
             <label
-              className="sc-hSdWYo bWWjLk"
+              className="sc-cvbbAY gzZtxq"
             >
               Amount
             </label>
             <div
-              className="sc-jzJRlG kGXhCS"
+              className="sc-kAzzGY gNSAFi"
             >
               <div
                 className="ant-row ant-form-item ant-form-item-with-help"
@@ -2503,7 +2503,7 @@
                           </span>
                         </div>
                         <span
-                          className="sc-kAzzGY hVyOwU"
+                          className="sc-kgoBCf geHQWv"
                           disabled={false}
                           onClick={[Function]}
                           style={
@@ -2534,17 +2534,17 @@
             </div>
           </div>
           <div
-            className="sc-jhAzac czfDUS"
+            className="sc-fMiknA dMCiTY"
           >
             <h3
-              className="sc-fMiknA eYsQBU"
+              className="sc-eqIVtm dDdwQv"
             >
               0
                
               XEC
             </h3>
             <div
-              className="sc-gPEVay bOUoOT"
+              className="sc-jlyJG evBTb"
             >
               =
                
@@ -2559,16 +2559,16 @@
             }
           >
             <button
-              className="sc-eNQAEJ dOAXiV"
+              className="sc-kEYyzF fEPvzM"
             >
               Send
             </button>
           </div>
           <div
-            className="sc-kGXeez fexpdX"
+            className="sc-dxgOiQ iPcCXY"
           >
             <div
-              className="ant-collapse ant-collapse-icon-position-left sc-dxgOiQ kHtnVB"
+              className="ant-collapse ant-collapse-icon-position-left sc-jKJlTe bEMpDk"
               role={null}
               style={
                 Object {
@@ -2609,7 +2609,7 @@
                     </span>
                   </div>
                   <div
-                    className="sc-kgoBCf kVSTZj"
+                    className="sc-kpOJdX kAzjOl"
                   >
                     Advanced
                   </div>
@@ -2621,10 +2621,10 @@
       </div>
     </div>
     <div
-      className="sc-kGXeez fexpdX"
+      className="sc-dxgOiQ iPcCXY"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-left sc-dxgOiQ kHtnVB"
+        className="ant-collapse ant-collapse-icon-position-left sc-jKJlTe bEMpDk"
         role={null}
         style={
           Object {
@@ -2665,7 +2665,7 @@
               </span>
             </div>
             <div
-              className="sc-kgoBCf kVSTZj"
+              className="sc-kpOJdX kAzjOl"
             >
               Sign Message
             </div>
@@ -2674,10 +2674,10 @@
       </div>
     </div>
     <div
-      className="sc-kGXeez fexpdX"
+      className="sc-dxgOiQ iPcCXY"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-left sc-dxgOiQ kHtnVB"
+        className="ant-collapse ant-collapse-icon-position-left sc-jKJlTe bEMpDk"
         role={null}
         style={
           Object {
@@ -2718,7 +2718,7 @@
               </span>
             </div>
             <div
-              className="sc-kgoBCf kVSTZj"
+              className="sc-kpOJdX kAzjOl"
             >
               Verify Message
             </div>
diff --git a/web/cashtab/src/components/Send/__tests__/__snapshots__/SendToken.test.js.snap b/web/cashtab/src/components/Send/__tests__/__snapshots__/SendToken.test.js.snap
--- a/web/cashtab/src/components/Send/__tests__/__snapshots__/SendToken.test.js.snap
+++ b/web/cashtab/src/components/Send/__tests__/__snapshots__/SendToken.test.js.snap
@@ -4,10 +4,10 @@
 
 exports[`Wallet with BCH balances and tokens and state field 1`] = `
 <div
-  className="sc-jKJlTe iSWneW"
+  className="sc-hMqMXs kjfrok"
 >
   <div
-    className="sc-kkGfuU fwBSar"
+    className="sc-hSdWYo bXDUps"
   >
     6.001
      
@@ -33,7 +33,7 @@
         }
       >
         <div
-          className="sc-kgoBCf ckdTFj"
+          className="sc-kpOJdX dVfnbE"
         >
           <div
             className="ant-row ant-form-item ant-form-item-with-help"
@@ -104,7 +104,7 @@
                         className="ant-input-group-addon"
                       >
                         <span
-                          className="sc-cSHVUG cSZBnH"
+                          className="sc-chPdSV lgTLHT"
                           onClick={[Function]}
                         >
                           <span
@@ -146,7 +146,7 @@
           </div>
         </div>
         <div
-          className="sc-kgoBCf ckdTFj"
+          className="sc-kpOJdX dVfnbE"
         >
           <div
             className="ant-row ant-form-item ant-form-item-with-help"
@@ -202,7 +202,7 @@
                         className="ant-input-group-addon"
                       >
                         <span
-                          className="sc-kGXeez gFDMKt"
+                          className="sc-dxgOiQ bpDknu"
                           disabled={false}
                           onClick={[Function]}
                         >
@@ -234,7 +234,7 @@
           }
         >
           <button
-            className="sc-VigVT hSdIBd"
+            className="sc-fjdhpX eQicuE"
             onClick={[Function]}
           >
             Send 
diff --git a/web/cashtab/src/components/Tokens/__tests__/__snapshots__/CreateTokenForm.test.js.snap b/web/cashtab/src/components/Tokens/__tests__/__snapshots__/CreateTokenForm.test.js.snap
--- a/web/cashtab/src/components/Tokens/__tests__/__snapshots__/CreateTokenForm.test.js.snap
+++ b/web/cashtab/src/components/Tokens/__tests__/__snapshots__/CreateTokenForm.test.js.snap
@@ -2,13 +2,13 @@
 
 exports[`Wallet with BCH balances and tokens and state field 1`] = `
 <div
-  className="sc-gPEVay ktxapN"
+  className="sc-jlyJG iASpVZ"
 >
   <h3>
     Create a Token
   </h3>
   <div
-    className="sc-jzJRlG kGXhCS"
+    className="sc-kAzzGY gNSAFi"
   >
     <form
       className="ant-form ant-form-horizontal ant-form-small"
@@ -21,7 +21,7 @@
       }
     >
       <label
-        className="sc-kkGfuU ekDVdV"
+        className="sc-hSdWYo bWWjLk"
       >
         Token Name
       </label>
@@ -65,7 +65,7 @@
         </div>
       </div>
       <label
-        className="sc-kkGfuU ekDVdV"
+        className="sc-hSdWYo bWWjLk"
       >
         Ticker
       </label>
@@ -109,7 +109,7 @@
         </div>
       </div>
       <label
-        className="sc-kkGfuU ekDVdV"
+        className="sc-hSdWYo bWWjLk"
       >
         Decimals
       </label>
@@ -153,7 +153,7 @@
         </div>
       </div>
       <label
-        className="sc-kkGfuU ekDVdV"
+        className="sc-hSdWYo bWWjLk"
       >
         Supply
       </label>
@@ -197,7 +197,7 @@
         </div>
       </div>
       <label
-        className="sc-kkGfuU ekDVdV"
+        className="sc-hSdWYo bWWjLk"
       >
         Document URL
       </label>
@@ -241,7 +241,7 @@
         </div>
       </div>
       <label
-        className="sc-kkGfuU ekDVdV"
+        className="sc-hSdWYo bWWjLk"
       >
         Add Image
       </label>
@@ -343,7 +343,7 @@
     </form>
   </div>
   <button
-    className="sc-jKJlTe cxrKVk"
+    className="sc-hMqMXs dakUFc"
     disabled={true}
     onClick={[Function]}
     style={
diff --git a/web/cashtab/src/components/Tokens/__tests__/__snapshots__/Tokens.test.js.snap b/web/cashtab/src/components/Tokens/__tests__/__snapshots__/Tokens.test.js.snap
--- a/web/cashtab/src/components/Tokens/__tests__/__snapshots__/Tokens.test.js.snap
+++ b/web/cashtab/src/components/Tokens/__tests__/__snapshots__/Tokens.test.js.snap
@@ -3,15 +3,15 @@
 exports[`Wallet with BCH balances 1`] = `
 Array [
   <div
-    className="sc-iAyFgw chWhWK"
+    className="sc-eHgmQL esgeHR"
   >
     <h4
-      className="sc-jlyJG fgeSBQ"
+      className="sc-csuQGl bKOZxQ"
     >
       MigrationTestAlpha
     </h4>
     <div
-      className="sc-eHgmQL znFwg"
+      className="sc-jWBwVP gdMlXD"
     >
       0
        
@@ -19,17 +19,17 @@
     </div>
   </div>,
   <div
-    className="sc-kEYyzF gZfJyA"
+    className="sc-iAyFgw eRQdeW"
   >
     <div
-      className="sc-gPEVay ktxapN"
+      className="sc-jlyJG iASpVZ"
     >
       <h3>
         Create a Token
       </h3>
     </div>
     <p
-      className="sc-cMljjf gKObdA"
+      className="sc-jDwBTQ bcLZea"
     >
       You need at least
        
@@ -50,15 +50,15 @@
 exports[`Wallet with BCH balances and tokens 1`] = `
 Array [
   <div
-    className="sc-iAyFgw chWhWK"
+    className="sc-eHgmQL esgeHR"
   >
     <h4
-      className="sc-jlyJG fgeSBQ"
+      className="sc-csuQGl bKOZxQ"
     >
       MigrationTestAlpha
     </h4>
     <div
-      className="sc-eHgmQL znFwg"
+      className="sc-jWBwVP gdMlXD"
     >
       0
        
@@ -66,17 +66,17 @@
     </div>
   </div>,
   <div
-    className="sc-kEYyzF gZfJyA"
+    className="sc-iAyFgw eRQdeW"
   >
     <div
-      className="sc-gPEVay ktxapN"
+      className="sc-jlyJG iASpVZ"
     >
       <h3>
         Create a Token
       </h3>
     </div>
     <p
-      className="sc-cMljjf gKObdA"
+      className="sc-jDwBTQ bcLZea"
     >
       You need at least
        
@@ -97,15 +97,15 @@
 exports[`Wallet with BCH balances and tokens and state field 1`] = `
 Array [
   <div
-    className="sc-iAyFgw chWhWK"
+    className="sc-eHgmQL esgeHR"
   >
     <h4
-      className="sc-jlyJG fgeSBQ"
+      className="sc-csuQGl bKOZxQ"
     >
       MigrationTestAlpha
     </h4>
     <div
-      className="sc-eHgmQL znFwg"
+      className="sc-jWBwVP gdMlXD"
     >
       0.06
        
@@ -113,16 +113,16 @@
     </div>
   </div>,
   <div
-    className="sc-kEYyzF gZfJyA"
+    className="sc-iAyFgw eRQdeW"
   >
     <div
-      className="sc-gPEVay ktxapN"
+      className="sc-jlyJG iASpVZ"
     >
       <h3>
         Create a Token
       </h3>
       <div
-        className="sc-jzJRlG kGXhCS"
+        className="sc-kAzzGY gNSAFi"
       >
         <form
           className="ant-form ant-form-horizontal ant-form-small"
@@ -135,7 +135,7 @@
           }
         >
           <label
-            className="sc-kkGfuU ekDVdV"
+            className="sc-hSdWYo bWWjLk"
           >
             Token Name
           </label>
@@ -179,7 +179,7 @@
             </div>
           </div>
           <label
-            className="sc-kkGfuU ekDVdV"
+            className="sc-hSdWYo bWWjLk"
           >
             Ticker
           </label>
@@ -223,7 +223,7 @@
             </div>
           </div>
           <label
-            className="sc-kkGfuU ekDVdV"
+            className="sc-hSdWYo bWWjLk"
           >
             Decimals
           </label>
@@ -267,7 +267,7 @@
             </div>
           </div>
           <label
-            className="sc-kkGfuU ekDVdV"
+            className="sc-hSdWYo bWWjLk"
           >
             Supply
           </label>
@@ -311,7 +311,7 @@
             </div>
           </div>
           <label
-            className="sc-kkGfuU ekDVdV"
+            className="sc-hSdWYo bWWjLk"
           >
             Document URL
           </label>
@@ -355,7 +355,7 @@
             </div>
           </div>
           <label
-            className="sc-kkGfuU ekDVdV"
+            className="sc-hSdWYo bWWjLk"
           >
             Add Image
           </label>
@@ -457,7 +457,7 @@
         </form>
       </div>
       <button
-        className="sc-jKJlTe cxrKVk"
+        className="sc-hMqMXs dakUFc"
         disabled={true}
         onClick={[Function]}
         style={
@@ -498,15 +498,15 @@
 exports[`Wallet without BCH balance 1`] = `
 Array [
   <div
-    className="sc-iAyFgw chWhWK"
+    className="sc-eHgmQL esgeHR"
   >
     <h4
-      className="sc-jlyJG fgeSBQ"
+      className="sc-csuQGl bKOZxQ"
     >
       MigrationTestAlpha
     </h4>
     <div
-      className="sc-eHgmQL znFwg"
+      className="sc-jWBwVP gdMlXD"
     >
       0
        
@@ -514,17 +514,17 @@
     </div>
   </div>,
   <div
-    className="sc-kEYyzF gZfJyA"
+    className="sc-iAyFgw eRQdeW"
   >
     <div
-      className="sc-gPEVay ktxapN"
+      className="sc-jlyJG iASpVZ"
     >
       <h3>
         Create a Token
       </h3>
     </div>
     <p
-      className="sc-cMljjf gKObdA"
+      className="sc-jDwBTQ bcLZea"
     >
       You need at least
        
@@ -545,10 +545,10 @@
 exports[`Without wallet defined 1`] = `
 Array [
   <div
-    className="sc-iAyFgw chWhWK"
+    className="sc-eHgmQL esgeHR"
   >
     <div
-      className="sc-eHgmQL znFwg"
+      className="sc-jWBwVP gdMlXD"
     >
       0
        
@@ -556,17 +556,17 @@
     </div>
   </div>,
   <div
-    className="sc-kEYyzF gZfJyA"
+    className="sc-iAyFgw eRQdeW"
   >
     <div
-      className="sc-gPEVay ktxapN"
+      className="sc-jlyJG iASpVZ"
     >
       <h3>
         Create a Token
       </h3>
     </div>
     <p
-      className="sc-cMljjf gKObdA"
+      className="sc-jDwBTQ bcLZea"
     >
       You need at least