diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 3cd8f08f51b11..7933bdd69f383 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -19,21 +19,25 @@
 							{{.locale.Tr "admin.repos.name"}}
 							{{SortArrow "alphabetically" "reversealphabetically" $.SortType false}}
 						</th>
-						<th>{{.locale.Tr "admin.repos.watches"}}</th>
-						<th  data-sortt-asc="moststars" data-sortt-desc="feweststars">
-							{{.locale.Tr "admin.repos.stars"}}
+						<th data-tooltip-content="{{.locale.Tr "admin.repos.watches"}}">
+							{{svg "octicon-eye"}}
+						</th>
+						<th data-tooltip-content="{{.locale.Tr "admin.repos.stars"}}" data-sortt-asc="moststars" data-sortt-desc="feweststars">
+							{{svg "octicon-star"}}
 							{{SortArrow "moststars" "feweststars" $.SortType false}}
 						</th>
-						<th  data-sortt-asc="mostforks" data-sortt-desc="fewestforks">
-							{{.locale.Tr "admin.repos.forks"}}
+						<th data-tooltip-content="{{.locale.Tr "admin.repos.forks"}}" data-sortt-asc="mostforks" data-sortt-desc="fewestforks">
+							{{svg "octicon-repo-forked"}}
 							{{SortArrow "mostforks" "fewestforks" $.SortType false}}
 						</th>
-						<th>{{.locale.Tr "admin.repos.issues"}}</th>
-						<th  data-sortt-asc="gitsize" data-sortt-desc="reversegitsize">
+						<th data-tooltip-content="{{.locale.Tr "admin.repos.issues"}}">
+							{{svg "octicon-issue-opened"}}
+						</th>
+						<th data-sortt-asc="gitsize" data-sortt-desc="reversegitsize">
 							{{.locale.Tr "admin.repos.size"}}
 							{{SortArrow "gitsize" "reversegitsize" $.SortType false}}
 						</th>
-						<th  data-sortt-asc="lfssize" data-sortt-desc="reverselfssize">
+						<th data-sortt-asc="lfssize" data-sortt-desc="reverselfssize">
 							{{.locale.Tr "admin.repos.lfs_size"}}
 							{{SortArrow "lfssize" "reverselfssize" $.SortType false}}
 						</th>
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index 3742b4ae85176..61cd284285ec9 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -67,11 +67,21 @@
 							{{SortArrow "alphabetically" "reversealphabetically" $.SortType true}}
 						</th>
 						<th>{{.locale.Tr "email"}}</th>
-						<th>{{.locale.Tr "admin.users.activated"}}</th>
-						<th>{{.locale.Tr "admin.users.admin"}}</th>
-						<th>{{.locale.Tr "admin.users.restricted"}}</th>
-						<th>{{.locale.Tr "admin.users.2fa"}}</th>
-						<th>{{.locale.Tr "admin.users.repos"}}</th>
+						<th data-tooltip-content="{{.locale.Tr "admin.users.activated"}}">
+							{{svg "octicon-check-circle"}}
+						</th>
+						<th data-tooltip-content="{{.locale.Tr "admin.users.admin"}}">
+							{{svg "octicon-gear"}}
+						</th>
+						<th data-tooltip-content="{{.locale.Tr "admin.users.restricted"}}">
+							{{svg "octicon-skip"}}
+						</th>
+						<th data-tooltip-content="{{.locale.Tr "admin.users.2fa"}}">
+							{{svg "octicon-key"}}
+						</th>
+						<th data-tooltip-content="{{.locale.Tr "admin.users.repos"}}">
+							{{svg "octicon-repo"}}
+						</th>
 						<th>{{.locale.Tr "admin.users.created"}}</th>
 						<th data-sortt-asc="lastlogin" data-sortt-desc="reverselastlogin">
 							{{.locale.Tr "admin.users.last_login"}}
diff --git a/web_src/css/base.css b/web_src/css/base.css
index 542fb1fd74607..dea8baf5d108d 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -883,7 +883,7 @@ a.label,
 .ui.table > thead > tr > th,
 .ui.table > tbody > tr > td,
 .ui.table > tr > td {
-  padding: 6px 3px;
+  padding: 6px;
 }
 /* use more horizontal padding on first and last items for visuals */
 .ui.table > thead > tr > th:first-of-type,