--- a/src/pyams_content/reference/pictograms/zmi/manager.py	Wed Jun 06 13:32:14 2018 +0200
+++ b/src/pyams_content/reference/pictograms/zmi/manager.py	Fri Jun 08 10:33:23 2018 +0200
@@ -27,7 +27,7 @@
 from pyams_zmi.layer import IAdminLayer
 
 # import packages
-from pyams_form.form import AJAXEditForm
+from pyams_form.form import AJAXEditForm, ajax_config
 from pyams_pagelet.pagelet import pagelet_config
 from pyams_skin.viewlet.menu import MenuItem
 from pyams_template.template import template_config
@@ -55,6 +55,7 @@
 
 @pagelet_config(name='pictograms-selection.html', context=IPictogramManagerTarget, layer=IPyAMSLayer,
                 permission=MANAGE_TOOL_PERMISSION)
+@ajax_config(name='pictograms-selection.json', context=IPictogramManagerTarget, layer=IPyAMSLayer)
 @implementer(IWidgetForm, IInnerPage, IObjectData)
 class PictogramManagerEditForm(AdminEditForm):
     """Pictogram manager selection form"""
@@ -66,7 +67,6 @@
 
     object_data = {'ams-form-data-init-callback': 'PyAMS_content.pictograms.initManagerSelection'}
 
-    ajax_handler = 'pictograms-selection.json'
     edit_permission = MANAGE_TOOL_PERMISSION
 
     def update_content(self, content, data):
@@ -80,12 +80,6 @@
         return changes
 
 
-@view_config(name='pictograms-selection.json', context=IPictogramManagerTarget, request_type=IPyAMSLayer,
-             permission=MANAGE_TOOL_PERMISSION, renderer='json', xhr=True)
-class PictogramManagerAJAXEditForm(AJAXEditForm, PictogramManagerEditForm):
-    """Pictogram manager selection form, JSON renderer"""
-
-
 @viewlet_config(name='pictogram-selection.subform', context=IPictogramManagerTarget, layer=IAdminLayer,
                 view=PictogramManagerEditForm, manager=IWidgetsSuffixViewletsManager, permission=MANAGE_TOOL_PERMISSION)
 @template_config(template='templates/manager-selection.pt', layer=IAdminLayer)