diff --git a/src/main/resources/noimage.png b/src/main/resources/noimage.png
index fe83548..c48285f 100644
--- a/src/main/resources/noimage.png
+++ b/src/main/resources/noimage.png
Binary files differ
diff --git a/src/main/twirl/account/activity.scala.html b/src/main/twirl/account/activity.scala.html
index 39af829..da65fcc 100644
--- a/src/main/twirl/account/activity.scala.html
+++ b/src/main/twirl/account/activity.scala.html
@@ -6,6 +6,7 @@
     <div class="row-fluid">
       <div class="span4">
         <div class="block">
+          <div class="account-image">@helper.html.avatar(account.userName, 200)</div>
           <div class="block-header">@account.userName</div>
         </div>
         <div class="block">
diff --git a/src/main/twirl/helper/activities.scala.html b/src/main/twirl/helper/activities.scala.html
index e102cdc..d5387b8 100644
--- a/src/main/twirl/helper/activities.scala.html
+++ b/src/main/twirl/helper/activities.scala.html
@@ -8,19 +8,21 @@
     <div class="block">
       <div class="muted small">@datetime(activity.activityDate)</div>
       <div class="strong">
-        @helper.html.avatar(activity.activityUserName, 16)
+        @if(avatar){
+          @helper.html.avatar(activity.activityUserName, 16)
+        }
         @activityMessage(activity.message)
       </div>
       @activity.additionalInfo.map { additionalInfo =>
         @(activity.activityType match {
           case "create_wiki" => {
-            <div class="small">Created <a href={"%s/%s/%s/wiki/%s".format(path, activity.userName, activity.repositoryName, additionalInfo)}>{additionalInfo}</a>.</div>
+            <div class="small activity-message">Created <a href={"%s/%s/%s/wiki/%s".format(path, activity.userName, activity.repositoryName, additionalInfo)}>{additionalInfo}</a>.</div>
           }
           case "edit_wiki" => {
-            <div class="small">Edited <a href={"%s/%s/%s/wiki/%s".format(path, activity.userName, activity.repositoryName, additionalInfo)}>{additionalInfo}</a>.</div>
+            <div class="small activity-message">Edited <a href={"%s/%s/%s/wiki/%s".format(path, activity.userName, activity.repositoryName, additionalInfo)}>{additionalInfo}</a>.</div>
           }
           case "push" => {
-            <div class="small">
+            <div class="small activity-message">
               {additionalInfo.split("\n").reverse.take(4).zipWithIndex.map{ case (commit, i) =>
                 if(i == 3){
                   <div>...</div>
@@ -34,7 +36,7 @@
             </div>
           }
           case _ => {
-            <div>{additionalInfo}</div>
+            <div class=" activity-message">{additionalInfo}</div>
           }
         })
       }
diff --git a/src/main/twirl/helper/avatar.scala.html b/src/main/twirl/helper/avatar.scala.html
index 8250a59..4905245 100644
--- a/src/main/twirl/helper/avatar.scala.html
+++ b/src/main/twirl/helper/avatar.scala.html
@@ -1,4 +1,4 @@
-@(userName: String, size: Int)(implicit context: app.Context)
+@(userName: String, size: Int, styles: String = "")(implicit context: app.Context)
 @import context._
 @import view.helpers._
-<img src="@url(userName)/_avatar" style="width: @(size)px; height: @(size)px;"/>
\ No newline at end of file
+<img src="@url(userName)/_avatar" class="avatar" style="width: @(size)px; height: @(size)px; @styles"/>
diff --git a/src/main/twirl/issues/create.scala.html b/src/main/twirl/issues/create.scala.html
index 284c59c..54bdcfc 100644
--- a/src/main/twirl/issues/create.scala.html
+++ b/src/main/twirl/issues/create.scala.html
@@ -23,7 +23,7 @@
                 <li><a href="javascript:void(0);" class="assign" data-name=""><i class="icon-remove-circle"></i> Clear assignee</a></li>
                 <li class="divider"></li>
                 @collaborators.map { collaborator =>
-                  <li><a href="javascript:void(0);" class="assign" data-name="@collaborator"><i class="icon-while"></i> @collaborator</a></li>
+                  <li><a href="javascript:void(0);" class="assign" data-name="@collaborator"><i class="icon-while"></i>@helper.html.avatar(collaborator, 20) @collaborator</a></li>
                 }
               }
             }
diff --git a/src/main/twirl/issues/issue.scala.html b/src/main/twirl/issues/issue.scala.html
index 7dc0dc6..ae65e40 100644
--- a/src/main/twirl/issues/issue.scala.html
+++ b/src/main/twirl/issues/issue.scala.html
@@ -31,7 +31,7 @@
           <div class="issue-info">
             <span id="label-assigned">
               @issue.assignedUserName.map { userName =>
-                <a href="@url(userName)" class="username strong">@userName</a> is assigned
+                @helper.html.avatar(userName, 20) <a href="@url(userName)" class="username strong">@userName</a> is assigned
               }.getOrElse("No one is assigned")
             </span>
             @if(hasWritePermission){
@@ -39,7 +39,7 @@
                 <li><a href="javascript:void(0);" class="assign" data-name=""><i class="icon-remove-circle"></i> Clear assignee</a></li>
                 <li class="divider"></li>
                 @collaborators.map { collaborator =>
-                  <li><a href="javascript:void(0);" class="assign" data-name="@collaborator"><i class="icon-white"></i> @collaborator</a></li>
+                  <li><a href="javascript:void(0);" class="assign" data-name="@collaborator"><i class="icon-white"></i>@helper.html.avatar(collaborator, 20) @collaborator</a></li>
                 }
               }
             }
