diff --git a/app/views/queries/_columns.html.erb b/app/views/queries/_columns.html.erb
index 1458131a9..c5d14190e 100644
--- a/app/views/queries/_columns.html.erb
+++ b/app/views/queries/_columns.html.erb
@@ -12,9 +12,9 @@
               :ondblclick => "moveOptions(this.form.#{available_tag_id}, this.form.#{selected_tag_id});" %>
   </span>
   <span class="buttons">
-      <input type="button" value="&#8594;"
+      <input type="button" value="&#8594;" class="move-right"
        onclick="moveOptions(this.form.<%= available_tag_id %>, this.form.<%= selected_tag_id %>);" />
-      <input type="button" value="&#8592;"
+      <input type="button" value="&#8592;" class="move-left"
        onclick="moveOptions(this.form.<%= selected_tag_id %>, this.form.<%= available_tag_id %>);" />
   </span>
   <span>
diff --git a/test/system/timelog_test.rb b/test/system/timelog_test.rb
index e1acd0f51..8624fffed 100644
--- a/test/system/timelog_test.rb
+++ b/test/system/timelog_test.rb
@@ -87,10 +87,10 @@ class TimelogTest < ApplicationSystemTestCase
     visit '/settings?tab=timelog'
     # Remove a column
     select 'Comment', :from => 'Selected Columns'
-    click_on "←"
+    page.first('input[type=button].move-left').click
     # Add a column
     select 'Tracker', :from => 'Available Columns'
-    click_on "→"
+    page.first('input[type=button].move-right').click
     click_on 'Save'
 
     # Display the list with updated settings