Index: wp-includes/js/wplink.js
===================================================================
--- wp-includes/js/wplink.js	(revision 22011)
+++ wp-includes/js/wplink.js	(working copy)
@@ -303,7 +303,7 @@
 					return;
 
 				wpLink.lastSearch = search;
-				waiting = t.parent().find('img.waiting').show();
+				waiting = t.parent().find('.spinner').show();
 
 				rivers.search.change( search );
 				rivers.search.ajax( function(){ waiting.hide(); });
Index: wp-includes/js/autosave.js
===================================================================
--- wp-includes/js/autosave.js	(revision 22011)
+++ wp-includes/js/autosave.js	(working copy)
@@ -22,9 +22,9 @@
 				t.addClass('button-disabled');
 		});
 		if ( $(this).attr('id') == 'publish' )
-			$('#ajax-loading').css('visibility', 'visible');
+			$('#major-publishing-actions .spinner').show();
 		else
-			$('#draft-ajax-loading').css('visibility', 'visible');
+			$('#minor-publishing .spinner').show();
 	});
 
 	window.onbeforeunload = function(){
@@ -230,7 +230,7 @@
 	// delay that a bit to avoid some rare collisions while the DOM is being updated.
 	setTimeout(function(){
 		jQuery(':button, :submit', '#submitpost').removeAttr('disabled');
-		jQuery('.ajax-loading').css('visibility', 'hidden');
+		jQuery('.spinner').hide();
 	}, 500);
 }
 
Index: wp-includes/css/editor.css
===================================================================
--- wp-includes/css/editor.css	(revision 22011)
+++ wp-includes/css/editor.css	(working copy)
@@ -1274,13 +1274,18 @@
 	margin-top: 5px;
 }
 
-#wp-link label span {
+#wp-link label span.search-label {
 	display: inline-block;
 	width: 80px;
 	text-align: right;
 	padding-right: 5px;
 }
 
+#wp-link .link-search-field {
+	float: left;
+	margin-right: 5px;
+}
+
 #wp-link .link-search-wrapper {
 	margin: 5px 6px 9px;
 	display: block;
@@ -1297,8 +1302,8 @@
 	width: 220px;
 }
 
-#wp-link .link-search-wrapper img.waiting {
-	margin: 0;
+#wp-link .link-search-wrapper .spinner {
+	margin: 4px 2px 0 0;
 	display: none;
 	vertical-align: text-bottom;
 }
@@ -1383,7 +1388,7 @@
 	padding: 10px 0;
 }
 
-#wp-link .river-waiting img.waiting {
+#wp-link .river-waiting .spinner {
 	margin: 0 auto;
 	display: block;
 }
Index: wp-includes/class-wp-editor.php
===================================================================
--- wp-includes/class-wp-editor.php	(revision 22011)
+++ wp-includes/class-wp-editor.php	(working copy)
@@ -707,9 +707,9 @@
 			</div></div>
 
 			<div id="wp-fullscreen-save">
-				<span><?php if ( $post->post_status == 'publish' ) _e('Updated.'); else _e('Saved.'); ?></span>
-				<img src="<?php echo admin_url('images/wpspin_light.gif'); ?>" alt="" />
-				<input type="button" class="button-primary" value="<?php echo $save; ?>" onclick="fullscreen.save();" />
+				<input type="button" class="button-primary right" value="<?php echo $save; ?>" onclick="fullscreen.save();" />
+				<span class="spinner"></span>
+				<span class="fs-saved"><?php if ( $post->post_status == 'publish' ) _e('Updated.'); else _e('Saved.'); ?></span>
 			</div>
 
 			</div>
@@ -822,22 +822,22 @@
 		<div id="search-panel"<?php if ( ! $show_internal ) echo ' style="display:none"'; ?>>
 			<div class="link-search-wrapper">
 				<label>
-					<span><?php _e( 'Search' ); ?></span>
+					<span class="search-label"><?php _e( 'Search' ); ?></span>
 					<input type="search" id="search-field" class="link-search-field" autocomplete="off" />
-					<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
+					<span class="spinner"></span>
 				</label>
 			</div>
 			<div id="search-results" class="query-results">
 				<ul></ul>
 				<div class="river-waiting">
-					<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
+					<span class="spinner"></span>
 				</div>
 			</div>
 			<div id="most-recent-results" class="query-results">
 				<div class="query-notice"><em><?php _e( 'No search term specified. Showing recent items.' ); ?></em></div>
 				<ul></ul>
 				<div class="river-waiting">
-					<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
+					<span class="spinner"></span>
 				</div>
 			</div>
 		</div>
Index: wp-admin/includes/class-wp-posts-list-table.php
===================================================================
--- wp-admin/includes/class-wp-posts-list-table.php	(revision 22011)
+++ wp-admin/includes/class-wp-posts-list-table.php	(working copy)
@@ -1041,7 +1041,7 @@
 				$update_text = __( 'Update' );
 				?>
 				<a accesskey="s" href="#inline-edit" title="<?php esc_attr_e( 'Update' ); ?>" class="button-primary save alignright"><?php echo esc_attr( $update_text ); ?></a>
-				<img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
+				<span class="spinner"></span>
 			<?php } else {
 				submit_button( __( 'Update' ), 'button-primary alignright', 'bulk_edit', false, array( 'accesskey' => 's' ) );
 			} ?>
