diff --git a/i18n/po/template.pot b/i18n/po/template.pot
index dbb6a5d93..7d5b41420 100644
--- a/i18n/po/template.pot
+++ b/i18n/po/template.pot
@@ -48,12 +48,11 @@ msgid "About"
 msgstr ""
 
 #: src/js/controllers/modals/txpDetails.js:52
-#: src/js/controllers/tx-details.js:62
+#: src/js/controllers/tx-details.js:60
 msgid "Accepted"
 msgstr ""
 
 #: www/views/preferencesInformation.html:66
-#: www/views/topup.html:52
 msgid "Account"
 msgstr ""
 
@@ -113,6 +112,10 @@ msgstr ""
 msgid "Add description"
 msgstr ""
 
+#: www/views/topup.html:6
+msgid "Add funds"
+msgstr ""
+
 #: src/js/services/bitpayAccountService.js:78
 msgid "Add this BitPay account ({{email}})?"
 msgstr ""
@@ -328,7 +331,7 @@ msgstr ""
 msgid "Bitcoin Address"
 msgstr ""
 
-#: www/views/modals/chooseFeeLevel.html:7
+#: www/views/modals/chooseFeeLevel.html:4
 #: www/views/preferencesFee.html:4
 #: www/views/tab-settings.html:85
 msgid "Bitcoin Network Fee Policy"
@@ -363,7 +366,7 @@ msgid "Broadcast Payment"
 msgstr ""
 
 #: src/js/controllers/modals/txpDetails.js:54
-#: src/js/controllers/tx-details.js:64
+#: src/js/controllers/tx-details.js:62
 msgid "Broadcasted"
 msgstr ""
 
@@ -392,7 +395,7 @@ msgid "Calculating fee"
 msgstr ""
 
 #: src/js/controllers/confirm.js:491
-#: src/js/controllers/topup.js:142
+#: src/js/controllers/topup.js:277
 #: src/js/services/popupService.js:60
 #: www/views/addressbook.add.html:10
 #: www/views/feedback/send.html:5
@@ -414,10 +417,6 @@ msgstr ""
 msgid "Cannot join the same wallet more that once"
 msgstr ""
 
-#: www/views/topup.html:46
-msgid "Card"
-msgstr ""
-
 #: www/views/includes/bitpayCardsCard.html:4
 msgid "Cards"
 msgstr ""
@@ -480,7 +479,7 @@ msgstr ""
 
 #: src/js/controllers/confirm.js:490
 #: src/js/controllers/copayers.js:55
-#: src/js/controllers/topup.js:197
+#: src/js/controllers/topup.js:275
 #: www/views/backup.html:53
 #: www/views/backup.html:72
 #: www/views/confirm.html:4
@@ -497,7 +496,7 @@ msgstr ""
 msgid "Confirm your PIN"
 msgstr ""
 
-#: src/js/services/walletService.js:1032
+#: src/js/services/walletService.js:1034
 msgid "Confirm your new spending password"
 msgstr ""
 
@@ -530,7 +529,6 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: src/js/controllers/topup.js:141
 #: www/views/onboarding/notifications.html:9
 msgid "Continue"
 msgstr ""
@@ -598,11 +596,11 @@ msgstr ""
 msgid "Could not create address"
 msgstr ""
 
-#: src/js/controllers/topup.js:59
+#: src/js/controllers/topup.js:86
 msgid "Could not create the invoice"
 msgstr ""
 
-#: src/js/controllers/topup.js:186
+#: src/js/controllers/topup.js:136
 msgid "Could not create transaction"
 msgstr ""
 
@@ -634,7 +632,7 @@ msgstr ""
 msgid "Could not get dynamic fee for level: {{feeLevel}}"
 msgstr ""
 
-#: src/js/controllers/topup.js:66
+#: src/js/controllers/topup.js:94
 msgid "Could not get the invoice"
 msgstr ""
 
@@ -677,7 +675,7 @@ msgstr ""
 msgid "Could not send payment"
 msgstr ""
 
-#: src/js/controllers/topup.js:210
+#: src/js/controllers/topup.js:289
 msgid "Could not send transaction"
 msgstr ""
 
@@ -727,10 +725,6 @@ msgstr ""
 msgid "Creating Wallet..."
 msgstr ""
 
-#: src/js/services/onGoingProcess.js:49
-msgid "Creating invoice..."
-msgstr ""
-
 #: src/js/services/onGoingProcess.js:17
 msgid "Creating transaction"
 msgstr ""
@@ -774,10 +768,6 @@ msgstr ""
 msgid "Deleting payment proposal"
 msgstr ""
 
