diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ef229f955..760298d75 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1252,11 +1252,14 @@ module ApplicationHelper
     link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")
   end
 
-  def toggle_checkboxes_link(selector)
-    link_to_function '',
-      "toggleCheckboxesBySelector('#{selector}')",
+  def toggle_checkboxes_button(selector)
+    button_tag '',
+      :type => 'button',
+      :onclick => "toggleCheckboxesBySelector('#{selector}')",
       :title => "#{l(:button_check_all)} / #{l(:button_uncheck_all)}",
-      :class => 'toggle-checkboxes'
+      :class => 'toggle-checkboxes' do
+        content_tag('span', '', :class => 'icon-only icon-checked')
+      end
   end
 
   def progress_bar(pcts, options={})
diff --git a/app/views/members/_new_form.html.erb b/app/views/members/_new_form.html.erb
index 3fe9187d1..3476eb100 100644
--- a/app/views/members/_new_form.html.erb
+++ b/app/views/members/_new_form.html.erb
@@ -7,7 +7,7 @@
   </div>
 </fieldset>
 <fieldset class="box">
-  <legend><%= l(:label_role_plural) %> <%= toggle_checkboxes_link('.roles-selection input') %></legend>
+  <legend><%= l(:label_role_plural) %> <%= toggle_checkboxes_button('.roles-selection input') %></legend>
   <div class="roles-selection">
     <% User.current.managed_roles(@project).each do |role| %>
       <label><%= check_box_tag 'membership[role_ids][]', role.id, false, :id => nil %> <%= role %></label>
diff --git a/app/views/principal_memberships/_new_form.html.erb b/app/views/principal_memberships/_new_form.html.erb
index c49d84993..7fa4cb7d6 100644
--- a/app/views/principal_memberships/_new_form.html.erb
+++ b/app/views/principal_memberships/_new_form.html.erb
@@ -1,5 +1,5 @@
 <fieldset class="box">
-  <legend><%= l(:label_project_plural) %> <%= toggle_checkboxes_link('.projects-selection input:enabled') %></legend>
+  <legend><%= l(:label_project_plural) %> <%= toggle_checkboxes_button('.projects-selection input:enabled') %></legend>
   <div class="objects-selection">
     <div class="projects-selection">
     <%= render_project_nested_lists(@projects) do |p| %>
@@ -12,7 +12,7 @@
 </fieldset>
 
 <fieldset class="box">
-  <legend><%= l(:label_role_plural) %> <%= toggle_checkboxes_link('.roles-selection input') %></legend>
+  <legend><%= l(:label_role_plural) %> <%= toggle_checkboxes_button('.roles-selection input') %></legend>
   <div class="roles-selection">
   <% @roles.each do |role| %>
     <label>
diff --git a/app/views/roles/permissions.html.erb b/app/views/roles/permissions.html.erb
index a4b14493d..658fd4ddc 100644
--- a/app/views/roles/permissions.html.erb
+++ b/app/views/roles/permissions.html.erb
@@ -9,10 +9,7 @@
     <th><%=l(:label_permissions)%></th>
     <% @roles.each do |role| %>
     <th>
-        <%= link_to_function('',
-                             "toggleCheckboxesBySelector('input.role-#{role.id}')",
-                             :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
-                             :class => 'icon-only icon-checked') %>
+        <%= toggle_checkboxes_button("input.role-#{role.id}") %>
         <%= content_tag(role.builtin? ? 'em' : 'span', role.name) %>
     </th>
     <% end %>
@@ -36,10 +33,7 @@
         <% humanized_perm_name = l_or_humanize(permission.name, :prefix => 'permission_') %>
         <tr class="permission-<%= permission.name %>">
         <td class="name">
-            <%= link_to_function('',
-                                 "toggleCheckboxesBySelector('.permission-#{permission.name} input')",
-                                 :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
-                                 :class => 'icon-only icon-checked') %>
+            <%= toggle_checkboxes_button(".permission-#{permission.name} input") %>
             <%= humanized_perm_name %>
         </td>
         <% @roles.each do |role| %>
