diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl
index f5ec6b0bf..f35e61d46 100644
--- a/templates/base/footer_content.tmpl
+++ b/templates/base/footer_content.tmpl
@@ -1,20 +1,7 @@
 <footer>
 	<div class="ui container">
 		<div class="ui left">
-			{{.i18n.Tr "powered_by" "Gitea"}}
-			{{if (or .ShowFooterVersion .PageIsAdmin)}}
-				{{.i18n.Tr "version"}}:
-				{{if .IsAdmin}}
-					<a href="{{AppSubUrl}}/admin/config">{{AppVer}}</a>
-				{{else}}
-					{{AppVer}}
-				{{end}}
-			{{end}}
-			{{if and .TemplateLoadTimes ShowFooterTemplateLoadTime}}
-				{{.i18n.Tr "page"}}: <strong>{{LoadTimes .PageStartTime}}</strong>
-				{{.i18n.Tr "template"}}
-				{{if .TemplateName}} {{.TemplateName}}{{end}}: <strong>{{call .TemplateLoadTimes}}</strong>
-			{{end}}
+			{{.i18n.Tr "powered_by" "Nikita Tokarchuk and Gitea"}}
 		</div>
 		<div class="ui right links">
 			{{if .ShowFooterBranding}}
@@ -22,16 +9,14 @@
 			{{end}}
 			<div class="ui language bottom floating slide up dropdown link item">
 				{{svg "octicon-globe"}}
-				<div class="text">{{.i18n.LangName}}</div>
+				<div class="text">{{.LangName}}</div>
 				<div class="menu language-menu">
 					{{range .AllLangs}}
-						<a lang="{{.Lang}}" data-url="{{AppSubUrl}}/?lang={{.Lang}}" class="item {{if eq $.i18n.Lang .Lang}}active selected{{end}}">{{.Name}}</a>
+						<a lang="{{.Lang}}" data-url="{{AppSubUrl}}/?lang={{.Lang}}" class="item {{if eq $.Lang .Lang}}active selected{{end}}">{{.Name}}</a>
 					{{end}}
 				</div>
 			</div>
 			<a href="{{AssetUrlPrefix}}/js/licenses.txt">{{.i18n.Tr "licenses"}}</a>
-			{{if .EnableSwagger}}<a href="{{AppSubUrl}}/api/swagger">API</a>{{end}}
-			<a target="_blank" rel="noopener noreferrer" href="https://gitea.io">{{.i18n.Tr "website"}}</a>
 			{{template "custom/extra_links_footer" .}}
 		</div>
 	</div>
diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl
index 911bcd377..1035b211a 100644
--- a/templates/base/head_navbar.tmpl
+++ b/templates/base/head_navbar.tmpl
@@ -1,22 +1,8 @@
-<div class="ui container" id="navbar">
-	{{$notificationUnreadCount := 0}}
-	{{if .IsSigned}}
-		{{if .NotificationUnreadCount}}{{$notificationUnreadCount = call .NotificationUnreadCount}}{{end}}
-	{{end}}
-	<div class="item brand" style="justify-content: space-between;">
-		<a href="{{AppSubUrl}}/" aria-label="{{if .IsSigned}}{{.i18n.Tr "dashboard"}}{{else}}{{.i18n.Tr "home"}}{{end}}">
-			<img class="ui mini image" width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{.i18n.Tr "logo"}}" aria-hidden="true">
-		</a>
-		{{if .IsSigned}}
-		<a href="{{AppSubUrl}}/notifications" class="tooltip mobile-only" data-content='{{.i18n.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>
+<div class="ui container" style="padding-top: 4px;" id="navbar">
+	<div class="left item brand" style="justify-content: space-between;padding-top: 1px;margin-right: 0px!important;">
+		<a href="{{AppSubUrl}}/" data-content="{{if .IsSigned}}{{.i18n.Tr "dashboard"}}{{else}}{{.i18n.Tr "home"}}{{end}}">
+			<span style="font-size: 2em;color: #046380;">code</span>.tokarch.uk
 		</a>
-		{{end}}
 		<div class="ui basic icon button mobile-only" id="navbar-expand-toggle">
 			<i class="sidebar icon"></i>
 		</div>
@@ -91,7 +77,7 @@
 					<a class="stopwatch-link df ac" href="{{.ActiveStopwatch.IssueLink}}">
 						{{svg "octicon-issue-opened"}}
 						<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>
@@ -114,9 +100,12 @@
 				</div>
 			</div>
 
-			<a href="{{AppSubUrl}}/notifications" class="item tooltip not-mobile" data-content="{{.i18n.Tr "notifications"}}" aria-label="{{.i18n.Tr "notifications"}}">
+			<a href="{{AppSubUrl}}/notifications" class="item tooltip" data-content='{{.i18n.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