diff --git a/src/wp-admin/install.php b/src/wp-admin/install.php
index e6152500a8..1a872970e1 100644
--- a/src/wp-admin/install.php
+++ b/src/wp-admin/install.php
@@ -141,7 +141,7 @@ function display_setup_form( $error = null ) {
 					<?php $initial_password = wp_generate_password( 24 ); ?>
 					<input type="password" name="admin_password" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" aria-describedby="pass-strength-result" />
 					<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
-						<span class="dashicons dashicons-visibility"></span>
+						<span class="dashicons dashicons-hidden"></span>
 						<span class="text"><?php _e( 'Hide' ); ?></span>
 					</button>
 					<div id="pass-strength-result" aria-live="polite"></div>
diff --git a/src/wp-admin/js/user-profile.js b/src/wp-admin/js/user-profile.js
index 771981c190..0909443287 100644
--- a/src/wp-admin/js/user-profile.js
+++ b/src/wp-admin/js/user-profile.js
@@ -143,8 +143,8 @@
 			if ( show == 1 ) {
 				pwWrapper.addClass( 'show-password' );
 				pw_togglebtn.attr({ 'data-toggle': 0, 'aria-label': userProfileL10n.ariaHide })
-					.find( '.text' ).text( userProfileL10n.hide )
-				;
+					.find( '.text' ).text( userProfileL10n.hide );
+				pw_togglebtn.find( '.dashicons' ).removeClass('dashicons-visibility').addClass('dashicons-hidden');
 				pwFieldText.focus();
 				if ( ! _.isUndefined( pwFieldText[0].setSelectionRange ) ) {
 					pwFieldText[0].setSelectionRange( 0, 100 );
@@ -153,6 +153,7 @@
 				pwWrapper.removeClass( 'show-password' );
 				pw_togglebtn.attr({ 'data-toggle': 1, 'aria-label': userProfileL10n.ariaShow })
 					.find( '.text' ).text( userProfileL10n.show );
+				pw_togglebtn.find( '.dashicons' ).removeClass('dashicons-hidden').addClass('dashicons-visibility');
 				pw_field.focus();
 				if ( ! _.isUndefined( pw_field[0].setSelectionRange ) ) {
 					pw_field[0].setSelectionRange( 0, 100 );
diff --git a/src/wp-admin/user-edit.php b/src/wp-admin/user-edit.php
index f0982f78c9..c60d4b6a8e 100644
--- a/src/wp-admin/user-edit.php
+++ b/src/wp-admin/user-edit.php
@@ -470,7 +470,7 @@ if ( $show_password_fields ) :
 		<div class="wp-pwd hide-if-js">
 			<input type="password" name="pass1" id="pass1" class="regular-text" value="" autocomplete="off" data-pw="<?php echo esc_attr( wp_generate_password( 24 ) ); ?>" aria-describedby="pass-strength-result" />
 			<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
-				<span class="dashicons dashicons-visibility"></span>
+				<span class="dashicons dashicons-hidden"></span>
 				<span class="text"><?php _e( 'Hide' ); ?></span>
 			</button>
 			<button type="button" class="button button-secondary wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Cancel password change' ); ?>">
diff --git a/src/wp-admin/user-new.php b/src/wp-admin/user-new.php
index fd3efdbee8..60b5c3b001 100644
--- a/src/wp-admin/user-new.php
+++ b/src/wp-admin/user-new.php
@@ -404,7 +404,7 @@ if ( apply_filters( 'show_password_fields', true ) ) : ?>
 				<?php $initial_password = wp_generate_password( 24 ); ?>
 				<input type="password" name="pass1" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" aria-describedby="pass-strength-result" />
 				<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
-					<span class="dashicons dashicons-visibility"></span>
+					<span class="dashicons dashicons-hidden"></span>
 					<span class="text"><?php _e( 'Hide' ); ?></span>
 				</button>
 				<button type="button" class="button button-secondary wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Cancel password change' ); ?>">