diff --git a/src/renderer/component/address/index.js b/src/renderer/component/address/index.js
deleted file mode 100644
index 3d24bd7e7..000000000
--- a/src/renderer/component/address/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// @flow
-
-import { connect } from 'react-redux';
-import { doToast } from 'lbry-redux';
-import Address from './view';
-
-export default connect(
-  null,
-  {
-    doToast,
-  }
-)(Address);
diff --git a/src/renderer/component/address/view.jsx b/src/renderer/component/address/view.jsx
deleted file mode 100644
index 050326d4d..000000000
--- a/src/renderer/component/address/view.jsx
+++ /dev/null
@@ -1,54 +0,0 @@
-// @flow
-import * as ICONS from 'constants/icons';
-import * as React from 'react';
-import { clipboard } from 'electron';
-import { FormRow } from 'component/common/form';
-import Button from 'component/button';
-
-type Props = {
-  address: string,
-  doToast: ({ message: string }) => void,
-};
-
-export default class Address extends React.PureComponent<Props> {
-  constructor() {
-    super();
-
-    this.input = null;
-  }
-
-  input: ?HTMLInputElement;
-
-  render() {
-    const { address, doToast } = this.props;
-
-    return (
-      <FormRow verticallyCentered stretch>
-        <input
-          className="input-copyable form-field__input"
-          readOnly
-          value={address || ''}
-          ref={input => {
-            this.input = input;
-          }}
-          onFocus={() => {
-            if (this.input) {
-              this.input.select();
-            }
-          }}
-        />
-        <Button
-          noPadding
-          button="secondary"
-          icon={ICONS.CLIPBOARD}
-          onClick={() => {
-            clipboard.writeText(address);
-            doToast({
-              message: __('Address copied'),
-            });
-          }}
-        />
-      </FormRow>
-    );
-  }
-}
diff --git a/src/renderer/component/common/icon-custom.jsx b/src/renderer/component/common/icon-custom.jsx
index 39d22af69..547282582 100644
--- a/src/renderer/component/common/icon-custom.jsx
+++ b/src/renderer/component/common/icon-custom.jsx
@@ -37,7 +37,7 @@ export const customIcons = {
       <polyline strokeLinejoin="round" points="13 4 21 12 13 20" />
     </g>
   ),
