diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index 747246c2..4c99bfd2 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -292,13 +292,13 @@ func (r RepoInfo) FullNameWithoutAt() string {
 
 func (r RepoInfo) GetTabs() [][]string {
 	tabs := [][]string{
-		{"overview", "/"},
-		{"issues", "/issues"},
-		{"pulls", "/pulls"},
+		{"overview", "/", "square-chart-gantt"},
+		{"issues", "/issues", "circle-dot"},
+		{"pulls", "/pulls", "git-pull-request"},
 	}
 
 	if r.Roles.SettingsAllowed() {
-		tabs = append(tabs, []string{"settings", "/settings"})
+		tabs = append(tabs, []string{"settings", "/settings", "cog"})
 	}
 
 	return tabs
diff --git a/appview/pages/templates/layouts/repobase.html b/appview/pages/templates/layouts/repobase.html
index edcecff3..e13120f4 100644
--- a/appview/pages/templates/layouts/repobase.html
+++ b/appview/pages/templates/layouts/repobase.html
@@ -32,6 +32,7 @@
                 {{ range $item := $tabs }}
                     {{ $key := index $item 0 }}
                     {{ $value := index $item 1 }}
+                    {{ $icon := index $item 2 }}
                     {{ $meta := index $tabmeta $key }}
                     <a
                         href="/{{ $.RepoInfo.FullName }}{{ $value }}"
@@ -47,10 +48,13 @@
                              {{ end }}
                              "
                         >
-                            {{ $key }}
-                            {{ if not (isNil $meta) }}
-                            <span class="bg-gray-200 dark:bg-gray-700 rounded py-1/2 px-1 text-sm">{{  $meta }}</span>
-                            {{ end }}
+                            <span class="flex items-center justify-center">
+                                {{ i $icon "w-4 h-4 mr-2" }}
+                                {{ $key }}
+                                {{ if not (isNil $meta) }}
+                                <span class="bg-gray-200 dark:bg-gray-700 rounded py-1/2 px-1 text-sm ml-1">{{  $meta }}</span>
+                                {{ end }}
+                            </span>
                         </div>
                     </a>
                 {{ end }}