diff --git a/templates/repo/commits_list_small.tmpl b/templates/repo/commits_list_small.tmpl
index 1450cdafbc..fa564ca86b 100644
--- a/templates/repo/commits_list_small.tmpl
+++ b/templates/repo/commits_list_small.tmpl
@@ -1,9 +1,10 @@
 {{ $r:= List .Commits}}
 {{ $index := 0}}
+<div class="timeline-item commits-list">
 {{range $r}}
 	{{ $tag := printf "%s-%d" $.HashTag $index }}
 	{{ $index = Add $index 1}}
-	<div class="timeline-item event small-line-spacing" id="{{$tag}}">
+	<div class="singular-commit" id="{{$tag}}">
 		<span class="badge badge-commit">{{svg "octicon-git-commit" 16}}</span>
 		{{if .User}}
 			<a class="ui avatar image" href="{{AppSubUrl}}/{{.User.Name}}"><img src="{{.User.RelAvatarLink}}" alt=""/></a>
@@ -42,7 +43,7 @@
 
 		<span class="message-wrapper">
 			{{ $commitLink:= printf "%s/%s/%s/commit/%s" AppSubUrl  $.Issue.PullRequest.BaseRepo.OwnerName $.Issue.PullRequest.BaseRepo.Name .ID }}
-			<span class="commit-summary has-emoji{{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{RenderCommitMessageLinkSubject .Message ($.Issue.PullRequest.BaseRepo.Link|Escape) $commitLink $.Issue.PullRequest.BaseRepo.ComposeMetas}}</span>
+			<span class="mono commit-summary has-emoji{{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{RenderCommitMessageLinkSubject .Message ($.Issue.PullRequest.BaseRepo.Link|Escape) $commitLink $.Issue.PullRequest.BaseRepo.ComposeMetas}}</span>
 		</span>
 		{{if IsMultilineCommitMessage .Message}}
 			<button class="basic compact mini ui icon button commit-button"><i class="ellipsis horizontal icon"></i></button>
@@ -55,3 +56,4 @@
 		{{end}}
 	</div>
 {{end}}
+</div>
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index 24984baebb..78e38e4ca2 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -602,7 +602,7 @@
 				<img src="{{.Poster.RelAvatarLink}}">
 			</a>
 			<span class="text grey">
-				<a href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
+				<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
 				{{ if .IsForcePush }}
 					{{$.i18n.Tr "repo.issues.force_push_codes" $.Issue.PullRequest.HeadBranch (ShortSha .OldCommit) ($.Issue.Repo.CommitLink .OldCommit)  (ShortSha .NewCommit) ($.Issue.Repo.CommitLink .NewCommit) $createdStr | Safe}}
 				{{else}}
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index b7b0400975..2328690b0b 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -751,11 +751,11 @@
                     }
                 }
 
-                &:first-child {
+                &:first-child:not(.commit) {
                     padding-top: 0 !important;
                 }
 
-                &:last-child {
+                &:last-child:not(.commit) {
                     padding-bottom: 0 !important;
                 }
 
@@ -807,8 +807,9 @@
                     line-height: 30px;
                 }
 
-                &.event.small-line-spacing {
-                    padding: 2px 0 0 15px;
+                &.commits-list {
+                    padding-left: 15px;
+                    padding-top: 0;
                 }
 
                 &.event > .commit-status-link {