diff --git a/admin-dev/themes/default/admin.css b/admin-dev/themes/default/admin.css
index 4d4790bb3..cd5faaf46 100644
--- a/admin-dev/themes/default/admin.css
+++ b/admin-dev/themes/default/admin.css
@@ -149,7 +149,7 @@ a.module_toggle_all{color: #268CCD;}
 /*toolbarBox*/
 .toolbarBox { background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 10px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
 .toolbarBox .pageTitle { margin-left:10px; line-height:48px}
-.toolbarBox .pageTitle h3 {font-size: 2em; font-weight: bold; line-height: 48px; margin: 0; padding: 0;}
+.toolbarBox .pageTitle h3 {font-size: 2em; font-weight: normal; line-height: 48px; margin: 0; padding: 0;}
 .toolbarBox ul.cc_button {float:right;margin:0;padding:0;}
 .toolbarBox ul.cc_button li {color: #666666; float: left; height: 48px; list-style: none outside none; padding: 1px 1px 3px 4px; text-align: center;}
 .toolbarBox a.toolbar_btn {   border-width: 1px;font-size:11px;cursor: pointer; display: block; float: left; padding: 1px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff;;}
@@ -218,6 +218,7 @@ form#product_form, form#access_form, form#cart_rule_form {   background-color:#e
 .sidebar ul.categorieList li a {color:#3a6ea7;}
 .sidebar ul.categorieList li div.categorieWidth { width:180px; margin-left:5px; overflow:hidden;}
 .sidebar ul.categorieList li div.count{ position:absolute; top:0; right:5px;}
+.sidebar .categorieStatus { display:none;}
 
 /*MODULECONTAINER*/
 #moduleContainer { margin-left:220px; padding:13px 0 0 20px;}
diff --git a/admin-dev/themes/template/home/content.tpl b/admin-dev/themes/template/home/content.tpl
index 9792b637c..46ab5b7a8 100644
--- a/admin-dev/themes/template/home/content.tpl
+++ b/admin-dev/themes/template/home/content.tpl
@@ -24,7 +24,11 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-	<h1>{l s='Dashboard'}</h1>
+<div class="toolbarBox">
+	<div class="pageTitle">
+		<span><h3>{l s='Dashboard'}</h3></span>
+	</div>
+</div>
 	{if $upgrade}
 		<div id="blockNewVersionCheck">
 		{if $upgrade->need_upgrade}
@@ -39,7 +43,7 @@
 	{/if}
 {if $employee->bo_show_screencast}
 <div id="adminpresentation">
-	<iframe src="{$protocol}://screencasts.prestashop.com/screencast.php?iso_lang={$isoUser}" style="border:none;width:100%;height:384px;" scrolling="no"></iframe>
+	<iframe src="{$protocol}://localhost:8888/screencast/screencast.php?iso_lang={$isoUser}" style="border:none;width:100%;height:384px;" scrolling="no"></iframe>
 	<div id="footer_iframe_home">
 		<!--<a href="#">{l s ='View more video tutorials'}</a>-->
 		<input type="checkbox" id="screencast_dont_show_again">
diff --git a/admin-dev/themes/template/home/optimizationTips.tpl b/admin-dev/themes/template/home/optimizationTips.tpl
index 8a54e5c21..04e47f775 100644
--- a/admin-dev/themes/template/home/optimizationTips.tpl
+++ b/admin-dev/themes/template/home/optimizationTips.tpl
@@ -27,15 +27,15 @@
 <h5>{l s='A good beginning...'}
 	<span style="float:right">
 	<a id="optimizationTipsFold" href="#">
-		<img alt="v" style="padding-top:0px; padding-right: 5px;" src="../img/admin/{if $hide_tips}down-white.gif{else}close-white.png{/if}" />
+		<img alt="v" src="../img/admin/{if $hide_tips}arrow-down.png{else}arrow-up.png{/if}" />
 	</a>
 	</span>
 </h5>
 			<ul id="list-optimization-tips" class="admin-home-box-list" {if $hide_tips}style="display:none"{/if} >
 			{foreach from=$opti_list item=i key=k}
-				<li style="background-color:{$i.color}">
+				<li>
 				<img src="../img/admin/{$i.image}" class="pico" />
-					<a href="{$i.href}">{$i.title}</a>
+					<a  style="color:{$i.color}" href="{$i.href}">{$i.title}</a>
 				</li>
 
 			{/foreach}
@@ -76,10 +76,10 @@ $(document).ready(function(){
 	$("#optimizationTipsFold").click(function(e){
 		e.preventDefault();
 		$("#list-optimization-tips").toggle(function(){
-			if($("#optimizationTipsFold").children("img").attr("src") == "../img/admin/down-white.gif")
-				$("#optimizationTipsFold").children("img").attr("src","../img/admin/close-white.png");
+			if($("#optimizationTipsFold").children("img").attr("src") == "../img/admin/arrow-up.png")
+				$("#optimizationTipsFold").children("img").attr("src","../img/admin/arrow-down.png");
 			else
-				$("#optimizationTipsFold").children("img").attr("src","../img/admin/down-white.gif");
+				$("#optimizationTipsFold").children("img").attr("src","../img/admin/arrow-up.png");
 		});
 	})
 });
diff --git a/cache/class_index.php b/cache/class_index.php
index 6215205e4..86cfc8277 100644
--- a/cache/class_index.php
+++ b/cache/class_index.php
@@ -365,12 +365,6 @@
   'AdminAttributesGroupsController' => '',
   'AdminBackupControllerCore' => 'controllers/admin/AdminBackupController.php',
   'AdminBackupController' => '',
-  'AdminCMSCategoriesControllerCore' => 'controllers/admin/AdminCMSCategoriesController.php',
-  'AdminCMSCategoriesController' => '',
-  'AdminCMSContentControllerCore' => 'controllers/admin/AdminCMSContentController.php',
-  'AdminCMSContentController' => '',
-  'AdminCMSControllerCore' => 'controllers/admin/AdminCMSController.php',
-  'AdminCMSController' => '',
   'AdminCarriersControllerCore' => 'controllers/admin/AdminCarriersController.php',
   'AdminCarriersController' => '',
   'AdminCartRulesControllerCore' => 'controllers/admin/AdminCartRulesController.php',
@@ -379,6 +373,12 @@
   'AdminCatalogController' => 'controllers/admin/AdminCatalogController.php',
   'AdminCategoriesControllerCore' => 'controllers/admin/AdminCategoriesController.php',
   'AdminCategoriesController' => '',
+  'AdminCmsCategoriesControllerCore' => 'controllers/admin/AdminCmsCategoriesController.php',
+  'AdminCmsCategoriesController' => '',
+  'AdminCmsContentControllerCore' => 'controllers/admin/AdminCmsContentController.php',
+  'AdminCmsContentController' => '',
+  'AdminCmsControllerCore' => 'controllers/admin/AdminCmsController.php',
+  'AdminCmsController' => '',
   'AdminContactControllerCore' => 'controllers/admin/AdminContactController.php',
   'AdminContactController' => '',
   'AdminContactsControllerCore' => 'controllers/admin/AdminContactsController.php',
@@ -436,12 +436,12 @@
   'AdminOrderMessageController' => 'controllers/admin/AdminOrderMessageController.php',
   'AdminOrdersControllerCore' => 'controllers/admin/AdminOrdersController.php',
   'AdminOrdersController' => '',
-  'AdminPDFControllerCore' => 'controllers/admin/AdminPDFController.php',
-  'AdminPDFController' => '',
   'AdminPPreferencesControllerCore' => 'controllers/admin/AdminPPreferencesController.php',
   'AdminPPreferencesController' => '',
   'AdminPaymentControllerCore' => 'controllers/admin/AdminPaymentController.php',
   'AdminPaymentController' => '',
+  'AdminPdfControllerCore' => 'controllers/admin/AdminPdfController.php',
+  'AdminPdfController' => '',
   'AdminPerformanceController' => 'controllers/admin/AdminPerformanceController.php',
   'AdminPreferencesControllerCore' => 'controllers/admin/AdminPreferencesController.php',
   'AdminPreferencesController' => '',
diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php
index d11e1cde9..369c9edd0 100644
--- a/controllers/admin/AdminHomeController.php
+++ b/controllers/admin/AdminHomeController.php
@@ -89,9 +89,9 @@ class AdminHomeControllerCore extends AdminController
 		$shopEnabled = (Configuration::get('PS_SHOP_ENABLE') ? 2 : 1);
 
 		$lights = array(
-		0 => array('image'=>'error2.png','color'=>'#fbe8e8'),
-		1 => array('image'=>'warn2.png','color'=>'#fffac6'),
-		2 => array('image'=>'ok2.png','color'=>'#dffad3'));
+		0 => array('image'=>'bullet_red.png','color'=>'red'),
+		1 => array('image'=>'bullet_orange.png','color'=>'orange'),
+		2 => array('image'=>'bullet_green.png','color'=>'green'));
 
 
 		if ($rewrite + $htaccessOptimized + $smartyOptimized + $cccOptimized + $shopEnabled + $htaccessAfterUpdate + $indexRebuiltAfterUpdate != 14)
diff --git a/css/admin.css b/css/admin.css
index 69967b001..151d2663e 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -1026,17 +1026,14 @@ table.permissions td {
 		}
 		
 .multishop_info{
-	background-image: url(../img/admin/info_multishop.png);
-	background-repeat: no-repeat;
-	background-position: 2px 2px;
-	background-color: #C6DEFC;
-	border: 1px solid #669BDB;
-	clear: both;
-	display: block;
-	font-size: 14px;
-	padding: 10px;
-	padding-left: 40px;
-	margin-bottom: 15px;
+	margin-top: 4px;
+	margin-bottom: 10px;
+	border: 1px solid #00529B;
+ 	padding: 13px 5px 0 40px;
+	color: #00529B;
+	background: #BDE5F8 url(../img/admin/icon-info.png) no-repeat 6px 5px;
+	border-radius:3px;
+	min-height:32px;
 }
 
 .assoShop{
@@ -1076,7 +1073,7 @@ html[xmlns] .clearfix {
 	border:1px solid #cccccc;
 	background-color: #F8F8F8;
 	float: left;
-	margin:0;
+	margin: 0 0 15px;
 	padding: 10px;
 	position:relative;
 }
@@ -1263,6 +1260,12 @@ html[xmlns] .clearfix {
 	padding-right: 10px;
 }
 
+.admin-box1 a#optimizationTipsFold img {
+	padding:5px 0;
+}
+
+
+
 #table_info_last{
 	margin-left: 0;
 	float: left;
@@ -1340,45 +1343,57 @@ html[xmlns] .clearfix {
 }
 
 .admin-box1{
+	background-color:#F8F8F8;
 	width: 310px;
 	float: left;
-	padding: 1px;
-	border: 1px solid #8E8E8E;
+	padding: 0;
+	border: 1px solid #ccc;
 	font-size: 8pt;
 	margin-bottom: 20px;
+	border-radius:3px;
 }
 
 .admin-box1 h5{
-	background-image: url('../img/admin/orange-gradient.png');
-	color: #FFFFFF;
+	background-image: -moz-linear-gradient(center top , #F9F9F9, #ECECEC);
+	background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#ECECEC)) repeat scroll 0 0 transparent;
+	color: #333;
+	text-shadow: 0 1px 0 #fff;
 	margin: 0;
+	padding:0;
 	line-height: 29px;
 	padding-left: 15px;
 	font-size: 12pt;
+	font-weight:normal;
+	
 }
 
 .admin-box2{
 	width: 310px;
 	float: left;
-	padding: 1px;
-	border: 1px solid #8E8E8E;
+	padding: 0;
+	border: 1px solid #CCCCCC;
 	font-size: 8pt;
 	margin-bottom: 20px;
 	background-color: #f2f2f2;
+	border-radius:3px;
 }
 
 .admin-box2 h5{
-	background-image: url('../img/admin/pink-gradient.png');
-	color: #FFFFFF;
+	background-image: -moz-linear-gradient(center top , #F9F9F9, #ECECEC);
+	background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#ECECEC)) repeat scroll 0 0 transparent;
+	color: #333;
+	text-shadow: 0 1px 0 #fff;
 	margin: 0;
+	padding:0;
 	line-height: 29px;
 	padding-left: 15px;
 	font-size: 12pt;
+	font-weight:normal;
 }
 
 
 .admin-home-box-list li img{
-	margin: 0 15px 0 5px;
+	margin: 0 5px;
 }
 .admin-home-box-list{
 	padding-left:0;
@@ -1387,7 +1402,7 @@ html[xmlns] .clearfix {
 }
 
 #prestashop_link{
-	background: url('../img/admin/bg_pslink.png') no-repeat 0px 0px;
+	background: transparent none no-repeat 0px 0px;
 }
 
 .admin-home-box-list li{
@@ -1396,25 +1411,27 @@ html[xmlns] .clearfix {
 }
 
 #prestashop_link li{
-	height: 67px;
-	margin: 1px;
+	height: 58px;
+	margin: 0px;
 }
 
 .admin-home-box-list li p{
-	padding: 5px 5px 0px 90px;
+	font-family: Georgia, 'Lucida Grande', Arial;
+	font-style:italic;
+	font-size:13px;
+	margin: 2px 0;
+	padding: 0px 5px 0px 15px;
 }
 .admin-home-box-list li a{
 	color: #812143;
-	font-weight: bold;
-	text-decoration: underline;
 	line-height: 18px;
-	font-size: 8.5pt;
+	font-size: 12px;
 	text-align: left;
 }
 
 #prestashop_link li a{
-	color: #812143;
-	margin-left: 90px;
+	color: #3A6EA7;
+	margin-left: 15px;
 	font-weight: bold;
 	text-decoration: underline;
 	line-height: 18px;
diff --git a/css/login.css b/css/login.css
index a09bb87d3..bbde0c75f 100644
--- a/css/login.css
+++ b/css/login.css
@@ -45,14 +45,14 @@ a:hover {
 input, textarea, option, select {
 	color: #000;
 	font-family: Arial;
-	font-size: 12px;
+	font-size: 16px;
 	margin: 0;
 	padding: 0;
 }
 
 input:focus, textarea:focus {
-	border: 1px solid #686868;
-	background-color: #DFDFDF;
+	border: 1px solid #3293D6;
+	box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3) inset;
 }
 
 /* CONTENT */
@@ -65,13 +65,28 @@ input:focus, textarea:focus {
 
 #login {
 	height: 313px;
-	background: url('../img/admin/bg_login.gif') no-repeat top center;
 	color: #383838;
 	text-align: left;
 	font-weight: bold;
+	background-color:#F5F5F5;
+	border-radius:9px;
+	box-shadow: 0 1px 20px #333333;
 }
 
+#login h1 {
+	border-bottom:1px solid #ccc;
+	color:#333;
+	text-shadow:0 1px 0 #fff;
+}
+
+#login a {
+	color:#3A6EA7;
+}
+#login label {
+	text-shadow: 0 1px 0 #fff;
+}
 #login form {
+	border-top:1px solid #fff;
 	margin: 0;
 	padding: 40px 30px 25px 30px;
 }
@@ -80,16 +95,18 @@ input:focus, textarea:focus {
 	margin: 1em 1px;
 	padding: 0;
 	display: block;
+	float:left;
 }
 
 #login #submit input {
-	padding: 2px 4px;
+	padding: 4px 10px;
 	_padding: 0;
 }
 
 #login #lost {
