diff --git a/roles/git/files/home/gitea/custom/public/img/codesignd.svg b/roles/git/files/home/gitea/custom/public/img/codesignd.svg
new file mode 100644
index 0000000..cbd6596
--- /dev/null
+++ b/roles/git/files/home/gitea/custom/public/img/codesignd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="1000"><g fill="none" fill-rule="evenodd"><path fill="#F4B971" d="M591.55.57a503.966 503.966 0 0178.89 21.087l-15.057 159.726a354.035 354.035 0 0142.818 24.771l130.732-92.852a510.782 510.782 0 0157.765 57.766l-92.852 130.73a354.035 354.035 0 0124.77 42.82l159.727-15.057a503.966 503.966 0 0121.087 78.888l-145.872 66.832c.562 8.167.848 16.41.848 24.719 0 8.31-.286 16.552-.848 24.719L999.43 591.55a503.966 503.966 0 01-21.087 78.888l-159.726-15.056a354.035 354.035 0 01-24.771 42.818l92.852 130.73a510.782 510.782 0 01-57.766 57.767l-130.73-92.852a354.035 354.035 0 01-42.82 24.77l15.057 159.727a503.966 503.966 0 01-78.888 21.087l-66.832-145.872c-6.243.43-12.53.698-18.858.8l-5.861.048c-8.31 0-16.552-.286-24.719-.848L408.45 999.43a503.966 503.966 0 01-78.888-21.087l15.056-159.726a354.035 354.035 0 01-42.818-24.771l-130.73 92.852a510.782 510.782 0 01-57.767-57.765L206.154 698.2a354.035 354.035 0 01-24.77-42.818L21.656 670.439A503.966 503.966 0 01.57 591.551l145.872-66.832a359.603 359.603 0 01-.848-24.719c0-8.31.286-16.552.848-24.719L.57 408.45a503.966 503.966 0 0121.087-78.888l159.726 15.056a354.035 354.035 0 0124.771-42.818l-92.852-130.73a510.782 510.782 0 0157.766-57.767l130.73 92.852a354.035 354.035 0 0142.82-24.77L329.56 21.656A503.966 503.966 0 01408.449.57l66.832 145.872c8.167-.562 16.41-.848 24.719-.848 8.31 0 16.552.286 24.719.848L591.55.57zM500 212.644c-158.703 0-287.356 128.653-287.356 287.356S341.297 787.356 500 787.356 787.356 658.703 787.356 500 658.703 212.644 500 212.644z"/><path stroke="#0BB888" stroke-width="57.471" d="M500 346.743l132.724 76.629v153.256L500 653.257l-132.724-76.629V423.372z"/><circle cx="500.001" cy="500" r="318.008" stroke="#ED8F1B" stroke-width="118.774"/></g></svg>
\ No newline at end of file
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 f69533e..59c9380 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
@@ -1,24 +1,23 @@
 <footer>
-    <div class="ui container">
-        <div class="ui left">
-            © Lukas Bestle
-        </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>
-            {{end}}
-            <div class="ui language bottom floating slide up dropdown link item">
-                <i class="world icon"></i>
-                <div class="text">{{.LangName}}</div>
-                <div class="menu">
-                    {{range .AllLangs}}
-                        <a class="item {{if eq $.Lang .Lang}}active selected{{end}}" href="{{if eq $.Lang .Lang}}#{{else}}{{$.Link}}?lang={{.Lang}}{{end}}">{{.Name}}</a>
-                    {{end}}
-                </div>
-            </div>
-            <a target="_blank" href="https://codesignd.com">{{.i18n.Tr "website"}}</a>
-            <a target="_blank" href="https://codesignd.com/legal">Imprint</a>
-            {{if (or .ShowFooterVersion .PageIsAdmin)}}<span class="version">{{GoVer}}</span>{{end}}
-        </div>
-    </div>
+	<div class="ui container">
+		<div class="ui left">
+			© <a target="_blank" href="https://lukasbestle.com">Lukas Bestle</a>
+		</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>
+			{{end}}
+			<div class="ui language bottom floating slide up dropdown link item">
+				<i class="world icon"></i>
+				<div class="text">{{.LangName}}</div>
+				<div class="menu">
+					{{range .AllLangs}}
+						<a lang="{{.Lang}}" class="item {{if eq $.Lang .Lang}}active selected{{end}}" href="{{if eq $.Lang .Lang}}#{{else}}{{$.Link}}?lang={{.Lang}}{{end}}">{{.Name}}</a>
+					{{end}}
+				</div>
+			</div>
+			<a target="_blank" href="https://lukasbestle.com/legal">Imprint</a>
+			{{if (or .ShowFooterVersion .PageIsAdmin)}}<span class="version">{{.i18n.Tr "version"}}: {{AppVer}} • {{GoVer}}</span>{{end}}
+		</div>
+	</div>
 </footer>
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 21e8acb..e52b089 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
@@ -1,133 +1,161 @@
 <div class="ui container" id="navbar">
