diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl
index a3205f2..3feb7d3 100644
--- a/templates/base/head_navbar.tmpl
+++ b/templates/base/head_navbar.tmpl
@@ -5,10 +5,22 @@
     {{end}}
     <div class="item brand gt-sb" style="justify-content: space-between;">
         <a href="{{AppSubUrl}}/" aria-label="{{if .IsSigned}}{{.locale.Tr "dashboard"}}{{else}}{{.locale.Tr "home"}}{{end}}">
-            <img class="ui mini image" width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{.locale.Tr "logo"}}" aria-hidden="true">
+            <img width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{.locale.Tr "logo"}}" aria-hidden="true">
         </a>
-        <div class="ui basic icon button mobile-only" id="navbar-expand-toggle">
-            <i class="sidebar icon"></i>
+        <div class="gt-df gt-ac">
+                {{if .IsSigned}}
+                <a href="{{AppSubUrl}}/notifications" class="tooltip mobile-only gt-mr-4 gt-mt-3" data-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}">
+                        <span class="fitted item">
+                                {{svg "octicon-bell"}}
+                                <span class="notification_count{{if not $notificationUnreadCount}} gt-hidden{{end}}">
+                                        {{$notificationUnreadCount}}
+                                </span>
+                        </span>
+                </a>
+                {{end}}
+                <button class="ui icon button mobile-only" id="navbar-expand-toggle">
+                        {{svg "octicon-three-bars"}}
+                </button>
         </div>
     </div>
 
@@ -67,27 +79,27 @@
         </div>
     {{else if .IsSigned}}
         <div class="right stackable menu">
-            <a class="active-stopwatch-trigger item ui label {{if not .ActiveStopwatch}}hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}">
-                <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>
+            {{if EnableTimetracking}}
+            <a class="active-stopwatch-trigger item ui gt-mx-0{{if not .ActiveStopwatch}} gt-hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}">
+                <span class="fitted gt-relative">
+                    {{svg "octicon-stopwatch"}}
+                    <span class="header-stopwatch-dot"></span>
                     <span class="sr-mobile-only">{{.locale.Tr "active_stopwatch"}}</span>
                 </span>
             </a>
-            <div class="ui popup very wide">
-                <div class="df ac">
-                    <a class="stopwatch-link df ac" href="{{.ActiveStopwatch.IssueLink}}">
-                        {{svg "octicon-issue-opened"}}
+            <div class="active-stopwatch-popup tippy-target">
+                <div class="gt-df gt-ac">
+                    <a class="stopwatch-link gt-df gt-ac" href="{{.ActiveStopwatch.IssueLink}}">
+                        {{svg "octicon-issue-opened" 16 "gt-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 primary label stopwatch-time gt-my-0 gt-mx-4" data-seconds="{{.ActiveStopwatch.Seconds}}">
                             {{if .ActiveStopwatch}}{{Sec2Time .ActiveStopwatch.Seconds}}{{end}}
                         </span>
                     </a>
                     <form class="stopwatch-commit" method="POST" action="{{.ActiveStopwatch.IssueLink}}/times/stopwatch/toggle">
                         {{.CsrfTokenHtml}}
                         <button
+                            type="submit"
                             class="ui button mini compact basic icon fitted tooltip"
                             data-content="{{.locale.Tr "repo.issues.stop_tracking"}}"
                             data-position="top right"
@@ -96,6 +108,7 @@
                     <form class="stopwatch-cancel" method="POST" action="{{.ActiveStopwatch.IssueLink}}/times/stopwatch/cancel">
                         {{.CsrfTokenHtml}}
                         <button
+                            type="submit"
                             class="ui button mini compact basic icon fitted tooltip"
                             data-content="{{.locale.Tr "repo.issues.cancel_tracking"}}"
                             data-position="top right"
@@ -103,20 +116,18 @@
                     </form>
                 </div>
             </div>
+            {{end}}
 
-            <a href="{{AppSubUrl}}/notifications" class="item tooltip" data-content='{{.locale.Tr "notifications"}}'>
-                <span class="text">
-                    <span class="fitted">{{svg "octicon-bell"}}</span>
-                    <span class="sr-mobile-only">{{.locale.Tr "notifications"}}</span>
-                    {{$notificationUnreadCount := 0}}
-                    {{if .NotificationUnreadCount}}{{$notificationUnreadCount = call .NotificationUnreadCount}}{{end}}
-                    <span class="ui red label {{if not $notificationUnreadCount}}hidden{{end}} notification_count">
+            <a href="{{AppSubUrl}}/notifications" class="item tooltip not-mobile gt-mx-0" data-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}">
+                <span class="fitted item">
+                    {{svg "octicon-bell"}}
+                    <span class="notification_count{{if not $notificationUnreadCount}} gt-hidden{{end}}">
                         {{$notificationUnreadCount}}
                     </span>
                 </span>
             </a>
 
-            <div class="ui dropdown jump item tooltip" data-content="{{.locale.Tr "create_new"}}">
+            <div class="ui dropdown jump item tooltip gt-mx-0" data-content="{{.locale.Tr "create_new"}}">
                 <span class="text">
                     <span class="fitted">{{svg "octicon-plus"}}</span>
                     <span class="sr-mobile-only">{{.locale.Tr "create_new"}}</span>
@@ -139,9 +150,9 @@
                 </div><!-- end content create new menu -->
             </div><!-- end dropdown menu create new -->
 
-            <div class="ui dropdown jump item tooltip" tabindex="-1" data-content="{{.locale.Tr "user_profile_and_more"}}">
+            <div class="ui dropdown jump item tooltip gt-mx-0" data-content="{{.locale.Tr "user_profile_and_more"}}">
                 <span class="text">
-                    {{avatar .SignedUser 24 "tiny"}}
+                    {{avatar $.Context .SignedUser 24 "tiny"}}
                     <span class="sr-only">{{.locale.Tr "user_profile_and_more"}}</span>
                     <span class="mobile-only">{{.SignedUser.Name}}</span>
                     <span class="fitted not-mobile" tabindex="-1">{{svg "octicon-triangle-down"}}</span>
@@ -162,7 +173,11 @@
                             {{.locale.Tr "your_starred"}}
                         </a>
                     {{end}}
-                    <a class="{{if .PageIsUserSettings}}active{{end}} item" href="{{AppSubUrl}}/user/settings">
+                    <a class="item" href="{{AppSubUrl}}/notifications/subscriptions">
+                        {{svg "octicon-bell"}}
+                        {{.locale.Tr "notification.subscriptions"}}<!-- Subscriptions -->
+                    </a>
+                    <a class="{{if .PageIsUserSettings}}active {{end}}item" href="{{AppSubUrl}}/user/settings">
                         {{svg "octicon-tools"}}
                         {{.locale.Tr "your_settings"}}<!-- Your settings -->
                     </a>
@@ -173,7 +188,7 @@
                     {{if .IsAdmin}}
                         <div class="divider"></div>
 
-                        <a class="{{if .PageIsAdmin}}active{{end}} item" href="{{AppSubUrl}}/admin">
+                        <a class="{{if .PageIsAdmin}}active {{end}}item" href="{{AppSubUrl}}/admin">
                             {{svg "octicon-server"}}
                             {{.locale.Tr "admin_panel"}}<!-- Admin Panel -->
                         </a>
@@ -203,4 +218,4 @@
             </a>
         </div><!-- end anonymous right menu -->
     {{end}}
-</div>
+</nav>