Index: src/bp-core/admin/bp-core-admin-tools.php
===================================================================
--- src/bp-core/admin/bp-core-admin-tools.php	(revision 11001)
+++ src/bp-core/admin/bp-core-admin-tools.php	(working copy)
@@ -21,42 +21,34 @@
 
 		<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' ); ?>
-			<?php esc_html_e( 'Use the tools below to manually recalculate these relationships.', 'buddypress' ); ?>
+		<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>
 
 		<form class="settings" method="post" action="">
-			<table class="form-table">
-				<tbody>
-					<tr valign="top">
-						<th scope="row"><?php esc_html_e( 'Repair tools', 'buddypress' ) ?></th>
-						<td>
-							<fieldset>
-								<legend class="screen-reader-text"><span><?php
-									/* translators: accessibility text */
-									esc_html_e( 'Repair', 'buddypress' );
-								?></span></legend>
 
-								<?php foreach ( bp_admin_repair_list() as $item ) : ?>
+			<fieldset>
+				<legend><?php esc_html_e( 'Repair tools', 'buddypress' ) ?></legend>
 
-									<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><br />
+				<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>
+				<?php endforeach; ?>
+				</div>
 
-								<?php endforeach; ?>
+				<p class="submit">
+					<input class="button-primary" type="submit" name="bp-tools-submit" value="<?php esc_attr_e( 'Repair Items', 'buddypress' ); ?>" />
+					<?php wp_nonce_field( 'bp-do-counts' ); ?>
+				</p>
 
-							</fieldset>
-						</td>
-					</tr>
-				</tbody>
-			</table>
+			</fieldset>
 
-			<fieldset class="submit">
-				<input class="button-primary" type="submit" name="bp-tools-submit" value="<?php esc_attr_e( 'Repair Items', 'buddypress' ); ?>" />
-				<?php wp_nonce_field( 'bp-do-counts' ); ?>
-			</fieldset>
 		</form>
+
 	</div>
+
 	<?php
 }
 
Index: src/bp-core/admin/css/common-rtl.css
===================================================================
--- src/bp-core/admin/css/common-rtl.css	(revision 11001)
+++ src/bp-core/admin/css/common-rtl.css	(working copy)
@@ -20,6 +20,7 @@
 	2.3 Tools
 3.0 User's Lists
 4.0 Emails - Edit page
+5.0 Tools - BuddyPress
 ------------------------------------------------------------------------------*/
 
 /*------------------------------------------------------------------------------
@@ -491,3 +492,36 @@
 	padding-right: 25px;
 	text-indent: -25px;
 }
+
+/*------------------------------------------------------------------------------
+ * 5.0 Tools - BuddyPress
+ *----------------------------------------------------------------------------*/
+.tools_page_bp-tools fieldset {
+	margin: 2em 0 0;
+}
+
+.tools_page_bp-tools legend {
+	color: #23282d;
+	font-size: 1.3em;
+	font-weight: 600px;
+	margin: 1em 0;
+}
+
+.tools_page_bp-tools label {
+	clear: right;
+	display: block;
+	line-height: 1.5em;
+	margin: 0 0 1em;
+	vertical-align: middle;
+}
+
+@media screen and (max-width: 782px) {
+	.tools_page_bp-tools label {
+		margin-bottom: 1em;
+		padding-left: 25px;
+		text-indent: -33px;
+	}
+	.tools_page_bp-tools .checkbox {
+		padding: 0 30px 0 0;
+	}
+}
Index: src/bp-core/admin/css/common.css
===================================================================
--- src/bp-core/admin/css/common.css	(revision 11001)
+++ src/bp-core/admin/css/common.css	(working copy)
@@ -20,6 +20,7 @@
 	2.3 Tools
 3.0 User's Lists
 4.0 Emails - Edit page
+5.0 Tools - BuddyPress
 ------------------------------------------------------------------------------*/
 
 /*------------------------------------------------------------------------------
@@ -491,3 +492,36 @@
 	padding-left: 25px;
 	text-indent: -25px;
 }
+
+/*------------------------------------------------------------------------------
+ * 5.0 Tools - BuddyPress
+ *----------------------------------------------------------------------------*/
+.tools_page_bp-tools fieldset {
+	margin: 2em 0 0;
+}
+
+.tools_page_bp-tools legend {
+	color: #23282d;
+	font-size: 1.3em;
+	font-weight: 600px;
+	margin: 1em 0;
+}
+
+.tools_page_bp-tools label {
+	clear: left;
+	display: block;
+	line-height: 1.5em;
+	margin: 0 0 1em;
+	vertical-align: middle;
+}
+
+@media screen and (max-width: 782px) {
+	.tools_page_bp-tools label {
+		margin-bottom: 1em;
+		padding-right: 25px;
+		text-indent: -33px;
+	}
+	.tools_page_bp-tools .checkbox {
+		padding: 0 0 0 30px;
+	}
+}