diff --git a/app-template/package-template.json b/app-template/package-template.json
index 3c92fdbbd..c4f6ec125 100644
--- a/app-template/package-template.json
+++ b/app-template/package-template.json
@@ -60,6 +60,7 @@
     "bower": "^1.7.9",
     "cordova-custom-config": "^3.0.5",
     "cordova-plugin-qrscanner": "^2.5.0",
+    "cordova-plugin-vibration": "^3.0.1",
     "coveralls": "^2.11.9",
     "express": "^4.11.2",
     "fs": "0.0.2",
diff --git a/i18n/po/template.pot b/i18n/po/template.pot
index d97008340..6a735121c 100644
--- a/i18n/po/template.pot
+++ b/i18n/po/template.pot
@@ -9,19 +9,19 @@ msgid "(Trusted)"
 msgstr ""
 
 #: www/views/includes/txp.html:23
-#: www/views/includes/walletHistory.html:64
+#: www/views/includes/walletHistory.html:68
 msgid "(possible double spend)"
 msgstr ""
 
-#: www/views/modals/txp-details.html:159
+#: www/views/modals/txp-details.html:170
 msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created."
 msgstr ""
 
-#: www/views/tx-details.html:82
+#: www/views/tx-details.html:118
 msgid "- {{btx.feeRateStr}} of the transaction"
 msgstr ""
 
-#: www/views/modals/txp-details.html:102
+#: www/views/modals/txp-details.html:113
 msgid "- {{tx.feeRateStr}} of the transaction"
 msgstr ""
 
@@ -34,26 +34,48 @@ msgstr ""
 msgid "<b>Only</b> redeemable on Mercado Livre (Brazil)"
 msgstr ""
 
+#: www/views/includes/walletSelector.html:40
+msgid ""
+"<img class=\"wallet-coin-logo\" src=\"img/icon-bitcoin.svg\" width=\"18\">\n"
+"    <span translate=\"\">Bitcoin Core (BTC)</span>"
+msgstr ""
+
+#: www/views/shapeshift.html:21
+msgid "<strong>From</strong>"
+msgstr ""
+
+#: www/views/signMessage.html:45
+msgid "<strong>Signed Message</strong>"
+msgstr ""
+
+#: www/views/shapeshift.html:44
+msgid "<strong>To</strong>"
+msgstr ""
+
+#: www/views/signMessage.html:12
+msgid "<strong>Wallet</strong>"
+msgstr ""
+
 #: src/js/controllers/feedback/send.js:27
 #: www/views/feedback/complete.html:21
 msgid "A member of the team will review your feedback as soon as possible."
 msgstr ""
 
-#: src/js/controllers/confirm.js:401
+#: src/js/controllers/confirm.js:437
 msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded."
 msgstr ""
 
-#: src/js/controllers/confirm.js:395
+#: src/js/controllers/confirm.js:431
 msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided."
 msgstr ""
 
 #: src/js/controllers/preferencesAbout.js:6
-#: www/views/tab-settings.html:156
+#: www/views/tab-settings.html:141
 msgid "About"
 msgstr ""
 
-#: src/js/controllers/modals/txpDetails.js:62
-#: src/js/controllers/tx-details.js:79
+#: src/js/controllers/modals/txpDetails.js:74
+#: src/js/controllers/tx-details.js:76
 msgid "Accepted"
 msgstr ""
 
@@ -61,7 +83,7 @@ msgstr ""
 msgid "Account"
 msgstr ""
 
-#: www/views/join.html:72
+#: www/views/join.html:70
 #: www/views/tab-create-personal.html:45
 #: www/views/tab-create-shared.html:74
 #: www/views/tab-import-hardware.html:19
@@ -97,7 +119,7 @@ msgstr ""
 msgid "Add Memo"
 msgstr ""
 
-#: www/views/join.html:87
+#: www/views/join.html:85
 #: www/views/tab-create-personal.html:59
 #: www/views/tab-create-shared.html:88
 msgid "Add a password"
@@ -107,17 +129,17 @@ msgstr ""
 msgid "Add account"
 msgstr ""
 
-#: www/views/join.html:90
+#: www/views/join.html:88
 #: www/views/tab-create-personal.html:62
 #: www/views/tab-create-shared.html:91
 msgid "Add an optional password to secure the recovery phrase"
 msgstr ""
 
-#: www/views/includes/incomingDataMenu.html:41
+#: www/views/includes/incomingDataMenu.html:18
 msgid "Add as a contact"
 msgstr ""
 
-#: src/js/controllers/confirm.js:424
+#: src/js/controllers/confirm.js:460
 msgid "Add description"
 msgstr ""
 
@@ -134,7 +156,7 @@ msgid "Add wallet"
 msgstr ""
 
 #: www/views/addressbook.view.html:26
-#: www/views/customAmount.html:28
+#: www/views/customAmount.html:55
 #: www/views/modals/paypro.html:24
 msgid "Address"
 msgstr ""
@@ -148,11 +170,20 @@ msgstr ""
 msgid "Address Type"
 msgstr ""
 
-#: www/views/addresses.html:64
+#: www/views/tab-receive.html:71
+msgid "Address Type:"
+msgstr ""
+
+#: www/views/addresses.html:41
+#: www/views/allAddresses.html:13
+msgid "Address type"
+msgstr ""
+
+#: www/views/addresses.html:77
 msgid "Addresses With Balance"
 msgstr ""
 
-#: www/views/tab-settings.html:149
+#: www/views/tab-settings.html:134
 msgid "Advanced"
 msgstr ""
 
@@ -184,12 +215,8 @@ msgstr ""
 msgid "Allow notifications"
 msgstr ""
 
-#: www/views/onboarding/disclaimer.html:14
-msgid "Almost done! Let's review."
-msgstr ""
-
 #: www/views/preferencesAltCurrency.html:4
-#: www/views/tab-settings.html:79
+#: www/views/tab-settings.html:64
 msgid "Alternative Currency"
 msgstr ""
 
@@ -197,8 +224,9 @@ msgstr ""
 msgid "Amazon.com is not available at this moment. Please try back later."
 msgstr ""
 
-#: www/views/amount.html:44
-#: www/views/customAmount.html:34
+#: www/views/amount.html:36
+#: www/views/amount.html:66
+#: www/views/customAmount.html:61
 #: www/views/includes/output.html:7
 msgid "Amount"
 msgstr ""
@@ -207,15 +235,11 @@ msgstr ""
 msgid "Amount below minimum allowed"
 msgstr ""
 
-#: src/js/controllers/confirm.js:216
+#: src/js/controllers/confirm.js:233
 msgid "Amount too big"
 msgstr ""
 
-#: www/views/includes/walletHistory.html:31
-msgid "Amount too low to spend"
-msgstr ""
-
-#: src/js/controllers/tab-home.js:147
+#: src/js/controllers/tab-home.js:153
 msgid "An update to this app is available. For your security, please update to the latest version."
 msgstr ""
 
@@ -223,7 +247,7 @@ msgstr ""
 msgid "Anyone with your backup phrase can access or spend your bitcoin."
 msgstr ""
 
-#: www/views/addresses.html:94
+#: www/views/addresses.html:110
 msgid "Approximate Bitcoin network fee to transfer wallet's balance (with normal priority)"
 msgstr ""
 
@@ -239,26 +263,22 @@ msgstr ""
 msgid "Are you sure you want to cancel and delete this wallet?"
 msgstr ""
 
-#: src/js/controllers/addressbookView.js:37
+#: src/js/controllers/addressbookView.js:45
 msgid "Are you sure you want to delete this contact?"
 msgstr ""
 
-#: src/js/controllers/preferencesDelete.js:25
+#: src/js/controllers/preferencesDelete.js:29
 msgid "Are you sure you want to delete this wallet?"
 msgstr ""
 
-#: src/js/controllers/modals/txpDetails.js:154
+#: src/js/controllers/modals/txpDetails.js:166
 msgid "Are you sure you want to reject this transaction?"
 msgstr ""
 
-#: src/js/controllers/modals/txpDetails.js:171
+#: src/js/controllers/modals/txpDetails.js:183
 msgid "Are you sure you want to remove this transaction?"
 msgstr ""
 
-#: src/js/controllers/onboarding/backupRequest.js:23
-msgid "Are you sure you want to skip it?"
-msgstr ""
-
 #: www/views/modals/bitpay-card-confirmation.html:4
 msgid "Are you sure you would like to log out of your BitPay Card account?"
 msgstr ""
@@ -268,7 +288,7 @@ msgstr ""
 msgid "Are you sure you would like to remove your BitPay Card ({{lastFourDigits}}) from this device?"
 msgstr ""
 
-#: www/views/includes/walletInfo.html:10
+#: www/views/includes/walletInfo.html:11
 msgid "Auditable"
 msgstr ""
 
@@ -285,7 +305,7 @@ msgstr ""
 msgid "Average confirmation time"
 msgstr ""
 
-#: www/views/join.html:143
+#: www/views/join.html:141
 #: www/views/tab-create-personal.html:113
 #: www/views/tab-create-shared.html:142
 #: www/views/tab-import-phrase.html:51
@@ -318,7 +338,6 @@ msgstr ""
 msgid "Backup now"
 msgstr ""
 
-#: www/views/onboarding/backupRequest.html:11
 #: www/views/tab-export-file.html:89
 msgid "Backup wallet"
 msgstr ""
@@ -327,7 +346,7 @@ msgstr ""
 msgid "Backup your wallet before using this function"
 msgstr ""
 
-#: src/js/services/profileService.js:446
+#: src/js/services/profileService.js:463
 msgid "Bad wallet invitation"
 msgstr ""
 
@@ -344,49 +363,54 @@ msgid "BitPay Visa&reg; Cards"
 msgstr ""
 
 #: www/views/addressbook.add.html:38
-#: www/views/includes/incomingDataMenu.html:29
+#: www/views/includes/incomingDataMenu.html:6
 msgid "Bitcoin Address"
 msgstr ""
 
+#: www/views/includes/walletSelector.html:11
+#: www/views/tab-home.html:69
+#: www/views/tab-settings.html:92
+msgid "Bitcoin Cash (BCH)"
+msgstr ""
+
 #: www/views/cashScan.html:4
 msgid "Bitcoin Cash (BCH) Balances"
 msgstr ""
 
-#: www/views/preferencesCash.html:3
-#: www/views/tab-settings.html:47
-msgid "Bitcoin Cash Support"
+#: www/views/preferencesFee.html:20
+msgid "Bitcoin Cash (BCH) rate for this policy"
 msgstr ""
 
-#: www/views/tab-home.html:98
-#: www/views/tab-settings.html:115
-msgid "Bitcoin Cash Wallets"
+#: www/views/paperWallet.html:11
+msgid "Bitcoin Cash found:"
+msgstr ""
+
+#: www/views/includes/walletSelector.html:42
+#: www/views/tab-home.html:85
+#: www/views/tab-settings.html:100
+msgid "Bitcoin Core (BTC)"
+msgstr ""
+
+#: www/views/preferencesFee.html:25
+msgid "Bitcoin Core (BTC) rate for this policy"
+msgstr ""
+
+#: www/views/advancedSettings.html:36
+msgid "Bitcoin Core Wallet"
 msgstr ""
 
 #: www/views/modals/chooseFeeLevel.html:4
 #: www/views/preferencesFee.html:4
-#: www/views/tab-settings.html:90
+#: www/views/tab-settings.html:75
 msgid "Bitcoin Network Fee Policy"
 msgstr ""
 
-#: www/views/tab-home.html:83
-#: www/views/tab-settings.html:107
-msgid "Bitcoin Core Wallets"
-msgstr ""
-
-#: src/js/services/incomingData.js:151
+#: src/js/services/incomingData.js:200
 msgid "Bitcoin cash Payment"
 msgstr ""
 
-#: www/views/onboarding/tour.html:31
-msgid "Bitcoin is a currency."
-msgstr ""
-
-#: www/views/onboarding/disclaimer.html:15
-msgid "Bitcoin is different &ndash; it cannot be safely held with a bank or web service."
-msgstr ""
-
-#: www/views/onboarding/tour.html:18
-msgid "Bitcoin is secure,<br>digital money."
+#: www/views/paperWallet.html:60
+msgid "Bitcoin found:"
 msgstr ""
 
 #: www/views/preferencesFee.html:11
@@ -401,8 +425,8 @@ msgstr ""
 msgid "Broadcast Payment"
 msgstr ""
 
-#: src/js/controllers/modals/txpDetails.js:64
-#: src/js/controllers/tx-details.js:81
+#: src/js/controllers/modals/txpDetails.js:76
+#: src/js/controllers/tx-details.js:78
 msgid "Broadcasted"
 msgstr ""
 
@@ -419,10 +443,6 @@ msgstr ""
 msgid "Buy"
 msgstr ""
 
-#: www/views/includes/buyAndSellCard.html:3
-msgid "Buy &amp; Sell Bitcoin"
-msgstr ""
-
 #: www/views/tab-send.html:35
 msgid "Buy Bitcoin"
 msgstr ""
@@ -432,11 +452,15 @@ msgstr ""
 msgid "Buy a Gift Card"
 msgstr ""
 
-#: src/js/controllers/buyAmazon.js:334
+#: www/views/includes/buyAndSellCard.html:3
+msgid "Buy bitcoin"
+msgstr ""
+
+#: src/js/controllers/buyAmazon.js:335
 msgid "Buy from"
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:40
+#: src/js/services/onGoingProcess.js:41
 msgid "Buying Bitcoin..."
 msgstr ""
 
@@ -444,19 +468,17 @@ msgstr ""
 msgid "Calculating fee"
 msgstr ""
 
-#: src/js/controllers/buyAmazon.js:313
-#: src/js/controllers/buyMercadoLibre.js:307
-#: src/js/controllers/confirm.js:550
-#: src/js/controllers/topup.js:287
-#: src/js/services/incomingData.js:154
+#: src/js/controllers/buyAmazon.js:314
+#: src/js/controllers/buyMercadoLibre.js:308
+#: src/js/controllers/topup.js:288
+#: src/js/services/incomingData.js:203
 #: src/js/services/popupService.js:62
 #: src/js/services/popupService.js:73
 #: www/views/addressbook.add.html:10
 #: www/views/feedback/send.html:5
-#: www/views/includes/incomingDataMenu.html:22
-#: www/views/includes/incomingDataMenu.html:54
-#: www/views/includes/incomingDataMenu.html:73
-#: www/views/includes/incomingDataMenu.html:97
+#: www/views/includes/incomingDataMenu.html:31
+#: www/views/includes/incomingDataMenu.html:50
+#: www/views/includes/incomingDataMenu.html:74
 #: www/views/includes/note.html:6
 #: www/views/modals/bitpay-card-confirmation.html:8
 #: www/views/modals/confirmation.html:13
@@ -467,11 +489,11 @@ msgstr ""
 msgid "Cancel invitation"
 msgstr ""
 
-#: src/js/controllers/onboarding/tour.js:52
+#: src/js/controllers/onboarding/tour.js:57
 msgid "Cannot Create Wallet"
 msgstr ""
 
-#: src/js/services/profileService.js:442
+#: src/js/services/profileService.js:459
 msgid "Cannot join the same wallet more that once"
 msgstr ""
 
@@ -499,7 +521,7 @@ msgstr ""
 msgid "Choose your source wallet"
 msgstr ""
 
-#: www/views/backup.html:61
+#: www/views/backup.html:63
 msgid "Clear"
 msgstr ""
 
