diff --git a/Theme/Backend/Components/Media/list.tpl.php b/Theme/Backend/Components/Media/list.tpl.php
index 50a8eb6..74ae74e 100755
--- a/Theme/Backend/Components/Media/list.tpl.php
+++ b/Theme/Backend/Components/Media/list.tpl.php
@@ -1,8 +1,9 @@
 <?php declare(strict_types=1);
-use phpOMS\System\File\ExtensionType;
 use phpOMS\System\File\FileUtils;
 use phpOMS\Uri\UriFactory;
 
+include __DIR__ . '/../template-functions.php';
+
 ?>
 <div class="portlet">
     <div class="portlet-head"><?= $this->getHtml('Media', 'Media'); ?><i class="fa fa-download floatRight download btn"></i></div>
@@ -20,30 +21,7 @@ use phpOMS\Uri\UriFactory;
 
                 $icon          = '';
                 $extensionType = FileUtils::getExtensionType($value->getExtension());
-
-                if ($extensionType === ExtensionType::CODE) {
-                    $icon = 'file-code-o';
-                } elseif ($extensionType === ExtensionType::TEXT) {
-                    $icon = 'file-text-o';
-                } elseif ($extensionType === ExtensionType::PRESENTATION) {
-                   $icon = 'file-powerpoint-o';
-                } elseif ($extensionType === ExtensionType::PDF) {
-                    $icon = 'file-pdf-o';
-                } elseif ($extensionType === ExtensionType::ARCHIVE) {
-                    $icon = 'file-zip-o';
-                } elseif ($extensionType === ExtensionType::AUDIO) {
-                    $icon = 'file-audio-o';
-                } elseif ($extensionType === ExtensionType::VIDEO) {
-                    $icon = 'file-video-o';
-                } elseif ($extensionType === ExtensionType::IMAGE) {
-                    $icon = 'file-image-o';
-                } elseif ($extensionType === ExtensionType::SPREADSHEET) {
-                    $icon = 'file-excel-o';
-                } elseif ($value->getExtension() === 'collection') {
-                    $icon = 'folder-open-o';
-                } else {
-                    $icon = 'file-o';
-                }
+                $icon          = $fileIconFunction($extensionType);
         ?>
         <tr data-href="<?= $url; ?>">
             <td data-label="<?= $this->getHtml('Type'); ?>"><a href="<?= $url; ?>"><i class="fa fa-<?= $this->printHtml($icon); ?>"></i></a>
diff --git a/Theme/Backend/media-single.tpl.php b/Theme/Backend/media-single.tpl.php
index 52a1e6c..f4958cb 100755
--- a/Theme/Backend/media-single.tpl.php
+++ b/Theme/Backend/media-single.tpl.php
@@ -126,7 +126,7 @@ echo $this->getData('nav')->render();
 
                 if ($this->isImageFile($media, $path)) : ?>
                     <div class="h-overflow centerText">
-                        <img src="<?= $media->getPath(); ?>" alt="<?= $media->getName(); ?>">
+                        <img style="max-width: 100%" src="<?= $media->getPath(); ?>" alt="<?= $this->printHtml($media->getName()); ?>">
                     </div>
                 <?php elseif ($this->isTextFile($media, $path)) : ?>
                     <!-- if markdown show markdown editor, if image show image editor, if text file show textarea only on edit -->
diff --git a/Theme/Backend/template-functions.php b/Theme/Backend/template-functions.php
index d049556..409ea7e 100755
--- a/Theme/Backend/template-functions.php
+++ b/Theme/Backend/template-functions.php
@@ -17,26 +17,26 @@ use \phpOMS\System\File\ExtensionType;
 $fileIconFunction = function (int $extensionType) : string
 {
     if ($extensionType === ExtensionType::CODE) {
-        return 'file-code-o';
+        return 'file-code';
     } elseif ($extensionType === ExtensionType::TEXT) {
-        return 'file-text-o';
+        return 'file-text';
     } elseif ($extensionType === ExtensionType::PRESENTATION) {
-       return 'file-powerpoint-o';
+       return 'file-powerpoint';
     } elseif ($extensionType === ExtensionType::PDF) {
-        return 'file-pdf-o';
+        return 'file-pdf';
     } elseif ($extensionType === ExtensionType::ARCHIVE) {
-        return 'file-zip-o';
+        return 'file-zip';
     } elseif ($extensionType === ExtensionType::AUDIO) {
-        return 'file-audio-o';
+        return 'file-audio';
     } elseif ($extensionType === ExtensionType::VIDEO) {
-        return 'file-video-o';
+        return 'file-video';
     } elseif ($extensionType === ExtensionType::IMAGE) {
         return 'file-image-o';
     } elseif ($extensionType === ExtensionType::SPREADSHEET) {
-        return 'file-excel-o';
+        return 'file-excel';
     } elseif ($extensionType === ExtensionType::DIRECTORY) {
-        return 'folder-open-o';
+        return 'folder-open';
     }
 
-    return 'file-o';
+    return 'file';
 };