diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index 88d4901e9..576fb4500 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -506,8 +506,7 @@ function amountController(configService, $filter, gettextCatalog, $ionicHistory,
         }
       }
 
-        $state.transitionTo('tabs.send.review', confirmData);
-      }
+      $state.transitionTo('tabs.send.review', confirmData);
       $scope.useSendMax = null;
     }
   };
diff --git a/src/js/controllers/review.controller.js b/src/js/controllers/review.controller.js
index b81645488..edf7787d5 100644
--- a/src/js/controllers/review.controller.js
+++ b/src/js/controllers/review.controller.js
@@ -6,7 +6,7 @@ angular
 
 function reviewController(addressbookService, configService, profileService, $log, $scope, txFormatService) {
   var vm = this;
-  
+
   vm.destination = {
     address: '',
     balanceAmount: '',
@@ -32,6 +32,7 @@ function reviewController(addressbookService, configService, profileService, $lo
   vm.primaryCurrency = '';
   vm.secondaryAmount = '';
   vm.secondaryCurrency = '';
+  vm.thirdParty = false;
 
   var config = null;
   var coin = '';
@@ -57,6 +58,20 @@ function reviewController(addressbookService, configService, profileService, $lo
     vm.origin.name = originWallet.name;
     coin = originWallet.coin;
 
+    if (data.stateParams.thirdParty) {
+      vm.thirdParty = JSON.parse(data.stateParams.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);
+        }
+      }
+    }
+
     configService.get(function onConfig(err, configCache) {
       if (err) {
         $log.err('Error getting config.', err);
diff --git a/src/js/routes.js b/src/js/routes.js
index d9c900e34..905683dcb 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -345,7 +345,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       })
       .state('tabs.send.review', {
-        url: '/review/:amount/:fromWalletId/:sendMax/:toAddr/:toWalletId',
+        url: '/review/:thirdParty/:amount/:fromWalletId/:sendMax/:toAddr/:toWalletId',
         views: {
           'tab-send@tabs': {
             controller: 'reviewController',
diff --git a/src/sass/views/amount.scss b/src/sass/views/amount.scss
index daf6cf4fe..ca32c6ac4 100644
--- a/src/sass/views/amount.scss
+++ b/src/sass/views/amount.scss
@@ -254,6 +254,9 @@
           padding: 0 6px 6px 6px;
           text-align: center;
         }
+        &__max {
+          float: right;
+        }
       }
 
       .send-amount-tool {
diff --git a/src/sass/views/shapeshift.scss b/src/sass/views/shapeshift.scss
index 1054fece2..158babb16 100644
--- a/src/sass/views/shapeshift.scss
+++ b/src/sass/views/shapeshift.scss
@@ -15,4 +15,7 @@
     border: 0px;
     @include button-shadow();
   }
+}
+.header.shapeshift {
+  background: #243F5D;
 }
\ No newline at end of file
diff --git a/www/views/amount.html b/www/views/amount.html
index e5df7dc0f..48637ec1b 100644
--- a/www/views/amount.html
+++ b/www/views/amount.html
@@ -6,17 +6,17 @@
       <ion-nav-back-button ng-click="vm.goBack()"></ion-nav-back-button>
     </ion-nav-bar>
     <ion-content scroll="false">
-      <div ng-if="vm.thirdParty && vm.thirdParty.id === 'shapeshift'" ng-include="'views/header-thirdparty.html'"></div>
+      <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="card item send-amount">
           <div class="send-amount-header-footer">
-            <span ng-if="vm.minAmount">Min: {{vm.minAmount}}</span> <span ng-if="vm.maxAmount">Max: {{vm.maxAmount}}</span>
+            <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: vm.amount.length > 5, 'very-long': vm.amount.length > 10}">
-                <span class="primary-amount-display text-selectable">{{vm.amount}} {{vm.unit}}</span>
+                <span class="primary-amount-display text-selectable">{{vm.amount || '0'}} {{vm.unit}}</span>
               </div>
               <span ng-show="vm.globalResult">{{vm.globalResult}} {{vm.unit}}</span>
               <div class="alternative-amount">
diff --git a/www/views/review.html b/www/views/review.html
index 36bb67410..b9c190ab5 100644
--- a/www/views/review.html
+++ b/www/views/review.html
@@ -9,7 +9,8 @@
 
   <ion-content class="padded-bottom-cta-with-summary bg-neutral"
     ng-init="memoExpanded = false">
-    <div class="header">
+    <div ng-if="vm.thirdParty && vm.thirdParty.id === 'shapeshift'" ng-include="'views/thirdparty/shapeshift-header.html'"></div>
+    <div class="header" ng-class="vm.thirdParty.id">
       <div class="content">
         <p translate>You are sending</p>
         <p class="large">{{vm.primaryAmount}} {{vm.primaryCurrency}}</amount></p>
diff --git a/www/views/shapeshift.html b/www/views/shapeshift.html
index 81e502631..764ef8851 100644
--- a/www/views/shapeshift.html
+++ b/www/views/shapeshift.html
@@ -7,9 +7,7 @@
     </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 ng-include="'views/thirdparty/shapeshift-header.html'"></div>
     <div class="list card empty-case">
       <div>
         <img class="swap-image" src="img/shapeshift_swap.png"/>
diff --git a/www/views/header-thirdparty.html b/www/views/thirdparty/shapeshift-header.html
similarity index 100%
rename from www/views/header-thirdparty.html
rename to www/views/thirdparty/shapeshift-header.html
diff --git a/www/views/walletSelector.html b/www/views/walletSelector.html
index a4cc4db81..49a7ba208 100644
--- a/www/views/walletSelector.html
+++ b/www/views/walletSelector.html
@@ -4,7 +4,7 @@
     <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/header-thirdparty.html'"></div>
+    <div ng-if="thirdParty && thirdParty.id === 'shapeshift'" ng-include="'views/thirdparty/shapeshift-header.html'"></div>
     <div class="header--request" ng-if="isPaymentRequest">
       <div class="header--request__title" translate>Paying</div>
       <div class="header--request__amount" translate>$... USD</div>