diff --git a/frontend/tests/tests/user/test_application_view.js b/frontend/tests/tests/user/test_application_view.js
index 6157830c3..a6226edcb 100644
--- a/frontend/tests/tests/user/test_application_view.js
+++ b/frontend/tests/tests/user/test_application_view.js
@@ -131,11 +131,6 @@ QUnit.test("rendering start button", function (assert) {
   model.appList[0].status = 'STARTING';
 
   Vue.nextTick(function() {
-    assert.equal(
-      appView.$el.querySelector('.start-button').innerHTML.trim(),
-      'Starting'
-    );
-
     assert.ok(
       appView.$el.querySelector('.start-button').disabled
     );
@@ -144,11 +139,6 @@ QUnit.test("rendering start button", function (assert) {
     model.appList[0].status = 'STOPPING';
 
     Vue.nextTick(function() {
-      assert.equal(
-        appView.$el.querySelector('.start-button').innerHTML.trim(),
-        'Stopping'
-      );
-
       assert.ok(
         appView.$el.querySelector('.start-button').disabled
       );
diff --git a/frontend/user/vue-components/ApplicationListView.vue b/frontend/user/vue-components/ApplicationListView.vue
index 21046a163..3de524578 100644
--- a/frontend/user/vue-components/ApplicationListView.vue
+++ b/frontend/user/vue-components/ApplicationListView.vue
@@ -16,7 +16,7 @@
       <!-- Loading spinner -->
       <li v-show="model.loading" id="loading-spinner">
         <a href="#">
-          <i class="fa fa-spinner fa-spin"></i>
+          <i class="fa fa-refresh fa-spin"></i>
           <span>Loading</span>
         </a>
       </li>
diff --git a/frontend/user/vue-components/ApplicationView.vue b/frontend/user/vue-components/ApplicationView.vue
index 5e4633a8e..a578de9da 100644
--- a/frontend/user/vue-components/ApplicationView.vue
+++ b/frontend/user/vue-components/ApplicationView.vue
@@ -54,9 +54,12 @@
           <div class="box-footer">
             <button id="start-button" class="btn btn-primary pull-right start-button"
             @click="startApplication()"
-            :disabled="!currentApp.isStopped()">
-              {{ {STOPPED: 'Start', STARTING: 'Starting', STOPPING: 'Stopping'}[currentApp.status] }}
-            </button>
+            :disabled="!currentApp.isStopped()"> Start </button>
+          </div>
+
+          <!-- Loading spinner -->
+          <div class="overlay" v-show="!currentApp.isStopped()">
+            <i class="fa fa-refresh fa-spin"></i>
           </div>
         </div>
       </div>
@@ -136,10 +139,6 @@
     padding: 0px;
   }
 
-  .start-button {
-    min-width: 80px;
-  }
-
   .app-logo {
     border-radius: 20%;
   }