diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index 762bfe42b..07256c0b2 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -140,7 +140,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
 
       return cb();
     });
-  }
+  };
 
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
     $scope.fromWallet = profileService.getWallet(data.stateParams.fromWalletId); // Wallet to send from
@@ -463,7 +463,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     }
   };
 
-
   $scope.toggleAddress = function() {
     $scope.showAddress = !$scope.showAddress;
   };
diff --git a/src/js/controllers/review.controller.js b/src/js/controllers/review.controller.js
index 473ac4452..f0a0ec2ae 100644
--- a/src/js/controllers/review.controller.js
+++ b/src/js/controllers/review.controller.js
@@ -4,7 +4,7 @@ angular
   .module('copayApp.controllers')
   .controller('reviewController', reviewController);
 
-function reviewController(addressbookService, configService, gettextCatalog, profileService, $log, $scope, txFormatService) {
+function reviewController($log, $scope, $ionicLoading, $ionicModal, $timeout, addressbookService, bitcoinCashJsService, bitcore, bitcoreCash, configService, feeService, gettextCatalog, lodash, ongoingProcess, platformInfo, profileService, walletService, txFormatService) {
   var vm = this;
 
   vm.destination = {
@@ -20,6 +20,8 @@ function reviewController(addressbookService, configService, gettextCatalog, pro
   };
   vm.feeCrypto = '';
   vm.feeFiat = '';
+  vm.fiatCurrency = '';
+  vm.feeLessThanACent = false;
   vm.origin = {
     balanceAmount: '',
     balanceCurrency: '',
@@ -28,21 +30,30 @@ function reviewController(addressbookService, configService, gettextCatalog, pro
     currencyColor: '',
     name: '',
   };
+  vm.isCordova = platformInfo.isCordova;
   vm.primaryAmount = '';
   vm.primaryCurrency = '';
+  vm.usingMerchantFee = false;
   vm.secondaryAmount = '';
   vm.secondaryCurrency = '';
   vm.thirdParty = false;
   vm.sendingTitle = gettextCatalog.getString('You are sending');
+  vm.buttonText = '';
 
   var config = null;
   var coin = '';
+  var countDown = null;
+  var usingCustomFee = false;
+  var usingMerchantFee = false;
+  var destinationWalletId = '';
   var originWalletId = '';
+  var originWallet;
   var priceDisplayIsFiat = true;
   var satoshis = null;
   var toAddress = '';
-  var destinationWalletId = '';
+  var tx = {};
 
+  var FEE_TOO_HIGH_LIMIT_PERCENTAGE = 15;
 
   $scope.$on("$ionicView.beforeEnter", onBeforeEnter);
 
@@ -53,7 +64,7 @@ function reviewController(addressbookService, configService, gettextCatalog, pro
     satoshis = parseInt(data.stateParams.amount, 10);
     toAddress = data.stateParams.toAddr;
     
-    var originWallet = profileService.getWallet(originWalletId);
+    originWallet = profileService.getWallet(originWalletId);
     vm.origin.currency = originWallet.coin.toUpperCase();
     vm.origin.color = originWallet.color;
     vm.origin.name = originWallet.name;
@@ -68,8 +79,6 @@ function reviewController(addressbookService, configService, gettextCatalog, pro
             vm.thirdParty.data = {};
           }
           vm.thirdParty.data['fromWalletId'] = vm.fromWalletId;
-          vm.fromWallet = profileService.getWallet(vm.fromWalletId);
-          vm.toWallet = profileService.getWallet(vm.toWalletId);
         }
       }
     }
@@ -86,15 +95,186 @@ function reviewController(addressbookService, configService, gettextCatalog, pro
       getOriginWalletBalance(originWallet);
       handleDestinationAsAddress(toAddress, coin);
       handleDestinationAsWallet(data.stateParams.toWalletId);
+      createVanityTransaction(data);
     });
-  }  
+  }
 
