diff --git a/foundation/templates/includes/navbar/navbar.html b/foundation/templates/includes/navbar/navbar.html
index 48d266a7..fdce3488 100644
--- a/foundation/templates/includes/navbar/navbar.html
+++ b/foundation/templates/includes/navbar/navbar.html
@@ -1,12 +1,11 @@
-<nav class="navbar navbar-expand-lg border-bottom" role="navigation">
-	<a class="navbar-brand ellipsis"
-		href="{{ url_prefix }}{{ home_page or "/"}}">
+<nav class="navbar navbar-expand-lg border-bottom navbar-light" role="navigation">
+	<a class="navbar-brand" href="{{ url_prefix }}{{ home_page or "/"}}">
 		<span>{{ brand_html or (frappe.get_hooks("brand_html") or ["Home"])[0] }}</span>
 	</a>
 	<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
 		<span class="navbar-toggler-icon"></span>
 	</button>
-	<div class="collapse navbar-collapse" id="navbarSupportedContent">
+	<div class="collapse navbar-collapse" id="navbarNavDropdown">
 		{% include "templates/includes/navbar/navbar_items.html" %}
 	</div>
 </nav>
diff --git a/foundation/templates/includes/navbar/navbar_link.html b/foundation/templates/includes/navbar/navbar_link.html
index 92510bef..ff6e880a 100644
--- a/foundation/templates/includes/navbar/navbar_link.html
+++ b/foundation/templates/includes/navbar/navbar_link.html
@@ -1,6 +1,6 @@
 <li class="nav-item {% if page.child_items %} dropdown {% endif %}" data-label='{{ page.label }}'>
 	<a {% if not page.child_items -%} class="nav-link" href="{{ (page.url or '')|abs_url }}" {%- endif %}
-		{% if page.child_items %} class="nav-link dropdown-toggle" data-toggle="dropdown" id="navbarDropdown" role="button" aria-haspopup="true" aria-expanded="false" {% endif %}
+		{% if page.child_items %} class="nav-link dropdown-toggle" data-toggle="dropdown" id="navbarDropdownMenuLink" role="button" aria-haspopup="true" aria-expanded="false" {% endif %}
 		{{ page.target or ''}}>
 	{{ page.label }}
 	</a>
diff --git a/foundation/templates/includes/navbar/navbar_login.html b/foundation/templates/includes/navbar/navbar_login.html
index b012889a..363ea894 100644
--- a/foundation/templates/includes/navbar/navbar_login.html
+++ b/foundation/templates/includes/navbar/navbar_login.html
@@ -10,13 +10,13 @@
 	<div class="dropdown-menu" role="menu">
 		{%- for child in post_login -%}
 			{%- if child.url -%}
-				<a href="{{ child.url | abs_url }}" {{ child.target or '' }}
+				<a class="dropdown-item" href="{{ child.url | abs_url }}" {{ child.target or '' }}
 					rel="nofollow">
 					{{ child.label }}
 				</a>
 			{%- endif -%}
 		{%- endfor -%}
-		<a href="/desk">{{ _('Switch To Desk') }}</a>
+		<a class="dropdown-item" href="/desk">{{ _('Switch To Desk') }}</a>
 	</div>
 </li>
 {% if not hide_login %}