diff --git a/src/views/admin/dashboard/logins.tpl b/src/views/admin/dashboard/logins.tpl
index ae9695ce63..5f135991f6 100644
--- a/src/views/admin/dashboard/logins.tpl
+++ b/src/views/admin/dashboard/logins.tpl
@@ -1,6 +1,6 @@
 <div class="row dashboard">
 	<div class="col-12">
-		<a class="btn btn-link" href="{config.relative_path}/admin/dashboard">
+		<a class="btn btn-primary mb-3" href="{config.relative_path}/admin/dashboard">
 			<i class="fa fa-chevron-left"></i>
 			[[admin/dashboard:back-to-dashboard]]
 		</a>
diff --git a/src/views/admin/dashboard/searches.tpl b/src/views/admin/dashboard/searches.tpl
index 44a736d207..fe114121d7 100644
--- a/src/views/admin/dashboard/searches.tpl
+++ b/src/views/admin/dashboard/searches.tpl
@@ -1,11 +1,10 @@
 <div class="row dashboard">
 	<div class="col-12">
-		<a class="btn btn-link" href="{config.relative_path}/admin/dashboard">
+		<a class="btn btn-primary mb-3" href="{config.relative_path}/admin/dashboard">
 			<i class="fa fa-chevron-left"></i>
 			[[admin/dashboard:back-to-dashboard]]
 		</a>
 
-
 		<table class="table table-striped search-list">
 			<tbody>
 				{{{ if !searches.length}}}
diff --git a/src/views/admin/dashboard/topics.tpl b/src/views/admin/dashboard/topics.tpl
index ad47c9615d..43ff763b21 100644
--- a/src/views/admin/dashboard/topics.tpl
+++ b/src/views/admin/dashboard/topics.tpl
@@ -1,6 +1,6 @@
 <div class="row dashboard">
 	<div class="col-12">
-		<a class="btn btn-link" href="{config.relative_path}/admin/dashboard">
+		<a class="btn btn-primary mb-3" href="{config.relative_path}/admin/dashboard">
 			<i class="fa fa-chevron-left"></i>
 			[[admin/dashboard:back-to-dashboard]]
 		</a>
diff --git a/src/views/admin/dashboard/users.tpl b/src/views/admin/dashboard/users.tpl
index 9ca93c9bac..2cb3cac6a8 100644
--- a/src/views/admin/dashboard/users.tpl
+++ b/src/views/admin/dashboard/users.tpl
@@ -1,6 +1,6 @@
 <div class="dashboard">
 	<div class="col-12">
-		<a class="btn btn-link" href="{config.relative_path}/admin/dashboard">
+		<a class="btn btn-primary mb-3" href="{config.relative_path}/admin/dashboard">
 			<i class="fa fa-chevron-left"></i>
 			[[admin/dashboard:back-to-dashboard]]
 		</a>
diff --git a/src/views/admin/manage/category-analytics.tpl b/src/views/admin/manage/category-analytics.tpl
index a582a3599e..523e79cdfc 100644
--- a/src/views/admin/manage/category-analytics.tpl
+++ b/src/views/admin/manage/category-analytics.tpl
@@ -1,55 +1,55 @@
-<a class="btn btn-primary" href="{config.relative_path}/admin/manage/categories">
+<a class="btn btn-primary mb-3" href="{config.relative_path}/admin/manage/categories">
 	<i class="fa fa-fw fa-chevron-left"></i> [[admin/manage/categories:analytics.back]]
 </a>
 
-<h3>[[admin/manage/categories:analytics.title, {name}]]</h3>
+<h5>[[admin/manage/categories:analytics.title, {name}]]</h5>
 <hr />
 
 <div class="row">
 	<div class="col-sm-6 text-center">
-		<div class="panel panel-default">
-			<div class="panel-body">
+		<div class="card">
+			<div class="card-body">
 				<div><canvas id="pageviews:hourly" height="250"></canvas></div>
 				<p>
-					
+
 				</p>
 			</div>
-			<div class="panel-footer"><small>[[admin/manage/categories:analytics.pageviews-hourly]]</div>
+			<div class="card-footer"><small>[[admin/manage/categories:analytics.pageviews-hourly]]</div>
 		</div>
 	</div>
 	<div class="col-sm-6 text-center">
-		<div class="panel panel-default">
-			<div class="panel-body">
+		<div class="card">
+			<div class="card-body">
 				<div><canvas id="pageviews:daily" height="250"></canvas></div>
 				<p>
-					
+
 				</p>
 			</div>
-			<div class="panel-footer"><small>[[admin/manage/categories:analytics.pageviews-daily]]</div>
+			<div class="card-footer"><small>[[admin/manage/categories:analytics.pageviews-daily]]</div>
 		</div>
 	</div>
 </div>
 <div class="row">
 	<div class="col-sm-6 text-center">
-		<div class="panel panel-default">
-			<div class="panel-body">
+		<div class="card">
+			<div class="card-body">
 				<div><canvas id="topics:daily" height="250"></canvas></div>
 				<p>
-					
+
 				</p>
 			</div>
-			<div class="panel-footer"><small>[[admin/manage/categories:analytics.topics-daily]]</div>
+			<div class="card-footer"><small>[[admin/manage/categories:analytics.topics-daily]]</div>
 		</div>
 	</div>
 	<div class="col-sm-6 text-center">
-		<div class="panel panel-default">
-			<div class="panel-body">
+		<div class="card">
+			<div class="card-body">
 				<div><canvas id="posts:daily" height="250"></canvas></div>
 				<p>
-					
+
 				</p>
 			</div>
-			<div class="panel-footer"><small>[[admin/manage/categories:analytics.posts-daily]]</div>
+			<div class="card-footer"><small>[[admin/manage/categories:analytics.posts-daily]]</div>
 		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/src/views/modals/move-post.tpl b/src/views/modals/move-post.tpl
index a82eebd1c5..e5c25c51f2 100644
--- a/src/views/modals/move-post.tpl
+++ b/src/views/modals/move-post.tpl
@@ -1,8 +1,8 @@
-<div class="panel panel-primary tool-modal">
-	<div class="panel-heading">
-		<h3 class="panel-title">[[topic:thread_tools.move-posts]]</h3>
-	</div>
-	<div class="panel-body">
+<div class="card tool-modal">
+	<h5 class="card-header text-bg-primary">
+		[[topic:thread_tools.move-posts]]
+	</h5>
+	<div class="card-body">
 		<div>
 			<label for="topicId">[[topic:topic-id]]</label>
 			<input id="topicId" type="text" class="form-control"><br/>
@@ -14,7 +14,7 @@
             [[topic:move_posts_instruction]]
         </p>
 	</div>
-	<div class="panel-footer text-right">
+	<div class="card-footer text-end">
 		<div class="btn-group">
 			<button class="btn btn-link btn-sm" id="move_posts_cancel">[[global:buttons.close]]</button>
 			<button class="btn btn-primary btn-sm" id="move_posts_confirm" disabled>[[topic:move]]</button>