+  vm.chooseFeeLevel = function(tx, wallet) {
+
+    if (wallet.coin == 'bch') return;
+    if (usingMerchantFee) return;
+
+    var scope = $rootScope.$new(true);
+    scope.network = tx.network;
+    scope.feeLevel = tx.feeLevel;
+    scope.noSave = true;
+    scope.coin = originWallet.coin;
+
+    if (usingCustomFee) {
+      scope.customFeePerKB = tx.feeRate;
+      scope.feePerSatByte = tx.feeRate / 1000;
+    }
+
+    $ionicModal.fromTemplateUrl('views/modals/chooseFeeLevel.html', {
+      scope: scope,
+      backdropClickToClose: false,
+      hardwareBackButtonClose: false
+    }).then(function(modal) {
+      scope.chooseFeeLevelModal = modal;
+      scope.openModal();
+    });
+    scope.openModal = function() {
+      scope.chooseFeeLevelModal.show();
+    };
+
+    scope.hideModal = function(newFeeLevel, customFeePerKB) {
+      scope.chooseFeeLevelModal.hide();
+      $log.debug('New fee level choosen:' + newFeeLevel + ' was:' + tx.feeLevel);
+
+      usingCustomFee = newFeeLevel == 'custom' ? true : false;
+
+      if (tx.feeLevel == newFeeLevel && !usingCustomFee) return;
+
+      tx.feeLevel = newFeeLevel;
+      if (usingCustomFee) tx.feeRate = parseInt(customFeePerKB);
+
+      updateTx(tx, originWallet, {
+        clearCache: true,
+        dryRun: true
+      }, function() {});
+    };
+  };
+
+  function createVanityTransaction(data) {
+    var configFeeLevel = config.wallet.settings.feeLevel ? config.wallet.settings.feeLevel : 'normal';
+
+    // Grab stateParams
+    tx = {
+      amount: parseInt(data.stateParams.amount),
+      sendMax: data.stateParams.useSendMax == 'true' ? true : false,
+      fromWalletId: data.stateParams.fromWalletId,
+      toAddress: data.stateParams.toAddress,
+      feeLevel: configFeeLevel,
+      spendUnconfirmed: config.wallet.spendUnconfirmed,
+
+      // Vanity tx info (not in the real tx)
+      recipientType: vm.destination.kind || null,
+      toName: vm.destination.name || null,
+      toEmail: vm.destination.email || null,
+      toColor: vm.destination.color || null,
+      network: false,
+      coin: originWallet.coin,
+      txp: {},
+    };
+
+    if (data.stateParams.requiredFeeRate) {
+      vm.usingMerchantFee = true;
+      tx.feeRate = parseInt(data.stateParams.requiredFeeRate);
+    }
+
+    if (tx.coin && tx.coin === 'bch') {
+      tx.feeLevel = 'normal';
+    }
+
+    var B = data.stateParams.coin === 'bch' ? bitcoreCash : bitcore;
+    var networkName;
+    try {
+      if (vm.destination.kind === 'wallet') { // There is a wallet-to-wallet transfer
+        $ionicLoading.show();
+        var toWallet = profileService.getWallet(data.stateParams.toWalletId);
+
+        // We need an address to send to, so we ask the walletService to create a new address for the toWallet.
+        walletService.getAddress(toWallet, true, function (err, addr) {
+          $ionicLoading.hide();
+          tx.toAddress = addr;
+          networkName = (new B.Address(tx.toAddress)).network.name;
+          tx.network = networkName;
+          setupTx(tx);
+        });
+      } else { // This is a Wallet-to-address transfer
+        networkName = (new B.Address(tx.toAddress)).network.name;
+        tx.network = networkName;
+        setupTx(tx);
+      }
+    } catch (e) {
+      var message = gettextCatalog.getString('Invalid address');
+      popupService.showAlert(null, message, function () {
+        $ionicHistory.nextViewOptions({
+          disableAnimate: true,
+          historyRoot: true
+        });
+        $state.go('tabs.send').then(function () {
+          $ionicHistory.clearHistory();
+        });
+      });
+      return;
+    }
+  }
   function getOriginWalletBalance(originWallet) {
     var balanceText = getWalletBalanceDisplayText(originWallet);
     vm.origin.balanceAmount = balanceText.amount;
     vm.origin.balanceCurrency = balanceText.currency;
   }
 
