diff --git a/app/views/context_menus/projects.html.erb b/app/views/context_menus/projects.html.erb
index ba18b4e06..390843ffb 100644
--- a/app/views/context_menus/projects.html.erb
+++ b/app/views/context_menus/projects.html.erb
@@ -1,19 +1,19 @@
 <ul>
   <% if @project && !@project.scheduled_for_deletion? %>
     <% if @project.archived? %>
-      <li><%= context_menu_link l(:button_unarchive), unarchive_project_path(@project), method: :post, class: 'icon icon-unlock' %></li>
+      <li><%= context_menu_link icon_with_label('unlock', l(:button_unarchive)), unarchive_project_path(@project), method: :post, class: 'icon icon-unlock' %></li>
     <% else %>
-      <li><%= context_menu_link l(:button_archive), archive_project_path(@project), data: {confirm: l(:text_project_archive_confirmation, @project.to_s)}, method: :post, class: 'icon icon-lock' %></li>
+      <li><%= context_menu_link icon_with_label('lock', l(:button_archive)), archive_project_path(@project), data: {confirm: l(:text_project_archive_confirmation, @project.to_s)}, method: :post, class: 'icon icon-lock' %></li>
     <% end %>
     <li>
       <%= context_menu_link icon_with_label('copy', l(:button_copy)), copy_project_path(@projects), class: 'icon icon-copy' %>
     </li>
     <li>
-      <%= context_menu_link l(:button_delete), project_path(@project, back_url: @back), method: :delete, class: 'icon icon-del' %>
+      <%= context_menu_link icon_with_label('del', l(:button_delete)), project_path(@project, back_url: @back), method: :delete, class: 'icon icon-del' %>
     </li>
   <% else %>
     <li>
-      <%= context_menu_link l(:button_delete),
+      <%= context_menu_link icon_with_label('del', l(:button_delete)),
         {controller: 'projects', action: 'bulk_destroy', ids: @projects.map(&:id), back_url: @back},
         method: :delete, data: {confirm: l(:text_projects_bulk_destroy_confirmation)}, class: 'icon icon-del' %>
     </li>
diff --git a/app/views/context_menus/users.html.erb b/app/views/context_menus/users.html.erb
index 4fa60779b..36dd1837c 100644
--- a/app/views/context_menus/users.html.erb
+++ b/app/views/context_menus/users.html.erb
@@ -2,11 +2,11 @@
   <% if @user %>
     <% if @user.locked? %>
       <li>
-        <%= context_menu_link l(:button_unlock), user_path(@user, user: { status: User::STATUS_ACTIVE }, back_url: @back), method: :put, class: 'icon icon-unlock' %>
+        <%= context_menu_link icon_with_label('unlock', l(:button_unlock)), user_path(@user, user: { status: User::STATUS_ACTIVE }, back_url: @back), method: :put, class: 'icon icon-unlock' %>
       </li>
     <% elsif User.current != @user %>
       <li>
-        <%= context_menu_link l(:button_lock), user_path(@user, user: { status: User::STATUS_LOCKED }, back_url: @back), method: :put, class: 'icon icon-lock' %>
+        <%= context_menu_link icon_with_label('lock', l(:button_lock)), user_path(@user, user: { status: User::STATUS_LOCKED }, back_url: @back), method: :put, class: 'icon icon-lock' %>
       </li>
     <% end %>
 
@@ -16,22 +16,22 @@
 
     <% unless User.current == @user %>
       <li>
-        <%= context_menu_link l(:button_delete), user_path(@user, back_url: @back),
+        <%= context_menu_link icon_with_label('del', l(:button_delete)), user_path(@user, back_url: @back),
           method: :delete, class: 'icon icon-del' %>
       </li>
     <% end %>
   <% else %>
     <% unless @users.all?(&:locked?) %>
       <li>
-        <%= context_menu_link l(:button_lock), bulk_lock_users_path(ids: @users.map(&:id)), method: :post, class: 'icon icon-lock' %>
+        <%= context_menu_link icon_with_label('lock', l(:button_lock)), bulk_lock_users_path(ids: @users.map(&:id)), method: :post, class: 'icon icon-lock' %>
       </li>
     <% else %>
       <li>
-        <%= context_menu_link l(:button_unlock), bulk_unlock_users_path(ids: @users.map(&:id)), method: :post, class: 'icon icon-unlock' %>
+        <%= context_menu_link icon_with_label('unlock', l(:button_unlock)), bulk_unlock_users_path(ids: @users.map(&:id)), method: :post, class: 'icon icon-unlock' %>
       </li>
     <% end %>
     <li>
-      <%= context_menu_link l(:button_delete),
+      <%= context_menu_link icon_with_label('del', l(:button_delete)),
         {controller: 'users', action: 'bulk_destroy', ids: @users.map(&:id)},
         method: :delete, class: 'icon icon-del' %>
     </li>