diff --git a/components/com_content/views/article/tmpl/default_links.php b/components/com_content/views/article/tmpl/default_links.php
index 60c3350e0dec8..b66fe5967dacb 100644
--- a/components/com_content/views/article/tmpl/default_links.php
+++ b/components/com_content/views/article/tmpl/default_links.php
@@ -60,9 +60,9 @@
 							break;
 						case 3:
 							// open in a modal window
-							JHtml::_('bootstrap.modal');
-							echo '<a href="#webLinkLangModal" role="button" class="btn btn-link" data-toggle="modal" title="' . htmlspecialchars($label) . '">' . htmlspecialchars($label) . ' </a>';
-							echo JHtmlBootstrap::renderModal('webLinkLangModal', array( 'url' => htmlspecialchars($link), 'title' => htmlspecialchars($label),'height' => '600px', 'width' => '600px'));
+							JHtml::_('behavior.modal', 'a.modal');
+							echo '<a class="modal" href="'.htmlspecialchars($link).'"  rel="{handler: \'iframe\', size: {x:600, y:600}}">'.
+							htmlspecialchars($label) . ' </a>';
 							break;
 
 						default:
diff --git a/components/com_content/views/form/tmpl/edit.php b/components/com_content/views/form/tmpl/edit.php
index 2ccf15c6ce473..dd48ee413f033 100644
--- a/components/com_content/views/form/tmpl/edit.php
+++ b/components/com_content/views/form/tmpl/edit.php
@@ -14,7 +14,7 @@
 JHtml::_('behavior.calendar');
 JHtml::_('behavior.formvalidation');
 JHtml::_('formbehavior.chosen', 'select');
-JHtml::_('bootstrap.modal');
+JHtml::_('behavior.modal', 'a.modal_jform_contenthistory');
 
 // Create shortcut to parameters.
 $params = $this->state->get('params');
diff --git a/components/com_weblinks/views/category/tmpl/default_items.php b/components/com_weblinks/views/category/tmpl/default_items.php
index 525ce9f862fd1..ff5be3a04b2f7 100644
--- a/components/com_weblinks/views/category/tmpl/default_items.php
+++ b/components/com_weblinks/views/category/tmpl/default_items.php
@@ -11,7 +11,7 @@
 
 JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
 
-JHtml::_('bootstrap.modal');
+JHtml::_('behavior.framework');
 
 // Create a shortcut for params.
 $params = &$this->item->params;
@@ -115,9 +115,9 @@
 									break;
 								case 3:
 									// Open in a modal window
-									JHtml::_('bootstrap.modal');
-									echo '<a href="#webLinkLangModal" role="button" class="btn btn-link" data-toggle="modal" title="' . $this->escape($item->title) . '">' . $this->escape($item->title) . ' </a>';
-									echo JHtmlBootstrap::renderModal('webLinkLangModal', array( 'url' => $link, 'title' => $this->escape($item->title),'height' => $this->escape($width), 'width' => $this->escape($height)));
+									JHtml::_('behavior.modal', 'a.modal');
+									echo '<a class="modal" href="' . $link . '"  rel="{handler: \'iframe\', size: {x:' . $this->escape($width) . ', y:' . $this->escape($height) . '}}">' .
+									$this->escape($item->title) . ' </a>';
 									break;
 
 								default:
diff --git a/components/com_weblinks/views/form/tmpl/edit.php b/components/com_weblinks/views/form/tmpl/edit.php
index 493f5019cb531..dd9b5d9f531ab 100644
--- a/components/com_weblinks/views/form/tmpl/edit.php
+++ b/components/com_weblinks/views/form/tmpl/edit.php
@@ -12,7 +12,7 @@
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.formvalidation');
 JHtml::_('formbehavior.chosen', 'select');
-JHtml::_('bootstrap.modal');
+JHtml::_('behavior.modal', 'a.modal_jform_contenthistory');
 
 // Create shortcut to parameters.
 $params = $this->state->get('params');