Index: wp-admin/includes/class-wp-terms-list-table.php
===================================================================
--- wp-admin/includes/class-wp-terms-list-table.php	(revision 22011)
+++ wp-admin/includes/class-wp-terms-list-table.php	(working copy)
@@ -364,7 +364,7 @@
 			<a accesskey="c" href="#inline-edit" title="<?php esc_attr_e( 'Cancel' ); ?>" class="cancel button-secondary alignleft"><?php _e( 'Cancel' ); ?></a>
 			<?php $update_text = $tax->labels->update_item; ?>
 			<a accesskey="s" href="#inline-edit" title="<?php echo esc_attr( $update_text ); ?>" class="save button-primary alignright"><?php echo $update_text; ?></a>
-			<img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
+			<span class="spinner"></span>
 			<span class="error" style="display:none;"></span>
 			<?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?>
 			<input type="hidden" name="taxonomy" value="<?php echo esc_attr( $this->screen->taxonomy ); ?>" />
Index: wp-admin/includes/dashboard.php
===================================================================
--- wp-admin/includes/dashboard.php	(revision 22011)
+++ wp-admin/includes/dashboard.php	(working copy)
@@ -535,7 +535,7 @@
 			<input type="reset" value="<?php esc_attr_e( 'Reset' ); ?>" class="button" />
 			<span id="publishing-action">
 				<input type="submit" name="publish" id="publish" accesskey="p" class="button-primary" value="<?php current_user_can('publish_posts') ? esc_attr_e('Publish') : esc_attr_e('Submit for Review'); ?>" />
-				<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
+				<span class="spinner"></span>
 			</span>
 			<br class="clear" />
 		</p>
Index: wp-admin/includes/class-wp-plugin-install-list-table.php
===================================================================
--- wp-admin/includes/class-wp-plugin-install-list-table.php	(revision 22011)
+++ wp-admin/includes/class-wp-plugin-install-list-table.php	(working copy)
@@ -115,13 +115,11 @@
 					<?php do_action( 'install_plugins_table_header' ); ?>
 				</div>
 				<?php $this->pagination( $which ); ?>
-				<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
 				<br class="clear" />
 			</div>
 		<?php } else { ?>
 			<div class="tablenav bottom">
 				<?php $this->pagination( $which ); ?>
-				<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
 				<br class="clear" />
 			</div>
 		<?php
Index: wp-admin/includes/class-wp-theme-install-list-table.php
===================================================================
--- wp-admin/includes/class-wp-theme-install-list-table.php	(revision 22011)
+++ wp-admin/includes/class-wp-theme-install-list-table.php	(working copy)
@@ -134,7 +134,6 @@
 				<?php do_action( 'install_themes_table_header' ); ?>
 			</div>
 			<?php $this->pagination( 'top' ); ?>
-			<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
 			<br class="clear" />
 		</div>
 
Index: wp-admin/includes/class-wp-upgrader.php
===================================================================
--- wp-admin/includes/class-wp-upgrader.php	(revision 22011)
+++ wp-admin/includes/class-wp-upgrader.php	(working copy)
@@ -1288,8 +1288,8 @@
 
 	function before($title = '') {
 		$this->in_loop = true;
-		printf( '<h4>' . $this->upgrader->strings['skin_before_update_header'] . ' <img alt="" src="' . admin_url( 'images/wpspin_light.gif' ) . '" class="hidden waiting-' . $this->upgrader->update_current . '" style="vertical-align:middle;" /></h4>',  $title, $this->upgrader->update_current, $this->upgrader->update_count);
-		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').show();</script>';
+		printf( '<h4>' . $this->upgrader->strings['skin_before_update_header'] . ' <span class="spinner waiting-' . $this->upgrader->update_current . '"></span></h4>',  $title, $this->upgrader->update_current, $this->upgrader->update_count);
+		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').css("display", "inline-block");</script>';
 		echo '<div class="update-messages hide-if-js" id="progress-' . esc_attr($this->upgrader->update_current) . '"><p>';
 		$this->flush_output();
 	}
Index: wp-admin/includes/meta-boxes.php
===================================================================
--- wp-admin/includes/meta-boxes.php	(revision 22011)
+++ wp-admin/includes/meta-boxes.php	(working copy)
@@ -32,7 +32,7 @@
 <?php } elseif ( 'pending' == $post->post_status && $can_publish ) { ?>
 <input type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save as Pending'); ?>" class="button" />
 <?php } ?>
-<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading" id="draft-ajax-loading" alt="" />
+<span class="spinner"></span>
 </div>
 <?php if ( $post_type_object->public ) : ?>
 <div id="preview-action">
@@ -200,7 +200,7 @@
 </div>
 
 <div id="publishing-action">
-<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading" id="ajax-loading" alt="" />
+<span class="spinner"></span>
 <?php
 if ( !in_array( $post->post_status, array('publish', 'future', 'private') ) || 0 == $post->ID ) {
 	if ( $can_publish ) :
@@ -283,7 +283,7 @@
 	</div>
 
 	<div id="publishing-action">
-		<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading" id="ajax-loading" alt="" />
+		<span class="spinner"></span>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Update') ?>" />
 		<input name="save" type="submit" class="button-primary button-large" id="publish" accesskey="p" value="<?php esc_attr_e('Update') ?>" />
 	</div>
@@ -589,7 +589,7 @@
 		}
 
 		?>
