Merge branch 'release/5.0' into dev

app/views/users/_toolbar.html

@@ -35,15 +35,15 @@ See doc/COPYRIGHT.rdoc for more details.
       <% end %>
     </li>
     <% unless current_user.id == @user.id %>
-      <%= form_for @user, :url => {:action => :change_status},
+      <%= form_for @user, html: { class: 'toolbar-item' }, :url => {:action => :change_status},
                 :method => :post do %>
-        <li class="toolbar-item">
+        <li>
           <%= change_user_status_buttons(@user) %>
         </li>
       <% end %>
     <% end %>
     <% if Setting.users_deletable_by_admins? %>
-      <li class="toolbar-items">
+      <li class="toolbar-item">
         <%= link_to deletion_info_user_path(@user), class: 'button' do %>
           <i class="button--icon icon-delete"></i>
           <span class="button--text"><%= l(:button_delete) %></span>

frontend/app/templates/work_packages/modals/export.html

@@ -7,7 +7,7 @@
     <ul class="export-options">
       <li ng-repeat="option in modal.exportOptions">
         <a ng-href="{{ ::option.url }}" focus="$first">
-          <i class="icon-page-{{ ::option.identifier }} icon-big"></i>
+          <i class="icon-export-{{ ::option.identifier }} icon-big"></i>
           <span class="export-label">{{ ::option.label }}</span>
         </a>
       </li>