-    <div class="item brand" style="justify-content: space-between;">
-        <a href="{{AppSubUrl}}/">
-            <img class="ui mini image" src="{{AppSubUrl}}/img/gitea-sm.png">
-        </a>
-        <div class="ui basic icon button mobile-only" id="navbar-expand-toggle">
-            <i class="sidebar icon"></i>
-        </div>
-    </div>
+	<div class="item brand" style="justify-content: space-between;">
+		<a href="{{AppSubUrl}}/">
+			<img class="ui mini image" src="{{StaticUrlPrefix}}/img/codesignd.svg">
+		</a>
+		<div class="ui basic icon button mobile-only" id="navbar-expand-toggle">
+			<i class="sidebar icon"></i>
+		</div>
+	</div>
 
-    {{if .IsSigned}}
-        <a class="item {{if .PageIsDashboard}}active{{end}}" href="{{AppSubUrl}}/">{{.i18n.Tr "dashboard"}}</a>
-        <a class="item {{if .PageIsIssues}}active{{end}}" href="{{AppSubUrl}}/issues">{{.i18n.Tr "issues"}}</a>
-        <a class="item {{if .PageIsPulls}}active{{end}}" href="{{AppSubUrl}}/pulls">{{.i18n.Tr "pull_requests"}}</a>
-        <a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "explore"}}</a>
-    {{else if .IsLandingPageHome}}
-        <a class="item {{if .PageIsHome}}active{{end}}" href="{{AppSubUrl}}/">{{.i18n.Tr "home"}}</a>
-        <a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "explore"}}</a>
-    {{else if .IsLandingPageExplore}}
-        <a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "home"}}</a>
-    {{else if .IsLandingPageOrganizations}}
-        <a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/organizations">{{.i18n.Tr "home"}}</a>
-    {{end}}
+	{{if and .IsSigned .MustChangePassword}}
+		{{/* No links */}}
+	{{else if .IsSigned}}
+		<a class="item {{if .PageIsDashboard}}active{{end}}" href="{{AppSubUrl}}/">{{.i18n.Tr "dashboard"}}</a>
+		{{if not .UnitIssuesGlobalDisabled}}
+		<a class="item {{if .PageIsIssues}}active{{end}}" href="{{AppSubUrl}}/issues">{{.i18n.Tr "issues"}}</a>
+		{{end}}
+		{{if not .UnitPullsGlobalDisabled}}
+		<a class="item {{if .PageIsPulls}}active{{end}}" href="{{AppSubUrl}}/pulls">{{.i18n.Tr "pull_requests"}}</a>
+		{{end}}
+		{{if not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled)}}
+		{{if .ShowMilestonesDashboardPage}}<a class="item {{if .PageIsMilestonesDashboard}}active{{end}}" href="{{AppSubUrl}}/milestones">{{.i18n.Tr "milestones"}}</a>{{end}}
+		{{end}}
+		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "explore"}}</a>
+	{{else if .IsLandingPageHome}}
+		<a class="item {{if .PageIsHome}}active{{end}}" href="{{AppSubUrl}}/">{{.i18n.Tr "home"}}</a>
+		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "explore"}}</a>
+	{{else if .IsLandingPageExplore}}
+		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "home"}}</a>
+	{{else if .IsLandingPageOrganizations}}
+		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/organizations">{{.i18n.Tr "home"}}</a>
+	{{end}}
 
