diff --git a/admin-dev/themes/default/template/content.tpl b/admin-dev/themes/default/template/content.tpl
index dc873ec14..9fb652427 100644
--- a/admin-dev/themes/default/template/content.tpl
+++ b/admin-dev/themes/default/template/content.tpl
@@ -24,5 +24,8 @@
 *}
 
 {if isset($content)}
+	{if isset($show_page_header_toolbar) && $show_page_header_toolbar}
+		{include file="page_header_toolbar.tpl" toolbar_btn=$page_header_toolbar_btn title=$page_header_toolbar_title}
+	{/if}
 	{$content}
 {/if}
diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl
index 62fadca9c..f620327f4 100644
--- a/admin-dev/themes/default/template/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl
@@ -76,6 +76,7 @@
 	<fieldset class="col-lg-12">
 		<div class="panel-heading">
 			{if is_array($title)}{$title|end}{else}{$title}{/if}
+			{if isset($toolbar_btn) && count($toolbar_btn) >0}
 			<span class="panel-heading-action">
 			{foreach from=$toolbar_btn item=btn key=k}
 				<a id="desc-{$table}-{if isset($btn.imgclass)}{$btn.imgclass}{else}{$k}{/if}" class="list-tooolbar-btn" {if isset($btn.href)}href="{$btn.href}"{/if} title="{$btn.desc}" {if isset($btn.target) && $btn.target}target="_blank"{/if}{if isset($btn.js) && $btn.js}onclick="{$btn.js}"{/if}>
@@ -99,6 +100,7 @@
 				{/if}
 			{/foreach}
 			</span>
+			{/if}
 			{if $show_toolbar}
 			<script language="javascript" type="text/javascript">
 			//<![CDATA[
