diff --git a/app/assets/images/defer_1.png b/app/assets/images/defer_1.png
index d40a9c01..e23c0fc1 100644
Binary files a/app/assets/images/defer_1.png and b/app/assets/images/defer_1.png differ
diff --git a/app/assets/images/defer_1_off.png b/app/assets/images/defer_1_off.png
deleted file mode 100644
index 2bd8d46c..00000000
Binary files a/app/assets/images/defer_1_off.png and /dev/null differ
diff --git a/app/assets/images/defer_2.png b/app/assets/images/defer_2.png
index c27b735b..0db9f53f 100644
Binary files a/app/assets/images/defer_2.png and b/app/assets/images/defer_2.png differ
diff --git a/app/assets/images/defer_2_off.png b/app/assets/images/defer_2_off.png
deleted file mode 100644
index d9ab3384..00000000
Binary files a/app/assets/images/defer_2_off.png and /dev/null differ
diff --git a/app/assets/images/defer_3.png b/app/assets/images/defer_3.png
index 7c8c68ee..9424249e 100644
Binary files a/app/assets/images/defer_3.png and b/app/assets/images/defer_3.png differ
diff --git a/app/assets/images/defer_3_off.png b/app/assets/images/defer_3_off.png
deleted file mode 100644
index 3fee2133..00000000
Binary files a/app/assets/images/defer_3_off.png and /dev/null differ
diff --git a/app/assets/images/defer_7.png b/app/assets/images/defer_7.png
index 7e80ff15..2eb3420e 100644
Binary files a/app/assets/images/defer_7.png and b/app/assets/images/defer_7.png differ
diff --git a/app/assets/images/defer_7_off.png b/app/assets/images/defer_7_off.png
deleted file mode 100644
index ea555b36..00000000
Binary files a/app/assets/images/defer_7_off.png and /dev/null differ
diff --git a/app/assets/images/delete.png b/app/assets/images/delete.png
new file mode 100644
index 00000000..614230d4
Binary files /dev/null and b/app/assets/images/delete.png differ
diff --git a/app/assets/images/delete_off.png b/app/assets/images/delete_off.png
deleted file mode 100644
index e67fdc2a..00000000
Binary files a/app/assets/images/delete_off.png and /dev/null differ
diff --git a/app/assets/images/delete_on.png b/app/assets/images/delete_on.png
deleted file mode 100644
index 6b9f0c12..00000000
Binary files a/app/assets/images/delete_on.png and /dev/null differ
diff --git a/app/assets/images/edit.png b/app/assets/images/edit.png
new file mode 100644
index 00000000..45ed103e
Binary files /dev/null and b/app/assets/images/edit.png differ
diff --git a/app/assets/images/edit_off.png b/app/assets/images/edit_off.png
deleted file mode 100644
index d7e9d3e3..00000000
Binary files a/app/assets/images/edit_off.png and /dev/null differ
diff --git a/app/assets/images/edit_on.png b/app/assets/images/edit_on.png
deleted file mode 100644
index 650ccc93..00000000
Binary files a/app/assets/images/edit_on.png and /dev/null differ
diff --git a/app/assets/stylesheets/tracks.css.scss b/app/assets/stylesheets/tracks.css.scss
index 40c924d1..bbbe7cff 100644
--- a/app/assets/stylesheets/tracks.css.scss
+++ b/app/assets/stylesheets/tracks.css.scss
@@ -107,28 +107,20 @@ h3 {
 /* Rules for the icon links */
 
 img.edit_item {
-    background-image: image-url('edit_off.png');
-    background-repeat: no-repeat;
+    background: image-url('edit.png') no-repeat top;
     border: none;
 
     a:hover & {
-        background-image: image-url('edit_on.png');
-        background-color: transparent;
-        background-repeat: no-repeat;
-        border: none;
+        background-position: bottom;
     }
 }
 
 img.delete_item {
-    background-image: image-url('delete_off.png');
-    background-repeat: no-repeat;
+    background: image-url('delete.png') no-repeat top;
     border: none;
 
     a:hover & {
-        background-image: image-url('delete_on.png');
-        background-color: transparent;
-        background-repeat: no-repeat;
-        border: none;
+        background-position: bottom;
     }
 }
 
@@ -1457,10 +1449,21 @@ a.item-downarrow {
 ul.todo-submenu > li > a {
     position: relative;
     padding-left: 24px;
+    height: 16px;
 
-    > img {
-        position: absolute;
-        left: 0px;
-        top: 0px;
+    &.icon_delete_item {
+        background: image-url('delete.png') no-repeat 2px top;
+        &:hover { background-position: 2px bottom; }
+    }
+
+    @each $days in 1, 2, 3, 7 {
+        &.icon_defer_#{$days}_item {
+            background: image-url('defer_#{$days}.png') no-repeat left top;
+            &:hover { background-position: left bottom; }
+        }
+    }
+
+    &.icon_item_to_project {
+        background: image-url('to_project_off.png') no-repeat;
     }
 }
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index daad4fff..51f94b88 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -16,12 +16,8 @@ module TodosHelper
   end
 
   def remote_delete_menu_item(todo)
-    # TODO: what is the current way to do mouseover with css?
     return link_to(
-      image_tag("delete_off.png",
-      :onmouseover => "this.src='#{path_to_image("delete_on.png")}'",
-      :onmouseout => "this.src='#{path_to_image("delete_off.png")}'",
-      :alt => t('todos.delete'), :align => "absmiddle")+" "+t('todos.delete'),
+      t('todos.delete'),
       {:controller => 'todos', :action => 'destroy', :id => todo.id},
       :class => "icon_delete_item",
       :id => "delete_#{dom_id(todo)}",
@@ -34,7 +30,7 @@ module TodosHelper
       :_source_view => (@source_view.underscore.gsub(/\s+/,'_') rescue "")}
     url[:_tag_name] = @tag_name if @source_view == 'tag'
 
-    options = {:x_defer_alert => false, :class => "icon_defer_item", :id => "defer_#{days}_#{dom_id(todo)}" }
+    options = {:x_defer_alert => false, :class => "icon_defer_item icon_defer_#{days}_item", :id => "defer_#{days}_#{dom_id(todo)}" }
     if todo.due
       futuredate = (todo.show_from || todo.user.date) + days.days
       if futuredate > todo.due
@@ -43,7 +39,7 @@ module TodosHelper
       end
     end
 
-    return link_to(image_tag_for_defer(days), url, options)
+    return link_to(t('todos.defer_x_days', :count => days), url, options)
   end
 
   def remote_delete_dependency(todo, predecessor)
@@ -59,15 +55,7 @@ module TodosHelper
       :_source_view => (@source_view.underscore.gsub(/\s+/,'_') rescue "")}
     url[:_tag_name] = @tag_name if @source_view == 'tag'
 
-    return link_to(image_tag("to_project_off.png", :align => "absmiddle")+" " + t('todos.convert_to_project'), url, {:id => "to_project_#{dom_id(todo)}"})
-  end
-
-  def image_tag_for_defer(days)
-    # TODO: what is the current way to do mouseover with css?
-    image_tag("defer_#{days}_off.png",
-      :onmouseover => "this.src='#{path_to_image("defer_#{days}.png")}'",
-      :onmouseout => "this.src='#{path_to_image("defer_#{days}_off.png")}'",
-      :alt => t('todos.defer_x_days', :count => days), :align => "absmiddle")+" "+t('todos.defer_x_days', :count => days)
+    return link_to(t('todos.convert_to_project'), url, {:class => "icon_item_to_project", :id => "to_project_#{dom_id(todo)}"})
   end
 
   def collapsed_notes_image(todo)
diff --git a/app/views/todos/_edit_form.html.erb b/app/views/todos/_edit_form.html.erb
index c46548fc..79da7e9b 100644
--- a/app/views/todos/_edit_form.html.erb
+++ b/app/views/todos/_edit_form.html.erb
@@ -37,7 +37,7 @@
     <label for="<%= dom_id(@todo, 'due_label') %>"><%= Todo.human_attribute_name('due') %></label>
     <%= date_field_tag("todo[due]", dom_id(@todo, 'due'), format_date(@todo.due), "tabindex" => next_tab_index) %>
     <a href="#" id="<%= dom_id(@todo, 'due_x') %>" class="date_clear" title="<%= t('todos.clear_due_date') %>">
-      <%= image_tag("delete_off.png", :alt => "Clear due date") %>
+      <%= image_tag("blank.png", :alt => "Clear due date", :class => "delete_item") %>
     </a>
   </div>
 
@@ -45,7 +45,7 @@
     <label for="<%= dom_id(@todo, 'show_from') %>"><%= t('todos.show_from') %></label>
     <%= date_field_tag("todo[show_from]", dom_id(@todo, 'show_from'), format_date(@todo.show_from), "tabindex" => next_tab_index) %>
     <a href="#" id="<%= dom_id(@todo, 'show_from_x') %>" class="date_clear" title="<%= t('todos.clear_show_from_date') %>">
-      <%= image_tag("delete_off.png", :alt => "Clear show from date") %>
+      <%= image_tag("blank.png", :alt => "Clear show from date", :class => "delete_item") %>
     </a>
   </div>