diff --git a/admin-dev/themes/default/css/_carrier-wizard.sass b/admin-dev/themes/default/css/_carrier-wizard.sass
index c1a96a36d..6eed571a4 100644
--- a/admin-dev/themes/default/css/_carrier-wizard.sass
+++ b/admin-dev/themes/default/css/_carrier-wizard.sass
@@ -139,4 +139,9 @@
 	table#zones_table
 		width: auto
 	.field_error
-		border-color: $brand-danger
\ No newline at end of file
+		border-color: $brand-danger
+	.actionBar
+		height: 30px
+	.actionBar a 
+		float: right
+		margin-right: 10px
\ No newline at end of file
diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css
index 7eb91a15b..a72139b1b 100644
--- a/admin-dev/themes/default/css/admin-theme.css
+++ b/admin-dev/themes/default/css/admin-theme.css
@@ -1,4 +1,4 @@
-/*
+/*!
  * Bootstrap v3.0.0
  *
  * Copyright 2013 Twitter, Inc
@@ -7,7 +7,7 @@
  *
  * Designed and built with all the love in the world by @mdo and @fat.
  */
-/* normalize.css v2.1.0 | MIT License | git.io/normalize */
+/*! normalize.css v2.1.0 | MIT License | git.io/normalize */
 /* line 22, ../bower_components/sass-bootstrap/lib/_normalize.scss */
 article, aside, details, figcaption, figure, footer, header, hgroup, main, nav, section, summary {
   display: block; }
@@ -5717,7 +5717,7 @@ th.visible-print, td.visible-print {
   /* line 523, ../bower_components/sass-bootstrap/lib/_mixins.scss */
   th.hidden-print, td.hidden-print {
     display: none !important; } }
-/*
+/*!
  *  Font Awesome 3.2.1
  *  the iconic font designed for Bootstrap
  *  ------------------------------------------------------------------------------
@@ -9132,6 +9132,13 @@ li.sortable-placeholder {
 /* line 141, _carrier-wizard.sass */
 #carrier_wizard .field_error {
   border-color: #d9534f; }
+/* line 143, _carrier-wizard.sass */
+#carrier_wizard .actionBar {
+  height: 30px; }
+/* line 145, _carrier-wizard.sass */
+#carrier_wizard .actionBar a {
+  float: right;
+  margin-right: 10px; }
 
 /* line 3, _dashboard.sass */
 .size_s, .size_md, .size_l, .size_xl, .size_xxl {
diff --git a/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
index f9899fce1..362696275 100644
--- a/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
@@ -30,18 +30,19 @@
 	<ul class="breadcrumb cat_bar2">
 		{assign var=i value=0}
 		{foreach $categories_tree key=key item=category}
+		<li>
 			{if $i++ == 0}
-				<li>
-					<i class="icon-home"></i>
+				<i class="icon-home"></i>
 				{assign var=params_url value=""}
 			{else}
 				{assign var=params_url value="&id_category={$category.id_category|intval}&viewcategory"}
 			{/if}
 			{if $category.id_category == $categories_tree_current_id}
-				{$category.name}</li>
+				{$category.name}
 			{else}
-				<a href="{$currentIndex}{$params_url}&token={$token}">{$category.name}</a></li>
+				<a href="{$currentIndex}{$params_url}&token={$token}">{$category.name}</a>
 			{/if}
+		</li>
 		{/foreach}
 	</ul>
 {/block}
diff --git a/admin-dev/themes/default/template/toolbar.tpl b/admin-dev/themes/default/template/toolbar.tpl
new file mode 100644
index 000000000..b59459ebc
--- /dev/null
+++ b/admin-dev/themes/default/template/toolbar.tpl
@@ -0,0 +1,185 @@
+{*
+* 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="toolbar-placeholder">
+	<div class="toolbarBox {if $toolbar_scroll}toolbarHead{/if}">
+		{block name=toolbarBox}
+			<ul class="cc_button">
+				{foreach from=$toolbar_btn item=btn key=k}
+					<li>
+						<a id="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}>
+							<span class="process-icon-{if isset($btn.imgclass)}{$btn.imgclass}{else}{$k}{/if} {if isset($btn.class)}{$btn.class}{/if}" ></span>
+							<div {if isset($btn.force_desc) && $btn.force_desc == true } class="locked" {/if}>{$btn.desc}</div>
+						</a>
+						{if $k == 'modules-list'}
+							<div id="modules_list_container" style="display:none">
+							<div style="float:right;margin:5px">
+								<a href="#" onclick="$('#modules_list_container').slideUp();return false;"><img alt="X" src="../img/admin/close.png" /></a>
+							</div>
+							<div id="modules_list_loader"><img src="../img/loader.gif" alt="" border="0" /></div>
+							<div id="modules_list_container_tab" style="display:none;"></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 = $('span[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 = $('span[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').slideDown();
+					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 class="pageTitle">
+			<h3>{block name=pageTitle}
+				<span id="current_obj" style="font-weight: normal;">
+					{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="breadcrumb 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}
+				</span>
+				{/block}
+			</h3>
+		</div>
+	</div>
+</div>