diff --git a/administrator/components/com_messages/views/config/tmpl/default.php b/administrator/components/com_messages/views/config/tmpl/default.php
index 6bdf386b4f029..a28589c548434 100644
--- a/administrator/components/com_messages/views/config/tmpl/default.php
+++ b/administrator/components/com_messages/views/config/tmpl/default.php
@@ -14,7 +14,6 @@
 
 JHtml::_('behavior.formvalidator');
 JHtml::_('behavior.keepalive');
-JHtml::_('behavior.modal');
 
 JFactory::getDocument()->addScriptDeclaration("
 		Joomla.submitbutton = function(task)
@@ -24,49 +23,17 @@
 				Joomla.submitform(task, document.getElementById('config-form'));
 			}
 		};
+
 ");
 ?>
-<form action="<?php echo JRoute::_('index.php?option=com_messages'); ?>" method="post" name="adminForm" id="message-form" class="form-validate form-horizontal">
+<form action="<?php echo JRoute::_('index.php?option=com_messages&view=config'); ?>" method="post" name="adminForm" id="message-form" class="form-validate form-horizontal">
 	<fieldset>
-		<div>
-			<div class="modal-header">
-				<h3><?php echo JText::_('COM_MESSAGES_MY_SETTINGS');?></h3>
-			</div>
-			<div class="modal-body">
-				<button class="btn btn-primary" type="submit" onclick="Joomla.submitform('config.save', this.form);window.top.setTimeout('window.parent.jModalClose()', 700);">
-					<?php echo JText::_('JSAVE');?></button>
-				<button class="btn" type="button" onclick="window.parent.jModalClose();">
-					<?php echo JText::_('JCANCEL');?></button>
-				<hr />
-				<div class="control-group">
-					<div class="control-label">
-						<?php echo $this->form->getLabel('lock'); ?>
-					</div>
-					<div class="controls">
-						<?php echo $this->form->getInput('lock'); ?>
-					</div>
-				</div>
-				<div class="control-group">
-					<div class="control-label">
-						<?php echo $this->form->getLabel('mail_on_new'); ?>
-					</div>
-					<div class="controls">
-						<?php echo $this->form->getInput('mail_on_new'); ?>
-					</div>
-				</div>
-				<div class="control-group">
-					<div class="control-label">
-						<?php echo $this->form->getLabel('auto_purge'); ?>
-					</div>
-					<div class="controls">
-						<?php echo $this->form->getInput('auto_purge'); ?>
-					</div>
-				</div>
-
-			</div>
-		</div>
-		</fieldset>
-		<input type="hidden" name="task" value="" />
-		<?php echo JHtml::_('form.token'); ?>
+		<?php echo $this->form->renderField('lock'); ?>
+		<?php echo $this->form->renderField('mail_on_new'); ?>
+		<?php echo $this->form->renderField('auto_purge'); ?>
+	</fieldset>
+	<button id="saveBtn" type="button" class="hidden" onclick="Joomla.submitform('config.save', this.form);"></button>
 
-</form>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
\ No newline at end of file
diff --git a/administrator/components/com_messages/views/message/tmpl/default.php b/administrator/components/com_messages/views/message/tmpl/default.php
index 7d06848920986..a5963e7c26345 100644
--- a/administrator/components/com_messages/views/message/tmpl/default.php
+++ b/administrator/components/com_messages/views/message/tmpl/default.php
@@ -8,7 +8,7 @@
  */
 
 defined('_JEXEC') or die;
-JHtml::_('behavior.framework');
+JHtml::_('behavior.core');
 JHtml::_('formbehavior.chosen', 'select');
 ?>
 <form action="<?php echo JRoute::_('index.php?option=com_messages'); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
diff --git a/administrator/components/com_messages/views/messages/tmpl/default.php b/administrator/components/com_messages/views/messages/tmpl/default.php
index 9c33de250f9ac..f3ee32f5cdab4 100644
--- a/administrator/components/com_messages/views/messages/tmpl/default.php
+++ b/administrator/components/com_messages/views/messages/tmpl/default.php
@@ -16,9 +16,21 @@
 JHtml::_('behavior.multiselect');
 JHtml::_('formbehavior.chosen', 'select');
 
-$user		= JFactory::getUser();
-$listOrder	= $this->escape($this->state->get('list.ordering'));
-$listDirn	= $this->escape($this->state->get('list.direction'));
+$user      = JFactory::getUser();
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+
+JFactory::getDocument()->addStyleDeclaration(
+	"
+	@media (min-width: 768px) {
+		div.modal {
+			left: none;
+			width: 500px;
+			margin-left: -250px;
+		}
+	}
+	"
+);
 ?>
 
 <form action="<?php echo JRoute::_('index.php?option=com_messages&view=messages'); ?>" method="post" name="adminForm" id="adminForm">