@@ -507,17 +529,17 @@ msgstr ""
 msgid "Clear cache"
 msgstr ""
 
-#: src/js/controllers/confirm.js:373
-#: src/js/controllers/modals/txpDetails.js:49
+#: src/js/controllers/confirm.js:409
+#: src/js/controllers/modals/txpDetails.js:61
 msgid "Click to accept"
 msgstr ""
 
-#: src/js/controllers/confirm.js:367
+#: src/js/controllers/confirm.js:403
 msgid "Click to pay"
 msgstr ""
 
-#: src/js/controllers/confirm.js:379
-#: src/js/controllers/modals/txpDetails.js:42
+#: src/js/controllers/confirm.js:415
+#: src/js/controllers/modals/txpDetails.js:54
 msgid "Click to send"
 msgstr ""
 
@@ -531,6 +553,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: www/views/addressbook.add.html:54
+#: www/views/addressbook.view.html:30
 #: www/views/includes/cash.html:2
 #: www/views/preferencesInformation.html:17
 msgid "Coin"
@@ -544,6 +568,10 @@ msgstr ""
 msgid "Commit hash"
 msgstr ""
 
+#: www/views/includes/community.html:3
+msgid "Community"
+msgstr ""
+
 #: www/views/preferences.html:49
 msgid "Complete the backup process to use this option"
 msgstr ""
@@ -552,20 +580,18 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/js/controllers/buyAmazon.js:311
-#: src/js/controllers/buyMercadoLibre.js:305
-#: src/js/controllers/confirm.js:549
+#: src/js/controllers/buyAmazon.js:312
+#: src/js/controllers/buyMercadoLibre.js:306
 #: src/js/controllers/copayers.js:55
-#: src/js/controllers/topup.js:285
-#: www/views/backup.html:60
-#: www/views/backup.html:79
+#: src/js/controllers/topup.js:286
+#: www/views/backup.html:62
+#: www/views/backup.html:81
 #: www/views/confirm.html:4
 #: www/views/onboarding/collectEmail.html:32
 msgid "Confirm"
 msgstr ""
 
 #: www/views/modals/terms.html:26
-#: www/views/onboarding/disclaimer.html:44
 msgid "Confirm &amp; Finish"
 msgstr ""
 
@@ -577,11 +603,11 @@ msgstr ""
 msgid "Confirm your PIN"
 msgstr ""
 
-#: src/js/services/walletService.js:1033
+#: src/js/services/walletService.js:1068
 msgid "Confirm your new spending password"
 msgstr ""
 
-#: www/views/tx-details.html:98
+#: www/views/tx-details.html:134
 msgid "Confirmations"
 msgstr ""
 
@@ -602,6 +628,10 @@ msgstr ""
 msgid "Connecting to Glidera..."
 msgstr ""
 
+#: src/js/services/onGoingProcess.js:16
+msgid "Connecting to Shapeshift..."
+msgstr ""
+
 #: src/js/services/bwcError.js:53
 msgid "Connection reset by peer"
 msgstr ""
@@ -618,10 +648,6 @@ msgstr ""
 msgid "Contribute Translations"
 msgstr ""
 
-#: src/js/controllers/confirm.js:130
-msgid "Copay only supports Bitcoin Cash using new version numbers addresses"
-msgstr ""
-
 #: src/js/services/bwcError.js:62
 msgid "Copayer already in this wallet"
 msgstr ""
@@ -652,14 +678,18 @@ msgstr ""
 msgid "Copy this text as it is to a safe place (notepad or email)"
 msgstr ""
 
-#: www/views/includes/incomingDataMenu.html:51
-#: www/views/includes/incomingDataMenu.html:70
-#: www/views/includes/incomingDataMenu.html:94
+#: www/views/includes/incomingDataMenu.html:28
+#: www/views/includes/incomingDataMenu.html:47
+#: www/views/includes/incomingDataMenu.html:71
 #: www/views/includes/logOptions.html:9
 #: www/views/tab-export-file.html:78
 msgid "Copy to clipboard"
 msgstr ""
 
+#: src/js/services/payproService.js:30
+msgid "Could Not Fetch Payment: Check if it is still valid"
+msgstr ""
+
 #: src/js/controllers/buyMercadoLibre.js:102
 msgid "Could not access Gift Card Service"
 msgstr ""
@@ -672,15 +702,15 @@ msgstr ""
 msgid "Could not access to Amazon.com"
 msgstr ""
 
-#: src/js/services/profileService.js:511
+#: src/js/services/profileService.js:527
 msgid "Could not access wallet"
 msgstr ""
 
-#: src/js/controllers/confirm.js:210
+#: src/js/controllers/confirm.js:227
 msgid "Could not add message to imported wallet without shared encrypting key"
 msgstr ""
 
-#: src/js/controllers/modals/txpDetails.js:199
+#: src/js/controllers/modals/txpDetails.js:210
 msgid "Could not broadcast payment"
 msgstr ""
 
@@ -688,7 +718,7 @@ msgstr ""
 msgid "Could not build transaction"
 msgstr ""
 
-#: src/js/services/walletService.js:854
+#: src/js/services/walletService.js:889
 msgid "Could not create address"
 msgstr ""
 
@@ -702,23 +732,23 @@ msgstr ""
 msgid "Could not create transaction"
 msgstr ""
 
-#: src/js/services/profileService.js:350
+#: src/js/services/profileService.js:366
 msgid "Could not create using the specified extended private key"
 msgstr ""
 
-#: src/js/services/profileService.js:362
+#: src/js/services/profileService.js:378
 msgid "Could not create using the specified extended public key"
 msgstr ""
 
-#: src/js/services/profileService.js:338
+#: src/js/services/profileService.js:354
 msgid "Could not create: Invalid wallet recovery phrase"
 msgstr ""
 
-#: src/js/controllers/import.js:114
+#: src/js/controllers/import.js:121
 msgid "Could not decrypt file, check your password"
 msgstr ""
 
-#: src/js/controllers/modals/txpDetails.js:181
+#: src/js/controllers/modals/txpDetails.js:193
 msgid "Could not delete payment proposal"
 msgstr ""
 
@@ -726,11 +756,11 @@ msgstr ""
 msgid "Could not duplicate"
 msgstr ""
 
-#: src/js/services/feeService.js:73
+#: src/js/services/feeService.js:82
 msgid "Could not get dynamic fee"
 msgstr ""
 
-#: src/js/services/feeService.js:43
+#: src/js/services/feeService.js:46
 msgid "Could not get dynamic fee for level: {{feeLevel}}"
 msgstr ""
 
@@ -748,21 +778,21 @@ msgstr ""
 msgid "Could not get transactions"
 msgstr ""
 
-#: src/js/services/profileService.js:615
-#: src/js/services/profileService.js:650
-#: src/js/services/profileService.js:674
+#: src/js/services/profileService.js:634
+#: src/js/services/profileService.js:669
+#: src/js/services/profileService.js:693
 msgid "Could not import"
 msgstr ""
 
-#: src/js/services/profileService.js:584
+#: src/js/services/profileService.js:603
 msgid "Could not import. Check input file and spending password"
 msgstr ""
 
-#: src/js/services/profileService.js:457
+#: src/js/services/profileService.js:474
 msgid "Could not join wallet"
 msgstr ""
 
-#: src/js/controllers/modals/txpDetails.js:161
+#: src/js/controllers/modals/txpDetails.js:173
 msgid "Could not reject payment"
 msgstr ""
 
@@ -775,21 +805,21 @@ msgstr ""
 msgid "Could not remove card"
 msgstr ""
 
-#: src/js/services/walletService.js:776
+#: src/js/services/walletService.js:811
 msgid "Could not save preferences on the server"
 msgstr ""
 
-#: src/js/controllers/modals/txpDetails.js:147
+#: src/js/controllers/modals/txpDetails.js:159
 msgid "Could not send payment"
 msgstr ""
 
-#: src/js/controllers/buyAmazon.js:325
-#: src/js/controllers/buyMercadoLibre.js:318
-#: src/js/controllers/topup.js:299
+#: src/js/controllers/buyAmazon.js:326
+#: src/js/controllers/buyMercadoLibre.js:319
+#: src/js/controllers/topup.js:300
 msgid "Could not send transaction"
 msgstr ""
 
-#: www/views/walletDetails.html:210
+#: www/views/walletDetails.html:208
 msgid "Could not update transaction history"
 msgstr ""
 
@@ -808,8 +838,7 @@ msgstr ""
 msgid "Create Shared Wallet"
 msgstr ""
 
-#: www/views/onboarding/tour.html:51
-#: www/views/tab-home.html:75
+#: www/views/onboarding/tour.html:12
 #: www/views/tab-send.html:36
 msgid "Create bitcoin wallet"
 msgstr ""
@@ -826,24 +855,24 @@ msgstr ""
 msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
 msgstr ""
 
-#: www/views/modals/txp-details.html:81
-#: www/views/tx-details.html:60
+#: www/views/modals/txp-details.html:92
+#: www/views/tx-details.html:97
 msgid "Created by"
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:18
+#: src/js/services/onGoingProcess.js:19
 msgid "Creating Wallet..."
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:17
+#: src/js/services/onGoingProcess.js:18
 msgid "Creating transaction"
 msgstr ""
 
 #: www/views/modals/chooseFeeLevel.html:34
-#: www/views/preferencesFee.html:20
 msgid "Current fee rate for this policy"
 msgstr ""
 
+#: src/js/controllers/confirm.js:310
 #: src/js/services/feeService.js:15
 msgid "Custom"
 msgstr ""
@@ -852,13 +881,13 @@ msgstr ""
 msgid "Custom Amount"
 msgstr ""
 
-#: src/js/controllers/preferencesFee.js:85
+#: src/js/controllers/preferencesFee.js:123
 msgid "Custom Fee"
 msgstr ""
 
 #: www/views/modals/mercadolibre-card-details.html:56
-#: www/views/modals/txp-details.html:87
-#: www/views/tx-details.html:66
+#: www/views/modals/txp-details.html:98
+#: www/views/tx-details.html:103
 msgid "Date"
 msgstr ""
 
@@ -866,7 +895,7 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: www/views/modals/txp-details.html:164
+#: www/views/modals/txp-details.html:175
 msgid "Delete Payment Proposal"
 msgstr ""
 
@@ -879,15 +908,15 @@ msgstr ""
 msgid "Delete it and create a new one"
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:19
+#: src/js/services/onGoingProcess.js:20
 msgid "Deleting Wallet..."
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:28
+#: src/js/services/onGoingProcess.js:29
 msgid "Deleting payment proposal"
 msgstr ""
 
-#: www/views/join.html:141
+#: www/views/join.html:139
 #: www/views/tab-create-personal.html:111
 #: www/views/tab-create-shared.html:140
 #: www/views/tab-import-phrase.html:49
@@ -907,12 +936,28 @@ msgstr ""
 
 #: src/js/controllers/lockSetup.js:9
 #: src/js/controllers/tab-settings.js:65
-#: www/views/tab-settings.html:50
 msgid "Disabled"
 msgstr ""
 
+#: www/views/customAmount.html:49
+msgid "Display BitPay address"
+msgstr ""
+
+#: www/views/customAmount.html:44
+#: www/views/modals/txp-details.html:65
+#: www/views/tx-details.html:59
+#: www/views/tx-details.html:89
+msgid "Display legacy address"
+msgstr ""
+
+#: www/views/customAmount.html:39
+#: www/views/modals/txp-details.html:68
+#: www/views/tx-details.html:62
+#: www/views/tx-details.html:92
+msgid "Display new style address"
+msgstr ""
+
 #: www/views/includes/backupNeededPopup.html:10
-#: www/views/onboarding/backupRequest.html:12
 msgid "Do it later"
 msgstr ""
 
@@ -925,7 +970,7 @@ msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd lo
 msgstr ""
 
 #: www/views/tab-export-file.html:59
-#: www/views/tab-home.html:22
+#: www/views/tab-home.html:21
 msgid "Download"
 msgstr ""
 
@@ -933,7 +978,7 @@ msgstr ""
 msgid "Duplicate for BCH"
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:49
+#: src/js/services/onGoingProcess.js:50
 msgid "Duplicating wallet..."
 msgstr ""
 
@@ -954,7 +999,7 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: www/views/preferencesNotifications.html:42
+#: www/views/preferencesNotifications.html:46
 msgid "Email Address"
 msgstr ""
 
@@ -962,10 +1007,6 @@ msgstr ""
 msgid "Empty addresses limit reached. New addresses cannot be generated."
 msgstr ""
 
-#: www/views/preferencesCash.html:17
-msgid "Enable Bitcoin Cash wallet creation and operation within the App."
-msgstr ""
-
 #: www/views/tab-scan.html:19
 msgid "Enable camera access in your device settings to get started."
 msgstr ""
@@ -986,12 +1027,8 @@ msgstr ""
 msgid "Enable the camera to get started."
 msgstr ""
 
-#: www/views/tab-settings.html:49
-msgid "Enabled"
-msgstr ""
-
-#: src/js/services/walletService.js:1047
-#: src/js/services/walletService.js:1062
+#: src/js/services/walletService.js:1082
+#: src/js/services/walletService.js:1097
 msgid "Enter Spending Password"
 msgstr ""
 
@@ -1007,11 +1044,11 @@ msgstr ""
 msgid "Enter custom fee"
 msgstr ""
 
-#: src/js/services/walletService.js:1029
+#: src/js/services/walletService.js:1064
 msgid "Enter new spending password"
 msgstr ""
 
-#: www/views/join.html:79
+#: www/views/join.html:77
 #: www/views/tab-create-personal.html:51
 #: www/views/tab-create-shared.html:80
 msgid "Enter the recovery phrase (BIP39)"
@@ -1021,16 +1058,16 @@ msgstr ""
 msgid "Enter your email"
 msgstr ""
 
-#: www/views/backup.html:69
+#: www/views/backup.html:71
 msgid "Enter your password"
 msgstr ""
 
 #. Trying to import a malformed wallet export QR code
-#: src/js/controllers/activity.js:45
-#: src/js/controllers/addressbookAdd.js:30
-#: src/js/controllers/addressbookView.js:42
-#: src/js/controllers/addresses.js:125
-#: src/js/controllers/addresses.js:126
+#: src/js/controllers/activity.js:66
+#: src/js/controllers/addressbookAdd.js:41
+#: src/js/controllers/addressbookView.js:50
+#: src/js/controllers/addresses.js:144
+#: src/js/controllers/addresses.js:145
 #: src/js/controllers/bitpayCard.js:66
 #: src/js/controllers/bitpayCardIntro.js:40
 #: src/js/controllers/bitpayCardIntro.js:81
@@ -1038,15 +1075,16 @@ msgstr ""
 #: src/js/controllers/buyAmazon.js:35
 #: src/js/controllers/buyMercadoLibre.js:24
 #: src/js/controllers/buyMercadoLibre.js:35
-#: src/js/controllers/confirm.js:307
+#: src/js/controllers/confirm.js:335
+#: src/js/controllers/confirm.js:360
 #: src/js/controllers/copayers.js:67
-#: src/js/controllers/create.js:161
-#: src/js/controllers/create.js:174
-#: src/js/controllers/create.js:180
+#: src/js/controllers/create.js:173
 #: src/js/controllers/create.js:186
