diff --git a/include/admin/templates.inc.php b/include/admin/templates.inc.php
index ab66238b..b768f322 100644
--- a/include/admin/templates.inc.php
+++ b/include/admin/templates.inc.php
@@ -169,7 +169,11 @@ foreach ($stack as $theme => $info) {
     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'])) {
-        $data['templates'][$theme]['fullsize_preview'] = $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'];
+        }
     }
 
     if (file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . $theme . '/preview.png')) {
diff --git a/templates/2k11/admin/templates.inc.tpl b/templates/2k11/admin/templates.inc.tpl
index 74688fbd..48aaffa5 100644
--- a/templates/2k11/admin/templates.inc.tpl
+++ b/templates/2k11/admin/templates.inc.tpl
@@ -33,9 +33,13 @@
             <div class="clearfix equal_heights template_wrap">
                 <div class="template_preview">
                 {if $cur_tpl.fullsize_preview || $cur_tpl.preview}
-                    {if $cur_tpl.fullsize_preview}<a href="{$cur_tpl.fullsize_preview}">{/if}
-                    {if $cur_tpl.preview}<img src="{$cur_tpl.preview}" alt="{$CONST.PREVIEW}">{/if}
-                    {if $cur_tpl.fullsize_preview}</a>{/if}
+                    {if $cur_tpl.fullsize_preview}
+                        <a href="{$cur_tpl.fullsize_preview}">
+                            <img src="{$cur_tpl.fullsize_preview}" width="400" style="max-height: 250px;" alt="{$CONST.PREVIEW}" >
+                        </a>
+                    {else}
+                        <img src="{$cur_tpl.preview}" alt="{$CONST.PREVIEW}" >
+                    {/if}
                 {/if}
                     <footer id="template_info_cur" class="template_info additional_info">
                         <dl class="clearfix">
@@ -66,10 +70,13 @@
                     <div class="clearfix equal_heights template_wrap">
                         <div class="template_preview">
                         {if $info.fullsize_preview || $info.preview}
-                        
-                            {if $info.fullsize_preview}<a href="{$info.fullsize_preview}">{/if}
-                            {if $info.preview}<img src="{$info.preview}" alt="{$CONST.PREVIEW}" >{/if}
-                            {if $info.fullsize_preview}</a>{/if}
+                            {if $info.fullsize_preview}
+                                <a href="{$info.fullsize_preview}">
+                                    <img src="{$info.fullsize_preview}" width="400" style="max-height: 250px;" alt="{$CONST.PREVIEW}" >
+                                </a>
+                            {else}
+                                <img src="{$info.preview}" alt="{$CONST.PREVIEW}" >
+                            {/if}
                         {/if}
                             <footer id="template_info_{$info@key}" class="template_info additional_info">
                                 <dl class="clearfix">