diff --git a/frontend/tests/tests/user/test_application_label.js b/frontend/tests/tests/user/test_application_label.js
index 136339997..c2f74b00c 100644
--- a/frontend/tests/tests/user/test_application_label.js
+++ b/frontend/tests/tests/user/test_application_label.js
@@ -52,7 +52,7 @@ QUnit.test("rendering stop button", function (assert) {
 
   // Test stop button disabled
   assert.ok(
-    appLabel.$el.querySelector('#stop-button').classList.contains('disabled')
+    appLabel.$el.querySelector('#stop-button').classList.contains('disabled-entry')
   );
 
   // Select running application
@@ -61,7 +61,7 @@ QUnit.test("rendering stop button", function (assert) {
   // Test stop button enabled
   Vue.nextTick(function() {
     assert.notOk(
-      appLabel.$el.querySelector('#stop-button').classList.contains('disabled')
+      appLabel.$el.querySelector('#stop-button').classList.contains('disabled-entry')
     );
 
     done();
@@ -107,7 +107,7 @@ QUnit.test("rendering share button", function (assert) {
 
   // Test share button disabled
   assert.ok(
-    appLabel.$el.querySelector('#share-button').classList.contains('disabled')
+    appLabel.$el.querySelector('#share-button').classList.contains('disabled-entry')
   );
 
   // Select running application
@@ -116,7 +116,7 @@ QUnit.test("rendering share button", function (assert) {
   // Test share button disabled (Because clipboard save is not supported in test environment)
   Vue.nextTick(function() {
     assert.ok(
-      appLabel.$el.querySelector('#share-button').classList.contains('disabled')
+      appLabel.$el.querySelector('#share-button').classList.contains('disabled-entry')
     );
 
     done();
diff --git a/frontend/user/vue-components/ApplicationLabel.vue b/frontend/user/vue-components/ApplicationLabel.vue
index 2a9dea9a3..686cf6ebb 100644
--- a/frontend/user/vue-components/ApplicationLabel.vue
+++ b/frontend/user/vue-components/ApplicationLabel.vue
@@ -1,6 +1,6 @@
 <template>
   <ul v-if="currentApp !== null" class="nav navbar-nav">
-    <li class="dropdown">
+    <li class="dropdown notifications-menu">
       <a href="#" class="dropdown-toggle cust-padding" data-toggle="dropdown" aria-expanded="false">
         <img class="app-icon"
         :src="currentApp.appData.image.icon_128 | iconSrc">
@@ -8,35 +8,35 @@
         <span>{{ currentApp.appData.image | appName }}</span>
       </a>
 
-      <ul class="dropdown-menu" role="menu">
-        <li class="disabled">
-          <a href="#">Application settings</a>
-        </li>
-        <li role="separator" class="divider"></li>
+      <ul class="dropdown-menu">
+        <li>
+          <ul class="menu">
 
-        <!-- Stop button -->
-        <li
-        id="stop-button"
-        :class="{ disabled: !currentApp.isRunning() }"
-        @click="stopApplication()">
-          <a href="#">
-            <i class="fa fa-times text-danger"></i>
-            Stop Application
-          </a>
-        </li>
+            <!-- Stop button -->
+            <li>
+              <a href="#"
+              id="stop-button"
+              :class="{ 'disabled-entry': !currentApp.isRunning() }"
+              @click="stopApplication()">
+                <i class="fa fa-times text-danger"></i>
+                Stop Application
+              </a>
+            </li>
 
-        <!-- Share button -->
-        <li
-        id="share-button"
-        :class="{ disabled: !(currentApp.isRunning() && clipboardSupported) }"
-        :data-clipboard-text="sharedUrl">
-          <a href="#">
-            <i class="fa fa-clipboard text-light-blue"></i>
-            Share (copy url to clipboard)
-          </a>
-        </li>
+            <!-- Share button -->
+            <li>
+              <a href="#"
+              id="share-button"
+              :class="{ 'disabled-entry': !(currentApp.isRunning() && clipboardSupported) }"
+              :data-clipboard-text="sharedUrl">
+                <i class="fa fa-clipboard text-light-blue"></i>
+                Share (copy url to clipboard)
+              </a>
+            </li>
 
-        <!-- Put other settings here -->
+            <!-- Put other settings here -->
+          </ul>
+        </li>
       </ul>
     </li>
   </ul>
@@ -98,8 +98,9 @@
     padding: 9px;
   }
 
-  .disabled {
+  .disabled-entry {
     pointer-events: none;
+    opacity: 0.4;
   }
 
   .app-icon {