-#: src/js/controllers/create.js:208
-#: src/js/controllers/create.js:215
-#: src/js/controllers/create.js:233
+#: src/js/controllers/create.js:192
+#: src/js/controllers/create.js:198
+#: src/js/controllers/create.js:220
+#: src/js/controllers/create.js:227
+#: src/js/controllers/create.js:246
 #: src/js/controllers/export.js:109
 #: src/js/controllers/export.js:115
 #: src/js/controllers/export.js:126
@@ -1056,55 +1094,57 @@ msgstr ""
 #: src/js/controllers/export.js:47
 #: src/js/controllers/export.js:53
 #: src/js/controllers/feedback/send.js:23
-#: src/js/controllers/import.js:119
-#: src/js/controllers/import.js:131
-#: src/js/controllers/import.js:149
-#: src/js/controllers/import.js:200
-#: src/js/controllers/import.js:229
-#: src/js/controllers/import.js:238
-#: src/js/controllers/import.js:254
-#: src/js/controllers/import.js:266
-#: src/js/controllers/import.js:278
-#: src/js/controllers/import.js:288
-#: src/js/controllers/import.js:312
-#: src/js/controllers/import.js:325
-#: src/js/controllers/import.js:335
-#: src/js/controllers/import.js:345
-#: src/js/controllers/import.js:369
-#: src/js/controllers/import.js:382
-#: src/js/controllers/import.js:85
-#: src/js/controllers/import.js:98
-#: src/js/controllers/join.js:125
-#: src/js/controllers/join.js:139
-#: src/js/controllers/join.js:145
-#: src/js/controllers/join.js:151
-#: src/js/controllers/join.js:174
-#: src/js/controllers/join.js:182
-#: src/js/controllers/join.js:200
+#: src/js/controllers/import.js:105
+#: src/js/controllers/import.js:126
+#: src/js/controllers/import.js:138
+#: src/js/controllers/import.js:156
+#: src/js/controllers/import.js:207
+#: src/js/controllers/import.js:236
+#: src/js/controllers/import.js:245
+#: src/js/controllers/import.js:261
+#: src/js/controllers/import.js:273
+#: src/js/controllers/import.js:285
+#: src/js/controllers/import.js:295
+#: src/js/controllers/import.js:319
+#: src/js/controllers/import.js:332
+#: src/js/controllers/import.js:342
+#: src/js/controllers/import.js:352
+#: src/js/controllers/import.js:376
+#: src/js/controllers/import.js:389
+#: src/js/controllers/import.js:92
+#: src/js/controllers/join.js:144
+#: src/js/controllers/join.js:158
+#: src/js/controllers/join.js:164
+#: src/js/controllers/join.js:170
+#: src/js/controllers/join.js:193
+#: src/js/controllers/join.js:201
+#: src/js/controllers/join.js:219
 #: src/js/controllers/modals/feeLevels.js:9
-#: src/js/controllers/modals/txpDetails.js:140
-#: src/js/controllers/paperWallet.js:47
+#: src/js/controllers/modals/txpDetails.js:152
+#: src/js/controllers/onboarding/tour.js:100
 #: src/js/controllers/preferencesBitpayCard.js:20
 #: src/js/controllers/preferencesBitpayServices.js:33
 #: src/js/controllers/preferencesBitpayServices.js:50
-#: src/js/controllers/preferencesDelete.js:36
+#: src/js/controllers/preferencesDelete.js:40
 #: src/js/controllers/preferencesExternal.js:20
-#: src/js/controllers/tab-home.js:174
-#: src/js/controllers/tab-send.js:143
+#: src/js/controllers/tab-home.js:180
+#: src/js/controllers/tab-send.js:142
 #: src/js/controllers/tabsController.js:36
 #: src/js/controllers/tabsController.js:7
 #: src/js/controllers/topup.js:21
 #: src/js/controllers/topup.js:32
-#: src/js/controllers/tx-details.js:119
-#: src/js/services/incomingData.js:101
+#: src/js/controllers/tx-details.js:116
+#: src/js/services/incomingData.js:117
 #: src/js/services/incomingData.js:125
-#: src/js/services/incomingData.js:168
+#: src/js/services/incomingData.js:150
+#: src/js/services/incomingData.js:174
+#: src/js/services/incomingData.js:217
 #: www/views/mercadoLibreCards.html:19
 #: www/views/modals/mercadolibre-card-details.html:45
 msgid "Error"
 msgstr ""
 
-#: src/js/controllers/confirm.js:502
+#: src/js/controllers/confirm.js:541
 msgid "Error at confirm"
 msgstr ""
 
@@ -1117,11 +1157,11 @@ msgstr ""
 msgid "Error creating the invoice"
 msgstr ""
 
-#: src/js/services/profileService.js:412
+#: src/js/services/profileService.js:428
 msgid "Error creating wallet"
 msgstr ""
 
-#: src/js/controllers/confirm.js:296
+#: src/js/controllers/confirm.js:324
 msgid "Error getting SendMax information"
 msgstr ""
 
@@ -1135,11 +1175,11 @@ msgstr ""
 msgid "Error pairing BitPay Account"
 msgstr ""
 
-#: src/js/controllers/paperWallet.js:41
+#: src/js/controllers/paperWallet.js:67
 msgid "Error scanning funds:"
 msgstr ""
 
-#: src/js/controllers/paperWallet.js:90
+#: src/js/controllers/paperWallet.js:127
 msgid "Error sweeping wallet:"
 msgstr ""
 
@@ -1151,19 +1191,23 @@ msgstr ""
 msgid "Exceeded daily limit of $500 per user"
 msgstr ""
 
-#: src/js/controllers/confirm.js:461
+#: src/js/controllers/confirm.js:497
 #: www/views/confirm.html:27
 #: www/views/mercadoLibreCards.html:25
 #: www/views/modals/mercadolibre-card-details.html:34
-#: www/views/modals/txp-details.html:119
+#: www/views/modals/txp-details.html:130
 msgid "Expired"
 msgstr ""
 
 #: www/views/modals/paypro.html:54
-#: www/views/modals/txp-details.html:125
+#: www/views/modals/txp-details.html:136
 msgid "Expires"
 msgstr ""
 
+#: www/views/includes/nextSteps.html:3
+msgid "Explore Bitcoin.com"
+msgstr ""
+
 #: www/views/preferencesAdvanced.html:21
 msgid "Export Wallet"
 msgstr ""
@@ -1177,7 +1221,7 @@ msgstr ""
 msgid "Export wallet"
 msgstr ""
 
-#: src/js/services/walletService.js:1174
+#: src/js/services/walletService.js:1214
 #: www/views/tab-export-qrCode.html:9
 msgid "Exporting via QR not supported for this wallet"
 msgstr ""
@@ -1186,7 +1230,7 @@ msgstr ""
 msgid "Extended Public Keys"
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:20
+#: src/js/services/onGoingProcess.js:21
 msgid "Extracting Wallet information..."
 msgstr ""
 
@@ -1203,7 +1247,7 @@ msgstr ""
 msgid "Family vacation funds"
 msgstr ""
 
-#: www/views/tx-details.html:79
+#: www/views/tx-details.html:115
 msgid "Fee"
 msgstr ""
 
@@ -1216,7 +1260,7 @@ msgid "Fee level is not defined"
 msgstr ""
 
 #: www/views/confirm.html:79
-#: www/views/modals/txp-details.html:99
+#: www/views/modals/txp-details.html:110
 msgid "Fee:"
 msgstr ""
 
@@ -1224,11 +1268,11 @@ msgstr ""
 msgid "Feedback could not be submitted. Please try again later."
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:42
+#: src/js/services/onGoingProcess.js:43
 msgid "Fetching BitPay Account..."
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:21
+#: src/js/services/onGoingProcess.js:22
 msgid "Fetching payment information"
 msgstr ""
 
@@ -1256,13 +1300,13 @@ msgstr ""
 msgid "For audit purposes"
 msgstr ""
 
-#: src/js/controllers/topup.js:308
+#: src/js/controllers/topup.js:309
 #: www/views/buyAmazon.html:29
 #: www/views/buyMercadoLibre.html:28
 #: www/views/confirm.html:65
-#: www/views/modals/txp-details.html:74
+#: www/views/modals/txp-details.html:85
 #: www/views/topup.html:34
-#: www/views/tx-details.html:52
+#: www/views/tx-details.html:67
 msgid "From"
 msgstr ""
 
@@ -1282,15 +1326,11 @@ msgstr ""
 msgid "Funds are locked by pending spend proposals"
 msgstr ""
 
-#: www/views/paperWallet.html:16
-msgid "Funds found:"
-msgstr ""
-
 #: www/views/topup.html:49
 msgid "Funds to be added"
 msgstr ""
 
-#: www/views/paperWallet.html:51
+#: www/views/paperWallet.html:111
 msgid "Funds transferred"
 msgstr ""
 
@@ -1299,6 +1339,7 @@ msgid "Funds were added to debit card"
 msgstr ""
 
 #: www/views/paperWallet.html:22
+#: www/views/paperWallet.html:71
 msgid "Funds will be transferred to"
 msgstr ""
 
@@ -1306,11 +1347,11 @@ msgstr ""
 msgid "Generate new address"
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:22
+#: src/js/services/onGoingProcess.js:23
 msgid "Generating .csv file..."
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:37
+#: src/js/services/onGoingProcess.js:38
 msgid "Generating new address..."
 msgstr ""
 
@@ -1319,12 +1360,7 @@ msgid "Get local cash anywhere you go, from any Visa<sup>&reg;</sup> compatible
 msgstr ""
 
 #: www/views/onboarding/collectEmail.html:15
-msgid "Get news and updates from BitPay"
-msgstr ""
-
-#: www/views/onboarding/welcome.html:8
-msgctxt "button"
-msgid "Get started"
+msgid "Get news and updates from Bitcoin.com"
 msgstr ""
 
 #: www/views/bitpayCard.html:49
@@ -1335,7 +1371,7 @@ msgstr ""
 msgid "Get started by adding your first one."
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:23
+#: src/js/services/onGoingProcess.js:24
 msgid "Getting fee levels..."
 msgstr ""
 
@@ -1360,28 +1396,24 @@ msgstr ""
 #: src/js/controllers/bitpayCard.js:114
 #: src/js/controllers/bitpayCard.js:124
 #: src/js/controllers/cashScan.js:20
-#: src/js/controllers/onboarding/terms.js:23
 #: src/js/controllers/preferences.js:67
 #: src/js/controllers/preferencesAbout.js:16
-#: src/js/controllers/preferencesCash.js:34
+#: src/js/controllers/preferencesAbout.js:26
 #: src/js/controllers/preferencesLanguage.js:14
-#: src/js/controllers/tab-home.js:149
+#: src/js/controllers/tab-home.js:155
 #: src/js/controllers/tab-settings.js:53
-#: src/js/controllers/tx-details.js:193
-#: src/js/controllers/tx-details.js:56
+#: src/js/controllers/tx-details.js:208
+#: src/js/controllers/tx-details.js:53
 msgid "Go Back"
 msgstr ""
 
-#: src/js/controllers/confirm.js:131
-#: src/js/controllers/onboarding/backupRequest.js:20
-#: src/js/controllers/onboarding/backupRequest.js:26
+#: src/js/controllers/confirm.js:139
 #: src/js/services/bitpayAccountService.js:84
 msgid "Go back"
 msgstr ""
 
 #: www/views/backupWarning.html:15
 #: www/views/includes/confirmBackupPopup.html:8
-#: www/views/onboarding/tour.html:23
 msgid "Got it"
 msgstr ""
 
@@ -1398,8 +1430,8 @@ msgstr ""
 msgid "Hardware wallet"
 msgstr ""
 
-#: src/js/controllers/create.js:180
-#: src/js/controllers/join.js:145
+#: src/js/controllers/create.js:192
+#: src/js/controllers/join.js:164
 msgid "Hardware wallets are not yet supported with Bitcoin Cash"
 msgstr ""
 
@@ -1412,7 +1444,7 @@ msgstr ""
 msgid "Help and support information is available at the website."
 msgstr ""
 
-#: www/views/addresses.html:25
+#: www/views/addresses.html:27
 msgid "Hide"
 msgstr ""
 
@@ -1424,7 +1456,7 @@ msgstr ""
 msgid "Hide Next Steps Card"
 msgstr ""
 
-#: www/views/join.html:49
+#: www/views/join.html:47
 #: www/views/tab-create-personal.html:28
 #: www/views/tab-create-shared.html:57
 #: www/views/tab-export-file.html:25
@@ -1452,15 +1484,11 @@ msgstr ""
 msgid "I don't like it"
 msgstr ""
 
-#: www/views/onboarding/disclaimer.html:43
-msgid "I have read, understood, and agree to the <a ng-click=\"openTerms()\" translate=\"\">Terms of Use</a>."
-msgstr ""
-
 #: www/views/modals/terms.html:22
 msgid "I have read, understood, and agree with the Terms of use."
 msgstr ""
 
-#: www/views/join.html:137
+#: www/views/join.html:135
 #: www/views/tab-create-personal.html:107
 #: www/views/tab-create-shared.html:136
 msgid "I have written it down"
@@ -1474,23 +1502,18 @@ msgstr ""
 msgid "I think this app is terrible."
 msgstr ""
 
-#: src/js/controllers/onboarding/backupRequest.js:19
 #: www/views/includes/screenshotWarningModal.html:9
 msgid "I understand"
 msgstr ""
 
-#: www/views/onboarding/disclaimer.html:21
-msgid "I understand that if this app is moved to another device or deleted, my bitcoin can only be recovered with the backup phrase."
-msgstr ""
-
-#: www/views/onboarding/disclaimer.html:18
-msgid "I understand that my funds are held securely on this device, not by a company."
-msgstr ""
-
-#: www/views/backup.html:36
+#: www/views/backup.html:38
 msgid "I've written it down"
 msgstr ""
 
+#: www/views/advancedSettings.html:38
+msgid "If enabled, Bitcoin Core (BTC) wallet(s) will be displayed on the Home screen. If disabled, BTC wallets will be not be deleted, only hidden."
+msgstr ""
+
 #: www/views/preferences.html:45
 msgid "If enabled, all sensitive information (private key and recovery phrase) and actions (spending and exporting) associated with this wallet will be protected."
 msgstr ""
@@ -1503,10 +1526,6 @@ msgstr ""
 msgid "If enabled, wallets will also try to spend unconfirmed funds. This option may cause transaction delays."
 msgstr ""
 
-#: src/js/controllers/onboarding/backupRequest.js:18
-msgid "If this device is replaced or this app is deleted, neither you nor BitPay can recover your funds without a backup."
-msgstr ""
-
 #: www/views/feedback/complete.html:23
 msgid "If you have additional feedback, please let us know by tapping the \"Send feedback\" option in the Settings tab."
 msgstr ""
@@ -1532,11 +1551,11 @@ msgstr ""
 msgid "Import wallet"
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:24
+#: src/js/services/onGoingProcess.js:25
 msgid "Importing Wallet..."
 msgstr ""
 
-#: www/views/backup.html:72
+#: www/views/backup.html:74
 msgid "In order to verify your wallet backup, please type your password."
 msgstr ""
 
@@ -1548,7 +1567,8 @@ msgstr ""
 #: www/views/includes/walletItem.html:9
 #: www/views/includes/walletList.html:6
 #: www/views/includes/walletListSettings.html:9
-#: www/views/includes/walletSelector.html:16
+#: www/views/includes/walletSelector.html:25
+#: www/views/includes/walletSelector.html:57
 msgid "Incomplete"
 msgstr ""
 
