diff --git a/app/views/shared/_label.html.haml b/app/views/shared/_label.html.haml
index 3d7cad8ecf8..cf42c0d1bd4 100644
--- a/app/views/shared/_label.html.haml
+++ b/app/views/shared/_label.html.haml
@@ -5,11 +5,11 @@
 - show_label_merge_requests_link = show_label_issuables_link?(label, :merge_requests, project: @project)
 - show_label_issues_link = show_label_issuables_link?(label, :issues, project: @project)
 
-%li.label-list-item{ class: label.priority? ? '' : 'no-hand', id: label_css_id, data: { id: label.id } }
+%li.label-list-item{ class: ('no-hand' unless label.priority?), id: label_css_id, data: { id: label.id } }
   = render "shared/label_row", label: label
   %ul.label-actions-list
     %li.inline
-      .label-badge.label-badge-gray= label.model_name.human.titleize
+      .label-badge.label-badge-gray= label.model_name.human.capitalize
     - if can?(current_user, :admin_label, @project)
       %li.inline.js-toggle-priority.toggle-priority{ data: { url: remove_priority_project_label_path(@project, label),
         dom_id: dom_id(label), type: label.type } }
@@ -22,15 +22,13 @@
           = icon('pencil')
     %li.inline
       .dropdown
-        %button{ type: 'button', class: 'btn btn-transparent js-label-options-dropdown', data: { toggle: "dropdown" } }
+        %button{ type: 'button', class: 'btn btn-transparent js-label-options-dropdown', data: { toggle: 'dropdown' } }
           = custom_icon('ellipsis_v')
         .dropdown-menu.dropdown-menu-align-right
           %ul
             - if label.is_a?(ProjectLabel) && label.project.group && can?(current_user, :admin_label, label.project.group)
               %li
-                %button.js-promote-project-label-button.btn.btn-transparent.btn-action.has-tooltip{ title: _('Promote to Group Label'),
-                  disabled: true,
-                  type: 'button',
+                %button.js-promote-project-label-button.btn.btn-transparent.btn-action{ disabled: true, type: 'button',
                   data: { url: promote_project_label_path(label.project, label),
                           label_title: label.title,
                           label_color: label.color,
@@ -39,18 +37,27 @@
                           target: '#promote-label-modal',
                           container: 'body',
                           toggle: 'modal' } }
-                  = sprite_icon('level-up')
-              %li
-                = link_to 'Delete', destroy_label_path(label), title: 'Delete', method: :delete, data: { confirm: 'Remove this label? Are you sure?' }, class: 'text-danger'
+                  Promote to group label
+            %li
+              = link_to 'Delete', destroy_label_path(label), title: 'Delete', method: :delete, data: { confirm: 'Remove this label? Are you sure?' }, class: 'text-danger'
     - if current_user
       %li.inline.label-subscription
         - if can_subscribe_to_label_in_different_levels?(label)
           %button.js-unsubscribe-button.label-subscribe-button.btn.btn-default{ class: ('hidden' if status.unsubscribed?), data: { url: toggle_subscription_path } }
             %span Unsubscribe
-          %button.js-subscribe-button.label-subscribe-button.btn.btn-default{ class: ('hidden' unless status.unsubscribed?), data: { url: toggle_subscription_project_label_path(@project, label) } }
-            %span Subscribe at project level
-          %button.js-subscribe-button.label-subscribe-button.btn.btn-default{ class: ('hidden' unless status.unsubscribed?), data: { url: toggle_subscription_group_label_path(label.group, label) } }
-            %span Subscribe at group level
+          .dropdown{ class: ('hidden' unless status.unsubscribed?) }
+            %button.label-subscribe-button.btn.btn-default{ data: { toggle: 'dropdown' } }
+              %span
+                Subscribe
+                = icon('chevron-down')
+            .dropdown-menu.dropdown-menu-align-right
+              %ul
+                %li
+                  %button.js-subscribe-button.label-subscribe-button.btn.btn-default{ class: ('hidden' unless status.unsubscribed?), data: { url: toggle_subscription_project_label_path(@project, label) } }
+                    %span Subscribe at project level
+                %li
+                  %button.js-subscribe-button.label-subscribe-button.btn.btn-default{ class: ('hidden' unless status.unsubscribed?), data: { url: toggle_subscription_group_label_path(label.group, label) } }
+                    %span Subscribe at group level
         - else
           %button.js-subscribe-button.label-subscribe-button.btn.btn-default{ data: { status: status, url: toggle_subscription_path } }
             %span= label_subscription_toggle_button_text(label, @project)