diff --git a/include/admin/templates.inc.php b/include/admin/templates.inc.php
index 22bb3744..989007b7 100644
--- a/include/admin/templates.inc.php
+++ b/include/admin/templates.inc.php
@@ -181,20 +181,28 @@ foreach ($stack as $theme => $info) {
         continue;
     }
 
-    if (file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . $theme . '/preview_fullsize.jpg')) {
-        $data['templates'][$theme]['fullsize_preview'] = $serendipity['baseURL'] . $serendipity['templatePath'] . $theme . '/preview_fullsize.jpg';
-    } elseif (!empty($info['preview_fullsizeURL'])) {
-        if (file_exists($serendipity['serendipityPath'] . '/templates_c/template_cache/'. $theme .'.jpg')) {
-            $data['templates'][$theme]['fullsize_preview']  = $serendipity['baseURL'] . 'templates_c/template_cache/'. $theme .'.jpg';
-        } else {
-            $data['templates'][$theme]['fullsize_preview'] = $info['preview_fullsizeURL'];
-        }
-    }
+    foreach(array('', '_backend') as $backendId) {
 
-    if (file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . $theme . '/preview.png')) {
-        $data['templates'][$theme]['preview'] = $serendipity['templatePath'] . $theme . '/preview.png';
-    } elseif (!empty($info['previewURL'])) {
-        $data['templates'][$theme]['preview'] = $info['previewURL'] ;
+        if (file_exists($serendipity["serendipityPath"] . $serendipity["templatePath"] . $theme . "/preview${backendId}_fullsize.jpg")) {
+            $data["templates"][$theme]["fullsize${backendId}_preview"] = $serendipity["baseURL"] . $serendipity["templatePath"] . $theme . "/preview${backendId}_fullsize.jpg";
+        } elseif (!empty($info["preview{$backendId}_fullsizeURL"])) {   // preview{$backendId}_fullsizeURL is not actually set yet in spartacus
+            if (file_exists($serendipity["serendipityPath"] . "/templates_c/template_cache/". $theme ."{$backendId}.jpg")) {
+                $data["templates"][$theme]["fullsize${backendId}_preview"]  = $serendipity["baseURL"] . "templates_c/template_cache/". $theme ."{$backendId}.jpg";
+            } else {
+                $data["templates"][$theme]["fullsize${backendId}_preview"] = $info["preview{$backendId}_fullsizeURL"];
+            }
+        }
+
+        $previewType = '.png';
+        if ($backendId) {
+            $previewType = '.jpg';
+        }
+
+        if (file_exists($serendipity["serendipityPath"] . $serendipity["templatePath"] . $theme . "/preview${backendId}${previewType}")) {
+            $data["templates"][$theme]["preview${backendId}"] = $serendipity["templatePath"] . $theme . "/preview${backendId}${previewType}";
+        } elseif (!empty($info["previewURL"])) {
+            $data["templates"][$theme]["preview${backendId}"] = $info["previewURL${backendId}"] ;
+        }
     }
 
     $unmetRequirements = array();
diff --git a/templates/2k11/admin/templates.inc.tpl b/templates/2k11/admin/templates.inc.tpl
index 939b07a3..36a5f02b 100644
--- a/templates/2k11/admin/templates.inc.tpl
+++ b/templates/2k11/admin/templates.inc.tpl
@@ -67,13 +67,13 @@
 
                 <div class="clearfix equal_heights template_wrap">
                     <div class="template_preview">
-                    {if $cur_tpl_backend.fullsize_preview || $cur_tpl_backend.preview}
-                        {if $cur_tpl_backend.fullsize_preview}
-                            <a class="media_fullsize" href="{$cur_tpl_backend.fullsize_preview}" title="{$CONST.MEDIA_FULLSIZE}: {$cur_tpl_backend.info.name}">
-                                <img src="{$cur_tpl_backend.fullsize_preview}" class="template_preview_img" alt="{$CONST.PREVIEW}" >
+                    {if $cur_tpl_backend.fullsize_backend_preview || $cur_tpl_backend.preview_backend}
+                        {if $cur_tpl_backend.fullsize_backend_preview}
+                            <a class="media_fullsize" href="{$cur_tpl_backend.fullsize_backend_preview}" title="{$CONST.MEDIA_FULLSIZE}: {$cur_tpl_backend.info.name}">
+                                <img src="{$cur_tpl_backend.fullsize_backend_preview}" class="template_preview_img" alt="{$CONST.PREVIEW}" >
                             </a>
                         {else}
-                            <img src="{$cur_tpl_backend.preview}" alt="{$CONST.PREVIEW}" >
+                            <img src="{$cur_tpl_backend.preview_backend}" alt="{$CONST.PREVIEW}" >
                         {/if}
                     {/if}
                         <footer id="template_info_cur_backend" class="template_info additional_info">