@@ -113,4 +125,4 @@
 			<?php echo JHtml::_('form.token'); ?>
 		</div>
 	</div>
-</form>
+</form>
\ No newline at end of file
diff --git a/administrator/components/com_messages/views/messages/view.html.php b/administrator/components/com_messages/views/messages/view.html.php
index 00e84b36ea5bc..866fc3a510ab2 100644
--- a/administrator/components/com_messages/views/messages/view.html.php
+++ b/administrator/components/com_messages/views/messages/view.html.php
@@ -8,7 +8,6 @@
  */
 
 defined('_JEXEC') or die;
-JHtml::_('behavior.modal');
 
 /**
  * View class for a list of messages.
@@ -34,9 +33,9 @@ class MessagesViewMessages extends JViewLegacy
 	 */
 	public function display($tpl = null)
 	{
-		$this->items		= $this->get('Items');
-		$this->pagination	= $this->get('Pagination');
-		$this->state		= $this->get('State');
+		$this->items      = $this->get('Items');
+		$this->pagination = $this->get('Pagination');
+		$this->state      = $this->get('State');
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -60,8 +59,8 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		$state	= $this->get('State');
-		$canDo	= JHelperContent::getActions('com_messages');
+		$state = $this->get('State');
+		$canDo = JHelperContent::getActions('com_messages');
 
 		JToolbarHelper::title(JText::_('COM_MESSAGES_MANAGER_MESSAGES'), 'envelope inbox');
 
@@ -79,12 +78,23 @@ protected function addToolbar()
 
 		JToolbarHelper::divider();
 		$bar = JToolBar::getInstance('toolbar');
-
-		// Instantiate a new JLayoutFile instance and render the layout
-		JHtml::_('behavior.modal', 'a.messagesSettings');
-		$layout = new JLayoutFile('toolbar.mysettings');
-
-		$bar->appendButton('Custom', $layout->render(array()), 'upload');
+		$bar->appendButton(
+			'Popup',
+			'cog',
+			'COM_MESSAGES_TOOLBAR_MY_SETTINGS',
+			'index.php?option=com_messages&amp;view=config&amp;tmpl=component',
+			500,
+			250,
+			0,
+			0,
+			'',
+			'',
+			'<button class="btn" type="button" data-dismiss="modal" aria-hidden="true">'
+				. JText::_('JCANCEL') 
+				. '</button><button class="btn btn-success" type="button" data-dismiss="modal" aria-hidden="true"onclick="jQuery(\'#modal-cog iframe\').contents().find(\'#saveBtn\').click();">' 
+				. JText::_('JSAVE') 
+				. '</button>'
+		);
 
 		if ($state->get('filter.state') == -2 && $canDo->get('core.delete'))
 		{
@@ -105,4 +115,4 @@ protected function addToolbar()
 		JToolbarHelper::divider();
 		JToolbarHelper::help('JHELP_COMPONENTS_MESSAGING_INBOX');
 	}
-}
+}
\ No newline at end of file
diff --git a/components/com_content/views/article/tmpl/default.php b/components/com_content/views/article/tmpl/default.php
index 1b7201f206133..bcf569e68ee81 100644
--- a/components/com_content/views/article/tmpl/default.php
+++ b/components/com_content/views/article/tmpl/default.php
@@ -11,6 +11,9 @@
 
 JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
 
+// Only required for legacy captions. This should be removed in j4.
+JHtml::_('behavior.caption');
+
 // Create shortcuts to some parameters.
 $params  = $this->item->params;
 $images  = json_decode($this->item->images);
@@ -18,7 +21,7 @@
 $canEdit = $params->get('access-edit');
 $user    = JFactory::getUser();
 $info    = $params->get('info_block_position', 0);
-JHtml::_('behavior.caption');
+
 ?>
 <div class="item-page<?php echo $this->pageclass_sfx; ?>" itemscope itemtype="http://schema.org/Article">
 	<meta itemprop="inLanguage" content="<?php echo ($this->item->language === '*') ? JFactory::getConfig()->get('language') : $this->item->language; ?>" />
@@ -90,15 +93,18 @@
 		|| (empty($urls->urls_position) && (!$params->get('urls_position')))) : ?>
 	<?php echo $this->loadTemplate('links'); ?>
 	<?php endif; ?>
-	<?php if ($params->get('access-view')):?>
-	<?php if (isset($images->image_fulltext) && !empty($images->image_fulltext)) : ?>
+	<?php if ($params->get('access-view')) : ?>
 	<?php $imgfloat = (empty($images->float_fulltext)) ? $params->get('float_fulltext') : $images->float_fulltext; ?>
