diff --git a/kallithea/templates/admin/gists/edit.html b/kallithea/templates/admin/gists/edit.html
--- a/kallithea/templates/admin/gists/edit.html
+++ b/kallithea/templates/admin/gists/edit.html
@@ -50,7 +50,7 @@
           ${h.form(h.url('edit_gist', gist_id=c.gist.gist_access_id), method='post', id='eform')}
             <div>
                 <div class="gravatar">
-                   <img alt="gravatar" src="${h.gravatar_url(c.authuser.email,32)}"/>
+                  ${h.gravatar(c.authuser.email, size=32)}
                 </div>
                 <input type="hidden" value="${c.file_changeset.raw_id}" name="parent_hash">
                 <textarea style="resize:vertical; width:400px;border: 1px solid #ccc;border-radius: 3px;"
diff --git a/kallithea/templates/admin/gists/index.html b/kallithea/templates/admin/gists/index.html
--- a/kallithea/templates/admin/gists/index.html
+++ b/kallithea/templates/admin/gists/index.html
@@ -47,7 +47,7 @@
           <div class="gist-item" style="padding:10px 20px 10px 15px">
 
             <div class="gravatar">
-               <img alt="gravatar" src="${h.gravatar_url(gist.owner.email,28)}"/>
+              ${h.gravatar(gist.owner.email, size=28)}
             </div>
             <div title="${gist.owner.full_contact}" class="user" style="font-size: 16px">
                 <b>${h.person(gist.owner.full_contact)}</b> /
diff --git a/kallithea/templates/admin/gists/new.html b/kallithea/templates/admin/gists/new.html
--- a/kallithea/templates/admin/gists/new.html
+++ b/kallithea/templates/admin/gists/new.html
@@ -37,7 +37,7 @@
           ${h.form(h.url('gists'), method='post',id='eform')}
             <div>
                 <div class="gravatar">
-                   <img alt="gravatar" src="${h.gravatar_url(c.authuser.email,32)}"/>
+                  ${h.gravatar(c.authuser.email, size=32)}
                 </div>
                 <textarea style="resize:vertical; width:400px;border: 1px solid #ccc;border-radius: 3px;" id="description" name="description" placeholder="${_('Gist description ...')}"></textarea>
                 <div style="padding:0px 0px 0px 42px">
diff --git a/kallithea/templates/admin/gists/show.html b/kallithea/templates/admin/gists/show.html
--- a/kallithea/templates/admin/gists/show.html
+++ b/kallithea/templates/admin/gists/show.html
@@ -71,7 +71,7 @@
 
                     <div class="author">
                         <div class="gravatar">
-                            <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(c.file_changeset.author),16)}"/>
+                          ${h.gravatar(h.email_or_none(c.file_changeset.author), size=16)}
                         </div>
                         <div title="${c.file_changeset.author}" class="user">${h.person(c.file_changeset.author)} - ${_('created')} ${h.age(c.file_changeset.date)}</div>
                     </div>
diff --git a/kallithea/templates/admin/my_account/my_account.html b/kallithea/templates/admin/my_account/my_account.html
--- a/kallithea/templates/admin/my_account/my_account.html
+++ b/kallithea/templates/admin/my_account/my_account.html
@@ -28,7 +28,7 @@
           <li>
            <div class="gravatar_box" style="height: 26px">
                <div class="gravatar" style="float: left">
-                   <img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/>
+                 ${h.gravatar(c.user.email)}
                </div>
                <div class="truncate" style="margin:10px 0px 10px 0px; color:#5f5f5f; float:left; width: 100px">
                 <strong>${c.user.username}</strong>
diff --git a/kallithea/templates/admin/my_account/my_account_emails.html b/kallithea/templates/admin/my_account/my_account_emails.html
--- a/kallithea/templates/admin/my_account/my_account_emails.html
+++ b/kallithea/templates/admin/my_account/my_account_emails.html
@@ -1,7 +1,7 @@
 <div class="emails_wrap">
   <table class="noborder">
     <tr>
-    <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email,16)}"/> </div></td>
+    <td><div class="gravatar">${h.gravatar(c.user.email, size=16)}</div></td>
     <td><div class="email">${c.user.email}</div></td>
     <td>
         <span class="btn btn-mini btn-success disabled">${_('Primary')}</span>
@@ -10,7 +10,7 @@
     %if c.user_email_map:
         %for em in c.user_email_map:
           <tr>
