diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index b2aff9a53..4fc4c2d09 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -38,10 +38,12 @@
   <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? %>">
-        <%= sprite_icon "arrow-right" if topic.sticky? %>
-        <%= sprite_icon "lock" if topic.locked? %>
-        <%= link_to topic.subject, board_message_path(@board, topic) %>
+      <td class="subject">
+        <span class="<%= 'icon' if topic.sticky? || topic.locked? %> <%= '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) %>
+        </span>
       </td>
       <td class="author"><%= link_to_user(topic.author) %></td>
       <td class="created_on"><%= format_time(topic.created_on) %></td>
diff --git a/app/views/projects/settings/_versions.html.erb b/app/views/projects/settings/_versions.html.erb
index 5af6a1f4b..d9c4e0bcb 100644
--- a/app/views/projects/settings/_versions.html.erb
+++ b/app/views/projects/settings/_versions.html.erb
@@ -35,9 +35,11 @@
 <% @versions.each do |version| %>
     <tr class="version <%=h version.status %> <%= 'shared' if version.project != @project %>">
     <% is_shared = version.project != @project %>
-    <td class="name <%= 'icon icon-shared' if is_shared %>">
-      <%= sprite_icon('link') if is_shared %>
-      <%= link_to_version version %>
+    <td class="name">
+      <span class="<%= 'icon icon-shared' if is_shared %>">
+        <%= sprite_icon('link') if is_shared %>
+        <%= link_to_version version %>
+      </span>
     </td>
     <td class="tick"><%= checked_image(version.id == @project.default_version_id) %></td>
     <td class="date"><%= format_date(version.effective_date) %></td>