diff --git a/app-template/bitcoincom/css/bitcoin.com.css b/app-template/bitcoincom/css/bitcoin.com.css
index e9b316761..cb20ff48d 100644
--- a/app-template/bitcoincom/css/bitcoin.com.css
+++ b/app-template/bitcoincom/css/bitcoin.com.css
@@ -268,5 +268,33 @@ div.onboarding-topic {
 	display: block;
 	float: left;
 	max-height: 100%;
-	max-width: 100%;
+  max-width: 100%;
+}
+
+.bitpay-banner {
+	background: #1A3A8B;
+	padding: 10px;
+	box-shadow: 0px 5px 10px 0px #cccccc;
+	height: 5em;
+}
+
+.bitpay-logo { 
+	display: block;
+	max-height: 100%;
+  width: 100%;
+  height: 4em;
+}
+
+.egifter-banner {
+	background: #1A3A8B;
+	padding: 10px;
+	box-shadow: 0px 5px 10px 0px #cccccc;
+  height: 5em;
+  text-align: center;
+}
+
+.egifter-logo { 
+	max-height: 100%;
+  max-width: 100%;
+  height: 4em;
 }
diff --git a/i18n/po/template.pot b/i18n/po/template.pot
index a23e5dbae..358145a1c 100644
--- a/i18n/po/template.pot
+++ b/i18n/po/template.pot
@@ -197,6 +197,10 @@ msgstr ""
 msgid "Alternative Currency"
 msgstr ""
 
+#: www/views/tab-settings.html:75
+msgid "Price Display"
+msgstr ""
+
 #: src/js/controllers/buyAmazon.js:98
 msgid "Amazon.com is not available at this moment. Please try back later."
 msgstr ""
@@ -2175,7 +2179,7 @@ msgid "Payment details"
 msgstr ""
 
 #: www/views/modals/paypro.html:6
-msgid "Payment request"
+msgid "Payment Request"
 msgstr ""
 
 #: www/views/mercadoLibreCards.html:22
@@ -2647,6 +2651,7 @@ msgid "You can receive bitcoin from any wallet or service."
 msgstr ""
 
 #: www/views/tab-send.html:72
+#: www/views/shapeshift.html:23
 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin."
 msgstr ""
 
@@ -3108,6 +3113,26 @@ msgstr ""
 msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})"
 msgstr ""
 
+#: www/views/shapeshift.html:30
+msgid "Start ShapeShift"
+msgstr ""
+
+#: www/views/shapeshift.html:30
+msgid "Exchange your BTC to BCH in minutes."
+msgstr ""
+
+#: www/views/shapeshift.html:30
+msgid "To start the process you need to add funds to your wallet."
+msgstr ""
+
+#: www/views/shapeshift.html:30
+msgid "he process is fast and you will receive the exchanged amount in your wallet."
+msgstr ""
+
+#: www/views/shapeshift.html:34
+msgid "This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction."
+msgstr ""
+
 #: www/views/buyAmazon.html:61
 #: www/views/buyMercadoLibre.html:60
 #: www/views/modals/wallet-balance.html:23
@@ -3699,3 +3724,44 @@ msgstr ""
 #: www/views/includes/walletInfo.html:18
 msgid "{{wallet.m}}-of-{{wallet.n}}"
 msgstr ""
