diff --git a/application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_select_survey_theme.php b/application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_select_survey_theme.php
index 38444983672..7fe2955ada4 100644
--- a/application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_select_survey_theme.php
+++ b/application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_select_survey_theme.php
@@ -10,8 +10,8 @@
         <div class=" ">
             <select id='theme' class="form-control custom-data"  name='theme' >
                 <?php
-                    $athemeList = Template::getTemplateListWithPreviews();
-                    foreach ($athemeList as $themeName => $preview) {
+                    $athemeList = Template::getTemplateList();
+                    foreach ($athemeList as $themeName => $folder) {
                         if (Permission::model()->hasGlobalPermission('themes','read') || Permission::model()->hasTemplatePermission($themeName) ) { ?>
                             <option value='<?php echo CHtml::encode($themeName); /* sanitize_filename aloow single quote */?>'>
                                 <?php echo CHtml::encode($themeName); ?>
diff --git a/application/models/Template.php b/application/models/Template.php
index 63d9a65b23e..78f069a8f2c 100755
--- a/application/models/Template.php
+++ b/application/models/Template.php
@@ -442,21 +442,24 @@ public static function getTemplateList()
     }
 
     /**
-     * @return array
-     * TODO: replace the calls to that function by a data provider based on search
+     * Return the array of existing and installed template with the preview images
+     * @todo deprecated to use directly Template::getTemplateList, usage of value seems deprecated
+     * @return array[]
      */
     public static function getTemplateListWithPreviews()
     {
+        $criteria = new CDBCriteria();
+        $criteria->select = 'template_name';
+        $criteria->condition = 'sid IS NULL AND gsid IS NULL';
+        $criteria->addInCondition('template_name', array_keys(self::getTemplateList()));
 
+        $oTemplateList = TemplateConfiguration::model()->with(array(
+            'template' => ['select' => 'id, name'],
+        ))->findAll($criteria);
         $aTemplateList = array();
-
-        $oTemplateList = TemplateConfiguration::model()->search();
-        $oTemplateList->setPagination(false);
-
-        foreach ($oTemplateList->getData() as $oTemplate) {
+        foreach ($oTemplateList as $oTemplate) {
             $aTemplateList[$oTemplate->template_name]['preview'] = $oTemplate->preview;
         }
-
         return $aTemplateList;
     }
 
diff --git a/application/views/admin/survey/subview/_survey_quickaction.php b/application/views/admin/survey/subview/_survey_quickaction.php
index ebd872f939e..a590425db74 100644
--- a/application/views/admin/survey/subview/_survey_quickaction.php
+++ b/application/views/admin/survey/subview/_survey_quickaction.php
@@ -5,6 +5,7 @@
  * @var Survey $oSurvey
  */
  $count= 0;
+ /* Use $template['preview'] in ./application/views/admin/survey/subview/_template_carousel.php */
  $templates = Template::getTemplateListWithPreviews();
  $surveylocale = Permission::model()->hasSurveyPermission($oSurvey->sid, 'surveylocale', 'read');
  // EDIT SURVEY SETTINGS BUTTON
diff --git a/application/views/admin/survey/subview/accordion/_generaloptions_panel.php b/application/views/admin/survey/subview/accordion/_generaloptions_panel.php
index b85c8c5f049..64d737e1da6 100755
--- a/application/views/admin/survey/subview/accordion/_generaloptions_panel.php
+++ b/application/views/admin/survey/subview/accordion/_generaloptions_panel.php
@@ -313,8 +313,8 @@ function checkSelect2Languages(mylangs) {
                         <option value="inherit" <?php echo ($oSurvey->template == 'inherit')?'selected="selected"':''; ?>><?php echo eT('Inherit').' ['. $oSurveyOptions->template . ']'; ?></option>
                     <?php } ?>
                     <?php
-                    $aTemplateList = Template::getTemplateListWithPreviews();
-                    foreach ($aTemplateList as $templateName => $preview) {
+                    $aTemplateList = Template::getTemplateList();
+                    foreach ($aTemplateList as $templateName => $folder) {
                         if (Permission::model()->hasGlobalPermission('templates','read') || Permission::model()->hasTemplatePermission($templateName) || $oSurvey->template==htmlspecialchars($templateName) ) { ?>
                             <option value='<?php echo CHtml::encode($templateName); ?>'
                                 <?php if ($oSurvey->template && htmlspecialchars($templateName) == $oSurvey->template && $oSurvey->template != 'inherit') { ?>
diff --git a/application/views/admin/survey/surveySummary_view.php b/application/views/admin/survey/surveySummary_view.php
index 82f147fd492..591fb4d88dd 100644
--- a/application/views/admin/survey/surveySummary_view.php
+++ b/application/views/admin/survey/surveySummary_view.php
@@ -9,9 +9,6 @@
 // DO NOT REMOVE This is for automated testing to validate we see that page
 echo viewHelper::getViewTestTag('surveySummary');
 
-//TODO : move to controller
-$templates = Template::getTemplateListWithPreviews();
-//print_r($templates);
 $count = 0;
 $surveyid = $oSurvey->sid;
 $templateModel = Template::model()->findByPk($oSurvey->oOptions->template);
diff --git a/application/views/surveyAdministration/surveySummary_view.php b/application/views/surveyAdministration/surveySummary_view.php
index ba97fdc4011..54a45aaaf4c 100644
--- a/application/views/surveyAdministration/surveySummary_view.php
+++ b/application/views/surveyAdministration/surveySummary_view.php
@@ -14,9 +14,6 @@
 // DO NOT REMOVE This is for automated testing to validate we see that page
 echo viewHelper::getViewTestTag('surveySummary');
 
-//TODO : move to controller
-$templates = Template::getTemplateListWithPreviews();
-//print_r($templates);
 $count = 0;
 $surveyid = $oSurvey->sid;
 $templateModel = Template::model()->findByPk($oSurvey->oOptions->template);