Index: wp-admin/includes/screen.php
===================================================================
--- wp-admin/includes/screen.php	(revision 24038)
+++ wp-admin/includes/screen.php	(working copy)
@@ -171,7 +171,7 @@
 		if ( $post_ID ) {
 			$format = get_post_format( $post_ID );
 			if ( $format )
-				$class .= ' ' . $format;
+				$class .= ' wp-format-' . $format;
 		}
 	}
 
Index: wp-admin/js/post-formats.js
===================================================================
--- wp-admin/js/post-formats.js	(revision 24038)
+++ wp-admin/js/post-formats.js	(working copy)
@@ -3,11 +3,14 @@
 (function($) {
 	var container, mediaFrame, lastMimeType, mediaPreview,
 		noUIFormats = ['standard', 'chat', 'status', 'aside', 'gallery'],
-		$container = $( '.post-formats-fields' );
+		$container = $( '.post-formats-fields' ),
+		$screenIcon = $( '.icon32' );
 
 	function switchFormatClass( format ) {
-		container.get(0).className = container.get(0).className.replace( /\bwp-format-[^ ]+/g, '' );
+		container.get(0).className = container.get(0).className.replace( /\s?\bwp-format-[^ ]+/g, '' );
 		container.addClass('wp-format-' + format);
+		$screenIcon.get(0).className = $screenIcon.get(0).className.replace( /\s?\bwp-format-[^ ]+/g, '' );
+		$screenIcon.addClass('wp-format-' + format);
 	}
 
 	function switchFormat($this) {
Index: wp-admin/css/wp-admin.css
===================================================================
--- wp-admin/css/wp-admin.css	(revision 24038)
+++ wp-admin/css/wp-admin.css	(working copy)
@@ -4031,52 +4031,52 @@
 	min-height: 97px;
 }
 
-#icon-edit.standard,
+#icon-edit.wp-format-standard,
 .post-format-options .standard {
 	background: url(../images/post-formats32.png) no-repeat -3px -4px;
 }
 
-#icon-edit.image,
+#icon-edit.wp-format-image,
 .post-format-options .image {
 	background: url(../images/post-formats32.png) no-repeat  -43px -4px;
 }
 
-#icon-edit.gallery,
+#icon-edit.wp-format-gallery,
 .post-format-options .gallery {
 	background: url(../images/post-formats32.png) no-repeat -83px -4px;
 }
 
-#icon-edit.audio,
+#icon-edit.wp-format-audio,
 .post-format-options .audio {
 	background: url(../images/post-formats32.png) no-repeat -123px -4px;
 }
 
-#icon-edit.video,
+#icon-edit.wp-format-video,
 .post-format-options .video {
 	background: url(../images/post-formats32.png) no-repeat -163px -4px;
 }
 
-#icon-edit.chat,
+#icon-edit.wp-format-chat,
 .post-format-options .chat {
 	background: url(../images/post-formats32.png) no-repeat -202px -4px;
 }
 
-#icon-edit.status,
+#icon-edit.wp-format-status,
 .post-format-options .status {
 	background: url(../images/post-formats32.png) no-repeat -242px -4px;
 }
 
-#icon-edit.aside,
+#icon-edit.wp-format-aside,
 .post-format-options .aside {
 	background: url(../images/post-formats32.png) no-repeat -282px -4px;
 }
 
-#icon-edit.quote,
+#icon-edit.wp-format-quote,
 .post-format-options .quote {
 	background: url(../images/post-formats32.png) no-repeat -322px -4px;
 }
 
-#icon-edit.link,
+#icon-edit.wp-format-link,
 .post-format-options .link {
 	background: url(../images/post-formats32.png) no-repeat -362px -4px;
 }