diff --git a/kallithea/public/css/style.css b/kallithea/public/css/style.css
--- a/kallithea/public/css/style.css
+++ b/kallithea/public/css/style.css
@@ -426,12 +426,12 @@ div.header img {
     padding: 10px 12px 8px;
 }
 
-#header #header-inner #quick li span.icon {
+#header #header-inner #quick li .icon {
     border-left: none;
     padding-left: 10px;
 }
 
-#header #header-inner #quick li span.icon_short {
+#header #header-inner #quick li .icon_short {
     top: 0;
     left: 0;
     border-left: none;
@@ -439,8 +439,8 @@ div.header img {
     padding: 8px 6px 4px;
 }
 
-#header #header-inner #quick li span.icon img,
-#header #header-inner #quick li span.icon_short img {
+#header #header-inner #quick li .icon img,
+#header #header-inner #quick li .icon_short img {
     vertical-align: middle;
     margin-bottom: 2px;
 }
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
@@ -46,9 +46,7 @@
         <div id="files_data">
           ${h.form(h.url('edit_gist', gist_id=c.gist.gist_access_id), method='post', id='eform')}
             <div>
-                <div class="gravatar">
-                  ${h.gravatar(c.authuser.email, size=32)}
-                </div>
+                ${h.gravatar_div(c.authuser.email, size=32)}
                 <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;"
                           id="description" name="description"
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
@@ -43,9 +43,7 @@
         % for gist in c.gists_pager:
           <div class="gist-item" style="padding:10px 20px 10px 15px">
 
-            <div class="gravatar">
-              ${h.gravatar(gist.owner.email, size=28)}
-            </div>
+            ${h.gravatar_div(gist.owner.email, size=28)}
             <div title="${gist.owner.full_contact}" class="user" style="font-size: 16px">
                 <b>${h.person(gist.owner.full_contact)}</b> /
                 <b><a href="${h.url('gist',gist_id=gist.gist_access_id)}">gist: ${gist.gist_access_id}</a></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
@@ -33,9 +33,7 @@
         <div id="files_data">
           ${h.form(h.url('gists'), method='post',id='eform')}
             <div>
-                <div class="gravatar">
-                  ${h.gravatar(c.authuser.email, size=32)}
-                </div>
+                ${h.gravatar_div(c.authuser.email, size=32)}
                 <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">
                 <label for='lifetime'>${_('Gist lifetime')}</label>
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
@@ -67,9 +67,7 @@
                     </div>
 
                     <div class="author">
-                        <div class="gravatar">
-                          ${h.gravatar(h.email_or_none(c.file_changeset.author), size=16)}
-                        </div>
+                        ${h.gravatar_div(h.email_or_none(c.file_changeset.author), size=16)}
                         <div title="${c.file_changeset.author}" class="user">${h.person(c.file_changeset.author)} - ${_('created')} ${h.age(c.file_changeset.date)}</div>
                     </div>
                     <div class="commit">${h.urlify_commit(c.file_changeset.message,c.repo_name)}</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
@@ -24,9 +24,7 @@
         <ul class="nav nav-pills nav-stacked">
           <li>
            <div class="gravatar_box" style="height: 26px">
