diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 5fb994c..ca29a6b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -617,7 +617,7 @@ module ApplicationHelper
   def time_tag(time)
     text = distance_of_time_in_words(Time.now, time)
     if @project
-      link_to(text, project_activity_path(@project, :from => User.current.time_to_date(time)), :title => format_time(time))
+      link_to(text, project_activity_path(@project, :from => User.current.time_to_date(time)), :title => format_time(time), :data => {:toggle => 'tooltip'})
     else
       content_tag('abbr', text, :title => format_time(time))
     end
diff --git a/app/helpers/avatars_helper.rb b/app/helpers/avatars_helper.rb
index 7e2a1ff..abef946 100644
--- a/app/helpers/avatars_helper.rb
+++ b/app/helpers/avatars_helper.rb
@@ -38,7 +38,7 @@ module AvatarsHelper
   # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe <joe@foo.bar>')
   def avatar(user, options = { })
     if Setting.gravatar_enabled?
-      options.merge!(:default => Setting.gravatar_default)
+      options.merge!(:default => Setting.gravatar_default, :data => {:toggle => 'tooltip'})
       options[:class] = GravatarHelper::DEFAULT_OPTIONS[:class] + " " + options[:class] if options[:class]
       email = nil
       if user.respond_to?(:mail)
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 019b45d..1b2ef8c 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -996,7 +996,7 @@ function setupAttachmentDetail() {
 }
 
 $(function () {
-    $('[title]').tooltip({
+    $('[data-toggle="tooltip"], .icon-only').tooltip({
         show: {
           delay: 400
         },