diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl
index 89be60922..e302cab0e 100644
--- a/templates/base/footer_content.tmpl
+++ b/templates/base/footer_content.tmpl
@@ -1,19 +1,7 @@
 <footer>
 	<div class="ui container">
 		<div class="ui left">
-			<a target="_blank" rel="noopener noreferrer" href="https://gitea.io">{{.locale.Tr "powered_by" "Gitea"}}</a>
-			{{if (or .ShowFooterVersion .PageIsAdmin)}}
-				{{.locale.Tr "version"}}:
-				{{if .IsAdmin}}
-					<a href="{{AppSubUrl}}/admin/config">{{AppVer}}</a>
-				{{else}}
-					{{AppVer}}
-				{{end}}
-			{{end}}
-			{{if and .TemplateLoadTimes ShowFooterTemplateLoadTime}}
-				{{.locale.Tr "page"}}: <strong>{{LoadTimes .PageStartTime}}</strong>
-				{{.locale.Tr "template"}}{{if .TemplateName}} {{.TemplateName}}{{end}}: <strong>{{call .TemplateLoadTimes}}</strong>
-			{{end}}
+			{{.locale.Tr "powered_by" "Nikita Tokarchuk and Gitea"}}
 		</div>
 		<div class="ui right links">
 			{{if .ShowFooterBranding}}
@@ -29,7 +17,6 @@
 				</div>
 			</div>
 			<a href="{{AssetUrlPrefix}}/js/licenses.txt">{{.locale.Tr "licenses"}}</a>
-			{{if .EnableSwagger}}<a href="{{AppSubUrl}}/api/swagger">API</a>{{end}}
 			{{template "custom/extra_links_footer" .}}
 		</div>
 	</div>
diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl
index c84e30ab2..8ef01f55b 100644
--- a/templates/base/head_navbar.tmpl
+++ b/templates/base/head_navbar.tmpl
@@ -1,22 +1,12 @@
-<div class="ui container" id="navbar">
+<div class="ui container" style="padding-top: 4px;" id="navbar">
 	{{$notificationUnreadCount := 0}}
 	{{if .IsSigned}}
 		{{if .NotificationUnreadCount}}{{$notificationUnreadCount = call .NotificationUnreadCount}}{{end}}
 	{{end}}
-	<div class="item brand" style="justify-content: space-between;">
+	<div class="left item brand" style="justify-content: space-between;padding-top: 1px;margin-right: 0px!important;">
 		<a href="{{AppSubUrl}}/" aria-label="{{if .IsSigned}}{{.locale.Tr "dashboard"}}{{else}}{{.locale.Tr "home"}}{{end}}">
-			<img width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{.locale.Tr "logo"}}" aria-hidden="true">
+			<span style="font-size: 2em;color: #046380;">code</span>.tokarch.uk
 		</a>
-		{{if .IsSigned}}
-		<a href="{{AppSubUrl}}/notifications" class="tooltip mobile-only" data-content='{{.locale.Tr "notifications"}}'>
-			<span class="text black">
-				<span class="fitted">{{svg "octicon-bell"}}</span>
-				<span class="ui red label mini{{if not $notificationUnreadCount}} hidden{{end}} notification_count">
-					{{$notificationUnreadCount}}
-				</span>
-			</span>
-		</a>
-		{{end}}
 		<div class="ui basic icon button mobile-only" id="navbar-expand-toggle">
 			<i class="sidebar icon"></i>
 		</div>
@@ -92,7 +82,7 @@
 					<a class="stopwatch-link df ac" href="{{.ActiveStopwatch.IssueLink}}">
 						{{svg "octicon-issue-opened" 16 "mr-3"}}
 						<span class="stopwatch-issue">{{.ActiveStopwatch.RepoSlug}}#{{.ActiveStopwatch.IssueIndex}}</span>
-						<span class="ui primary label stopwatch-time my-0 mx-4" data-seconds="{{.ActiveStopwatch.Seconds}}">
+						<span class="ui label blue stopwatch-time my-0 mx-4" data-seconds="{{.ActiveStopwatch.Seconds}}">
 							{{if .ActiveStopwatch}}{{Sec2Time .ActiveStopwatch.Seconds}}{{end}}
 						</span>
 					</a>
@@ -121,6 +111,9 @@
 			<a href="{{AppSubUrl}}/notifications" class="item tooltip not-mobile" data-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}">
 				<span class="text">
 					<span class="fitted">{{svg "octicon-bell"}}</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>
diff --git a/tokarchuk/templates/base/footer_content.tmpl b/tokarchuk/templates/base/footer_content.tmpl
new file mode 120000
index 000000000..5c6abf593
--- /dev/null
+++ b/tokarchuk/templates/base/footer_content.tmpl
@@ -0,0 +1 @@
+../../../templates/base/footer_content.tmpl
\ No newline at end of file
diff --git a/tokarchuk/templates/base/head_navbar.tmpl b/tokarchuk/templates/base/head_navbar.tmpl
new file mode 120000
index 000000000..61c6d5159
--- /dev/null
+++ b/tokarchuk/templates/base/head_navbar.tmpl
@@ -0,0 +1 @@
+../../../templates/base/head_navbar.tmpl
\ No newline at end of file