diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 30a3f8200..0c9d68a44 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -406,7 +406,6 @@ tr.builtin td.name {font-style:italic;}
 
 a.sort { padding-right: 16px; background-position: 100% 50%; background-repeat: no-repeat; }
 
-table.boards a.board { background: url(/comment.png) no-repeat 0% 50%; padding-left: 20px; }
 table.boards td.last-message {text-align:left;font-size:80%;}
 
 div.table-list.boards .table-list-cell.name {width: 30%;}
@@ -1715,7 +1714,7 @@ span.icon-label {
 .icon-unlock:not(:has(svg)) { background-image: url(/unlock.png); }
 .icon-checked:not(:has(svg)) { background-image: url(/toggle_check.png); }
 .icon-report { background-image: url(/report.png); }
-.icon-comment:not(:has(svg)), .icon-comments  { background-image: url(/comment.png); }
+.icon-comment:not(:has(svg)), .icon-comments:not(:has(svg)) { background-image: url(/comment.png); }
 .icon-summary:not(:has(svg)) { background-image: url(/lightning.png); }
 .icon-server-authentication { background-image: url(/server_key.png); }
 .icon-issue:not(:has(svg)) { background-image: url(/ticket.png); }
@@ -1723,7 +1722,7 @@ span.icon-label {
 .icon-zoom-out:not(:has(svg)) { background-image: url(/zoom_out.png); }
 .icon-magnifier { background-image: url(/magnifier.png); }
 .icon-passwd:not(:has(svg)) { background-image: url(/textfield_key.png); }
-.icon-arrow-right, .icon-test:not(:has(svg)), .icon-sticky { background-image: url(/bullet_go.png); }
+.icon-arrow-right, .icon-test:not(:has(svg)), .icon-sticky:not(:has(svg)) { background-image: url(/bullet_go.png); }
 .icon-email:not(:has(svg)) { background-image: url(/email.png); }
 .icon-email-disabled:not(:has(svg)) { background-image: url(/email_disabled.png); }
 .icon-email-add:not(:has(svg)) { background-image: url(/email_add.png); }
diff --git a/app/views/boards/index.html.erb b/app/views/boards/index.html.erb
index e20c8f641..ee43b3427 100644
--- a/app/views/boards/index.html.erb
+++ b/app/views/boards/index.html.erb
@@ -21,7 +21,7 @@
     <tr class="board">
   <% end %>
     <td class="name">
-      <%= link_to board.name, project_board_path(board.project, board), :class => "board" %>
+      <%= link_to icon_with_label('comment', board.name), project_board_path(board.project, board), :class => "board icon icon-comment" %>
       <p class="description"><%= board.description %></p>
     </td>
     <td class="topic-count"><%= board.topics_count %></td>
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 96d6490c1..617c7807f 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -38,7 +38,11 @@
   <tbody>
   <% @topics.each do |topic| %>
     <tr id="message-<%= topic.id %>" class="message <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
-      <td class="subject icon <%= 'icon-sticky' if topic.sticky? %> <%= 'icon-locked' if topic.locked? %>"><%= link_to topic.subject, board_message_path(@board, topic) %></td>
+      <td class="subject icon <%= 'icon-sticky' if topic.sticky? %> <%= 'icon-locked' if topic.locked? %>">
+        <%= sprite_icon "arrow-right" if topic.sticky? %>
+        <%= sprite_icon "lock" if topic.locked? %>
+        <%= link_to topic.subject, board_message_path(@board, topic) %>
+      </td>
       <td class="author"><%= link_to_user(topic.author) %></td>
       <td class="created_on"><%= format_time(topic.created_on) %></td>
       <td class="reply-count"><%= topic.replies_count %></td>
diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index ff1aa5254..616cad82c 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -22,7 +22,7 @@
     <% if container.is_a?(Version) -%>
     <tr>
       <th colspan="6">
-        <%= link_to(container, {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package") %>
+        <%= link_to(icon_with_label('package', container), {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package") %>
       </th>
     </tr>
     <% end -%>
@@ -34,7 +34,7 @@
       <td class="downloads"><%= file.downloads %></td>
       <td class="digest"><%= file.digest_type %>: <%= file.digest %></td>
       <td class="buttons">
-      <%= link_to_attachment file, class: 'icon-only icon-download', title: l(:button_download), download: true %>
+      <%= link_to_attachment file, class: 'icon-only icon-download', title: l(:button_download), download: true, icon: 'download' %>
       <%= link_to(icon_with_label('del', l(:button_delete)), attachment_path(file), :class => 'icon-only icon-del',
                                           :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
       </td>
diff --git a/app/views/layouts/_file.html.erb b/app/views/layouts/_file.html.erb
index 4a17bacd7..902964bed 100644
--- a/app/views/layouts/_file.html.erb
+++ b/app/views/layouts/_file.html.erb
@@ -1,5 +1,5 @@
 <div class="contextual">
-  <%= link_to_attachment @attachment, :text => "#{l(:button_download)} (#{number_to_human_size(@attachment.filesize)})", :download => true, :class => 'icon icon-download' -%>
+  <%= link_to_attachment @attachment, :text => "#{l(:button_download)} (#{number_to_human_size(@attachment.filesize)})", :download => true, :class => 'icon icon-download', :icon => "download" -%>
 </div>
 
 <h2>
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index ba22f713c..64c69a0fe 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -35,7 +35,7 @@
 
 <% unless @replies.empty? %>
 <div id="replies">
-<h3 class="comments icon icon-comments"><%= l(:label_reply_plural) %> (<%= @reply_count %>)</h3>
+<h3 class="comments icon icon-comments"><%= icon_with_label('comments', l(:label_reply_plural)) %> (<%= @reply_count %>)</h3>
 <% if !@topic.locked? && authorize_for('messages', 'reply') && @replies.size >= 3 %>
   <p><%= toggle_link l(:button_reply), "reply", :focus => 'message_content', :scroll => "message_content" %></p>
 <% end %>
@@ -43,7 +43,7 @@
   <div class="message reply" id="<%= "message-#{message.id}" %>">
     <div class="contextual">
       <%= link_to(
-            '',
+            icon_with_label('comment', l(:button_quote), icon_only: true),
             {:action => 'quote', :id => message},
             :remote => true,
             :method => 'get',
@@ -51,13 +51,13 @@
             :class => 'icon icon-comment'
           ) if !@topic.locked? && authorize_for('messages', 'reply') %>
       <%= link_to(
-            '',
+            icon_with_label('edit', l(:button_edit), icon_only: true),
             {:action => 'edit', :id => message},
             :title => l(:button_edit),
             :class => 'icon icon-edit'
           ) if message.editable_by?(User.current) %>
       <%= link_to(
-            '',
+            icon_with_label('del', l(:button_delete), icon_only: true),
             {:action => 'destroy', :id => message},
             :method => :post,
             :data => {:confirm => l(:text_are_you_sure)},
diff --git a/app/views/repositories/_navigation.html.erb b/app/views/repositories/_navigation.html.erb
index c897f91b1..693889ea0 100644
--- a/app/views/repositories/_navigation.html.erb
+++ b/app/views/repositories/_navigation.html.erb
@@ -4,7 +4,7 @@
 
 <% if @entry && !@entry.is_dir? && @repository.supports_cat? %>
   <% download_label = @entry.size ? "#{l :button_download} (#{number_to_human_size @entry.size})" : l(:button_download) %>
-  <%= link_to(download_label,
+  <%= link_to(icon_with_label('download', download_label),
               {:action => 'raw', :id => @project,
                :repository_id => @repository.identifier_param,
                :path => to_path_param(@path),