diff --git a/roles/git/files/home/gitea/custom/templates/base/footer_content.tmpl b/roles/git/files/home/gitea/custom/templates/base/footer_content.tmpl
index 3a76b4b..358801b 100644
--- a/roles/git/files/home/gitea/custom/templates/base/footer_content.tmpl
+++ b/roles/git/files/home/gitea/custom/templates/base/footer_content.tmpl
@@ -8,7 +8,7 @@
 		</div>
 		<div class="ui right links">
 			{{if .ShowFooterBranding}}
-				<a target="_blank" rel="noopener noreferrer" href="https://github.com/go-gitea/gitea"><i class="fa fa-github-square"></i><span class="sr-only">GitHub</span></a>
+				<a target="_blank" rel="noopener noreferrer" href="https://github.com/go-gitea/gitea">{{svg "octicon-mark-github"}}<span class="sr-only">GitHub</span></a>
 			{{end}}
 			<div class="ui language bottom floating slide up dropdown link item">
 				{{svg "octicon-globe"}}
diff --git a/roles/git/files/home/gitea/custom/templates/base/head_navbar.tmpl b/roles/git/files/home/gitea/custom/templates/base/head_navbar.tmpl
index 98f8ee2..b84f15b 100644
--- a/roles/git/files/home/gitea/custom/templates/base/head_navbar.tmpl
+++ b/roles/git/files/home/gitea/custom/templates/base/head_navbar.tmpl
@@ -71,42 +71,42 @@
 	{{else if .IsSigned}}
 		<div class="right stackable menu">
 			{{$issueURL := Printf "%s/%s/issues/%d" AppSubUrl .ActiveStopwatch.RepoSlug .ActiveStopwatch.IssueIndex}}
- 			<a class="active-stopwatch-trigger item ui label {{if not .ActiveStopwatch}}hidden{{end}}" href="{{$issueURL}}">
- 				<span class="text">
- 					<span class="fitted item">
- 						{{svg "octicon-stopwatch"}}
- 						<span class="red" style="position:absolute; right:-0.6em; top:-0.6em;">{{svg "octicon-dot-fill"}}</span>
- 					</span>
- 					<span class="sr-mobile-only">{{.i18n.Tr "active_stopwatch"}}</span>
- 				</span>
- 			</a>
- 			<div class="ui popup very wide">
- 				<div class="df ac">
- 					<a class="stopwatch-link df ac" href="{{$issueURL}}">
- 						{{svg "octicon-issue-opened"}}
- 						<span class="stopwatch-issue">{{.ActiveStopwatch.RepoSlug}}#{{.ActiveStopwatch.IssueIndex}}</span>
- 						<span class="ui label blue stopwatch-time my-0 mx-4" data-seconds="{{.ActiveStopwatch.Seconds}}">
- 							{{if .ActiveStopwatch}}{{Sec2Time .ActiveStopwatch.Seconds}}{{end}}
- 						</span>
- 					</a>
- 					<form class="stopwatch-commit" method="POST" action="{{$issueURL}}/times/stopwatch/toggle">
- 						{{.CsrfTokenHtml}}
- 						<button
- 							class="ui button mini compact basic icon fitted poping up"
- 							data-content="{{.i18n.Tr "repo.issues.stop_tracking"}}"
- 							data-position="top right" data-variation="small inverted"
- 						>{{svg "octicon-square-fill"}}</button>
- 					</form>
- 					<form class="stopwatch-cancel" method="POST" action="{{$issueURL}}/times/stopwatch/cancel">
- 						{{.CsrfTokenHtml}}
- 						<button
- 							class="ui button mini compact basic icon fitted poping up"
- 							data-content="{{.i18n.Tr "repo.issues.cancel_tracking"}}"
- 							data-position="top right" data-variation="small inverted"
- 						>{{svg "octicon-trash"}}</button>
- 					</form>
- 				</div>
- 			</div>
+			<a class="active-stopwatch-trigger item ui label {{if not .ActiveStopwatch}}hidden{{end}}" href="{{$issueURL}}">
+				<span class="text">
+					<span class="fitted item">
+						{{svg "octicon-stopwatch"}}
+						<span class="red" style="position:absolute; right:-0.6em; top:-0.6em;">{{svg "octicon-dot-fill"}}</span>
+					</span>
+					<span class="sr-mobile-only">{{.i18n.Tr "active_stopwatch"}}</span>
+				</span>
+			</a>
+			<div class="ui popup very wide">
+				<div class="df ac">
+					<a class="stopwatch-link df ac" href="{{$issueURL}}">
+						{{svg "octicon-issue-opened"}}
+						<span class="stopwatch-issue">{{.ActiveStopwatch.RepoSlug}}#{{.ActiveStopwatch.IssueIndex}}</span>
+						<span class="ui label blue stopwatch-time my-0 mx-4" data-seconds="{{.ActiveStopwatch.Seconds}}">
+							{{if .ActiveStopwatch}}{{Sec2Time .ActiveStopwatch.Seconds}}{{end}}
+						</span>
+					</a>
+					<form class="stopwatch-commit" method="POST" action="{{$issueURL}}/times/stopwatch/toggle">
+						{{.CsrfTokenHtml}}
+						<button
+							class="ui button mini compact basic icon fitted poping up"
+							data-content="{{.i18n.Tr "repo.issues.stop_tracking"}}"
+							data-position="top right" data-variation="small inverted"
+						>{{svg "octicon-square-fill"}}</button>
+					</form>
+					<form class="stopwatch-cancel" method="POST" action="{{$issueURL}}/times/stopwatch/cancel">
+						{{.CsrfTokenHtml}}
+						<button
+							class="ui button mini compact basic icon fitted poping up"
+							data-content="{{.i18n.Tr "repo.issues.cancel_tracking"}}"
+							data-position="top right" data-variation="small inverted"
+						>{{svg "octicon-trash"}}</button>
+					</form>
+				</div>
+			</div>
 
 			<a href="{{AppSubUrl}}/notifications" class="item poping up" data-content='{{.i18n.Tr "notifications"}}' data-variation="tiny inverted">
 				<span class="text">
