diff --git a/webadmin/dist/views/appstore.html b/webadmin/dist/views/appstore.html
index cd76b084a..3050657ad 100644
--- a/webadmin/dist/views/appstore.html
+++ b/webadmin/dist/views/appstore.html
@@ -1,13 +1,6 @@
-<div class="row">
-    <div class="col-lg-12">
-        <br/>
-    </div>
-</div>
-
 <div class="row animateMeOpacity ng-hide" ng-show="loadStatus == LOADING">
-    <div class="col-lg-12" style="text-align: center;">
-        <h2>Loading</h2>
-        <i class="fa fa-circle-o-notch fa-spin fa-5x"></i>
+    <div class="col-lg-12 text-center">
+        <h2><i class="fa fa-spinner fa-pulse"></i> Loading</h2>
     </div>
 </div>
 
diff --git a/webadmin/dist/views/userlist.html b/webadmin/dist/views/userlist.html
index 1a7d4a268..4a36094fa 100644
--- a/webadmin/dist/views/userlist.html
+++ b/webadmin/dist/views/userlist.html
@@ -1,21 +1,18 @@
-<div class="row">
-    <div class="col-lg-12">
-        <h1 class="page-header">Users</h1>
-    </div>
-</div>
-
-<div class="row" ng-show="userInfo.admin">
-    <div class="col-lg-12">
-        <button class="btn btn-primary btn-outline pull-right" ng-click="addUser()">New User</button>
-    </div>
-</div>
-
 <div class="row animateMeOpacity ng-hide" ng-show="!ready">
-    <div class="col-lg-12" class="text-center">
-        <center>
-            <h2>Loading</h2>
-            <i class="fa fa-circle-o-notch fa-spin fa-5x"></i>
-        </center>
+    <div class="col-lg-12 text-center">
+        <h2><i class="fa fa-spinner fa-pulse"></i> Loading</h2>
+    </div>
+</div>
+
+<div class="row animateMeOpacity ng-hide" ng-show="ready">
+    <div class="col-lg-12">
+        <h1>Users</h1>
+    </div>
+</div>
+
+<div class="row animateMeOpacity ng-hide" ng-show="ready && userInfo.admin">
+    <div class="col-lg-12">
+        <button class="btn btn-primary btn-outline pull-right" ng-click="addUser()"><i class="fa fa-user-plus"></i> New User</button>
     </div>
 </div>
 
diff --git a/webadmin/src/views/appstore.html b/webadmin/src/views/appstore.html
index cd76b084a..3050657ad 100644
--- a/webadmin/src/views/appstore.html
+++ b/webadmin/src/views/appstore.html
@@ -1,13 +1,6 @@
-<div class="row">
-    <div class="col-lg-12">
-        <br/>
-    </div>
-</div>
-
 <div class="row animateMeOpacity ng-hide" ng-show="loadStatus == LOADING">
-    <div class="col-lg-12" style="text-align: center;">
-        <h2>Loading</h2>
-        <i class="fa fa-circle-o-notch fa-spin fa-5x"></i>
+    <div class="col-lg-12 text-center">
+        <h2><i class="fa fa-spinner fa-pulse"></i> Loading</h2>
     </div>
 </div>
 
diff --git a/webadmin/src/views/userlist.html b/webadmin/src/views/userlist.html
index 1a7d4a268..4a36094fa 100644
--- a/webadmin/src/views/userlist.html
+++ b/webadmin/src/views/userlist.html
@@ -1,21 +1,18 @@
-<div class="row">
-    <div class="col-lg-12">
-        <h1 class="page-header">Users</h1>
-    </div>
-</div>
-
-<div class="row" ng-show="userInfo.admin">
-    <div class="col-lg-12">
-        <button class="btn btn-primary btn-outline pull-right" ng-click="addUser()">New User</button>
-    </div>
-</div>
-
 <div class="row animateMeOpacity ng-hide" ng-show="!ready">
-    <div class="col-lg-12" class="text-center">
-        <center>
-            <h2>Loading</h2>
-            <i class="fa fa-circle-o-notch fa-spin fa-5x"></i>
-        </center>
+    <div class="col-lg-12 text-center">
+        <h2><i class="fa fa-spinner fa-pulse"></i> Loading</h2>
+    </div>
+</div>
+
+<div class="row animateMeOpacity ng-hide" ng-show="ready">
+    <div class="col-lg-12">
+        <h1>Users</h1>
+    </div>
+</div>
+
+<div class="row animateMeOpacity ng-hide" ng-show="ready && userInfo.admin">
+    <div class="col-lg-12">
+        <button class="btn btn-primary btn-outline pull-right" ng-click="addUser()"><i class="fa fa-user-plus"></i> New User</button>
     </div>
 </div>