diff --git a/web/cashtab/src/assets/mail.svg b/web/cashtab/src/assets/mail.svg
new file mode 100644
--- /dev/null
+++ b/web/cashtab/src/assets/mail.svg
@@ -0,0 +1 @@
+<svg viewBox="64 64 896 896" focusable="false"><path d="M928 160H96c-17.7 0-32 14.3-32 32v640c0 17.7 14.3 32 32 32h832c17.7 0 32-14.3 32-32V192c0-17.7-14.3-32-32-32zm-40 110.8V792H136V270.8l-27.6-21.5 39.3-50.5 42.8 33.3h643.1l42.8-33.3 39.3 50.5-27.7 21.5zM833.6 232L512 482 190.4 232l-42.8-33.3-39.3 50.5 27.6 21.5 341.6 265.6a55.99 55.99 0 0068.7 0L888 270.8l27.6-21.5-39.3-50.5-42.7 33.2z" /></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,13 +3,13 @@
 exports[`Wallet with BCH balances 1`] = `
 Array [
   <div
-    className="sc-jlyJG IVetq"
+    className="sc-gipzik cVmPKw"
   >
     <div
-      className="sc-caSCKo iqqjWf"
+      className="sc-gisBJw eendT"
     >
       <h4
-        className="sc-gisBJw vOrRQ"
+        className="sc-kjoXOD eJukkq"
       >
         MigrationTestAlpha
       </h4>
@@ -42,7 +42,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -51,7 +51,7 @@
       </div>
     </div>
     <div
-      className="sc-Rmtcm bcyISv"
+      className="sc-bRBYWo euMChu"
     >
       You currently have 0 
       XEC
@@ -61,7 +61,7 @@
   </div>,
   <br />,
   <div
-    className="sc-gPEVay dOhwxg"
+    className="sc-iRbamj jTHqpF"
   >
     <div
       className="ant-row"
@@ -73,10 +73,10 @@
         style={Object {}}
       >
         <div
-          className="sc-iAyFgw igETcM"
+          className="sc-hSdWYo iRCZlN"
         >
           <div
-            className="ant-collapse ant-collapse-icon-position-start sc-eHgmQL khnmqK"
+            className="ant-collapse ant-collapse-icon-position-start sc-cvbbAY eZzhXj"
             role={null}
             style={
               Object {
@@ -125,7 +125,7 @@
                   onClick={null}
                 >
                   <div
-                    className="sc-kkGfuU gqJIVH"
+                    className="sc-iAyFgw gPlgsX"
                   >
                     XEC Airdrop Calculator
                   </div>
@@ -143,13 +143,13 @@
 exports[`Wallet with BCH balances and tokens 1`] = `
 Array [
   <div
-    className="sc-jlyJG IVetq"
+    className="sc-gipzik cVmPKw"
   >
     <div
-      className="sc-caSCKo iqqjWf"
+      className="sc-gisBJw eendT"
     >
       <h4
-        className="sc-gisBJw vOrRQ"
+        className="sc-kjoXOD eJukkq"
       >
         MigrationTestAlpha
       </h4>
@@ -182,7 +182,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -191,7 +191,7 @@
       </div>
     </div>
     <div
-      className="sc-Rmtcm bcyISv"
+      className="sc-bRBYWo euMChu"
     >
       You currently have 0 
       XEC
@@ -201,7 +201,7 @@
   </div>,
   <br />,
   <div
-    className="sc-gPEVay dOhwxg"
+    className="sc-iRbamj jTHqpF"
   >
     <div
       className="ant-row"
@@ -213,10 +213,10 @@
         style={Object {}}
       >
         <div
-          className="sc-iAyFgw igETcM"
+          className="sc-hSdWYo iRCZlN"
         >
           <div
-            className="ant-collapse ant-collapse-icon-position-start sc-eHgmQL khnmqK"
+            className="ant-collapse ant-collapse-icon-position-start sc-cvbbAY eZzhXj"
             role={null}
             style={
               Object {
@@ -265,7 +265,7 @@
                   onClick={null}
                 >
                   <div
-                    className="sc-kkGfuU gqJIVH"
+                    className="sc-iAyFgw gPlgsX"
                   >
                     XEC Airdrop Calculator
                   </div>
@@ -283,13 +283,13 @@
 exports[`Wallet with BCH balances and tokens and state field 1`] = `
 Array [
   <div
-    className="sc-jlyJG IVetq"
+    className="sc-gipzik cVmPKw"
   >
     <div
-      className="sc-caSCKo iqqjWf"
+      className="sc-gisBJw eendT"
     >
       <h4
-        className="sc-gisBJw vOrRQ"
+        className="sc-kjoXOD eJukkq"
       >
         MigrationTestAlpha
       </h4>
@@ -322,7 +322,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -331,10 +331,10 @@
       </div>
     </div>
     <div
-      className="sc-csuQGl fFnofI"
+      className="sc-Rmtcm bTMyR"
     >
       <span
-        className="sc-dVhcbM dXNsNY"
+        className="sc-eqIVtm fWPzjj"
       >
          
         0.06
@@ -346,7 +346,7 @@
   </div>,
   <br />,
   <div
-    className="sc-gPEVay dOhwxg"
+    className="sc-iRbamj jTHqpF"
   >
     <div
       className="ant-row"
@@ -358,10 +358,10 @@
         style={Object {}}
       >
         <div
-          className="sc-iAyFgw igETcM"
+          className="sc-hSdWYo iRCZlN"
         >
           <div
-            className="ant-collapse ant-collapse-icon-position-start sc-eHgmQL khnmqK"
+            className="ant-collapse ant-collapse-icon-position-start sc-cvbbAY eZzhXj"
             role={null}
             style={
               Object {
@@ -410,7 +410,7 @@
                   onClick={null}
                 >
                   <div
-                    className="sc-kkGfuU gqJIVH"
+                    className="sc-iAyFgw gPlgsX"
                   >
                     XEC Airdrop Calculator
                   </div>
@@ -428,13 +428,13 @@
 exports[`Wallet without BCH balance 1`] = `
 Array [
   <div
-    className="sc-jlyJG IVetq"
+    className="sc-gipzik cVmPKw"
   >
     <div
-      className="sc-caSCKo iqqjWf"
+      className="sc-gisBJw eendT"
     >
       <h4
-        className="sc-gisBJw vOrRQ"
+        className="sc-kjoXOD eJukkq"
       >
         MigrationTestAlpha
       </h4>
@@ -467,7 +467,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -476,7 +476,7 @@
       </div>
     </div>
     <div
-      className="sc-Rmtcm bcyISv"
+      className="sc-bRBYWo euMChu"
     >
       You currently have 0 
       XEC
@@ -486,7 +486,7 @@
   </div>,
   <br />,
   <div
-    className="sc-gPEVay dOhwxg"
+    className="sc-iRbamj jTHqpF"
   >
     <div
       className="ant-row"
@@ -498,10 +498,10 @@
         style={Object {}}
       >
         <div
-          className="sc-iAyFgw igETcM"
+          className="sc-hSdWYo iRCZlN"
         >
           <div
-            className="ant-collapse ant-collapse-icon-position-start sc-eHgmQL khnmqK"
+            className="ant-collapse ant-collapse-icon-position-start sc-cvbbAY eZzhXj"
             role={null}
             style={
               Object {
@@ -550,7 +550,7 @@
                   onClick={null}
                 >
                   <div
-                    className="sc-kkGfuU gqJIVH"
+                    className="sc-iAyFgw gPlgsX"
                   >
                     XEC Airdrop Calculator
                   </div>
@@ -568,10 +568,10 @@
 exports[`Without wallet defined 1`] = `
 Array [
   <div
-    className="sc-jlyJG IVetq"
+    className="sc-gipzik cVmPKw"
   >
     <div
-      className="sc-caSCKo iqqjWf"
+      className="sc-gisBJw eendT"
     >
       <a
         href="/configure"
@@ -602,7 +602,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -611,7 +611,7 @@
       </div>
     </div>
     <div
-      className="sc-Rmtcm bcyISv"
+      className="sc-bRBYWo euMChu"
     >
       You currently have 0 
       XEC
@@ -621,7 +621,7 @@
   </div>,
   <br />,
   <div
-    className="sc-gPEVay dOhwxg"
+    className="sc-iRbamj jTHqpF"
   >
     <div
       className="ant-row"
@@ -633,10 +633,10 @@
         style={Object {}}
       >
         <div
-          className="sc-iAyFgw igETcM"
+          className="sc-hSdWYo iRCZlN"
         >
           <div
-            className="ant-collapse ant-collapse-icon-position-start sc-eHgmQL khnmqK"
+            className="ant-collapse ant-collapse-icon-position-start sc-cvbbAY eZzhXj"
             role={null}
             style={
               Object {
@@ -685,7 +685,7 @@
                   onClick={null}
                 >
                   <div
-                    className="sc-kkGfuU gqJIVH"
+                    className="sc-iAyFgw gPlgsX"
                   >
                     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
@@ -31,7 +31,7 @@
 import { ReactComponent as EyeSVG } from 'assets/eye.svg';
 import { ReactComponent as EyeInvisibleSVG } from 'assets/eye-invisible.svg';
 import { ReactComponent as Audit } from 'assets/audit.svg';
-
+import { ReactComponent as Mail } from 'assets/mail.svg';
 export const CashLoadingIcon = <LoadingOutlined className="cashLoadingIcon" />;
 
 export const CashReceivedNotificationIcon = () => (
@@ -136,6 +136,13 @@
     cursor: pointer;
 `;
 
+export const ThemedMailOutlined = styled(Mail)`
+    stroke: ${props => props.theme.eCashBlue};
+    fill: ${props => props.theme.eCashBlue};
+    width: 20px;
+    height: 20px;
+    cursor: pointer;
+`;
 export const ThemedFingerprintSVG = styled(FingerprintSVG)`
     fill: ${props => props.theme.buttons.primary.color};
 `;
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-ckVGcZ jBULtA"
+  className="sc-jKJlTe iSWneW"
 >
   <div
-    className="sc-hqyNC iYZusv"
+    className="sc-jbKcbu bAvvyh"
   >
     <h2>
       <span
@@ -72,7 +72,7 @@
       </div>
     </div>
     <div
-      className="sc-jbKcbu cAnKKZ"
+      className="sc-dNLxif cYGCgJ"
     />
     <h2>
       <span
@@ -97,7 +97,7 @@
        Manage Wallets
     </h2>
     <button
-      className="sc-hzDkRC bwFRJ"
+      className="sc-jhAzac fsnDTQ"
       onClick={[Function]}
     >
       <span
@@ -125,7 +125,7 @@
        New Wallet
     </button>
     <button
-      className="sc-jhAzac ipjnfi"
+      className="sc-fBuWsC jHStXd"
       onClick={[Function]}
     >
       <span
@@ -159,7 +159,7 @@
         style={Object {}}
       >
         <div
-          className="ant-collapse ant-collapse-icon-position-start sc-brqgnP jOOFaf"
+          className="ant-collapse ant-collapse-icon-position-start sc-cMljjf jOzpQd"
           role={null}
           style={
             Object {
@@ -215,7 +215,7 @@
       </div>
     </div>
     <div
-      className="sc-jbKcbu cAnKKZ"
+      className="sc-dNLxif cYGCgJ"
     />
     <h2>
       <span
@@ -240,7 +240,7 @@
        Fiat Currency
     </h2>
     <div
-      className="sc-csuQGl Ltnqj"
+      className="sc-Rmtcm ffxWXt"
     >
       <div
         className="ant-select select-after ant-select-single ant-select-show-arrow"
@@ -333,7 +333,7 @@
       </div>
     </div>
     <div
-      className="sc-jbKcbu cAnKKZ"
+      className="sc-dNLxif cYGCgJ"
     />
     <h2>
       <span
@@ -358,7 +358,7 @@
        General Settings
     </h2>
     <div
-      className="sc-uJMKN feNMja"
+      className="sc-bbmXgH glAzTs"
     >
       <div
         className="title"
@@ -417,7 +417,7 @@
       </span>
     </div>
     <div
-      className="sc-uJMKN feNMja"
+      className="sc-bbmXgH glAzTs"
     >
       <div
         className="SendConfirm"
@@ -480,7 +480,7 @@
       </button>
     </div>
     <div
-      className="sc-uJMKN feNMja"
+      className="sc-bbmXgH glAzTs"
     >
       <div
         className="ShowMessages"
@@ -543,14 +543,14 @@
       </button>
     </div>
     <div
-      className="sc-jbKcbu cAnKKZ"
+      className="sc-dNLxif cYGCgJ"
     />
     <div
-      className="sc-dVhcbM jnrGDi"
+      className="sc-eqIVtm cVAvsU"
     >
       [
       <a
-        className="sc-eqIVtm HDzdf"
+        className="sc-fAjcbJ lhnlcf"
         href="https://docs.cashtab.com/docs/"
         rel="noreferrer"
         target="_blank"
@@ -566,10 +566,10 @@
 
 exports[`Without wallet defined 1`] = `
 <div
-  className="sc-ckVGcZ jBULtA"
+  className="sc-jKJlTe iSWneW"
 >
   <div
-    className="sc-hqyNC iYZusv"
+    className="sc-jbKcbu bAvvyh"
   >
     <h2>
       <span
@@ -636,7 +636,7 @@
       </div>
     </div>
     <div
-      className="sc-jbKcbu cAnKKZ"
+      className="sc-dNLxif cYGCgJ"
     />
     <h2>
       <span
@@ -661,7 +661,7 @@
        Manage Wallets
     </h2>
     <button
-      className="sc-hzDkRC bwFRJ"
+      className="sc-jhAzac fsnDTQ"
       onClick={[Function]}
     >
       <span
@@ -689,7 +689,7 @@
        New Wallet
     </button>
     <button
-      className="sc-jhAzac ipjnfi"
+      className="sc-fBuWsC jHStXd"
       onClick={[Function]}
     >
       <span
@@ -723,7 +723,7 @@
         style={Object {}}
       >
         <div
-          className="ant-collapse ant-collapse-icon-position-start sc-brqgnP jOOFaf"
+          className="ant-collapse ant-collapse-icon-position-start sc-cMljjf jOzpQd"
           role={null}
           style={
             Object {
@@ -779,7 +779,7 @@
       </div>
     </div>
     <div
-      className="sc-jbKcbu cAnKKZ"
+      className="sc-dNLxif cYGCgJ"
     />
     <h2>
       <span
@@ -804,7 +804,7 @@
        Fiat Currency
     </h2>
     <div
-      className="sc-csuQGl Ltnqj"
+      className="sc-Rmtcm ffxWXt"
     >
       <div
         className="ant-select select-after ant-select-single ant-select-show-arrow"
@@ -897,7 +897,7 @@
       </div>
     </div>
     <div
-      className="sc-jbKcbu cAnKKZ"
+      className="sc-dNLxif cYGCgJ"
     />
     <h2>
       <span
@@ -922,7 +922,7 @@
        General Settings
     </h2>
     <div
-      className="sc-uJMKN feNMja"
+      className="sc-bbmXgH glAzTs"
     >
       <div
         className="title"
@@ -981,7 +981,7 @@
       </span>
     </div>
     <div
-      className="sc-uJMKN feNMja"
+      className="sc-bbmXgH glAzTs"
     >
       <div
         className="SendConfirm"
@@ -1044,7 +1044,7 @@
       </button>
     </div>
     <div
-      className="sc-uJMKN feNMja"
+      className="sc-bbmXgH glAzTs"
     >
       <div
         className="ShowMessages"
@@ -1107,14 +1107,14 @@
       </button>
     </div>
     <div
-      className="sc-jbKcbu cAnKKZ"
+      className="sc-dNLxif cYGCgJ"
     />
     <div
-      className="sc-dVhcbM jnrGDi"
+      className="sc-eqIVtm cVAvsU"
     >
       [
       <a
-        className="sc-eqIVtm HDzdf"
+        className="sc-fAjcbJ lhnlcf"
         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
@@ -3,13 +3,13 @@
 exports[`Wallet with BCH balances 1`] = `
 Array [
   <div
-    className="sc-iELTvK jysMvw"
+    className="sc-cmTdod dMlssU"
   >
     <div
-      className="sc-gzOgki hoHWnL"
+      className="sc-iyvyFf gfBhTP"
     >
       <h4
-        className="sc-iyvyFf fVXNig"
+        className="sc-hwwEjo jyxyV"
       >
         MigrationTestAlpha
       </h4>
@@ -42,7 +42,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -51,10 +51,10 @@
       </div>
     </div>
     <div
-      className="sc-jwKygS gRoDVM"
+      className="sc-btzYZH emKHAR"
     >
       <span
-        className="sc-dqBHgY igXMFp"
+        className="sc-gxMtzJ cGgaPw"
       >
          
         0
@@ -65,26 +65,26 @@
     </div>
   </div>,
   <div
-    className="sc-kafWEX iUUQOf"
+    className="sc-feJyhm lfjVYN"
   >
     <div
-      className="sc-hwwEjo hlvMZF"
+      className="sc-kPVwWT klfGtE"
     >
       <button
-        className="sc-kPVwWT kYSKBV"
+        className="sc-kfGgVZ fhjDBy"
         onClick={[Function]}
       >
         Transactions
       </button>
       <button
-        className="sc-kPVwWT keLWwq"
+        className="sc-kfGgVZ ewXFby"
         onClick={[Function]}
       >
         eTokens
       </button>
     </div>
     <div
-      className="sc-kfGgVZ hgwVMo"
+      className="sc-esjQYD ehSaCe"
     >
       <div />
       <span
@@ -111,10 +111,10 @@
        to send to others
     </div>
     <div
-      className="sc-kfGgVZ cUYaFW"
+      className="sc-esjQYD dtMdKv"
     >
       <a
-        className="sc-ibxdXY iWbWIq"
+        className="sc-RefOD gOfBLf"
         href="/tokens"
         onClick={[Function]}
       >
@@ -133,13 +133,13 @@
 exports[`Wallet with BCH balances and tokens 1`] = `
 Array [
   <div
-    className="sc-iELTvK jysMvw"
+    className="sc-cmTdod dMlssU"
   >
     <div
-      className="sc-gzOgki hoHWnL"
+      className="sc-iyvyFf gfBhTP"
     >
       <h4
-        className="sc-iyvyFf fVXNig"
+        className="sc-hwwEjo jyxyV"
       >
         MigrationTestAlpha
       </h4>
@@ -172,7 +172,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -181,10 +181,10 @@
       </div>
     </div>
     <div
-      className="sc-jwKygS gRoDVM"
+      className="sc-btzYZH emKHAR"
     >
       <span
-        className="sc-dqBHgY igXMFp"
+        className="sc-gxMtzJ cGgaPw"
       >
          
         0
@@ -195,26 +195,26 @@
     </div>
   </div>,
   <div
-    className="sc-kafWEX iUUQOf"
+    className="sc-feJyhm lfjVYN"
   >
     <div
-      className="sc-hwwEjo hlvMZF"
+      className="sc-kPVwWT klfGtE"
     >
       <button
-        className="sc-kPVwWT kYSKBV"
+        className="sc-kfGgVZ fhjDBy"
         onClick={[Function]}
       >
         Transactions
       </button>
       <button
-        className="sc-kPVwWT keLWwq"
+        className="sc-kfGgVZ ewXFby"
         onClick={[Function]}
       >
         eTokens
       </button>
     </div>
     <div
-      className="sc-kfGgVZ hgwVMo"
+      className="sc-esjQYD ehSaCe"
     >
       <div />
       <span
@@ -241,10 +241,10 @@
        to send to others
     </div>
     <div
-      className="sc-kfGgVZ cUYaFW"
+      className="sc-esjQYD dtMdKv"
     >
       <a
-        className="sc-ibxdXY iWbWIq"
+        className="sc-RefOD gOfBLf"
         href="/tokens"
         onClick={[Function]}
       >
@@ -263,13 +263,13 @@
 exports[`Wallet with BCH balances and tokens and state field 1`] = `
 Array [
   <div
-    className="sc-iELTvK jysMvw"
+    className="sc-cmTdod dMlssU"
   >
     <div
-      className="sc-gzOgki hoHWnL"
+      className="sc-iyvyFf gfBhTP"
     >
       <h4
-        className="sc-iyvyFf fVXNig"
+        className="sc-hwwEjo jyxyV"
       >
         MigrationTestAlpha
       </h4>
@@ -302,7 +302,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -311,10 +311,10 @@
       </div>
     </div>
     <div
-      className="sc-jwKygS gRoDVM"
+      className="sc-btzYZH emKHAR"
     >
       <span
-        className="sc-dqBHgY igXMFp"
+        className="sc-gxMtzJ cGgaPw"
       >
          
         0.06
@@ -325,26 +325,26 @@
     </div>
   </div>,
   <div
-    className="sc-kafWEX iUUQOf"
+    className="sc-feJyhm lfjVYN"
   >
     <div
-      className="sc-hwwEjo hlvMZF"
+      className="sc-kPVwWT klfGtE"
     >
       <button
-        className="sc-kPVwWT kYSKBV"
+        className="sc-kfGgVZ fhjDBy"
         onClick={[Function]}
       >
         Transactions
       </button>
       <button
-        className="sc-kPVwWT keLWwq"
+        className="sc-kfGgVZ ewXFby"
         onClick={[Function]}
       >
         eTokens
       </button>
     </div>
     <div
-      className="sc-kfGgVZ hgwVMo"
+      className="sc-esjQYD ehSaCe"
     >
       <div />
       <span
@@ -371,10 +371,10 @@
        to send to others
     </div>
     <div
-      className="sc-kfGgVZ cUYaFW"
+      className="sc-esjQYD dtMdKv"
     >
       <a
-        className="sc-ibxdXY iWbWIq"
+        className="sc-RefOD gOfBLf"
         href="/tokens"
         onClick={[Function]}
       >
@@ -386,13 +386,13 @@
           onClick={[Function]}
         >
           <div
-            className="sc-jAaTju qrNOC"
+            className="sc-jDwBTQ dXkzGU"
           >
             <div
-              className="sc-cMljjf bRXGWX"
+              className="sc-jAaTju iRloCz"
             >
               <div
-                className="sc-brqgnP gkemhp"
+                className="sc-cMljjf kzeZiI"
               />
               <h4>
                 TBS
@@ -410,13 +410,13 @@
 exports[`Wallet without BCH balance 1`] = `
 Array [
   <div
-    className="sc-iELTvK jysMvw"
+    className="sc-cmTdod dMlssU"
   >
     <div
-      className="sc-gzOgki hoHWnL"
+      className="sc-iyvyFf gfBhTP"
     >
       <h4
-        className="sc-iyvyFf fVXNig"
+        className="sc-hwwEjo jyxyV"
       >
         MigrationTestAlpha
       </h4>
@@ -449,7 +449,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -458,10 +458,10 @@
       </div>
     </div>
     <div
-      className="sc-jwKygS gRoDVM"
+      className="sc-btzYZH emKHAR"
     >
       <span
-        className="sc-dqBHgY igXMFp"
+        className="sc-gxMtzJ cGgaPw"
       >
          
         0
@@ -472,26 +472,26 @@
     </div>
   </div>,
   <div
-    className="sc-kafWEX iUUQOf"
+    className="sc-feJyhm lfjVYN"
   >
     <div
-      className="sc-hwwEjo hlvMZF"
+      className="sc-kPVwWT klfGtE"
     >
       <button
-        className="sc-kPVwWT kYSKBV"
+        className="sc-kfGgVZ fhjDBy"
         onClick={[Function]}
       >
         Transactions
       </button>
       <button
-        className="sc-kPVwWT keLWwq"
+        className="sc-kfGgVZ ewXFby"
         onClick={[Function]}
       >
         eTokens
       </button>
     </div>
     <div
-      className="sc-kfGgVZ hgwVMo"
+      className="sc-esjQYD ehSaCe"
     >
       <div />
       <span
@@ -518,10 +518,10 @@
        to send to others
     </div>
     <div
-      className="sc-kfGgVZ cUYaFW"
+      className="sc-esjQYD dtMdKv"
     >
       <a
-        className="sc-ibxdXY iWbWIq"
+        className="sc-RefOD gOfBLf"
         href="/tokens"
         onClick={[Function]}
       >
@@ -539,18 +539,18 @@
 
 exports[`Without wallet defined 1`] = `
 <div
-  className="sc-eHgmQL aQUNn"
+  className="sc-cvbbAY iRzyBn"
 >
   <h2>
     Welcome to Cashtab!
   </h2>
   <p
-    className="sc-cvbbAY daqIBh"
+    className="sc-jWBwVP cwtNsa"
   >
     Cashtab is an
      
     <a
-      className="sc-jWBwVP jvgrAu"
+      className="sc-brqgnP iIywyg"
       href="https://github.com/bitcoin-abc/bitcoin-abc"
       rel="noreferrer"
       target="_blank"
@@ -566,7 +566,7 @@
     Want to learn more?
      
     <a
-      className="sc-jWBwVP jvgrAu"
+      className="sc-brqgnP iIywyg"
       href="https://docs.cashtab.com/docs/"
       rel="noreferrer"
       target="_blank"
@@ -575,7 +575,7 @@
     </a>
   </p>
   <button
-    className="sc-kEYyzF eGMKh"
+    className="sc-kkGfuU ORPKP"
     onClick={[Function]}
   >
     <span
@@ -603,7 +603,7 @@
      New Wallet
   </button>
   <button
-    className="sc-kkGfuU hVRGbW"
+    className="sc-iAyFgw jNlDQp"
     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,16 +2,16 @@
 
 exports[`Wallet with BCH balances 1`] = `
 <div
-  className="sc-kgAjT TVSEh"
+  className="sc-cJSrbW hAenpB"
 >
   <div
-    className="sc-Rmtcm kwslpU"
+    className="sc-bRBYWo kVYmei"
   >
     <div
-      className="sc-cHGsZl kXimCH"
+      className="sc-TOsTZ eYrqmp"
     >
       <h4
-        className="sc-TOsTZ bsocru"
+        className="sc-kgAjT cKPgvU"
       >
         MigrationTestAlpha
       </h4>
@@ -44,7 +44,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -53,7 +53,7 @@
       </div>
     </div>
     <div
-      className="sc-jhAzac kkbIYr"
+      className="sc-fBuWsC hgNVpd"
     >
       You currently have 0 
       XEC
@@ -87,7 +87,7 @@
         }
       >
         <div
-          className="sc-cMljjf lcsRlG"
+          className="sc-jAaTju gtTnsd"
           style={
             Object {
               "display": "none",
@@ -107,7 +107,7 @@
           </span>
         </div>
         <svg
-          className="sc-brqgnP ebIyri"
+          className="sc-cMljjf ALoye"
           height={210}
           id="borderedQRCode"
           shapeRendering="crispEdges"
@@ -133,7 +133,7 @@
           />
         </svg>
         <div
-          className="sc-gPEVay kEPMve notranslate"
+          className="sc-iRbamj dEGYOU notranslate"
         >
           <input
             readOnly={true}
@@ -142,18 +142,18 @@
             value="ecash:qzagy47mvh6qxkvcn3acjnz73rkhkc6y7ccxkrr6zd"
           />
           <span
-            className="sc-jAaTju fdrnMa"
+            className="sc-jDwBTQ dYvcEx"
           >
             ecash:
           </span>
           <span
-            className="sc-jDwBTQ kjecyh"
+            className="sc-gPEVay lexnxF"
           >
             qzagy47m
           </span>
           vh6qxkvcn3acjnz73rkhkc6y7c
           <span
-            className="sc-jDwBTQ kjecyh"
+            className="sc-gPEVay lexnxF"
           >
             cxkrr6zd
           </span>
@@ -162,16 +162,16 @@
     </div>
   </div>
   <div
-    className="sc-cJSrbW laTTRh"
+    className="sc-ksYbfQ fidRXF"
   >
     <div
-      className="sc-ksYbfQ huTQJD"
+      className="sc-hmzhuo cyyfUG"
       onClick={[Function]}
     >
       XEC
     </div>
     <div
-      className="sc-ksYbfQ huTQJD nonactiveBtn"
+      className="sc-hmzhuo cyyfUG nonactiveBtn"
       onClick={[Function]}
     >
       eToken
@@ -182,16 +182,16 @@
 
 exports[`Wallet with BCH balances and tokens 1`] = `
 <div
-  className="sc-kgAjT TVSEh"
+  className="sc-cJSrbW hAenpB"
 >
   <div
-    className="sc-Rmtcm kwslpU"
+    className="sc-bRBYWo kVYmei"
   >
     <div
-      className="sc-cHGsZl kXimCH"
+      className="sc-TOsTZ eYrqmp"
     >
       <h4
-        className="sc-TOsTZ bsocru"
+        className="sc-kgAjT cKPgvU"
       >
         MigrationTestAlpha
       </h4>
@@ -224,7 +224,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -233,7 +233,7 @@
       </div>
     </div>
     <div
-      className="sc-jhAzac kkbIYr"
+      className="sc-fBuWsC hgNVpd"
     >
       You currently have 0 
       XEC
@@ -267,7 +267,7 @@
         }
       >
         <div
-          className="sc-cMljjf lcsRlG"
+          className="sc-jAaTju gtTnsd"
           style={
             Object {
               "display": "none",
@@ -287,7 +287,7 @@
           </span>
         </div>
         <svg
-          className="sc-brqgnP ebIyri"
+          className="sc-cMljjf ALoye"
           height={210}
           id="borderedQRCode"
           shapeRendering="crispEdges"
@@ -313,7 +313,7 @@
           />
         </svg>
         <div
-          className="sc-gPEVay kEPMve notranslate"
+          className="sc-iRbamj dEGYOU notranslate"
         >
           <input
             readOnly={true}
@@ -322,18 +322,18 @@
             value="ecash:qzagy47mvh6qxkvcn3acjnz73rkhkc6y7ccxkrr6zd"
           />
           <span
-            className="sc-jAaTju fdrnMa"
+            className="sc-jDwBTQ dYvcEx"
           >
             ecash:
           </span>
           <span
-            className="sc-jDwBTQ kjecyh"
+            className="sc-gPEVay lexnxF"
           >
             qzagy47m
           </span>
           vh6qxkvcn3acjnz73rkhkc6y7c
           <span
-            className="sc-jDwBTQ kjecyh"
+            className="sc-gPEVay lexnxF"
           >
             cxkrr6zd
           </span>
@@ -342,16 +342,16 @@
     </div>
   </div>
   <div
-    className="sc-cJSrbW laTTRh"
+    className="sc-ksYbfQ fidRXF"
   >
     <div
-      className="sc-ksYbfQ huTQJD"
+      className="sc-hmzhuo cyyfUG"
       onClick={[Function]}
     >
       XEC
     </div>
     <div
-      className="sc-ksYbfQ huTQJD nonactiveBtn"
+      className="sc-hmzhuo cyyfUG nonactiveBtn"
       onClick={[Function]}
     >
       eToken
@@ -362,16 +362,16 @@
 
 exports[`Wallet with BCH balances and tokens and state field 1`] = `
 <div
-  className="sc-kgAjT TVSEh"
+  className="sc-cJSrbW hAenpB"
 >
   <div
-    className="sc-Rmtcm kwslpU"
+    className="sc-bRBYWo kVYmei"
   >
     <div
-      className="sc-cHGsZl kXimCH"
+      className="sc-TOsTZ eYrqmp"
     >
       <h4
-        className="sc-TOsTZ bsocru"
+        className="sc-kgAjT cKPgvU"
       >
         MigrationTestAlpha
       </h4>
@@ -404,7 +404,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -413,10 +413,10 @@
       </div>
     </div>
     <div
-      className="sc-hzDkRC kfpqXQ"
+      className="sc-jhAzac dVfipN"
     >
       <span
-        className="sc-caSCKo gaZMix"
+        className="sc-gisBJw plqbj"
       >
          
         0.06
@@ -452,7 +452,7 @@
         }
       >
         <div
-          className="sc-cMljjf lcsRlG"
+          className="sc-jAaTju gtTnsd"
           style={
             Object {
               "display": "none",
@@ -472,7 +472,7 @@
           </span>
         </div>
         <svg
-          className="sc-brqgnP ebIyri"
+          className="sc-cMljjf ALoye"
           height={210}
           id="borderedQRCode"
           shapeRendering="crispEdges"
@@ -498,7 +498,7 @@
           />
         </svg>
         <div
-          className="sc-gPEVay kEPMve notranslate"
+          className="sc-iRbamj dEGYOU notranslate"
         >
           <input
             readOnly={true}
@@ -507,18 +507,18 @@
             value="ecash:qzagy47mvh6qxkvcn3acjnz73rkhkc6y7ccxkrr6zd"
           />
           <span
-            className="sc-jAaTju fdrnMa"
+            className="sc-jDwBTQ dYvcEx"
           >
             ecash:
           </span>
           <span
-            className="sc-jDwBTQ kjecyh"
+            className="sc-gPEVay lexnxF"
           >
             qzagy47m
           </span>
           vh6qxkvcn3acjnz73rkhkc6y7c
           <span
-            className="sc-jDwBTQ kjecyh"
+            className="sc-gPEVay lexnxF"
           >
             cxkrr6zd
           </span>
@@ -527,16 +527,16 @@
     </div>
   </div>
   <div
-    className="sc-cJSrbW laTTRh"
+    className="sc-ksYbfQ fidRXF"
   >
     <div
-      className="sc-ksYbfQ huTQJD"
+      className="sc-hmzhuo cyyfUG"
       onClick={[Function]}
     >
       XEC
     </div>
     <div
-      className="sc-ksYbfQ huTQJD nonactiveBtn"
+      className="sc-hmzhuo cyyfUG nonactiveBtn"
       onClick={[Function]}
     >
       eToken
@@ -547,16 +547,16 @@
 
 exports[`Wallet without BCH balance 1`] = `
 <div
-  className="sc-kgAjT TVSEh"
+  className="sc-cJSrbW hAenpB"
 >
   <div
-    className="sc-Rmtcm kwslpU"
+    className="sc-bRBYWo kVYmei"
   >
     <div
-      className="sc-cHGsZl kXimCH"
+      className="sc-TOsTZ eYrqmp"
     >
       <h4
-        className="sc-TOsTZ bsocru"
+        className="sc-kgAjT cKPgvU"
       >
         MigrationTestAlpha
       </h4>
@@ -589,7 +589,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -598,7 +598,7 @@
       </div>
     </div>
     <div
-      className="sc-jhAzac kkbIYr"
+      className="sc-fBuWsC hgNVpd"
     >
       You currently have 0 
       XEC
@@ -632,7 +632,7 @@
         }
       >
         <div
-          className="sc-cMljjf lcsRlG"
+          className="sc-jAaTju gtTnsd"
           style={
             Object {
               "display": "none",
@@ -652,7 +652,7 @@
           </span>
         </div>
         <svg
-          className="sc-brqgnP ebIyri"
+          className="sc-cMljjf ALoye"
           height={210}
           id="borderedQRCode"
           shapeRendering="crispEdges"
@@ -678,7 +678,7 @@
           />
         </svg>
         <div
-          className="sc-gPEVay kEPMve notranslate"
+          className="sc-iRbamj dEGYOU notranslate"
         >
           <input
             readOnly={true}
@@ -687,18 +687,18 @@
             value="ecash:qzagy47mvh6qxkvcn3acjnz73rkhkc6y7ccxkrr6zd"
           />
           <span
-            className="sc-jAaTju fdrnMa"
+            className="sc-jDwBTQ dYvcEx"
           >
             ecash:
           </span>
           <span
-            className="sc-jDwBTQ kjecyh"
+            className="sc-gPEVay lexnxF"
           >
             qzagy47m
           </span>
           vh6qxkvcn3acjnz73rkhkc6y7c
           <span
-            className="sc-jDwBTQ kjecyh"
+            className="sc-gPEVay lexnxF"
           >
             cxkrr6zd
           </span>
@@ -707,16 +707,16 @@
     </div>
   </div>
   <div
-    className="sc-cJSrbW laTTRh"
+    className="sc-ksYbfQ fidRXF"
   >
     <div
-      className="sc-ksYbfQ huTQJD"
+      className="sc-hmzhuo cyyfUG"
       onClick={[Function]}
     >
       XEC
     </div>
     <div
-      className="sc-ksYbfQ huTQJD nonactiveBtn"
+      className="sc-hmzhuo cyyfUG nonactiveBtn"
       onClick={[Function]}
     >
       eToken
@@ -727,18 +727,18 @@
 
 exports[`Without wallet defined 1`] = `
 <div
-  className="sc-eHgmQL aQUNn"
+  className="sc-cvbbAY iRzyBn"
 >
   <h2>
     Welcome to Cashtab!
   </h2>
   <p
-    className="sc-cvbbAY daqIBh"
+    className="sc-jWBwVP cwtNsa"
   >
     Cashtab is an
      
     <a
-      className="sc-jWBwVP jvgrAu"
+      className="sc-brqgnP iIywyg"
       href="https://github.com/bitcoin-abc/bitcoin-abc"
       rel="noreferrer"
       target="_blank"
@@ -754,7 +754,7 @@
     Want to learn more?
      
     <a
-      className="sc-jWBwVP jvgrAu"
+      className="sc-brqgnP iIywyg"
       href="https://docs.cashtab.com/docs/"
       rel="noreferrer"
       target="_blank"
@@ -763,7 +763,7 @@
     </a>
   </p>
   <button
-    className="sc-kEYyzF eGMKh"
+    className="sc-kkGfuU ORPKP"
     onClick={[Function]}
   >
     <span
@@ -791,7 +791,7 @@
      New Wallet
   </button>
   <button
-    className="sc-kkGfuU hVRGbW"
+    className="sc-iAyFgw jNlDQp"
     onClick={[Function]}
   >
     <span
diff --git a/web/cashtab/src/components/Send/Send.js b/web/cashtab/src/components/Send/Send.js
--- a/web/cashtab/src/components/Send/Send.js
+++ b/web/cashtab/src/components/Send/Send.js
@@ -8,6 +8,7 @@
     DestinationAddressSingle,
     DestinationAddressMulti,
 } from 'components/Common/EnhancedInputs';
+import { ThemedMailOutlined } from 'components/Common/CustomIcons';
 import { CustomCollapseCtn } from 'components/Common/StyledCollapse';
 import { Form, message, Modal, Alert, Input } from 'antd';
 import { Row, Col, Switch } from 'antd';
@@ -94,6 +95,13 @@
     }
 `;
 
+const PanelHeaderCtn = styled.div`
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 1rem;
+`;
+
 // Note jestBCH is only used for unit tests; BCHJS must be mocked for jest
 const SendBCH = ({ jestBCH, passLoadingStatus }) => {
     // use balance parameters from wallet.state object and not legacy balances parameter from walletState, if user has migrated wallet
@@ -895,7 +903,11 @@
                             </div>
 
                             <CustomCollapseCtn
-                                panelHeader="Advanced"
+                                panelHeader={
+                                    <PanelHeaderCtn>
+                                        <ThemedMailOutlined /> Message
+                                    </PanelHeaderCtn>
+                                }
                                 optionalDefaultActiveKey={
                                     location &&
                                     location.state &&
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,13 +3,13 @@
 exports[`Wallet with BCH balances 1`] = `
 Array [
   <div
-    className="sc-jlyJG IVetq"
+    className="sc-gipzik cVmPKw"
   >
     <div
-      className="sc-caSCKo iqqjWf"
+      className="sc-gisBJw eendT"
     >
       <h4
-        className="sc-gisBJw vOrRQ"
+        className="sc-kjoXOD eJukkq"
       >
         MigrationTestAlpha
       </h4>
@@ -42,7 +42,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -51,7 +51,7 @@
       </div>
     </div>
     <div
-      className="sc-Rmtcm bcyISv"
+      className="sc-bRBYWo euMChu"
     >
       You currently have 0 
       XEC
@@ -60,7 +60,7 @@
     </div>
   </div>,
   <div
-    className="sc-gPEVay dOhwxg"
+    className="sc-iRbamj jTHqpF"
   >
     <div
       className="ant-row"
@@ -83,16 +83,16 @@
           }
         >
           <div
-            className="sc-cJSrbW fAcGrF"
+            className="sc-ksYbfQ jGqaXi"
           >
              
             <label
-              className="sc-iRbamj bjnTvN"
+              className="sc-jlyJG kTtgoZ"
             >
               Send to
             </label>
             <div
-              className="sc-kjoXOD gkZeZp"
+              className="sc-cHGsZl cjKbMT"
             >
               Multiple Recipients:  
               <button
@@ -119,17 +119,17 @@
             </div>
           </div>
           <div
-            className="sc-frDJqD caWSHh"
+            className="sc-kvZOFW ePpRlA"
             open={false}
           >
             <div
-              className="sc-TOsTZ itTzLO"
+              className="sc-kgAjT iFcTEH"
             >
               <div
-                className="sc-ksYbfQ jHwjmi"
+                className="sc-hmzhuo eRtqMp"
               >
                 <div
-                  className="sc-jKJlTe gyMjfX"
+                  className="sc-eNQAEJ kPLQzL"
                 >
                   <div
                     className="ant-form-item ant-form-item-with-help"
@@ -208,7 +208,7 @@
                                   className="ant-input-group-addon"
                                 >
                                   <span
-                                    className="sc-kpOJdX horMMw"
+                                    className="sc-dxgOiQ fraLQa"
                                     onClick={[Function]}
                                   >
                                     <span
@@ -241,12 +241,12 @@
                   </div>
                 </div>
                 <label
-                  className="sc-iRbamj bjnTvN"
+                  className="sc-jlyJG kTtgoZ"
                 >
                   Amount
                 </label>
                 <div
-                  className="sc-jKJlTe gyMjfX"
+                  className="sc-eNQAEJ kPLQzL"
                 >
                   <div
                     className="ant-form-item ant-form-item-with-help"
@@ -396,7 +396,7 @@
                                 </span>
                               </div>
                               <span
-                                className="sc-hMqMXs guaRtl"
+                                className="sc-kEYyzF fyKOGM"
                                 disabled={false}
                                 onClick={[Function]}
                                 style={
@@ -419,10 +419,10 @@
               </div>
             </div>
             <div
-              className="sc-hmzhuo eRtqMp"
+              className="sc-frDJqD gCEYuZ"
             >
               <div
-                className="sc-jKJlTe gyMjfX"
+                className="sc-eNQAEJ kPLQzL"
               >
                 <div
                   className="ant-form-item ant-form-item-with-help"
@@ -471,17 +471,17 @@
               </div>
             </div>
             <div
-              className="sc-cHGsZl gJhPxK"
+              className="sc-TOsTZ hDxYPI"
             >
               <h3
-                className="sc-kgAjT bbvSjP"
+                className="sc-cJSrbW kPKfAt"
               >
                 0
                  
                 XEC
               </h3>
               <div
-                className="sc-fBuWsC dySnfm"
+                className="sc-fMiknA fhbntc"
               >
                 =
                  
@@ -497,16 +497,16 @@
             }
           >
             <button
-              className="sc-brqgnP hRpeUQ"
+              className="sc-cMljjf cgwtph"
             >
               Send
             </button>
           </div>
           <div
-            className="sc-iAyFgw igETcM"
+            className="sc-hSdWYo iRCZlN"
           >
             <div
-              className="ant-collapse ant-collapse-icon-position-start sc-eHgmQL khnmqK"
+              className="ant-collapse ant-collapse-icon-position-start sc-cvbbAY eZzhXj"
               role={null}
               style={
                 Object {
@@ -555,9 +555,18 @@
                     onClick={null}
                   >
                     <div
-                      className="sc-kkGfuU gqJIVH"
+                      className="sc-iAyFgw gPlgsX"
                     >
-                      Advanced
+                      <div
+                        className="sc-hqyNC cNBzUr"
+                      >
+                        <svg
+                          className="sc-jzJRlG kLfsyF"
+                        >
+                          mail.svg
+                        </svg>
+                         Message
+                      </div>
                     </div>
                   </span>
                 </div>
@@ -574,13 +583,13 @@
 exports[`Wallet with BCH balances and tokens 1`] = `
 Array [
   <div
-    className="sc-jlyJG IVetq"
+    className="sc-gipzik cVmPKw"
   >
     <div
-      className="sc-caSCKo iqqjWf"
+      className="sc-gisBJw eendT"
     >
       <h4
-        className="sc-gisBJw vOrRQ"
+        className="sc-kjoXOD eJukkq"
       >
         MigrationTestAlpha
       </h4>
@@ -613,7 +622,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -622,7 +631,7 @@
       </div>
     </div>
     <div
-      className="sc-Rmtcm bcyISv"
+      className="sc-bRBYWo euMChu"
     >
       You currently have 0 
       XEC
@@ -631,7 +640,7 @@
     </div>
   </div>,
   <div
-    className="sc-gPEVay dOhwxg"
+    className="sc-iRbamj jTHqpF"
   >
     <div
       className="ant-row"
@@ -654,16 +663,16 @@
           }
         >
           <div
-            className="sc-cJSrbW fAcGrF"
+            className="sc-ksYbfQ jGqaXi"
           >
              
             <label
-              className="sc-iRbamj bjnTvN"
+              className="sc-jlyJG kTtgoZ"
             >
               Send to
             </label>
             <div
-              className="sc-kjoXOD gkZeZp"
+              className="sc-cHGsZl cjKbMT"
             >
               Multiple Recipients:  
               <button
@@ -690,17 +699,17 @@
             </div>
           </div>
           <div
-            className="sc-frDJqD caWSHh"
+            className="sc-kvZOFW ePpRlA"
             open={false}
           >
             <div
-              className="sc-TOsTZ itTzLO"
+              className="sc-kgAjT iFcTEH"
             >
               <div
-                className="sc-ksYbfQ jHwjmi"
+                className="sc-hmzhuo eRtqMp"
               >
                 <div
-                  className="sc-jKJlTe gyMjfX"
+                  className="sc-eNQAEJ kPLQzL"
                 >
                   <div
                     className="ant-form-item ant-form-item-with-help"
@@ -779,7 +788,7 @@
                                   className="ant-input-group-addon"
                                 >
                                   <span
-                                    className="sc-kpOJdX horMMw"
+                                    className="sc-dxgOiQ fraLQa"
                                     onClick={[Function]}
                                   >
                                     <span
@@ -812,12 +821,12 @@
                   </div>
                 </div>
                 <label
-                  className="sc-iRbamj bjnTvN"
+                  className="sc-jlyJG kTtgoZ"
                 >
                   Amount
                 </label>
                 <div
-                  className="sc-jKJlTe gyMjfX"
+                  className="sc-eNQAEJ kPLQzL"
                 >
                   <div
                     className="ant-form-item ant-form-item-with-help"
@@ -967,7 +976,7 @@
                                 </span>
                               </div>
                               <span
-                                className="sc-hMqMXs guaRtl"
+                                className="sc-kEYyzF fyKOGM"
                                 disabled={false}
                                 onClick={[Function]}
                                 style={
@@ -990,10 +999,10 @@
               </div>
             </div>
             <div
-              className="sc-hmzhuo eRtqMp"
+              className="sc-frDJqD gCEYuZ"
             >
               <div
-                className="sc-jKJlTe gyMjfX"
+                className="sc-eNQAEJ kPLQzL"
               >
                 <div
                   className="ant-form-item ant-form-item-with-help"
@@ -1042,17 +1051,17 @@
               </div>
             </div>
             <div
-              className="sc-cHGsZl gJhPxK"
+              className="sc-TOsTZ hDxYPI"
             >
               <h3
-                className="sc-kgAjT bbvSjP"
+                className="sc-cJSrbW kPKfAt"
               >
                 0
                  
                 XEC
               </h3>
               <div
-                className="sc-fBuWsC dySnfm"
+                className="sc-fMiknA fhbntc"
               >
                 =
                  
@@ -1068,16 +1077,16 @@
             }
           >
             <button
-              className="sc-brqgnP hRpeUQ"
+              className="sc-cMljjf cgwtph"
             >
               Send
             </button>
           </div>
           <div
-            className="sc-iAyFgw igETcM"
+            className="sc-hSdWYo iRCZlN"
           >
             <div
-              className="ant-collapse ant-collapse-icon-position-start sc-eHgmQL khnmqK"
+              className="ant-collapse ant-collapse-icon-position-start sc-cvbbAY eZzhXj"
               role={null}
               style={
                 Object {
@@ -1126,9 +1135,18 @@
                     onClick={null}
                   >
                     <div
-                      className="sc-kkGfuU gqJIVH"
+                      className="sc-iAyFgw gPlgsX"
                     >
-                      Advanced
+                      <div
+                        className="sc-hqyNC cNBzUr"
+                      >
+                        <svg
+                          className="sc-jzJRlG kLfsyF"
+                        >
+                          mail.svg
+                        </svg>
+                         Message
+                      </div>
                     </div>
                   </span>
                 </div>
@@ -1145,13 +1163,13 @@
 exports[`Wallet with BCH balances and tokens and state field 1`] = `
 Array [
   <div
-    className="sc-jlyJG IVetq"
+    className="sc-gipzik cVmPKw"
   >
     <div
-      className="sc-caSCKo iqqjWf"
+      className="sc-gisBJw eendT"
     >
       <h4
-        className="sc-gisBJw vOrRQ"
+        className="sc-kjoXOD eJukkq"
       >
         MigrationTestAlpha
       </h4>
@@ -1184,7 +1202,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -1193,10 +1211,10 @@
       </div>
     </div>
     <div
-      className="sc-csuQGl fFnofI"
+      className="sc-Rmtcm bTMyR"
     >
       <span
-        className="sc-dVhcbM dXNsNY"
+        className="sc-eqIVtm fWPzjj"
       >
          
         0.06
@@ -1207,7 +1225,7 @@
     </div>
   </div>,
   <div
-    className="sc-gPEVay dOhwxg"
+    className="sc-iRbamj jTHqpF"
   >
     <div
       className="ant-row"
@@ -1230,16 +1248,16 @@
           }
         >
           <div
-            className="sc-cJSrbW fAcGrF"
+            className="sc-ksYbfQ jGqaXi"
           >
              
             <label
-              className="sc-iRbamj bjnTvN"
+              className="sc-jlyJG kTtgoZ"
             >
               Send to
             </label>
             <div
-              className="sc-kjoXOD gkZeZp"
+              className="sc-cHGsZl cjKbMT"
             >
               Multiple Recipients:  
               <button
@@ -1266,17 +1284,17 @@
             </div>
           </div>
           <div
-            className="sc-frDJqD caWSHh"
+            className="sc-kvZOFW ePpRlA"
             open={false}
           >
             <div
-              className="sc-TOsTZ itTzLO"
+              className="sc-kgAjT iFcTEH"
             >
               <div
-                className="sc-ksYbfQ jHwjmi"
+                className="sc-hmzhuo eRtqMp"
               >
                 <div
-                  className="sc-jKJlTe gyMjfX"
+                  className="sc-eNQAEJ kPLQzL"
                 >
                   <div
                     className="ant-form-item ant-form-item-with-help"
@@ -1355,7 +1373,7 @@
                                   className="ant-input-group-addon"
                                 >
                                   <span
-                                    className="sc-kpOJdX horMMw"
+                                    className="sc-dxgOiQ fraLQa"
                                     onClick={[Function]}
                                   >
                                     <span
@@ -1388,12 +1406,12 @@
                   </div>
                 </div>
                 <label
-                  className="sc-iRbamj bjnTvN"
+                  className="sc-jlyJG kTtgoZ"
                 >
                   Amount
                 </label>
                 <div
-                  className="sc-jKJlTe gyMjfX"
+                  className="sc-eNQAEJ kPLQzL"
                 >
                   <div
                     className="ant-form-item ant-form-item-with-help"
@@ -1543,7 +1561,7 @@
                                 </span>
                               </div>
                               <span
-                                className="sc-hMqMXs guaRtl"
+                                className="sc-kEYyzF fyKOGM"
                                 disabled={false}
                                 onClick={[Function]}
                                 style={
@@ -1566,10 +1584,10 @@
               </div>
             </div>
             <div
-              className="sc-hmzhuo eRtqMp"
+              className="sc-frDJqD gCEYuZ"
             >
               <div
-                className="sc-jKJlTe gyMjfX"
+                className="sc-eNQAEJ kPLQzL"
               >
                 <div
                   className="ant-form-item ant-form-item-with-help"
@@ -1618,17 +1636,17 @@
               </div>
             </div>
             <div
-              className="sc-cHGsZl gJhPxK"
+              className="sc-TOsTZ hDxYPI"
             >
               <h3
-                className="sc-kgAjT bbvSjP"
+                className="sc-cJSrbW kPKfAt"
               >
                 0
                  
                 XEC
               </h3>
               <div
-                className="sc-fBuWsC dySnfm"
+                className="sc-fMiknA fhbntc"
               >
                 =
                  
@@ -1644,17 +1662,17 @@
             }
           >
             <button
-              className="sc-cvbbAY fANdvl"
+              className="sc-jWBwVP kAXeLy"
               onClick={[Function]}
             >
               Send
             </button>
           </div>
           <div
-            className="sc-iAyFgw igETcM"
+            className="sc-hSdWYo iRCZlN"
           >
             <div
-              className="ant-collapse ant-collapse-icon-position-start sc-eHgmQL khnmqK"
+              className="ant-collapse ant-collapse-icon-position-start sc-cvbbAY eZzhXj"
               role={null}
               style={
                 Object {
@@ -1703,9 +1721,18 @@
                     onClick={null}
                   >
                     <div
-                      className="sc-kkGfuU gqJIVH"
+                      className="sc-iAyFgw gPlgsX"
                     >
-                      Advanced
+                      <div
+                        className="sc-hqyNC cNBzUr"
+                      >
+                        <svg
+                          className="sc-jzJRlG kLfsyF"
+                        >
+                          mail.svg
+                        </svg>
+                         Message
+                      </div>
                     </div>
                   </span>
                 </div>
@@ -1722,13 +1749,13 @@
 exports[`Wallet without BCH balance 1`] = `
 Array [
   <div
-    className="sc-jlyJG IVetq"
+    className="sc-gipzik cVmPKw"
   >
     <div
-      className="sc-caSCKo iqqjWf"
+      className="sc-gisBJw eendT"
     >
       <h4
-        className="sc-gisBJw vOrRQ"
+        className="sc-kjoXOD eJukkq"
       >
         MigrationTestAlpha
       </h4>
@@ -1761,7 +1788,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -1770,7 +1797,7 @@
       </div>
     </div>
     <div
-      className="sc-Rmtcm bcyISv"
+      className="sc-bRBYWo euMChu"
     >
       You currently have 0 
       XEC
@@ -1779,7 +1806,7 @@
     </div>
   </div>,
   <div
-    className="sc-gPEVay dOhwxg"
+    className="sc-iRbamj jTHqpF"
   >
     <div
       className="ant-row"
@@ -1802,16 +1829,16 @@
           }
         >
           <div
-            className="sc-cJSrbW fAcGrF"
+            className="sc-ksYbfQ jGqaXi"
           >
              
             <label
-              className="sc-iRbamj bjnTvN"
+              className="sc-jlyJG kTtgoZ"
             >
               Send to
             </label>
             <div
-              className="sc-kjoXOD gkZeZp"
+              className="sc-cHGsZl cjKbMT"
             >
               Multiple Recipients:  
               <button
@@ -1838,17 +1865,17 @@
             </div>
           </div>
           <div
-            className="sc-frDJqD caWSHh"
+            className="sc-kvZOFW ePpRlA"
             open={false}
           >
             <div
-              className="sc-TOsTZ itTzLO"
+              className="sc-kgAjT iFcTEH"
             >
               <div
-                className="sc-ksYbfQ jHwjmi"
+                className="sc-hmzhuo eRtqMp"
               >
                 <div
-                  className="sc-jKJlTe gyMjfX"
+                  className="sc-eNQAEJ kPLQzL"
                 >
                   <div
                     className="ant-form-item ant-form-item-with-help"
@@ -1927,7 +1954,7 @@
                                   className="ant-input-group-addon"
                                 >
                                   <span
-                                    className="sc-kpOJdX horMMw"
+                                    className="sc-dxgOiQ fraLQa"
                                     onClick={[Function]}
                                   >
                                     <span
@@ -1960,12 +1987,12 @@
                   </div>
                 </div>
                 <label
-                  className="sc-iRbamj bjnTvN"
+                  className="sc-jlyJG kTtgoZ"
                 >
                   Amount
                 </label>
                 <div
-                  className="sc-jKJlTe gyMjfX"
+                  className="sc-eNQAEJ kPLQzL"
                 >
                   <div
                     className="ant-form-item ant-form-item-with-help"
@@ -2115,7 +2142,7 @@
                                 </span>
                               </div>
                               <span
-                                className="sc-hMqMXs guaRtl"
+                                className="sc-kEYyzF fyKOGM"
                                 disabled={false}
                                 onClick={[Function]}
                                 style={
@@ -2138,10 +2165,10 @@
               </div>
             </div>
             <div
-              className="sc-hmzhuo eRtqMp"
+              className="sc-frDJqD gCEYuZ"
             >
               <div
-                className="sc-jKJlTe gyMjfX"
+                className="sc-eNQAEJ kPLQzL"
               >
                 <div
                   className="ant-form-item ant-form-item-with-help"
@@ -2190,17 +2217,17 @@
               </div>
             </div>
             <div
-              className="sc-cHGsZl gJhPxK"
+              className="sc-TOsTZ hDxYPI"
             >
               <h3
-                className="sc-kgAjT bbvSjP"
+                className="sc-cJSrbW kPKfAt"
               >
                 0
                  
                 XEC
               </h3>
               <div
-                className="sc-fBuWsC dySnfm"
+                className="sc-fMiknA fhbntc"
               >
                 =
                  
@@ -2216,16 +2243,16 @@
             }
           >
             <button
-              className="sc-brqgnP hRpeUQ"
+              className="sc-cMljjf cgwtph"
             >
               Send
             </button>
           </div>
           <div
-            className="sc-iAyFgw igETcM"
+            className="sc-hSdWYo iRCZlN"
           >
             <div
-              className="ant-collapse ant-collapse-icon-position-start sc-eHgmQL khnmqK"
+              className="ant-collapse ant-collapse-icon-position-start sc-cvbbAY eZzhXj"
               role={null}
               style={
                 Object {
@@ -2274,9 +2301,18 @@
                     onClick={null}
                   >
                     <div
-                      className="sc-kkGfuU gqJIVH"
+                      className="sc-iAyFgw gPlgsX"
                     >
-                      Advanced
+                      <div
+                        className="sc-hqyNC cNBzUr"
+                      >
+                        <svg
+                          className="sc-jzJRlG kLfsyF"
+                        >
+                          mail.svg
+                        </svg>
+                         Message
+                      </div>
                     </div>
                   </span>
                 </div>
@@ -2293,10 +2329,10 @@
 exports[`Without wallet defined 1`] = `
 Array [
   <div
-    className="sc-jlyJG IVetq"
+    className="sc-gipzik cVmPKw"
   >
     <div
-      className="sc-caSCKo iqqjWf"
+      className="sc-gisBJw eendT"
     >
       <a
         href="/configure"
@@ -2327,7 +2363,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -2336,7 +2372,7 @@
       </div>
     </div>
     <div
-      className="sc-Rmtcm bcyISv"
+      className="sc-bRBYWo euMChu"
     >
       You currently have 0 
       XEC
@@ -2345,7 +2381,7 @@
     </div>
   </div>,
   <div
-    className="sc-gPEVay dOhwxg"
+    className="sc-iRbamj jTHqpF"
   >
     <div
       className="ant-row"
@@ -2368,16 +2404,16 @@
           }
         >
           <div
-            className="sc-cJSrbW fAcGrF"
+            className="sc-ksYbfQ jGqaXi"
           >
              
             <label
-              className="sc-iRbamj bjnTvN"
+              className="sc-jlyJG kTtgoZ"
             >
               Send to
             </label>
             <div
-              className="sc-kjoXOD gkZeZp"
+              className="sc-cHGsZl cjKbMT"
             >
               Multiple Recipients:  
               <button
@@ -2404,17 +2440,17 @@
             </div>
           </div>
           <div
-            className="sc-frDJqD caWSHh"
+            className="sc-kvZOFW ePpRlA"
             open={false}
           >
             <div
-              className="sc-TOsTZ itTzLO"
+              className="sc-kgAjT iFcTEH"
             >
               <div
-                className="sc-ksYbfQ jHwjmi"
+                className="sc-hmzhuo eRtqMp"
               >
                 <div
-                  className="sc-jKJlTe gyMjfX"
+                  className="sc-eNQAEJ kPLQzL"
                 >
                   <div
                     className="ant-form-item ant-form-item-with-help"
@@ -2493,7 +2529,7 @@
                                   className="ant-input-group-addon"
                                 >
                                   <span
-                                    className="sc-kpOJdX horMMw"
+                                    className="sc-dxgOiQ fraLQa"
                                     onClick={[Function]}
                                   >
                                     <span
@@ -2526,12 +2562,12 @@
                   </div>
                 </div>
                 <label
-                  className="sc-iRbamj bjnTvN"
+                  className="sc-jlyJG kTtgoZ"
                 >
                   Amount
                 </label>
                 <div
-                  className="sc-jKJlTe gyMjfX"
+                  className="sc-eNQAEJ kPLQzL"
                 >
                   <div
                     className="ant-form-item ant-form-item-with-help"
@@ -2681,7 +2717,7 @@
                                 </span>
                               </div>
                               <span
-                                className="sc-hMqMXs guaRtl"
+                                className="sc-kEYyzF fyKOGM"
                                 disabled={false}
                                 onClick={[Function]}
                                 style={
@@ -2704,10 +2740,10 @@
               </div>
             </div>
             <div
-              className="sc-hmzhuo eRtqMp"
+              className="sc-frDJqD gCEYuZ"
             >
               <div
-                className="sc-jKJlTe gyMjfX"
+                className="sc-eNQAEJ kPLQzL"
               >
                 <div
                   className="ant-form-item ant-form-item-with-help"
@@ -2756,17 +2792,17 @@
               </div>
             </div>
             <div
-              className="sc-cHGsZl gJhPxK"
+              className="sc-TOsTZ hDxYPI"
             >
               <h3
-                className="sc-kgAjT bbvSjP"
+                className="sc-cJSrbW kPKfAt"
               >
                 0
                  
                 XEC
               </h3>
               <div
-                className="sc-fBuWsC dySnfm"
+                className="sc-fMiknA fhbntc"
               >
                 =
                  
@@ -2782,16 +2818,16 @@
             }
           >
             <button
-              className="sc-brqgnP hRpeUQ"
+              className="sc-cMljjf cgwtph"
             >
               Send
             </button>
           </div>
           <div
-            className="sc-iAyFgw igETcM"
+            className="sc-hSdWYo iRCZlN"
           >
             <div
-              className="ant-collapse ant-collapse-icon-position-start sc-eHgmQL khnmqK"
+              className="ant-collapse ant-collapse-icon-position-start sc-cvbbAY eZzhXj"
               role={null}
               style={
                 Object {
@@ -2840,9 +2876,18 @@
                     onClick={null}
                   >
                     <div
-                      className="sc-kkGfuU gqJIVH"
+                      className="sc-iAyFgw gPlgsX"
                     >
-                      Advanced
+                      <div
+                        className="sc-hqyNC cNBzUr"
+                      >
+                        <svg
+                          className="sc-jzJRlG kLfsyF"
+                        >
+                          mail.svg
+                        </svg>
+                         Message
+                      </div>
                     </div>
                   </span>
                 </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-jWBwVP bOCXcR"
+  className="sc-brqgnP bfyWvH"
 >
   <div
-    className="sc-jDwBTQ dLkfcN"
+    className="sc-gPEVay djlRgR"
   >
      
     TBS
@@ -32,7 +32,7 @@
         }
       >
         <div
-          className="sc-kkGfuU JWAsO"
+          className="sc-iAyFgw jzsFKO"
         >
           <div
             className="ant-form-item ant-form-item-with-help"
@@ -106,7 +106,7 @@
                           className="ant-input-group-addon"
                         >
                           <span
-                            className="sc-eNQAEJ rjbMI"
+                            className="sc-hMqMXs cVhNWA"
                             onClick={[Function]}
                           >
                             <span
@@ -139,7 +139,7 @@
           </div>
         </div>
         <div
-          className="sc-kkGfuU JWAsO"
+          className="sc-iAyFgw jzsFKO"
         >
           <div
             className="ant-form-item ant-form-item-with-help"
@@ -199,7 +199,7 @@
                           className="ant-input-group-addon"
                         >
                           <span
-                            className="sc-iAyFgw jYZvjf"
+                            className="sc-hSdWYo cuaAmY"
                             disabled={false}
                             onClick={[Function]}
                           >
@@ -222,7 +222,7 @@
           }
         >
           <button
-            className="sc-kpOJdX bVnaln"
+            className="sc-dxgOiQ jOtciy"
             onClick={[Function]}
           >
             Send 
diff --git a/web/cashtab/src/components/SignVerifyMsg/__tests__/__snapshots__/SignVerifyMsg.test.js.snap b/web/cashtab/src/components/SignVerifyMsg/__tests__/__snapshots__/SignVerifyMsg.test.js.snap
--- a/web/cashtab/src/components/SignVerifyMsg/__tests__/__snapshots__/SignVerifyMsg.test.js.snap
+++ b/web/cashtab/src/components/SignVerifyMsg/__tests__/__snapshots__/SignVerifyMsg.test.js.snap
@@ -2,16 +2,16 @@
 
 exports[`Wallet with BCH balances 1`] = `
 <div
-  className="sc-kjoXOD iNlzeb"
+  className="sc-cHGsZl dwpoOs"
 >
   <div
-    className="sc-eNQAEJ bPMOWW"
+    className="sc-hMqMXs kpJXFt"
   >
     <div
-      className="sc-brqgnP gZiDCM"
+      className="sc-cMljjf kvVOCQ"
     >
       <h4
-        className="sc-cMljjf guMiAV"
+        className="sc-jAaTju cMtIVA"
       >
         MigrationTestAlpha
       </h4>
@@ -44,7 +44,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -53,7 +53,7 @@
       </div>
     </div>
     <div
-      className="sc-kkGfuU ihmkkm"
+      className="sc-iAyFgw hxUtff"
     >
       You currently have 0 
       XEC
@@ -63,13 +63,13 @@
   </div>
    
   <div
-    className="sc-ckVGcZ jBULtA"
+    className="sc-jKJlTe iSWneW"
   >
     <div
-      className="sc-gipzik cRhJfe"
+      className="sc-csuQGl hBaaqO"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-start sc-Rmtcm etSSpm"
+        className="ant-collapse ant-collapse-icon-position-start sc-bRBYWo ffrGxA"
         role={null}
         style={
           Object {
@@ -118,7 +118,7 @@
               onClick={null}
             >
               <div
-                className="sc-jlyJG bbyJzT"
+                className="sc-gipzik iyhjGb"
               >
                 Sign
               </div>
@@ -128,10 +128,10 @@
       </div>
     </div>
     <div
-      className="sc-gipzik cRhJfe"
+      className="sc-csuQGl hBaaqO"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-start sc-Rmtcm etSSpm"
+        className="ant-collapse ant-collapse-icon-position-start sc-bRBYWo ffrGxA"
         role={null}
         style={
           Object {
@@ -180,7 +180,7 @@
               onClick={null}
             >
               <div
-                className="sc-jlyJG bbyJzT"
+                className="sc-gipzik iyhjGb"
               >
                 Verify
               </div>
@@ -195,16 +195,16 @@
 
 exports[`Wallet with BCH balances and tokens and state field 1`] = `
 <div
-  className="sc-kjoXOD iNlzeb"
+  className="sc-cHGsZl dwpoOs"
 >
   <div
-    className="sc-eNQAEJ bPMOWW"
+    className="sc-hMqMXs kpJXFt"
   >
     <div
-      className="sc-brqgnP gZiDCM"
+      className="sc-cMljjf kvVOCQ"
     >
       <h4
-        className="sc-cMljjf guMiAV"
+        className="sc-jAaTju cMtIVA"
       >
         MigrationTestAlpha
       </h4>
@@ -237,7 +237,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -246,10 +246,10 @@
       </div>
     </div>
     <div
-      className="sc-kEYyzF eqAzMl"
+      className="sc-kkGfuU fwBSar"
     >
       <span
-        className="sc-jAaTju cFnuHB"
+        className="sc-jDwBTQ duWiub"
       >
          
         0.06
@@ -261,13 +261,13 @@
   </div>
    
   <div
-    className="sc-ckVGcZ jBULtA"
+    className="sc-jKJlTe iSWneW"
   >
     <div
-      className="sc-gipzik cRhJfe"
+      className="sc-csuQGl hBaaqO"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-start sc-Rmtcm etSSpm"
+        className="ant-collapse ant-collapse-icon-position-start sc-bRBYWo ffrGxA"
         role={null}
         style={
           Object {
@@ -316,7 +316,7 @@
               onClick={null}
             >
               <div
-                className="sc-jlyJG bbyJzT"
+                className="sc-gipzik iyhjGb"
               >
                 Sign
               </div>
@@ -326,10 +326,10 @@
       </div>
     </div>
     <div
-      className="sc-gipzik cRhJfe"
+      className="sc-csuQGl hBaaqO"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-start sc-Rmtcm etSSpm"
+        className="ant-collapse ant-collapse-icon-position-start sc-bRBYWo ffrGxA"
         role={null}
         style={
           Object {
@@ -378,7 +378,7 @@
               onClick={null}
             >
               <div
-                className="sc-jlyJG bbyJzT"
+                className="sc-gipzik iyhjGb"
               >
                 Verify
               </div>
@@ -393,16 +393,16 @@
 
 exports[`Wallet without BCH balance 1`] = `
 <div
-  className="sc-kjoXOD iNlzeb"
+  className="sc-cHGsZl dwpoOs"
 >
   <div
-    className="sc-eNQAEJ bPMOWW"
+    className="sc-hMqMXs kpJXFt"
   >
     <div
-      className="sc-brqgnP gZiDCM"
+      className="sc-cMljjf kvVOCQ"
     >
       <h4
-        className="sc-cMljjf guMiAV"
+        className="sc-jAaTju cMtIVA"
       >
         MigrationTestAlpha
       </h4>
@@ -435,7 +435,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -444,7 +444,7 @@
       </div>
     </div>
     <div
-      className="sc-kkGfuU ihmkkm"
+      className="sc-iAyFgw hxUtff"
     >
       You currently have 0 
       XEC
@@ -454,13 +454,13 @@
   </div>
    
   <div
-    className="sc-ckVGcZ jBULtA"
+    className="sc-jKJlTe iSWneW"
   >
     <div
-      className="sc-gipzik cRhJfe"
+      className="sc-csuQGl hBaaqO"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-start sc-Rmtcm etSSpm"
+        className="ant-collapse ant-collapse-icon-position-start sc-bRBYWo ffrGxA"
         role={null}
         style={
           Object {
@@ -509,7 +509,7 @@
               onClick={null}
             >
               <div
-                className="sc-jlyJG bbyJzT"
+                className="sc-gipzik iyhjGb"
               >
                 Sign
               </div>
@@ -519,10 +519,10 @@
       </div>
     </div>
     <div
-      className="sc-gipzik cRhJfe"
+      className="sc-csuQGl hBaaqO"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-start sc-Rmtcm etSSpm"
+        className="ant-collapse ant-collapse-icon-position-start sc-bRBYWo ffrGxA"
         role={null}
         style={
           Object {
@@ -571,7 +571,7 @@
               onClick={null}
             >
               <div
-                className="sc-jlyJG bbyJzT"
+                className="sc-gipzik iyhjGb"
               >
                 Verify
               </div>
@@ -586,13 +586,13 @@
 
 exports[`Without wallet defined 1`] = `
 <div
-  className="sc-kjoXOD iNlzeb"
+  className="sc-cHGsZl dwpoOs"
 >
   <div
-    className="sc-eNQAEJ bPMOWW"
+    className="sc-hMqMXs kpJXFt"
   >
     <div
-      className="sc-brqgnP gZiDCM"
+      className="sc-cMljjf kvVOCQ"
     >
       <a
         href="/configure"
@@ -623,7 +623,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -632,7 +632,7 @@
       </div>
     </div>
     <div
-      className="sc-kkGfuU ihmkkm"
+      className="sc-iAyFgw hxUtff"
     >
       You currently have 0 
       XEC
@@ -642,13 +642,13 @@
   </div>
    
   <div
-    className="sc-ckVGcZ jBULtA"
+    className="sc-jKJlTe iSWneW"
   >
     <div
-      className="sc-gipzik cRhJfe"
+      className="sc-csuQGl hBaaqO"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-start sc-Rmtcm etSSpm"
+        className="ant-collapse ant-collapse-icon-position-start sc-bRBYWo ffrGxA"
         role={null}
         style={
           Object {
@@ -697,7 +697,7 @@
               onClick={null}
             >
               <div
-                className="sc-jlyJG bbyJzT"
+                className="sc-gipzik iyhjGb"
               >
                 Sign
               </div>
@@ -707,10 +707,10 @@
       </div>
     </div>
     <div
-      className="sc-gipzik cRhJfe"
+      className="sc-csuQGl hBaaqO"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-start sc-Rmtcm etSSpm"
+        className="ant-collapse ant-collapse-icon-position-start sc-bRBYWo ffrGxA"
         role={null}
         style={
           Object {
@@ -759,7 +759,7 @@
               onClick={null}
             >
               <div
-                className="sc-jlyJG bbyJzT"
+                className="sc-gipzik iyhjGb"
               >
                 Verify
               </div>
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-fBuWsC fsSZEY"
+  className="sc-fMiknA jZzFfL"
 >
   <h3>
     Create a Token
   </h3>
   <div
-    className="sc-jKJlTe gyMjfX"
+    className="sc-eNQAEJ kPLQzL"
   >
     <form
       className="ant-form ant-form-horizontal ant-form-small"
@@ -21,7 +21,7 @@
       }
     >
       <label
-        className="sc-jDwBTQ lpifbE"
+        className="sc-gPEVay honyxf"
       >
         Token Name
       </label>
@@ -59,7 +59,7 @@
         </div>
       </div>
       <label
-        className="sc-jDwBTQ lpifbE"
+        className="sc-gPEVay honyxf"
       >
         Ticker
       </label>
@@ -97,7 +97,7 @@
         </div>
       </div>
       <label
-        className="sc-jDwBTQ lpifbE"
+        className="sc-gPEVay honyxf"
       >
         Decimals
       </label>
@@ -135,7 +135,7 @@
         </div>
       </div>
       <label
-        className="sc-jDwBTQ lpifbE"
+        className="sc-gPEVay honyxf"
       >
         Supply
       </label>
@@ -173,7 +173,7 @@
         </div>
       </div>
       <label
-        className="sc-jDwBTQ lpifbE"
+        className="sc-gPEVay honyxf"
       >
         Document URL
       </label>
@@ -211,7 +211,7 @@
         </div>
       </div>
       <label
-        className="sc-jDwBTQ lpifbE"
+        className="sc-gPEVay honyxf"
       >
         Add Image
       </label>
@@ -317,7 +317,7 @@
     </form>
   </div>
   <button
-    className="sc-jWBwVP fKhesL"
+    className="sc-brqgnP bPIDjd"
     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,13 +3,13 @@
 exports[`Wallet with BCH balances 1`] = `
 Array [
   <div
-    className="sc-gPEVay kgesTV"
+    className="sc-iRbamj ipjoLH"
   >
     <div
-      className="sc-fAjcbJ fvNgBe"
+      className="sc-caSCKo iqqjWf"
     >
       <h4
-        className="sc-caSCKo cQvZnP"
+        className="sc-gisBJw vOrRQ"
       >
         MigrationTestAlpha
       </h4>
@@ -42,7 +42,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -51,10 +51,10 @@
       </div>
     </div>
     <div
-      className="sc-jlyJG bMQkuN"
+      className="sc-gipzik bKzPiy"
     >
       <span
-        className="sc-fMiknA iAqacI"
+        className="sc-dVhcbM dXNsNY"
       >
          
         0
@@ -65,17 +65,17 @@
     </div>
   </div>,
   <div
-    className="sc-jAaTju dkllRF"
+    className="sc-jDwBTQ cyCIHz"
   >
     <div
-      className="sc-fBuWsC fsSZEY"
+      className="sc-fMiknA jZzFfL"
     >
       <h3>
         Create a Token
       </h3>
     </div>
     <p
-      className="sc-bRBYWo jvAUss"
+      className="sc-hzDkRC kDtfGq"
     >
       You need at least
        
@@ -96,13 +96,13 @@
 exports[`Wallet with BCH balances and tokens 1`] = `
 Array [
   <div
-    className="sc-gPEVay kgesTV"
+    className="sc-iRbamj ipjoLH"
   >
     <div
-      className="sc-fAjcbJ fvNgBe"
+      className="sc-caSCKo iqqjWf"
     >
       <h4
-        className="sc-caSCKo cQvZnP"
+        className="sc-gisBJw vOrRQ"
       >
         MigrationTestAlpha
       </h4>
@@ -135,7 +135,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -144,10 +144,10 @@
       </div>
     </div>
     <div
-      className="sc-jlyJG bMQkuN"
+      className="sc-gipzik bKzPiy"
     >
       <span
-        className="sc-fMiknA iAqacI"
+        className="sc-dVhcbM dXNsNY"
       >
          
         0
@@ -158,17 +158,17 @@
     </div>
   </div>,
   <div
-    className="sc-jAaTju dkllRF"
+    className="sc-jDwBTQ cyCIHz"
   >
     <div
-      className="sc-fBuWsC fsSZEY"
+      className="sc-fMiknA jZzFfL"
     >
       <h3>
         Create a Token
       </h3>
     </div>
     <p
-      className="sc-bRBYWo jvAUss"
+      className="sc-hzDkRC kDtfGq"
     >
       You need at least
        
@@ -189,13 +189,13 @@
 exports[`Wallet with BCH balances and tokens and state field 1`] = `
 Array [
   <div
-    className="sc-gPEVay kgesTV"
+    className="sc-iRbamj ipjoLH"
   >
     <div
-      className="sc-fAjcbJ fvNgBe"
+      className="sc-caSCKo iqqjWf"
     >
       <h4
-        className="sc-caSCKo cQvZnP"
+        className="sc-gisBJw vOrRQ"
       >
         MigrationTestAlpha
       </h4>
@@ -228,7 +228,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -237,10 +237,10 @@
       </div>
     </div>
     <div
-      className="sc-jlyJG bMQkuN"
+      className="sc-gipzik bKzPiy"
     >
       <span
-        className="sc-fMiknA iAqacI"
+        className="sc-dVhcbM dXNsNY"
       >
          
         0.06
@@ -251,16 +251,16 @@
     </div>
   </div>,
   <div
-    className="sc-jAaTju dkllRF"
+    className="sc-jDwBTQ cyCIHz"
   >
     <div
-      className="sc-fBuWsC fsSZEY"
+      className="sc-fMiknA jZzFfL"
     >
       <h3>
         Create a Token
       </h3>
       <div
-        className="sc-jKJlTe gyMjfX"
+        className="sc-eNQAEJ kPLQzL"
       >
         <form
           className="ant-form ant-form-horizontal ant-form-small"
@@ -273,7 +273,7 @@
           }
         >
           <label
-            className="sc-jDwBTQ lpifbE"
+            className="sc-gPEVay honyxf"
           >
             Token Name
           </label>
@@ -311,7 +311,7 @@
             </div>
           </div>
           <label
-            className="sc-jDwBTQ lpifbE"
+            className="sc-gPEVay honyxf"
           >
             Ticker
           </label>
@@ -349,7 +349,7 @@
             </div>
           </div>
           <label
-            className="sc-jDwBTQ lpifbE"
+            className="sc-gPEVay honyxf"
           >
             Decimals
           </label>
@@ -387,7 +387,7 @@
             </div>
           </div>
           <label
-            className="sc-jDwBTQ lpifbE"
+            className="sc-gPEVay honyxf"
           >
             Supply
           </label>
@@ -425,7 +425,7 @@
             </div>
           </div>
           <label
-            className="sc-jDwBTQ lpifbE"
+            className="sc-gPEVay honyxf"
           >
             Document URL
           </label>
@@ -463,7 +463,7 @@
             </div>
           </div>
           <label
-            className="sc-jDwBTQ lpifbE"
+            className="sc-gPEVay honyxf"
           >
             Add Image
           </label>
@@ -569,7 +569,7 @@
         </form>
       </div>
       <button
-        className="sc-jWBwVP fKhesL"
+        className="sc-brqgnP bPIDjd"
         disabled={true}
         onClick={[Function]}
         style={
@@ -610,13 +610,13 @@
 exports[`Wallet without BCH balance 1`] = `
 Array [
   <div
-    className="sc-gPEVay kgesTV"
+    className="sc-iRbamj ipjoLH"
   >
     <div
-      className="sc-fAjcbJ fvNgBe"
+      className="sc-caSCKo iqqjWf"
     >
       <h4
-        className="sc-caSCKo cQvZnP"
+        className="sc-gisBJw vOrRQ"
       >
         MigrationTestAlpha
       </h4>
@@ -649,7 +649,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -658,10 +658,10 @@
       </div>
     </div>
     <div
-      className="sc-jlyJG bMQkuN"
+      className="sc-gipzik bKzPiy"
     >
       <span
-        className="sc-fMiknA iAqacI"
+        className="sc-dVhcbM dXNsNY"
       >
          
         0
@@ -672,17 +672,17 @@
     </div>
   </div>,
   <div
-    className="sc-jAaTju dkllRF"
+    className="sc-jDwBTQ cyCIHz"
   >
     <div
-      className="sc-fBuWsC fsSZEY"
+      className="sc-fMiknA jZzFfL"
     >
       <h3>
         Create a Token
       </h3>
     </div>
     <p
-      className="sc-bRBYWo jvAUss"
+      className="sc-hzDkRC kDtfGq"
     >
       You need at least
        
@@ -703,10 +703,10 @@
 exports[`Without wallet defined 1`] = `
 Array [
   <div
-    className="sc-gPEVay kgesTV"
+    className="sc-iRbamj ipjoLH"
   >
     <div
-      className="sc-fAjcbJ fvNgBe"
+      className="sc-caSCKo iqqjWf"
     >
       <a
         href="/configure"
@@ -737,7 +737,7 @@
             className="ant-switch-inner"
           >
             <svg
-              className="sc-kAzzGY fUTkYj"
+              className="sc-chPdSV gzfndC"
             >
               eye-invisible.svg
             </svg>
@@ -746,10 +746,10 @@
       </div>
     </div>
     <div
-      className="sc-jlyJG bMQkuN"
+      className="sc-gipzik bKzPiy"
     >
       <span
-        className="sc-fMiknA iAqacI"
+        className="sc-dVhcbM dXNsNY"
       >
          
         0
@@ -760,17 +760,17 @@
     </div>
   </div>,
   <div
-    className="sc-jAaTju dkllRF"
+    className="sc-jDwBTQ cyCIHz"
   >
     <div
-      className="sc-fBuWsC fsSZEY"
+      className="sc-fMiknA jZzFfL"
     >
       <h3>
         Create a Token
       </h3>
     </div>
     <p
-      className="sc-bRBYWo jvAUss"
+      className="sc-hzDkRC kDtfGq"
     >
       You need at least