diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56512339b8..4d87f54975 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+* Adaptations for new icon font
 * added icon for new project menu
 
 ## 4.0.0.pre8
diff --git a/lib/open_project/reporting/engine.rb b/lib/open_project/reporting/engine.rb
index e4d9be26db..8a57866ecc 100644
--- a/lib/open_project/reporting/engine.rb
+++ b/lib/open_project/reporting/engine.rb
@@ -98,7 +98,7 @@ module OpenProject::Reporting
                :after => :cost_objects,
                :caption => :cost_reports_title,
                :if => Proc.new { |project| project.module_enabled?(:reporting_module) },
-               :html => {:'data-icon2' => "w"}
+               :html => {:class => 'icon2 icon-stats'}
         end
       end
     end
diff --git a/lib/widget/entry_table.rb b/lib/widget/entry_table.rb
index 72833c1d68..f228cdb81b 100644
--- a/lib/widget/entry_table.rb
+++ b/lib/widget/entry_table.rb
@@ -73,13 +73,17 @@ class Widget::Table::EntryTable < Widget::Table
     icons = ""
     with_project(result.fields['project_id']) do
       if entry_for(result).editable_by? User.current
-        icons = link_to(image_tag('webalys/edit.png'),
+        icons = link_to(icon_wrapper('icon-context icon-edit', l(:button_edit)),
                         action_for(result, :action => 'edit'),
+                        :class => 'no-decoration-on-hover',
                         :title => l(:button_edit))
-        icons << link_to(image_tag('webalys/delete.png'),
-                         (action_for(result, :action => 'destroy').reverse_merge(:authenticity_token => form_authenticity_token)),
-                         :title  => l(:button_edit), :confirm  => l(:text_are_you_sure),
-                         :method => :delete,         :title    => l(:button_delete))
+        icons << link_to(icon_wrapper('icon-context icon-delete', l(:button_delete)),
+                        (action_for(result, :action => 'destroy').reverse_merge(:authenticity_token => form_authenticity_token)),
+                        :title  => l(:button_edit),
+                        :confirm  => l(:text_are_you_sure),
+                        :method => :delete,
+                        :class => 'no-decoration-on-hover',
+                        :title    => l(:button_delete))
       end
     end
     icons