diff --git a/CTFd/themes/admin/templates/challenges/challenges.html b/CTFd/themes/admin/templates/challenges/challenges.html
index baf6df3b..8ce7e8d4 100644
--- a/CTFd/themes/admin/templates/challenges/challenges.html
+++ b/CTFd/themes/admin/templates/challenges/challenges.html
@@ -22,6 +22,9 @@
 		<div class="col-md-12">
 			<div class="float-right pb-3">
 				<div class="btn-group" role="group">
+					<button type="button" class="btn btn-outline-secondary" data-toggle="tooltip" title="Hide/Show Challenges">
+						<i class="btn-fa fas fa-eye"></i>
+					</button>
 					<button type="button" class="btn btn-outline-danger">
 						<i class="btn-fa fas fa-trash-alt"></i>
 					</button>
diff --git a/CTFd/themes/admin/templates/scoreboard.html b/CTFd/themes/admin/templates/scoreboard.html
index 80fb24d8..bea64d2e 100644
--- a/CTFd/themes/admin/templates/scoreboard.html
+++ b/CTFd/themes/admin/templates/scoreboard.html
@@ -11,10 +11,7 @@
 		<div class="col-md-12">
 			<div class="float-right pb-3">
 				<div class="btn-group" role="group">
-					<button type="button" class="btn btn-outline-danger" id="scoreboard-hide-button" data-toggle="tooltip" title="Hide Accounts">
-						<i class="btn-fa fas fa-eye-slash"></i>
-					</button>
-					<button type="button" class="btn btn-outline-success" id="scoreboard-show-button" data-toggle="tooltip" title="Unhide Accounts">
+					<button type="button" class="btn btn-outline-secondary" id="scoreboard-show-button" data-toggle="tooltip" title="Hide/Unhide Accounts">
 						<i class="btn-fa fas fa-eye"></i>
 					</button>
 				</div>
diff --git a/CTFd/themes/admin/templates/teams/teams.html b/CTFd/themes/admin/templates/teams/teams.html
index 6fc5d022..37a8116f 100644
--- a/CTFd/themes/admin/templates/teams/teams.html
+++ b/CTFd/themes/admin/templates/teams/teams.html
@@ -51,9 +51,17 @@
 		<div class="col-md-12">
 			<div class="float-right pb-3">
 				<div class="btn-group" role="group">
-					<button type="button" class="btn btn-outline-danger">
-						<i class="btn-fa fas fa-trash-alt"></i>
-					</button>
+					<div class="btn-group" role="group">
+						<button type="button" class="btn btn-outline-secondary" data-toggle="tooltip" title="Ban/Unban Teams">
+							<i class="btn-fa fas fa-ban"></i>
+						</button>
+						<button type="button" class="btn btn-outline-secondary" data-toggle="tooltip" title="Hide/Show Teams">
+							<i class="btn-fa fas fa-eye"></i>
+						</button>
+						<button type="button" class="btn btn-outline-danger" data-toggle="tooltip" title="Delete Teams">
+							<i class="btn-fa fas fa-trash-alt"></i>
+						</button>
+					</div>
 				</div>
 			</div>
 		</div>
diff --git a/CTFd/themes/admin/templates/users/users.html b/CTFd/themes/admin/templates/users/users.html
index ac96e6ef..c28322ca 100644
--- a/CTFd/themes/admin/templates/users/users.html
+++ b/CTFd/themes/admin/templates/users/users.html
@@ -53,7 +53,13 @@
 		<div class="col-md-12">
 			<div class="float-right pb-3">
 				<div class="btn-group" role="group">
-					<button type="button" class="btn btn-outline-danger">
+					<button type="button" class="btn btn-outline-secondary" data-toggle="tooltip" title="Ban/Unban Users">
+						<i class="btn-fa fas fa-ban"></i>
+					</button>
+					<button type="button" class="btn btn-outline-secondary" data-toggle="tooltip" title="Hide/Show Users">
+						<i class="btn-fa fas fa-eye"></i>
+					</button>
+					<button type="button" class="btn btn-outline-danger" data-toggle="tooltip" title="Delete Users">
 						<i class="btn-fa fas fa-trash-alt"></i>
 					</button>
 				</div>