-		<p class="hide-if-no-js" id="show-comments"><a href="#commentstatusdiv" onclick="commentsBox.get(<?php echo $total; ?>);return false;"><?php _e('Show comments'); ?></a> <img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" /></p>
+		<p class="hide-if-no-js" id="show-comments"><a href="#commentstatusdiv" onclick="commentsBox.get(<?php echo $total; ?>);return false;"><?php _e('Show comments'); ?></a> <span class="spinner"></span></p>
 		<?php
 	}
 
Index: wp-admin/includes/widgets.php
===================================================================
--- wp-admin/includes/widgets.php	(revision 22011)
+++ wp-admin/includes/widgets.php	(working copy)
@@ -211,8 +211,8 @@
 		<a class="widget-control-close" href="#close"><?php _e('Close'); ?></a>
 		</div>
 		<div class="alignright<?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?>">
-		<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback" title="" alt="" />
-		<?php submit_button( __( 'Save' ), 'button button-primary widget-control-save', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
+			<?php submit_button( __( 'Save' ), 'button-primary widget-control-save right', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
+			<span class="spinner"></span>
 		</div>
 		<br class="clear" />
 	</div>
Index: wp-admin/includes/class-wp-themes-list-table.php
===================================================================
--- wp-admin/includes/class-wp-themes-list-table.php	(revision 22011)
+++ wp-admin/includes/class-wp-themes-list-table.php	(working copy)
@@ -91,8 +91,8 @@
 		?>
 		<div class="tablenav themes <?php echo $which; ?>">
 			<?php $this->pagination( $which ); ?>
-		   <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
-		  <br class="clear" />
+			<span class="ajax-loading list-ajax-loading spinner"></span>
+			<br class="clear" />
 		</div>
 		<?php
 	}
Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php	(revision 22011)
+++ wp-admin/includes/template.php	(working copy)
@@ -360,7 +360,7 @@
 	<span id="savebtn" style="display:none;"><?php _e('Update Comment'); ?></span>
 	<span id="replybtn" style="display:none;"><?php _e('Submit Reply'); ?></span></a>
 	<a href="#comments-form" class="cancel button-secondary alignleft"><?php _e('Cancel'); ?></a>
-	<img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
+	<span class="waiting spinner"></span>
 	<span class="error" style="display:none;"></span>
 	<br class="clear" />
 	</p>
Index: wp-admin/includes/media.php
===================================================================
--- wp-admin/includes/media.php	(revision 22011)
+++ wp-admin/includes/media.php	(working copy)
@@ -1112,7 +1112,7 @@
 	$image_edit_button = '';
 	if ( gd_edit_image_support( $post->post_mime_type ) ) {
 		$nonce = wp_create_nonce( "image_editor-$post->ID" );
-		$image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <img src='" . esc_url( admin_url( 'images/wpspin_light.gif' ) ) . "' class='imgedit-wait-spin' alt='' />";
+		$image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <span class='spinner'></span>";
 	}
 
 	$attachment_url = get_permalink( $attachment_id );
@@ -1580,7 +1580,7 @@
 			return false;
 		}
 
-		document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />';
+		document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" width="16" />';
 		t.preloadImg = new Image();
 		t.preloadImg.onload = t.updateImageData;
 		t.preloadImg.onerror = t.resetImageData;
@@ -2126,7 +2126,7 @@
 	$image_edit_button = '';
 	if ( gd_edit_image_support( $post->post_mime_type ) ) {
 		$nonce = wp_create_nonce( "image_editor-$post->ID" );
-		$image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <img src='" . esc_url( admin_url( 'images/wpspin_light.gif' ) ) . "' class='imgedit-wait-spin' alt='' />";
+		$image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <span class='spinner'></span>";
 	}
 
  	?>
Index: wp-admin/includes/nav-menu.php
===================================================================
--- wp-admin/includes/nav-menu.php	(revision 22011)
+++ wp-admin/includes/nav-menu.php	(working copy)
@@ -511,8 +511,8 @@
 	}
 	?>
 	<p class="button-controls">
-		<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
-		<?php submit_button( __( 'Save' ), 'primary', 'nav-menu-locations', false, disabled( $nav_menu_selected_id, 0, false ) ); ?>
+		<?php submit_button( __( 'Save' ), 'primary right', 'nav-menu-locations', false, disabled( $nav_menu_selected_id, 0, false ) ); ?>
+		<span class="spinner"></span>
 	</p>
 	<?php
 }
@@ -560,8 +560,8 @@
 
 		<p class="button-controls">
 			<span class="add-to-menu">
