diff --git a/app/components/CryptoIcon/CryptoIcon.scss b/app/components/CryptoIcon/CryptoIcon.scss
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/components/CurrencyIcon/CurrencyIcon.js b/app/components/CurrencyIcon/CurrencyIcon.js
new file mode 100644
index 00000000..19840e18
--- /dev/null
+++ b/app/components/CurrencyIcon/CurrencyIcon.js
@@ -0,0 +1,16 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { FaDollar } from 'react-icons/lib/fa'
+import CryptoIcon from '../CryptoIcon'
+
+const CurrencyIcon = ({ currency, crypto }) => (currency === 'usd' ?
+  <FaDollar />
+  :
+  <CryptoIcon currency={crypto} />)
+
+CurrencyIcon.propTypes = {
+  currency: PropTypes.string.isRequired,
+  crypto: PropTypes.string.isRequired
+}
+
+export default CurrencyIcon
diff --git a/app/components/CurrencyIcon/index.js b/app/components/CurrencyIcon/index.js
new file mode 100644
index 00000000..da33382d
--- /dev/null
+++ b/app/components/CurrencyIcon/index.js
@@ -0,0 +1,3 @@
+import CurrencyIcon from './CurrencyIcon'
+
+export default CurrencyIcon
diff --git a/app/routes/app/components/components/Form/Form.js b/app/routes/app/components/components/Form/Form.js
index 52396a2d..a286f67d 100644
--- a/app/routes/app/components/components/Form/Form.js
+++ b/app/routes/app/components/components/Form/Form.js
@@ -1,8 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { FaDollar } from 'react-icons/lib/fa'
 import { MdClose } from 'react-icons/lib/md'
-import CryptoIcon from '../../../../../components/CryptoIcon'
+import CurrencyIcon from '../../../../../components/CurrencyIcon'
 import { btc } from '../../../../../utils'
 import styles from './Form.scss'
 
@@ -46,12 +45,7 @@ const Form = ({
         <div className={styles.content}>
           <section className={styles.amountContainer}>
             <label htmlFor='amount'>
-              {
-                currency === 'usd' ?
-                  <FaDollar />
-                  :
-                  <CryptoIcon currency={crypto} />
-              }
+              <CurrencyIcon currency={currency} crypto={crypto} />
             </label>
             <input
               type='text'
diff --git a/app/routes/app/components/components/Nav.js b/app/routes/app/components/components/Nav.js
index 0525b6a2..79a97bea 100644
--- a/app/routes/app/components/components/Nav.js
+++ b/app/routes/app/components/components/Nav.js
@@ -5,6 +5,7 @@ import ReactSVG from 'react-svg'
 import { MdAccountBalanceWallet } from 'react-icons/lib/md'
 import { FaClockO, FaDollar } from 'react-icons/lib/fa'
 import CryptoIcon from '../../../../components/CryptoIcon'
+import CurrencyIcon from '../../../../components/CurrencyIcon'
 import { btc } from '../../../../utils'
 import styles from './Nav.scss'
 
@@ -28,7 +29,7 @@ const Nav = ({ ticker, balance, setCurrency, formClicked, currentTicker }) => (
       </li>
       <li className={`${styles.balance} ${styles.link}`}>
         <p data-hint='Wallet balance' className='hint--bottom-left'>
-          <span>{ticker.currency === 'usd' ? <FaDollar /> : <CryptoIcon currency={ticker.crypto} />}</span>
+          <span><CurrencyIcon currency={ticker.currency} crypto={ticker.crypto} /></span>
           <span>
             {
               ticker.currency === 'usd' ?
@@ -39,7 +40,7 @@ const Nav = ({ ticker, balance, setCurrency, formClicked, currentTicker }) => (
           </span>
         </p>
         <p data-hint='Channel balance' className='hint--bottom-left'>
-          <span>{ticker.currency === 'usd' ? <FaDollar /> : <CryptoIcon currency={ticker.crypto} />}</span>
+          <span><CurrencyIcon currency={ticker.currency} crypto={ticker.crypto} /></span>
           <span>
             {
               ticker.currency === 'usd' ?