-	<div class="pull-<?php echo htmlspecialchars($imgfloat); ?> item-image"> <img
-	<?php if ($images->image_fulltext_caption):
-		echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_fulltext_caption) . '"';
-	endif; ?>
-	src="<?php echo htmlspecialchars($images->image_fulltext); ?>" alt="<?php echo htmlspecialchars($images->image_fulltext_alt); ?>" itemprop="image"/> </div>
-	<?php endif; ?>
+	<figure class="pull-<?php echo htmlspecialchars($imgfloat); ?> item-image">
+		<img
+		<?php if ($images->image_fulltext_caption) : ?>
+			<?php echo 'title="' .htmlspecialchars($images->image_fulltext_caption) . '"'; ?>
+		<?php endif; ?>
+		src="<?php echo htmlspecialchars($images->image_fulltext); ?>" alt="<?php echo htmlspecialchars($images->image_fulltext_alt); ?>"/>
+		<?php if ($images->image_fulltext_caption) : ?>
+			<figcaption><?php echo htmlspecialchars($images->image_fulltext_caption); ?></figcaption>
+		<?php endif; ?>
+	</figure>
 	<?php
 	if (!empty($this->item->pagination) && $this->item->pagination && !$this->item->paginationposition && !$this->item->paginationrelative):
 		echo $this->item->pagination;
diff --git a/components/com_content/views/category/tmpl/blog.php b/components/com_content/views/category/tmpl/blog.php
index 8a5bb822cbe49..04a357e70383e 100644
--- a/components/com_content/views/category/tmpl/blog.php
+++ b/components/com_content/views/category/tmpl/blog.php
@@ -11,7 +11,9 @@
 
 JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
 
+// Only required for legacy captions. This should be removed in j4.
 JHtml::_('behavior.caption');
+
 ?>
 <div class="blog<?php echo $this->pageclass_sfx; ?>" itemscope itemtype="http://schema.org/Blog">
 	<?php if ($this->params->get('show_page_heading')) : ?>
diff --git a/components/com_content/views/featured/tmpl/default.php b/components/com_content/views/featured/tmpl/default.php
index 884da2a465fda..16b4641070c11 100644
--- a/components/com_content/views/featured/tmpl/default.php
+++ b/components/com_content/views/featured/tmpl/default.php
@@ -11,6 +11,7 @@
 
 JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
 
+// Only required for legacy captions. This should be removed in j4.
 JHtml::_('behavior.caption');
 
 // If the page class is defined, add to class as suffix.
diff --git a/components/com_content/views/featured/tmpl/default_item.php b/components/com_content/views/featured/tmpl/default_item.php
index 048ac1ab186d1..4df6df2aedb1c 100644
--- a/components/com_content/views/featured/tmpl/default_item.php
+++ b/components/com_content/views/featured/tmpl/default_item.php
@@ -56,14 +56,7 @@
 	<?php echo JLayoutHelper::render('joomla.content.info_block.block', array('item' => $this->item, 'params' => $params, 'position' => 'above')); ?>
 <?php endif; ?>
 
-<?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"> <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); ?>"/> </div>
-<?php endif; ?>
+<?php echo JLayoutHelper::render('joomla.content.intro_image', $this->item); ?>
 
 <?php if (!$params->get('show_intro')) : ?>
 	<?php echo $this->item->event->afterDisplayTitle; ?>
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; ?>
diff --git a/libraries/cms/html/behavior.php b/libraries/cms/html/behavior.php
index 1c07cf22c1fbc..aa1ef7cddd856 100644
--- a/libraries/cms/html/behavior.php
+++ b/libraries/cms/html/behavior.php
@@ -99,9 +99,13 @@ public static function core()
 	 * @return  void
 	 *
 	 * @since   1.5
+	 *
+	 * @deprecated 4.0 Use the layout (layouts/joomla/content/intro_image.php) instead
 	 */
 	public static function caption($selector = 'img.caption')
 	{
+		JLog::add('The use of caption is deprecated use the layout (layouts/joomla/content/intro_image.php) instead.', JLog::WARNING, 'deprecated');
+
 		// Only load once
 		if (isset(static::$loaded[__METHOD__][$selector]))
 		{
@@ -136,7 +140,7 @@ public static function caption($selector = 'img.caption')
 	 *
 	 * @since   1.5
 	 *
-	 * @Deprecated 3.4 Use formvalidator instead
+	 * @deprecated 4.0 Use formvalidator instead
 	 */
 	public static function formvalidation()
 	{