diff --git a/src/wp-admin/css/dashboard.css b/src/wp-admin/css/dashboard.css
index 66505ec34e..1f42793ac1 100644
--- a/src/wp-admin/css/dashboard.css
+++ b/src/wp-admin/css/dashboard.css
@@ -354,7 +354,7 @@
 .community-events-errors [aria-hidden="true"],
 .community-events-loading[aria-hidden="true"],
 .community-events[aria-hidden="true"],
-.community-events [aria-hidden="true"] {
+.community-events form[aria-hidden="true"] {
 	display: none;
 }
 
diff --git a/src/wp-admin/includes/dashboard.php b/src/wp-admin/includes/dashboard.php
index 14d2837867..5d332921c0 100644
--- a/src/wp-admin/includes/dashboard.php
+++ b/src/wp-admin/includes/dashboard.php
@@ -1350,8 +1350,9 @@ function wp_print_community_events_markup() {
 			<p>
 				<span id="community-events-location-message"></span>
 
-				<button class="button-link community-events-toggle-location" aria-label="<?php esc_attr_e( 'Edit city' ); ?>" aria-expanded="false">
-					<span class="dashicons dashicons-edit"></span>
+				<button class="button-link community-events-toggle-location" aria-expanded="false">
+					<span class="dashicons dashicons-location" aria-hidden="true"></span>
+					<span class="community-events-location-edit"><?php _e( 'Select location' ); ?></span>
 				</button>
 			</p>