diff --git a/app/views/trackers/fields.html.erb b/app/views/trackers/fields.html.erb
index 8ba1c3ae4..d95bd5cf4 100644
--- a/app/views/trackers/fields.html.erb
+++ b/app/views/trackers/fields.html.erb
@@ -9,9 +9,7 @@
         <th></th>
         <% @trackers.each do |tracker| %>
         <th>
-          <%= link_to_function('', "toggleCheckboxesBySelector('input.tracker-#{tracker.id}')",
-                               :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
-                               :class => 'icon-only icon-checked') %>
+          <%= toggle_checkboxes_button("input.tracker-#{tracker.id}") %>
           <%= tracker.name %>
         </th>
         <% end %>
@@ -28,9 +26,7 @@
       <tr>
         <% field_name = l("field_#{field}".sub(/_id$/, '')) %>
         <td class="name">
-          <%= link_to_function('', "toggleCheckboxesBySelector('input.core-field-#{field}')",
-                               :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
-                               :class => 'icon-only icon-checked') %>
+          <%= toggle_checkboxes_button("input.core-field-#{field}") %>
           <%= field_name %>
         </td>
         <% @trackers.each do |tracker| %>
@@ -51,9 +47,7 @@
         <% @custom_fields.each do |field| %>
         <tr>
           <td class="name">
-            <%= link_to_function('', "toggleCheckboxesBySelector('input.custom-field-#{field.id}')",
-                                 :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
-                                 :class => 'icon-only icon-checked') %>
+            <%= toggle_checkboxes_button("input.custom-field-#{field.id}") %>
             <%= field.name %>
           </td>
           <% @trackers.each do |tracker| %>
diff --git a/app/views/workflows/_form.html.erb b/app/views/workflows/_form.html.erb
index 958c1e43c..604271bba 100644
--- a/app/views/workflows/_form.html.erb
+++ b/app/views/workflows/_form.html.erb
@@ -2,9 +2,7 @@
 <thead>
   <tr>
     <th>
-      <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input[type=checkbox]')",
-                           :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
-                           :class => 'icon-only icon-checked') %>
+      <%= toggle_checkboxes_button("table.transitions-#{name} input[type=checkbox]") %>
       <%=l(:label_current_status)%>
     </th>
     <th colspan="<%= @statuses.length %>"><%=l(:label_new_statuses_allowed)%></th>
@@ -13,9 +11,7 @@
     <td></td>
     <% for new_status in @statuses %>
     <td style="width:<%= 75 / @statuses.size %>%;">
-      <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input[type=checkbox].new-status-#{new_status.id}')",
-                           :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
-                           :class => 'icon-only icon-checked') %>
+      <%= toggle_checkboxes_button("table.transitions-#{name} input[type=checkbox].new-status-#{new_status.id}") %>
       <%= new_status.name %>
     </td>
     <% end %>
@@ -26,9 +22,7 @@
   <% next if old_status.nil? && name != 'always' %>
   <tr>
     <td class="name">
-      <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input[type=checkbox].old-status-#{old_status.try(:id) || 0}')",
-                           :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
-                           :class => 'icon-only icon-checked') %>
+      <%= toggle_checkboxes_button("table.transitions-#{name} input[type=checkbox].old-status-#{old_status.try(:id) || 0}") %>
       <% if old_status %>
         <% old_status_name = old_status.name %>
         <%= old_status_name %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 59bcc3d80..849016486 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -140,7 +140,7 @@ a.collapsible.collapsed {background: url(../images/arrow_collapsed.png) no-repea
 
 a#toggle-completed-versions {color:#999;}
 
-a.toggle-checkboxes { margin-left: 5px; padding-left: 12px; background: url(../images/toggle_check.png) no-repeat 0% 50%; }
+button.toggle-checkboxes { padding: 0px 0px 1px 4px;}
 
 /***** Dropdown *****/
 .drdn {position:relative;}