diff --git a/app/views/boards/show.rhtml b/app/views/boards/show.rhtml
index eb33d880f6..8c52f1197b 100644
--- a/app/views/boards/show.rhtml
+++ b/app/views/boards/show.rhtml
@@ -41,8 +41,8 @@
   </tr></thead>
   <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 } %></td>
+    <tr class="message <%= cycle 'odd', 'even' %>">
+      <td class="subject"><%= image_tag('locked.png', :alt => l(:label_board_locked)) if topic.locked? %><%= image_tag 'bullet_go.png', :alt => l(:label_board_sticky) if topic.sticky? %><%= link_to h(topic.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => topic } %></td>
       <td class="author" align="center"><%= link_to_user(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/app/views/my/_block.rhtml b/app/views/my/_block.rhtml
index 121f7a4c49..7469614aa1 100644
--- a/app/views/my/_block.rhtml
+++ b/app/views/my/_block.rhtml
@@ -4,11 +4,12 @@
     <%= link_to_remote "", {
         :url => { :action => "remove_block", :block => block_name },
         :complete => "removeBlock('block_#{block_name.dasherize}')" },
-        :class => "close-icon"
+        :class => "close-icon",
+        :title => l(:button_remove_widget)
          %>
     </div>
 
     <div class="handle">
 	<%= render :partial => "my/blocks/#{block_name}", :locals => { :user => user } %>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/queries/_columns.rhtml b/app/views/queries/_columns.rhtml
index 6f8c633983..853b139839 100644
--- a/app/views/queries/_columns.rhtml
+++ b/app/views/queries/_columns.rhtml
@@ -10,10 +10,10 @@
 		<td align="center" valign="middle">
 			<input type="button" value="&#8594;"
 			 onclick="moveOptions(this.form.available_columns, this.form.selected_columns);"
-       title="<%= l(:label_sort_right) %>"/><br />
+       title="<%= l(:label_add_columns) %>"/><br />
 			<input type="button" value="&#8592;"
 			 onclick="moveOptions(this.form.selected_columns, this.form.available_columns);"
-       title="<%= l(:label_sort_left) %>" />
+       title="<%= l(:label_remove_columns) %>" />
 		</td>
 		<td>
                 <%= label_tag "selected_columns", l(:description_selected_columns) %>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index cbe571fa81..b4a014d858 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -658,8 +658,8 @@ de:
   label_sort_higher: Eins höher
   label_sort_lower: Eins tiefer
   label_sort_lowest: Ans Ende
-  label_sort_right: Eins nach rechts
-  label_sort_left: Eins nach links
+  label_add_columns: Ausgewählte Spalten hinzufügen
+  label_remove_columns: Ausgewählte Spalten entfernen
   label_roadmap: Roadmap
   label_roadmap_due_in: "Fällig in %{value}"
   label_roadmap_overdue: "%{value} verspätet"
@@ -857,6 +857,7 @@ de:
   button_quote: Zitieren
   button_duplicate: Duplizieren
   button_show: Anzeigen
+  button_remove_widget: Infobox löschen
 
   status_active: aktiv
   status_registered: angemeldet
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8eb2d1312e..80376fa19b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -658,8 +658,8 @@ en:
   label_sort_higher: Move up
   label_sort_lower: Move down
   label_sort_lowest: Move to bottom
-  label_sort_right: Move right
-  label_sort_left: Move left
+  label_add_columns: Add selected columns
+  label_remove_columns: Remove selected columns
   label_roadmap: Roadmap
   label_roadmap_due_in: "Due in %{value}"
   label_roadmap_overdue: "%{value} late"
@@ -875,6 +875,7 @@ en:
   button_quote: Quote
   button_duplicate: Duplicate
   button_show: Show
+  button_remove_widget: Remove widget
 
   status_active: active
   status_registered: registered
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 28e27e52be..34e597f111 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -152,11 +152,8 @@ 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.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; }