-            <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(em.email,16)}"/> </div></td>
+            <td><div class="gravatar">${h.gravatar(em.email, size=16)}</div></td>
             <td><div class="email">${em.email}</div></td>
             <td>
                 ${h.form(url('my_account_emails'),method='delete')}
diff --git a/kallithea/templates/admin/my_account/my_account_profile.html b/kallithea/templates/admin/my_account/my_account_profile.html
--- a/kallithea/templates/admin/my_account/my_account_profile.html
+++ b/kallithea/templates/admin/my_account/my_account_profile.html
@@ -3,7 +3,9 @@ ${h.form(url('my_account'), method='post
 
          <div class="field">
            <div class="gravatar_box">
-               <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/></div>
+               <div class="gravatar">
+                 ${h.gravatar(c.user.email)}
+               </div>
                 <p>
                 %if c.visual.use_gravatar:
                 <strong>${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong>
diff --git a/kallithea/templates/admin/notifications/notifications_data.html b/kallithea/templates/admin/notifications/notifications_data.html
--- a/kallithea/templates/admin/notifications/notifications_data.html
+++ b/kallithea/templates/admin/notifications/notifications_data.html
@@ -10,7 +10,7 @@ unread = lambda n:{False:'unread'}.get(n
   <div id="notification_${notification.notification.notification_id}" class="container ${unread(notification.read)}">
     <div class="notification-header">
       <div class="gravatar">
-          <img alt="gravatar" src="${h.gravatar_url(notification.notification.created_by_user.email,24)}"/>
+        ${h.gravatar(notification.notification.created_by_user.email, size=24)}
       </div>
       <div class="desc ${unread(notification.read)}">
       <a href="${url('notification', notification_id=notification.notification.notification_id)}">${notification.notification.description}</a>
diff --git a/kallithea/templates/admin/notifications/show_notification.html b/kallithea/templates/admin/notifications/show_notification.html
--- a/kallithea/templates/admin/notifications/show_notification.html
+++ b/kallithea/templates/admin/notifications/show_notification.html
@@ -28,7 +28,7 @@
       <div id="notification_${c.notification.notification_id}">
         <div class="notification-header">
           <div class="gravatar">
-              <img alt="gravatar" src="${h.gravatar_url(c.notification.created_by_user.email,24)}"/>
+            ${h.gravatar(c.notification.created_by_user.email, size=24)}
           </div>
           <div class="desc">
               ${c.notification.description}
diff --git a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html
+++ b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html
@@ -21,7 +21,7 @@ ${h.form(url('edit_repo_group_perms', gr
                         <td>${h.radio('u_perm_%s' % r2p.user.username,'group.write')}</td>
                         <td>${h.radio('u_perm_%s' % r2p.user.username,'group.admin')}</td>
                         <td style="white-space: nowrap;">
-                            <img class="perm-gravatar" src="${h.gravatar_url(r2p.user.email,14)}"/>
+                            ${h.gravatar(r2p.user.email, cls="perm-gravatar", size=14)}
                             %if h.HasPermissionAny('hg.admin')() and r2p.user.username != 'default':
                              <a href="${h.url('edit_user',id=r2p.user.user_id)}">${r2p.user.username}</a>
                             %else:
@@ -41,7 +41,7 @@ ${h.form(url('edit_repo_group_perms', gr
                         <td>${h.radio('u_perm_%s' % r2p.user.username,'group.write', disabled="disabled")}</td>
                         <td>${h.radio('u_perm_%s' % r2p.user.username,'group.admin', disabled="disabled")}</td>
                         <td style="white-space: nowrap;">
-                            <img class="perm-gravatar" src="${h.gravatar_url(r2p.user.email,14)}"/>
+                            ${h.gravatar(r2p.user.email, cls="perm-gravatar", size=14)/>
                             ${r2p.user.username if r2p.user.username != 'default' else _('default')}
                         </td>
                         <td><i class="icon-user"></i> ${_('delegated admin')}</td>
diff --git a/kallithea/templates/admin/repos/repo_edit_permissions.html b/kallithea/templates/admin/repos/repo_edit_permissions.html
--- a/kallithea/templates/admin/repos/repo_edit_permissions.html
+++ b/kallithea/templates/admin/repos/repo_edit_permissions.html
@@ -30,7 +30,7 @@ ${h.form(url('edit_repo_perms_update', r
                         <td>${h.radio('u_perm_%s' % r2p.user.username,'repository.write')}</td>
                         <td>${h.radio('u_perm_%s' % r2p.user.username,'repository.admin')}</td>
                         <td style="white-space: nowrap;">
-                            <img class="perm-gravatar" src="${h.gravatar_url(r2p.user.email,14)}"/>
+                            ${h.gravatar(r2p.user.email, size=14)}
                             %if h.HasPermissionAny('hg.admin')() and r2p.user.username != 'default':
                              <a href="${h.url('edit_user',id=r2p.user.user_id)}">${r2p.user.username}</a>
                             %else:
diff --git a/kallithea/templates/admin/user_groups/user_group_edit_members.html b/kallithea/templates/admin/user_groups/user_group_edit_members.html
--- a/kallithea/templates/admin/user_groups/user_group_edit_members.html
+++ b/kallithea/templates/admin/user_groups/user_group_edit_members.html
@@ -4,7 +4,9 @@
   %for user in c.group_members_obj:
     <li>
       <div class="group_member">
-        <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(user.email,24)}"/> </div>
+        <div class="gravatar">
+          ${h.gravatar(user.email, size=24)}
+        </div>
         <div>${h.link_to(user.username, h.url('edit_user',id=user.user_id))}</div>
         <div>${user.full_name}</div>
       </div>
diff --git a/kallithea/templates/admin/user_groups/user_group_edit_perms.html b/kallithea/templates/admin/user_groups/user_group_edit_perms.html
--- a/kallithea/templates/admin/user_groups/user_group_edit_perms.html
+++ b/kallithea/templates/admin/user_groups/user_group_edit_perms.html
@@ -21,7 +21,7 @@ ${h.form(url('edit_user_group_perms', id
                         <td>${h.radio('u_perm_%s' % r2p.user.username,'usergroup.write')}</td>
                         <td>${h.radio('u_perm_%s' % r2p.user.username,'usergroup.admin')}</td>
                         <td style="white-space: nowrap;">
-                            <img class="perm-gravatar" src="${h.gravatar_url(r2p.user.email,14)}"/>
+                            ${h.gravatar(r2p.user.email, cls="perm-gravatar", size=14)}
                             %if h.HasPermissionAny('hg.admin')() and r2p.user.username != 'default':
                              <a href="${h.url('edit_user',id=r2p.user.user_id)}">${r2p.user.username}</a>
                             %else:
@@ -41,7 +41,7 @@ ${h.form(url('edit_user_group_perms', id
                         <td>${h.radio('u_perm_%s' % r2p.user.username,'usergroup.write', disabled="disabled")}</td>
                         <td>${h.radio('u_perm_%s' % r2p.user.username,'usergroup.admin', disabled="disabled")}</td>
                         <td style="white-space: nowrap;">
-                            <img class="perm-gravatar" src="${h.gravatar_url(r2p.user.email,14)}"/>
+                            ${h.gravatar(r2p.user.email, cls="perm-gravatar", size=14)}
                             ${r2p.user.username if r2p.user.username != 'default' else _('default')}
                         </td>
                         <td><i class="icon-user"></i> ${_('delegated admin')}</td>
diff --git a/kallithea/templates/admin/users/user_edit.html b/kallithea/templates/admin/users/user_edit.html
--- a/kallithea/templates/admin/users/user_edit.html
+++ b/kallithea/templates/admin/users/user_edit.html
@@ -32,7 +32,7 @@
           <li>
            <div class="gravatar_box" style="height: 26px">
                <div class="gravatar" style="float: left">
-                   <img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/>
+                 ${h.gravatar(c.user.email, size=26)}
                </div>
                <div class="truncate" style="margin:10px 0px 10px 0px; color:#5f5f5f; float:left; width: 100px">
                 <strong>${c.user.username}</strong>
diff --git a/kallithea/templates/admin/users/user_edit_emails.html b/kallithea/templates/admin/users/user_edit_emails.html
--- a/kallithea/templates/admin/users/user_edit_emails.html
+++ b/kallithea/templates/admin/users/user_edit_emails.html
@@ -1,7 +1,7 @@
 <div class="emails_wrap">
   <table class="noborder">
     <tr>
-    <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email,16)}"/> </div></td>
+    <td><div class="gravatar">${h.gravatar(c.user.email, size=16)}</div></td>
     <td><div class="email">${c.user.email}</div></td>
     <td>
         <span class="btn btn-mini btn-success disabled">${_('Primary')}</span>
@@ -10,7 +10,7 @@
     %if c.user_email_map:
         %for em in c.user_email_map:
           <tr>
-            <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(em.email,16)}"/> </div></td>
+            <td><div class="gravatar">${h.gravatar(c.user.email, size=16)}</div></td>
             <td><div class="email">${em.email}</div></td>
             <td>
                 ${h.form(url('edit_user_emails', id=c.user.user_id),method='delete')}
diff --git a/kallithea/templates/admin/users/user_edit_profile.html b/kallithea/templates/admin/users/user_edit_profile.html
--- a/kallithea/templates/admin/users/user_edit_profile.html
+++ b/kallithea/templates/admin/users/user_edit_profile.html
@@ -2,7 +2,7 @@ ${h.form(url('update_user', id=c.user.us
 <div class="form">
         <div class="field">
            <div class="gravatar_box">
-               <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/></div>
+                <div class="gravatar">${h.gravatar(c.user.email)}</div>
                 <p>
                 %if c.visual.use_gravatar:
                 <strong>${_('Change avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong>
diff --git a/kallithea/templates/base/base.html b/kallithea/templates/base/base.html
--- a/kallithea/templates/base/base.html
+++ b/kallithea/templates/base/base.html
@@ -296,7 +296,7 @@
     <li>
       <a class="menu_link childs" id="quick_login_link">
           <span class="icon">
-             <img src="${h.gravatar_url(c.authuser.email,20)}" alt="avatar">
+            ${h.gravatar(c.authuser.email, size=20)}
           </span>
           %if c.authuser.username != 'default':
             <span class="menu_link_user">${c.authuser.username}</span>
@@ -349,7 +349,9 @@
             ${h.end_form()}
           %else:
             <div class="links_left">
-                <div class="big_gravatar"><img alt="gravatar" src="${h.gravatar_url(c.authuser.email,48)}" /></div>
+                <div class="big_gravatar">
+                  ${h.gravatar(c.authuser.email, size=48)}
+                </div>
                 <div class="full_name">${c.authuser.full_name_or_username}</div>
                 <div class="email">${c.authuser.email}</div>
             </div>
diff --git a/kallithea/templates/changelog/changelog.html b/kallithea/templates/changelog/changelog.html
--- a/kallithea/templates/changelog/changelog.html
+++ b/kallithea/templates/changelog/changelog.html
@@ -104,7 +104,7 @@ ${self.repo_context_bar('changelog', c.f
                           %endif
                         </td>
                         <td class="author">
-                            <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),16)}"/>
+                            ${h.gravatar(h.email_or_none(cs.author), size=16)}
                             <span title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span>
                         </td>
                         <td class="hash" style="width:${len(h.show_id(cs))*6.5}px">
diff --git a/kallithea/templates/changeset/changeset.html b/kallithea/templates/changeset/changeset.html
--- a/kallithea/templates/changeset/changeset.html
+++ b/kallithea/templates/changeset/changeset.html
@@ -111,7 +111,7 @@ ${self.repo_context_bar('changelog', c.c
                 <div class="left">
                      <div class="author">
                          <div class="gravatar">
-                             <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(c.changeset.author),20)}"/>
+                           ${h.gravatar(h.email_or_none(c.changeset.author), size=20)}
                          </div>
                          <span><b>${h.person(c.changeset.author,'username_and_name')}</b> - ${h.age(c.changeset.date,True)} ${h.fmt_date(c.changeset.date)}</span><br/>
                          <span>${h.email_or_none(c.changeset.author)}</span><br/>
diff --git a/kallithea/templates/changeset/changeset_file_comment.html b/kallithea/templates/changeset/changeset_file_comment.html
--- a/kallithea/templates/changeset/changeset_file_comment.html
+++ b/kallithea/templates/changeset/changeset_file_comment.html
@@ -7,7 +7,9 @@
   <div class="comment" id="comment-${co.comment_id}" line="${co.line_no}">
     <div class="comment-wrapp">
       <div class="meta">
-        <div style="float:left"> <img src="${h.gravatar_url(co.author.email, 20)}" /> </div>
+          <div style="float:left">
+               ${h.gravatar(co.author.email, size=20)}
+          </div>
           <div class="user">
               ${co.author.username}
           </div>
diff --git a/kallithea/templates/changeset/changeset_range.html b/kallithea/templates/changeset/changeset_range.html
--- a/kallithea/templates/changeset/changeset_range.html
+++ b/kallithea/templates/changeset/changeset_range.html
@@ -42,7 +42,7 @@ ${self.repo_context_bar('changelog')}
             <table class="compare_view_commits noborder">
             %for cnt,cs in enumerate(c.cs_ranges):
                 <tr>
-                <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td>
+                <td><div class="gravatar">${h.gravatar(h.email_or_none(cs.author), size=14)}</div></td>
                 <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</td>
                 <td><div class="author">${h.person(cs.author)}</div></td>
                 <td><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
@@ -83,7 +83,7 @@ ${self.repo_context_bar('changelog')}
           <div class="h3">
           <a class="tooltip" title="${h.tooltip(cs.message)}" href="${h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id)}">${h.show_id(cs)}</a>
              <div class="gravatar">
-                 <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),20)}"/>
+               ${h.gravatar(h.email_or_none(cs.author), size=20)}
              </div>
              <div class="right">
               <span class="logtags">
diff --git a/kallithea/templates/compare/compare_cs.html b/kallithea/templates/compare/compare_cs.html
--- a/kallithea/templates/compare/compare_cs.html
+++ b/kallithea/templates/compare/compare_cs.html
@@ -37,7 +37,7 @@
           %endif
         </td>
         <td style="width: 140px"><span class="tooltip" title="${h.tooltip(h.age(cs.date))}">${cs.date}</span></td>
-        <td><div class="gravatar" commit_id="${cs.raw_id}"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}" height="14" width="14"/></div></td>
+        <td><div class="gravatar" commit_id="${cs.raw_id}">${h.gravatar(h.email_or_none(cs.author), size=14)}</div></td>
         <td><div class="author">${h.person(cs.author)}</div></td>
         <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</td>
         <td>
diff --git a/kallithea/templates/data_table/_dt_elements.html b/kallithea/templates/data_table/_dt_elements.html
--- a/kallithea/templates/data_table/_dt_elements.html
+++ b/kallithea/templates/data_table/_dt_elements.html
@@ -123,7 +123,7 @@
 </%def>
 
 <%def name="user_gravatar(email, size=24)">
-    <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(email, size)}"/> </div>
+    <div class="gravatar">${h.gravatar(email, size=size)}</div>
 </%def>
 
 <%def name="repo_actions(repo_name, super_user=True)">
diff --git a/kallithea/templates/files/files_history_box.html b/kallithea/templates/files/files_history_box.html
--- a/kallithea/templates/files/files_history_box.html
+++ b/kallithea/templates/files/files_history_box.html
@@ -2,7 +2,9 @@
     <div class="item">${h.literal(ungettext(u'%s author',u'%s authors',len(c.authors)) % ('<b>%s</b>' % len(c.authors))) }</div>
     %for email, user in c.authors:
       <div class="contributor tooltip" style="float:left" title="${h.tooltip(user)}">
-        <div class="gravatar" style="margin:1px"><img alt="gravatar" src="${h.gravatar_url(email, 20)}"/> </div>
+        <div class="gravatar" style="margin:1px">
+          ${h.gravatar(email, size=20)}
+        </div>
       </div>
     %endfor
 </div>
diff --git a/kallithea/templates/files/files_source.html b/kallithea/templates/files/files_source.html
--- a/kallithea/templates/files/files_source.html
+++ b/kallithea/templates/files/files_source.html
@@ -49,7 +49,7 @@
         </div>
         <div class="author">
             <div class="gravatar">
-                <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(c.file_changeset.author),16)}"/>
+                ${h.gravatar(h.email_or_none(c.file_changeset.author), size=16)}
             </div>
             <div title="${c.file_changeset.author}" class="user">${h.person(c.file_changeset.author)}</div>
         </div>
diff --git a/kallithea/templates/followers/followers_data.html b/kallithea/templates/followers/followers_data.html
--- a/kallithea/templates/followers/followers_data.html
+++ b/kallithea/templates/followers/followers_data.html
@@ -4,7 +4,7 @@
     <div>
         <div class="follower_user">
             <div class="gravatar">
-                <img alt="gravatar" src="${h.gravatar_url(f.user.email,24)}"/>
+              ${h.gravatar(f.user.email, size=24)}
             </div>
             <span style="font-size: 20px"> <b>${f.user.username}</b> (${f.user.name} ${f.user.lastname})</span>
         </div>
diff --git a/kallithea/templates/forks/forks_data.html b/kallithea/templates/forks/forks_data.html
--- a/kallithea/templates/forks/forks_data.html
+++ b/kallithea/templates/forks/forks_data.html
@@ -5,7 +5,7 @@
         <div>
             <div class="fork_user">
                 <div class="gravatar">
-                    <img alt="gravatar" src="${h.gravatar_url(f.user.email,24)}"/>
+                  ${h.gravatar(f.user.email, size=24)}
                 </div>
                 <span style="font-size: 20px">
                  <b>${f.user.username}</b> (${f.user.name} ${f.user.lastname}) /
diff --git a/kallithea/templates/journal/journal_data.html b/kallithea/templates/journal/journal_data.html
--- a/kallithea/templates/journal/journal_data.html
+++ b/kallithea/templates/journal/journal_data.html
@@ -6,10 +6,10 @@
         % for user,entries in items:
             <div class="journal_container">
                 <div class="gravatar">
-                    <img alt="gravatar" src="${h.gravatar_url(user.email if user else 'anonymous@kallithea-scm.org',24)}"/>
+                    ${h.gravatar(user.email if user else 'anonymous@kallithea-scm.org', size=24)}
                 </div>
                 %if user:
-                   <div class="journal_user">${user.name} ${user.lastname}</div>
+                    <div class="journal_user">${user.name} ${user.lastname}</div>
                 %else:
                     <div class="journal_user deleted">${entries[0].username}</div>
                 %endif
diff --git a/kallithea/templates/pullrequests/pullrequest_show.html b/kallithea/templates/pullrequests/pullrequest_show.html
--- a/kallithea/templates/pullrequests/pullrequest_show.html
+++ b/kallithea/templates/pullrequests/pullrequest_show.html
@@ -158,7 +158,7 @@ ${self.repo_context_bar('showpullrequest
           <div class="input">
               <div class="author">
                   <div class="gravatar">
-                      <img alt="gravatar" src="${h.gravatar_url(c.pull_request.author.email,20)}"/>
+                    ${h.gravatar(c.pull_request.author.email, size=20)}
                   </div>
                   <span>${c.pull_request.author.username_and_name}</span><br/>
                   <span><a href="mailto:${c.pull_request.author.email}">${c.pull_request.author.email}</a></span><br/>
@@ -219,7 +219,9 @@ ${self.repo_context_bar('showpullrequest
                     <div class="reviewer_status tooltip" title="${h.tooltip(h.changeset_status_lbl(status.status if status else 'not_reviewed'))}">
                       <i class="icon-circle changeset-status-${status.status if status else 'not_reviewed'}"></i>
                     </div>
-                  <div class="reviewer_gravatar gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email,14)}"/> </div>
+                  <div class="reviewer_gravatar gravatar">
+                    ${h.gravatar(member.email, size=14)}
+                  </div>
                   <div style="float:left;">${member.full_name} (${_('owner') if c.pull_request.user_id == member.user_id else _('reviewer')})</div>
                   <input type="hidden" value="${member.user_id}" name="review_members" />
                   %if editable:
diff --git a/kallithea/templates/search/search_commit.html b/kallithea/templates/search/search_commit.html
--- a/kallithea/templates/search/search_commit.html
+++ b/kallithea/templates/search/search_commit.html
@@ -13,7 +13,7 @@
             <div class="left">
                 <div class="author">
                     <div class="gravatar">
-                        <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(sr['author']),20)}"/>
+                      ${h.gravatar(h.email_or_none(sr['author']), size=20)}
                     </div>
                     <span>${h.person(sr['author'])}</span><br/>
                     <span>${h.email_or_none(sr['author'])}</a></span><br/>
diff --git a/kallithea/templates/summary/summary.html b/kallithea/templates/summary/summary.html
--- a/kallithea/templates/summary/summary.html
+++ b/kallithea/templates/summary/summary.html
@@ -141,7 +141,7 @@ summary = lambda n:{False:'summary-short
                <a title="${_('Owner')} ${c.db_repo.user.email}">
                 <i class="icon-user"></i> ${c.db_repo.user.username}
                   <div class="gravatar" style="float: right; margin: 0px 0px 0px 0px" title="${c.db_repo.user.name} ${c.db_repo.user.lastname}">
-                     <img alt="gravatar" src="${h.gravatar_url(c.db_repo.user.email, 18)}"/>
+                    ${h.gravatar(c.db_repo.user.email, size=18)}
                   </div>
               </a>
             </li>