@@ -1561,7 +1581,7 @@ msgid "Incorrect PIN, try again."
 msgstr ""
 
 #. Trying to import a malformed wallet export QR code
-#: src/js/controllers/import.js:85
+#: src/js/controllers/import.js:92
 msgid "Incorrect code format"
 msgstr ""
 
@@ -1569,23 +1589,27 @@ msgstr ""
 msgid "Incorrect network address"
 msgstr ""
 
-#: src/js/controllers/confirm.js:114
-#: src/js/controllers/confirm.js:306
+#: src/js/controllers/confirm.js:122
+#: src/js/controllers/confirm.js:334
 #: src/js/services/bwcError.js:44
 msgid "Insufficient confirmed funds"
 msgstr ""
 
+#: src/js/controllers/confirm.js:359
+msgid "Insufficient funds"
+msgstr ""
+
 #: src/js/controllers/topup.js:165
 #: src/js/controllers/topup.js:177
 #: src/js/services/bwcError.js:71
 msgid "Insufficient funds for fee"
 msgstr ""
 
-#: www/views/tab-settings.html:123
+#: www/views/tab-settings.html:108
 msgid "Integrations"
 msgstr ""
 
-#: www/views/includes/walletHistory.html:49
+#: www/views/includes/walletHistory.html:52
 msgid "Invalid"
 msgstr ""
 
@@ -1595,12 +1619,13 @@ msgstr ""
 msgid "Invalid URL"
 msgstr ""
 
-#: src/js/controllers/create.js:186
-#: src/js/controllers/import.js:345
-#: src/js/controllers/join.js:151
+#: src/js/controllers/create.js:198
+#: src/js/controllers/import.js:352
+#: src/js/controllers/join.js:170
 msgid "Invalid account number"
 msgstr ""
 
+#: src/js/controllers/confirm.js:138
 #: src/js/services/bwcError.js:119
 msgid "Invalid address"
 msgstr ""
@@ -1609,9 +1634,9 @@ msgstr ""
 msgid "Invalid data"
 msgstr ""
 
-#: src/js/controllers/create.js:161
-#: src/js/controllers/import.js:266
-#: src/js/controllers/join.js:125
+#: src/js/controllers/create.js:173
+#: src/js/controllers/import.js:273
+#: src/js/controllers/join.js:144
 msgid "Invalid derivation path"
 msgstr ""
 
@@ -1628,7 +1653,7 @@ msgstr ""
 msgid "Is there anything we could do better?"
 msgstr ""
 
-#: www/views/backup.html:54
+#: www/views/backup.html:56
 msgid "Is this correct?"
 msgstr ""
 
@@ -1636,15 +1661,15 @@ msgstr ""
 msgid "Is this email address correct?"
 msgstr ""
 
-#: www/views/addresses.html:25
+#: www/views/addresses.html:26
 msgid "It's a good idea to avoid reusing addresses - this both protects your privacy and keeps your bitcoins secure against hypothetical attacks by quantum computers."
 msgstr ""
 
-#: src/js/controllers/backup.js:76
+#: src/js/controllers/backup.js:87
 msgid "It's important that you write your backup phrase down correctly. If something happens to your wallet, you'll need this backup to recover your money. Please review your backup and try again."
 msgstr ""
 
-#: www/views/join.html:151
+#: www/views/join.html:149
 msgid "Join"
 msgstr ""
 
@@ -1657,20 +1682,16 @@ msgstr ""
 msgid "Join shared wallet"
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:25
+#: src/js/services/onGoingProcess.js:26
 msgid "Joining Wallet..."
 msgstr ""
 
-#: www/views/onboarding/tour.html:22
-msgid "Just scan the code to pay."
-msgstr ""
-
 #: src/js/services/bwcError.js:116
 msgid "Key already associated with an existing wallet"
 msgstr ""
 
 #: www/views/preferencesLanguage.html:4
-#: www/views/tab-settings.html:68
+#: www/views/tab-settings.html:53
 msgid "Language"
 msgstr ""
 
@@ -1678,27 +1699,26 @@ msgstr ""
 msgid "Last Month"
 msgstr ""
 
-#: src/js/controllers/confirm.js:132
+#: src/js/controllers/confirm.js:140
 #: www/views/preferences.html:48
-#: www/views/preferencesCash.html:18
-#: www/views/tx-details.html:94
+#: www/views/tx-details.html:130
 msgid "Learn more"
 msgstr ""
 
-#: www/views/backup.html:43
+#: www/views/backup.html:45
 msgid "Let's verify your backup phrase."
 msgstr ""
 
-#: www/views/addresses.html:45
-#: www/views/allAddresses.html:14
+#: www/views/addresses.html:58
+#: www/views/allAddresses.html:25
 msgid "Loading addresses..."
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:35
+#: src/js/services/onGoingProcess.js:36
 msgid "Loading transaction info..."
 msgstr ""
 
-#: www/views/tab-settings.html:100
+#: www/views/tab-settings.html:85
 msgid "Lock App"
 msgstr ""
 
@@ -1730,18 +1750,14 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: www/views/addresses.html:87
+#: www/views/addresses.html:103
 msgid "Low amount inputs"
 msgstr ""
 
-#: www/views/includes/walletHistory.html:27
+#: www/views/includes/walletHistory.html:31
 msgid "Low fees"
 msgstr ""
 
-#: www/views/onboarding/tour.html:38
-msgid "Makes sense"
-msgstr ""
-
 #: src/js/controllers/modals/search.js:61
 msgid "Matches:"
 msgstr ""
@@ -1755,13 +1771,17 @@ msgstr ""
 msgid "Meh - it's alright"
 msgstr ""
 
-#: src/js/controllers/tx-details.js:165
 #: www/views/modals/paypro.html:48
-#: www/views/modals/txp-details.html:93
-#: www/views/tx-details.html:72
+#: www/views/modals/txp-details.html:104
 msgid "Memo"
 msgstr ""
 
+#: www/views/tx-details.html:109
+msgid ""
+"Memo: &emsp;\n"
+"            <textarea elastic=\"\" placeholder=\"{{btx.note.body || btx.message || 'Enter text here'}}\" ng-model=\"btx.note.body\" ng-blur=\"updateNote(btx.note.body)\"></textarea>"
+msgstr ""
+
 #: www/views/mercadoLibre.html:6
 msgid "Mercado Livre Brazil Gift Cards"
 msgstr ""
@@ -1770,7 +1790,7 @@ msgstr ""
 msgid "Mercadolibre Gift Card Service is not available at this moment. Please try back later."
 msgstr ""
 
-#: www/views/modals/txp-details.html:131
+#: www/views/modals/txp-details.html:142
 msgid "Merchant Message"
 msgstr ""
 
@@ -1793,16 +1813,17 @@ msgstr ""
 msgid "More Options"
 msgstr ""
 
-#: www/views/includes/walletHistory.html:47
+#: www/views/includes/walletHistory.html:50
 #: www/views/tx-details.html:19
 msgid "Moved"
 msgstr ""
 
-#: src/js/controllers/tx-details.js:131
+#: src/js/controllers/tx-details.js:152
 msgid "Moved Funds"
 msgstr ""
 
 #: www/views/modals/txp-details.html:57
+#: www/views/modals/txp-details.html:62
 msgid "Multiple recipients"
 msgstr ""
 
@@ -1831,7 +1852,7 @@ msgstr ""
 msgid "New Proposal"
 msgstr ""
 
-#: src/js/controllers/addresses.js:126
+#: src/js/controllers/addresses.js:145
 msgid "New address could not be generated. Please try again."
 msgstr ""
 
@@ -1839,8 +1860,12 @@ msgstr ""
 msgid "New personal wallet"
 msgstr ""
 
-#: www/views/includes/nextSteps.html:3
-msgid "Next steps"
+#: www/views/paperWallet.html:54
+msgid "No Bitcoin Cash found"
+msgstr ""
+
+#: www/views/paperWallet.html:104
+msgid "No Bitcoin found"
 msgstr ""
 
 #: www/views/tab-receive.html:16
@@ -1852,8 +1877,8 @@ msgstr ""
 msgid "No access key defined"
 msgstr ""
 
-#: www/views/onboarding/backupRequest.html:5
-msgid "No backup, no bitcoin."
+#: www/views/shapeshift.html:15
+msgid "No available wallets to convert between."
 msgstr ""
 
 #: www/views/addressbook.html:19
@@ -1885,7 +1910,7 @@ msgstr ""
 msgid "No signing proposal: No private key"
 msgstr ""
 
-#: www/views/walletDetails.html:204
+#: www/views/walletDetails.html:202
 msgid "No transactions yet"
 msgstr ""
 
@@ -1897,17 +1922,13 @@ msgstr ""
 msgid "No wallet selected"
 msgstr ""
 
-#: src/js/controllers/buyAmazon.js:300
-#: src/js/controllers/buyMercadoLibre.js:292
-#: src/js/controllers/confirm.js:85
-#: src/js/controllers/topup.js:265
+#: src/js/controllers/buyAmazon.js:301
+#: src/js/controllers/buyMercadoLibre.js:293
+#: src/js/controllers/confirm.js:93
+#: src/js/controllers/topup.js:266
 msgid "No wallets available"
 msgstr ""
 
-#: www/views/paperWallet.html:45
-msgid "No wallets available to receive funds"
-msgstr ""
-
 #: www/views/cashScan.html:15
 msgid "No wallets eligible for Bitcoin Cash support"
 msgstr ""
@@ -1928,16 +1949,13 @@ msgstr ""
 msgid "Not authorized"
 msgstr ""
 
-#: src/js/controllers/confirm.js:307
+#: src/js/controllers/confirm.js:335
+#: src/js/controllers/confirm.js:360
 msgid "Not enough funds for fee"
 msgstr ""
 
-#: www/views/onboarding/tour.html:50
-msgid "Not even BitPay can access it."
-msgstr ""
-
-#: src/js/controllers/paperWallet.js:47
-msgid "Not funds found"
+#: www/views/onboarding/tour.html:11
+msgid "Not even Bitcoin.com can access it."
 msgstr ""
 
 #: www/views/feedback/rateApp.html:3
@@ -1949,16 +1967,29 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#: www/views/amount.html:33
+#: www/views/amount.html:65
+msgid "Note: Address doesn't contain currency information, please make sure you are sending the correct currency."
+msgstr ""
+
+#: www/views/backup.html:21
+msgid "Note: Both of the default BCH and BTC wallets share this same recovery phrase."
+msgstr ""
+
 #: www/views/backup.html:19
 msgid "Note: if this BCH wallet was duplicated from a BTC wallet, they share the same recovery phrase."
 msgstr ""
 
+#: www/views/backup.html:20
+msgid "Note: if this BTC wallet was duplicated from a BCH wallet, they share the same recovery phrase."
+msgstr ""
+
 #: www/views/modals/wallets.html:25
 msgid "Notice: only 1-1 (single signature) wallets can be used for sell bitcoin"
 msgstr ""
 
 #: www/views/preferencesNotifications.html:3
-#: www/views/tab-settings.html:61
+#: www/views/tab-settings.html:46
 msgid "Notifications"
 msgstr ""
 
@@ -1966,7 +1997,7 @@ msgstr ""
 msgid "Notifications by email"
 msgstr ""
 
-#: www/views/tx-details.html:117
+#: www/views/tx-details.html:153
 msgid "Notify me if confirmed"
 msgstr ""
 
@@ -1982,9 +2013,9 @@ msgstr ""
 msgid "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?"
 msgstr ""
 
-#: src/js/controllers/buyAmazon.js:312
-#: src/js/controllers/topup.js:286
-#: src/js/services/incomingData.js:153
+#: src/js/controllers/buyAmazon.js:313
+#: src/js/controllers/topup.js:287
+#: src/js/services/incomingData.js:202
 #: src/js/services/popupService.js:16
 #: src/js/services/popupService.js:52
 #: src/js/services/popupService.js:61
@@ -2008,20 +2039,19 @@ msgstr ""
 msgid "Oh no!"
 msgstr ""
 
-#: src/js/controllers/buyMercadoLibre.js:306
+#: src/js/controllers/buyMercadoLibre.js:307
 msgid "Ok"
 msgstr ""
 
-#: www/views/tab-home.html:39
+#: www/views/tab-home.html:38
 msgid "On this screen you can see all your wallets, accounts, and assets."
 msgstr ""
 
 #: src/js/controllers/bitpayCard.js:113
 #: src/js/controllers/cashScan.js:19
 #: src/js/controllers/preferences.js:66
-#: src/js/controllers/preferencesCash.js:33
 #: src/js/controllers/tab-settings.js:52
-#: src/js/controllers/tx-details.js:55
+#: src/js/controllers/tx-details.js:52
 msgid "Open"
 msgstr ""
 
@@ -2029,19 +2059,21 @@ msgstr ""
 msgid "Open Crowdin"
 msgstr ""
 
+#: src/js/controllers/bitpayCard.js:123
+#: src/js/controllers/tx-details.js:207
+msgid "Open Explorer"
+msgstr ""
+
 #: src/js/controllers/preferencesAbout.js:15
+#: src/js/controllers/preferencesAbout.js:25
 msgid "Open GitHub"
 msgstr ""
 
 #: src/js/controllers/preferencesAbout.js:13
+#: src/js/controllers/preferencesAbout.js:23
 msgid "Open GitHub Project"
 msgstr ""
 
-#: src/js/controllers/bitpayCard.js:123
-#: src/js/controllers/tx-details.js:192
-msgid "Open Explorer"
-msgstr ""
-
 #: www/views/tab-scan.html:22
 msgid "Open Settings"
 msgstr ""
@@ -2050,14 +2082,6 @@ msgstr ""
 msgid "Open Translation Community"
 msgstr ""
 
-#: src/js/controllers/onboarding/terms.js:22
-msgid "Open Website"
-msgstr ""
-
-#: src/js/controllers/preferencesCash.js:32
-msgid "Open bitcoincash.org?"
-msgstr ""
-
 #: src/js/controllers/cashScan.js:18
 msgid "Open the recovery tool."
 msgstr ""
@@ -2066,16 +2090,12 @@ msgstr ""
 msgid "Open wallet"
 msgstr ""
 
-#: www/views/includes/incomingDataMenu.html:19
-msgid "Open website"
-msgstr ""
-
 #: www/views/bitpayCardIntro.html:34
 msgid "Order the BitPay Card"
 msgstr ""
 
-#: www/views/join.html:105
-#: www/views/join.html:96
+#: www/views/join.html:103
+#: www/views/join.html:94
 #: www/views/tab-create-personal.html:69
 #: www/views/tab-create-personal.html:77
 #: www/views/tab-create-shared.html:106
@@ -2085,7 +2105,7 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: src/js/controllers/import.js:98
+#: src/js/controllers/import.js:105
 msgid "Password required. Make sure to enter your password in advanced options"
 msgstr ""
 
@@ -2105,7 +2125,7 @@ msgstr ""
 msgid "Pay To"
 msgstr ""
 
-#: src/js/controllers/modals/txpDetails.js:51
+#: src/js/controllers/modals/txpDetails.js:63
 #: www/views/modals/tx-status.html:33
 msgid "Payment Accepted"
 msgstr ""
@@ -2122,15 +2142,15 @@ msgstr ""
 msgid "Payment Proposal Created"
 msgstr ""
 
-#: www/views/tab-home.html:46
+#: www/views/tab-home.html:45
 msgid "Payment Proposals"
 msgstr ""
 