+  function getSendMaxInfo(tx, wallet, cb) {
+    if (!tx.sendMax) return cb();
+
+    //ongoingProcess.set('retrievingInputs', true);
+    walletService.getSendMaxInfo(wallet, {
+      feePerKb: tx.feeRate,
+      excludeUnconfirmedUtxos: !tx.spendUnconfirmed,
+      returnInputs: true,
+    }, cb);
+  };
+
+  function getTxp(tx, wallet, dryRun, cb) {
+
+    // ToDo: use a credential's (or fc's) function for this
+    if (tx.description && !wallet.credentials.sharedEncryptingKey) {
+      var msg = gettextCatalog.getString('Could not add message to imported wallet without shared encrypting key');
+      $log.warn(msg);
+      return setSendError(msg);
+    }
+
+    if (tx.amount > Number.MAX_SAFE_INTEGER) {
+      var msg = gettextCatalog.getString('Amount too big');
+      $log.warn(msg);
+      return setSendError(msg);
+    }
+
+    var txp = {};
+
+    txp.outputs = [{
+      'toAddress': tx.toAddress,
+      'amount': tx.amount,
+      'message': tx.description
+    }];
+
+    if (tx.sendMaxInfo) {
+      txp.inputs = tx.sendMaxInfo.inputs;
+      txp.fee = tx.sendMaxInfo.fee;
+    } else {
+      if (usingCustomFee || usingMerchantFee) {
+        txp.feePerKb = tx.feeRate;
+      } else txp.feeLevel = tx.feeLevel;
+    }
+
+    txp.message = tx.description;
+
+    if (tx.paypro) {
+      txp.payProUrl = tx.paypro.url;
+    }
+    txp.excludeUnconfirmedUtxos = !tx.spendUnconfirmed;
+    txp.dryRun = dryRun;
+    walletService.createTx(wallet, txp, function(err, ctxp) {
+      if (err) {
+        setSendError(err);
+        return cb(err);
+      }
+      return cb(null, ctxp);
+    });
+  };
+
   function getWalletBalanceDisplayText(wallet) {
     var balanceCryptoAmount = '';
     var balanceCryptoCurrencyCode = '';
@@ -157,7 +337,8 @@ function reviewController(addressbookService, configService, gettextCatalog, pro
   function handleDestinationAsContact(contact) {
     vm.destination.kind = 'contact';
     vm.destination.name = contact.name;
-    vm.destination.color = contact.coin === 'btc' ? config.bitcoinWalletColor : config.bitcoinCashWalletColor; 
+    vm.destination.email = contact.email;
+    vm.destination.color = contact.coin === 'btc' ? config.bitcoinWalletColor : config.bitcoinCashWalletColor;
     vm.destination.currency = contact.coin.toUpperCase();
     vm.destination.currencyColor = vm.destination.color;
   }
@@ -228,4 +409,234 @@ function reviewController(addressbookService, configService, gettextCatalog, pro
     });
   }
 