-  [ICONS.EYE]: buildIcon(
+  [ICONS.VIEW]: buildIcon(
     <g fill="none" fillRule="evenodd">
       <path
         d="M2, 12 C2, 12 5, 5 12, 5 C19, 5 22, 12 22, 12 C22, 12 19, 19 12, 19 C5, 19 2, 12 2, 12 Z"
diff --git a/src/renderer/component/copyableText/view.jsx b/src/renderer/component/copyableText/view.jsx
index fce38f8dd..b855e62d5 100644
--- a/src/renderer/component/copyableText/view.jsx
+++ b/src/renderer/component/copyableText/view.jsx
@@ -7,6 +7,7 @@ import Button from 'component/button';
 
 type Props = {
   copyable: string,
+  snackMessage: ?string,
   doToast: ({ message: string }) => void,
 };
 
@@ -20,7 +21,7 @@ export default class CopyableText extends React.PureComponent<Props> {
   input: ?HTMLInputElement;
 
   render() {
-    const { copyable, doToast } = this.props;
+    const { copyable, doToast, snackMessage } = this.props;
 
     return (
       <FormRow verticallyCentered stretch>
@@ -45,7 +46,7 @@ export default class CopyableText extends React.PureComponent<Props> {
           onClick={() => {
             clipboard.writeText(copyable);
             doToast({
-              message: __('Text copied'),
+              message: snackMessage || __('Text copied'),
             });
           }}
         />
diff --git a/src/renderer/component/externalLink/view.jsx b/src/renderer/component/externalLink/view.jsx
index 11a8bee65..aad4ce1c6 100644
--- a/src/renderer/component/externalLink/view.jsx
+++ b/src/renderer/component/externalLink/view.jsx
@@ -34,7 +34,7 @@ class ExternalLink extends React.PureComponent<Props> {
       element = (
         <Button
           button="link"
-          iconRight={ICONS.EXTERNAL_LINK}
+          iconRight={ICONS.EXTERNAL}
           title={title || href}
           label={children}
           className="btn--external-link"
diff --git a/src/renderer/component/fileActions/view.jsx b/src/renderer/component/fileActions/view.jsx
index cbc922da4..703b3c79f 100644
--- a/src/renderer/component/fileActions/view.jsx
+++ b/src/renderer/component/fileActions/view.jsx
@@ -20,7 +20,7 @@ type Props = {
 class FileActions extends React.PureComponent<Props> {
   render() {
     const { fileInfo, uri, openModal, claimIsMine, claimId } = this.props;
-    const showDelete = (claimIsMine || (fileInfo && Object.keys(fileInfo).length > 0)) ;
+    const showDelete = claimIsMine || (fileInfo && Object.keys(fileInfo).length > 0);
 
     return (
       <React.Fragment>
@@ -28,7 +28,7 @@ class FileActions extends React.PureComponent<Props> {
           <Tooltip onComponent body={__('Delete this file')}>
             <Button
               button="alt"
-              icon={ICONS.TRASH}
+              icon={ICONS.DELETE}
               description={__('Delete')}
               onClick={() => openModal(MODALS.CONFIRM_FILE_REMOVE, { uri })}
             />
diff --git a/src/renderer/component/fileCard/view.jsx b/src/renderer/component/fileCard/view.jsx
index 06b5db10d..3d980d5a7 100644
--- a/src/renderer/component/fileCard/view.jsx
+++ b/src/renderer/component/fileCard/view.jsx
@@ -132,7 +132,7 @@ class FileCard extends React.PureComponent<Props> {
         <div className="media__properties">
           <FilePrice hideFree uri={uri} />
           {isRewardContent && <Icon iconColor="red" icon={icons.FEATURED} />}
-          {isSubscribed && <Icon icon={icons.HEART} />}
+          {isSubscribed && <Icon icon={icons.SUBSCRIPTION} />}
           {fileInfo && <Icon icon={icons.LOCAL} />}
           {isNew && <span className="badge badge--alert">{__('NEW')}</span>}
         </div>
diff --git a/src/renderer/component/fileDownloadLink/view.jsx b/src/renderer/component/fileDownloadLink/view.jsx
index 9d9fc81c9..94aeb9c76 100644
--- a/src/renderer/component/fileDownloadLink/view.jsx
+++ b/src/renderer/component/fileDownloadLink/view.jsx
@@ -97,7 +97,7 @@ class FileDownloadLink extends React.PureComponent<Props> {
     } else if (fileInfo && fileInfo.download_path) {
       return (
         <ToolTip onComponent body={__('Open file')}>
-          <Button button="alt" iconColor="green" icon={ICONS.LOCAL} onClick={() => openFile()} />
+          <Button button="alt" iconColor="green" icon={ICONS.EXTERNAL} onClick={() => openFile()} />
         </ToolTip>
       );
     }
diff --git a/src/renderer/component/fileTile/view.jsx b/src/renderer/component/fileTile/view.jsx
index 2d023f8ba..773f7b609 100644
--- a/src/renderer/component/fileTile/view.jsx
+++ b/src/renderer/component/fileTile/view.jsx
@@ -70,7 +70,7 @@ class FileTile extends React.PureComponent<Props> {
       <div className={classnames('media__properties', { card__subtitle: size === 'large' })}>
         <FilePrice hideFree uri={uri} />
         {isNew && <span className="badge badge--alert icon">{__('NEW')}</span>}
-        {isSubscribed && <Icon icon={ICONS.HEART} />}
+        {isSubscribed && <Icon icon={ICONS.SUBSCRIPTION} />}
         {isRewardContent && <Icon iconColor="red" icon={ICONS.FEATURED} />}
         {isDownloaded && <Icon icon={ICONS.LOCAL} />}
       </div>
diff --git a/src/renderer/component/fileViewer/internal/play-button.jsx b/src/renderer/component/fileViewer/internal/play-button.jsx
index 3fc7c1620..a64541897 100644
--- a/src/renderer/component/fileViewer/internal/play-button.jsx
+++ b/src/renderer/component/fileViewer/internal/play-button.jsx
@@ -17,7 +17,7 @@ class VideoPlayButton extends React.PureComponent<Props> {
     const disabled = isLoading || fileInfo === undefined;
     const doesPlayback = ['audio', 'video'].indexOf(mediaType) !== -1;
     const label = doesPlayback ? __('Play') : __('View');
-    const icon = doesPlayback ? ICONS.PLAY : ICONS.EYE;
+    const icon = doesPlayback ? ICONS.PLAY : ICONS.VIEW;
     return (
       <Button
         disabled={disabled}
diff --git a/src/renderer/component/inviteList/view.jsx b/src/renderer/component/inviteList/view.jsx
index 77205bbbb..5dc120892 100644
--- a/src/renderer/component/inviteList/view.jsx
+++ b/src/renderer/component/inviteList/view.jsx
@@ -47,14 +47,14 @@ class InviteList extends React.PureComponent<Props> {
                     <td>{invitee.email}</td>
                     <td className="text-center">
                       {invitee.invite_accepted ? (
-                        <Icon icon={ICONS.CHECK} />
+                        <Icon icon={ICONS.COMPLETED} />
                       ) : (
                         <span className="empty">{__('unused')}</span>
                       )}
                     </td>
                     <td className="text-center">
                       {invitee.invite_reward_claimed ? (
-                        <Icon icon={ICONS.CHECK} />
+                        <Icon icon={ICONS.COMPLETED} />
                       ) : invitee.invite_reward_claimable ? (
                         <RewardLink label={__('claim')} reward_type={rewards.TYPE_REFERRAL} />
                       ) : (
diff --git a/src/renderer/component/rewardTile/view.jsx b/src/renderer/component/rewardTile/view.jsx
index 640861bc4..8a2e8c26a 100644
--- a/src/renderer/component/rewardTile/view.jsx
+++ b/src/renderer/component/rewardTile/view.jsx
@@ -41,7 +41,7 @@ const RewardTile = (props: Props) => {
           {reward.reward_type !== rewards.TYPE_REFERRAL &&
             (claimed ? (
               <span>
-                <Icon icon={ICONS.CHECK} /> {__('Reward claimed.')}
+                <Icon icon={ICONS.COMPLETED} /> {__('Reward claimed.')}
               </span>
             ) : (
               <RewardLink button reward_type={reward.reward_type} />
diff --git a/src/renderer/component/shapeShift/internal/active-shift.jsx b/src/renderer/component/shapeShift/internal/active-shift.jsx
index f39896a90..5df7e5bb2 100644
--- a/src/renderer/component/shapeShift/internal/active-shift.jsx
+++ b/src/renderer/component/shapeShift/internal/active-shift.jsx
@@ -3,7 +3,7 @@ import * as React from 'react';
 import QRCode from 'component/common/qr-code';
 import { FormRow } from 'component/common/form';
 import * as statuses from 'constants/shape_shift';
-import Address from 'component/address';
+import CopyableText from 'component/copyableText';
 import Button from 'component/button';
 import type { Dispatch, ThunkAction } from 'types/redux';
 import type { Action } from 'redux/actions/shape_shift';
@@ -96,7 +96,7 @@ class ActiveShapeShift extends React.PureComponent<Props> {
             {shiftDepositAddress && (
               <FormRow verticallyCentered padded>
                 <QRCode value={shiftDepositAddress} paddingRight />
-                <Address address={shiftDepositAddress} showCopyButton padded />
+                <CopyableText copyable={shiftDepositAddress} />
               </FormRow>
             )}
           </div>
@@ -134,12 +134,13 @@ class ActiveShapeShift extends React.PureComponent<Props> {
             />
           )}
         </div>
-        {shiftState === statuses.NO_DEPOSITS && shiftReturnAddress && (
-          <div className="help">
-            {__("If the transaction doesn't go through, ShapeShift will return your")}{' '}
-            {shiftCoinType} {__('back to')} {shiftReturnAddress}
-          </div>
-        )}
+        {shiftState === statuses.NO_DEPOSITS &&
+          shiftReturnAddress && (
+            <div className="help">
+              {__("If the transaction doesn't go through, ShapeShift will return your")}{' '}
+              {shiftCoinType} {__('back to')} {shiftReturnAddress}
+            </div>
+          )}
       </div>
     );
   }
diff --git a/src/renderer/component/socialShare/view.jsx b/src/renderer/component/socialShare/view.jsx
index bb2e4a622..b6b2e37f1 100644
--- a/src/renderer/component/socialShare/view.jsx
+++ b/src/renderer/component/socialShare/view.jsx
@@ -82,7 +82,7 @@ class SocialShare extends React.PureComponent<Props> {
               </ToolTip>
               <ToolTip onComponent body={__('View on Spee.ch')}>
                 <Button
-                  icon={ICONS.GLOBE}
+                  icon={ICONS.WEB}
                   iconColor="blue"
                   button="alt"
                   label={__('')}
diff --git a/src/renderer/component/subscribeButton/view.jsx b/src/renderer/component/subscribeButton/view.jsx
index 56b9db4ea..91a1d13a6 100644
--- a/src/renderer/component/subscribeButton/view.jsx
+++ b/src/renderer/component/subscribeButton/view.jsx
@@ -43,7 +43,7 @@ export default (props: Props) => {
   return (
     <Button
       iconColor="red"
-      icon={isSubscribed ? undefined : ICONS.HEART}
+      icon={isSubscribed ? undefined : ICONS.SUBSCRIPTION}
       button={buttonStyle || 'alt'}
       label={subscriptionLabel}
       onClick={e => {
diff --git a/src/renderer/component/subscribeMarkAsRead/view.jsx b/src/renderer/component/subscribeMarkAsRead/view.jsx
index e06d41438..ca0f9900d 100644
--- a/src/renderer/component/subscribeMarkAsRead/view.jsx
+++ b/src/renderer/component/subscribeMarkAsRead/view.jsx
@@ -33,7 +33,7 @@ export default class MarkAsRead extends PureComponent<Props> {
       <Button
         noPadding
         button="inverse"
-        icon={ICONS.CHECK_SIMPLE}
+        icon={ICONS.COMPLETE}
         label={label}
         onClick={this.handleClick}
       />
diff --git a/src/renderer/component/transactionList/internal/transaction-list-item.jsx b/src/renderer/component/transactionList/internal/transaction-list-item.jsx
index fb5960dda..33bc8afea 100644
--- a/src/renderer/component/transactionList/internal/transaction-list-item.jsx
+++ b/src/renderer/component/transactionList/internal/transaction-list-item.jsx
@@ -29,7 +29,7 @@ class TransactionListItem extends React.PureComponent<Props> {
     if (type === txnTypes.TIP) {
       return <Button icon={ICONS.UNLOCK} onClick={this.abandonClaim} title={__('Unlock Tip')} />;
     }
-    return <Button icon={ICONS.TRASH} onClick={this.abandonClaim} title={__('Abandon Claim')} />;
+    return <Button icon={ICONS.DELETE} onClick={this.abandonClaim} title={__('Abandon Claim')} />;
   }
 
   abandonClaim() {
diff --git a/src/renderer/component/transactionListRecent/view.jsx b/src/renderer/component/transactionListRecent/view.jsx
index 4925b342e..5c5d4f57d 100644
--- a/src/renderer/component/transactionListRecent/view.jsx
+++ b/src/renderer/component/transactionListRecent/view.jsx
@@ -59,7 +59,7 @@ class TransactionListRecent extends React.PureComponent<Props> {
                   button="primary"
                   navigate="/history"
                   label={__('Full History')}
-                  icon={icons.CLOCK}
+                  icon={icons.HISTORY}
                 />
               </div>
             </div>
diff --git a/src/renderer/component/userVerify/view.jsx b/src/renderer/component/userVerify/view.jsx
index ba24effe4..9f9e97130 100644
--- a/src/renderer/component/userVerify/view.jsx
+++ b/src/renderer/component/userVerify/view.jsx
@@ -118,7 +118,7 @@ class UserVerify extends React.PureComponent<Props> {
               <Button
                 href="https://chat.lbry.io"
                 button="primary"
-                icon={icons.MESSAGE}
+                icon={icons.CHAT}
                 label={__('Join LBRY Chat')}
               />
             </div>
diff --git a/src/renderer/component/viewOnWebButton/index.js b/src/renderer/component/viewOnWebButton/index.js
deleted file mode 100644
index ff11c6d87..000000000
--- a/src/renderer/component/viewOnWebButton/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import ViewOnWebButton from './view';
-
-export default ViewOnWebButton;
diff --git a/src/renderer/component/viewOnWebButton/view.jsx b/src/renderer/component/viewOnWebButton/view.jsx
deleted file mode 100644
index 681c56fc1..000000000
--- a/src/renderer/component/viewOnWebButton/view.jsx
+++ /dev/null
@@ -1,30 +0,0 @@
-// @flow
-import * as ICONS from 'constants/icons';
-import React from 'react';
-import Button from 'component/button';
-
-type Props = {
-  claimId: ?string,
-  claimName: ?string,
-};
-
-export default (props: Props) => {
-  const { claimId, claimName } = props;
-
-  if (claimId && claimName) {
-    const speechURL = claimName.startsWith('@')
-      ? `${claimName}:${claimId}`
-      : `${claimId}/${claimName}`;
-
-    return (
-      <Button
-        icon={ICONS.GLOBE}
-        button="alt"
-        label={__('Share')}
-        href={`https://spee.ch/${speechURL}`}
-      />
-    );
-  }
-
-  return null;
-};
diff --git a/src/renderer/component/walletAddress/view.jsx b/src/renderer/component/walletAddress/view.jsx
index ccda318bf..8fbbde816 100644
--- a/src/renderer/component/walletAddress/view.jsx
+++ b/src/renderer/component/walletAddress/view.jsx
@@ -2,7 +2,7 @@
 import * as icons from 'constants/icons';
 import React from 'react';
 import Button from 'component/button';
-import Address from 'component/address';
+import CopyableText from 'component/copyableText';
 import QRCode from 'component/common/qr-code';
 
 type Props = {
@@ -58,7 +58,7 @@ class WalletAddress extends React.PureComponent<Props, State> {
         </header>
 
         <div className="card__content">
-          <Address address={receiveAddress} showCopyButton />
+          <CopyableText copyable={receiveAddress} snackMessage={__('Address copied.')} />
         </div>
 
         <div className="card__content">
diff --git a/src/renderer/component/wunderbar/view.jsx b/src/renderer/component/wunderbar/view.jsx
index c39961319..f5e12f194 100644
--- a/src/renderer/component/wunderbar/view.jsx
+++ b/src/renderer/component/wunderbar/view.jsx
@@ -45,7 +45,7 @@ class WunderBar extends React.PureComponent<Props> {
       case 'file':
         return ICONS.LOCAL;
       case 'channel':
-        return ICONS.AT_SIGN;
+        return ICONS.CHANNEL;
       default:
         return ICONS.SEARCH;
     }
diff --git a/src/renderer/constants/icons.js b/src/renderer/constants/icons.js
index d758b3082..57f27e3f9 100644
--- a/src/renderer/constants/icons.js
+++ b/src/renderer/constants/icons.js
@@ -1,4 +1,8 @@
-// React Feather
+// React Feather icons
+// https://github.com/carmelopullara/react-feather
+// Note: Icons should be named for their purpose, rather than the actual icon.
+//       The goal being to reduce multiple uses of the same icon for different purposes.
+//
 export const FEATURED = 'Award';
 export const LOCAL = 'Folder';
 export const ALERT = 'AlertCircle';
@@ -9,30 +13,28 @@ export const DOWNLOAD = 'Download';
 export const UPLOAD = 'UploadCloud';
 export const CLOSE = 'X';
 export const EDIT = 'Edit3';
-export const TRASH = 'Trash';
+export const DELETE = 'Trash';
 export const REPORT = 'Flag';
-export const OPEN = 'BookOpen';
 export const HELP = 'HelpCircle';
-export const MESSAGE = 'MessageCircle';
-export const SEND = 'Send';
+export const CHAT = 'MessageCircle';
 export const SEARCH = 'Search';
-export const COMPASS = 'Compass';
-export const AT_SIGN = 'AtSign';
+export const CHANNEL = 'AtSign';
 export const REFRESH = 'RefreshCw';
-export const CLOCK = 'Clock';
+export const HISTORY = 'Clock';
 export const HOME = 'Home';
 export const PHONE = 'Phone';
-export const CHECK = 'CheckCircle';
-export const HEART = 'Heart';
+export const COMPLETE = 'Check';
+export const COMPLETED = 'CheckCircle';
+export const SUBSCRIPTION = 'Heart';
 export const UNLOCK = 'Unlock';
-export const CHECK_SIMPLE = 'Check';
-export const GLOBE = 'Globe';
-export const EXTERNAL_LINK = 'ExternalLink';
-export const GIFT = 'Gift';
-export const EYE = 'Eye';
+export const WEB = 'Globe';
+export const SHARE = 'Share2';
+export const EXTERNAL = 'ExternalLink';
+export const TIP = 'Gift';
+export const VIEW = 'Eye';
 export const PLAY = 'Play';
 export const FACEBOOK = 'Facebook';
 export const TWITTER = 'Twitter';
-export const CREDIT_CARD = 'CreditCard';
+export const WALLET = 'CreditCard';
 export const SETTINGS = 'Settings';
-export const USERS = 'Users';
+export const INVITE = 'Users';
diff --git a/src/renderer/page/channel/view.jsx b/src/renderer/page/channel/view.jsx
index f66ef56bb..90fb47cc8 100644
--- a/src/renderer/page/channel/view.jsx
+++ b/src/renderer/page/channel/view.jsx
@@ -95,7 +95,7 @@ class ChannelPage extends React.PureComponent<Props> {
             <SubscribeButton uri={`lbry://${permanentUrl}`} channelName={name} />
             <Button
               button="alt"
-              icon={icons.GLOBE}
+              icon={icons.SHARE}
               label={__('Share Channel')}
               onClick={() =>
                 openModal(MODALS.SOCIAL_SHARE, { uri, speechShareable: true, isChannel: true })
diff --git a/src/renderer/page/file/view.jsx b/src/renderer/page/file/view.jsx
index 1a85d2ad0..e0de0d64a 100644
--- a/src/renderer/page/file/view.jsx
+++ b/src/renderer/page/file/view.jsx
@@ -216,14 +216,14 @@ class FilePage extends React.Component<Props> {
               {!claimIsMine && (
                 <Button
                   button="alt"
-                  icon={icons.GIFT}
+                  icon={icons.TIP}
                   label={__('Send a tip')}
                   onClick={() => openModal(MODALS.SEND_TIP, { uri })}
                 />
               )}
               <Button
                 button="alt"
-                icon={icons.GLOBE}
+                icon={icons.SHARE}
                 label={__('Share')}
                 onClick={() => openModal(MODALS.SOCIAL_SHARE, { uri, speechShareable })}
               />
diff --git a/src/renderer/page/help/view.jsx b/src/renderer/page/help/view.jsx
index b3ee9e785..4017d27ea 100644
--- a/src/renderer/page/help/view.jsx
+++ b/src/renderer/page/help/view.jsx
@@ -151,7 +151,7 @@ class HelpPage extends React.PureComponent<Props, State> {
               <Button
                 button="primary"
                 label={__('Join Our Chat')}
-                icon={icons.MESSAGE}
+                icon={icons.CHAT}
                 href="https://chat.lbry.io"
               />
             </div>