diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl
index e46e276ed0..3086e674fd 100644
--- a/templates/base/head_navbar.tmpl
+++ b/templates/base/head_navbar.tmpl
@@ -3,62 +3,63 @@
 	{{$notificationUnreadCount = call .NotificationUnreadCount}}
 {{end}}
 
-<nav id="navbar" class="ui secondary stackable menu" aria-label="{{.locale.Tr "aria.navbar"}}">
-	<div class="item">
+<nav id="navbar" aria-label="{{.locale.Tr "aria.navbar"}}">
+	<div class="navbar-left ui secondary menu">
 		<!-- the logo -->
-		<a href="{{AppSubUrl}}/" aria-label="{{if .IsSigned}}{{.locale.Tr "dashboard"}}{{else}}{{.locale.Tr "home"}}{{end}}">
+		<a class="item" id="navbar-logo" 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">
 		</a>
 
 		<!-- mobile right menu, it must be here because in mobile view, each item is a flex column, the first item is a full row column -->
-		<div class="ui secondary menu navbar-mobile-right gt-gap-2">
+		<div class="ui secondary menu item navbar-mobile-right gt-gap-2">
 			{{if .IsSigned}}
-			<a class="item gt-mx-0 gt-p-3" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}">
+			<a class="item mobile-right-item gt-mr-2 gt-p-3" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}">
 				<div class="gt-relative">
 					{{svg "octicon-bell"}}
 					<span class="notification_count{{if not $notificationUnreadCount}} gt-hidden{{end}}">{{$notificationUnreadCount}}</span>
 				</div>
 			</a>
 			{{end}}
-			<button class="item ui icon mini button gt-p-3 gt-m-0" id="navbar-expand-toggle">{{svg "octicon-three-bars"}}</button>
+			<button class="item mobile-right-item ui icon mini button gt-p-3 gt-m-0" id="navbar-expand-toggle">{{svg "octicon-three-bars"}}</button>
 		</div>
+
+
+		<!-- navbar links non-mobile -->
+		{{if and .IsSigned .MustChangePassword}}
+			{{/* No links */}}
+		{{else if .IsSigned}}
+			{{if not .UnitIssuesGlobalDisabled}}
+				<a class="item{{if .PageIsIssues}} active{{end}}" href="{{AppSubUrl}}/issues">{{.locale.Tr "issues"}}</a>
+			{{end}}
+			{{if not .UnitPullsGlobalDisabled}}
+				<a class="item{{if .PageIsPulls}} active{{end}}" href="{{AppSubUrl}}/pulls">{{.locale.Tr "pull_requests"}}</a>
+			{{end}}
+			{{if not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled)}}
+				{{if .ShowMilestonesDashboardPage}}
+					<a class="item{{if .PageIsMilestonesDashboard}} active{{end}}" href="{{AppSubUrl}}/milestones">{{.locale.Tr "milestones"}}</a>
+				{{end}}
+			{{end}}
+			<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.locale.Tr "explore"}}</a>
+		{{else if .IsLandingPageOrganizations}}
+			<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/organizations">{{.locale.Tr "explore"}}</a>
+		{{else}}
+			<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.locale.Tr "explore"}}</a>
+		{{end}}
+
+		{{template "custom/extra_links" .}}
+
+		{{if not .IsSigned}}
+			<a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io">{{.locale.Tr "help"}}</a>
+		{{end}}
 	</div>
 
-	<!-- navbar links -->
-	{{if and .IsSigned .MustChangePassword}}
-		{{/* No links */}}
-	{{else if .IsSigned}}
-		{{if not .UnitIssuesGlobalDisabled}}
-			<a class="item{{if .PageIsIssues}} active{{end}}" href="{{AppSubUrl}}/issues">{{.locale.Tr "issues"}}</a>
-		{{end}}
-		{{if not .UnitPullsGlobalDisabled}}
-			<a class="item{{if .PageIsPulls}} active{{end}}" href="{{AppSubUrl}}/pulls">{{.locale.Tr "pull_requests"}}</a>
-		{{end}}
-		{{if not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled)}}
-			{{if .ShowMilestonesDashboardPage}}
-				<a class="item{{if .PageIsMilestonesDashboard}} active{{end}}" href="{{AppSubUrl}}/milestones">{{.locale.Tr "milestones"}}</a>
-			{{end}}
-		{{end}}
-		<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.locale.Tr "explore"}}</a>
-	{{else if .IsLandingPageOrganizations}}
-		<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/organizations">{{.locale.Tr "explore"}}</a>
-	{{else}}
-		<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.locale.Tr "explore"}}</a>
-	{{end}}
-
-	{{template "custom/extra_links" .}}
-
-	{{if not .IsSigned}}
-		<a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io">{{.locale.Tr "help"}}</a>
-	{{end}}
-
 	<!-- the full dropdown menus -->