diff --git a/admin-dev/themes/default/template/page_header_toolbar.tpl b/admin-dev/themes/default/template/page_header_toolbar.tpl
new file mode 100644
index 000000000..9008cbe2d
--- /dev/null
+++ b/admin-dev/themes/default/template/page_header_toolbar.tpl
@@ -0,0 +1,200 @@
+{*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+<div class="page-head">
+	{block name=pageTitle}
+	<h2 class="page-title">
+		{if is_array($title)}{$title|end}{else}{$title}{/if}
+	</h2>
+	{/block}
+
+	<div class="page-bar toolbarBox">
+		<div class="btn-toolbar">
+			{block name=toolbarBox}
+			<ul class="cc_button nav nav-pills pull-right">
+				{foreach from=$toolbar_btn item=btn key=k}
+				<li>
+					<a id="page-header-desc-{$table}-{if isset($btn.imgclass)}{$btn.imgclass}{else}{$k}{/if}" class="toolbar_btn" {if isset($btn.href)}href="{$btn.href}"{/if} title="{$btn.desc}" {if isset($btn.target) && $btn.target}target="_blank"{/if}{if isset($btn.js) && $btn.js}onclick="{$btn.js}"{/if}>
+						<i class="{if isset($btn.icon)}{$btn.icon}{else}process-icon-{if isset($btn.imgclass)}{$btn.imgclass}{else}{$k}{/if}{/if} {if isset($btn.class)}{$btn.class}{/if}" ></i>
+						<div {if isset($btn.force_desc) && $btn.force_desc == true } class="locked" {/if}>{$btn.desc}</div>
+					</a>
+					{if $k == 'modules-list'}
+					<div class="modal fade" id="modules_list_container">
+						<div class="modal-dialog">
+							<div class="modal-content">
+								<div class="modal-header">
+									<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+									<h3 class="modal-title">{l s='Modules'}</h3>
+								</div>
+								<div class="modal-body">
+									<div id="modules_list_container_tab" style="display:none;"></div>
+									<div id="modules_list_loader"><img src="../img/loader.gif" alt=""/></div>
+								</div>
+							</div>
+						</div>
+					</div>
+					{/if}
+				</li>
+				{/foreach}
+			</ul>
+
+			<script language="javascript" type="text/javascript">
+			//<![CDATA[
+				var submited = false
+				var modules_list_loaded = false;
+				$(function() {
+					//get reference on save link
+					btn_save = $('i[class~="process-icon-save"]').parent();
+
+					//get reference on form submit button
+					btn_submit = $('#{$table}_form_submit_btn');
+
+					if (btn_save.length > 0 && btn_submit.length > 0)
+					{
+						//get reference on save and stay link
+						btn_save_and_stay = $('i[class~="process-icon-save-and-stay"]').parent();
+
+						//get reference on current save link label
+						lbl_save = $('#desc-{$table}-save div');
+
+						//override save link label with submit button value
+						if (btn_submit.val().length > 0)
+							lbl_save.html(btn_submit.attr("value"));
+
+						if (btn_save_and_stay.length > 0)
+						{
+
+							//get reference on current save link label
+							lbl_save_and_stay = $('#desc-{$table}-save-and-stay div');
+
+							//override save and stay link label with submit button value
+							if (btn_submit.val().length > 0 && lbl_save_and_stay && !lbl_save_and_stay.hasClass('locked'))
+							{
+								lbl_save_and_stay.html(btn_submit.val() + " {l s='and stay'} ");
+							}
+
+						}
+
+						//hide standard submit button
+						btn_submit.hide();
+						//bind enter key press to validate form
+						$('#{$table}_form').keypress(function (e) {
+							if (e.which == 13 && e.target.localName != 'textarea')
+								$('#desc-{$table}-save').click();
+						});
+						//submit the form
+						{block name=formSubmit}
+							btn_save.click(function() {
+								// Avoid double click
+								if (submited)
+									return false;
+								submited = true;
+								
+								//add hidden input to emulate submit button click when posting the form -> field name posted
+								btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'" value="1" />');
+
+								$('#{$table}_form').submit();
+								return false;
+							});
+
+							if (btn_save_and_stay)
+							{
+								btn_save_and_stay.click(function() {
+									//add hidden input to emulate submit button click when posting the form -> field name posted
+									btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'AndStay" value="1" />');
+
+									$('#{$table}_form').submit();
+									return false;
+								});
+							}
+						{/block}
+					}
+					{if isset($tab_modules_open)}
+						if ({$tab_modules_open})
+							openModulesList();
+					{/if}
+				});
+				{if isset($tab_modules_list)}
+				$('.process-icon-modules-list').parent('a').unbind().bind('click', function (){
+					openModulesList();
+				});
+				
+				function openModulesList()
+				{
+					$('#modules_list_container').modal('show');
+					if (!modules_list_loaded)
+					{
+						$.ajax({
+							type: "POST",
+							url : '{$admin_module_ajax_url}',
+							async: true,
+							data : {
+								ajax : "1",
+								controller : "AdminModules",
+								action : "getTabModulesList",
+								tab_modules_list : '{$tab_modules_list}',
+								back_tab_modules_list : '{$back_tab_modules_list}'
+							},
+							success : function(data)
+							{
+								$('#modules_list_container_tab').html(data).slideDown();
+								$('#modules_list_loader').hide();
+								modules_list_loaded = true;
+							}
+						});
+					}
+					else
+					{
+						$('#modules_list_container_tab').slideDown();
+						$('#modules_list_loader').hide();
+					}
+					return false;
+				}
+				{/if}
+			//]]>
+			</script>
+			{/block}
+		</div>
+	</div>
+</div>
+
+{block name=pageBreadcrumb}
+<ul class="breadcrumb hide">
+	<li>
+		{if $title}
+			{foreach $title as $key => $item name=title}
+				{* Use strip_tags because if the string already has been through htmlentities using escape will break it *}
+				<span class="item-{$key} ">{$item|strip_tags}
+					{if !$smarty.foreach.title.last}
+						<img alt="&gt;" style="margin-right:5px" src="../img/admin/separator_breadcrumb.png" />
+					{/if}
+				</span>
+			{/foreach}
+		{else}
+			&nbsp;
+		{/if}
+	</li>
+</ul>
+{/block}
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 8e803008c..7b2e8e67d 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -273,6 +273,11 @@ class AdminControllerCore extends Controller
 	 */
 	protected $breadcrumbs;
 
+	//Bootstrap variable
+	public $show_page_header_toolbar = false;
+	public $page_header_toolbar_title;
+	public $page_header_toolbar_btn = array();
+
 	public function __construct()
 	{
 		global $timer_start;
@@ -414,7 +419,7 @@ class AdminControllerCore extends Controller
 			}
 			if ($filter)
 				$this->toolbar_title[] = $filter;
-		}	
+		}
 	}
 
 	/**
@@ -1082,6 +1087,21 @@ class AdminControllerCore extends Controller
 			$this->confirmations[] = $this->_conf[6];
 	}
 
+
+	public function initPageHeaderToolbar()
+	{
+		if (is_array($this->page_header_toolbar_btn)
+			&& $this->page_header_toolbar_btn instanceof Traversable
+			|| trim($this->page_header_toolbar_title) != '')
+			$this->show_page_header_toolbar = true;
+
+		$this->context->smarty->assign(array(
+			'show_page_header_toolbar' => $this->show_page_header_toolbar,
+			'page_header_toolbar_title' => $this->page_header_toolbar_title,
+			'page_header_toolbar_btn' => $this->page_header_toolbar_btn
+		));
+	}
+
 	/**
 	 * assign default action in toolbar_btn smarty var, if they are not set.
 	 * uses override to specifically add, modify or remove items
@@ -1583,6 +1603,8 @@ class AdminControllerCore extends Controller
 	 */
 	public function renderList()
 	{
+		$this->initPageHeaderToolbar();
+
 		if (!($this->fields_list && is_array($this->fields_list)))
 			return false;
 		$this->getList($this->context->language->id);