-               <div class="gravatar" style="float: left">
-                 ${h.gravatar(c.user.email)}
-               </div>
+               ${h.gravatar_div(c.user.email, div_style="float: left")}
                <div class="truncate" style="margin:10px 0px 10px 0px; color:#5f5f5f; float:left; width: 100px">
                 <strong>${c.user.username}</strong>
                </div>
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">${h.gravatar(c.user.email, size=16)}</div></td>
+    <td>${h.gravatar_div(c.user.email, size=16)}</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">${h.gravatar(em.email, size=16)}</div></td>
+            <td>${h.gravatar_div(em.email, size=16)}</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,9 +3,7 @@ ${h.form(url('my_account'), method='post
 
          <div class="field">
            <div class="gravatar_box">
-               <div class="gravatar">
-                 ${h.gravatar(c.user.email)}
-               </div>
+                ${h.gravatar_div(c.user.email)}
                 <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
@@ -9,9 +9,7 @@ unread = lambda n:{False:'unread'}.get(n
 %for notification in c.notifications:
   <div id="notification_${notification.notification.notification_id}" class="container ${unread(notification.read)}">
     <div class="notification-header">
-      <div class="gravatar">
-        ${h.gravatar(notification.notification.created_by_user.email, size=24)}
-      </div>
+      ${h.gravatar_div(notification.notification.created_by_user.email, size=24)}
       <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
@@ -24,9 +24,7 @@
     <div class="table">
       <div id="notification_${c.notification.notification_id}">
         <div class="notification-header">
-          <div class="gravatar">
-            ${h.gravatar(c.notification.created_by_user.email, size=24)}
-          </div>
+          ${h.gravatar_div(c.notification.created_by_user.email, size=24)}
           <div class="desc">
               ${c.notification.description}
           </div>
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,9 +4,7 @@
   %for user in c.group_members_obj:
     <li>
       <div class="group_member">
-        <div class="gravatar">
-          ${h.gravatar(user.email, size=24)}
-        </div>
+        ${h.gravatar_div(user.email, size=24)}
         <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/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">${h.gravatar(c.user.email, size=16)}</div></td>
+    <td>${h.gravatar_div(c.user.email, size=16)}</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">${h.gravatar(c.user.email, size=16)}</div></td>
+            <td>${h.gravatar_div(c.user.email, size=16)}</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">${h.gravatar(c.user.email)}</div>
+                ${h.gravatar_div(c.user.email)}
                 <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
@@ -365,9 +365,7 @@
           href="${h.url('notifications')}"
         %endif
       >
-          <span class="icon">
-            ${h.gravatar(c.authuser.email, size=20)}
-          </span>
+          ${h.gravatar_div(c.authuser.email, size=20, div_class="icon", div_style="display:inline")}
           %if c.authuser.username != 'default':
             <span class="menu_link_user">${c.authuser.username}</span>
             %if c.unread_notifications != 0:
@@ -419,9 +417,7 @@
             ${h.end_form()}
           %else:
             <div class="links_left">
-                <div class="big_gravatar">
-                  ${h.gravatar(c.authuser.email, size=48)}
-                </div>
+                ${h.gravatar_div(c.authuser.email, size=48, div_class="big_gravatar")}
                 <div class="full_name">${c.authuser.full_name_or_username}</div>
                 <div class="email">${c.authuser.email}</div>
             </div>
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,9 +111,7 @@ ${self.repo_context_bar('changelog', c.c
                 </div>
                 <div class="left">
                      <div class="author">
-                         <div class="gravatar">
-                           ${h.gravatar(h.email_or_none(c.changeset.author), size=20)}
-                         </div>
+                         ${h.gravatar_div(h.email_or_none(c.changeset.author), size=20)}
                          <span><b>${h.person(c.changeset.author,'full_name_and_username')}</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/>
                      </div>
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
@@ -8,9 +8,7 @@
     <div class="comment-prev-next-links"></div>
     <div class="comment-wrapp">
       <div class="meta">
-          <div style="float:left">
-               ${h.gravatar(co.author.email, size=20)}
-          </div>
+          ${h.gravatar_div(co.author.email, size=20, div_style="float:left")}
           <div class="user">
               ${co.author.full_name_and_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
@@ -39,7 +39,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">${h.gravatar(h.email_or_none(cs.author), size=14)}</div></td>
+                <td>${h.gravatar_div(h.email_or_none(cs.author), size=14)}</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>
@@ -79,9 +79,7 @@ ${self.repo_context_bar('changelog')}
           ## diff block
           <div class="h3">
           <a class="tooltip" title="${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">
-               ${h.gravatar(h.email_or_none(cs.author), size=20)}
-             </div>
+             ${h.gravatar_div(h.email_or_none(cs.author), size=20)}
              <div class="right">
               <span class="logtags">
                 %if len(cs.parents)>1:
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
@@ -52,7 +52,7 @@
           </span>
         </td>
         <td style="width: 140px"><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
-        <td><div class="gravatar" commit_id="${cs.raw_id}">${h.gravatar(h.email_or_none(cs.author), size=14)}</div></td>
+        <td>${h.gravatar_div(h.email_or_none(cs.author), size=14, div_commit_id="${cs.raw_id}")}</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/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,9 +2,7 @@
     <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="${user}">
-        <div class="gravatar" style="margin:1px">
-          ${h.gravatar(email, size=20)}
-        </div>
+        ${h.gravatar_div(email, size=20, div_style="margin:1px")}
       </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
@@ -48,9 +48,7 @@
             </div>
         </div>
         <div class="author">
-            <div class="gravatar">
-                ${h.gravatar(h.email_or_none(c.file_changeset.author), size=16)}
-            </div>
+            ${h.gravatar_div(h.email_or_none(c.file_changeset.author), size=16)}
             <div title="${c.file_changeset.author}" class="user">${h.person(c.file_changeset.author)}</div>
         </div>
         <div class="commit">${h.urlify_commit(c.file_changeset.message,c.repo_name)}</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
@@ -3,9 +3,7 @@
 % for f in c.followers_pager:
     <div>
         <div class="follower_user">
-            <div class="gravatar">
-              ${h.gravatar(f.user.email, size=24)}
-            </div>
+            ${h.gravatar_div(f.user.email, size=24)}
             <span style="font-size: 20px"> <b>${f.user.username}</b> (${f.user.name} ${f.user.lastname})</span>
         </div>
         <div style="clear:both;padding-top: 10px"></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
@@ -4,9 +4,7 @@
     % for f in c.forks_pager:
         <div>
             <div class="fork_user">
-                <div class="gravatar">
-                  ${h.gravatar(f.user.email, size=24)}
-                </div>
+                ${h.gravatar_div(f.user.email, size=24)}
                 <span style="font-size: 20px">
                  <b>${f.user.username}</b> (${f.user.name} ${f.user.lastname}) /
                   ${h.link_to(f.repo_name,h.url('summary_home',repo_name=f.repo_name))}
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
@@ -5,9 +5,7 @@
      <div class="journal_day">${day}</div>
         % for user,entries in items:
             <div class="journal_container">
-                <div class="gravatar">
-                    ${h.gravatar(user.email if user else 'anonymous@kallithea-scm.org', size=24)}
-                </div>
+                ${h.gravatar_div(user.email if user else 'anonymous@kallithea-scm.org', size=24)}
                 %if user:
                     <div class="journal_user">${user.name} ${user.lastname}</div>
                 %else:
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
@@ -156,9 +156,7 @@ ${self.repo_context_bar('showpullrequest
               <label>${_('Owner')}:</label>
           </div>
           <div class="input pr-not-edit">
-                  <div class="gravatar">
-                    ${h.gravatar(c.pull_request.owner.email, size=20)}
-                  </div>
+                  ${h.gravatar_div(c.pull_request.owner.email, size=20)}
                   <span>${c.pull_request.owner.full_name_and_username}</span><br/>
                   <span><a href="mailto:${c.pull_request.owner.email}">${c.pull_request.owner.email}</a></span><br/>
           </div>
@@ -235,9 +233,7 @@ ${self.repo_context_bar('showpullrequest
                     <div class="reviewer_status tooltip" title="${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">
-                    ${h.gravatar(member.email, size=14)}
-                  </div>
+                  ${h.gravatar_div(member.email, size=14, div_class="reviewer_gravatar gravatar")}
                   <div style="float:left;">
                     ${member.full_name_and_username}
                     %if c.pull_request.user_id == member.user_id:
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
@@ -12,9 +12,7 @@
             </div>
             <div class="left">
                 <div class="author">
-                    <div class="gravatar">
-                      ${h.gravatar(h.email_or_none(sr['author']), size=20)}
-                    </div>
+                    ${h.gravatar_div(h.email_or_none(sr['author']), size=20)}
                     <span>${h.person(sr['author'])}</span><br/>
                     <span>${h.email_or_none(sr['author'])}</a></span><br/>
                 </div>
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
@@ -133,9 +133,7 @@ summary = lambda n:{False:'summary-short
             <li>
                <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}">
-                    ${h.gravatar(c.db_repo.user.email, size=18)}
-                  </div>
+                ${h.gravatar_div(c.db_repo.user.email, size=18, div_style="float: right; margin: 0px 0px 0px 0px", div_title=c.db_repo.user.full_name)}
               </a>
             </li>
             <li>