diff --git a/approot/templates.xml b/approot/templates.xml
index f2aa8a7b..a046161d 100644
--- a/approot/templates.xml
+++ b/approot/templates.xml
@@ -2,51 +2,59 @@
 <messages xmlns:if="Wt.WTemplate.conditions">
 
 <message id="Lms.template">
-	<nav class="navbar navbar-default">
+	<nav class="navbar navbar-expand-md navbar-light bg-light">
 		<div class="container">
-			<div class="navbar-header">
-				<button class="navbar-toggle" data-target=".navbar-collapse" data-toggle="collapse">
-					<span class="sr-only">Toggle navigation</span>
-					<span class="icon-bar"></span>
-					<span class="icon-bar"></span>
-					<span class="icon-bar"></span>
-				</button>
-				${title class="navbar-brand Lms-btn"}
-				<div class="Lms-navbar-search pull-left">
-					${search class="form-control"}
-				</div>
-			</div>
-			<div class="collapse navbar-collapse">
-				<ul class="nav navbar-nav">
-					<li>${releases class="Lms-btn"}</li>
-					<li>${artists class="Lms-btn"}</li>
-					<li>${tracks class="Lms-btn"}</li>
-					<li>${playqueue class="Lms-btn"}</li>
+			<form class="d-flex">
+				${search class="form-control me-2" type="search"}
+			</form>
+		    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+				<span class="navbar-toggler-icon"></span>
+			</button>
+			<div class="collapse navbar-collapse" id="navbarSupportedContent">
+				<ul class="navbar-nav me-auto mb-2 mb-lg-0">
+					<li class="nav-item">
+						${releases class="nav-link Lms-btn"}
+					</li>
+					<li class="nav-item">
+						${artists class="nav-link Lms-btn"}
+					</li>
+					<li class="nav-item">
+						${tracks class="nav-link Lms-btn"}
+					</li>
+					<li class="nav-item">
+						${tracks class="nav-link Lms-btn"}
+					</li>
+					<li class="nav-item">
+						${playqueue class="nav-link Lms-btn"}
+					</li>
+					<li class="nav-item">
+						${filters class="nav-link Lms-clusters-control"}
+					</li>
 				</ul>
-				<div class="navbar-form navbar-left">
-					${filters class="form-group Lms-clusters-control"}
-				</div>
-				<ul class="nav navbar-nav navbar-right">
-					${<if-is-admin>}
-					<li class="dropdown">
-						<a href="#" class="Lms-btn dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false" title="${tr:Lms.administration}"><i class="fa fa-cogs" aria-hidden="true"></i> <span class="caret"></span></a>
-						<ul class="dropdown-menu" role="menu">
-							<li>${database}</li>
-							<li>${users}</li>
+				<div class="navbar-nav me-auto mb-2 mb-lg-0">
+				${<if-is-admin>}
+					<li class="nav-item dropdown">
+						<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false" title="${tr:Lms.administration}">
+							<i class="fa fa-cogs" aria-hidden="true"></i>
+						</a>
+						<ul class="dropdown-menu" aria-labelledby="navbarDropdown">
+							<li>${database class="dropdown-item"}</li>
+							<li>${users class="dropdown-item"}</li>
 						</ul>
 					</li>
-					${</if-is-admin>}
-					<li class="dropdown">
-						<a href="#" class="Lms-btn dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false" title="${tr:Lms.user}"><i class="fa fa-user" aria-hidden="true"></i>
- <span class="caret"></span></a>
-						<ul class="dropdown-menu" role="menu">
+				${</if-is-admin>}
+					<li class="nav-item dropdown">
+						<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false" title="${tr:Lms.user}">
+							<i class="fa fa-user" aria-hidden="true"></i>
+						</a>
+						<ul class="dropdown-menu" aria-labelledby="navbarDropdown">
 							<li class="dropdown-header">${username}</li>
 							<li class="divider"></li>
-							<li>${settings}</li>
-							<li>${logout}</li>
+							<li>${settings class="dropdown-item"}</li>
+							<li>${logout class="dropdown-item"}</li>
 						</ul>
 					</li>
-				</ul>
+				</div>
 			</div>
 		</div>
 	</nav>