diff --git a/layouts/joomla/toolbar/versions.php b/layouts/joomla/toolbar/versions.php
index 63e7fb1ee6bd6..095ddc1a59a48 100644
--- a/layouts/joomla/toolbar/versions.php
+++ b/layouts/joomla/toolbar/versions.php
@@ -13,7 +13,19 @@
 	. (int) $displayData['itemId'] . '&amp;type_id=' . $displayData['typeId'] . '&amp;type_alias='
 	. $displayData['typeAlias'] . '&amp;' . JSession::getFormToken() . '=1';
 
-echo JHtmlBootstrap::renderModal('versionsModal', array( 'url' => $link, 'title' => JText::_('COM_CONTENTHISTORY_MODAL_TITLE'),'height' => '600px', 'width' => '800px'), '');
+if (JFactory::getApplication()->isAdmin()) {
+	echo JHtmlBootstrap::renderModal('versionsModal', array( 'url' => $link, 'title' => JText::_('COM_CONTENTHISTORY_MODAL_TITLE'),'height' => '600px', 'width' => '800px'), '');
+}
 ?>
+<?php if (JFactory::getApplication()->isAdmin()) : ?>
 <button onclick="jQuery('#versionsModal').modal('show')" class="btn btn-small" data-toggle="modal" title="<?php echo $displayData['title']; ?>">
 <span class="icon-archive"></span><?php echo $displayData['title']; ?></button>
+<?php endif; ?>
+
+<?php if (JFactory::getApplication()->isSite()) : ?>
+<a rel="{handler: 'iframe', size: {x: <?php echo $displayData['height']; ?>, y: <?php echo $displayData['width']; ?>}}"
+	href="index.php?option=com_contenthistory&amp;view=history&amp;layout=modal&amp;tmpl=component&amp;item_id=<?php echo (int) $displayData['itemId']; ?>&amp;type_id=<?php echo $displayData['typeId']; ?>&amp;type_alias=<?php echo $displayData['typeAlias']; ?>&amp;<?php echo JSession::getFormToken(); ?>=1"
+	title="<?php echo $displayData['title']; ?>" class="btn btn-small modal_jform_contenthistory">
+	<i class="icon-archive"></i> <?php echo $displayData['title']; ?>
+</a>
+<?php endif; ?>
diff --git a/libraries/cms/form/field/contenthistory.php b/libraries/cms/form/field/contenthistory.php
index 3abf9472502df..7801e320ea378 100644
--- a/libraries/cms/form/field/contenthistory.php
+++ b/libraries/cms/form/field/contenthistory.php
@@ -43,11 +43,25 @@ protected function getInput()
 			. $this->id . '&amp;item_id=' . $itemId . '&amp;type_id=' . $typeId . '&amp;type_alias='
 			. $this->element['data-typeAlias'] . '&amp;' . JSession::getFormToken() . '=1';
 
-		// Include jQuery
-		JHtml::_('jquery.framework');
-		JHtml::_('bootstrap.modal');
-		$html[] = '<button href="#versionsModal" role="button" class="btn btn-small" data-toggle="modal" title="' . $label . '"><span class="icon-archive"></span>' . $label . '</button>';
-		$html[] = JHtmlBootstrap::renderModal('versionsModal', array( 'url' => $link, 'title' => $label ,'height' => '600px', 'width' => '800px'), '');
+		if (JFactory::getApplication()->isSite())
+		{
+			// Load the modal behavior script.
+			JHtml::_('behavior.modal', 'button.modal_' . $this->id);
+
+			$html[] = '		<button class="btn modal_' . $this->id . '" title="' . $label . '" href="' . $link . '"'
+				. ' rel="{handler: \'iframe\', size: {x: 800, y: 500}}">';
+			$html[] = '<i class="icon-archive"></i>';
+			$html[] = $label;
+			$html[] = '</button>';
+		}
+		elseif (JFactory::getApplication()->isAdmin())
+		{
+			// Include jQuery
+			JHtml::_('jquery.framework');
+			JHtml::_('bootstrap.modal');
+			$html[] = '<button href="#versionsModal" role="button" class="btn btn-small" data-toggle="modal" title="' . $label . '"><span class="icon-archive"></span>' . $label . '</button>';
+			$html[] = JHtmlBootstrap::renderModal('versionsModal', array( 'url' => $link, 'title' => $label ,'height' => '600px', 'width' => '800px'), '');
+		}
 
 		return implode("\n", $html);
 	}