diff --git a/web/cashtab/src/components/Send/SendToken.js b/web/cashtab/src/components/Send/SendToken.js
--- a/web/cashtab/src/components/Send/SendToken.js
+++ b/web/cashtab/src/components/Send/SendToken.js
@@ -28,6 +28,7 @@
 } from '@components/Common/Notifications';
 import { isValidXecAddress, isValidEtokenAddress } from '@utils/validation';
 import { formatDate } from '@utils/formatting';
+import TokenIcon from '@components/Tokens/TokenIcon';
 import styled, { css } from 'styled-components';
 
 const AntdDescriptionsCss = css`
@@ -378,50 +379,22 @@
                                         title={`Token info for "${token.info.tokenName}"`}
                                     >
                                         <Descriptions.Item label="Icon">
-                                            {currency.tokenIconsUrl !== '' ? (
-                                                <Popover
-                                                    style={{ width: 256 }}
-                                                    content={
-                                                        <Img
-                                                            src={`${currency.tokenIconsUrl}/256/${tokenId}.png`}
-                                                        />
-                                                    }
-                                                    trigger="click"
-                                                    color="transparent"
-                                                >
-                                                    <Img
-                                                        src={`${currency.tokenIconsUrl}/32/${tokenId}.png`}
-                                                        width={32}
-                                                        height={32}
-                                                        unloader={
-                                                            <img
-                                                                alt={`identicon of tokenId ${tokenId} `}
-                                                                height="32"
-                                                                width="32"
-                                                                style={{
-                                                                    borderRadius:
-                                                                        '50%',
-                                                                }}
-                                                                key={`identicon-${tokenId}`}
-                                                                src={makeBlockie(
-                                                                    tokenId,
-                                                                )}
-                                                            />
-                                                        }
+                                            <Popover
+                                                style={{ width: 256 }}
+                                                content={
+                                                    <TokenIcon
+                                                        size={256}
+                                                        tokenId={tokenId}
                                                     />
-                                                </Popover>
-                                            ) : (
-                                                <img
-                                                    alt={`identicon of tokenId ${tokenId} `}
-                                                    height="32"
-                                                    width="32"
-                                                    style={{
-                                                        borderRadius: '50%',
-                                                    }}
-                                                    key={`identicon-${tokenId}`}
-                                                    src={makeBlockie(tokenId)}
+                                                }
+                                                trigger="click"
+                                                color="transparent"
+                                            >
+                                                <TokenIcon
+                                                    size={32}
+                                                    tokenId={tokenId}
                                                 />
-                                            )}
+                                            </Popover>
                                         </Descriptions.Item>
                                         <Descriptions.Item label="Decimals">
                                             {token.info.decimals}
diff --git a/web/cashtab/src/components/Tokens/TokenIcon.js b/web/cashtab/src/components/Tokens/TokenIcon.js
new file mode 100644
--- /dev/null
+++ b/web/cashtab/src/components/Tokens/TokenIcon.js
@@ -0,0 +1,36 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import styled from 'styled-components';
+import makeBlockie from 'ethereum-blockies-base64';
+import { Img } from 'react-image';
+import { currency } from '@components/Common/Ticker';
+
+const TokenIcon = ({ size, tokenId }) => {
+    return (
+        <>
+            <Img
+                src={`${currency.tokenIconsUrl}/${size}/${tokenId}.png`}
+                width={size}
+                height={size}
+                unloader={
+                    <img
+                        alt={`identicon of tokenId ${tokenId} `}
+                        height="32"
+                        width="32"
+                        style={{
+                            borderRadius: '50%',
+                        }}
+                        key={`identicon-${tokenId}`}
+                        src={makeBlockie(tokenId)}
+                    />
+                }
+            />
+        </>
+    );
+};
+TokenIcon.propTypes = {
+    size: PropTypes.oneOf([32, 64, 128, 256, 512]),
+    tokenId: PropTypes.string,
+};
+
+export default TokenIcon;
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
@@ -367,13 +367,10 @@
       onClick={[Function]}
     >
       <div
-        className="sc-hSdWYo tUbiI"
+        className="sc-iAyFgw bbWRGZ"
       >
         <div
-          className="sc-kkGfuU dSxERO"
-        />
-        <div
-          className="sc-iAyFgw clPeTt"
+          className="sc-kkGfuU lgOArh"
         >
           6.001
            
diff --git a/web/cashtab/src/components/Wallet/TokenListItem.js b/web/cashtab/src/components/Wallet/TokenListItem.js
--- a/web/cashtab/src/components/Wallet/TokenListItem.js
+++ b/web/cashtab/src/components/Wallet/TokenListItem.js
@@ -1,14 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
-import makeBlockie from 'ethereum-blockies-base64';
-import { Img } from 'react-image';
-import { currency } from '@components/Common/Ticker';
-
-const TokenIcon = styled.div`
-    height: 32px;
-    width: 32px;
-`;
+import TokenIcon from '@components/Tokens/TokenIcon';
 
 const BalanceAndTicker = styled.div`
     font-size: 1rem;
