diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index 662c3d25..b989b432 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -281,7 +281,7 @@ module TodosHelper
   end  
   
   def defer_link(days)
-    link_to_remote "+#{days}", :url => {:controller => 'todos', :action => 'defer', :id => @todo.id, :days => days, :_source_view => @source_view.underscore.gsub(/\s+/,'_')}
+    link_to_remote image_tag("defer_#{days}.png"), :url => {:controller => 'todos', :action => 'defer', :id => @todo.id, :days => days, :_source_view => (@source_view.underscore.gsub(/\s+/,'_') rescue "")}
   end
 
 end
diff --git a/app/views/todos/_todo.html.erb b/app/views/todos/_todo.html.erb
index 8a4f70c2..496b87da 100644
--- a/app/views/todos/_todo.html.erb
+++ b/app/views/todos/_todo.html.erb
@@ -11,6 +11,7 @@
     <%= remote_star_icon %>
     <%= remote_toggle_checkbox unless source_view_is :deferred %>
     <div class="description<%= staleness_class( todo ) %>">
+      <span class="defer-container"><%= defer_link(1) %> <%= defer_link(7) %></span>
       <%= date_span -%>
       <span class="todo.descr"><%= h sanitize(todo.description) %></span>
       <%= link_to(image_tag("recurring16x16.png"), {:controller => "recurring_todos", :action => "index"}, :class => "recurring_icon") if @todo.from_recurring_todo? %>
@@ -18,7 +19,6 @@
       <%= deferred_due_date %>
       <%= project_and_context_links( parent_container_type, :suppress_context => suppress_context, :suppress_project => suppress_project ) %>
       <%= render(:partial => "todos/toggle_notes", :locals => { :item => todo }) if todo.notes? %>
-      <span class="defer-container"><%= defer_link(1) %> <%= defer_link(7) %></span>
     </div>
   </div>
   <div id="<%= dom_id(todo, 'edit') %>" class="edit-form" style="display:none">
diff --git a/public/images/defer_1.png b/public/images/defer_1.png
new file mode 100644
index 00000000..d40a9c01
Binary files /dev/null and b/public/images/defer_1.png differ
diff --git a/public/images/defer_7.png b/public/images/defer_7.png
new file mode 100644
index 00000000..de231e49
Binary files /dev/null and b/public/images/defer_7.png differ
diff --git a/public/javascripts/tracks_1219672692.js b/public/javascripts/tracks_1220755978.js
similarity index 100%
rename from public/javascripts/tracks_1219672692.js
rename to public/javascripts/tracks_1220755978.js
diff --git a/public/stylesheets/standard.css b/public/stylesheets/standard.css
index adf66146..3cd52ea9 100644
--- a/public/stylesheets/standard.css
+++ b/public/stylesheets/standard.css
@@ -1202,6 +1202,5 @@ body.integrations textarea {
     background-color:#ddd;
 }
 .defer-container {
-  position: absolute;
-  right: 2px;
+  float:right;
 }
diff --git a/public/stylesheets/tracks_1219763287.css b/public/stylesheets/tracks_1220795605.css
similarity index 99%
rename from public/stylesheets/tracks_1219763287.css
rename to public/stylesheets/tracks_1220795605.css
index c2d06198..6060a1f0 100644
--- a/public/stylesheets/tracks_1219763287.css
+++ b/public/stylesheets/tracks_1220795605.css
@@ -220,6 +220,7 @@ body.integrations h2 {margin-top:40px; padding-top:20px; margin-bottom:10px; bor
 body.integrations p, body.integrations li {font-size:1.0em}
 body.integrations li {list-style-type: disc; list-style-position: inside; margin-left:30px}
 body.integrations textarea {margin:10px; padding:3px; width:80%; background-color:#ddd}
+.defer-container {float:right}
 div.calendar {position: relative}
 .calendar, .calendar table {border: 1px solid #556; font-size: 11px; color: #000; cursor: default; background: #eef; z-index: 110; font-family: tahoma,verdana,sans-serif}
 .calendar .button {text-align: center; padding: 2px}