-#: www/views/topup.html:42
-msgid "Deposit into"
-msgstr ""
-
 #: www/views/join.html:138
 #: www/views/tab-create-personal.html:109
 #: www/views/tab-create-shared.html:138
@@ -789,6 +779,10 @@ msgstr ""
 msgid "Derivation Strategy"
 msgstr ""
 
+#: www/views/topup.html:45
+msgid "Details"
+msgstr ""
+
 #: src/js/controllers/lockSetup.js:9
 #: src/js/controllers/tab-settings.js:60
 msgid "Disabled"
@@ -857,8 +851,8 @@ msgstr ""
 msgid "Enter Amount"
 msgstr ""
 
-#: src/js/services/walletService.js:1046
-#: src/js/services/walletService.js:1061
+#: src/js/services/walletService.js:1048
+#: src/js/services/walletService.js:1063
 msgid "Enter Spending Password"
 msgstr ""
 
@@ -866,7 +860,7 @@ msgstr ""
 msgid "Enter Two Factor for your BitPay account"
 msgstr ""
 
-#: src/js/services/walletService.js:1028
+#: src/js/services/walletService.js:1030
 msgid "Enter new spending password"
 msgstr ""
 
@@ -945,9 +939,9 @@ msgstr ""
 #: src/js/controllers/tab-send.js:132
 #: src/js/controllers/tabsController.js:36
 #: src/js/controllers/tabsController.js:7
-#: src/js/controllers/topup.js:11
-#: src/js/controllers/topup.js:21
-#: src/js/controllers/tx-details.js:102
+#: src/js/controllers/topup.js:15
+#: src/js/controllers/topup.js:26
+#: src/js/controllers/tx-details.js:100
 #: src/js/services/incomingData.js:98
 msgid "Error"
 msgstr ""
@@ -960,15 +954,11 @@ msgstr ""
 msgid "Error creating wallet"
 msgstr ""
 
-#: src/js/controllers/topup.js:159
-msgid "Error fetching invoice"
-msgstr ""
-
 #: src/js/controllers/confirm.js:261
 msgid "Error getting SendMax information"
 msgstr ""
 
-#: src/js/controllers/topup.js:152
+#: src/js/controllers/topup.js:108
 msgid "Error in Payment Protocol"
 msgstr ""
 
@@ -992,10 +982,6 @@ msgstr ""
 msgid "Exceeded daily limit of $500 per user"
 msgstr ""
 
-#: www/views/topup.html:62
-msgid "Expire in"
-msgstr ""
-
 #: src/js/controllers/confirm.js:407
 #: www/views/confirm.html:27
 #: www/views/modals/txp-details.html:121
@@ -1020,7 +1006,7 @@ msgstr ""
 msgid "Export wallet"
 msgstr ""
 
-#: src/js/services/walletService.js:1173
+#: src/js/services/walletService.js:1175
 #: www/views/tab-export-qrCode.html:9
 msgid "Exporting via QR not supported for this wallet"
 msgstr ""
@@ -1046,7 +1032,6 @@ msgstr ""
 msgid "Family vacation funds"
 msgstr ""
 
-#: www/views/topup.html:69
 #: www/views/tx-details.html:81
 msgid "Fee"
 msgstr ""
@@ -1090,7 +1075,7 @@ msgstr ""
 
 #: www/views/confirm.html:65
 #: www/views/modals/txp-details.html:74
-#: www/views/topup.html:32
+#: www/views/topup.html:34
 #: www/views/tx-details.html:52
 msgid "From"
 msgstr ""
@@ -1115,11 +1100,15 @@ msgstr ""
 msgid "Funds found:"
 msgstr ""
 
+#: www/views/topup.html:49
+msgid "Funds to be added"
+msgstr ""
+
 #: www/views/paperWallet.html:53
 msgid "Funds transferred"
 msgstr ""
 
-#: www/views/topup.html:107
+#: www/views/topup.html:103
 msgid "Funds were added to debit card"
 msgstr ""
 
@@ -1167,7 +1156,7 @@ msgstr ""
 #: src/js/controllers/preferencesLanguage.js:14
 #: src/js/controllers/tab-home.js:149
 #: src/js/controllers/tab-settings.js:48
-#: src/js/controllers/tx-details.js:173
+#: src/js/controllers/tx-details.js:174
 msgid "Go Back"
 msgstr ""
 
@@ -1357,11 +1346,12 @@ msgstr ""
 msgid "Incorrect network address"
 msgstr ""
 
