diff --git a/src/js/controllers/addresses.js b/src/js/controllers/addresses.js
index f0525a517..48f1a377f 100644
--- a/src/js/controllers/addresses.js
+++ b/src/js/controllers/addresses.js
@@ -37,8 +37,8 @@ angular.module('copayApp.controllers').controller('addressesController', functio
       var allAddresses = addresses;
 
       walletService.getBalance($scope.wallet, {}, function(err, resp) {
-        $scope.loading = false;
         if (err) {
+          $scope.loading = false;
           return popupService.showAlert(bwcError.msg(err, gettextCatalog.getString('Could not update wallet')));
         }
 
@@ -64,9 +64,12 @@ angular.module('copayApp.controllers').controller('addressesController', functio
         $scope.allAddresses = $scope.noBalance.concat(withBalance);
 
         cachedWallet = $scope.wallet.id;
+        $scope.loading = false;
         $log.debug('Addresses cached for Wallet:', cachedWallet);
-        $ionicScrollDelegate.resize();
-        $scope.$digest();
+        $timeout(function() {
+          $ionicScrollDelegate.resize();
+          $scope.$digest();
+        });
       });
     });
   };
diff --git a/src/sass/views/addresses.scss b/src/sass/views/addresses.scss
index 8e3513da9..c13eda8b4 100644
--- a/src/sass/views/addresses.scss
+++ b/src/sass/views/addresses.scss
@@ -1,4 +1,15 @@
 #addresses {
+  @extend .deflash-blue;
+  .updating {
+    text-align: center;
+    font-size: 0.9em;
+    color: $v-mid-gray;
+    padding-top: 1.3rem;
+    .spinner svg {
+      stroke: #111;
+      fill: #111;
+    }
+  }
   .addr {
     &-explanation, &-button-group {
       padding: 0 1rem;
diff --git a/www/views/addresses.html b/www/views/addresses.html
index 6701b33b4..8250df646 100644
--- a/www/views/addresses.html
+++ b/www/views/addresses.html
@@ -36,14 +36,8 @@
         </div>
 
         <div ng-if="loading" class="updating">
-          <div class="item item-divider row">
-            <ion-spinner class="spinner-dark" icon="crescent"></ion-spinner>
-          </div>
-          <div class="row">
-            <div class="col">
-              <span translate>Loading addresses...</span>
-            </div>
-          </div>
+          <ion-spinner class="spinner-dark recent" icon="crescent"></ion-spinner>
+          <span translate>Loading addresses...</span>
         </div>
 
         <div ng-if="latestUnused[0]">
diff --git a/www/views/allAddresses.html b/www/views/allAddresses.html
index 5151964ec..4e1768eab 100644
--- a/www/views/allAddresses.html
+++ b/www/views/allAddresses.html
@@ -10,14 +10,8 @@
       <div class="item item-divider"></div>
 
       <div ng-if="loading" class="updating">
-        <div class="row">
-          <ion-spinner class="spinner-dark" icon="crescent"></ion-spinner>
-        </div>
-        <div class="row">
-          <div class="col">
-            <span translate>Loading addresses...</span>
-          </div>
-        </div>
+        <ion-spinner class="spinner-dark recent" icon="crescent"></ion-spinner>
+        <span translate>Loading addresses...</span>
       </div>
 
       <div ng-show="isCordova && allAddresses[0]">