-#: src/js/services/payproService.js:32
+#: src/js/services/payproService.js:33
 msgid "Payment Protocol Invalid"
 msgstr ""
 
-#: src/js/services/payproService.js:18
+#: src/js/services/payproService.js:19
 msgid "Payment Protocol not supported on Chrome App"
 msgstr ""
 
@@ -2143,7 +2163,7 @@ msgstr ""
 msgid "Payment Rejected"
 msgstr ""
 
-#: src/js/controllers/modals/txpDetails.js:44
+#: src/js/controllers/modals/txpDetails.js:56
 #: www/views/confirm.html:124
 #: www/views/includes/walletActivity.html:11
 #: www/views/modals/txp-details.html:42
@@ -2158,11 +2178,11 @@ msgstr ""
 msgid "Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created."
 msgstr ""
 
-#: src/js/services/incomingData.js:152
+#: src/js/services/incomingData.js:201
 msgid "Payment address was translated to new Bitcoin Cash address format:"
 msgstr ""
 
-#: www/views/modals/txp-details.html:107
+#: www/views/modals/txp-details.html:118
 msgid "Payment details"
 msgstr ""
 
@@ -2183,11 +2203,11 @@ msgstr ""
 msgid "Permanently delete this wallet."
 msgstr ""
 
-#: src/js/services/profileService.js:403
+#: src/js/services/profileService.js:419
 msgid "Personal Wallet"
 msgstr ""
 
-#: www/views/backup.html:25
+#: www/views/backup.html:27
 msgid "Please carefully write down this phrase."
 msgstr ""
 
@@ -2195,12 +2215,12 @@ msgstr ""
 msgid "Please connect a camera to get started."
 msgstr ""
 
-#: src/js/controllers/import.js:278
+#: src/js/controllers/import.js:285
 msgid "Please enter the recovery phrase"
 msgstr ""
 
-#: src/js/controllers/create.js:174
-#: src/js/controllers/join.js:139
+#: src/js/controllers/create.js:186
+#: src/js/controllers/join.js:158
 msgid "Please enter the wallet recovery phrase"
 msgstr ""
 
@@ -2208,7 +2228,7 @@ msgstr ""
 msgid "Please enter your PIN"
 msgstr ""
 
-#: www/views/backup.html:53
+#: www/views/backup.html:55
 msgid "Please tap each word in the correct order."
 msgstr ""
 
@@ -2216,12 +2236,12 @@ msgstr ""
 msgid "Please upgrade Copay to perform this action"
 msgstr ""
 
-#: www/views/walletDetails.html:142
-#: www/views/walletDetails.html:62
+#: www/views/walletDetails.html:140
+#: www/views/walletDetails.html:61
 msgid "Please wait"
 msgstr ""
 
-#: src/js/controllers/import.js:238
+#: src/js/controllers/import.js:245
 msgid "Please, select your backup file"
 msgstr ""
 
@@ -2233,7 +2253,7 @@ msgstr ""
 msgid "Preferences"
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:38
+#: src/js/services/onGoingProcess.js:39
 msgid "Preparing addresses..."
 msgstr ""
 
@@ -2241,7 +2261,7 @@ msgstr ""
 msgid "Preparing backup..."
 msgstr ""
 
-#: src/js/routes.js:1264
+#: src/js/routes.js:1249
 msgid "Press again to exit"
 msgstr ""
 
@@ -2249,11 +2269,11 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#: www/views/includes/incomingDataMenu.html:80
+#: www/views/includes/incomingDataMenu.html:57
 msgid "Private Key"
 msgstr ""
 
-#: src/js/controllers/paperWallet.js:136
+#: src/js/controllers/paperWallet.js:190
 msgid "Private key encrypted. Enter password"
 msgstr ""
 
@@ -2265,8 +2285,8 @@ msgstr ""
 msgid "Proposal Accepted"
 msgstr ""
 
-#: src/js/controllers/modals/txpDetails.js:61
-#: src/js/controllers/tx-details.js:78
+#: src/js/controllers/modals/txpDetails.js:73
+#: src/js/controllers/tx-details.js:75
 #: www/views/confirm.html:125
 msgid "Proposal Created"
 msgstr ""
@@ -2279,15 +2299,15 @@ msgstr ""
 msgid "Proposal Rejected"
 msgstr ""
 
-#: www/views/walletDetails.html:189
+#: www/views/walletDetails.html:187
 msgid "Proposals"
 msgstr ""
 
-#: src/js/controllers/buyAmazon.js:282
+#: src/js/controllers/buyAmazon.js:283
 msgid "Purchase Amount is limited to {{limitPerDay}} {{currency}} per day"
 msgstr ""
 
-#: src/js/controllers/buyMercadoLibre.js:281
+#: src/js/controllers/buyMercadoLibre.js:282
 msgid "Purchase amount must be a value between 50 and 2000"
 msgstr ""
 
@@ -2303,12 +2323,8 @@ msgstr ""
 msgid "QR Code"
 msgstr ""
 
-#: www/views/onboarding/disclaimer.html:13
-msgid "Quick review!"
-msgstr ""
-
-#: src/js/controllers/create.js:84
-#: src/js/controllers/join.js:68
+#: src/js/controllers/create.js:96
+#: src/js/controllers/join.js:87
 msgid "Random"
 msgstr ""
 
@@ -2316,16 +2332,16 @@ msgstr ""
 msgid "Rate on the app store"
 msgstr ""
 
-#: www/views/addresses.html:52
+#: www/views/addresses.html:65
 msgid "Read less"
 msgstr ""
 
-#: www/views/addresses.html:51
+#: www/views/addresses.html:64
 msgid "Read more"
 msgstr ""
 
 #: src/js/controllers/preferences.js:65
-#: src/js/controllers/tx-details.js:54
+#: src/js/controllers/tx-details.js:51
 msgid "Read more in our Wiki"
 msgstr ""
 
@@ -2338,7 +2354,7 @@ msgstr ""
 msgid "Receive"
 msgstr ""
 
-#: www/views/customAmount.html:44
+#: www/views/customAmount.html:71
 msgid "Receive in"
 msgstr ""
 
@@ -2347,11 +2363,15 @@ msgstr ""
 msgid "Received"
 msgstr ""
 
-#: src/js/controllers/tx-details.js:130
+#: src/js/controllers/tx-details.js:151
 msgid "Received Funds"
 msgstr ""
 
-#: www/views/includes/walletHistory.html:57
+#: www/views/tx-details.html:68
+msgid "Received To"
+msgstr ""
+
+#: www/views/includes/walletHistory.html:61
 #: www/views/tx-details.html:24
 msgid "Receiving"
 msgstr ""
@@ -2366,16 +2386,16 @@ msgid "Recent Transaction Card"
 msgstr ""
 
 #: www/views/activity.html:4
-#: www/views/tab-home.html:58
+#: www/views/tab-home.html:57
 msgid "Recent Transactions"
 msgstr ""
 
-#: www/views/amount.html:18
+#: www/views/amount.html:11
 #: www/views/tab-send.html:9
 msgid "Recipient"
 msgstr ""
 
-#: www/views/modals/txp-details.html:62
+#: www/views/modals/txp-details.html:73
 msgid "Recipients"
 msgstr ""
 
@@ -2383,7 +2403,7 @@ msgstr ""
 msgid "Recovery phrase"
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:26
+#: src/js/services/onGoingProcess.js:27
 msgid "Recreating Wallet..."
 msgstr ""
 
@@ -2391,12 +2411,12 @@ msgstr ""
 msgid "Redeem now"
 msgstr ""
 
-#: src/js/controllers/modals/txpDetails.js:63
-#: src/js/controllers/tx-details.js:80
+#: src/js/controllers/modals/txpDetails.js:75
+#: src/js/controllers/tx-details.js:77
 msgid "Rejected"
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:27
+#: src/js/services/onGoingProcess.js:28
 msgid "Rejecting payment proposal"
 msgstr ""
 
@@ -2404,7 +2424,7 @@ msgstr ""
 msgid "Release information"
 msgstr ""
 
-#: www/views/addressbook.view.html:36
+#: www/views/addressbook.view.html:40
 #: www/views/modals/mercadolibre-card-details.html:69
 msgid "Remove"
 msgstr ""
@@ -2421,8 +2441,8 @@ msgstr ""
 msgid "Removing your BitPay account will remove all associated BitPay account data from this device. Are you sure you would like to remove your BitPay Account ({{email}}) from this device?"
 msgstr ""
 
-#: www/views/join.html:116
-#: www/views/join.html:124
+#: www/views/join.html:114
+#: www/views/join.html:122
 #: www/views/tab-create-personal.html:86
 #: www/views/tab-create-personal.html:94
 #: www/views/tab-create-shared.html:115
@@ -2439,7 +2459,7 @@ msgstr ""
 msgid "Request Fingerprint"
 msgstr ""
 
-#: www/views/tab-receive.html:45
+#: www/views/tab-receive.html:34
 msgid "Request Specific amount"
 msgstr ""
 
@@ -2451,15 +2471,15 @@ msgstr ""
 msgid "Required number of signatures"
 msgstr ""
 
-#: www/views/onboarding/welcome.html:9
+#: www/views/onboarding/tour.html:15
 msgid "Restore from backup"
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:29
+#: src/js/services/onGoingProcess.js:30
 msgid "Retrieving inputs information"
 msgstr ""
 
-#: src/js/controllers/onboarding/tour.js:56
+#: src/js/controllers/onboarding/tour.js:61
 msgid "Retry"
 msgstr ""
 
@@ -2467,11 +2487,11 @@ msgstr ""
 msgid "Retry Camera"
 msgstr ""
 
-#: www/views/addressbook.add.html:56
+#: www/views/addressbook.add.html:65
 #: www/views/includes/note.html:9
 #: www/views/preferencesAlias.html:21
 #: www/views/preferencesBwsUrl.html:25
-#: www/views/preferencesNotifications.html:46
+#: www/views/preferencesNotifications.html:50
 msgid "Save"
 msgstr ""
 
@@ -2484,7 +2504,7 @@ msgstr ""
 msgid "Scan QR Codes"
 msgstr ""
 
-#: www/views/addresses.html:31
+#: www/views/addresses.html:33
 msgid "Scan addresses for funds"
 msgstr ""
 
@@ -2496,11 +2516,7 @@ msgstr ""
 msgid "Scan your fingerprint please"
 msgstr ""
 
-#: www/views/preferencesCash.html:23
-msgid "Scan your wallets for Bitcoin Cash"
-msgstr ""
-
-#: src/js/services/onGoingProcess.js:30
+#: src/js/services/onGoingProcess.js:31
 msgid "Scanning Wallet funds..."
 msgstr ""
 
@@ -2540,7 +2556,7 @@ msgstr ""
 msgid "Select a backup file"
 msgstr ""
 
-#: src/js/controllers/tab-receive.js:139
+#: src/js/controllers/tab-receive.js:248
 msgid "Select a wallet"
 msgstr ""
 
@@ -2548,7 +2564,7 @@ msgstr ""
 msgid "Self-signed Certificate"
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:41
+#: src/js/services/onGoingProcess.js:42
 msgid "Selling Bitcoin..."
 msgstr ""
 
@@ -2564,11 +2580,11 @@ msgstr ""
 msgid "Send Feedback"
 msgstr ""
 
-#: www/views/addressbook.view.html:31
+#: www/views/addressbook.view.html:35
 msgid "Send Money"
 msgstr ""
 
-#: www/views/allAddresses.html:19
+#: www/views/allAddresses.html:30
 msgid "Send addresses by email"
 msgstr ""
 
@@ -2577,15 +2593,17 @@ msgstr ""
 msgid "Send by email"
 msgstr ""
 
-#: src/js/controllers/confirm.js:177
+#: src/js/controllers/confirm.js:194
 msgid "Send from"
 msgstr ""
 
+#: www/views/amount.html:56
+#: www/views/amount.html:83
 #: www/views/includes/itemSelector.html:8
 msgid "Send max amount"
 msgstr ""
 
-#: www/views/includes/incomingDataMenu.html:46
+#: www/views/includes/incomingDataMenu.html:23
 msgid "Send payment to this address"
 msgstr ""
 
@@ -2600,11 +2618,11 @@ msgstr ""
 msgid "Sending"
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:39
+#: src/js/services/onGoingProcess.js:40
 msgid "Sending 2FA code..."
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:36
+#: src/js/services/onGoingProcess.js:37
 msgid "Sending feedback..."
 msgstr ""
 
@@ -2612,22 +2630,18 @@ msgstr ""
 msgid "Sending maximum amount"
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:31
+#: src/js/services/onGoingProcess.js:32
 msgid "Sending transaction"
 msgstr ""
 
-#: src/js/controllers/confirm.js:545
-msgid "Sending {{amountStr}} from your {{name}} wallet"
-msgstr ""
-
-#: www/views/includes/walletHistory.html:42
+#: www/views/includes/walletHistory.html:41
 #: www/views/modals/tx-status.html:9
 #: www/views/topup.html:100
 #: www/views/tx-details.html:17
 msgid "Sent"
 msgstr ""
 
-#: src/js/controllers/tx-details.js:129
+#: src/js/controllers/tx-details.js:150
 msgid "Sent Funds"
 msgstr ""
 
@@ -2641,6 +2655,7 @@ msgid "Service not available"
 msgstr ""
 
 #: www/views/includes/homeIntegrations.html:3
+#: www/views/includes/services.html:3
 msgid "Services"
 msgstr ""
 
@@ -2648,7 +2663,7 @@ msgstr ""
 msgid "Session Log"
 msgstr ""
 
-#: www/views/preferencesAbout.html:35
+#: www/views/preferencesAbout.html:44
 msgid "Session log"
 msgstr ""
 
@@ -2656,7 +2671,7 @@ msgstr ""
 msgid "Set up a password"
 msgstr ""
 
-#: src/js/controllers/preferencesFee.js:85
+#: src/js/controllers/preferencesFee.js:123
 msgid "Set your own fee in satoshis/byte"
 msgstr ""
 
@@ -2665,6 +2680,10 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
+#: www/views/shapeshift.html:4
+msgid "Shapeshift"
+msgstr ""
+
 #: www/views/feedback/complete.html:17
 #: www/views/feedback/complete.html:26
 msgid "Share the love by inviting your friends."
@@ -2687,11 +2706,11 @@ msgstr ""
 msgid "Show Recovery Phrase"
 msgstr ""
 
-#: www/views/tab-receive.html:34
+#: www/views/tab-receive.html:40
 msgid "Show address"
 msgstr ""
 
-#: www/views/join.html:48
+#: www/views/join.html:46
 #: www/views/tab-create-personal.html:27
 #: www/views/tab-create-shared.html:56
 #: www/views/tab-export-file.html:24
@@ -2705,34 +2724,33 @@ msgstr ""
 msgid "Show bitcoin address"
 msgstr ""
 
-#: www/views/tab-send.html:59
+#: www/views/tab-send.html:62
 msgid "Show more"
 msgstr ""
 
+#: www/views/signMessage.html:4
+msgid "Sign Message"
+msgstr ""
+
 #: src/js/services/bwcError.js:104
 msgid "Signatures rejected by server"
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:32
+#: src/js/services/onGoingProcess.js:33
 msgid "Signing transaction"
 msgstr ""
 