-	
+	margin:20px;
 	font-size: 0.95em;
+	float:left;
 }
 
 /* ERROR */
@@ -123,22 +140,29 @@ input:focus, textarea:focus {
 /* CLASS */
 
 .input {
-	width: 260px;
-	margin-top: 2px;
-	padding: 2px 4px;
-	border: 1px solid #588216;
+	border:1px solid #ccc;
+	width: 365px;
+	margin:0;
+	padding: 6px 4px 6px 35px;
+}
+
+.input#email {
+	background: #fff url(../img/admin/bg_form_email.png) no-repeat scroll 10px 8px;
+}
+.input, .input#passwd {
+	background: #fff url(../img/admin/bg_form_password.png) no-repeat scroll 10px 8px;
 }
 
 .button {
-	border: 1px solid #DFD5AF;
-	border-top: 1px solid #FFF6D3;
-	border-left: 1px solid #FFF6D3;
-	color: #268CCD;
-	background-color: #FFF6D3;
+	background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent; 
+	background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent;
+	border-color: #CCCCCC #BBBBBB #A0A0A0;border-left: 1px solid #BBBBBB;border-radius: 3px 3px 3px 3px;border-right: 1px solid #BBBBBB;border-style: solid;border-width: 1px;color: #000000;margin: 0; outline: medium none;padding: 3px 8px;
+
 }
 
 .button:hover {
 	background-color: #F0EBD6;
+	cursor:default;
 }
 
 .center {