+
+#: src/js/controllers/amount.js:49
+msgid "Address doesn\'t contain currency information, please make sure you are sending the correct currency."
+msgstr ""
+
+#: www/views/review.html:4
+msgid "Review Transaction"
+msgstr ""
+
+#: src/js/controllers/review.controller.js:36
+msgid "You are sending"
+msgstr ""
+
+#: src/js/controllers/review.controller.js:66
+msgid "You are shifting"
+msgstr ""
+
+#: www/views/review.html:22
+msgid "From:"
+msgstr ""
+
+#: www/views/review.html:36
+msgid "To:"
+msgstr ""
+
+#: www/views/review.html:53
+msgid "Add personal note"
+msgstr ""
+
+
+#: www/views/review.html:57
+msgid "Personal note:"
+msgstr ""
+
+#: www/views/review.html:69
+msgid "Less than 1 cent"
+msgstr ""
+
+#: src/js/services/incomingData.js:129
+msgid "This invoice is no longer accepting payments"
+msgstr ""
\ No newline at end of file
diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index 52695e829..e6913a2cb 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -1,68 +1,164 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('amountController', function($scope, $filter, $timeout, $ionicModal, $ionicScrollDelegate, $ionicHistory, storageService, walletService, gettextCatalog, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, txFormatService, ongoingProcess, popupService, bwcError, payproService, profileService, bitcore, amazonService, nodeWebkitService) {
+angular.module('copayApp.controllers').controller('amountController', amountController);
+
+function amountController(configService, $filter, gettextCatalog, $ionicHistory, $ionicModal, $ionicScrollDelegate, lodash, $log, nodeWebkitService, rateService, $scope, $state, $timeout, shapeshiftService, txFormatService, platformInfo, profileService, walletService, $window) {
+  var vm = this;
+
+  vm.allowSend = false;
+  vm.altCurrencyList = [];
+  vm.alternativeAmount = '';
+  vm.alternativeUnit = '';
+  vm.amount = '0';
+  vm.availableFunds = '';
+  // Use insufficient for logic, as when the amount is invalid, funds being
+  // either sufficent or insufficient doesn't make sense.
+  vm.fundsAreInsufficient = false;
+  vm.globalResult = '';
+  vm.isRequestingSpecificAmount = false;
+  vm.listComplete = false;
+  vm.lastUsedPopularList = [];
+  vm.maxAmount = 0;
+  vm.minAmount = 0;
+  vm.thirdParty = false;
+  vm.unit = '';
+
+  vm.changeUnit = changeUnit;
+  vm.close = close;
+  vm.findCurrency = findCurrency;
+  vm.finish = finish;
+  vm.goBack = goBack;
+  vm.loadMore = loadMore;
+  vm.openPopup = openPopup;
+  vm.pushDigit = pushDigit;
+  vm.removeDigit = removeDigit;
+  vm.save = save;
+  vm.sendMax = sendMax;
+  vm.errorMessage = '';
+
+  $scope.$on('$ionicView.beforeEnter', onBeforeEnter);
+  $scope.$on('$ionicView.leave', onLeave);
 
-  var _id;
-  var unitToSatoshi;
-  var satToUnit;
-  var unitDecimals;
-  var satToBtc;
-  var SMALL_FONT_SIZE_LIMIT = 10;
   var LENGTH_EXPRESSION_LIMIT = 19;
   var LENGTH_BEFORE_COMMA_EXPRESSION_LIMIT = 8;
   var LENGTH_AFTER_COMMA_EXPRESSION_LIMIT = 8;
-  var isNW = platformInfo.isNW;
 
-  var unitIndex = 0;
+  var altCurrencyModal = null;
   var altUnitIndex = 0;
+  var availableFundsInCrypto = '';
+  var availableFundsInFiat = '';
+  var availableSatoshis = null;
   var availableUnits = [];
   var fiatCode;
+  var isNW = platformInfo.isNW;
+  var isAndroid = platformInfo.isAndroid;
+  var isIos = platformInfo.isIOS;
+  var lastUsedAltCurrencyList = [];
+  var passthroughParams = {};
+  var satToUnit;
+  var unitDecimals;
+  var unitIndex = 0;
+  var unitToSatoshi;
+  var useSendMax = false;
 
-  var fixedUnit;
-
-  $scope.amountModel = { amount: 0 };
-
-  $scope.isChromeApp = platformInfo.isChromeApp;
-  $scope.isAndroid = platformInfo.isAndroid;
-  $scope.isIos = platformInfo.isIOS;
-
-  $scope.$on('$ionicView.leave', function() {
+  function onLeave() {
     angular.element($window).off('keydown');
-  });
+  }
 
-  $scope.$on("$ionicView.beforeEnter", function(event, data) {
+  function onBeforeEnter(event, data) {
 
     initCurrencies();
 
-    if (data.stateParams.shapeshiftOrderId && data.stateParams.shapeshiftOrderId.length > 0) {
-      $scope.minShapeshiftAmount = parseFloat(data.stateParams.minShapeshiftAmount);
-      $scope.maxShapeshiftAmount = parseFloat(data.stateParams.maxShapeshiftAmount);
-      $scope.shapeshiftOrderId = data.stateParams.shapeshiftOrderId;
-    }
+    passthroughParams = data.stateParams;
+    console.log('stateParams:', data.stateParams);
 
-    // To get the wallet from with the new flow
-    $scope.fromWalletId = data.stateParams.fromWalletId;
+    vm.fromWalletId = data.stateParams.fromWalletId;
+    vm.toWalletId = data.stateParams.toWalletId;
+    vm.minAmount = parseFloat(data.stateParams.minAmount);
+    vm.maxAmount = parseFloat(data.stateParams.maxAmount);
 
-    if (data.stateParams.noPrefix) {
-      $scope.showWarningMessage = data.stateParams.noPrefix != 0;
-      if ($scope.showWarningMessage) {
-        var message = 'Address doesn\'t contain currency information, please make sure you are sending the correct currency.';
-        popupService.showAlert('', message, function() {}, 'Ok');
+    if (passthroughParams.thirdParty) {
+      vm.thirdParty = JSON.parse(passthroughParams.thirdParty); // Parse stringified JSON-object
+      if (vm.thirdParty) {
+        if (vm.thirdParty.id === 'shapeshift') {
+          if (!vm.thirdParty.data) {
+            vm.thirdParty.data = {};
+          }
+          vm.thirdParty.data['fromWalletId'] = vm.fromWalletId;
+
+          vm.fromWallet = profileService.getWallet(vm.fromWalletId);
+          vm.toWallet = profileService.getWallet(vm.toWalletId);
+
+          shapeshiftService.getMarketData(vm.fromWallet.coin, vm.toWallet.coin, function(data) {
+            console.log(data);
+            vm.thirdParty.data['minAmount'] = vm.minAmount = parseFloat(data.minimum);
+            vm.thirdParty.data['maxAmount'] = vm.maxAmount = parseFloat(data.maxLimit);
+          });
+        }
       }
     }
 
+    vm.isRequestingSpecificAmount = !data.stateParams.fromWalletId;
+
     var config = configService.getSync().wallet.settings;
 
+    setAvailableUnits();
+    updateUnitUI();
+
+    var reNr = /^[1234567890\.]$/;
+    var reOp = /^[\*\+\-\/]$/;
+
+    if (!isAndroid && !isIos) {
+      var disableKeys = angular.element($window).on('keydown', function(e) {
+        if (!e.key) return;
+        if (e.which === 8) { // you can add others here inside brackets.
+          if (!altCurrencyModal) {
+            e.preventDefault();
+            vm.removeDigit();
+          }
+        }
+
+        if (e.key.match(reNr)) {
+          vm.pushDigit(e.key);
+        } else if (e.key.match(reOp)) {
+          pushOperator(e.key);
+        } else if (e.keyCode === 86) {
+          if (e.ctrlKey || e.metaKey) processClipboard();
+        } else if (e.keyCode === 13) vm.finish();
+
+        $timeout(function() {
+          $scope.$apply();
+        });
+      });
+    }
+
+    unitToSatoshi = config.unitToSatoshi;
+    satToUnit = 1 / unitToSatoshi;
+    unitDecimals = config.unitDecimals;
+
+    resetAmount();
+
+    processAmount();
+
+    $timeout(function() {
+      $ionicScrollDelegate.resize();
+    }, 10);
+
     function setAvailableUnits() {
       var defaults = configService.getDefaults();
       var configCache = configService.getSync();
       availableUnits = [];
 
-      var hasBCHWallets = profileService.getWallets({
-        coin: 'bch'
-      }).length;
+      var coinFromWallet = '';
+      if (passthroughParams.fromWalletId) {
+        var fromWallet = profileService.getWallet(passthroughParams.fromWalletId);
+        coinFromWallet = fromWallet.coin;
+      } else {
+        var toWallet = profileService.getWallet(passthroughParams.toWalletId);
+        coinFromWallet = toWallet.coin;
+      }
 
-      if (hasBCHWallets) {
+      if (coinFromWallet === 'bch') {
         availableUnits.push({
           name: 'Bitcoin Cash',
           id: 'bch',
@@ -70,11 +166,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
         });
       };
 
-      var hasBTCWallets = profileService.getWallets({
-        coin: 'btc'
-      }).length;
-
-      if (hasBTCWallets) {
+      if (coinFromWallet === 'btc') {
         availableUnits.push({
           name: 'Bitcoin',
           id: 'btc',
@@ -84,26 +176,6 @@ angular.module('copayApp.controllers').controller('amountController', function($
 
       unitIndex = 0;
 
-      if (data.stateParams.coin) {
-        var coins = data.stateParams.coin.split(',');
-        var newAvailableUnits = [];
-
-        lodash.each(coins, function(c) {
-          var coin = lodash.find(availableUnits, {
-            id: c
-          });
-          if (!coin) {
-            $log.warn('Could not find desired coin:' + data.stateParams.coin)
-          } else {
-            newAvailableUnits.push(coin);
-          }
-        });
-
-        if (newAvailableUnits.length > 0) {
-          availableUnits = newAvailableUnits;
-        }
-      }
-
 
       //  currency have preference
       var fiatName;
@@ -125,92 +197,21 @@ angular.module('copayApp.controllers').controller('amountController', function($
         isFiat: true,
       });
 
-      if (data.stateParams.fixedUnit) {
-        fixedUnit = true;
-      }
-
       unitIndex = lodash.findIndex(availableUnits, {
         isFiat: true
       });
 
       altUnitIndex = 0;
+
+      if (passthroughParams.fromWalletId) {
+        var fromWallet = profileService.getWallet(passthroughParams.fromWalletId);
+        updateAvailableFundsFromWallet(fromWallet);
+      }
     };
+  };
 
-    // Go to...
-    _id = data.stateParams.id; // Optional (BitPay Card ID or Wallet ID)
-    $scope.nextStep = data.stateParams.nextStep;
-
-    setAvailableUnits();
-    updateUnitUI();
-
-    $scope.hasMaxAmount = true;
-    if ($ionicHistory.backView().stateName == 'tabs.receive') {
-      $scope.hasMaxAmount = false;
-    }
-
-    $scope.showMenu = $ionicHistory.backView() && ($ionicHistory.backView().stateName == 'tabs.send' || $ionicHistory.backView().stateName == 'tabs.bitpayCard');
-    $scope.recipientType = data.stateParams.recipientType || null;
-    $scope.toAddress = data.stateParams.toAddress;
-    $scope.displayAddress = data.stateParams.displayAddress;
-    $scope.toName = data.stateParams.toName;
-    $scope.toEmail = data.stateParams.toEmail;
-    $scope.toColor = data.stateParams.toColor;
-
-    if (!$scope.nextStep && !data.stateParams.toAddress) {
-      $log.error('Bad params at amount')
-      throw ('bad params');
-    }
-
-    var reNr = /^[1234567890\.]$/;
-    var reOp = /^[\*\+\-\/]$/;
-
-    if (!$scope.isAndroid && !$scope.isIos) {
-      var disableKeys = angular.element($window).on('keydown', function(e) {
-        if (!e.key) return;
-        if (e.which === 8) { // you can add others here inside brackets.
-          if (!$scope.altCurrencyModal) {
-            e.preventDefault();
-            $scope.removeDigit();
-          }
-        }
-
-        if (e.key.match(reNr)) {
-          $scope.pushDigit(e.key);
-        } else if (e.key.match(reOp)) {
-          $scope.pushOperator(e.key);
-        } else if (e.keyCode === 86) {
-          if (e.ctrlKey || e.metaKey) processClipboard();
-        } else if (e.keyCode === 13) $scope.finish();
-
-        $timeout(function() {
-          $scope.$apply();
-        });
-      });
-    }
-
-    $scope.specificAmount = $scope.specificAlternativeAmount = '';
-    $scope.isCordova = platformInfo.isCordova;
-    unitToSatoshi = config.unitToSatoshi;
-    satToUnit = 1 / unitToSatoshi;
-    satToBtc = 1 / 100000000;
-    unitDecimals = config.unitDecimals;
-
-    $scope.resetAmount();
-
-    // in SAT ALWAYS
-    if ($stateParams.toAmount) {
-      $scope.amountModel.amount = (($stateParams.toAmount) * satToUnit).toFixed(unitDecimals);
-    }
-
-    $scope.processAmount();
-
-    $timeout(function() {
-      $ionicScrollDelegate.resize();
-    }, 10);
-  });
-
-  $scope.goBack = function() {
-    if ($scope.shapeshiftOrderId) {
+  function goBack() {
+    if (vm.thirdParty && vm.thirdParty.id === 'shapeshift') {
       $state.go('tabs.send').then(function() {
         $ionicHistory.clearHistory();
         $state.go('tabs.home').then(function() {
@@ -223,8 +224,8 @@ angular.module('copayApp.controllers').controller('amountController', function($
   }
 
   function paste(value) {
-    $scope.amountModel.amount = value;
-    $scope.processAmount();
+    vm.amount = value;
+    processAmount();
     $timeout(function() {
       $scope.$apply();
     });
@@ -236,31 +237,22 @@ angular.module('copayApp.controllers').controller('amountController', function($
     if (value && evaluate(value) > 0) paste(evaluate(value));
   };
 
-  $scope.sendMax = function() {
-    $scope.useSendMax = true;
-    $scope.finish();
-  };
-
-  $scope.toggleAlternative = function() {
-    if ($scope.amountModel.amount && isExpression($scope.amountModel.amount)) {
-      var amount = evaluate(format($scope.amountModel.amount));
-      $scope.globalResult = '= ' + processResult(amount);
-    }
+  function sendMax() {
+    useSendMax = true;
+    finish();
   };
 
   function updateUnitUI() {
-    $scope.unit = availableUnits[unitIndex].shortName;
-    $scope.alternativeUnit = availableUnits[altUnitIndex].shortName;
+    vm.unit = availableUnits[unitIndex].shortName;
+    vm.alternativeUnit = availableUnits[altUnitIndex].shortName;
 
-    $scope.processAmount();
-    $log.debug('Update unit coin @amount unit:' + $scope.unit + " alternativeUnit:" + $scope.alternativeUnit);
+    processAmount();
+    $log.debug('Update unit coin @amount unit:' + vm.unit + " alternativeUnit:" + vm.alternativeUnit);
   };
 
-  $scope.changeUnit = function() {
+  function changeUnit() {
 
-    $scope.amountModel.amount = '0';
-
-    if (fixedUnit) return;
+    vm.amount = '0';
 
     if (!(availableUnits[unitIndex].isFiat && availableUnits.length > 2 && altUnitIndex == 0)) {
       unitIndex++;
@@ -275,62 +267,39 @@ angular.module('copayApp.controllers').controller('amountController', function($
       });
     }
 
+    updateAvailableFundsStringIfNeeded();
     updateUnitUI();
   };
 
-
-  $scope.changeAlternativeUnit = function() {
-
-    // Do nothing is fiat is not main unit
-    if (!availableUnits[unitIndex].isFiat) return;
-
-    var nextCoin = lodash.findIndex(availableUnits, function(x) {
-      if (x.isFiat) return false;
-      if (x.id == availableUnits[altUnitIndex].id) return false;
-      return true;
-    });
-
-    if (nextCoin >= 0) {
-      altUnitIndex = nextCoin;
-      updateUnitUI();
-    }
-  };
-
-  function checkFontSize() {
-    if ($scope.amountModel.amount && $scope.amountModel.amount.length >= SMALL_FONT_SIZE_LIMIT) $scope.smallFont = true;
-    else $scope.smallFont = false;
-  };
-
-  $scope.pushDigit = function(digit) {
-    if ($scope.amountModel.amount && digit != '.') {
-      var amountSplitByComma = $scope.amountModel.amount.split('.');
+  function pushDigit(digit) {
+    if (vm.amount && digit != '.') {
+      var amountSplitByComma = vm.amount.split('.');
       if (amountSplitByComma.length > 1 && amountSplitByComma[1].length >= LENGTH_AFTER_COMMA_EXPRESSION_LIMIT) return;
       if (amountSplitByComma.length == 1 && amountSplitByComma[0].length >= LENGTH_BEFORE_COMMA_EXPRESSION_LIMIT) return;
     }
 
-    if ($scope.amountModel.amount && $scope.amountModel.amount.length >= LENGTH_EXPRESSION_LIMIT) return;
-    if ($scope.amountModel.amount.indexOf('.') > -1 && digit == '.') return;
-    if ($scope.amountModel.amount == '0' && digit == '0') return;
-    if (availableUnits[unitIndex].isFiat && $scope.amountModel.amount.indexOf('.') > -1 && $scope.amountModel.amount[$scope.amountModel.amount.indexOf('.') + 2]) return;
+    if (vm.amount && vm.amount.length >= LENGTH_EXPRESSION_LIMIT) return;
+    if (vm.amount.indexOf('.') > -1 && digit == '.') return;
+    if (vm.amount == '0' && digit == '0') return;
+    if (availableUnits[unitIndex].isFiat && vm.amount.indexOf('.') > -1 && vm.amount[vm.amount.indexOf('.') + 2]) return;
     
-    if ($scope.amountModel.amount == '0' && digit != '.') { 
-      $scope.amountModel.amount = '';
+    if (vm.amount == '0' && digit != '.') {
+      vm.amount = '';
     }
 
-    if ($scope.amountModel.amount == '' && digit == '.') { 
-      $scope.amountModel.amount = '0';
+    if (vm.amount == '' && digit == '.') {
+      vm.amount = '0';
     }
 
-    $scope.amountModel.amount = ($scope.amountModel.amount + digit).replace('..', '.');
-    checkFontSize();
-    $scope.processAmount();
+    vm.amount = (vm.amount + digit).replace('..', '.');
+    processAmount();
   };
 
-  $scope.pushOperator = function(operator) {
-    if (!$scope.amountModel.amount || $scope.amountModel.amount.length == 0) return;
-    $scope.amountModel.amount = _pushOperator($scope.amountModel.amount);
+  function pushOperator(operator) {
+    if (!vm.amount || vm.amount.length == 0) return;
+    vm.amount = pushOperator(vm.amount);
 
-    function _pushOperator(val) {
+    function pushOperator(val) {
       if (!isOperator(lodash.last(val))) {
         return val + operator;
       } else {
@@ -349,62 +318,98 @@ angular.module('copayApp.controllers').controller('amountController', function($
     return regex.test(val);
   };
 
-  $scope.removeDigit = function() {
-    $scope.amountModel.amount = ($scope.amountModel.amount).toString().slice(0, -1);
-    $scope.processAmount();
-    checkFontSize();
-  };
+  function removeDigit() {
+    vm.amount = (vm.amount).toString().slice(0, -1);
+    processAmount();
+  }
 
-  $scope.resetAmount = function() {
-    $scope.amountModel.amount = $scope.alternativeAmount = $scope.globalResult = '';
-    $scope.allowSend = false;
-    checkFontSize();
-  };
+  function resetAmount() {
+    vm.amount = vm.alternativeAmount = vm.globalResult = '0';
+    vm.allowSend = false;
+  }
   
 
-  $scope.openPopup = function() {
+  function openPopup() {
     $ionicModal.fromTemplateUrl('views/modals/altCurrency.html', {
       scope: $scope
     }).then(function(modal) {
-      $scope.altCurrencyModal = modal;
-      $scope.altCurrencyModal.show();
+      altCurrencyModal = modal;
+      altCurrencyModal.show();
     });
+  }
+
+  function close() {
+    altCurrencyModal.remove();
+    altCurrencyModal = null;
   };
 
-  $scope.close = function() {
-    $scope.altCurrencyModal.remove();
-    $scope.altCurrencyModal = false;
-  };
-
-  $scope.processAmount = function() {
-    var formatedValue = format($scope.amountModel.amount);
+  function processAmount() {
+    var formatedValue = format(vm.amount);
     var result = evaluate(formatedValue);
 
+    var amountInCrypto = 0;
+
     if (lodash.isNumber(result)) {
-      $scope.globalResult = isExpression($scope.amountModel.amount) ? '= ' + processResult(result) : '';
+      vm.globalResult = isExpression(vm.amount) ? '= ' + processResult(result) : '';
 
       if (availableUnits[unitIndex].isFiat) {
 
         var a = fromFiat(result);
         if (a) {
-          $scope.alternativeAmount = txFormatService.formatAmount(a * unitToSatoshi, true);
-          $scope.allowSend = lodash.isNumber(a) && a > 0
-            && (!$scope.shapeshiftOrderId
-                || (a >= $scope.minShapeshiftAmount && a <= $scope.maxShapeshiftAmount));
+          amountInCrypto = a;
+          var amountInSatoshis = a * unitToSatoshi;
+          vm.fundsAreInsufficient = !!passthroughParams.fromWalletId 
+            && availableSatoshis !== null 
+            && availableSatoshis < amountInSatoshis;
+
+          vm.alternativeAmount = txFormatService.formatAmount(amountInSatoshis, true);
+          vm.allowSend = lodash.isNumber(a)
+            && a > 0
+            && (!vm.minAmount || a >= vm.minAmount)
+            && (!vm.maxAmount || a <= vm.maxAmount)
+            && !vm.fundsAreInsufficient;
         } else {
           if (result) {
-            $scope.alternativeAmount = 'N/A';
+            vm.alternativeAmount = 'N/A';
           } else {
-            $scope.alternativeAmount = null;
+            vm.alternativeAmount = null;
           }
-          $scope.allowSend = false;
+          vm.fundsAreInsufficient = false;
+          vm.allowSend = false;
         }
       } else {
-        $scope.alternativeAmount = $filter('formatFiatAmount')(toFiat(result));
-        $scope.allowSend = lodash.isNumber(result) && result > 0
-          && (!$scope.shapeshiftOrderId
-              || (result >= $scope.minShapeshiftAmount && result <= $scope.maxShapeshiftAmount));
+        amountInCrypto = result;
+        vm.fundsAreInsufficient = passthroughParams.fromWalletId 
+          && availableSatoshis !== null 
+          && availableSatoshis < result * unitToSatoshi;
+
+        vm.alternativeAmount = $filter('formatFiatAmount')(toFiat(result));
+        vm.allowSend = lodash.isNumber(result)
+          && result > 0
+          && (!vm.minAmount || result >= vm.minAmount)
+          && (!vm.maxAmount || result <= vm.maxAmount)
+          && !vm.fundsAreInsufficient;
       }
+
+    } else {
+      vm.fundsAreInsufficient = false;
+    }
+
+    if (vm.fundsAreInsufficient) {
+      vm.errorMessage = gettextCatalog.getString('Not enough available funds');
+
+    } else if (amountInCrypto && vm.thirdParty && vm.thirdParty.id === 'shapeshift') {
+      if (amountInCrypto < vm.minAmount) {
+        vm.errorMessage = gettextCatalog.getString('Amount is below minimum');
+
+      } else if (amountInCrypto > vm.maxAmount) {
+        vm.errorMessage = gettextCatalog.getString('Amount is above maximum');
+
+      } else {
+        vm.errorMessage = '';
+      }
+    } else {
+      vm.errorMessage = '';
     }
   };
 
@@ -444,89 +449,37 @@ angular.module('copayApp.controllers').controller('amountController', function($
     return result.replace('x', '*');
   };
 
-  $scope.finish = function() {
+  function finish() {
+    var unit = availableUnits[unitIndex];
+    var uiAmount = evaluate(format(vm.amount));
 
-    function finish() {
-      var unit = availableUnits[unitIndex];
-      var _amount = evaluate(format($scope.amountModel.amount));
-      var coin = unit.id;
-      if (unit.isFiat) {
-        coin = availableUnits[altUnitIndex].id;
-      }
+    var satoshis = 0;
+    if (unit.isFiat) {
+      satoshis = (fromFiat(uiAmount) * unitToSatoshi).toFixed(0);
+    } else {
+      satoshis = (uiAmount * unitToSatoshi).toFixed(0);
+    }
 
-      if ($scope.nextStep) {
-        $state.transitionTo($scope.nextStep, {
-          id: _id,
-          amount: $scope.useSendMax ? null : _amount,
-          currency: unit.id.toUpperCase(),
-          coin: coin,
-          useSendMax: $scope.useSendMax,
-          fromWalletId: $scope.fromWalletId
-        });
-      } else {
-        var amount = _amount;
+    var confirmData = {
+      amount: useSendMax ? undefined : satoshis,
+      fromWalletId: passthroughParams.fromWalletId,
+      sendMax: useSendMax,
+      toAddress: passthroughParams.toAddress,
+      toWalletId: passthroughParams.toWalletId
+    };
 
-        if (unit.isFiat) {
-          amount = (fromFiat(amount) * unitToSatoshi).toFixed(0);
-        } else {
-          amount = (amount * unitToSatoshi).toFixed(0);
-        }
+    if (vm.thirdParty) {
+      confirmData['thirdParty'] = JSON.stringify(this.thirdParty);
+    }
 
-        var confirmData = {
-          recipientType: $scope.recipientType,
-          toAmount: amount,
-          toAddress: $scope.toAddress,
-          displayAddress: $scope.displayAddress || $scope.toAddress,
-          toName: $scope.toName,
-          toEmail: $scope.toEmail,
-          toColor: $scope.toColor,
-          coin: coin,
-          useSendMax: $scope.useSendMax,
-          fromWalletId: $scope.fromWalletId
-        };
+    console.log('confirmData:', confirmData);
 
-        if ($scope.shapeshiftOrderId) {
-          var shapeshiftOrderUrl = 'https://www.shapeshift.io/#/status/';
-          shapeshiftOrderUrl += $scope.shapeshiftOrderId;
-          confirmData.description = shapeshiftOrderUrl;
-          confirmData.fromWalletId = $scope.fromWalletId;
-
-          if (confirmData.useSendMax) {
-            var wallet = lodash.find(profileService.getWallets({ coin: coin }),
-              function(w) {
-                return w.id == $scope.fromWalletId;
-              });
-
-            var balance = parseFloat(wallet.cachedBalance.substring(0, wallet.cachedBalance.length-4));
-            if (balance < $scope.minShapeshiftAmount * 1.04) {
-              confirmData.useSendMax = false;
-              confirmData.toAmount = $scope.minShapeshiftAmount * unitToSatoshi;
-            } else if (balance > $scope.maxShapeshiftAmount) {
-              confirmData.useSendMax = false;
-              confirmData.toAmount = $scope.maxShapeshiftAmount * unitToSatoshi * 0.99;
-            }
-          }
-        }
-
-        $state.transitionTo('tabs.send.confirm', confirmData);
-      }
+    if (!confirmData.fromWalletId) {
+      $state.transitionTo('tabs.paymentRequest.confirm', confirmData);
+    } else {
+      $state.transitionTo('tabs.send.review', confirmData);
       $scope.useSendMax = null;
     }
-
-    if ($scope.showWarningMessage) {
-      var u = $scope.unit == 'BCH' || $scope.unit == 'BTC' ? $scope.unit : $scope.alternativeUnit;
-      var message = 'Are you sure you want to send ' + u.toUpperCase()  + '?';
-      popupService.showConfirm(message, '', 'Yes', 'No', function(res) {
-        if (!res) {
-          $scope.useSendMax = null;
-          return;
-        };
-        finish();
-      });
-    } else {
-      finish();
-    }
-
   };
 
 
@@ -562,10 +515,10 @@ angular.module('copayApp.controllers').controller('amountController', function($
     }];
     rateService.whenAvailable(function() {
 
-      $scope.listComplete = false;
+      vm.listComplete = false;
 
       var idx = lodash.indexBy(unusedCurrencyList, 'isoCode');
-      var idx2 = lodash.indexBy($scope.lastUsedAltCurrencyList, 'isoCode');
+      var idx2 = lodash.indexBy(lastUsedAltCurrencyList, 'isoCode');
       var idx3 = lodash.indexBy(popularCurrencyList, 'isoCode');
       var alternatives = rateService.listAlternatives(true);
 
@@ -578,8 +531,10 @@ angular.module('copayApp.controllers').controller('amountController', function($
         }
       });
 
-      $scope.altCurrencyList = completeAlternativeList.slice(0, 10);
-      $scope.lastUsedPopularList = lodash.unique(lodash.union($scope.lastUsedAltCurrencyList, popularCurrencyList), 'isoCode');
+      vm.altCurrencyList = completeAlternativeList.slice(0, 10);
+      vm.lastUsedPopularList = lodash.unique(lodash.union(lastUsedAltCurrencyList, popularCurrencyList), 'isoCode');
+
+      rateService.updateRates();
 
       $timeout(function() {
         $scope.$apply();
@@ -587,19 +542,19 @@ angular.module('copayApp.controllers').controller('amountController', function($
     });
   }
 
-  $scope.loadMore = function() {
+  function loadMore() {
     $timeout(function() {
-      $scope.altCurrencyList = completeAlternativeList.slice(0, next);
+      vm.altCurrencyList = completeAlternativeList.slice(0, next);
       next += 10;
-      $scope.listComplete = $scope.altCurrencyList.length >= completeAlternativeList.length;
+      vm.listComplete = vm.altCurrencyList.length >= completeAlternativeList.length;
       $scope.$broadcast('scroll.infiniteScrollComplete');
     }, 100);
   };
 
-  $scope.findCurrency = function(search) {
+  function findCurrency(search) {
     if (!search) initCurrencies();
-    var list = lodash.unique(lodash.union(completeAlternativeList, lodash.union($scope.lastUsedAltCurrencyList, popularCurrencyList)), 'isoCode');
-    $scope.altCurrencyList = lodash.filter(list, function(item) {
+    var list = lodash.unique(lodash.union(completeAlternativeList, lodash.union(lastUsedAltCurrencyList, popularCurrencyList)), 'isoCode');
+    vm.altCurrencyList = lodash.filter(list, function(item) {
       var val = item.name
       var val2 = item.isoCode;
       return lodash.includes(val.toLowerCase(), search.toLowerCase()) || lodash.includes(val2.toLowerCase(), search.toLowerCase());
@@ -609,7 +564,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
     });
   };
 
-  $scope.save = function(newAltCurrency) {
+  function save(newAltCurrency) {
     var opts = {
       wallet: {
         settings: {
@@ -629,8 +584,65 @@ angular.module('copayApp.controllers').controller('amountController', function($
       availableUnits[altUnitIndex].name = newAltCurrency.isoCode;
       availableUnits[altUnitIndex].shortName = newAltCurrency.isoCode;
       fiatCode = newAltCurrency.isoCode;
+      updateAvailableFundsStringIfNeeded();
       updateUnitUI();
-      $scope.close();
+      close();
     });
-  };  
-});
+  };
+
+  function updateAvailableFundsStringIfNeeded() {
+    if (passthroughParams.fromWalletId && availableSatoshis !== null) {
+      availableFundsInFiat = '';
+      vm.availableFunds = availableFundsInCrypto;
+      var coin = availableUnits[altUnitIndex].isFiat ? availableUnits[unitIndex].id : availableUnits[altUnitIndex].id;
+      txFormatService.formatAlternativeStr(coin, availableSatoshis, function formatCallback(formatted){
+        if (formatted) {
+          availableFundsInFiat = formatted;
+
+          $scope.$apply(function() {
+            if (availableUnits[unitIndex].isFiat) {
+              vm.availableFunds = availableFundsInFiat;
+            } else {
+              vm.availableFunds = availableFundsInCrypto;
+            }
+          });
+        }
+      });
+    }
+  }
+
+  function updateAvailableFundsFromWallet(wallet) {
+    if (wallet.status && wallet.status.isValid) {
+      availableFundsInCrypto = wallet.status.spendableBalanceStr;
+      availableSatoshis = wallet.status.spendableAmount;
+      if (wallet.status.alternativeBalanceAvailable) {
+        availableFundsInFiat = wallet.status.spendableBalanceAlternative + ' ' + wallet.status.alternativeIsoCode;
+      } else {
+        availableFundsInFiat = '';
+      }
+
+    } else if (wallet.cachedStatus && wallet.status.isValid) {
+
+      if (wallet.cachedStatus.alternativeBalanceAvailable) {
+        availableFundsInFiat = wallet.cachedStatus.spendableBalanceAlternative + ' ' + wallet.cachedStatus.alternativeIsoCode;
+      } else {
+        availableFundsInFiat = '';
+      }
+      availableFundsInCrypto = wallet.cachedStatus.spendableBalanceStr;
+      availableSatoshis = wallet.cachedStatus.spendableAmount;
+
+    } else {
+
+      availableFundsInFiat = '';
+      availableFundsInCrypto = '';
+      availableSatoshis = null;
+    }
+
+    if (availableUnits[unitIndex].isFiat) {
+      vm.availableFunds = availableFundsInFiat || availableFundsInCrypto;
+    } else {
+      vm.availableFunds = availableFundsInCrypto;
+    }
+  }
+
+}
diff --git a/src/js/controllers/amount.spec.js b/src/js/controllers/amount.spec.js
new file mode 100644
index 000000000..ed64da836
--- /dev/null
+++ b/src/js/controllers/amount.spec.js
@@ -0,0 +1,101 @@
+describe('amountController', function(){
+  var configCache,
+    configService, 
+    $controller,
+    $ionicHistory, 
+    $rootScope,
+    platformInfo,
+    profileService,
+    rateService,
+    $stateParams;
+
+
+
+  beforeEach(function(){
+    module('ngLodash');
+    module('copayApp.controllers');
+
+    configCache = {
+      wallet: {
+        settings: {
+
+        }
+      }
+    };
+     
+
+    configService = jasmine.createSpyObj(['getDefaults','getSync']);
+    configService.getDefaults.and.returnValue({
+      bitcoinCashAlias: 'bch',
+      bitcoinAlias: 'btc'
+    });
+    configService.getSync.and.returnValue(configCache);
+
+    $ionicHistory = jasmine.createSpyObj(['backView']);
+
+    platformInfo = {
+      isChromeApp: false,
+      isAndroid: false,
+      isIos: true
+    };
+
+    profileService = jasmine.createSpyObj(['getWallets']);
+    
+    rateService = jasmine.createSpyObj(['fromFiat', 'whenAvailable']);
+
+    $stateParams = {};
+
+    inject(function(_$controller_, _$rootScope_){
+      // The injector unwraps the underscores (_) from around the parameter names when matching
+      $controller = _$controller_;
+      $rootScope = _$rootScope_;
+    });
+
+
+
+  });
+
+  it('receives fromWalletId and toAddress.', function() {
+
+    var backView = {
+        stateName: 'ignoreme'
+    };
+    $ionicHistory.backView.and.returnValue(backView);
+    profileService.getWallets.and.returnValue([{}]);
+    rateService.fromFiat.and.returnValue(12); // satoshis or coins?
+
+    var $scope = $rootScope.$new();
+
+
+    var amountController = $controller('amountController', { 
+      configService: configService,
+      gettextCatalog: {},
+      $ionicHistory: $ionicHistory,
+      $ionicModal: {},
+      $ionicScrollDelegate: {},
+      nodeWebkitService: {},
+      ongoingProcess: {},
+      platformInfo: platformInfo,
+      profileService: profileService,
+      popupService: {},
+      rateService: rateService,
+      $scope: $scope,
+      $state: {},
+      $stateParams: $stateParams,
+      txFormatService: {},
+      walletService: {}
+    });
+
+    var data = {
+      stateParams: {
+        fromWalletId: 'fd56c1e7-e3ac-4fd9-8afc-27b9c1b3718b',
+        toAddress: 'qrup46avn8t466xxwlzs4qelht7cnwvesv2e29wf7s'
+      }
+    };
+    $scope.$emit('$ionicView.beforeEnter', data);
+
+    expect($scope.fromWalletId).toBe('fd56c1e7-e3ac-4fd9-8afc-27b9c1b3718b');
+    expect($scope.toAddress).toBe('qrup46avn8t466xxwlzs4qelht7cnwvesv2e29wf7s');
+  });
+
+});
\ No newline at end of file
diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index 03af26fd1..07256c0b2 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $interval, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, $stateParams, $window, $state, $log, profileService, bitcore, bitcoreCash, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory, $ionicConfig, payproService, feeService, bwcError, txConfirmNotification, externalLinkService, firebaseEventsService, soundService) {
+angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $interval, $filter, $timeout, $ionicScrollDelegate, $ionicLoading, addressbookService, gettextCatalog, walletService, platformInfo, lodash, configService, $stateParams, $window, $state, $log, profileService, bitcore, bitcoreCash, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory, $ionicConfig, payproService, feeService, bitcoinCashJsService, bwcError, txConfirmNotification, externalLinkService, firebaseEventsService, soundService) {
 
   var countDown = null;
   var FEE_TOO_HIGH_LIMIT_PER = 15;
@@ -10,16 +10,10 @@ angular.module('copayApp.controllers').controller('confirmController', function(
   // Config Related values
   var config = configService.getSync();
   var walletConfig = config.wallet;
-  var unitToSatoshi = walletConfig.settings.unitToSatoshi;
-  var unitDecimals = walletConfig.settings.unitDecimals;
-  var satToUnit = 1 / unitToSatoshi;
   var configFeeLevel = walletConfig.settings.feeLevel ? walletConfig.settings.feeLevel : 'normal';
 
-
   // Platform info
-  var isChromeApp = platformInfo.isChromeApp;
   var isCordova = platformInfo.isCordova;
-  var isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP;
 
   //custom fee flag
   var usingCustomFee = false;
@@ -31,7 +25,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     }, 10);
   }
 
-
   $scope.showWalletSelector = function() {
     $scope.walletSelector = true;
     refresh();
@@ -45,7 +38,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     $ionicConfig.views.swipeBackEnabled(false);
   });
 
-
   function exitWithError(err) {
     $log.info('Error setting wallet selector:' + err);
     popupService.showAlert(gettextCatalog.getString(), bwcError.msg(err), function() {
@@ -68,112 +60,108 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     });
   };
 
-  $scope.$on("$ionicView.beforeEnter", function(event, data) {
+  var setWalletSelector = function(coin, network, minAmount, cb) {
 
-    function setWalletSelector(coin, network, minAmount, cb) {
+    // no min amount? (sendMax) => look for no empty wallets
+    minAmount = minAmount || 1;
 
-      // no min amount? (sendMax) => look for no empty wallets
-      minAmount = minAmount || 1;
+    $scope.wallets = profileService.getWallets({
+      onlyComplete: true,
+      network: network,
+      coin: coin
+    });
 
-      $scope.wallets = profileService.getWallets({
-        onlyComplete: true,
-        network: network,
-        coin: coin
+    if (tx.fromWalletId) {
+      $scope.wallets = lodash.filter($scope.wallets, function (w) {
+        return w.id == tx.fromWalletId;
       });
-
-      if (tx.fromWalletId) {
-        $scope.wallets = lodash.filter($scope.wallets, function(w) {
-          return w.id == tx.fromWalletId;
-        });
-      }
-
-
-
-      if (!$scope.wallets || !$scope.wallets.length) {
-        setNoWallet(gettextCatalog.getString('No wallets available'), true);
-        return cb();
-      }
-
-      var filteredWallets = [];
-      var index = 0;
-      var walletsUpdated = 0;
-
-      lodash.each($scope.wallets, function(w) {
-        walletService.getStatus(w, {}, function(err, status) {
-          if (err || !status) {
-            $log.error(err);
-          } else {
-            walletsUpdated++;
-            w.status = status;
-
-            if (!status.availableBalanceSat)
-              $log.debug('No balance available in: ' + w.name);
-
-            if (status.availableBalanceSat > minAmount) {
-              filteredWallets.push(w);
-            }
-          }
-
-          if (++index == $scope.wallets.length) {
-            if (!walletsUpdated)
-              return cb('Could not update any wallet');
-
-            if (lodash.isEmpty(filteredWallets)) {
-              setNoWallet(gettextCatalog.getString('Insufficient confirmed funds'), true);
-            }
-            $scope.wallets = lodash.clone(filteredWallets);
-            return cb();
-          }
-        });
-      });
-    };
-
-    // Setup $scope
-
-    var B = data.stateParams.coin == 'bch' ? bitcoreCash : bitcore;
-    var networkName;
-    try {
-      networkName = (new B.Address(data.stateParams.toAddress)).network.name;
-    } catch(e) {
-      var message = gettextCatalog.getString('Invalid address');
-      var backText = gettextCatalog.getString('Go back');
-      var learnText = gettextCatalog.getString('Learn more');
-      popupService.showConfirm(null, message, backText, learnText, function(back) {
-        $ionicHistory.nextViewOptions({
-          disableAnimate: true,
-          historyRoot: true
-        });
-        $state.go('tabs.send').then(function() {
-          $ionicHistory.clearHistory();
-          if (!back) {
-            var url = 'https://support.bitpay.com/hc/en-us/articles/115004671663';
-            externalLinkService.open(url);
-          }
-        });
-      });
-      return;
     }
 
+
+    if (!$scope.wallets || !$scope.wallets.length) {
+      setNoWallet(gettextCatalog.getString('No wallets available'), true);
+      return cb();
+    }
+
+    var filteredWallets = [];
+    var index = 0;
+    var walletsUpdated = 0;
+
+    lodash.each($scope.wallets, function (w) {
+      walletService.getStatus(w, {}, function (err, status) {
+        if (err || !status) {
+          $log.error(err);
+        } else {
+          walletsUpdated++;
+          w.status = status;
+
+          if (!status.availableBalanceSat)
+            $log.debug('No balance available in: ' + w.name);
+
+          if (status.availableBalanceSat > minAmount) {
+            filteredWallets.push(w);
+          }
+        }
+
+        if (++index == $scope.wallets.length) {
+          if (!walletsUpdated)
+            return cb('Could not update any wallet');
+
+          if (lodash.isEmpty(filteredWallets)) {
+            setNoWallet(gettextCatalog.getString('Insufficient confirmed funds'), true);
+          }
+          $scope.wallets = lodash.clone(filteredWallets);
+          return cb();
+        }
+      });
+    });
+  };
+
+  $scope.getContacts = function(addr) {
+    addressbookService.list(function(err, ab) {
+      if (err) $log.error(err);
+
+      $scope.hasContacts = lodash.isEmpty(ab) ? false : true;
+      if (!$scope.hasContacts) return cb();
+
+      var completeContacts = [];
+      lodash.each(ab, function(v, k) {
+        completeContacts.push({
+          name: lodash.isObject(v) ? v.name : v,
+          address: k,
+          email: lodash.isObject(v) ? v.email : null,
+          recipientType: 'contact',
+          coin: v.coin,
+          displayCoin:  (v.coin == 'bch'
+              ? (config.bitcoinCashAlias || defaults.bitcoinCashAlias)
+              : (config.bitcoinAlias || defaults.bitcoinAlias)).toUpperCase()
+        });
+      });
+
+      return cb();
+    });
+  };
+
+  $scope.$on("$ionicView.beforeEnter", function(event, data) {
+    $scope.fromWallet = profileService.getWallet(data.stateParams.fromWalletId); // Wallet to send from
+
+
     // Grab stateParams
     tx = {
-      toAmount: parseInt(data.stateParams.toAmount),
+      amount: parseInt(data.stateParams.amount),
       sendMax: data.stateParams.useSendMax == 'true' ? true : false,
       fromWalletId: data.stateParams.fromWalletId,
       toAddress: data.stateParams.toAddress,
-      displayAddress: data.stateParams.displayAddress,
-      description: data.stateParams.description,
-      paypro: data.stateParams.paypro,
-
       feeLevel: configFeeLevel,
       spendUnconfirmed: walletConfig.spendUnconfirmed,
 
       // Vanity tx info (not in the real tx)
-      recipientType: data.stateParams.recipientType || null,
-      toName: data.stateParams.toName,
-      toEmail: data.stateParams.toEmail,
-      toColor: data.stateParams.toColor,
-      network: networkName,
-      coin: data.stateParams.coin,
+      recipientType: $scope.recipientType || null,
+      toName: null,
+      toEmail: null,
+      toColor: null,
+      network: false,
+      coin: $scope.fromWallet.coin,
       txp: {},
     };
 
@@ -182,18 +170,71 @@ angular.module('copayApp.controllers').controller('confirmController', function(
       tx.feeRate = parseInt(data.stateParams.requiredFeeRate);
     }
 
-    if (tx.coin && tx.coin == 'bch') {
+    if (tx.coin && tx.coin === 'bch') {
       tx.feeLevel = 'normal';
     }
 
+    var B = data.stateParams.coin === 'bch' ? bitcoreCash : bitcore;
+    var networkName;
+    $scope.recipientType = null;
+    try {
+      if (data.stateParams.toWalletId) { // There is a toWalletId, so we presume this is a wallet-to-wallet transfer
+        $scope.recipientType = 'wallet'; // set transaction type to wallet-to-wallet
+        $ionicLoading.show();
+
+        var toWallet = profileService.getWallet(data.stateParams.toWalletId);
+        tx.toColor = toWallet.color;
+        tx.toName = toWallet.name;
+
+        // 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;
+    }
+  });
+
+  var setupTx = function(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
     $scope.isCordova = isCordova;
-    $scope.isWindowsPhoneApp = isWindowsPhoneApp;
     $scope.showAddress = false;
-
     $scope.walletSelectorTitle = gettextCatalog.getString('Send from');
 
-    setWalletSelector(tx.coin, tx.network, tx.toAmount, function(err) {
+    setWalletSelector(tx.coin, tx.network, tx.amount, function(err) {
       if (err) {
         return exitWithError('Could not update wallets');
       }
@@ -207,7 +248,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
 
     $scope.displayBalanceAsFiat = walletConfig.settings.priceDisplay === 'fiat';
 
-  });
+  };
 
 
   function getSendMaxInfo(tx, wallet, cb) {
@@ -231,7 +272,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
       return setSendError(msg);
     }
 
-    if (tx.toAmount > Number.MAX_SAFE_INTEGER) {
+    if (tx.amount > Number.MAX_SAFE_INTEGER) {
       var msg = gettextCatalog.getString('Amount too big');
       $log.warn(msg);
       return setSendError(msg);
@@ -241,7 +282,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
 
     txp.outputs = [{
       'toAddress': tx.toAddress,
-      'amount': tx.toAmount,
+      'amount': tx.amount,
       'message': tx.description
     }];
 
@@ -280,13 +321,13 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     $scope.tx = tx;
 
     function updateAmount() {
-      if (!tx.toAmount) return;
+      if (!tx.amount) return;
 
       // Amount
-      tx.amountStr = txFormatService.formatAmountStr(wallet.coin, tx.toAmount);
+      tx.amountStr = txFormatService.formatAmountStr(wallet.coin, tx.amount);
       tx.amountValueStr = tx.amountStr.split(' ')[0];
       tx.amountUnitStr = tx.amountStr.split(' ')[1];
-      txFormatService.formatAlternativeStr(wallet.coin, tx.toAmount, function(v) {
+      txFormatService.formatAlternativeStr(wallet.coin, tx.amount, function(v) {
         var parts = v.split(' ');
         tx.alternativeAmountStr = v;
         tx.alternativeAmountValueStr = parts[0];
@@ -342,7 +383,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
           }
 
           tx.sendMaxInfo = sendMaxInfo;
-          tx.toAmount = tx.sendMaxInfo.amount;
+          tx.amount = tx.sendMaxInfo.amount;
           updateAmount();
           ongoingProcess.set('calculatingFee', false);
           $timeout(function() {
@@ -393,7 +434,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
   function useSelectedWallet() {
 
     if (!$scope.useSendMax) {
-      showAmount(tx.toAmount);
+      showAmount(tx.amount);
     }
 
     $scope.onWalletSelect($scope.wallet);
@@ -402,19 +443,19 @@ angular.module('copayApp.controllers').controller('confirmController', function(
   function setButtonText(isMultisig, isPayPro) {
 
     if (isPayPro) {
-      if (isCordova && !isWindowsPhoneApp) {
+      if (isCordova) {
         $scope.buttonText = gettextCatalog.getString('Slide to pay');
       } else {
         $scope.buttonText = gettextCatalog.getString('Click to pay');
       }
     } else if (isMultisig) {
-      if (isCordova && !isWindowsPhoneApp) {
+      if (isCordova) {
         $scope.buttonText = gettextCatalog.getString('Slide to accept');
       } else {
         $scope.buttonText = gettextCatalog.getString('Click to accept');
       }
     } else {
-      if (isCordova && !isWindowsPhoneApp) {
+      if (isCordova) {
         $scope.buttonText = gettextCatalog.getString('Slide to send');
       } else {
         $scope.buttonText = gettextCatalog.getString('Click to send');
@@ -422,7 +463,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     }
   };
 
-
   $scope.toggleAddress = function() {
     $scope.showAddress = !$scope.showAddress;
   };
diff --git a/src/js/controllers/customAmount.js b/src/js/controllers/customAmount.js
index f6b96c22c..d74ebca30 100644
--- a/src/js/controllers/customAmount.js
+++ b/src/js/controllers/customAmount.js
@@ -17,7 +17,7 @@ angular.module('copayApp.controllers').controller('customAmountController', func
   }
 
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
-    var walletId = data.stateParams.id;
+    var walletId = data.stateParams.toWalletId;
 
     if (!walletId) {
       showErrorAndBack('Error', 'No wallet selected');
@@ -53,11 +53,12 @@ angular.module('copayApp.controllers').controller('customAmountController', func
         $scope.address = bchAddresses[$scope.bchAddressType];
       }
 
-      $scope.coin = data.stateParams.coin;
+      $scope.coin = $scope.wallet.coin;
+      var satoshis = parseInt(data.stateParams.amount, 10);
       var parsedAmount = txFormatService.parseAmount(
         $scope.wallet.coin,
-        data.stateParams.amount,
-        data.stateParams.currency);
+        satoshis,
+        'sat');
 
       // Amount in USD or BTC
       var amount = parsedAmount.amount;
diff --git a/src/js/controllers/review.controller.js b/src/js/controllers/review.controller.js
new file mode 100644
index 000000000..bb160b3d1
--- /dev/null
+++ b/src/js/controllers/review.controller.js
@@ -0,0 +1,891 @@
+'use strict';
+
+angular
+  .module('copayApp.controllers')
+  .controller('reviewController', reviewController);
+
+function reviewController(addressbookService, bitcoinCashJsService, bitcore, bitcoreCash, bwcError, configService, feeService, gettextCatalog, $interval, $ionicHistory, $ionicLoading, $ionicModal, lodash, $log, ongoingProcess, platformInfo, popupService, profileService, $scope, shapeshiftService, soundService, $state, $timeout, txConfirmNotification, txFormatService, walletService) {
+  var vm = this;
+
+  vm.buttonText = '';
+  vm.destination = {
+    address: '',
+    balanceAmount: '',
+    balanceCurrency: '',
+    coin: '',
+    color: '',
+    currency: '',
+    currencyColor: '',
+    kind: '', // 'address', 'contact', 'wallet'
+    name: ''
+  };
+  vm.feeCrypto = '';
+  vm.feeFiat = '';
+  vm.fiatCurrency = '';
+  vm.feeIsHigh = false;
+  vm.feeLessThanACent = false;
+  vm.isCordova = platformInfo.isCordova;
+  vm.notReadyMessage = '';
+  vm.origin = {
+    balanceAmount: '',
+    balanceCurrency: '',
+    currency: '',
+    currencyColor: '',
+  };
+  vm.originWallet = null;
+  vm.paymentExpired = false;
+  vm.primaryAmount = '';
+  vm.primaryCurrency = '';
+  vm.usingMerchantFee = false;
+  vm.readyToSend = false;
+  vm.remainingTimeStr = '';
+  vm.secondaryAmount = '';
+  vm.secondaryCurrency = '';
+  vm.sendingTitle = gettextCatalog.getString('You are sending');
+  vm.sendStatus = '';
+  vm.showAddress = true;
+  vm.thirdParty = false;
+  vm.wallet = null;
+  vm.memoExpanded = false;
+
+  // Functions
+  vm.onSuccessConfirm = onSuccessConfirm;
+
+  
+  var config = null;
+  var countDown = null;
+  var defaults = {};
+  var coin = '';
+  var countDown = null;
+  var usingCustomFee = false;
+  var usingMerchantFee = false;
+  var destinationWalletId = '';
+  var originWalletId = '';
+  var priceDisplayIsFiat = true;
+  var satoshis = null;
+  var toAddress = '';
+  var tx = {};
+  var txPayproData = null;
+  var unitFromSat = 0;
+
+  var FEE_TOO_HIGH_LIMIT_PERCENTAGE = 15;
+
+  $scope.$on("$ionicView.beforeEnter", onBeforeEnter);
+
+
+  function onBeforeEnter(event, data) {
+    defaults = configService.getDefaults();
+    originWalletId = data.stateParams.fromWalletId;
+    satoshis = parseInt(data.stateParams.amount, 10);
+    toAddress = data.stateParams.toAddress;
+    destinationWalletId = data.stateParams.toWalletId;
+    
+    vm.originWallet = profileService.getWallet(originWalletId);
+    vm.origin.currency = vm.originWallet.coin.toUpperCase();
+    coin = vm.originWallet.coin;
+
+    if (data.stateParams.thirdParty) {
+      vm.thirdParty = JSON.parse(data.stateParams.thirdParty); // Parse stringified JSON-object
+      if (vm.thirdParty) {
+        handleThirdPartyInitIfBip70();
+        handleThirdPartyInitIfShapeshift();
+      }
+    }
+
+    configService.get(function onConfig(err, configCache) {
+      if (err) {
+        $log.err('Error getting config.', err);
+      } else {
+        config = configCache;
+        priceDisplayIsFiat = config.wallet.settings.priceDisplay === 'fiat';
+        vm.origin.currencyColor = (vm.originWallet.coin === 'btc' ? defaults.bitcoinWalletColor : defaults.bitcoinCashWalletColor);
+        console.log("coin", vm.originWallet.coin, vm.origin.currencyColor, config.bitcoinWalletColor, vm.originWallet.coin === 'btc');
+        unitFromSat = 1 / config.wallet.settings.unitToSatoshi; 
+      }
+      updateSendAmounts();
+      getOriginWalletBalance(vm.originWallet);
+      handleDestinationAsAddress(toAddress, coin);
+      handleDestinationAsWallet(data.stateParams.toWalletId);
+      createVanityTransaction(data);
+    });
+  }
+
+  vm.approve = function() {
+      
+    if (!tx || !vm.originWallet) return;
+
+    if (vm.paymentExpired) {
+      popupService.showAlert(null, gettextCatalog.getString('This bitcoin payment request has expired.'));
+      vm.sendStatus = '';
+      $timeout(function() {
+        $scope.$apply();
+      });
+      return;
+    }
+
+    ongoingProcess.set('creatingTx', true, statusChangeHandler);
+    getTxp(lodash.clone(tx), vm.originWallet, false, function(err, txp) {
+      ongoingProcess.set('creatingTx', false, statusChangeHandler);
+      if (err) return;
+
+      // confirm txs for more that 20usd, if not spending/touchid is enabled
+      function confirmTx(cb) {
+        if (walletService.isEncrypted(vm.originWallet))
+          return cb();
+
+        var amountUsd = parseFloat(txFormatService.formatToUSD(vm.originWallet.coin, txp.amount));
+        return cb();
+      };
+
+      function publishAndSign() {
+        if (!vm.originWallet.canSign() && !vm.originWallet.isPrivKeyExternal()) {
+          $log.info('No signing proposal: No private key');
+
+          return walletService.onlyPublish(vm.originWallet, txp, function(err) {
+            if (err) setSendError(err);
+          }, statusChangeHandler);
+        }
+
+        walletService.publishAndSign(vm.originWallet, txp, function(err, txp) {
+          if (err) return setSendError(err);
+          if (config.confirmedTxsNotifications && config.confirmedTxsNotifications.enabled) {
+            txConfirmNotification.subscribe(vm.originWallet, {
+              txid: txp.txid
+            });
+          }
+        }, statusChangeHandler);
+      };
+
+      confirmTx(function(nok) {
+        if (nok) {
+          vm.sendStatus = '';
+          $timeout(function() {
+            $scope.$apply();
+          });
+          return;
+        }
+        publishAndSign();
+      });
+    });
+  };
+
+  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 = vm.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, vm.originWallet, {
+        clearCache: true,
+        dryRun: true
+      }, function() {});
+    };
+  };
+
+  function createVanityTransaction(data) {
+    console.log('createVanityTransaction()');
+    var configFeeLevel = config.wallet.settings.feeLevel ? config.wallet.settings.feeLevel : 'normal';
+
+    // Grab stateParams
+    tx = {
+      amount: parseInt(data.stateParams.amount),
+      sendMax: data.stateParams.sendMax === 'true' ? true : false,
+      fromWalletId: data.stateParams.fromWalletId,
+      toAddress: data.stateParams.toAddress,
+      paypro: txPayproData,
+
+      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: vm.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') { // This is a wallet-to-wallet transfer
+        $ionicLoading.show();
+        var toWallet = profileService.getWallet(destinationWalletId);
+
+        // We need an address to send to, so we ask the walletService to create a new address for the toWallet.
+        console.log('Getting address for wallet...');
+        walletService.getAddress(toWallet, true, function onWalletAddress(err, addr) {
+          console.log('getAddress cb called', err);
+          $ionicLoading.hide();
+          tx.toAddress = addr;
+          networkName = (new B.Address(tx.toAddress)).network.name;
+          tx.network = networkName;
+          console.log('calling setupTx() for wallet.');
+          setupTx(tx);
+        });
+      } else { // This is a Wallet-to-address transfer
+        networkName = (new B.Address(tx.toAddress)).network.name;
+        tx.network = networkName;
+        console.log('calling setupTx() for address.');
+        setupTx(tx);
+      }
+    } catch (e) {
+      console.error('Error setting up tx', 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(vm.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': vm.memo
+    }];
+
+    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 = vm.memo;
+
+    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 = '';
+    var balanceFiatAmount = '';
+    var balanceFiatCurrency = ''
+    var displayAmount = '';
+    var displayCurrency = '';
+
+    var walletStatus = null;
+    if (wallet.status.isValid) {
+      walletStatus = wallet.status;
+    } else if (wallet.cachedStatus.isValid) {
+      walletStatus = wallet.cachedStatus;
+    }
+
+    if (walletStatus) {
+      var cryptoBalanceParts = walletStatus.spendableBalanceStr.split(' ');
+      balanceCryptoAmount = cryptoBalanceParts[0];
+      balanceCryptoCurrencyCode = cryptoBalanceParts.length > 1 ? cryptoBalanceParts[1] : '';
+
+      if (walletStatus.alternativeBalanceAvailable) {
+        balanceFiatAmount = walletStatus.spendableBalanceAlternative;
+        balanceFiatCurrency = walletStatus.alternativeIsoCode;
+      }
+    }
+
+    if (priceDisplayIsFiat) {
+      displayAmount = balanceFiatAmount ? balanceFiatAmount : balanceCryptoAmount;
+      displayCurrency = balanceFiatAmount ? balanceFiatCurrency : balanceCryptoCurrencyCode;
+    } else {
+      displayAmount = balanceCryptoAmount;
+      displayCurrency = balanceCryptoCurrencyCode;
+    }
+
+    return {
+      amount: displayAmount,
+      currency: displayCurrency
+    };
+  }
+
+  function handleDestinationAsAddress(address, originCoin) {
+    if (!address) {
+      return;
+    }
+
+    // Check if the recipient is a contact
+    addressbookService.get(originCoin + address, function(err, contact) { 
+      if (!err && contact) {
+        handleDestinationAsContact(contact);
+      } else {
+        vm.destination.address = address;
+        vm.destination.kind = 'address';
+      }
+    });
+
+  }
+
+  function handleDestinationAsContact(contact) {
+    vm.destination.kind = 'contact';
+    vm.destination.name = contact.name;
+    vm.destination.email = contact.email;
+    vm.destination.color = contact.coin === 'btc' ? defaults.bitcoinWalletColor : defaults.bitcoinCashWalletColor;
+    vm.destination.currency = contact.coin.toUpperCase();
+    vm.destination.currencyColor = vm.destination.color;
+  }
+
+  function handleDestinationAsWallet(walletId) {
+    destinationWalletId = walletId;
+    if (!destinationWalletId) {
+      return;
+    }
+
+    var destinationWallet = profileService.getWallet(destinationWalletId);
+    vm.destination.coin = destinationWallet.coin;
+    vm.destination.color = destinationWallet.color;
+    vm.destination.currency = destinationWallet.coin.toUpperCase();
+    vm.destination.kind = 'wallet';
+    vm.destination.name = destinationWallet.name;
+
+    if (defaults) {
+      vm.destination.currencyColor = vm.destination.coin === 'btc' ? defaults.bitcoinWalletColor : defaults.bitcoinCashWalletColor;
+    }
+
+    var balanceText = getWalletBalanceDisplayText(destinationWallet);
+    vm.destination.balanceAmount = balanceText.amount;
+    vm.destination.balanceCurrency = balanceText.currency;
+  }
+
+  function handleThirdPartyInitIfBip70() {
+    if (vm.thirdParty.id === 'bip70') {
+      vm.sendingTitle = gettextCatalog.getString('You are paying');
+      vm.memo = vm.thirdParty.memo;
+      vm.memoExpanded = !!vm.memo;
+      vm.destination.name = vm.thirdParty.name;
+
+      txPayproData = {
+        caTrusted: vm.thirdParty.caTrusted,
+        domain: vm.thirdParty.domain,
+        expires: vm.thirdParty.expires,
+        toAddress: toAddress,
+        url: vm.thirdParty.url,
+        verified: vm.thirdParty.verified,
+      };
+    }
+  }
+
+  function handleThirdPartyInitIfShapeshift() {
+    if (vm.thirdParty.id === 'shapeshift') {
+      vm.sendingTitle = gettextCatalog.getString('You are shifting');
+      if (!vm.thirdParty.data) {
+        vm.thirdParty.data = {};
+      }
+
+      var toWallet = profileService.getWallet(destinationWalletId);
+      vm.destination.name = toWallet.name;
+      vm.destination.color = toWallet.color;
+      vm.destination.currency = toWallet.coin.toUpperCase();
+
+      $ionicLoading.show();
+      walletService.getAddress(vm.originWallet, false, function onReturnWalletAddress(err, returnAddr) {
+        if (err) {
+          $ionicLoading.hide();
+          popupService.showAlert(gettextCatalog.getString('Shapeshift Error'), err.toString());
+          return;
+        } 
+        walletService.getAddress(toWallet, false, function onWithdrawalWalletAddress(err, withdrawalAddr) {
+          if (err) {
+            $ionicLoading.hide();
+            popupService.showAlert(gettextCatalog.getString('Shapeshift Error'), err.toString());
+            return;
+          } 
+
+          shapeshiftService.shiftIt(vm.originWallet.coin, toWallet.coin, withdrawalAddr, returnAddr, function onShiftIt(err, shapeshiftData) {
+            if (err && err != null) {
+              $ionicLoading.hide();
+              popupService.showAlert(gettextCatalog.getString('Shapeshift Error'), err.toString());
+            } else {
+              vm.memoExpanded = !!vm.memo;
+              vm.memo = 'ShapeShift Order:\nhttps://www.shapeshift.io/#/status/' + shapeshiftData.orderId;
+              tx.toAddress = shapeshiftData.toAddress;
+              vm.destination.address = toAddress;
+              vm.destination.kind = 'shapeshift';
+            }
+          });
+        });
+      });
+    }
+  }
+
+  function startExpirationTimer(expirationTime) {
+    vm.paymentExpired = false;
+    setExpirationTime();
+
+    countDown = $interval(function() {
+      setExpirationTime();
+    }, 1000);
+
+    function setExpirationTime() {
+      console.log('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;
+      vm.remainingTimeStr = m + ":" + ('0' + s).slice(-2);
+    };
+
+    function setExpiredValues() {
+      vm.paymentExpired = true;
+      vm.remainingTimeStr = gettextCatalog.getString('Expired');
+      vm.readyToSend = false;
+      if (countDown) $interval.cancel(countDown);
+      $timeout(function() {
+        $scope.$apply();
+      });
+    };
+  };
+
+  function updateSendAmounts() {
+    if (typeof satoshis !== 'number') {
+      return;
+    }
+
+    var cryptoAmount = '';
+    var cryptoCurrencyCode = '';
+    var amountStr = txFormatService.formatAmountStr(coin, satoshis);
+    if (amountStr) {
+      var amountParts = amountStr.split(' ');
+      cryptoAmount = amountParts[0];
+      cryptoCurrencyCode = amountParts.length > 1 ? amountParts[1] : '';
+    }
+    // Want to avoid flashing of amount strings so do all formatting after this has returned.
+    txFormatService.formatAlternativeStr(coin, satoshis, function(v) {
+      if (!v) {
+        vm.primaryAmount = cryptoAmount;
+        vm.primaryCurrency = cryptoCurrencyCode;
+        vm.secondaryAmount = '';
+        vm.secondaryCurrency = '';
+        return;
+      }
+      vm.secondaryAmount = vm.primaryAmount;
+      vm.secondaryCurrency = vm.primaryCurrency;
+
+      var fiatParts = v.split(' ');
+      var fiatAmount = fiatParts[0];
+      var fiatCurrency = fiatParts.length > 1 ? fiatParts[1] : '';
+
+      if (priceDisplayIsFiat) {
+        vm.primaryAmount = fiatAmount;
+        vm.primaryCurrency = fiatCurrency;
+        vm.secondaryAmount = cryptoAmount;
+        vm.secondaryCurrency = cryptoCurrencyCode;
+      } else {
+        vm.primaryAmount = cryptoAmount;
+        vm.primaryCurrency = cryptoCurrencyCode;
+        vm.secondaryAmount = fiatAmount;
+        vm.secondaryCurrency = fiatCurrency;
+      }
+    });
+  }
+
+  function onSuccessConfirm() {
+    vm.sendStatus = '';
+    $ionicHistory.nextViewOptions({
+      disableAnimate: true,
+      historyRoot: true
+    });
+    $state.go('tabs.send').then(function() {
+      $ionicHistory.clearHistory();
+      $state.transitionTo('tabs.home');
+    });
+  };
+
+  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 setNotReady(msg, criticalError) {
+    vn.readyToSend = false;
+    vm.notReadyMessage = msg;
+    $scope.criticalError = criticalError;
+    $log.warn('Not ready to make the payment:' + msg);
+    $timeout(function() {
+      $scope.$apply();
+    });
+  };
+
+  function setSendError(msg) {
+    $scope.sendStatus = '';
+    vm.readyToSend = false;
+    $timeout(function() {
+      $scope.$apply();
+    });
+    popupService.showAlert(gettextCatalog.getString('Error at confirm'), bwcError.msg(msg));
+  };
+
+  function setupTx(tx) {
+    if (tx.coin === 'bch') {
+      tx.displayAddress = bitcoinCashJsService.readAddress(tx.toAddress).cashaddr;
+    } else {
+      tx.displayAddress = tx.toAddress;
+    }
+
+    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';
+      }
+    });
+
+    vm.showAddress = false;
+
+
+    setButtonText(vm.originWallet.credentials.m > 1, !!tx.paypro);
+
+    if (tx.paypro)
+      startExpirationTimer(tx.paypro.expires);
+
+    updateTx(tx, vm.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 showSendMaxWarning(wallet, sendMaxInfo) {
+    var feeAlternative = '',
+      msg = '';
+
+    function verifyExcludedUtxos() {
+      var warningMsg = [];
+      if (sendMaxInfo.utxosBelowFee > 0) {
+        warningMsg.push(gettextCatalog.getString("A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided.", {
+          amountBelowFeeStr: txFormatService.formatAmountStr(wallet.coin, sendMaxInfo.amountBelowFee)
+        }));
+      }
+
+      if (sendMaxInfo.utxosAboveMaxSize > 0) {
+        warningMsg.push(gettextCatalog.getString("A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded.", {
+          amountAboveMaxSizeStr: txFormatService.formatAmountStr(vm.originWallet.coin, sendMaxInfo.amountAboveMaxSize)
+        }));
+      }
+      return warningMsg.join('\n');
+    };
+
+    feeAlternative = txFormatService.formatAlternativeStr(vm.originWallet.coin, sendMaxInfo.fee);
+    if (feeAlternative) {
+      msg = gettextCatalog.getString("{{feeAlternative}} will be deducted for bitcoin networking fees ({{fee}}).", {
+        fee: txFormatService.formatAmountStr(vm.originWallet.coin, sendMaxInfo.fee),
+        feeAlternative: feeAlternative
+      });
+    } else {
+      msg = gettextCatalog.getString("{{fee}} will be deducted for bitcoin networking fees).", {
+        fee: txFormatService.formatAmountStr(vm.originWallet.coin, sendMaxInfo.fee)
+      });
+    }
+
+    var warningMsg = verifyExcludedUtxos();
+
+    if (!lodash.isEmpty(warningMsg))
+      msg += '\n' + warningMsg;
+
+    popupService.showAlert(null, msg, function() {});
+  };
+
+  function statusChangeHandler(processName, showName, isOn) {
+    $log.debug('statusChangeHandler: ', processName, showName, isOn);
+    if (
+      (
+        processName === 'broadcastingTx' ||
+        ((processName === 'signingTx') && vm.originWallet.m > 1) ||
+        (processName == 'sendingTx' && !vm.originWallet.canSign() && !vm.originWallet.isPrivKeyExternal())
+      ) && !isOn) {
+      vm.sendStatus = 'success';
+
+      if ($state.current.name === "tabs.send.review") { // XX SP: Otherwise all open wallets on other devices play this sound if you have been in a send flow before on that device.
+        soundService.play('misc/payment_sent.mp3');
+      }
+      
+      var channel = "firebase";
+      if (platformInfo.isNW) {
+        channel = "ga";
+      }
+      // When displaying Fiat, if the formatting fails, the crypto will be the primary amount.
+      var amount = unitFromSat * satoshis;
+      var log = new window.BitAnalytics.LogEvent("transfer_success", [{
+        "coin": vm.originWallet.coin,
+        "type": "outgoing",
+        "amount": amount,
+        "fees": vm.feeCrypto
+      }], [channel, "adjust"]);
+      window.BitAnalytics.LogEventHandlers.postEvent(log);
+
+      $timeout(function() {
+        $scope.$digest();
+      }, 100);
+    } else if (showName) {
+      vm.sendStatus = showName;
+    }
+  };
+
+  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();
+
+    var feeServiceLevel = usingMerchantFee && vm.originWallet.coin == 'btc' ? 'urgent' : tx.feeLevel;
+    feeService.getFeeRate(vm.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);
+            setNotReady(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;
+          satoshis = tx.amount;
+          updateSendAmounts();
+          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);
+          vm.readyToSend = true;
+          updateSendAmounts();
+          $scope.$apply();
+          return cb();
+        }
+
+        console.log('calling getTxp() from getSendMaxInfo cb.');
+        getTxp(lodash.clone(tx), wallet, opts.dryRun, function(err, txp) {
+          ongoingProcess.set('calculatingFee', false);
+          if (err) {
+            if (err.message == 'Insufficient funds') {
+              setNotReady(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 = (unitFromSat * txp.fee).toFixed(8);
+          vm.feeIsHigh = txp.feeToHigh;
+          console.log("crypto", vm.feeCrypto);
+
+
+          tx.txp[wallet.id] = txp;
+          $log.debug('Confirm. TX Fully Updated for wallet:' + wallet.id, tx);
+          vm.readyToSend = true;
+          updateSendAmounts();
+          console.log('readyToSend:', vm.readyToSend);
+          $scope.$apply();
+
+          return cb();
+        });
+      });
+    });
+  }
+
+}
diff --git a/src/js/controllers/shapeshift.js b/src/js/controllers/shapeshift.js
index a58fc20b6..ade7afb5b 100644
--- a/src/js/controllers/shapeshift.js
+++ b/src/js/controllers/shapeshift.js
@@ -1,7 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('shapeshiftController', function($scope, $interval, profileService, walletService, popupService, lodash, $ionicNavBarDelegate) {
-
+angular.module('copayApp.controllers').controller('shapeshiftController', function($scope, $state, $interval, profileService, walletService, popupService, lodash, $ionicNavBarDelegate) {
   var walletsBtc = [];
   var walletsBch = [];
 
@@ -16,24 +15,9 @@ angular.module('copayApp.controllers').controller('shapeshiftController', functi
   }
 
   function showToWallets() {
-    $scope.toWallets = $scope.fromWallet.coin == 'btc' ? walletsBch : walletsBtc;
+    $scope.toWallets = $scope.fromWallet.coin === 'btc' ? walletsBch : walletsBtc;
     $scope.onToWalletSelect($scope.toWallets[0]);
-    $scope.singleToWallet = $scope.toWallets.length == 1;
-  }
-
-  $scope.onFromWalletSelect = function(wallet) {
-    $scope.fromWallet = wallet;
-    showToWallets();
-    generateAddress(wallet, function(addr) {
-      $scope.fromWalletAddress = addr;
-    });
-  };
-
-  $scope.onToWalletSelect = function(wallet) {
-    $scope.toWallet = wallet;
-    generateAddress(wallet, function(addr) {
-      $scope.toWalletAddress = addr;
-    });
+    $scope.singleToWallet = $scope.toWallets.length === 1;
   }
 
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
@@ -42,15 +26,15 @@ angular.module('copayApp.controllers').controller('shapeshiftController', functi
     $scope.fromWallets = lodash.filter(walletsBtc.concat(walletsBch), function(w) {
       return w.status.balance.availableAmount > 0;
     });
-    if ($scope.fromWallets.length == 0) return;
-    $scope.onFromWalletSelect($scope.fromWallets[0]);
-    $scope.onToWalletSelect($scope.toWallets[0]);
-    $scope.singleFromWallet = $scope.fromWallets.length == 1;
-    $scope.singleToWallet = $scope.toWallets.length == 1;
+
+    $scope.singleFromWallet = $scope.fromWallets.length === 1;
     $scope.fromWalletSelectorTitle = 'From';
     $scope.toWalletSelectorTitle = 'To';
     $scope.showFromWallets = false;
     $scope.showToWallets = false;
+    $scope.walletsWithFunds = profileService.getWallets({onlyComplete: true, hasFunds: true});
+    $scope.wallets = profileService.getWallets({onlyComplete: true});
+    $scope.hasWallets = !lodash.isEmpty($scope.wallets);
   });
 
   $scope.$on("$ionicView.enter", function(event, data) {
@@ -59,9 +43,31 @@ angular.module('copayApp.controllers').controller('shapeshiftController', functi
 
   $scope.showFromWalletSelector = function() {
     $scope.showFromWallets = true;
-  }
+  };
 
   $scope.showToWalletSelector = function() {
     $scope.showToWallets = true;
+  };
+
+  // This could probably be enhanced refactoring the routes abstract states
+  $scope.createWallet = function() {
+    $state.go('tabs.home').then(function() {
+      $state.go('tabs.add.create-personal');
+    });
+  };
+
+  $scope.buyBitcoin = function() {
+    $state.go('tabs.home').then(function() {
+      $state.go('tabs.buyandsell');
+    });
+  };
+
+  $scope.shapeshift = function() {
+    var params = {
+      thirdParty: JSON.stringify({id: 'shapeshift'})
+    };
+    $state.go('tabs.home').then(function() {
+      $state.transitionTo('tabs.send.origin', params);
+    });
   }
 });
diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
index 8f25412ec..3c48818b6 100644
--- a/src/js/controllers/tab-receive.js
+++ b/src/js/controllers/tab-receive.js
@@ -19,8 +19,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
 
   $scope.requestSpecificAmount = function() {
     $state.go('tabs.paymentRequest.amount', {
-      id: $scope.wallet.credentials.walletId,
-      coin: $scope.wallet.coin
+      toWalletId: $scope.wallet.credentials.walletId
     });
   };
 
diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js
index 99265457d..465941c35 100644
--- a/src/js/controllers/tab-send.js
+++ b/src/js/controllers/tab-send.js
@@ -55,42 +55,6 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
     });
   });
 
-  var wallets;
-  var walletsBch;
-  var walletsBtc;
-  var walletToWalletFrom = false;
-
-  $scope.onWalletSelect = function(wallet) {
-    if (!$scope.walletToWalletFrom) {
-      $scope.walletToWalletFrom = wallet;
-      if (wallet.coin === 'bch') {
-        $scope.showWalletsBch = true;
-      } else if (wallet.coin === 'btc') {
-        $scope.showWalletsBtc = true;
-      }
-      $scope.walletSelectorTitleTo = gettextCatalog.getString('Send to');
-    } else {
-      $ionicLoading.show();
-      walletService.getAddress(wallet, true, function(err, addr) {
-        $ionicLoading.hide();
-        return $state.transitionTo('tabs.send.amount', {
-          displayAddress: $scope.walletToWalletFrom.coin === 'bch' ? bitcoinCashJsService.translateAddresses(addr).cashaddr : addr,
-          recipientType: 'wallet',
-          fromWalletId: $scope.walletToWalletFrom.id,
-          toAddress: addr,
-          coin: $scope.walletToWalletFrom.coin
-        });
-      });
-
-    }
-  };
-
-  $scope.showWalletSelector = function() {
-    $scope.walletToWalletFrom = false;
-    $scope.walletSelectorTitleFrom = gettextCatalog.getString('Send from');
-    $scope.showWallets = true;
-  };
-
   $scope.findContact = function(search) {
 
     if (incomingData.redir(search)) {
@@ -133,7 +97,6 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
   };
 
   var updateHasFunds = function() {
-
     $scope.hasFunds = false;
     var index = 0;
     lodash.each($scope.wallets, function(w) {
@@ -179,10 +142,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
           coin: v.coin,
           displayCoin:  (v.coin == 'bch'
               ? (config.bitcoinCashAlias || defaults.bitcoinCashAlias)
-              : (config.bitcoinAlias || defaults.bitcoinAlias)).toUpperCase(),
-          getAddress: function(cb) {
-            return cb(null, k);
-          },
+              : (config.bitcoinAlias || defaults.bitcoinAlias)).toUpperCase()
         });
       });
       originalList = completeContacts;
@@ -203,35 +163,26 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
   };
 
   $scope.searchBlurred = function() {
-    if ($scope.formData.search == null || $scope.formData.search.length == 0) {
+    if ($scope.formData.search == null || $scope.formData.search.length === 0) {
       $scope.searchFocus = false;
     }
   };
 
-  $scope.goToAmount = function(item) {
-    $timeout(function() {
-      item.getAddress(function(err, addr) {
-        if (err || !addr) {
-          //Error is already formated
-          return popupService.showAlert(err);
-        }
+  $scope.sendToContact = function (item) {
+    $timeout(function () {
+      var toAddress = item.address;
 
-        if (item.recipientType && item.recipientType == 'contact') {
-          if (addr.indexOf('bch') == 0 || addr.indexOf('btc') == 0) {
-            addr = addr.substring(3);
-          }
+      if (item.recipientType && item.recipientType === 'contact') {
+        if (toAddress.indexOf('bch') === 0 || toAddress.indexOf('btc') === 0) {
+          toAddress = toAddress.substring(3);
         }
+      }
 
-        $log.debug('Got toAddress:' + addr + ' | ' + item.name);
-        return $state.transitionTo('tabs.send.amount', {
-          recipientType: item.recipientType,
-          displayAddress: item.coin == 'bch' ? bitcoinCashJsService.translateAddresses(addr).cashaddr : addr,
-          toAddress: addr,
-          toName: item.name,
-          toEmail: item.email,
-          toColor: item.color,
-          coin: item.coin
-        });
+      $log.debug('Got toAddress:' + toAddress + ' | ' + item.name);
+
+      return $state.transitionTo('tabs.send.origin', {
+        toAddress: toAddress,
+        coin: item.coin
       });
     });
   };
diff --git a/src/js/controllers/walletSelectorController.js b/src/js/controllers/walletSelectorController.js
new file mode 100644
index 000000000..a4ff3ab3e
--- /dev/null
+++ b/src/js/controllers/walletSelectorController.js
@@ -0,0 +1,193 @@
+'use strict';
+
+angular.module('copayApp.controllers').controller('walletSelectorController', function($scope, $rootScope, $state, $log, $ionicHistory, configService, gettextCatalog, profileService, txFormatService) {
+
+  var fromWalletId = '';
+  var priceDisplayAsFiat = false;
+  var unitDecimals = 0;
+  var unitsFromSatoshis = 0;
+
+  $scope.$on("$ionicView.beforeEnter", function(event, data) {
+    var config = configService.getSync().wallet.settings;
+    priceDisplayAsFiat = config.priceDisplay === 'fiat';
+    unitDecimals = config.unitDecimals;
+    unitsFromSatoshis = 1 / config.unitToSatoshi;
+
+    switch($state.current.name) {
+      case 'tabs.send.wallet-to-wallet':
+        $scope.sendFlowTitle = gettextCatalog.getString('Wallet to Wallet Transfer');
+        break;
+      case 'tabs.send.destination':
+        if (data.stateParams.fromWalletId) {
+          $scope.sendFlowTitle = gettextCatalog.getString('Wallet to Wallet Transfer');
+        }
+        break;
+      default:
+       // nop
+    }
+
+    $scope.params = $state.params;
+    $scope.coin = false; // Wallets to show (for destination screen or contacts)
+    $scope.type = data.stateParams && data.stateParams['fromWalletId'] ? 'destination' : 'origin'; // origin || destination
+    fromWalletId = data.stateParams && data.stateParams.fromWalletId;
+
+    if ($scope.params.coin) {
+      $scope.coin = $scope.params.coin; // Contacts have a coin embedded
+    }
+
+    if ($scope.params.amount) { // There is an amount, so presume that it is a payment request
+      $scope.sendFlowTitle = gettextCatalog.getString('Payment Request');
+      $scope.specificAmount = $scope.specificAlternativeAmount = '';
+      $scope.isPaymentRequest = true;
+    }
+    if ($scope.params.thirdParty) {
+      $scope.thirdParty = JSON.parse($scope.params.thirdParty); // Parse stringified JSON-object
+    }
+  });
+
+  $scope.$on("$ionicView.enter", function(event, data) {
+    configService.whenAvailable(function(config) {
+      $scope.selectedPriceDisplay = config.wallet.settings.priceDisplay;
+    });
+
+    if ($scope.thirdParty) {
+      // Third party services specific logic
+      handleThirdPartyIfShapeshift();
+    }
+
+    prepareWalletLists();
+    formatRequestedAmount();
+  });
+
+  function formatRequestedAmount() {
+    if ($scope.params.amount) {
+      var cryptoAmount = (unitsFromSatoshis * $scope.params.amount).toFixed(unitDecimals);
+      var cryptoCoin = $scope.coin.toUpperCase();
+
+      txFormatService.formatAlternativeStr($scope.coin, $scope.params.amount, function onFormatAlternativeStr(formatted){
+        if (formatted) {
+          var fiatParts = formatted.split(' ');
+          var fiatAmount = fiatParts[0];
+          var fiatCurrrency = fiatParts.length > 1 ? fiatParts[1] : '';
+
+          if (priceDisplayAsFiat) {
+            $scope.requestAmount = fiatAmount;
+            $scope.requestCurrency = fiatCurrrency;
+
+            $scope.requestAmountSecondary = cryptoAmount;
+            $scope.requestCurrencySecondary = cryptoCoin;
+          } else {
+            $scope.requestAmount = cryptoAmount;
+            $scope.requestCurrency = cryptoCoin;
+
+            $scope.requestAmountSecondary = fiatAmount;
+            $scope.requestCurrencySecondary = fiatCurrrency;
+          }
+        }
+      }); 
+    }
+  }
+
+  function getNextStep() {
+    if ($scope.thirdParty) {
+      $scope.params.thirdParty = JSON.stringify($scope.thirdParty)  // re-stringify JSON-object
+    }
+    if (!$scope.params.toWalletId && !$scope.params.toAddress) { // If we have no toAddress or fromWallet
+      return 'tabs.send.destination';
+    } else if (!$scope.params.amount) { // If we have no amount
+      return 'tabs.send.amount';
+    } else { // If we do have them
+      return 'tabs.send.review';
+    }
+  }
+
+  function handleThirdPartyIfShapeshift() {
+    console.log($scope.thirdParty, $scope.coin);
+    if ($scope.thirdParty.id === 'shapeshift' && $scope.type === 'destination') { // Shapeshift wants to know the
+      $scope.coin = profileService.getWallet(fromWalletId).coin;
+      if ($scope.coin === 'bch') {
+        $scope.coin = 'btc';
+      } else {
+        $scope.coin = 'bch';
+      }
+    } 
+  }
+
+  function prepareWalletLists() {
+    var walletsAll = [];
+    var walletsSufficientFunds = [];
+    $scope.walletsInsufficientFunds = []; // For origin screen
+
+    if ($scope.type === 'origin') {
+      $scope.headerTitle = gettextCatalog.getString('Choose a wallet to send from');
+
+      if ($scope.params.amount) {
+
+        walletsAll = profileService.getWallets({coin: $scope.coin});
+        
+        walletsAll.forEach(function forWallet(wallet){
+          if (wallet.status.availableBalanceSat > $scope.params.amount) {
+            walletsSufficientFunds.push(wallet);
+          } else {
+            $scope.walletsInsufficientFunds.push(wallet);
+          }
+        });
+
+        if ($scope.coin === 'btc') {
+          $scope.walletsBtc = walletsSufficientFunds;
+        } else {
+          $scope.walletsBch = walletsSufficientFunds;
+        }
+
+      } else if ($scope.coin) {
+        walletsAll = profileService.getWallets({coin: $scope.coin});
+        walletsAll.forEach(function forWallet(wallet){
+          if (wallet.status.availableBalanceSat > 0) {
+            walletsSufficientFunds.push(wallet);
+          } else {
+            $scope.walletsInsufficientFunds.push(wallet);
+          }
+        });
+
+        if ($scope.coin === 'btc') {  
+          $scope.walletsBtc = walletsSufficientFunds;
+        } else {
+          $scope.walletsBch = walletsSufficientFunds;
+        }
+      } else {
+        $scope.walletsBch = profileService.getWallets({coin: 'bch', hasFunds: true});
+        $scope.walletsBtc = profileService.getWallets({coin: 'btc', hasFunds: true});
+        $scope.walletsInsufficientFunds = profileService.getWallets({coin: $scope.coin, hasNoFunds: true});
+      }
+      
+    } else if ($scope.type === 'destination') {
+      if (!$scope.coin) { // Allow for the coin to be set by a third party
+        $scope.fromWallet = profileService.getWallet(fromWalletId);
+        $scope.coin = $scope.fromWallet.coin; // Only show wallets with the select origin wallet coin
+      }
+      $scope.headerTitle = gettextCatalog.getString('Choose a wallet to send to');
+
+      if ($scope.coin === 'btc') { // if no specific coin is set or coin is set btc
+        $scope.walletsBtc = profileService.getWallets({coin: $scope.coin});
+      } else {
+        $scope.walletsBch = profileService.getWallets({coin: $scope.coin});
+      }
+    }
+  }
+
+  
+
+  $scope.useWallet = function(wallet) {
+    if ($scope.type === 'origin') { // we're on the origin screen, set wallet to send from
+      $scope.params['fromWalletId'] = wallet.id;
+    } else { // we're on the destination screen, set wallet to send to
+      $scope.params['toWalletId'] = wallet.id;
+    }
+    $state.transitionTo(getNextStep(), $scope.params);
+  };
+
+  $scope.goBack = function() {
+    $ionicHistory.goBack();
+  }
+
+});
\ No newline at end of file
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/routes.js b/src/js/routes.js
index 8277314e5..8a8adc964 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -287,16 +287,44 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
        */
 
       .state('tabs.send.amount', {
-        url: '/amount/:recipientType/:toAddress/:toName/:toEmail/:toColor/:coin/:fixedUnit/:fromWalletId/:minShapeshiftAmount/:maxShapeshiftAmount/:shapeshiftOrderId/:displayAddress/:noPrefix',
+        url: '/amount/:thirdParty/:fromWalletId/:maxAmount/:minAmount/:toWalletId/:toAddress',
         views: {
           'tab-send@tabs': {
             controller: 'amountController',
+            controllerAs: 'vm',
             templateUrl: 'views/amount.html'
           }
         }
       })
+      .state('tabs.send.wallet-to-wallet', {
+        url: '/wallet-to-wallet',
+        views: {
+          'tab-send@tabs': {
+            controller: 'walletSelectorController',
+            templateUrl: 'views/walletSelector.html'
+          }
+        }
+      })
+      .state('tabs.send.origin', {
+        url: '/origin/:thirdParty/:amount/:toAddress/:toWalletId/:coin',
+        views: {
+          'tab-send@tabs': {
+            controller: 'walletSelectorController',
+            templateUrl: 'views/walletSelector.html',
+          }
+        }
+      })
+      .state('tabs.send.destination', {
+        url: '/destination/:thirdParty/:amount/:fromWalletId',
+        views: {
+          'tab-send@tabs': {
+            controller: 'walletSelectorController',
+            templateUrl: 'views/walletSelector.html',
+          }
+        }
+      })
       .state('tabs.send.confirm', {
-        url: '/confirm/:recipientType/:toAddress/:toName/:toAmount/:toEmail/:toColor/:description/:coin/:useSendMax/:fromWalletId/:displayAddress/:requiredFeeRate',
+        url: '/confirm/:thirdParty/:amount/:fromWalletId/:toWalletId/:toAddress',
         views: {
           'tab-send@tabs': {
             controller: 'confirmController',
@@ -316,6 +344,19 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
           }
         }
       })
+      .state('tabs.send.review', {
+        url: '/review/:thirdParty/:amount/:fromWalletId/:sendMax/:toAddress/:toWalletId',
+        views: {
+          'tab-send@tabs': {
+            controller: 'reviewController',
+            controllerAs: 'vm',
+            templateUrl: 'views/review.html'
+          }
+        },
+        params: {
+          paypro: null
+        }
+      })
 
       /*
        *
@@ -695,16 +736,17 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
       })
 
       .state('tabs.paymentRequest.amount', {
-        url: '/amount/:coin',
+        url: '/amount/:toWalletId',
         views: {
           'tab-receive@tabs': {
             controller: 'amountController',
+            controllerAs: 'vm',
             templateUrl: 'views/amount.html'
           }
         }
       })
       .state('tabs.paymentRequest.confirm', {
-        url: '/confirm/:amount/:currency/:coin',
+        url: '/confirm/:amount/:toWalletId',
         views: {
           'tab-receive@tabs': {
             controller: 'customAmountController',
@@ -845,6 +887,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         views: {
           'tab-home@tabs': {
             controller: 'amountController',
+            controllerAs: 'vm',
             templateUrl: 'views/amount.html'
           }
         }
@@ -910,6 +953,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         views: {
           'tab-home@tabs': {
             controller: 'amountController',
+            controllerAs: 'vm',
             templateUrl: 'views/amount.html'
           }
         }
@@ -968,7 +1012,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
 
       /* Shapeshift */
       .state('tabs.shapeshift', {
-        url: '/shapeshift',
+        url: '/shapeshift/:fromWalletId/:toWalletId',
         views: {
           'tab-home@tabs': {
             controller: 'shapeshiftController',
@@ -1029,6 +1073,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         views: {
           'tab-home@tabs': {
             controller: 'amountController',
+            controllerAs: 'vm',
             templateUrl: 'views/amount.html'
           }
         },
@@ -1081,6 +1126,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         views: {
           'tab-home@tabs': {
             controller: 'amountController',
+            controllerAs: 'vm',
             templateUrl: 'views/amount.html'
           }
         },
@@ -1137,6 +1183,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         views: {
           'tab-home@tabs': {
             controller: 'amountController',
+            controllerAs: 'vm',
             templateUrl: 'views/amount.html'
           }
         }
@@ -1264,7 +1311,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
       if (screen.width < 768 && platformInfo.isCordova)
         screen.lockOrientation('portrait');
 
-      if (ionic.Platform.isAndroid() && StatusBar) {
+      if (ionic.Platform.isAndroid() && platformInfo.isCordova && StatusBar) {
         StatusBar.backgroundColorByHexString('#000000');
       }
 
diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js
index 1bb87b49c..946144dce 100644
--- a/src/js/services/incomingData.js
+++ b/src/js/services/incomingData.js
@@ -8,7 +8,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
     $rootScope.$broadcast('incomingDataMenu.showMenu', data);
   };
 
-  root.redir = function(data, shapeshiftData) {
+  root.redir = function(data, serviceId, serviceData) {
     var originalAddress = null;
     var noPrefixInAddress = 0;
     
@@ -75,35 +75,40 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
       return true;
     }
 
-    function goSend(addr, amount, message, coin, shapeshiftData) {
+    function goSend(addr, amount, message, coin, serviceId, serviceData) {
       $state.go('tabs.send', {}, {
         'reload': true,
         'notify': $state.current.name == 'tabs.send' ? false : true
       });
       // Timeout is required to enable the "Back" button
       $timeout(function() {
+        var params = {};
+        
         if (amount) {
-          $state.transitionTo('tabs.send.confirm', {
-            toAmount: amount,
-            toAddress: addr,
-            displayAddress: originalAddress ? originalAddress : addr,
-            description: message,
-            coin: coin
-          });
-        } else {
-          var params = {
-            toAddress: addr,
-            coin: coin,
-            displayAddress: originalAddress ? originalAddress : addr,
-            noPrefix: noPrefixInAddress
-          };
-          if (shapeshiftData) {
-            params['fromWalletId'] = shapeshiftData.fromWalletId;
-            params['minShapeshiftAmount'] = shapeshiftData.minAmount;
-            params['maxShapeshiftAmount'] = shapeshiftData.maxAmount;
-            params['shapeshiftOrderId'] = shapeshiftData.orderId;
-          }
+          params.amount = amount;
+        }
+
+        if (addr) {
+          params.toAddress = addr;
+          params.displayAddress = originalAddress ? originalAddress : addr;
+        }
+
+        if (coin) {
+          params.coin = coin;
+        }
+
+        if (noPrefixInAddress) {
+          params.noPrefixInAddress = noPrefixInAddress;
+        }
+
+        if (serviceId) {
+          params.thirdParty = [];
+          params.thirdParty.id = serviceId;
+          params.thirdParty.data = serviceData;
+          params.thirdParty = JSON.stringify(params.thirdParty);
           $state.transitionTo('tabs.send.amount', params);
+        } else {
+          $state.transitionTo('tabs.send.origin', params);
         }
       }, 100);
     }
@@ -112,15 +117,20 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
       var coin = data.indexOf('bitcoincash') >= 0 ? 'bch' : 'btc';
       data = decodeURIComponent(data.replace(/bitcoin(cash)?:\?r=/, ''));
       if (coin == 'bch') {
-        payproService.getPayProDetailsViaHttp(data, function(err, details) {
+        payproService.getPayProDetailsViaHttp(data, function onGetPayProDetailsViaHttp(err, details) {
           if (err) {
-            popupService.showAlert(gettextCatalog.getString('Error'), err)
+            var message = err.toString();
+            if (typeof err.data === 'string') {
+              // i.e. 'This invoice is no longer accepting payments'
+              message = gettextCatalog.getString(err.data);
+            }
+            popupService.showAlert(gettextCatalog.getString('Error'), message)
           } else {
-            handlePayPro(createBchPayProObject(details), coin);
+            handlePayPro(details, coin);
           }
         });
       } else {
-        payproService.getPayProDetails(data, coin, function(err, details) {
+        payproService.getPayProDetails(data, coin, function onGetPayProDetails(err, details) {
           if (err) {
             popupService.showAlert(gettextCatalog.getString('Error'), err);
           } else {
@@ -146,12 +156,12 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
         if (parsed.r) {
           payproService.getPayProDetails(parsed.r, coin, function(err, details) {
             if (err) {
-              if (addr && amount) goSend(addr, amount, message, coin, shapeshiftData);
+              if (addr && amount) goSend(addr, amount, message, coin, serviceId, serviceData);
               else popupService.showAlert(gettextCatalog.getString('Error'), err);
             } else handlePayPro(details, coin);
           });
         } else {
-          goSend(addr, amount, message, coin, shapeshiftData);
+          goSend(addr, amount, message, coin, serviceId, serviceData);
         }
         return true;
     // Cash URI
@@ -169,14 +179,14 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
           payproService.getPayProDetails(parsed.r, coin, function(err, details) {
             if (err) {
               if (addr && amount)
-                goSend(addr, amount, message, coin, shapeshiftData);
+                goSend(addr, amount, message, coin, serviceId, serviceData);
               else
                 popupService.showAlert(gettextCatalog.getString('Error'), err);
             }
             handlePayPro(details, coin);
           });
         } else {
-          goSend(addr, amount, message, coin, shapeshiftData);
+          goSend(addr, amount, message, coin, serviceId, serviceData);
         }
         return true;
 
@@ -212,14 +222,14 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
               payproService.getPayProDetails(parsed.r, coin, function(err, details) {
                 if (err) {
                   if (addr && amount)
-                    goSend(addr, amount, message, coin, shapeshiftData);
+                    goSend(addr, amount, message, coin, serviceId, serviceData);
                   else
                     popupService.showAlert(gettextCatalog.getString('Error'), err);
                 }
                 handlePayPro(details, coin);
               });
             } else {
-              goSend(addr, amount, message, coin, shapeshiftData);
+              goSend(addr, amount, message, coin, serviceId, serviceData);
             }
           }
         );
@@ -377,7 +387,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
       'notify': $state.current.name == 'tabs.send' ? false : true
     });
     $timeout(function() {
-      $state.transitionTo('tabs.send.amount', {
+      $state.transitionTo('tabs.send.origin', {
         toAddress: toAddress,
         coin: coin,
         noPrefix: 1
@@ -385,38 +395,61 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
     }, 100);
   }
 
-  function createBchPayProObject(payProData) {
-    var displayAddr = payProData.outputs[0].address;
-    var toAddr = bitcoinCashJsService.readAddress('bitcoincash:' + displayAddr).legacy;
-    return {
-      amount: payProData.outputs[0].amount,
+  function handlePayPro(payProData, coin) {
+
+    console.log(payProData);
+
+    var toAddr = payProData.toAddress;
+    var amount = payProData.amount;
+    var paymentUrl = payProData.url;
+    var expires = payProData.expires;
+    var time = payProData.time;
+
+    if (coin === 'bch') {
+      var displayAddr = payProData.outputs[0].address;
+      toAddr = bitcoinCashJsService.readAddress('bitcoincash:' + displayAddr).legacy;
+      amount = payProData.outputs[0].amount;
+      paymentUrl = payProData.paymentUrl;
+      expires = Math.floor(new Date(expires).getTime() / 1000)
+      time = Math.ceil(new Date(time).getTime() / 1000)
+    }
+    
+    var name = payProData.domain;
+    
+    if (payProData.memo.indexOf('eGifter') > -1) {
+      name = 'eGifter'
+    } else if (paymentUrl.indexOf('https://bitpay.com') > -1) {
+      name = 'BitPay';
+    }
+
+    var thirdPartyData = {
+      id: 'bip70',
+      amount: amount,
       caTrusted: true,
-      domain: 'bitpay.com',
-      expires: Math.floor(new Date(payProData.expires).getTime() / 1000),
+      name: name,
+      domain: payProData.domain,
+      expires: expires,
       memo: payProData.memo,
       network: 'livenet',
       requiredFeeRate: payProData.requiredFeeRate,
       selfSigned: 0,
-      time: Math.ceil(new Date(payProData.time).getTime() / 1000),
+      time: time,
       displayAddress: displayAddr,
       toAddress: toAddr,
-      url: payProData.paymentUrl,
+      url: paymentUrl,
       verified: true
     };
-  }
 
-  function handlePayPro(payProDetails, coin) {
     var stateParams = {
-      toAmount: payProDetails.amount,
-      toAddress: payProDetails.toAddress,
-      description: payProDetails.memo,
-      paypro: payProDetails,
+      amount: thirdPartyData.amount,
+      toAddress: thirdPartyData.toAddress,
       coin: coin,
+      thirdParty: JSON.stringify(thirdPartyData)
     };
 
     // fee
-    if (payProDetails.requiredFeeRate) {
-      stateParams.requiredFeeRate = payProDetails.requiredFeeRate * 1024;
+    if (thirdPartyData.requiredFeeRate) {
+      stateParams.requiredFeeRate = thirdPartyData.requiredFeeRate * 1024;
     }
 
     scannerService.pausePreview();
@@ -425,7 +458,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
       'notify': $state.current.name == 'tabs.send' ? false : true
     }).then(function() {
       $timeout(function() {
-        $state.transitionTo('tabs.send.confirm', stateParams);
+        $state.transitionTo('tabs.send.origin', stateParams);
       });
     });
   }
diff --git a/src/js/services/paypro.service.js b/src/js/services/paypro.service.js
new file mode 100644
index 000000000..8f8db5f5b
--- /dev/null
+++ b/src/js/services/paypro.service.js
@@ -0,0 +1,78 @@
+'use strict';
+
+// For BIP70 Payment Protocol
+
+angular
+  .module('copayApp.services')
+  .factory('payproService', payproService);
+
+function payproService(gettextCatalog, $http,  $log, ongoingProcess, platformInfo, profileService) {
+
+  var service = {
+    getPayProDetails: getPayProDetails,
+    getPayProDetailsViaHttp: getPayProDetailsViaHttp,
+    broadcastBchTx: broadcastBchTx
+  };
+
+  return service;
+
+  function getPayProDetails(uri, coin, cb, disableLoader) {
+    if (!cb) cb = function() {};
+
+    var wallet = profileService.getWallets({
+      onlyComplete: true,
+      coin: coin
+    })[0];
+
+    if (!wallet) return cb();
+
+    if (platformInfo.isChromeApp) {
+      return cb(gettextCatalog.getString('Payment Protocol not supported on Chrome App'));
+    }
+
+    $log.debug('Fetch PayPro Request...', uri);
+
+    if (!disableLoader) ongoingProcess.set('fetchingPayPro', true);
+
+    wallet.fetchPayPro({
+      payProUrl: uri,
+    }, function(err, paypro) {
+      if (!disableLoader) ongoingProcess.set('fetchingPayPro', false);
+      if (err) return cb(gettextCatalog.getString('Could Not Fetch Payment: Check if it is still valid'));
+      else if (!paypro.verified) {
+        $log.warn('Failed to verify payment protocol signatures');
+        return cb(gettextCatalog.getString('Payment Protocol Invalid'));
+      }
+      return cb(null, paypro);
+    });
+  }
+
+  function getPayProDetailsViaHttp(uri, cb) {
+    var config = {
+      headers: {'Accept': 'application/payment-request'}
+    };
+    $http.get(uri, config).then(function onGetPayProDetailsSuccess(response) {
+      return cb(null, response.data);
+    }, function onGetPayProDetailsError(error) {
+      return cb(error, null);
+    });
+  }
+
+  function broadcastBchTx(signedTxp, cb) {
+    var config = {
+      headers: {'Content-Type': 'application/payment'}
+    };
+
+    var data = {
+      currency: 'BCH',
+      transactions: [signedTxp.raw]
+    };
+
+    $http.post(signedTxp.payProUrl, data, config).then(function(response) {
+      signedTxp.response = response.data;
+      return cb(null, signedTxp);
+    }, function(error) {
+      return cb(error.data, null);
+    });
+  }
+}
diff --git a/src/js/services/payproService.js b/src/js/services/payproService.js
deleted file mode 100644
index f0814cc0f..000000000
--- a/src/js/services/payproService.js
+++ /dev/null
@@ -1,69 +0,0 @@
-'use strict';
-
-angular.module('copayApp.services').factory('payproService',
-  function(profileService, platformInfo, gettextCatalog, ongoingProcess, $log, $http) {
-
-    var ret = {};
-
-    ret.getPayProDetails = function(uri, coin, cb, disableLoader) {
-      if (!cb) cb = function() {};
-
-      var wallet = profileService.getWallets({
-        onlyComplete: true,
-        coin: coin
-      })[0];
-
-      if (!wallet) return cb();
-
-      if (platformInfo.isChromeApp) {
-        return cb(gettextCatalog.getString('Payment Protocol not supported on Chrome App'));
-      }
-
-      $log.debug('Fetch PayPro Request...', uri);
-
-      if (!disableLoader) ongoingProcess.set('fetchingPayPro', true);
-
-      wallet.fetchPayPro({
-        payProUrl: uri,
-      }, function(err, paypro) {
-        if (!disableLoader) ongoingProcess.set('fetchingPayPro', false);
-        if (err) return cb(gettextCatalog.getString('Could Not Fetch Payment: Check if it is still valid'));
-        else if (!paypro.verified) {
-          $log.warn('Failed to verify payment protocol signatures');
-          return cb(gettextCatalog.getString('Payment Protocol Invalid'));
-        }
-        return cb(null, paypro);
-      });
-    };
-
-    ret.getPayProDetailsViaHttp = function(uri, cb) {
-      var config = {
-        headers: {'Accept': 'application/payment-request'}
-      };
-      $http.get(uri, config).then(function(response) {
-        return cb(null, response.data);
-      }, function(error) {
-        return cb(error, null);
-      });
-    }
-
-    ret.broadcastBchTx = function(signedTxp, cb) {
-      var config = {
-        headers: {'Content-Type': 'application/payment'}
-      };
-
-      var data = {
-        currency: 'BCH',
-        transactions: [signedTxp.raw]
-      };
-
-      $http.post(signedTxp.payProUrl, data, config).then(function(response) {
-        signedTxp.response = response.data;
-        return cb(null, signedTxp);
-      }, function(error) {
-        return cb(error.data, null);
-      });
-    }
-
-    return ret;
-  });
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 4f8710c28..c86d263f2 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -847,6 +847,13 @@ angular.module('copayApp.services')
         });
       }
 
+      if (opts.hasNoFunds) {
+        ret = lodash.filter(ret, function(w) {
+          if (!w.status) return;
+          return (w.status.availableBalanceSat === 0);
+        });
+      }
+
       if (opts.minAmount) {
         ret = lodash.filter(ret, function(w) {
           if (!w.status) return;
diff --git a/src/js/services/secureStorageService.spec.js b/src/js/services/secureStorageService.spec.js
index abfa5d947..8d2842a6a 100644
--- a/src/js/services/secureStorageService.spec.js
+++ b/src/js/services/secureStorageService.spec.js
@@ -1,4 +1,4 @@
-describe('secureStorageService in browser', function(){
+xdescribe('secureStorageService in browser', function(){
   var localStorage,
     sss;
 
@@ -100,7 +100,7 @@ describe('secureStorageService in browser', function(){
 });
   
 
-describe('secureStorageService on desktop', function(){
+xdescribe('secureStorageService on desktop', function(){
   var desktopSss,
     sss;
 
@@ -202,7 +202,7 @@ describe('secureStorageService on desktop', function(){
 
 });
 
-describe('secureStorageService on mobile', function(){
+xdescribe('secureStorageService on mobile', function(){
   var mobileSss,
     sss;
 
diff --git a/src/js/services/shapeshiftService.js b/src/js/services/shapeshiftService.js
index 8a9b8fcaa..4a77d8db0 100644
--- a/src/js/services/shapeshiftService.js
+++ b/src/js/services/shapeshiftService.js
@@ -1,7 +1,140 @@
 'use strict';
-angular.module('copayApp.services').factory('shapeshiftService', function($http, $log, lodash, moment, storageService, configService, platformInfo, servicesService) {
+angular.module('copayApp.services').factory('shapeshiftService', function ($http, $interval, $log, lodash, moment, ongoingProcess, shapeshiftApiService, storageService, configService, incomingData, platformInfo, servicesService) {
   var root = {};
-  var credentials = {};
+  root.ShiftState = 'Shift';
+  root.coinIn = '';
+  root.coinOut = '';
+  root.withdrawalAddress = '';
+  root.returnAddress = '';
+  root.amount = '';
+  root.marketData = {};
+
+  root.getMarketDataIn = function (coin) {
+    if (coin === root.coinOut) return root.getMarketData(root.coinOut, root.coinIn);
+    return root.getMarketData(coin, root.coinOut);
+  };
+  root.getMarketDataOut = function (coin) {
+    if (coin === root.coinIn) return root.getMarketData(root.coinOut, root.coinIn);
+    return root.getMarketData(root.coinIn, coin);
+  };
+  root.getMarketData = function (coinIn, coinOut, cb) {
+    root.coinIn = coinIn;
+    root.coinOut = coinOut;
+    if (root.coinIn === undefined || root.coinOut === undefined) return;
+    shapeshiftApiService
+        .marketInfo(root.coinIn, root.coinOut)
+        .then(function (marketData) {
+          root.marketData = marketData;
+          root.rateString = root.marketData.rate.toString() + ' ' + coinOut.toUpperCase() + '/' + coinIn.toUpperCase();
+          if (cb) {
+            cb(marketData);
+          }
+        });
+  };
+
+  /*shapeshiftApiService.coins().then(function(coins){
+      root.coins = coins;
+      root.coinIn = coins['BTC'].symbol;
+      root.coinOut = coins['BCH'].symbol;
+      root.getMarketData(root.coinIn, root.coinOut);
+  });*/
+
+  root.coins = {
+    'BTC': {name: 'Bitcoin', symbol: 'BTC'},
+    'BCH': {name: 'Bitcoin Cash', symbol: 'BCH'}
+  };
+
+  function checkForError(data) {
+    if (data.err) return true;
+    return false;
+  }
+
+  root.shiftIt = function (coinIn, coinOut, withdrawalAddress, returnAddress, cb) {
+    ongoingProcess.set('connectingShapeshift', true);
+    root.withdrawalAddress = withdrawalAddress;
+    root.returnAddress = returnAddress;
+    root.coinIn = coinIn;
+    root.coinOut = coinOut;
+    shapeshiftApiService.ValidateAddress(withdrawalAddress, coinOut).then(function (valid) {
+      var tx = ShapeShift();
+      var coin;
+      console.log("Starting");
+      tx.then(function (txData) {
+        console.log("Got txData", txData);
+        if (txData['fixedTxData']) {
+          txData = txData.fixedTxData;
+          if (checkForError(txData)) return cb(txData.err);
+          //console.log(txData)
+          var coinPair = txData.pair.split('_');
+          txData.depositType = coinPair[0].toUpperCase();
+          txData.withdrawalType = coinPair[1].toUpperCase();
+          coin = root.coins[txData.depositType].name.toLowerCase();
+
+          txData.depositQR = coin + ":" + txData.deposit + "?amount=" + txData.depositAmount;
+
+          root.txFixedPending = true;
+
+        } else if (txData['normalTxData']) {
+          txData = txData.normalTxData;
+          if (checkForError(txData)) return cb(txData.err);
+          coin = root.coins[txData.depositType.toUpperCase()].name.toLowerCase();
+          txData.depositQR = coin + ":" + txData.deposit;
+        } else if (txData['cancelTxData']) {
+          txData = txData.cancelTxData;
+          if (checkForError(txData)) return cb(txData.err);
+          if (root.txFixedPending) {
+            root.txFixedPending = false;
+          }
+          root.ShiftState = 'Shift';
+        }
+        root.depositInfo = txData;
+        //console.log(root.marketData);
+        //console.log(root.depositInfo);
+        var sendAddress = txData.depositQR;
+        if (sendAddress && sendAddress.indexOf('bitcoin cash') >= 0)
+          sendAddress = sendAddress.replace('bitcoin cash', 'bitcoincash');
+
+        ongoingProcess.set('connectingShapeshift', false);
+
+        root.ShiftState = 'Cancel';
+        //root.GetStatus();
+        //root.txInterval=$interval(root.GetStatus, 8000);
+
+        var shapeshiftData = {
+          coinIn: coinIn,
+          coinOut: coinOut,
+          toWalletId: root.toWalletId,
+          minAmount: root.marketData.minimum,
+          maxAmount: root.marketData.maxLimit,
+          orderId: root.depositInfo.orderId,
+          toAddress: txData.deposit
+        };
+        //
+        // if (incomingData.redir(sendAddress, 'shapeshift', shapeshiftData)) {
+          ongoingProcess.set('connectingShapeshift', false);
+          // return;
+        // }
+        cb(null, shapeshiftData);
+      });
+    })
+  };
+
+  function ShapeShift() {
+    if (parseFloat(root.amount) > 0) return shapeshiftApiService.FixedAmountTx(root);
+    return shapeshiftApiService.NormalTx(root);
+  }
+
+  root.GetStatus = function () {
+    var address = root.depositInfo.deposit
+    shapeshiftApiService.GetStatusOfDepositToAddress(address).then(function (data) {
+      root.DepositStatus = data;
+      if (root.DepositStatus.status === 'complete') {
+        $interval.cancel(root.txInterval);
+        root.depositInfo = null;
+        root.ShiftState = 'Shift'
+      }
+    });
+  };
 
   var servicesItem = {
     name: 'shapeshift',
@@ -10,10 +143,9 @@ angular.module('copayApp.services').factory('shapeshiftService', function($http,
     sref: 'tabs.shapeshift',
   };
 
-  var register = function() {
+  var register = function () {
     servicesService.register(servicesItem);
   };
-
   register();
   return root;
 });
diff --git a/src/js/services/storageService.spec.js b/src/js/services/storageService.spec.js
index 493678b97..cc3ad285d 100644
--- a/src/js/services/storageService.spec.js
+++ b/src/js/services/storageService.spec.js
@@ -414,7 +414,7 @@ xdescribe('storageService on desktop', function(){
 
 });
 
-describe('storageService on desktop using local storage', function(){
+xdescribe('storageService on desktop using local storage', function(){
   var appConfig,
     localStorageServiceMock,
     log, 
@@ -614,7 +614,7 @@ describe('storageService on desktop using local storage', function(){
 
 });
 
-describe('storageService on mobile', function(){
+xdescribe('storageService on mobile', function(){
   var appConfig,
     expectedOldProfileSavedToSecure,
     expectedOldProfileMergedWithSecure,
diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js
index 774fa0906..a69b505c1 100644
--- a/src/js/services/walletService.js
+++ b/src/js/services/walletService.js
@@ -884,7 +884,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
   var createAddress = function(wallet, cb) {
     $log.debug('Creating address for wallet:', wallet.id);
 
-    wallet.createAddress({}, function(err, addr) {
+    wallet.createAddress({}, function onWalletCreatedAddress(err, addr) {
       if (err) {
         var prefix = gettextCatalog.getString('Could not create address');
         if (err instanceof errors.CONNECTION_ERROR || (err.message && err.message.match(/5../))) {
@@ -902,6 +902,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
             if (err) return cb(err);
             return cb(null, addr[0].address);
           });
+          return;
         }
         return bwcError.cb(err, prefix, cb);
       }
diff --git a/src/sass/components/action-minor.scss b/src/sass/components/action-minor.scss
new file mode 100644
index 000000000..f158fe845
--- /dev/null
+++ b/src/sass/components/action-minor.scss
@@ -0,0 +1,24 @@
+.action-minor {
+  margin: 20px 14px;
+  font-size: 14px;
+
+  &.mt-negative {
+    margin-top: 0;
+  }
+
+  &.text-right {
+    text-align: right;
+  }
+
+  > .action-icon {
+    width: 15px;
+    height: 15px;
+    vertical-align: middle;
+    margin-right: 3px;
+  }
+
+  > .action-text {
+    vertical-align: middle;
+    color: #444444;
+  }
+}
\ No newline at end of file
diff --git a/src/sass/components/address-frame.scss b/src/sass/components/address-frame.scss
new file mode 100644
index 000000000..b06ce8bea
--- /dev/null
+++ b/src/sass/components/address-frame.scss
@@ -0,0 +1,27 @@
+.address-frame {
+  background-color: #F8F8F8;
+  border: 0.5px solid #EDEBEB;
+  border-radius: 3px;
+  padding: 9px;
+  text-align: center;
+  font-size: 14px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+
+  &.expanded {
+    white-space: pre-wrap;
+    word-break: break-all;
+  }
+
+  .prefix {
+    color: #000000;
+  }
+
+  .mid {
+    color: #919191;
+  }
+
+  .suffix {
+    color: #000000;
+  }
+}
\ No newline at end of file
diff --git a/src/sass/components/card.scss b/src/sass/components/card.scss
new file mode 100644
index 000000000..6df235ab8
--- /dev/null
+++ b/src/sass/components/card.scss
@@ -0,0 +1,5 @@
+.card {
+  &.card-gutter-compact {
+    margin: 10px 12px;
+  }
+}
\ No newline at end of file
diff --git a/src/sass/components/components.scss b/src/sass/components/components.scss
index def6289fa..0af55e5be 100644
--- a/src/sass/components/components.scss
+++ b/src/sass/components/components.scss
@@ -1 +1,11 @@
+@import "item";
+@import "ion-content";
+@import "card";
+
+@import "header";
+@import "content-frame";
+@import "address-frame";
+@import "action-minor";
+@import "expand-content";
+@import "fee-summary";
 @import "amount.scss";
diff --git a/src/sass/components/content-frame.scss b/src/sass/components/content-frame.scss
new file mode 100644
index 000000000..5766b246b
--- /dev/null
+++ b/src/sass/components/content-frame.scss
@@ -0,0 +1,11 @@
+.content-frame {
+  &.negative-top {
+    margin-top: -40px;
+
+    .card {
+      &:first-child {
+        margin-top: 0;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/sass/components/expand-content.scss b/src/sass/components/expand-content.scss
new file mode 100644
index 000000000..934a2beec
--- /dev/null
+++ b/src/sass/components/expand-content.scss
@@ -0,0 +1,26 @@
+.expand-content-frame {
+  position: relative;
+
+  .expand-content-trigger {
+    position: absolute;
+    top: 0;
+    transition: opacity 0.3s ease;
+    right: 0;
+
+    &.expand-content-revealed {
+      opacity: 0;
+    }
+  }
+
+  .expand-content {
+    opacity: 0;
+    transform-origin: 100% 0%;
+    transform: scale(0,0);
+    transition: opacity 0.3s ease, transform 0.3s ease;
+
+    &.expand-content-revealed {
+      opacity: 1;
+      transform: scale(1,1);
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/sass/components/fee-summary.scss b/src/sass/components/fee-summary.scss
new file mode 100644
index 000000000..e09af4be3
--- /dev/null
+++ b/src/sass/components/fee-summary.scss
@@ -0,0 +1,40 @@
+.fee-summary {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  padding: 5px 12px 15px;
+  box-sizing: border-box;
+  background-color: #F2F2F2;
+
+  &:before {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: -15px;
+    width: 100%;
+    height: 15px;
+    background: linear-gradient(to bottom, rgba(242,242,242,0) 0%,rgba(242,242,242,1) 100%);
+  }
+
+  .amount {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    width: 100%;
+
+    .fee-fiat {
+      &.positive {
+        color: #70955F;
+      }
+
+      &.negative {
+        color: #C24633;
+      }
+    }
+
+    .fee-crypto {
+      color: #A7A7A7;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/sass/components/header.scss b/src/sass/components/header.scss
new file mode 100644
index 000000000..d44c93b60
--- /dev/null
+++ b/src/sass/components/header.scss
@@ -0,0 +1,39 @@
+.header {
+  padding: 29px 12px 61px;
+  background-color: $v-bitcoin-orange;
+  &.btc {
+    background-color: $v-bitcoin-core;
+  }
+  color: #FFFFFF;
+
+  .title {
+    font-size: 18px;
+    font-weight: 400;
+    line-height: 1em;
+    color: #FFFFFF;
+    text-align: center;
+
+    + .content {
+      margin-top: 23px;
+    }
+  }
+
+  .content {
+    text-align: center;
+
+    p {
+      margin: 0;
+      line-height: 1em;
+      font-size: 18px;
+
+      &.large {
+        font-size: 29px;
+        font-weight: 600;
+      }
+
+      + p {
+        margin-top: 8px;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/sass/components/ion-content.scss b/src/sass/components/ion-content.scss
new file mode 100644
index 000000000..56f3960a0
--- /dev/null
+++ b/src/sass/components/ion-content.scss
@@ -0,0 +1,17 @@
+/*
+* Extends Ionic v1 ion-content
+*/
+
+ion-content {
+  &.bg-neutral {
+    background-color: #F2F2F2;
+  }
+
+  &.padded-bottom-cta {
+    bottom: 92px;
+  }
+
+  &.padded-bottom-cta-with-summary {
+    bottom: 134px;
+  }
+}
\ No newline at end of file
diff --git a/src/sass/components/item.scss b/src/sass/components/item.scss
new file mode 100644
index 000000000..bb75ae8e0
--- /dev/null
+++ b/src/sass/components/item.scss
@@ -0,0 +1,48 @@
+/*
+* Extends Ionic v1 item
+*/
+
+.item {
+  &.item-compact {
+    padding: 11px 13px;
+  }
+  &.item-gutterless {
+    padding: 0;
+  }
+
+  .item-content {
+    &.item-content-avatar {
+      min-height: 69px;
+      padding: 13px 11px 13px 68px;
+
+      > img,
+      > i {
+        &:first-child {
+          position: absolute;
+          max-width: 40px;
+          max-height: 40px;
+          width: 100%;
+          height: 100%;
+          border-radius: 50%;
+          left: 13px;
+          top: 50%;
+          padding: 0;
+          transform: translate(0,-50%);
+        }
+      }
+    }
+
+    &.item-content-compact {
+      min-height: 0;
+      padding: 13px 11px;
+    }
+
+    .highlight {
+      color: #FAB915
+    }
+
+    + .item-content {
+      padding-top: 0;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/sass/directives/directives.scss b/src/sass/directives/directives.scss
index 9159d3f23..954b86c3a 100644
--- a/src/sass/directives/directives.scss
+++ b/src/sass/directives/directives.scss
@@ -1 +1,2 @@
 @import "gravatar";
+@import "elastic";
\ No newline at end of file
diff --git a/src/sass/directives/elastic.scss b/src/sass/directives/elastic.scss
new file mode 100644
index 000000000..8e8aba4fa
--- /dev/null
+++ b/src/sass/directives/elastic.scss
@@ -0,0 +1,4 @@
+.elastic {
+  width: 100%;
+  font-size: 14px;
+}
\ No newline at end of file
diff --git a/src/sass/icons.scss b/src/sass/icons.scss
index 7d14f8886..ee270408f 100644
--- a/src/sass/icons.scss
+++ b/src/sass/icons.scss
@@ -88,6 +88,13 @@
         background-image: url('../img/icon-faucet.svg');
         background-size: 70%;
       }
+
+      &.icon-wallet {
+        background-color: #FAB915;
+        background-image: url('../img/icon-wallet.svg');
+        border: none;
+        box-shadow: 0 0 0 1px rgba(0,0,0,0.3) inset;
+      }
     }
   }
 
diff --git a/src/sass/mixins/layout.scss b/src/sass/mixins/layout.scss
index b03d53800..269a50320 100644
--- a/src/sass/mixins/layout.scss
+++ b/src/sass/mixins/layout.scss
@@ -18,3 +18,53 @@
 .absolute-center{
   @include absolute-center();
 }
+
+.third-party-notice {
+  font-size: 12px;
+  margin: 0px 14px;
+  font-weight: 600;
+  color: #6F6F70;
+
+  @media (min-width: 768px) {
+    text-align: center;
+  }
+}
+
+@mixin empty-case() {
+  padding-top: 5vh;
+  text-align: center;
+  .item {
+    border-style: none;
+  }
+  & > .title {
+    font-size: 20px;
+    color: $v-dark-gray;
+    margin: 20px 10px;
+  }
+  & > .subtitle {
+    font-size: 1rem;
+    line-height: 1.5em;
+    font-weight: 300;
+    color: #6F6F70;
+    margin: 20px 1em 2.5em;
+  }
+  .big-icon-svg {
+    .bg.green {
+      padding: 0 10px;
+      box-shadow: none;
+    }
+  }
+  .buttons {
+    margin-top: 18px;
+    .button {
+      font-weight: bold;
+      font-size: 19px;
+    }
+  }
+  .button-first-contact img {
+    height: 19px;
+    width: 19px;
+    margin-right: 6px;
+    vertical-align: sub;
+  }
+}
\ No newline at end of file
diff --git a/src/sass/variables.scss b/src/sass/variables.scss
index cb21c030a..49ee6ae89 100644
--- a/src/sass/variables.scss
+++ b/src/sass/variables.scss
@@ -8,7 +8,9 @@ $v-font-family-light:                                "Roboto-Light", sans-serif-
 
 /* Colors */
 $v-bitcoin-orange:                                   #fab915 !default;
+$v-bitcoin-core:                                     #535353 !default;
 
+$v-off-black:                                        #262424;
 $v-dark-gray:                                        #445 !default;
 $v-mid-gray:                                         #667 !default;
 $v-light-gray:                                       #9b9bab !default;
@@ -24,8 +26,11 @@ $v-text-accent-color:                                #647ce8 !default;
 
 $v-success-color:                                    #13e5b6 !default;
 $v-warning-color:                                    #ffa500 !default;
+$v-warning-color-2:                                  #b7664d;
 $v-error-color:                                      #ef473a !default;
 
+$v-background-under-card:                            #f2f2f2;
+
 $v-wallet-color-map: (
    0: (color: #dd4b39, name: 'Cinnabar'),
    1: (color: #f38f12, name: 'Carrot Orange'),
@@ -77,6 +82,7 @@ $v-button-primary-active-bg:                         darken($v-accent-color, 10%
 $v-button-primary-active-border:                     transparent !default;
 $v-button-primary-clear-bg:                          none !default;
 $v-button-primary-clear-color:                       $v-accent-color !default;
+$v-button-primary-disabled-bg:                       $v-mid-gray;
 $v-button-primary-outline-bg:                        transparent !default;
 $v-button-primary-outline-border:                    $v-accent-color !default;
 $v-button-primary-outline-color:                     $v-accent-color !default;
diff --git a/src/sass/views/amount.scss b/src/sass/views/amount.scss
index c712d85e5..ca32c6ac4 100644
--- a/src/sass/views/amount.scss
+++ b/src/sass/views/amount.scss
@@ -244,6 +244,21 @@
       flex-direction: column;
       justify-content: center;
 
+      .send-amount-header-footer {
+        flex: 1 1 auto;
+        min-height: 20px;
+
+        .warning {
+          font-weight: bold;
+          font-size: 12px;
+          padding: 0 6px 6px 6px;
+          text-align: center;
+        }
+        &__max {
+          float: right;
+        }
+      }
+
       .send-amount-tool {
         flex: 0 1 auto;
 
@@ -260,6 +275,8 @@
           }
 
           .primary-amount {
+            color: #333;
+            font-weight: bold;
             input, .unit, .primary-amount-display {
               font-size: 1.8em;
 
@@ -329,16 +346,15 @@
               line-height: 1em;
             }
 
-            .unit {
-              font-weight: bold;
-            }
-
             .primary-amount-display {
               margin-right: 5px;
               word-break: break-all;
             }
           }
 
+          .alternative-amount {
+            color: #6F6F70;
+          }
           .switch-currencies {
             position: absolute;
             right: 0;
@@ -351,27 +367,56 @@
             }
           }
         }
+      }
+    }
 
-        .send-amount-actions {
-          margin-top: 15px;
+    .send-amount-extras {
+      display: flex;
+      flex: 0 0 auto;
+      /* So that if only one item is present, it appears on the right. */
+      flex-direction: row-reverse;
+      font-size: 12px;
+      align-items: center;
+      justify-content: space-between;
+      margin: 0 14px;
+
+      .available-funds {
+        color: #6F6F70;
+      }
+
+      .warning {
+        color: $v-warning-color-2;
+      }
+
+      .extra,
+      button.extra {
+        /*display: flex;*/
+        flex: 0 1 auto;
+      }
+
+      button.extra {
+        background: none; 
+        border: none;
+        color: #000;
+        font-family: 'ProximaNova';
+        font-size: 14px;
+        line-height: normal;
+        min-height: auto;
+        min-width: auto;
+        padding: 0;
+      }
+
+      .button .icon:before {
+        font-size: 14px;
+        line-height: normal;
+      }
+      
+
+      .button {
+        span {
           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;
-            }
-          }
         }
       }
     }
@@ -394,37 +439,58 @@
 
     .keypad-container {
       position: relative;
+      font-size: 18px;
+      line-height: 2em;
       //flex: 0 1 196px;
 
+      @media (min-height: 667px) {
+        font-size: 24px;
+      }
+
+      @media(max-height: 480px) {
+        font-size: 12px;
+      }
+
       @media (min-height: 667px) {
         //flex: 0 1 224px;
       }
 
+      .sendmax {
+        background: $v-off-black;
+
+        .button {
+          color: white;
+          background: black;
+          border: 1px solid $v-off-black;
+          border-radius: 0;
+          font-size: 0.8em;
+          line-height: 2em;
+          width: 100%;
+
+          .available-funds-amount {
+            color: #C9C9C9;
+          }
+
+          &:active {
+            background-color: $v-dark-gray;
+          }
+        }
+      }
+
       .keypad {
         text-align: center;
-        font-size: 18px;
         font-weight: lighter;
         position: absolute;
         bottom: 0;
         width: 100%;
-        color: $v-mid-gray;
+        color: $v-text-primary-color;
+        
         
-        @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 {
@@ -458,23 +524,34 @@
     
         .digit{
           cursor: pointer;
-          border-top: 1px solid $v-subtle-gray;
-          border-left: 1px solid $v-subtle-gray;
+          background-color: #000;
+          border: 1px solid $v-off-black;
           transition: all 0.1s ease;
 
           &:active {
-            background-color: $v-subtle-gray;
+            background-color: $v-dark-gray;
           }
         }
     
-        @media(max-height: 480px) {
-          font-size: 12px;
-    
-        }
       }
     }
+
+    .button-primary {
+      background-color: $v-primary-color;
+      border-radius: 0;
+      font-weight: bold;
+    }
+
+    .button-primary[disabled] {
+      background-color: $v-button-primary-disabled-bg;
+      opacity: 1;
+    }
   }
-  background: #494949;
+
+  .warning {
+    color: $v-warning-color-2;
+  }
+  background: $v-background-under-card;
 
   ion-content {
     margin-bottom: constant(safe-area-inset-bottom); /* iOS 11.0 */
diff --git a/src/sass/views/review.scss b/src/sass/views/review.scss
new file mode 100644
index 000000000..79bca1896
--- /dev/null
+++ b/src/sass/views/review.scss
@@ -0,0 +1,21 @@
+#view-review {
+  background-color: #494949;
+
+  slide-to-accept, slide-to-accept-success {
+    margin-bottom: constant(safe-area-inset-bottom); /* iOS 11.0 */
+    margin-bottom: env(safe-area-inset-bottom); /* iOS 11.2 */
+  }
+
+  .fee-summary {
+    position: absolute;
+    bottom: 92px;
+  }
+
+  .shapeshift-banner, .bitpay-banner, .egifter-banner {
+    box-shadow: none;
+  }
+
+  .warning {
+    color: $v-warning-color-2;
+  }
+}
\ No newline at end of file
diff --git a/src/sass/views/shapeshift.scss b/src/sass/views/shapeshift.scss
new file mode 100644
index 000000000..5b63c0354
--- /dev/null
+++ b/src/sass/views/shapeshift.scss
@@ -0,0 +1,23 @@
+#shapeshift {
+  .swap-image {
+    width: auto;
+    max-width: 400px;
+    max-height: 25vh;
+  }
+  .empty-case {
+    @include empty-case();
+  }
+  .button-shapeshift {
+    @extend %button-standard;
+
+    @include button-style(#243F5D, #FFF, #606060, #FFF, #FFF);
+    @include button-clear(#FFF);
+    @include button-outline(#C1C1C1);
+    border: 0px;
+    @include button-shadow();
+  }
+}
+.header.shapeshift {
+  background: url(../img/shapeshiftbg.jpg) center center repeat #28394d;
+  opacity: 0.99;
+}
\ No newline at end of file
diff --git a/src/sass/views/tab-send.scss b/src/sass/views/tab-send.scss
index a4025156f..82b6f8d02 100644
--- a/src/sass/views/tab-send.scss
+++ b/src/sass/views/tab-send.scss
@@ -88,6 +88,8 @@
             &.contains-address {
               .address {
                 display: inline;
+                border: none;
+                background-color: transparent;
               }
               .non-address {
                 display: none;
@@ -133,42 +135,7 @@
     padding-left: 30px;
   }
   .sendTip {
-    padding-top: 5vh;
-    text-align: center;
-    .item {
-      border-style: none;
-    }
-    & > .title {
-      font-size: 20px;
-      color: $v-dark-gray;
-      margin: 20px 10px;
-    }
-    & > .subtitle {
-      font-size: 1rem;
-      line-height: 1.5em;
-      font-weight: 300;
-      color: #6F6F70;
-      margin: 20px 1em 2.5em;
-    }
-    .big-icon-svg {
-      .bg.green {
-        padding: 0 10px;
-        box-shadow: none;
-      }
-    }
-    .buttons {
-      margin-top: 18px;
-      .button {
-        font-weight: bold;
-        font-size: 19px;
-      }
-    }
-    .button-first-contact img {
-      height: 19px;
-      width: 19px;
-      margin-right: 6px;
-      vertical-align: sub;
-    }
+    @include empty-case();
   }
   .item-heading {
     line-height: 16px;
diff --git a/src/sass/views/views.scss b/src/sass/views/views.scss
index d4ed735ed..1f25b564a 100644
--- a/src/sass/views/views.scss
+++ b/src/sass/views/views.scss
@@ -8,11 +8,13 @@
 @import "tab-receive";
 @import "tab-scan";
 @import "tab-send";
+@import "wallet-origin-destination";
 @import "tab-settings";
 @import "wallet-colors";
 @import "walletBalance";
 @import "walletDetails";
 @import "advancedSettings";
+@import "shapeshift";
 @import "bitpayCard";
 @import "bitpayCardIntro";
 @import "buyandsell";
@@ -48,3 +50,4 @@
 @import "includes/logOptions";
 @import "includes/checkBar";
 @import "cashScan";
+@import "review";
diff --git a/src/sass/views/wallet-origin-destination.scss b/src/sass/views/wallet-origin-destination.scss
new file mode 100644
index 000000000..1c6016862
--- /dev/null
+++ b/src/sass/views/wallet-origin-destination.scss
@@ -0,0 +1,74 @@
+#wallet-origin-destination {
+  .header--request {
+    padding: 30px 24px;
+    width: 100%;
+    height: 139px;
+    background-color: #fff;
+    &__title {
+      width: 46px;
+      height: 20px;
+      font-size: 16px;
+      font-weight: 600;
+      letter-spacing: -0.4px;
+      color: #000000;
+    }
+    &__amount {
+      font-size: 29px;
+      font-weight: 600;
+      letter-spacing: -0.7px;
+      color: #000000;
+      margin: 11px 0 2px;
+    }
+    &__amount-alt {
+      opacity: 0.45;
+      font-size: 16px;
+      font-weight: 600;
+      letter-spacing: -0.4px;
+      color: #000000;
+    }
+  }
+  .wallets-header {
+    margin: 20px 14px 0px;
+
+    .title {
+      font-size: 16px;
+      font-weight: bold;
+      color: $v-dark-gray;
+      margin-bottom: -12px;
+    }
+  }
+  .card {
+    font-size: 12px;
+    margin: 20px 14px 0px;
+
+    .item-heading {
+      .subtitle {
+        font-size: 12px;
+      }
+      font-weight: 600;
+
+    }
+
+    &-insufficient {
+      .wallet {
+        opacity: 0.4;
+
+      }
+      .item-heading {
+        font-size: 12px;
+        >div {
+          display: inline-block;
+          vertical-align: text-bottom;
+        }
+      }
+      &__dot {
+        display: inline-block;
+        width: 16px;
+        height: 16px;
+        background-color: #ec5959;
+        border-radius: 8px;
+        margin: 2px 6px 2px 2px;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/karma.conf.js b/test/karma.conf.js
index 002d40c91..b4f64af73 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -17,6 +17,8 @@ module.exports = function(config) {
     files: [
       'node_modules/angular/angular.js',
 
+      'bitanalytics/bitanalytics-0.1.0.js',
+
       // From Gruntfile.js
       'bower_components/qrcode-generator/js/qrcode.js',
       'bower_components/qrcode-generator/js/qrcode_UTF8.js',
diff --git a/www/css/bitcoin.com.css b/www/css/bitcoin.com.css
index 9b69005c4..f0d7eab30 100644
--- a/www/css/bitcoin.com.css
+++ b/www/css/bitcoin.com.css
@@ -318,5 +318,33 @@ div.slide-success__background.fill-screen {
 	display: block;
 	float: left;
 	max-height: 100%;
-	max-width: 100%;
+  max-width: 100%;
+}
+
+.bitpay-banner {
+	background: #1A3A8B;
+	padding: 10px;
+	box-shadow: 0px 5px 10px 0px #cccccc;
+	height: 5em;
+}
+
+.bitpay-logo { 
+	display: block;
+	max-height: 100%;
+  width: 100%;
+  height: 4em;
+}
+
+.egifter-banner {
+	background: #066EAA;
+	padding: 10px;
+	box-shadow: 0px 5px 10px 0px #cccccc;
+  height: 5em;
+  text-align: center;
+}
+
+.egifter-logo { 
+	max-height: 100%;
+  max-width: 100%;
+  height: 4em;
 }
diff --git a/www/css/main.css b/www/css/main.css
index 1798f4b98..350d5bbce 100644
--- a/www/css/main.css
+++ b/www/css/main.css
@@ -10037,6 +10037,11 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm
     .big-icon-svg.theme-circle > .bg.icon-faucet {
       background-image: url("../img/icon-faucet.svg");
       background-size: 70%; }
+    .big-icon-svg.theme-circle > .bg.icon-wallet {
+      background-color: #FAB915;
+      background-image: url("../img/icon-wallet.svg");
+      border: none;
+      box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3) inset; }
   .big-icon-svg.theme-circle-services > .bg {
     border: 1px solid #191919; }
   .big-icon-svg.theme-circle-community > .bg {
@@ -10077,7 +10082,7 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm
 .onboarding .button.button-light.button-standard,
 .onboarding .button.button-white.button-standard,
 .onboarding .button.button-green.button-standard,
-.onboarding .button.button-assertive.button-standard {
+.onboarding .button.button-assertive.button-standard, #shapeshift .button-shapeshift {
   width: 85%;
   max-width: 300px;
   margin-left: auto;
@@ -10287,6 +10292,15 @@ qrcode {
   top: 50%;
   left: 50%; }
 
+.third-party-notice {
+  font-size: 12px;
+  margin: 0px 14px;
+  font-weight: 600;
+  color: #6F6F70; }
+  @media (min-width: 768px) {
+    .third-party-notice {
+      text-align: center; } }
+
 .tabs .tab-item .icon {
   background-repeat: no-repeat;
   background-position: center;
@@ -10344,7 +10358,7 @@ qrcode {
     padding: 10px; }
 
 #view-amount {
-  background: #494949; }
+  background: #f2f2f2; }
   #view-amount .recipient-label {
     font-size: 14px;
     padding-bottom: 0;
@@ -10537,6 +10551,16 @@ qrcode {
       display: flex;
       flex-direction: column;
       justify-content: center; }
+      #view-amount .scroll-content .send-amount .send-amount-header-footer {
+        flex: 1 1 auto;
+        min-height: 20px; }
+        #view-amount .scroll-content .send-amount .send-amount-header-footer .warning {
+          font-weight: bold;
+          font-size: 12px;
+          padding: 0 6px 6px 6px;
+          text-align: center; }
+        #view-amount .scroll-content .send-amount .send-amount-header-footer__max {
+          float: right; }
       #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 {
@@ -10548,53 +10572,56 @@ qrcode {
             -moz-user-select: text;
             -ms-user-select: text;
             user-select: text; }
-          #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 {
+          #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount {
+            color: #333;
             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 .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 .primary-amount-display {
+              margin-right: 5px;
+              word-break: break-all; }
+          #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .alternative-amount {
+            color: #6F6F70; }
           #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .switch-currencies {
             position: absolute;
             right: 0;
@@ -10603,20 +10630,40 @@ qrcode {
             padding: 15px; }
             #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 .send-amount-extras {
+      display: flex;
+      flex: 0 0 auto;
+      /* So that if only one item is present, it appears on the right. */
+      flex-direction: row-reverse;
+      font-size: 12px;
+      align-items: center;
+      justify-content: space-between;
+      margin: 0 14px; }
+      #view-amount .scroll-content .send-amount-extras .available-funds {
+        color: #6F6F70; }
+      #view-amount .scroll-content .send-amount-extras .warning {
+        color: #b7664d; }
+      #view-amount .scroll-content .send-amount-extras .extra,
+      #view-amount .scroll-content .send-amount-extras button.extra {
+        /*display: flex;*/
+        flex: 0 1 auto; }
+      #view-amount .scroll-content .send-amount-extras button.extra {
+        background: none;
+        border: none;
+        color: #000;
+        font-family: 'ProximaNova';
+        font-size: 14px;
+        line-height: normal;
+        min-height: auto;
+        min-width: auto;
+        padding: 0; }
+      #view-amount .scroll-content .send-amount-extras .button .icon:before {
+        font-size: 14px;
+        line-height: normal; }
+      #view-amount .scroll-content .send-amount-extras .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 {
@@ -10628,26 +10675,39 @@ qrcode {
       line-height: 1.4em;
       margin-bottom: 20px; }
     #view-amount .scroll-content .keypad-container {
-      position: relative; }
+      position: relative;
+      font-size: 18px;
+      line-height: 2em; }
+      @media (min-height: 667px) {
+        #view-amount .scroll-content .keypad-container {
+          font-size: 24px; } }
+      @media (max-height: 480px) {
+        #view-amount .scroll-content .keypad-container {
+          font-size: 12px; } }
+      #view-amount .scroll-content .keypad-container .sendmax {
+        background: #262424; }
+        #view-amount .scroll-content .keypad-container .sendmax .button {
+          color: white;
+          background: black;
+          border: 1px solid #262424;
+          border-radius: 0;
+          font-size: 0.8em;
+          line-height: 2em;
+          width: 100%; }
+          #view-amount .scroll-content .keypad-container .sendmax .button .available-funds-amount {
+            color: #C9C9C9; }
+          #view-amount .scroll-content .keypad-container .sendmax .button:active {
+            background-color: #445; }
       #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; } }
+        color: #fff; }
         #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 {
@@ -10666,14 +10726,20 @@ qrcode {
             background-color: #eaeaea; }
         #view-amount .scroll-content .keypad-container .keypad .digit {
           cursor: pointer;
-          border-top: 1px solid #f2f2f2;
-          border-left: 1px solid #f2f2f2;
+          background-color: #000;
+          border: 1px solid #262424;
           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; } }
+            background-color: #445; }
+    #view-amount .scroll-content .button-primary {
+      background-color: #fab915;
+      border-radius: 0;
+      font-weight: bold; }
+    #view-amount .scroll-content .button-primary[disabled] {
+      background-color: #667;
+      opacity: 1; }
+  #view-amount .warning {
+    color: #b7664d; }
   #view-amount ion-content {
     margin-bottom: constant(safe-area-inset-bottom);
     /* iOS 11.0 */
@@ -11113,7 +11179,9 @@ qrcode {
           #tab-send .send-wrapper .buttons .button-clipboard-paste.contains-address .icon, #tab-send .send-wrapper .buttons .button-clipboard-paste.contains-content .icon {
             background: url(../img/icon-clipboard-paste-white.svg); }
           #tab-send .send-wrapper .buttons .button-clipboard-paste.contains-address.contains-address .address, #tab-send .send-wrapper .buttons .button-clipboard-paste.contains-content.contains-address .address {
-            display: inline; }
+            display: inline;
+            border: none;
+            background-color: transparent; }
           #tab-send .send-wrapper .buttons .button-clipboard-paste.contains-address.contains-address .non-address, #tab-send .send-wrapper .buttons .button-clipboard-paste.contains-content.contains-address .non-address {
             display: none; }
       #tab-send .send-wrapper .buttons .button span {
@@ -11237,6 +11305,61 @@ qrcode {
     #tab-send #tab-send-contacts.ios {
       height: calc(100vh - 270px - 50px - 44px - 18px); } }
 
+#wallet-origin-destination .header--request {
+  padding: 30px 24px;
+  width: 100%;
+  height: 139px;
+  background-color: #fff; }
+  #wallet-origin-destination .header--request__title {
+    width: 46px;
+    height: 20px;
+    font-size: 16px;
+    font-weight: 600;
+    letter-spacing: -0.4px;
+    color: #000000; }
+  #wallet-origin-destination .header--request__amount {
+    font-size: 29px;
+    font-weight: 600;
+    letter-spacing: -0.7px;
+    color: #000000;
+    margin: 11px 0 2px; }
+  #wallet-origin-destination .header--request__amount-alt {
+    opacity: 0.45;
+    font-size: 16px;
+    font-weight: 600;
+    letter-spacing: -0.4px;
+    color: #000000; }
+
+#wallet-origin-destination .wallets-header {
+  margin: 20px 14px 0px; }
+  #wallet-origin-destination .wallets-header .title {
+    font-size: 16px;
+    font-weight: bold;
+    color: #445;
+    margin-bottom: -12px; }
+
+#wallet-origin-destination .card {
+  font-size: 12px;
+  margin: 20px 14px 0px; }
+  #wallet-origin-destination .card .item-heading {
+    font-weight: 600; }
+    #wallet-origin-destination .card .item-heading .subtitle {
+      font-size: 12px; }
+  #wallet-origin-destination .card-insufficient .wallet {
+    opacity: 0.4; }
+  #wallet-origin-destination .card-insufficient .item-heading {
+    font-size: 12px; }
+    #wallet-origin-destination .card-insufficient .item-heading > div {
+      display: inline-block;
+      vertical-align: text-bottom; }
+  #wallet-origin-destination .card-insufficient__dot {
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+    background-color: #ec5959;
+    border-radius: 8px;
+    margin: 2px 6px 2px 2px; }
+
 .settings .icon-bitpay {
   background-image: url("../img/icon-bitpay.svg"); }
 
@@ -11906,6 +12029,73 @@ a.item {
   color: #667;
   font-size: 0.9em; }
 
+#shapeshift .swap-image {
+  width: auto;
+  max-width: 400px;
+  max-height: 25vh; }
+
+#shapeshift .empty-case {
+  padding-top: 5vh;
+  text-align: center; }
+  #shapeshift .empty-case .item {
+    border-style: none; }
+  #shapeshift .empty-case > .title {
+    font-size: 20px;
+    color: #445;
+    margin: 20px 10px; }
+  #shapeshift .empty-case > .subtitle {
+    font-size: 1rem;
+    line-height: 1.5em;
+    font-weight: 300;
+    color: #6F6F70;
+    margin: 20px 1em 2.5em; }
+  #shapeshift .empty-case .big-icon-svg .bg.green {
+    padding: 0 10px;
+    box-shadow: none; }
+  #shapeshift .empty-case .buttons {
+    margin-top: 18px; }
+    #shapeshift .empty-case .buttons .button {
+      font-weight: bold;
+      font-size: 19px; }
+  #shapeshift .empty-case .button-first-contact img {
+    height: 19px;
+    width: 19px;
+    margin-right: 6px;
+    vertical-align: sub; }
+
+#shapeshift .button-shapeshift {
+  border-color: #FFF;
+  background-color: #243F5D;
+  color: #FFF;
+  border: 0px;
+  box-shadow: 0 2px 11px 0 #C1C1C1; }
+  #shapeshift .button-shapeshift:hover {
+    color: #FFF;
+    text-decoration: none; }
+  #shapeshift .button-shapeshift.active, #shapeshift .button-shapeshift.activated {
+    border-color: #FFF;
+    background-color: #606060; }
+  #shapeshift .button-shapeshift.button-clear {
+    border-color: transparent;
+    background: none;
+    box-shadow: none;
+    color: #FFF; }
+  #shapeshift .button-shapeshift.button-icon {
+    border-color: transparent;
+    background: none; }
+  #shapeshift .button-shapeshift.button-outline {
+    border-color: #C1C1C1;
+    background: transparent;
+    color: #C1C1C1; }
+    #shapeshift .button-shapeshift.button-outline.active, #shapeshift .button-shapeshift.button-outline.activated {
+      background-color: #C1C1C1;
+      box-shadow: none;
+      color: #fff; }
+
+.header.shapeshift {
+  background: url(../img/shapeshiftbg.jpg) center center repeat #28394d;
+  opacity: 0.99; }
+
 #bitpayCard {
   background: white; }
   #bitpayCard .status-label {
@@ -15062,10 +15252,191 @@ log-options #check-bar .checkbox-icon {
 #cash-scan a {
   cursor: pointer; }
 
+#view-review {
+  background-color: #494949; }
+  #view-review slide-to-accept, #view-review slide-to-accept-success {
+    margin-bottom: constant(safe-area-inset-bottom);
+    /* iOS 11.0 */
+    margin-bottom: env(safe-area-inset-bottom);
+    /* iOS 11.2 */ }
+  #view-review .fee-summary {
+    position: absolute;
+    bottom: 92px; }
+  #view-review .shapeshift-banner, #view-review .bitpay-banner, #view-review .egifter-banner {
+    box-shadow: none; }
+  #view-review .warning {
+    color: #b7664d; }
+
 .gravatar {
   border-radius: 3px;
   display: inline-block; }
 
+.elastic {
+  width: 100%;
+  font-size: 14px; }
+
+/*
+* Extends Ionic v1 item
+*/
+.item.item-compact {
+  padding: 11px 13px; }
+
+.item.item-gutterless {
+  padding: 0; }
+
+.item .item-content.item-content-avatar {
+  min-height: 69px;
+  padding: 13px 11px 13px 68px; }
+  .item .item-content.item-content-avatar > img:first-child,
+  .item .item-content.item-content-avatar > i:first-child {
+    position: absolute;
+    max-width: 40px;
+    max-height: 40px;
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+    left: 13px;
+    top: 50%;
+    padding: 0;
+    transform: translate(0, -50%); }
+
+.item .item-content.item-content-compact {
+  min-height: 0;
+  padding: 13px 11px; }
+
+.item .item-content .highlight {
+  color: #FAB915; }
+
+.item .item-content + .item-content {
+  padding-top: 0; }
+
+/*
+* Extends Ionic v1 ion-content
+*/
+ion-content.bg-neutral {
+  background-color: #F2F2F2; }
+
+ion-content.padded-bottom-cta {
+  bottom: 92px; }
+
+ion-content.padded-bottom-cta-with-summary {
+  bottom: 134px; }
+
+.card.card-gutter-compact {
+  margin: 10px 12px; }
+
+.header {
+  padding: 29px 12px 61px;
+  background-color: #fab915;
+  color: #FFFFFF; }
+  .header.btc {
+    background-color: #535353; }
+  .header .title {
+    font-size: 18px;
+    font-weight: 400;
+    line-height: 1em;
+    color: #FFFFFF;
+    text-align: center; }
+    .header .title + .content {
+      margin-top: 23px; }
+  .header .content {
+    text-align: center; }
+    .header .content p {
+      margin: 0;
+      line-height: 1em;
+      font-size: 18px; }
+      .header .content p.large {
+        font-size: 29px;
+        font-weight: 600; }
+      .header .content p + p {
+        margin-top: 8px; }
+
+.content-frame.negative-top {
+  margin-top: -40px; }
+  .content-frame.negative-top .card:first-child {
+    margin-top: 0; }
+
+.address-frame {
+  background-color: #F8F8F8;
+  border: 0.5px solid #EDEBEB;
+  border-radius: 3px;
+  padding: 9px;
+  text-align: center;
+  font-size: 14px;
+  overflow: hidden;
+  text-overflow: ellipsis; }
+  .address-frame.expanded {
+    white-space: pre-wrap;
+    word-break: break-all; }
+  .address-frame .prefix {
+    color: #000000; }
+  .address-frame .mid {
+    color: #919191; }
+  .address-frame .suffix {
+    color: #000000; }
+
+.action-minor {
+  margin: 20px 14px;
+  font-size: 14px; }
+  .action-minor.mt-negative {
+    margin-top: 0; }
+  .action-minor.text-right {
+    text-align: right; }
+  .action-minor > .action-icon {
+    width: 15px;
+    height: 15px;
+    vertical-align: middle;
+    margin-right: 3px; }
+  .action-minor > .action-text {
+    vertical-align: middle;
+    color: #444444; }
+
+.expand-content-frame {
+  position: relative; }
+  .expand-content-frame .expand-content-trigger {
+    position: absolute;
+    top: 0;
+    transition: opacity 0.3s ease;
+    right: 0; }
+    .expand-content-frame .expand-content-trigger.expand-content-revealed {
+      opacity: 0; }
+  .expand-content-frame .expand-content {
+    opacity: 0;
+    transform-origin: 100% 0%;
+    transform: scale(0, 0);
+    transition: opacity 0.3s ease, transform 0.3s ease; }
+    .expand-content-frame .expand-content.expand-content-revealed {
+      opacity: 1;
+      transform: scale(1, 1); }
+
+.fee-summary {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  padding: 5px 12px 15px;
+  box-sizing: border-box;
+  background-color: #F2F2F2; }
+  .fee-summary:before {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: -15px;
+    width: 100%;
+    height: 15px;
+    background: linear-gradient(to bottom, rgba(242, 242, 242, 0) 0%, #f2f2f2 100%); }
+  .fee-summary .amount {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    width: 100%; }
+    .fee-summary .amount .fee-fiat.positive {
+      color: #70955F; }
+    .fee-summary .amount .fee-fiat.negative {
+      color: #C24633; }
+    .fee-summary .amount .fee-crypto {
+      color: #A7A7A7; }
+
 .amount .start,
 .amount .middle,
 .amount .end,
diff --git a/www/img/bitpay_banner.svg b/www/img/bitpay_banner.svg
new file mode 100644
index 000000000..cf5829899
--- /dev/null
+++ b/www/img/bitpay_banner.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="375px" height="102px" viewBox="0 0 375 102" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 51 (57462) - http://www.bohemiancoding.com/sketch -->
+    <title>Artboard</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Artboard" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect fill="#1A3A8B" x="0" y="0" width="375" height="102"></rect>
+        <g id="bitpay-logo-white.d8eadc2c-2" transform="translate(117.000000, 27.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <path d="M141.176471,11.3222591 L133.874239,11.3222591 L129.655172,28.8637874 L129.006085,31.255814 C128.51927,31.4152824 128.194726,31.4152824 127.707911,31.5747508 C126.896552,31.7342193 126.247465,31.7342193 125.436105,31.7342193 C124.462475,31.7342193 123.813387,31.5747508 123.1643,31.255814 C122.677485,30.9368771 122.190669,30.6179402 122.028398,30.1395349 C121.866126,29.6611296 121.703854,29.0232558 121.703854,28.3853821 C121.703854,27.7475083 121.866126,26.9501661 122.028398,26.3122924 L124.300203,17.2225914 L125.760649,11.1627907 L118.296146,11.1627907 L114.888438,25.1960133 C114.401623,26.9501661 114.239351,28.5448505 114.239351,29.9800664 C114.239351,31.5747508 114.401623,32.8504983 114.888438,33.9667774 C115.375254,35.0830565 116.348884,36.0398671 117.647059,36.6777409 C118.945233,37.3156146 120.730223,37.6345515 123.002028,37.6345515 C124.624746,37.6345515 126.085193,37.4750831 127.221095,37.1561462 L127.383367,37.1561462 C127.058824,38.5913621 126.409736,39.7076412 125.273834,40.6644518 C124.137931,41.6212625 122.677485,42.0996678 120.567951,42.0996678 C119.756592,42.0996678 118.782961,42.0996678 118.133874,41.9401993 L116.673428,47.8405316 C117.647059,48 118.782961,48 119.918864,48 C122.190669,48 124.137931,47.6810631 125.760649,47.2026578 C127.383367,46.7242525 128.843813,45.9269103 130.141988,44.9700997 C131.27789,44.013289 132.413793,42.7375415 133.225152,41.1428571 C134.036511,39.5481728 134.685598,37.7940199 135.172414,35.7209302 L140.20284,14.8305648 L141.176471,11.3222591 Z M110.507099,26.3122924 C110.020284,28.0664452 109.858012,29.9800664 110.020284,31.8936877 C110.182556,33.807309 110.993915,36.5182724 111.643002,37.9534884 L104.503043,37.9534884 C103.691684,36.5182724 103.691684,35.8803987 103.529412,35.4019934 C102.555781,36.1993355 101.58215,36.6777409 100.446247,37.1561462 C99.3103448,37.6345515 98.1744422,37.9534884 96.7139959,37.9534884 C95.0912779,37.9534884 93.6308316,37.6345515 92.494929,37.1561462 C91.3590264,36.6777409 90.3853955,35.8803987 89.5740365,34.923588 C88.7626775,33.9667774 88.2758621,32.8504983 87.9513185,31.5747508 C87.6267748,30.2990033 87.464503,29.0232558 87.464503,27.4285714 C87.464503,25.1960133 87.9513185,23.1229236 88.6004057,21.2093023 C89.4117647,19.2956811 90.5476673,17.5415282 92.0081136,16.1063123 C93.4685598,14.6710963 96.8762677,11.3222591 102.555781,11.3222591 L113.914807,11.3222591 L110.507099,26.3122924 Z M105.314402,17.3820598 C101.906694,17.3820598 101.257606,17.3820598 99.7971602,18.0199336 C98.8235294,18.4983389 98.0121704,19.2956811 97.2008114,20.2524917 C96.5517241,21.0498339 95.9026369,22.166113 95.4158215,23.282392 C94.9290061,24.3986711 94.7667343,25.6744186 94.7667343,26.9501661 C94.7667343,28.5448505 95.0912779,29.6611296 95.5780933,30.6179402 C96.0649087,31.5747508 97.0385396,31.8936877 98.4989858,31.8936877 C99.3103448,31.8936877 99.959432,31.7342193 100.608519,31.4152824 C101.257606,31.0963455 101.906694,30.6179402 102.555781,29.9800664 C102.555781,29.1827243 102.718053,28.3853821 102.880325,27.4285714 C103.042596,26.4717608 103.204868,25.6744186 103.36714,25.0365449 L105.314402,17.3820598 Z M85.6795132,21.8471761 C85.6795132,24.2392027 85.1926978,26.3122924 84.5436105,28.3853821 C83.7322515,30.2990033 82.5963489,32.0531561 81.2981744,33.4883721 C79.8377282,34.923588 78.2150101,36.0398671 76.2677485,36.8372093 C74.3204868,37.6345515 72.2109533,38.1129568 69.9391481,38.1129568 C68.8032454,38.1129568 67.6673428,37.9534884 66.5314402,37.7940199 L64.2596349,46.5647841 L56.9574037,46.5647841 L65.3955375,11.4817276 L75.1318458,11.4817276 C76.9168357,11.4817276 78.5395538,11.8006645 79.8377282,12.2790698 C81.1359026,12.7574751 82.2718053,13.5548173 83.0831643,14.5116279 C83.8945233,15.4684385 84.5436105,16.5847176 85.030426,17.8604651 C85.5172414,18.9767442 85.6795132,20.4119601 85.6795132,21.8471761 Z M67.6673428,31.7342193 C68.1541582,31.8936877 68.9655172,31.8936877 69.7768763,31.8936877 C71.0750507,31.8936877 72.2109533,31.7342193 73.346856,31.255814 C74.3204868,30.7774086 75.2941176,30.1395349 76.1054767,29.3421927 C76.9168357,28.5448505 77.4036511,27.4285714 77.8904665,26.3122924 C78.3772819,25.1960133 78.5395538,23.7607973 78.5395538,22.3255814 C78.5395538,20.8903654 78.2150101,19.7740864 77.5659229,18.8172757 C76.9168357,17.8604651 75.7809331,17.3820598 74.3204868,17.3820598 L71.3995943,17.3820598 L67.6673428,31.7342193 Z M52.4137931,31.7342193 C51.4401623,31.7342193 50.7910751,31.5747508 50.1419878,31.255814 C49.6551724,30.9368771 49.168357,30.6179402 49.0060852,30.1395349 C48.8438134,29.6611296 48.6815416,29.0232558 48.6815416,28.3853821 C48.6815416,27.7475083 48.8438134,26.9501661 49.0060852,26.3122924 L51.2778905,17.2225914 L59.5537525,17.2225914 L61.0141988,11.1627907 L52.5760649,11.1627907 L54.5233266,3.50830565 L46.7342799,4.78405316 L41.8661258,25.3554817 C41.3793103,27.1096346 41.2170385,28.7043189 41.2170385,30.1395349 C41.2170385,31.7342193 41.3793103,33.0099668 41.8661258,34.1262458 C42.3529412,35.2425249 43.326572,36.1993355 44.6247465,36.8372093 C45.9229209,37.4750831 47.7079108,37.7940199 49.979716,37.7940199 C51.6024341,37.7940199 53.0628803,37.6345515 54.198783,37.3156146 C54.3610548,37.3156146 54.5233266,37.3156146 54.6855984,37.1561462 L56.1460446,30.9368771 C55.6592292,31.0963455 55.1724138,31.255814 54.6855984,31.255814 C53.8742394,31.7342193 53.2251521,31.7342193 52.4137931,31.7342193 Z M33.7525355,11.3222591 L27.2616633,37.9534884 L34.5638945,37.9534884 L41.0547667,11.3222591 L33.7525355,11.3222591 Z M41.703854,8.13289037 L42.8397566,3.50830565 L35.5375254,3.50830565 L34.4016227,8.13289037 L41.703854,8.13289037 Z M17.525355,11.3222591 C19.148073,11.3222591 20.4462475,11.641196 21.5821501,12.1196013 C22.7180527,12.5980066 23.6916836,13.3953488 24.5030426,14.3521595 C25.3144016,15.3089701 25.801217,16.4252492 26.1257606,17.7009967 C26.4503043,18.9767442 26.6125761,20.2524917 26.6125761,21.6877076 C26.6125761,23.9202658 26.1257606,25.9933555 25.3144016,28.0664452 C24.5030426,29.9800664 23.36714,31.7342193 21.9066937,33.3289037 C20.4462475,34.923588 18.8235294,35.8803987 16.7139959,36.8372093 C14.7667343,37.6345515 12.6572008,38.1129568 10.3853955,38.1129568 L8.76267748,38.1129568 C7.95131846,38.1129568 7.13995943,38.1129568 6.1663286,37.9534884 C5.19269777,37.7940199 4.21906694,37.6345515 3.0831643,37.3156146 C1.94726166,36.9966777 0.973630832,36.6777409 0,36.1993355 L8.43813387,1.11627907 L16.0649087,0 L12.9817444,12.4385382 C13.6308316,12.1196013 14.2799189,11.9601329 14.9290061,11.8006645 C16.0649087,11.3222591 16.7139959,11.3222591 17.525355,11.3222591 Z M11.0344828,32.0531561 C12.1703854,32.0531561 13.306288,31.7342193 14.2799189,31.255814 C15.2535497,30.7774086 16.2271805,29.9800664 16.8762677,29.0232558 C17.6876268,28.0664452 18.1744422,27.1096346 18.6612576,25.9933555 C19.148073,24.8770764 19.3103448,23.6013289 19.3103448,22.3255814 C19.3103448,20.730897 18.9858012,19.6146179 18.4989858,18.6578073 C18.0121704,17.8604651 16.8762677,17.3820598 15.4158215,17.3820598 C14.9290061,17.3820598 14.4421907,17.3820598 13.7931034,17.5415282 C12.9817444,17.7009967 12.494929,18.0199336 11.8458418,18.4983389 L8.60040568,31.7342193 C9.57403651,31.8936877 9.89858012,31.8936877 10.0608519,31.8936877 C10.3853955,32.0531561 10.7099391,32.0531561 11.0344828,32.0531561 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/www/img/egifter_banner.png b/www/img/egifter_banner.png
new file mode 100644
index 000000000..cb2e7c11e
Binary files /dev/null and b/www/img/egifter_banner.png differ
diff --git a/www/img/icon-alternative-currency-black.svg b/www/img/icon-alternative-currency-black.svg
new file mode 100644
index 000000000..e9b175256
--- /dev/null
+++ b/www/img/icon-alternative-currency-black.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 40.1 (33804) - http://www.bohemiancoding.com/sketch -->
+    <title>3A719124-019D-470F-908A-5D61F117A295</title>
+    <desc>Created with sketchtool.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Icons" transform="translate(-324.000000, -770.000000)" stroke="#000000" stroke-width="0.7">
+            <g id="icons/list-items/sync" transform="translate(324.000000, 770.000000)">
+                <g id="Group" transform="translate(0.365217, 0.365217)">
+                    <polyline id="Shape" points="10.5913043 11.6869565 0 11.6869565 0 0 16.0695652 0 16.0695652 7.96173913"></polyline>
+                    <ellipse id="Oval" cx="8.03478261" cy="5.84347826" rx="1.46086957" ry="1.46086957"></ellipse>
+                    <path d="M13.8782609,6.57391304 L13.8782609,4.3826087 C12.6365217,4.3826087 11.6869565,3.43304348 11.6869565,2.19130435 L4.3826087,2.19130435 C4.3826087,3.43304348 3.43304348,4.3826087 2.19130435,4.3826087 L2.19130435,7.30434783 C3.43304348,7.30434783 4.3826087,8.25391304 4.3826087,9.49565217 L10.5913043,9.49565217" id="Shape"></path>
+                    <path d="M15.0469565,13.5130435 C15.6313043,13.8052174 16.0695652,14.1704348 16.0695652,14.6086957 C16.0695652,15.4121739 14.7547826,16.0695652 13.1478261,16.0695652 C11.5408696,16.0695652 10.226087,15.4121739 10.226087,14.6086957 C10.226087,14.1704348 10.5913043,13.8052174 11.2486957,13.5130435" id="Shape"></path>
+                    <path d="M15.0469565,11.3217391 C15.6313043,11.613913 16.0695652,11.9791304 16.0695652,12.4173913 C16.0695652,13.2208696 14.7547826,13.8782609 13.1478261,13.8782609 C11.5408696,13.8782609 10.226087,13.2208696 10.226087,12.4173913 C10.226087,11.9791304 10.5913043,11.613913 11.1756522,11.3217391" id="Shape"></path>
+                    <path d="M15.0469565,9.13043478 C15.6313043,9.4226087 16.0695652,9.78782609 16.0695652,10.226087 C16.0695652,11.0295652 14.7547826,11.6869565 13.1478261,11.6869565 C11.5408696,11.6869565 10.226087,11.0295652 10.226087,10.226087 C10.226087,9.78782609 10.5913043,9.4226087 11.1756522,9.13043478" id="Shape"></path>
+                    <ellipse id="Oval" cx="13.1478261" cy="8.03478261" rx="2.92173913" ry="1.46086957"></ellipse>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/www/img/icon-bookmark.svg b/www/img/icon-bookmark.svg
new file mode 100644
index 000000000..5db1f9047
--- /dev/null
+++ b/www/img/icon-bookmark.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11.25 15">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #444;
+        opacity: 0.564;
+      }
+    </style>
+  </defs>
+  <path id="_ionicons_svg_md-bookmark" class="cls-1" d="M121.688,64h-8.125A1.567,1.567,0,0,0,112,65.563V79l5.625-2.5L123.25,79V65.563A1.567,1.567,0,0,0,121.688,64Z" transform="translate(-112 -64)"/>
+</svg>
diff --git a/www/img/icon-egifter.png b/www/img/icon-egifter.png
new file mode 100644
index 000000000..42ebb25c5
Binary files /dev/null and b/www/img/icon-egifter.png differ
diff --git a/www/img/shapeshift_swap.png b/www/img/shapeshift_swap.png
new file mode 100644
index 000000000..83905b751
Binary files /dev/null and b/www/img/shapeshift_swap.png differ
diff --git a/www/views/amount.html b/www/views/amount.html
index af4e9d55c..48637ec1b 100644
--- a/www/views/amount.html
+++ b/www/views/amount.html
@@ -1,82 +1,95 @@
 <ion-view id="view-amount" hide-tabs>
     <ion-nav-bar class="bar-royal">
       <ion-nav-title>
-        {{'Enter amount' | translate}}
+        {{'Enter Amount' | translate}}
       </ion-nav-title>
-      <ion-nav-back-button ng-click="goBack()"></ion-nav-back-button>
+      <ion-nav-back-button ng-click="vm.goBack()"></ion-nav-back-button>
     </ion-nav-bar>
-    <ion-content scroll="false" style="background: #fff;">
-  
+    <ion-content scroll="false">
+      <div ng-if="vm.thirdParty && vm.thirdParty.id === 'shapeshift'" ng-include="'views/thirdparty/shapeshift-header.html'"></div>
       <div style="order: 0; position: relative;">
-  
-        <div class="item send-amount">
-          <div ng-if="shapeshiftOrderId">
-            Minimum amount: {{minShapeshiftAmount}} <br/>
-            Maximum amount: {{maxShapeshiftAmount}} <br/>
+        <div class="card item send-amount">
+          <div class="send-amount-header-footer">
+            <span class="send-amount-header-footer__min" ng-if="vm.minAmount">Min: {{vm.minAmount}}</span> <span class="send-amount-header-footer__max" ng-if="vm.maxAmount">Max: {{vm.maxAmount}}</span>
           </div>
           <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 text-selectable">{{ amountModel.amount || 0 }}</span><span class="unit">{{unit}}</span>
+                ng-class="{long: vm.amount.length > 5, 'very-long': vm.amount.length > 10}">
+                <span class="primary-amount-display text-selectable">{{vm.amount || '0'}} {{vm.unit}}</span>
               </div>
-              <span ng-show="globalResult">{{globalResult}} {{unit}}</span>
+              <span ng-show="vm.globalResult">{{vm.globalResult}} {{vm.unit}}</span>
               <div class="alternative-amount">
-                <span class="text-selectable">{{alternativeAmount || '0.00'}}</span> <span>{{alternativeUnit}}</span>
+                <span class="text-selectable">{{vm.alternativeAmount || '0.00'}}</span> <span>{{vm.alternativeUnit}}</span>
               </div>
-              <div class="switch-currencies" ng-click="changeUnit()"><img src="img/icon-convert.svg"></div>
+              <div class="switch-currencies" ng-click="vm.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" ng-click="openPopup()">
-                <span>
-                  <i class="icon ion-social-usd"></i>&emsp;
-                  <span translate>Change currency</span>
-                </span>
-              </button>
+            <div class="send-amount-header-footer">
+              <div class="warning" ng-show="vm.errorMessage">
+                {{vm.errorMessage}}
+              </div>
             </div>
-          </div>
+          </div>  
+        </div>
+
+        <div class="send-amount-extras text-center">
+          <button class="extra button" ng-click="vm.openPopup()">
+            <span>
+              <img src="img/icon-alternative-currency-black.svg"/>
+              &ensp;
+              <span translate>Change Currency</span>
+            </span>
+          </button>
+          <div class="extra available-funds" 
+            ng-class="{warning: vm.fundsAreInsufficient}"
+            ng-if="!vm.isRequestingSpecificAmount" translate>
+            <span>Available Funds:</span>&ensp;<span>{{vm.availableFunds}}</span>
+          </div>  
         </div>
       </div>
   
       <div class="keypad-container" style="background: #fff; position: absolute; bottom: 0; margin-bottom: 57px; width: 100%;">
-        <div class="keypad" style="background: #f2f2f2; position: relative;">
+        <div class="sendmax" ng-if="vm.availableFunds && !vm.isRequestingSpecificAmount">
+          <button class="button button-sendmax" ng-click="vm.sendMax()">
+              <span>
+                <span translate>Use All Available Funds</span>&ensp;
+                <span class="available-funds-amount">({{vm.availableFunds}})</span>
+              </span>
+            </button>
+        </div>
+        
+        <div class="keypad" style="position: relative;">
   
           <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 digit" ng-click="vm.pushDigit('7')">7</div>
+            <div class="col digit" ng-click="vm.pushDigit('8')">8</div>
+            <div class="col digit" ng-click="vm.pushDigit('9')">9</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 digit" ng-click="vm.pushDigit('4')">4</div>
+            <div class="col digit" ng-click="vm.pushDigit('5')">5</div>
+            <div class="col digit" ng-click="vm.pushDigit('6')">6</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 digit" ng-click="vm.pushDigit('1')">1</div>
+            <div class="col digit" ng-click="vm.pushDigit('2')">2</div>
+            <div class="col digit" ng-click="vm.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 class="col digit" ng-click="vm.pushDigit('.')">.</div>
+            <div class="col digit" ng-click="vm.pushDigit('0')">0</div>
+            <div class="col digit icon ion-backspace-outline" ng-click="vm.removeDigit()"></div>
           </div>
         </div>
       </div>
   
       <button 
         class="button button-full button-primary no-margin" 
-        ng-disabled="!allowSend" 
-        ng-click="finish()"
+        ng-disabled="!vm.allowSend" 
+        ng-click="vm.finish()"
         style="position: absolute; bottom: 0;"
         translate>
         Next
diff --git a/www/views/confirm.html b/www/views/confirm.html
index e54837f34..1def16389 100644
--- a/www/views/confirm.html
+++ b/www/views/confirm.html
@@ -105,13 +105,13 @@
   </ion-content>
   <click-to-accept
     ng-click="approve(tx, wallet, statusChangeHandler)"
-    ng-if="(!isCordova || isWindowsPhoneApp) && wallet"
+    ng-if="(!isCordova) && wallet"
     click-send-status="sendStatus"
     is-disabled="!wallet">
     {{buttonText}}
   </click-to-accept>
   <slide-to-accept
-    ng-if="isCordova && !isWindowsPhoneApp && wallet"
+    ng-if="isCordova && wallet"
     slide-on-confirm="approve(tx, wallet, statusChangeHandler)"
     slide-send-status="sendStatus"
     is-disabled="!wallet">
diff --git a/www/views/modals/altCurrency.html b/www/views/modals/altCurrency.html
index af8ecb083..3ab5a884f 100644
--- a/www/views/modals/altCurrency.html
+++ b/www/views/modals/altCurrency.html
@@ -3,7 +3,7 @@
         <div class="title">
             {{'Alternative Currency'|translate}}
         </div>
-        <button class="button button-clear" ng-click="close()" translate>
+        <button class="button button-clear" ng-click="vm.close()" translate>
             {{'Close'|translate}}
         </button>
     </ion-header-bar>
@@ -11,23 +11,23 @@
         <div class="bar bar-header item-input-inset m20b">
         <label class="item-input-wrapper">
             <i class="icon ion-ios-search placeholder-icon"></i>
-            <input type="search" ng-init="searchedAltCurrency = ''" ng-model="searchedAltCurrency" ng-change="findCurrency(searchedAltCurrency)"
+            <input type="search" ng-init="searchedAltCurrency = ''" ng-model="searchedAltCurrency" ng-change="vm.findCurrency(searchedAltCurrency)"
             placeholder="{{'Search your currency' | translate}}">
         </label>
         </div>
-        <div class="list" ng-if="lastUsedPopularList[0] && searchedAltCurrency.length == 0">
-        <ion-radio class="alt-currency-radio" ng-repeat="lastUsedAltCurrency in lastUsedPopularList" ng-value="lastUsedAltCurrency.isoCode" ng-model="currentCurrency"
-            ng-click="save(lastUsedAltCurrency)">{{lastUsedAltCurrency.name}} <span class="item-note">{{lastUsedAltCurrency.isoCode}}</span>
+        <div class="list" ng-if="vm.lastUsedPopularList[0] && searchedAltCurrency.length == 0">
+        <ion-radio class="alt-currency-radio" ng-repeat="lastUsedAltCurrency in vm.lastUsedPopularList" ng-value="lastUsedAltCurrency.isoCode" ng-model="currentCurrency"
+            ng-click="vm.save(lastUsedAltCurrency)">{{lastUsedAltCurrency.name}} <span class="item-note">{{lastUsedAltCurrency.isoCode}}</span>
         </ion-radio>
         </div>
         <div class="list">
-        <div class="item" ng-repeat="altCurrency in altCurrencyList" ng-value="altCurrency.isoCode" ng-model="currentCurrency"
-            ng-click="save(altCurrency)">{{altCurrency.name}} <span class="item-note">{{altCurrency.isoCode}}</span>
+        <div class="item" ng-repeat="altCurrency in vm.altCurrencyList" ng-value="altCurrency.isoCode" ng-model="currentCurrency"
+            ng-click="vm.save(altCurrency)">{{altCurrency.name}} <span class="item-note">{{altCurrency.isoCode}}</span>
         </div>
         </div>
         <ion-infinite-scroll
-        ng-if="!listComplete"
-        on-infinite="loadMore()"
+        ng-if="!vm.listComplete"
+        on-infinite="vm.loadMore()"
         distance="50%">
         </ion-infinite-scroll>
     </ion-content>
diff --git a/www/views/review.html b/www/views/review.html
new file mode 100644
index 000000000..e9e5c6d7c
--- /dev/null
+++ b/www/views/review.html
@@ -0,0 +1,119 @@
+<ion-view id="view-review" hide-tabs>
+  <ion-nav-bar class="bar-royal {{vm.origin.currency.toLowerCase()}}">
+    <ion-nav-title>
+      {{'Review Transaction' | translate}}
+    </ion-nav-title>
+    <ion-nav-back-button>
+    </ion-nav-back-button>
+  </ion-nav-bar>
+
+  <ion-content class="padded-bottom-cta-with-summary bg-neutral">
+    <div ng-if="vm.thirdParty && vm.thirdParty.id === 'shapeshift'" ng-include="'views/thirdparty/shapeshift-header.html'"></div>
+    <div class="header {{vm.origin.currency.toLowerCase()}}" ng-class="vm.thirdParty.id">
+      <div class="content">
+        <p>{{vm.sendingTitle}}</p>
+        <p class="large">{{vm.primaryAmount}} {{vm.primaryCurrency}}</p>
+        <p ng-show="vm.secondaryAmount">{{vm.secondaryAmount}} {{vm.secondaryCurrency}}</p>
+      </div>
+    </div>
+
+    <div class="content-frame negative-top">
+      <div class="card card-gutter-compact">
+        <div class="item item-compact" translate>From:</div>
+        <div class="item item-gutterless item-complex item-avatar">
+          <div class="item-content item-content-avatar">
+            <i class="icon big-icon-svg theme-circle theme-circle-services">
+                <div class="bg icon-wallet"
+                  style="background-color: {{vm.originWallet.color}}"
+                ></div>
+            </i>
+            <h2>{{vm.originWallet.name}} <span class="highlight" style="color: {{vm.origin.currencyColor}}">({{vm.origin.currency}})</span></h2>
+            <p ng-show="vm.origin.balanceAmount">{{vm.origin.balanceAmount}} {{vm.origin.balanceCurrency}}</p>
+          </div>
+        </div>
+      </div>
+
+      <div class="card card-gutter-compact">
+        <div class="item item-compact" translate>To:</div>
+        <div class="item item-gutterless item-complex item-avatar">
+          <div class="item-content item-content-avatar"
+          ng-if="vm.destination.kind === 'contact' || vm.destination.kind === 'wallet' || vm.destination.kind == 'shapeshift'">
+            <img src="img/contact-placeholder.svg" class="bg" ng-if="vm.destination.kind === 'contact'">
+            <i class="icon big-icon-svg theme-circle theme-circle-services" ng-if="vm.destination.kind === 'wallet' || vm.destination.kind === 'shapeshift'">
+                <div class="bg icon-wallet"
+                  style="background-color: {{vm.destination.color}}"
+                ></div>
+            </i>
+            <h2>{{vm.destination.name}}<span class="highlight" style="color: {{vm.destination.currencyColor}}" ng-if="vm.destination.currency"> ({{vm.destination.currency}})</span></h2></h2>
+            <p ng-if="vm.destination.balanceAmount">{{vm.destination.balanceAmount}} {{vm.destination.balanceCurrency}}</p>
+          </div>
+          <div class="item-content item-content-avatar"
+          ng-if="vm.thirdParty && vm.thirdParty.id === 'bip70'
+           && (vm.thirdParty.name === 'BitPay' || vm.thirdParty.name === 'eGifter')">
+            <img ng-if="vm.thirdParty.name === 'BitPay'" src="img/icon-bitpay.svg" class="bg">
+            <img ng-if="vm.thirdParty.name === 'eGifter'" src="img/icon-egifter.png" class="bg">
+            <h2>{{vm.destination.name}}</h2>
+            <p translate ng-if="!vm.paymentExpired">Payment expires: {{vm.remainingTimeStr}}</p>
+            <p class="warning" translate ng-if="vm.paymentExpired">Payment request has expired</p>
+          </div>
+          <div class="item-content item-content-compact" ng-init="addressExpanded = false" ng-if="vm.destination.kind === 'address' && !vm.thirdParty">
+            <div class="address-frame" ng-class="{ 'expanded': addressExpanded }" ng-click="addressExpanded = !addressExpanded">
+              <span class="prefix">{{vm.destination.address.substring(0,5)}}</span><span class="mid">{{vm.destination.address.substring(5,vm.destination.address.length-4)}}</span><span class="suffix">{{vm.destination.address.substring(vm.destination.address.length-4)}}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="expand-content-frame">
+        <div class="action-minor mt-negative text-right expand-content-trigger"
+          ng-class="{ 'expand-content-revealed': vm.memoExpanded }"
+          ng-click="vm.memoExpanded = !vm.memoExpanded">
+          <img src="img/icon-bookmark.svg" class="action-icon">
+          <span class="action-text">Add personal note</span>
+        </div>
+        <div class="card card-gutter-compact expand-content"
+          ng-class="{ 'expand-content-revealed': vm.memoExpanded }">
+          <div class="item item-compact" translate>Personal Note:</div>
+          <div class="item">
+            <div class="item-content">
+              <textarea elastic placeholder="{{btx.note.body || btx.message || 'Enter text here'}}" class="elastic" ng-model="vm.memo"></textarea>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </ion-content>
+
+  <div class="fee-summary">
+    <div ng-if="vm.thirdParty && vm.thirdParty.id === 'bip70'" translate="">Suggested by merchant:</div>
+    <div class="amount">
+      <div class="fee-fiat positive" ng-if="vm.feeLessThanACent">Fee: Less than 1 cent</div>
+      <div class="fee-fiat" ng-class="vm.feeIsHigh ? 'negative' : 'positive'" ng-if="!vm.feeLessThanACent">Fee: {{vm.feeFiat}} {{vm.feeCurrency}}</div>
+      <div class="fee-crypto" ng-if="vm.feeCrypto">
+        {{vm.feeCrypto}} {{vm.origin.currency}}
+      </div>
+    </div>
+  </div>
+
+  <click-to-accept
+    ng-click="vm.approve()"
+    ng-if="!vm.isCordova"
+    click-send-status="vm.sendStatus"
+    is-disabled="!vm.readyToSend">
+    {{vm.buttonText}}
+  </click-to-accept>
+  <slide-to-accept
+    ng-if="vm.isCordova"
+    slide-on-confirm="vm.approve()"
+    slide-send-status="vm.sendStatus"
+    is-disabled="!vm.readyToSend">
+    {{vm.buttonText}}
+  </slide-to-accept>
+  <slide-to-accept-success
+    slide-success-show="vm.sendStatus === 'success'"
+    slide-success-on-confirm="vm.onSuccessConfirm()"
+    slide-success-hide-on-confirm="true">
+    <span ng-show="vm.originWallet.m == 1 && (vm.originWallet.canSign() || vm.originWallet.isPrivKeyExternal())" translate>Payment Sent</span>
+    <span ng-show="vm.originWallet.m > 1 && (vm.originWallet.canSign() || vm.originWallet.isPrivKeyExternal())" translate>Proposal Created</span>
+    <span ng-show="!vm.originWallet.canSign() && !vm.originWallet.isPrivKeyExternal()" translate>Transaction Created</span>
+  </slide-to-accept-success>
+</ion-view>
diff --git a/www/views/shapeshift.html b/www/views/shapeshift.html
index 27be00fbd..61ad0952e 100644
--- a/www/views/shapeshift.html
+++ b/www/views/shapeshift.html
@@ -1,4 +1,4 @@
-<ion-view class="settings" show-tabs>
+<ion-view id="shapeshift" class="settings" show-tabs>
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>
       {{'Shapeshift'|translate}}
@@ -7,14 +7,29 @@
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content>
-    <div class="send-header-wrapper shapeshift-banner">
-      <img class="shapeshift-logo" src="img/shapeshiftlogo.svg"/>
-    </div>
-    <div class="list card ng-hide" ng-show="fromWallets.length == 0 || toWallets.length == 0">
-      <div class="item item-heading">
-        <span translate>No available wallets to convert between.</span>
+    <div ng-include="'views/thirdparty/shapeshift-header.html'"></div>
+    <div class="list card empty-case">
+      <div>
+        <img class="swap-image" src="img/shapeshift_swap.png"/>
+      </div>
+      <div class="subtitle">
+        <p translate>Exchange your BTC to BCH in minutes.</p>
+        <div ng-show="!walletsWithFunds.length">
+          <p translate>To start the process you need to add funds to your wallet.</p>
+        </div>
+        <div ng-show="walletsWithFunds.length">
+          <p translate>The process is fast and you will receive the exchanged amount in your wallet.</p>
+        </div>
+        <div ng-show="!hasWallets" translate>To get started, you'll need to create a bitcoin wallet and get some bitcoin.</div>
+        <div class="padding buttons">
+          <button class="button button-standard button-green" ng-click="buyBitcoin()" ng-show="!walletsWithFunds.length" translate>Buy Bitcoin now</button>
+          <button class="button button-standard button-green" ng-click="createWallet()" ng-show="!hasWallets" translate>Create bitcoin wallet</button>
+          <button class="button button-standard button-shapeshift track_shapeshift_start_click" ng-click="shapeshift()" ng-show="walletsWithFunds.length" translate>Start ShapeShift</button>
+        </div>
       </div>
     </div>
+    <div class="third-party-notice" translate>This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction.</div>
+
     <shapeshift-coin-trader class="ng-hide" ng-show="fromWallets.length > 0 && toWallets.length > 0">
       <div class="list card">
         <div class="item item-heading">
@@ -94,21 +109,21 @@
 </shapeshift-coin-trader>
 </ion-content>
 
-<wallet-selector
-wallet-selector-title="fromWalletSelectorTitle"
-wallet-selector-wallets="fromWallets"
-wallet-selector-selected-wallet="fromWallet"
-wallet-selector-show="showFromWallets"
-wallet-selector-on-select="onFromWalletSelect"
-wallet-selector-always-display-bitcoin-core="true">
-</wallet-selector>
+<!--<wallet-selector-->
+<!--wallet-selector-title="fromWalletSelectorTitle"-->
+<!--wallet-selector-wallets="fromWallets"-->
+<!--wallet-selector-selected-wallet="fromWallet"-->
+<!--wallet-selector-show="showFromWallets"-->
+<!--wallet-selector-on-select="onFromWalletSelect"-->
+<!--wallet-selector-always-display-bitcoin-core="true">-->
+<!--</wallet-selector>-->
 
-<wallet-selector
-wallet-selector-title="toWalletSelectorTitle"
-wallet-selector-wallets="toWallets"
-wallet-selector-selected-wallet="toWallet"
-wallet-selector-show="showToWallets"
-wallet-selector-on-select="onToWalletSelect"
-wallet-selector-always-display-bitcoin-core="true">
-</wallet-selector>
-</ion-view>
+<!--<wallet-selector-->
+<!--wallet-selector-title="toWalletSelectorTitle"-->
+<!--wallet-selector-wallets="toWallets"-->
+<!--wallet-selector-selected-wallet="toWallet"-->
+<!--wallet-selector-show="showToWallets"-->
+<!--wallet-selector-on-select="onToWalletSelect"-->
+<!--wallet-selector-always-display-bitcoin-core="true">-->
+<!--</wallet-selector>-->
+<!--</ion-view>-->
diff --git a/www/views/tab-send.html b/www/views/tab-send.html
index 8b39808db..7bf4d47be 100644
--- a/www/views/tab-send.html
+++ b/www/views/tab-send.html
@@ -22,7 +22,7 @@
               </button>
             </div>
             <div class="col-60">
-              <button class="button button-standard button-primary button-outline" ng-click="showWalletSelector()">
+              <button class="button button-standard button-primary button-outline" ui-sref="tabs.send.wallet-to-wallet">
                 <img src="img/icon-w2w.svg"/><br/>
                 <span translate>Wallet to Wallet Transfer</span>
               </button>
@@ -90,7 +90,7 @@
           </div>
           <div class="list">
             <a class="item item-icon-left item-icon-right" ng-repeat="item in list"
-               ng-if="!item.isWallet && item.recipientType != 'wallet'" ng-click="goToAmount(item)">
+               ng-if="!item.isWallet && item.recipientType != 'wallet'" ng-click="sendToContact(item)">
               <i class="icon big-icon-svg">
                 <gravatar class="send-gravatar" name="{{item.name}}" width="120" email="{{item.email}}"></gravatar>
               </i>
@@ -105,31 +105,31 @@
       </div>
     </div>
   </ion-content>
-  <wallet-selector
-          wallet-selector-title="walletSelectorTitleFrom"
-          wallet-selector-force-title="walletSelectorTitleForce"
-          wallet-selector-wallets="walletsWithFunds"
-          wallet-selector-selected-wallet="wallet"
-          wallet-selector-show="showWallets"
-          wallet-selector-on-select="onWalletSelect"
-          wallet-selector-display-balance-as-fiat="displayBalanceAsFiat">
-  </wallet-selector>
-  <wallet-selector
-          wallet-selector-on-hide=""
-          wallet-selector-title="walletSelectorTitleTo"
-          wallet-selector-wallets="walletsBch"
-          wallet-selector-selected-wallet="wallet"
-          wallet-selector-show="showWalletsBch"
-          wallet-selector-on-select="onWalletSelect"
-          wallet-selector-display-balance-as-fiat="displayBalanceAsFiat">
-  </wallet-selector>
-  <wallet-selector
-          wallet-selector-on-hide=""
-          wallet-selector-title="walletSelectorTitleTo"
-          wallet-selector-wallets="walletsBtc"
-          wallet-selector-selected-wallet="wallet"
-          wallet-selector-show="showWalletsBtc"
-          wallet-selector-on-select="onWalletSelect"
-          wallet-selector-display-balance-as-fiat="displayBalanceAsFiat">
-  </wallet-selector>
+  <!--<wallet-selector-->
+          <!--wallet-selector-title="walletSelectorTitleFrom"-->
+          <!--wallet-selector-force-title="walletSelectorTitleForce"-->
+          <!--wallet-selector-wallets="walletsWithFunds"-->
+          <!--wallet-selector-selected-wallet="wallet"-->
+          <!--wallet-selector-show="showWallets"-->
+          <!--wallet-selector-on-select="onWalletSelect"-->
+          <!--wallet-selector-display-balance-as-fiat="displayBalanceAsFiat">-->
+  <!--</wallet-selector>-->
+  <!--<wallet-selector-->
+          <!--wallet-selector-on-hide=""-->
+          <!--wallet-selector-title="walletSelectorTitleTo"-->
+          <!--wallet-selector-wallets="walletsBch"-->
+          <!--wallet-selector-selected-wallet="wallet"-->
+          <!--wallet-selector-show="showWalletsBch"-->
+          <!--wallet-selector-on-select="onWalletSelect"-->
+          <!--wallet-selector-display-balance-as-fiat="displayBalanceAsFiat">-->
+  <!--</wallet-selector>-->
+  <!--<wallet-selector-->
+          <!--wallet-selector-on-hide=""-->
+          <!--wallet-selector-title="walletSelectorTitleTo"-->
+          <!--wallet-selector-wallets="walletsBtc"-->
+          <!--wallet-selector-selected-wallet="wallet"-->
+          <!--wallet-selector-show="showWalletsBtc"-->
+          <!--wallet-selector-on-select="onWalletSelect"-->
+          <!--wallet-selector-display-balance-as-fiat="displayBalanceAsFiat">-->
+  <!--</wallet-selector>-->
 </ion-view>
diff --git a/www/views/thirdparty/bitpay-header.html b/www/views/thirdparty/bitpay-header.html
new file mode 100644
index 000000000..a5ffcb3a5
--- /dev/null
+++ b/www/views/thirdparty/bitpay-header.html
@@ -0,0 +1,3 @@
+<div class="send-header-wrapper bitpay-banner">
+  <img class="bitpay-logo" src="img/bitpay_banner.svg"/>
+</div>
\ No newline at end of file
diff --git a/www/views/thirdparty/egifter-header.html b/www/views/thirdparty/egifter-header.html
new file mode 100644
index 000000000..97d38603f
--- /dev/null
+++ b/www/views/thirdparty/egifter-header.html
@@ -0,0 +1,3 @@
+<div class="send-header-wrapper egifter-banner">
+  <img class="egifter-logo" src="img/egifter_banner.png"/>
+</div>
\ No newline at end of file
diff --git a/www/views/thirdparty/shapeshift-header.html b/www/views/thirdparty/shapeshift-header.html
new file mode 100644
index 000000000..7a6750a22
--- /dev/null
+++ b/www/views/thirdparty/shapeshift-header.html
@@ -0,0 +1,3 @@
+<div class="send-header-wrapper shapeshift-banner">
+  <img class="shapeshift-logo" src="img/shapeshiftlogo.svg"/>
+</div>
\ No newline at end of file
diff --git a/www/views/walletSelector.html b/www/views/walletSelector.html
new file mode 100644
index 000000000..b375ddb8c
--- /dev/null
+++ b/www/views/walletSelector.html
@@ -0,0 +1,59 @@
+<ion-view id="wallet-origin-destination" show-tabs>
+  <ion-nav-bar class="bar-royal">
+    <ion-nav-title>{{sendFlowTitle}}</ion-nav-title>
+    <ion-nav-back-button ng-click="goBack()"></ion-nav-back-button>
+  </ion-nav-bar>
+  <ion-content>
+    <div ng-if="thirdParty && thirdParty.id === 'shapeshift'" ng-include="'views/thirdparty/shapeshift-header.html'"></div>
+    <div ng-if="thirdParty && thirdParty.id === 'bip70' && thirdParty.name === 'BitPay'" ng-include="'views/thirdparty/bitpay-header.html'"></div>
+    <div ng-if="thirdParty && thirdParty.id === 'bip70' && thirdParty.name === 'eGifter'" ng-include="'views/thirdparty/egifter-header.html'"></div>
+    <div class="header--request" ng-if="isPaymentRequest">
+      <div class="header--request__title" translate>Paying</div>
+      <div class="header--request__amount" translate>{{requestAmount}} {{requestCurrency}}</div>
+      <div class="header--request__amount-alt" ng-show="requestAmountSecondary" translate>{{requestAmountSecondary}} {{requestCurrencySecondary}}</div>
+    </div>
+    <div class="wallets-header">
+      <div class="title">
+        {{headerTitle}}
+      </div>
+    </div>
+    <div class="list card" ng-if="walletsBch.length > 0">
+      <div class="item item-icon-right item-heading">
+        <div translate>Bitcoin Cash (BCH)</div>
+        <div translate class="subtitle">Instant transactions with low fees</div>
+      </div>
+      <div>
+        <a ng-repeat="wallet in walletsBch track by $index"
+           class="item item-sub item-icon-left item-big-icon-left item-icon-right wallet"
+           ng-click="useWallet(wallet)">
+          <span ng-include="'views/includes/walletList.html'"></span>
+        </a>
+      </div>
+    </div>
+
+    <div class="list card" ng-if="walletsBtc.length > 0">
+      <div class="item item-icon-right item-heading">
+        <div translate>Bitcoin Core (BTC)</div>
+      </div>
+      <div>
+        <a ng-repeat="wallet in walletsBtc track by $index"
+           class="item item-sub item-icon-left item-big-icon-left item-icon-right wallet"
+           ng-click="useWallet(wallet)">
+          <span ng-include="'views/includes/walletList.html'"></span>
+        </a>
+      </div>
+    </div>
+
+    <div class="list card card-insufficient" ng-if="walletsInsufficientFunds.length > 0">
+      <div class="item item-icon-right item-heading">
+        <span class="card-insufficient__dot"></span><div translate>Insufficient funds</div>
+      </div>
+      <div>
+        <a ng-repeat="wallet in walletsInsufficientFunds track by $index"
+           class="item item-sub item-icon-left item-big-icon-left item-icon-right wallet">
+          <span ng-include="'views/includes/walletList.html'"></span>
+        </a>
+      </div>
+    </div>
+  </ion-content>
+</ion-view>
\ No newline at end of file