diff --git a/layouts/joomla/content/intro_image.php b/layouts/joomla/content/intro_image.php
index 4a7b1a1f85d19..2503234dd5cf3 100644
--- a/layouts/joomla/content/intro_image.php
+++ b/layouts/joomla/content/intro_image.php
@@ -8,23 +8,21 @@
  */
 
 defined('_JEXEC') or die;
-$params  = $displayData->params;
+
+$params = $displayData->params;
+$images = json_decode($displayData->images);
+
 ?>
-<?php $images = json_decode($displayData->images); ?>
 <?php if (isset($images->image_intro) && !empty($images->image_intro)) : ?>
 	<?php $imgfloat = (empty($images->float_intro)) ? $params->get('float_intro') : $images->float_intro; ?>
-	<div class="pull-<?php echo htmlspecialchars($imgfloat); ?> item-image"> 
-	<?php if ($params->get('link_titles') && $params->get('access-view')) : ?>
-	<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($displayData->slug, $displayData->catid, $displayData->language)); ?>"><img
-	<?php if ($images->image_intro_caption):
-		echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_intro_caption) . '"';
-	endif; ?>
-	src="<?php echo htmlspecialchars($images->image_intro); ?>" alt="<?php echo htmlspecialchars($images->image_intro_alt); ?>" itemprop="thumbnailUrl"/></a>
-	<?php else : ?><img
-	<?php if ($images->image_intro_caption):
-		echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_intro_caption) . '"';
-	endif; ?>
-	src="<?php echo htmlspecialchars($images->image_intro); ?>" alt="<?php echo htmlspecialchars($images->image_intro_alt); ?>" itemprop="thumbnailUrl"/>
-	<?php endif; ?> 
-</div>
+	<figure class="pull-<?php echo htmlspecialchars($imgfloat); ?> item-image">
+		<img
+		<?php if ($images->image_intro_caption) : ?>
+			<?php echo 'title="' .htmlspecialchars($images->image_intro_caption) .'"'; ?>
+		<?php endif; ?>
+		src="<?php echo htmlspecialchars($images->image_intro); ?>" alt="<?php echo htmlspecialchars($images->image_intro_alt); ?>"/>
+		<?php if ($images->image_intro_caption) : ?>
+			<figcaption><?php echo htmlspecialchars($images->image_intro_caption); ?></figcaption>
+		<?php endif; ?>
+	</figure>
 <?php endif; ?>