diff --git a/public/views/includes/backupWarningPopup.html b/public/views/includes/backupWarningPopup.html
index fbe1b79fd..b5cfecee9 100644
--- a/public/views/includes/backupWarningPopup.html
+++ b/public/views/includes/backupWarningPopup.html
@@ -1,7 +1,7 @@
 <div>
   <h1 translate>Screenshots are not secure</h1>
   <span translate>if you take a screenshot, your backup may be viewed by others apps. You can make a safe backup with paper and a pen.</span>
-  <button ng-click="close()" class="button button-block button-light" translate>
+  <button ng-click="close()" class="button button-block no-border" translate>
     Got it
   </button>
 </div>
diff --git a/public/views/onboarding/backupRequest.html b/public/views/onboarding/backupRequest.html
index 6044406d5..f7099033f 100644
--- a/public/views/onboarding/backupRequest.html
+++ b/public/views/onboarding/backupRequest.html
@@ -17,7 +17,8 @@
       <i class="ion-ios-arrow-thin-down light-blue col col-60" id="arrow-down"></i>
     </div>
     <div class="row">
-      <button class="button button-block button-positive col-75 col" href ui-sref="onboarding.backupWarning" translate>Backup wallet</button>
+      <button class="button button-block button-positive col-75 col" href
+              ui-sref="onboarding.backupWarning({walletId: walletId})" translate>Backup wallet</button>
     </div>
     <div class="row">
       <button class="button button-block button-transparent col-75 col" ng-click="openPopup()" translate>I'll backup my wallet later</button>
diff --git a/public/views/onboarding/backupWarning.html b/public/views/onboarding/backupWarning.html
index a6f0bafee..d3406fb13 100644
--- a/public/views/onboarding/backupWarning.html
+++ b/public/views/onboarding/backupWarning.html
@@ -1,12 +1,12 @@
-<ion-view id="onboarding-backup-warning" class="onboarding">
-  <ion-nav-bar class="bar-stable">
+<ion-view id="onboarding-backup-warning" class="onboarding" ng-controller="backupWarningController">
+  <ion-nav-bar>
     <ion-nav-buttons side="primary">
-      <button class="button no-border" href ui-sref="onboarding.backupRequest">
+      <button class="button button-back no-border" href ui-sref="onboarding.backupRequest({walletId: walletId})">
         <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>
-  <ion-content ng-controller="backupWarningController">
+  <ion-content>
     <div class="row text-center">
       <h3 translate class="col col-75">
         Are you being watched?
diff --git a/public/views/onboarding/collectEmail.html b/public/views/onboarding/collectEmail.html
index edcc2c96e..5f01e1e53 100644
--- a/public/views/onboarding/collectEmail.html
+++ b/public/views/onboarding/collectEmail.html
@@ -1,11 +1,4 @@
 <ion-view ng-controller="collectEmailController" id="onboarding-collect-email" class="onboarding">
-  <ion-nav-bar class="bar-stable">
-    <ion-nav-buttons side="secondary">
-      <button class="button no-border" ng-click="onboardingMailSkip()">
-        {{'Skip' | translate}}
-      </button>
-    </ion-nav-buttons>
-  </ion-nav-bar>
   <ion-content>
     <div class="row">
       <img src="img/onboarding-success.svg" class="col col-75" id="success-image" />
@@ -24,6 +17,11 @@
         <input type="email" id="email" name="email" ng-model="email" required></input>
       </label>
     </form>
+    <div class="text-center">
+      <button class="button button-back no-border" ng-click="onboardingMailSkip()">
+        {{'Skip' | translate}}
+      </button>
+    </div>
   </div>
   <div class="overlay"></div>
 </ion-view>
