diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
index ce944cb039..0298dbdcb8 100644
--- a/src/wp-admin/css/common.css
+++ b/src/wp-admin/css/common.css
@@ -1188,11 +1188,19 @@ th.action-links {
 
 .filter-drawer .filter-group-feature input,
 .filter-drawer .filter-group-feature label {
-	display: inline-block;
-	margin: 7px 4px 7px 0;
 	line-height: 16px;
 }
 
+.filter-drawer .filter-group-feature input {
+	position: absolute;
+	margin: 0;
+}
+
+.filter-group .filter-group-feature label {
+	display: block;
+	margin: 14px 0px 14px 23px;
+}
+
 .filter-drawer .buttons {
 	clear: both;
 	margin-bottom: 20px;
@@ -3889,6 +3897,10 @@ img {
 		line-height: 25px;
 	}
 
+	.filter-drawer .filter-group-feature label {
+		margin-left: 32px;
+	}
+
 	.wp-filter .button.drawer-toggle {
 		font-size: 13px;
 		line-height: 26px;
diff --git a/src/wp-admin/theme-install.php b/src/wp-admin/theme-install.php
index 975735cc51..03aea10e6a 100644
--- a/src/wp-admin/theme-install.php
+++ b/src/wp-admin/theme-install.php
@@ -214,7 +214,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 			foreach ( $features as $feature => $feature_name ) {
 				$feature = esc_attr( $feature );
 				echo '<input type="checkbox" id="filter-id-' . $feature . '" value="' . $feature . '" /> ';
-				echo '<label for="filter-id-' . $feature . '">' . $feature_name . '</label><br>';
+				echo '<label for="filter-id-' . $feature . '">' . $feature_name . '</label>';
 			}
 			echo '</div>';
 			echo '</fieldset>';
diff --git a/src/wp-includes/customize/class-wp-customize-themes-section.php b/src/wp-includes/customize/class-wp-customize-themes-section.php
index eff894f8f4..1af0b1a1a2 100644
--- a/src/wp-includes/customize/class-wp-customize-themes-section.php
+++ b/src/wp-includes/customize/class-wp-customize-themes-section.php
@@ -164,7 +164,7 @@ class WP_Customize_Themes_Section extends WP_Customize_Section {
 						<div class="filter-group-feature">
 							<?php foreach ( $features as $feature => $feature_name ) : ?>
 								<input type="checkbox" id="filter-id-<?php echo esc_attr( $feature ); ?>" value="<?php echo esc_attr( $feature ); ?>" />
-								<label for="filter-id-<?php echo esc_attr( $feature ); ?>"><?php echo esc_html( $feature_name ); ?></label><br>
+								<label for="filter-id-<?php echo esc_attr( $feature ); ?>"><?php echo esc_html( $feature_name ); ?></label>
 							<?php endforeach; ?>
 						</div>
 					</fieldset>