-#: src/js/controllers/topup.js:115
 #: src/js/services/bwcError.js:44
 msgid "Insufficient funds"
 msgstr ""
 
+#: src/js/controllers/topup.js:159
+#: src/js/controllers/topup.js:171
 #: src/js/services/bwcError.js:71
 msgid "Insufficient funds for fee"
 msgstr ""
@@ -1370,7 +1360,7 @@ msgstr ""
 msgid "Invalid"
 msgstr ""
 
-#: src/js/controllers/topup.js:152
+#: src/js/controllers/topup.js:109
 msgid "Invalid URL"
 msgstr ""
 
@@ -1398,12 +1388,8 @@ msgstr ""
 msgid "Invitation to share a {{appName}} Wallet"
 msgstr ""
 
-#: www/views/topup.html:58
-msgid "Invoice"
-msgstr ""
-
-#: src/js/controllers/topup.js:257
-msgid "Invoice Expired"
+#: www/views/topup.html:56
+msgid "Invoice Fee"
 msgstr ""
 
 #: src/js/controllers/feedback/send.js:79
@@ -1530,7 +1516,7 @@ msgstr ""
 msgid "Meh - it's alright"
 msgstr ""
 
-#: src/js/controllers/tx-details.js:145
+#: src/js/controllers/tx-details.js:146
 #: www/views/modals/paypro.html:48
 #: www/views/modals/txp-details.html:95
 #: www/views/tx-details.html:74
@@ -1563,7 +1549,7 @@ msgstr ""
 msgid "Moved"
 msgstr ""
 
-#: src/js/controllers/tx-details.js:114
+#: src/js/controllers/tx-details.js:112
 msgid "Moved Funds"
 msgstr ""
 
@@ -1586,6 +1572,10 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
+#: www/views/topup.html:63
+msgid "Network Fee"
+msgstr ""
+
 #: src/js/services/bwcError.js:47
 msgid "Network error"
 msgstr ""
@@ -1614,10 +1604,6 @@ msgstr ""
 msgid "No backup, no bitcoin."
 msgstr ""
 
-#: src/js/controllers/topup.js:94
-msgid "No card selected"
-msgstr ""
-
 #: www/views/addressbook.html:19
 msgid "No contacts yet"
 msgstr ""
@@ -1638,7 +1624,7 @@ msgstr ""
 msgid "No recent transactions"
 msgstr ""
 
-#: src/js/controllers/topup.js:30
+#: src/js/controllers/topup.js:41
 msgid "No signing proposal: No private key"
 msgstr ""
 
@@ -1654,6 +1640,10 @@ msgstr ""
 msgid "No wallet selected"
 msgstr ""
 
+#: src/js/controllers/topup.js:255
+msgid "No wallets available"
+msgstr ""
+
 #: www/views/paperWallet.html:47
 msgid "No wallets available to receive funds"
 msgstr ""
@@ -1712,9 +1702,9 @@ msgstr ""
 msgid "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?"
 msgstr ""
 
+#: src/js/controllers/topup.js:276
 #: src/js/services/popupService.js:16
 #: src/js/services/popupService.js:59
-#: www/views/modals/chooseFeeLevel.html:34
 msgid "OK"
 msgstr ""
 
@@ -1755,7 +1745,7 @@ msgid "Open GitHub Project"
 msgstr ""
 
 #: src/js/controllers/bitpayCard.js:190
-#: src/js/controllers/tx-details.js:172
+#: src/js/controllers/tx-details.js:173
 msgid "Open Insight"
 msgstr ""
 
@@ -1931,7 +1921,7 @@ msgstr ""
 msgid "Preparing backup..."
 msgstr ""
 
-#: src/js/routes.js:1177
+#: src/js/routes.js:1196
 msgid "Press again to exit"
 msgstr ""
 
@@ -1952,7 +1942,7 @@ msgid "Proposal Accepted"
 msgstr ""
 
 #: src/js/controllers/modals/txpDetails.js:51
-#: src/js/controllers/tx-details.js:61
+#: src/js/controllers/tx-details.js:59
 #: www/views/confirm.html:127
 msgid "Proposal Created"
 msgstr ""
@@ -2012,7 +2002,7 @@ msgstr ""
 msgid "Received"
 msgstr ""
 
-#: src/js/controllers/tx-details.js:113
+#: src/js/controllers/tx-details.js:111
 msgid "Received Funds"
 msgstr ""
 
@@ -2058,7 +2048,7 @@ msgid "Recreating Wallet..."
 msgstr ""
 
 #: src/js/controllers/modals/txpDetails.js:53
