diff --git a/admin-dev/themes/template/statuses/list_action_edit_status.tpl b/admin-dev/themes/template/statuses/list_action_edit_status.tpl
deleted file mode 100644
index ca6ee9ac6..000000000
--- a/admin-dev/themes/template/statuses/list_action_edit_status.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-{*
-* 2007-2011 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-2011 PrestaShop SA
-*  @version  Release: $Revision: 9197 $
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*}
-<a href="{$href}">
-<img src="../img/admin/edit.gif" alt="{$action}" title="{$action}" /></a>
\ No newline at end of file
diff --git a/controllers/admin/AdminStatusesController.php b/controllers/admin/AdminStatusesController.php
index 24b8d2941..351d3b82c 100644
--- a/controllers/admin/AdminStatusesController.php
+++ b/controllers/admin/AdminStatusesController.php
@@ -34,6 +34,7 @@ class AdminStatusesControllerCore extends AdminController
 	 	$this->lang = true;
 	 	$this->deleted = false;
 		$this->colorOnBackground = false;
+		$this->context = Context::getContext();
 		$this->imageType = 'gif';
 
 		$this->fieldImageSettings = array(
@@ -43,7 +44,6 @@ class AdminStatusesControllerCore extends AdminController
 
 		$this->requiredDatabase = true;
 
-		$this->context = Context::getContext();
 		$this->fieldImageSettings = array(
 			'name' => 'icon',
 			'dir' => 'os'
@@ -351,6 +351,18 @@ class AdminStatusesControllerCore extends AdminController
 			)
 		);
 
+
+		$this->toolbar_btn = array(
+			'save' => array(
+				'href' => '#',
+				'desc' => $this->l('Save')
+			),
+			'cancel' => array(
+				'href' => self::$currentIndex.'&token='.$this->token,
+				'desc' => $this->l('Cancel')
+			)
+		);
+
 		$this->getlanguages();
 		$helper = new HelperForm();
 		$helper->currentIndex = self::$currentIndex;
@@ -358,6 +370,7 @@ class AdminStatusesControllerCore extends AdminController
 		$helper->table = 'order_return_state';
 		$helper->identifier = 'id_order_return_state';
 		$helper->id = $order_return_state->id;
+		$helper->toolbar_fix = false;
 		$helper->languages = $this->_languages;
 		$helper->default_form_language = $this->default_form_language;
 		$helper->allow_employee_form_lang = $this->allow_employee_form_lang;
@@ -426,7 +439,7 @@ class AdminStatusesControllerCore extends AdminController
             'action' => self::$cache_lang['editstatus'],
         ));
 
-        return $this->context->smarty->fetch(_PS_ADMIN_DIR_.'/themes/template/statuses/list_action_edit_status.tpl');
+        return $this->context->smarty->fetch('helper/list/list_action_edit.tpl');
 	}
 
 	public function postProcess()