diff --git a/src/main/scala/service/ActivityService.scala b/src/main/scala/service/ActivityService.scala
index 5470ffc..1fc61e4 100644
--- a/src/main/scala/service/ActivityService.scala
+++ b/src/main/scala/service/ActivityService.scala
@@ -112,7 +112,7 @@
   
   def recordCreateBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String) =
     Activities.autoInc insert(userName, repositoryName, activityUserName,
-      "create_tag",
+      "create_branch",
       s"[user:${activityUserName}] created branch [tag:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]",
       None,
       currentDate)
diff --git a/src/main/twirl/helper/activities.scala.html b/src/main/twirl/helper/activities.scala.html
index 70435f5..e301980 100644
--- a/src/main/twirl/helper/activities.scala.html
+++ b/src/main/twirl/helper/activities.scala.html
@@ -1,45 +1,84 @@
 @(activities: List[model.Activity])(implicit context: app.Context)
 @import context._
 @import view.helpers._
+
+@longActivity(activity: model.Activity, image: String) = {
+  <div style="position: absolute; padding-top: 8px;"><img src="@assets/common/images/@image"/></div>
+  <div style="margin-left: 40px;">
+    <div class="muted small">@datetime(activity.activityDate)</div>
+    <div class="strong">
+      @avatar(activity.activityUserName, 16)
+      @activityMessage(activity.message)
+    </div>
+    @activity.additionalInfo.map { additionalInfo =>
+      <div class=" activity-message">@additionalInfo</div>
+    }
+  </div>
+}
+
+@customActivity(activity: model.Activity, image: String)(additionalInfo: Any) = {
+  <div style="position: absolute; padding-top: 8px;"><img src="@assets/common/images/@image"/></div>
+  <div style="margin-left: 40px;">
+    <div class="muted small">@datetime(activity.activityDate)</div>
+    <div class="strong">
+      @avatar(activity.activityUserName, 16)
+      @activityMessage(activity.message)
+    </div>
+    @additionalInfo
+  </div>
+}
+
+@shortActivity(activity: model.Activity, image: String) = {
+  <div style="position: absolute; padding-left: 8px;"><img src="@assets/common/images/@image"/></div>
+  <div style="margin-left: 40px;">
+    <div>
+      @avatar(activity.activityUserName, 16)
+      @activityMessage(activity.message)
+      <span class="muted small">@datetime(activity.activityDate)</span>
+    </div>
+  </div>
+}
+
 @if(activities.isEmpty){
   No activity
 } else {
   @activities.map { activity =>
     <div class="block">
-      <div class="muted small">@datetime(activity.activityDate)</div>
-      <div class="strong">
-        @avatar(activity.activityUserName, 16)
-        @activityMessage(activity.message)
-      </div>
-      @activity.additionalInfo.map { additionalInfo =>
-        @if(additionalInfo.nonEmpty){
-          @(activity.activityType match {
-            case "create_wiki" => {
-              <div class="small activity-message">Created <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${additionalInfo}"}>{additionalInfo}</a>.</div>
-            }
-            case "edit_wiki" => {
-              <div class="small activity-message">Edited <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${additionalInfo}"}>{additionalInfo}</a>.</div>
-            }
-            case "push" => {
-              <div class="small activity-message">
-                {additionalInfo.split("\n").reverse.take(4).zipWithIndex.map{ case (commit, i) =>
-                  if(i == 3){
-                    <div>...</div>
-                  } else {
-                    <div>
-                      <a href={s"${path}/${activity.userName}/${activity.repositoryName}/commit/${commit.substring(0, 40)}"} class="monospace">{commit.substring(0, 7)}</a>
-                      <span>{commit.substring(41)}</span>
-                    </div>
-                  }
-                }}
-              </div>
-            }
-            case _ => {
-              <div class=" activity-message">{additionalInfo}</div>
-            }
-          })
+      @(activity.activityType match {
+        case "open_issue"        => longActivity(activity, "activity-issue.png")
+        case "comment_issue"     => longActivity(activity, "activity-comment.png")
+        case "close_issue"       => longActivity(activity, "activity-issue-close.png")
+        case "reopen_issue"      => longActivity(activity, "activity-issue-reopen.png")
+        case "open_pullreq"      => longActivity(activity, "activity-merge.png")
+        case "merge_pullreq"     => longActivity(activity, "activity-merge.png")
+        case "create_repository" => shortActivity(activity, "activity-create-repository.png")
+        case "create_branch"     => shortActivity(activity, "activity-branch.png")
+        case "fork"              => shortActivity(activity, "activity-fork.png")
+        case "push"  => customActivity(activity, "activity-commit.png"){
+          <div class="small activity-message">
+            {activity.additionalInfo.map { additionalInfo => additionalInfo.split("\n").reverse.take(4).zipWithIndex.map{ case (commit, i) =>
+              if(i == 3){
+                <div>...</div>
+              } else {
+                <div>
+                   <a href={s"${path}/${activity.userName}/${activity.repositoryName}/commit/${commit.substring(0, 40)}"} class="monospace">{commit.substring(0, 7)}</a>
+                    <span>{commit.substring(41)}</span>
+                </div>
+              }
+            }}}
+          </div>
         }
-      }
+        case "create_wiki" => customActivity(activity, "activity-wiki.png"){
+          <div class="small activity-message">
+            Created <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${activity.additionalInfo.get}"}>{activity.additionalInfo.get}</a>.
+          </div>
+        }
+        case "edit_wiki" => customActivity(activity, "activity-wiki.png"){
+          <div class="small activity-message">
+            Edited <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${activity.additionalInfo.get}"}>{activity.additionalInfo.get}</a>.
+          </div>
+        }
+      })
     </div>
   }
 }
diff --git a/src/main/webapp/assets/common/images/activity-branch.png b/src/main/webapp/assets/common/images/activity-branch.png
new file mode 100644
index 0000000..a995e29
--- /dev/null
+++ b/src/main/webapp/assets/common/images/activity-branch.png
Binary files differ
diff --git a/src/main/webapp/assets/common/images/activity-comment.png b/src/main/webapp/assets/common/images/activity-comment.png
new file mode 100644
index 0000000..3d36740
--- /dev/null
+++ b/src/main/webapp/assets/common/images/activity-comment.png
Binary files differ
diff --git a/src/main/webapp/assets/common/images/activity-commit.png b/src/main/webapp/assets/common/images/activity-commit.png
new file mode 100644
index 0000000..562b990
--- /dev/null
+++ b/src/main/webapp/assets/common/images/activity-commit.png
Binary files differ
diff --git a/src/main/webapp/assets/common/images/activity-create-repository.png b/src/main/webapp/assets/common/images/activity-create-repository.png
new file mode 100644
index 0000000..17fe6d1
--- /dev/null
+++ b/src/main/webapp/assets/common/images/activity-create-repository.png
Binary files differ
diff --git a/src/main/webapp/assets/common/images/activity-fork.png b/src/main/webapp/assets/common/images/activity-fork.png
new file mode 100644
index 0000000..bd370ed
--- /dev/null
+++ b/src/main/webapp/assets/common/images/activity-fork.png
Binary files differ
diff --git a/src/main/webapp/assets/common/images/activity-issue-close.png b/src/main/webapp/assets/common/images/activity-issue-close.png
new file mode 100644
index 0000000..b91d388
--- /dev/null
+++ b/src/main/webapp/assets/common/images/activity-issue-close.png
Binary files differ
diff --git a/src/main/webapp/assets/common/images/activity-issue-reopen.png b/src/main/webapp/assets/common/images/activity-issue-reopen.png
new file mode 100644
index 0000000..acc7865
--- /dev/null
+++ b/src/main/webapp/assets/common/images/activity-issue-reopen.png
Binary files differ
diff --git a/src/main/webapp/assets/common/images/activity-issue.png b/src/main/webapp/assets/common/images/activity-issue.png
new file mode 100644
index 0000000..af24759
--- /dev/null
+++ b/src/main/webapp/assets/common/images/activity-issue.png
Binary files differ
diff --git a/src/main/webapp/assets/common/images/activity-merge.png b/src/main/webapp/assets/common/images/activity-merge.png
new file mode 100644
index 0000000..4aa4ddc
--- /dev/null
+++ b/src/main/webapp/assets/common/images/activity-merge.png
Binary files differ
diff --git a/src/main/webapp/assets/common/images/activity-wiki.png b/src/main/webapp/assets/common/images/activity-wiki.png
new file mode 100644
index 0000000..01844b4
--- /dev/null
+++ b/src/main/webapp/assets/common/images/activity-wiki.png
Binary files differ