+  function setButtonText(isMultisig, isPayPro) {
+    if (isPayPro) {
+      if (vm.isCordova) {
+        vm.buttonText = gettextCatalog.getString('Slide to pay');
+      } else {
+        vm.buttonText = gettextCatalog.getString('Click to pay');
+      }
+    } else if (isMultisig) {
+      if (vm.isCordova) {
+        vm.buttonText = gettextCatalog.getString('Slide to accept');
+      } else {
+        vm.buttonText = gettextCatalog.getString('Click to accept');
+      }
+    } else {
+      if (vm.isCordova) {
+        vm.buttonText = gettextCatalog.getString('Slide to send');
+      } else {
+        vm.buttonText = gettextCatalog.getString('Click to send');
+      }
+    }
+  }
+
+  function setupTx(tx) {
+    if (tx.coin === 'bch') {
+      tx.displayAddress = bitcoinCashJsService.readAddress(tx.toAddress).cashaddr;
+    } else {
+      tx.displayAddress = entry.address;
+    }
+
+    addressbookService.get(tx.coin+tx.toAddress, function(err, addr) { // Check if the recipient is a contact
+      if (!err && addr) {
+        tx.toName = addr.name;
+        tx.toEmail = addr.email;
+        tx.recipientType = 'contact';
+      }
+    });
+
+    // Other Scope vars
+    vm.showAddress = false;
+
+
+    setButtonText(originWallet.credentials.m > 1, !!tx.paypro);
+
+    if (tx.paypro)
+      _paymentTimeControl(tx.paypro.expires);
+
+    updateTx(tx, originWallet, {
+      dryRun: true
+    }, function(err) {
+      $timeout(function() {
+        $scope.$apply();
+      }, 10);
+
+    });
+
+    // setWalletSelector(tx.coin, tx.network, tx.amount, function(err) {
+    //   if (err) {
+    //     return exitWithError('Could not update wallets');
+    //   }
+    //
+    //   if (vm.wallets.length > 1) {
+    //     vm.showWalletSelector();
+    //   } else if (vm.wallets.length) {
+    //     setWallet(vm.wallets[0], tx);
+    //   }
+    // });
+  }
+  function updateTx(tx, wallet, opts, cb) {
+    ongoingProcess.set('calculatingFee', true);
+
+    if (opts.clearCache) {
+      tx.txp = {};
+    }
+
+    // $scope.tx = tx;
+
+    // function updateAmount() {
+    //   if (!tx.amount) return;
+    //
+    //   // Amount
+    //   tx.amountStr = txFormatService.formatAmountStr(originWallet.coin, tx.amount);
+    //   tx.amountValueStr = tx.amountStr.split(' ')[0];
+    //   tx.amountUnitStr = tx.amountStr.split(' ')[1];
+    //   txFormatService.formatAlternativeStr(wallet.coin, tx.amount, function(v) {
+    //     var parts = v.split(' ');
+    //     tx.alternativeAmountStr = v;
+    //     tx.alternativeAmountValueStr = parts[0];
+    //     tx.alternativeAmountUnitStr = (parts.length > 0) ? parts[1] : '';
+    //   });
+    // }
+    //
+    // updateAmount();
+    // refresh();
+
+    // End of quick refresh, before wallet is selected.
+    if (!wallet) {
+      ongoingProcess.set('calculatingFee', false);
+      return cb();
+    }
+
+    var feeServiceLevel = usingMerchantFee && originWallet.coin == 'btc' ? 'urgent' : tx.feeLevel;
+    feeService.getFeeRate(originWallet.coin, tx.network, feeServiceLevel, function(err, feeRate) {
+      if (err) {
+        ongoingProcess.set('calculatingFee', false);
+        return cb(err);
+      }
+
+      var msg;
+      if (usingCustomFee) {
+        msg = gettextCatalog.getString('Custom');
+        tx.feeLevelName = msg;
+      } else if (usingMerchantFee) {
+        $log.info('Using Merchant Fee:' + tx.feeRate + ' vs. Urgent level:' + feeRate);
+        msg = gettextCatalog.getString('Suggested by Merchant');
+        tx.feeLevelName = msg;
+      } else {
+        tx.feeLevelName = feeService.feeOpts[tx.feeLevel];
+        tx.feeRate = feeRate;
+      }
+
+      getSendMaxInfo(lodash.clone(tx), wallet, function(err, sendMaxInfo) {
+        if (err) {
+          ongoingProcess.set('calculatingFee', false);
+          var msg = gettextCatalog.getString('Error getting SendMax information');
+          return setSendError(msg);
+        }
+
+        if (sendMaxInfo) {
+
+          $log.debug('Send max info', sendMaxInfo);
+
+          if (tx.sendMax && sendMaxInfo.amount == 0) {
+            ongoingProcess.set('calculatingFee', false);
+            setNoWallet(gettextCatalog.getString('Insufficient confirmed funds'));
+            popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Not enough funds for fee'));
+            return cb('no_funds');
+          }
+
+          tx.sendMaxInfo = sendMaxInfo;
+          tx.amount = tx.sendMaxInfo.amount;
+          updateAmount();
+          ongoingProcess.set('calculatingFee', false);
+          $timeout(function() {
+            showSendMaxWarning(wallet, sendMaxInfo);
+          }, 200);
+        }
+
+        // txp already generated for this wallet?
+        if (tx.txp[wallet.id]) {
+          ongoingProcess.set('calculatingFee', false);
+          updateSendAmounts();
+          return cb();
+        }
+
+        getTxp(lodash.clone(tx), wallet, opts.dryRun, function(err, txp) {
+          ongoingProcess.set('calculatingFee', false);
+          if (err) {
+            if (err.message == 'Insufficient funds') {
+              setNoWallet(gettextCatalog.getString('Insufficient funds'));
+              popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Not enough funds for fee'));
+              return cb('no_funds');
+            } else
+              return cb(err);
+          }
+
+          txp.feeStr = txFormatService.formatAmountStr(wallet.coin, txp.fee);
+          txFormatService.formatAlternativeStr(wallet.coin, txp.fee, function(v) {
+            // txp.alternativeFeeStr = v;
+            // if (txp.alternativeFeeStr.substring(0, 4) == '0.00')
+            //   txp.alternativeFeeStr = '< ' + txp.alternativeFeeStr;
+            vm.feeFiat = v;
+            vm.fiatCurrency = config.wallet.settings.alternativeIsoCode;
+            if (v.substring(0, 1) === "<") {
+              vm.feeLessThanACent = true;
+            }
+            
+            console.log("fiat", vm.feeFiat);
+
+          });
+
+          var per = (txp.fee / (txp.amount + txp.fee) * 100);
+          var perString = per.toFixed(2);
+          txp.feeRatePerStr = (perString == '0.00' ? '< ' : '') + perString + '%';
+          txp.feeToHigh = per > FEE_TOO_HIGH_LIMIT_PERCENTAGE;
+          vm.feeCrypto = txp.fee;
+          console.log("crypto", vm.feeCrypto);
+
+
+          tx.txp[wallet.id] = txp;
+          $log.debug('Confirm. TX Fully Updated for wallet:' + wallet.id, tx);
+          updateSendAmounts();
+
+          return cb();
+        });
+      });
+    });
+  }
+
+  function _paymentTimeControl(expirationTime) {
+    $scope.paymentExpired = false;
+    setExpirationTime();
+
+    countDown = $interval(function() {
+      setExpirationTime();
+    }, 1000);
+
+    function setExpirationTime() {
+      var now = Math.floor(Date.now() / 1000);
+
+      if (now > expirationTime) {
+        setExpiredValues();
+        return;
+      }
+
+      var totalSecs = expirationTime - now;
+      var m = Math.floor(totalSecs / 60);
+      var s = totalSecs % 60;
+      $scope.remainingTimeStr = ('0' + m).slice(-2) + ":" + ('0' + s).slice(-2);
+    };
+
+    function setExpiredValues() {
+      $scope.paymentExpired = true;
+      $scope.remainingTimeStr = gettextCatalog.getString('Expired');
+      if (countDown) $interval.cancel(countDown);
+      $timeout(function() {
+        $scope.$apply();
+      });
+    };
+  };
+
 }