-    {{template "custom/extra_links" .}}
+	{{template "custom/extra_links" .}}
 
-    {{/*
-        <div class="item">
-        <div class="ui icon input">
-        <input class="searchbox" type="text" placeholder="{{.i18n.Tr "search_project"}}">
-        <i class="search icon"></i>
-        </div>
-        </div>
-    */}}
+	{{/*
+		<div class="item">
+		<div class="ui icon input">
+		<input class="searchbox" type="text" placeholder="{{.i18n.Tr "search_project"}}">
+		<i class="search icon"></i>
+		</div>
+		</div>
+	*/}}
 
-    {{if .IsSigned}}
-        <div class="right stackable menu">
-            <a href="{{AppSubUrl}}/notifications" class="item poping up" data-content='{{.i18n.Tr "notifications"}}' data-variation="tiny inverted">
-                <span class="text">
-                    <i class="fitted octicon octicon-bell"></i>
-                    <span class="sr-mobile-only">{{.i18n.Tr "notifications"}}</span>
 
-                    {{if .NotificationUnreadCount}}
-                        <span class="ui red label">
-                            {{.NotificationUnreadCount}}
-                        </span>
-                    {{end}}
-                </span>
-            </a>
+	{{if and .IsSigned .MustChangePassword}}
+		<div class="right stackable menu">
+			<div class="ui dropdown jump item poping up" tabindex="-1" data-content="{{.i18n.Tr "user_profile_and_more"}}" data-variation="tiny inverted">
+				<span class="text">
+					<img class="ui tiny avatar image" width="24" height="24" src="{{.SignedUser.RelAvatarLink}}">
+					<span class="sr-only">{{.i18n.Tr "user_profile_and_more"}}</span>
+					<span class="mobile-only">{{.SignedUser.Name}}</span>
+					<span class="fitted not-mobile" tabindex="-1">{{svg "octicon-triangle-down" 16}}</span>
+				</span>
+				<div class="menu user-menu" tabindex="-1">
+					<div class="ui header">
+						{{.i18n.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong>
+					</div>
 
-            <div class="ui dropdown jump item poping up" data-content="{{.i18n.Tr "create_new"}}" data-variation="tiny inverted">
-                <span class="text">
-                    <i class="fitted octicon octicon-plus"></i>
-                    <span class="sr-mobile-only">{{.i18n.Tr "create_new"}}</span>
-                    <i class="fitted octicon octicon-triangle-down not-mobile"></i>
-                </span>
-                <div class="menu">
-                    <a class="item" href="{{AppSubUrl}}/repo/create">
-                        <i class="fitted octicon octicon-plus"></i> {{.i18n.Tr "new_repo"}}
-                    </a>
-                    <a class="item" href="{{AppSubUrl}}/repo/migrate">
-                        <i class="fitted octicon octicon-repo-clone"></i> {{.i18n.Tr "new_migrate"}}
-                    </a>
-                    {{if .SignedUser.CanCreateOrganization}}
-                    <a class="item" href="{{AppSubUrl}}/org/create">
-                        <i class="fitted octicon octicon-organization"></i> {{.i18n.Tr "new_org"}}
-                    </a>
-                    {{end}}
-                </div><!-- end content create new menu -->
-            </div><!-- end dropdown menu create new -->
+					<div class="divider"></div>
+					<a class="item link-action" href data-url="{{AppSubUrl}}/user/logout" data-redirect="{{AppSubUrl}}/">
+						{{svg "octicon-sign-out" 16}}
+						{{.i18n.Tr "sign_out"}}<!-- Sign Out -->
+					</a>
+				</div><!-- end content avatar menu -->
+			</div><!-- end dropdown avatar menu -->
+		</div>
+	{{else if .IsSigned}}
+		<div class="right stackable menu">
+			<a href="{{AppSubUrl}}/notifications" class="item poping up" data-content='{{.i18n.Tr "notifications"}}' data-variation="tiny inverted">
+				<span class="text">
+					<span class="fitted">{{svg "octicon-bell" 16}}</span>
+					<span class="sr-mobile-only">{{.i18n.Tr "notifications"}}</span>
+					{{$notificationUnreadCount := 0}}
+					{{if .NotificationUnreadCount}}{{$notificationUnreadCount = call .NotificationUnreadCount}}{{end}}
+					<span class="ui red label {{if not $notificationUnreadCount}}hidden{{end}} notification_count">
+						{{$notificationUnreadCount}}
+					</span>
+				</span>
+			</a>
 
-            <div class="ui dropdown jump item poping up" tabindex="-1" data-content="{{.i18n.Tr "user_profile_and_more"}}" data-variation="tiny inverted">
-                <span class="text">
-                    <img class="ui tiny avatar image" src="{{.SignedUser.RelAvatarLink}}">
-                    <span class="sr-only">{{.i18n.Tr "user_profile_and_more"}}</span>
-                    <span class="mobile-only">{{.SignedUser.Name}}</span>
-                    <i class="fitted octicon octicon-triangle-down not-mobile" tabindex="-1"></i>
-                </span>
-                <div class="menu user-menu" tabindex="-1">
-                    <div class="ui header">
-                        {{.i18n.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong>
-                    </div>
+			<div class="ui dropdown jump item poping up" data-content="{{.i18n.Tr "create_new"}}" data-variation="tiny inverted">
+				<span class="text">
+					<span class="fitted">{{svg "octicon-plus" 16}}</span>
+					<span class="sr-mobile-only">{{.i18n.Tr "create_new"}}</span>
+					<span class="fitted not-mobile">{{svg "octicon-triangle-down" 16}}</span>
+				</span>
+				<div class="menu">
+					<a class="item" href="{{AppSubUrl}}/repo/create">
+						<span class="fitted">{{svg "octicon-plus" 16}}</span> {{.i18n.Tr "new_repo"}}
+					</a>
+					<a class="item" href="{{AppSubUrl}}/repo/migrate">
+						<span class="fitted">{{svg "octicon-repo-clone" 16}}</span> {{.i18n.Tr "new_migrate"}}
+					</a>
+					{{if .SignedUser.CanCreateOrganization}}
+					<a class="item" href="{{AppSubUrl}}/org/create">
+						<span class="fitted">{{svg "octicon-organization" 16}}</span> {{.i18n.Tr "new_org"}}
+					</a>
+					{{end}}
+				</div><!-- end content create new menu -->
+			</div><!-- end dropdown menu create new -->
 
-                    <div class="divider"></div>
-                    <a class="item" href="{{AppSubUrl}}/{{.SignedUser.Name}}">
-                        <i class="octicon octicon-person"></i>
-                        {{.i18n.Tr "your_profile"}}<!-- Your profile -->
-                    </a>
-                    <a class="item" href="{{AppSubUrl}}/{{.SignedUser.Name}}?tab=stars">
-                        <i class="octicon octicon-star"></i>
-                        {{.i18n.Tr "your_starred"}}
-                    </a>
-                    <a class="{{if .PageIsUserSettings}}active{{end}} item" href="{{AppSubUrl}}/user/settings">
-                        <i class="octicon octicon-settings"></i>
-                        {{.i18n.Tr "your_settings"}}<!-- Your settings -->
-                    </a>
-                    <a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io">
-                        <i class="octicon octicon-question"></i>
-                        {{.i18n.Tr "help"}}<!-- Help -->
-                    </a>
-                    {{if .IsAdmin}}
-                        <div class="divider"></div>
+			<div class="ui dropdown jump item poping up" tabindex="-1" data-content="{{.i18n.Tr "user_profile_and_more"}}" data-variation="tiny inverted">
+				<span class="text">
+					<img class="ui tiny avatar image" width="24" height="24" src="{{.SignedUser.RelAvatarLink}}">
+					<span class="sr-only">{{.i18n.Tr "user_profile_and_more"}}</span>
+					<span class="mobile-only">{{.SignedUser.Name}}</span>
+					<span class="fitted not-mobile" tabindex="-1">{{svg "octicon-triangle-down" 16}}</span>
+				</span>
+				<div class="menu user-menu" tabindex="-1">
+					<div class="ui header">
+						{{.i18n.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong>
+					</div>
 
-                        <a class="{{if .PageIsAdmin}}active{{end}} item" href="{{AppSubUrl}}/admin">
-                            <i class="icon settings"></i>
-                            {{.i18n.Tr "admin_panel"}}<!-- Admin Panel -->
-                        </a>
-                    {{end}}
+					<div class="divider"></div>
+					<a class="item" href="{{AppSubUrl}}/{{.SignedUser.Name}}">
+						{{svg "octicon-person" 16}}
+						{{.i18n.Tr "your_profile"}}<!-- Your profile -->
+					</a>
+					<a class="item" href="{{AppSubUrl}}/{{.SignedUser.Name}}?tab=stars">
+						{{svg "octicon-star" 16}}
+						{{.i18n.Tr "your_starred"}}
+					</a>
+					<a class="{{if .PageIsUserSettings}}active{{end}} item" href="{{AppSubUrl}}/user/settings">
+						{{svg "octicon-settings" 16}}
+						{{.i18n.Tr "your_settings"}}<!-- Your settings -->
+					</a>
+					<a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io">
+						{{svg "octicon-question" 16}}
+						{{.i18n.Tr "help"}}<!-- Help -->
+					</a>
+					{{if .IsAdmin}}
+						<div class="divider"></div>
 
-                    <div class="divider"></div>
-                    <a class="item" href="{{AppSubUrl}}/user/logout">
-                        <i class="octicon octicon-sign-out"></i>
-                        {{.i18n.Tr "sign_out"}}<!-- Sign Out -->
-                    </a>
-                </div><!-- end content avatar menu -->
-            </div><!-- end dropdown avatar menu -->
-        </div><!-- end signed user right menu -->
+						<a class="{{if .PageIsAdmin}}active{{end}} item" href="{{AppSubUrl}}/admin">
+							<i class="icon settings"></i>
+							{{.i18n.Tr "admin_panel"}}<!-- Admin Panel -->
+						</a>
+					{{end}}
 
-    {{else}}
-
-        <div class="right stackable menu">
-            {{if .ShowRegistrationButton}}
-                <a class="item{{if .PageIsSignUp}} active{{end}}" href="{{AppSubUrl}}/user/sign_up">
-                    <i class="octicon octicon-person"></i> {{.i18n.Tr "register"}}
-                </a>
-            {{end}}
-            <a class="item{{if .PageIsSignIn}} active{{end}}" href="{{AppSubUrl}}/user/login?redirect_to={{.Link}}">
-                <i class="octicon octicon-sign-in"></i> {{.i18n.Tr "sign_in"}}
-            </a>
-        </div><!-- end anonymous right menu -->
-
-    {{end}}
+					<div class="divider"></div>
+					<a class="item link-action" href data-url="{{AppSubUrl}}/user/logout" data-redirect="{{AppSubUrl}}/">
+						{{svg "octicon-sign-out" 16}}
+						{{.i18n.Tr "sign_out"}}<!-- Sign Out -->
+					</a>
+				</div><!-- end content avatar menu -->
+			</div><!-- end dropdown avatar menu -->
+		</div><!-- end signed user right menu -->
+	{{else}}
+		<div class="right stackable menu">
+			{{if .ShowRegistrationButton}}
+				<a class="item{{if .PageIsSignUp}} active{{end}}" href="{{AppSubUrl}}/user/sign_up">
+					{{svg "octicon-person" 16}} {{.i18n.Tr "register"}}
+				</a>
+			{{end}}
+			<a class="item{{if .PageIsSignIn}} active{{end}}" rel="nofollow" href="{{AppSubUrl}}/user/login?redirect_to={{.CurrentURL}}">
+				{{svg "octicon-sign-in" 16}} {{.i18n.Tr "sign_in"}}
+			</a>
+		</div><!-- end anonymous right menu -->
+	{{end}}
 </div>