diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl
index 6064db1b4c03e..043e8ca0121c7 100644
--- a/templates/package/view.tmpl
+++ b/templates/package/view.tmpl
@@ -84,14 +84,17 @@
 					{{end}}
 					</div>
 				{{end}}
-				<div class="divider"></div>
-				<strong>{{.locale.Tr "packages.versions"}} ({{.TotalVersionCount}})</strong>
-				<a class="ui right" href="{{$.PackageDescriptor.PackageWebLink}}/versions">{{.locale.Tr "packages.versions.view_all"}}</a>
-				<div class="ui relaxed list">
-				{{range .LatestVersions}}
-					<div class="item gt-df">
-						<a class="gt-f1" href="{{$.PackageDescriptor.PackageWebLink}}/{{PathEscape .LowerVersion}}">{{.Version}}</a>
-						<span class="text small">{{DateTime "short" .CreatedUnix}}</span>
+				{{if .LatestVersions}}
+					<div class="divider"></div>
+					<strong>{{.locale.Tr "packages.versions"}} ({{.TotalVersionCount}})</strong>
+					<a class="ui right" href="{{$.PackageDescriptor.PackageWebLink}}/versions">{{.locale.Tr "packages.versions.view_all"}}</a>
+					<div class="ui relaxed list">
+					{{range .LatestVersions}}
+						<div class="item gt-df">
+							<a class="gt-f1" href="{{$.PackageDescriptor.PackageWebLink}}/{{PathEscape .LowerVersion}}">{{.Version}}</a>
+							<span class="text small">{{DateTime "short" .CreatedUnix}}</span>
+						</div>
+					{{end}}
 					</div>
 				{{end}}
 				</div>
diff --git a/templates/repo/pulse.tmpl b/templates/repo/pulse.tmpl
index 0d1c9864dcf63..f4a16a92c69d6 100644
--- a/templates/repo/pulse.tmpl
+++ b/templates/repo/pulse.tmpl
@@ -19,7 +19,7 @@
 		</div>
 	</div>
 </h2>
-<div class="ui divider"></div>
+<div class="divider"></div>
 
 {{if (or (.Permission.CanRead $.UnitTypeIssues) (.Permission.CanRead $.UnitTypePullRequests))}}
 <h4 class="ui top attached header">{{.locale.Tr "repo.activity.overview"}}</h4>
@@ -111,8 +111,8 @@
 {{end}}
 
 {{if gt .Activity.PublishedReleaseCount 0}}
-	<h4 class="ui horizontal divider header" id="published-releases">
-		<span class="text">{{svg "octicon-tag"}}</span>
+	<h4 class="divider divider-text gt-normal-case" id="published-releases">
+		{{svg "octicon-tag" 16 "gt-mr-3"}}
 		{{.locale.Tr "repo.activity.title.releases_published_by"
 			(.locale.TrN .Activity.PublishedReleaseCount "repo.activity.title.releases_1" "repo.activity.title.releases_n" .Activity.PublishedReleaseCount)
 			(.locale.TrN .Activity.PublishedReleaseAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.PublishedReleaseAuthorCount)
@@ -133,8 +133,8 @@
 {{end}}
 
 {{if gt .Activity.MergedPRCount 0}}
-	<h4 class="ui horizontal divider header" id="merged-pull-requests">
-		<span class="text">{{svg "octicon-git-pull-request"}}</span>
+	<h4 class="divider divider-text gt-normal-case" id="merged-pull-requests">
+		{{svg "octicon-git-pull-request" 16 "gt-mr-3"}}
 		{{.locale.Tr "repo.activity.title.prs_merged_by"
 			(.locale.TrN .Activity.MergedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.MergedPRCount)
 			(.locale.TrN .Activity.MergedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.MergedPRAuthorCount)
@@ -152,8 +152,8 @@
 {{end}}
 
 {{if gt .Activity.OpenedPRCount 0}}
-	<h4 class="ui horizontal divider header" id="proposed-pull-requests">
-		<span class="text">{{svg "octicon-git-branch"}}</span>
+	<h4 class="divider divider-text gt-normal-case" id="proposed-pull-requests">
+		{{svg "octicon-git-branch" 16 "gt-mr-3"}}
 		{{.locale.Tr "repo.activity.title.prs_opened_by"
 			(.locale.TrN .Activity.OpenedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.OpenedPRCount)
 			(.locale.TrN .Activity.OpenedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedPRAuthorCount)
@@ -171,8 +171,8 @@
 {{end}}
 
 {{if gt .Activity.ClosedIssueCount 0}}
-	<h4 class="ui horizontal divider header" id="closed-issues">
-		<span class="text">{{svg "octicon-issue-closed"}}</span>
+	<h4 class="divider divider-text gt-normal-case" id="closed-issues">
+		{{svg "octicon-issue-closed" 16 "gt-mr-3"}}
 		{{.locale.Tr "repo.activity.title.issues_closed_from"
 			(.locale.TrN .Activity.ClosedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.ClosedIssueCount)
 			(.locale.TrN .Activity.ClosedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.ClosedIssueAuthorCount)
@@ -190,8 +190,8 @@
 {{end}}
 
 {{if gt .Activity.OpenedIssueCount 0}}
-	<h4 class="ui horizontal divider header" id="new-issues">
-		<span class="text">{{svg "octicon-issue-opened"}}</span>
+	<h4 class="divider divider-text gt-normal-case" id="new-issues">
+		{{svg "octicon-issue-opened" 16 "gt-mr-3"}}
 		{{.locale.Tr "repo.activity.title.issues_created_by"
 			(.locale.TrN .Activity.OpenedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.OpenedIssueCount)
 			(.locale.TrN .Activity.OpenedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedIssueAuthorCount)
@@ -209,13 +209,10 @@
 {{end}}
 
 {{if gt .Activity.UnresolvedIssueCount 0}}
-	<h4 class="ui horizontal divider header" id="unresolved-conversations">
-		<span class="text">{{svg "octicon-comment-discussion"}}</span>
+	<h4 class="divider divider-text gt-normal-case" id="unresolved-conversations" data-tooltip-content="{{.locale.Tr "repo.activity.unresolved_conv_desc"}}">
+		{{svg "octicon-comment-discussion" 16 "gt-mr-3"}}
 		{{.locale.TrN .Activity.UnresolvedIssueCount "repo.activity.title.unresolved_conv_1" "repo.activity.title.unresolved_conv_n" .Activity.UnresolvedIssueCount}}
 	</h4>
-	<div class="text center desc">
-		{{.locale.Tr "repo.activity.unresolved_conv_desc"}}
-	</div>
 	<div class="list">
 		{{range .Activity.UnresolvedIssues}}
 			<p class="desc">