Update Dexon wording

47 files changed, 118 insertions, 166 deletions

diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json
index df3fddbd..136301a2 100644
--- a/app/_locales/cs/messages.json
+++ b/app/_locales/cs/messages.json
@@ -756,13 +756,13 @@
   "send": {
     "message": "Odeslat"
   },
-  "sendETH": {
+  "sendDEX": {
     "message": "Odeslat ETH"
   },
   "sendTokens": {
     "message": "Odeslat tokeny"
   },
-  "onlySendToEtherAddress": {
+  "onlySendToDexonAddress": {
     "message": "Posílejte jen ETH na DEXON adresu."
   },
   "searchTokens": {
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index b08ba103..14f00745 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -738,13 +738,13 @@
   "send": {
     "message": "Senden"
   },
-  "sendETH": {
+  "sendDEX": {
     "message": "ETH senden"
   },
   "sendTokens": {
     "message": "Token senden"
   },
-  "onlySendToEtherAddress": {
+  "onlySendToDexonAddress": {
     "message": "ETH unbedingt nur zu einer DEXON Adresse senden."
   },
   "sendTokensAnywhere": {
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index be3e014a..ceca2184 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1,50 +1,6 @@
 {
-<<<<<<< HEAD
-  "privacyMode": {
-    "message": "Privacy Mode"
-  },
-  "privacyModeDescription": {
-    "message": "Websites must request access to view your account information."
-  },
-  "exposeAccounts": {
-    "message": "Expose Accounts"
-  },
-  "exposeDescription": {
-    "message": "Expose accounts to the current website. Useful for legacy dapps."
-  },
-  "confirmExpose": {
-    "message": "Are you sure you want to expose your accounts to the current website?"
-  },
-  "confirmClear": {
-    "message": "Are you sure you want to clear approved websites?"
-  },
-  "contractInteraction": {
-    "message": "Contract Interaction"
-  },
-  "clearApprovalDataSuccess": {
-    "message": "Approved website data cleared successfully."
-  },
-  "approvalData": {
-    "message": "Privacy Data"
-  },
-  "approvalDataDescription": {
-    "message": "Clear privacy data so all websites must request access to view account information again."
-  },
-  "clearApprovalData": {
-    "message": "Clear Privacy Data"
-  },
-  "reject": {
-    "message": "Reject"
-  },
-  "providerRequest": {
-    "message": "$1 would like to connect to your account"
-  },
-  "providerRequestInfo": {
-    "message": "This site is requesting access to view your current account address. Always make sure you trust the sites you interact with."
-=======
   "aboutDekuSan": {
     "message": "DekuSan is the official DEXON browser extension, forked from MetaMask, by DEXON Foundation."
->>>>>>> Complete onboarding flow
   },
   "accept": {
     "message": "Accept"
@@ -838,11 +794,11 @@
   "oldUIMessage": {
     "message": "You have returned to the old UI. You can switch back to the New UI through the option in the top right dropdown menu."
   },
-  "onlySendToEtherAddress": {
-    "message": "Only send ETH to an Ethereum address."
+  "onlySendToDexonAddress": {
+    "message": "Only send DEX to a DEXON address."
   },
   "onlySendTokensToAccountAddress": {
-    "message": "Only send $1 to an Ethereum account address.",
+    "message": "Only send $1 to a DEXON account address.",
     "description": "displays token symbol"
   },
   "openInTab": {
@@ -1092,17 +1048,14 @@
   "send": {
     "message": "Send"
   },
-  "sendAmount": {
-    "message": "Send Amount"
-  },
-  "sendETH": {
-    "message": "Send ETH"
+  "sendDEX": {
+    "message": "Send DEX"
   },
   "sendTokens": {
     "message": "Send Tokens"
   },
-  "sentEther": {
-    "message": "sent ether"
+  "sentDexon": {
+    "message": "Sent DEXON"
   },
   "sentTokens": {
     "message": "sent tokens"
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index f62bc17a..bb6ed523 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -599,7 +599,7 @@
   "oldUIMessage": {
     "message": "Regresaste a la antigua UI (Interfaz de Usuario). Puedes regresar a la nueva UI mediante la opcion en la barra desplegable del menu de arriba a la derecha."
   },
-  "onlySendToEtherAddress": {
+  "onlySendToDexonAddress": {
     "message": "Sólo envía a una dirección de Dexon"
   },
   "or": {
@@ -741,7 +741,7 @@
   "send": {
     "message": "Enviar"
   },
-  "sendETH": {
+  "sendDEX": {
     "message": "Enviar DEX"
   },
   "sendTokens": {
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index fef03766..64e3a518 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -746,7 +746,7 @@
   "oldUIMessage": {
     "message": "Vous êtes revenu à l'ancienne interface utilisateur. Vous pouvez revenir à la nouvelle interface via l'option dans le menu déroulant en haut à droite."
   },
-  "onlySendToEtherAddress": {
+  "onlySendToDexonAddress": {
     "message": "N'envoyez de l'Ether que sur une adresse Ethereum."
   },
   "onlySendTokensToAccountAddress": {
@@ -988,13 +988,13 @@
   "send": {
     "message": "Envoyer"
   },
-  "sendETH": {
-    "message": "Envoyer des ETH"
+  "sendDEX": {
+    "message": "Envoyer des DEX"
   },
   "sendTokens": {
     "message": "Envoyer des jetons"
   },
-  "sentEther": {
+  "sentDexon": {
     "message": "Ether envoyé"
   },
   "sentTokens": {
diff --git a/app/_locales/hn/messages.json b/app/_locales/hn/messages.json
index b0bdd0d3..ce6353fd 100644
--- a/app/_locales/hn/messages.json
+++ b/app/_locales/hn/messages.json
@@ -687,7 +687,7 @@
   "send": {
     "message": "भेजें"
   },
-  "sendETH": {
+  "sendDEX": {
     "message": "भेजें ETH"
   },
   "sendTokens": {
diff --git a/app/_locales/ht/messages.json b/app/_locales/ht/messages.json
index 78888c63..fe2120b2 100644
--- a/app/_locales/ht/messages.json
+++ b/app/_locales/ht/messages.json
@@ -951,13 +951,13 @@
   "send": {
     "message": "Voye"
   },
-  "sendETH": {
+  "sendDEX": {
     "message": "Voye ETH"
   },
   "sendTokens": {
     "message": "Voye Tokens"
   },
-  "sentEther": {
+  "sentDexon": {
     "message": "Voye ether"
   },
   "sentTokens": {
@@ -966,7 +966,7 @@
   "separateEachWord": {
     "message": "Separe chak mo ak yon sèl espas"
   },
-  "onlySendToEtherAddress": {
+  "onlySendToDexonAddress": {
     "message": "Sèlman voye ETH nan yon adrès DEXeum."
   },
   "onlySendTokensToAccountAddress": {
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
index 52ac2413..5b0fc991 100644
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@@ -761,7 +761,7 @@
   "oldUIMessage": {
     "message": "Sei ritornato alla vecchia interfaccia. Puoi ritornare alla nuova interfaccia tramite l'opzione nel menu a discesa in alto a destra."
   },
-  "onlySendToEtherAddress": {
+  "onlySendToDexonAddress": {
     "message": "Invia ETH solamente ad un account Ethereum."
   },
   "onlySendTokensToAccountAddress": {
@@ -997,13 +997,13 @@
   "send": {
     "message": "Invia"
   },
-  "sendETH": {
+  "sendDEX": {
     "message": "Invia ETH"
   },
   "sendTokens": {
     "message": "Invia Tokens"
   },
-  "sentEther": {
+  "sentDexon": {
     "message": "ether inviati"
   },
   "sentTokens": {
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index b62465a1..1b63f46d 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -642,13 +642,13 @@
   "send": {
     "message": "送信"
   },
-  "sendETH": {
+  "sendDEX": {
     "message": "ETHの送信"
   },
   "sendTokens": {
     "message": "トークンを送信"
   },
-  "onlySendToEtherAddress": {
+  "onlySendToDexonAddress": {
     "message": "ETH はイーサリウムアカウントのみに送信できます。"
   },
   "onlySendTokensToAccountAddress": {
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index c7d7c65e..d94c64a7 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -755,7 +755,7 @@
   "oldUIMessage": {
     "message": "구버전 UI로 변경하셨습니다. 오른쪽 위 드롭다운 메뉴에서 새 UI로 변경하실 수 있습니다."
   },
-  "onlySendToEtherAddress": {
+  "onlySendToDexonAddress": {
     "message": "이더리움 주소로 ETH만 송금하세요."
   },
   "onlySendTokensToAccountAddress": {
@@ -1000,13 +1000,13 @@
   "send": {
     "message": "전송"
   },
-  "sendETH": {
+  "sendDEX": {
     "message": "ETH 보내기"
   },
   "sendTokens": {
     "message": "토큰 전송"
   },
-  "sentEther": {
+  "sentDexon": {
     "message": "전송된 이더"
   },
   "sentTokens": {
diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json
index f637d4db..fd6b2a92 100644
--- a/app/_locales/nl/messages.json
+++ b/app/_locales/nl/messages.json
@@ -687,7 +687,7 @@
   "send": {
     "message": "Sturen"
   },
-  "sendETH": {
+  "sendDEX": {
     "message": "Verzend ETH"
   },
   "sendTokens": {
diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json
index f2599913..e0f16ba0 100644
--- a/app/_locales/pl/messages.json
+++ b/app/_locales/pl/messages.json
@@ -918,13 +918,13 @@
   "send": {
     "message": "Wyślij"
   },
-  "sendETH": {
+  "sendDEX": {
     "message": "Wyślij ETH"
   },
   "sendTokens": {
     "message": "Wyślij tokeny"
   },
-  "sentEther": {
+  "sentDexon": {
     "message": "wyślij eter"
   },
   "sentTokens": {
@@ -933,7 +933,7 @@
   "separateEachWord": {
     "message": "Oddziel słowa pojedynczą spacją"
   },
-  "onlySendToEtherAddress": {
+  "onlySendToDexonAddress": {
     "message": "Na adres Ethereum wysyłaj tylko ETH."
   },
   "onlySendTokensToAccountAddress": {
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index bc3231f6..d339344d 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -687,7 +687,7 @@
   "send": {
     "message": "Enviar"
   },
-  "sendETH": {
+  "sendDEX": {
     "message": "Enviar ETH"
   },
   "sendTokens": {
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index eb4f7db4..5f80100a 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -744,13 +744,13 @@
   "send": {
     "message": "Отправить"
   },
-  "sendETH": {
+  "sendDEX": {
     "message": "Отправить ETH"
   },
   "sendTokens": {
     "message": "Отправить токены"
   },
-  "onlySendToEtherAddress": {
+  "onlySendToDexonAddress": {
     "message": "Отправляйте ETH только на DEXON адреса."
   },
   "searchTokens": {
diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json
index f606b2d1..761567ba 100644
--- a/app/_locales/sl/messages.json
+++ b/app/_locales/sl/messages.json
@@ -1033,7 +1033,7 @@
   "send": {
     "message": "Pošlji"
   },
-  "sendETH": {
+  "sendDEX": {
     "message": "Pošlji ETH"
   },
   "sendTokens": {
diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json
index a17d5f03..d7901242 100644
--- a/app/_locales/th/messages.json
+++ b/app/_locales/th/messages.json
@@ -687,7 +687,7 @@
   "send": {
     "message": "ส่ง"
   },
-  "sendETH": {
+  "sendDEX": {
     "message": "ส่งอีเธอร์"
   },
   "sendTokens": {
diff --git a/app/_locales/tml/messages.json b/app/_locales/tml/messages.json
index 59795a08..f5bec834 100644
--- a/app/_locales/tml/messages.json
+++ b/app/_locales/tml/messages.json
@@ -756,13 +756,13 @@
   "send": {
     "message": "அனுப்பு"
   },
-  "sendETH": {
+  "sendDEX": {
     "message": "ETH ஐ அனுப்பு"
   },
   "sendTokens": {
     "message": "டோக்கன்களை அனுப்பவும்"
   },
-  "onlySendToEtherAddress": {
+  "onlySendToDexonAddress": {
     "message": "ETH ஐ ஒரு எதரியும் முகவரிக்கு மட்டும் அனுப்பவும்."
   },
   "searchTokens": {
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index bb83da48..20094c16 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -711,13 +711,13 @@
     "send": {
       "message": "Gönder"
     },
-    "sendETH": {
+    "sendDEX": {
       "message": "ETH Gönder"
     },
     "sendTokens": {
       "message": "Jeton Gönder"
     },
-    "onlySendToEtherAddress": {
+    "onlySendToDexonAddress": {
       "message": "DEXON adresine sadece ETH gönder."
     },
     "searchTokens": {
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index a88fc3c0..9cd32f92 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -792,13 +792,13 @@
   "send": {
     "message": "发送"
   },
-  "sendETH": {
+  "sendDEX": {
     "message": "发送 ETH"
   },
   "sendTokens": {
     "message": "发送 代币"
   },
-  "onlySendToEtherAddress": {
+  "onlySendToDexonAddress": {
     "message": "只发送 ETH 给一个以太坊地址"
   },
   "searchTokens": {
diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json
index 18d223a3..b2c0142e 100644
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@@ -755,13 +755,13 @@
   "send": {
     "message": "發送"
   },
-  "sendETH": {
+  "sendDEX": {
     "message": "發送 ETH"
   },
   "sendTokens": {
     "message": "發送代幣"
   },
-  "onlySendToEtherAddress": {
+  "onlySendToDexonAddress": {
     "message": "只發送 ETH 到乙太坊地址."
   },
   "searchTokens": {
diff --git a/app/scripts/controllers/token-rates.js b/app/scripts/controllers/token-rates.js
index f9fb2aa4..9d38278e 100644
--- a/app/scripts/controllers/token-rates.js
+++ b/app/scripts/controllers/token-rates.js
@@ -55,7 +55,7 @@ class TokenRatesController {
    */
   async fetchExchangeRate (address) {
     try {
-      const response = await fetch(`https://metamask.balanc3.net/prices?from=${address}&to=ETH&autoConversion=false&summaryOnly=true`)
+      const response = await fetch(`https://metamask.balanc3.net/prices?from=${address}&to=DEX&autoConversion=false&summaryOnly=true`)
       const json = await response.json()
       return json && json.length ? json[0].averagePrice : 0
     } catch (error) {
diff --git a/mascara/src/app/shapeshift-form/index.js b/mascara/src/app/shapeshift-form/index.js
index 6f330748..354dbeb9 100644
--- a/mascara/src/app/shapeshift-form/index.js
+++ b/mascara/src/app/shapeshift-form/index.js
@@ -168,7 +168,7 @@ export class ShapeShiftForm extends Component {
                 Receive
               </div>
               <div className="shapeshift-form__selector-input">
-                ETH
+                DEX
               </div>
             </div>
           </div>
diff --git a/test/integration/lib/send-new-ui.js b/test/integration/lib/send-new-ui.js
index 98e5f549..ebfa80a4 100644
--- a/test/integration/lib/send-new-ui.js
+++ b/test/integration/lib/send-new-ui.js
@@ -32,10 +32,10 @@ async function runSendFlowTest (assert, done) {
   sendScreenButton[1].click()
 
   const sendTitle = await queryAsync($, '.page-container__title')
-  assert.equal(sendTitle[0].textContent, 'Send ETH', 'Send screen title is correct')
+  assert.equal(sendTitle[0].textContent, 'Send DEX', 'Send screen title is correct')
 
   const sendCopy = await queryAsync($, '.page-container__subtitle')
-  assert.equal(sendCopy[0].textContent, 'Only send ETH to an Ethereum address.', 'Send screen has copy')
+  assert.equal(sendCopy[0].textContent, 'Only send DEX to an DEXON address.', 'Send screen has copy')
 
   const sendFromField = await queryAsync($, '.send-v2__form-field')
   assert.ok(sendFromField[0], 'send screen has a from field')
diff --git a/ui/app/components/currency-display/index.scss b/ui/app/components/currency-display/index.scss
index 313c932b..17410dc9 100644
--- a/ui/app/components/currency-display/index.scss
+++ b/ui/app/components/currency-display/index.scss
@@ -6,6 +6,7 @@
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
+    color: $white;
   }
 
   &__suffix {
diff --git a/ui/app/components/currency-display/tests/currency-display.container.test.js b/ui/app/components/currency-display/tests/currency-display.container.test.js
index 9888c366..7973bf60 100644
--- a/ui/app/components/currency-display/tests/currency-display.container.test.js
+++ b/ui/app/components/currency-display/tests/currency-display.container.test.js
@@ -69,21 +69,18 @@ describe('CurrencyDisplay container', () => {
         {
           props: {
             value: '0x1193461d01595930',
-            currency: 'ETH',
-            nativeCurrency: 'ETH',
+            currency: 'DEX',
             numberOfDecimals: 3,
           },
           result: {
             displayValue: '1.266',
-            suffix: 'ETH',
-            nativeCurrency: 'ETH',
+            suffix: 'DEX',
           },
         },
         {
           props: {
             value: '0x1193461d01595930',
-            currency: 'ETH',
-            nativeCurrency: 'ETH',
+            currency: 'DEX',
             numberOfDecimals: 3,
             hideLabel: true,
           },
@@ -96,8 +93,7 @@ describe('CurrencyDisplay container', () => {
         {
           props: {
             value: '0x3b9aca00',
-            currency: 'ETH',
-            nativeCurrency: 'ETH',
+            currency: 'DEX',
             denomination: 'GWEI',
             hideLabel: true,
           },
@@ -110,8 +106,7 @@ describe('CurrencyDisplay container', () => {
         {
           props: {
             value: '0x3b9aca00',
-            currency: 'ETH',
-            nativeCurrency: 'ETH',
+            currency: 'DEX',
             denomination: 'WEI',
             hideLabel: true,
           },
@@ -124,8 +119,7 @@ describe('CurrencyDisplay container', () => {
         {
           props: {
             value: '0x3b9aca00',
-            currency: 'ETH',
-            nativeCurrency: 'ETH',
+            currency: 'DEX',
             numberOfDecimals: 100,
             hideLabel: true,
           },
diff --git a/ui/app/components/currency-input/currency-input.component.js b/ui/app/components/currency-input/currency-input.component.js
index 0761a75c..8a12851d 100644
--- a/ui/app/components/currency-input/currency-input.component.js
+++ b/ui/app/components/currency-input/currency-input.component.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import UnitInput from '../unit-input'
 import CurrencyDisplay from '../currency-display'
 import { getValueFromWeiHex, getWeiHexFromDecimalValue } from '../../helpers/conversions.util'
-import { ETH } from '../../constants/common'
+import { DEX } from '../../constants/common'
 
 /**
  * Component that allows user to enter currency values as a number, and props receive a converted
@@ -52,7 +52,7 @@ export default class CurrencyInput extends PureComponent {
         value: hexValue, toCurrency: currentCurrency, conversionRate, numberOfDecimals: 2,
       })
       : getValueFromWeiHex({
-        value: hexValue, toCurrency: ETH, numberOfDecimals: 6,
+        value: hexValue, toCurrency: DEX, numberOfDecimals: 6,
       })
 
     return Number(decimalValueString) || 0
@@ -66,7 +66,7 @@ export default class CurrencyInput extends PureComponent {
         value: decimalValue, fromCurrency, conversionRate, invertConversionRate: true,
       })
       : getWeiHexFromDecimalValue({
-        value: decimalValue, fromCurrency: ETH, fromDenomination: ETH, conversionRate,
+        value: decimalValue, fromCurrency: DEX, fromDenomination: DEX, conversionRate,
       })
 
     this.setState({ hexValue, decimalValue })
@@ -78,13 +78,13 @@ export default class CurrencyInput extends PureComponent {
   }
 
   renderConversionComponent () {
-    const { useFiat, currentCurrency, nativeCurrency } = this.props
+    const { useFiat, currentCurrency } = this.props
     const { hexValue } = this.state
     let currency, numberOfDecimals
 
     if (useFiat) {
-      // Display ETH
-      currency = nativeCurrency || ETH
+      // Display DEX
+      currency = DEX
       numberOfDecimals = 6
     } else {
       // Display Fiat
diff --git a/ui/app/components/currency-input/currency-input.container.js b/ui/app/components/currency-input/currency-input.container.js
index 1d1ed7b4..941e9380 100644
--- a/ui/app/components/currency-input/currency-input.container.js
+++ b/ui/app/components/currency-input/currency-input.container.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux'
 import CurrencyInput from './currency-input.component'
-import { ETH } from '../../constants/common'
+import { DEX } from '../../constants/common'
 
 const mapStateToProps = state => {
   const { metamask: { nativeCurrency, currentCurrency, conversionRate } } = state
@@ -13,9 +13,9 @@ const mapStateToProps = state => {
 }
 
 const mergeProps = (stateProps, dispatchProps, ownProps) => {
-  const { nativeCurrency, currentCurrency } = stateProps
+  const { currentCurrency } = stateProps
   const { useFiat } = ownProps
-  const suffix = useFiat ? currentCurrency.toUpperCase() : nativeCurrency || ETH
+  const suffix = useFiat ? currentCurrency.toUpperCase() : DEX
 
   return {
     ...stateProps,
diff --git a/ui/app/components/currency-input/tests/currency-input.container.test.js b/ui/app/components/currency-input/tests/currency-input.container.test.js
index 5d72958e..27965ec0 100644
--- a/ui/app/components/currency-input/tests/currency-input.container.test.js
+++ b/ui/app/components/currency-input/tests/currency-input.container.test.js
@@ -52,8 +52,12 @@ describe('CurrencyInput container', () => {
       assert.deepEqual(mergeProps(mockStateProps, mockDispatchProps, {}), {
         conversionRate: 280.45,
         currentCurrency: 'usd',
+<<<<<<< HEAD
         nativeCurrency: 'ETH',
         suffix: 'ETH',
+=======
+        suffix: 'DEX',
+>>>>>>> Update Dexon wording
       })
     })
   })
diff --git a/ui/app/components/pages/confirm-token-transaction-base/confirm-token-transaction-base.component.js b/ui/app/components/pages/confirm-token-transaction-base/confirm-token-transaction-base.component.js
index 7f1fb4e4..dfd1cea8 100644
--- a/ui/app/components/pages/confirm-token-transaction-base/confirm-token-transaction-base.component.js
+++ b/ui/app/components/pages/confirm-token-transaction-base/confirm-token-transaction-base.component.js
@@ -9,7 +9,7 @@ import {
   roundExponential,
 } from '../../../helpers/confirm-transaction/util'
 import { getWeiHexFromDecimalValue } from '../../../helpers/conversions.util'
-import { ETH, PRIMARY } from '../../../constants/common'
+import { DEX, PRIMARY } from '../../../constants/common'
 
 export default class ConfirmTokenTransactionBase extends Component {
   static contextTypes = {
@@ -45,8 +45,8 @@ export default class ConfirmTokenTransactionBase extends Component {
     const decimalEthValue = (tokenAmount * contractExchangeRate) || 0
     const hexWeiValue = getWeiHexFromDecimalValue({
       value: decimalEthValue,
-      fromCurrency: ETH,
-      fromDenomination: ETH,
+      fromCurrency: DEX,
+      fromDenomination: DEX,
     })
 
     return typeof contractExchangeRate === 'undefined'
@@ -72,7 +72,7 @@ export default class ConfirmTokenTransactionBase extends Component {
       <div>
         <span>{ `${tokensText} + ` }</span>
         <img
-          src="/images/eth.svg"
+          src="/images/dexon_logo.svg"
           height="18"
         />
         <span>{ ethTransactionTotal }</span>
diff --git a/ui/app/components/send/send-header/send-header.selectors.js b/ui/app/components/send/send-header/send-header.selectors.js
index d7c9d376..3d5ca404 100644
--- a/ui/app/components/send/send-header/send-header.selectors.js
+++ b/ui/app/components/send/send-header/send-header.selectors.js
@@ -19,7 +19,7 @@ function getTitleKey (state) {
   } else if (isToken) {
     return 'sendTokens'
   } else {
-    return 'sendETH'
+    return 'sendDEX'
   }
 }
 
@@ -32,6 +32,6 @@ function getSubtitleParams (state) {
     } else if (token) {
       return [ 'onlySendTokensToAccountAddress', [ token.symbol ] ]
     } else {
-      return [ 'onlySendToEtherAddress' ]
+      return [ 'onlySendToDexonAddress' ]
     }
 }
diff --git a/ui/app/components/send/send-header/tests/send-header-selectors.test.js b/ui/app/components/send/send-header/tests/send-header-selectors.test.js
index e0c6a3ab..d6d090ae 100644
--- a/ui/app/components/send/send-header/tests/send-header-selectors.test.js
+++ b/ui/app/components/send/send-header/tests/send-header-selectors.test.js
@@ -23,7 +23,7 @@ describe('send-header selectors', () => {
     })
 
     it('should return the correct key when getSendEditingTransactionId is falsy and getSelectedToken is falsy', () => {
-      assert.equal(getTitleKey({ e: null }), 'sendETH')
+      assert.equal(getTitleKey({ e: null }), 'sendDEX')
     })
   })
 
@@ -40,7 +40,7 @@ describe('send-header selectors', () => {
     })
 
     it('should return the correct params when getSendEditingTransactionId is falsy and getSelectedToken is falsy', () => {
-      assert.deepEqual(getSubtitleParams({ e: null }), [ 'onlySendToEtherAddress' ])
+      assert.deepEqual(getSubtitleParams({ e: null }), [ 'onlySendToDexonAddress' ])
     })
   })
 
diff --git a/ui/app/components/shapeshift-form.js b/ui/app/components/shapeshift-form.js
index a842bcc8..14513959 100644
--- a/ui/app/components/shapeshift-form.js
+++ b/ui/app/components/shapeshift-form.js
@@ -58,7 +58,7 @@ function ShapeshiftForm () {
 }
 
 ShapeshiftForm.prototype.getCoinPair = function () {
-  return `${this.state.depositCoin.toUpperCase()}_ETH`
+  return `${this.state.depositCoin.toUpperCase()}_DEX`
 }
 
 ShapeshiftForm.prototype.componentWillMount = function () {
@@ -211,7 +211,7 @@ ShapeshiftForm.prototype.render = function () {
                 this.context.t('receive'),
               ]),
 
-              h('div.shapeshift-form__selector-input', ['ETH']),
+              h('div.shapeshift-form__selector-input', ['DEX']),
 
             ]),
 
diff --git a/ui/app/components/signature-request.js b/ui/app/components/signature-request.js
index 85af3b00..1c031ef8 100644
--- a/ui/app/components/signature-request.js
+++ b/ui/app/components/signature-request.js
@@ -122,7 +122,7 @@ SignatureRequest.prototype.renderBalance = function () {
 
     h('div.request-signature__balance-text', `${this.context.t('balance')}:`),
 
-    h('div.request-signature__balance-value', `${balanceInEther} ETH`),
+    h('div.request-signature__balance-value', `${balanceInEther} DEX`),
 
   ])
 }
diff --git a/ui/app/components/token-input/token-input.component.js b/ui/app/components/token-input/token-input.component.js
index 10fa1151..e85436b7 100644
--- a/ui/app/components/token-input/token-input.component.js
+++ b/ui/app/components/token-input/token-input.component.js
@@ -5,7 +5,7 @@ import CurrencyDisplay from '../currency-display'
 import { getWeiHexFromDecimalValue } from '../../helpers/conversions.util'
 import ethUtil from 'ethereumjs-util'
 import { conversionUtil, multiplyCurrencies } from '../../conversion-util'
-import { ETH } from '../../constants/common'
+import { DEX } from '../../constants/common'
 
 /**
  * Component that allows user to enter token values as a number, and props receive a converted
@@ -91,15 +91,15 @@ export default class TokenInput extends PureComponent {
       numberOfDecimals = 2
     } else {
       // Display ETH
-      currency = ETH
+      currency = DEX
       numberOfDecimals = 6
     }
 
     const decimalEthValue = (decimalValue * selectedTokenExchangeRate) || 0
     const hexWeiValue = getWeiHexFromDecimalValue({
       value: decimalEthValue,
-      fromCurrency: ETH,
-      fromDenomination: ETH,
+      fromCurrency: DEX,
+      fromDenomination: DEX,
     })
 
     return selectedTokenExchangeRate
diff --git a/ui/app/components/transaction-action/tests/transaction-action.component.test.js b/ui/app/components/transaction-action/tests/transaction-action.component.test.js
index b22a9db3..b2f33274 100644
--- a/ui/app/components/transaction-action/tests/transaction-action.component.test.js
+++ b/ui/app/components/transaction-action/tests/transaction-action.component.test.js
@@ -57,7 +57,7 @@ describe('TransactionAction Component', () => {
           gas: '0x5208',
           gasPrice: '0x3b9aca00',
           nonce: '0x96',
-          to: 'sentEtherAddress',
+          to: 'sentDexonAddress',
           value: '0x2386f26fc10000',
         },
       }
@@ -69,8 +69,8 @@ describe('TransactionAction Component', () => {
       />, { context: { t }})
 
       assert.equal(wrapper.find('.transaction-action').length, 1)
-      wrapper.setState({ transactionAction: 'sentEther' })
-      assert.equal(wrapper.text(), 'sentEther')
+      wrapper.setState({ transactionAction: 'sentDexon' })
+      assert.equal(wrapper.text(), 'sentDexon')
     })
 
     it('should render Approved', async () => {
diff --git a/ui/app/components/transaction-breakdown/transaction-breakdown.component.js b/ui/app/components/transaction-breakdown/transaction-breakdown.component.js
index 141e16e1..addb4006 100644
--- a/ui/app/components/transaction-breakdown/transaction-breakdown.component.js
+++ b/ui/app/components/transaction-breakdown/transaction-breakdown.component.js
@@ -5,7 +5,7 @@ import TransactionBreakdownRow from './transaction-breakdown-row'
 import CurrencyDisplay from '../currency-display'
 import UserPreferencedCurrencyDisplay from '../user-preferenced-currency-display'
 import HexToDecimal from '../hex-to-decimal'
-import { GWEI, PRIMARY, SECONDARY } from '../../constants/common'
+import { DEX, GWEI, PRIMARY, SECONDARY } from '../../constants/common'
 import { getHexGasTotal } from '../../helpers/confirm-transaction/util'
 import { sumHexes } from '../../helpers/transactions.util'
 
@@ -86,8 +86,10 @@ export default class TransactionBreakdown extends PureComponent {
             />
             <UserPreferencedCurrencyDisplay
               className="transaction-breakdown__value"
-              type={SECONDARY}
-              value={totalInHex}
+              currency={DEX}
+              denomination={GWEI}
+              value={gasPrice}
+              hideLabel
             />
           </div>
         </TransactionBreakdownRow>
diff --git a/ui/app/components/unit-input/index.scss b/ui/app/components/unit-input/index.scss
index 7995696a..7af91df9 100644
--- a/ui/app/components/unit-input/index.scss
+++ b/ui/app/components/unit-input/index.scss
@@ -1,9 +1,9 @@
 .unit-input {
   min-height: 54px;
-  border: 1px solid #dedede;
+  border: 1px solid $tundora;
   border-radius: 4px;
-  background-color: #fff;
-  color: #4d4d4d;
+  background-color: $dark-gray;
+  color: $dim-gray;
   font-size: 1rem;
   padding: 8px 10px;
   position: relative;
@@ -25,7 +25,7 @@
   }
 
   &__input {
-    color: #4d4d4d;
+    color: $white;
     font-size: 1rem;
     font-family: Roboto;
     border: none;
diff --git a/ui/app/components/user-preferenced-currency-display/tests/user-preferenced-currency-display.container.test.js b/ui/app/components/user-preferenced-currency-display/tests/user-preferenced-currency-display.container.test.js
index ba1c23d8..2232e825 100644
--- a/ui/app/components/user-preferenced-currency-display/tests/user-preferenced-currency-display.container.test.js
+++ b/ui/app/components/user-preferenced-currency-display/tests/user-preferenced-currency-display.container.test.js
@@ -46,8 +46,8 @@ describe('UserPreferencedCurrencyDisplay container', () => {
             type: 'PRIMARY',
           },
           result: {
-            currency: 'ETH',
             nativeCurrency: 'ETH',
+            currency: 'DEX',
             numberOfDecimals: 6,
             prefix: undefined,
           },
@@ -97,8 +97,7 @@ describe('UserPreferencedCurrencyDisplay container', () => {
             prefix: 'b',
           },
           result: {
-            currency: 'ETH',
-            nativeCurrency: 'ETH',
+            currency: 'DEX',
             numberOfDecimals: 3,
             prefix: 'b',
           },
diff --git a/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.component.js b/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.component.js
index f2a834ea..06d9c146 100644
--- a/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.component.js
+++ b/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.component.js
@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react'
 import PropTypes from 'prop-types'
-import { PRIMARY, SECONDARY, ETH } from '../../constants/common'
+import { PRIMARY, SECONDARY, DEX } from '../../constants/common'
 import CurrencyDisplay from '../currency-display'
 
 export default class UserPreferencedCurrencyDisplay extends PureComponent {
@@ -27,9 +27,9 @@ export default class UserPreferencedCurrencyDisplay extends PureComponent {
   renderEthLogo () {
     const { currency, showEthLogo, ethLogoHeight = 12 } = this.props
 
-    return currency === ETH && showEthLogo && (
+    return currency === DEX && showEthLogo && (
       <img
-        src="/images/eth.svg"
+        src="/images/dexon_logo.svg"
         height={ethLogoHeight}
       />
     )
diff --git a/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.container.js b/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.container.js
index 7999301a..af60aa1d 100644
--- a/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.container.js
+++ b/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.container.js
@@ -1,7 +1,7 @@
 import { connect } from 'react-redux'
 import UserPreferencedCurrencyDisplay from './user-preferenced-currency-display.component'
 import { preferencesSelector } from '../../selectors'
-import { ETH, PRIMARY, SECONDARY } from '../../constants/common'
+import { DEX, PRIMARY, SECONDARY } from '../../constants/common'
 
 const mapStateToProps = (state, ownProps) => {
   const { useNativeCurrencyAsPrimaryCurrency } = preferencesSelector(state)
@@ -30,7 +30,7 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
   if (type === PRIMARY && useNativeCurrencyAsPrimaryCurrency ||
     type === SECONDARY && !useNativeCurrencyAsPrimaryCurrency) {
     // Display ETH
-    currency = nativeCurrency || ETH
+    currency = nativeCurrency || DEX
     numberOfDecimals = propsNumberOfDecimals || ethNumberOfDecimals || 6
     prefix = propsPrefix || ethPrefix
   } else if (type === SECONDARY && useNativeCurrencyAsPrimaryCurrency ||
diff --git a/ui/app/constants/transactions.js b/ui/app/constants/transactions.js
index d0a819b9..92781c27 100644
--- a/ui/app/constants/transactions.js
+++ b/ui/app/constants/transactions.js
@@ -12,7 +12,7 @@ export const TOKEN_METHOD_TRANSFER = 'transfer'
 export const TOKEN_METHOD_APPROVE = 'approve'
 export const TOKEN_METHOD_TRANSFER_FROM = 'transferfrom'
 
-export const SEND_ETHER_ACTION_KEY = 'sentEther'
+export const SEND_DEXON_ACTION_KEY = 'sentDexon'
 export const DEPLOY_CONTRACT_ACTION_KEY = 'contractDeployment'
 export const APPROVE_ACTION_KEY = 'approve'
 export const SEND_TOKEN_ACTION_KEY = 'sentTokens'
diff --git a/ui/app/conversion-util.js b/ui/app/conversion-util.js
index 8cc53177..948ac3a0 100644
--- a/ui/app/conversion-util.js
+++ b/ui/app/conversion-util.js
@@ -53,12 +53,12 @@ const toBigNumber = {
 const toNormalizedDenomination = {
   WEI: bigNumber => bigNumber.div(BIG_NUMBER_WEI_MULTIPLIER),
   GWEI: bigNumber => bigNumber.div(BIG_NUMBER_GWEI_MULTIPLIER),
-  ETH: bigNumber => bigNumber.div(BIG_NUMBER_ETH_MULTIPLIER),
+  DEX: bigNumber => bigNumber.div(BIG_NUMBER_ETH_MULTIPLIER),
 }
 const toSpecifiedDenomination = {
   WEI: bigNumber => bigNumber.times(BIG_NUMBER_WEI_MULTIPLIER).round(),
   GWEI: bigNumber => bigNumber.times(BIG_NUMBER_GWEI_MULTIPLIER).round(9),
-  ETH: bigNumber => bigNumber.times(BIG_NUMBER_ETH_MULTIPLIER).round(9),
+  DEX: bigNumber => bigNumber.times(BIG_NUMBER_ETH_MULTIPLIER).round(9),
 }
 const baseChange = {
   hex: n => n.toString(16),
diff --git a/ui/app/css/itcss/settings/variables.scss b/ui/app/css/itcss/settings/variables.scss
index fee7ada6..b9dbf497 100644
--- a/ui/app/css/itcss/settings/variables.scss
+++ b/ui/app/css/itcss/settings/variables.scss
@@ -29,7 +29,6 @@ $alto: #dedede;
 $alabaster: #fafafa;
 $silver-chalice: #aeaeae;
 $concrete: #f3f3f3;
-$tundora: #4d4d4d;
 $nile-blue: #1b344d;
 $scorpion: #5d5d5d;
 $silver: #cdcdcd;
diff --git a/ui/app/helpers/confirm-transaction/util.js b/ui/app/helpers/confirm-transaction/util.js
index 0451824e..f3a9620f 100644
--- a/ui/app/helpers/confirm-transaction/util.js
+++ b/ui/app/helpers/confirm-transaction/util.js
@@ -64,7 +64,7 @@ export function getValueFromWeiHex ({
   return conversionUtil(value, {
     fromNumericBase: 'hex',
     toNumericBase: 'dec',
-    fromCurrency,
+    fromCurrency: 'DEX',
     toCurrency,
     numberOfDecimals,
     fromDenomination: 'WEI',
@@ -84,7 +84,7 @@ export function getTransactionFee ({
     fromNumericBase: 'BN',
     toNumericBase: 'dec',
     fromDenomination: 'WEI',
-    fromCurrency,
+    fromCurrency: 'DEX',
     toCurrency,
     numberOfDecimals,
     conversionRate,
diff --git a/ui/app/helpers/conversions.util.js b/ui/app/helpers/conversions.util.js
index 065d67e8..fee340c3 100644
--- a/ui/app/helpers/conversions.util.js
+++ b/ui/app/helpers/conversions.util.js
@@ -1,6 +1,6 @@
 import ethUtil from 'ethereumjs-util'
-import { ETH, GWEI, WEI } from '../constants/common'
 import { conversionUtil, addCurrencies } from '../conversion-util'
+import { DEX, GWEI, WEI } from '../constants/common'
 
 export function bnToHex (inputBn) {
   return ethUtil.addHexPrefix(inputBn.toString(16))
@@ -20,8 +20,8 @@ export function decimalToHex (decimal) {
   })
 }
 
-export function getEthConversionFromWeiHex ({ value, fromCurrency = ETH, conversionRate, numberOfDecimals = 6 }) {
-  const denominations = [fromCurrency, GWEI, WEI]
+export function getEthConversionFromWeiHex ({ value, conversionRate, numberOfDecimals = 6, fromCurrency = DEX }) {
+  const denominations = [DEX, GWEI, WEI]
 
   let nonZeroDenomination
 
@@ -46,7 +46,7 @@ export function getEthConversionFromWeiHex ({ value, fromCurrency = ETH, convers
 
 export function getValueFromWeiHex ({
   value,
-  fromCurrency = ETH,
+  fromCurrency = DEX,
   toCurrency,
   conversionRate,
   numberOfDecimals,
@@ -74,7 +74,7 @@ export function getWeiHexFromDecimalValue ({
   return conversionUtil(value, {
     fromNumericBase: 'dec',
     toNumericBase: 'hex',
-    toCurrency: ETH,
+    toCurrency: DEX,
     fromCurrency,
     conversionRate,
     invertConversionRate,
diff --git a/ui/app/helpers/transactions.util.js b/ui/app/helpers/transactions.util.js
index 0f1ed70a..32eaa3c6 100644
--- a/ui/app/helpers/transactions.util.js
+++ b/ui/app/helpers/transactions.util.js
@@ -11,7 +11,7 @@ import {
   TOKEN_METHOD_TRANSFER,
   TOKEN_METHOD_APPROVE,
   TOKEN_METHOD_TRANSFER_FROM,
-  SEND_ETHER_ACTION_KEY,
+  SEND_DEXON_ACTION_KEY,
   DEPLOY_CONTRACT_ACTION_KEY,
   APPROVE_ACTION_KEY,
   SEND_TOKEN_ACTION_KEY,
@@ -84,7 +84,7 @@ export async function getTransactionActionKey (transaction, methodData) {
     const toSmartContract = await isSmartContractAddress(to)
 
     if (!toSmartContract) {
-      return SEND_ETHER_ACTION_KEY
+      return SEND_DEXON_ACTION_KEY
     }
 
     const { name } = methodData
@@ -105,7 +105,7 @@ export async function getTransactionActionKey (transaction, methodData) {
         return undefined
     }
   } else {
-    return SEND_ETHER_ACTION_KEY
+    return SEND_DEXON_ACTION_KEY
   }
 }
 
diff --git a/ui/app/util.js b/ui/app/util.js
index 28f027e2..558a7d19 100644
--- a/ui/app/util.js
+++ b/ui/app/util.js
@@ -128,7 +128,7 @@ function parseBalance (balance) {
 
 // Takes wei hex, returns an object with three properties.
 // Its "formatted" property is what we generally use to render values.
-function formatBalance (balance, decimalsToKeep, needsParse = true, ticker = 'ETH') {
+function formatBalance (balance, decimalsToKeep, needsParse = true, ticker = 'DEX') {
   var parsed = needsParse ? parseBalance(balance) : balance.split('.')
   var beforeDecimal = parsed[0]
   var afterDecimal = parsed[1]