diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0eb965c276..8c3e83b5e3 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -73,17 +73,17 @@ module ApplicationHelper
   def link_to_issue(issue, options={})
     title = nil
     subject = nil
-    if options[:subject] == false
-      title = truncate(issue.subject, :length => 60)
-    else
+    title = "#{h(issue.tracker)} #{issue.id}: #{(truncate(issue.subject, :length => 60))}"
+    unless options[:subject] == false
       subject = issue.subject
       if options[:truncate]
         subject = truncate(subject, :length => options[:truncate])
       end
     end
-    s = link_to "#{h(issue.tracker)} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue},
+    s = image_tag "bullet_go.png", :alt => l(:label_issue), :title => l(:label_issue)
+    s << link_to("#{h(issue.tracker)} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue},
                                                  :class => issue.css_classes,
-                                                 :title => title
+                                                 :title => title)
     s << ": #{h subject}" if subject
     s = "#{h issue.project} - " + s if options[:project]
     s
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 6824ea08eb..bd19b5b589 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -14,7 +14,8 @@
 module ProjectsHelper
   def link_to_version(version, options = {})
     return '' unless version && version.is_a?(Version)
-    link_to_if version.visible?, format_version_name(version), { :controller => 'versions', :action => 'show', :id => version }, options
+    s = image_tag "package.png", :title => l(:label_version)
+    s << link_to_if(version.visible?, format_version_name(version), { :controller => 'versions', :action => 'show', :id => version }, options)
   end
 
   def project_settings_tabs
diff --git a/app/views/common/_calendar.rhtml b/app/views/common/_calendar.rhtml
index 147c49b2cf..42b46abafb 100644
--- a/app/views/common/_calendar.rhtml
+++ b/app/views/common/_calendar.rhtml
@@ -17,9 +17,9 @@ while day <= calendar.enddt %>
   <span class="tip"><%= render_issue_tooltip i %></span>
   </div>
   <% else %>
-  <span class="icon icon-package">
+  <span>
     <%= h("#{i.project} -") unless @project && @project == i.project %>
-    <%= link_to_version i%>
+    <%= link_to_version i, :title => l(:label_version) %>
   </span>
   <% end %>
 <% end %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 22dfb01fc3..eac80ecdde 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -563,9 +563,9 @@ 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;}
+table.cal td img {padding:0px 2px 3px 0px; vertical-align:middle;}
 p.cal.legend span {display:block;}
 
 /***** Tooltips ******/