diff --git a/app/views/todos/_todo.html.erb b/app/views/todos/_todo.html.erb
index d37e8fcc..3c344ab9 100644
--- a/app/views/todos/_todo.html.erb
+++ b/app/views/todos/_todo.html.erb
@@ -13,12 +13,12 @@ parameters += "&_tag_name=#{@tag_name}" if @source_view == 'tag'
     <%= remote_toggle_checkbox unless source_view_is :deferred %>
     <ul class="sf-menu sf-item-menu"><li style="z-index:<%=@z_index_counter%>"><%= image_tag "downarrow.png", :alt=> "" %><ul id="ul<%= dom_id(todo) %>">
         <% unless suppress_edit_button %>
-          <li><%= link_to_remote("Edit", :url => {:controller => 'todos', :action => 'edit', :id => @todo.id}, :method => 'get', :with => "'#{parameters}'", :before => "$('ul#{dom_id(todo)}').hide(); itemContainer = $('#{dom_id(todo)}'); itemContainer.startWaiting()", :complete => "itemContainer.stopWaiting();") %></li>
+          <li><%= link_to_remote(image_tag("edit_off.png", :mouseover => "edit_on.png", :alt => "", :align => "absmiddle")+" Edit", :url => {:controller => 'todos', :action => 'edit', :id => @todo.id}, :method => 'get', :with => "'#{parameters}'", :before => "$('ul#{dom_id(todo)}').hide(); itemContainer = $('#{dom_id(todo)}'); itemContainer.startWaiting()", :complete => "itemContainer.stopWaiting();") %></li>
         <% end %>
-        <li><%= link_to_remote "Delete", :url => {:controller => 'todos', :action => 'destroy', :id => @todo.id}, :method => 'delete', :with => "'#{parameters}'", :before => "$('ul#{dom_id(todo)}').hide(); itemContainer = $('#{dom_id(todo)}'); itemContainer.startWaiting()", :complete => "itemContainer.stopWaiting();" %></li>
+        <li><%= link_to_remote image_tag("delete_off.png", :mouseover => "delete_on.png", :alt => "", :align => "absmiddle")+" Delete", :url => {:controller => 'todos', :action => 'destroy', :id => @todo.id}, :method => 'delete', :with => "'#{parameters}'", :before => "$('ul#{dom_id(todo)}').hide(); itemContainer = $('#{dom_id(todo)}'); itemContainer.startWaiting()", :complete => "itemContainer.stopWaiting();" %></li>
         <% unless todo.completed? || todo.deferred? %>
-          <li><%= link_to_remote "Defer 1 day", :url => {:controller => 'todos', :action => 'defer', :id => @todo.id, :days => 1, :_source_view => (@source_view.underscore.gsub(/\s+/,'_') rescue "")}, :before => "$('ul#{dom_id(todo)}').hide(); itemContainer = $('#{dom_id(todo)}'); itemContainer.startWaiting()", :complete => "itemContainer.stopWaiting();" %></li>
-          <li><%= link_to_remote "Defer 7 days", :url => {:controller => 'todos', :action => 'defer', :id => @todo.id, :days => 7, :_source_view => (@source_view.underscore.gsub(/\s+/,'_') rescue "")}, :before => "$('ul#{dom_id(todo)}').hide(); itemContainer = $('#{dom_id(todo)}'); itemContainer.startWaiting()", :complete => "itemContainer.stopWaiting();" %></li>
+          <li><%= link_to_remote image_tag("defer_1_off.png", :mouseover => "defer_1.png", :alt => "", :align => "absmiddle")+" Defer 1 day", :url => {:controller => 'todos', :action => 'defer', :id => @todo.id, :days => 1, :_source_view => (@source_view.underscore.gsub(/\s+/,'_') rescue "")}, :before => "$('ul#{dom_id(todo)}').hide(); itemContainer = $('#{dom_id(todo)}'); itemContainer.startWaiting()", :complete => "itemContainer.stopWaiting();" %></li>
+          <li><%= link_to_remote image_tag("defer_7_off.png", :mouseover => "defer_7.png", :alt => "", :align => "absmiddle")+" Defer 7 days", :url => {:controller => 'todos', :action => 'defer', :id => @todo.id, :days => 7, :_source_view => (@source_view.underscore.gsub(/\s+/,'_') rescue "")}, :before => "$('ul#{dom_id(todo)}').hide(); itemContainer = $('#{dom_id(todo)}'); itemContainer.startWaiting()", :complete => "itemContainer.stopWaiting();" %></li>
         <% end %>
     </ul></ul>
     <div class="description<%= staleness_class( todo ) %>">
diff --git a/public/images/defer_1_off.png b/public/images/defer_1_off.png
new file mode 100644
index 00000000..2bd8d46c
Binary files /dev/null and b/public/images/defer_1_off.png differ
diff --git a/public/images/defer_7_off.png b/public/images/defer_7_off.png
new file mode 100644
index 00000000..ea555b36
Binary files /dev/null and b/public/images/defer_7_off.png differ
diff --git a/public/images/downarrow.png b/public/images/downarrow.png
index 8deb8c11..ae6a0fa8 100644
Binary files a/public/images/downarrow.png and b/public/images/downarrow.png differ
diff --git a/public/stylesheets/superfish.css b/public/stylesheets/superfish.css
index 767999f0..ca422aeb 100644
--- a/public/stylesheets/superfish.css
+++ b/public/stylesheets/superfish.css
@@ -15,7 +15,7 @@
 }
 
 .sf-item-menu ul {
-    width: 8em;
+    width: 9.5em;
     z-index: 99;
 }