diff --git a/css/main.css b/css/main.css
index 9675e67e7..4daccfde7 100644
--- a/css/main.css
+++ b/css/main.css
@@ -288,10 +288,14 @@ hr { margin: 2.25rem 0;}
 }
 .online {
   background-color: black;
-  border: 3px solid green;
+  border: 3px solid #1ABC9C;
+}
+.online:hover {
+  border-color: #16A085;
 }
 .offline {
   border: 3px solid gray;
+  opacity: 0.4;
 }
 
 .tx-copayers {
diff --git a/css/tpl-default.css b/css/tpl-default.css
index f7e9970e3..c4d5c5bd4 100644
--- a/css/tpl-default.css
+++ b/css/tpl-default.css
@@ -140,7 +140,12 @@ a.box-backup:hover i, a.box-backup:hover p {
   color: #FBE500;
 }
 
-.alert-box.warning, .alert-box.error {
+.alert-box.success {
+  background-color: #1ABC9C;
+  border-color: #16A085;
+}
+
+.alert-box.error {
   background-color: #C0392A;
   border-color: #C0392A;
   color: #fff;
diff --git a/img/loading.gif b/img/loading.gif
deleted file mode 100644
index c14d37553..000000000
Binary files a/img/loading.gif and /dev/null differ
diff --git a/index.html b/index.html
index ff4392386..f86ddb2a5 100644
--- a/index.html
+++ b/index.html
@@ -147,7 +147,7 @@
       <div class="signin" ng-controller="SigninController">
         <div data-alert class="alert-box info radius" ng-show="loading">
           <i class="size-21 fi-bitcoin-circle icon-rotate spinner"></i>
-          Looking for peers...
+          Authenticating and Looking for peers...
         </div>
         <div ng-show="!loading">
           <div class="row">
@@ -486,10 +486,10 @@
                       <input type="text" id="address" name="address" placeholder="Send to" ng-model="address" valid-address required>
                     </div>
                     <div class="small-2 columns" ng-hide="showScanner">
-                      <a class="postfix button" ng-click="openScanner()"><i class="fi-camera"></i></a>
+                      <a class="postfix button secondary" ng-click="openScanner()"><i class="fi-camera"></i></a>
                     </div>
                     <div class="small-2 columns" ng-show="showScanner">
-                      <a class="postfix button alert" ng-click="cancelScanner()">Cancel</a>
+                      <a class="postfix button warning" ng-click="cancelScanner()">Cancel</a>
                     </div>
                   </div>
                   <div id="scanner" class="row" ng-if="showScanner">
diff --git a/js/controllers/signin.js b/js/controllers/signin.js
index 96febcb62..5971a1ce2 100644
--- a/js/controllers/signin.js
+++ b/js/controllers/signin.js
@@ -31,6 +31,7 @@ angular.module('copay.signin').controller('SigninController',
         if (!w) {
           $scope.loading = false;
           $rootScope.flashMessage = { message: 'Bad password or connection error', type: 'error'};
+          $rootScope.$digest();
           return;
         }
         controllerUtils.startNetwork(w);
diff --git a/js/directives.js b/js/directives.js
index 4bcef07e5..1df4026d4 100644
--- a/js/directives.js
+++ b/js/directives.js
@@ -72,7 +72,7 @@ angular.module('copay.directives')
         var text = attr.loading;
         scope.$watch('loading', function(val) {
           if (val) {
-            element.html('<img src="img/loading.gif"> ' + text + '...');
+            element.html('<i class="size-21 fi-bitcoin-circle icon-rotate spinner"></i> ' + text + '...');
           } else {
             element.html(a);
           }