diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Tools.php b/lib/Alchemy/Phrasea/Controller/Prod/Tools.php
index 66cd544cbd..c0f5ef05ae 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Tools.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Tools.php
@@ -205,13 +205,13 @@ class Tools implements ControllerProviderInterface
                                     , $request->get('record_id')
                             );
 
-                            $media = $app['Core']['mediavorus']->guess($file);
+                            $media = $app['Core']['mediavorus']->guess(new \SplFileInfo($tmpFile));
 
                             $record->substitute_subdef('thumbnail', $media);
 
                             $success = true;
                         } catch (\Exception $e) {
-                            $errorMessage = $e->getMessage();
+                            $errorMessage = _('An error occured');
                         }
                     } else {
                         $errorMessage = _('file is not valid');
diff --git a/templates/web/prod/actions/Tools/index.html.twig b/templates/web/prod/actions/Tools/index.html.twig
index 2016ac3617..6d4c8964b2 100644
--- a/templates/web/prod/actions/Tools/index.html.twig
+++ b/templates/web/prod/actions/Tools/index.html.twig
@@ -57,7 +57,7 @@
                         </a>
                     </li>
                 {% endif %}
-                {% if selectionLength == 1 and registry.get('GV_seeOngChgDoc') %}
+                {% if selectionLength == 1 and (registry.get('GV_seeOngChgDoc') or registry.get('GV_seeNewThumb')) %}
                     <li>
                         <a href="#substitution">
                             {% trans "substitution" %}
@@ -73,7 +73,7 @@
                 {% endif %}
             </ul>
         </div>
-        {# subef section #}
+        {# subdef section #}
         <div id="subdefs" class="tabBox">
             <form id="new-img-form" action="/prod/tools/image/" method="post">
                 <fieldset style='border:1px solid #999; padding:20px;'>
@@ -269,70 +269,74 @@
     {% endif %}
 
     {# hd sub section #}
-    {% if selectionLength == 1 %}
+    {% if selectionLength == 1 and (registry.get('GV_seeOngChgDoc') or registry.get('GV_seeNewThumb')) %}
       {% for record in selection %}
         <div id="substitution" class="tabBox">
 
-         {% if registry.get('GV_seeOngChgDoc') %}
-            <div id="substitution-hd">
-              <form
-                name ="formchgHD"
-                action="/prod/tools/hddoc/"
-                enctype="multipart/form-data"
-                method="post"
-                target="uploadHdsub">
+         {% if "unknown" == record.get_type() %}
+            <i class="icon-warning-sign icon-white"></i>{% trans "Substitution is not possible for this kind of record" %}
+         {% else %}
+            {% if registry.get('GV_seeOngChgDoc') %}
+                <div id="substitution-hd">
+                  <form
+                    name ="formchgHD"
+                    action="/prod/tools/hddoc/"
+                    enctype="multipart/form-data"
+                    method="post"
+                    target="uploadHdsub">
 
-                <fieldset style='border:1px solid #999;padding:20px;'>
-                  <legend style='color:#EEE'>&nbsp;<b>{% trans "substitution HD" %}</b>&nbsp;</legend>
-                  <div>
-                    <input type="hidden" name="MAX_FILE_SIZE" value="20000000" />
-                    <input id='new-hd-file' name="newHD" type="file" />
-                    <br />
-                    <label for="CCFNALP" class="checkbox">
-                        <input type="checkbox" name="ccfilename" id="CCFNALP" value="1">
-                        {% trans "mettre a jour le nom original de fichier apres substitution"%}
-                    </label>
-                    <input type="hidden" name="ACT" value="SEND" />
-                    <input type="hidden" name="sbas_id" value="{{record.get_sbas_id()}}"/>
-                    <input type="hidden" name="record_id" value="{{record.get_record_id()}}" />
-                    <div class="load"></div>
-                  </div>
-                </fieldset>
-                <div style='text-align:right;padding-top:10px;'>
-                  <button class="iframe_submiter btn btn-inverse">{% trans "validate" %}</button>
-                  <button class="action_cancel btn btn-inverse">{% trans "cancel" %}</button>
+                    <fieldset style='border:1px solid #999;padding:20px;'>
+                      <legend style='color:#EEE'>&nbsp;<b>{% trans "substitution HD" %}</b>&nbsp;</legend>
+                      <div>
+                        <input type="hidden" name="MAX_FILE_SIZE" value="20000000" />
+                        <input id='new-hd-file' name="newHD" type="file"/>
+                        <br />
+                        <label for="CCFNALP" class="checkbox">
+                            <input type="checkbox" name="ccfilename" id="CCFNALP" value="1">
+                            {% trans "mettre a jour le nom original de fichier apres substitution"%}
+                        </label>
+                        <input type="hidden" name="ACT" value="SEND" />
+                        <input type="hidden" name="sbas_id" value="{{record.get_sbas_id()}}"/>
+                        <input type="hidden" name="record_id" value="{{record.get_record_id()}}" />
+                        <div class="load"></div>
+                      </div>
+                    </fieldset>
+                    <div style='text-align:right;padding-top:10px;'>
+                      <button class="iframe_submiter btn btn-inverse">{% trans "validate" %}</button>
+                      <button class="action_cancel btn btn-inverse">{% trans "cancel" %}</button>
+                    </div>
+                  </form>
+                  <div class='resultAction'></div>
                 </div>
-              </form>
-              <div class='resultAction'></div>
-            </div>
-          {% endif %}
+              {% endif %}
 
-          {% if registry.get('GV_seeNewThumb') %}
-            <div id="substitution-sd">
-              <form
-                name="formchgHD"
-                action="/prod/tools/chgthumb/"
-                enctype="multipart/form-data"
-                method="post"
-                target="uploadHdsub">
-                <fieldset style='border:1px solid #999;padding:20px;'>
-                  <legend style='color:#EEE'>&nbsp;<b>{% trans "substitution SD" %}</b>&nbsp;</legend>
-                  <div>
-                    <input type="hidden" name="MAX_FILE_SIZE" value="20000000" />
-                    <input id='new-sd-file' name="newThumb" type="file" />
-                    <input type="hidden" name="sbas_id" value="{{record.get_sbas_id()}}" />
-                    <input type="hidden" name="record_id" value="{{record.get_record_id()}}" />
-                    <div class="load"></div>
-                  </div>
-                </fieldset>
-                <div style='text-align:right;padding-top:10px;'>
-                  <button class="iframe_submiter btn btn-inverse">{% trans "validate" %}</button>
-                  <button class="action_cancel btn btn-inverse">{% trans "cancel" %}</button>
+              {% if registry.get('GV_seeNewThumb') %}
+                <div id="substitution-sd">
+                  <form
+                    name="formchgHD"
+                    action="/prod/tools/chgthumb/"
+                    enctype="multipart/form-data"
+                    method="post"
+                    target="uploadHdsub">
+                    <fieldset style='border:1px solid #999;padding:20px;'>
+                      <legend style='color:#EEE'>&nbsp;<b>{% trans "substitution SD" %}</b>&nbsp;</legend>
+                      <div>
+                        <input type="hidden" name="MAX_FILE_SIZE" value="20000000" />
+                        <input id='new-sd-file' name="newThumb" type="file" />
+                        <input type="hidden" name="sbas_id" value="{{record.get_sbas_id()}}" />
+                        <input type="hidden" name="record_id" value="{{record.get_record_id()}}" />
+                        <div class="load"></div>
+                      </div>
+                    </fieldset>
+                    <div style='text-align:right;padding-top:10px;'>
+                      <button class="iframe_submiter btn btn-inverse">{% trans "validate" %}</button>
+                      <button class="action_cancel btn btn-inverse">{% trans "cancel" %}</button>
+                    </div>
+                  </form>
+                  <div class='resultAction'></div>
                 </div>
-              </form>
-              <div class='resultAction'></div>
-            </div>
-          {% endif %}
+              {% endif %}
+         {% endif %}
         </div>
       {% endfor %}
     {% endif %}
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/ToolsTest.php b/tests/Alchemy/Phrasea/Controller/Prod/ToolsTest.php
new file mode 100644
index 0000000000..62e15dd5a2
--- /dev/null
+++ b/tests/Alchemy/Phrasea/Controller/Prod/ToolsTest.php
@@ -0,0 +1,59 @@
+<?php
+
+require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+
+class ControllerToolsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
+{
+    protected $client;
+    protected $tmpFile;
+
+    public function setUp()
+    {
+        parent::setUp();
+        $this->client = $this->createClient();
+        $this->tmpFile = sys_get_temp_dir() . '/' . time() . mt_rand(1000, 9999) . '.jpg';
+        copy(__DIR__ . '/../../../../testfiles/cestlafete.jpg', $this->tmpFile);
+    }
+
+    public function tearDown()
+    {
+        if (file_exists($this->tmpFile)) {
+            unlink($this->tmpFile);
+        }
+        parent::tearDown();
+    }
+
+    public function createApplication()
+    {
+        $app = require __DIR__ . '/../../../../../lib/Alchemy/Phrasea/Application/Prod.php';
+
+        $app['debug'] = true;
+        unset($app['exception_handler']);
+
+        return $app;
+    }
+
+    public function testRouteChangeThumb()
+    {
+        $record = static::$records['record_1'];
+
+        $this->client->request('POST', '/tools/chgthumb/', array(
+            'sbas_id' => $record->get_sbas_id(),
+            'record_id' => $record->get_record_id(),
+        ), array(
+            'newThumb' => new UploadedFile(
+               $this->tmpFile, 'KIKOO.JPG', 'image/jpg', 2000
+            )
+        ));
+
+        $response = $this->client->getResponse();
+
+        $content = $response->getContent();
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertFalse(strpos(_('An error occured'), $content));
+        $this->assertFalse(strpos(_('file is not valid'), $content));
+    }
+}