diff --git a/app/views/documents/index.html.erb b/app/views/documents/index.html.erb
index ebc08a361b..a44deec7ba 100644
--- a/app/views/documents/index.html.erb
+++ b/app/views/documents/index.html.erb
@@ -39,7 +39,7 @@ See doc/COPYRIGHT.rdoc for more details.
                   { class: 'button -alt-highlight',
                     aria: {label: t(:label_document_new)},
                     title: t(:label_document_new)}) do %>
-        <i class="button--icon icon-add"></i>
+        <%= op_icon('button--icon icon-add') %>
         <span class="button--text"><%= t('activerecord.models.document') %></span>
       <% end %>
     </li>
diff --git a/app/views/documents/show.html.erb b/app/views/documents/show.html.erb
index 8e1a1d7b9f..2d6a22cfcc 100644
--- a/app/views/documents/show.html.erb
+++ b/app/views/documents/show.html.erb
@@ -36,14 +36,14 @@ See doc/COPYRIGHT.rdoc for more details.
   <% if authorize_for(:documents, :edit) %>
     <li class="toolbar-item">
       <%= link_to({controller: '/documents', action: 'edit', id: @document}, class: 'button', accesskey: accesskey(:edit)) do %>
-        <i class="button--icon icon-edit"></i> <%= l(:button_edit) %>
+        <%= op_icon('button--icon icon-edit') %> <%= l(:button_edit) %>
       <% end %>
     </li>
   <% end %>
   <% if authorize_for(:documents, :destroy) %>
     <li class="toolbar-item">
       <%= link_to({controller: '/documents', action: 'destroy', id: @document}, class: 'button', data: { confirm: l(:text_are_you_sure) }, method: :delete) do %>
-        <i class="button--icon icon-delete"></i> <%= l(:button_delete) %>
+        <%= op_icon('button--icon icon-delete') %> <%= l(:button_delete) %>
       <% end %>
     </li>
   <% end %>
diff --git a/app/views/my/blocks/_documents.html.erb b/app/views/my/blocks/_documents.html.erb
index 620bcda772..1e097ade56 100644
--- a/app/views/my/blocks/_documents.html.erb
+++ b/app/views/my/blocks/_documents.html.erb
@@ -35,7 +35,7 @@ See doc/COPYRIGHT.rdoc for more details.
 <% end %>
 
 <h3 class="widget-box--header">
-  <span class="icon-context icon-notes"></span>
+  <%= op_icon('icon-context icon-notes') %>
   <span class="widget-box--header-title"><%=l(:label_document_plural)%></span>
 </h3>
 
diff --git a/app/views/my_projects_overviews/blocks/_documents.html.erb b/app/views/my_projects_overviews/blocks/_documents.html.erb
index ac299d6932..fc406f7ed0 100644
--- a/app/views/my_projects_overviews/blocks/_documents.html.erb
+++ b/app/views/my_projects_overviews/blocks/_documents.html.erb
@@ -35,7 +35,7 @@ See doc/COPYRIGHT.rdoc for more details.
 <% end %>
 
 <h3 class="widget-box--header">
-  <span class="icon-context icon-notes"></span>
+  <%= op_icon('icon-context icon-notes') %>
   <span class="widget-box--header-title"><%=l(:label_document_plural)%></span>
 </h3>
 
diff --git a/lib/open_project/documents/engine.rb b/lib/open_project/documents/engine.rb
index d7416d81a9..1fa0a81cb7 100644
--- a/lib/open_project/documents/engine.rb
+++ b/lib/open_project/documents/engine.rb
@@ -45,7 +45,7 @@ module OpenProject::Documents
                           { controller: '/documents', action: 'index' },
                           param: :project_id,
                           caption: :label_document_plural,
-                          html: { class: 'icon2 icon-notes' }
+                          icon: 'icon2 icon-notes'
 
       project_module :documents do |_map|
         permission :manage_documents, {