diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index c3ba50180..e51207e0e 100644
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -34,7 +34,7 @@ module JournalsHelper
       dropbown_links << link_to(icon_with_label('download', l(:label_download_all_attachments)),
                                 container_attachments_download_path(journal),
                                 :title => l(:label_download_all_attachments),
-                                :class => 'icon icon-download '
+                                :class => 'icon icon-download'
                                )
     end
 
@@ -45,7 +45,7 @@ module JournalsHelper
                          :remote => true,
                          :method => 'post',
                          :title => l(:button_quote),
-                         :class => 'icon-only icon-comment '
+                         :class => 'icon-only icon-comment'
                         )
       end
       if journal.editable_by?(User.current)
@@ -54,14 +54,14 @@ module JournalsHelper
                          :remote => true,
                          :method => 'get',
                          :title => l(:button_edit),
-                         :class => 'icon-only icon-edit '
+                         :class => 'icon-only icon-edit'
                         )
         dropbown_links << link_to(icon_with_label('del', l(:button_delete)),
                                   journal_path(journal, :journal => {:notes => ""}),
                                   :remote => true,
                                   :method => 'put',
                                   :data => {:confirm => l(:text_are_you_sure)},
-                                  :class => 'icon icon-del '
+                                  :class => 'icon icon-del'
                                  )
       end
     end
diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb
index 2071879e3..c800e4c96 100644
--- a/app/helpers/watchers_helper.rb
+++ b/app/helpers/watchers_helper.rb
@@ -26,7 +26,7 @@ module WatchersHelper
 
     watched = Watcher.any_watched?(objects, user)
     icon = watched ? 'fav' : 'fav-off'
-    css = [watcher_css(objects), '', 'icon', icon].join(' ')
+    css = [watcher_css(objects), 'icon', "icon-#{icon}"].join(' ')
     text = watched ? l(:button_unwatch) : l(:button_watch)
     url = watch_path(
       :object_type => objects.first.class.to_s.underscore,
diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index 82991888d..c91ca37a0 100644
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -1716,7 +1716,8 @@ class ApplicationHelperTest < Redmine::HelperTest
         Regexp.new(
           '<div class="contextual heading-2" title="Edit this section" id="section-4">' \
           '<a class="icon-only icon-edit" href="/projects/1/wiki/Test/edit\?section=4">' \
-          'Edit this section' \
+          '<svg class="s14" aria-hidden="true"><use href="\/assets\/icons-.*.svg#icon--edit"></use></svg>' \
+          '<span class="icon-label">Edit this section</span>' \
           '</a></div>' \
           '<a name="Subtitle-with-inline-code"></a>' \
           '<h2 >Subtitle with ' \
@@ -1730,7 +1731,8 @@ class ApplicationHelperTest < Redmine::HelperTest
         Regexp.new(
           '<div class="contextual heading-2" title="Edit this section" id="section-5">' \
           '<a class="icon-only icon-edit" href="/projects/1/wiki/Test/edit\?section=5">' \
-          'Edit this section' \
+          '<svg class="s14" aria-hidden="true"><use href="\/assets\/icons-.*.svg#icon--edit"></use></svg>' \
+          '<span class="icon-label">Edit this section</span>' \
           '</a></div>' \
           '<a name="Subtitle-after-pre-tag"></a>' \
           '<h2 >Subtitle after pre tag' \
diff --git a/test/helpers/watchers_helper_test.rb b/test/helpers/watchers_helper_test.rb
index cc413f8fa..3943b8447 100644
--- a/test/helpers/watchers_helper_test.rb
+++ b/test/helpers/watchers_helper_test.rb
@@ -28,7 +28,7 @@ class WatchersHelperTest < Redmine::HelperTest
 
   test '#watcher_link with a non-watched object' do
     expected = link_to(
-      "Watch",
+      icon_with_label("fav-off", "Watch"),
       "/watchers/watch?object_id=1&object_type=issue",
       :remote => true, :method => 'post', :class => "issue-1-watcher icon icon-fav-off"
     )
@@ -37,7 +37,7 @@ class WatchersHelperTest < Redmine::HelperTest
 
   test '#watcher_link with a single object array' do
     expected = link_to(
-      "Watch",
+      icon_with_label("fav-off","Watch"),
       "/watchers/watch?object_id=1&object_type=issue",
       :remote => true, :method => 'post', :class => "issue-1-watcher icon icon-fav-off"
     )
@@ -46,7 +46,7 @@ class WatchersHelperTest < Redmine::HelperTest
 
   test '#watcher_link with a multiple objects array' do
     expected = link_to(
-      "Watch",
+      icon_with_label("fav-off", "Watch"),
       "/watchers/watch?object_id%5B%5D=1&object_id%5B%5D=3&object_type=issue",
       :remote => true, :method => 'post', :class => "issue-bulk-watcher icon icon-fav-off"
     )
@@ -61,7 +61,7 @@ class WatchersHelperTest < Redmine::HelperTest
     Watcher.create!(:watchable => Issue.find(1), :user => User.find(1))
 
     expected = link_to(
-      "Unwatch",
+      icon_with_label("fav","Unwatch"),
       "/watchers/watch?object_id=1&object_type=issue",
       :remote => true, :method => 'delete', :class => "issue-1-watcher icon icon-fav"
     )