diff --git a/src/wp-content/themes/twentyfourteen/content-aside.php b/src/wp-content/themes/twentyfourteen/content-aside.php
index 5c63527dd5..394d65fe27 100644
--- a/src/wp-content/themes/twentyfourteen/content-aside.php
+++ b/src/wp-content/themes/twentyfourteen/content-aside.php
@@ -9,7 +9,7 @@
 ?>
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-	<?php twentyfourteen_featured_thumbnail(); ?>
+	<?php twentyfourteen_post_thumbnail(); ?>
 
 	<header class="entry-header">
 		<?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
diff --git a/src/wp-content/themes/twentyfourteen/content-gallery.php b/src/wp-content/themes/twentyfourteen/content-gallery.php
index 6542e73b11..e56909aabc 100644
--- a/src/wp-content/themes/twentyfourteen/content-gallery.php
+++ b/src/wp-content/themes/twentyfourteen/content-gallery.php
@@ -25,12 +25,12 @@ endif;
 ?>
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-	<?php if( is_single() && $image ) : ?>
-	<div class="attachment-featured-thumbnail">
+	<?php if ( is_single() && $image ) : ?>
+	<div class="featured-thumbnail">
 		<?php echo wp_get_attachment_image( $image, 'featured-thumbnail-large' ); ?>
 	</div>
 	<?php elseif ( $image ) : ?>
-	<a class="attachment-featured-thumbnail" href="<?php the_permalink(); ?>" rel="<?php the_ID(); ?>">
+	<a class="featured-thumbnail" href="<?php the_permalink(); ?>" rel="<?php the_ID(); ?>">
 		<?php echo wp_get_attachment_image( $image, 'featured-thumbnail-large' ); ?>
 	</a>
 	<?php endif; ?>
diff --git a/src/wp-content/themes/twentyfourteen/content-image.php b/src/wp-content/themes/twentyfourteen/content-image.php
index 63d5620ba4..c600a181c4 100644
--- a/src/wp-content/themes/twentyfourteen/content-image.php
+++ b/src/wp-content/themes/twentyfourteen/content-image.php
@@ -9,7 +9,7 @@
 ?>
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-	<?php twentyfourteen_featured_thumbnail(); ?>
+	<?php twentyfourteen_post_thumbnail(); ?>
 
 	<header class="entry-header">
 		<?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
diff --git a/src/wp-content/themes/twentyfourteen/content-link.php b/src/wp-content/themes/twentyfourteen/content-link.php
index 21c6f1dc78..282d94f46f 100644
--- a/src/wp-content/themes/twentyfourteen/content-link.php
+++ b/src/wp-content/themes/twentyfourteen/content-link.php
@@ -9,7 +9,7 @@
 ?>
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-	<?php twentyfourteen_featured_thumbnail(); ?>
+	<?php twentyfourteen_post_thumbnail(); ?>
 
 	<header class="entry-header">
 		<?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
diff --git a/src/wp-content/themes/twentyfourteen/content-page.php b/src/wp-content/themes/twentyfourteen/content-page.php
index 74175754a5..e1bd6551f3 100644
--- a/src/wp-content/themes/twentyfourteen/content-page.php
+++ b/src/wp-content/themes/twentyfourteen/content-page.php
@@ -9,9 +9,10 @@
 ?>
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-	<?php twentyfourteen_featured_thumbnail(); ?>
-
-	<?php the_title( '<header class="entry-header"><h1 class="entry-title">', '</h1></header><!-- .entry-header -->' ); ?>
+	<?php
+		twentyfourteen_post_thumbnail();
+		the_title( '<header class="entry-header"><h1 class="entry-title">', '</h1></header><!-- .entry-header -->' );
+	?>
 
 	<div class="entry-content">
 		<?php
diff --git a/src/wp-content/themes/twentyfourteen/content-quote.php b/src/wp-content/themes/twentyfourteen/content-quote.php
index fae0dfeb54..515f12ab2e 100644
--- a/src/wp-content/themes/twentyfourteen/content-quote.php
+++ b/src/wp-content/themes/twentyfourteen/content-quote.php
@@ -9,7 +9,7 @@
 ?>
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-	<?php twentyfourteen_featured_thumbnail(); ?>
+	<?php twentyfourteen_post_thumbnail(); ?>
 
 	<header class="entry-header">
 		<?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
