diff --git a/app/views/blame/show.html.haml b/app/views/blame/show.html.haml
index 5c3231e2..29fac7a4 100644
--- a/app/views/blame/show.html.haml
+++ b/app/views/blame/show.html.haml
@@ -24,9 +24,7 @@
           - commit = Commit.new(commit)
           - commit = CommitDecorator.decorate(commit)
           %tr
-            %td.author
-              = image_tag gravatar_icon(commit.author_email, 16)
-              = commit.author_name
+            %td.author= commit.author_link avatar: true, size: 16
             %td.blame_commit
                
               %code= link_to commit.short_id, project_commit_path(@project, commit)
diff --git a/app/views/commits/_commit.html.haml b/app/views/commits/_commit.html.haml
index 9abadc5d..8e96d16a 100644
--- a/app/views/commits/_commit.html.haml
+++ b/app/views/commits/_commit.html.haml
@@ -4,9 +4,8 @@
       %strong= link_to "Browse Code »", project_tree_path(@project, commit), class: "right"
   %p
     = link_to commit.short_id(8), project_commit_path(@project, commit), class: "commit_short_id"
-    %strong.commit-author-name= commit.author_name
+    %strong= commit.author_link avatar: true, size: 24
     %span.dash –
-    = image_tag gravatar_icon(commit.author_email), class: "avatar", width: 16
     = link_to_gfm truncate(commit.title, length: 50), project_commit_path(@project, commit.id), class: "row_title"
 
     %span.committed_ago
diff --git a/app/views/commits/_commit_box.html.haml b/app/views/commits/_commit_box.html.haml
index ece0df22..26753a14 100644
--- a/app/views/commits/_commit_box.html.haml
+++ b/app/views/commits/_commit_box.html.haml
@@ -18,16 +18,15 @@
   .commit-info
     .row
       .span5
-        = image_tag gravatar_icon(@commit.author_email, 40), class: "avatar"
         .author
-          %strong= @commit.author_name
+          %strong= @commit.author_link avatar: true, size: 40
           authored
           %time{title: @commit.authored_date.stamp("Aug 21, 2011 9:23pm")}
             #{time_ago_in_words(@commit.authored_date)} ago
         - if @commit.different_committer?
           .committer
             →
-            %strong= @commit.committer_name
+            %strong= @commit.committer_link
             committed
             %time{title: @commit.committed_date.stamp("Aug 21, 2011 9:23pm")}
               #{time_ago_in_words(@commit.committed_date)} ago