@@ -131,10 +131,10 @@
 						<span class="fitted">{{svg "octicon-plus"}}</span> {{.i18n.Tr "new_repo"}}
 					</a>
 					{{if not .DisableMigrations}}
- 						<a class="item" href="{{AppSubUrl}}/repo/migrate">
- 							<span class="fitted">{{svg "octicon-repo-push"}}</span> {{.i18n.Tr "new_migrate"}}
- 						</a>
- 					{{end}}
+						<a class="item" href="{{AppSubUrl}}/repo/migrate">
+							<span class="fitted">{{svg "octicon-repo-push"}}</span> {{.i18n.Tr "new_migrate"}}
+						</a>
+					{{end}}
 					{{if .SignedUser.CanCreateOrganization}}
 					<a class="item" href="{{AppSubUrl}}/org/create">
 						<span class="fitted">{{svg "octicon-organization"}}</span> {{.i18n.Tr "new_org"}}
@@ -161,11 +161,11 @@
 						{{.i18n.Tr "your_profile"}}<!-- Your profile -->
 					</a>
 					{{if not .DisableStars}}
- 						<a class="item" href="{{AppSubUrl}}/{{.SignedUser.Name}}?tab=stars">
- 							{{svg "octicon-star"}}
- 							{{.i18n.Tr "your_starred"}}
- 						</a>
- 					{{end}}
+						<a class="item" href="{{AppSubUrl}}/{{.SignedUser.Name}}?tab=stars">
+							{{svg "octicon-star"}}
+							{{.i18n.Tr "your_starred"}}
+						</a>
+					{{end}}
 					<a class="{{if .PageIsUserSettings}}active{{end}} item" href="{{AppSubUrl}}/user/settings">
 						{{svg "octicon-tools"}}
 						{{.i18n.Tr "your_settings"}}<!-- Your settings -->