-				<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
-				<input type="submit"<?php disabled( $nav_menu_selected_id, 0 ); ?> class="button-secondary submit-add-to-menu" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
+				<input type="submit"<?php disabled( $nav_menu_selected_id, 0 ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
+				<span class="spinner"></span>
 			</span>
 		</p>
 
@@ -692,7 +692,7 @@
 			?>
 			<p class="quick-search-wrap">
 				<input type="search" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" />
-				<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
+				<span class="spinner"></span>
 				<?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
 			</p>
 
@@ -779,8 +779,8 @@
 			</span>
 
 			<span class="add-to-menu">
-				<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
-				<input type="submit"<?php disabled( $nav_menu_selected_id, 0 ); ?> class="button-secondary submit-add-to-menu" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-post-type-menu-item" id="submit-posttype-<?php echo $post_type_name; ?>" />
+				<input type="submit"<?php disabled( $nav_menu_selected_id, 0 ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-post-type-menu-item" id="submit-posttype-<?php echo $post_type_name; ?>" />
+				<span class="spinner"></span>
 			</span>
 		</p>
 
@@ -923,7 +923,7 @@
 			?>
 			<p class="quick-search-wrap">
 				<input type="search" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
-				<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
+				<span class="spinner"></span>
 				<?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
 			</p>
 
@@ -955,8 +955,8 @@
 			</span>
 
 			<span class="add-to-menu">
-				<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
-				<input type="submit"<?php disabled( $nav_menu_selected_id, 0 ); ?> class="button-secondary submit-add-to-menu" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-taxonomy-menu-item" id="submit-taxonomy-<?php echo $taxonomy_name; ?>" />
+				<input type="submit"<?php disabled( $nav_menu_selected_id, 0 ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-taxonomy-menu-item" id="submit-taxonomy-<?php echo $taxonomy_name; ?>" />
+				<span class="spinner"></span>
 			</span>
 		</p>
 
Index: wp-admin/customize.php
===================================================================
--- wp-admin/customize.php	(revision 22011)
+++ wp-admin/customize.php	(working copy)
@@ -72,7 +72,7 @@
 				$save_text = $wp_customize->is_theme_active() ? __( 'Save &amp; Publish' ) : __( 'Save &amp; Activate' );
 				submit_button( $save_text, 'primary', 'save', false );
 			?>
-			<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" />
+			<span class="spinner"></span>
 			<a class="back button" href="<?php echo esc_url( $return ? $return : admin_url( 'themes.php' ) ); ?>">
 				<?php _e( 'Cancel' ); ?>
 			</a>
Index: wp-admin/js/edit-comments.js
===================================================================
--- wp-admin/js/edit-comments.js	(revision 22011)
+++ wp-admin/js/edit-comments.js	(working copy)
@@ -368,7 +368,7 @@
 		$('#replycontent').css('height', '').val('');
 		$('#edithead input').val('');
 		$('.error', replyrow).html('').hide();
-		$('.waiting', replyrow).hide();
+		$('.spinner', replyrow).hide();
 
 		this.cid = '';
 	},
@@ -451,7 +451,7 @@
 		var post = {};
 
 		$('#replysubmit .error').hide();
-		$('#replysubmit .waiting').show();
+		$('#replysubmit .spinner').show();
 
 		$('#replyrow input').not(':button').each(function() {
 			var t = $(this);
@@ -533,7 +533,7 @@
 	error : function(r) {
 		var er = r.statusText;
 
-		$('#replysubmit .waiting').hide();
+		$('#replysubmit .spinner').hide();
 
 		if ( r.responseText )
 			er = r.responseText.replace( /<.[^<>]*?>/g, '' );
Index: wp-admin/js/inline-edit-tax.js
===================================================================
--- wp-admin/js/inline-edit-tax.js	(revision 22011)
+++ wp-admin/js/inline-edit-tax.js	(working copy)
@@ -60,7 +60,7 @@
 		if( typeof(id) == 'object' )
 			id = this.getId(id);
 
-		$('table.widefat .inline-edit-save .waiting').show();
+		$('table.widefat .spinner').show();
 
 		params = {
 			action: 'inline-save-tax',
@@ -76,7 +76,7 @@
 		$.post( ajaxurl, params,
 			function(r) {
 				var row, new_id;
-				$('table.widefat .inline-edit-save .waiting').hide();
+				$('table.widefat .spinner').hide();
 
 				if (r) {
 					if ( -1 != r.indexOf('<tr') ) {
@@ -99,7 +99,7 @@
 		var id = $('table.widefat tr.inline-editor').attr('id');
 
 		if ( id ) {
-			$('table.widefat .inline-edit-save .waiting').hide();
+			$('table.widefat .spinner').hide();
 			$('#'+id).remove();
 			id = id.substr( id.lastIndexOf('-') + 1 );
 			$(this.what+id).show();
Index: wp-admin/js/widgets.js
===================================================================
--- wp-admin/js/widgets.js	(revision 22011)
+++ wp-admin/js/widgets.js	(working copy)
@@ -176,7 +176,7 @@
 
 	saveOrder : function(sb) {
 		if ( sb )
-			$('#' + sb).closest('div.widgets-holder-wrap').find('img.ajax-feedback').css('visibility', 'visible');
+			$('#' + sb).closest('div.widgets-holder-wrap').find('.spinner').css('display', 'inline-block');
 
 		var a = {
 			action: 'widgets-order',
@@ -190,7 +190,7 @@
 		});
 
 		$.post( ajaxurl, a, function() {
-			$('img.ajax-feedback').css('visibility', 'hidden');
+			$('.spinner').hide();
 		});
 
 		this.resize();
@@ -199,7 +199,7 @@
 	save : function(widget, del, animate, order) {
 		var sb = widget.closest('div.widgets-sortables').attr('id'), data = widget.find('form').serialize(), a;
 		widget = $(widget);
-		$('.ajax-feedback', widget).css('visibility', 'visible');
+		$('.spinner', widget).show();
 
 		a = {
 			action: 'save-widget',
@@ -235,7 +235,7 @@
 					wpWidgets.resize();
 				}
 			} else {
-				$('.ajax-feedback').css('visibility', 'hidden');
+				$('.spinner').hide();
 				if ( r && r.length > 2 ) {
 					$('div.widget-content', widget).html(r);
 					wpWidgets.appendTitle(widget);
Index: wp-admin/js/nav-menu.js
===================================================================
--- wp-admin/js/nav-menu.js	(revision 22011)
+++ wp-admin/js/nav-menu.js	(working copy)
@@ -130,7 +130,7 @@
 							return false;
 
 						// Show the ajax spinner
-						t.find('img.waiting').show();
+						t.find('.spinner').show();
 
 						// Retrieve menu item data
 						$(checkboxes).each(function(){
@@ -146,7 +146,7 @@
 						api.addItemToMenu(menuItems, processMethod, function(){
 							// Deselect the items and hide the ajax spinner
 							checkboxes.removeAttr('checked');
-							t.find('img.waiting').hide();
+							t.find('.spinner').hide();
 						});
 					});
 				},
@@ -471,9 +471,9 @@
 				loc.find('select').each(function() {
 					params[this.name] = $(this).val();
 				});
-				loc.find('.waiting').show();
+				loc.find('.spinner').show();
 				$.post( ajaxurl, params, function(r) {
-					loc.find('.waiting').hide();
+					loc.find('.spinner').hide();
 				});
 				return false;
 			});
@@ -515,7 +515,7 @@
 				'type': input.attr('name')
 			};
 
-			$('img.waiting', panel).show();
+			$('.spinner', panel).show();
 
 			$.post( ajaxurl, params, function(menuMarkup) {
 				api.processQuickSearchQueryResponse(menuMarkup, params, panel);
@@ -532,10 +532,10 @@
 				return false;
 
 			// Show the ajax spinner
-			$('.customlinkdiv img.waiting').show();
+			$('.customlinkdiv .spinner').show();
 			this.addLinkToMenu( url, label, processMethod, function() {
 				// Remove the ajax spinner
-				$('.customlinkdiv img.waiting').hide();
+				$('.customlinkdiv .spinner').hide();
 				// Set custom link form back to defaults
 				$('#custom-menu-item-name').val('').blur();
 				$('#custom-menu-item-url').val('http://');
@@ -905,7 +905,7 @@
 
 			if( ! $items.length ) {
 				$('.categorychecklist', panel).html( '<li><p>' + navMenuL10n.noResultsFound + '</p></li>' );
-				$('img.waiting', panel).hide();
+				$('.spinner', panel).hide();
 				return;
 			}
 
@@ -932,7 +932,7 @@
 			});
 
 			$('.categorychecklist', panel).html( $items );
-			$('img.waiting', panel).hide();
+			$('.spinner', panel).hide();
 		},
 
 		removeMenuItem : function(el) {
Index: wp-admin/js/wp-fullscreen.js
===================================================================
--- wp-admin/js/wp-fullscreen.js	(revision 22011)
+++ wp-admin/js/wp-fullscreen.js	(working copy)
@@ -205,7 +205,7 @@
 	 */
 
 	api.save = function() {
-		var hidden = $('#hiddenaction'), old = hidden.val(), spinner = $('#wp-fullscreen-save img'),
+		var hidden = $('#hiddenaction'), old = hidden.val(), spinner = $('#wp-fullscreen-save .spinner'),
 			message = $('#wp-fullscreen-save span');
 
 		spinner.show();
Index: wp-admin/js/dashboard.js
===================================================================
--- wp-admin/js/dashboard.js	(revision 22011)
+++ wp-admin/js/dashboard.js	(working copy)
@@ -66,7 +66,7 @@
 	quickPressLoad = function() {
 		var act = $('#quickpost-action'), t;
 		t = $('#quick-press').submit( function() {
-			$('#dashboard_quick_press #publishing-action img.waiting').css('visibility', 'visible');
+			$('#dashboard_quick_press #publishing-action .spinner').show();
 			$('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').prop('disabled', true);
 
 			if ( 'post' == act.val() ) {
@@ -74,7 +74,7 @@
 			}
 
 			$('#dashboard_quick_press div.inside').load( t.attr( 'action' ), t.serializeArray(), function() {
-				$('#dashboard_quick_press #publishing-action img.waiting').css('visibility', 'hidden');
+				$('#dashboard_quick_press #publishing-action .spinner').hide();
 				$('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').prop('disabled', false);
 				$('#dashboard_quick_press ul').next('p').remove();
 				$('#dashboard_quick_press ul').find('li').each( function() {
Index: wp-admin/js/image-edit.js
===================================================================
--- wp-admin/js/image-edit.js	(revision 22011)
+++ wp-admin/js/image-edit.js	(working copy)
@@ -272,10 +272,10 @@
 
 	open : function(postid, nonce) {
 		var data, elem = $('#image-editor-' + postid), head = $('#media-head-' + postid),
-			btn = $('#imgedit-open-btn-' + postid), spin = btn.siblings('img');
+			btn = $('#imgedit-open-btn-' + postid), spin = btn.siblings('.spinner');
 
 		btn.prop('disabled', true);
-		spin.css('visibility', 'visible');
+		spin.show();
 
 		data = {
 			'action': 'image-editor',
@@ -288,7 +288,7 @@
 			elem.fadeIn('fast');
 			head.fadeOut('fast', function(){
 				btn.removeAttr('disabled');
-				spin.css('visibility', 'hidden');
+				spin.hide();
 			});
 		});
 	},
Index: wp-admin/js/inline-edit-post.js
===================================================================
--- wp-admin/js/inline-edit-post.js	(revision 22011)
+++ wp-admin/js/inline-edit-post.js	(working copy)
@@ -237,7 +237,7 @@
 		if ( typeof(id) == 'object' )
 			id = this.getId(id);
 
-		$('table.widefat .inline-edit-save .waiting').show();
+		$('table.widefat .spinner').show();
 
 		params = {
 			action: 'inline-save',
@@ -253,7 +253,7 @@
 		// make ajax request
 		$.post( ajaxurl, params,
 			function(r) {
-				$('table.widefat .inline-edit-save .waiting').hide();
+				$('table.widefat .spinner').hide();
 
 				if (r) {
 					if ( -1 != r.indexOf('<tr') ) {
@@ -276,7 +276,7 @@
 		var id = $('table.widefat tr.inline-editor').attr('id');
 
 		if ( id ) {
-			$('table.widefat .inline-edit-save .waiting').hide();
+			$('table.widefat .spinner').hide();
 
 			if ( 'bulk-edit' == id ) {
 				$('table.widefat #bulk-edit').removeClass('inline-editor').hide();
Index: wp-admin/js/theme.js
===================================================================
--- wp-admin/js/theme.js	(revision 22011)
+++ wp-admin/js/theme.js	(working copy)
@@ -156,7 +156,7 @@
 
 			// Cache jQuery selectors
 			this.$outList = $('#availablethemes');
-			this.$spinner = $('div.tablenav.bottom').children( 'img.ajax-loading' );
+			this.$spinner = $('div.tablenav.bottom').children( '.spinner' );
 			this.$window = $(window);
 			this.$document = $(document);
 
@@ -231,16 +231,16 @@
 				'list_args': list_args
 			};
 
-			this.$spinner.css( 'visibility', 'visible' );
+			this.$spinner.show();
 			$.getJSON( ajaxurl, query )
 				.done( function( response ) {
 					self.nextPage++;
 					self.process( response );
-					self.$spinner.css( 'visibility', 'hidden' );
+					self.$spinner.hide();
 					self.querying = false;
 				})
 				.fail( function() {
-					self.$spinner.css( 'visibility', 'hidden' );
+					self.$spinner.hide();
 					self.querying = false;
 					setTimeout( function() { self.ajax(); }, self.failedRetryDelay );
 				});
Index: wp-admin/js/post.js
===================================================================
--- wp-admin/js/post.js	(revision 22011)
+++ wp-admin/js/post.js	(working copy)
@@ -185,7 +185,7 @@
 
 		this.st += num;
 		this.total = total;
-		$('#commentsdiv img.waiting').show();
+		$('#commentsdiv .spinner').show();
 
 		data = {
 			'action' : 'get-comments',
@@ -200,7 +200,7 @@
 			function(r) {
 				r = wpAjax.parseAjaxResponse(r);
 				$('#commentsdiv .widefat').show();
-				$('#commentsdiv img.waiting').hide();
+				$('#commentsdiv .spinner').hide();
 
 				if ( 'object' == typeof r && r.responses[0] ) {
 					$('#the-comment-list').append( r.responses[0].data );
Index: wp-admin/options-general.php
===================================================================
--- wp-admin/options-general.php	(revision 22011)
+++ wp-admin/options-general.php	(working copy)
@@ -44,11 +44,11 @@
 		});
 		$("input[name='date_format_custom'], input[name='time_format_custom']").change( function() {
 			var format = $(this);
-			format.siblings('img').css('visibility','visible');
+			format.siblings('.spinner').css('display', 'inline-block'); // show(); can't be used here
 			$.post(ajaxurl, {
 					action: 'date_format_custom' == format.attr('name') ? 'date_format' : 'time_format',
 					date : format.val()
-				}, function(d) { format.siblings('img').css('visibility','hidden'); format.siblings('.example').text(d); } );
+				}, function(d) { format.siblings('.spinner').hide(); format.siblings('.example').text(d); } );
 		});
 	});
 //]]>
@@ -250,7 +250,7 @@
 
 	echo '	<label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
 	checked( $custom );
-	echo '/> ' . __('Custom:') . ' </label><input type="text" name="date_format_custom" value="' . esc_attr( get_option('date_format') ) . '" class="small-text" /> <span class="example"> ' . date_i18n( get_option('date_format') ) . "</span> <img class='ajax-loading' src='" . esc_url( admin_url( 'images/wpspin_light.gif' ) ) . "' />\n";
+	echo '/> ' . __('Custom:') . ' </label><input type="text" name="date_format_custom" value="' . esc_attr( get_option('date_format') ) . '" class="small-text" /> <span class="example"> ' . date_i18n( get_option('date_format') ) . "</span> <span class='spinner'></span>\n";
 
 	echo "\t<p>" . __('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date and time formatting</a>.') . "</p>\n";
 ?>
@@ -282,7 +282,7 @@
 
 	echo '	<label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';
 	checked( $custom );
-	echo '/> ' . __('Custom:') . ' </label><input type="text" name="time_format_custom" value="' . esc_attr( get_option('time_format') ) . '" class="small-text" /> <span class="example"> ' . date_i18n( get_option('time_format') ) . "</span> <img class='ajax-loading' src='" . esc_url( admin_url( 'images/wpspin_light.gif' ) ) . "' />\n";
+	echo '/> ' . __('Custom:') . ' </label><input type="text" name="time_format_custom" value="' . esc_attr( get_option('time_format') ) . '" class="small-text" /> <span class="example"> ' . date_i18n( get_option('time_format') ) . "</span> <span class='spinner'></span>\n";
 	;
 ?>
 	</fieldset>
Index: wp-admin/press-this.php
===================================================================
--- wp-admin/press-this.php	(revision 22011)
+++ wp-admin/press-this.php	(working copy)
@@ -427,7 +427,7 @@
 			show('photo');
 		<?php } ?>
 		jQuery('#title').unbind();
-		jQuery('#publish, #save').click(function() { jQuery('#saving').css('display', 'inline'); });
+		jQuery('#publish, #save').click(function() { jQuery('.press-this #publishing-actions .spinner').css('display', 'inline-block'); });
 
 		$('#tagsdiv-post_tag, #categorydiv').children('h3, .handlediv').click(function(){
 			$(this).siblings('.inside').toggle();
@@ -467,7 +467,7 @@
 							echo '<br /><br />';
 							submit_button( __( 'Submit for Review' ), 'primary', 'review', false );
 						} ?>
-						<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" id="saving" style="display:none;" />
+						<span class="spinner" style="display: none;"></span>
 					</p>
 					<?php if ( current_theme_supports( 'post-formats' ) && post_type_supports( 'post', 'post-formats' ) ) :
 							$post_formats = get_theme_support( 'post-formats' );
@@ -586,7 +586,7 @@
 			</div>
 		</div>
 
-		<div id="waiting" style="display: none"><img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" /> <?php esc_html_e( 'Loading...' ); ?></div>
+		<div id="waiting" style="display: none"><span class="spinner"></span> <span><?php esc_html_e( 'Loading...' ); ?></span></div>
 
 		<div id="extra-fields" style="display: none"></div>
 
Index: wp-admin/css/wp-admin-rtl.css
===================================================================
--- wp-admin/css/wp-admin-rtl.css	(revision 22011)
+++ wp-admin/css/wp-admin-rtl.css	(working copy)
@@ -845,7 +845,7 @@
 	font-style: normal;
 }
 
-#commentsdiv img.waiting {
+#commentsdiv .spinner {
 	padding-left: 0;
 	padding-right: 5px;
 }
@@ -1089,8 +1089,8 @@
 
 /* reply to comments */
 
-#replysubmit img.waiting,
-.inline-edit-save img.waiting {
+#replysubmit .spinner,
+.inline-edit-save .spinner {
 	float: left;
 }
 
@@ -1508,12 +1508,6 @@
 
 * html #template div {margin-left: 0;}
 
-.list-ajax-loading {
-	float: left;
-	margin-right: 0;
-	margin-left: 9px;
-}
-
 /* - Used - but could/should be deprecated with a CSS reset
 ------------------------------------------------------------------------------*/
 /* No RTL for now, this space intentionally left blank */
@@ -1858,7 +1852,7 @@
 	float: left;
 }
 
-#dashboard-widgets #dashboard_quick_press form p.submit img.waiting {
+#dashboard-widgets #dashboard_quick_press form p.submit .spinner {
 	margin: 4px 0 0 6px;
 }
 
Index: wp-admin/css/wp-admin.css
===================================================================
--- wp-admin/css/wp-admin.css	(revision 22011)
+++ wp-admin/css/wp-admin.css	(working copy)
@@ -968,6 +968,10 @@
 	line-height: 23px;
 }
 
+#publishing-action .spinner {
+	float: left;
+}
+
 #misc-publishing-actions {
 	padding: 6px 0 0;
 }
@@ -1099,7 +1103,6 @@
 }
 
 .ajax-feedback {
-	visibility: hidden;
 	vertical-align: bottom;
 }
 
@@ -2374,7 +2377,7 @@
 	border-bottom: 0 none;
 }
 
-#commentsdiv img.waiting {
+#commentsdiv .spinner {
 	padding-left: 5px;
 }
 
@@ -2814,6 +2817,16 @@
   11.0 - Write/Edit Post Screen
 ------------------------------------------------------------------------------*/
 
+#show-comments {
+	overflow: hidden;
+}
+
+#save-action .spinner,
+#show-comments a,
+#show-comments .spinner {
+	float: left;
+}
+
 #titlediv {
 	position: relative;
 	margin-bottom: 10px;
@@ -2848,6 +2861,12 @@
 	padding: 8px 10px;
 }
 
+#wp-fullscreen-save .fs-saved {
+	color: #999;
+	float: right;
+	margin-top: 4px;
+}
+
 #wp-fullscreen-title-prompt-text {
 	padding: 11px;
 }
@@ -2898,10 +2917,6 @@
 	vertical-align: middle;
 }
 
-#wpcontent .ajax-loading {
-	visibility: hidden;
-}
-
 .submitbox .submit {
 	text-align: left;
 	padding: 12px 10px 10px;
@@ -3976,6 +3991,7 @@
 	position: absolute;
 	top: 0;
 	background: #FFFFFF url(../images/wpspin_light.gif) no-repeat scroll 22px 10px;
+	background-size: 16px 16px;
 	opacity: 0.7;
 	filter: alpha(opacity=70);
 	width: 100%;
@@ -3983,15 +3999,39 @@
 	display: none;
 }
 
+.spinner {
+	background: url(../images/wpspin_light.gif) no-repeat;
+	background-size: 16px 16px;
+	display: none;
+	float: right;
+	opacity: 0.7;
+	filter: alpha(opacity=70);
+	width: 16px;
+	height: 16px;
+	margin: 5px 5px 0;
+}
+
+.no-float {
+	float: none;
+}
+
 .media-disabled,
 .imgedit-settings .disabled  {
 	color: grey;
 }
 
-.imgedit-wait-spin {
+.wp_attachment_image, .A1B1 {
+	overflow: hidden;
+}
+
+.wp_attachment_image .button, .A1B1 .button {
+	float: left;
+}
+
+.wp_attachment_image .spinner, .A1B1 .spinner {
+	float: left;
 	padding: 0 4px 4px;
 	vertical-align: bottom;
-	visibility: hidden;
 }
 
 .imgedit-menu {
@@ -4277,8 +4317,8 @@
 	text-align: center;
 }
 
-#replysubmit img.waiting,
-.inline-edit-save img.waiting {
+#replysubmit .spinner,
+.inline-edit-save .spinner {
 	padding: 4px 10px 0;
 	vertical-align: top;
 	float: right;
@@ -4903,6 +4943,10 @@
 	vertical-align: middle;
 }
 
+.options-general-php .spinner {
+	float: none;
+	margin: -3px 3px;
+}
 
 /*------------------------------------------------------------------------------
   21.0 - Admin Footer
@@ -5457,6 +5501,7 @@
 
 .customize-loading #customize-container {
 	background: #fff url("../images/wpspin_light.gif") no-repeat fixed center center;
+	background-size: 16px 16px;
 }
 
 #customize-container iframe,
@@ -5761,12 +5806,6 @@
 	max-height: 60px;
 }
 
-.list-ajax-loading {
-	float: right;
-	margin-right: 9px;
-	margin-top: -1px;
-}
-
 .tablenav .list-ajax-loading {
 	margin-top: 7px;
 }
@@ -5982,7 +6021,7 @@
 	color: red;
 }
 
-#dashboard_right_now .waiting {
+#dashboard_right_now .spinner {
 	color: #e66f00;
 }
 
@@ -6140,7 +6179,7 @@
 	float: right;
 }
 
-#dashboard-widgets #dashboard_quick_press form p.submit img.waiting {
+#dashboard-widgets #dashboard_quick_press form p.submit .spinner {
 	vertical-align: middle;
 	visibility: hidden;
 	margin: 4px 6px 0 0;
@@ -6701,6 +6740,10 @@
 	margin-top: 5px;
 }
 
+.button.right, .button-secondary.right, .button-primary.right {
+	float: right;
+}
+
 /* Button Secondary Actions */
 .list-controls {
 	float: left;
@@ -6711,7 +6754,7 @@
 	float: right;
 }
 
-.postbox img.waiting {
+.postbox .spinner {
 	display: none;
 	vertical-align: middle;
 }
@@ -7471,8 +7514,18 @@
 
 #waiting {
 	margin-top: 10px;
+	overflow: hidden;
 }
 
+#waiting span {
+	float: right;
+	margin: 0 0 0 5px;
+}
+
+#waiting .spinner {
+	display: block;
+}
+
 #extra-fields .postbox {
 	margin-bottom: 5px;
 }
@@ -7545,7 +7598,7 @@
 }
 
 /* Submit */
-#saving {
+.press-this #publishing-actions .spinner {
 	display: inline;
 	vertical-align: middle;
 }
@@ -7990,6 +8043,11 @@
 	padding-top: 2px;
 }
 
+.sidebar-name .spinner {
+	float: none;
+	margin: 0 3px -3px;
+}
+
 .sidebar-name-arrow {
 	float: right;
 	height: 29px;
@@ -8179,3 +8237,8 @@
 .locale-lt-lt .inline-edit-row fieldset label span.input-text-wrap {
 	margin-left: 8em;
 }
+
+.update-php .spinner {
+	float: none;
+	margin: -4px 0;
+}
\ No newline at end of file
Index: wp-admin/css/customize-controls-rtl.css
===================================================================
--- wp-admin/css/customize-controls-rtl.css	(revision 22011)
+++ wp-admin/css/customize-controls-rtl.css	(working copy)
@@ -10,7 +10,7 @@
 	float: left;
 }
 
-#customize-header-actions img {
+#customize-header-actions .spinner {
 	float: left;
 	margin-right: 0;
 	margin-left: 4px;
Index: wp-admin/css/customize-controls.css
===================================================================
--- wp-admin/css/customize-controls.css	(revision 22011)
+++ wp-admin/css/customize-controls.css	(working copy)
@@ -160,14 +160,12 @@
 	margin-top: 10px;
 }
 
