diff --git a/src/main/twirl/helper/avatar.scala.html b/src/main/twirl/helper/avatar.scala.html
index 4905245..547fee8 100644
--- a/src/main/twirl/helper/avatar.scala.html
+++ b/src/main/twirl/helper/avatar.scala.html
@@ -1,4 +1,8 @@
-@(userName: String, size: Int, styles: String = "")(implicit context: app.Context)
+@(userName: String, size: Int, tooltip: Boolean = false, styles: String = "")(implicit context: app.Context)
 @import context._
 @import view.helpers._
-<img src="@url(userName)/_avatar" class="avatar" style="width: @(size)px; height: @(size)px; @styles"/>
+@if(tooltip){
+  <img src="@url(userName)/_avatar" data-toggle="tooltip" title="@userName" class="avatar" style="width: @(size)px; height: @(size)px; @styles"/>
+} else {
+  <img src="@url(userName)/_avatar" class="avatar" style="width: @(size)px; height: @(size)px; @styles"/>
+}
diff --git a/src/main/twirl/issues/list.scala.html b/src/main/twirl/issues/list.scala.html
index 8a79cee..1aa62f6 100644
--- a/src/main/twirl/issues/list.scala.html
+++ b/src/main/twirl/issues/list.scala.html
@@ -217,7 +217,12 @@
               @labels.map { label =>
                 <span class="label-color small" style="background-color: #@label.color; color: #@label.fontColor; padding-left: 4px; padding-right: 4px">@label.labelName</span>
               }
-              <span class="pull-right muted">#@issue.issueId</span>
+              <span class="pull-right muted">
+                @issue.assignedUserName.map { userName =>
+                  @helper.html.avatar(userName, 20, true)
+                }
+                #@issue.issueId
+              </span>
               <div class="small muted">
                 Opened by <a href="@url(issue.openedUserName)" class="username">@issue.openedUserName</a> @datetime(issue.registeredDate)&nbsp;
                 @if(commentCount > 0){
diff --git a/src/main/twirl/repo/commits.scala.html b/src/main/twirl/repo/commits.scala.html
index 03d92d1..de5b13e 100644
--- a/src/main/twirl/repo/commits.scala.html
+++ b/src/main/twirl/repo/commits.scala.html
@@ -38,7 +38,7 @@
             <a href="@url(repository)/tree/@commit.id" class="small">Browse code</a>
           </div>
           <div>
-            @helper.html.avatar(commit.committer, 40, "float: left; margin-right: 4px;")
+            @helper.html.avatar(commit.committer, 40, styles = "float: left; margin-right: 4px;")
             <a href="@url(repository)/commit/@commit.id" class="commit-message" style="font-weight: bold;">@link(commit.summary, repository)</a>
             @if(commit.description.isDefined){
               <a href="javascript:void(0)" onclick="$('#description-@commit.id').toggle();" class="omit">...</a>
diff --git a/src/main/webapp/assets/common/js/gitbucket.js b/src/main/webapp/assets/common/js/gitbucket.js
index f11a35e..4f6e6cc 100644
--- a/src/main/webapp/assets/common/js/gitbucket.js
+++ b/src/main/webapp/assets/common/js/gitbucket.js
@@ -1,11 +1,11 @@
 $(function(){
-  $.ajaxSetup({
-    cache: false
-  });
+  $.ajaxSetup({ cache: false });
 
   $('#repository-url').click(function(){
     this.select(0, this.value.length); 
   });
 
+  $('img[data-toggle=tooltip]').tooltip();
+
   prettyPrint();
 });