diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index ea19a31043..4bc5c2486c 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -139,7 +139,7 @@ function get_comment_author_link() {
 	if ( empty( $url ) || 'http://' == $url )
 		$return = $author;
 	else
-		$return = "<a href='$url' rel='external nofollow'>$author</a>";
+		$return = "<a href='$url' rel='external nofollow' class='url'>$author</a>";
 	return apply_filters('get_comment_author_link', $return);
 }
 
@@ -1149,7 +1149,7 @@ class Walker_Comment extends Walker {
 		<?php endif; ?>
 		<div class="comment-author vcard">
 		<?php if ($args['avatar_size'] != 0) echo get_avatar( $comment, $args['avatar_size'] ); ?>
-		<?php printf(__('<cite>%s</cite> Says:'), get_comment_author_link()) ?>
+		<?php printf(__('<cite class="fn">%s</cite> Says:'), get_comment_author_link()) ?>
 		</div>
 <?php if ($comment->comment_approved == '0') : ?>
 		<em><?php _e('Your comment is awaiting moderation.') ?></em>
@@ -1281,4 +1281,4 @@ function wp_list_comments($args = array(), $comments = null ) {
 	$wp_query->max_num_comment_pages = $walker->max_pages;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 84ebc9c77b..41e8421f18 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -1535,9 +1535,9 @@ function get_avatar( $id_or_email, $size = '96', $default = '', $alt = false ) {
 		if ( !empty( $rating ) )
 			$out .= "&amp;r={$rating}";
 
-		$avatar = "<img alt='{$safe_alt}' src='{$out}' class='avatar avatar-{$size}' height='{$size}' width='{$size}' />";
+		$avatar = "<img alt='{$safe_alt}' src='{$out}' class='avatar avatar-{$size} photo' height='{$size}' width='{$size}' />";
 	} else {
-		$avatar = "<img alt='{$safe_alt}' src='{$default}' class='avatar avatar-{$size} avatar-default' height='{$size}' width='{$size}' />";
+		$avatar = "<img alt='{$safe_alt}' src='{$default}' class='avatar avatar-{$size} photo avatar-default' height='{$size}' width='{$size}' />";
 	}
 
 	return apply_filters('get_avatar', $avatar, $id_or_email, $size, $default, $alt);