diff --git a/app/views/common/_calendar.rhtml b/app/views/common/_calendar.rhtml
index af525c87..2a5d9ae2 100644
--- a/app/views/common/_calendar.rhtml
+++ b/app/views/common/_calendar.rhtml
@@ -11,14 +11,7 @@ while day <= calendar.enddt %>
 <p class="day-num"><%= day.day %></p>	
 <% calendar.events_on(day).each do |i| %>
   <% if i.is_a? Issue %>
-  <div class="<%= i.css_classes %> tooltip">
-  <%= if day == i.start_date && day == i.due_date
-        image_tag('arrow_bw.png')
-      elsif day == i.start_date
-        image_tag('arrow_from.png') 
-      elsif day == i.due_date
-		image_tag('arrow_to.png') 
-      end %>
+  <div class="<%= i.css_classes %> <%= 'starting' if day == i.start_date %> <%= 'ending' if day == i.due_date %> tooltip">
   <%= h("#{i.project} -") unless @project && @project == i.project %>
   <%= link_to_issue i, :truncate => 30 %>
   <span class="tip"><%= render_issue_tooltip i %></span>
diff --git a/app/views/issues/calendar.rhtml b/app/views/issues/calendar.rhtml
index 5e7ee31b..1df5aa3b 100644
--- a/app/views/issues/calendar.rhtml
+++ b/app/views/issues/calendar.rhtml
@@ -40,9 +40,11 @@
 <% if @query.valid? %>
 <%= render :partial => 'common/calendar', :locals => {:calendar => @calendar} %>
 
-<%= image_tag 'arrow_from.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_day) %><br />
-<%= image_tag 'arrow_to.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_end_day) %><br />
-<%= image_tag 'arrow_bw.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_end_day) %><br />
+<p class="legend cal">
+	<span class="starting"><%= l(:text_tip_task_begin_day) %></span>
+	<span class="ending"><%= l(:text_tip_task_end_day) %></span>
+	<span class="starting ending"><%= l(:text_tip_task_begin_end_day) %></span>
+</p>
 <% end %>
 
 <% content_for :sidebar do %>
diff --git a/public/images/arrow_bw.png b/public/images/arrow_bw.png
deleted file mode 100644
index 8155a2f2..00000000
Binary files a/public/images/arrow_bw.png and /dev/null differ
diff --git a/public/images/arrow_from.png b/public/images/arrow_from.png
deleted file mode 100644
index c76ae1f3..00000000
Binary files a/public/images/arrow_from.png and /dev/null differ
diff --git a/public/images/arrow_to.png b/public/images/arrow_to.png
deleted file mode 100644
index c88fa60d..00000000
Binary files a/public/images/arrow_to.png and /dev/null differ
diff --git a/public/images/bullet_diamond.png b/public/images/bullet_diamond.png
new file mode 100644
index 00000000..f68cb795
Binary files /dev/null and b/public/images/bullet_diamond.png differ
diff --git a/public/images/bullet_end.png b/public/images/bullet_end.png
new file mode 100644
index 00000000..0ff03323
Binary files /dev/null and b/public/images/bullet_end.png differ
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index f5959d88..6db5e58d 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -481,6 +481,10 @@ table.cal td p.day-num {font-size: 1.1em; text-align:right;}
 table.cal td.odd p.day-num {color: #bbb;}
 table.cal td.today {background:#ffffdd;}
 table.cal td.today p.day-num {font-weight: bold;}
+table.cal .starting a, p.cal.legend .starting {background: url(../images/bullet_go.png) no-repeat -1px -2px; padding-left:16px;}
+table.cal .ending a, p.cal.legend .ending {background: url(../images/bullet_end.png) no-repeat -1px -2px; padding-left:16px;}
+table.cal .starting.ending a, p.cal.legend .starting.ending {background: url(../images/bullet_diamond.png) no-repeat -1px -2px; padding-left:16px;}
+p.cal.legend span {display:block;}
 
 /***** Tooltips ******/
 .tooltip{position:relative;z-index:24;}