-#: www/views/onboarding/backupRequest.html:6
-msgid "Since only you control your money, you’ll need to save your backup phrase in case this app is deleted."
-msgstr ""
-
 #: www/views/tab-create-personal.html:122
 #: www/views/tab-create-shared.html:151
 msgid "Single Address Wallet"
 msgstr ""
 
 #: www/views/onboarding/collectEmail.html:40
-#: www/views/onboarding/tour.html:11
 msgid "Skip"
 msgstr ""
 
-#: src/js/controllers/confirm.js:371
-#: src/js/controllers/modals/txpDetails.js:47
+#: src/js/controllers/confirm.js:407
+#: src/js/controllers/modals/txpDetails.js:59
 msgid "Slide to accept"
 msgstr ""
 
@@ -2740,12 +2758,12 @@ msgstr ""
 msgid "Slide to buy"
 msgstr ""
 
-#: src/js/controllers/confirm.js:365
+#: src/js/controllers/confirm.js:401
 msgid "Slide to pay"
 msgstr ""
 
-#: src/js/controllers/confirm.js:377
-#: src/js/controllers/modals/txpDetails.js:40
+#: src/js/controllers/confirm.js:413
+#: src/js/controllers/modals/txpDetails.js:52
 msgid "Slide to send"
 msgstr ""
 
@@ -2753,8 +2771,8 @@ msgstr ""
 msgid "Some of your wallets are not eligible for Bitcoin Cash support. You can try to access BCH funds from these wallets using the"
 msgstr ""
 
-#: src/js/controllers/create.js:88
-#: src/js/controllers/join.js:71
+#: src/js/controllers/create.js:100
+#: src/js/controllers/join.js:90
 msgid "Specify Recovery Phrase..."
 msgstr ""
 
@@ -2770,7 +2788,7 @@ msgstr ""
 msgid "Spending Password needed"
 msgstr ""
 
-#: www/views/walletDetails.html:173
+#: www/views/walletDetails.html:171
 msgid "Spending this balance will need significant Bitcoin network fees"
 msgstr ""
 
@@ -2791,24 +2809,25 @@ msgstr ""
 msgid "Success"
 msgstr ""
 
+#: src/js/controllers/confirm.js:314
+msgid "Suggested by Merchant"
+msgstr ""
+
 #: src/js/services/feeService.js:14
 msgid "Super Economy"
 msgstr ""
 
-#: www/views/preferencesCash.html:11
-msgid "Support Bitcoin Cash"
-msgstr ""
-
-#: www/views/paperWallet.html:7
+#: www/views/paperWallet.html:44
+#: www/views/paperWallet.html:94
 msgid "Sweep"
 msgstr ""
 
-#: www/views/includes/incomingDataMenu.html:89
+#: www/views/includes/incomingDataMenu.html:66
 #: www/views/paperWallet.html:3
 msgid "Sweep paper wallet"
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:33
+#: src/js/services/onGoingProcess.js:34
 msgid "Sweeping Wallet..."
 msgstr ""
 
@@ -2816,12 +2835,8 @@ msgstr ""
 msgid "THIS ACTION CANNOT BE REVERSED"
 msgstr ""
 
-#: www/views/onboarding/welcome.html:5
-msgid "Take control of your money,<br>get started with bitcoin."
-msgstr ""
-
-#: www/views/walletDetails.html:132
-#: www/views/walletDetails.html:52
+#: www/views/walletDetails.html:130
+#: www/views/walletDetails.html:51
 msgid "Tap and hold to show"
 msgstr ""
 
@@ -2838,9 +2853,7 @@ msgid "Terms Of Use"
 msgstr ""
 
 #: www/views/modals/terms.html:3
-#: www/views/onboarding/disclaimer.html:29
-#: www/views/onboarding/disclaimer.html:43
-#: www/views/preferencesAbout.html:30
+#: www/views/preferencesAbout.html:39
 msgid "Terms of Use"
 msgstr ""
 
@@ -2849,7 +2862,7 @@ msgstr ""
 msgid "Testnet"
 msgstr ""
 
-#: www/views/includes/incomingDataMenu.html:61
+#: www/views/includes/incomingDataMenu.html:38
 msgid "Text"
 msgstr ""
 
@@ -2888,27 +2901,19 @@ msgstr ""
 msgid "The derivation path"
 msgstr ""
 
-#: www/views/onboarding/tour.html:37
-msgid "The exchange rate changes with the market."
-msgstr ""
-
 #: www/views/preferencesFee.html:12
 msgid "The higher the fee, the greater the incentive a miner has to include that transaction in a block. Current fees are determined based on network load and the selected policy."
 msgstr ""
 
-#: www/views/addresses.html:51
+#: www/views/addresses.html:64
 msgid "The maximum number of consecutive unused addresses (20) has been reached. When one of your unused addresses receives a payment, a new address will be generated and shown in your Receive tab."
 msgstr ""
 
-#: src/js/controllers/onboarding/terms.js:21
-msgid "The official English Terms of Service are available on the BitPay website."
-msgstr ""
-
 #: www/views/tab-import-phrase.html:4
 msgid "The password of the recovery phrase (if set)"
 msgstr ""
 
-#: src/js/services/walletService.js:1139
+#: src/js/services/walletService.js:1174
 msgid "The payment was created but could not be completed. Please try again from home screen"
 msgstr ""
 
@@ -2916,7 +2921,7 @@ msgstr ""
 msgid "The payment was removed by creator"
 msgstr ""
 
-#: www/views/join.html:91
+#: www/views/join.html:89
 #: www/views/tab-create-personal.html:63
 #: www/views/tab-create-shared.html:92
 #: www/views/tab-import-phrase.html:43
@@ -2927,7 +2932,7 @@ msgstr ""
 msgid "The request could not be understood by the server"
 msgstr ""
 
-#: www/views/addresses.html:52
+#: www/views/addresses.html:65
 msgid "The restore process will stop when 20 addresses are generated in a row which contain no funds. To safely generate more addresses, make a payment to one of the unused addresses which has already been generated."
 msgstr ""
 
@@ -2947,13 +2952,13 @@ msgstr ""
 msgid "The wallet service URL"
 msgstr ""
 
-#: src/js/controllers/tab-home.js:38
+#: src/js/controllers/tab-home.js:39
 msgid "There is a new version of {{appName}} available"
 msgstr ""
 
-#: src/js/controllers/import.js:229
-#: src/js/controllers/import.js:254
-#: src/js/controllers/import.js:335
+#: src/js/controllers/import.js:236
+#: src/js/controllers/import.js:261
+#: src/js/controllers/import.js:342
 msgid "There is an error in the form"
 msgstr ""
 
@@ -2966,48 +2971,51 @@ msgstr ""
 msgid "This app is fantastic!"
 msgstr ""
 
-#: www/views/onboarding/tour.html:47
-msgid "This app stores your bitcoin with cutting-edge security."
+#: www/views/onboarding/tour.html:8
+msgid "This app stores your bitcoin locally on your device with cutting-edge security."
 msgstr ""
 
-#: src/js/controllers/confirm.js:523
+#: src/js/controllers/confirm.js:562
 msgid "This bitcoin payment request has expired."
 msgstr ""
 
-#: www/views/join.html:133
+#: www/views/join.html:131
 #: www/views/tab-create-personal.html:103
 #: www/views/tab-create-shared.html:132
 msgid "This password cannot be recovered. If the password is lost, there is no way you could recover your funds."
 msgstr ""
 
-#: www/views/backup.html:31
+#: www/views/backup.html:33
 msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed."
 msgstr ""
 
-#: www/views/tx-details.html:91
+#: www/views/tx-details.html:127
 msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself."
 msgstr ""
 
-#: www/views/tx-details.html:87
+#: www/views/tx-details.html:123
 msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender"
 msgstr ""
 
-#: www/views/walletDetails.html:109
+#: www/views/walletDetails.html:107
 #: www/views/walletDetails.html:29
 msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information."
 msgstr ""
 
-#: www/views/modals/txp-details.html:136
-#: www/views/tx-details.html:121
+#: src/js/controllers/preferencesAbout.js:24
+msgid "This will take you to the original Github project for Copay."
+msgstr ""
+
+#: www/views/modals/txp-details.html:147
+#: www/views/tx-details.html:157
 msgid "Timeline"
 msgstr ""
 
 #: www/views/confirm.html:31
 #: www/views/includes/output.html:2
-#: www/views/modals/txp-details.html:109
+#: www/views/modals/txp-details.html:120
 #: www/views/modals/txp-details.html:53
 #: www/views/tx-details.html:41
-#: www/views/tx-details.html:53
 msgid "To"
 msgstr ""
 
@@ -3023,11 +3031,11 @@ msgstr ""
 msgid "To {{reason}} you must first add your BitPay account - {{email}}"
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:48
+#: src/js/services/onGoingProcess.js:49
 msgid "Top up in progress..."
 msgstr ""
 
-#: src/js/controllers/topup.js:206
+#: src/js/controllers/topup.js:207
 msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})"
 msgstr ""
 
@@ -3038,7 +3046,7 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: www/views/walletDetails.html:196
+#: www/views/walletDetails.html:194
 msgid "Total Locked Balance"
 msgstr ""
 
@@ -3046,7 +3054,7 @@ msgstr ""
 msgid "Total number of copayers"
 msgstr ""
 
-#: www/views/addresses.html:81
+#: www/views/addresses.html:97
 msgid "Total wallet inputs"
 msgstr ""
 
@@ -3055,7 +3063,7 @@ msgstr ""
 msgid "Touch ID Failed"
 msgstr ""
 
-#: src/js/controllers/tx-details.js:12
+#: src/js/controllers/tx-details.js:13
 msgid "Transaction"
 msgstr ""
 
@@ -3072,9 +3080,9 @@ msgstr ""
 msgid "Transaction already broadcasted"
 msgstr ""
 
-#: src/js/controllers/buyAmazon.js:308
-#: src/js/controllers/buyMercadoLibre.js:301
-#: src/js/controllers/topup.js:281
+#: src/js/controllers/buyAmazon.js:309
+#: src/js/controllers/buyMercadoLibre.js:302
+#: src/js/controllers/topup.js:282
 msgid "Transaction has not been created"
 msgstr ""
 
@@ -3082,12 +3090,12 @@ msgstr ""
 msgid "Transaction initiated"
 msgstr ""
 
-#: src/js/controllers/tx-details.js:119
+#: src/js/controllers/tx-details.js:116
 msgid "Transaction not available at this time"
 msgstr ""
 
-#: src/js/controllers/activity.js:45
-#: src/js/controllers/tab-home.js:174
+#: src/js/controllers/activity.js:66
+#: src/js/controllers/tab-home.js:180
 msgid "Transaction not found"
 msgstr ""
 
@@ -3095,11 +3103,12 @@ msgstr ""
 msgid "Transactions without fee are not supported."
 msgstr ""
 
-#: src/js/controllers/paperWallet.js:109
+#: src/js/controllers/paperWallet.js:150
+#: src/js/controllers/paperWallet.js:156
 msgid "Transfer to"
 msgstr ""
 
-#: www/views/tab-send.html:67
+#: www/views/tab-send.html:70
 msgid "Transfer to Wallet"
 msgstr ""
 
@@ -3115,27 +3124,27 @@ msgstr ""
 msgid "Type the Recovery Phrase (usually 12 words)"
 msgstr ""
 
-#: src/js/controllers/backup.js:75
+#: src/js/controllers/backup.js:86
 msgid "Uh oh..."
 msgstr ""
 
-#: www/views/tx-details.html:100
+#: www/views/tx-details.html:136
 msgid "Unconfirmed"
 msgstr ""
 
-#: www/views/walletDetails.html:190
+#: www/views/walletDetails.html:188
 msgid "Unsent transactions"
 msgstr ""
 
-#: www/views/addresses.html:39
+#: www/views/addresses.html:52
 msgid "Unused Addresses"
 msgstr ""
 
-#: www/views/addresses.html:50
+#: www/views/addresses.html:63
 msgid "Unused Addresses Limit"
 msgstr ""
 
-#: src/js/controllers/tab-home.js:146
+#: src/js/controllers/tab-home.js:152
 msgid "Update Available"
 msgstr ""
 
@@ -3143,7 +3152,7 @@ msgstr ""
 msgid "Updating pending proposals. Please stand by"
 msgstr ""
 
-#: www/views/walletDetails.html:217
+#: www/views/walletDetails.html:215
 msgid "Updating transaction history. Please stand by."
 msgstr ""
 
@@ -3159,10 +3168,14 @@ msgstr ""
 msgid "Use Unconfirmed Funds"
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:34
+#: src/js/services/onGoingProcess.js:35
 msgid "Validating recovery phrase..."
 msgstr ""
 
+#: www/views/verifyMessage.html:4
+msgid "Verify Message"
+msgstr ""
+
 #: www/views/modals/fingerprintCheck.html:4
 msgid "Verify your identity"
 msgstr ""
@@ -3176,24 +3189,20 @@ msgstr ""
 msgid "View"
 msgstr ""
 
-#: www/views/addresses.html:34
+#: www/views/addresses.html:36
 msgid "View All Addresses"
 msgstr ""
 
-#: src/js/controllers/onboarding/terms.js:20
-msgid "View Terms of Service"
-msgstr ""
-
 #: src/js/controllers/bitpayCard.js:122
-#: src/js/controllers/tx-details.js:191
+#: src/js/controllers/tx-details.js:206
 msgid "View Transaction on Explorer.Bitcoin.com"
 msgstr ""
 
-#: src/js/controllers/tab-home.js:148
+#: src/js/controllers/tab-home.js:154
 msgid "View Update"
 msgstr ""
 
-#: www/views/tx-details.html:147
+#: www/views/tx-details.html:183
 msgid "View on blockchain"
 msgstr ""
 
@@ -3201,7 +3210,7 @@ msgstr ""
 msgid "Visit mercadolivre.com.br &rarr;"
 msgstr ""
 
-#: www/views/walletDetails.html:182
+#: www/views/walletDetails.html:180
 msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet."
 msgstr ""
 
@@ -3221,7 +3230,7 @@ msgstr ""
 msgid "Waiting for Ledger..."
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:16
+#: src/js/services/onGoingProcess.js:17
 msgid "Waiting for Trezor..."
 msgstr ""
 
@@ -3259,7 +3268,7 @@ msgstr ""
 msgid "Wallet Information"
 msgstr ""
 
-#: www/views/addresses.html:76
+#: www/views/addresses.html:92
 msgid "Wallet Inputs"
 msgstr ""
 
@@ -3267,7 +3276,7 @@ msgstr ""
 msgid "Wallet Invitation"
 msgstr ""
 
-#: www/views/join.html:60
+#: www/views/join.html:58
 #: www/views/tab-create-personal.html:38
 #: www/views/tab-create-shared.html:67
 msgid "Wallet Key"
@@ -3285,7 +3294,7 @@ msgstr ""
 msgid "Wallet Network"
 msgstr ""
 
-#: www/views/join.html:77
+#: www/views/join.html:75
 #: www/views/tab-create-personal.html:50
 #: www/views/tab-create-shared.html:79
 msgid "Wallet Recovery Phrase"
@@ -3313,7 +3322,7 @@ msgstr ""
 msgid "Wallet already exists"
 msgstr ""
 
-#: src/js/services/profileService.js:516
+#: src/js/services/profileService.js:532
 msgid "Wallet already in {{appName}}"
 msgstr ""
 
@@ -3346,8 +3355,8 @@ msgstr ""
 msgid "Wallet needs backup"
 msgstr ""
 