-#: src/js/controllers/tx-details.js:63
+#: src/js/controllers/tx-details.js:61
 msgid "Rejected"
 msgstr ""
 
@@ -2134,7 +2124,6 @@ msgstr ""
 
 #: www/views/addressbook.add.html:56
 #: www/views/includes/note.html:9
-#: www/views/modals/chooseFeeLevel.html:33
 #: www/views/preferencesAlias.html:21
 #: www/views/preferencesBwsUrl.html:25
 #: www/views/preferencesNotifications.html:40
@@ -2271,18 +2260,14 @@ msgstr ""
 msgid "Sending {{amountStr}} from your {{name}} wallet"
 msgstr ""
 
-#: src/js/controllers/topup.js:190
-msgid "Sending {{amountStr}} from {{walletName}}"
-msgstr ""
-
 #: www/views/includes/walletHistory.html:42
 #: www/views/modals/tx-status.html:9
-#: www/views/topup.html:104
+#: www/views/topup.html:100
 #: www/views/tx-details.html:17
 msgid "Sent"
 msgstr ""
 
-#: src/js/controllers/tx-details.js:112
+#: src/js/controllers/tx-details.js:110
 msgid "Sent Funds"
 msgstr ""
 
@@ -2414,7 +2399,7 @@ msgstr ""
 msgid "Startup Lock"
 msgstr ""
 
-#: www/views/topup.html:105
+#: www/views/topup.html:101
 msgid "Success"
 msgstr ""
 
@@ -2523,7 +2508,7 @@ msgstr ""
 msgid "The password of the recovery phrase (if set)"
 msgstr ""
 
-#: src/js/services/walletService.js:1138
+#: src/js/services/walletService.js:1140
 msgid "The payment was created but could not be completed. Please try again from home screen"
 msgstr ""
 
@@ -2593,10 +2578,6 @@ msgstr ""
 msgid "This bitcoin payment request has expired."
 msgstr ""
 
-#: src/js/controllers/topup.js:257
-msgid "This invoice has expired. An invoice is only valid for 15 minutes."
-msgstr ""
-
 #: www/views/join.html:130
 #: www/views/tab-create-personal.html:101
 #: www/views/tab-create-shared.html:130
@@ -2650,12 +2631,12 @@ msgstr ""
 msgid "Top up in progress..."
 msgstr ""
 
-#: src/js/controllers/topup.js:137
+#: src/js/controllers/topup.js:198
 msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})"
 msgstr ""
 
 #: www/views/modals/wallet-balance.html:23
-#: www/views/topup.html:75
+#: www/views/topup.html:70
 msgid "Total"
 msgstr ""
 
@@ -2693,11 +2674,15 @@ msgstr ""
 msgid "Transaction created"
 msgstr ""
 
-#: www/views/topup.html:108
+#: src/js/controllers/topup.js:271
+msgid "Transaction has not been created"
+msgstr ""
+
+#: www/views/topup.html:104
 msgid "Transaction initiated"
 msgstr ""
 
-#: src/js/controllers/tx-details.js:102
+#: src/js/controllers/tx-details.js:100
 msgid "Transaction not available at this time"
 msgstr ""
 
@@ -2800,7 +2785,7 @@ msgid "View Terms of Service"
 msgstr ""
 
 #: src/js/controllers/bitpayCard.js:189
-#: src/js/controllers/tx-details.js:171
+#: src/js/controllers/tx-details.js:172
 msgid "View Transaction on Insight"
 msgstr ""
 
@@ -3140,7 +3125,7 @@ msgstr ""
 msgid "Your wallet is never saved to cloud storage or standard device backups."
 msgstr ""
 
-#: src/js/services/walletService.js:1029
+#: src/js/services/walletService.js:1031
 msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down."
 msgstr ""
 
@@ -3192,7 +3177,6 @@ msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain inform
 msgstr ""
 
 #: src/js/controllers/confirm.js:354
-#: src/js/controllers/topup.js:194
 msgid "{{fee}} will be deducted for bitcoin networking fees."
 msgstr ""
 
diff --git a/src/js/controllers/topup.js b/src/js/controllers/topup.js
index a6261fd35..175d7e016 100644
--- a/src/js/controllers/topup.js
+++ b/src/js/controllers/topup.js
@@ -252,7 +252,7 @@ angular.module('copayApp.controllers').controller('topUpController', function($s
       });
 
       if (lodash.isEmpty($scope.wallets)) {
-        showErrorAndBack(null, gettextCatalog.getString('No wallets with funds'));
+        showErrorAndBack(null, gettextCatalog.getString('No wallets available'));
         return;
       }