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,8 @@
 } from '@components/Common/Notifications';
 import { isValidXecAddress, isValidEtokenAddress } from '@utils/validation';
 import { formatDate } from '@utils/formatting';
+import TokenIcon from '@components/Tokens/TokenIcon';
+
 const SendToken = ({ tokenId, jestBCH, passLoadingStatus }) => {
     const { wallet, apiError } = React.useContext(WalletContext);
     const walletState = getWalletState(wallet);
@@ -363,50 +365,26 @@
                                     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`}
+                                        <Popover
+                                            style={{ width: 256 }}
+                                            content={
+                                                <span>
+                                                    <TokenIcon
+                                                        size={256}
+                                                        tokenId={token.tokenId}
                                                     />
-                                                }
-                                                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,
-                                                            )}
-                                                        />
-                                                    }
+                                                </span>
+                                            }
+                                            trigger="click"
+                                            color="transparent"
+                                        >
+                                            <span>
+                                                <TokenIcon
+                                                    size={32}
+                                                    tokenId={tokenId}
                                                 />
-                                            </Popover>
-                                        ) : (
-                                            <img
-                                                alt={`identicon of tokenId ${tokenId} `}
-                                                height="32"
-                                                width="32"
-                                                style={{
-                                                    borderRadius: '50%',
-                                                }}
-                                                key={`identicon-${tokenId}`}
-                                                src={makeBlockie(tokenId)}
-                                            />
-                                        )}
+                                            </span>
+                                        </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,51 @@
+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 TokenIconWrapper = styled.div``;
+
+const TokenIcon = ({ size, tokenId }) => {
+    return (
+        <TokenIconWrapper>
+            {currency.tokenIconsUrl !== '' ? (
+                <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)}
+                        />
+                    }
+                />
+            ) : (
+                <img
+                    alt={`identicon of tokenId ${tokenId} `}
+                    height="32"
+                    width="32"
+                    style={{
+                        borderRadius: '50%',
+                    }}
+                    key={`identicon-${tokenId}`}
+                    src={makeBlockie(tokenId)}
+                />
+            )}
+        </TokenIconWrapper>
+    );
+};
+TokenIcon.propTypes = {
+    size: PropTypes.number,
+    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
@@ -370,7 +370,7 @@
         className="sc-hSdWYo tUbiI"
       >
         <div
-          className="sc-kkGfuU dSxERO"
+          className="sc-kkGfuU gqJIVH"
         />
         <div
           className="sc-iAyFgw clPeTt"
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 ? (
                                         <>