diff --git src/bp-core/admin/bp-core-admin-tools.php src/bp-core/admin/bp-core-admin-tools.php
index aa9f4c645..c05eecc81 100644
--- src/bp-core/admin/bp-core-admin-tools.php
+++ src/bp-core/admin/bp-core-admin-tools.php
@@ -21,21 +21,28 @@ function bp_core_admin_tools() {
 
 		<h1><?php esc_html_e( 'BuddyPress Tools', 'buddypress' ) ?></h1>
 
-		<p><?php esc_html_e( 'BuddyPress keeps track of various relationships between members, groups, and activity items. Occasionally these relationships become out of sync, most often after an import, update, or migration.', 'buddypress' ); ?></p>
+		<hr class="wp-header-end" />
+
+		<p><?php esc_html_e( 'BuddyPress keeps track of various relationships between members, groups, and activity items.', 'buddypress' ); ?></p>
+		<p><?php esc_html_e( 'Occasionally these relationships become out of sync, most often after an import, update, or migration.', 'buddypress' ); ?></p>
 		<p><?php esc_html_e( 'Use the tools below to manually recalculate these relationships.', 'buddypress' ); ?>
 		</p>
-		<p class="description"><?php esc_html_e( 'Some of these tools create substantial database overhead. Avoid running more than one repair job at a time.', 'buddypress' ); ?></p>
+		<p class="attention"><?php esc_html_e( 'Some of these tools create substantial database overhead. Avoid running more than one repair job at a time.', 'buddypress' ); ?></p>
+
+		<h2><?php esc_html_e( 'Activate checkboxe(s) to select the operation(s) to perform', 'buddypress' ); ?></h2>
 
 		<form class="settings" method="post" action="">
 
 			<fieldset>
-				<legend><?php esc_html_e( 'Repair tools', 'buddypress' ) ?></legend>
+				<legend class="screen-reader-text"><?php esc_html_e( 'Repair tools', 'buddypress' ); ?></legend>
 
-				<div class="checkbox">
 				<?php foreach ( bp_admin_repair_list() as $item ) : ?>
-					<label for="<?php echo esc_attr( str_replace( '_', '-', $item[0] ) ); ?>"><input type="checkbox" class="checkbox" name="<?php echo esc_attr( $item[0] ) . '" id="' . esc_attr( str_replace( '_', '-', $item[0] ) ); ?>" value="1" /> <?php echo esc_html( $item[1] ); ?></label>
+					<p>
+						<label for="<?php echo esc_attr( str_replace( '_', '-', $item[0] ) ); ?>">
+							<input type="checkbox" class="checkbox" name="<?php echo esc_attr( $item[0] ) . '" id="' . esc_attr( str_replace( '_', '-', $item[0] ) ); ?>" value="1" /> <?php echo esc_html( $item[1] ); ?>
+						</label>
+					</p>
 				<?php endforeach; ?>
-				</div>
 
 				<p class="submit">
 					<input class="button-primary" type="submit" name="bp-tools-submit" value="<?php esc_attr_e( 'Repair Items', 'buddypress' ); ?>" />
diff --git src/bp-core/admin/css/common.css src/bp-core/admin/css/common.css
index c5f7aa6fb..c0af4884c 100644
--- src/bp-core/admin/css/common.css
+++ src/bp-core/admin/css/common.css
@@ -21,8 +21,7 @@ TABLE OF CONTENTS:
 	3.1 Users List
 	3.2 Site Notices
 4.0 Emails - Edit page
-5.0 Tools - BuddyPress
-6.0 Plugins page
+5.0 Plugins page
 ------------------------------------------------------------------------------*/
 
 /*------------------------------------------------------------------------------
@@ -523,55 +522,7 @@ body.post-type-bp-email .categorydiv label {
 }
 
 /*------------------------------------------------------------------------------
- * 5.0 Tools - BuddyPress
- *----------------------------------------------------------------------------*/
-.tools_page_bp-tools .wrap {
-	max-width: 950px;
-}
-
-.tools_page_bp-tools p {
-	line-height: 2;
-}
-
-.tools_page_bp-tools fieldset {
-	margin: 2em 0 0;
-}
-
-.tools_page_bp-tools legend {
-	color: #23282d;
-	font-size: 1.3em;
-	font-weight: 600;
-	margin: 1em 0;
-}
-
-.tools_page_bp-tools label {
-	clear: left;
-	display: block;
-	line-height: 1.5;
-	margin: 0 0 1em;
-	vertical-align: middle;
-}
-
-@media screen and (max-width: 782px) {
-
-	.tools_page_bp-tools p {
-		line-height: 1.5;
-	}
-
-	.tools_page_bp-tools label {
-		margin-bottom: 1em;
-		padding-right: 25px;
-		text-indent: -33px;
-	}
-
-	.tools_page_bp-tools .checkbox {
-		padding: 0 0 0 30px;
-	}
-}
-
-
-/*------------------------------------------------------------------------------
- * 6.0 Plugins page
+ * 5.0 Plugins page
  *----------------------------------------------------------------------------*/
 #buddypress-update.not-shiny .update-message {
 	border-left: 0;