diff --git a/src/main/twirl/repo/commit.scala.html b/src/main/twirl/repo/commit.scala.html
index 89d4230..2ac2af5 100644
--- a/src/main/twirl/repo/commit.scala.html
+++ b/src/main/twirl/repo/commit.scala.html
@@ -43,7 +43,9 @@
     </tr>
     <tr>
       <td>
-        <a href="@url(commit.committer)" class="username strong">@commit.committer</a> <span class="muted">@datetime(commit.time)</span>
+        @helper.html.avatar(commit.committer, 20)
+        <a href="@url(commit.committer)" class="username strong">@commit.committer</a>
+        <span class="muted">@datetime(commit.time)</span>
         <div class="pull-right monospace small" style="text-align: right;">
           <div>
             @if(commit.parents.size == 0){
diff --git a/src/main/twirl/repo/commits.scala.html b/src/main/twirl/repo/commits.scala.html
index c6555a7..03d92d1 100644
--- a/src/main/twirl/repo/commits.scala.html
+++ b/src/main/twirl/repo/commits.scala.html
@@ -33,7 +33,12 @@
       @day.map { commit =>
       <tr>
         <td>
-          <div class="pull-left">
+          <div class="pull-right align-right">
+            <a href="@url(repository)/commit/@commit.id" class="btn btn-small monospace">@commit.id.substring(0, 10)</a><br>
+            <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;")
             <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>
@@ -47,10 +52,6 @@
               <span class="muted">@datetime(commit.time)</span>
             </div>
           </div>
-          <div class="pull-right align-right">
-            <a href="@url(repository)/commit/@commit.id" class="btn btn-small monospace">@commit.id.substring(0, 10)</a><br>
-            <a href="@url(repository)/tree/@commit.id" class="small">Browse code</a>
-          </div>
         </td>
       </tr>
       }
diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html
index 1e107ea..60acfed 100644
--- a/src/main/twirl/repo/files.scala.html
+++ b/src/main/twirl/repo/files.scala.html
@@ -36,6 +36,7 @@
       <tr>
         <td colspan="4" class="latest-commit">
           <div>
+            @helper.html.avatar(latestCommit.committer, 20)
             <a href="@url(latestCommit.committer)" class="username strong">@latestCommit.committer</a>
             <span class="muted">@datetime(latestCommit.time)</span>
             <div class="pull-right align-right monospace">
diff --git a/src/main/twirl/wiki/history.scala.html b/src/main/twirl/wiki/history.scala.html
index 022ca4b..859f0f8 100644
--- a/src/main/twirl/wiki/history.scala.html
+++ b/src/main/twirl/wiki/history.scala.html
@@ -35,7 +35,7 @@
     @commits.map { commit =>
       <tr>
         <td width="0%"><input type="checkbox" name="commitId" value="@commit.id"></td>
-        <td><a href="@url(commit.committer)">@commit.committer</a></td>
+        <td>@helper.html.avatar(commit.committer, 20)<a href="@url(commit.committer)">@commit.committer</a></td>
         <td width="80%">
           <span class="muted">@datetime(commit.time):</span>
           @commit.shortMessage
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index f1dd451..79ce206 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -197,6 +197,16 @@
   margin-left: 20px;
 }
 
+img.avatar {
+  border-radius: 4px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+}
+
+div.activity-message {
+  margin-left: 20px;
+}
+
 fieldset.margin {
   border-top: 1px solid #eee;
   margin-top: 10px;