diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl
index c72936a070..eac6d1ecd8 100644
--- a/templates/admin/navbar.tmpl
+++ b/templates/admin/navbar.tmpl
@@ -3,83 +3,83 @@
 		<div class="header item">{{ctx.Locale.Tr "admin.settings"}}</div>
 
 		<details class="item toggleable-item" {{if or .PageIsAdminDashboard .PageIsAdminSelfCheck}}open{{end}}>
-			<summary>{{ctx.Locale.Tr "admin.maintenance"}}</summary>
+			<summary>{{svg "octicon-tools" 16}} {{ctx.Locale.Tr "admin.maintenance"}}</summary>
 			<div class="menu">
 				<a class="{{if .PageIsAdminDashboard}}active {{end}}item" href="{{AppSubUrl}}/-/admin">
-					{{ctx.Locale.Tr "admin.dashboard"}}
+					{{svg "octicon-dashboard" 16}} {{ctx.Locale.Tr "admin.dashboard"}}
 				</a>
 				<a class="{{if .PageIsAdminSelfCheck}}active {{end}}item" href="{{AppSubUrl}}/-/admin/self_check">
-					{{ctx.Locale.Tr "admin.self_check"}}
+					{{svg "octicon-check-circle" 16}} {{ctx.Locale.Tr "admin.self_check"}}
 				</a>
 			</div>
 		</details>
 		<details class="item toggleable-item" {{if or .PageIsAdminUsers .PageIsAdminBadges .PageIsAdminEmails .PageIsAdminOrganizations .PageIsAdminAuthentications}}open{{end}}>
-			<summary>{{ctx.Locale.Tr "admin.identity_access"}}</summary>
+			<summary>{{svg "octicon-people" 16}} {{ctx.Locale.Tr "admin.identity_access"}}</summary>
 			<div class="menu">
 				<a class="{{if .PageIsAdminAuthentications}}active {{end}}item" href="{{AppSubUrl}}/-/admin/auths">
-					{{ctx.Locale.Tr "admin.authentication"}}
+					{{svg "octicon-shield-lock" 16}} {{ctx.Locale.Tr "admin.authentication"}}
 				</a>
 				<a class="{{if .PageIsAdminOrganizations}}active {{end}}item" href="{{AppSubUrl}}/-/admin/orgs">
-					{{ctx.Locale.Tr "admin.organizations"}}
+					{{svg "octicon-organization" 16}} {{ctx.Locale.Tr "admin.organizations"}}
 				</a>
 				<a class="{{if .PageIsAdminUsers}}active {{end}}item" href="{{AppSubUrl}}/-/admin/users">
-					{{ctx.Locale.Tr "admin.users"}}
+					{{svg "octicon-person" 16}} {{ctx.Locale.Tr "admin.users"}}
 				</a>
 				<a class="{{if .PageIsAdminBadges}}active {{end}}item" href="{{AppSubUrl}}/-/admin/badges">
-					{{ctx.Locale.Tr "admin.badges"}}
+					{{svg "octicon-id-badge" 16}} {{ctx.Locale.Tr "admin.badges"}}
 				</a>
 				<a class="{{if .PageIsAdminEmails}}active {{end}}item" href="{{AppSubUrl}}/-/admin/emails">
-					{{ctx.Locale.Tr "admin.emails"}}
+					{{svg "octicon-mail" 16}} {{ctx.Locale.Tr "admin.emails"}}
 				</a>
 			</div>
 		</details>
 		<details class="item toggleable-item" {{if or .PageIsAdminRepositories (and .EnablePackages .PageIsAdminPackages)}}open{{end}}>
-			<summary>{{ctx.Locale.Tr "admin.assets"}}</summary>
+			<summary>{{svg "octicon-database" 16}} {{ctx.Locale.Tr "admin.assets"}}</summary>
 			<div class="menu">
 				{{if .EnablePackages}}
 					<a class="{{if .PageIsAdminPackages}}active {{end}}item" href="{{AppSubUrl}}/-/admin/packages">
-						{{ctx.Locale.Tr "packages.title"}}
+						{{svg "octicon-package" 16}} {{ctx.Locale.Tr "packages.title"}}
 					</a>
 				{{end}}
 				<a class="{{if .PageIsAdminRepositories}}active {{end}}item" href="{{AppSubUrl}}/-/admin/repos">
-					{{ctx.Locale.Tr "admin.repositories"}}
+					{{svg "octicon-repo" 16}} {{ctx.Locale.Tr "admin.repositories"}}
 				</a>
 			</div>
 		</details>
 		<!-- Webhooks and OAuth can be both disabled here, so add this if statement to display different ui -->
 		{{if and (not DisableWebhooks) .EnableOAuth2}}
 			<details class="item toggleable-item" {{if or .PageIsAdminDefaultHooks .PageIsAdminSystemHooks .PageIsAdminApplications}}open{{end}}>
-				<summary>{{ctx.Locale.Tr "admin.integrations"}}</summary>
+				<summary>{{svg "octicon-plug" 16}} {{ctx.Locale.Tr "admin.integrations"}}</summary>
 				<div class="menu">
 					<a class="{{if .PageIsAdminApplications}}active {{end}}item" href="{{AppSubUrl}}/-/admin/applications">
-						{{ctx.Locale.Tr "settings.applications"}}
+						{{svg "octicon-key" 16}} {{ctx.Locale.Tr "settings.applications"}}
 					</a>
 					<a class="{{if or .PageIsAdminDefaultHooks .PageIsAdminSystemHooks}}active {{end}}item" href="{{AppSubUrl}}/-/admin/hooks">
