diff --git a/public/index.html b/public/index.html
index 4d55c0075..466f32077 100644
--- a/public/index.html
+++ b/public/index.html
@@ -27,8 +27,6 @@
 
         <div notifications="right top"></div> 
         <div ng-include="'views/includes/offline.html'" ng-if="index.isOffline"></div>
-        <div ng-include="'views/includes/clientError.html'" ng-if="index.clientError"></div>
-
         <div ng-include="'views/includes/password.html'" ng-if="index.askPassword"
 ></div>
 
diff --git a/public/views/history.html b/public/views/history.html
index a9ea5e970..e69de29bb 100644
--- a/public/views/history.html
+++ b/public/views/history.html
@@ -1 +0,0 @@
-<div class="extra-margin-bottom"></div>
diff --git a/public/views/includes/clientError.html b/public/views/includes/clientError.html
index de193f2cf..e69de29bb 100644
--- a/public/views/includes/clientError.html
+++ b/public/views/includes/clientError.html
@@ -1,11 +0,0 @@
-<div class="client-error dr-notification-wrapper">
-  <div class="dr-notification">
-    <div class="dr-notification-image">
-      <i class="fi-alert"></i>
-    </div>
-    <div class="dr-notification-content">
-      <h3 class="dr-notification-title">Wallet Service Error</h3>
-      <div class="dr-notification-text ellipsis">{{index.clientError.message || index.clientError}}</div>
-    </div>
-  </div>
-</div>
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index a05dad2e8..5ce10b389 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -58,10 +58,11 @@
         <div class="rect4"></div>
         <div class="rect5"></div>
       </div>
-      <span translate ng-show="index.onGoingProcessName == 'openingWallet'"> Updating Wallet... </span>
-      <span translate ng-show="index.onGoingProcessName == 'updatingStatus'"> Updating Status...</span>
-      <span translate ng-show="index.onGoingProcessName == 'updatingBalance'">Updating Wallet... </span>
-      <span translate ng-show="index.onGoingProcessName == 'updatingPendingTxps'">Updating Wallet...</span>
+      <span translate ng-show="
+index.onGoingProcessName == 'openingWallet'
+|| index.onGoingProcessName == 'updatingStatus'
+|| index.onGoingProcessName == 'updatingBalance'
+"> Updating Wallet... </span>
       <span translate ng-show="index.onGoingProcessName == 'scanning'">Scanning Wallet funds...</span>
       <span translate ng-show="index.onGoingProcessName == 'recreating'">Recreating Wallet...</span>
     </div>
@@ -343,7 +344,7 @@ history
         <span ng-if="!index.updatingTxHistory">
           <span ng-show="index.txHistoryError && !index.notAuthorized" ng-click='index.openWallet()'>
             <span translate>Could not fetch transaction history</span>
-            <br> [<span translate>Tap to retry</span>]
+            <br> <span translate>Tap to retry</span>
           </span>
           <span ng-if="!index.txHistoryError" translate>
             No transactions yet
diff --git a/src/css/main.css b/src/css/main.css
index d41667a74..8e5e605eb 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -1115,7 +1115,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
   top:auto;
   left:0;
   right:0;
-  bottom:90px;
+  bottom:200px;
   margin: auto;
   border-radius: 3px;
   color: #fff;
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index d2b241eda..1a5ca6f1a 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -72,7 +72,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     self.alternativeBalanceAvailable = false;
     self.totalBalanceAlternative = null;
     self.notAuthorized = false;
-    self.clientError = null;
     self.txHistory = [];
     self.txHistoryPaging = false;
 
@@ -411,17 +410,27 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   };
 
 
+  self.clientError = function (err) {
+    if (isCordova) {
+      navigator.notification.confirm(
+        err,
+        function() {},
+        'Wallet Server Error', ['OK']
+      );
+    } else {
+      alert(err);
+    }
+  };
 
   self.recreate = function(cb) {
     var fc = profileService.focusedClient;
     self.setOngoingProcess('recreating', true);
-    self.clientError = null;
     fc.recreateWallet(function(err) {
       self.notAuthorized = false;
       self.setOngoingProcess('recreating', false);
 
       if (err) {
-        self.clientError = 'Could not recreate wallet:' + err;
+        self.clientError('Could not recreate wallet:' + err);
         $rootScope.$apply();
         return;
       }
@@ -458,7 +467,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
       if (err) {
         if (self.walletId == walletId)
           self.setOngoingProcess('scanning', false);
-        self.clientError = 'Could not scan wallet:' + err;
+        self.clientError = ('Could not scan wallet:' + err);
         $rootScope.$apply();
       }
     });
@@ -522,7 +531,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     $rootScope.$on(eventName, function(event) {
       $log.debug('### Online event');
       self.isOffline = false;
-      self.clientError = null;
       self.updateAll();
       self.updateTxHistory();
     });
@@ -544,7 +552,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   });
 
   $rootScope.$on('Local/BWSNotFound', function(event) {
-    self.clientError = 'Could not access to Bitcore Wallet Service: Service not found';
+    self.clientError('Could not access to Bitcore Wallet Service: Service not found');
     $rootScope.$apply();
   });
 
@@ -557,7 +565,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     } else if (err.code === 'ETIMEDOUT') {
       $log.debug('Time out:', err);
     } else {
-      self.clientError = err;
+      self.clientError(err && err.message ? 'Error at Bitcore Wallet Service:' + err.message : err);
     }
     $rootScope.$apply();
   });
@@ -627,7 +635,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     $timeout(function() {
       self.hasProfile = true;
       self.noFocusedWallet = true;
-      self.clientError = null;
       self.isComplete = null;
       self.walletName = null;
       go.addWallet();