@@ -36,38 +29,7 @@
 const TokenListItem = ({ ticker, balance, tokenId }) => {
     return (
         <Wrapper>
-            <TokenIcon>
-                {currency.tokenIconsUrl !== '' ? (
-                    <Img
-                        src={`${currency.tokenIconsUrl}/32/${tokenId}.png`}
-                        width={32}
-                        height={32}
-                        unloader={
-                            <img
-                                alt={`identicon of tokenId ${tokenId} `}
-                                height="32"
-                                width="32"
-                                style={{
-                                    borderRadius: '50%',
-                                }}
-                                key={`identicon-${tokenId}`}
-                                src={makeBlockie(tokenId)}
-                            />
-                        }
-                    />
-                ) : (
-                    <img
-                        alt={`identicon of tokenId ${tokenId} `}
-                        height="32"
-                        width="32"
-                        style={{
-                            borderRadius: '50%',
-                        }}
-                        key={`identicon-${tokenId}`}
-                        src={makeBlockie(tokenId)}
-                    />
-                )}
-            </TokenIcon>
+            <TokenIcon size={32} tokenId={tokenId} />
             <BalanceAndTicker>
                 {balance} <strong>{ticker}</strong>
             </BalanceAndTicker>
diff --git a/web/cashtab/src/components/Wallet/Tx.js b/web/cashtab/src/components/Wallet/Tx.js
--- a/web/cashtab/src/components/Wallet/Tx.js
+++ b/web/cashtab/src/components/Wallet/Tx.js
@@ -9,10 +9,11 @@
     ExclamationOutlined,
 } from '@ant-design/icons';
 import { currency } from '@components/Common/Ticker';
-import makeBlockie from 'ethereum-blockies-base64';
-import { Img } from 'react-image';
+
 import { fromLegacyDecimals } from '@utils/cashMethods';
 import { formatBalance, formatDate } from '@utils/formatting';
+
+import TokenIcon from '@components/Tokens/TokenIcon';
 const SentTx = styled(ArrowUpOutlined)`
     color: ${props => props.theme.secondary} !important;
 `;
@@ -255,35 +256,10 @@
                             {data.tokenTx && data.tokenInfo ? (
                                 <>
                                     <TxTokenIcon>
-                                        {currency.tokenIconsUrl !== '' ? (
-                                            <Img
-                                                src={`${currency.tokenIconsUrl}/32/${data.tokenInfo.tokenId}.png`}
-                                                unloader={
-                                                    <img
-                                                        alt={`identicon of tokenId ${data.tokenInfo.tokenId} `}
-                                                        style={{
-                                                            borderRadius: '50%',
-                                                        }}
-                                                        key={`identicon-${data.tokenInfo.tokenId}`}
-                                                        src={makeBlockie(
-                                                            data.tokenInfo
-                                                                .tokenId,
-                                                        )}
-                                                    />
-                                                }
-                                            />
-                                        ) : (
-                                            <img
-                                                alt={`identicon of tokenId ${data.tokenInfo.tokenId} `}
-                                                style={{
-                                                    borderRadius: '50%',
-                                                }}
-                                                key={`identicon-${data.tokenInfo.tokenId}`}
-                                                src={makeBlockie(
-                                                    data.tokenInfo.tokenId,
-                                                )}
-                                            />
-                                        )}
+                                        <TokenIcon
+                                            size={32}
+                                            tokenId={data.tokenInfo.tokenId}
+                                        />
                                     </TxTokenIcon>
                                     {data.outgoingTx ? (
                                         <>
diff --git a/web/cashtab/src/components/Wallet/__tests__/__snapshots__/Wallet.test.js.snap b/web/cashtab/src/components/Wallet/__tests__/__snapshots__/Wallet.test.js.snap
--- a/web/cashtab/src/components/Wallet/__tests__/__snapshots__/Wallet.test.js.snap
+++ b/web/cashtab/src/components/Wallet/__tests__/__snapshots__/Wallet.test.js.snap
@@ -3,7 +3,7 @@
 exports[`Wallet with BCH balances 1`] = `
 Array [
   <div
-    className="sc-eqIVtm gpHdyi"
+    className="sc-dVhcbM fSFzLu"
   >
     <span
       aria-label="party emoji"
@@ -29,7 +29,7 @@
      to send to others
   </div>,
   <div
-    className="sc-fMiknA fUPKHz"
+    className="sc-fBuWsC ouBcJ"
   >
     0
      
@@ -119,16 +119,16 @@
     </div>
   </div>,
   <div
-    className="sc-cJSrbW grtjkC"
+    className="sc-kgAjT jByKrU"
   >
     <div
-      className="sc-ksYbfQ hhXWxr"
+      className="sc-cJSrbW fxyvyQ"
       onClick={[Function]}
     >
       XEC
     </div>
     <div
-      className="sc-ksYbfQ hhXWxr nonactiveBtn"
+      className="sc-cJSrbW fxyvyQ nonactiveBtn"
       onClick={[Function]}
     >
       eToken
@@ -140,7 +140,7 @@
 exports[`Wallet with BCH balances and tokens 1`] = `
 Array [
   <div
-    className="sc-eqIVtm gpHdyi"
+    className="sc-dVhcbM fSFzLu"
   >
     <span
       aria-label="party emoji"
@@ -166,7 +166,7 @@
      to send to others
   </div>,
   <div
-    className="sc-fMiknA fUPKHz"
+    className="sc-fBuWsC ouBcJ"
   >
     0
      
@@ -256,16 +256,16 @@
     </div>
   </div>,
   <div
-    className="sc-cJSrbW grtjkC"
+    className="sc-kgAjT jByKrU"
   >
     <div
-      className="sc-ksYbfQ hhXWxr"
+      className="sc-cJSrbW fxyvyQ"
       onClick={[Function]}
     >
       XEC
     </div>
     <div
-      className="sc-ksYbfQ hhXWxr nonactiveBtn"
+      className="sc-cJSrbW fxyvyQ nonactiveBtn"
       onClick={[Function]}
     >
       eToken
@@ -277,14 +277,14 @@
 exports[`Wallet with BCH balances and tokens and state field 1`] = `
 Array [
   <div
-    className="sc-fMiknA fUPKHz"
+    className="sc-fBuWsC ouBcJ"
   >
     0.06
      
     XEC
   </div>,
   <div
-    className="sc-dVhcbM eDJCmc"
+    className="sc-fMiknA fexmhZ"
   >
     $ 
     NaN
@@ -375,16 +375,16 @@
     </div>
   </div>,
   <div
-    className="sc-cJSrbW grtjkC"
+    className="sc-kgAjT jByKrU"
   >
     <div
-      className="sc-ksYbfQ hhXWxr"
+      className="sc-cJSrbW fxyvyQ"
       onClick={[Function]}
     >
       XEC
     </div>
     <div
-      className="sc-ksYbfQ hhXWxr nonactiveBtn"
+      className="sc-cJSrbW fxyvyQ nonactiveBtn"
       onClick={[Function]}
     >
       eToken
@@ -396,7 +396,7 @@
 exports[`Wallet without BCH balance 1`] = `
 Array [
   <div
-    className="sc-eqIVtm gpHdyi"
+    className="sc-dVhcbM fSFzLu"
   >
     <span
       aria-label="party emoji"
@@ -422,7 +422,7 @@
      to send to others
   </div>,
   <div
-    className="sc-fMiknA fUPKHz"
+    className="sc-fBuWsC ouBcJ"
   >
     0
      
@@ -512,16 +512,16 @@
     </div>
   </div>,
   <div
-    className="sc-cJSrbW grtjkC"
+    className="sc-kgAjT jByKrU"
   >
     <div
-      className="sc-ksYbfQ hhXWxr"
+      className="sc-cJSrbW fxyvyQ"
       onClick={[Function]}
     >
       XEC
     </div>
     <div
-      className="sc-ksYbfQ hhXWxr nonactiveBtn"
+      className="sc-cJSrbW fxyvyQ nonactiveBtn"
       onClick={[Function]}
     >
       eToken