diff --git a/content.php b/content.php
index e0691ee..64a83d7 100755
--- a/content.php
+++ b/content.php
@@ -24,7 +24,7 @@
 			</h2>
 		<?php endif; ?>
 		<h1 class="entry-title p-name">
-			<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'independent-publisher' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php the_title(); ?></a>
+			<a href="<?php the_permalink(); ?>" title="<?php echo independent_publisher_post_link_title(); ?>" rel="bookmark"><?php the_title(); ?></a>
 		</h1>
 	</header>
 	<!-- .entry-header -->
@@ -39,7 +39,7 @@
 
 			<?php /* Only show featured image for Standard post and gallery post formats */ ?>
 			<?php if ( has_post_thumbnail() && in_array( get_post_format(), array( 'gallery', false ) ) ) : ?>
-				<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'independent-publisher' ), the_title_attribute( 'echo=0' ) ) ); ?>"><?php the_post_thumbnail( 'independent_publisher_post_thumbnail' ); ?></a>
+				<a href="<?php the_permalink(); ?>" title="<?php echo independent_publisher_post_thumbnail_link_title(); ?>"><?php the_post_thumbnail( 'independent_publisher_post_thumbnail' ); ?></a>
 			<?php endif; ?>
 
 			<?php the_content( independent_publisher_continue_reading_text() ); ?>
diff --git a/functions.php b/functions.php
index 8f5687e..065fff8 100755
--- a/functions.php
+++ b/functions.php
@@ -1187,7 +1187,7 @@ function independent_publisher_maybe_linkify_the_content( $content ) {
 			$content = independent_publisher_clean_content( $content );
 
 			// Now we can link the Quote or Aside content to itself
-			$content = '<a href="' . get_permalink() . '" rel="bookmark" title="' . esc_attr( sprintf( __( 'Permalink to %s', 'independent-publisher' ), the_title_attribute( 'echo=0' ) ) ) . '">' . $content . '</a>';
+			$content = '<a href="' . get_permalink() . '" rel="bookmark" title="' . independent_publisher_post_link_title() . '">' . $content . '</a>';
 		}
 
 		return $content;
@@ -1202,7 +1202,7 @@ function independent_publisher_maybe_linkify_the_content( $content ) {
 	 */
 	function independent_publisher_maybe_linkify_the_excerpt( $content ) {
 		if ( !is_single() ) {
-			$content = '<a href="' . get_permalink() . '" rel="bookmark" title="' . esc_attr( sprintf( __( 'Permalink to %s', 'independent-publisher' ), the_title_attribute( 'echo=0' ) ) ) . '">' . $content . '</a>';
+			$content = '<a href="' . get_permalink() . '" rel="bookmark" title="' . independent_publisher_post_link_title() . '">' . $content . '</a>';
 		}
 
 		return $content;
@@ -1295,3 +1295,23 @@ function independent_publisher_show_page_load_progress_bar() { ?>
 		<?php
 	}
 endif;
+
+if ( ! function_exists( 'independent_publisher_post_thumbnail_link_title' ) ) :
+	function independent_publisher_post_thumbnail_link_title() {
+		return independent_publisher_post_link_title_common();
+	}
+endif;
+
+if ( ! function_exists( 'independent_publisher_post_link_title' ) ) :
+	function independent_publisher_post_link_title() {
+		return independent_publisher_post_link_title_common();
+	}
+endif;
+
+if ( ! function_exists( 'independent_publisher_post_link_title_common' ) ) :
+	function independent_publisher_post_link_title_common() {
+		return esc_attr( sprintf( __( 'Permalink to %s', 'independent-publisher' ), the_title_attribute( 'echo=0' ) ) );
+	}
+endif;
+
+?>
\ No newline at end of file