diff --git a/app/assets/stylesheets/screen.css.scss b/app/assets/stylesheets/screen.css.scss
index 992c22d..634c70e 100644
--- a/app/assets/stylesheets/screen.css.scss
+++ b/app/assets/stylesheets/screen.css.scss
@@ -559,23 +559,17 @@ and (min-width: 0px) //TODO
         display: block;
         padding: 0.5em;
         border-bottom: 1px solid #ddd;
-        &.locked:after {
-          background-image: url(image_path('/assets/lock.png'));
-          width: 20px;
-          height: 20px;
-          display: inline-block;
+        &.locked:before {
+          content: "(locked) ";
+          color: #000;
         }
-        &.sticky:after {
-          background-image: url(image_path('/assets/pin.png'));
-          width: 20px;
-          height: 20px;
-          display: inline-block;
+        &.sticky:before {
+          content: "(sticky) ";
+          color: #000;
         }
-        &.sticky-locked:after {
-          background-image: url(image_path('/assets/lock.png'));
-          width: 20px;
-          height: 20px;
-          display: inline-block;
+        &.lockedsticky:before {
+          content: "(locked sticky) ";
+          color: #000;
         }
         &.content {
           .headline {
diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index e3fe5ae..cde5216 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -1,6 +1,9 @@
 <%= link_to @forum.group, forumgroup_path(@forum.group) %> → <%= link_to @forum %>
 
 <h1><%= @forum %></h1>
+<% if @forum.can_write?(current_user) %>
+  <p><%= link_to "New thread", new_forumthread_path(forum: @forum), class: "btn blue" %></p>
+<% end %>
 <div id="forum_groups">
   <% @threads.each do |thread| %>
     <div class="item-group with-avatar" id="thread-<%= thread.id %>">
@@ -12,11 +15,8 @@
         </span>
       </div>
       <div class="items bold">
-        <%= link_to thread.title, forumthread_path(thread), class: "item#{" locked" if thread.locked}#{" sticky" if thread.sticky}" %>
+        <%= link_to thread.title, forumthread_path(thread), class: "item #{"locked" if thread.locked}#{"sticky" if thread.sticky}" %>
       </div>
     </div>
   <% end %>
-</div>
-<% if @forum.can_write?(current_user) %>
-  <p><%= link_to "New thread", new_forumthread_path(forum: @forum), class: "btn blue" %></p>
-<% end %>
\ No newline at end of file
+</div>
\ No newline at end of file