-#: www/views/tab-receive.html:59
-#: www/views/walletDetails.html:169
+#: www/views/tab-receive.html:86
+#: www/views/walletDetails.html:167
 msgid "Wallet not backed up"
 msgstr ""
 
@@ -3356,7 +3365,7 @@ msgid "Wallet not found"
 msgstr ""
 
 #: src/js/controllers/cashScan.js:81
-#: src/js/controllers/tab-home.js:230
+#: src/js/controllers/tab-home.js:236
 msgid "Wallet not registered"
 msgstr ""
 
@@ -3372,14 +3381,10 @@ msgstr ""
 msgid "Wallet service not found"
 msgstr ""
 
-#: www/views/tab-home.html:69
-msgid "Wallets"
-msgstr ""
-
-#: src/js/controllers/addressbookView.js:36
-#: src/js/controllers/modals/txpDetails.js:153
-#: src/js/controllers/modals/txpDetails.js:170
-#: src/js/controllers/preferencesDelete.js:24
+#: src/js/controllers/addressbookView.js:44
+#: src/js/controllers/modals/txpDetails.js:165
+#: src/js/controllers/modals/txpDetails.js:182
+#: src/js/controllers/preferencesDelete.js:28
 #: src/js/controllers/preferencesExternal.js:14
 #: www/views/preferencesDeleteWallet.html:11
 msgid "Warning!"
@@ -3389,15 +3394,11 @@ msgstr ""
 msgid "Warning: this transaction has unconfirmed inputs"
 msgstr ""
 
-#: src/js/controllers/onboarding/backupRequest.js:17
-msgid "Watch out!"
-msgstr ""
-
 #: src/js/controllers/feedback/send.js:69
 msgid "We'd love to do better."
 msgstr ""
 
-#: www/views/backup.html:35
+#: www/views/backup.html:37
 msgid "We'll confirm on the next screen."
 msgstr ""
 
@@ -3409,10 +3410,6 @@ msgstr ""
 msgid "We're always looking for ways to improve {{appName}}. How could we improve your experience?"
 msgstr ""
 
-#: www/views/includes/incomingDataMenu.html:6
-msgid "Website"
-msgstr ""
-
 #: www/views/preferencesLanguage.html:16
 msgid "We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin."
 msgstr ""
@@ -3429,7 +3426,7 @@ msgstr ""
 msgid "Where would you like to receive email notifications about payments?"
 msgstr ""
 
-#: www/views/addresses.html:19
+#: www/views/addresses.html:20
 msgid "Why?"
 msgstr ""
 
@@ -3441,7 +3438,7 @@ msgstr ""
 msgid "Would you like to receive push notifications about payments?"
 msgstr ""
 
-#: src/js/controllers/import.js:288
+#: src/js/controllers/import.js:295
 msgid "Wrong number of recovery words:"
 msgstr ""
 
@@ -3453,14 +3450,6 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: src/js/controllers/onboarding/backupRequest.js:25
-msgid "Yes, skip"
-msgstr ""
-
-#: src/js/controllers/onboarding/backupRequest.js:24
-msgid "You can create a backup later from your wallet settings."
-msgstr ""
-
 #: src/js/controllers/preferencesLanguage.js:12
 msgid "You can make contributions by signing up on our Crowdin community translation website. We’re looking forward to hearing from you!"
 msgstr ""
@@ -3473,19 +3462,11 @@ msgstr ""
 msgid "You can see the latest developments and contribute to this open source app by visiting our project on GitHub."
 msgstr ""
 
-#: www/views/onboarding/tour.html:19
-msgid "You can spend bitcoin at millions of websites and stores worldwide."
-msgstr ""
-
 #: www/views/backup.html:15
 msgid "You can still export it from Advanced &gt; Export."
 msgstr ""
 
-#: www/views/onboarding/tour.html:32
-msgid "You can trade it for other currencies like US Dollars, Euros, or Pounds."
-msgstr ""
-
-#: www/views/onboarding/tour.html:46
+#: www/views/onboarding/tour.html:7
 msgid "You control your bitcoin."
 msgstr ""
 
@@ -3497,7 +3478,7 @@ msgstr ""
 msgid "You will need to log back for fill in your BitPay Card."
 msgstr ""
 
-#: www/views/preferencesNotifications.html:34
+#: www/views/preferencesNotifications.html:38
 msgid "You'll receive email notifications about payments sent and received from your wallets."
 msgstr ""
 
@@ -3514,7 +3495,7 @@ msgstr ""
 msgid "Your bitcoin wallet is backed up!"
 msgstr ""
 
-#: www/views/tab-home.html:36
+#: www/views/tab-home.html:35
 msgid "Your bitcoin wallet is ready!"
 msgstr ""
 
@@ -3547,25 +3528,26 @@ msgstr ""
 msgid "Your purchase was added to the list of pending"
 msgstr ""
 
-#: www/views/onboarding/backupRequest.html:10
-msgid "Your wallet is never saved to cloud storage or standard device backups."
-msgstr ""
-
-#: src/js/services/walletService.js:1030
+#: src/js/services/walletService.js:1065
 msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down."
 msgstr ""
 
 #: www/views/includes/walletList.html:13
-#: www/views/includes/walletSelector.html:21
-#: www/views/paperWallet.html:33
-#: www/views/tab-receive.html:72
-#: www/views/walletDetails.html:131
-#: www/views/walletDetails.html:51
+#: www/views/includes/walletSelector.html:30
+#: www/views/includes/walletSelector.html:62
+#: www/views/paperWallet.html:34
+#: www/views/paperWallet.html:84
+#: www/views/shapeshift.html:32
+#: www/views/shapeshift.html:55
+#: www/views/signMessage.html:23
+#: www/views/tab-receive.html:99
+#: www/views/walletDetails.html:129
+#: www/views/walletDetails.html:50
 msgid "[Balance Hidden]"
 msgstr ""
 
-#: www/views/walletDetails.html:141
-#: www/views/walletDetails.html:61
+#: www/views/walletDetails.html:139
+#: www/views/walletDetails.html:60
 msgid "[Scanning Funds]"
 msgstr ""
 
@@ -3577,7 +3559,7 @@ msgstr ""
 msgid "locked by pending payments"
 msgstr ""
 
-#: src/js/services/profileService.js:404
+#: src/js/services/profileService.js:420
 msgid "me"
 msgstr ""
 
@@ -3593,19 +3575,19 @@ msgstr ""
 msgid "recovery tool."
 msgstr ""
 
-#: src/js/controllers/buyAmazon.js:239
+#: src/js/controllers/buyAmazon.js:240
 msgid "{{amountStr}} for Amazon.com Gift Card"
 msgstr ""
 
-#: src/js/controllers/buyMercadoLibre.js:237
+#: src/js/controllers/buyMercadoLibre.js:238
 msgid "{{amountStr}} for Mercado Livre Brazil Gift Card"
 msgstr ""
 
 #: www/views/preferencesBwsUrl.html:21
-msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)."
+msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and wallet synchronization. The default configuration points to https://bws.bitcoin.com (Bitcoin.com's public BWS instance)."
 msgstr ""
 
-#: src/js/controllers/confirm.js:408
+#: src/js/controllers/confirm.js:444
 msgid "{{fee}} will be deducted for bitcoin networking fees."
 msgstr ""
 
@@ -3613,12 +3595,12 @@ msgstr ""
 msgid "{{tx.txp[wallet.id].feeRatePerStr}}  of the sending amount"
 msgstr ""
 
-#: www/views/walletDetails.html:218
+#: www/views/walletDetails.html:216
 msgid "{{updatingTxHistoryProgress}} transactions downloaded"
 msgstr ""
 
 #: www/views/cashScan.html:33
 #: www/views/copayers.html:46
-#: www/views/includes/walletInfo.html:18
+#: www/views/includes/walletInfo.html:19
 msgid "{{wallet.m}}-of-{{wallet.n}}"
 msgstr ""
diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index 16724bf18..b7937ea12 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -240,6 +240,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
   };
 
   $scope.changeUnit = function() {
+    $scope.amountModel.amount = '';
 
     if ($scope.alternativeAmount == 0) {
       $scope.alternativeAmount = null;
@@ -294,6 +295,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
     $scope.amountModel.amount = ($scope.amountModel.amount + digit).replace('..', '.');
     checkFontSize();
     $scope.processAmount();
+    navigator.vibrate(50);
   };
 
   $scope.pushOperator = function(operator) {
@@ -323,6 +325,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
     $scope.amountModel.amount = ($scope.amountModel.amount).toString().slice(0, -1);
     $scope.processAmount();
     checkFontSize();
+    navigator.vibrate(50);
   };
 
   $scope.resetAmount = function() {
@@ -464,6 +467,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
         $state.transitionTo('tabs.send.confirm', confirmData);
       }
       $scope.useSendMax = null;
+      navigator.vibrate(50);
     }
 
     if ($scope.showWarningMessage) {
diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js
index bfda5cfc4..97e6992ac 100644
--- a/src/js/controllers/tab-send.js
+++ b/src/js/controllers/tab-send.js
@@ -5,6 +5,9 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
   var originalList;
   var CONTACTS_SHOW_LIMIT;
   var currentContactsPage;
+  $scope.sectionDisplay = {
+    transferToWallet: false
+  };
   $scope.isChromeApp = platformInfo.isChromeApp;
 
 
@@ -247,4 +250,12 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
       updateList();
     });
   });
+
+  $scope.toggle = function(section) {
+    $scope.sectionDisplay[section] = !$scope.sectionDisplay[section];
+    $timeout(function() {
+      $ionicScrollDelegate.resize();
+      $scope.$apply();
+    }, 10);
+  };
 });
diff --git a/src/sass/views/amount.scss b/src/sass/views/amount.scss
index cd77cb501..f100a4394 100644
--- a/src/sass/views/amount.scss
+++ b/src/sass/views/amount.scss
@@ -233,58 +233,238 @@
       }
     }
   }