diff --git a/src/wp-content/themes/twentyfourteen/content-video.php b/src/wp-content/themes/twentyfourteen/content-video.php
index 570b866a29..1e6c3aa56e 100644
--- a/src/wp-content/themes/twentyfourteen/content-video.php
+++ b/src/wp-content/themes/twentyfourteen/content-video.php
@@ -9,7 +9,7 @@
 ?>
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-	<?php twentyfourteen_featured_thumbnail(); ?>
+	<?php twentyfourteen_post_thumbnail(); ?>
 
 	<header class="entry-header">
 		<?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
diff --git a/src/wp-content/themes/twentyfourteen/content.php b/src/wp-content/themes/twentyfourteen/content.php
index da86e52bda..30e5ad6b56 100644
--- a/src/wp-content/themes/twentyfourteen/content.php
+++ b/src/wp-content/themes/twentyfourteen/content.php
@@ -11,7 +11,7 @@
 ?>
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-	<?php twentyfourteen_featured_thumbnail(); ?>
+	<?php twentyfourteen_post_thumbnail(); ?>
 
 	<header class="entry-header">
 		<?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
diff --git a/src/wp-content/themes/twentyfourteen/inc/customizer.php b/src/wp-content/themes/twentyfourteen/inc/customizer.php
index 04bd944af8..725585a01a 100644
--- a/src/wp-content/themes/twentyfourteen/inc/customizer.php
+++ b/src/wp-content/themes/twentyfourteen/inc/customizer.php
@@ -18,7 +18,7 @@ function twentyfourteen_customize_register( $wp_customize ) {
 	// Add postMessage support for site title and description.
 	$wp_customize->get_setting( 'blogname' )->transport        = 'postMessage';
 	$wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
-	
+
 	// Add the custom accent color setting and control.
 	$wp_customize->add_setting( 'accent_color', array(
 		'default'           => '#24890d',
diff --git a/src/wp-content/themes/twentyfourteen/inc/template-tags.php b/src/wp-content/themes/twentyfourteen/inc/template-tags.php
index ec5708a15d..e2c00754db 100644
--- a/src/wp-content/themes/twentyfourteen/inc/template-tags.php
+++ b/src/wp-content/themes/twentyfourteen/inc/template-tags.php
@@ -155,26 +155,31 @@ add_action( 'edit_category', 'twentyfourteen_category_transient_flusher' );
 add_action( 'save_post',     'twentyfourteen_category_transient_flusher' );
 
 /**
- * Display featured image with appropriate HTML tag.
- *
- * @since Twenty Fourteen 1.0
+ * Displays an optional featured image, with an anchor element
+ * when on index views, and a div element when on a single view.
  *
  * @return void
- */
-function twentyfourteen_featured_thumbnail() {
-	if ( ! post_password_required() ) :
-		if ( has_post_thumbnail() && is_singular() ) :
-		?>
-			<div class="attachment-featured-thumbnail">
-				<?php the_post_thumbnail( 'featured-thumbnail-large' ); ?>
-			</div>
-		<?php
-		else :
-		?>
-			<a href="<?php the_permalink(); ?>" rel="<?php the_ID(); ?>" class="attachment-featured-thumbnail">
-				<?php the_post_thumbnail( 'featured-thumbnail-large' ); ?>
-			</a>
-		<?php
-		endif;
-	endif;
-}
\ No newline at end of file
+*/
+function twentyfourteen_post_thumbnail() {
+	if ( post_password_required() )
+		return;
+
+	if ( is_singular() ) :
+	?>
+
+	<div class="featured-thumbnail">
+		<?php the_post_thumbnail( 'featured-thumbnail-large' ); ?>
+	</div>
+
+	<?php else : ?>
+
+	<a class="featured-thumbnail" href="<?php the_permalink(); ?>" rel="<?php the_ID(); ?>">
+	<?php if ( has_post_thumbnail() ) :
+		the_post_thumbnail( 'featured-thumbnail-large' );
+	else : ?>
+		<p class="screen-reader-text"><?php _e( 'No featured image.', 'twentyfourteen' ); ?></p>
+	<?php endif; ?>
+	</a>
+
+	<?php endif; // End is_singular()
+}
diff --git a/src/wp-content/themes/twentyfourteen/rtl.css b/src/wp-content/themes/twentyfourteen/rtl.css
index f1ae15b930..4821067a3f 100644
--- a/src/wp-content/themes/twentyfourteen/rtl.css
+++ b/src/wp-content/themes/twentyfourteen/rtl.css
@@ -367,7 +367,7 @@ blockquote.alignleft {
 
 /* Mobile list style */
 @media screen and (max-width: 400px) {
-	.list-view .attachment-featured-thumbnail img {
+	.list-view .featured-thumbnail img {
 		float: right;
 		margin: 0 0 3px 10px;
 	}
diff --git a/src/wp-content/themes/twentyfourteen/style.css b/src/wp-content/themes/twentyfourteen/style.css
index 5890f69178..bac494012c 100644
--- a/src/wp-content/themes/twentyfourteen/style.css
+++ b/src/wp-content/themes/twentyfourteen/style.css
@@ -560,7 +560,7 @@ img.wp-post-image {
 }
 
 .attachment-featured-featured img,
-.attachment-featured-thumbnail img {
+.featured-thumbnail img {
 	height: auto;
 	max-width: 100%;
 }
@@ -1107,7 +1107,7 @@ span + .edit-link:before,
  * -----------------------------------------------------------------------------
  */
 
- .attachment-featured-thumbnail {
+ .featured-thumbnail {
 	background: #767676;
 	background-attachment: fixed;
 	background-image: -webkit-linear-gradient(135deg, #767676 12.5%, #fff 12.5%, #fff 50%, #767676 50%, #767676 62.5%, #fff 62.5%);
@@ -1123,7 +1123,7 @@ span + .edit-link:before,
 	z-index: 0;
 }
 
-.attachment-featured-thumbnail:hover {
+.featured-thumbnail:hover {
 	background: #919191;
 	background-attachment: fixed;
 	background-image: -webkit-linear-gradient(135deg, #919191 12.5%, #fff 12.5%, #fff 50%, #919191 50%, #919191 62.5%, #fff 62.5%);
@@ -1131,13 +1131,13 @@ span + .edit-link:before,
 	background-size: 4px 4px;
 }
 
-.attachment-featured-thumbnail img {
+.featured-thumbnail img {
 	display: block;
 	margin: 0 auto;
 }
 
-.has-featured-image .attachment-featured-thumbnail,
-.format-standard .attachment-featured-thumbnail {
+.has-featured-image .featured-thumbnail,
+.format-standard .featured-thumbnail {
 	display: block;
 }
 
@@ -2637,14 +2637,14 @@ span + .edit-link:before,
  */
 
 @media screen and (max-width: 400px) {
-	.list-view .attachment-featured-thumbnail {
+	.list-view .featured-thumbnail {
 		background: none;
 		min-height: 0;
 		width: auto;
 		z-index: 2;
 	}
 
-	.list-view .attachment-featured-thumbnail img {
+	.list-view .featured-thumbnail img {
 		float: left;
 		margin: 0 10px 3px 0;
 		width: 84px;
@@ -2707,7 +2707,7 @@ span + .edit-link:before,
 }
 
 @media screen and (min-width: 401px) {
-	a.attachment-featured-thumbnail:hover img {
+	a.featured-thumbnail:hover img {
 		opacity: 0.85;
 	}
 
@@ -2809,8 +2809,8 @@ span + .edit-link:before,
 		margin: -3px 2px 0 0;
 	}
 
-	.list-view .site-content .has-featured-image .attachment-featured-thumbnail,
-	.list-view .site-content .format-standard .attachment-featured-thumbnail {
+	.list-view .site-content .has-featured-image .featured-thumbnail,
+	.list-view .site-content .format-standard .featured-thumbnail {
 		margin-top: -49px;
 	}