Index: src/wp-admin/css/common.css
===================================================================
--- src/wp-admin/css/common.css	(revision 33160)
+++ src/wp-admin/css/common.css	(working copy)
@@ -3038,10 +3038,39 @@
 }
 
 /* My Sites */
+.my-sites.striped > :nth-child(odd){
+	background: #fff;
+}
+
 .my-sites {
 	display: block;
 	overflow: auto;
 	zoom: 1;
+
+	display:-webkit-box;
+	display:-webkit-flex;
+	display:-ms-flexbox;
+	display:flex;
+	-webkit-box-orient: horizontal;
+	-webkit-box-direction: normal;
+	-webkit-flex-direction: row;
+	    -ms-flex-direction: row;
+	        flex-direction: row;
+	-webkit-flex-wrap: wrap;
+	    -ms-flex-wrap: wrap;
+	        flex-wrap: wrap;
+	-webkit-box-pack: start;
+	-webkit-justify-content: flex-start;
+	    -ms-flex-pack: start;
+	        justify-content: flex-start;
+	-webkit-align-content: flex-start;
+	    -ms-flex-line-pack: start;
+	        align-content: flex-start;
+	-webkit-box-align: stretch;
+	-webkit-align-items: stretch;
+	    -ms-flex-align: stretch;
+	        align-items: stretch;
+
 }
 
 .my-sites li {
@@ -3048,134 +3077,35 @@
 	display: block;
 	padding: 8px 3%;
 	min-height: 130px;
-	margin: 0;
-}
+	margin: 0 5px 10px 5px;
+	border: 1px solid #ccc;
+	background-color: #fff;
 
-@media only screen and (max-width: 599px) {
-	.my-sites li {
-		min-height: 0;
-	}
-}
 
-@media only screen and (min-width: 600px) {
-	.my-sites.striped li {
-		background-color: #fff;
-		position: relative;
-	}
-	.my-sites.striped li:after {
-		content: "";
-		width: 1px;
-		height: 100%;
-		position: absolute;
-		top: 0;
-		right: 0;
-		background: #ccc;
-	}
+	min-height: 0;
+	width: 300px;
+	-webkit-box-flex: 1;
+	-webkit-flex-grow: 1;
+	    -ms-flex-positive: 1;
+	        flex-grow: 1;
+	-webkit-flex-shrink: 0;
+	    -ms-flex-negative: 0;
+	        flex-shrink: 0;
+	-webkit-flex-basis: 200px;
+	    -ms-flex-preferred-size: 200px;
+	        flex-basis: 200px;
 
 }
-@media only screen and (min-width: 600px) and (max-width: 699px) {
-	.my-sites li{
-		float: left;
-		width: 44%;
-	}
-	.my-sites.striped li {
-		background-color: #fff;
-	}
-	.my-sites.striped li:nth-of-type(2n+1) {
-		clear: left;
-	}
-	.my-sites.striped li:nth-of-type(2n+2):after {
-		content: none;
-	}
-	.my-sites li:nth-of-type(4n+1),
-	.my-sites li:nth-of-type(4n+2) {
-		background-color: #f9f9f9;
-	}
 
+.my-sites .site-icon{
+	max-width: 32px;
+	height: auto;
+	float: left;
+	margin: 0 5px 5px 0;
 }
 
-@media only screen and (min-width: 700px) and (max-width: 1199px) {
-	.my-sites li {
-		float: left;
-		width: 27.333333%;
-		background-color: #fff;
-	}
-	.my-sites.striped li:nth-of-type(3n+3):after {
-		content: none;
-	}
-	.my-sites li:nth-of-type(6n+1),
-	.my-sites li:nth-of-type(6n+2),
-	.my-sites li:nth-of-type(6n+3) {
-		background-color: #f9f9f9;
-	}
-}
 
-@media only screen and (min-width: 1200px) and (max-width: 1399px) {
-	.my-sites li {
-		float: left;
-		width: 21%;
-		padding: 8px 2%;
-		background-color: #fff;
-	}
-	.my-sites.striped li:nth-of-type(4n+1) {
-		clear: left;
-	}
-	.my-sites.striped li:nth-of-type(4n+4):after {
-		content: none;
-	}
-	.my-sites li:nth-of-type(8n+1),
-	.my-sites li:nth-of-type(8n+2),
-	.my-sites li:nth-of-type(8n+3),
-	.my-sites li:nth-of-type(8n+4) {
-		background-color: #f9f9f9;
-	}
-}
 
-@media only screen and (min-width: 1400px) and (max-width: 1599px) {
-	.my-sites li {
-		float: left;
-		width: 16%;
-		padding: 8px 2%;
-		background-color: #fff;
-	}
-	.my-sites.striped li:nth-of-type(5n+1) {
-		clear: left;
-	}
-	.my-sites.striped li:nth-of-type(5n+5):after {
-		content: none;
-	}
-	.my-sites li:nth-of-type(10n+1),
-	.my-sites li:nth-of-type(10n+2),
-	.my-sites li:nth-of-type(10n+3),
-	.my-sites li:nth-of-type(10n+4),
-	.my-sites li:nth-of-type(10n+5) {
-		background-color: #f9f9f9;
-	}
-}
-
-@media only screen and (min-width: 1600px) {
-	.my-sites li {
-		float: left;
-		width: 12.666666%;
-		padding: 8px 2%;
-		background-color: #fff;
-	}
-	.my-sites.striped li:nth-of-type(6n+1) {
-		clear: left;
-	}
-	.my-sites.striped li:nth-of-type(6n+6):after {
-		content: none;
-	}
-	.my-sites li:nth-of-type(12n+1),
-	.my-sites li:nth-of-type(12n+2),
-	.my-sites li:nth-of-type(12n+3),
-	.my-sites li:nth-of-type(12n+4),
-	.my-sites li:nth-of-type(12n+5),
-	.my-sites li:nth-of-type(12n+6) {
-		background-color: #f9f9f9;
-	}
-}
-
 .my-sites li a {
 	text-decoration: none;
 }
Index: src/wp-admin/my-sites.php
===================================================================
--- src/wp-admin/my-sites.php	(revision 33160)
+++ src/wp-admin/my-sites.php	(working copy)
@@ -98,7 +98,17 @@
 
 	foreach ( $blogs as $user_blog ) {
 		echo "<li>";
-		echo "<h3>{$user_blog->blogname}</h3>";
+
+		$site_icon_image = "";
+		if($site_icon = get_blog_option($user_blog->userblog_id, "site_icon")){
+			switch_to_blog( $user_blog->userblog_id );
+			$icon_attrs = array(
+				'class'	=> "site-icon",
+			);
+			$site_icon_image = wp_get_attachment_image( $site_icon, "thumbnail", false,  $icon_attrs);
+			restore_current_blog();
+		}
+		echo "<h3>$site_icon_image {$user_blog->blogname}</h3>";
 		/**
 		 * Filter the row links displayed for each site on the My Sites screen.
 		 *