diff --git a/src/js/directives/shapeshiftCoinTrader.js b/src/js/directives/shapeshiftCoinTrader.js
index d5c62f431..60cc66bdf 100644
--- a/src/js/directives/shapeshiftCoinTrader.js
+++ b/src/js/directives/shapeshiftCoinTrader.js
@@ -111,7 +111,7 @@ angular.module('copayApp.directives').directive('shapeshiftCoinTrader', function
                       orderId: $scope.depositInfo.orderId
                     };
 
-                    if (incomingData.redir(sendAddress, shapeshiftData)) {
+                    if (incomingData.redir(sendAddress, 'shapeshift', shapeshiftData)) {
                         ongoingProcess.set('connectingShapeshift', false);
                         return;
                     }
diff --git a/src/js/services/shapeshiftService.js b/src/js/services/shapeshiftService.js
index 41af14002..131df0cd0 100644
--- a/src/js/services/shapeshiftService.js
+++ b/src/js/services/shapeshiftService.js
@@ -109,7 +109,7 @@ angular.module('copayApp.services').factory('shapeshiftService', function($http,
           orderId: root.depositInfo.orderId
         };
 
-        if (incomingData.redir(sendAddress, shapeshiftData)) {
+        if (incomingData.redir(sendAddress, 'shapeshift', shapeshiftData)) {
           ongoingProcess.set('connectingShapeshift', false);
           return;
         }
diff --git a/www/views/review.html b/www/views/review.html
index e398e68a1..a26143d2c 100644
--- a/www/views/review.html
+++ b/www/views/review.html
@@ -13,7 +13,7 @@
     <div class="header" ng-class="vm.thirdParty.id">
       <div class="content">
         <p>{{vm.sendingTitle}}</p>
-        <p class="large">{{vm.primaryAmount}} {{vm.primaryCurrency}}</amount></p>
+        <p class="large">{{vm.primaryAmount}} {{vm.primaryCurrency}}</p>
         <p ng-show="vm.secondaryAmount">{{vm.secondaryAmount}} {{vm.secondaryCurrency}}</p>
       </div>
     </div>
@@ -73,24 +73,22 @@
   </ion-content>
 
   <div class="fee-summary">
-    <div class="fee-fiat positive">Fee: Less than 1 cent</div>
-    <div class="fee-crypto"
-      ng-init="fee = {value: '0.00195823', currency: 'BCH'};">
-      <amount
-        value="fee.value"
-        currency="fee.currency"></amount>
+    <div class="fee-fiat positive" ng-if="vm.feeLessThanACent">Fee: Less than 1 cent</div>
+    <div class="fee-fiat positive" ng-if="!vm.feeLessThanACent">Fee: <amount value="fee.value" currency="fee.currency"></amount></div>
+    <div class="fee-crypto" ng-if="vm.feeCrypto">
+      <amount value="vm.feeCrypto" currency="fee.currency"></amount>
     </div>
   </div>
 
   <click-to-accept
     ng-click="approve(tx, wallet, statusChangeHandler)"
-    ng-if="(!isCordova || isWindowsPhoneApp)"
+    ng-if="(!vm.isCordova)"
     click-send-status="sendStatus"
     is-disabled="!wallet">
     {{buttonText}}
   </click-to-accept>
   <slide-to-accept
-    ng-if="isCordova && !isWindowsPhoneApp"
+    ng-if="vm.isCordova"
     slide-on-confirm="approve(tx, wallet, statusChangeHandler)"
     slide-send-status="sendStatus"
     is-disabled="!wallet">