-	<div class="right menu">
+	<div class="navbar-right ui secondary menu">
 		{{if and .IsSigned .MustChangePassword}}
 			<div class="ui dropdown jump item" data-tooltip-content="{{.locale.Tr "user_profile_and_more"}}">
 				<span class="text gt-df gt-ac">
 					{{avatar $.Context .SignedUser 24 "gt-mr-2"}}
-					<span class="mobile-only gt-ml-2">{{.SignedUser.Name}}</span>
+					<span class="mobile-only gt-ml-3">{{.SignedUser.Name}}</span>
 					<span class="not-mobile">{{svg "octicon-triangle-down"}}</span>
 				</span>
 				<div class="menu user-menu">
@@ -75,14 +76,14 @@
 			</div><!-- end dropdown avatar menu -->
 		{{else if .IsSigned}}
 			{{if EnableTimetracking}}
-			<a class="active-stopwatch-trigger item ui gt-mx-0{{if not .ActiveStopwatch}} gt-hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}" title="{{.locale.Tr "active_stopwatch"}}">
+			<a class="active-stopwatch-trigger item gt-mx-0{{if not .ActiveStopwatch}} gt-hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}" title="{{.locale.Tr "active_stopwatch"}}">
 				<div class="gt-relative">
 					{{svg "octicon-stopwatch"}}
 					<span class="header-stopwatch-dot"></span>
 				</div>
-				<span class="mobile-only gt-ml-2">{{.locale.Tr "active_stopwatch"}}</span>
+				<span class="mobile-only gt-ml-3">{{.locale.Tr "active_stopwatch"}}</span>
 			</a>
-			<div class="active-stopwatch-popup tippy-target gt-p-3">
+			<div class="active-stopwatch-popup item tippy-target gt-p-3">
 				<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"}}
@@ -111,7 +112,7 @@
 			</div>
 			{{end}}
 
-			<a href="{{AppSubUrl}}/notifications" class="item not-mobile gt-mx-0" data-tooltip-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}">
+			<a class="item not-mobile gt-mx-0" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}">
 				<div class="gt-relative">
 					{{svg "octicon-bell"}}
 					<span class="notification_count{{if not $notificationUnreadCount}} gt-hidden{{end}}">{{$notificationUnreadCount}}</span>
@@ -144,7 +145,7 @@
 			<div class="ui dropdown jump item gt-mx-0 gt-pr-3" data-tooltip-content="{{.locale.Tr "user_profile_and_more"}}">
 				<span class="text gt-df gt-ac">
 					{{avatar $.Context .SignedUser 24 "gt-mr-2"}}
-					<span class="mobile-only gt-ml-2">{{.SignedUser.Name}}</span>
+					<span class="mobile-only gt-ml-3">{{.SignedUser.Name}}</span>
 					<span class="not-mobile">{{svg "octicon-triangle-down"}}</span>
 				</span>
 				<div class="menu user-menu">
diff --git a/web_src/css/base.css b/web_src/css/base.css
index a876885632..7322b778f3 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -930,102 +930,6 @@ img.ui.avatar,
   }
 }
 
