diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index f688ed3fc..d475a4364 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -60,7 +60,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
 
   function setNoWallet(msg) {
     $scope.wallet = null;
-    $scope.noWalletMessage = gettextCatalog.getString(msg);
+    $scope.noWalletMessage = msg;
     $log.warn('Not ready to make the payment:' + msg);
     $timeout(function() {
       $scope.$apply();
@@ -80,7 +80,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
       });
 
       if (!$scope.wallets || !$scope.wallets.length) {
-        setNoWallet('No wallets available');
+        setNoWallet(gettextCatalog.getString('No wallets available'));
         return cb();
       }
 
@@ -109,7 +109,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
               return cb('Could not update any wallet');
 
             if (lodash.isEmpty(filteredWallets)) {
-              setNoWallet('Insufficent funds');
+              setNoWallet(gettextCatalog.getString('Insufficient funds'));
             }
             $scope.wallets = lodash.clone(filteredWallets);
             return cb();
@@ -272,7 +272,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
           $log.debug('Send max info', sendMaxInfo);
 
           if (tx.sendMax && sendMaxInfo.amount == 0) {
-            setNoWallet('Insufficent funds');
+            setNoWallet(gettextCatalog.getString('Insufficient funds'));
             popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Not enough funds for fee'));
             return cb('no_funds');
           }
diff --git a/www/views/confirm.html b/www/views/confirm.html
index d638f57bf..a2b85ad88 100644
--- a/www/views/confirm.html
+++ b/www/views/confirm.html
@@ -61,7 +61,7 @@
             <span ng-if="tx.toName && showAddress">{{tx.toAddress}}</span>
           </div>
         </div>
-        <a class="item item-icon-right" ng-hide="!wallets" ng-click="showWalletSelector()">
+        <a class="item item-icon-right" ng-hide="!wallet" ng-click="showWalletSelector()">
           <span class="label" translate>From</span>
           <div class="wallet" ng-if="wallet">
             <i class="icon big-icon-svg">
@@ -107,7 +107,7 @@
   </ion-content>
   <click-to-accept
     ng-click="approve(tx, wallet, statusChangeHandler)"
-    ng-if="!isCordova || isWindowsPhoneApp"
+    ng-if="(!isCordova || isWindowsPhoneApp) && wallet"
     click-send-status="sendStatus"
     is-disabled="!wallet">
     {{buttonText}}
diff --git a/www/views/customAmount.html b/www/views/customAmount.html
index 902671d63..f9d5aafb7 100644
--- a/www/views/customAmount.html
+++ b/www/views/customAmount.html
@@ -10,9 +10,9 @@
     </ion-nav-title>
     <ion-nav-buttons side="secondary">
       <button class="button-share ng-hide" ng-show="showShareButton" ng-click="shareAddress()">
-        <i class="icon" 
+        <i class="icon"
           ng-class="{
-          'ion-ios-upload-outline': showShareButton == 'iOS', 
+          'ion-ios-upload-outline': showShareButton == 'iOS',
           'ion-android-share-alt': showShareButton != 'iOS'
           }"></i>
       </button>
@@ -23,7 +23,7 @@
       <div class="qr-code" copy-to-clipboard="copyToClipboard()">
         <qrcode size="220" data="bitcoin:{{address + '?amount=' + amountBtc}}" color="#334"></qrcode>
       </div>
-      <div class="info"> 
+      <div class="info">
         <div class="item single-line" copy-to-clipboard="address">
           <span class="label" translate>Address</span>
           <span class="item-note ellipsis">
@@ -43,7 +43,7 @@
             </i>
             {{wallet.name}}
           </div>
-          <div class="label">Receive in</div>
+          <div class="label" translate>Receive in</div>
         </div>
       </div>
     </div>