-						{{ctx.Locale.Tr "admin.hooks"}}
+						{{svg "octicon-webhook" 16}} {{ctx.Locale.Tr "admin.hooks"}}
 					</a>
 				</div>
 			</details>
 		{{else}}
 			{{if not DisableWebhooks}}
 			<a class="{{if or .PageIsAdminDefaultHooks .PageIsAdminSystemHooks}}active {{end}}item" href="{{AppSubUrl}}/-/admin/hooks">
-				{{ctx.Locale.Tr "admin.hooks"}}
+				{{svg "octicon-webhook" 16}} {{ctx.Locale.Tr "admin.hooks"}}
 			</a>
 			{{end}}
 			{{if .EnableOAuth2}}
 				<a class="{{if .PageIsAdminApplications}}active {{end}}item" href="{{AppSubUrl}}/-/admin/applications">
-					{{ctx.Locale.Tr "settings.applications"}}
+					{{svg "octicon-key" 16}} {{ctx.Locale.Tr "settings.applications"}}
 				</a>
 			{{end}}
 		{{end}}
 		{{if .EnableActions}}
 		<details class="item toggleable-item" {{if or .PageIsSharedSettingsRunners .PageIsSharedSettingsVariables}}open{{end}}>
-			<summary>{{ctx.Locale.Tr "actions.actions"}}</summary>
+			<summary>{{svg "octicon-play" 16}} {{ctx.Locale.Tr "actions.actions"}}</summary>
 			<div class="menu">
 				<a class="{{if .PageIsSharedSettingsRunners}}active {{end}}item" href="{{AppSubUrl}}/-/admin/actions/runners">
-					{{ctx.Locale.Tr "actions.runners"}}
+					{{svg "octicon-server" 16}} {{ctx.Locale.Tr "actions.runners"}}
 				</a>
 				<a class="{{if .PageIsSharedSettingsVariables}}active {{end}}item" href="{{AppSubUrl}}/-/admin/actions/variables">
-					{{ctx.Locale.Tr "actions.variables"}}
+					{{svg "octicon-list-unordered" 16}} {{ctx.Locale.Tr "actions.variables"}}
 				</a>
 			</div>
 		</details>
@@ -88,33 +88,33 @@
 			{{svg "octicon-paintbrush" 16}} Branding
 		</a>
 		<details class="item toggleable-item" {{if or .PageIsAdminConfig}}open{{end}}>
-			<summary>{{ctx.Locale.Tr "admin.config"}}</summary>
+			<summary>{{svg "octicon-gear" 16}} {{ctx.Locale.Tr "admin.config"}}</summary>
 			<div class="menu">
 				<a class="{{if .PageIsAdminConfigSummary}}active {{end}}item" href="{{AppSubUrl}}/-/admin/config">
-					{{ctx.Locale.Tr "admin.config_summary"}}
+					{{svg "octicon-info" 16}} {{ctx.Locale.Tr "admin.config_summary"}}
 				</a>
 				<a class="{{if .PageIsAdminConfigSettings}}active {{end}}item" href="{{AppSubUrl}}/-/admin/config/settings">
-					{{ctx.Locale.Tr "admin.config_settings"}}
+					{{svg "octicon-sliders" 16}} {{ctx.Locale.Tr "admin.config_settings"}}
 				</a>
 			</div>
 		</details>
 		<a class="{{if .PageIsAdminNotices}}active {{end}}item" href="{{AppSubUrl}}/-/admin/notices">
-			{{ctx.Locale.Tr "admin.notices"}}
+			{{svg "octicon-alert" 16}} {{ctx.Locale.Tr "admin.notices"}}
 		</a>
 		<details class="item toggleable-item" {{if or .PageIsAdminMonitorStats .PageIsAdminMonitorCron .PageIsAdminMonitorQueue .PageIsAdminMonitorTrace}}open{{end}}>
-			<summary>{{ctx.Locale.Tr "admin.monitor"}}</summary>
+			<summary>{{svg "octicon-pulse" 16}} {{ctx.Locale.Tr "admin.monitor"}}</summary>
 			<div class="menu">
 				<a class="{{if .PageIsAdminMonitorStats}}active {{end}}item" href="{{AppSubUrl}}/-/admin/monitor/stats">
-					{{ctx.Locale.Tr "admin.monitor.stats"}}
+					{{svg "octicon-graph" 16}} {{ctx.Locale.Tr "admin.monitor.stats"}}
 				</a>
 				<a class="{{if .PageIsAdminMonitorCron}}active {{end}}item" href="{{AppSubUrl}}/-/admin/monitor/cron">
-					{{ctx.Locale.Tr "admin.monitor.cron"}}
+					{{svg "octicon-clock" 16}} {{ctx.Locale.Tr "admin.monitor.cron"}}
 				</a>
 				<a class="{{if .PageIsAdminMonitorQueue}}active {{end}}item" href="{{AppSubUrl}}/-/admin/monitor/queue">
-					{{ctx.Locale.Tr "admin.monitor.queues"}}
+					{{svg "octicon-stack" 16}} {{ctx.Locale.Tr "admin.monitor.queues"}}
 				</a>
 				<a class="{{if .PageIsAdminMonitorTrace}}active {{end}}item" href="{{AppSubUrl}}/-/admin/monitor/stacktrace">
-					{{ctx.Locale.Tr "admin.monitor.trace"}}
+					{{svg "octicon-cpu" 16}} {{ctx.Locale.Tr "admin.monitor.trace"}}
 				</a>
 			</div>
 		</details>