diff --git a/src/wp-includes/admin-bar.php b/src/wp-includes/admin-bar.php
index 5d6d6fe98c..d36487ee56 100644
--- a/src/wp-includes/admin-bar.php
+++ b/src/wp-includes/admin-bar.php
@@ -582,7 +582,15 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
switch_to_blog( $blog->userblog_id );
- $blavatar = '
';
+ if ( has_site_icon() ) {
+ $blavatar = sprintf(
+ '
',
+ esc_url( get_site_icon_url( 16 ) ),
+ esc_url( get_site_icon_url( 32 ) )
+ );
+ } else {
+ $blavatar = '';
+ }
$blogname = $blog->blogname;
diff --git a/src/wp-includes/css/admin-bar.css b/src/wp-includes/css/admin-bar.css
index 3cc47cb0fc..3a77e2991d 100644
--- a/src/wp-includes/css/admin-bar.css
+++ b/src/wp-includes/css/admin-bar.css
@@ -517,14 +517,18 @@ html:lang(he-il) .rtl #wpadminbar * {
color: #72aee6;
}
-#wpadminbar .quicklinks li .blavatar:before {
- content: "\f120";
+#wpadminbar .quicklinks li img.blavatar,
+#wpadminbar .quicklinks li div.blavatar:before {
height: 16px;
width: 16px;
- display: inline-block;
margin: 0 8px 2px -2px;
}
+#wpadminbar .quicklinks li div.blavatar:before {
+ content: "\f120";
+ display: inline-block;
+}
+
#wpadminbar #wp-admin-bar-appearance {
margin-top: -12px;
}