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,29 @@
 exports[`Wallet with BCH balances 1`] = `
 Array [
   <div
-    className="sc-jWBwVP cbXqTI"
+    className="sc-brqgnP ghMCeb"
   >
-    <h4
-      className="sc-Rmtcm eLIA"
+    <div
+      className="sc-bRBYWo ibKBs"
     >
-      MigrationTestAlpha
-    </h4>
+      <h4
+        className="sc-hzDkRC jSDoTI"
+      >
+        MigrationTestAlpha
+      </h4>
+      <a
+        href="/configure"
+        onClick={[Function]}
+      >
+        <svg
+          className="sc-VigVT kUaiyV"
+        >
+          edit.svg
+        </svg>
+      </a>
+    </div>
     <div
-      className="sc-jAaTju Vyslf"
+      className="sc-jDwBTQ bfTPPk"
     >
       You currently have 0 
       XEC
@@ -21,7 +35,7 @@
   </div>,
   <br />,
   <div
-    className="sc-eHgmQL kvZwAq"
+    className="sc-cvbbAY blOKNt"
   >
     <div
       className="ant-row"
@@ -33,10 +47,10 @@
         style={Object {}}
       >
         <div
-          className="sc-dxgOiQ iPcCXY"
+          className="sc-ckVGcZ gFKjKB"
         >
           <div
-            className="ant-collapse ant-collapse-icon-position-start sc-jKJlTe bEMpDk"
+            className="ant-collapse ant-collapse-icon-position-start sc-eNQAEJ bYABjs"
             role={null}
             style={
               Object {
@@ -85,7 +99,7 @@
                   onClick={null}
                 >
                   <div
-                    className="sc-kpOJdX kAzjOl"
+                    className="sc-dxgOiQ hTjMfW"
                   >
                     XEC Airdrop Calculator
                   </div>
@@ -103,15 +117,29 @@
 exports[`Wallet with BCH balances and tokens 1`] = `
 Array [
   <div
-    className="sc-jWBwVP cbXqTI"
+    className="sc-brqgnP ghMCeb"
   >
-    <h4
-      className="sc-Rmtcm eLIA"
+    <div
+      className="sc-bRBYWo ibKBs"
     >
-      MigrationTestAlpha
-    </h4>
+      <h4
+        className="sc-hzDkRC jSDoTI"
+      >
+        MigrationTestAlpha
+      </h4>
+      <a
+        href="/configure"
+        onClick={[Function]}
+      >
+        <svg
+          className="sc-VigVT kUaiyV"
+        >
+          edit.svg
+        </svg>
+      </a>
+    </div>
     <div
-      className="sc-jAaTju Vyslf"
+      className="sc-jDwBTQ bfTPPk"
     >
       You currently have 0 
       XEC
@@ -121,7 +149,7 @@
   </div>,
   <br />,
   <div
-    className="sc-eHgmQL kvZwAq"
+    className="sc-cvbbAY blOKNt"
   >
     <div
       className="ant-row"
@@ -133,10 +161,10 @@
         style={Object {}}
       >
         <div
-          className="sc-dxgOiQ iPcCXY"
+          className="sc-ckVGcZ gFKjKB"
         >
           <div
-            className="ant-collapse ant-collapse-icon-position-start sc-jKJlTe bEMpDk"
+            className="ant-collapse ant-collapse-icon-position-start sc-eNQAEJ bYABjs"
             role={null}
             style={
               Object {
@@ -185,7 +213,7 @@
                   onClick={null}
                 >
                   <div
-                    className="sc-kpOJdX kAzjOl"
+                    className="sc-dxgOiQ hTjMfW"
                   >
                     XEC Airdrop Calculator
                   </div>
@@ -203,15 +231,29 @@
 exports[`Wallet with BCH balances and tokens and state field 1`] = `
 Array [
   <div
-    className="sc-jWBwVP cbXqTI"
+    className="sc-brqgnP ghMCeb"
   >
-    <h4
-      className="sc-Rmtcm eLIA"
+    <div
+      className="sc-bRBYWo ibKBs"
     >
-      MigrationTestAlpha
-    </h4>
+      <h4
+        className="sc-hzDkRC jSDoTI"
+      >
+        MigrationTestAlpha
+      </h4>
+      <a
+        href="/configure"
+        onClick={[Function]}
+      >
+        <svg
+          className="sc-VigVT kUaiyV"
+        >
+          edit.svg
+        </svg>
+      </a>
+    </div>
     <div
-      className="sc-cMljjf coNPHF"
+      className="sc-jAaTju eoNejo"
     >
       0.06
        
@@ -220,7 +262,7 @@
   </div>,
   <br />,
   <div
-    className="sc-eHgmQL kvZwAq"
+    className="sc-cvbbAY blOKNt"
   >
     <div
       className="ant-row"
@@ -232,10 +274,10 @@
         style={Object {}}
       >
         <div
-          className="sc-dxgOiQ iPcCXY"
+          className="sc-ckVGcZ gFKjKB"
         >
           <div
-            className="ant-collapse ant-collapse-icon-position-start sc-jKJlTe bEMpDk"
+            className="ant-collapse ant-collapse-icon-position-start sc-eNQAEJ bYABjs"
             role={null}
             style={
               Object {
@@ -284,7 +326,7 @@
                   onClick={null}
                 >
                   <div
-                    className="sc-kpOJdX kAzjOl"
+                    className="sc-dxgOiQ hTjMfW"
                   >
                     XEC Airdrop Calculator
                   </div>
@@ -302,15 +344,29 @@
 exports[`Wallet without BCH balance 1`] = `
 Array [
   <div
-    className="sc-jWBwVP cbXqTI"
+    className="sc-brqgnP ghMCeb"
   >
-    <h4
-      className="sc-Rmtcm eLIA"
+    <div
+      className="sc-bRBYWo ibKBs"
     >
-      MigrationTestAlpha
-    </h4>
+      <h4
+        className="sc-hzDkRC jSDoTI"
+      >
+        MigrationTestAlpha
+      </h4>
+      <a
+        href="/configure"
+        onClick={[Function]}
+      >
+        <svg
+          className="sc-VigVT kUaiyV"
+        >
+          edit.svg
+        </svg>
+      </a>
+    </div>
     <div
-      className="sc-jAaTju Vyslf"
+      className="sc-jDwBTQ bfTPPk"
     >
       You currently have 0 
       XEC
@@ -320,7 +376,7 @@
   </div>,
   <br />,
   <div
-    className="sc-eHgmQL kvZwAq"
+    className="sc-cvbbAY blOKNt"
   >
     <div
       className="ant-row"
@@ -332,10 +388,10 @@
         style={Object {}}
       >
         <div
-          className="sc-dxgOiQ iPcCXY"
+          className="sc-ckVGcZ gFKjKB"
         >
           <div
-            className="ant-collapse ant-collapse-icon-position-start sc-jKJlTe bEMpDk"
+            className="ant-collapse ant-collapse-icon-position-start sc-eNQAEJ bYABjs"
             role={null}
             style={
               Object {
@@ -384,7 +440,7 @@
                   onClick={null}
                 >
                   <div
-                    className="sc-kpOJdX kAzjOl"
+                    className="sc-dxgOiQ hTjMfW"
                   >
                     XEC Airdrop Calculator
                   </div>
@@ -402,10 +458,24 @@
 exports[`Without wallet defined 1`] = `
 Array [
   <div
-    className="sc-jWBwVP cbXqTI"
+    className="sc-brqgnP ghMCeb"
   >
     <div
-      className="sc-jAaTju Vyslf"
+      className="sc-bRBYWo ibKBs"
+    >
+      <a
+        href="/configure"
+        onClick={[Function]}
+      >
+        <svg
+          className="sc-VigVT kUaiyV"
+        >
+          edit.svg
+        </svg>
+      </a>
+    </div>
+    <div
+      className="sc-jDwBTQ bfTPPk"
     >
       You currently have 0 
       XEC
@@ -415,7 +485,7 @@
   </div>,
   <br />,
   <div
-    className="sc-eHgmQL kvZwAq"
+    className="sc-cvbbAY blOKNt"
   >
     <div
       className="ant-row"
@@ -427,10 +497,10 @@
         style={Object {}}
       >
         <div
-          className="sc-dxgOiQ iPcCXY"
+          className="sc-ckVGcZ gFKjKB"
         >
           <div
-            className="ant-collapse ant-collapse-icon-position-start sc-jKJlTe bEMpDk"
+            className="ant-collapse ant-collapse-icon-position-start sc-eNQAEJ bYABjs"
             role={null}
             style={
               Object {
@@ -479,7 +549,7 @@
                   onClick={null}
                 >
                   <div
-                    className="sc-kpOJdX kAzjOl"
+                    className="sc-dxgOiQ hTjMfW"
                   >
                     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
@@ -24,6 +24,7 @@
 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';
+import { ReactComponent as Edit } from 'assets/edit.svg';
 export const CashLoadingIcon = <LoadingOutlined className="cashLoadingIcon" />;
 
 export const CashReceivedNotificationIcon = () => (
@@ -109,6 +110,14 @@
     width: 1.3em;
 `;
 
+export const ThemedEditOutlined = styled(Edit)`
+    stroke: ${props => props.theme.eCashBlue};
+    fill: ${props => props.theme.eCashBlue};
+    min-width: 20px;
+    min-height: 20px;
+    cursor: pointer;
+`;
+
 export const LoadingBlock = styled.div`
     width: 100%;
     display: flex;
diff --git a/web/cashtab/src/components/Common/WalletLabel.js b/web/cashtab/src/components/Common/WalletLabel.js
--- a/web/cashtab/src/components/Common/WalletLabel.js
+++ b/web/cashtab/src/components/Common/WalletLabel.js
@@ -1,12 +1,21 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
+import { ThemedEditOutlined } from 'components/Common/CustomIcons';
+import { Link } from 'react-router-dom';
+
+const LabelCtn = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 3%;
+`;
 
 const WalletName = styled.h4`
     font-size: 16px;
     display: inline-block;
     color: ${props => props.theme.lightWhite};
-    margin-bottom: 0px;
+    margin-bottom: 2px;
     @media (max-width: 400px) {
         font-size: 16px;
     }
@@ -14,11 +23,21 @@
 
 const WalletLabel = ({ name }) => {
     return (
-        <>
+        <LabelCtn>
             {name && typeof name === 'string' && (
                 <WalletName>{name}</WalletName>
             )}
-        </>
+            <Link
+                to={{
+                    pathname: `/configure`,
+                    state: {
+                        showRenameWalletModal: true,
+                    },
+                }}
+            >
+                <ThemedEditOutlined />
+            </Link>
+        </LabelCtn>
     );
 };
 
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
@@ -369,6 +369,7 @@
     margin-bottom: 6px;
     h3 {
         font-size: 16px;
+        flex: 1 1 0;
         display: inline-block;
         color: ${props => props.theme.darkBlue};
         margin: 0;
@@ -380,11 +381,15 @@
     }
     h4 {
         font-size: 16px;
+        flex: 1 1 0;
         display: inline-block;
         color: ${props => props.theme.eCashBlue} !important;
         margin: 0;
         text-align: right;
     }
+    ${SWButtonCtn} {
+        flex: 1 1 0;
+    }
     @media (max-width: 500px) {
         flex-direction: column;
         margin-bottom: 12px;
@@ -480,7 +485,8 @@
     const {
         addNewSavedWallet,
         activateWallet,
-        renameWallet,
+        renameSavedWallet,
+        renameActiveWallet,
         deleteWallet,
         validateMnemonic,
         getSavedWallets,
@@ -585,6 +591,15 @@
             setShowTranslationWarning(true);
         }
 
+        if (
+            location &&
+            location.state &&
+            location.state.showRenameWalletModal
+        ) {
+            setShowRenameWalletModal(true);
+            setWalletToBeRenamed(wallet);
+        }
+
         // if this was routed from Home screen's Add to Contact link
         if (location && location.state && location.state.contactToAdd) {
             let tempContactListArray;
@@ -757,6 +772,7 @@
     };
 
     const changeWalletName = async () => {
+        let oldActiveWalletName;
         if (!isValidNewWalletNameLength(newWalletName)) {
             setNewWalletNameIsValid(false);
             return;
@@ -767,14 +783,29 @@
         console.log(
             `Changing wallet ${walletToBeRenamed.name} name to ${newWalletName}`,
         );
-        const renameSuccess = await renameWallet(
-            walletToBeRenamed.name,
-            newWalletName,
-        );
+        let renameSuccess;
+
+        if (walletToBeRenamed.name === wallet.name) {
+            oldActiveWalletName = walletToBeRenamed.name;
+            renameSuccess = await renameActiveWallet(
+                wallet,
+                walletToBeRenamed.name,
+                newWalletName,
+            );
+        } else {
+            renameSuccess = await renameSavedWallet(
+                walletToBeRenamed.name,
+                newWalletName,
+            );
+        }
 
         if (renameSuccess) {
             Modal.success({
-                content: `Wallet "${walletToBeRenamed.name}" renamed to "${newWalletName}"`,
+                content: `Wallet "${
+                    oldActiveWalletName !== undefined
+                        ? oldActiveWalletName
+                        : walletToBeRenamed.name
+                }" renamed to "${newWalletName}"`,
             });
         } else {
             Modal.error({
@@ -1486,7 +1517,7 @@
                     />
                 )}
                 {wallet && wallet.mnemonic && (
-                    <StyledCollapse expandIconPosition="left">
+                    <StyledCollapse expandIconPosition="start">
                         <Panel
                             header={
                                 <div className="seedPhrase">
@@ -1579,6 +1610,20 @@
                                         </h3>
                                     </Tooltip>
                                     <h4>Currently active</h4>
+                                    <SWButtonCtn>
+                                        <Edit
+                                            onClick={() =>
+                                                showPopulatedRenameWalletModal(
+                                                    wallet,
+                                                )
+                                            }
+                                        />
+                                        <ThemedContactsOutlined
+                                            onClick={() =>
+                                                addSavedWalletToContact(wallet)
+                                            }
+                                        />
+                                    </SWButtonCtn>
                                 </AWRow>
                                 <div>
                                     {savedWallets.map(sw => (
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-cSHVUG jkzHCz"
+  className="sc-kAzzGY fEGWQF"
 >
   <div
-    className="sc-TOsTZ bvNCJE"
+    className="sc-kgAjT ipRqIP"
   >
     <h2>
       <span
@@ -72,7 +72,7 @@
       </div>
     </div>
     <div
-      className="sc-kgAjT dqIHCd"
+      className="sc-cJSrbW gjKLFi"
     />
     <h2>
       <span
@@ -97,7 +97,7 @@
        Manage Wallets
     </h2>
     <button
-      className="sc-gPEVay fIifAs"
+      className="sc-iRbamj fvPHft"
       onClick={[Function]}
     >
       <span
@@ -125,7 +125,7 @@
        New Wallet
     </button>
     <button
-      className="sc-iRbamj eDAZIV"
+      className="sc-jlyJG kiMfqH"
       onClick={[Function]}
     >
       <span
@@ -159,7 +159,7 @@
         style={Object {}}
       >
         <div
-          className="ant-collapse ant-collapse-icon-position-start sc-kEYyzF BStYT"
+          className="ant-collapse ant-collapse-icon-position-start sc-kkGfuU kcgGis"
           role={null}
           style={
             Object {
@@ -215,7 +215,7 @@
       </div>
     </div>
     <div
-      className="sc-kgAjT dqIHCd"
+      className="sc-cJSrbW gjKLFi"
     />
     <h2>
       <span
@@ -240,7 +240,7 @@
        Fiat Currency
     </h2>
     <div
-      className="sc-cMljjf hRKaxd"
+      className="sc-jAaTju esgADR"
     >
       <div
         className="ant-select select-after ant-select-single ant-select-show-arrow"
@@ -333,7 +333,7 @@
       </div>
     </div>
     <div
-      className="sc-kgAjT dqIHCd"
+      className="sc-cJSrbW gjKLFi"
     />
     <h2>
       <span
@@ -358,7 +358,7 @@
        General Settings
     </h2>
     <div
-      className="sc-hmzhuo hrXGsZ"
+      className="sc-frDJqD gHcDjq"
     >
       <div
         className="title"
@@ -417,7 +417,7 @@
       </span>
     </div>
     <div
-      className="sc-hmzhuo hrXGsZ"
+      className="sc-frDJqD gHcDjq"
     >
       <div
         className="SendConfirm"
@@ -480,7 +480,7 @@
       </button>
     </div>
     <div
-      className="sc-hmzhuo hrXGsZ"
+      className="sc-frDJqD gHcDjq"
     >
       <div
         className="ShowMessages"
@@ -543,14 +543,14 @@
       </button>
     </div>
     <div
-      className="sc-kgAjT dqIHCd"
+      className="sc-cJSrbW gjKLFi"
     />
     <div
-      className="sc-csuQGl iEJzqX"
+      className="sc-Rmtcm irNbQg"
     >
       [
       <a
-        className="sc-Rmtcm jetxTC"
+        className="sc-bRBYWo hnPTQa"
         href="https://docs.cashtab.com/docs/"
         rel="noreferrer"
         target="_blank"
@@ -566,10 +566,10 @@
 
 exports[`Without wallet defined 1`] = `
 <div
-  className="sc-cSHVUG jkzHCz"
+  className="sc-kAzzGY fEGWQF"
 >
   <div
-    className="sc-TOsTZ bvNCJE"
+    className="sc-kgAjT ipRqIP"
   >
     <h2>
       <span
@@ -636,7 +636,7 @@
       </div>
     </div>
     <div
-      className="sc-kgAjT dqIHCd"
+      className="sc-cJSrbW gjKLFi"
     />
     <h2>
       <span
@@ -661,7 +661,7 @@
        Manage Wallets
     </h2>
     <button
-      className="sc-gPEVay fIifAs"
+      className="sc-iRbamj fvPHft"
       onClick={[Function]}
     >
       <span
@@ -689,7 +689,7 @@
        New Wallet
     </button>
     <button
-      className="sc-iRbamj eDAZIV"
+      className="sc-jlyJG kiMfqH"
       onClick={[Function]}
     >
       <span
@@ -723,7 +723,7 @@
         style={Object {}}
       >
         <div
-          className="ant-collapse ant-collapse-icon-position-start sc-kEYyzF BStYT"
+          className="ant-collapse ant-collapse-icon-position-start sc-kkGfuU kcgGis"
           role={null}
           style={
             Object {
@@ -779,7 +779,7 @@
       </div>
     </div>
     <div
-      className="sc-kgAjT dqIHCd"
+      className="sc-cJSrbW gjKLFi"
     />
     <h2>
       <span
@@ -804,7 +804,7 @@
        Fiat Currency
     </h2>
     <div
-      className="sc-cMljjf hRKaxd"
+      className="sc-jAaTju esgADR"
     >
       <div
         className="ant-select select-after ant-select-single ant-select-show-arrow"
@@ -897,7 +897,7 @@
       </div>
     </div>
     <div
-      className="sc-kgAjT dqIHCd"
+      className="sc-cJSrbW gjKLFi"
     />
     <h2>
       <span
@@ -922,7 +922,7 @@
        General Settings
     </h2>
     <div
-      className="sc-hmzhuo hrXGsZ"
+      className="sc-frDJqD gHcDjq"
     >
       <div
         className="title"
@@ -981,7 +981,7 @@
       </span>
     </div>
     <div
-      className="sc-hmzhuo hrXGsZ"
+      className="sc-frDJqD gHcDjq"
     >
       <div
         className="SendConfirm"
@@ -1044,7 +1044,7 @@
       </button>
     </div>
     <div
-      className="sc-hmzhuo hrXGsZ"
+      className="sc-frDJqD gHcDjq"
     >
       <div
         className="ShowMessages"
@@ -1107,14 +1107,14 @@
       </button>
     </div>
     <div
-      className="sc-kgAjT dqIHCd"
+      className="sc-cJSrbW gjKLFi"
     />
     <div
-      className="sc-csuQGl iEJzqX"
+      className="sc-Rmtcm irNbQg"
     >
       [
       <a
-        className="sc-Rmtcm jetxTC"
+        className="sc-bRBYWo hnPTQa"
         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,15 +3,29 @@
 exports[`Wallet with BCH balances 1`] = `
 Array [
   <div
-    className="sc-uJMKN ktTWlM"
+    className="sc-bbmXgH kdVZcs"
   >
-    <h4
-      className="sc-feJyhm deZNHa"
+    <div
+      className="sc-iELTvK fssSXy"
     >
-      MigrationTestAlpha
-    </h4>
+      <h4
+        className="sc-cmTdod gssGZC"
+      >
+        MigrationTestAlpha
+      </h4>
+      <a
+        href="/configure"
+        onClick={[Function]}
+      >
+        <svg
+          className="sc-VigVT kUaiyV"
+        >
+          edit.svg
+        </svg>
+      </a>
+    </div>
     <div
-      className="sc-gGBfsJ ezsYEf"
+      className="sc-jnlKLf boFAvt"
     >
       0
        
@@ -19,26 +33,26 @@
     </div>
   </div>,
   <div
-    className="sc-dNLxif OsUoi"
+    className="sc-jqCOkK dpFugr"
   >
     <div
-      className="sc-iELTvK gUkZUv"
+      className="sc-jwKygS kxGNHu"
     >
       <button
-        className="sc-cmTdod kbCwqb"
+        className="sc-btzYZH kfYOCz"
         onClick={[Function]}
       >
         Transactions
       </button>
       <button
-        className="sc-cmTdod kKunbN"
+        className="sc-btzYZH cBfbb"
         onClick={[Function]}
       >
         eTokens
       </button>
     </div>
     <div
-      className="sc-jwKygS ANbhp"
+      className="sc-lhVmIH jfoklE"
     >
       <div />
       <span
@@ -65,10 +79,10 @@
        to send to others
     </div>
     <div
-      className="sc-jwKygS csnWgt"
+      className="sc-lhVmIH laugOp"
     >
       <a
-        className="sc-elJkPf fxlXUb"
+        className="sc-kTUwUJ iTUXXN"
         href="/tokens"
         onClick={[Function]}
       >
@@ -87,15 +101,29 @@
 exports[`Wallet with BCH balances and tokens 1`] = `
 Array [
   <div
-    className="sc-uJMKN ktTWlM"
+    className="sc-bbmXgH kdVZcs"
   >
-    <h4
-      className="sc-feJyhm deZNHa"
+    <div
+      className="sc-iELTvK fssSXy"
     >
-      MigrationTestAlpha
-    </h4>
+      <h4
+        className="sc-cmTdod gssGZC"
+      >
+        MigrationTestAlpha
+      </h4>
+      <a
+        href="/configure"
+        onClick={[Function]}
+      >
+        <svg
+          className="sc-VigVT kUaiyV"
+        >
+          edit.svg
+        </svg>
+      </a>
+    </div>
     <div
-      className="sc-gGBfsJ ezsYEf"
+      className="sc-jnlKLf boFAvt"
     >
       0
        
@@ -103,26 +131,26 @@
     </div>
   </div>,
   <div
-    className="sc-dNLxif OsUoi"
+    className="sc-jqCOkK dpFugr"
   >
     <div
-      className="sc-iELTvK gUkZUv"
+      className="sc-jwKygS kxGNHu"
     >
       <button
-        className="sc-cmTdod kbCwqb"
+        className="sc-btzYZH kfYOCz"
         onClick={[Function]}
       >
         Transactions
       </button>
       <button
-        className="sc-cmTdod kKunbN"
+        className="sc-btzYZH cBfbb"
         onClick={[Function]}
       >
         eTokens
       </button>
     </div>
     <div
-      className="sc-jwKygS ANbhp"
+      className="sc-lhVmIH jfoklE"
     >
       <div />
       <span
@@ -149,10 +177,10 @@
        to send to others
     </div>
     <div
-      className="sc-jwKygS csnWgt"
+      className="sc-lhVmIH laugOp"
     >
       <a
-        className="sc-elJkPf fxlXUb"
+        className="sc-kTUwUJ iTUXXN"
         href="/tokens"
         onClick={[Function]}
       >
@@ -171,15 +199,29 @@
 exports[`Wallet with BCH balances and tokens and state field 1`] = `
 Array [
   <div
-    className="sc-uJMKN ktTWlM"
+    className="sc-bbmXgH kdVZcs"
   >
-    <h4
-      className="sc-feJyhm deZNHa"
+    <div
+      className="sc-iELTvK fssSXy"
     >
-      MigrationTestAlpha
-    </h4>
+      <h4
+        className="sc-cmTdod gssGZC"
+      >
+        MigrationTestAlpha
+      </h4>
+      <a
+        href="/configure"
+        onClick={[Function]}
+      >
+        <svg
+          className="sc-VigVT kUaiyV"
+        >
+          edit.svg
+        </svg>
+      </a>
+    </div>
     <div
-      className="sc-gGBfsJ ezsYEf"
+      className="sc-jnlKLf boFAvt"
     >
       0.06
        
@@ -187,26 +229,26 @@
     </div>
   </div>,
   <div
-    className="sc-dNLxif OsUoi"
+    className="sc-jqCOkK dpFugr"
   >
     <div
-      className="sc-iELTvK gUkZUv"
+      className="sc-jwKygS kxGNHu"
     >
       <button
-        className="sc-cmTdod kbCwqb"
+        className="sc-btzYZH kfYOCz"
         onClick={[Function]}
       >
         Transactions
       </button>
       <button
-        className="sc-cmTdod kKunbN"
+        className="sc-btzYZH cBfbb"
         onClick={[Function]}
       >
         eTokens
       </button>
     </div>
     <div
-      className="sc-jwKygS ANbhp"
+      className="sc-lhVmIH jfoklE"
     >
       <div />
       <span
@@ -233,10 +275,10 @@
        to send to others
     </div>
     <div
-      className="sc-jwKygS csnWgt"
+      className="sc-lhVmIH laugOp"
     >
       <a
-        className="sc-elJkPf fxlXUb"
+        className="sc-kTUwUJ iTUXXN"
         href="/tokens"
         onClick={[Function]}
       >
@@ -248,13 +290,13 @@
           onClick={[Function]}
         >
           <div
-            className="sc-iAyFgw fIykat"
+            className="sc-hSdWYo gakLSi"
           >
             <div
-              className="sc-kkGfuU bUZIBS"
+              className="sc-iAyFgw jMUgTU"
             >
               <div
-                className="sc-kEYyzF edBbzK"
+                className="sc-kkGfuU brwoQK"
               />
               <h4>
                 TBS
@@ -274,15 +316,29 @@
 exports[`Wallet without BCH balance 1`] = `
 Array [
   <div
-    className="sc-uJMKN ktTWlM"
+    className="sc-bbmXgH kdVZcs"
   >
-    <h4
-      className="sc-feJyhm deZNHa"
+    <div
+      className="sc-iELTvK fssSXy"
     >
-      MigrationTestAlpha
-    </h4>
+      <h4
+        className="sc-cmTdod gssGZC"
+      >
+        MigrationTestAlpha
+      </h4>
+      <a
+        href="/configure"
+        onClick={[Function]}
+      >
+        <svg
+          className="sc-VigVT kUaiyV"
+        >
+          edit.svg
+        </svg>
+      </a>
+    </div>
     <div
-      className="sc-gGBfsJ ezsYEf"
+      className="sc-jnlKLf boFAvt"
     >
       0
        
@@ -290,26 +346,26 @@
     </div>
   </div>,
   <div
-    className="sc-dNLxif OsUoi"
+    className="sc-jqCOkK dpFugr"
   >
     <div
-      className="sc-iELTvK gUkZUv"
+      className="sc-jwKygS kxGNHu"
     >
       <button
-        className="sc-cmTdod kbCwqb"
+        className="sc-btzYZH kfYOCz"
         onClick={[Function]}
       >
         Transactions
       </button>
       <button
-        className="sc-cmTdod kKunbN"
+        className="sc-btzYZH cBfbb"
         onClick={[Function]}
       >
         eTokens
       </button>
     </div>
     <div
-      className="sc-jwKygS ANbhp"
+      className="sc-lhVmIH jfoklE"
     >
       <div />
       <span
@@ -336,10 +392,10 @@
        to send to others
     </div>
     <div
-      className="sc-jwKygS csnWgt"
+      className="sc-lhVmIH laugOp"
     >
       <a
-        className="sc-elJkPf fxlXUb"
+        className="sc-kTUwUJ iTUXXN"
         href="/tokens"
         onClick={[Function]}
       >
@@ -357,18 +413,18 @@
 
 exports[`Without wallet defined 1`] = `
 <div
-  className="sc-jKJlTe dtdOPB"
+  className="sc-eNQAEJ jIYxnD"
 >
   <h2>
     Welcome to Cashtab!
   </h2>
   <p
-    className="sc-eNQAEJ jDkKnj"
+    className="sc-hMqMXs clAcON"
   >
     Cashtab is an
      
     <a
-      className="sc-hMqMXs JqwcT"
+      className="sc-kEYyzF gzxncb"
       href="https://github.com/bitcoin-abc/bitcoin-abc"
       rel="noreferrer"
       target="_blank"
@@ -384,7 +440,7 @@
     Want to learn more?
      
     <a
-      className="sc-hMqMXs JqwcT"
+      className="sc-kEYyzF gzxncb"
       href="https://docs.cashtab.com/docs/"
       rel="noreferrer"
       target="_blank"
@@ -393,7 +449,7 @@
     </a>
   </p>
   <button
-    className="sc-kGXeez fPsebQ"
+    className="sc-kpOJdX bVnaln"
     onClick={[Function]}
   >
     <span
@@ -421,7 +477,7 @@
      New Wallet
   </button>
   <button
-    className="sc-kpOJdX jLOxVU"
+    className="sc-dxgOiQ dpPRzh"
     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-hzDkRC jpmyIp"
+  className="sc-jhAzac eeGaiy"
 >
   <h2>
     Receive 
@@ -31,7 +31,7 @@
         }
       >
         <div
-          className="sc-kkGfuU glXUgJ"
+          className="sc-iAyFgw hMysbf"
           style={
             Object {
               "display": "none",
@@ -51,7 +51,7 @@
           </span>
         </div>
         <svg
-          className="sc-kEYyzF gsdwMY"
+          className="sc-kkGfuU kvqSrq"
           height={210}
           id="borderedQRCode"
           shapeRendering="crispEdges"
@@ -77,7 +77,7 @@
           />
         </svg>
         <div
-          className="sc-eHgmQL btMJHq notranslate"
+          className="sc-cvbbAY gDLqxE notranslate"
         >
           <input
             readOnly={true}
@@ -86,18 +86,18 @@
             value="ecash:qzagy47mvh6qxkvcn3acjnz73rkhkc6y7ccxkrr6zd"
           />
           <span
-            className="sc-iAyFgw eTfFuJ"
+            className="sc-hSdWYo gDVSrH"
           >
             ecash:
           </span>
           <span
-            className="sc-hSdWYo gBAUha"
+            className="sc-eHgmQL ilsHxd"
           >
             qzagy47m
           </span>
           vh6qxkvcn3acjnz73rkhkc6y7c
           <span
-            className="sc-hSdWYo gBAUha"
+            className="sc-eHgmQL ilsHxd"
           >
             cxkrr6zd
           </span>
@@ -106,16 +106,16 @@
     </div>
   </div>
   <div
-    className="sc-jhAzac iUZUeb"
+    className="sc-fBuWsC iqecVI"
   >
     <div
-      className="sc-fBuWsC cFysrL"
+      className="sc-fMiknA jZncgw"
       onClick={[Function]}
     >
       XEC
     </div>
     <div
-      className="sc-fBuWsC cFysrL nonactiveBtn"
+      className="sc-fMiknA jZncgw nonactiveBtn"
       onClick={[Function]}
     >
       eToken
@@ -126,7 +126,7 @@
 
 exports[`Wallet with BCH balances and tokens 1`] = `
 <div
-  className="sc-hzDkRC jpmyIp"
+  className="sc-jhAzac eeGaiy"
 >
   <h2>
     Receive 
@@ -155,7 +155,7 @@
         }
       >
         <div
-          className="sc-kkGfuU glXUgJ"
+          className="sc-iAyFgw hMysbf"
           style={
             Object {
               "display": "none",
@@ -175,7 +175,7 @@
           </span>
         </div>
         <svg
-          className="sc-kEYyzF gsdwMY"
+          className="sc-kkGfuU kvqSrq"
           height={210}
           id="borderedQRCode"
           shapeRendering="crispEdges"
@@ -201,7 +201,7 @@
           />
         </svg>
         <div
-          className="sc-eHgmQL btMJHq notranslate"
+          className="sc-cvbbAY gDLqxE notranslate"
         >
           <input
             readOnly={true}
@@ -210,18 +210,18 @@
             value="ecash:qzagy47mvh6qxkvcn3acjnz73rkhkc6y7ccxkrr6zd"
           />
           <span
-            className="sc-iAyFgw eTfFuJ"
+            className="sc-hSdWYo gDVSrH"
           >
             ecash:
           </span>
           <span
-            className="sc-hSdWYo gBAUha"
+            className="sc-eHgmQL ilsHxd"
           >
             qzagy47m
           </span>
           vh6qxkvcn3acjnz73rkhkc6y7c
           <span
-            className="sc-hSdWYo gBAUha"
+            className="sc-eHgmQL ilsHxd"
           >
             cxkrr6zd
           </span>
@@ -230,16 +230,16 @@
     </div>
   </div>
   <div
-    className="sc-jhAzac iUZUeb"
+    className="sc-fBuWsC iqecVI"
   >
     <div
-      className="sc-fBuWsC cFysrL"
+      className="sc-fMiknA jZncgw"
       onClick={[Function]}
     >
       XEC
     </div>
     <div
-      className="sc-fBuWsC cFysrL nonactiveBtn"
+      className="sc-fMiknA jZncgw nonactiveBtn"
       onClick={[Function]}
     >
       eToken
@@ -250,7 +250,7 @@
 
 exports[`Wallet with BCH balances and tokens and state field 1`] = `
 <div
-  className="sc-hzDkRC jpmyIp"
+  className="sc-jhAzac eeGaiy"
 >
   <h2>
     Receive 
@@ -279,7 +279,7 @@
         }
       >
         <div
-          className="sc-kkGfuU glXUgJ"
+          className="sc-iAyFgw hMysbf"
           style={
             Object {
               "display": "none",
@@ -299,7 +299,7 @@
           </span>
         </div>
         <svg
-          className="sc-kEYyzF gsdwMY"
+          className="sc-kkGfuU kvqSrq"
           height={210}
           id="borderedQRCode"
           shapeRendering="crispEdges"
@@ -325,7 +325,7 @@
           />
         </svg>
         <div
-          className="sc-eHgmQL btMJHq notranslate"
+          className="sc-cvbbAY gDLqxE notranslate"
         >
           <input
             readOnly={true}
@@ -334,18 +334,18 @@
             value="ecash:qzagy47mvh6qxkvcn3acjnz73rkhkc6y7ccxkrr6zd"
           />
           <span
-            className="sc-iAyFgw eTfFuJ"
+            className="sc-hSdWYo gDVSrH"
           >
             ecash:
           </span>
           <span
-            className="sc-hSdWYo gBAUha"
+            className="sc-eHgmQL ilsHxd"
           >
             qzagy47m
           </span>
           vh6qxkvcn3acjnz73rkhkc6y7c
           <span
-            className="sc-hSdWYo gBAUha"
+            className="sc-eHgmQL ilsHxd"
           >
             cxkrr6zd
           </span>
@@ -354,16 +354,16 @@
     </div>
   </div>
   <div
-    className="sc-jhAzac iUZUeb"
+    className="sc-fBuWsC iqecVI"
   >
     <div
-      className="sc-fBuWsC cFysrL"
+      className="sc-fMiknA jZncgw"
       onClick={[Function]}
     >
       XEC
     </div>
     <div
-      className="sc-fBuWsC cFysrL nonactiveBtn"
+      className="sc-fMiknA jZncgw nonactiveBtn"
       onClick={[Function]}
     >
       eToken
@@ -374,7 +374,7 @@
 
 exports[`Wallet without BCH balance 1`] = `
 <div
-  className="sc-hzDkRC jpmyIp"
+  className="sc-jhAzac eeGaiy"
 >
   <h2>
     Receive 
@@ -403,7 +403,7 @@
         }
       >
         <div
-          className="sc-kkGfuU glXUgJ"
+          className="sc-iAyFgw hMysbf"
           style={
             Object {
               "display": "none",
@@ -423,7 +423,7 @@
           </span>
         </div>
         <svg
-          className="sc-kEYyzF gsdwMY"
+          className="sc-kkGfuU kvqSrq"
           height={210}
           id="borderedQRCode"
           shapeRendering="crispEdges"
@@ -449,7 +449,7 @@
           />
         </svg>
         <div
-          className="sc-eHgmQL btMJHq notranslate"
+          className="sc-cvbbAY gDLqxE notranslate"
         >
           <input
             readOnly={true}
@@ -458,18 +458,18 @@
             value="ecash:qzagy47mvh6qxkvcn3acjnz73rkhkc6y7ccxkrr6zd"
           />
           <span
-            className="sc-iAyFgw eTfFuJ"
+            className="sc-hSdWYo gDVSrH"
           >
             ecash:
           </span>
           <span
-            className="sc-hSdWYo gBAUha"
+            className="sc-eHgmQL ilsHxd"
           >
             qzagy47m
           </span>
           vh6qxkvcn3acjnz73rkhkc6y7c
           <span
-            className="sc-hSdWYo gBAUha"
+            className="sc-eHgmQL ilsHxd"
           >
             cxkrr6zd
           </span>
@@ -478,16 +478,16 @@
     </div>
   </div>
   <div
-    className="sc-jhAzac iUZUeb"
+    className="sc-fBuWsC iqecVI"
   >
     <div
-      className="sc-fBuWsC cFysrL"
+      className="sc-fMiknA jZncgw"
       onClick={[Function]}
     >
       XEC
     </div>
     <div
-      className="sc-fBuWsC cFysrL nonactiveBtn"
+      className="sc-fMiknA jZncgw nonactiveBtn"
       onClick={[Function]}
     >
       eToken
@@ -498,18 +498,18 @@
 
 exports[`Without wallet defined 1`] = `
 <div
-  className="sc-jKJlTe dtdOPB"
+  className="sc-eNQAEJ jIYxnD"
 >
   <h2>
     Welcome to Cashtab!
   </h2>
   <p
-    className="sc-eNQAEJ jDkKnj"
+    className="sc-hMqMXs clAcON"
   >
     Cashtab is an
      
     <a
-      className="sc-hMqMXs JqwcT"
+      className="sc-kEYyzF gzxncb"
       href="https://github.com/bitcoin-abc/bitcoin-abc"
       rel="noreferrer"
       target="_blank"
@@ -525,7 +525,7 @@
     Want to learn more?
      
     <a
-      className="sc-hMqMXs JqwcT"
+      className="sc-kEYyzF gzxncb"
       href="https://docs.cashtab.com/docs/"
       rel="noreferrer"
       target="_blank"
@@ -534,7 +534,7 @@
     </a>
   </p>
   <button
-    className="sc-kGXeez fPsebQ"
+    className="sc-kpOJdX bVnaln"
     onClick={[Function]}
   >
     <span
@@ -562,7 +562,7 @@
      New Wallet
   </button>
   <button
-    className="sc-kpOJdX jLOxVU"
+    className="sc-dxgOiQ dpPRzh"
     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,29 @@
 exports[`Wallet with BCH balances 1`] = `
 Array [
   <div
-    className="sc-jWBwVP cbXqTI"
+    className="sc-brqgnP ghMCeb"
   >
-    <h4
-      className="sc-Rmtcm eLIA"
+    <div
+      className="sc-bRBYWo ibKBs"
     >
-      MigrationTestAlpha
-    </h4>
+      <h4
+        className="sc-hzDkRC jSDoTI"
+      >
+        MigrationTestAlpha
+      </h4>
+      <a
+        href="/configure"
+        onClick={[Function]}
+      >
+        <svg
+          className="sc-VigVT kUaiyV"
+        >
+          edit.svg
+        </svg>
+      </a>
+    </div>
     <div
-      className="sc-jAaTju Vyslf"
+      className="sc-jDwBTQ bfTPPk"
     >
       You currently have 0 
       XEC
@@ -20,7 +34,7 @@
     </div>
   </div>,
   <div
-    className="sc-eHgmQL kvZwAq"
+    className="sc-cvbbAY blOKNt"
   >
     <div
       className="ant-row"
@@ -43,15 +57,15 @@
           }
         >
           <div
-            className="sc-dVhcbM hjOMtW"
+            className="sc-fAjcbJ kYSNQr"
           >
             <label
-              className="sc-cvbbAY gzZtxq"
+              className="sc-jWBwVP ovobL"
             >
               Send to
             </label>
             <div
-              className="sc-kAzzGY gpqAje"
+              className="sc-chPdSV gGNknR"
             >
               <div
                 className="ant-form-item ant-form-item-with-help"
@@ -130,7 +144,7 @@
                               className="ant-input-group-addon"
                             >
                               <span
-                                className="sc-fjdhpX lnKJWB"
+                                className="sc-jzJRlG jGaGNy"
                                 onClick={[Function]}
                               >
                                 <span
@@ -163,12 +177,12 @@
               </div>
             </div>
             <label
-              className="sc-cvbbAY gzZtxq"
+              className="sc-jWBwVP ovobL"
             >
               Amount
             </label>
             <div
-              className="sc-kAzzGY gpqAje"
+              className="sc-chPdSV gGNknR"
             >
               <div
                 className="ant-form-item ant-form-item-with-help"
@@ -317,7 +331,7 @@
                             </span>
                           </div>
                           <span
-                            className="sc-kgoBCf geHQWv"
+                            className="sc-kGXeez eCsKmc"
                             disabled={false}
                             onClick={[Function]}
                             style={
@@ -339,17 +353,17 @@
             </div>
           </div>
           <div
-            className="sc-fMiknA dMCiTY"
+            className="sc-eqIVtm evDzBW"
           >
             <h3
-              className="sc-eqIVtm dDdwQv"
+              className="sc-caSCKo YviKk"
             >
               0
                
               XEC
             </h3>
             <div
-              className="sc-jlyJG evBTb"
+              className="sc-gipzik gqOKiD"
             >
               =
                
@@ -364,16 +378,16 @@
             }
           >
             <button
-              className="sc-kEYyzF fEPvzM"
+              className="sc-kkGfuU exvTTB"
             >
               Send
             </button>
           </div>
           <div
-            className="sc-dxgOiQ iPcCXY"
+            className="sc-ckVGcZ gFKjKB"
           >
             <div
-              className="ant-collapse ant-collapse-icon-position-start sc-jKJlTe bEMpDk"
+              className="ant-collapse ant-collapse-icon-position-start sc-eNQAEJ bYABjs"
               role={null}
               style={
                 Object {
@@ -422,7 +436,7 @@
                     onClick={null}
                   >
                     <div
-                      className="sc-kpOJdX kAzjOl"
+                      className="sc-dxgOiQ hTjMfW"
                     >
                       Advanced
                     </div>
@@ -435,10 +449,10 @@
       </div>
     </div>
     <div
-      className="sc-dxgOiQ iPcCXY"
+      className="sc-ckVGcZ gFKjKB"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-start sc-jKJlTe bEMpDk"
+        className="ant-collapse ant-collapse-icon-position-start sc-eNQAEJ bYABjs"
         role={null}
         style={
           Object {
@@ -487,7 +501,7 @@
               onClick={null}
             >
               <div
-                className="sc-kpOJdX kAzjOl"
+                className="sc-dxgOiQ hTjMfW"
               >
                 Sign Message
               </div>
@@ -497,10 +511,10 @@
       </div>
     </div>
     <div
-      className="sc-dxgOiQ iPcCXY"
+      className="sc-ckVGcZ gFKjKB"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-start sc-jKJlTe bEMpDk"
+        className="ant-collapse ant-collapse-icon-position-start sc-eNQAEJ bYABjs"
         role={null}
         style={
           Object {
@@ -549,7 +563,7 @@
               onClick={null}
             >
               <div
-                className="sc-kpOJdX kAzjOl"
+                className="sc-dxgOiQ hTjMfW"
               >
                 Verify Message
               </div>
@@ -565,15 +579,29 @@
 exports[`Wallet with BCH balances and tokens 1`] = `
 Array [
   <div
-    className="sc-jWBwVP cbXqTI"
+    className="sc-brqgnP ghMCeb"
   >
-    <h4
-      className="sc-Rmtcm eLIA"
+    <div
+      className="sc-bRBYWo ibKBs"
     >
-      MigrationTestAlpha
-    </h4>
+      <h4
+        className="sc-hzDkRC jSDoTI"
+      >
+        MigrationTestAlpha
+      </h4>
+      <a
+        href="/configure"
+        onClick={[Function]}
+      >
+        <svg
+          className="sc-VigVT kUaiyV"
+        >
+          edit.svg
+        </svg>
+      </a>
+    </div>
     <div
-      className="sc-jAaTju Vyslf"
+      className="sc-jDwBTQ bfTPPk"
     >
       You currently have 0 
       XEC
@@ -582,7 +610,7 @@
     </div>
   </div>,
   <div
-    className="sc-eHgmQL kvZwAq"
+    className="sc-cvbbAY blOKNt"
   >
     <div
       className="ant-row"
@@ -605,15 +633,15 @@
           }
         >
           <div
-            className="sc-dVhcbM hjOMtW"
+            className="sc-fAjcbJ kYSNQr"
           >
             <label
-              className="sc-cvbbAY gzZtxq"
+              className="sc-jWBwVP ovobL"
             >
               Send to
             </label>
             <div
-              className="sc-kAzzGY gpqAje"
+              className="sc-chPdSV gGNknR"
             >
               <div
                 className="ant-form-item ant-form-item-with-help"
@@ -692,7 +720,7 @@
                               className="ant-input-group-addon"
                             >
                               <span
-                                className="sc-fjdhpX lnKJWB"
+                                className="sc-jzJRlG jGaGNy"
                                 onClick={[Function]}
                               >
                                 <span
@@ -725,12 +753,12 @@
               </div>
             </div>
             <label
-              className="sc-cvbbAY gzZtxq"
+              className="sc-jWBwVP ovobL"
             >
               Amount
             </label>
             <div
-              className="sc-kAzzGY gpqAje"
+              className="sc-chPdSV gGNknR"
             >
               <div
                 className="ant-form-item ant-form-item-with-help"
@@ -879,7 +907,7 @@
                             </span>
                           </div>
                           <span
-                            className="sc-kgoBCf geHQWv"
+                            className="sc-kGXeez eCsKmc"
                             disabled={false}
                             onClick={[Function]}
                             style={
@@ -901,17 +929,17 @@
             </div>
           </div>
           <div
-            className="sc-fMiknA dMCiTY"
+            className="sc-eqIVtm evDzBW"
           >
             <h3
-              className="sc-eqIVtm dDdwQv"
+              className="sc-caSCKo YviKk"
             >
               0
                
               XEC
             </h3>
             <div
-              className="sc-jlyJG evBTb"
+              className="sc-gipzik gqOKiD"
             >
               =
                
@@ -926,16 +954,16 @@
             }
           >
             <button
-              className="sc-kEYyzF fEPvzM"
+              className="sc-kkGfuU exvTTB"
             >
               Send
             </button>
           </div>
           <div
-            className="sc-dxgOiQ iPcCXY"
+            className="sc-ckVGcZ gFKjKB"
           >
             <div
-              className="ant-collapse ant-collapse-icon-position-start sc-jKJlTe bEMpDk"
+              className="ant-collapse ant-collapse-icon-position-start sc-eNQAEJ bYABjs"
               role={null}
               style={
                 Object {
@@ -984,7 +1012,7 @@
                     onClick={null}
                   >
                     <div
-                      className="sc-kpOJdX kAzjOl"
+                      className="sc-dxgOiQ hTjMfW"
                     >
                       Advanced
                     </div>
@@ -997,10 +1025,10 @@
       </div>
     </div>
     <div
-      className="sc-dxgOiQ iPcCXY"
+      className="sc-ckVGcZ gFKjKB"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-start sc-jKJlTe bEMpDk"
+        className="ant-collapse ant-collapse-icon-position-start sc-eNQAEJ bYABjs"
         role={null}
         style={
           Object {
@@ -1049,7 +1077,7 @@
               onClick={null}
             >
               <div
-                className="sc-kpOJdX kAzjOl"
+                className="sc-dxgOiQ hTjMfW"
               >
                 Sign Message
               </div>
@@ -1059,10 +1087,10 @@
       </div>
     </div>
     <div
-      className="sc-dxgOiQ iPcCXY"
+      className="sc-ckVGcZ gFKjKB"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-start sc-jKJlTe bEMpDk"
+        className="ant-collapse ant-collapse-icon-position-start sc-eNQAEJ bYABjs"
         role={null}
         style={
           Object {
@@ -1111,7 +1139,7 @@
               onClick={null}
             >
               <div
-                className="sc-kpOJdX kAzjOl"
+                className="sc-dxgOiQ hTjMfW"
               >
                 Verify Message
               </div>
@@ -1127,15 +1155,29 @@
 exports[`Wallet with BCH balances and tokens and state field 1`] = `
 Array [
   <div
-    className="sc-jWBwVP cbXqTI"
+    className="sc-brqgnP ghMCeb"
   >
-    <h4
-      className="sc-Rmtcm eLIA"
+    <div
+      className="sc-bRBYWo ibKBs"
     >
-      MigrationTestAlpha
-    </h4>
+      <h4
+        className="sc-hzDkRC jSDoTI"
+      >
+        MigrationTestAlpha
+      </h4>
+      <a
+        href="/configure"
+        onClick={[Function]}
+      >
+        <svg
+          className="sc-VigVT kUaiyV"
+        >
+          edit.svg
+        </svg>
+      </a>
+    </div>
     <div
-      className="sc-cMljjf coNPHF"
+      className="sc-jAaTju eoNejo"
     >
       0.06
        
@@ -1143,7 +1185,7 @@
     </div>
   </div>,
   <div
-    className="sc-eHgmQL kvZwAq"
+    className="sc-cvbbAY blOKNt"
   >
     <div
       className="ant-row"
@@ -1166,15 +1208,15 @@
           }
         >
           <div
-            className="sc-dVhcbM hjOMtW"
+            className="sc-fAjcbJ kYSNQr"
           >
             <label
-              className="sc-cvbbAY gzZtxq"
+              className="sc-jWBwVP ovobL"
             >
               Send to
             </label>
             <div
-              className="sc-kAzzGY gpqAje"
+              className="sc-chPdSV gGNknR"
             >
               <div
                 className="ant-form-item ant-form-item-with-help"
@@ -1253,7 +1295,7 @@
                               className="ant-input-group-addon"
                             >
                               <span
-                                className="sc-fjdhpX lnKJWB"
+                                className="sc-jzJRlG jGaGNy"
                                 onClick={[Function]}
                               >
                                 <span
@@ -1286,12 +1328,12 @@
               </div>
             </div>
             <label
-              className="sc-cvbbAY gzZtxq"
+              className="sc-jWBwVP ovobL"
             >
               Amount
             </label>
             <div
-              className="sc-kAzzGY gpqAje"
+              className="sc-chPdSV gGNknR"
             >
               <div
                 className="ant-form-item ant-form-item-with-help"
@@ -1440,7 +1482,7 @@
                             </span>
                           </div>
                           <span
-                            className="sc-kgoBCf geHQWv"
+                            className="sc-kGXeez eCsKmc"
                             disabled={false}
                             onClick={[Function]}
                             style={
@@ -1462,17 +1504,17 @@
             </div>
           </div>
           <div
-            className="sc-fMiknA dMCiTY"
+            className="sc-eqIVtm evDzBW"
           >
             <h3
-              className="sc-eqIVtm dDdwQv"
+              className="sc-caSCKo YviKk"
             >
               0
                
               XEC
             </h3>
             <div
-              className="sc-jlyJG evBTb"
+              className="sc-gipzik gqOKiD"
             >
               =
                
@@ -1487,17 +1529,17 @@
             }
           >
             <button
-              className="sc-eNQAEJ cQeDXN"
+              className="sc-hMqMXs jjgrrY"
               onClick={[Function]}
             >
               Send
             </button>
           </div>
           <div
-            className="sc-dxgOiQ iPcCXY"
+            className="sc-ckVGcZ gFKjKB"
           >
             <div
-              className="ant-collapse ant-collapse-icon-position-start sc-jKJlTe bEMpDk"
+              className="ant-collapse ant-collapse-icon-position-start sc-eNQAEJ bYABjs"
               role={null}
               style={
                 Object {
@@ -1546,7 +1588,7 @@
                     onClick={null}
                   >
                     <div
-                      className="sc-kpOJdX kAzjOl"
+                      className="sc-dxgOiQ hTjMfW"
                     >
                       Advanced
                     </div>
@@ -1559,10 +1601,10 @@
       </div>
     </div>
     <div
-      className="sc-dxgOiQ iPcCXY"
+      className="sc-ckVGcZ gFKjKB"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-start sc-jKJlTe bEMpDk"
+        className="ant-collapse ant-collapse-icon-position-start sc-eNQAEJ bYABjs"
         role={null}
         style={
           Object {
@@ -1611,7 +1653,7 @@
               onClick={null}
             >
               <div
-                className="sc-kpOJdX kAzjOl"
+                className="sc-dxgOiQ hTjMfW"
               >
                 Sign Message
               </div>
@@ -1621,10 +1663,10 @@
       </div>
     </div>
     <div
-      className="sc-dxgOiQ iPcCXY"
+      className="sc-ckVGcZ gFKjKB"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-start sc-jKJlTe bEMpDk"
+        className="ant-collapse ant-collapse-icon-position-start sc-eNQAEJ bYABjs"
         role={null}
         style={
           Object {
@@ -1673,7 +1715,7 @@
               onClick={null}
             >
               <div
-                className="sc-kpOJdX kAzjOl"
+                className="sc-dxgOiQ hTjMfW"
               >
                 Verify Message
               </div>
@@ -1689,15 +1731,29 @@
 exports[`Wallet without BCH balance 1`] = `
 Array [
   <div
-    className="sc-jWBwVP cbXqTI"
+    className="sc-brqgnP ghMCeb"
   >
-    <h4
-      className="sc-Rmtcm eLIA"
+    <div
+      className="sc-bRBYWo ibKBs"
     >
-      MigrationTestAlpha
-    </h4>
+      <h4
+        className="sc-hzDkRC jSDoTI"
+      >
+        MigrationTestAlpha
+      </h4>
+      <a
+        href="/configure"
+        onClick={[Function]}
+      >
+        <svg
+          className="sc-VigVT kUaiyV"
+        >
+          edit.svg
+        </svg>
+      </a>
+    </div>
     <div
-      className="sc-jAaTju Vyslf"
+      className="sc-jDwBTQ bfTPPk"
     >
       You currently have 0 
       XEC
@@ -1706,7 +1762,7 @@
     </div>
   </div>,
   <div
-    className="sc-eHgmQL kvZwAq"
+    className="sc-cvbbAY blOKNt"
   >
     <div
       className="ant-row"
@@ -1729,15 +1785,15 @@
           }
         >
           <div
-            className="sc-dVhcbM hjOMtW"
+            className="sc-fAjcbJ kYSNQr"
           >
             <label
-              className="sc-cvbbAY gzZtxq"
+              className="sc-jWBwVP ovobL"
             >
               Send to
             </label>
             <div
-              className="sc-kAzzGY gpqAje"
+              className="sc-chPdSV gGNknR"
             >
               <div
                 className="ant-form-item ant-form-item-with-help"
@@ -1816,7 +1872,7 @@
                               className="ant-input-group-addon"
                             >
                               <span
-                                className="sc-fjdhpX lnKJWB"
+                                className="sc-jzJRlG jGaGNy"
                                 onClick={[Function]}
                               >
                                 <span
@@ -1849,12 +1905,12 @@
               </div>
             </div>
             <label
-              className="sc-cvbbAY gzZtxq"
+              className="sc-jWBwVP ovobL"
             >
               Amount
             </label>
             <div
-              className="sc-kAzzGY gpqAje"
+              className="sc-chPdSV gGNknR"
             >
               <div
                 className="ant-form-item ant-form-item-with-help"
@@ -2003,7 +2059,7 @@
                             </span>
                           </div>
                           <span
-                            className="sc-kgoBCf geHQWv"
+                            className="sc-kGXeez eCsKmc"
                             disabled={false}
                             onClick={[Function]}
                             style={
@@ -2025,17 +2081,17 @@
             </div>
           </div>
           <div
-            className="sc-fMiknA dMCiTY"
+            className="sc-eqIVtm evDzBW"
           >
             <h3
-              className="sc-eqIVtm dDdwQv"
+              className="sc-caSCKo YviKk"
             >
               0
                
               XEC
             </h3>
             <div
-              className="sc-jlyJG evBTb"
+              className="sc-gipzik gqOKiD"
             >
               =
                
@@ -2050,16 +2106,16 @@
             }
           >
             <button
-              className="sc-kEYyzF fEPvzM"
+              className="sc-kkGfuU exvTTB"
             >
               Send
             </button>
           </div>
           <div
-            className="sc-dxgOiQ iPcCXY"
+            className="sc-ckVGcZ gFKjKB"
           >
             <div
-              className="ant-collapse ant-collapse-icon-position-start sc-jKJlTe bEMpDk"
+              className="ant-collapse ant-collapse-icon-position-start sc-eNQAEJ bYABjs"
               role={null}
               style={
                 Object {
@@ -2108,7 +2164,7 @@
                     onClick={null}
                   >
                     <div
-                      className="sc-kpOJdX kAzjOl"
+                      className="sc-dxgOiQ hTjMfW"
                     >
                       Advanced
                     </div>
@@ -2121,10 +2177,10 @@
       </div>
     </div>
     <div
-      className="sc-dxgOiQ iPcCXY"
+      className="sc-ckVGcZ gFKjKB"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-start sc-jKJlTe bEMpDk"
+        className="ant-collapse ant-collapse-icon-position-start sc-eNQAEJ bYABjs"
         role={null}
         style={
           Object {
@@ -2173,7 +2229,7 @@
               onClick={null}
             >
               <div
-                className="sc-kpOJdX kAzjOl"
+                className="sc-dxgOiQ hTjMfW"
               >
                 Sign Message
               </div>
@@ -2183,10 +2239,10 @@
       </div>
     </div>
     <div
-      className="sc-dxgOiQ iPcCXY"
+      className="sc-ckVGcZ gFKjKB"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-start sc-jKJlTe bEMpDk"
+        className="ant-collapse ant-collapse-icon-position-start sc-eNQAEJ bYABjs"
         role={null}
         style={
           Object {
@@ -2235,7 +2291,7 @@
               onClick={null}
             >
               <div
-                className="sc-kpOJdX kAzjOl"
+                className="sc-dxgOiQ hTjMfW"
               >
                 Verify Message
               </div>
@@ -2251,10 +2307,24 @@
 exports[`Without wallet defined 1`] = `
 Array [
   <div
-    className="sc-jWBwVP cbXqTI"
+    className="sc-brqgnP ghMCeb"
   >
     <div
-      className="sc-jAaTju Vyslf"
+      className="sc-bRBYWo ibKBs"
+    >
+      <a
+        href="/configure"
+        onClick={[Function]}
+      >
+        <svg
+          className="sc-VigVT kUaiyV"
+        >
+          edit.svg
+        </svg>
+      </a>
+    </div>
+    <div
+      className="sc-jDwBTQ bfTPPk"
     >
       You currently have 0 
       XEC
@@ -2263,7 +2333,7 @@
     </div>
   </div>,
   <div
-    className="sc-eHgmQL kvZwAq"
+    className="sc-cvbbAY blOKNt"
   >
     <div
       className="ant-row"
@@ -2286,15 +2356,15 @@
           }
         >
           <div
-            className="sc-dVhcbM hjOMtW"
+            className="sc-fAjcbJ kYSNQr"
           >
             <label
-              className="sc-cvbbAY gzZtxq"
+              className="sc-jWBwVP ovobL"
             >
               Send to
             </label>
             <div
-              className="sc-kAzzGY gpqAje"
+              className="sc-chPdSV gGNknR"
             >
               <div
                 className="ant-form-item ant-form-item-with-help"
@@ -2373,7 +2443,7 @@
                               className="ant-input-group-addon"
                             >
                               <span
-                                className="sc-fjdhpX lnKJWB"
+                                className="sc-jzJRlG jGaGNy"
                                 onClick={[Function]}
                               >
                                 <span
@@ -2406,12 +2476,12 @@
               </div>
             </div>
             <label
-              className="sc-cvbbAY gzZtxq"
+              className="sc-jWBwVP ovobL"
             >
               Amount
             </label>
             <div
-              className="sc-kAzzGY gpqAje"
+              className="sc-chPdSV gGNknR"
             >
               <div
                 className="ant-form-item ant-form-item-with-help"
@@ -2560,7 +2630,7 @@
                             </span>
                           </div>
                           <span
-                            className="sc-kgoBCf geHQWv"
+                            className="sc-kGXeez eCsKmc"
                             disabled={false}
                             onClick={[Function]}
                             style={
@@ -2582,17 +2652,17 @@
             </div>
           </div>
           <div
-            className="sc-fMiknA dMCiTY"
+            className="sc-eqIVtm evDzBW"
           >
             <h3
-              className="sc-eqIVtm dDdwQv"
+              className="sc-caSCKo YviKk"
             >
               0
                
               XEC
             </h3>
             <div
-              className="sc-jlyJG evBTb"
+              className="sc-gipzik gqOKiD"
             >
               =
                
@@ -2607,16 +2677,16 @@
             }
           >
             <button
-              className="sc-kEYyzF fEPvzM"
+              className="sc-kkGfuU exvTTB"
             >
               Send
             </button>
           </div>
           <div
-            className="sc-dxgOiQ iPcCXY"
+            className="sc-ckVGcZ gFKjKB"
           >
             <div
-              className="ant-collapse ant-collapse-icon-position-start sc-jKJlTe bEMpDk"
+              className="ant-collapse ant-collapse-icon-position-start sc-eNQAEJ bYABjs"
               role={null}
               style={
                 Object {
@@ -2665,7 +2735,7 @@
                     onClick={null}
                   >
                     <div
-                      className="sc-kpOJdX kAzjOl"
+                      className="sc-dxgOiQ hTjMfW"
                     >
                       Advanced
                     </div>
@@ -2678,10 +2748,10 @@
       </div>
     </div>
     <div
-      className="sc-dxgOiQ iPcCXY"
+      className="sc-ckVGcZ gFKjKB"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-start sc-jKJlTe bEMpDk"
+        className="ant-collapse ant-collapse-icon-position-start sc-eNQAEJ bYABjs"
         role={null}
         style={
           Object {
@@ -2730,7 +2800,7 @@
               onClick={null}
             >
               <div
-                className="sc-kpOJdX kAzjOl"
+                className="sc-dxgOiQ hTjMfW"
               >
                 Sign Message
               </div>
@@ -2740,10 +2810,10 @@
       </div>
     </div>
     <div
-      className="sc-dxgOiQ iPcCXY"
+      className="sc-ckVGcZ gFKjKB"
     >
       <div
-        className="ant-collapse ant-collapse-icon-position-start sc-jKJlTe bEMpDk"
+        className="ant-collapse ant-collapse-icon-position-start sc-eNQAEJ bYABjs"
         role={null}
         style={
           Object {
@@ -2792,7 +2862,7 @@
               onClick={null}
             >
               <div
-                className="sc-kpOJdX kAzjOl"
+                className="sc-dxgOiQ hTjMfW"
               >
                 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-hMqMXs kjfrok"
+  className="sc-kEYyzF gZfJyA"
 >
   <div
-    className="sc-hSdWYo bXDUps"
+    className="sc-eHgmQL znFwg"
   >
     6.001
      
@@ -33,7 +33,7 @@
         }
       >
         <div
-          className="sc-kpOJdX hEMbUj"
+          className="sc-dxgOiQ hgEvvT"
         >
           <div
             className="ant-form-item ant-form-item-with-help"
@@ -107,7 +107,7 @@
                           className="ant-input-group-addon"
                         >
                           <span
-                            className="sc-chPdSV lgTLHT"
+                            className="sc-kgoBCf fXiQWC"
                             onClick={[Function]}
                           >
                             <span
@@ -140,7 +140,7 @@
           </div>
         </div>
         <div
-          className="sc-kpOJdX hEMbUj"
+          className="sc-dxgOiQ hgEvvT"
         >
           <div
             className="ant-form-item ant-form-item-with-help"
@@ -199,7 +199,7 @@
                           className="ant-input-group-addon"
                         >
                           <span
-                            className="sc-dxgOiQ bpDknu"
+                            className="sc-ckVGcZ jywPMT"
                             disabled={false}
                             onClick={[Function]}
                           >
@@ -222,7 +222,7 @@
           }
         >
           <button
-            className="sc-fjdhpX eQicuE"
+            className="sc-jzJRlG lltaza"
             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-jlyJG iASpVZ"
+  className="sc-gipzik jbxDOO"
 >
   <h3>
     Create a Token
   </h3>
   <div
-    className="sc-kAzzGY gpqAje"
+    className="sc-chPdSV gGNknR"
   >
     <form
       className="ant-form ant-form-horizontal ant-form-small"
@@ -21,7 +21,7 @@
       }
     >
       <label
-        className="sc-hSdWYo bWWjLk"
+        className="sc-eHgmQL bNAogF"
       >
         Token Name
       </label>
@@ -59,7 +59,7 @@
         </div>
       </div>
       <label
-        className="sc-hSdWYo bWWjLk"
+        className="sc-eHgmQL bNAogF"
       >
         Ticker
       </label>
@@ -97,7 +97,7 @@
         </div>
       </div>
       <label
-        className="sc-hSdWYo bWWjLk"
+        className="sc-eHgmQL bNAogF"
       >
         Decimals
       </label>
@@ -135,7 +135,7 @@
         </div>
       </div>
       <label
-        className="sc-hSdWYo bWWjLk"
+        className="sc-eHgmQL bNAogF"
       >
         Supply
       </label>
@@ -173,7 +173,7 @@
         </div>
       </div>
       <label
-        className="sc-hSdWYo bWWjLk"
+        className="sc-eHgmQL bNAogF"
       >
         Document URL
       </label>
@@ -211,7 +211,7 @@
         </div>
       </div>
       <label
-        className="sc-hSdWYo bWWjLk"
+        className="sc-eHgmQL bNAogF"
       >
         Add Image
       </label>
@@ -317,7 +317,7 @@
     </form>
   </div>
   <button
-    className="sc-hMqMXs dakUFc"
+    className="sc-kEYyzF gpbNiR"
     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,29 @@
 exports[`Wallet with BCH balances 1`] = `
 Array [
   <div
-    className="sc-eHgmQL esgeHR"
+    className="sc-cvbbAY doMtLK"
   >
-    <h4
-      className="sc-csuQGl bKOZxQ"
+    <div
+      className="sc-Rmtcm cZLcRh"
     >
-      MigrationTestAlpha
-    </h4>
+      <h4
+        className="sc-bRBYWo cmdkvD"
+      >
+        MigrationTestAlpha
+      </h4>
+      <a
+        href="/configure"
+        onClick={[Function]}
+      >
+        <svg
+          className="sc-VigVT kUaiyV"
+        >
+          edit.svg
+        </svg>
+      </a>
+    </div>
     <div
-      className="sc-jWBwVP gdMlXD"
+      className="sc-brqgnP gQXNsF"
     >
       0
        
@@ -19,17 +33,17 @@
     </div>
   </div>,
   <div
-    className="sc-iAyFgw eRQdeW"
+    className="sc-hSdWYo hTUZUh"
   >
     <div
-      className="sc-jlyJG iASpVZ"
+      className="sc-gipzik jbxDOO"
     >
       <h3>
         Create a Token
       </h3>
     </div>
     <p
-      className="sc-jDwBTQ bcLZea"
+      className="sc-gPEVay lnmMAx"
     >
       You need at least
        
@@ -50,15 +64,29 @@
 exports[`Wallet with BCH balances and tokens 1`] = `
 Array [
   <div
-    className="sc-eHgmQL esgeHR"
+    className="sc-cvbbAY doMtLK"
   >
-    <h4
-      className="sc-csuQGl bKOZxQ"
+    <div
+      className="sc-Rmtcm cZLcRh"
     >
-      MigrationTestAlpha
-    </h4>
+      <h4
+        className="sc-bRBYWo cmdkvD"
+      >
+        MigrationTestAlpha
+      </h4>
+      <a
+        href="/configure"
+        onClick={[Function]}
+      >
+        <svg
+          className="sc-VigVT kUaiyV"
+        >
+          edit.svg
+        </svg>
+      </a>
+    </div>
     <div
-      className="sc-jWBwVP gdMlXD"
+      className="sc-brqgnP gQXNsF"
     >
       0
        
@@ -66,17 +94,17 @@
     </div>
   </div>,
   <div
-    className="sc-iAyFgw eRQdeW"
+    className="sc-hSdWYo hTUZUh"
   >
     <div
-      className="sc-jlyJG iASpVZ"
+      className="sc-gipzik jbxDOO"
     >
       <h3>
         Create a Token
       </h3>
     </div>
     <p
-      className="sc-jDwBTQ bcLZea"
+      className="sc-gPEVay lnmMAx"
     >
       You need at least
        
@@ -97,15 +125,29 @@
 exports[`Wallet with BCH balances and tokens and state field 1`] = `
 Array [
   <div
-    className="sc-eHgmQL esgeHR"
+    className="sc-cvbbAY doMtLK"
   >
-    <h4
-      className="sc-csuQGl bKOZxQ"
+    <div
+      className="sc-Rmtcm cZLcRh"
     >
-      MigrationTestAlpha
-    </h4>
+      <h4
+        className="sc-bRBYWo cmdkvD"
+      >
+        MigrationTestAlpha
+      </h4>
+      <a
+        href="/configure"
+        onClick={[Function]}
+      >
+        <svg
+          className="sc-VigVT kUaiyV"
+        >
+          edit.svg
+        </svg>
+      </a>
+    </div>
     <div
-      className="sc-jWBwVP gdMlXD"
+      className="sc-brqgnP gQXNsF"
     >
       0.06
        
@@ -113,16 +155,16 @@
     </div>
   </div>,
   <div
-    className="sc-iAyFgw eRQdeW"
+    className="sc-hSdWYo hTUZUh"
   >
     <div
-      className="sc-jlyJG iASpVZ"
+      className="sc-gipzik jbxDOO"
     >
       <h3>
         Create a Token
       </h3>
       <div
-        className="sc-kAzzGY gpqAje"
+        className="sc-chPdSV gGNknR"
       >
         <form
           className="ant-form ant-form-horizontal ant-form-small"
@@ -135,7 +177,7 @@
           }
         >
           <label
-            className="sc-hSdWYo bWWjLk"
+            className="sc-eHgmQL bNAogF"
           >
             Token Name
           </label>
@@ -173,7 +215,7 @@
             </div>
           </div>
           <label
-            className="sc-hSdWYo bWWjLk"
+            className="sc-eHgmQL bNAogF"
           >
             Ticker
           </label>
@@ -211,7 +253,7 @@
             </div>
           </div>
           <label
-            className="sc-hSdWYo bWWjLk"
+            className="sc-eHgmQL bNAogF"
           >
             Decimals
           </label>
@@ -249,7 +291,7 @@
             </div>
           </div>
           <label
-            className="sc-hSdWYo bWWjLk"
+            className="sc-eHgmQL bNAogF"
           >
             Supply
           </label>
@@ -287,7 +329,7 @@
             </div>
           </div>
           <label
-            className="sc-hSdWYo bWWjLk"
+            className="sc-eHgmQL bNAogF"
           >
             Document URL
           </label>
@@ -325,7 +367,7 @@
             </div>
           </div>
           <label
-            className="sc-hSdWYo bWWjLk"
+            className="sc-eHgmQL bNAogF"
           >
             Add Image
           </label>
@@ -431,7 +473,7 @@
         </form>
       </div>
       <button
-        className="sc-hMqMXs dakUFc"
+        className="sc-kEYyzF gpbNiR"
         disabled={true}
         onClick={[Function]}
         style={
@@ -472,15 +514,29 @@
 exports[`Wallet without BCH balance 1`] = `
 Array [
   <div
-    className="sc-eHgmQL esgeHR"
+    className="sc-cvbbAY doMtLK"
   >
-    <h4
-      className="sc-csuQGl bKOZxQ"
+    <div
+      className="sc-Rmtcm cZLcRh"
     >
-      MigrationTestAlpha
-    </h4>
+      <h4
+        className="sc-bRBYWo cmdkvD"
+      >
+        MigrationTestAlpha
+      </h4>
+      <a
+        href="/configure"
+        onClick={[Function]}
+      >
+        <svg
+          className="sc-VigVT kUaiyV"
+        >
+          edit.svg
+        </svg>
+      </a>
+    </div>
     <div
-      className="sc-jWBwVP gdMlXD"
+      className="sc-brqgnP gQXNsF"
     >
       0
        
@@ -488,17 +544,17 @@
     </div>
   </div>,
   <div
-    className="sc-iAyFgw eRQdeW"
+    className="sc-hSdWYo hTUZUh"
   >
     <div
-      className="sc-jlyJG iASpVZ"
+      className="sc-gipzik jbxDOO"
     >
       <h3>
         Create a Token
       </h3>
     </div>
     <p
-      className="sc-jDwBTQ bcLZea"
+      className="sc-gPEVay lnmMAx"
     >
       You need at least
        
@@ -519,10 +575,24 @@
 exports[`Without wallet defined 1`] = `
 Array [
   <div
-    className="sc-eHgmQL esgeHR"
+    className="sc-cvbbAY doMtLK"
   >
     <div
-      className="sc-jWBwVP gdMlXD"
+      className="sc-Rmtcm cZLcRh"
+    >
+      <a
+        href="/configure"
+        onClick={[Function]}
+      >
+        <svg
+          className="sc-VigVT kUaiyV"
+        >
+          edit.svg
+        </svg>
+      </a>
+    </div>
+    <div
+      className="sc-brqgnP gQXNsF"
     >
       0
        
@@ -530,17 +600,17 @@
     </div>
   </div>,
   <div
-    className="sc-iAyFgw eRQdeW"
+    className="sc-hSdWYo hTUZUh"
   >
     <div
-      className="sc-jlyJG iASpVZ"
+      className="sc-gipzik jbxDOO"
     >
       <h3>
         Create a Token
       </h3>
     </div>
     <p
-      className="sc-jDwBTQ bcLZea"
+      className="sc-gPEVay lnmMAx"
     >
       You need at least
        
diff --git a/web/cashtab/src/hooks/useWallet.js b/web/cashtab/src/hooks/useWallet.js
--- a/web/cashtab/src/hooks/useWallet.js
+++ b/web/cashtab/src/hooks/useWallet.js
@@ -743,14 +743,14 @@
         return walletToActivate;
     };
 
-    const renameWallet = async (oldName, newName) => {
+    const renameSavedWallet = async (oldName, newName) => {
         // Load savedWallets
         let savedWallets;
         try {
             savedWallets = await localforage.getItem('savedWallets');
         } catch (err) {
             console.log(
-                `Error in await localforage.getItem("savedWallets") in renameWallet`,
+                `Error in await localforage.getItem("savedWallets") in renameSavedWallet`,
             );
             console.log(err);
             return false;
@@ -776,7 +776,52 @@
             await localforage.setItem('savedWallets', savedWallets);
         } catch (err) {
             console.log(
-                `Error in localforage.setItem("savedWallets", savedWallets) in renameWallet()`,
+                `Error in localforage.setItem("savedWallets", savedWallets) in renameSavedWallet()`,
+            );
+            return false;
+        }
+        return true;
+    };
+
+    const renameActiveWallet = async (wallet, oldName, newName) => {
+        // Load savedWallets
+        let savedWallets;
+        try {
+            savedWallets = await localforage.getItem('savedWallets');
+        } catch (err) {
+            console.log(
+                `Error in await localforage.getItem("savedWallets") in renameSavedWallet`,
+            );
+            console.log(err);
+            return false;
+        }
+        // Verify that no existing wallet has this name
+        for (let i = 0; i < savedWallets.length; i += 1) {
+            if (savedWallets[i].name === newName) {
+                // return an error
+                return false;
+            }
+        }
+        if (wallet.name === oldName) {
+            wallet.name = newName;
+            setWallet(wallet);
+        }
+
+        // change name of desired wallet
+        for (let i = 0; i < savedWallets.length; i += 1) {
+            if (savedWallets[i].name === oldName) {
+                // Replace the name of this entry with the new name
+                savedWallets[i].name = newName;
+            }
+        }
+        // resave savedWallets
+        try {
+            // Set walletName as the active wallet
+            await localforage.setItem('savedWallets', savedWallets);
+            await localforage.setItem('wallet', wallet);
+        } catch (err) {
+            console.log(
+                `Error in localforage.setItem("wallet", wallet) in renameActiveWallet()`,
             );
             return false;
         }
@@ -1487,7 +1532,8 @@
             }
         },
         addNewSavedWallet,
-        renameWallet,
+        renameSavedWallet,
+        renameActiveWallet,
         deleteWallet,
     };
 };