-#navbar {
-  display: flex;
-  align-items: center;
-  background: var(--color-nav-bg);
-  border-bottom: 1px solid var(--color-secondary);
-  min-height: 52px;
-  margin: 0 !important;
-}
-
-#navbar a.item:hover {
-  background: var(--color-nav-hover-bg);
-}
-
-#navbar .navbar-mobile-right {
-  margin-left: auto;
-}
-
-#navbar .navbar-mobile-right a.item:hover {
-  background: transparent;
-}
-
-#navbar .secondary.menu > .item > .svg,
-#navbar .right.menu > .item > .svg {
-  margin-right: 0;
-}
-
-@media (max-width: 767.98px) {
-  /* hide all items */
-  #navbar .item {
-    display: none;
-  }
-  /* show the first navbar item (logo and its mobile right items) */
-  #navbar > .item:first-child {
-    display: flex;
-    padding-top: 5px;
-    padding-bottom: 5px;
-  }
-  #navbar .navbar-mobile-right > .item {
-    display: flex;
-  }
-  /* show items if the navbar is open */
-  #navbar.navbar-menu-open .item {
-    display: flex;
-  }
-  #navbar.navbar-menu-open > .item:first-child {
-    padding-bottom: 0;
-  }
-}
-
-@media (min-width: 767.98px) {
-  #navbar .navbar-mobile-right,
-  #navbar .mobile-only {
-    display: none;
-  }
-  #navbar .right.menu {
-    padding-right: 1em;
-  }
-}
-
-#navbar .navbar-mobile-right .item {
-  width: auto !important;
-}
-
-#navbar a.item .notification_count {
-  color: var(--color-nav-bg);
-  padding: 0 3.75px;
-  font-size: 12px;
-  line-height: 12px;
-  font-weight: var(--font-weight-bold);
-}
-
-#navbar a.item:hover .notification_count,
-#navbar a.item:hover .header-stopwatch-dot {
-  border-color: var(--color-nav-hover-bg);
-}
-
-#navbar a.item .notification_count,
-#navbar a.item .header-stopwatch-dot {
-  background: var(--color-primary);
-  border: 2px solid var(--color-nav-bg);
-  position: absolute;
-  left: 6px;
-  top: -9px;
-  min-width: 17px;
-  min-height: 17px;
-  border-radius: 17px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-#navbar .right.menu {
-  width: 100%;
-  justify-content: flex-end;
-}
-
 .ui.pagination.menu .active.item {
   color: var(--color-text);
   background: var(--color-active);
diff --git a/web_src/css/index.css b/web_src/css/index.css
index 125249ceab..21ae4c1b1f 100644
--- a/web_src/css/index.css
+++ b/web_src/css/index.css
@@ -7,6 +7,7 @@
 @import "./modules/breadcrumb.css";
 @import "./modules/card.css";
 @import "./modules/comment.css";
+@import "./modules/navbar.css";
 
 @import "./shared/issuelist.css";
 @import "./shared/milestone.css";
diff --git a/web_src/css/modules/navbar.css b/web_src/css/modules/navbar.css
new file mode 100644
index 0000000000..abc6afc690
--- /dev/null
+++ b/web_src/css/modules/navbar.css
@@ -0,0 +1,138 @@
+#navbar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background: var(--color-nav-bg);
+  border-bottom: 1px solid var(--color-secondary);
+  margin: 0 !important;
+  padding: 0 10px;
+}
+
+#navbar,
+#navbar .navbar-left,
+#navbar .navbar-right {
+  min-height: 49px; /* +1px border-bottom */
+}
+
+#navbar .navbar-left,
+#navbar .navbar-right {
+  margin: 0;
+  display: flex;
+  align-items: center;
+}
+
+#navbar-logo {
+  margin: 0;
+}
+
+#navbar .item {
+  min-height: 36px;
+  min-width: 36px;
+  padding-top: 3px;
+  padding-bottom: 3px;
+  display: flex;
+  justify-content: center;
+}
+
+#navbar a.item:hover,
+#navbar button.item:hover {
+  background: var(--color-nav-hover-bg);
+}
+
+#navbar .secondary.menu > .item > .svg,
+#navbar .right.menu > .item > .svg {
+  margin-right: 0;
+}
+
+@media (max-width: 767.98px) {
+  #navbar {
+    align-items: stretch;
+  }
+  /* hide all items */
+  #navbar .item {
+    display: none;
+  }
+  #navbar #navbar-logo {
+    display: flex;
+  }
+  /* show the first navbar item (logo and its mobile right items) */
+  #navbar .navbar-left {
+    flex: 1;
+    display: flex;
+    justify-content: space-between;
+  }
+  #navbar .navbar-mobile-right {
+    display: flex;
+    margin-left: auto !important;
+    width: auto !important;
+  }
+  #navbar .navbar-mobile-right > .item {
+    display: flex;
+    width: auto !important;
+  }
+  /* show items if the navbar is open */
+  #navbar.navbar-menu-open {
+    padding-bottom: 8px;
+  }
+  #navbar.navbar-menu-open,
+  #navbar.navbar-menu-open .navbar-right {
+    flex-direction: column;
+  }
+  #navbar.navbar-menu-open .navbar-left {
+    display: flex;
+    flex-wrap: wrap;
+  }
+  #navbar.navbar-menu-open .item {
+    display: flex;
+    width: 100%;
+  }
+  #navbar.navbar-menu-open .navbar-left #navbar-logo {
+    justify-content: flex-start;
+    width: 50%;
+    min-height: 48px;
+  }
+  #navbar.navbar-menu-open .navbar-left .navbar-mobile-right {
+    justify-content: flex-end;
+    width: 50%;
+    min-height: 48px;
+  }
+  #navbar.navbar-menu-open .mobile-right-item {
+    width: auto !important;
+  }
+}
+
+@media (min-width: 767.98px) {
+  #navbar .navbar-mobile-right,
+  #navbar .mobile-only {
+    display: none;
+  }
+}
+
+#navbar a.item .notification_count {
+  color: var(--color-nav-bg);
+  padding: 0 3.75px;
+  font-size: 12px;
+  line-height: 12px;
+  font-weight: var(--font-weight-bold);
+}
+
+#navbar a.item:hover .notification_count,
+#navbar a.item:hover .header-stopwatch-dot {
+  border-color: var(--color-nav-hover-bg);
+}
+
+#navbar a.item .notification_count,
+#navbar a.item .header-stopwatch-dot {
+  background: var(--color-primary);
+  border: 2px solid var(--color-nav-bg);
+  position: absolute;
+  left: 6px;
+  top: -9px;
+  min-width: 17px;
+  min-height: 17px;
+  border-radius: 17px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1; /* prevent menu button background from overlaying icon */
+}