diff --git a/public/views/onboarding/notifications.html b/public/views/onboarding/notifications.html
index 3d5b3f6f9..d086b1355 100644
--- a/public/views/onboarding/notifications.html
+++ b/public/views/onboarding/notifications.html
@@ -10,7 +10,7 @@
       </span>
 
       <button class="button button-block button-positive" ng-click="allowNotif()" translate>Allow notifications</button>
-      <button class="button button-block  button-light" href ui-sref="onboarding.backupRequest" translate>Not now</button>
+      <button class="button button-block  button-light" href ui-sref="onboarding.backupRequest({walletId: walletId})" translate>Not now</button>
     </div>
   </ion-content>
 </ion-view>
diff --git a/src/js/controllers/onboarding/backupRequest.js b/src/js/controllers/onboarding/backupRequest.js
index 60ae381f2..8284baafb 100644
--- a/src/js/controllers/onboarding/backupRequest.js
+++ b/src/js/controllers/onboarding/backupRequest.js
@@ -1,7 +1,8 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('backupRequestController', function($scope, $state, $ionicPopup) {
+angular.module('copayApp.controllers').controller('backupRequestController', function($scope, $state, $stateParams, $ionicPopup) {
 
+  $scope.walletId = $stateParams.walletId;
   $scope.openPopup = function() {
     var backupLaterPopup = $ionicPopup.show({
       templateUrl: "views/includes/backupLaterPopup.html",
diff --git a/src/js/controllers/onboarding/backupWarning.js b/src/js/controllers/onboarding/backupWarning.js
index cb4aa4934..b7099ed8a 100644
--- a/src/js/controllers/onboarding/backupWarning.js
+++ b/src/js/controllers/onboarding/backupWarning.js
@@ -1,7 +1,8 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('backupWarningController', function($scope, $state, $ionicPopup, $stateParams, profileService) {
+angular.module('copayApp.controllers').controller('backupWarningController', function($scope, $state, $stateParams, $ionicPopup, profileService) {
 
+  $scope.walletId = $stateParams.walletId;
   $scope.openPopup = function() {
     var backupWarningPopup = $ionicPopup.show({
       templateUrl: "views/includes/backupWarningPopup.html",
@@ -10,7 +11,7 @@ angular.module('copayApp.controllers').controller('backupWarningController', fun
 
     $scope.close = function() {
       backupWarningPopup.close();
-      $state.go('onboarding.backup');
+      $state.go('onboarding.backup', {walletId: $stateParams.walletId, fromOnboarding: true});
     };
   }
 });
diff --git a/src/js/controllers/onboarding/collectEmail.js b/src/js/controllers/onboarding/collectEmail.js
index 58122bd74..a383a78b3 100644
--- a/src/js/controllers/onboarding/collectEmail.js
+++ b/src/js/controllers/onboarding/collectEmail.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('collectEmailController', function($scope, $state, $stateParams, profileService, configService, walletService, platformInfo) {
+angular.module('copayApp.controllers').controller('collectEmailController', function($scope, $state, $stateParams, $ionicScrollDelegate, profileService, configService, walletService, platformInfo) {
 
   var isCordova = platformInfo.isCordova;
   var isWP = platformInfo.isWP;
@@ -25,13 +25,13 @@ angular.module('copayApp.controllers').controller('collectEmailController', func
       if (err) $log.warn(err);
       configService.set(opts, function(err) {
         if (err) $log.warn(err);
-        if (!usePushNotifications) $state.go('onboarding.backupRequest');
-        else $state.go('onboarding.notifications');
+        if (!usePushNotifications) $state.go('onboarding.backupRequest', {walletId: walletId});
+        else $state.go('onboarding.notifications', {walletId: walletId});
       });
     });
   };
 
   $scope.onboardingMailSkip = function() {
-    $state.go('onboarding.backupRequest');
+    $state.go('onboarding.backupRequest', {walletId: walletId});
   };
 });
diff --git a/src/js/controllers/onboarding/notifications.js b/src/js/controllers/onboarding/notifications.js
index 2b40cd65a..6252a77e7 100644
--- a/src/js/controllers/onboarding/notifications.js
+++ b/src/js/controllers/onboarding/notifications.js
@@ -1,7 +1,9 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('notificationsController', function($scope, $state, profileService) {
+angular.module('copayApp.controllers').controller('notificationsController', function($scope, $state, $stateParams, profileService) {
+console.log('[notifications.js:3]',$stateParams); //TODO
 
+  $scope.walletId = $stateParams.walletId;
   $scope.allowNotif = function() {
     profileService.pushNotificationsInit();
     $state.go('onboarding.backupRequest');
diff --git a/src/js/routes.js b/src/js/routes.js
index b3878fce1..7660ebf31 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -560,11 +560,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
     .state('onboarding', {
         url: '/onboarding',
         abstract: true,
-        template: '<ion-nav-view name="onboarding"></ion-nav-view>',
-        params: {
-          walletId: null,
-          fromOnboarding: null,
-        },
+        template: '<ion-nav-view name="onboarding"></ion-nav-view>'
       })
       .state('onboarding.welcome', {
         url: '/welcome',
@@ -583,7 +579,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       })
       .state('onboarding.collectEmail', {
-        url: '/collectEmail',
+        url: '/collectEmail/:walletId',
         views: {
           'onboarding': {
             templateUrl: 'views/onboarding/collectEmail.html'
@@ -591,7 +587,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       })
       .state('onboarding.notifications', {
-        url: '/notifications',
+        url: '/notifications/:walletId',
         views: {
           'onboarding': {
             templateUrl: 'views/onboarding/notifications.html'
@@ -599,7 +595,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       })
       .state('onboarding.backupRequest', {
-        url: '/backupRequest',
+        url: '/backupRequest/:walletId',
         views: {
           'onboarding': {
             templateUrl: 'views/onboarding/backupRequest.html'
@@ -607,7 +603,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       })
       .state('onboarding.backupWarning', {
-        url: '/backupWarning',
+        url: '/backupWarning/:walletId',
         views: {
           'onboarding': {
             templateUrl: 'views/onboarding/backupWarning.html'
@@ -615,7 +611,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       })
       .state('onboarding.backup', {
-        url: '/backup',
+        url: '/backup/:walletId/:fromOnboarding',
         views: {
           'onboarding': {
             templateUrl: 'views/backup.html'
@@ -647,7 +643,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
           },
         },
         params: {
-          code: null
+          code: null,
+          fromOnboarding: null
         },
       })
       .state('onboarding.import.phrase', {
diff --git a/src/sass/views/onboarding/onboard-collect-email.scss b/src/sass/views/onboarding/onboard-collect-email.scss
index 427ab466f..7ffd453bb 100644
--- a/src/sass/views/onboarding/onboard-collect-email.scss
+++ b/src/sass/views/onboarding/onboard-collect-email.scss
@@ -11,7 +11,7 @@
     opacity: 1;
     background: #fff;
     color: rgb(108, 108, 108);
-    height: 11rem;
+    height: 13rem;
     animation-name: topBottom;
     animation-iteration-count: 1;
     animation-timing-function: ease-in;
@@ -22,6 +22,7 @@
     animation-fill-mode: forwards;
     z-index: 5;
     margin-top: 0;
+    width: 100%;
     label {
       background: rgba(200, 200, 200, 0.20);
       height: 3rem;
diff --git a/src/sass/views/onboarding/onboarding.scss b/src/sass/views/onboarding/onboarding.scss
index ac2d1d698..55846f08d 100644
--- a/src/sass/views/onboarding/onboarding.scss
+++ b/src/sass/views/onboarding/onboarding.scss
@@ -34,7 +34,7 @@
       background-size: contain;
       width: 100%;
       clear: both;
-      height: 20rem;
+      height: 23rem;
       margin-bottom: -3rem;
       background-position: center;
       background-repeat: no-repeat;