diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index c19eb030e..796054005 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -594,40 +594,40 @@
 				{{end}}
 			</span>
 		</div>
-	{{else}}
-	<div class="timeline-item event" id="{{.HashTag}}">
-		<span class="badge">{{svg "octicon-milestone" 16}}</span>
-		<a class="ui avatar image" href="{{.Poster.HomeLink}}">
-			<img src="{{.Poster.RelAvatarLink}}">
-		</a>
-		<span class="text grey">
-			<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
+	{{else if eq .Type 29}}
+		<div class="timeline-item event" id="{{.HashTag}}">
+			<span class="badge">{{svg "octicon-git-branch" 16}}</span>
+			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
+				<img src="{{.Poster.RelAvatarLink}}">
+			</a>
+			<span class="text grey">
+				<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
 
-			{{ $refOldName:= GetRefName .OldRef }}
-			{{ $refNewName:= GetRefName .NewRef }}
+				{{ $refOldName:= GetRefName .OldRef }}
+				{{ $refNewName:= GetRefName .NewRef }}
 
-			{{if  .OldRef }}
-				{{if .NewRef }}
-					{{$.i18n.Tr "repo.issues.change_branch_tag_at" ($refOldName|Escape) ($refOldName|Escape) $createdStr | Safe}}
-				{{else}}
-					{{ $getRefOldType:= GetRefType .OldRef }}
-					{{ if eq $getRefOldType "branch"}}
-						{{$.i18n.Tr "repo.issues.remove_branch_at" ($refOldName|Escape) $createdStr | Safe}}
+				{{if  .OldRef }}
+					{{if .NewRef }}
+						{{$.i18n.Tr "repo.issues.change_branch_tag_at" ($refOldName|Escape) ($refNewName|Escape) $createdStr | Safe}}
 					{{else}}
-						{{$.i18n.Tr "repo.issues.remove_tag_at" ($refOldName|Escape) $createdStr | Safe}}
+						{{ $getRefOldType:= GetRefType .OldRef }}
+						{{ if eq $getRefOldType "branch"}}
+							{{$.i18n.Tr "repo.issues.remove_branch_at" ($refOldName|Escape) $createdStr | Safe}}
+						{{else}}
+							{{$.i18n.Tr "repo.issues.remove_tag_at" ($refOldName|Escape) $createdStr | Safe}}
+						{{end}}
 					{{end}}
-				{{end}}
-			{{else}}
-				{{if  .NewRef}}
-					{{ $getRefNewType:= GetRefType .NewRef }}
-					{{ if eq $getRefNewType "branch"}}
-						{{$.i18n.Tr "repo.issues.add_branch_at" ($refNewName|Escape) $createdStr | Safe}}
-					{{else}}
-						{{$.i18n.Tr "repo.issues.add_tag_at" ($refNewName|Escape) $createdStr | Safe}}
+				{{else}}
+					{{if  .NewRef}}
+						{{ $getRefNewType:= GetRefType .NewRef }}
+						{{ if eq $getRefNewType "branch"}}
+							{{$.i18n.Tr "repo.issues.add_branch_at" ($refNewName|Escape) $createdStr | Safe}}
+						{{else}}
+							{{$.i18n.Tr "repo.issues.add_tag_at" ($refNewName|Escape) $createdStr | Safe}}
+						{{end}}
 					{{end}}
 				{{end}}
-			{{end}}
-		</span>
-	</div>
+			</span>
+		</div>
 	{{end}}
 {{end}}
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 19022020a..e6a61a567 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -3,7 +3,7 @@
 		<!-- {{template "repo/issue/branch_selector_field" .}} -->
 		{{if and (not .Issue.IsPull) (not .PageIsComparePull)}}
 		<input id="ref_selector" name="ref" type="hidden" value="{{.Issue.Ref}}">
-		<div class="ui floating filter select-branch dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}">
+		<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating filter select-branch dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}">
 			<div class="ui basic small button">
 				<span class="text branch-name">{{if .Issue.Ref}}{{$.RefEndName}}{{else}}{{.i18n.Tr "repo.issues.no_ref"}}{{end}}</span>
 				<i class="dropdown icon"></i>