diff --git a/app/views/boards/show.rhtml b/app/views/boards/show.rhtml
index 9a4028c95..23e453e38 100644
--- a/app/views/boards/show.rhtml
+++ b/app/views/boards/show.rhtml
@@ -42,7 +42,7 @@
   <tbody>
   <% @topics.each do |topic| %>
     <tr class="message <%= cycle 'odd', 'even' %> <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
-      <td class="subject"><%= link_to h(topic.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => topic }, :class => 'icon' %></td>
+      <td class="subject"><%= link_to h(topic.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => topic } %></td>
       <td class="author" align="center"><%= topic.author %></td>
       <td class="created_on" align="center"><%= format_time(topic.created_on) %></td>
       <td class="replies" align="center"><%= topic.replies_count %></td>
diff --git a/public/images/bullet_go.png b/public/images/bullet_go.png
new file mode 100644
index 000000000..c724754b3
Binary files /dev/null and b/public/images/bullet_go.png differ
diff --git a/public/images/sticky.png b/public/images/sticky.png
deleted file mode 100644
index abd30db0e..000000000
Binary files a/public/images/sticky.png and /dev/null differ
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index d5dd42c4e..f5959d88c 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -137,9 +137,11 @@ table.files tr.file td.digest { font-size: 80%; }
 table.members td.roles, table.memberships td.roles { width: 45%; }
 
 tr.message { height: 2.6em; }
-tr.message td.last_message { font-size: 80%; }
-tr.message.locked td.subject a { background-image: url(../images/locked.png); }
-tr.message.sticky td.subject a { background-image: url(../images/sticky.png); font-weight: bold; }
+tr.message td.subject { padding-left: 20px; }
+tr.message td.created_on { white-space: nowrap; }
+tr.message td.last_message { font-size: 80%; white-space: nowrap; }
+tr.message.locked td.subject { background: url(../images/locked.png) no-repeat 0 1px; }
+tr.message.sticky td.subject { background: url(../images/bullet_go.png) no-repeat 0 1px; font-weight: bold; }
 
 tr.version.closed, tr.version.closed a { color: #999; }
 tr.version td.name { padding-left: 20px; }