-  .keypad {
-    text-align: center;
-    font-size: 24px;
-    font-weight: lighter;
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-    color: $v-mid-gray;
 
-    .row {
-      padding: 0 !important;
-      margin: 0 !important;
-    }
+  .scroll-content {
+    display: flex;
+    flex-direction: column;
 
-    .col {
-      line-height: 45px;
-    }
+    .send-amount {
+      flex: 1 1 auto;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
 
-    .operator {
-      background-color: $v-subtle-gray;
-      font-weight: normal;
-      cursor: pointer;
+      .send-amount-tool {
+        flex: 0 1 auto;
 
-      &:active {
-        background-color: $v-light-gray;
+        .send-amount-tool-input {
+          text-align: center;
+          position: relative;
+          padding: 10px 30px;
+
+          .primary-amount {
+            input, .unit, .primary-amount-display {
+              font-size: 1.8em;
+
+              @media (min-width: 375px) {
+                font-size: 2.1em;
+              }
+              
+              @media (min-width: 414px) {
+                font-size: 2.4em;
+              }
+            }
+
+            &.long {
+              input, .unit, .primary-amount-display {
+                font-size: 1.6em;
+  
+                @media (min-width: 375px) {
+                  font-size: 1.8em;
+                }
+                
+                @media (min-width: 414px) {
+                  font-size: 2em;
+                }
+              }
+            }
+
+            &.very-long {
+              input, .unit, .primary-amount-display {
+                font-size: 0.9em;
+  
+                @media (min-width: 375px) {
+                  font-size: 1.3em;
+                }
+                
+                @media (min-width: 414px) {
+                  font-size: 1.4em;
+                }
+              }
+            }
+
+
+            input {
+              border:0;
+              padding:0;
+              white-space:normal;
+              background:none;
+              line-height:1;
+              box-sizing:content-box;
+              display: inline-block;
+              vertical-align: middle;
+              margin: 0;
+              height: 1em;
+              margin-right: 5px;
+              font-family: 'ProximaNova';
+
+              @media (min-width: 375px) {
+              }
+              
+              @media (min-width: 414px) {
+              }
+            }
+
+            .unit,
+            .primary-amount-display {
+              display: inline-block;
+              vertical-align: middle;
+              line-height: 1em;
+            }
+
+            .unit {
+              font-weight: bold;
+            }
+
+            .primary-amount-display {
+              margin-right: 5px;
+              word-break: break-all;
+            }
+          }
+
+          .switch-currencies {
+            position: absolute;
+            right: 0;
+            top: 50%;
+            transform: translate(0, -50%);
+            padding: 5px;
+
+            img {
+              width: 18px;
+            }
+          }
+        }
+
+        .send-amount-actions {
+          margin-top: 15px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+
+          .button {
+            flex: 1 1 auto;
+            line-height: 1.2em;
+
+            + .button {
+              margin-left: 10px;
+            }
+
+            span {
+              display: flex;
+              align-items: center;
+              justify-content: center;
+            }
+          }
+        }
       }
     }
 
-    .operator-send {
-      font-weight: bolder;
-      color: #fff;
-      background-color: $positive;
-      font-size: 36px;
-      cursor: pointer;
-
-      &:active {
-        background-color: #eaeaea;
+    .button {
+      &.no-margin {
+        margin: 0;
       }
     }
 
-    .digit{
-      cursor: pointer;
-      border-top: 1px solid $v-subtle-gray;
-      border-left: 1px solid $v-subtle-gray;
-      &:active {
-        background-color: $v-subtle-gray;
-      }
+    .notification-warning {
+      display: block;
+      padding: .75rem 1.25rem;
+      color: #856404;
+      background-color: #fff3cd;
+      border: 1px solid #ffeeba;
+      line-height: 1.4em;
+      margin-bottom: 20px;
     }
 
-    @media(max-height: 480px) {
-      font-size: 12px;
+    .keypad-container {
+      position: relative;
+      flex: 0 1 196px;
 
+      @media (min-height: 667px) {
+        flex: 0 1 224px;
+      }
+
+      .keypad {
+        text-align: center;
+        font-size: 18px;
+        font-weight: lighter;
+        position: absolute;
+        bottom: 0;
+        width: 100%;
+        color: $v-mid-gray;
+        
+        @media (min-height: 667px) {
+          font-size: 24px;
+        }
+    
+        .row {
+          padding: 0 !important;
+          margin: 0 !important;
+        }
+    
+        .col {
+          line-height: 38px;
+        
+          @media (min-height: 667px) {
+            line-height: 45px;
+          }
+        }
+
+        .row {
+          &:last-child {
+            .col {
+              padding-bottom: 10px;
+            }
+          }
+        }
+    
+        .operator {
+          background-color: $v-subtle-gray;
+          font-weight: normal;
+          cursor: pointer;
+    
+          &:active {
+            background-color: $v-light-gray;
+          }
+        }
+    
+        .operator-send {
+          font-weight: bolder;
+          color: #fff;
+          background-color: $positive;
+          font-size: 36px;
+          cursor: pointer;
+    
+          &:active {
+            background-color: #eaeaea;
+          }
+        }
+    
+        .digit{
+          cursor: pointer;
+          border-top: 1px solid $v-subtle-gray;
+          border-left: 1px solid $v-subtle-gray;
+          transition: all 0.1s ease;
+
+          &:active {
+            background-color: $v-subtle-gray;
+          }
+        }
+    
+        @media(max-height: 480px) {
+          font-size: 12px;
+    
+        }
+      }
     }
   }
 }
diff --git a/www/css/main.css b/www/css/main.css
index 1cc07e123..124e0028e 100644
--- a/www/css/main.css
+++ b/www/css/main.css
@@ -10425,42 +10425,150 @@ textarea.d-block {
         margin-top: 0;
         font-size: 16px; } }
 
-#view-amount .keypad {
-  text-align: center;
-  font-size: 24px;
-  font-weight: lighter;
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  color: #667; }
-  #view-amount .keypad .row {
-    padding: 0 !important;
-    margin: 0 !important; }
-  #view-amount .keypad .col {
-    line-height: 45px; }
-  #view-amount .keypad .operator {
-    background-color: #f2f2f2;
-    font-weight: normal;
-    cursor: pointer; }
-    #view-amount .keypad .operator:active {
-      background-color: #9b9bab; }
-  #view-amount .keypad .operator-send {
-    font-weight: bolder;
-    color: #fff;
-    background-color: #494949;
-    font-size: 36px;
-    cursor: pointer; }
-    #view-amount .keypad .operator-send:active {
-      background-color: #eaeaea; }
-  #view-amount .keypad .digit {
-    cursor: pointer;
-    border-top: 1px solid #f2f2f2;
-    border-left: 1px solid #f2f2f2; }
-    #view-amount .keypad .digit:active {
-      background-color: #f2f2f2; }
-  @media (max-height: 480px) {
-    #view-amount .keypad {
-      font-size: 12px; } }
+#view-amount .scroll-content {
+  display: flex;
+  flex-direction: column; }
+  #view-amount .scroll-content .send-amount {
+    flex: 1 1 auto;
+    display: flex;
+    flex-direction: column;
+    justify-content: center; }
+    #view-amount .scroll-content .send-amount .send-amount-tool {
+      flex: 0 1 auto; }
+      #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input {
+        text-align: center;
+        position: relative;
+        padding: 10px 30px; }
+        #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .primary-amount-display {
+          font-size: 1.8em; }
+          @media (min-width: 375px) {
+            #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .primary-amount-display {
+              font-size: 2.1em; } }
+          @media (min-width: 414px) {
+            #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .primary-amount-display {
+              font-size: 2.4em; } }
+        #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long .primary-amount-display {
+          font-size: 1.6em; }
+          @media (min-width: 375px) {
+            #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long .primary-amount-display {
+              font-size: 1.8em; } }
+          @media (min-width: 414px) {
+            #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long .primary-amount-display {
+              font-size: 2em; } }
+        #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long .primary-amount-display {
+          font-size: 0.9em; }
+          @media (min-width: 375px) {
+            #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long .primary-amount-display {
+              font-size: 1.3em; } }
+          @media (min-width: 414px) {
+            #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long .primary-amount-display {
+              font-size: 1.4em; } }
+        #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount input {
+          border: 0;
+          padding: 0;
+          white-space: normal;
+          background: none;
+          line-height: 1;
+          box-sizing: content-box;
+          display: inline-block;
+          vertical-align: middle;
+          margin: 0;
+          height: 1em;
+          margin-right: 5px;
+          font-family: 'ProximaNova'; }
+        #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .unit,
+        #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .primary-amount-display {
+          display: inline-block;
+          vertical-align: middle;
+          line-height: 1em; }
+        #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .unit {
+          font-weight: bold; }
+        #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .primary-amount-display {
+          margin-right: 5px;
+          word-break: break-all; }
+        #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .switch-currencies {
+          position: absolute;
+          right: 0;
+          top: 50%;
+          transform: translate(0, -50%);
+          padding: 5px; }
+          #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .switch-currencies img {
+            width: 18px; }
+      #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-actions {
+        margin-top: 15px;
+        display: flex;
+        align-items: center;
+        justify-content: center; }
+        #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-actions .button {
+          flex: 1 1 auto;
+          line-height: 1.2em; }
+          #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-actions .button + .button {
+            margin-left: 10px; }
+          #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-actions .button span {
+            display: flex;
+            align-items: center;
+            justify-content: center; }
+  #view-amount .scroll-content .button.no-margin {
+    margin: 0; }
+  #view-amount .scroll-content .notification-warning {
+    display: block;
+    padding: .75rem 1.25rem;
+    color: #856404;
+    background-color: #fff3cd;
+    border: 1px solid #ffeeba;
+    line-height: 1.4em;
+    margin-bottom: 20px; }
+  #view-amount .scroll-content .keypad-container {
+    position: relative;
+    flex: 0 1 196px; }
+    @media (min-height: 667px) {
+      #view-amount .scroll-content .keypad-container {
+        flex: 0 1 224px; } }
+    #view-amount .scroll-content .keypad-container .keypad {
+      text-align: center;
+      font-size: 18px;
+      font-weight: lighter;
+      position: absolute;
+      bottom: 0;
+      width: 100%;
+      color: #667; }
+      @media (min-height: 667px) {
+        #view-amount .scroll-content .keypad-container .keypad {
+          font-size: 24px; } }
+      #view-amount .scroll-content .keypad-container .keypad .row {
+        padding: 0 !important;
+        margin: 0 !important; }
+      #view-amount .scroll-content .keypad-container .keypad .col {
+        line-height: 38px; }
+        @media (min-height: 667px) {
+          #view-amount .scroll-content .keypad-container .keypad .col {
+            line-height: 45px; } }
+      #view-amount .scroll-content .keypad-container .keypad .row:last-child .col {
+        padding-bottom: 10px; }
+      #view-amount .scroll-content .keypad-container .keypad .operator {
+        background-color: #f2f2f2;
+        font-weight: normal;
+        cursor: pointer; }
+        #view-amount .scroll-content .keypad-container .keypad .operator:active {
+          background-color: #9b9bab; }
+      #view-amount .scroll-content .keypad-container .keypad .operator-send {
+        font-weight: bolder;
+        color: #fff;
+        background-color: #494949;
+        font-size: 36px;
+        cursor: pointer; }
+        #view-amount .scroll-content .keypad-container .keypad .operator-send:active {
+          background-color: #eaeaea; }
+      #view-amount .scroll-content .keypad-container .keypad .digit {
+        cursor: pointer;
+        border-top: 1px solid #f2f2f2;
+        border-left: 1px solid #f2f2f2;
+        transition: all 0.1s ease; }
+        #view-amount .scroll-content .keypad-container .keypad .digit:active {
+          background-color: #f2f2f2; }
+      @media (max-height: 480px) {
+        #view-amount .scroll-content .keypad-container .keypad {
+          font-size: 12px; } }
 
 #view-confirm {
   background-color: #ffffff; }
diff --git a/www/img/icon-convert.svg b/www/img/icon-convert.svg
new file mode 100644
index 000000000..01b9016e1
--- /dev/null
+++ b/www/img/icon-convert.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<g>
+	<g>
+		<g>
+			<path d="M304.1,32c44.8,0,48,26.9,48,32v393.4l-84.6-84.6l-22.7,22.6l112,112c6.2,6.2,16.3,6.2,22.6,0l112-112l-22.6-22.6
+				l-84.6,84.6V64c0-22.1-16-64-80-64l-48,0v32H304.1z"/>
+			<path d="M208.1,480c-44.8,0-48-26.9-48-32V54.6l84.6,84.6l22.6-22.6l-112-112c-6.2-6.2-16.3-6.2-22.6,0l-112,112l22.7,22.7
+				l84.6-84.8V448c0,22.1,16,64,80,64h48v-32H208.1z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/www/views/amount.html b/www/views/amount.html
index a1dd8bd7b..6024901a4 100644
--- a/www/views/amount.html
+++ b/www/views/amount.html
@@ -29,8 +29,8 @@
       </div>
     </div>
 
-    <div ng-show="!isAndroid && !isIos" ng-class="{'amount-pane-recipient': !customAmount && !nextStep,'amount-pane-no-recipient': customAmount || nextStep}">
-      <span class="recipient-label" ng-if="showWarningMessage" translate>Note: Address doesn't contain currency information, please make sure you are sending the correct currency.</span>
+    <div ng-show="!isAndroid && !isIos" class="send-amount" ng-class="{'amount-pane-recipient': !customAmount && !nextStep,'amount-pane-no-recipient': customAmount || nextStep}">
+      <span class="recipient-label notification-warning" ng-if="showWarningMessage" translate>Note: Address doesn't contain currency information, please make sure you are sending the correct currency.</span>
       <div class="amount-bar oh">
         <div class="title">
           <span translate>Amount</span>
@@ -61,77 +61,83 @@
       </div>
     </div>
 
-    <div class="item" ng-show="isAndroid || isIos">
-      <span class="recipient-label" ng-if="showWarningMessage" translate>Note: Address doesn't contain currency information, please make sure you are sending the correct currency.</span><br/><br/>
-      <span class="label" translate>Amount</span><br/>
+    <div class="item send-amount" ng-show="isAndroid || isIos">
+      <span class="recipient-label notification-warning" ng-if="showWarningMessage" translate>Note: Address doesn't contain currency information, please make sure you are sending the correct currency.</span>
       <div ng-if="shapeshiftOrderId">
         Minimum amount: {{minShapeshiftAmount}} <br/>
         Maximum amount: {{maxShapeshiftAmount}} <br/>
       </div>
-      <div class="amount">
-        <span>
-          <input type="number" ng-model="amountModel.amount" ng-change="processAmount()" placeholder="Enter amount" focus-me>
-          <a class="amount__currency-toggle-mobile" ng-click="changeUnit()">{{unit}}</a>
-        </span>
-        <span ng-show="globalResult">{{globalResult}} {{unit}}</span>
-        <span>&lt;&gt; {{alternativeAmount || '0.00'}} {{alternativeUnit}}</span>
-      </div>
-      <div>
-        <button class="button button-sendmax" ng-click="sendMax()">
-          <span>
-            <i class="icon ion-ios-speedometer-outline"></i>&emsp;
-            <span translate>Send max amount</span>
-          </span>
-        </button>
-        <button class="button button-sendmax" ng-click="changeUnit()">
-          <span>Switch Currencies</span>
-        </button>
-      </div>
-    </div>
-
-    <div class="item" ng-show="isAndroid || isIos">
-      <button class="button button-standard button-primary" ng-disabled="!allowSend" ng-click="finish()">
-        Confirm
-      </button>
-    </div>
-
-    <div ng-show="!isAndroid && !isIos">
-      <div class="keypad">
-        <div class="row">
-          <div class="col col-25 col-offset-75 operator-send"
-          ng-show="allowSend" ng-click="finish()">
-          <i class="icon ion-ios-arrow-thin-right"></i>
+      <div class="send-amount-tool">
+        <div class="send-amount-tool-input amount">
+          <div class="primary-amount"
+            ng-class="{long: amountModel.amount.length > 5, 'very-long': amountModel.amount.length > 10}">
+            <span class="primary-amount-display">{{ amountModel.amount || 0 }}</span><span class="unit">{{unit}}</span>
+          </div>
+          <span ng-show="globalResult">{{globalResult}} {{unit}}</span>
+          <div class="alternative-amount">
+            <span>{{alternativeAmount || '0.00'}} {{alternativeUnit}}</span>
+          </div>
+          <div class="switch-currencies" ng-click="changeUnit()"><img src="img/icon-convert.svg"></div>
+        </div>
+        <div class="send-amount-actions text-center">
+          <button class="button button-sendmax" ng-click="sendMax()">
+            <span>
+              <i class="icon ion-ios-speedometer-outline"></i>&emsp;
+              <span translate>Send max amount</span>
+            </span>
+          </button>
+          <button class="button button-sendmax" modal-select ng-model="someModel" options="selectables" modal-title="Select a number">
+            <span>
+              <i class="icon ion-social-usd"></i>&emsp;
+              <span translate>Change currency</span>
+            </span>
+          </button>
         </div>
       </div>
+    </div>
 
-      <div class="row">
-        <div class="col digit" ng-click="pushDigit('7')">7</div>
-        <div class="col digit" ng-click="pushDigit('8')">8</div>
-        <div class="col digit" ng-click="pushDigit('9')">9</div>
-        <div class="col operator" ng-click="pushOperator('/')">&divide;</div>
-      </div>
+    <div class="keypad-container">
+      <div class="keypad">
+        <div class="row">
+            <div class="col col-25 col-offset-75 operator-send"
+            ng-show="allowSend" ng-click="finish()">
+            <i class="icon ion-ios-arrow-thin-right"></i>
+          </div>
+        </div>
 
-      <div class="row">
-        <div class="col digit" ng-click="pushDigit('4')">4</div>
-        <div class="col digit" ng-click="pushDigit('5')">5</div>
-        <div class="col digit" ng-click="pushDigit('6')">6</div>
-        <div class="col operator" ng-click="pushOperator('x')">&times;</div>
-      </div>
+        <div class="row">
+          <div class="col digit" ng-click="pushDigit('7')">7</div>
+          <div class="col digit" ng-click="pushDigit('8')">8</div>
+          <div class="col digit" ng-click="pushDigit('9')">9</div>
+        </div>
 
-      <div class="row">
-        <div class="col digit" ng-click="pushDigit('1')">1</div>
-        <div class="col digit" ng-click="pushDigit('2')">2</div>
-        <div class="col digit" ng-click="pushDigit('3')">3</div>
-        <div class="col operator" ng-click="pushOperator('+')">&plus;</div>
-      </div>
+        <div class="row">
+          <div class="col digit" ng-click="pushDigit('4')">4</div>
+          <div class="col digit" ng-click="pushDigit('5')">5</div>
+          <div class="col digit" ng-click="pushDigit('6')">6</div>
+        </div>
 
-      <div class="row">
-        <div class="col digit" ng-click="pushDigit('.')">.</div>
-        <div class="col digit" ng-click="pushDigit('0')">0</div>
-        <div class="col digit icon ion-backspace-outline" ng-click="removeDigit()"></div>
-        <div class="col operator" ng-click="pushOperator('-')">&minus;</div>
+        <div class="row">
+          <div class="col digit" ng-click="pushDigit('1')">1</div>
+          <div class="col digit" ng-click="pushDigit('2')">2</div>
+          <div class="col digit" ng-click="pushDigit('3')">3</div>
+        </div>
+
+        <div class="row">
+          <div class="col digit" ng-click="pushDigit('.')">.</div>
+          <div class="col digit" ng-click="pushDigit('0')">0</div>
+          <div class="col digit icon ion-backspace-outline" ng-click="removeDigit()"></div>
+        </div>
       </div>
     </div>
 
+    <button 
+      ng-show="isAndroid || isIos"
+      class="button button-full button-primary no-margin" 
+      ng-disabled="!allowSend" 
+      ng-click="finish()"
+      translate>
+      Next
+    </button>
   </ion-content>
 </ion-view>
diff --git a/www/views/tab-send.html b/www/views/tab-send.html
index c5bfd27ef..2f33a863e 100644
--- a/www/views/tab-send.html
+++ b/www/views/tab-send.html
@@ -66,10 +66,12 @@
     </div>
 
     <div class="card" ng-if="showTransferCard && hasFunds">
-      <div class="item item-heading">
+      <div class="item item-icon-right item-heading" ng-click="toggle('transferToWallet')">
         <span translate>Transfer to Wallet</span>
+        <i class="icon bp-arrow-up" ng-show="sectionDisplay.transferToWallet"></i>
+        <i class="icon bp-arrow-down" ng-show="!sectionDisplay.transferToWallet"></i>
       </div>
-      <div class="list">
+      <div class="list" ng-show="sectionDisplay.transferToWallet">
         <a class="item item-icon-left item-icon-right"
           ng-repeat="item in list"
           ng-if="hasWallets && item.recipientType == 'wallet'"