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/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/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);
           }