diff --git a/main/admin/settings.lib.php b/main/admin/settings.lib.php
index 43a8a7ddc4..1c6d4cb302 100755
--- a/main/admin/settings.lib.php
+++ b/main/admin/settings.lib.php
@@ -1077,9 +1077,9 @@ function actionsFilter($id)
 function searchImageFilter($image)
 {
     if (!empty($image)) {
-        return '<img src="'.api_get_path(WEB_PUBLIC_PATH).'img/templates_thumb/'.$image.'" alt="'.get_lang('TemplatePreview').'"/>';
+        return '<img src="'.api_get_path(WEB_PUBLIC_PATH).'img/template_thumb/'.$image.'" alt="'.get_lang('TemplatePreview').'"/>';
     } else {
-        return '<img src="'.api_get_path(WEB_PUBLIC_PATH).'img/templates_thumb/noimage.gif" alt="'.get_lang('NoTemplatePreview').'"/>';
+        return '<img src="'.api_get_path(WEB_PUBLIC_PATH).'img/template_thumb/noimage.gif" alt="'.get_lang('NoTemplatePreview').'"/>';
     }
 }
 
diff --git a/public/img/templates_thumb/audiocomment.gif b/public/img/template_thumb/audiocomment.gif
similarity index 100%
rename from public/img/templates_thumb/audiocomment.gif
rename to public/img/template_thumb/audiocomment.gif
diff --git a/public/img/templates_thumb/checklist.gif b/public/img/template_thumb/checklist.gif
similarity index 100%
rename from public/img/templates_thumb/checklist.gif
rename to public/img/template_thumb/checklist.gif
diff --git a/public/img/templates_thumb/compare.gif b/public/img/template_thumb/compare.gif
similarity index 100%
rename from public/img/templates_thumb/compare.gif
rename to public/img/template_thumb/compare.gif
diff --git a/public/img/templates_thumb/courseobjectives.gif b/public/img/template_thumb/courseobjectives.gif
similarity index 100%
rename from public/img/templates_thumb/courseobjectives.gif
rename to public/img/template_thumb/courseobjectives.gif
diff --git a/public/img/templates_thumb/coursetitle.gif b/public/img/template_thumb/coursetitle.gif
similarity index 100%
rename from public/img/templates_thumb/coursetitle.gif
rename to public/img/template_thumb/coursetitle.gif
diff --git a/public/img/templates_thumb/cyclechart.gif b/public/img/template_thumb/cyclechart.gif
similarity index 100%
rename from public/img/templates_thumb/cyclechart.gif
rename to public/img/template_thumb/cyclechart.gif
diff --git a/public/img/templates_thumb/description.gif b/public/img/template_thumb/description.gif
similarity index 100%
rename from public/img/templates_thumb/description.gif
rename to public/img/template_thumb/description.gif
diff --git a/public/img/templates_thumb/diagram.gif b/public/img/template_thumb/diagram.gif
similarity index 100%
rename from public/img/templates_thumb/diagram.gif
rename to public/img/template_thumb/diagram.gif
diff --git a/public/img/templates_thumb/empty.gif b/public/img/template_thumb/empty.gif
similarity index 100%
rename from public/img/templates_thumb/empty.gif
rename to public/img/template_thumb/empty.gif
diff --git a/public/img/templates_thumb/flash.gif b/public/img/template_thumb/flash.gif
similarity index 100%
rename from public/img/templates_thumb/flash.gif
rename to public/img/template_thumb/flash.gif
diff --git a/public/img/templates_thumb/index.html b/public/img/template_thumb/index.html
similarity index 100%
rename from public/img/templates_thumb/index.html
rename to public/img/template_thumb/index.html
diff --git a/public/img/templates_thumb/learnerwonder.gif b/public/img/template_thumb/learnerwonder.gif
similarity index 100%
rename from public/img/templates_thumb/learnerwonder.gif
rename to public/img/template_thumb/learnerwonder.gif
diff --git a/public/img/templates_thumb/leftlist.gif b/public/img/template_thumb/leftlist.gif
similarity index 100%
rename from public/img/templates_thumb/leftlist.gif
rename to public/img/template_thumb/leftlist.gif
diff --git a/public/img/templates_thumb/leftrightlist.gif b/public/img/template_thumb/leftrightlist.gif
similarity index 100%
rename from public/img/templates_thumb/leftrightlist.gif
rename to public/img/template_thumb/leftrightlist.gif
diff --git a/public/img/templates_thumb/noimage.gif b/public/img/template_thumb/noimage.gif
similarity index 100%
rename from public/img/templates_thumb/noimage.gif
rename to public/img/template_thumb/noimage.gif
diff --git a/public/img/templates_thumb/phasetimeline.gif b/public/img/template_thumb/phasetimeline.gif
similarity index 100%
rename from public/img/templates_thumb/phasetimeline.gif
rename to public/img/template_thumb/phasetimeline.gif
diff --git a/public/img/templates_thumb/rightlist.gif b/public/img/template_thumb/rightlist.gif
similarity index 100%
rename from public/img/templates_thumb/rightlist.gif
rename to public/img/template_thumb/rightlist.gif
diff --git a/public/img/templates_thumb/stopthink.gif b/public/img/template_thumb/stopthink.gif
similarity index 100%
rename from public/img/templates_thumb/stopthink.gif
rename to public/img/template_thumb/stopthink.gif
diff --git a/public/img/templates_thumb/table.gif b/public/img/template_thumb/table.gif
similarity index 100%
rename from public/img/templates_thumb/table.gif
rename to public/img/template_thumb/table.gif
diff --git a/public/img/templates_thumb/video.gif b/public/img/template_thumb/video.gif
similarity index 100%
rename from public/img/templates_thumb/video.gif
rename to public/img/template_thumb/video.gif
diff --git a/public/img/templates_thumb/yourinstructor.gif b/public/img/template_thumb/yourinstructor.gif
similarity index 100%
rename from public/img/templates_thumb/yourinstructor.gif
rename to public/img/template_thumb/yourinstructor.gif
diff --git a/src/CoreBundle/Controller/EditorController.php b/src/CoreBundle/Controller/EditorController.php
index 442505aa1a..031ad2c009 100644
--- a/src/CoreBundle/Controller/EditorController.php
+++ b/src/CoreBundle/Controller/EditorController.php
@@ -34,7 +34,7 @@ class EditorController extends Controller
     public function editorTemplatesAction()
     {
         $editor = new CkEditor(
-            $this->get('translator.default'),
+            $this->get('translator'),
             $this->get('router')
         );
         $templates = $editor->simpleFormatTemplates();