-#customize-header-actions img {
-	display: none;
-	float: right;
-	margin-top: 13px;
+#customize-header-actions .spinner {
+	margin-top: 16px;
 	margin-right: 4px;
 }
 
-.saving #customize-header-actions img {
+.saving #customize-header-actions .spinner {
 	display: block;
 }
 
Index: wp-admin/widgets.php
===================================================================
--- wp-admin/widgets.php	(revision 22011)
+++ wp-admin/widgets.php	(working copy)
@@ -345,7 +345,7 @@
 			<div class="sidebar-name">
 				<div class="sidebar-name-arrow"><br /></div>
 				<h3><?php echo esc_html( $registered_sidebar['name'] ); ?>
-					<span><img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback" title="" alt="" /></span>
+					<span class="spinner"></span>
 				</h3>
 			</div>
 			<div class="widget-holder inactive">
@@ -380,7 +380,7 @@
 	<div class="sidebar-name">
 	<div class="sidebar-name-arrow"><br /></div>
 	<h3><?php echo esc_html( $registered_sidebar['name'] ); ?>
-	<span><img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback" title="" alt="" /></span></h3></div>
+	<span class="spinner"></span></h3></div>
 	<?php wp_list_widget_controls( $sidebar ); // Show the control forms for each of the widgets in this sidebar ?>
 	</div>
 <?php