Index: wp-content/themes/twentythirteen/style.css
===================================================================
--- wp-content/themes/twentythirteen/style.css	(revision 23465)
+++ wp-content/themes/twentythirteen/style.css	(working copy)
@@ -2223,12 +2223,17 @@
 }
 
 .comment-author .fn,
+.comment-meta .fn,
 .comment-reply-link {
 	color: #ed331c;
 	font-size: 14px;
 	font-style: normal;
 }
 
+.comment-meta .fn a {
+	color: #f94a0a;
+}
+
 .bypostauthor .fn:before {
 	content: '\f408';
 }
@@ -2246,6 +2251,12 @@
 	width:         calc(100% - 124px);
 }
 
+.comment.no-avatar .comment-meta,
+.comment.no-avatar .comment-content,
+.comment.no-avatar .reply {
+	width: 100%;
+}
+
 .comment-meta,
 .comment-meta a {
 	color: #a2a2a2;
Index: wp-content/themes/twentythirteen/functions.php
===================================================================
--- wp-content/themes/twentythirteen/functions.php	(revision 23465)
+++ wp-content/themes/twentythirteen/functions.php	(working copy)
@@ -343,13 +343,19 @@
 		// Proceed with normal comments.
 	?>
 	<li id="li-comment-<?php comment_ID(); ?>">
+		<?php $show_avatars = get_option( 'show_avatars' ); ?>
 		<article id="comment-<?php comment_ID(); ?>" <?php comment_class(); ?>>
+			<?php if ( $show_avatars ) : ?>
 			<div class="comment-author vcard">
 				<?php echo get_avatar( $comment, 74 ); ?>
 				<cite class="fn"><?php comment_author_link(); ?></cite>
 			</div><!-- .comment-author -->
+			<?php endif; ?>
 
 			<header class="comment-meta">
+				<?php if ( ! $show_avatars ) : ?>
+				<cite class="fn"><?php comment_author_link(); ?></cite> &middot;
+				<?php endif; ?>
 				<?php
 					printf( '<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
 						esc_url( get_comment_link( $comment->comment_ID ) ),
@@ -378,6 +384,23 @@
 }
 endif;
 
+/**
+ * Extends the default WordPress comment class to denote wheter showing avatars
+ * is enabled.
+ *
+ * @since Twenty Thirteen 1.0
+ *
+ * @param array $classes Existing class values.
+ * @return array Filtered class values.
+ */
+function twentythirteen_comment_class( $classes ) {
+	if ( ! get_option( 'show_avatars' ) )
+		$classes[] = 'no-avatar';
+
+	return $classes;
+}
+add_filter( 'comment_class', 'twentythirteen_comment_class' );
+
 if ( ! function_exists( 'twentythirteen_entry_meta' ) ) :
 /**
  * Prints HTML with meta information for current post: categories, tags, permalink, author, and date.