diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml
index e53eb6fc46355e61c1a8b121030ef9c315d8d29c..d088ab057780e6905b5fc7dd1cf296ad9753a65e 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,7 +88,7 @@ action_dict = request.get(\'actions\', {}) # XXX actions needs to be renamed to
 exchange_action_list = action_dict.get(\'object_exchange\', [])\n
 button_action_list = action_dict.get(\'object_button\', [])\n
 portal_url = context.portal_url()\n
-http_parameters = request.get(\'http_parameters\')\n
+http_parameters = request.get(\'http_parameters\', \'\')\n
 http_parameters = http_parameters.replace(\'editable_mode\', \'dummy_editable_mode\')\n
 \n
 # Try to get the original absolute_url if this is a permanent URL\n
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml
index 5cfb1567d594f182342b9629f3ea7419aad6f0f9..634cb9553cc3df29fcc954207103ea44b5b669c8 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -60,7 +57,10 @@
 \n
 <tal:block\n
   tal:define="is_web_mode  python: True;\n
-              portal_type  python: here.getPortalType()">\n
+              portal_type  python: here.getPortalType();\n
+              actions      request/actions | python:\n
+                           here.Base_filterDuplicateActions(here.portal_actions.listFilteredActionsFor(here));\n
+              dummy        python:request.set(\'actions\', actions);">\n
 \n
   <!-- XXX is this really useful - called how many times ?? - tried to removed but failed -->\n
   <!-- <tal:block metal:use-macro="here/global_definitions/macros/header_definitions"/> -->\n
@@ -68,7 +68,7 @@
   <!-- Edit button menu -->\n
   <div name="adminSection" class="adminSection">\n
     <h3 i18n:translate="" i18n:domain="ui">Edit</h3>\n
-    <ul tal:define="edit_link_list python: context.Base_getAdminToolboxEditShortcutList()">\n
+    <ul tal:define="edit_link_list python: here.Base_getAdminToolboxEditShortcutList()">\n
       <li tal:repeat="link edit_link_list">\n
         <a tal:attributes="href python: link[\'url\']">\n
           <img tal:attributes="src   python: link[\'icon\'];\n
@@ -85,7 +85,7 @@
 \n
        We need to setup the actions variable from the request because\n
        this template is called from outside the main rendering process-->\n
-  <div name="adminSection" class="adminSection" tal:define="actions request/actions">\n
+  <div name="adminSection" class="adminSection">\n
     <h3><tal:block tal:content="portal_type"/> Actions</h3>\n
     <tal:block metal:use-macro="here/context_box_render/macros/action"/>\n
   </div>\n