diff --git a/public/scss/admin/header.scss b/public/scss/admin/header.scss
index b0cbae638b..16c7e168b3 100644
--- a/public/scss/admin/header.scss
+++ b/public/scss/admin/header.scss
@@ -23,10 +23,6 @@
 		flex-direction: row-reverse;
 		margin: 0;
 
-		li {
-			align-self: end;
-		}
-
 		> * {
 			margin-right: 20px;
 		}
@@ -75,6 +71,7 @@
 			padding: 10px 20px;
 			width: 250px;
 			height: 44px;
+			background-color: rgba(0,0,0,.2);
 			border-radius: 3px;
 			box-shadow: none;
 			transition: .4s ease background-color;
@@ -96,14 +93,14 @@
 				pointer-events: none;
 
 				position: absolute;
-				top: 10px;
+				top: 13px;
 				left: 1em;
 			}
 
 			&:after {
 				content: attr(data-text);
 				position: absolute;
-				top: 10px;
+				top: 13px;
 				left: 3em;
 				font-size: small;
 				font-weight: 600;
diff --git a/public/src/admin/dashboard.js b/public/src/admin/dashboard.js
index 43897e8c14..3e3af63ff0 100644
--- a/public/src/admin/dashboard.js
+++ b/public/src/admin/dashboard.js
@@ -43,7 +43,7 @@ define('admin/dashboard', [
 
 		isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
 
-		$('[data-toggle="tooltip"]').tooltip();
+		$('[data-bs-toggle="tooltip"]').tooltip();
 
 		setupRealtimeButton();
 		setupGraphs(function () {
diff --git a/public/src/client/post-queue.js b/public/src/client/post-queue.js
index c33fa0486a..5c75743912 100644
--- a/public/src/client/post-queue.js
+++ b/public/src/client/post-queue.js
@@ -7,7 +7,7 @@ define('forum/post-queue', [
 	const PostQueue = {};
 
 	PostQueue.init = function () {
-		$('[data-toggle="tooltip"]').tooltip();
+		$('[data-bs-toggle="tooltip"]').tooltip();
 
 		categoryFilter.init($('[component="category/dropdown"]'), {
 			privilege: 'moderate',
diff --git a/src/views/admin/dashboard.tpl b/src/views/admin/dashboard.tpl
index 731c07a9c3..d353849c73 100644
--- a/src/views/admin/dashboard.tpl
+++ b/src/views/admin/dashboard.tpl
@@ -87,7 +87,7 @@
 					<!-- END -->
 				</p>
 				<p>
-					<a href="{config.relative_path}/admin/settings/advanced" class="btn btn-info btn-block" data-placement="bottom" data-toggle="tooltip" title="[[admin/dashboard:maintenance-mode-title]]">[[admin/dashboard:maintenance-mode]]</a>
+					<a href="{config.relative_path}/admin/settings/advanced" class="btn btn-info btn-block" data-bs-placement="bottom" data-bs-toggle="tooltip" title="[[admin/dashboard:maintenance-mode-title]]">[[admin/dashboard:maintenance-mode]]</a>
 				</p>
 
 				<hr />
@@ -142,7 +142,7 @@
 					<!-- IF notices.done -->
 					<i class="fa fa-fw fa-check text-success"></i> {notices.doneText}
 					<!-- ELSE -->
-					<!-- IF notices.link --><a href="{config.relative_path}{notices.link}" data-toggle="tooltip" title="{notices.tooltip}"><!-- ENDIF notices.link -->
+					<!-- IF notices.link --><a href="{config.relative_path}{notices.link}" data-bs-toggle="tooltip" title="{notices.tooltip}"><!-- ENDIF notices.link -->
 					<i class="fa fa-fw fa-times text-danger"></i> {notices.notDoneText}
 					<!-- IF notices.link --></a><!-- ENDIF notices.link -->
 					<!-- ENDIF notices.done -->
diff --git a/src/views/admin/partials/menu.tpl b/src/views/admin/partials/menu.tpl
index c5f0202aca..8ff881ffec 100644
--- a/src/views/admin/partials/menu.tpl
+++ b/src/views/admin/partials/menu.tpl
@@ -124,7 +124,7 @@
 
 <main id="panel">
 	<nav class="header" id="header">
-		<div class="pull-left">
+		<div class="float-start">
 			<div id="mobile-menu">
 				<div class="bar"></div>
 				<div class="bar"></div>
@@ -133,7 +133,7 @@
 			<h1 id="main-page-title"></h1>
 		</div>
 
-		<ul class="quick-actions hidden-xs hidden-sm">
+		<ul class="quick-actions hidden-xs hidden-sm hidden-md align-items-center">
 			<!-- IMPORT admin/partials/quick_actions/buttons.tpl -->
 
 			{{{ if user.privileges.admin:settings }}}