diff --git a/config/configuration.sample.yml b/config/configuration.sample.yml
index 9173e61f5b..f488003af9 100644
--- a/config/configuration.sample.yml
+++ b/config/configuration.sample.yml
@@ -279,6 +279,7 @@ registry:
         api-subdef_service: false
     actions:
         export-stamp-choice: false
+        stamp-subdefs: false
 crossdomain:
     site-control: 'master-only'
     allow-access-from:
diff --git a/lib/Alchemy/Phrasea/Controller/Admin/CollectionController.php b/lib/Alchemy/Phrasea/Controller/Admin/CollectionController.php
index 89409b6958..d192fafbf6 100644
--- a/lib/Alchemy/Phrasea/Controller/Admin/CollectionController.php
+++ b/lib/Alchemy/Phrasea/Controller/Admin/CollectionController.php
@@ -803,7 +803,9 @@ class CollectionController extends Controller
         try {
             if ('' !== trim($prefs)) {
                 $domdoc = new \DOMDocument();
-                if (true === @$domdoc->loadXML($prefs)) {
+                if (true === @$domdoc->loadXML($prefs, LIBXML_NONET | LIBXML_NOBLANKS)) {
+                    $domdoc->formatOutput = true;
+                    $domdoc->saveXML(null, LIBXML_NOEMPTYTAG);
                     $collection->set_prefs($domdoc);
                     $success = true;
                 }
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/DownloadController.php b/lib/Alchemy/Phrasea/Controller/Prod/DownloadController.php
index 55d08f9a2e..5fc51d2ff0 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/DownloadController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/DownloadController.php
@@ -15,6 +15,7 @@ use Alchemy\Phrasea\Core\Configuration\PropertyAccess;
 use Alchemy\Phrasea\Core\Event\DownloadAsyncEvent;
 use Alchemy\Phrasea\Core\Event\ExportEvent;
 use Alchemy\Phrasea\Core\PhraseaEvents;
+use Alchemy\Phrasea\Filesystem\PhraseanetFilesystem;
 use Alchemy\Phrasea\Model\Manipulator\TokenManipulator;
 use set_export;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -42,7 +43,7 @@ class DownloadController extends Controller
         $ssttid = $request->request->get('ssttid', '');
         $subdefs = $request->request->get('obj', []);
 
-        $download = new \set_export($this->app, $lst, $ssttid);
+        $download = new set_export($this->app, $lst, $ssttid);
 
         if (0 === $download->get_total_download()) {
             $this->app->abort(403);
@@ -50,11 +51,13 @@ class DownloadController extends Controller
 
         $list = $download->prepare_export(
             $this->getAuthenticatedUser(),
-            $this->app['filesystem'],
+            $this->getFilesystem(),
             $subdefs,
             $request->request->get('type') === 'title' ? true : false,
             $request->request->get('businessfields'),
-            $request->request->get('stamp_choice') === "NO_STAMP" ? \set_export::NO_STAMP : \set_export::STAMP_SYNC
+            set_export::STAMP_SYNC,
+            $request->request->get('stamp_choice') === "REMOVE_STAMP",
+            false
         );
 
         $list['export_name'] = sprintf('%s.zip', $download->getExportName());
@@ -89,7 +92,7 @@ class DownloadController extends Controller
         $ssttid = $request->request->get('ssttid', '');
         $subdefs = $request->request->get('obj', []);
 
-        $download = new \set_export($this->app, $lst, $ssttid);
+        $download = new set_export($this->app, $lst, $ssttid);
 
         if (0 === $download->get_total_download()) {
             $this->app->abort(403);
@@ -103,12 +106,12 @@ class DownloadController extends Controller
 
         $list = $download->prepare_export(
             $this->getAuthenticatedUser(),
-            $this->app['filesystem'],
+            $this->getFilesystem(),
             $subdefs,
             $request->request->get('type') === 'title' ? true : false,
             $request->request->get('businessfields'),
-            // do not stamp now, worker will do
-            $stamp_method,
+            set_export::STAMP_ASYNC,
+            $request->request->get('stamp_choice') === "REMOVE_STAMP",
             true
         );
         $list['export_name'] = sprintf('%s.zip', $download->getExportName());
@@ -212,4 +215,11 @@ class DownloadController extends Controller
     {
         return $this->app['session'];
     }
+    /**
+     * @return PhraseanetFilesystem
+     */
+    private function getFilesystem()
+    {
+        return $this->app['filesystem'];
+    }
 }
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/ExportController.php b/lib/Alchemy/Phrasea/Controller/Prod/ExportController.php
index 4ef91b65c5..6ccea28428 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/ExportController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/ExportController.php
@@ -9,6 +9,7 @@
  */
 namespace Alchemy\Phrasea\Controller\Prod;
 
+use ACL;
 use Alchemy\Phrasea\Application\Helper\DispatcherAware;
 use Alchemy\Phrasea\Application\Helper\FilesystemAware;
 use Alchemy\Phrasea\Application\Helper\NotifierAware;
@@ -19,6 +20,8 @@ use Alchemy\Phrasea\Core\PhraseaEvents;
 use Alchemy\Phrasea\Model\Manipulator\TokenManipulator;
 use Alchemy\Phrasea\WorkerManager\Event\ExportFtpEvent;
 use Alchemy\Phrasea\WorkerManager\Event\WorkerEvents;
+use DOMDocument;
+use DOMXPath;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -29,6 +32,15 @@ class ExportController extends Controller
     use FilesystemAware;
     use NotifierAware;
 
+    /**
+     * @return ACL
+     */
+    private function getAclForConnectedUser()
+    {
+        return $this->getAclForUser($this->getAuthenticatedUser());
+    }
+
+
     /**
      * Display form to export documents
      *
@@ -44,17 +56,63 @@ class ExportController extends Controller
             $request->request->get('story')
         );
 
+        // we must propose "do not stamp" when at least one collection is stamped AND the user has right to
+        // remove stamp on this collection
+        $removeable_stamp = false;          // true if at least one coll is "unstampable"
+        $removeable_stamp_by_base = [];     // unset: no stamp ; false: stamp not "unstampable" ; true: stamp "unstampable"
+
+        $colls_manageable = array_keys($this->getAclForConnectedUser()->get_granted_base([ACL::COLL_MANAGE]) ?? []);
+        $dbox_manageable = array_keys($this->getAclForConnectedUser()->get_granted_sbas([ACL::BAS_MANAGE]) ?? []);
+
+        foreach($download->get_elements() as $recordAdapter) {
+            // check collection only once
+            if(array_key_exists($bid = $recordAdapter->getCollection()->get_base_id(), $removeable_stamp_by_base)) {
+                continue;
+            }
+            // check stamp
+            $domprefs = new DOMDocument();
+            if ( !$domprefs->loadXML($recordAdapter->getCollection()->get_prefs()) ) {
+                continue;
+            }
+            $xpprefs = new DOMXPath($domprefs);
+            if ($xpprefs->query('/baseprefs/stamp')->length == 0) {
+                // the collection has no stamp settings
+                continue;
+            }
+            unset($domprefs);
+            // the collection has stamp, check user's right to remove it
+            $removeable_stamp_by_base[$bid] = false;
+            switch ((string)$this->getConf()->get(['registry', 'actions', 'export-stamp-choice'], false)) {
+                case '1':   // == (string)true
+                    // everybody can remove stamp (bc)
+                    $removeable_stamp_by_base[$bid] = $removeable_stamp = true;
+                    break;
+                case 'manage_collection':
+                    if (in_array($bid, $colls_manageable)) {
+                        $removeable_stamp_by_base[$bid] = $removeable_stamp = true;
+                    }
+                    break;
+                case 'manage_databox':
+                    if (in_array($recordAdapter->getDatabox()->get_sbas_id(), $dbox_manageable)) {
+                        $removeable_stamp_by_base[$bid] = $removeable_stamp = true;
+                    }
+                    break;
+            }
+        }
+
         $this->setSessionFormToken('prodExportDownload');
         $this->setSessionFormToken('prodExportEmail');
         $this->setSessionFormToken('prodExportFTP');
         $this->setSessionFormToken('prodExportOrder');
 
         return new Response($this->render('common/dialog_export.html.twig', [
-            'download'             => $download,
-            'ssttid'               => $request->request->get('ssel'),
-            'lst'                  => $download->serialize_list(),
-            'default_export_title' => $this->getConf()->get(['registry', 'actions', 'default-export-title']),
-            'choose_export_title'  => $this->getConf()->get(['registry', 'actions', 'export-title-choice'])
+            'download'                  => $download,
+            'ssttid'                    => $request->request->get('ssel'),
+            'lst'                       => $download->serialize_list(),
+            'default_export_title'      => $this->getConf()->get(['registry', 'actions', 'default-export-title']),
+            'choose_export_title'       => $this->getConf()->get(['registry', 'actions', 'export-title-choice']),
+            'removeable_stamp'          => $removeable_stamp,
+            'removeable_stamp_by_base'  => $removeable_stamp_by_base,
         ]));
     }
 
@@ -123,7 +181,9 @@ class ExportController extends Controller
                 $request->request->get('obj'),
                 false,
                 $request->request->get('businessfields'),
-                $request->request->get('stamp_choice') === "NO_STAMP" ? \set_export::NO_STAMP : \set_export::STAMP_ASYNC
+                \set_export::STAMP_ASYNC,
+                $request->request->get('stamp_choice') === "REMOVE_STAMP",
+                false
         );
 
             $exportFtpId = $download->export_ftp(
@@ -181,7 +241,8 @@ class ExportController extends Controller
             (array) $request->request->get('obj'),
             $request->request->get("type") == "title" ? : false,
             $request->request->get('businessfields'),
-            $request->request->get('stamp_choice') === "NO_STAMP" ? \set_export::NO_STAMP : \set_export::STAMP_ASYNC,
+            \set_export::STAMP_ASYNC,
+            $request->request->get('stamp_choice') === "REMOVE_STAMP",
             true
         );
 
diff --git a/lib/Alchemy/Phrasea/ControllerProvider/Admin/Collection.php b/lib/Alchemy/Phrasea/ControllerProvider/Admin/Collection.php
index 2daaf273f4..1e6e863aad 100644
--- a/lib/Alchemy/Phrasea/ControllerProvider/Admin/Collection.php
+++ b/lib/Alchemy/Phrasea/ControllerProvider/Admin/Collection.php
@@ -52,10 +52,12 @@ class Collection implements ControllerProviderInterface, ServiceProviderInterfac
             ->assert('bas_id', '\d+')
             ->bind('admin_display_collection');
 
+        /** @uses CollectionController::getSuggestedValues */
         $controllers->get('/{bas_id}/suggested-values/', 'controller.admin.collection:getSuggestedValues')
             ->assert('bas_id', '\d+')
             ->bind('admin_collection_display_suggested_values');
 
+        /** @uses CollectionController::submitSuggestedValues */
         $controllers->post('/{bas_id}/suggested-values/', 'controller.admin.collection:submitSuggestedValues')
             ->assert('bas_id', '\d+')
             ->bind('admin_collection_submit_suggested_values');
diff --git a/lib/Alchemy/Phrasea/Order/Controller/ApiOrderController.php b/lib/Alchemy/Phrasea/Order/Controller/ApiOrderController.php
index c61e27d1c6..bb802fb966 100644
--- a/lib/Alchemy/Phrasea/Order/Controller/ApiOrderController.php
+++ b/lib/Alchemy/Phrasea/Order/Controller/ApiOrderController.php
@@ -189,7 +189,16 @@ class ApiOrderController extends BaseOrderController
         $subdefs = $this->findDataboxSubdefNames();
 
         try {
-            $exportData = $export->prepare_export($user, $this->getFilesystem(), $subdefs, true, true, false);
+            $exportData = $export->prepare_export(
+                $user,
+                $this->getFilesystem(),
+                $subdefs,
+                true,
+                true,
+                \set_export::STAMP_SYNC,
+                false,
+                false
+            );
         }
         catch (\Exception $e) {
             throw new NotFoundHttpException(sprintf('No archive could be downloaded for Order "%d"', $order->getId()));
diff --git a/lib/Alchemy/Phrasea/WorkerManager/Worker/DownloadAsyncWorker.php b/lib/Alchemy/Phrasea/WorkerManager/Worker/DownloadAsyncWorker.php
index f735db799f..f7618ba8c1 100644
--- a/lib/Alchemy/Phrasea/WorkerManager/Worker/DownloadAsyncWorker.php
+++ b/lib/Alchemy/Phrasea/WorkerManager/Worker/DownloadAsyncWorker.php
@@ -218,7 +218,7 @@ class DownloadAsyncWorker implements WorkerInterface
             }
 
             foreach($v_file['subdefs'] as $k_subdef => $v_subdef) {
-                if($k_subdef === "document" && $v_subdef['to_stamp']) {
+                if($v_subdef['to_stamp']) {
                     // we must stamp this document
                     try {
                         if(!$record) {
diff --git a/lib/classes/recordutils/image.php b/lib/classes/recordutils/image.php
index 6fd4aa5031..718c782baf 100644
--- a/lib/classes/recordutils/image.php
+++ b/lib/classes/recordutils/image.php
@@ -15,6 +15,7 @@ use Imagine\Exception\Exception as ImagineException;
 use Imagine\Image\Box;
 use Imagine\Image\ImagineInterface;
 use Imagine\Image\Palette\RGB;
+use Imagine\Image\Palette\Color\ColorInterface;
 use Imagine\Image\Point;
 use MediaVorus\Media\Image;
 use MediaVorus\Media\MediaInterface;
@@ -47,19 +48,22 @@ class recordutils_image
         }
 
         $xmlToColor = function ($attr, $ret = [255, 255, 255]) use ($palette) {
-            try {
-                $alpha = 100;
-                $attr = explode(',', $attr);
-                if (count($attr) == 4) {
-                    // 0..127 -> 100..0
-                    $alpha = (int)((127 - (int)array_pop($attr)) / 1.27);
-                }
+            if($attr !== null) {
+                try {
+                    $alpha = 100;
+                    $attr = explode(',', $attr);
+                    if (count($attr) == 4) {
+                        // 0..127 -> 100..0
+                        $alpha = (int)((127 - (int)array_pop($attr)) / 1.27);
+                    }
 
-                return $palette->color($attr, $alpha);
-            }
-            catch (ImagineException $e) {
-                return $palette->color($ret);
+                    return $palette->color($attr, $alpha);
+                }
+                catch (ImagineException $e) {
+                    return $palette->color($ret);
+                }
             }
+            return null;
         };
 
         $base_id = $subdef->get_record()->getBaseId();
@@ -287,10 +291,11 @@ class recordutils_image
                 if ($txtline != '') {
                     $wrap = static::wrap($imagine, $fontsize, 0, __DIR__ . '/../../../resources/Fonts/arial.ttf', $txtline, $text_width);
                     $txtblock[] = [
-                        'fontsize'  => $fontsize,
-                        'fontcolor' => $xmlToColor($texts->item($i)->getAttribute('color'), [0, 0, 0]),
-                        'h'         => $wrap['toth'],
-                        'lines'     => $wrap['l']
+                        'fontsize'    => $fontsize,
+                        'fontcolor'   => $xmlToColor($texts->item($i)->getAttribute('color'), [0, 0, 0]),
+                        'shadowcolor' => $xmlToColor($texts->item($i)->getAttribute('shadow'), [0, 0, 0, 127]),
+                        'h'           => $wrap['toth'],
+                        'lines'       => $wrap['l'],
                     ];
                     $txth += $wrap['toth'];
                 }
@@ -327,10 +332,22 @@ class recordutils_image
             $draw = $imfg->draw();
             $txt_ypos = 0;
             foreach ($txtblock as $block) {
-                $font = $imagine->font(__DIR__ . '/../../../resources/Fonts/arial.ttf', $block['fontsize'], $block['fontcolor']);
+                /** @var ColorInterface $color */
+                $color = $block['fontcolor'];
+                $font = $imagine->font(__DIR__ . '/../../../resources/Fonts/arial.ttf', $block['fontsize'], $color);
+                $shadowFont = null;
+                $shadowDelta = 0;
+                if($block['shadowcolor'] !== null) {
+                    $shadowFont = $imagine->font(__DIR__ . '/../../../resources/Fonts/arial.ttf', $block['fontsize'], $block['shadowcolor']);
+                    $shadowDelta = max(2, (int)($block['fontsize'] / 20));
+                }
                 foreach ($block['lines'] as $line) {
                     if ($line['t'] != '') {
-                        $draw->text($line['t'], $font, new Point($logo_reswidth, $txt_ypos), 0);
+                        if($shadowFont) {
+                            $draw->text($line['t'], $shadowFont, new Point($logo_reswidth, $txt_ypos + $shadowDelta), 0);
+                            $draw->text($line['t'], $shadowFont, new Point($logo_reswidth+1, $txt_ypos + $shadowDelta*1.5), 0);
+                        }
+                        $draw->text($line['t'], $font, new Point($logo_reswidth + $shadowDelta, $txt_ypos), 0);
                     }
                     $txt_ypos += $line['h'];
                 }
@@ -354,7 +371,7 @@ class recordutils_image
         $newh = $tables['TOP']['h'] + $image_height + $tables['BOTTOM']['h'];
 
         // create the output image
-        $image_out = $imagine->create(new Box($image_width, $newh), $palette->color("FFFFFF", 64));
+        $image_out = $imagine->create(new Box($image_width, $newh), $palette->color("FFFFFF"));
 
         // paste the input image into
         $image_out->paste($image_in, new Point(0, $tables['TOP']['h']));
@@ -414,7 +431,7 @@ class recordutils_image
      *
      * @return boolean|string
      */
-    public static function watermark(Application $app, media_subdef $subdef)
+    public static function watermark(Application $app, media_subdef $subdef, $otherPath = null)
     {
         static $palette;
 
@@ -436,7 +453,7 @@ class recordutils_image
             return false;
         }
 
-        $pathIn = $subdef->getRealPath();
+        $pathIn = $otherPath ?? $subdef->getRealPath();
 
         if (!is_file($pathIn)) {
             return false;
diff --git a/lib/classes/set/export.php b/lib/classes/set/export.php
index 99a34df139..757db0695a 100644
--- a/lib/classes/set/export.php
+++ b/lib/classes/set/export.php
@@ -9,6 +9,8 @@
  */
 
 use Alchemy\Phrasea\Application;
+use Alchemy\Phrasea\Authentication\ACLProvider;
+use Alchemy\Phrasea\Core\Configuration\PropertyAccess;
 use Alchemy\Phrasea\Filesystem\PhraseanetFilesystem as Filesystem;
 use Alchemy\Phrasea\Model\Entities\Token;
 use Alchemy\Phrasea\Model\Entities\User;
@@ -183,7 +185,7 @@ class set_export extends set_abstract
 
         /** @var record_exportElement $download_element */
         foreach ($this->get_elements() as $download_element) {
-            if ($app->getAclForUser($app->getAuthenticatedUser())->has_right_on_base($download_element->getBaseId(), \ACL::CANMODIFRECORD)) {
+            if ($app->getAclForUser($app->getAuthenticatedUser())->has_right_on_base($download_element->getBaseId(), ACL::CANMODIFRECORD)) {
                 $this->businessFieldsAccess = true;
             }
 
@@ -235,11 +237,11 @@ class set_export extends set_abstract
 
         $display_ftp = [];
 
-        $hasadminright = $app->getAclForUser($app->getAuthenticatedUser())->has_right(\ACL::CANADDRECORD)
-            || $app->getAclForUser($app->getAuthenticatedUser())->has_right(\ACL::CANDELETERECORD)
-            || $app->getAclForUser($app->getAuthenticatedUser())->has_right(\ACL::CANMODIFRECORD)
-            || $app->getAclForUser($app->getAuthenticatedUser())->has_right(\ACL::COLL_MANAGE)
-            || $app->getAclForUser($app->getAuthenticatedUser())->has_right(\ACL::COLL_MODIFY_STRUCT);
+        $hasadminright = $app->getAclForUser($app->getAuthenticatedUser())->has_right(ACL::CANADDRECORD)
+            || $app->getAclForUser($app->getAuthenticatedUser())->has_right(ACL::CANDELETERECORD)
+            || $app->getAclForUser($app->getAuthenticatedUser())->has_right(ACL::CANMODIFRECORD)
+            || $app->getAclForUser($app->getAuthenticatedUser())->has_right(ACL::COLL_MANAGE)
+            || $app->getAclForUser($app->getAuthenticatedUser())->has_right(ACL::COLL_MODIFY_STRUCT);
 
         $this->ftp_datas = [];
 
@@ -391,6 +393,35 @@ class set_export extends set_abstract
         return $this->total_ftp;
     }
 
+    /**
+     * @return ACLProvider
+     */
+    private function getAclProvider()
+    {
+        return $this->app['acl'];
+    }
+
+    /**
+     * Gets ACL for user.
+     *
+     * @param User $user
+     *
+     * @return ACL
+     */
+    private function getAclForUser(User $user)
+    {
+        return $this->getAclProvider()->get($user);
+    }
+
+    /**
+     * @return PropertyAccess
+     */
+    protected function getConf()
+    {
+        return $this->app['conf'];
+    }
+
+
     const NO_STAMP = 'NO_STAMP';
     const STAMP_SYNC = 'STAMP_SYNC';
     const STAMP_ASYNC = 'STAMP_ASYNC';
@@ -404,7 +435,7 @@ class set_export extends set_abstract
      * @return array
      * @throws Exception
      */
-    public function prepare_export(User $user, Filesystem $filesystem, Array $wantedSubdefs, $rename_title, $includeBusinessFields, $stampMethod, $exportEmail = false)
+    public function prepare_export(User $user, Filesystem $filesystem, Array $wantedSubdefs, $rename_title, $includeBusinessFields, $stampMethod, $removeStamp, $exportEmail = false)
     {
         if (!is_array($wantedSubdefs)) {
             throw new Exception('No subdefs given');
@@ -423,6 +454,13 @@ class set_export extends set_abstract
         $unicode = $this->app['unicode'];
         $hasCgu = false;
 
+        // we must propose "do not stamp" when at least one collection is stamped AND the user has right to
+        // remove stamp on this collection
+        $stamp_by_base = [];     // unset: no stamp ; false: stamp not "unstampable" ; true: stamp "unstampable"
+
+        $colls_manageable = array_keys($this->getAclForUser($user)->get_granted_base([ACL::COLL_MANAGE]) ?? []);
+        $dbox_manageable = array_keys($this->getAclForUser($user)->get_granted_sbas([ACL::BAS_MANAGE]) ?? []);
+
         /** @var record_exportElement $download_element */
         foreach ($this->elements as $download_element) {
 
@@ -443,10 +481,49 @@ class set_export extends set_abstract
 
             $BF = false;
 
-            if ($includeBusinessFields && $this->app->getAclForUser($user)->has_right_on_base($download_element->getBaseId(), \ACL::CANMODIFRECORD)) {
+            if ($includeBusinessFields && $this->app->getAclForUser($user)->has_right_on_base($download_element->getBaseId(), ACL::CANMODIFRECORD)) {
                 $BF = true;
             }
 
+            // check if stamp can be removed
+            // check collection only once
+            if(!array_key_exists($bid = $download_element->getCollection()->get_base_id(), $stamp_by_base)) {
+                // check stamp
+                $stamp_by_base[$bid] = self::NO_STAMP;
+
+                $domprefs = new DOMDocument();
+                if ($domprefs->loadXML($download_element->getCollection()->get_prefs())) {
+                    $xpprefs = new DOMXPath($domprefs);
+                    if ($xpprefs->query('/baseprefs/stamp')->length != 0) {
+                        // the collection has stamp settings
+                        unset($domprefs);
+
+                        // the collection has stamp, check user's right to remove it
+                        $stamp_by_base[$bid] = $stampMethod;
+                        if($removeStamp) {   // user asked to remove stamp
+                            switch ((string)$this->getConf()->get(['registry', 'actions', 'export-stamp-choice'], false)) {
+                                case '1':       // == (string)true
+                                    // everybody can remove stamp (bc)
+                                    $stamp_by_base[$bid] = self::NO_STAMP;
+                                    break;
+                                case 'manage_collection':
+                                    if (in_array($bid, $colls_manageable)) {
+                                        $stamp_by_base[$bid] = self::NO_STAMP;
+                                    }
+                                    break;
+                                case 'manage_databox':
+                                    if (in_array($download_element->getDatabox()->get_sbas_id(), $dbox_manageable)) {
+                                        $stamp_by_base[$bid] = self::NO_STAMP;
+                                    }
+                                    break;
+                            }
+                        }
+                    }
+                }
+            }
+            $files[$id]['to_stamp'] = $stamp_by_base[$bid];
+
+
             // $original_name : the original_name WITHOUT extension (ex. "DSC_1234")
             // $extension     : the extension WITHOUT DOT (ex. "jpg")
             // $export_name   : the export name WITHOUT extension, (ex. "Hollydays_2016_DSC_1234")
@@ -539,9 +616,9 @@ class set_export extends set_abstract
                             'to_watermark' => false
                         ];
 
-                        if($this->app['conf']->get(['registry', 'actions', 'export-stamp-choice']) !== true || $stampMethod !== self::NO_STAMP ){
+                        if($files[$id]['to_stamp'] !== self::NO_STAMP){
                             // stamp is mandatory, or user did not check "no stamp" : we must apply stamp
-                            if($stampMethod === self::STAMP_SYNC) {
+                            if($files[$id]['to_stamp'] === self::STAMP_SYNC) {
                                 // we prepare a direct download, we must stamp now
                                 $path = \recordutils_image::stamp($this->app, $sd[$subdefName]);
                                 if ($path && file_exists($path)) {
@@ -568,18 +645,32 @@ class set_export extends set_abstract
                             'to_watermark' => false
                         ];
 
-                        if (!$this->app->getAclForUser($user)->has_right_on_base($download_element->getBaseId(), \ACL::NOWATERMARK)
+                        $stampedPath = null;
+                        if($files[$id]['to_stamp'] !== self::NO_STAMP && $this->getConf()->get(['registry', 'actions', 'stamp-subdefs'], false) === true){
+                            // stamp is mandatory, or user did not check "no stamp" : we must apply stamp
+                            if($files[$id]['to_stamp'] === self::STAMP_SYNC) {
+                                // we prepare a direct download, we must stamp now
+                                $path = \recordutils_image::stamp($this->app, $sd[$subdefName]);
+                                if ($path && file_exists($path)) {
+                                    $stampedPath = $path;
+                                    $tmp_pathfile['path'] = dirname($path);
+                                    $tmp_pathfile['file'] = basename($path);
+                                }
+                            }
+                            else {
+                                // we prepare an email or ftp download : the worker will apply stamp
+                                $tmp_pathfile ['to_stamp'] = true;
+                            }
+                        }
+
+                        if (!$this->app->getAclForUser($user)->has_right_on_base($download_element->getBaseId(), ACL::NOWATERMARK)
                             && !$this->app->getAclForUser($user)->has_preview_grant($download_element)
                             && $sd[$subdefName]->get_type() == media_subdef::TYPE_IMAGE )
                         {
-                            $path = recordutils_image::watermark($this->app, $sd[$subdefName]);
+                            $path = recordutils_image::watermark($this->app, $sd[$subdefName], $stampedPath);
                             if (file_exists($path)) {
-                                $tmp_pathfile = [
-                                    'path' => dirname($path),
-                                    'file' => basename($path),
-                                    'to_stamp' => false,
-                                    'to_watermark' => false
-                                ];
+                                $tmp_pathfile['path'] = dirname($path);
+                                $tmp_pathfile['file'] = basename($path);
                                 $subdef_ok = true;
                             }
                         }
diff --git a/templates/web/admin/collection/suggested_value.html.twig b/templates/web/admin/collection/suggested_value.html.twig
index ab2a63fdf8..e4b715cc7d 100644
--- a/templates/web/admin/collection/suggested_value.html.twig
+++ b/templates/web/admin/collection/suggested_value.html.twig
@@ -1,657 +1,406 @@
-<form method="post" action="{{ path('admin_users_search') }}" target="_self" style="visibility:hidden; display:none" >
-    <input type="text" name="ord" value="" />
-    <input type="text" name="srt" value="" />
-    <input type="text" name="act" value="?" />
-    <input type="text" name="p0" value="" />
-    <input type="text" name="p1" value="" />
-    <input type="text" name="p2" value="5" />
-    <input type="text" name="p3" value="?" />
-    <input type="submit">
-</form>
+<div style="display: flex; flex-direction: column; justify-content: space-between; height:100%">
+    <form method="post" action="{{ path('admin_users_search') }}" target="_self"
+          style="visibility:hidden; display:none">
+        <input type="text" name="ord" value=""/>
+        <input type="text" name="srt" value=""/>
+        <input type="text" name="act" value="?"/>
+        <input type="text" name="p0" value=""/>
+        <input type="text" name="p1" value=""/>
+        <input type="text" name="p2" value="5"/>
+        <input type="text" name="p3" value="?"/>
+        <input type="submit">
+    </form>
 
-<div class="page-header">
-    <h1>{{ 'Suggested values' | trans }}</h1>
-</div>
+    <div class="page-header">
+        <h1>{{ 'admin::sugval: Valeurs suggerees/Preferences de la collection' | trans }}
+            "{{ app['request'].attributes.get('bas_id')|bas_labels(app) }}"</h1>
+    </div>
 
 
-{% if app['request'].query.get('success') == '1' %}
+    {% if app['request'].query.get('success') == '1' %}
     <div class="alert alert-success">
         <a class="close" data-dismiss="alert" href="#">×</a>
         {{ 'Successful update' | trans }}
     </div>
-{% elseif app['request'].query.get('success') == '0' %}
+    {% elseif app['request'].query.get('success') == '0' %}
     <div class="alert alert-error">
         <a class="close" data-dismiss="alert" href="#">×</a>
         <strong>{{ 'An error occured' | trans }}</strong>
     </div>
-{% endif %}
+    {% endif %}
 
-<div id="iddivloading" style="border:#ff0000 3px solid;position:absolute; width:94%;height:80%; top:95px; left:10px;z-index:99;text-align:center">
-    <table style='width:100%;height:100%; text-align:center;vertical-align: middle; color:#FF0000; font-size:16px'>
-        <tr>
-            <td>
-                <div style='background-color:#FFFFFF'>
-                    <b>{{ 'phraseanet::chargement' | trans }}</b>
-                </div>
-            </td>
-        </tr>
-    </table>
-</div>
+    <div id="iddivloading"
+         style="border:#ff0000 3px solid;position:absolute; width:94%;height:80%; top:95px; left:10px;z-index:99;text-align:center">
+        <table style='width:100%;height:100%; text-align:center;vertical-align: middle; color:#FF0000; font-size:16px'>
+            <tr>
+                <td>
+                    <div style='background-color:#FFFFFF'>
+                        <b>{{ 'phraseanet::chargement' | trans }}</b>
+                    </div>
+                </td>
+            </tr>
+        </table>
+    </div>
 
-<span id="spanref" style="position:absolute; bottom:0px; left:5px;  background-color:#0f00cc; visibility:hidden">
+    <span id="spanref" style="position:absolute; bottom:0px; left:5px;  background-color:#0f00cc; visibility:hidden">
 </span>
 
-<div id="divref" >&nbsp;</div>
+    <div id="divref">&nbsp;</div>
 
-<table id="presentUser" style="table-layout:fixed; width:100%;border:none;" border="0" cellpadding="0" cellspacing="0">
+    <div id="presentUser" style="flex: 1; display: flex; flex-direction: column;">
 
-    <tr style="height:30px; " >
-        <td style="height:30px; width:20px;  font-size:12px; border:0px; background-position: left top;background-repeat: no-repeat">
+        <div style="" class="tabbar">
+            <a href="#" id="linkviewgraph" onClick="view('GRAPH');return(false);"
+               class='btn btn-mini active'>{{ 'boutton::vue graphique' | trans }}</a>
+            <a href="#" id="linkviewxml" onClick="view('XML');return(false);"
+               class='btn btn-mini'>{{ 'boutton::vue xml' | trans }}</a>
+        </div>
 
-        </td>
+        <div style="background-color:#c9c9c9; border:#cccccc 1px solid; display: flex; flex:1;">
 
-        <td style="text-align:center;height:30px;font-size:12px; border:0px;background-position: 0px 0px;background-repeat: repeat-x" nowrap>
-            {{ 'admin::sugval: Valeurs suggerees/Preferences de la collection' | trans }} {{ app['request'].attributes.get('bas_id')|bas_labels(app) }}
-        </td>
+            <div id="divGraph"
+                 style="background-color:#c9c9c9; border:none; display: flex; flex-direction: column; width:100%;">
 
-        <td style="height:30px;width:20px;font-size:12px;border:0px; text-align:right">
+                <div style="display: flex; flex-direction: row; align-items: flex-start;">
 
-        </td>
+                    <label for="nomchamPH">{{ 'admin::sugval: champs' | trans }}</label>
+                    <select name="usrbases" id="nomchamPH"
+                            onKeyUp="javascript:write_valsug();"
+                            onChange="javascript:savenomaff();makeRestrict();maketextaffich();makeEmpty();write_valsug();"
+                            onclick="makeRestrict();desactivall4VS(); write_valsug();">
+                        {% for field in databox.get_meta_structure() %}
+                        {% if not field.is_readonly %}
+                        <option value='{{ field.get_name() }}'> {{ field.get_label(app['locale']) }} </option>
+                        {% endif %}
+                        {% endfor %}
+                    </select>
+                    &nbsp;&nbsp;
+                    <input type="text" id="valajout" onKeyUp="verifAndactiv();" onclick="desactivall4VS();" style="">
+                    <input class='btn' type="submit" value="{{ 'boutton::ajouter' | trans }}" disabled style=""
+                           onclick="ajouter();" id="bout_add" name="bout_add">
+                </div>
 
-    </tr>
+                <div class="btn-group" style="display: flex; flex-direction: row; align-items: flex-start;">
+                    <span style="flex:1"></span>
+                    <input class='btn' type="submit" value="{{ 'admin::base:collorder: monter' | trans }}" disabled
+                           onclick="modifordre(true);" id="bout_mont" name="bout_mont">
+                    <input class='btn' type="submit" value="{{ 'admin::base:collorder: descendre' | trans }}" disabled
+                           onclick="modifordre(false);" id="bout_desc" name="bout_desc">
+                    <input class='btn' type="submit" value="{{ 'boutton::supprimer' | trans }}" disabled
+                           onclick="supprimer();" ondblclick="supprimer();" id="bout_supp"
+                           name="bout_supp">
+                    <input class='btn' type="submit"
+                           value="{{ 'admin::base:collorder: reinitialiser en ordre alphabetique' | trans }}"
+                           onclick="trialph();" ondblclick="trialph();" id="bout_trialph"
+                           name="bout_trialph">
+                </div>
 
-    <tr style="background-color:#aaaaaa; border:#cccccc 1px solid;"  >
-        <td colspan="3" style=" border:#aaaaaa 1px solid;padding-left:3px;text-align:right">
-            <a href="#" id="linkviewxml" onClick="view('XML');return(false);" class='btn btn-mini'>{{ 'boutton::vue xml' | trans }}</a>
-            <a href="#" id="linkviewgraph" onClick="view('GRAPH');return(false);"  class='btn btn-mini' style="display:none">{{ 'boutton::vue graphique' | trans }}</a>
-        </td>
-    </tr>
+                <div id="valsug" style="flex: 1;">
+                    <select size="12" name=valsug2 id="valsug2" onFocus="activ4VS();" onClick="desactiver();activ4VS();"
+                            onChange="desactiv4VS();" style="width:100%; height:100%;"></select>
+                </div>
 
-    <tr style="background-color:#c9c9c9; border:#cccccc 1px solid;"  >
-        <td colspan="3" style=" border:#c9c9c9 1px solid;padding-left:3px;text-align:center">
-
-            <div id="divGraph" style="background-color:#c9c9c9; border:none; width:100%; height:100%;overflow:hidden;" >
-
-                <table border="0" id="tabsgv" style="width:100%; background-color:#c9c9c9;">
-                    <tr>
-                        <td valign="top" style="text-align:center;">
-                            {{ 'admin::sugval: champs' | trans }}
-                            <select  name=usrbases id="nomchamPH" onKeyUp="javascript:write_valsug();" onChange="javascript:savenomaff();makeRestrict();maketextaffich();makeEmpty();write_valsug();"   onclick="javascript: makeRestrict();desactivall4VS(); write_valsug();" >
-                                {% for field in databox.get_meta_structure() %}
-                                    {% if not field.is_readonly %}
-                                        <option value='{{ field.get_name() }}'> {{ field.get_label(app['locale']) }} </option>
-                                    {% endif %}
-                                {% endfor %}
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td valign="top" style="text-align:center;">
-                            <div class="btn-group">
-                                <input class='btn' type="submit" value="{{ 'admin::base:collorder: monter' | trans }}" disabled onclick="javascript:modifordre(true);" id="bout_mont" name="bout_mont">
-                                <input class='btn' type="submit" value="{{ 'admin::base:collorder: descendre' | trans }}"  disabled onclick="javascript:modifordre(false);" id="bout_desc" name="bout_desc">
-                                <input class='btn' type="submit" value="{{ 'boutton::supprimer' | trans }}" disabled onclick="javascript:supprimer();" ondblclick="javascript:supprimer();" id="bout_supp" name="bout_supp">
-                                <input class='btn' type="submit" value="{{ 'admin::base:collorder: reinitialiser en ordre alphabetique' | trans }}" onclick="javascript:trialph();" ondblclick="javascript:trialph();" id="bout_trialph" name="bout_trialph">
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td valign="top">
-                            <span id="valsug">
-                                <select size="12" name=valsug2 id="valsug2" onFocus="activ4VS();" onClick="desactiver();activ4VS();" onChange="desactiv4VS();"  style="width:100%;font-size:11px;height:380px;"></select>
-                            </span>
-                        </td>
-
-                    </tr>
-                    <tr id="trajout" style="height:50px">
-                        <td valign="top" style="height:50px; border:none">
-                            <table style="width:100%;">
-                                <tr>
-                                    <td style="width:100%"><input type="text" id="valajout" onKeyUp="verifAndactiv();" onclick="desactivall4VS();" style="width:99%"></td>
-                                    <td style="width:100px" ><input class='btn' type="submit" value="{{ 'boutton::ajouter' | trans }}" disabled style="width:100px" onclick="javascript:ajouter();" id="bout_add" name="bout_add"></td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
             </div>
 
             <div id="divXml" style="display:none">
-                <textarea nowrap id="txtareaxml" onchange="chgXml();" style=" width:99%;height:380px;white-space:pre" >{{ collection.get_prefs() | raw }}</textarea>
+                <textarea cols="500" wrap="soft" id="txtareaxml" onchange="chgXml();"
+                          style="white-space:pre; width:100%">{{ collection.get_prefs() | raw }}</textarea>
             </div>
-        </td>
-    </tr>
 
-    <tr style="height:30px;" >
-        <td style="height:30px; width:20px; background-position: 0px 0px; background-repeat:no-repeat">
+        </div>
 
-        </td>
-        <td style="height:30px; background-position: 0px 0px; background-repeat: repeat-x; font-size:12px;text-align:center;">
-            <b><a class='btn' href="javascript:void();" onclick="valid();return(false);"  id="genevalid" style="color:#000000; text-decoration:none">{{ 'boutton::valider' | trans }}</a></b>
-        </td>
-        <td style="height:30px;width:20px;font-size:12px; background-position:left ;">
-        </td>
-    </tr>
-</table>
+        <div style="height:30px; text-align: center;">
+            <b><a class='btn' href="#" onclick="valid();return false;" id="genevalid"
+                  style="color:#000000; text-decoration:none">{{ 'boutton::valider' | trans }}</a></b>
+        </div>
+    </div>
 
-<form method="post" name="chgStructure" action="{{ path('admin_collection_display_suggested_values', { 'bas_id' : app['request'].attributes.get('bas_id') }) }}" onsubmit="return(false);" target="right" style="visibility:hidden;">
-    <textarea nowrap style="visibility:hidden;white-space:pre" name="str" id="idstr">{{ collection.get_prefs() | raw }}</textarea>
-</form>
+    <form method="post" name="chgStructure"
+          action="{{ path('admin_collection_display_suggested_values', { 'bas_id' : app['request'].attributes.get('bas_id') }) }}"
+          onsubmit="return false;"
+          target="right"
+          style="position:absolute; visibility:hidden; height: 0px; padding: 0px; margin: 0px;">
+        <textarea style="visibility:hidden;white-space:pre" name="str"
+                  id="idstr">{{ collection.get_prefs() | raw }}</textarea>
+    </form>
 
+</div>
+
+<style>
+    .tabbar A::before {
+        content: " ";
+    }
+    .tabbar A.active::before {
+        content: "✓";
+    }
+</style>
 <script type="text/javascript">
 
-    var allgetID = new Array ;
-    var total = 0;
-    var statuscoll="";
-    var changeInXml = false ;
-    var avantModif="";
+    let total       = 0;
+    let statuscoll  = "";
+    let changeInXml = false;
+    let avantModif  = "";
+    let pref     = new Array(0);
+    let lastpref = null;
 
-    function chgXml()
-    {
-        inxml = $("#txtareaxml").val();
-        inxml2="";
-        for(i=0; i<inxml.length;i++)
-        {
-            if(inxml.charCodeAt(i)!=13)
-                inxml2+=inxml.substr(i,1);
-
-        }
-
-        if( avantModif!= inxml2 )
-            changeInXml = true ;
-
-    }
-
-    function tableScroll(theTable)
-    {
-        var TableId = theTable.id.replace("_center", "");
-        var tableTop = $("#"+TableId+"_top");
-        var tableLeft = $("#"+TableId+"_left");
-
-        $("#imgtopinclin").width("700px");
-
-        tableTop.scrollLeft(theTable.scrollLeft());
-        tableLeft.scrollTop(theTable.scrollTop());
-    }
-
-    /* Chargement de tt les elements dans un tableau pour un acces plus rapide */
-    function scandom(node, depth)
-    {
-        var n;
-        if(!node)
-
-        return;
-
-        if(node.id)
-        {
-            allgetID[node.id] = node;
-            //node.style.visibility = "hidden";
-            total++;
-        }
-
-        for(n=node.firstChild; n; n=n.nextSibling)
-        {
-            if(n.nodeType && n.nodeType == 1)
-                scandom(n, depth+1);
+    function chgXml() {
+        if (avantModif != $("#txtareaxml").val()) {
+            changeInXml = true;
         }
     }
 
-    function scan()
-    {
-        if(document.all)
-            scandom(document.documentElement, 0);
-        else
-        {
-            allccuser = document.getElementsByName("ccuser");
-            for (var i=0; i<allccuser.length;i++)
-            {
-                allgetID[allccuser[i].id] = allccuser[i];
-                total++ ;
-            }
-        }
+    function valeursPref(nomaff) {
+        this.nomaff  = nomaff;
+        this.Type    = "text";
+        this.content = "none";
+        this.empty   = true;
+        this.valsug  = new Array(0);
 
+        return this;
     }
 
-    function view(typeDiv)
-    {
+    function savenomaff() {
+        const o = $("#namAff");
 
-        switch (typeDiv)
-        {
-            case "RIGHTS":
-                if( $("#divGraph").length > 0 )
-                {
-                    $("#divGraph").show();
-                }
-                if( oo=returnElement("genecancel") )
-                    oo.style.visibility = "visible" ;
-                if( oo=returnElement("genevalid") )
-                    oo.style.visibility = "visible" ;
-                break;
+        if (o.length > 0 && lastpref != null) {
+            pref[lastpref].nomaff = o.val();
         }
     }
 
-    var pass = false;
+    // ecrit le select des valsug
+    function write_valsug() {
+        const o = $("#nomchamPH");
 
-function redrawme()
-{
-    wb = $("#divref").outerWidth(true);
+        if (o.length > 0) {
+            const o2 = $("#valsug");
 
-    if(wb<150) {
-        wb= 150;
-     }
+            if (o2.length > 0) {
+                lastpref = o.val();
 
-    $("#presentUser").width((wb-10)+"px");
+                const p = document.getElementById("valsug2");
 
-    /***************************************************/
-    if(document.all)
-    {
-        if (document.documentElement.clientHeight) { // no jquery equivalent for clientHeight
-            bodyH = document.documentElement.clientHeight - 5 ;
-        } else {
-            bodyH = document.body.clientHeight - 5 ;
-        }
+                p.options.length = 0;
 
-        scrollLeft = null;
-
-        if (document.documentElement.scrollLeft) {
-            scrollLeft = document.documentElement.scrollLeft;
-        } else {
-            scrollLeft = document.body.scrollLeft;
-        }
-
-        scrolltop = null;
-
-        if (document.documentElement.scrollTop)
-        {
-            scrolltop = document.documentElement.scrollTop;
-            document.documentElement.scrollTop = 0 ;
-        }
-        else
-        {
-            scrolltop = document.body.scrollTop;
-            document.body.scrollTop=0;
-        }
-    }
-    else
-    {
-        bodyH =  window.document.clientHeight;
-
-        if (!bodyH) {
-            if (document.documentElement.clientHeight) {
-                bodyH = document.documentElement.clientHeight - 5 ;
-            }
-        } else {
-            bodyH = document.body.clientHeight - 5 ;
-        }
-
-        scrollLeft = null;
-
-        if (document.documentElement.scrollLeft) {
-            scrollLeft = document.documentElement.scrollLeft;
-        } else {
-            scrollLeft = document.body.scrollLeft;
-        }
-
-        scrolltop = null;
-
-        if (document.documentElement.scrollTop) {
-            scrolltop = document.documentElement.scrollTop;
-            document.documentElement.scrollTop = 0;
-        } else {
-            scrolltop = document.body.scrollTop;
-            document.body.scrollTop=0;
-        }
-    }
-
-    /***************************************************/
-    hauteur =  $("#spanref").offset().top;
-    hauteur =  bodyH-10;
-
-    if (hauteur<10)
-    {
-        hauteur = document.getElementById("spanref").clientHeight;
-    }
-
-    if (hauteur<350) {
-        hauteur= 350;
-    }
-
-    $("#divGraph").height((hauteur-160)+"px");
-    $("#tabsgv").height((hauteur-100)+"px");
-    $("#trajout").height("150px");
-
-    if ((hauteur-280) > 10) {
-        $("#valsug2").height((hauteur-280)+"px");
-    } else {
-        $("#valsug2").height("10px");
-    }
-
-    $("#txtareaxml").height((hauteur-160)+"px");
-
-    if (o = returnElement("iddivloading") )
-    {
-        o.style.width = (wb-18)+"px";
-        o.style.left = "10px";
-        o.style.top = "95px";
-        o.style.height = (hauteur-160)+"px";
-    }
-}
-
-
-function returnElement(unId)
-{
-    if (! allgetID[unId] )
-    {
-        if ( document.getElementById(unId) )
-        {
-            allgetID[unId] = document.getElementById(unId);
-        }
-    }
-
-    return allgetID[unId];
-}
-
-var pref = new Array(0);
-var lastpref=null;
-
-function Roll(im, x)
-{
-    var s=document[im].src;
-    var d=s.substr(0,s.length-5)
-    document[im].src = d + x + ".gif";
-}
-
-function valeursPref(nomaff,valsug)
-{
-    this.nomaff = nomaff;
-    this.Type = "text";
-    this.content = "none" ;
-    this.empty = true;
-    this.valsug = new Array(0);
-
-    return(this);
-}
-
-function savenomaff()
-{
-    o = $("#namAff");
-
-    if (o.length > 0  && lastpref!=null) {
-        pref[lastpref].nomaff = o.val();
-    }
-}
-// ecrit le select des valsug
-function write_valsug()
-{
-    o = $("#nomchamPH");
-
-    if ( o.length > 0 )
-    {
-        o2  = $("#valsug");
-
-        if ( o2.length > 0 )
-        {
-            lastpref =  o.val();
-
-            p = document.getElementById("valsug2");
-
-            p.options.length = 0;
-
-            for (i=0; i<pref[o.val()].valsug.length; i++)
-            {
-                if (pref[o.val()].valsug[i]) {
-                    x = p.options[p.options.length] = new Option((pref[o.val()].valsug[i]), pref[o.val()].valsug[i]);
+                for (let i = 0; i < pref[o.val()].valsug.length; i++) {
+                    if (pref[o.val()].valsug[i]) {
+                        p.options[p.options.length] = new Option((pref[o.val()].valsug[i]), pref[o.val()].valsug[i]);
+                    }
                 }
             }
         }
     }
-}
 
-function desactivall4VS()
-{
-    activer_bout('bout_supp', false);
-    activer_bout('bout_mont', false);
-    activer_bout('bout_desc', false);
+    function desactivall4VS() {
+        activer_bout('bout_supp', false);
+        activer_bout('bout_mont', false);
+        activer_bout('bout_desc', false);
 
-    o2 = $("#valsug2");
+        const o2 = $("#valsug2");
 
-    if( o2.length > 0 ) {
-        o2.prop("selectedIndex",-1);
+        if (o2.length > 0) {
+            o2.prop("selectedIndex", -1);
+        }
     }
-}
 
 
-function desactiv4VS()
-{
-    o2 = $("#valsug2");
+    function desactiv4VS() {
+        const o2 = $("#valsug2");
 
-    if( o2.length > 0 )
-    {
-        var optionLength = o2.find("option").length;
-        var index = o2.prop("selectedIndex");
+        if (o2.length > 0) {
+            const optionLength = o2.find("option").length;
+            const index        = o2.prop("selectedIndex");
 
-        if ( optionLength > 1 && index != -1) {
-            if ((index+1) == optionLength) {
-                activer_bout('bout_desc',false);
-            } else {
-                activer_bout('bout_desc',true);
+            if (optionLength > 1 && index != -1) {
+                if ((index + 1) == optionLength) {
+                    activer_bout('bout_desc', false);
+                }
+                else {
+                    activer_bout('bout_desc', true);
+                }
+
+                if (index == 0 && optionLength > 1) {
+                    activer_bout('bout_mont', false);
+                }
+                else {
+                    activer_bout('bout_mont', true);
+                }
+            }
+            else {
+                activer_bout('bout_desc', false);
+                activer_bout('bout_mont', false);
             }
 
-            if (index == 0 && optionLength>1) {
-                activer_bout('bout_mont',false);
-            } else {
-                activer_bout('bout_mont',true);
+        }
+    }
+
+    function activ4VS() {
+        const o2 = $("#valsug2");
+
+        if (o2.length > 0 && o2.prop("selectedIndex") == -1) {
+            return;
+        }
+
+        desactiv4VS();
+        activer_bout('bout_supp', true);
+    }
+
+    // supprime une valsug
+    function supprimer() {
+
+        let lastIdx = null;
+        const o2    = $("#valsug2");
+
+        if (o2.length > 0) {
+            const o           = $("#nomchamPH");
+            let ancienfocus = o2.prop("selectedIndex");
+            // pref[o.value].valsug.splice(o2.selectedIndex,1);
+            let bb          = 0;
+            lastIdx         = (pref[o.val()].valsug.length) - 1;
+            for (let aa in pref[o.val()].valsug) {
+                if (aa != o2.prop("selectedIndex")) {
+                    pref[o.val()].valsug[bb] = pref[o.val()].valsug[aa];
+                    if (parseInt(aa) + 1 == pref[o.val()].valsug.length) {
+                        pref[o.val()].valsug[bb] = null;
+                    }
+                    bb++;
+                }
             }
-        } else {
-            activer_bout('bout_desc',false);
-            activer_bout('bout_mont',false);
-        }
 
-    }
-}
+            pref[o.val()].valsug[bb] = "";
 
-function activ4VS()
-{
-    o2 = $("#valsug2");
-
-    if( o2.length > 0 ) {
-
-        if(o2.prop("selectedIndex") ==-1)
-
-        return;
-    }
-
-    desactiv4VS();
-    activer_bout('bout_supp',true);
-}
-
-// supprime une valsug
-function supprimer()
-{
-
-  lastIdx = null;
-  o2 = $("#valsug2");
-
-  if( o2.length > 0 )
-  {
-      var o = $("#nomchamPH");
-      var ancienfocus = o2.prop("selectedIndex");
-      // pref[o.value].valsug.splice(o2.selectedIndex,1);
-      var bb =0;
-      lastIdx = (pref[o.val()].valsug.length)-1;
-      for ( aa in pref[o.val()].valsug)
-      {
-          if(aa != o2.prop("selectedIndex")) {
-              pref[o.val()].valsug[bb]=pref[o.val()].valsug[aa];
-              if(parseInt(aa)+1 == pref[o.val()].valsug.length) {
-                  pref[o.val()].valsug[bb]=null;
-              }
-              bb++;
-          }
-      }
-
-      pref[o.val()].valsug[bb]="";
-
-      if (lastIdx!=null && lastIdx>=0) {
-          delete(pref[o.val()].valsug[lastIdx]);
-          pref[o.val()].valsug.length--;
-      }
+            if (lastIdx != null && lastIdx >= 0) {
+                delete (pref[o.val()].valsug[lastIdx]);
+                pref[o.val()].valsug.length--;
+            }
 
 
-      write_valsug();
-      o2 = $("#valsug2");
+            write_valsug();
+            const o2 = $("#valsug2");
 
-      var i = o2.find("options").length ;  // au depart i=1 et ancienfocus=1
-      o2.prop("selectedIndex",-1);
+            let i = o2.find("options").length;  // au depart i=1 et ancienfocus=1
+            o2.prop("selectedIndex", -1);
 
-      while( i>-1 )
-      {
-          if (o2.find("options").length>= ancienfocus+1) {
-              o2.prop("selectedIndex",ancienfocus);
-              i==0;
-          } else {
-              ancienfocus--;
-          }
+            while (i > -1) {
+                if (o2.find("options").length >= ancienfocus + 1) {
+                    o2.prop("selectedIndex", ancienfocus);
+                    i == 0;
+                }
+                else {
+                    ancienfocus--;
+                }
 
-          i--;
-      }
+                i--;
+            }
 
-      if(o2.prop("selectedIndex")<0) {
-          activer_bout('bout_supp',false);
-      }
+            if (o2.prop("selectedIndex") < 0) {
+                activer_bout('bout_supp', false);
+            }
 
-      desactiv4VS();
-    }
-}
-
-// ajoute une valsug
-function ajouter()
-{
-    o2 = $("#valajout");
-    var test = false;
-
-    for (var k=0; k<o2.val().length; k++) {
-        if(o2.val().charAt(k)!=" ") {
-            test=true;
-        }
-    }
-
-    if(!test) {
-        o2.val("");
-        verifAndactiv();
-        o2.focus();
-    } else {
-        if(o2.val()!="" && o2.val()!=null) {
-            o = $("#nomchamPH");
-            // pref[o.value].valsug.push( UtEncode(o2.value) );
-            // pref[o.value].valsug[pref[o.value].valsug.length]= UtEncode(o2.value);
-            pref[o.val()].valsug[pref[o.val()].valsug.length]= (o2.val());
-            o2.val("");
-        }
-
-        write_valsug();
-
-        o2 = $("#valsug2");
-        if( test && o2.length > 0) {
-            o2.prop("selectedIndex", o2.find("options").length-1);
-            activer_bout('bout_add',true);
-            activ4VS();
             desactiv4VS();
         }
     }
-}
 
-function UtEncode(expr)
-{
-    var expretour = "";
+    // ajoute une valsug
+    function ajouter() {
+        const o2       = $("#valajout");
+        const newVal = o2.val().trim();
 
-    for (i=0; i<expr.length; i++) {
-
-        if( (expr.charCodeAt(i) >= 65 && expr.charCodeAt(i) <=90) || (expr.charCodeAt(i) >= 97 && expr.charCodeAt(i) <=122) ) {
-            expretour += expr.substring(i,i+1);
-        } else {
-            expretour += "&#" + expr.charCodeAt(i)+";";
+        if (newVal === "") {
+            o2.val("");
+            verifAndactiv();
+            o2.focus();
         }
-    }
+        else {
+            const o = $("#nomchamPH");
+            pref[o.val()].valsug[pref[o.val()].valsug.length] = newVal;
+            o2.val("");
 
-    return (expretour);
-}
+            write_valsug();
 
-function verifAndactiv()
-{
-    o = $("#valajout");
-    if ( o.length > 0 ) {
-        if(o.val().length>0) {
-            activer_bout('bout_add',true);
-        } else {
-            activer_bout('bout_add',false);
-        }
-    }
-}
-
-function desactiver()
-{
-    o = $("#valajout");
-    // desactivation du bouton ajouter
-    if( o.length > 0) {
-        o.val("");
-        activer_bout("bout_add",true);
-    }
-}
-
-function valid()
-{
-    savenomaff();
-    var lexmlstruct = '';
-
-    if($('#divGraph').length > 0 && $('#divGraph').is(':visible')) {
-        lexmlstruct = getSruct();
-    } else if( $('#divXml').length >0  && $('#divXml').is(':visible') ) {
-        lexmlstruct = $('#txtareaxml').val();
-    }
-
-    if($("#idstr").length > 0) {
-        $("#idstr").val(lexmlstruct);
-
-        var form = $("form[name=chgStructure]");
-
-        $.ajax({
-            dataType:'json',
-            type: form.attr('method'),
-            url: form.attr('action'),
-            data: form.serializeArray(),
-            success: function(data) {
-                if(data.success) {
-                    $('#tree li.selected a').trigger('click');
-                } else {
-                    $(".page-header").after(
-                    '<div class="alert alert-error">'
-                    +'<button class="close" data-dismiss="alert">×</button>'
-                    + data.msg
-                    + '</div>');
-                }
+            const o3 = $("#valsug2");
+            if (o3.length > 0) {
+                o3.prop("selectedIndex", o3.find("options").length - 1);
+                activer_bout('bout_add', true);
+                activ4VS();
+                desactiv4VS();
             }
-        });
+        }
     }
-}
 
-function modifordre(bool)
-{
-    o2 = $("#valsug2");
-    //bool : true pour monter  -- false pour descendre
-    if(o2.length > 0) {
-        o = $("#nomchamPH");
-        if ( o.length > 0) {
-            var ancienind = o2.prop('selectedIndex');
-            var tmp = pref[o.val()].valsug[o2.prop('selectedIndex')];
+    function verifAndactiv() {
+        const o = $("#valajout");
+        if (o.length > 0) {
+            if (o.val().trim() !== "") {
+                activer_bout('bout_add', true);
+            }
+            else {
+                activer_bout('bout_add', false);
+            }
+        }
+    }
+
+    function desactiver() {
+        const o = $("#valajout");
+        // desactivation du bouton ajouter
+        if (o.length > 0) {
+            o.val("");
+            activer_bout("bout_add", true);
+        }
+    }
+
+    function valid() {
+        savenomaff();
+        let lexmlstruct = '';
+
+        if ($('#divGraph').length > 0 && $('#divGraph').is(':visible')) {
+            lexmlstruct = getSruct();
+        }
+        else if ($('#divXml').length > 0 && $('#divXml').is(':visible')) {
+            lexmlstruct = $('#txtareaxml').val();
+        }
+
+        if ($("#idstr").length > 0) {
+            $("#idstr").val(lexmlstruct);
+
+            const form = $("form[name=chgStructure]");
+
+            $.ajax({
+                dataType: 'json',
+                type:     form.attr('method'),
+                url:      form.attr('action'),
+                data:     form.serializeArray(),
+                success:  function (data) {
+                    if (data.success) {
+                        $('#tree li.selected a').trigger('click');
+                    }
+                    else {
+                        $(".page-header").after(
+                            '<div class="alert alert-error">'
+                            + '<button class="close" data-dismiss="alert">×</button>'
+                            + data.msg
+                            + '</div>');
+                    }
+                }
+            });
+        }
+    }
+
+    function modifordre(bool) {
+        let o2 = $("#valsug2");
+        const o = $("#nomchamPH");
+        //bool : true pour monter  -- false pour descendre
+        if (o2.length > 0 && o.length > 0) {
+            let ancienind = o2.prop('selectedIndex');
+            let tmp       = pref[o.val()].valsug[o2.prop('selectedIndex')];
 
             if (bool) {
-                pref[o.val()].valsug[o2.prop('selectedIndex')] = pref[o.val()].valsug[o2.prop('selectedIndex')-1] ;
-                pref[o.val()].valsug[o2.prop('selectedIndex')-1] = tmp ;
+                pref[o.val()].valsug[o2.prop('selectedIndex')]     = pref[o.val()].valsug[o2.prop('selectedIndex') - 1];
+                pref[o.val()].valsug[o2.prop('selectedIndex') - 1] = tmp;
                 ancienind--;
-            } else {
-                pref[o.val()].valsug[o2.prop('selectedIndex')] = pref[o.val()].valsug[o2.prop('selectedIndex')+1] ;
-                pref[o.val()].valsug[o2.prop('selectedIndex')+1] = tmp ;
+            }
+            else {
+                pref[o.val()].valsug[o2.prop('selectedIndex')]     = pref[o.val()].valsug[o2.prop('selectedIndex') + 1];
+                pref[o.val()].valsug[o2.prop('selectedIndex') + 1] = tmp;
                 ancienind++;
             }
 
@@ -661,275 +410,216 @@ function modifordre(bool)
             desactiv4VS();
         }
     }
-}
 
-function trialph()
-{
-    o2 = $("#valsug2");
+    function trialph() {
+        const o2 = $("#valsug2");
+        const o = $("#nomchamPH");
 
-    if(o2.length > 0) {
-        o = $("#nomchamPH");
-        if ( o.length > 0 ) {
+        if (o2.length > 0 && o.length > 0) {
             pref[o.val()].valsug.sort();
             write_valsug();
             desactiv4VS();
             desactivall4VS()
         }
     }
-}
 
-function maketextaffich()
-{
-    return false;
-    o = $("#nomchamPH");
+    function maketextaffich() {
+        return false;
+    }
 
-    if ( o.length > 0 ) {
-        var tmp = "idtext";
+    function makeRestrict() {
+        const o = $("#nomchamPH");
 
-        if(pref[o.val()].Type != null ) {
-            tmp = "id" + pref[o.val()].Type;
-        }
+        if (o.length > 0) {
+            let tmp = "none";
 
-        o3 = $("#"+tmp);
+            if (pref[o.val()].content != null) {
+                tmp = pref[o.val()].content;
+            }
 
-        if ( o3.length > 0 ) {
-            o3.attr("checked", true);
+            const o3 = $("#" + tmp);
+
+            if (o3.length > 0) {
+                o3.attr("checked", true);
+            }
         }
     }
-}
 
-function makeRestrict()
-{
-    o = $("#nomchamPH");
+    function makeEmpty() {
+        const o = $("#nomchamPH");
 
-    if ( o.length > 0 ) {
-        var tmp = "none";
+        if (o.length > 0) {
+            let tmp = "empty";
+            if (!pref[o.val()].empty) {
+                tmp = "no" + tmp;
+            }
 
-        if(pref[o.val()].content != null ) {
-            tmp = pref[o.val()].content;
-        }
+            const o3 = $("#" + tmp);
 
-        o3 = $("#"+tmp);
-
-        if ( o3.length > 0 ) {
-            o3.attr("checked", true);
+            if (o3.length > 0) {
+                o3.attr("checked", true);
+            }
         }
     }
-}
 
-function makeEmpty()
-{
-    o = $("#nomchamPH");
+    function chgEmpty(bool) {
+        const o = $("#nomchamPH");
 
-    if ( o.length > 0 ) {
-        var tmp = "empty";
-        if(!pref[o.val()].empty) {
-            tmp = "no"+tmp;
-        }
-
-        o3 = $("#"+tmp);
-
-        if ( o3.length > 0 ) {
-            o3.attr("checked", true);
+        if (o.length > 0) {
+            pref[o.val()].empty = bool;
         }
     }
-}
 
-function chgEmpty(bool)
-{
-    o = $("#nomchamPH");
+    function chgType(type) {
+        const o = $("#nomchamPH");
 
-    if ( o.length > 0 ) {
-        pref[o.val()].empty = bool;
-    }
-}
-
-function chgType(type)
-{
-    o = $("#nomchamPH");
-
-    if ( o.length > 0 ) {
-        pref[o.val()].Type = type;
-    }
-}
-
-function chgrestrict(nomRestrict)
-{
-    o = $("#nomchamPH");
-
-    if ( o.length > 0 ) {
-        pref[o.val()].content=nomRestrict;
-    }
-}
-
-function activer_bout(idBout,val)
-{
-    o = $("#"+idBout);
-
-    if( o.length > 0 ) {
-        if (!val) {
-            o.prop('disabled', true);
-        } else {
-            o.prop('disabled', false);
+        if (o.length > 0) {
+            pref[o.val()].Type = type;
         }
-     }
-}
+    }
 
-otherFields = "";
+    function chgrestrict(nomRestrict) {
+        const o = $("#nomchamPH");
+
+        if (o.length > 0) {
+            pref[o.val()].content = nomRestrict;
+        }
+    }
+
+    function activer_bout(idBout, val) {
+        const o = $("#" + idBout);
+
+        if (o.length > 0) {
+            if (!val) {
+                o.prop('disabled', true);
+            }
+            else {
+                o.prop('disabled', false);
+            }
+        }
+    }
+
+    otherFields = "";
 
 
-{% for name, meta in structFields %}
-pref["{{ name }}"] = new valeursPref("{{ name }}");
-pref["{{ name }}"].nomaff = "{{ name }}>";
-pref["{{ name }}"].Type = "text";
-pref["{{ name }}"].content = "none";
-pref["{{ name }}"].empty = true;
-{% endfor %}
+    {% for name, meta in structFields %}
+    pref["{{ name }}"]         = new valeursPref("{{ name }}");
+    pref["{{ name }}"].nomaff  = "{{ name }}>";
+    pref["{{ name }}"].Type    = "text";
+    pref["{{ name }}"].content = "none";
+    pref["{{ name }}"].empty   = true;
+    {% endfor %}
 
 
-{% for value in suggestedValues %}
-pref["{{ value['key']|escapeDoubleQuote|raw }}"].valsug["{{ value['value']|escapeDoubleQuote|raw }}"] = ('{{ value['name']|escapeSimpleQuote|raw }}');
-{% endfor %}
+    {% for value in suggestedValues %}
+    pref["{{ value['key']|escapeDoubleQuote|raw }}"].valsug["{{ value['value']|escapeDoubleQuote|raw }}"] = ('{{ value['name']|escapeSimpleQuote|raw }}');
+    {% endfor %}
 
 
-{% for pref in basePrefs %}
-{% if pref['status'] is not none %}
+    {% for pref in basePrefs %}
+    {% if pref['status'] is not none %}
     statuscoll = "<status>{{ pref['status'] }}</status>";
-{% elseif pref['xml'] is not none %}
+    {% elseif pref['xml'] is not none %}
     otherFields += "{{ pref['xml'] | e('js') }}";
-{% endif%}
-{% endfor %}
+    {% endif %}
+    {% endfor %}
 
-function getSruct()
-{
-    var parser = new DOMParser();
-    var dom = parser.parseFromString($('#txtareaxml').val(), 'text/xml');
-    var existing = dom.getElementsByTagName('sugestedValues');
+    function getSruct() {
+        const parser = new DOMParser();
+        const dom    = parser.parseFromString($('#txtareaxml').val(), 'text/xml');
 
-    if (existing.length !== 0) {
-        for (i in existing) {
-            if (existing[i].parentNode) {
-                existing[i].parentNode.removeChild(existing[i]);
+        let svDeleted = false;
+        while (true) {
+            const svs = dom.getElementsByTagName('sugestedValues');
+            if (svs.length === 0) {
+                break;
             }
+            const sv     = svs[0];
+            const indent = sv.previousSibling;
+            if (indent && indent.nodeType === dom.TEXT_NODE && indent.textContent.trim() === "") {
+                indent.parentNode.removeChild(indent);
+            }
+            const eol = sv.nextSibling;
+            if (eol && eol.nodeType === dom.TEXT_NODE && eol.textContent.trim() === "") {
+                eol.parentNode.removeChild(eol);
+            }
+            sv.parentNode.removeChild(sv);
+            svDeleted = true;
+        }
+
+        const sv = dom.createElement('sugestedValues');
+
+        for (const a in pref) {
+            const section = dom.createElement(a);
+            let go        = false;
+            for (const b in pref[a].valsug) {
+                if (pref[a].valsug[b] !== "") {
+                    go          = true;
+                    const value = dom.createElement('value');
+                    value.appendChild(dom.createTextNode(pref[a].valsug[b]));
+                    section.appendChild(dom.createTextNode("\n\t\t\t"));
+                    section.appendChild(value);
+                }
+            }
+            if (go) {
+                sv.appendChild(dom.createTextNode("\n\t\t"));
+                section.appendChild(dom.createTextNode("\n\t\t"));
+                sv.appendChild(section);
+            }
+        }
+        sv.appendChild(dom.createTextNode("\n\t"));
+        const bp = dom.getElementsByTagName('baseprefs')[0];
+        if (svDeleted) {
+            bp.appendChild(dom.createTextNode("\n"));
+        }
+        bp.appendChild(dom.createTextNode("\t"));
+        bp.appendChild(sv);
+        bp.appendChild(dom.createTextNode("\n"));
+
+        const serializer = new XMLSerializer();
+        let xml          = serializer.serializeToString(dom).replace("<baseprefs>", "\n<baseprefs>");
+
+        if (xml.substring(0, 8) !== '<?xml ve') {
+            xml = '<?xml version="1.0" encoding="UTF-8"?>' + xml;
+        }
+
+        return xml;
+    }
+
+    function view(type) {
+        $(".tabbar A").removeClass("active");
+        switch (type) {
+            case 'XML':
+                $('#divGraph').css("display", "none");
+                $('#divXml').css("display", "flex");
+
+                $('#linkviewxml').addClass("active");
+
+                newStr = getSruct();
+
+                if ($('#txtareaxml').length > 0 && newStr != null) {
+                    avantModif = newStr;
+                    $('#txtareaxml').val(newStr);
+                }
+                break;
+
+            case 'GRAPH':
+                if (!changeInXml || confirm("{{ 'admin::sugval: Attention, passer en mode graphique implique la perte des modifications du xml si vous n\'appliquez pas les changements avant.' |trans | e('js') }}\n{{ 'Continuer quand meme' |trans | e('js') }}")) {
+                    $('#divXml').css("display", "none");
+                    $('#divGraph').css("display", "flex");
+
+                    $('#linkviewgraph').addClass("active");
+                }
+                break;
         }
     }
 
-    var values = dom.createElement('sugestedValues');
-
-    for (a in pref ) {
-    	var section = dom.createElement(a);
-        var go = false;
-        for (b in pref[a].valsug ) {
-            if(pref[a].valsug[b]!="") {
-                go = true;
-                var value = dom.createElement('value');
-                value.appendChild(dom.createTextNode(pref[a].valsug[b]));
-                section.appendChild(value);
-            }
-        }
-        if (go) {
-            values.appendChild(section);
-        }
-    }
-    dom.getElementsByTagName('baseprefs')[0].appendChild(values);
-
-    var serializer = new XMLSerializer();
-    var xml = serializer.serializeToString(dom);
-
-    if (xml.substring(0, 8) !== '<?xml ve') {
-        xml = '<?xml version="1.0" encoding="UTF-8"?>' + xml;
-    }
-
-    xml.replace('<sugestedValues>', statuscoll + otherFields + '<sugestedValues>');
-
-
-    return formatXml(xml);
-}
-
-function formatXml(xml) {
-    var formatted = '';
-    var reg = /(>)(<)(\/*)/g;
-    xml = xml.replace(reg, '$1\r\n$2$3');
-    var pad = 0;
-    jQuery.each(xml.split('\r\n'), function(index, node) {
-        var indent = 0;
-        if (node.match( /.+<\/\w[^>]*>$/ )) {
-            indent = 0;
-        } else if (node.match( /^<\/\w/ )) {
-            if (pad != 0) {
-                pad -= 1;
-            }
-        } else if (node.match( /^<\w[^>]*[^\/]>.*$/ )) {
-            indent = 1;
-        } else {
-            indent = 0;
-        }
-
-        var padding = '';
-        for (var i = 0; i < pad; i++) {
-            padding += '  ';
-        }
-
-        formatted += padding + node + '\r\n';
-        pad += indent;
+    $(document).ready(function () {
+        write_valsug();
+        makeRestrict();
+        maketextaffich();
+        makeEmpty();
+        $("#iddivloading").hide();
     });
 
-    return formatted;
-}
-
-function view(type)
-{
-    switch(type)
-    {
-      case 'XML':
-          if($('#divGraph').length > 0 )
-              $('#divGraph').hide();
-
-          if($('#divXml').length > 0 )
-              $('#divXml').show();
-
-          if($('#linkviewgraph').length >0 )
-              $('#linkviewgraph').show();
-
-          if( $('#linkviewxml'))
-              $('#linkviewxml').hide();
-
-          newStr=getSruct();
-
-          if($('#txtareaxml').length > 0 && newStr!=null  )
-          {
-              avantModif =  newStr;
-              $('#txtareaxml').val(newStr);
-          }
-
-
-          break;
-      case 'GRAPH':
-          if( !changeInXml || confirm("{{ 'admin::sugval: Attention, passer en mode graphique implique la perte des modifications du xml si vous n\'appliquez pas les changements avant.' |trans | e('js') }}\n{{ 'Continuer quand meme' |trans | e('js') }}"))
-          {
-              if($('#divGraph').length > 0 )
-                  $('#divGraph').show();
-
-              if($('#divXml').length > 0 )
-                  $('#divXml').hide();
-
-              if($('#linkviewgraph').length > 0 )
-                  $('#linkviewgraph').hide();
-              if($('#linkviewxml').length >0 )
-                  $('#linkviewxml').show();
-          }
-          break;
-      }
-}
-
-$(document).ready(function(){
-    write_valsug();
-    makeRestrict();
-    maketextaffich();
-    makeEmpty();
-    redrawme();
-    scan();
-    $("#iddivloading").hide();
-});
-
 </script>
diff --git a/templates/web/common/dialog_export.html.twig b/templates/web/common/dialog_export.html.twig
index f72d9601be..046a8ed0c7 100644
--- a/templates/web/common/dialog_export.html.twig
+++ b/templates/web/common/dialog_export.html.twig
@@ -170,8 +170,8 @@
                                 </label>
                             </div>
                         {% endif %}
-                        {% if app['conf'].get(['registry', 'actions', 'export-stamp-choice']) == true and download.has_stamp_option() == true %}
-                            <div id="stamp_choice" class="well-small hide" style="margin-left: 20px;" >
+                        {% if removeable_stamp and download.has_stamp_option() == true %}
+                            <div id="stamp_choice" class="well-small" style="margin-left: 20px;" >
                                 <label for="option_stamp" class="checkbox">
                                     <input class="stamp_choice" type="checkbox" id="stamp_choice" name="stamp_choice" value="NO_STAMP" />
                                     {{ 'prod::download: delete-marking-stamp' | trans }}
@@ -540,14 +540,6 @@
             $(document).find(".tagsinput").tagsinput('add', $(this).val());
             $(this).val('');
         });
-
-        $('#download_document').click(function(){
-            if($(this).is(':checked')){
-                $('#download_stamp_choice').show();
-            } else{
-                $('#download_stamp_choice').hide();
-            }
-        });
     </script>
 {% endif %}