diff --git a/app/assets/stylesheets/layout/_toolbar.lsg b/app/assets/stylesheets/layout/_toolbar.lsg
index 91be7f2156..22aa7f3d6c 100644
--- a/app/assets/stylesheets/layout/_toolbar.lsg
+++ b/app/assets/stylesheets/layout/_toolbar.lsg
@@ -62,8 +62,9 @@ A toolbar that can and should be used for actions on the current view. Initially
         </select>
       </li>
       <li class="toolbar-item -icon-only">
-        <a href="#" class="button -highlight">
+        <a href="#" class="button -highlight" aria-label="Add" title="Add">
           <i class="button--icon icon-add"></i>
+          <span class="button--text">Add</span>
         </a>
       </li>
     </ul>
diff --git a/app/assets/stylesheets/open_project_global/_variables.sass b/app/assets/stylesheets/open_project_global/_variables.sass
index 45c5f8ef46..6091a7db0c 100644
--- a/app/assets/stylesheets/open_project_global/_variables.sass
+++ b/app/assets/stylesheets/open_project_global/_variables.sass
@@ -189,7 +189,7 @@ $wiki-toc-ul-font-size:                         0.8em !default
 
 $journal-attribute-font-size:                   11px !default
 
-$repository-entry-filename-margin-left:         24px !default
+$repository-entry-filename-margin-left:         28px !default
 
 $user-avatar-border-radius:                     50px !default
 $user-avatar-width:                             36px !default
diff --git a/app/helpers/work_packages_helper.rb b/app/helpers/work_packages_helper.rb
index 1b722c68e9..d37260038f 100644
--- a/app/helpers/work_packages_helper.rb
+++ b/app/helpers/work_packages_helper.rb
@@ -109,7 +109,7 @@ module WorkPackagesHelper
 
     # title part
 
-    parts[:title] << package.subject
+    parts[:title] << (options[:title].nil? ? package.subject : options[:title])
 
     # combining
 
@@ -119,6 +119,7 @@ module WorkPackagesHelper
     hidden_link = parts[:hidden_link].join('')
     title = parts[:title].join(' ')
     css_class = parts[:css_class].join(' ')
+    css_class << options[:class].to_s
 
     # Determine path or url
     work_package_link =
diff --git a/app/views/common/_calendar.html.erb b/app/views/common/_calendar.html.erb
index 7ea302eb55..0f33f02cab 100644
--- a/app/views/common/_calendar.html.erb
+++ b/app/views/common/_calendar.html.erb
@@ -45,16 +45,17 @@ while day <= calendar.enddt %>
             <% if i.is_a? WorkPackage %>
               <div class="<%= work_package_css_classes(i) %> tooltip">
                 <%= h("#{i.project} -") unless @project && @project == i.project %>
-                <%# date_img = '' %>
                 <% if day == i.start_date and day == i.due_date %>
-                  <% date_img = content_tag(:span, '', class: "icon icon-milestone diamond") %>
+                  <% classes = " icon icon-milestone diamond" %>
                 <% elsif day == i.start_date %>
-                  <% date_img = content_tag(:span, '', class: "icon icon-arrow-right4 starting") %>
+                  <% classes = " icon icon-arrow-right4 starting" %>
+                  <% title = t('timelines.start') + ' ' + i.subject %>
                 <% elsif day == i.due_date %>
-                  <% date_img = content_tag(:span, '', class: "icon icon-arrow-right4 ending") %>
+                  <% classes = " icon icon-arrow-right4 ending" %>
+                  <% title = t('timelines.end') + ' ' + i.subject %>
                 <% end %>
-                <%= date_img %>
-                <%= link_to_work_package i, truncate: 30%>
+                <span class="hidden-for-sighted"><%= title %></span>
+                <%= link_to_work_package i, { truncate: 30, class: classes.to_s, title: title } %>
                 <span class="tip"><%= render_issue_tooltip i %></span>
               </div>
             <% else %>
diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb
index 8d16311c56..fb4bec8054 100644
--- a/app/views/repositories/_dir_list_content.html.erb
+++ b/app/views/repositories/_dir_list_content.html.erb
@@ -49,7 +49,7 @@ See doc/COPYRIGHT.rdoc for more details.
       <% end %>
       <%=  link_to h(ent_name),
           {action: (entry.dir? ? 'show' : 'changes'), project_id: @project, path: to_path_param(ent_path), rev: @rev},
-          class: (entry.dir? ? 'icon-context icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
+          class: 'icon-context ' + (entry.dir? ? 'icon-folder' : "icon-ticket #{Redmine::MimeType.css_class_of(ent_name)}"), aria: {label: (entry.dir? ? t('label_folder') : t('activerecord.attributes.attachment.file')) + " #{h(ent_name)}"} %>
     </td>
     <td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.dir? %></td>
     <% changeset = @project.repository.find_changeset_by_name(entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %>