diff --git a/src/js/controllers/onboarding/tour.js b/src/js/controllers/onboarding/tour.js
index 4803bda37..47261006b 100644
--- a/src/js/controllers/onboarding/tour.js
+++ b/src/js/controllers/onboarding/tour.js
@@ -33,6 +33,7 @@ angular.module('copayApp.controllers').controller('tourController',
         $scope.localCurrencyPerBtc = $filter('formatFiatAmount')(parseFloat(rate.toFixed(2), 10));
         $timeout(function() {
           $scope.$apply();
+          $scope.createDefaultWallet();
         })
       });
     });
@@ -93,12 +94,12 @@ angular.module('copayApp.controllers').controller('tourController',
 
           $q.all([bchAddressPromise, btcAddressPromise]).then(function(addresses) {
             ongoingProcess.set('generatingNewAddress', false);
-            goToCollectEmail();
+            $state.go('tabs.home');
           }, function(e) {
             ongoingProcess.set('generatingNewAddress', false);
             $log.warn(e);
             popupService.showAlert(gettextCatalog.getString('Error'), e);
-            goToCollectEmail();
+            $state.go('tabs.home');
           });
         });
       }, 300);
diff --git a/src/sass/icons.scss b/src/sass/icons.scss
index 9204718d5..b083835d8 100644
--- a/src/sass/icons.scss
+++ b/src/sass/icons.scss
@@ -83,3 +83,7 @@
     content: '';
   }
 }
+
+.loading .spinner svg {
+  margin-top: 0;
+}
\ No newline at end of file
diff --git a/www/css/main.css b/www/css/main.css
index dfdcd76e2..1cc07e123 100644
--- a/www/css/main.css
+++ b/www/css/main.css
@@ -10038,6 +10038,9 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm
     right: 0;
     content: ''; }
 
+.loading .spinner svg {
+  margin-top: 0; }
+
 .button.button-primary.button-standard, .button.button-secondary.button-standard, .button.button-light.button-standard, .button.button-assertive.button-standard,
 .onboarding .button.button-primary.button-standard,
 .onboarding .button.button-secondary.button-standard,
diff --git a/www/views/onboarding/tour.html b/www/views/onboarding/tour.html
index 4d9926b5b..9d77d078f 100644
--- a/www/views/onboarding/tour.html
+++ b/www/views/onboarding/tour.html
@@ -3,16 +3,5 @@
     <ion-nav-title></ion-nav-title>
   </ion-nav-bar>
   <ion-content id="onboard-tour-control" scroll="false" ng-init="createProfile()">
-    <img src='img/app/logo-negative.png' id="logo" />
-    <div class="onboarding-topic" translate>You control your bitcoin.</div>
-    <div class="onboarding-description" translate>This app stores your bitcoin locally on your device with cutting-edge security.</div>
-    <div class="onboarding-illustration-control"></div>
-    <div class="cta-buttons">
-      <div class="onboarding-tldr" translate>Not even Bitcoin.com can access it.</div>
-      <button class="button button-standard button-primary" ng-click="createDefaultWallet()" translate>
-        Create bitcoin wallet
-      </button>
-      <button class="button button-standard button-secondary button-clear" id="restore" translate href ui-sref="onboarding.import({'fromOnboarding':true})">Restore from backup</button>
-    </div>
   </ion-content>
 </ion-view>