diff --git a/modules/backend/ServiceProvider.php b/modules/backend/ServiceProvider.php
index 29316b4b0..195ab1856 100644
--- a/modules/backend/ServiceProvider.php
+++ b/modules/backend/ServiceProvider.php
@@ -68,6 +68,8 @@ class ServiceProvider extends ModuleServiceProvider
             $combiner->registerBundle('~/modules/backend/assets/less/october.less');
             $combiner->registerBundle('~/modules/backend/assets/js/october.js');
             $combiner->registerBundle('~/modules/backend/widgets/table/assets/js/build.js');
+            $combiner->registerBundle('~/modules/backend/widgets/mediamanager/assets/js/mediamanager-browser.js');
+            $combiner->registerBundle('~/modules/backend/widgets/mediamanager/assets/less/mediamanager.less');
             $combiner->registerBundle('~/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less');
             $combiner->registerBundle('~/modules/backend/formwidgets/codeeditor/assets/js/build.js');
             $combiner->registerBundle('~/modules/backend/formwidgets/fileupload/assets/less/fileupload.less');
@@ -96,6 +98,14 @@ class ServiceProvider extends ModuleServiceProvider
                     'url'         => Backend::url('backend'),
                     'permissions' => ['backend.access_dashboard'],
                     'order'       => 10
+                ],
+                'media' => [
+                    'label'       => 'backend::lang.media.menu_label',
+                    'icon'        => 'icon-folder',
+                    'iconSvg'     => 'modules/backend/assets/images/media-icon.svg',
+                    'url'         => Backend::url('backend/media'),
+                    'permissions' => ['media.*'],
+                    'order'       => 200
                 ]
             ]);
         });
@@ -140,6 +150,10 @@ class ServiceProvider extends ModuleServiceProvider
                 'backend.manage_branding' => [
                     'label' => 'system::lang.permissions.manage_branding',
                     'tab'   => 'system::lang.permissions.name'
+                ],
+                'media.manage_media' => [
+                    'label' => 'backend::lang.permissions.manage_media',
+                    'tab' => 'system::lang.permissions.name',
                 ]
             ]);
         });
@@ -163,6 +177,7 @@ class ServiceProvider extends ModuleServiceProvider
             $manager->registerFormWidget('Backend\FormWidgets\RecordFinder', 'recordfinder');
             $manager->registerFormWidget('Backend\FormWidgets\Repeater', 'repeater');
             $manager->registerFormWidget('Backend\FormWidgets\TagList', 'taglist');
+            $manager->registerFormWidget('Backend\FormWidgets\MediaFinder', 'mediafinder');
         });
     }
 
diff --git a/modules/cms/assets/images/media-icon.svg b/modules/backend/assets/images/media-icon.svg
similarity index 100%
rename from modules/cms/assets/images/media-icon.svg
rename to modules/backend/assets/images/media-icon.svg
diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php
index 3410281e2..450d19d35 100644
--- a/modules/backend/classes/Controller.php
+++ b/modules/backend/classes/Controller.php
@@ -14,7 +14,7 @@ use Exception;
 use BackendAuth;
 use Backend\Models\UserPreference;
 use Backend\Models\Preference as BackendPreference;
-use Cms\Widgets\MediaManager;
+use Backend\Widgets\MediaManager;
 use October\Rain\Exception\AjaxException;
 use October\Rain\Exception\SystemException;
 use October\Rain\Exception\ValidationException;
@@ -152,11 +152,7 @@ class Controller extends Extendable
         /*
          * Media Manager widget is available on all back-end pages
          */
-        if (
-            class_exists('Cms\Widgets\MediaManager') &&
-            $this->user &&
-            $this->user->hasAccess('media.*')
-        ) {
+        if ($this->user && $this->user->hasAccess('media.*')) {
             $manager = new MediaManager($this, 'ocmediamanager');
             $manager->bindToController();
         }
diff --git a/modules/backend/controllers/Media.php b/modules/backend/controllers/Media.php
new file mode 100644
index 000000000..e8c8941bb
--- /dev/null
+++ b/modules/backend/controllers/Media.php
@@ -0,0 +1,38 @@
+<?php namespace Backend\Controllers;
+
+use BackendMenu;
+use Backend\Classes\Controller;
+use Backend\Widgets\MediaManager;
+
+/**
+ * Backend Media Manager
+ *
+ * @package october\backend
+ * @author Alexey Bobkov, Samuel Georges
+ */
+class Media extends Controller
+{
+    /**
+     * @var array Permissions required to view this page.
+     */
+    public $requiredPermissions = ['media.*'];
+
+    /**
+     * Constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        BackendMenu::setContext('October.Backend', 'media', true);
+        $this->pageTitle = 'backend::lang.media.menu_label';
+
+        $manager = new MediaManager($this, 'manager');
+        $manager->bindToController();
+    }
+
+    public function index()
+    {
+        $this->bodyClass = 'compact-container';
+    }
+}
diff --git a/modules/backend/controllers/media/index.htm b/modules/backend/controllers/media/index.htm
new file mode 100644
index 000000000..d6f5048c2
--- /dev/null
+++ b/modules/backend/controllers/media/index.htm
@@ -0,0 +1,7 @@
+<?= Block::put('head') ?><?= Block::endPut() ?>
+
+<?= Block::put('body') ?>
+    <?= Form::open(['class'=>'layout', 'onsubmit'=>'return false']) ?>
+        <?= $this->widget->manager->render() ?>
+    <?= Form::close() ?>
+<?= Block::endPut() ?>
\ No newline at end of file
diff --git a/modules/backend/formwidgets/MediaFinder.php b/modules/backend/formwidgets/MediaFinder.php
new file mode 100644
index 000000000..817d0af78
--- /dev/null
+++ b/modules/backend/formwidgets/MediaFinder.php
@@ -0,0 +1,118 @@
+<?php namespace Backend\FormWidgets;
+
+use Lang;
+use ApplicationException;
+use System\Classes\MediaLibrary;
+use Backend\Classes\FormField;
+use Backend\Classes\FormWidgetBase;
+
+/**
+ * Media Finder
+ * Renders a record finder field.
+ *
+ *    image:
+ *        label: Some image
+ *        type: media
+ *        prompt: Click the %s button to find a user
+ *
+ * @package october\backend
+ * @author Alexey Bobkov, Samuel Georges
+ */
+class MediaFinder extends FormWidgetBase
+{
+    //
+    // Configurable properties
+    //
+
+    /**
+     * @var string Prompt to display if no record is selected.
+     */
+    public $prompt = 'backend::lang.mediafinder.default_prompt';
+
+    /**
+     * @var string Display mode for the selection. Values: file, image.
+     */
+    public $mode = 'file';
+
+    /**
+     * @var int Preview image width
+     */
+    public $imageWidth = null;
+
+    /**
+     * @var int Preview image height
+     */
+    public $imageHeight = null;
+
+    //
+    // Object properties
+    //
+
+    /**
+     * @inheritDoc
+     */
+    protected $defaultAlias = 'media';
+
+    /**
+     * @inheritDoc
+     */
+    public function init()
+    {
+        $this->fillFromConfig([
+            'mode',
+            'prompt',
+            'imageWidth',
+            'imageHeight'
+        ]);
+
+        if ($this->formField->disabled) {
+            $this->previewMode = true;
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function render()
+    {
+        $this->prepareVars();
+
+        return $this->makePartial('mediafinder');
+    }
+
+    /**
+     * Prepares the list data
+     */
+    public function prepareVars()
+    {
+        $value = $this->getLoadValue();
+        $this->vars['value'] = $value;
+        $this->vars['imageUrl'] = $value ? MediaLibrary::url($value) : '';
+        $this->vars['field'] = $this->formField;
+        $this->vars['prompt'] = str_replace('%s', '<i class="icon-folder"></i>', trans($this->prompt));
+        $this->vars['mode'] = $this->mode;
+        $this->vars['imageWidth'] = $this->imageWidth;
+        $this->vars['imageHeight'] = $this->imageHeight;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getSaveValue($value)
+    {
+        if ($this->formField->disabled || $this->formField->hidden) {
+            return FormField::NO_SAVE_DATA;
+        }
+
+        return $value;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function loadAssets()
+    {
+        $this->addJs('js/mediafinder.js', 'core');
+        $this->addCss('css/mediafinder.css', 'core');
+    }
+}
diff --git a/modules/cms/formwidgets/mediafinder/assets/css/mediafinder.css b/modules/backend/formwidgets/mediafinder/assets/css/mediafinder.css
similarity index 100%
rename from modules/cms/formwidgets/mediafinder/assets/css/mediafinder.css
rename to modules/backend/formwidgets/mediafinder/assets/css/mediafinder.css
diff --git a/modules/cms/formwidgets/mediafinder/assets/js/mediafinder.js b/modules/backend/formwidgets/mediafinder/assets/js/mediafinder.js
similarity index 100%
rename from modules/cms/formwidgets/mediafinder/assets/js/mediafinder.js
rename to modules/backend/formwidgets/mediafinder/assets/js/mediafinder.js
diff --git a/modules/cms/formwidgets/mediafinder/assets/less/mediafinder.base.less b/modules/backend/formwidgets/mediafinder/assets/less/mediafinder.base.less
similarity index 100%
rename from modules/cms/formwidgets/mediafinder/assets/less/mediafinder.base.less
rename to modules/backend/formwidgets/mediafinder/assets/less/mediafinder.base.less
diff --git a/modules/cms/formwidgets/mediafinder/assets/less/mediafinder.filesingle.less b/modules/backend/formwidgets/mediafinder/assets/less/mediafinder.filesingle.less
similarity index 100%
rename from modules/cms/formwidgets/mediafinder/assets/less/mediafinder.filesingle.less
rename to modules/backend/formwidgets/mediafinder/assets/less/mediafinder.filesingle.less
diff --git a/modules/cms/formwidgets/mediafinder/assets/less/mediafinder.imagesingle.less b/modules/backend/formwidgets/mediafinder/assets/less/mediafinder.imagesingle.less
similarity index 100%
rename from modules/cms/formwidgets/mediafinder/assets/less/mediafinder.imagesingle.less
rename to modules/backend/formwidgets/mediafinder/assets/less/mediafinder.imagesingle.less
diff --git a/modules/cms/formwidgets/mediafinder/assets/less/mediafinder.less b/modules/backend/formwidgets/mediafinder/assets/less/mediafinder.less
similarity index 100%
rename from modules/cms/formwidgets/mediafinder/assets/less/mediafinder.less
rename to modules/backend/formwidgets/mediafinder/assets/less/mediafinder.less
diff --git a/modules/cms/formwidgets/mediafinder/partials/_file_single.htm b/modules/backend/formwidgets/mediafinder/partials/_file_single.htm
similarity index 100%
rename from modules/cms/formwidgets/mediafinder/partials/_file_single.htm
rename to modules/backend/formwidgets/mediafinder/partials/_file_single.htm
diff --git a/modules/cms/formwidgets/mediafinder/partials/_image_single.htm b/modules/backend/formwidgets/mediafinder/partials/_image_single.htm
similarity index 100%
rename from modules/cms/formwidgets/mediafinder/partials/_image_single.htm
rename to modules/backend/formwidgets/mediafinder/partials/_image_single.htm
diff --git a/modules/cms/formwidgets/mediafinder/partials/_mediafinder.htm b/modules/backend/formwidgets/mediafinder/partials/_mediafinder.htm
similarity index 100%
rename from modules/cms/formwidgets/mediafinder/partials/_mediafinder.htm
rename to modules/backend/formwidgets/mediafinder/partials/_mediafinder.htm
diff --git a/modules/backend/lang/be/lang.php b/modules/backend/lang/be/lang.php
index 53e4d8a4c..8b76dc9ce 100644
--- a/modules/backend/lang/be/lang.php
+++ b/modules/backend/lang/be/lang.php
@@ -466,5 +466,72 @@ return [
         'unknown_column_error' => "Невядомы слупок",
         'encoding_not_supported_error' => "Не атрымалася вызначыць кадзіроўку файла. Калі ласка, выберыце правільны фармат самастойна",
         'encoding_format' => "Кадзіроўка файла"
+    ],
+    'permissions' => [
+        'manage_media' => "Загрузка і кіраванне медыя зместам - выявы, відэа, гукі, дакументы"
+    ],
+    'mediafinder' => [
+        'label' => "Медыя каталог",
+        'default_prompt' => "Націсніце %s кнопку, каб адшукаць медыя файлы"
+    ],
+    'media' => [
+        'menu_label' => "Медыя",
+        'upload' => "Загрузіць",
+        'move' => "Перамясціць",
+        'delete' => "Выдаліць",
+        'add_folder' => "Дадаць каталог",
+        'search' => "Пошук",
+        'display' => "Паказаць",
+        'filter_everything' => "Усё",
+        'filter_images' => "Выявы",
+        'filter_video' => "Відэа",
+        'filter_audio' => "Аўдыё",
+        'filter_documents' => "Дакументы",
+        'library' => "Бібліятэка",
+        'size' => "Памер",
+        'title' => "Назва",
+        'last_modified' => "Час апошняй мадыфікацыі",
+        'public_url' => "Публічны URL",
+        'click_here' => "Націсніце сюды",
+        'thumbnail_error' => "Памылка падчас генерацыі мініяцюры",
+        'return_to_parent' => "Вярнуцца да бацькоўскага каталогу",
+        'return_to_parent_label' => "Падняцца ..",
+        'nothing_selected' => "Нічога не выбрана",
+        'multiple_selected' => "Шматлікія аб'екты выбраны",
+        'uploading_file_num' => "Загрузка :number файла(аў)...",
+        'uploading_complete' => "Загрузка скончаная",
+        'uploading_error' => "Не атымалася загрузіць",
+        'type_blocked' => "Гэты тып файлу заблакіраваны з-за небяспекі",
+        'order_by' => "Сартаваць па",
+        'folder' => "Каталог",
+        'no_files_found' => "Не знойдзена файлаў па Вашым запыце",
+        'delete_empty' => "Калі ласка, вызначце файлы для выдалення",
+        'delete_confirm' => "Выдаліць абраныя аб'екты?",
+        'error_renaming_file' => "Памылка падчас пераіменавання аб'екту",
+        'new_folder_title' => "Новы каталог",
+        'folder_name' => "Імя каталогу",
+        'error_creating_folder' => "Памылка падчас стварэння каталогу",
+        'folder_or_file_exist' => "Каталог альбо файл з такім імем ужо існуе",
+        'move_empty' => "Калі ласка, выберыце аб'екты для перамяшчэння",
+        'move_popup_title' => "Перамясціць файлы альбо каталогі",
+        'move_destination' => "Каталог прызначэння",
+        'please_select_move_dest' => "Калі ласка, выберыце каталог прызначэння",
+        'move_dest_src_match' => "Калі ласка, выберыце іншы каталог прызначэння",
+        'empty_library' => "Медыя бібліятэка пустая. Загрузіце файлы альбо стварыце каталогі, каб пачаць",
+        'insert' => "Уставіць",
+        'crop_and_insert' => "Абрэзаць і ўставіць",
+        'select_single_image' => "Калі ласка, выберыце адну выяву",
+        'selection_not_image' => "Абраны аб'ект не з'яўляецца файлам",
+        'restore' => "Адмяніць усе змяненні",
+        'resize' => "Змяніць памер...",
+        'selection_mode_normal' => "Нармальны",
+        'selection_mode_fixed_ratio' => "Фіксіраваныя суадносіны старонак",
+        'selection_mode_fixed_size' => "Фіксіраваны памер",
+        'height' => "Вышыня",
+        'width' => "Шырыня",
+        'selection_mode' => "Рэжым выбару",
+        'resize_image' => "Змяніць памер",
+        'image_size' => "Памер выявы:",
+        'selected_size' => "Выбрана:"
     ]
 ];
diff --git a/modules/backend/lang/bg/lang.php b/modules/backend/lang/bg/lang.php
index c071b3ecf..4544f6548 100644
--- a/modules/backend/lang/bg/lang.php
+++ b/modules/backend/lang/bg/lang.php
@@ -373,4 +373,70 @@ return [
         'file_not_found_error' => 'Файлът не е намерен',
         'empty_error' => 'Няма предоставени данни за изнасяне',
     ],
+    'permissions' => [
+        'manage_media' => 'Управление на медия'
+    ],
+    'mediafinder' => [
+        'label' => 'Медия',
+        'default_prompt' => 'Кликнете върху %s бутон за да намерите медия'
+    ],
+    'media' => [
+        'menu_label' => 'Медия',
+        'upload' => 'Качи',
+        'move' => 'Премести',
+        'delete' => 'Изтрии',
+        'add_folder' => 'Добави папка',
+        'search' => 'Търсене',
+        'display' => 'Показване',
+        'filter_everything' => 'Всичко',
+        'filter_images' => 'Изображения',
+        'filter_video' => 'Видео',
+        'filter_audio' => 'Аудио',
+        'filter_documents' => 'Документи',
+        'library' => 'Библиотека',
+        'size' => 'Размер',
+        'title' => 'Заглавие',
+        'last_modified' => 'Последно модифициран',
+        'public_url' => 'Обществен URL',
+        'click_here' => 'Натисни тук',
+        'thumbnail_error' => 'Грешка при генериране на умалено изображение.',
+        'return_to_parent' => 'Върнете се към основната папка',
+        'return_to_parent_label' => 'Нагоре ..',
+        'nothing_selected' => 'Нищо не е избрано.',
+        'multiple_selected' => 'Множество предмети избрани.',
+        'uploading_file_num' => 'Качване: брой на файл(ове)...',
+        'uploading_complete' => 'Качването завършено',
+        'uploading_error' => 'Качването неуспешно',
+        'order_by' => 'Подредени по',
+        'folder' => 'Папка',
+        'no_files_found' => 'Не са намерени файлове по заявката ви.',
+        'delete_empty' => 'Моля изберете елементи, за които да бъдат изтрити.',
+        'delete_confirm' => 'Наистина ли искате да изтриете избрания елемент(и)?',
+        'error_renaming_file' => 'Грешка при преименуването на елемента.',
+        'new_folder_title' => 'Нова папка',
+        'folder_name' => 'Име на папка',
+        'error_creating_folder' => 'Грешка при създаване на папка',
+        'folder_or_file_exist' => 'Папка или файл с посоченото име вече съществува.',
+        'move_empty' => 'Моля изберете елементи които да бъдат преместени.',
+        'move_popup_title' => 'Преместване на файлове или папки',
+        'move_destination' => 'Дестинационна папка',
+        'please_select_move_dest' => 'Моля изберете папка за дестинация.',
+        'move_dest_src_match' => 'Моля, изберете друга папка за дестинация.',
+        'empty_library' => 'Медийната библиотека е празна. Качете файлове, или създайте папки, за да започнете.',
+        'insert' => 'Вмъквам',
+        'crop_and_insert' => 'Отрежи и вмъкни',
+        'select_single_image' => 'Моля, изберете едно изображение.',
+        'selection_not_image' => 'Избраният елемент не е изображение.',
+        'restore' => 'Отмяна на всички промени',
+        'resize' => 'Преоразмеряване...',
+        'selection_mode_normal' => 'Normal',
+        'selection_mode_fixed_ratio' => 'Фиксиран  съотношение',
+        'selection_mode_fixed_size' => 'Фиксиран  размер',
+        'height' => 'Височина',
+        'width' => 'Широчина',
+        'selection_mode' => 'Режимът на избиране (селекция)',
+        'resize_image' => 'Преоразмеряване изображение',
+        'image_size' => 'Размер на изображение:',
+        'selected_size' => 'Избран:'
+    ]
 ];
diff --git a/modules/backend/lang/cs/lang.php b/modules/backend/lang/cs/lang.php
index 23ab5849d..a1b230f83 100644
--- a/modules/backend/lang/cs/lang.php
+++ b/modules/backend/lang/cs/lang.php
@@ -492,5 +492,72 @@ return [
         'unknown_column_error' => 'neznámý sloupec',
         'encoding_not_supported_error' => 'Kódování zdrojového souboru není rozpoznáno. Zvolte volbu formátu souboru s vlastním kódováním pro import souboru.',
         'encoding_format' => 'Kódování souboru',
-    ]
+    ],
+    'permissions' => [
+        'manage_media' => 'Správa médií'
+    ],
+    'mediafinder' => [
+        'label' => 'Vyhledávač médií',
+        'default_prompt' => 'Klikněte na tlačítko %s pro hledání souboru'
+    ],
+    'media' => [
+        'menu_label' => 'Média',
+        'upload' => 'Nahrát',
+        'move' => 'Přesunout',
+        'delete' => 'Smazat',
+        'add_folder' => 'Přidat složku',
+        'search' => 'Vyhledat',
+        'display' => 'Zobrazit',
+        'filter_everything' => 'Vše',
+        'filter_images' => 'Obrázky',
+        'filter_video' => 'Video',
+        'filter_audio' => 'Audio',
+        'filter_documents' => 'Dokumenty',
+        'library' => 'Knihovna',
+        'size' => 'Velikost',
+        'title' => 'Název',
+        'last_modified' => 'Naposledy upraveno',
+        'public_url' => 'Veřejná URL',
+        'click_here' => 'Klikněte zde',
+        'thumbnail_error' => 'Chyba generování náhledu.',
+        'return_to_parent' => 'Zpět do nadřazené složky',
+        'return_to_parent_label' => 'Nahoru ..',
+        'nothing_selected' => 'Nic nevybráno.',
+        'multiple_selected' => 'Vybráno více položek.',
+        'uploading_file_num' => 'Nahrávám :number soubor(y)...',
+        'uploading_complete' => 'Nahrávání kompletní',
+        'uploading_error' => 'Nahrávání se nezdařilo',
+        'type_blocked' => 'Kvůli bezpečnosti je tento typ souborů zablokován.',
+        'order_by' => 'Seřadit dle',
+        'folder' => 'Složka',
+        'no_files_found' => 'Pro tento požadavek nebyly nalezeny žádné soubory.',
+        'delete_empty' => 'Vyberte položky ke smazání.',
+        'delete_confirm' => 'Opravu chcete smazat vybrané položky?',
+        'error_renaming_file' => 'Přejmenování se nezdařilo.',
+        'new_folder_title' => 'Nová složka',
+        'folder_name' => 'Název složky',
+        'error_creating_folder' => 'Chyba vytváření složky',
+        'folder_or_file_exist' => 'Adresář nebo soubor se zadaným názvem již existuje.',
+        'move_empty' => 'Vyberte položky k přesunutí.',
+        'move_popup_title' => 'Přesun souborů nebo složek',
+        'move_destination' => 'Cílová složka',
+        'please_select_move_dest' => 'Prosím vyberte cílovou složku.',
+        'move_dest_src_match' => 'Prosím vyberte jinou cílovou složku.',
+        'empty_library' => 'Knihovna médií je prázdná. Nahrajte prosím soubory, nebo vytvořte složky.',
+        'insert' => 'Vložit',
+        'crop_and_insert' => 'Oříznout & vložit',
+        'select_single_image' => 'Prosím vyberte pouze jeden obrázek.',
+        'selection_not_image' => 'Vybraná položka není obrázek.',
+        'restore' => 'Zpět všechny změny',
+        'resize' => 'Změnit velikost...',
+        'selection_mode_normal' => 'Normální',
+        'selection_mode_fixed_ratio' => 'Pevný poměr stran',
+        'selection_mode_fixed_size' => 'Pevná velikost',
+        'height' => 'Výška',
+        'width' => 'Šířka',
+        'selection_mode' => 'Způsob označování (selection mode)',
+        'resize_image' => 'Změnit velikost obrázku',
+        'image_size' => 'Velikost obrázku:',
+        'selected_size' => 'Vybráno:'
+    ],
 ];
diff --git a/modules/backend/lang/da/lang.php b/modules/backend/lang/da/lang.php
index 9de80a3a8..ca12b906c 100644
--- a/modules/backend/lang/da/lang.php
+++ b/modules/backend/lang/da/lang.php
@@ -477,5 +477,72 @@ return [
             'windows_1251' => 'Windows-1251 (CP1251)',
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
+    ],
+    'permissions' => [
+        'manage_media' => 'Upload og administrer media indhold - billeder, video, lyd, dokumenter'
+    ],
+    'mediafinder' => [
+        'label' => 'Media Finder',
+        'default_prompt' => 'Tryk på %s knappen for at finde et mediaobjekt'
+    ],
+    'media' => [
+        'menu_label' => 'Media',
+        'upload' => 'Upload',
+        'move' => 'Flyt',
+        'delete' => 'Slet',
+        'add_folder' => 'Tilføj mappe',
+        'search' => 'Søg',
+        'display' => 'Vis',
+        'filter_everything' => 'Alt',
+        'filter_images' => 'Billeder',
+        'filter_video' => 'Video',
+        'filter_audio' => 'Lyd',
+        'filter_documents' => 'Dokumenter',
+        'library' => 'Bibliotek',
+        'size' => 'Størrelse',
+        'title' => 'Titel',
+        'last_modified' => 'Sidst redigeret',
+        'public_url' => 'Offentlig URL',
+        'click_here' => 'Tryk her',
+        'thumbnail_error' => 'Fejl ved generering af thumbnail.',
+        'return_to_parent' => 'Gå en mappe tilbage',
+        'return_to_parent_label' => 'Gå op ..',
+        'nothing_selected' => 'Intet er valgt.',
+        'multiple_selected' => 'Flere ting valgt.',
+        'uploading_file_num' => 'Uploader :number fil(er)...',
+        'uploading_complete' => 'Upload færdig',
+        'uploading_error' => 'Upload fejlede',
+        'type_blocked' => 'Filtypen er blokeret af sikkerhedshensyn.',
+        'order_by' => 'Sorter efter',
+        'folder' => 'Mappe',
+        'no_files_found' => 'Ingen filer fundet fra din forespørgsel.',
+        'delete_empty' => 'Vælg venligst filer at slette.',
+        'delete_confirm' => 'Slet de valgte ting?',
+        'error_renaming_file' => 'Fejl ved omdøbning.',
+        'new_folder_title' => 'Ny mappe',
+        'folder_name' => 'Mappenavn',
+        'error_creating_folder' => 'Fejl ved opretning af mappe',
+        'folder_or_file_exist' => 'En mappe eller fil med det angivede navn, findes allerede.',
+        'move_empty' => 'Vælg venligst nogle ting du vil flytte.',
+        'move_popup_title' => 'Flyt filer eller mapper',
+        'move_destination' => 'Destinationmappe',
+        'please_select_move_dest' => 'Vælg venligst en destinationsmappe.',
+        'move_dest_src_match' => 'Vælg venligst en anden destinationsmappe.',
+        'empty_library' => 'Media biblioteket er tomt. Upload filer eller mapper for at starte.',
+        'insert' => 'Indsæt',
+        'crop_and_insert' => 'Beskær & Indsæt',
+        'select_single_image' => 'Vælg venligst et enkelt billede.',
+        'selection_not_image' => 'Det valgte objekt er ikke et billede.',
+        'restore' => 'Fortryd alle ændringer',
+        'resize' => 'Skaler...',
+        'selection_mode_normal' => 'Normal',
+        'selection_mode_fixed_ratio' => 'Fast størrelsesforhold',
+        'selection_mode_fixed_size' => 'Fast størrelse',
+        'height' => 'Højde',
+        'width' => 'Bredde',
+        'selection_mode' => 'Udvælgelsesmetode',
+        'resize_image' => 'Skaler billede',
+        'image_size' => 'Billedstørrelse:',
+        'selected_size' => 'Valgt:'
     ]
 ];
diff --git a/modules/backend/lang/de/lang.php b/modules/backend/lang/de/lang.php
index 0ef889b58..5dacf89f7 100644
--- a/modules/backend/lang/de/lang.php
+++ b/modules/backend/lang/de/lang.php
@@ -494,4 +494,69 @@ return [
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
     ],
+    'permissions' => [
+        'manage_media' => 'Medien verwalten',
+    ],
+    'mediafinder' => [
+        'label' => 'Media Finder',
+        'default_prompt' => 'Klicke auf %s um eine Mediendatei auszuwählen'
+    ],
+    'media' => [
+        'menu_label' => 'Medien',
+        'upload' => 'Hochladen',
+        'move' => 'Verschieben',
+        'delete' => 'Löschen',
+        'add_folder' => 'Ordner erstellen',
+        'search' => 'Suchen',
+        'display' => 'Anzeigen',
+        'filter_everything' => 'Alles',
+        'filter_images' => 'Bilder',
+        'filter_video' => 'Video',
+        'filter_audio' => 'Audio',
+        'filter_documents' => 'Dokumente',
+        'library' => 'Sammlung',
+        'size' => 'Größe',
+        'title' => 'Titel',
+        'last_modified' => 'Zuletzt bearbeitet',
+        'public_url' => 'Öffentliche URL',
+        'click_here' => 'Hier drücken',
+        'thumbnail_error' => 'Fehler beim Erstellen des Thumbnails.',
+        'return_to_parent' => 'Zu oberem Ordner zurückkehren',
+        'return_to_parent_label' => 'Stufe hoch ..',
+        'nothing_selected' => 'Nichts ausgewählt.',
+        'multiple_selected' => 'Mehrere Dateien ausgewählt.',
+        'uploading_file_num' => 'Lade :number Datei(en)...',
+        'uploading_complete' => 'Upload vollständig',
+        'order_by' => 'Sortieren nach',
+        'folder' => 'Ordner',
+        'no_files_found' => 'Keine entsprechenden Dateien gefunden.',
+        'delete_empty' => 'Bitte Wählen Sie Dateien zum Löschen aus.',
+        'delete_confirm' => 'Wollen Sie wirklich die gewählte(n) Datei(en) löschen?',
+        'error_renaming_file' => 'Fehler beim Umbenennen.',
+        'new_folder_title' => 'Neuer Ordner',
+        'folder_name' => 'Ordnername',
+        'error_creating_folder' => 'Fehler beim Erstellen des Ordners',
+        'folder_or_file_exist' => 'Ein Ordner oder eine Datei mit dem gewählten Namen existiert bereits.',
+        'move_empty' => 'Bitte wählen Sie Dateien zum Verschieben aus',
+        'move_popup_title' => 'Verschiebe Dateien oder Ordner',
+        'move_destination' => 'Zielordner',
+        'please_select_move_dest' => 'Bitte wählen Sie einen Zielordner.',
+        'move_dest_src_match' => 'Bitte wählen Sie einen anderen Zielordner.',
+        'empty_library' => 'Diese Medienbibliothek ist leer. Laden Sie Dateien hoch oder erstellen Sie Ordner!',
+        'insert' => 'Einfügen',
+        'crop_and_insert' => 'Zuschneiden und Einfügen',
+        'select_single_image' => 'Bitte wählen Sie ein einzelnes Bild.',
+        'selection_not_image' => 'Die gewählte Datei ist kein Bild.',
+        'restore' => 'Alle Änderungen rückgängig machen',
+        'resize' => 'Größe anpassen...',
+        'selection_mode_normal' => 'Normal',
+        'selection_mode_fixed_ratio' => 'Fixes Verhältnis',
+        'selection_mode_fixed_size' => 'Fixe Größe',
+        'height' => 'Höhe',
+        'width' => 'Breite',
+        'selection_mode' => 'Selection mode',
+        'resize_image' => 'Bildgröße anpassen',
+        'image_size' => 'Dimensionen:',
+        'selected_size' => 'Ausgewählt:'
+    ]
 ];
diff --git a/modules/backend/lang/el/lang.php b/modules/backend/lang/el/lang.php
index c02a0e09d..ac89c3af7 100644
--- a/modules/backend/lang/el/lang.php
+++ b/modules/backend/lang/el/lang.php
@@ -483,5 +483,72 @@ return [
             'windows_1251' => 'Windows-1251 (CP1251)',
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
+    ],
+    'permissions' => [
+        'manage_media' => 'Ανέβασμα και διαχείριση περιεχομένου μέσων - εικόνων, βίντεο, ήχων, εγγράφων,//Upload and manage media contents - images, videos, sounds, documents'
+    ],
+    'mediafinder' => [
+        'label' => 'Media Finder',
+        'default_prompt' => 'Click the %s button to find a media item'
+    ],
+    'media' => [
+        'menu_label' => 'Μέσα',
+        'upload' => 'Ανέβασμα',
+        'move' => 'Μετακίνηση',
+        'delete' => 'Διαγραφή',
+        'add_folder' => 'Προσθήκη καταλόγου',
+        'search' => 'Αναζήτηση',
+        'display' => 'Εμφάνιση',
+        'filter_everything' => 'Όλα',
+        'filter_images' => 'Εικόνες',
+        'filter_video' => 'Βίντεο',
+        'filter_audio' => 'Ήχος',
+        'filter_documents' => 'Έγγραφο',
+        'library' => 'Βιβλιοθήκη',
+        'size' => 'Μέγεθος',
+        'title' => 'Τίτλος',
+        'last_modified' => 'Τελευταία τροποποίηση',
+        'public_url' => 'Δημόσιο URL',
+        'click_here' => 'Κλικ εδώ',
+        'thumbnail_error' => 'Σφάλμα κατά την δημιουργία μικρογραφίας.',
+        'return_to_parent' => 'Επιστροφή στον γονικό κατάλογο',
+        'return_to_parent_label' => 'Πήγαινε επάνω...',
+        'nothing_selected' => 'Δεν επιλέχτηκε τίποτα.',
+        'multiple_selected' => 'Επιλέχτηκαν πολλαπλά αντικείμενα.',
+        'uploading_file_num' => 'Ανέβασμα :number αρχείων...',
+        'uploading_complete' => 'Το ανέβασμα ολοκληρώθηκε',
+        'uploading_error' => 'Το ανέβασμα απέτυχε',
+        'type_blocked' => 'Ο τύπος του αρχείου που χρησιμοποιήθηκε μπλοκαρίστηκε για λόγους ασφαλείας.',
+        'order_by' => 'Ταξινόμηση κατά',
+        'folder' => 'Κατάλογος',
+        'no_files_found' => 'Δεν βρέθηκαν αρχεία από το αίτημα σας.',
+        'delete_empty' => 'παρακαλούμε επιλέξτε αντικείμενά για να τα σβήσετε.',
+        'delete_confirm' => 'Διαγραφή των επιλεγμένων αντικείμενων;',
+        'error_renaming_file' => 'Σφάλμα κατά την μετονομασία του αντικειμένου.',
+        'new_folder_title' => 'Νέος κατάλογος',
+        'folder_name' => 'Όνομα καταλόγου',
+        'error_creating_folder' => 'Σφάλμα κατά την δημιουργία καταλόγου',
+        'folder_or_file_exist' => 'Ένας κατάλογος ή αρχείο με το ίδιο όνομα υπάρχει ήδη.',
+        'move_empty' => 'παρακαλούμε επιλέξτε αντικείμενα για να τα μετακινήσετε.',
+        'move_popup_title' => 'Μετακίνηση αρχείων ή καταλογών.',
+        'move_destination' => 'Κατάλογος προορισμού',
+        'please_select_move_dest' => 'Παρακαλούμε επιλέξτε ένα κατάλογο προορισμού.',
+        'move_dest_src_match' => 'Παρακαλούμε επιλέξτε έναν διαφορετικό κατάλογο προορισμού.',
+        'empty_library' => 'Η βιβλιοθήκη Μέσων είναι άδεια. Ανεβάστε αρχεία ή δημιουργήστε καταλόγους για να ξεκινήσετε.',
+        'insert' => 'Εισαγωγή',
+        'crop_and_insert' => 'Περικοπή & Εισαγωγή',
+        'select_single_image' => 'παρακαλούμε επιλέξτε μόνο μια εικόνα.',
+        'selection_not_image' => 'Το επιλεγμένο αντικείμενο δεν είναι εικόνα.',
+        'restore' => 'Αναίρεση όλων των αλλαγών',
+        'resize' => 'Αλλαγή μεγέθους...',
+        'selection_mode_normal' => 'Κανονικό',
+        'selection_mode_fixed_ratio' => 'Κλειδωμένη αναλογία',
+        'selection_mode_fixed_size' => 'Κλειδωμένο μέγεθος',
+        'height' => 'Ύψος',
+        'width' => 'Πλάτος',
+        'selection_mode' => 'Λειτουργία επιλογής',
+        'resize_image' => 'Αλλαγή μεγέθους εικόνας',
+        'image_size' => 'Μέγεθος εικόνας:',
+        'selected_size' => 'Επιλεγμένο:',
     ]
 ];
diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php
index 92567e3f3..6bc525d6f 100644
--- a/modules/backend/lang/en/lang.php
+++ b/modules/backend/lang/en/lang.php
@@ -514,5 +514,75 @@ return [
             'windows_1251' => 'Windows-1251 (CP1251)',
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
-    ]
+    ],
+    'permissions' => [
+        'manage_media' => 'Upload and manage media contents - images, videos, sounds, documents'
+    ],
+    'mediafinder' => [
+        'label' => 'Media Finder',
+        'default_prompt' => 'Click the %s button to find a media item'
+    ],
+    'media' => [
+        'menu_label' => 'Media',
+        'upload' => 'Upload',
+        'move' => 'Move',
+        'delete' => 'Delete',
+        'add_folder' => 'Add folder',
+        'search' => 'Search',
+        'display' => 'Display',
+        'filter_everything' => 'Everything',
+        'filter_images' => 'Images',
+        'filter_video' => 'Video',
+        'filter_audio' => 'Audio',
+        'filter_documents' => 'Documents',
+        'library' => 'Library',
+        'size' => 'Size',
+        'title' => 'Title',
+        'last_modified' => 'Last modified',
+        'public_url' => 'URL',
+        'click_here' => 'Click here',
+        'thumbnail_error' => 'Error generating thumbnail.',
+        'return_to_parent' => 'Return to the parent folder',
+        'return_to_parent_label' => 'Go up ..',
+        'nothing_selected' => 'Nothing is selected.',
+        'multiple_selected' => 'Multiple items selected.',
+        'uploading_file_num' => 'Uploading :number file(s)...',
+        'uploading_complete' => 'Upload complete',
+        'uploading_error' => 'Upload failed',
+        'type_blocked' => 'The file type used is blocked for security reasons.',
+        'order_by' => 'Order by',
+        'direction' => 'Direction',
+        'direction_asc' => 'Ascending',
+        'direction_desc' => 'Descending',
+        'folder' => 'Folder',
+        'no_files_found' => 'No files found by your request.',
+        'delete_empty' => 'Please select items to delete.',
+        'delete_confirm' => 'Delete the selected item(s)?',
+        'error_renaming_file' => 'Error renaming the item.',
+        'new_folder_title' => 'New folder',
+        'folder_name' => 'Folder name',
+        'error_creating_folder' => 'Error creating folder',
+        'folder_or_file_exist' => 'A folder or file with the specified name already exists.',
+        'move_empty' => 'Please select items to move.',
+        'move_popup_title' => 'Move files or folders',
+        'move_destination' => 'Destination folder',
+        'please_select_move_dest' => 'Please select a destination folder.',
+        'move_dest_src_match' => 'Please select another destination folder.',
+        'empty_library' => 'It looks a bit empty here. Upload files or create folders to get started.',
+        'insert' => 'Insert',
+        'crop_and_insert' => 'Crop & Insert',
+        'select_single_image' => 'Please select a single image.',
+        'selection_not_image' => 'The selected item is not an image.',
+        'restore' => 'Undo all changes',
+        'resize' => 'Resize...',
+        'selection_mode_normal' => 'Normal',
+        'selection_mode_fixed_ratio' => 'Fixed ratio',
+        'selection_mode_fixed_size' => 'Fixed size',
+        'height' => 'Height',
+        'width' => 'Width',
+        'selection_mode' => 'Selection mode',
+        'resize_image' => 'Resize image',
+        'image_size' => 'Image size:',
+        'selected_size' => 'Selected:'
+    ],
 ];
diff --git a/modules/backend/lang/es/lang.php b/modules/backend/lang/es/lang.php
index 385f69316..2fb07690b 100644
--- a/modules/backend/lang/es/lang.php
+++ b/modules/backend/lang/es/lang.php
@@ -472,5 +472,72 @@ return [
             'windows_1251' => 'Windows-1251 (CP1251)',
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
-    ]
+    ],
+    'permissions' => [
+        'manage_media' => 'Subir y gestionar contenidos multimedia - imágenes, vídeos, sonidos y documentos'        
+    ],
+    'mediafinder' => [
+        'label' => 'Buscador de multimedia',
+        'default_prompt' => 'Haga clic en el botón %s para buscar un elemento multimedia',
+    ],
+    'media' => [
+        'menu_label' => 'Media',
+        'upload' => 'Subir',
+        'move' => 'Mover',
+        'delete' => 'Eliminar',
+        'add_folder' => 'Nueva carpeta',
+        'search' => 'Buscar',
+        'display' => 'Mostrar',
+        'filter_everything' => 'Todo',
+        'filter_images' => 'Imágenes',
+        'filter_video' => 'Vídeo',
+        'filter_audio' => 'Audio',
+        'filter_documents' => 'Documentos',
+        'library' => 'Biblioteca',
+        'size' => 'Tamaño',
+        'title' => 'Título',
+        'last_modified' => 'Última modificación',
+        'public_url' => 'URL pública',
+        'click_here' => 'Haz click aquí',
+        'thumbnail_error' => 'Error generando la miniatura.',
+        'return_to_parent' => 'Volver a la carpeta anterior',
+        'return_to_parent_label' => 'Atrás ..',
+        'nothing_selected' => 'No se ha seleccionado nada.',
+        'multiple_selected' => 'Se han seleccionado varios elementos.',
+        'uploading_file_num' => 'Subiendo :number archivo(s)...',
+        'uploading_complete' => 'Subida completada',
+        'uploading_error' => 'Error al subir',
+        'type_blocked' => 'El tipo de archivo usado ha sido bloqueado por motivos de seguridad.',
+        'order_by' => 'Ordenar por',
+        'folder' => 'Carpeta',
+        'no_files_found' => 'No se han encontrado archivos.',
+        'delete_empty' => 'Por favor, selecciona los elementos que quieres eliminar.',
+        'delete_confirm' => '¿Deseas eliminar los elementos seleccionados?',
+        'error_renaming_file' => 'Error al renombrar el elemento.',
+        'new_folder_title' => 'Nueva carpeta',
+        'folder_name' => 'Nombre de la carpeta',
+        'error_creating_folder' => 'Error al crear la carpeta',
+        'folder_or_file_exist' => 'Ya existe un archivo o carpeta con este nombre.',
+        'move_empty' => 'Por favor, selecciona los elementos que quieres mover.',
+        'move_popup_title' => 'Mover archivos o carpetas',
+        'move_destination' => 'Carpeta de destino',
+        'please_select_move_dest' => 'Por favor, selecciona una carpeta de destino.',
+        'move_dest_src_match' => 'Por favor, selecciona otra carpeta de destino.',
+        'empty_library' => 'La biblioteca de medios está vacía. Sube archivos o crea carpetas para empezar.',
+        'insert' => 'Insertar',
+        'crop_and_insert' => 'Cortar e insertar',
+        'select_single_image' => 'Por favor, selecciona sólo una imagen.',
+        'selection_not_image' => 'El elemento seleccionado no es una imagen.',
+        'restore' => 'Deshacer todos los cambios',
+        'resize' => 'Redimensionar...',
+        'selection_mode_normal' => 'Normal',
+        'selection_mode_fixed_ratio' => 'Aspecto fijo',
+        'selection_mode_fixed_size' => 'Tamaño fijo',
+        'height' => 'Alto',
+        'width' => 'Ancho',
+        'selection_mode' => 'Modo de selección',
+        'resize_image' => 'Redimensionar imagen',
+        'image_size' => 'Tamaño de la imagen:',
+        'selected_size' => 'Selección:'
+    ],
 ];
diff --git a/modules/backend/lang/et/lang.php b/modules/backend/lang/et/lang.php
index 88ad06d18..9d1e0795c 100644
--- a/modules/backend/lang/et/lang.php
+++ b/modules/backend/lang/et/lang.php
@@ -493,5 +493,72 @@ return [
             'windows_1251' => 'Windows-1251 (CP1251)',
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
-    ]
+    ],
+    'permissions' => [
+        'manage_media' => 'Upload and manage media contents - images, videos, sounds, documents'
+    ],
+    'mediafinder' => [
+        'label' => 'Media Finder',
+        'default_prompt' => 'Click the %s button to find a media item'
+    ],
+    'media' => [
+        'menu_label' => 'Media',
+        'upload' => 'Upload',
+        'move' => 'Move',
+        'delete' => 'Delete',
+        'add_folder' => 'Add folder',
+        'search' => 'Search',
+        'display' => 'Display',
+        'filter_everything' => 'Everything',
+        'filter_images' => 'Images',
+        'filter_video' => 'Video',
+        'filter_audio' => 'Audio',
+        'filter_documents' => 'Documents',
+        'library' => 'Library',
+        'size' => 'Size',
+        'title' => 'Title',
+        'last_modified' => 'Last modified',
+        'public_url' => 'Download URL',
+        'click_here' => 'Click here',
+        'thumbnail_error' => 'Error generating thumbnail.',
+        'return_to_parent' => 'Return to the parent folder',
+        'return_to_parent_label' => 'Go up ..',
+        'nothing_selected' => 'Nothing is selected.',
+        'multiple_selected' => 'Multiple items selected.',
+        'uploading_file_num' => 'Uploading :number file(s)...',
+        'uploading_complete' => 'Upload complete',
+        'uploading_error' => 'Upload failed',
+        'type_blocked' => 'The file type used is blocked for security reasons.',
+        'order_by' => 'Order by',
+        'folder' => 'Folder',
+        'no_files_found' => 'No files found by your request.',
+        'delete_empty' => 'Please select items to delete.',
+        'delete_confirm' => 'Delete the selected item(s)?',
+        'error_renaming_file' => 'Error renaming the item.',
+        'new_folder_title' => 'New folder',
+        'folder_name' => 'Folder name',
+        'error_creating_folder' => 'Error creating folder',
+        'folder_or_file_exist' => 'A folder or file with the specified name already exists.',
+        'move_empty' => 'Please select items to move.',
+        'move_popup_title' => 'Move files or folders',
+        'move_destination' => 'Destination folder',
+        'please_select_move_dest' => 'Please select a destination folder.',
+        'move_dest_src_match' => 'Please select another destination folder.',
+        'empty_library' => 'It looks a bit empty here. Upload files or create folders to get started.',
+        'insert' => 'Insert',
+        'crop_and_insert' => 'Crop & Insert',
+        'select_single_image' => 'Please select a single image.',
+        'selection_not_image' => 'The selected item is not an image.',
+        'restore' => 'Undo all changes',
+        'resize' => 'Resize...',
+        'selection_mode_normal' => 'Normal',
+        'selection_mode_fixed_ratio' => 'Fixed ratio',
+        'selection_mode_fixed_size' => 'Fixed size',
+        'height' => 'Height',
+        'width' => 'Width',
+        'selection_mode' => 'Selection mode',
+        'resize_image' => 'Resize image',
+        'image_size' => 'Image size:',
+        'selected_size' => 'Selected:'
+    ],
 ];
diff --git a/modules/backend/lang/fa/lang.php b/modules/backend/lang/fa/lang.php
index 534b3b6e6..4b72228af 100644
--- a/modules/backend/lang/fa/lang.php
+++ b/modules/backend/lang/fa/lang.php
@@ -486,5 +486,72 @@ return [
             'windows_1251' => 'Windows-1251 (CP1251)',
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
+    ],
+    'permissions' => [
+        'manage_media' => 'مدیریت چند رسانه ها'
+    ],
+    'mediafinder' => [
+        'label' => 'جستجوگر رسانه',
+        'default_prompt' => '%s را جهت انتخاب فایل چند رسانه ای انتخاب کنید'
+    ],
+    'media' => [
+        'menu_label' => 'چند رسانه ای',
+        'upload' => 'ارسال',
+        'move' => 'جابجایی',
+        'delete' => 'حذف',
+        'add_folder' => 'پوشه جدید',
+        'search' => 'جستجو',
+        'display' => 'نمایش',
+        'filter_everything' => 'همه',
+        'filter_images' => 'تصاویر',
+        'filter_video' => 'ویدیو',
+        'filter_audio' => 'صوتی',
+        'filter_documents' => 'اسناد',
+        'library' => 'کتاب خانه',
+        'size' => 'اندازه',
+        'title' => 'عنوان',
+        'last_modified' => 'آخرین تغییرات',
+        'public_url' => 'آدرس عمومی',
+        'click_here' => 'اینجا کلیک کنید',
+        'thumbnail_error' => 'خطا در ایجاد تصویر بند انگشتی',
+        'return_to_parent' => 'بازگشت به پوشه قبل',
+        'return_to_parent_label' => 'بازگشت ..',
+        'nothing_selected' => 'چیزی انتخاب نشده است.',
+        'multiple_selected' => 'چند مورد انتخاب شده',
+        'uploading_file_num' => 'ارسال :number فایل(ها)...',
+        'uploading_complete' => 'ارسال انجام شد',
+        'uploading_error' => 'خطا در ارسال',
+        'type_blocked' => 'نوع فایل استفاده شده به دلیل مسایل امنیتی مجاز نمی باشد..',
+        'order_by' => 'مرتب سازی با',
+        'folder' => 'پوشه',
+        'no_files_found' => 'فایلی با درخواست شما یافت نشد',
+        'delete_empty' => 'لطفا موارد را جهت حذف انتخاب نمایید',
+        'delete_confirm' => 'آیا از حذف مورد(های) انتخاب شده اطمینان دارید؟',
+        'error_renaming_file' => 'خطا در تغییر نام.',
+        'new_folder_title' => 'پوشه ی جدید',
+        'folder_name' => 'نام پوشه',
+        'error_creating_folder' => 'خطا در ایجاد پوشه',
+        'folder_or_file_exist' => 'پوشه یا فایلی با نام وارد شده از قبل وجود دارد.',
+        'move_empty' => 'لطفا موارد را جهت جابجایی انتخاب نمایید',
+        'move_popup_title' => 'جابحایی فایل یا پوشه ها',
+        'move_destination' => 'پوشه مقصد',
+        'please_select_move_dest' => 'لطفا پوشه مقصد را انتخاب نمائید.',
+        'move_dest_src_match' => 'لطفا پوشه دیگری را انتخاب نمایید.',
+        'empty_library' => 'چیزی یافت نشد.',
+        'insert' => 'قرار دادن',
+        'crop_and_insert' => 'بریدن و افزودن',
+        'select_single_image' => 'لطفا یک تصویر انتخاب نمایید',
+        'selection_not_image' => 'مورد انتخاب شده تصویر نمی باشد',
+        'restore' => 'حذف همه تغییرات',
+        'resize' => 'تغییر اندازه...',
+        'selection_mode_normal' => 'معمولی',
+        'selection_mode_fixed_ratio' => 'نصبت ثابت',
+        'selection_mode_fixed_size' => 'اندازه ثابت',
+        'height' => 'ارتفاع',
+        'width' => 'عرض',
+        'selection_mode' => 'حالت انتخابی',
+        'resize_image' => 'تغییر اندازه تصویر',
+        'image_size' => 'اندازه تصویر:',
+        'selected_size' => 'انتخاب شده:'
     ]
 ];
diff --git a/modules/backend/lang/fr/lang.php b/modules/backend/lang/fr/lang.php
index 29d7141bd..86643b3c7 100644
--- a/modules/backend/lang/fr/lang.php
+++ b/modules/backend/lang/fr/lang.php
@@ -491,5 +491,72 @@ return [
             'windows_1251' => 'Windows-1251 (CP1251)',
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
+    ],
+    'permissions' => [
+        'manage_media' => 'Déposer et gérer les contenus media - images, vidéos, sons, documents'
+    ],
+    'mediafinder' => [
+        'label' => 'Galerie média',
+        'default_prompt' => 'Cliquez sur le bouton %s pour trouver un élément média'
+    ],
+    'media' => [
+        'menu_label' => 'Média',
+        'upload' => 'Déposer un fichier',
+        'move' => 'Déplacer',
+        'delete' => 'Supprimer',
+        'add_folder' => 'Ajouter un répertoire',
+        'search' => 'Rechercher',
+        'display' => 'Affichage',
+        'filter_everything' => 'Tout',
+        'filter_images' => 'Images',
+        'filter_video' => 'Vidéo',
+        'filter_audio' => 'Audio',
+        'filter_documents' => 'Documents',
+        'library' => 'Librairie',
+        'size' => 'Taille',
+        'title' => 'Titre',
+        'last_modified' => 'Dernière modification',
+        'public_url' => 'Adresse URL publique',
+        'click_here' => 'Cliquer ici',
+        'thumbnail_error' => 'Erreur lors de la création de la miniature.',
+        'return_to_parent' => 'Retourner au répertoire parent',
+        'return_to_parent_label' => 'Monter…',
+        'nothing_selected' => 'Aucune sélection.',
+        'multiple_selected' => 'Plusieurs éléments sélectionnés.',
+        'uploading_file_num' => 'Dépôt de :number fichier(s)…',
+        'uploading_complete' => 'Dépôt des fichiers terminé',
+        'uploading_error' => 'Le dépôt des fichiers a échoué',
+        'type_blocked' => 'Le type de fichier utilisé est bloqué pour des raisons de sécurité.',
+        'order_by' => 'Trier par',
+        'folder' => 'Répertoire',
+        'no_files_found' => 'Aucun fichier trouvé.',
+        'delete_empty' => 'Veuillez sélectionner les éléments à supprimer.',
+        'delete_confirm' => 'Confirmer la suppression de ces éléments ?',
+        'error_renaming_file' => 'Erreur lors du renommage de l’élément.',
+        'new_folder_title' => 'Nouveau répertoire',
+        'folder_name' => 'Nom du répertoire',
+        'error_creating_folder' => 'Erreur lors de la création du répertoire',
+        'folder_or_file_exist' => 'Un répertoire ou un fichier portant ce nom existe déjà.',
+        'move_empty' => 'Veuillez sélectionner les éléments à déplacer.',
+        'move_popup_title' => 'Déplacer des fichiers ou répertoires',
+        'move_destination' => 'Répertoire de destination',
+        'please_select_move_dest' => 'Veuillez sélectionner un répertoire de destination.',
+        'move_dest_src_match' => 'Veuillez sélectionner un autre répertoire de destination.',
+        'empty_library' => 'La librairie multimédia est vide. Pour commencer, télécharger des fichiers ou répertoires.',
+        'insert' => 'Insérer',
+        'crop_and_insert' => 'Rogner et insérer',
+        'select_single_image' => 'Veuillez sélectionner une seule image.',
+        'selection_not_image' => 'L’élément sélectionné n’est pas une image.',
+        'restore' => 'Annuler tous les changements',
+        'resize' => 'Redimensionner…',
+        'selection_mode_normal' => 'Normal',
+        'selection_mode_fixed_ratio' => 'Rapport fixe',
+        'selection_mode_fixed_size' => 'Taille fixe',
+        'height' => 'Hauteur',
+        'width' => 'Largeur',
+        'selection_mode' => 'Mode de sélection',
+        'resize_image' => 'Redimensionner l’image',
+        'image_size' => 'Taille de l’image :',
+        'selected_size' => 'Sélectionnée :'
     ]
 ];
diff --git a/modules/backend/lang/hu/lang.php b/modules/backend/lang/hu/lang.php
index 2ff3114e2..fcb6a11f5 100644
--- a/modules/backend/lang/hu/lang.php
+++ b/modules/backend/lang/hu/lang.php
@@ -514,5 +514,75 @@ return [
             'windows_1251' => 'Windows-1251 (CP1251)',
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
-    ]
+    ],
+    'permissions' => [
+        'manage_media' => 'Média kezelése'
+    ],
+    'mediafinder' => [
+        'label' => 'Média',
+        'default_prompt' => 'Kattintson a(z) %s gombra új média fájl kereséséhez.'
+    ],
+    'media' => [
+        'menu_label' => 'Média',
+        'upload' => 'Feltöltés',
+        'move' => 'Áthelyezés',
+        'delete' => 'Törlés',
+        'add_folder' => 'Könyvtár létrehozása',
+        'search' => 'Keresés...',
+        'display' => 'Megjelenítés',
+        'filter_everything' => 'Összes',
+        'filter_images' => 'Kép',
+        'filter_video' => 'Videó',
+        'filter_audio' => 'Audió',
+        'filter_documents' => 'Dokumentum',
+        'library' => 'Média',
+        'size' => 'Méret',
+        'title' => 'Név',
+        'last_modified' => 'Módosítva',
+        'public_url' => 'Webcím',
+        'click_here' => 'Megtekintés',
+        'thumbnail_error' => 'Hiba a bélyegkép létrehozásánál.',
+        'return_to_parent' => 'Vissza a szülő könyvtárhoz',
+        'return_to_parent_label' => 'Eggyel vissza ..',
+        'nothing_selected' => 'Nincs kiválasztva fájl.',
+        'multiple_selected' => 'Több fájl kiválasztva.',
+        'uploading_file_num' => 'Feltöltve :number fájl...',
+        'uploading_complete' => 'Feltöltés sikeresen befejezve',
+        'uploading_error' => 'Feltöltés sikertelen',
+        'type_blocked' => 'A fájltípus blokkolva lett biztonsági okokból.',
+        'order_by' => 'Rendezés',
+        'direction' => 'Irány',
+        'direction_asc' => 'Növekvő',
+        'direction_desc' => 'Csökkenő',
+        'folder' => 'Könyvtár',
+        'no_files_found' => 'Nem található fájl a lekérésben.',
+        'delete_empty' => 'Kérjük válassza ki a törölni kívánt fájlokat.',
+        'delete_confirm' => 'Valóban törölni akarja a kiválasztott fájlokat?',
+        'error_renaming_file' => 'Hiba a fájl átnevezésében.',
+        'new_folder_title' => 'Új könyvtár',
+        'folder_name' => 'Könyvtár neve',
+        'error_creating_folder' => 'Hiba a könyvtár létrehozásánál',
+        'folder_or_file_exist' => 'Már létezik ilyen nevű fájl vagy könyvtár.',
+        'move_empty' => 'Kérjük válasszon ki fájlt az áthelyezéshez.',
+        'move_popup_title' => 'Fájlok vagy könyvtárak áthelyezése',
+        'move_destination' => 'Célkönyvtár',
+        'please_select_move_dest' => 'Kérjük válasszon célkönyvtárat.',
+        'move_dest_src_match' => 'Kérjük válasszon másik célkönyvtárat.',
+        'empty_library' => 'Kezdésként hozzon létre könyvtárat és töltsön fel fájlokat.',
+        'insert' => 'Beillesztés',
+        'crop_and_insert' => 'Vágás és beillesztés',
+        'select_single_image' => 'Kérjük válasszon ki egy képet.',
+        'selection_not_image' => 'A kiválasztott fájl nem kép.',
+        'restore' => 'Összes változtatás visszavonása',
+        'resize' => 'Átméretezés...',
+        'selection_mode_normal' => 'Normál',
+        'selection_mode_fixed_ratio' => 'Rögzített képarány',
+        'selection_mode_fixed_size' => 'Rögzített méret',
+        'height' => 'Magasság',
+        'width' => 'Szélesség',
+        'selection_mode' => 'Kiválasztás módja',
+        'resize_image' => 'Kép átméretezése',
+        'image_size' => 'Kép mérete:',
+        'selected_size' => 'Kiválasztva:'
+    ],
 ];
diff --git a/modules/backend/lang/it/lang.php b/modules/backend/lang/it/lang.php
index bc445aafd..a84633195 100644
--- a/modules/backend/lang/it/lang.php
+++ b/modules/backend/lang/it/lang.php
@@ -472,5 +472,72 @@ return [
             'windows_1251' => 'Windows-1251 (CP1251)',
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
+    ],
+    'permissions' => [
+        'manage_media' => 'Gestisci elementi multimediali'
+    ],
+    'mediafinder' => [
+        'label' => 'Media Finder',
+        'default_prompt' => 'Fai clic sul pulsante %s per trovare un elemento multimediale'
+    ],
+    'media' => [
+        'menu_label' => 'Elementi multimediali',
+        'upload' => 'Carica',
+        'move' => 'Sposta',
+        'delete' => 'Elimina',
+        'add_folder' => 'Aggiungi cartella',
+        'search' => 'Cerca',
+        'display' => 'Visualizza',
+        'filter_everything' => 'Tutto',
+        'filter_images' => 'Immagini',
+        'filter_video' => 'Video',
+        'filter_audio' => 'Audio',
+        'filter_documents' => 'Documenti',
+        'library' => 'Libreria',
+        'size' => 'Dimensione',
+        'title' => 'Titolo',
+        'last_modified' => 'Ultima modifica',
+        'public_url' => 'URL pubblico',
+        'click_here' => 'Fai clic qui',
+        'thumbnail_error' => 'Errore durante la generazione dell\'anteprima.',
+        'return_to_parent' => 'Ritorna alla cartella superiore',
+        'return_to_parent_label' => 'Torna su ..',
+        'nothing_selected' => 'Nessun elemento selezionato.',
+        'multiple_selected' => 'Elementi multipli selezionati.',
+        'uploading_file_num' => 'Caricamento in corso di :number file(s)...',
+        'uploading_complete' => 'Caricamento completato',
+        'uploading_error' => 'Caricamento fallito',
+        'type_blocked' => 'Il tipo di file utilizzato è bloccato per questioni di sicurezza.',
+        'order_by' => 'Ordina per',
+        'folder' => 'Cartella',
+        'no_files_found' => 'Nessun file corrisponde alla tua richiesta.',
+        'delete_empty' => 'Seleziona elementi da eliminare.',
+        'delete_confirm' => 'Vuoi davvero eliminare gli elementi selezionati?',
+        'error_renaming_file' => 'Errore durante la rinominazione dell\'elemento',
+        'new_folder_title' => 'Nuova cartella',
+        'folder_name' => 'Nome della cartella',
+        'error_creating_folder' => 'Errore durante la creazione della cartella',
+        'folder_or_file_exist' => 'Una cartella o un file con il nome specificato è già esistente.',
+        'move_empty' => 'Selezione elementi da spostare.',
+        'move_popup_title' => 'Sposta file o cartelle',
+        'move_destination' => 'Cartella di destinazione',
+        'please_select_move_dest' => 'Seleziona una cartella di destinazione.',
+        'move_dest_src_match' => 'Seleziona un\'altra cartella di destinazione.',
+        'empty_library' => 'La libreria è vuota. Carica dei files o crea delle cartelle per iniziare.',
+        'insert' => 'Inserisci',
+        'crop_and_insert' => 'Ritaglia e inserisci',
+        'select_single_image' => 'Seleziona una singola immagine.',
+        'selection_not_image' => 'L\'elemento selezionato non è un\'immagine.',
+        'restore' => 'Annulla tutte le modifiche',
+        'resize' => 'Ridimensiona...',
+        'selection_mode_normal' => 'Normale',
+        'selection_mode_fixed_ratio' => 'Rapporto fisso',
+        'selection_mode_fixed_size' => 'Dimensione fissa',
+        'height' => 'Altezza',
+        'width' => 'Larghezza',
+        'selection_mode' => 'Metodo di selezione',
+        'resize_image' => 'Ridimensiona immagine',
+        'image_size' => 'Dimensione immagine:',
+        'selected_size' => 'Selezionati:'
     ]
 ];
diff --git a/modules/backend/lang/kr/lang.php b/modules/backend/lang/kr/lang.php
index cebc0fd79..e18099611 100644
--- a/modules/backend/lang/kr/lang.php
+++ b/modules/backend/lang/kr/lang.php
@@ -492,5 +492,72 @@ return [
             'windows_1251' => 'Windows-1251 (CP1251)',
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
-    ]
+    ],
+    'permissions' => [
+        'manage_media' => '미디어관리와 업로드 - 이미지, 동영상, 소리, 문서'
+    ],
+    'mediafinder' => [
+        'label' => '미디어 탐색기',
+        'default_prompt' => '%s 버튼 클릭하여 미디어 아이템 찾기'
+    ],
+    'media' => [
+        'menu_label' => '미디어',
+        'upload' => '업로드',
+        'move' => '이동',
+        'delete' => '삭제',
+        'add_folder' => '폴더 추가',
+        'search' => '검색',
+        'display' => '표시방법',
+        'filter_everything' => '전체표시',
+        'filter_images' => '이미지',
+        'filter_video' => '동영상',
+        'filter_audio' => '소리',
+        'filter_documents' => '문서',
+        'library' => '라이브러리',
+        'size' => '용량',
+        'title' => '제목',
+        'last_modified' => '최종변경',
+        'public_url' => '다운로드 URL',
+        'click_here' => '클릭해주세요',
+        'thumbnail_error' => '썸네일 생성 오류.',
+        'return_to_parent' => '상위 폴더로 돌아가기',
+        'return_to_parent_label' => '상위 폴더 ..',
+        'nothing_selected' => '선택없음.',
+        'multiple_selected' => '여러개 선택됨.',
+        'uploading_file_num' => ':number 파일 업로드중...',
+        'uploading_complete' => '업로드 완료',
+        'uploading_error' => '업로드 실패',
+        'type_blocked' => '보안문제로 해당 파일타입은 불가능합니다.',
+        'order_by' => '정렬방법',
+        'folder' => '폴더',
+        'no_files_found' => '요청하신 파일을 찾을 수 없습니다.',
+        'delete_empty' => '삭제할 대상을 선택해 주세요.',
+        'delete_confirm' => '선택하신 대상을 삭제하시겠습니까?',
+        'error_renaming_file' => '이름변경 오류.',
+        'new_folder_title' => '신규 폴더',
+        'folder_name' => '폴더 이름',
+        'error_creating_folder' => '폴더 생성 오류',
+        'folder_or_file_exist' => '해당 이름의 파일이나 폴더가 이미 존재합니다.',
+        'move_empty' => '이동할 대상을 선택하세요.',
+        'move_popup_title' => '파일이나 폴더를 이동',
+        'move_destination' => '목적지 폴더',
+        'please_select_move_dest' => '목적지 폴더를 선택하세요.',
+        'move_dest_src_match' => '다른 목적지 폴더를 선택하세요.',
+        'empty_library' => '라이브러리가 비어있습니다. 파일을 업로드하거나 폴더를 생성하여 시작해보세요.',
+        'insert' => '삽입',
+        'crop_and_insert' => '자르기 & 삽입',
+        'select_single_image' => '한개의 이미지를 선택해주세요.',
+        'selection_not_image' => '선택하신 것은 이미지가 아닙니다.',
+        'restore' => '모든 변경 되돌리기',
+        'resize' => '크기변경...',
+        'selection_mode_normal' => '일반',
+        'selection_mode_fixed_ratio' => '고정 비율',
+        'selection_mode_fixed_size' => '고정 크기',
+        'height' => '높이',
+        'width' => '넓이',
+        'selection_mode' => '선택 모드',
+        'resize_image' => '이미지 크기 변경',
+        'image_size' => '이미지 크기:',
+        'selected_size' => '선택크기:'
+    ],
 ];
diff --git a/modules/backend/lang/lt/lang.php b/modules/backend/lang/lt/lang.php
index d5a605c4d..94ad6c446 100644
--- a/modules/backend/lang/lt/lang.php
+++ b/modules/backend/lang/lt/lang.php
@@ -490,5 +490,72 @@ return [
             'windows_1251' => 'Windows-1251 (CP1251)',
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
+    ],
+    'permissions' => [
+        'manage_media' => 'Įkelti ir tvarkyti media elementus - paveiksliukus, video, garsus, dokumentus'
+    ],
+    'mediafinder' => [
+        'label' => 'Failų Tvarkyklė',
+        'default_prompt' => 'Spauskite %s mygtuką media failų paieškai'
+    ],
+    'media' => [
+        'menu_label' => 'Media',
+        'upload' => 'Įkelti',
+        'move' => 'Perkelti',
+        'delete' => 'Trinti',
+        'add_folder' => 'Pridėti katalogą',
+        'search' => 'Ieškoti',
+        'display' => 'Rodyti',
+        'filter_everything' => 'Viskas',
+        'filter_images' => 'Paveiksliukai',
+        'filter_video' => 'Video',
+        'filter_audio' => 'Audio',
+        'filter_documents' => 'Dokumentai',
+        'library' => 'Biblioteka',
+        'size' => 'Dydis',
+        'title' => 'Pavadinimas',
+        'last_modified' => 'Redaguotas',
+        'public_url' => 'Viešas URL',
+        'click_here' => 'Spauskite čia',
+        'thumbnail_error' => 'Nepavyko atvaizduoti miniatiūros.',
+        'return_to_parent' => 'Grįžti į pirminį katalogą',
+        'return_to_parent_label' => 'Eiti aukštyn ..',
+        'nothing_selected' => 'Nieko nepasirinkote.',
+        'multiple_selected' => 'Pasirinkote keletą elementų.',
+        'uploading_file_num' => 'Įkeliama :number failai(as)...',
+        'uploading_complete' => 'Įkėlimas įvykdytas',
+        'uploading_error' => 'Įkėlimas nepavyko',
+        'type_blocked' => 'Failo tipas yra blokuojamas saugumo sumetimais.',
+        'order_by' => 'Rūšiuoti pagal',
+        'folder' => 'Katalogas',
+        'no_files_found' => 'Pagal Jūsų paiešką failų neradome.',
+        'delete_empty' => 'Pasirinkite emelentus trynimui.',
+        'delete_confirm' => 'Trinti pasirinktus elementus?',
+        'error_renaming_file' => 'Klaida pervadinant elementą.',
+        'new_folder_title' => 'Naujas katalogas',
+        'folder_name' => 'Katalogo pavadinimas',
+        'error_creating_folder' => 'Klaida sukuriant katalogą',
+        'folder_or_file_exist' => 'Katalogas ar failas šiuo pavadinimu jau yra.',
+        'move_empty' => 'Pasirinkite elementus perkėlimui.',
+        'move_popup_title' => 'Perkelti failus ar katalogus',
+        'move_destination' => 'Paskirties katalogas',
+        'please_select_move_dest' => 'Pasirinkite paskirties katalogą.',
+        'move_dest_src_match' => 'Prašome pasirinkti kitą paskirties katalogą.',
+        'empty_library' => 'Media biblioteka tuščiay. Pradžiai įkelkite failus ar sukurkite katalogus.',
+        'insert' => 'Įterpti',
+        'crop_and_insert' => 'Apkirpti ir Įterpti',
+        'select_single_image' => 'Pasirinkite vieną paveiksliuką.',
+        'selection_not_image' => 'pasirinktas elementas nėra paveiksliukas.',
+        'restore' => 'Atstatyti visus pakeitimus',
+        'resize' => 'Keisti išmatavimus...',
+        'selection_mode_normal' => 'Normalus',
+        'selection_mode_fixed_ratio' => 'Fiksuotas sdantykis',
+        'selection_mode_fixed_size' => 'Fiksuotas dydis',
+        'height' => 'Aukštis',
+        'width' => 'Plotis',
+        'selection_mode' => 'Pasirinkimo būdas',
+        'resize_image' => 'Keisti paveiksliuko išmatavimus',
+        'image_size' => 'Paveiksliuko dydis:',
+        'selected_size' => 'Pasirinkta:'
     ]
 ];
diff --git a/modules/backend/lang/lv/lang.php b/modules/backend/lang/lv/lang.php
index ebf75f851..6342a91bd 100644
--- a/modules/backend/lang/lv/lang.php
+++ b/modules/backend/lang/lv/lang.php
@@ -395,4 +395,68 @@ return [
         'encoding_not_supported_error' => 'Izvēlētā faila kodējums nav atpazīts. Lūdzu, izvēlieties Pielāgota formāta opciju ar pareizu kodējumu lai Jūsu fails tiktu ieimportēts.',
         'encoding_format' => 'Faila kodējums',
     ],
+    'permissions' => [
+        'manage_media' => 'Pārvaldīt multividi'
+    ],
+    'mediafinder' => [
+        'default_prompt' => 'Klikšķiniet uz %s pogas, lai atrastu multividi'
+    ],
+    'media' => [
+        'menu_label' => 'Multimēdija',
+        'upload' => 'Augšupielādēt',
+        'move' => 'Pārvietot',
+        'delete' => 'Dzēst',
+        'add_folder' => 'Pievienot mapi',
+        'search' => 'Meklēt',
+        'display' => 'Attēlot',
+        'filter_everything' => 'Viss',
+        'filter_images' => 'Attēli',
+        'filter_video' => 'Video',
+        'filter_audio' => 'Audio',
+        'filter_documents' => 'Dokumenti',
+        'library' => 'Bibliotēka',
+        'size' => 'Izmērs',
+        'title' => 'Virsraksts',
+        'last_modified' => 'Pēdējoreiz modificēts',
+        'public_url' => 'Publiskā URL',
+        'click_here' => 'Spiest šeit',
+        'thumbnail_error' => 'Kļūda ģenerējot priekšskatījumu.',
+        'return_to_parent' => 'Atgriezties vecākmapē',
+        'return_to_parent_label' => 'Doties augšup ..',
+        'nothing_selected' => 'Nekas nav izvēlēts.',
+        'multiple_selected' => 'Vairāki izvēlēti objekti.',
+        'uploading_file_num' => 'Augšupielādējam :number failu(us)...',
+        'uploading_complete' => 'Augšupielāde pabeigta',
+        'order_by' => 'Kārtot pēc',
+        'folder' => 'Mape',
+        'no_files_found' => 'Jūsu pieprasītie faili netika atrasti.',
+        'delete_empty' => 'Lūdzu izvēlaties objektus, kurus dzēst.',
+        'delete_confirm' => 'Vai tiešām vēlaties izdzēst izvēlēto objektu(us)?',
+        'error_renaming_file' => 'Kļūda pārdēvējot objektu.',
+        'new_folder_title' => 'Jauna mape',
+        'folder_name' => 'Mapes nosaukums',
+        'error_creating_folder' => 'Kļūda izveidojot mapi',
+        'folder_or_file_exist' => 'Mape vai fails ar izvēlēto nosaukumu jau eksistē.',
+        'move_empty' => 'Izvēlēties objektus, kurus pārvietot.',
+        'move_popup_title' => 'Pārvietot failus vai mapes',
+        'move_destination' => 'Mērķdirektorija',
+        'please_select_move_dest' => 'Lūdzu izvēlieties mērķdirektoriju.',
+        'move_dest_src_match' => 'Lūdzu izvēlieties citu mērķdirektoriju.',
+        'empty_library' => 'Multimēdijas bibliotēka ir tukša. Augšupielādējiet failus vai izveidojat mapes, lai sāktu.',
+        'insert' => 'Ievietot',
+        'crop_and_insert' => 'Apgriezt un Ievietot',
+        'select_single_image' => 'Lūdzu izvēlieties vienu attēlu.',
+        'selection_not_image' => 'Izvēlētais objekts nav attēls.',
+        'restore' => 'Atcelt visas izmaiņas',
+        'resize' => 'Mērogot...',
+        'selection_mode_normal' => 'Normāls',
+        'selection_mode_fixed_ratio' => 'Fiksēta attiecība',
+        'selection_mode_fixed_size' => 'Fiksēts izmērs',
+        'height' => 'Augstums',
+        'width' => 'Platums',
+        'selection_mode' => 'Iezīmēšanas režīms',
+        'resize_image' => 'Mērogot attēlu',
+        'image_size' => 'Attēla izmērs:',
+        'selected_size' => 'Izvēlēts:'
+    ]
 ];
diff --git a/modules/backend/lang/nb-no/lang.php b/modules/backend/lang/nb-no/lang.php
index 1014276de..47f8d2009 100644
--- a/modules/backend/lang/nb-no/lang.php
+++ b/modules/backend/lang/nb-no/lang.php
@@ -481,5 +481,71 @@ return [
             'windows_1251' => 'Windows-1251 (CP1251)',
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
+    ],
+    'permissions' => [
+        'manage_media' => 'Last opp og behandle media - bilder, video, lydfiler, dokumenter',
+    ],
+    'mediafinder' => [
+        'default_prompt' => 'Klikk på %s knappen for å hente media'
+    ],
+    'media' => [
+        'menu_label' => 'Media',
+        'upload' => 'Last opp',
+        'move' => 'Flytt',
+        'delete' => 'Slett',
+        'add_folder' => 'Ny mappe',
+        'search' => 'Søk',
+        'display' => 'Vis',
+        'filter_everything' => 'Alle filer',
+        'filter_images' => 'Bilder',
+        'filter_video' => 'Video',
+        'filter_audio' => 'Lyd',
+        'filter_documents' => 'Dokumenter',
+        'library' => 'Bibliotek',
+        'size' => 'Størrelse',
+        'title' => 'Tittel',
+        'last_modified' => 'Sist endret',
+        'public_url' => 'URL',
+        'click_here' => 'Klikk her',
+        'thumbnail_error' => 'Kunne ikke lage thumbnail.',
+        'return_to_parent' => 'Gå til forrige mappe',
+        'return_to_parent_label' => 'Gå opp ..',
+        'nothing_selected' => 'Ingenting er valgt.',
+        'multiple_selected' => 'Flere filer er valgt.',
+        'uploading_file_num' => 'Laster opp :number fil(er)...',
+        'uploading_complete' => 'Opplasting fullført',
+        'uploading_error' => 'Opplasting feilet',
+        'type_blocked' => 'Filtypen er blokkert av sikkerhetsgrunner.',
+        'order_by' => 'Sorter etter',
+        'folder' => 'Mappe',
+        'no_files_found' => 'Ingen filer ble funnet.',
+        'delete_empty' => 'Ingen filer er valgt.',
+        'delete_confirm' => 'Vil du virkelig slette valgte fil(er)?',
+        'error_renaming_file' => 'Kunne ikke gi filen nytt navn.',
+        'new_folder_title' => 'Ny mappe',
+        'folder_name' => 'Mappenavn',
+        'error_creating_folder' => 'Kunne ikke opprette ny mappe',
+        'folder_or_file_exist' => 'En fil eller mappe med det navnet eksisterer allerede.',
+        'move_empty' => 'Vennligst velg filer å flytte.',
+        'move_popup_title' => 'Flytt filer eller mapper',
+        'move_destination' => 'Målmappe',
+        'please_select_move_dest' => 'Vennligst velg en målmappe.',
+        'move_dest_src_match' => 'Please select another destination folder.',
+        'empty_library' => 'Mediabiblioteket er tomt. Last opp filer eller opprett mapper for å komme i gang.',
+        'insert' => 'Insert',
+        'crop_and_insert' => 'Crop & Insert',
+        'select_single_image' => 'Vennligst velg ett enkelt bilde.',
+        'selection_not_image' => 'Valgte fil er ikke et bilde.',
+        'restore' => 'Angre endringer',
+        'resize' => 'Endre størrelse...',
+        'selection_mode_normal' => 'Normal',
+        'selection_mode_fixed_ratio' => 'Fast forhold',
+        'selection_mode_fixed_size' => 'Fast størrelse',
+        'height' => 'Høyde',
+        'width' => 'Bredde',
+        'selection_mode' => 'Valgmodus',
+        'resize_image' => 'Endre bildestørrelse',
+        'image_size' => 'Bildestørrelse:',
+        'selected_size' => 'Valgt:'
     ]
 ];
diff --git a/modules/backend/lang/nl/lang.php b/modules/backend/lang/nl/lang.php
index c0aaf514c..3879beed2 100644
--- a/modules/backend/lang/nl/lang.php
+++ b/modules/backend/lang/nl/lang.php
@@ -496,5 +496,72 @@ return [
             'windows_1251' => 'Windows-1251 (CP1251)',
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
-    ]
+    ],
+    'permissions' => [
+        'manage_media' => 'Beheer media',
+    ],
+    'mediafinder' => [
+        'label' => 'Media zoeker',
+        'default_prompt' => 'Klik op de %s knop om een media item te vinden',
+    ],
+    'media' => [
+        'menu_label' => 'Media',
+        'upload' => 'Uploaden',
+        'move' => 'Verplaatsen',
+        'delete' => 'Verwijderen',
+        'add_folder' => 'Map toevoegen',
+        'search' => 'Zoeken',
+        'display' => 'Weergeven',
+        'filter_everything' => 'Alles',
+        'filter_images' => 'Afbeeldingen',
+        'filter_video' => 'Video\'s',
+        'filter_audio' => 'Audio',
+        'filter_documents' => 'Documenten',
+        'library' => 'Bibliotheek',
+        'size' => 'Grootte',
+        'title' => 'Titel',
+        'last_modified' => 'Laatst gewijzigd',
+        'public_url' => 'URL',
+        'click_here' => 'Klik hier',
+        'thumbnail_error' => 'Fout opgetreden bij genereren miniatuurweergave.',
+        'return_to_parent' => 'Terug naar bovenliggende map',
+        'return_to_parent_label' => 'Naar bovenliggende ...',
+        'nothing_selected' => 'Er is niets geselecteerd.',
+        'multiple_selected' => 'Meerdere items geselecteerd.',
+        'uploading_file_num' => 'Uploaden van :number bestanden...',
+        'uploading_complete' => 'Uploaden voltooid',
+        'uploading_error' => 'Upload mislukt',
+        'type_blocked' => 'Het bestandstype is i.v.m. veiligheidsredenen geblokkeerd.',
+        'order_by' => 'Sorteer op',
+        'folder' => 'Map',
+        'no_files_found' => 'Er zijn geen bestanden gevonden.',
+        'delete_empty' => 'Selecteer items om te verwijderen.',
+        'delete_confirm' => 'Weet je zeker dat je de geselecteerde items wilt verwijderen?',
+        'error_renaming_file' => 'Fout bij wijzigen naam.',
+        'new_folder_title' => 'Nieuwe map',
+        'folder_name' => 'Mapnaam',
+        'error_creating_folder' => 'Fout bij maken van map',
+        'folder_or_file_exist' => 'Er bestaat reeds een map of bestand met deze naam.',
+        'move_empty' => 'Selecteer de items om te verplaatsen.',
+        'move_popup_title' => 'Verplaats bestanden of mappen',
+        'move_destination' => 'Doelmap',
+        'please_select_move_dest' => 'Selecteer een doelmap.',
+        'move_dest_src_match' => 'Selecteer een andere doelmap.',
+        'empty_library' => 'De media bibliotheek is leeg. Upload bestanden of maak mappen aan om te beginnen.',
+        'insert' => 'Invoegen',
+        'crop_and_insert' => 'Uitsnijden & Invoegen',
+        'select_single_image' => 'Selecteer één afbeelding.',
+        'selection_not_image' => 'Het geselecteerde item is geen afbeelding.',
+        'restore' => 'Alle wijzigingen ongedaan maken',
+        'resize' => 'Wijzig grootte...',
+        'selection_mode_normal' => 'Normaal',
+        'selection_mode_fixed_ratio' => 'Vaste ratio',
+        'selection_mode_fixed_size' => 'Vaste grootte',
+        'height' => 'Hoogte',
+        'width' => 'Breedte',
+        'selection_mode' => 'Selectie modus',
+        'resize_image' => 'Wijzig grootte van afbeelding',
+        'image_size' => 'Grootte afbeelding:',
+        'selected_size' => 'Geselecteerd:',
+    ],
 ];
diff --git a/modules/backend/lang/pl/lang.php b/modules/backend/lang/pl/lang.php
index 2230eee6e..890fefc69 100644
--- a/modules/backend/lang/pl/lang.php
+++ b/modules/backend/lang/pl/lang.php
@@ -478,4 +478,70 @@ return [
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
     ],
+    'permissions' => [
+        'manage_media' => 'Manage mediami'
+    ],
+    'mediafinder' => [
+        'default_prompt' => 'Kliknij przycisk %s aby znaleźć element'
+    ],
+    'media' => [
+        'menu_label' => 'Media',
+        'upload' => 'Prześlij',
+        'move' => 'Przenieś',
+        'delete' => 'Usuń',
+        'add_folder' => 'Dodaj folder',
+        'search' => 'Szukaj',
+        'display' => 'Pokaż',
+        'filter_everything' => 'Wszystko',
+        'filter_images' => 'Obrazki',
+        'filter_video' => 'Filmy',
+        'filter_audio' => 'Dźwięki',
+        'filter_documents' => 'Dokumenty',
+        'library' => 'Biblioteka',
+        'size' => 'Rozmiar',
+        'title' => 'Tytuł',
+        'last_modified' => 'Data modyfikacji',
+        'public_url' => 'Publiczny URL',
+        'click_here' => 'Kliknij tutaj',
+        'thumbnail_error' => 'Wystąpił błąd przy tworzeniu miniatury.',
+        'return_to_parent' => 'Wróć do folderu nadrzędnego',
+        'return_to_parent_label' => 'Idź w górę ..',
+        'nothing_selected' => 'Nic nie zaznaczono.',
+        'multiple_selected' => 'Wybrano wiele elementów.',
+        'uploading_file_num' => 'Przesyłanie :number pliku(ów)...',
+        'uploading_complete' => 'Przesyłanie zakończone',
+        'uploading_error' => 'Błąd przesyłania pliku',
+        'type_blocked' => 'Typ pliku jest zablokowany ze względów bezpieczeństwa.',
+        'order_by' => 'Sortowanie',
+        'folder' => 'Folder',
+        'no_files_found' => 'Nie znaleziono żadnych pasujących elementów.',
+        'delete_empty' => 'Wybierz elementy do usunięcia.',
+        'delete_confirm' => 'Czy na pewno chcesz usunąć wybrane elementy?',
+        'error_renaming_file' => 'Wystąpił błąd przy zmianie nazwy elementu.',
+        'new_folder_title' => 'Nowy folder',
+        'folder_name' => 'Nazwa folderu',
+        'error_creating_folder' => 'Wystąpił błąd przy tworzeniu folderu',
+        'folder_or_file_exist' => 'Folder lub plik o podanej nazwie już istnieje.',
+        'move_empty' => 'Wybierz elementy do przeniesienia.',
+        'move_popup_title' => 'Przenieś pliki lub foldery',
+        'move_destination' => 'Folder docelowy',
+        'please_select_move_dest' => 'Wybierz folder docelowy.',
+        'move_dest_src_match' => 'Wybierz inny folder docelowy.',
+        'empty_library' => 'Biblioteka Mediów jest pusta. Na początek prześlij pliki lub utwórz foldery.',
+        'insert' => 'Wstaw',
+        'crop_and_insert' => 'Przytnij lub wstaw',
+        'select_single_image' => 'Wybierz pojedynczy obrazek.',
+        'selection_not_image' => 'Wybrany element nie jest obrazkiem.',
+        'restore' => 'Cofnij wszystkie zmiany',
+        'resize' => 'Skaluj...',
+        'selection_mode_normal' => 'Normalny',
+        'selection_mode_fixed_ratio' => 'Zablokuj proporcje',
+        'selection_mode_fixed_size' => 'Zablokuj rozmiar',
+        'height' => 'Wysokość',
+        'width' => 'Szerokość',
+        'selection_mode' => 'Tryb zaznaczenia',
+        'resize_image' => 'Zmień rozmiar obrazka',
+        'image_size' => 'Rozmiar obrazka:',
+        'selected_size' => 'Wybrano:'
+    ]
 ];
diff --git a/modules/backend/lang/pt-br/lang.php b/modules/backend/lang/pt-br/lang.php
index 52a5c7457..896e78867 100644
--- a/modules/backend/lang/pt-br/lang.php
+++ b/modules/backend/lang/pt-br/lang.php
@@ -472,5 +472,71 @@ return [
             'windows_1251' => 'Windows-1251 (CP1251)',
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
+    ],
+    'permissions' => [
+        'manage_media' => 'Gerenciar mídias'
+    ],
+    'mediafinder' => [
+        'default_prompt' => 'Clique no botão %s para localizar um arquivo de mídia'
+    ],
+    'media' => [
+        'menu_label' => 'Mídias',
+        'upload' => 'Enviar',
+        'move' => 'Mover',
+        'delete' => 'Excluir',
+        'add_folder' => 'Adicionar pasta',
+        'search' => 'Buscar',
+        'display' => 'Exibir',
+        'filter_everything' => 'Tudo',
+        'filter_images' => 'Imagens',
+        'filter_video' => 'Vídeos',
+        'filter_audio' => 'Áudios',
+        'filter_documents' => 'Documentos',
+        'library' => 'Biblioteca',
+        'size' => 'Tamanho',
+        'title' => 'Título',
+        'last_modified' => 'Última modificação',
+        'public_url' => 'URL pública',
+        'click_here' => 'Clique aqui',
+        'thumbnail_error' => 'Erro ao gerar a miniatura.',
+        'return_to_parent' => 'Retornar ao diretório anterior',
+        'return_to_parent_label' => 'Vá para ..',
+        'nothing_selected' => 'Nenhum item selecionado.',
+        'multiple_selected' => 'Múltiplos itens selecionados.',
+        'uploading_file_num' => 'Enviando :number arquivo(s)...',
+        'uploading_complete' => 'Envio finalizado',
+        'uploading_error' => 'Falha no envio',
+        'type_blocked' => 'O tipo de arquivo utilizado é bloqueado por motivos de segurança.',
+        'order_by' => 'Ordenar por',
+        'folder' => 'Pasta',
+        'no_files_found' => 'Nenhum arquivo encontrado.',
+        'delete_empty' => 'Por favor, selecione um item para excluir.',
+        'delete_confirm' => 'Você deseja mesmo excluir o(s) arquivo(s) selecionado(s)?',
+        'error_renaming_file' => 'Erro ao renomear o arquivo.',
+        'new_folder_title' => 'Nova pasta',
+        'folder_name' => 'Nome da pasta',
+        'error_creating_folder' => 'Erro ao criar a pasta',
+        'folder_or_file_exist' => 'Uma pasta ou arquivo já existe com o nome especificado.',
+        'move_empty' => 'Por favor, selecione um item para mover.',
+        'move_popup_title' => 'Mover arquivos ou pastas',
+        'move_destination' => 'Pasta destino',
+        'please_select_move_dest' => 'Por favor, selecione a pasta destino.',
+        'move_dest_src_match' => 'Por favor, selecione outra pasta destino.',
+        'empty_library' => 'A biblioteca de mídias está vazia. Envie arquivos ou crie pastas para iniciar.',
+        'insert' => 'Inserir',
+        'crop_and_insert' => 'Cortar & Inserir',
+        'select_single_image' => 'Por favor, selecione uma única imagem.',
+        'selection_not_image' => 'O arquivo selecionado não é uma imagem.',
+        'restore' => 'Desfazer todas as alterações',
+        'resize' => 'Redimensionar...',
+        'selection_mode_normal' => 'Normal',
+        'selection_mode_fixed_ratio' => 'Proporção fixa',
+        'selection_mode_fixed_size' => 'Tamanho fixo',
+        'height' => 'Altura',
+        'width' => 'Largura',
+        'selection_mode' => 'Modo de seleção',
+        'resize_image' => 'Redimensionar imagem',
+        'image_size' => 'Tamanho da imagem:',
+        'selected_size' => 'Selecionado:'
     ]
 ];
diff --git a/modules/backend/lang/pt-pt/lang.php b/modules/backend/lang/pt-pt/lang.php
index 0a2dc93a8..203d4edbb 100644
--- a/modules/backend/lang/pt-pt/lang.php
+++ b/modules/backend/lang/pt-pt/lang.php
@@ -493,5 +493,72 @@ return [
             'windows_1251' => 'Windows-1251 (CP1251)',
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
-    ]
+    ],
+    'permissions' => [
+        'manage_media' => 'Gerir conteúdo multimédia'
+    ],
+    'mediafinder' => [
+        'label' => 'Localizador de multimédia',
+        'default_prompt' => 'Clique no botão %s para localizar um ficheiro multimédia'
+    ],
+    'media' => [
+        'menu_label' => 'Conteúdos',
+        'upload' => 'Enviar',
+        'move' => 'Mover',
+        'delete' => 'Excluir',
+        'add_folder' => 'Adicionar pasta',
+        'search' => 'Procurar',
+        'display' => 'Mostrar',
+        'filter_everything' => 'Tudo',
+        'filter_images' => 'Imagens',
+        'filter_video' => 'Vídeos',
+        'filter_audio' => 'Áudios',
+        'filter_documents' => 'Documentos',
+        'library' => 'Biblioteca',
+        'size' => 'Tamanho',
+        'title' => 'Título',
+        'last_modified' => 'Última modificação',
+        'public_url' => 'URL pública',
+        'click_here' => 'Clique aqui',
+        'thumbnail_error' => 'Erro ao gerar a miniatura.',
+        'return_to_parent' => 'Retornar à diretoria anterior',
+        'return_to_parent_label' => 'Acima ..',
+        'nothing_selected' => 'Nenhum item selecionado.',
+        'multiple_selected' => 'Múltiplos itens selecionados.',
+        'uploading_file_num' => 'Enviando :number ficheiro(s)...',
+        'uploading_complete' => 'Envio finalizado',
+        'uploading_error' => 'Falha no envio',
+        'type_blocked' => 'O tipo de ficheiro utilizado é bloqueado por motivos de segurança.',
+        'order_by' => 'Ordenar por',
+        'folder' => 'Pasta',
+        'no_files_found' => 'Nenhum ficheiro encontrado.',
+        'delete_empty' => 'Por favor, selecione itens para apagar.',
+        'delete_confirm' => 'Deseja apagar o(s) ficheiro(s) selecionado(s)?',
+        'error_renaming_file' => 'Erro ao renomear o ficheiro.',
+        'new_folder_title' => 'Nova pasta',
+        'folder_name' => 'Nome da pasta',
+        'error_creating_folder' => 'Erro ao criar a pasta',
+        'folder_or_file_exist' => 'Uma pasta ou ficheiro já existe com o nome especificado.',
+        'move_empty' => 'Por favor, selecione os itens para mover.',
+        'move_popup_title' => 'Mover ficheiros ou pastas',
+        'move_destination' => 'Pasta destino',
+        'please_select_move_dest' => 'Por favor, selecione a pasta de destino.',
+        'move_dest_src_match' => 'Por favor, selecione outra pasta de destino.',
+        'empty_library' => 'A biblioteca de multimédia, está vazia. Envie ficheiros ou crie pastas para iniciar.',
+        'insert' => 'Inserir',
+        'crop_and_insert' => 'Cortar & Inserir',
+        'select_single_image' => 'Por favor, selecione uma única imagem.',
+        'selection_not_image' => 'O ficheiro selecionado não é uma imagem.',
+        'restore' => 'Desfazer todas as alterações',
+        'resize' => 'Redimensionar...',
+        'selection_mode_normal' => 'Normal',
+        'selection_mode_fixed_ratio' => 'Proporção fixa',
+        'selection_mode_fixed_size' => 'Tamanho fixo',
+        'height' => 'Altura',
+        'width' => 'Largura',
+        'selection_mode' => 'Modo de seleção',
+        'resize_image' => 'Redimensionar imagem',
+        'image_size' => 'Tamanho da imagem:',
+        'selected_size' => 'Selecionado:'
+    ],
 ];
diff --git a/modules/backend/lang/ru/lang.php b/modules/backend/lang/ru/lang.php
index 63ede061d..2ef6d0ae6 100644
--- a/modules/backend/lang/ru/lang.php
+++ b/modules/backend/lang/ru/lang.php
@@ -512,5 +512,72 @@ return [
             'windows_1251' => 'Windows-1251 (CP1251)',
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
-    ]
+    ],
+    'permissions' => [
+        'manage_media' => 'Управление медиафайлами'
+    ],
+    'mediafinder' => [
+        'label' => 'Поиск медиа',
+        'default_prompt' => 'Кликните на кнопку %s, чтобы найти медиафайл'
+    ],
+    'media' => [
+        'menu_label' => 'Медиафайлы',
+        'upload' => 'Загрузить',
+        'move' => 'Переместить',
+        'delete' => 'Удалить',
+        'add_folder' => 'Создать папку',
+        'search' => 'Поиск',
+        'display' => 'Отобразить',
+        'filter_everything' => 'Все файлы',
+        'filter_images' => 'Изображения',
+        'filter_video' => 'Видео',
+        'filter_audio' => 'Музыка',
+        'filter_documents' => 'Документы',
+        'library' => 'Библиотека',
+        'size' => 'Размер',
+        'title' => 'Имя',
+        'last_modified' => 'Последнее изменение',
+        'public_url' => 'Публичный адрес',
+        'click_here' => 'Нажмите здесь',
+        'thumbnail_error' => 'Ошибка создания миниатюры.',
+        'return_to_parent' => 'Вернуться в родительскую папку',
+        'return_to_parent_label' => 'Подняться на уровень выше ..',
+        'nothing_selected' => 'Ничего не выбрано.',
+        'multiple_selected' => 'Выбрано несколько объектов.',
+        'uploading_file_num' => 'Загрузка файлов: :number',
+        'uploading_complete' => 'Загрузка файлов завершена!',
+        'uploading_error' => 'Ошибка загрузки',
+        'type_blocked' => 'Используемый тип файла блокируется по соображениям безопасности.',
+        'order_by' => 'Сортировать по',
+        'folder' => 'Папка',
+        'no_files_found' => 'Ни один из файлов не удовлетворяет вашему запросу.',
+        'delete_empty' => 'Пожалуйста, выберите объекты для удаления.',
+        'delete_confirm' => 'Вы действительно хотите удалить выбранные объекты?',
+        'error_renaming_file' => 'Ошибка изменения имени файла.',
+        'new_folder_title' => 'Новая папка',
+        'folder_name' => 'Название папки',
+        'error_creating_folder' => 'Ошибка создания папки',
+        'folder_or_file_exist' => 'Папка или файл с таким именем уже существует.',
+        'move_empty' => 'Пожалуйста, выберите объекты для перемещения.',
+        'move_popup_title' => 'Перемещение файлов или папок',
+        'move_destination' => 'Папка назначения',
+        'please_select_move_dest' => 'Пожалуйста, выберите папку назначения для перемещения.',
+        'move_dest_src_match' => 'Пожалуйста, выберите другую папку.',
+        'empty_library' => 'Библиотека медиафайлов пуста. Для начала загрузите файлы или создайте папки.',
+        'insert' => 'Вставить',
+        'crop_and_insert' => 'Обрезать и вставить',
+        'select_single_image' => 'Пожалуйста, выберите одно изображение.',
+        'selection_not_image' => 'Выбранный элемент не является изображением.',
+        'restore' => 'Отменить все изменения',
+        'resize' => 'Изменение размера...',
+        'selection_mode_normal' => 'Нормальный',
+        'selection_mode_fixed_ratio' => 'Фиксированное соотношение',
+        'selection_mode_fixed_size' => 'Фиксированный размер',
+        'height' => 'Высота',
+        'width' => 'Ширина',
+        'selection_mode' => 'Режим выделения',
+        'resize_image' => 'Изменение размера изображения',
+        'image_size' => 'Размер изображения:',
+        'selected_size' => 'Выбрано:'
+    ],
 ];
diff --git a/modules/backend/lang/sv/lang.php b/modules/backend/lang/sv/lang.php
index 5d0a1c7f5..c62992356 100644
--- a/modules/backend/lang/sv/lang.php
+++ b/modules/backend/lang/sv/lang.php
@@ -315,5 +315,69 @@ return [
     ],
     'filter' => [
       'all' => 'alla'
+    ],
+    'permissions' => [
+        'manage_media' => 'Hantera media'
+    ],
+    'mediafinder' => [
+        'default_prompt' => 'Klicka på %s knappen för att hitta ett mediaföremål'
+    ],
+    'media' => [
+        'menu_label' => 'Media',
+        'upload' => 'Ladda upp',
+        'move' => 'Flytta',
+        'delete' => 'Radera',
+        'add_folder' => 'Ny mapp',
+        'search' => 'Sök',
+        'display' => 'Visa',
+        'filter_everything' => 'Allt',
+        'filter_images' => 'Bilder',
+        'filter_video' => 'Videor',
+        'filter_audio' => 'Ljud',
+        'filter_documents' => 'Dokument',
+        'library' => 'Bibliotek',
+        'size' => 'Storlek',
+        'title' => 'Titel',
+        'last_modified' => 'Senast ändrad',
+        'public_url' => 'Publik URL',
+        'click_here' => 'Klicka här',
+        'thumbnail_error' => 'Fel vid generering av thumbnail.',
+        'return_to_parent' => 'Återgå till mappens förälder',
+        'return_to_parent_label' => 'Upp ..',
+        'nothing_selected' => 'Inget är valt.',
+        'multiple_selected' => 'Flera föremål valda.',
+        'uploading_file_num' => 'Laddar upp :number fil(er)...',
+        'uploading_complete' => 'Uppladdning slutförd',
+        'order_by' => 'Ordna efter',
+        'folder' => 'Mapp',
+        'no_files_found' => 'Inga filer kunde hittas baserat på din sökning.',
+        'delete_empty' => 'Vänligen välj föremål att radera.',
+        'delete_confirm' => 'Är du säker att du vill radera de valda föremålen?',
+        'error_renaming_file' => 'Fel vid namnbyte av föremålet.',
+        'new_folder_title' => 'Ny mapp',
+        'folder_name' => 'Mappnamn',
+        'error_creating_folder' => 'Fel vid skapande av mapp',
+        'folder_or_file_exist' => 'En mapp eller fil med det angivna namnet existerar redan.',
+        'move_empty' => 'Vänligen välj föremål att flytta.',
+        'move_popup_title' => 'Flytta filer eller mappar',
+        'move_destination' => 'Destinationsmapp',
+        'please_select_move_dest' => 'Vänligen välj en destinationsmapp.',
+        'move_dest_src_match' => 'Vänligen välj en annan destinationsmapp.',
+        'empty_library' => 'Mediabiblioteket är tomt. Ladda upp filer eller skapa mappar för att börja.',
+        'insert' => 'Infoga',
+        'crop_and_insert' => 'Beskär & infoga',
+        'select_single_image' => 'Vänligen välj en enskild bild.',
+        'selection_not_image' => 'Det valda föremålet är inte en bild.',
+        'restore' => 'Ångra alla ändringar',
+        'resize' => 'Anpassa storlek...',
+        'selection_mode_normal' => 'Normal',
+        'selection_mode_fixed_ratio' => 'Fast proportion',
+        'selection_mode_fixed_size' => 'Fast storlek',
+        'height' => 'Höjd',
+        'width' => 'Bredd',
+        'selection_mode' => 'Urvalsläge',
+        'resize_image' => 'Anpassa bildstorlek',
+        'image_size' => 'Bildstorlek:',
+        'selected_size' => 'Vald:'
     ]
 ];
diff --git a/modules/backend/lang/tr/lang.php b/modules/backend/lang/tr/lang.php
index fad7255f2..f979b2cf7 100644
--- a/modules/backend/lang/tr/lang.php
+++ b/modules/backend/lang/tr/lang.php
@@ -482,4 +482,70 @@ return [
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
     ],
+    'permissions' => [
+        'manage_media' => 'Medyaları düzenleyebilsin'
+    ],
+    'mediafinder' => [
+        'default_prompt' => 'Bir medya öğesi bulmak için %s butonuna tıklayın'
+    ],
+    'media' => [
+        'menu_label' => 'Medya',
+        'upload' => 'Yükle',
+        'move' => 'Taşı',
+        'delete' => 'Sil',
+        'add_folder' => 'Yeni Klasör',
+        'search' => 'Ara',
+        'display' => 'Görüntüle',
+        'filter_everything' => 'Her şey',
+        'filter_images' => 'Resimler',
+        'filter_video' => 'Video',
+        'filter_audio' => 'Ses',
+        'filter_documents' => 'Belgeler',
+        'library' => 'Kütüphane',
+        'size' => 'Boyut',
+        'title' => 'Başlık',
+        'last_modified' => 'Son düzenleme tarihi',
+        'public_url' => 'Public URL',
+        'click_here' => 'Buraya tıkla',
+        'thumbnail_error' => 'Önizleme oluşturulurken hata.',
+        'return_to_parent' => 'Ana klasöre geri dön',
+        'return_to_parent_label' => 'Yukarı git..',
+        'nothing_selected' => 'Hiçbir şey seçilmedi.',
+        'multiple_selected' => 'Birden fazla öğe seçildi.',
+        'uploading_file_num' => ':number adet dosya yükleniyor...',
+        'uploading_complete' => 'Yükleme tamamlandı',
+        'uploading_error' => 'Yükleme hatası',
+        'type_blocked' => 'Seçilen dosya türünü güvenlik nedenleriyle izin verilmiyor.',
+        'order_by' => 'Sırala',
+        'folder' => 'Klasör',
+        'no_files_found' => 'İsteğiniz doğrultusunda hiçbir dosya bulunamadı.',
+        'delete_empty' => 'Lütfen silinecek öğeleri seçiniz.',
+        'delete_confirm' => 'Bu öğe veya öğeleri gerçekten silmek istediğinize emin misiniz?',
+        'error_renaming_file' => 'Öğeyi yeniden isimlendirirken hata.',
+        'new_folder_title' => 'Yeni Klasör',
+        'folder_name' => 'Klasör ismi',
+        'error_creating_folder' => 'Klasör oluştururken hata',
+        'folder_or_file_exist' => 'Belirtilen isimde bir klasör ya da dosya zaten mevcut.',
+        'move_empty' => 'Lütfen taşınacak öğeleri seçiniz.',
+        'move_popup_title' => 'Dosyaları veya klasörleri taşı',
+        'move_destination' => 'Hedef klasör',
+        'please_select_move_dest' => 'Lütfen hedef klasörü seçiniz.',
+        'move_dest_src_match' => 'Lütfen başka bir hedef klasör seçiniz.',
+        'empty_library' => 'Medya kütüphanesi boş. Başlamak için dosya yükleyin yada klasör oluşturun.',
+        'insert' => 'Ekle',
+        'crop_and_insert' => 'Kırp ve Ekle',
+        'select_single_image' => 'Lütfen sadece bir tane resim seçiniz.',
+        'selection_not_image' => 'Seçili öğe bir resim değil.',
+        'restore' => 'Tüm değişiklikleri geri al',
+        'resize' => 'Yeniden boyutlandırma...',
+        'selection_mode_normal' => 'Normal',
+        'selection_mode_fixed_ratio' => 'Sabit oran',
+        'selection_mode_fixed_size' => 'Sabit boyut',
+        'height' => 'Yükseklik',
+        'width' => 'Genişlik',
+        'selection_mode' => 'Seçim modu',
+        'resize_image' => 'Resimi yeniden boyutlandırs',
+        'image_size' => 'Resim boyutu:',
+        'selected_size' => 'Seçili:'
+    ]
 ];
diff --git a/modules/backend/lang/uk/lang.php b/modules/backend/lang/uk/lang.php
index c73d10e83..186e62d8c 100644
--- a/modules/backend/lang/uk/lang.php
+++ b/modules/backend/lang/uk/lang.php
@@ -512,5 +512,72 @@ return [
             'windows_1251' => 'Windows-1251 (CP1251)',
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
-    ]
+    ],
+    'permissions' => [
+        'manage_media' => 'Керування медіафайлами'
+    ],
+    'mediafinder' => [
+        'label' => 'Пошук медіа',
+        'default_prompt' => 'Натисніть на кнопку %s, щоб знайти медіафайл'
+    ],
+    'media' => [
+        'menu_label' => 'Медіафайли',
+        'upload' => 'Завантажити',
+        'move' => 'Перемістити',
+        'delete' => 'Видалити',
+        'add_folder' => 'Створити папку',
+        'search' => 'Пошук',
+        'display' => 'Показати',
+        'filter_everything' => 'Всі файли',
+        'filter_images' => 'Зображення',
+        'filter_video' => 'Відео',
+        'filter_audio' => 'Музика',
+        'filter_documents' => 'Документи',
+        'library' => 'Бібліотека',
+        'size' => 'Розмір',
+        'title' => 'Ім\'я',
+        'last_modified' => 'Остання зміна',
+        'public_url' => 'Публічна адреса',
+        'click_here' => 'Натисніть тут',
+        'thumbnail_error' => 'Помилка створення мініатюри.',
+        'return_to_parent' => 'Повернутися до батьківської папки',
+        'return_to_parent_label' => 'Піднятися на рівень вище...',
+        'nothing_selected' => 'Нічого не обрано.',
+        'multiple_selected' => 'Обрано кілька об\'єктів.',
+        'uploading_file_num' => 'Завантаження файлів: :number',
+        'uploading_complete' => 'Завантаження файлів завершено!',
+        'uploading_error' => 'Помилка завантаження',
+        'type_blocked' => 'Тип файлу, який використовується заблокований з міркувань безпеки.',
+        'order_by' => 'Сортувати за',
+        'folder' => 'Папка',
+        'no_files_found' => 'Жоден з файлів не задовольняє вашому запиту.',
+        'delete_empty' => 'Будь ласка, оберіть об\'єкти для видалення.',
+        'delete_confirm' => 'Ви дійсно хочете видалити вибрані об\'єкти?',
+        'error_renaming_file' => 'Помилка зміни імені файлу.',
+        'new_folder_title' => 'Нова папка',
+        'folder_name' => 'Назва папки',
+        'error_creating_folder' => 'Помилка створення папки',
+        'folder_or_file_exist' => 'Папка або файл з таким ім\'ям вже існує.',
+        'move_empty' => 'Будь ласка, оберіть об\'єкти для переміщення.',
+        'move_popup_title' => 'Переміщення файлів або папок',
+        'move_destination' => 'Папка призначення',
+        'please_select_move_dest' => 'Будь ласка, оберіть папку призначення для переміщення.',
+        'move_dest_src_match' => 'Будь ласка, оберіть іншу папку.',
+        'empty_library' => 'Бібліотека медіафайлів порожня. Для початку завантажте файли або створіть папки.',
+        'insert' => 'Вставити',
+        'crop_and_insert' => 'Обрізати і вставити',
+        'select_single_image' => 'Будь ласка, оберіть одне зображення.',
+        'selection_not_image' => 'Обраний елемент не є зображенням.',
+        'restore' => 'Скасувати всі зміни',
+        'resize' => 'Зміна розміру...',
+        'selection_mode_normal' => 'Нормальний',
+        'selection_mode_fixed_ratio' => 'Фіксоване співвідношення',
+        'selection_mode_fixed_size' => 'Фіксований розмір',
+        'height' => 'Висота',
+        'width' => 'Ширина',
+        'selection_mode' => 'Режим виділення',
+        'resize_image' => 'Зміна розміру зображення',
+        'image_size' => 'Розмір зображення:',
+        'selected_size' => 'Обрано:'
+    ],
 ];
diff --git a/modules/backend/lang/zh-cn/lang.php b/modules/backend/lang/zh-cn/lang.php
index 59b1ccc61..e66828f5f 100644
--- a/modules/backend/lang/zh-cn/lang.php
+++ b/modules/backend/lang/zh-cn/lang.php
@@ -493,5 +493,70 @@ return [
             'windows_1251' => 'Windows-1251 (CP1251)',
             'windows_1252' => 'Windows-1252 (CP1252)'
         ]
+    ],
+    'permissions' => [
+        'manage_media' => '管理媒体'
+    ],
+    'mediafinder' => [
+        'label' => 'Media Finder',
+        'default_prompt' => 'Click the %s button to find a media item'
+    ],
+   'media' => [
+        'menu_label' => '媒体',
+        'upload' => '上传',
+        'move' => '移动',
+        'delete' => '删除',
+        'add_folder' => '增加文件夹',
+        'search' => '搜索',
+        'display' => '显示',
+        'filter_everything' => '所有',
+        'filter_images' => '图片',
+        'filter_video' => '视频',
+        'filter_audio' => '音频',
+        'filter_documents' => '文档',
+        'library' => '库',
+        'size' => '大小',
+        'title' => '标题',
+        'last_modified' => '最近修改',
+        'public_url' => '公开URL',
+        'click_here' => '点击这里',
+        'thumbnail_error' => '生产缩略图错误.',
+        'return_to_parent' => '返回上层文件夹',
+        'return_to_parent_label' => '返回 ..',
+        'nothing_selected' => '没有选中.',
+        'multiple_selected' => '多选.',
+        'uploading_file_num' => '上传 :number 文件...',
+        'uploading_complete' => '上传完毕',
+        'order_by' => '排序',
+        'folder' => '文件夹',
+        'no_files_found' => '没找到你请求的文件.',
+        'delete_empty' => '请选择删除项.',
+        'delete_confirm' => '你是否想要删除选中项?',
+        'error_renaming_file' => '重命名错误.',
+        'new_folder_title' => '新文件',
+        'folder_name' => '文件夹名',
+        'error_creating_folder' => '新建文件夹错误',
+        'folder_or_file_exist' => '文件夹或文件已经存在.',
+        'move_empty' => '请选择移动项.',
+        'move_popup_title' => '移动文件或文件夹',
+        'move_destination' => '目标文件夹',
+        'please_select_move_dest' => '请选择目标文件夹.',
+        'move_dest_src_match' => '请选择另一个目标文件夹.',
+        'empty_library' => '媒体库是空的. 从上传文件或创建文件夹开始.',
+        'insert' => '插入',
+        'crop_and_insert' => '裁剪并插入',
+        'select_single_image' => '请选择一张图片.',
+        'selection_not_image' => '选择的不是一张图片.',
+        'restore' => '取消所有更改',
+        'resize' => '调整大小...',
+        'selection_mode_normal' => '正常',
+        'selection_mode_fixed_ratio' => '固定比例',
+        'selection_mode_fixed_size' => '固定大小',
+        'height' => '高度',
+        'width' => '宽度',
+        'selection_mode' => '选择模式',
+        'resize_image' => '调整图片',
+        'image_size' => '图片大小:',
+        'selected_size' => '选中:'
     ]
 ];
diff --git a/modules/backend/lang/zh-tw/lang.php b/modules/backend/lang/zh-tw/lang.php
index e475b1486..a2ef7075b 100644
--- a/modules/backend/lang/zh-tw/lang.php
+++ b/modules/backend/lang/zh-tw/lang.php
@@ -298,5 +298,70 @@ return [
     ],
     'filter' => [
       'all' => '全部'
+    ],
+    'permissions' => [
+        'manage_media' => 'Upload and manage media contents - images, videos, sounds, documents'
+    ],
+    'mediafinder' => [
+        'label' => 'Media Finder',
+        'default_prompt' => 'Click the %s button to find a media item'
+    ],
+   'media' => [
+        'menu_label' => '媒體',
+        'upload' => '上傳',
+        'move' => '移動',
+        'delete' => '刪除',
+        'add_folder' => '增加檔案夾',
+        'search' => '搜尋',
+        'display' => '顯示',
+        'filter_everything' => '所有',
+        'filter_images' => '圖片',
+        'filter_video' => '視頻',
+        'filter_audio' => '音頻',
+        'filter_documents' => '文檔',
+        'library' => '庫',
+        'size' => '大小',
+        'title' => '標題',
+        'last_modified' => '最近修改',
+        'public_url' => '公開URL',
+        'click_here' => '點選這裡',
+        'thumbnail_error' => '生產縮略圖錯誤.',
+        'return_to_parent' => '返回上層檔案夾',
+        'return_to_parent_label' => '返回 ..',
+        'nothing_selected' => '沒有選中.',
+        'multiple_selected' => '多選.',
+        'uploading_file_num' => '上傳 :number 檔案...',
+        'uploading_complete' => '上傳完畢',
+        'order_by' => '排序',
+        'folder' => '檔案夾',
+        'no_files_found' => '沒找到您請求的檔案.',
+        'delete_empty' => '請選擇刪除項.',
+        'delete_confirm' => '您是否想要刪除選中項?',
+        'error_renaming_file' => '重命名錯誤.',
+        'new_folder_title' => '新檔案',
+        'folder_name' => '檔案夾名',
+        'error_creating_folder' => '新建檔案夾錯誤',
+        'folder_or_file_exist' => '檔案夾或檔案已經存在.',
+        'move_empty' => '請選擇移動項.',
+        'move_popup_title' => '移動檔案或檔案夾',
+        'move_destination' => '目標檔案夾',
+        'please_select_move_dest' => '請選擇目標檔案夾.',
+        'move_dest_src_match' => '請選擇另一個目標檔案夾.',
+        'empty_library' => '媒體庫是空的. 從上傳檔案或建立檔案夾開始.',
+        'insert' => '插入',
+        'crop_and_insert' => '裁剪並插入',
+        'select_single_image' => '請選擇一張圖片.',
+        'selection_not_image' => '選擇的不是一張圖片.',
+        'restore' => '取消所有更改',
+        'resize' => '調整大小...',
+        'selection_mode_normal' => '正常',
+        'selection_mode_fixed_ratio' => '固定比例',
+        'selection_mode_fixed_size' => '固定大小',
+        'height' => '高度',
+        'width' => '寬度',
+        'selection_mode' => '選擇模式',
+        'resize_image' => '調整圖片',
+        'image_size' => '圖片大小:',
+        'selected_size' => '選中:'
     ]
 ];
diff --git a/modules/backend/widgets/MediaManager.php b/modules/backend/widgets/MediaManager.php
new file mode 100644
index 000000000..31a4229a0
--- /dev/null
+++ b/modules/backend/widgets/MediaManager.php
@@ -0,0 +1,1414 @@
+<?php namespace Backend\Widgets;
+
+use Url;
+use Str;
+use Lang;
+use File;
+use Form;
+use Input;
+use Config;
+use Request;
+use Response;
+use Exception;
+use SystemException;
+use ApplicationException;
+use Backend\Classes\WidgetBase;
+use System\Classes\MediaLibrary;
+use System\Classes\MediaLibraryItem;
+use October\Rain\Database\Attach\Resizer;
+use October\Rain\Filesystem\Definitions as FileDefinitions;
+
+/**
+ * Media Manager widget.
+ *
+ * @package october\backend
+ * @author Alexey Bobkov, Samuel Georges
+ */
+class MediaManager extends WidgetBase
+{
+    const FOLDER_ROOT = '/';
+
+    const VIEW_MODE_GRID = 'grid';
+    const VIEW_MODE_LIST = 'list';
+    const VIEW_MODE_TILES = 'tiles';
+
+    const SELECTION_MODE_NORMAL = 'normal';
+    const SELECTION_MODE_FIXED_RATIO = 'fixed-ratio';
+    const SELECTION_MODE_FIXED_SIZE = 'fixed-size';
+
+    const FILTER_EVERYTHING = 'everything';
+
+    protected $brokenImageHash = null;
+
+    /**
+     * @var boolean Determines whether the bottom toolbar is visible.
+     */
+    public $bottomToolbar = false;
+
+    /**
+     * @var boolean Determines whether the Crop & Insert button is visible.
+     */
+    public $cropAndInsertButton = false;
+
+    /**
+     * Constructor.
+     */
+    public function __construct($controller, $alias)
+    {
+        $this->alias = $alias;
+
+        parent::__construct($controller, []);
+
+        $this->checkUploadPostback();
+    }
+
+    /**
+     * Adds widget specific asset files. Use $this->addJs() and $this->addCss()
+     * to register new assets to include on the page.
+     * @return void
+     */
+    protected function loadAssets()
+    {
+        $this->addCss('css/mediamanager.css', 'core');
+        $this->addJs('js/mediamanager-browser-min.js', 'core');
+    }
+
+    /**
+     * Renders the widget.
+     * @return string
+     */
+    public function render()
+    {
+        $this->prepareVars();
+
+        return $this->makePartial('body');
+    }
+
+    //
+    // Event handlers
+    //
+
+    public function onSearch()
+    {
+        $this->setSearchTerm(Input::get('search'));
+
+        $this->prepareVars();
+
+        return [
+            '#'.$this->getId('item-list') => $this->makePartial('item-list'),
+            '#'.$this->getId('folder-path') => $this->makePartial('folder-path')
+        ];
+    }
+
+    public function onGoToFolder()
+    {
+        $path = Input::get('path');
+
+        if (Input::get('clearCache')) {
+            MediaLibrary::instance()->resetCache();
+        }
+
+        if (Input::get('resetSearch')) {
+            $this->setSearchTerm(null);
+        }
+
+        $this->setCurrentFolder($path);
+        $this->prepareVars();
+
+        return [
+            '#'.$this->getId('item-list') => $this->makePartial('item-list'),
+            '#'.$this->getId('folder-path') => $this->makePartial('folder-path')
+        ];
+    }
+
+    public function onGenerateThumbnails()
+    {
+        $batch = Input::get('batch');
+        if (!is_array($batch)) {
+            return;
+        }
+
+        $result = [];
+        foreach ($batch as $thumbnailInfo) {
+            $result[] = $this->generateThumbnail($thumbnailInfo);
+        }
+
+        return [
+            'generatedThumbnails'=>$result
+        ];
+    }
+
+    public function onGetSidebarThumbnail()
+    {
+        $path = Input::get('path');
+        $lastModified = Input::get('lastModified');
+
+        $thumbnailParams = $this->getThumbnailParams();
+        $thumbnailParams['width'] = 300;
+        $thumbnailParams['height'] = 255;
+        $thumbnailParams['mode'] = 'auto';
+
+        $path = MediaLibrary::validatePath($path);
+
+        if (!is_numeric($lastModified)) {
+            throw new ApplicationException('Invalid input data');
+        }
+
+        /*
+         * If the thumbnail file exists, just return the thumbnail markup,
+         * otherwise generate a new thumbnail.
+         */
+        $thumbnailPath = $this->thumbnailExists($thumbnailParams, $path, $lastModified);
+        if ($thumbnailPath) {
+            return [
+                'markup' => $this->makePartial('thumbnail-image', [
+                    'isError' => $this->thumbnailIsError($thumbnailPath),
+                    'imageUrl' => $this->getThumbnailImageUrl($thumbnailPath)
+                ])
+            ];
+        }
+
+        $thumbnailInfo = $thumbnailParams;
+        $thumbnailInfo['path'] = $path;
+        $thumbnailInfo['lastModified'] = $lastModified;
+        $thumbnailInfo['id'] = 'sidebar-thumbnail';
+
+        return $this->generateThumbnail($thumbnailInfo, $thumbnailParams, true);
+    }
+
+    public function onChangeView()
+    {
+        $viewMode = Input::get('view');
+        $path = Input::get('path');
+
+        $this->setViewMode($viewMode);
+        $this->setCurrentFolder($path);
+
+        $this->prepareVars();
+
+        return [
+            '#'.$this->getId('item-list') => $this->makePartial('item-list'),
+            '#'.$this->getId('folder-path') => $this->makePartial('folder-path'),
+            '#'.$this->getId('view-mode-buttons') => $this->makePartial('view-mode-buttons')
+        ];
+    }
+
+    public function onSetFilter()
+    {
+        $filter = Input::get('filter');
+        $path = Input::get('path');
+
+        $this->setFilter($filter);
+        $this->setCurrentFolder($path);
+
+        $this->prepareVars();
+
+        return [
+            '#'.$this->getId('item-list') => $this->makePartial('item-list'),
+            '#'.$this->getId('folder-path') => $this->makePartial('folder-path'),
+            '#'.$this->getId('filters') => $this->makePartial('filters')
+        ];
+    }
+
+    public function onSetSorting()
+    {
+        $sortBy = Input::get('sortBy', $this->getSortBy());
+        $sortDirection = Input::get('sortDirection', $this->getSortDirection());
+        $path = Input::get('path');
+
+        $this->setSortBy($sortBy);
+        $this->setSortDirection($sortDirection);
+        $this->setCurrentFolder($path);
+
+        $this->prepareVars();
+
+        return [
+            '#'.$this->getId('item-list') => $this->makePartial('item-list'),
+            '#'.$this->getId('folder-path') => $this->makePartial('folder-path')
+        ];
+    }
+
+    public function onDeleteItem()
+    {
+        $paths = Input::get('paths');
+
+        if (!is_array($paths)) {
+            throw new ApplicationException('Invalid input data');
+        }
+
+        $library = MediaLibrary::instance();
+
+        $filesToDelete = [];
+        foreach ($paths as $pathInfo) {
+            $path = array_get($pathInfo, 'path');
+            $type = array_get($pathInfo, 'type');
+
+            if (!$path || !$type) {
+                throw new ApplicationException('Invalid input data');
+            }
+
+            if ($type === MediaLibraryItem::TYPE_FILE) {
+                /*
+                 * Add to bulk collection
+                 */
+                $filesToDelete[] = $path;
+            }
+            elseif ($type === MediaLibraryItem::TYPE_FOLDER) {
+                /*
+                 * Delete single folder
+                 */
+                $library->deleteFolder($path);
+
+                /*
+                 * Extensibility
+                 */
+                $this->fireSystemEvent('media.folder.delete', [$path]);
+            }
+        }
+
+        if (count($filesToDelete) > 0) {
+            /*
+             * Delete collection of files
+             */
+            $library->deleteFiles($filesToDelete);
+
+            /*
+             * Extensibility
+             */
+            foreach ($filesToDelete as $path) {
+                $this->fireSystemEvent('media.file.delete', [$path]);
+            }
+        }
+
+        $library->resetCache();
+        $this->prepareVars();
+
+        return [
+            '#'.$this->getId('item-list') => $this->makePartial('item-list')
+        ];
+    }
+
+    public function onLoadRenamePopup()
+    {
+        $path = Input::get('path');
+        $path = MediaLibrary::validatePath($path);
+
+        $this->vars['originalPath'] = $path;
+        $this->vars['name'] = basename($path);
+        $this->vars['listId'] = Input::get('listId');
+        $this->vars['type'] = Input::get('type');
+
+        return $this->makePartial('rename-form');
+    }
+
+    public function onApplyName()
+    {
+        $newName = trim(Input::get('name'));
+        if (!strlen($newName)) {
+            throw new ApplicationException(Lang::get('cms::lang.asset.name_cant_be_empty'));
+        }
+
+        if (!$this->validateFileName($newName)) {
+            throw new ApplicationException(Lang::get('cms::lang.asset.invalid_name'));
+        }
+
+        $originalPath = Input::get('originalPath');
+        $originalPath = MediaLibrary::validatePath($originalPath);
+        $newPath = dirname($originalPath).'/'.$newName;
+        $type = Input::get('type');
+
+        if ($type == MediaLibraryItem::TYPE_FILE) {
+            /*
+             * Validate extension
+             */
+            if (!$this->validateFileType($newName)) {
+                throw new ApplicationException(Lang::get('backend::lang.media.type_blocked'));
+            }
+
+            /*
+             * Move single file
+             */
+            MediaLibrary::instance()->moveFile($originalPath, $newPath);
+
+            /*
+             * Extensibility
+             */
+            $this->fireSystemEvent('media.file.rename', [$originalPath, $newPath]);
+        }
+        else {
+            /*
+             * Move single folder
+             */
+            MediaLibrary::instance()->moveFolder($originalPath, $newPath);
+
+            /*
+             * Extensibility
+             */
+            $this->fireSystemEvent('media.folder.rename', [$originalPath, $newPath]);
+        }
+
+        MediaLibrary::instance()->resetCache();
+    }
+
+    public function onCreateFolder()
+    {
+        $name = trim(Input::get('name'));
+        if (!strlen($name)) {
+            throw new ApplicationException(Lang::get('cms::lang.asset.name_cant_be_empty'));
+        }
+
+        if (!$this->validateFileName($name)) {
+            throw new ApplicationException(Lang::get('cms::lang.asset.invalid_name'));
+        }
+
+        $path = Input::get('path');
+        $path = MediaLibrary::validatePath($path);
+
+        $newFolderPath = $path.'/'.$name;
+
+        $library = MediaLibrary::instance();
+
+        if ($library->folderExists($newFolderPath)) {
+            throw new ApplicationException(Lang::get('backend::lang.media.folder_or_file_exist'));
+        }
+
+        /*
+         * Create the new folder
+         */
+        if (!$library->makeFolder($newFolderPath)) {
+            throw new ApplicationException(Lang::get('backend::lang.media.error_creating_folder'));
+        }
+
+        /*
+         * Extensibility
+         */
+        $this->fireSystemEvent('media.folder.create', [$newFolderPath]);
+
+        $library->resetCache();
+
+        $this->prepareVars();
+
+        return [
+            '#'.$this->getId('item-list') => $this->makePartial('item-list')
+        ];
+    }
+
+    public function onLoadMovePopup()
+    {
+        $exclude = Input::get('exclude', []);
+        if (!is_array($exclude)) {
+            throw new ApplicationException('Invalid input data');
+        }
+
+        $folders = MediaLibrary::instance()->listAllDirectories($exclude);
+
+        $folderList = [];
+        foreach ($folders as $folder) {
+            $path = $folder;
+
+            if ($folder == '/') {
+                $name = Lang::get('backend::lang.media.library');
+            }
+            else {
+                $segments = explode('/', $folder);
+                $name = str_repeat('&nbsp;', (count($segments)-1)*4).basename($folder);
+            }
+
+            $folderList[$path] = $name;
+        }
+
+        $this->vars['folders'] = $folderList;
+        $this->vars['originalPath'] = Input::get('path');
+
+        return $this->makePartial('move-form');
+    }
+
+    public function onMoveItems()
+    {
+        $dest = trim(Input::get('dest'));
+        if (!strlen($dest)) {
+            throw new ApplicationException(Lang::get('backend::lang.media.please_select_move_dest'));
+        }
+
+        $dest = MediaLibrary::validatePath($dest);
+        if ($dest == Input::get('originalPath')) {
+            throw new ApplicationException(Lang::get('backend::lang.media.move_dest_src_match'));
+        }
+
+        $files = Input::get('files', []);
+        if (!is_array($files)) {
+            throw new ApplicationException('Invalid input data');
+        }
+
+        $folders = Input::get('folders', []);
+        if (!is_array($folders)) {
+            throw new ApplicationException('Invalid input data');
+        }
+
+        $library = MediaLibrary::instance();
+
+        foreach ($files as $path) {
+            /*
+             * Move a single file
+             */
+            $library->moveFile($path, $dest.'/'.basename($path));
+
+            /*
+             * Extensibility
+             */
+            $this->fireSystemEvent('media.file.move', [$path, $dest]);
+        }
+
+        foreach ($folders as $path) {
+            /*
+             * Move a single folder
+             */
+            $library->moveFolder($path, $dest.'/'.basename($path));
+
+            /*
+             * Extensibility
+             */
+            $this->fireSystemEvent('media.folder.move', [$path, $dest]);
+        }
+
+        $library->resetCache();
+
+        $this->prepareVars();
+
+        return [
+            '#'.$this->getId('item-list') => $this->makePartial('item-list')
+        ];
+    }
+
+    public function onSetSidebarVisible()
+    {
+        $visible = Input::get('visible');
+
+        $this->setSidebarVisible($visible);
+    }
+
+    public function onLoadPopup()
+    {
+        $this->bottomToolbar = Input::get('bottomToolbar', $this->bottomToolbar);
+
+        $this->cropAndInsertButton = Input::get('cropAndInsertButton', $this->cropAndInsertButton);
+
+        return $this->makePartial('popup-body');
+    }
+
+    public function onLoadImageCropPopup()
+    {
+        $path = Input::get('path');
+        $path = MediaLibrary::validatePath($path);
+        $cropSessionKey = md5(Form::getSessionKey());
+        $selectionParams = $this->getSelectionParams();
+
+        $urlAndSize = $this->getCropEditImageUrlAndSize($path, $cropSessionKey);
+        $width = $urlAndSize['dimensions'][0];
+        $height = $urlAndSize['dimensions'][1] ? $urlAndSize['dimensions'][1] : 1;
+
+        $this->vars['currentSelectionMode'] = $selectionParams['mode'];
+        $this->vars['currentSelectionWidth'] = $selectionParams['width'];
+        $this->vars['currentSelectionHeight'] = $selectionParams['height'];
+        $this->vars['cropSessionKey'] = $cropSessionKey;
+        $this->vars['imageUrl'] = $urlAndSize['url'];
+        $this->vars['dimensions'] = $urlAndSize['dimensions'];
+        $this->vars['originalRatio'] = round($width / $height, 5);
+        $this->vars['path'] = $path;
+
+        return $this->makePartial('image-crop-popup-body');
+    }
+
+    public function onEndCroppingSession()
+    {
+        $cropSessionKey = Input::get('cropSessionKey');
+        if (!preg_match('/^[0-9a-z]+$/', $cropSessionKey)) {
+            throw new ApplicationException('Invalid input data');
+        }
+
+        $this->removeCropEditDir($cropSessionKey);
+    }
+
+    public function onCropImage()
+    {
+        $imageSrcPath = trim(Input::get('img'));
+        $selectionData = Input::get('selection');
+        $cropSessionKey = Input::get('cropSessionKey');
+        $path = Input::get('path');
+        $path = MediaLibrary::validatePath($path);
+
+        if (!strlen($imageSrcPath)) {
+            throw new ApplicationException('Invalid input data');
+        }
+
+        if (!preg_match('/^[0-9a-z]+$/', $cropSessionKey)) {
+            throw new ApplicationException('Invalid input data');
+        }
+
+        if (!is_array($selectionData)) {
+            throw new ApplicationException('Invalid input data');
+        }
+
+        $result = $this->cropImage($imageSrcPath, $selectionData, $cropSessionKey, $path);
+
+        $selectionMode = Input::get('selectionMode');
+        $selectionWidth = Input::get('selectionWidth');
+        $selectionHeight = Input::get('selectionHeight');
+
+        $this->setSelectionParams($selectionMode, $selectionWidth, $selectionHeight);
+
+        return $result;
+    }
+
+    public function onResizeImage()
+    {
+        $cropSessionKey = Input::get('cropSessionKey');
+        if (!preg_match('/^[0-9a-z]+$/', $cropSessionKey)) {
+            throw new ApplicationException('Invalid input data');
+        }
+
+        $width = trim(Input::get('width'));
+        if (!strlen($width) || !ctype_digit($width)) {
+            throw new ApplicationException('Invalid input data');
+        }
+
+        $height = trim(Input::get('height'));
+        if (!strlen($height) || !ctype_digit($height)) {
+            throw new ApplicationException('Invalid input data');
+        }
+
+        $path = Input::get('path');
+        $path = MediaLibrary::validatePath($path);
+
+        $params = array(
+            'width' => $width,
+            'height' => $height
+        );
+
+        return $this->getCropEditImageUrlAndSize($path, $cropSessionKey, $params);
+    }
+
+    //
+    // Methods for th internal use
+    //
+
+    protected function prepareVars()
+    {
+        clearstatcache();
+
+        $folder = $this->getCurrentFolder();
+        $viewMode = $this->getViewMode();
+        $filter = $this->getFilter();
+        $sortBy = $this->getSortBy();
+        $sortDirection = $this->getSortDirection();
+        $searchTerm = $this->getSearchTerm();
+        $searchMode = strlen($searchTerm) > 0;
+
+        if (!$searchMode) {
+            $this->vars['items'] = $this->listFolderItems($folder, $filter, ['by' => $sortBy, 'direction' => $sortDirection]);
+        }
+        else {
+            $this->vars['items'] = $this->findFiles($searchTerm, $filter, ['by' => $sortBy, 'direction' => $sortDirection]);
+        }
+
+        $this->vars['currentFolder'] = $folder;
+        $this->vars['isRootFolder'] = $folder == self::FOLDER_ROOT;
+        $this->vars['pathSegments'] = $this->splitPathToSegments($folder);
+        $this->vars['viewMode'] = $viewMode;
+        $this->vars['thumbnailParams'] = $this->getThumbnailParams($viewMode);
+        $this->vars['currentFilter'] = $filter;
+        $this->vars['sortBy'] = $sortBy;
+        $this->vars['sortDirection'] = $sortDirection;
+        $this->vars['searchMode'] = $searchMode;
+        $this->vars['searchTerm'] = $searchTerm;
+        $this->vars['sidebarVisible'] = $this->getSidebarVisible();
+    }
+
+    protected function listFolderItems($folder, $filter, $sortBy)
+    {
+        $filter = $filter !== self::FILTER_EVERYTHING ? $filter : null;
+
+        return MediaLibrary::instance()->listFolderContents($folder, $sortBy, $filter);
+    }
+
+    protected function findFiles($searchTerm, $filter, $sortBy)
+    {
+        $filter = $filter !== self::FILTER_EVERYTHING ? $filter : null;
+
+        return MediaLibrary::instance()->findFiles($searchTerm, $sortBy, $filter);
+    }
+
+    protected function setCurrentFolder($path)
+    {
+        $path = MediaLibrary::validatePath($path);
+
+        $this->putSession('media_folder', $path);
+    }
+
+    protected function getCurrentFolder()
+    {
+        $folder = $this->getSession('media_folder', self::FOLDER_ROOT);
+
+        return $folder;
+    }
+
+    protected function setFilter($filter)
+    {
+        if (!in_array($filter, [
+            self::FILTER_EVERYTHING,
+            MediaLibraryItem::FILE_TYPE_IMAGE,
+            MediaLibraryItem::FILE_TYPE_AUDIO,
+            MediaLibraryItem::FILE_TYPE_DOCUMENT,
+            MediaLibraryItem::FILE_TYPE_VIDEO
+        ])) {
+            throw new ApplicationException('Invalid input data');
+        }
+
+        $this->putSession('media_filter', $filter);
+    }
+
+    protected function getFilter()
+    {
+        return $this->getSession('media_filter', self::FILTER_EVERYTHING);
+    }
+
+    protected function setSearchTerm($searchTerm)
+    {
+        $this->putSession('media_search', trim($searchTerm));
+    }
+
+    protected function getSearchTerm()
+    {
+        return $this->getSession('media_search', null);
+    }
+
+    protected function setSortBy($sortBy)
+    {
+        if (!in_array($sortBy, [
+            MediaLibrary::SORT_BY_TITLE,
+            MediaLibrary::SORT_BY_SIZE,
+            MediaLibrary::SORT_BY_MODIFIED
+        ])) {
+            throw new ApplicationException('Invalid input data');
+        }
+
+        $this->putSession('media_sort_by', $sortBy);
+    }
+
+    protected function getSortBy()
+    {
+        return $this->getSession('media_sort_by', MediaLibrary::SORT_BY_TITLE);
+    }
+
+    protected function setSortDirection($sortDirection)
+    {
+        if (!in_array($sortDirection, [
+            MediaLibrary::SORT_DIRECTION_ASC,
+            MediaLibrary::SORT_DIRECTION_DESC
+        ])) {
+            throw new ApplicationException('Invalid input data');
+        }
+
+        $this->putSession('media_sort_direction', $sortDirection);
+    }
+
+    protected function getSortDirection()
+    {
+        return $this->getSession('media_sort_direction', MediaLibrary::SORT_DIRECTION_ASC);
+    }
+
+    protected function getSelectionParams()
+    {
+        $result = $this->getSession('media_crop_selection_params');
+
+        if ($result) {
+            if (!isset($result['mode'])) {
+                $result['mode'] = MediaManager::SELECTION_MODE_NORMAL;
+            }
+
+            if (!isset($result['width'])) {
+                $result['width'] = null;
+            }
+
+            if (!isset($result['height'])) {
+                $result['height'] = null;
+            }
+
+            return $result;
+        }
+
+        return [
+            'mode'   => MediaManager::SELECTION_MODE_NORMAL,
+            'width'  => null,
+            'height' => null
+        ];
+    }
+
+    protected function setSelectionParams($selectionMode, $selectionWidth, $selectionHeight)
+    {
+        if (!in_array($selectionMode, [
+            MediaManager::SELECTION_MODE_NORMAL,
+            MediaManager::SELECTION_MODE_FIXED_RATIO,
+            MediaManager::SELECTION_MODE_FIXED_SIZE
+        ])) {
+            throw new ApplicationException('Invalid input data');
+        }
+
+        if (strlen($selectionWidth) && !ctype_digit($selectionWidth)) {
+            throw new ApplicationException('Invalid input data');
+        }
+
+        if (strlen($selectionHeight) && !ctype_digit($selectionHeight)) {
+            throw new ApplicationException('Invalid input data');
+        }
+
+        $this->putSession('media_crop_selection_params', [
+            'mode'   => $selectionMode,
+            'width'  => $selectionWidth,
+            'height' => $selectionHeight
+        ]);
+    }
+
+    protected function setSidebarVisible($visible)
+    {
+        $this->putSession('sidebar_visible', !!$visible);
+    }
+
+    protected function getSidebarVisible()
+    {
+        return $this->getSession('sidebar_visible', true);
+    }
+
+    protected function itemTypeToIconClass($item, $itemType)
+    {
+        if ($item->type == MediaLibraryItem::TYPE_FOLDER) {
+            return 'icon-folder';
+        }
+
+        switch ($itemType) {
+            case MediaLibraryItem::FILE_TYPE_IMAGE: return "icon-picture-o";
+            case MediaLibraryItem::FILE_TYPE_VIDEO: return "icon-video-camera";
+            case MediaLibraryItem::FILE_TYPE_AUDIO: return "icon-volume-up";
+            default: return "icon-file";
+        }
+    }
+
+    protected function splitPathToSegments($path)
+    {
+        $path = MediaLibrary::validatePath($path, true);
+        $path = explode('/', ltrim($path, '/'));
+
+        $result = [];
+        while (count($path) > 0) {
+            $folder = array_pop($path);
+
+            $result[$folder] = implode('/', $path).'/'.$folder;
+            if (substr($result[$folder], 0, 1) != '/') {
+                $result[$folder] = '/'.$result[$folder];
+            }
+        }
+
+        return array_reverse($result, true);
+    }
+
+    protected function setViewMode($viewMode)
+    {
+        if (!in_array($viewMode, [
+            self::VIEW_MODE_GRID,
+            self::VIEW_MODE_LIST,
+            self::VIEW_MODE_TILES
+        ])) {
+            throw new ApplicationException('Invalid input data');
+        }
+
+        $this->putSession('view_mode', $viewMode);
+    }
+
+    protected function getViewMode()
+    {
+        return $this->getSession('view_mode', self::VIEW_MODE_GRID);
+    }
+
+    protected function getThumbnailParams($viewMode = null)
+    {
+        $result = [
+            'mode' => 'crop',
+            'ext' => 'png'
+        ];
+
+        if ($viewMode) {
+            if ($viewMode == self::VIEW_MODE_LIST) {
+                $result['width'] = 75;
+                $result['height'] = 75;
+            }
+            else {
+                $result['width'] = 165;
+                $result['height'] = 165;
+            }
+        }
+
+        return $result;
+    }
+
+    protected function getThumbnailImagePath($thumbnailParams, $itemPath, $lastModified)
+    {
+        $itemSignature = md5($itemPath).$lastModified;
+
+        $thumbFile = 'thumb_' .
+            $itemSignature . '_' .
+            $thumbnailParams['width'] . 'x' .
+            $thumbnailParams['height'] . '_' .
+            $thumbnailParams['mode'] . '.' .
+            $thumbnailParams['ext'];
+
+        $partition = implode('/', array_slice(str_split($itemSignature, 3), 0, 3)) . '/';
+
+        $result = $this->getThumbnailDirectory().$partition.$thumbFile;
+
+        return $result;
+    }
+
+    protected function getThumbnailImageUrl($imagePath)
+    {
+        return Url::to('/storage/temp'.$imagePath);
+    }
+
+    protected function thumbnailExists($thumbnailParams, $itemPath, $lastModified)
+    {
+        $thumbnailPath = $this->getThumbnailImagePath($thumbnailParams, $itemPath, $lastModified);
+
+        $fullPath = temp_path(ltrim($thumbnailPath, '/'));
+
+        if (File::exists($fullPath)) {
+            return $thumbnailPath;
+        }
+
+        return false;
+    }
+
+    protected function thumbnailIsError($thumbnailPath)
+    {
+        $fullPath = temp_path(ltrim($thumbnailPath, '/'));
+
+        return hash_file('crc32', $fullPath) == $this->getBrokenImageHash();
+    }
+
+    protected function getLocalTempFilePath($fileName)
+    {
+        $fileName = md5($fileName.uniqid().microtime());
+
+        $mediaFolder = Config::get('cms.storage.media.folder', 'media');
+
+        $path = temp_path() . MediaLibrary::validatePath($mediaFolder, true);
+
+        if (!File::isDirectory($path)) {
+            File::makeDirectory($path, 0777, true, true);
+        }
+
+        return $path.'/'.$fileName;
+    }
+
+    protected function getThumbnailDirectory()
+    {
+        /*
+         * NOTE: Custom routing for /storage/temp/$thumbnailDirectory must be setup
+         * to return the thumbnail if not using default 'public' directory
+         */
+        return MediaLibrary::validatePath(Config::get('cms.storage.media.thumbFolder', 'public'), true) . '/';
+    }
+
+    protected function getPlaceholderId($item)
+    {
+        return 'placeholder'.md5($item->path.'-'.$item->lastModified.uniqid(microtime()));
+    }
+
+    protected function generateThumbnail($thumbnailInfo, $thumbnailParams = null)
+    {
+        $tempFilePath = null;
+        $fullThumbnailPath = null;
+        $thumbnailPath = null;
+        $markup = null;
+
+        try {
+            /*
+             * Get and validate input data
+             */
+            $path = $thumbnailInfo['path'];
+            $width = $thumbnailInfo['width'];
+            $height = $thumbnailInfo['height'];
+            $lastModified = $thumbnailInfo['lastModified'];
+
+            if (!is_numeric($width) || !is_numeric($height) || !is_numeric($lastModified)) {
+                throw new ApplicationException('Invalid input data');
+            }
+
+            if (!$thumbnailParams) {
+                $thumbnailParams = $this->getThumbnailParams();
+                $thumbnailParams['width'] = $width;
+                $thumbnailParams['height'] = $height;
+            }
+
+            $thumbnailPath = $this->getThumbnailImagePath($thumbnailParams, $path, $lastModified);
+            $fullThumbnailPath = temp_path(ltrim($thumbnailPath, '/'));
+
+            /*
+             * Save the file locally
+             */
+            $library = MediaLibrary::instance();
+            $tempFilePath = $this->getLocalTempFilePath($path);
+
+            if (!@File::put($tempFilePath, $library->get($path))) {
+                throw new SystemException('Error saving remote file to a temporary location');
+            }
+
+            /*
+             * Resize the thumbnail and save to the thumbnails directory
+             */
+            $this->resizeImage($fullThumbnailPath, $thumbnailParams, $tempFilePath);
+
+            /*
+             * Delete the temporary file
+             */
+            File::delete($tempFilePath);
+            $markup = $this->makePartial('thumbnail-image', [
+                'isError' => false,
+                'imageUrl' => $this->getThumbnailImageUrl($thumbnailPath)
+            ]);
+        }
+        catch (Exception $ex) {
+            if ($tempFilePath) {
+                File::delete($tempFilePath);
+            }
+
+            if ($fullThumbnailPath) {
+                $this->copyBrokenImage($fullThumbnailPath);
+            }
+
+            $markup = $this->makePartial('thumbnail-image', ['isError' => true]);
+
+            /*
+             * @todo We need to log all types of exceptions here
+             */
+            traceLog($ex->getMessage());
+        }
+
+        if ($markup && ($id = $thumbnailInfo['id'])) {
+            return [
+                'id' => $id,
+                'markup' => $markup
+            ];
+        }
+    }
+
+    protected function resizeImage($fullThumbnailPath, $thumbnailParams, $tempFilePath)
+    {
+        $thumbnailDir = dirname($fullThumbnailPath);
+        if (!File::isDirectory($thumbnailDir)) {
+            if (File::makeDirectory($thumbnailDir, 0777, true) === false) {
+                throw new SystemException('Error creating thumbnail directory');
+            }
+        }
+
+        $targetDimensions = $this->getTargetDimensions($thumbnailParams['width'], $thumbnailParams['height'], $tempFilePath);
+
+        $targetWidth = $targetDimensions[0];
+        $targetHeight = $targetDimensions[1];
+
+        Resizer::open($tempFilePath)
+            ->resize($targetWidth, $targetHeight, [
+                'mode'   => $thumbnailParams['mode'],
+                'offset' => [0, 0]
+            ])
+            ->save($fullThumbnailPath)
+        ;
+
+        File::chmod($fullThumbnailPath);
+    }
+
+    protected function getBrokenImagePath()
+    {
+        return __DIR__.'/mediamanager/assets/images/broken-thumbnail.gif';
+    }
+
+    protected function getBrokenImageHash()
+    {
+        if ($this->brokenImageHash) {
+            return $this->brokenImageHash;
+        }
+
+        $fullPath = $this->getBrokenImagePath();
+        return $this->brokenImageHash = hash_file('crc32', $fullPath);
+    }
+
+    protected function copyBrokenImage($path)
+    {
+        try {
+            $thumbnailDir = dirname($path);
+            if (!File::isDirectory($thumbnailDir)) {
+                if (File::makeDirectory($thumbnailDir, 0777, true) === false)
+                    return;
+            }
+            File::copy($this->getBrokenImagePath(), $path);
+        }
+        catch (Exception $ex) {
+            traceLog($ex->getMessage());
+        }
+    }
+
+    protected function getTargetDimensions($width, $height, $originalImagePath)
+    {
+        $originalDimensions = [$width, $height];
+
+        try {
+            $dimensions = getimagesize($originalImagePath);
+            if (!$dimensions) {
+                return $originalDimensions;
+            }
+
+            if ($dimensions[0] > $width || $dimensions[1] > $height) {
+                return $originalDimensions;
+            }
+
+            return $dimensions;
+        }
+        catch (Exception $ex) {
+            return $originalDimensions;
+        }
+    }
+
+    protected function checkUploadPostback()
+    {
+        $fileName = null;
+        $quickMode = false;
+
+        if (
+            (!($uniqueId = Request::header('X-OCTOBER-FILEUPLOAD')) || $uniqueId != $this->getId()) &&
+            (!$quickMode = post('X_OCTOBER_MEDIA_MANAGER_QUICK_UPLOAD'))
+        ) {
+            return;
+        }
+
+        try {
+            if (!Input::hasFile('file_data')) {
+                throw new ApplicationException('File missing from request');
+            }
+
+            $uploadedFile = Input::file('file_data');
+
+            $fileName = $uploadedFile->getClientOriginalName();
+
+            /*
+             * Convert uppcare case file extensions to lower case
+             */
+            $extension = strtolower($uploadedFile->getClientOriginalExtension());
+            $fileName = File::name($fileName).'.'.$extension;
+
+            /*
+             * File name contains non-latin characters, attempt to slug the value
+             */
+            if (!$this->validateFileName($fileName)) {
+                $fileNameClean = $this->cleanFileName(File::name($fileName));
+                $fileName = $fileNameClean . '.' . $extension;
+            }
+
+            /*
+             * Check for unsafe file extensions
+             */
+            if (!$this->validateFileType($fileName)) {
+                throw new ApplicationException(Lang::get('backend::lang.media.type_blocked'));
+            }
+
+            /*
+             * See mime type handling in the asset manager
+             */
+            if (!$uploadedFile->isValid()) {
+                throw new ApplicationException($uploadedFile->getErrorMessage());
+            }
+
+            $path = $quickMode ? '/uploaded-files' : Input::get('path');
+            $path = MediaLibrary::validatePath($path);
+            $filePath = $path.'/'.$fileName;
+
+            /*
+             * getRealPath() can be empty for some environments (IIS)
+             */
+            $realPath = empty(trim($uploadedFile->getRealPath()))
+                             ? $uploadedFile->getPath() . DIRECTORY_SEPARATOR . $uploadedFile->getFileName()
+                             : $uploadedFile->getRealPath();
+
+            MediaLibrary::instance()->put(
+                $filePath,
+                File::get($realPath)
+            );
+
+            /*
+             * Extensibility
+             */
+            $this->fireSystemEvent('media.file.upload', [$filePath, $uploadedFile]);
+
+            Response::json([
+                'link' => MediaLibrary::url($filePath),
+                'result' => 'success'
+            ])->send();
+        }
+        catch (Exception $ex) {
+            Response::json($ex->getMessage(), 400)->send();
+        }
+
+        exit;
+    }
+
+    /**
+     * Validate a proposed media item file name.
+     * @param string
+     * @return bool
+     */
+    protected function validateFileName($name)
+    {
+        if (!preg_match('/^[0-9a-z@\.\s_\-]+$/i', $name)) {
+            return false;
+        }
+
+        if (strpos($name, '..') !== false) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check for blocked / unsafe file extensions
+     * @param string
+     * @return bool
+     */
+    protected function validateFileType($name)
+    {
+        $extension = strtolower(File::extension($name));
+
+        $allowedFileTypes = FileDefinitions::get('defaultExtensions');
+
+        if (!in_array($extension, $allowedFileTypes)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Creates a slug form the string. A modified version of Str::slug
+     * with the main difference that it accepts @-signs
+     * @param string
+     * @return string
+     */
+    protected function cleanFileName($name)
+    {
+        $title = Str::ascii($name);
+
+        // Convert all dashes/underscores into separator
+        $flip = $separator = '-';
+        $title = preg_replace('!['.preg_quote($flip).']+!u', $separator, $title);
+
+        // Remove all characters that are not the separator, letters, numbers, whitespace or @.
+        $title = preg_replace('![^'.preg_quote($separator).'\pL\pN\s@]+!u', '', mb_strtolower($title));
+
+        // Replace all separator characters and whitespace by a single separator
+        $title = preg_replace('!['.preg_quote($separator).'\s]+!u', $separator, $title);
+
+        return trim($title, $separator);
+    }
+
+    //
+    // Cropping
+    //
+
+    protected function getCropSessionDirPath($cropSessionKey)
+    {
+        return $this->getThumbnailDirectory().'edit-crop-'.$cropSessionKey;
+    }
+
+    protected function getCropEditImageUrlAndSize($path, $cropSessionKey, $params = null)
+    {
+        $sessionDirectoryPath = $this->getCropSessionDirPath($cropSessionKey);
+        $fullSessionDirectoryPath = temp_path($sessionDirectoryPath);
+        $sessionDirectoryCreated = false;
+
+        if (!File::isDirectory($fullSessionDirectoryPath)) {
+            File::makeDirectory($fullSessionDirectoryPath, 0777, true, true);
+            $sessionDirectoryCreated = true;
+        }
+
+        $tempFilePath = null;
+
+        try {
+            $extension = pathinfo($path, PATHINFO_EXTENSION);
+            $library = MediaLibrary::instance();
+            $originalThumbFileName = 'original.'.$extension;
+
+            /*
+             * If the target dimensions are not provided, save the original image to the
+             * crop session directory and return its URL.
+             */
+            if (!$params) {
+                $tempFilePath = $fullSessionDirectoryPath.'/'.$originalThumbFileName;
+
+                if (!@File::put($tempFilePath, $library->get($path))) {
+                    throw new SystemException('Error saving remote file to a temporary location.');
+                }
+
+                $url = $this->getThumbnailImageUrl($sessionDirectoryPath.'/'.$originalThumbFileName);
+                $dimensions = getimagesize($tempFilePath);
+
+                return [
+                    'url' => $url,
+                    'dimensions' => $dimensions
+                ];
+            }
+            /*
+             * If the target dimensions are provided, resize the original image and
+             * return its URL and dimensions.
+             */
+            else {
+
+                $originalFilePath = $fullSessionDirectoryPath.'/'.$originalThumbFileName;
+                if (!File::isFile($originalFilePath)) {
+                    throw new SystemException('The original image is not found in the cropping session directory.');
+                }
+
+                $resizedThumbFileName = 'resized-'.$params['width'].'-'.$params['height'].'.'.$extension;
+                $tempFilePath = $fullSessionDirectoryPath.'/'.$resizedThumbFileName;
+
+                Resizer::open($originalFilePath)
+                    ->resize($params['width'], $params['height'], [
+                        'mode' => 'exact'
+                    ])
+                    ->save($tempFilePath)
+                ;
+
+                $url = $this->getThumbnailImageUrl($sessionDirectoryPath.'/'.$resizedThumbFileName);
+                $dimensions = getimagesize($tempFilePath);
+
+                return [
+                    'url' => $url,
+                    'dimensions' => $dimensions
+                ];
+            }
+        }
+        catch (Exception $ex) {
+            if ($sessionDirectoryCreated) {
+                @File::deleteDirectory($fullSessionDirectoryPath);
+            }
+
+            if ($tempFilePath) {
+                File::delete($tempFilePath);
+            }
+
+            throw $ex;
+        }
+    }
+
+    protected function removeCropEditDir($cropSessionKey)
+    {
+        $sessionDirectoryPath = $this->getCropSessionDirPath($cropSessionKey);
+        $fullSessionDirectoryPath = temp_path($sessionDirectoryPath);
+
+        if (File::isDirectory($fullSessionDirectoryPath)) {
+            @File::deleteDirectory($fullSessionDirectoryPath);
+        }
+    }
+
+    protected function cropImage($imageSrcPath, $selectionData, $cropSessionKey, $path)
+    {
+        $originalFileName = basename($path);
+
+        $path = rtrim(dirname($path), '/').'/';
+        $fileName = basename($imageSrcPath);
+
+        if (
+            strpos($fileName, '..') !== false ||
+            strpos($fileName, '/') !== false ||
+            strpos($fileName, '\\') !== false
+        ) {
+            throw new SystemException('Invalid image file name.');
+        }
+
+        $selectionParams = ['x', 'y', 'w', 'h'];
+
+        foreach ($selectionParams as $paramName) {
+            if (!array_key_exists($paramName, $selectionData)) {
+                throw new SystemException('Invalid selection data.');
+            }
+
+            if (!is_numeric($selectionData[$paramName])) {
+                throw new SystemException('Invalid selection data.');
+            }
+
+            $selectionData[$paramName] = (int) $selectionData[$paramName];
+        }
+
+        $sessionDirectoryPath = $this->getCropSessionDirPath($cropSessionKey);
+        $fullSessionDirectoryPath = temp_path($sessionDirectoryPath);
+
+        if (!File::isDirectory($fullSessionDirectoryPath)) {
+            throw new SystemException('The image editing session is not found.');
+        }
+
+        /*
+         * Find the image on the disk and resize it
+         */
+        $imagePath = $fullSessionDirectoryPath.'/'.$fileName;
+        if (!File::isFile($imagePath)) {
+            throw new SystemException('The image is not found on the disk.');
+        }
+
+        $extension = pathinfo($originalFileName, PATHINFO_EXTENSION);
+
+        $targetImageName = basename($originalFileName, '.'.$extension).'-'
+            .$selectionData['x'].'-'
+            .$selectionData['y'].'-'
+            .$selectionData['w'].'-'
+            .$selectionData['h'].'-';
+
+        $targetImageName .= time();
+        $targetImageName .= '.'.$extension;
+
+        $targetTmpPath = $fullSessionDirectoryPath.'/'.$targetImageName;
+
+        /*
+         * Crop the image, otherwise copy original to target destination.
+         */
+        if ($selectionData['w'] == 0 || $selectionData['h'] == 0) {
+            File::copy($imagePath, $targetTmpPath);
+        }
+        else {
+            Resizer::open($imagePath)
+                ->crop(
+                    $selectionData['x'],
+                    $selectionData['y'],
+                    $selectionData['w'],
+                    $selectionData['h'],
+                    $selectionData['w'],
+                    $selectionData['h']
+                )
+                ->save($targetTmpPath)
+            ;
+        }
+
+        /*
+         * Upload the cropped file to the Library
+         */
+        $targetFolder = $path.'cropped-images';
+        $targetPath = $targetFolder.'/'.$targetImageName;
+
+        $library = MediaLibrary::instance();
+        $library->put($targetPath, file_get_contents($targetTmpPath));
+
+        return [
+            'publicUrl' => $library->getPathUrl($targetPath),
+            'documentType' => MediaLibraryItem::FILE_TYPE_IMAGE,
+            'itemType' => MediaLibraryItem::TYPE_FILE,
+            'path' => $targetPath,
+            'title' => $targetImageName,
+            'folder' => $targetFolder
+        ];
+   }
+}
diff --git a/modules/cms/widgets/mediamanager/assets/css/mediamanager.css b/modules/backend/widgets/mediamanager/assets/css/mediamanager.css
similarity index 100%
rename from modules/cms/widgets/mediamanager/assets/css/mediamanager.css
rename to modules/backend/widgets/mediamanager/assets/css/mediamanager.css
diff --git a/modules/cms/widgets/mediamanager/assets/images/broken-thumbnail.gif b/modules/backend/widgets/mediamanager/assets/images/broken-thumbnail.gif
similarity index 100%
rename from modules/cms/widgets/mediamanager/assets/images/broken-thumbnail.gif
rename to modules/backend/widgets/mediamanager/assets/images/broken-thumbnail.gif
diff --git a/modules/cms/widgets/mediamanager/assets/images/video-poster.png b/modules/backend/widgets/mediamanager/assets/images/video-poster.png
similarity index 100%
rename from modules/cms/widgets/mediamanager/assets/images/video-poster.png
rename to modules/backend/widgets/mediamanager/assets/images/video-poster.png
diff --git a/modules/cms/widgets/mediamanager/assets/js/mediamanager-browser-min.js b/modules/backend/widgets/mediamanager/assets/js/mediamanager-browser-min.js
similarity index 100%
rename from modules/cms/widgets/mediamanager/assets/js/mediamanager-browser-min.js
rename to modules/backend/widgets/mediamanager/assets/js/mediamanager-browser-min.js
diff --git a/modules/cms/widgets/mediamanager/assets/js/mediamanager-browser.js b/modules/backend/widgets/mediamanager/assets/js/mediamanager-browser.js
similarity index 100%
rename from modules/cms/widgets/mediamanager/assets/js/mediamanager-browser.js
rename to modules/backend/widgets/mediamanager/assets/js/mediamanager-browser.js
diff --git a/modules/cms/widgets/mediamanager/assets/js/mediamanager-global.js b/modules/backend/widgets/mediamanager/assets/js/mediamanager-global.js
similarity index 100%
rename from modules/cms/widgets/mediamanager/assets/js/mediamanager-global.js
rename to modules/backend/widgets/mediamanager/assets/js/mediamanager-global.js
diff --git a/modules/cms/widgets/mediamanager/assets/js/mediamanager.imagecroppopup.js b/modules/backend/widgets/mediamanager/assets/js/mediamanager.imagecroppopup.js
similarity index 100%
rename from modules/cms/widgets/mediamanager/assets/js/mediamanager.imagecroppopup.js
rename to modules/backend/widgets/mediamanager/assets/js/mediamanager.imagecroppopup.js
diff --git a/modules/cms/widgets/mediamanager/assets/js/mediamanager.js b/modules/backend/widgets/mediamanager/assets/js/mediamanager.js
similarity index 100%
rename from modules/cms/widgets/mediamanager/assets/js/mediamanager.js
rename to modules/backend/widgets/mediamanager/assets/js/mediamanager.js
diff --git a/modules/cms/widgets/mediamanager/assets/js/mediamanager.popup.js b/modules/backend/widgets/mediamanager/assets/js/mediamanager.popup.js
similarity index 100%
rename from modules/cms/widgets/mediamanager/assets/js/mediamanager.popup.js
rename to modules/backend/widgets/mediamanager/assets/js/mediamanager.popup.js
diff --git a/modules/cms/widgets/mediamanager/assets/less/mediamanager.less b/modules/backend/widgets/mediamanager/assets/less/mediamanager.less
similarity index 100%
rename from modules/cms/widgets/mediamanager/assets/less/mediamanager.less
rename to modules/backend/widgets/mediamanager/assets/less/mediamanager.less
diff --git a/modules/cms/widgets/mediamanager/partials/_body.htm b/modules/backend/widgets/mediamanager/partials/_body.htm
similarity index 87%
rename from modules/cms/widgets/mediamanager/partials/_body.htm
rename to modules/backend/widgets/mediamanager/partials/_body.htm
index 7e17c4ff0..7c74a0cf9 100644
--- a/modules/cms/widgets/mediamanager/partials/_body.htm
+++ b/modules/backend/widgets/mediamanager/partials/_body.htm
@@ -3,11 +3,11 @@
     class="layout"
     data-alias="<?= $this->alias ?>"
     data-unique-id="<?= $this->getId() ?>"
-    data-delete-empty="<?= e(trans('cms::lang.media.delete_empty')) ?>"
-    data-delete-confirm="<?= e(trans('cms::lang.media.delete_confirm')) ?>"
-    data-move-empty="<?= e(trans('cms::lang.media.move_empty')) ?>"
-    data-select-single-image="<?= e(trans('cms::lang.media.select_single_image')) ?>"
-    data-selection-not-image="<?= e(trans('cms::lang.media.selection_not_image')) ?>"
+    data-delete-empty="<?= e(trans('backend::lang.media.delete_empty')) ?>"
+    data-delete-confirm="<?= e(trans('backend::lang.media.delete_confirm')) ?>"
+    data-move-empty="<?= e(trans('backend::lang.media.move_empty')) ?>"
+    data-select-single-image="<?= e(trans('backend::lang.media.select_single_image')) ?>"
+    data-selection-not-image="<?= e(trans('backend::lang.media.selection_not_image')) ?>"
     data-bottom-toolbar="<?= $this->bottomToolbar ? 'true' : 'false' ?>"
     data-crop-and-insert-button="<?= $this->cropAndInsertButton ? 'true' : 'false' ?>"
     tabindex="0"
diff --git a/modules/cms/widgets/mediamanager/partials/_bottom-toolbar.htm b/modules/backend/widgets/mediamanager/partials/_bottom-toolbar.htm
similarity index 84%
rename from modules/cms/widgets/mediamanager/partials/_bottom-toolbar.htm
rename to modules/backend/widgets/mediamanager/partials/_bottom-toolbar.htm
index 9fb73ee79..8c0ea5ad6 100644
--- a/modules/cms/widgets/mediamanager/partials/_bottom-toolbar.htm
+++ b/modules/backend/widgets/mediamanager/partials/_bottom-toolbar.htm
@@ -6,7 +6,7 @@
                 data-command="popup-command"
                 data-popup-command="insert"
                 class="btn btn-primary">
-                <?= e(trans('cms::lang.media.insert')) ?>
+                <?= e(trans('backend::lang.media.insert')) ?>
             </button>
 
             <button
@@ -14,7 +14,7 @@
                 data-command="popup-command"
                 data-popup-command="crop-and-insert"
                 class="btn btn-primary hide">
-                <?= e(trans('cms::lang.media.crop_and_insert')) ?>
+                <?= e(trans('backend::lang.media.crop_and_insert')) ?>
             </button>
 
             <button
diff --git a/modules/cms/widgets/mediamanager/partials/_crop-tool-image-area.htm b/modules/backend/widgets/mediamanager/partials/_crop-tool-image-area.htm
similarity index 100%
rename from modules/cms/widgets/mediamanager/partials/_crop-tool-image-area.htm
rename to modules/backend/widgets/mediamanager/partials/_crop-tool-image-area.htm
diff --git a/modules/cms/widgets/mediamanager/partials/_crop-toolbar.htm b/modules/backend/widgets/mediamanager/partials/_crop-toolbar.htm
similarity index 52%
rename from modules/cms/widgets/mediamanager/partials/_crop-toolbar.htm
rename to modules/backend/widgets/mediamanager/partials/_crop-toolbar.htm
index e98a8da1c..02749b1a3 100644
--- a/modules/cms/widgets/mediamanager/partials/_crop-toolbar.htm
+++ b/modules/backend/widgets/mediamanager/partials/_crop-toolbar.htm
@@ -1,40 +1,40 @@
 <?php
 
     $selectionModes = [
-        Cms\Widgets\MediaManager::SELECTION_MODE_NORMAL => trans('cms::lang.media.selection_mode_normal'),
-        Cms\Widgets\MediaManager::SELECTION_MODE_FIXED_RATIO => trans('cms::lang.media.selection_mode_fixed_ratio'),
-        Cms\Widgets\MediaManager::SELECTION_MODE_FIXED_SIZE => trans('cms::lang.media.selection_mode_fixed_size')
+        Backend\Widgets\MediaManager::SELECTION_MODE_NORMAL => trans('backend::lang.media.selection_mode_normal'),
+        Backend\Widgets\MediaManager::SELECTION_MODE_FIXED_RATIO => trans('backend::lang.media.selection_mode_fixed_ratio'),
+        Backend\Widgets\MediaManager::SELECTION_MODE_FIXED_SIZE => trans('backend::lang.media.selection_mode_fixed_size')
     ];
 
-    $sizeDisabledAttr = $currentSelectionMode == Cms\Widgets\MediaManager::SELECTION_MODE_NORMAL ? 'disabled="disabled"' : null;
+    $sizeDisabledAttr = $currentSelectionMode == Backend\Widgets\MediaManager::SELECTION_MODE_NORMAL ? 'disabled="disabled"' : null;
 ?>
 
 <div class="control-toolbar toolbar-padded">
     <div class="toolbar-item toolbar-primary">
         <div data-control="toolbar">
-            <label class="standalone"><?= e(trans('cms::lang.media.image_size')) ?> <span data-label="width"><?= $dimensions[0] ?></span> x <span data-label="height"><?= $dimensions[1] ?></span></label>
+            <label class="standalone"><?= e(trans('backend::lang.media.image_size')) ?> <span data-label="width"><?= $dimensions[0] ?></span> x <span data-label="height"><?= $dimensions[1] ?></span></label>
 
             <div class="btn-group offset-right">
                 <button type="button" class="btn btn-primary standalone" data-command="resize"
-                ><?= e(trans('cms::lang.media.resize')) ?></button>
+                ><?= e(trans('backend::lang.media.resize')) ?></button>
 
                 <button type="button" class="btn btn-primary oc-icon-undo empty" data-command="undo-resizing"></button>
             </div>
 
-            <label for="mmcropimagewidth"><?= e(trans('cms::lang.media.selection_mode')) ?></label>
+            <label for="mmcropimagewidth"><?= e(trans('backend::lang.media.selection_mode')) ?></label>
             <select name="selectionMode" class="form-control custom-select w-150" data-control="selection-mode">
                 <?php foreach ($selectionModes as $mode=>$name): ?>
                     <option <?= $mode == $currentSelectionMode ? 'selected="selected"' : null ?> value="<?= $mode ?>"><?= e($name) ?></option>
                 <?php endforeach ?>
             </select>
 
-            <label for="mmcropimagewidth"><?= e(trans('cms::lang.media.width')) ?></label>
+            <label for="mmcropimagewidth"><?= e(trans('backend::lang.media.width')) ?></label>
             <input id="mmcropimagewidth" type="text" class="form-control w-50" data-control="crop-width-input" name="selectionWidth" value="<?= e($currentSelectionWidth) ?>" <?= $sizeDisabledAttr ?>/>
 
-            <label for="mmcropimageheight"><?= e(trans('cms::lang.media.height')) ?></label>
+            <label for="mmcropimageheight"><?= e(trans('backend::lang.media.height')) ?></label>
             <input id="mmcropimageheight" type="text" class="form-control w-50" data-control="crop-height-input" name="selectionHeight" value="<?= e($currentSelectionHeight) ?>" <?= $sizeDisabledAttr ?>/>
 
-            <label class="standalone hide" data-label="selection-size"><?= e(trans('cms::lang.media.selected_size')) ?> <span data-label="selection-width"></span> x <span data-label="selection-height"></span></label>
+            <label class="standalone hide" data-label="selection-size"><?= e(trans('backend::lang.media.selected_size')) ?> <span data-label="selection-width"></span> x <span data-label="selection-height"></span></label>
 
         </div>
     </div>
diff --git a/modules/backend/widgets/mediamanager/partials/_filters.htm b/modules/backend/widgets/mediamanager/partials/_filters.htm
new file mode 100644
index 000000000..ded01d797
--- /dev/null
+++ b/modules/backend/widgets/mediamanager/partials/_filters.htm
@@ -0,0 +1,39 @@
+<h3 class="section"><?= e(trans('backend::lang.media.display')) ?></h3>
+
+<ul class="nav nav-stacked selector-group">
+    <li role="presentation" <?php if ($currentFilter == Backend\Widgets\MediaManager::FILTER_EVERYTHING): ?>class="active"<?php endif ?>>
+        <a href="#" data-command="set-filter" data-filter="<?= Backend\Widgets\MediaManager::FILTER_EVERYTHING ?>">
+            <i class="icon-recycle"></i>
+
+            <?= e(trans('backend::lang.media.filter_everything')) ?>
+        </a>
+    </li>
+    <li role="presentation" <?php if ($currentFilter == System\Classes\MediaLibraryItem::FILE_TYPE_IMAGE): ?>class="active"<?php endif ?>>
+        <a href="#" data-command="set-filter" data-filter="<?= System\Classes\MediaLibraryItem::FILE_TYPE_IMAGE ?>">
+            <i class="icon-picture-o"></i>
+
+            <?= e(trans('backend::lang.media.filter_images')) ?>
+        </a>
+    </li>
+    <li role="presentation" <?php if ($currentFilter == System\Classes\MediaLibraryItem::FILE_TYPE_VIDEO): ?>class="active"<?php endif ?>>
+        <a href="#" data-command="set-filter" data-filter="<?= System\Classes\MediaLibraryItem::FILE_TYPE_VIDEO ?>">
+            <i class="icon-video-camera"></i>
+
+            <?= e(trans('backend::lang.media.filter_video')) ?>
+        </a>
+    </li>
+    <li role="presentation" <?php if ($currentFilter == System\Classes\MediaLibraryItem::FILE_TYPE_AUDIO): ?>class="active"<?php endif ?>>
+        <a href="#" data-command="set-filter" data-filter="<?= System\Classes\MediaLibraryItem::FILE_TYPE_AUDIO ?>">
+            <i class="icon-volume-up"></i>
+
+            <?= e(trans('backend::lang.media.filter_audio')) ?>
+        </a>
+    </li>
+    <li role="presentation" <?php if ($currentFilter == System\Classes\MediaLibraryItem::FILE_TYPE_DOCUMENT): ?>class="active"<?php endif ?>>
+        <a href="#" data-command="set-filter" data-filter="<?= System\Classes\MediaLibraryItem::FILE_TYPE_DOCUMENT ?>">
+            <i class="icon-file"></i>
+
+            <?= e(trans('backend::lang.media.filter_documents')) ?>
+        </a>
+    </li>
+</ul>
\ No newline at end of file
diff --git a/modules/cms/widgets/mediamanager/partials/_folder-path.htm b/modules/backend/widgets/mediamanager/partials/_folder-path.htm
similarity index 84%
rename from modules/cms/widgets/mediamanager/partials/_folder-path.htm
rename to modules/backend/widgets/mediamanager/partials/_folder-path.htm
index ab7641534..b3ea29708 100644
--- a/modules/cms/widgets/mediamanager/partials/_folder-path.htm
+++ b/modules/backend/widgets/mediamanager/partials/_folder-path.htm
@@ -1,5 +1,5 @@
 <ul class="tree-path">
-    <li class="root"><a href="javascript:;" data-type="media-item" data-item-type="folder" data-path="/" data-clear-search="true"><?= e(trans('cms::lang.media.library')) ?></a></li>
+    <li class="root"><a href="javascript:;" data-type="media-item" data-item-type="folder" data-path="/" data-clear-search="true"><?= e(trans('backend::lang.media.library')) ?></a></li>
 
     <?php if (!$searchMode): ?>
         <?php foreach ($pathSegments as $folder => $path): ?>
@@ -8,6 +8,6 @@
             <?php endif ?>
         <?php endforeach?>
     <?php else: ?>
-        <li><a href="javascript:;" data-type="media-item"><?= e(trans('cms::lang.media.search')) ?></a></li>
+        <li><a href="javascript:;" data-type="media-item"><?= e(trans('backend::lang.media.search')) ?></a></li>
     <?php endif ?>
 </ul>
\ No newline at end of file
diff --git a/modules/cms/widgets/mediamanager/partials/_folder-toolbar.htm b/modules/backend/widgets/mediamanager/partials/_folder-toolbar.htm
similarity index 100%
rename from modules/cms/widgets/mediamanager/partials/_folder-toolbar.htm
rename to modules/backend/widgets/mediamanager/partials/_folder-toolbar.htm
diff --git a/modules/cms/widgets/mediamanager/partials/_generic-list.htm b/modules/backend/widgets/mediamanager/partials/_generic-list.htm
similarity index 91%
rename from modules/cms/widgets/mediamanager/partials/_generic-list.htm
rename to modules/backend/widgets/mediamanager/partials/_generic-list.htm
index 9931764b1..8525fb462 100644
--- a/modules/cms/widgets/mediamanager/partials/_generic-list.htm
+++ b/modules/backend/widgets/mediamanager/partials/_generic-list.htm
@@ -10,7 +10,7 @@
                     <div class="icon-wrapper"><i class="icon-folder"></i></div>
                 </div>
                 <div class="info">
-                    <h4 title="<?= e(trans('cms::lang.media.return_to_parent')) ?>"><?= e(trans('cms::lang.media.return_to_parent_label')) ?></h4>
+                    <h4 title="<?= e(trans('backend::lang.media.return_to_parent')) ?>"><?= e(trans('backend::lang.media.return_to_parent_label')) ?></h4>
                 </div>
             </li>
         <?php endif ?>
@@ -54,7 +54,7 @@
 
     <?php if (count($items) == 0 && $searchMode): ?>
         <li class="no-data">
-            <?= e(trans('cms::lang.media.no_files_found')) ?>
+            <?= e(trans('backend::lang.media.no_files_found')) ?>
         </li>
     <?php endif ?>
 </ul>
\ No newline at end of file
diff --git a/modules/cms/widgets/mediamanager/partials/_image-crop-popup-body.htm b/modules/backend/widgets/mediamanager/partials/_image-crop-popup-body.htm
similarity index 94%
rename from modules/cms/widgets/mediamanager/partials/_image-crop-popup-body.htm
rename to modules/backend/widgets/mediamanager/partials/_image-crop-popup-body.htm
index 17a736a90..9771480bd 100644
--- a/modules/cms/widgets/mediamanager/partials/_image-crop-popup-body.htm
+++ b/modules/backend/widgets/mediamanager/partials/_image-crop-popup-body.htm
@@ -13,7 +13,7 @@
                         type="button"
                         data-command="insert"
                         class="btn btn-primary">
-                        <?= e(trans('cms::lang.media.crop_and_insert')) ?>
+                        <?= e(trans('backend::lang.media.crop_and_insert')) ?>
                     </button>
 
                     <button
diff --git a/modules/cms/widgets/mediamanager/partials/_item-icon.htm b/modules/backend/widgets/mediamanager/partials/_item-icon.htm
similarity index 93%
rename from modules/cms/widgets/mediamanager/partials/_item-icon.htm
rename to modules/backend/widgets/mediamanager/partials/_item-icon.htm
index f0881e416..758c62f15 100644
--- a/modules/cms/widgets/mediamanager/partials/_item-icon.htm
+++ b/modules/backend/widgets/mediamanager/partials/_item-icon.htm
@@ -1,7 +1,7 @@
 <div class="icon-container <?= $itemType ?>">
     <div class="icon-wrapper"><i class="<?= $this->itemTypeToIconClass($item, $itemType) ?>"></i></div>
 
-    <?php if ($itemType == Cms\Classes\MediaLibraryItem::FILE_TYPE_IMAGE):
+    <?php if ($itemType == System\Classes\MediaLibraryItem::FILE_TYPE_IMAGE):
         $thumbnailPath = $this->thumbnailExists($thumbnailParams, $item->path, $item->lastModified);
     ?>
         <div>
diff --git a/modules/cms/widgets/mediamanager/partials/_item-list.htm b/modules/backend/widgets/mediamanager/partials/_item-list.htm
similarity index 67%
rename from modules/cms/widgets/mediamanager/partials/_item-list.htm
rename to modules/backend/widgets/mediamanager/partials/_item-list.htm
index 5eb055b7c..f799f4f22 100644
--- a/modules/cms/widgets/mediamanager/partials/_item-list.htm
+++ b/modules/backend/widgets/mediamanager/partials/_item-list.htm
@@ -3,12 +3,12 @@
     <input type="hidden" data-type="search-mode" value="<?= $searchMode ? 'true' : 'false' ?>"/>
     <div class="list-container">
         <?php if (count($items) == 0 && $isRootFolder && !$searchMode): ?>
-            <div class="empty-library"><?= e(trans('cms::lang.media.empty_library')) ?></div>
+            <div class="empty-library"><?= e(trans('backend::lang.media.empty_library')) ?></div>
         <?php endif ?>
 
-        <?php if ($viewMode == Cms\Widgets\MediaManager::VIEW_MODE_GRID): ?>
+        <?php if ($viewMode == Backend\Widgets\MediaManager::VIEW_MODE_GRID): ?>
             <?= $this->makePartial('list-grid') ?>
-        <?php elseif ($viewMode == Cms\Widgets\MediaManager::VIEW_MODE_LIST): ?>
+        <?php elseif ($viewMode == Backend\Widgets\MediaManager::VIEW_MODE_LIST): ?>
             <?= $this->makePartial('list-list') ?>
         <?php else: ?>
             <?= $this->makePartial('list-tiles') ?>
diff --git a/modules/cms/widgets/mediamanager/partials/_item-sidebar-preview.htm b/modules/backend/widgets/mediamanager/partials/_item-sidebar-preview.htm
similarity index 87%
rename from modules/cms/widgets/mediamanager/partials/_item-sidebar-preview.htm
rename to modules/backend/widgets/mediamanager/partials/_item-sidebar-preview.htm
index 1adaeb7a1..d373444fe 100644
--- a/modules/cms/widgets/mediamanager/partials/_item-sidebar-preview.htm
+++ b/modules/backend/widgets/mediamanager/partials/_item-sidebar-preview.htm
@@ -22,7 +22,7 @@
     <div class="sidebar-image-placeholder-container">
         <div class="sidebar-image-placeholder no-border">
             <i class="icon-crop"></i>
-            <p><?= e(trans('cms::lang.media.nothing_selected')) ?></p>
+            <p><?= e(trans('backend::lang.media.nothing_selected')) ?></p>
         </div>
     </div>
 </script>
@@ -31,7 +31,7 @@
     <div class="sidebar-image-placeholder-container">
         <div class="sidebar-image-placeholder no-border">
             <i class="icon-asterisk"></i>
-            <p><?= e(trans('cms::lang.media.multiple_selected')) ?></p>
+            <p><?= e(trans('backend::lang.media.multiple_selected')) ?></p>
         </div>
     </div>
 </script>
@@ -40,7 +40,7 @@
     <div class="sidebar-image-placeholder-container">
         <div class="sidebar-image-placeholder no-border">
             <i class="icon-level-up"></i>
-            <p><?= e(trans('cms::lang.media.return_to_parent')) ?></p>
+            <p><?= e(trans('backend::lang.media.return_to_parent')) ?></p>
         </div>
     </div>
 </script>
\ No newline at end of file
diff --git a/modules/cms/widgets/mediamanager/partials/_left-sidebar.htm b/modules/backend/widgets/mediamanager/partials/_left-sidebar.htm
similarity index 100%
rename from modules/cms/widgets/mediamanager/partials/_left-sidebar.htm
rename to modules/backend/widgets/mediamanager/partials/_left-sidebar.htm
diff --git a/modules/cms/widgets/mediamanager/partials/_list-grid.htm b/modules/backend/widgets/mediamanager/partials/_list-grid.htm
similarity index 97%
rename from modules/cms/widgets/mediamanager/partials/_list-grid.htm
rename to modules/backend/widgets/mediamanager/partials/_list-grid.htm
index 48151fda4..95fffb521 100644
--- a/modules/cms/widgets/mediamanager/partials/_list-grid.htm
+++ b/modules/backend/widgets/mediamanager/partials/_list-grid.htm
@@ -61,6 +61,6 @@
 
 <?php if (count($items) == 0 && $searchMode): ?>
     <p class="no-data">
-        <?= e(trans('cms::lang.media.no_files_found')) ?>
+        <?= e(trans('backend::lang.media.no_files_found')) ?>
     </p>
 <?php endif ?>
diff --git a/modules/cms/widgets/mediamanager/partials/_list-list.htm b/modules/backend/widgets/mediamanager/partials/_list-list.htm
similarity index 100%
rename from modules/cms/widgets/mediamanager/partials/_list-list.htm
rename to modules/backend/widgets/mediamanager/partials/_list-list.htm
diff --git a/modules/cms/widgets/mediamanager/partials/_list-tiles.htm b/modules/backend/widgets/mediamanager/partials/_list-tiles.htm
similarity index 100%
rename from modules/cms/widgets/mediamanager/partials/_list-tiles.htm
rename to modules/backend/widgets/mediamanager/partials/_list-tiles.htm
diff --git a/modules/cms/widgets/mediamanager/partials/_move-form.htm b/modules/backend/widgets/mediamanager/partials/_move-form.htm
similarity index 86%
rename from modules/cms/widgets/mediamanager/partials/_move-form.htm
rename to modules/backend/widgets/mediamanager/partials/_move-form.htm
index b2cc00152..ab4c68ee3 100644
--- a/modules/cms/widgets/mediamanager/partials/_move-form.htm
+++ b/modules/backend/widgets/mediamanager/partials/_move-form.htm
@@ -1,11 +1,11 @@
 <?= Form::open() ?>
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="popup">&times;</button>
-        <h4 class="modal-title"><?= e(trans('cms::lang.media.move_popup_title')) ?></h4>
+        <h4 class="modal-title"><?= e(trans('backend::lang.media.move_popup_title')) ?></h4>
     </div>
     <div class="modal-body">
         <div class="form-group">
-            <label><?= e(trans('cms::lang.media.move_destination')) ?></label>
+            <label><?= e(trans('backend::lang.media.move_destination')) ?></label>
             <select
                 class="form-control custom-select"
                 name="dest"
diff --git a/modules/cms/widgets/mediamanager/partials/_new-folder-form.htm b/modules/backend/widgets/mediamanager/partials/_new-folder-form.htm
similarity index 84%
rename from modules/cms/widgets/mediamanager/partials/_new-folder-form.htm
rename to modules/backend/widgets/mediamanager/partials/_new-folder-form.htm
index c84e7ebeb..9589143af 100644
--- a/modules/cms/widgets/mediamanager/partials/_new-folder-form.htm
+++ b/modules/backend/widgets/mediamanager/partials/_new-folder-form.htm
@@ -2,11 +2,11 @@
     <?= Form::open() ?>
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="popup">&times;</button>
-            <h4 class="modal-title"><?= e(trans('cms::lang.media.new_folder_title')) ?></h4>
+            <h4 class="modal-title"><?= e(trans('backend::lang.media.new_folder_title')) ?></h4>
         </div>
         <div class="modal-body">
             <div class="form-group">
-                <label><?= e(trans('cms::lang.media.folder_name')) ?></label>
+                <label><?= e(trans('backend::lang.media.folder_name')) ?></label>
                 <input
                     type="text"
                     class="form-control"
diff --git a/modules/cms/widgets/mediamanager/partials/_popup-body.htm b/modules/backend/widgets/mediamanager/partials/_popup-body.htm
similarity index 100%
rename from modules/cms/widgets/mediamanager/partials/_popup-body.htm
rename to modules/backend/widgets/mediamanager/partials/_popup-body.htm
diff --git a/modules/cms/widgets/mediamanager/partials/_rename-form.htm b/modules/backend/widgets/mediamanager/partials/_rename-form.htm
similarity index 100%
rename from modules/cms/widgets/mediamanager/partials/_rename-form.htm
rename to modules/backend/widgets/mediamanager/partials/_rename-form.htm
diff --git a/modules/cms/widgets/mediamanager/partials/_resize-image-form.htm b/modules/backend/widgets/mediamanager/partials/_resize-image-form.htm
similarity index 80%
rename from modules/cms/widgets/mediamanager/partials/_resize-image-form.htm
rename to modules/backend/widgets/mediamanager/partials/_resize-image-form.htm
index c076177ba..ca31d9405 100644
--- a/modules/cms/widgets/mediamanager/partials/_resize-image-form.htm
+++ b/modules/backend/widgets/mediamanager/partials/_resize-image-form.htm
@@ -2,15 +2,15 @@
     <?= Form::open() ?>
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="popup">&times;</button>
-            <h4 class="modal-title"><?= e(trans('cms::lang.media.resize_image')) ?></h4>
+            <h4 class="modal-title"><?= e(trans('backend::lang.media.resize_image')) ?></h4>
         </div>
         <div class="modal-body">
             <div class="form-group span-left">
-                <label><?= e(trans('cms::lang.media.width')) ?></label>
+                <label><?= e(trans('backend::lang.media.width')) ?></label>
                 <input type="text" class="form-control" name="width" value="" />
             </div>
             <div class="form-group span-right">
-                <label><?= e(trans('cms::lang.media.height')) ?></label>
+                <label><?= e(trans('backend::lang.media.height')) ?></label>
                 <input type="text" class="form-control" name="height" value="" />
             </div>
         </div>
diff --git a/modules/cms/widgets/mediamanager/partials/_right-sidebar.htm b/modules/backend/widgets/mediamanager/partials/_right-sidebar.htm
similarity index 61%
rename from modules/cms/widgets/mediamanager/partials/_right-sidebar.htm
rename to modules/backend/widgets/mediamanager/partials/_right-sidebar.htm
index abefec1bf..e429f76b2 100644
--- a/modules/cms/widgets/mediamanager/partials/_right-sidebar.htm
+++ b/modules/backend/widgets/mediamanager/partials/_right-sidebar.htm
@@ -1,25 +1,25 @@
 <?= $this->makePartial('item-sidebar-preview') ?>
 
 <div class="panel hide" data-control="sidebar-labels">
-    <label><?= e(trans('cms::lang.media.title')) ?></label>
+    <label><?= e(trans('backend::lang.media.title')) ?></label>
     <p data-label="title"></p>
 
     <table class="name-value-list">
         <tr>
-            <th><?= e(trans('cms::lang.media.size')) ?></th>
+            <th><?= e(trans('backend::lang.media.size')) ?></th>
             <td data-label="size"></td>
         </tr>
         <tr>
-            <th><?= e(trans('cms::lang.media.public_url')) ?></th>
-            <td><a href="#" data-label="public-url" target="_blank"><?= e(trans('cms::lang.media.click_here')) ?></a></td>
+            <th><?= e(trans('backend::lang.media.public_url')) ?></th>
+            <td><a href="#" data-label="public-url" target="_blank"><?= e(trans('backend::lang.media.click_here')) ?></a></td>
         </tr>
         <tr data-control="last-modified">
-            <th><?= e(trans('cms::lang.media.last_modified')) ?></th>
+            <th><?= e(trans('backend::lang.media.last_modified')) ?></th>
             <td data-label="last-modified"></td>
         </tr>
 
         <tr data-control="item-folder" class="hide">
-            <th><?= e(trans('cms::lang.media.folder')) ?></th>
+            <th><?= e(trans('backend::lang.media.folder')) ?></th>
             <td><a href="#" data-type="media-item" data-item-type="folder" data-label="folder" data-clear-search="true"></a></td>
         </tr>
     </table>
diff --git a/modules/cms/widgets/mediamanager/partials/_sorting.htm b/modules/backend/widgets/mediamanager/partials/_sorting.htm
similarity index 65%
rename from modules/cms/widgets/mediamanager/partials/_sorting.htm
rename to modules/backend/widgets/mediamanager/partials/_sorting.htm
index dc75b2d3f..7bc4ec981 100644
--- a/modules/cms/widgets/mediamanager/partials/_sorting.htm
+++ b/modules/backend/widgets/mediamanager/partials/_sorting.htm
@@ -1,18 +1,18 @@
 <?php
     $sortModes = [
-        Cms\Classes\MediaLibrary::SORT_BY_TITLE => trans('cms::lang.media.title'),
-        Cms\Classes\MediaLibrary::SORT_BY_SIZE => trans('cms::lang.media.size'),
-        Cms\Classes\MediaLibrary::SORT_BY_MODIFIED => trans('cms::lang.media.last_modified')
+        Cms\Classes\MediaLibrary::SORT_BY_TITLE => trans('backend::lang.media.title'),
+        Cms\Classes\MediaLibrary::SORT_BY_SIZE => trans('backend::lang.media.size'),
+        Cms\Classes\MediaLibrary::SORT_BY_MODIFIED => trans('backend::lang.media.last_modified')
     ];
 
     $sortDirections = [
-        Cms\Classes\MediaLibrary::SORT_DIRECTION_ASC => trans('cms::lang.media.direction_asc'),
-        Cms\Classes\MediaLibrary::SORT_DIRECTION_DESC => trans('cms::lang.media.direction_desc')
+        Cms\Classes\MediaLibrary::SORT_DIRECTION_ASC => trans('backend::lang.media.direction_asc'),
+        Cms\Classes\MediaLibrary::SORT_DIRECTION_DESC => trans('backend::lang.media.direction_desc')
     ];
 ?>
 
 <div class="sidebar-group">
-    <h3 class="section"><?= e(trans('cms::lang.media.order_by')) ?></h3>
+    <h3 class="section"><?= e(trans('backend::lang.media.order_by')) ?></h3>
 
     <select
         name="sorting"
@@ -29,7 +29,7 @@
 </div>
 
 <div class="sidebar-group">
-    <h3 class="section"><?= e(trans('cms::lang.media.direction')) ?></h3>
+    <h3 class="section"><?= e(trans('backend::lang.media.direction')) ?></h3>
 
     <select
         name="sorting"
diff --git a/modules/backend/widgets/mediamanager/partials/_thumbnail-image.htm b/modules/backend/widgets/mediamanager/partials/_thumbnail-image.htm
new file mode 100644
index 000000000..6e32df95b
--- /dev/null
+++ b/modules/backend/widgets/mediamanager/partials/_thumbnail-image.htm
@@ -0,0 +1,6 @@
+<?php if (!$isError): ?>
+    <img src="<?= $imageUrl ?>"/>
+<?php else: ?>
+    <i class="icon-chain-broken" title="<?= e(trans('backend::lang.media.thumbnail_error')) ?>"></i>
+    <p class="thumbnail-error-message"><?= e(trans('backend::lang.media.thumbnail_error')) ?></p>
+<?php endif ?>
\ No newline at end of file
diff --git a/modules/cms/widgets/mediamanager/partials/_toolbar.htm b/modules/backend/widgets/mediamanager/partials/_toolbar.htm
similarity index 79%
rename from modules/cms/widgets/mediamanager/partials/_toolbar.htm
rename to modules/backend/widgets/mediamanager/partials/_toolbar.htm
index 786215792..35fe5be8c 100644
--- a/modules/cms/widgets/mediamanager/partials/_toolbar.htm
+++ b/modules/backend/widgets/mediamanager/partials/_toolbar.htm
@@ -4,17 +4,17 @@
             <div data-control="toolbar">
                 <div class="btn-group offset-right">
                     <button type="button" class="btn btn-primary oc-icon-upload" data-control="upload"
-                        ><?= e(trans('cms::lang.media.upload')) ?></button>
-                    <button type="button" class="btn btn-primary oc-icon-folder" data-command="create-folder"><?= e(trans('cms::lang.media.add_folder')) ?></button>
+                        ><?= e(trans('backend::lang.media.upload')) ?></button>
+                    <button type="button" class="btn btn-primary oc-icon-folder" data-command="create-folder"><?= e(trans('backend::lang.media.add_folder')) ?></button>
                 </div>
 
                 <button type="button" class="btn btn-default oc-icon-refresh empty offset-right" data-command="refresh"></button>
 
                 <div class="btn-group offset-right">
                     <button type="button" class="btn btn-default oc-icon-reply-all" data-command="move"
-                        ><?= e(trans('cms::lang.media.move')) ?></button>
+                        ><?= e(trans('backend::lang.media.move')) ?></button>
                     <button type="button" class="btn btn-default oc-icon-trash" data-command="delete"
-                        ><?= e(trans('cms::lang.media.delete')) ?></button>
+                        ><?= e(trans('backend::lang.media.delete')) ?></button>
                 </div>
 
                 <div class="btn-group offset-right" id="<?= $this->getId('view-mode-buttons') ?>">
@@ -29,7 +29,7 @@
                     name="search"
                     value="<?= e($searchTerm) ?>"
                     class="form-control icon search growable"
-                    placeholder="<?= e(trans('cms::lang.media.search')) ?>"
+                    placeholder="<?= e(trans('backend::lang.media.search')) ?>"
                     data-control="search"
                     autocomplete="off"
                     data-load-indicator
diff --git a/modules/cms/widgets/mediamanager/partials/_upload-progress.htm b/modules/backend/widgets/mediamanager/partials/_upload-progress.htm
similarity index 71%
rename from modules/cms/widgets/mediamanager/partials/_upload-progress.htm
rename to modules/backend/widgets/mediamanager/partials/_upload-progress.htm
index c315c84c5..1922a9229 100644
--- a/modules/cms/widgets/mediamanager/partials/_upload-progress.htm
+++ b/modules/backend/widgets/mediamanager/partials/_upload-progress.htm
@@ -3,9 +3,9 @@
         <div class="upload-progress">
             <h5 
                 data-label="file-number-and-progress"
-                data-message-template="<?= e(trans('cms::lang.media.uploading_file_num')) ?> &lt;span&gt;:percents&lt;/span&gt;"
-                data-success-template="<?= e(trans('cms::lang.media.uploading_complete')) ?>"
-                data-error-template="<?= e(trans('cms::lang.media.uploading_error')) ?>"
+                data-message-template="<?= e(trans('backend::lang.media.uploading_file_num')) ?> &lt;span&gt;:percents&lt;/span&gt;"
+                data-success-template="<?= e(trans('backend::lang.media.uploading_complete')) ?>"
+                data-error-template="<?= e(trans('backend::lang.media.uploading_error')) ?>"
             ></h5>
 
             <div class="progress-controls">
diff --git a/modules/backend/widgets/mediamanager/partials/_view-mode-buttons.htm b/modules/backend/widgets/mediamanager/partials/_view-mode-buttons.htm
new file mode 100644
index 000000000..2826b33c8
--- /dev/null
+++ b/modules/backend/widgets/mediamanager/partials/_view-mode-buttons.htm
@@ -0,0 +1,18 @@
+<button
+    type="button"
+    class="btn btn-default oc-icon-align-justify empty <?= $viewMode == Backend\Widgets\MediaManager::VIEW_MODE_GRID ? 'on' : '' ?>"
+    data-command="change-view"
+    data-view="<?= Backend\Widgets\MediaManager::VIEW_MODE_GRID ?>">
+</button>
+<button
+    type="button"
+    class="btn btn-default oc-icon-th empty <?= $viewMode == Backend\Widgets\MediaManager::VIEW_MODE_LIST ? 'on' : '' ?>"
+    data-command="change-view"
+    data-view="<?= Backend\Widgets\MediaManager::VIEW_MODE_LIST ?>">
+</button>
+<button
+    type="button"
+    class="btn btn-default oc-icon-th-large empty <?= $viewMode == Backend\Widgets\MediaManager::VIEW_MODE_TILES ? 'on' : '' ?>"
+    data-command="change-view"
+    data-view="<?= Backend\Widgets\MediaManager::VIEW_MODE_TILES ?>">
+</button>
\ No newline at end of file
diff --git a/modules/cms/ServiceProvider.php b/modules/cms/ServiceProvider.php
index f6f508070..59e3337e5 100644
--- a/modules/cms/ServiceProvider.php
+++ b/modules/cms/ServiceProvider.php
@@ -30,7 +30,6 @@ class ServiceProvider extends ModuleServiceProvider
 
         $this->registerComponents();
         $this->registerThemeLogging();
-        $this->registerAssetBundles();
         $this->registerCombinerEvents();
 
         /*
@@ -79,20 +78,6 @@ class ServiceProvider extends ModuleServiceProvider
         });
     }
 
-    /**
-     * Register asset bundles.
-     */
-    protected function registerAssetBundles()
-    {
-        /*
-         * Register asset bundles
-         */
-        CombineAssets::registerCallback(function ($combiner) {
-            $combiner->registerBundle('~/modules/cms/widgets/mediamanager/assets/js/mediamanager-browser.js');
-            $combiner->registerBundle('~/modules/cms/widgets/mediamanager/assets/less/mediamanager.less');
-        });
-    }
-
     /**
      * Registers events for the asset combiner.
      */
@@ -181,14 +166,6 @@ class ServiceProvider extends ModuleServiceProvider
                             'permissions' => ['cms.manage_pages', 'cms.manage_layouts', 'cms.manage_partials']
                         ]
                     ]
-                ],
-                'media' => [
-                    'label'       => 'cms::lang.media.menu_label',
-                    'icon'        => 'icon-folder',
-                    'iconSvg'     => 'modules/cms/assets/images/media-icon.svg',
-                    'url'         => Backend::url('cms/media'),
-                    'permissions' => ['media.*'],
-                    'order'       => 200
                 ]
             ]);
         });
@@ -255,11 +232,6 @@ class ServiceProvider extends ModuleServiceProvider
                     'tab' => 'cms::lang.permissions.name',
                     'order' => 100
                 ],
-                'media.manage_media' => [
-                    'label' => 'cms::lang.permissions.manage_media',
-                    'tab' => 'cms::lang.permissions.name',
-                    'order' => 100
-                ]
             ]);
         });
     }
@@ -271,7 +243,6 @@ class ServiceProvider extends ModuleServiceProvider
     {
         WidgetManager::instance()->registerFormWidgets(function ($manager) {
             $manager->registerFormWidget('Cms\FormWidgets\Components');
-            $manager->registerFormWidget('Cms\FormWidgets\MediaFinder', 'mediafinder');
         });
     }
 
diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index 8d9e9a9d7..b2b7852c6 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -1191,16 +1191,6 @@ class Controller
         return $_url;
     }
 
-    /**
-     * Converts supplied file to a URL relative to the media library.
-     * @param string $file Specifies the media-relative file
-     * @return string
-     */
-    public function mediaUrl($file = null)
-    {
-        return MediaLibrary::url($file);
-    }
-
     /**
      * Returns a routing parameter.
      * @param string $name Routing parameter name.
diff --git a/modules/cms/classes/MediaLibrary.php b/modules/cms/classes/MediaLibrary.php
index ad16fd9d6..e59b228af 100644
--- a/modules/cms/classes/MediaLibrary.php
+++ b/modules/cms/classes/MediaLibrary.php
@@ -1,14 +1,6 @@
 <?php namespace Cms\Classes;
 
-use Str;
-use Lang;
-use Cache;
-use Config;
-use Storage;
-use Request;
-use October\Rain\Filesystem\Definitions as FileDefinitions;
-use ApplicationException;
-use SystemException;
+use System\Classes\MediaLibrary as SystemMediaLibrary;
 
 /**
  * Provides abstraction level for the Media Library operations.
@@ -16,745 +8,16 @@ use SystemException;
  *
  * @package october\cms
  * @author Alexey Bobkov, Samuel Georges
+ * @deprecated Use System\Classes\MediaLibrary. Remove if year >= 2020.
  */
-class MediaLibrary
+class MediaLibrary extends SystemMediaLibrary
 {
-    use \October\Rain\Support\Traits\Singleton;
-
-    const CACHE_KEY = 'cms-media-library-contents';
-    const SORT_BY_TITLE = 'title';
-    const SORT_BY_SIZE = 'size';
-    const SORT_BY_MODIFIED = 'modified';
-    const SORT_DIRECTION_ASC = 'asc';
-    const SORT_DIRECTION_DESC = 'desc';
-
-    /**
-     * @var string Relative or absolute URL of the Library root folder.
-     */
-    protected $storagePath;
-
-    /**
-     * @var string The root Library folder path.
-     */
-    protected $storageFolder;
-
-    /**
-     * @var mixed A reference to the Media Library disk.
-     */
-    protected $storageDisk;
-
-    /**
-     * @var array Contains a list of files and directories to ignore.
-     * The list can be customized with cms.storage.media.ignore configuration option.
-     */
-    protected $ignoreNames;
-
-    /**
-     * @var array Contains a list of regex patterns to ignore in files and directories.
-     * The list can be customized with cms.storage.media.ignorePatterns configuration option.
-     */
-    protected $ignorePatterns;
-
-    /**
-     * @var int Cache for the storage folder name length.
-     */
-    protected $storageFolderNameLength;
-
     /**
      * Initialize this singleton.
      */
     protected function init()
     {
-        $this->storageFolder = self::validatePath(Config::get('cms.storage.media.folder', 'media'), true);
-        $this->storagePath = rtrim(Config::get('cms.storage.media.path', '/storage/app/media'), '/');
-
-        if (!starts_with($this->storagePath, ['//', 'http://', 'https://'])) {
-            $this->storagePath = Request::getBasePath() . $this->storagePath;
-        }
-
-        $this->ignoreNames = Config::get('cms.storage.media.ignore', FileDefinitions::get('ignoreFiles'));
-
-        $this->ignorePatterns = Config::get('cms.storage.media.ignorePatterns', ['^\..*']);
-
-        $this->storageFolderNameLength = strlen($this->storageFolder);
-    }
-
-    /**
-     * Returns a list of folders and files in a Library folder.
-     *
-     * @param string $folder Specifies the folder path relative the the Library root.
-     * @param mixed $sortBy Determines the sorting preference.
-     * Supported values are 'title', 'size', 'lastModified' (see SORT_BY_XXX class constants), FALSE (to disable sorting), or an associative array with a 'by' key and a 'direction' key: ['by' => SORT_BY_XXX, 'direction' => SORT_DIRECTION_XXX].
-     * @param string $filter Determines the document type filtering preference.
-     * Supported values are 'image', 'video', 'audio', 'document' (see FILE_TYPE_XXX constants of MediaLibraryItem class).
-     * @param boolean $ignoreFolders Determines whether folders should be suppressed in the result list.
-     * @return array Returns an array of MediaLibraryItem objects.
-     */
-    public function listFolderContents($folder = '/', $sortBy = 'title', $filter = null, $ignoreFolders = false)
-    {
-        $folder = self::validatePath($folder);
-        $fullFolderPath = $this->getMediaPath($folder);
-
-        /*
-         * Try to load the contents from cache
-         */
-
-        $cached = Cache::get('cms-media-library-contents', false);
-        $cached = $cached ? @unserialize(@base64_decode($cached)) : [];
-
-        if (!is_array($cached)) {
-            $cached = [];
-        }
-
-        if (array_key_exists($fullFolderPath, $cached)) {
-            $folderContents = $cached[$fullFolderPath];
-        }
-        else {
-            $folderContents = $this->scanFolderContents($fullFolderPath);
-
-            $cached[$fullFolderPath] = $folderContents;
-            Cache::put(
-                self::CACHE_KEY,
-                base64_encode(serialize($cached)),
-                Config::get('cms.storage.media.ttl', 10)
-            );
-        }
-
-        /*
-         * Sort the result and combine the file and folder lists
-         */
-
-        if ($sortBy !== false) {
-            $this->sortItemList($folderContents['files'], $sortBy);
-            $this->sortItemList($folderContents['folders'], $sortBy);
-        }
-
-        $this->filterItemList($folderContents['files'], $filter);
-
-        if (!$ignoreFolders) {
-            $folderContents = array_merge($folderContents['folders'], $folderContents['files']);
-        }
-        else {
-            $folderContents = $folderContents['files'];
-        }
-
-        return $folderContents;
-    }
-
-    /**
-     * Finds files in the Library.
-     * @param string $searchTerm Specifies the search term.
-     * @param mixed $sortBy Determines the sorting preference.
-     * Supported values are 'title', 'size', 'lastModified' (see SORT_BY_XXX class constants), FALSE (to disable sorting), or an associative array with a 'by' key and a 'direction' key: ['by' => SORT_BY_XXX, 'direction' => SORT_DIRECTION_XXX].
-     * @param string $filter Determines the document type filtering preference.
-     * Supported values are 'image', 'video', 'audio', 'document' (see FILE_TYPE_XXX constants of MediaLibraryItem class).
-     * @return array Returns an array of MediaLibraryItem objects.
-     */
-    public function findFiles($searchTerm, $sortBy = 'title', $filter = null)
-    {
-        $words = explode(' ', Str::lower($searchTerm));
-        $result = [];
-
-        $findInFolder = function ($folder) use (&$findInFolder, $words, &$result, $sortBy, $filter) {
-            $folderContents = $this->listFolderContents($folder, $sortBy, $filter);
-
-            foreach ($folderContents as $item) {
-                if ($item->type == MediaLibraryItem::TYPE_FOLDER) {
-                    $findInFolder($item->path);
-                }
-                elseif ($this->pathMatchesSearch($item->path, $words)) {
-                    $result[] = $item;
-                }
-            }
-        };
-
-        $findInFolder('/');
-
-        /*
-         * Sort the result
-         */
-
-        if ($sortBy !== false) {
-            $this->sortItemList($result, $sortBy);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Deletes a file from the Library.
-     * @param array $paths A list of file paths relative to the Library root to delete.
-     */
-    public function deleteFiles($paths)
-    {
-        $fullPaths = [];
-        foreach ($paths as $path) {
-            $path = self::validatePath($path);
-            $fullPaths[] = $this->getMediaPath($path);
-        }
-
-        return $this->getStorageDisk()->delete($fullPaths);
-    }
-
-    /**
-     * Deletes a folder from the Library.
-     * @param string $path Specifies the folder path relative to the Library root.
-     */
-    public function deleteFolder($path)
-    {
-        $path = self::validatePath($path);
-        $fullPaths = $this->getMediaPath($path);
-
-        return $this->getStorageDisk()->deleteDirectory($fullPaths);
-    }
-
-    /**
-     * Determines if a file with the specified path exists in the library.
-     * @param string $path Specifies the file path relative the the Library root.
-     * @return boolean Returns TRUE if the file exists.
-     */
-    public function exists($path)
-    {
-        $path = self::validatePath($path);
-        $fullPath = $this->getMediaPath($path);
-
-        return $this->getStorageDisk()->exists($fullPath);
-    }
-
-    /**
-     * Determines if a folder with the specified path exists in the library.
-     * @param string $path Specifies the folder path relative the the Library root.
-     * @return boolean Returns TRUE if the folder exists.
-     */
-    public function folderExists($path)
-    {
-        $folderName = basename($path);
-        $folderPath = dirname($path);
-
-        $path = self::validatePath($folderPath);
-        $fullPath = $this->getMediaPath($path);
-
-        $folders = $this->getStorageDisk()->directories($fullPath);
-        foreach ($folders as $folder) {
-            if (basename($folder) == $folderName) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns a list of all directories in the Library, optionally excluding some of them.
-     * @param array $exclude A list of folders to exclude from the result list.
-     * The folder paths should be specified relative to the Library root.
-     * @return array
-     */
-    public function listAllDirectories($exclude = [])
-    {
-        $fullPath = $this->getMediaPath('/');
-
-        $folders = $this->getStorageDisk()->allDirectories($fullPath);
-
-        $folders = array_unique($folders, SORT_LOCALE_STRING);
-
-        $result = [];
-
-        foreach ($folders as $folder) {
-            $folder = $this->getMediaRelativePath($folder);
-            if (!strlen($folder)) {
-                $folder = '/';
-            }
-
-            if (Str::startsWith($folder, $exclude)) {
-                continue;
-            }
-
-            $result[] = $folder;
-        }
-
-        if (!in_array('/', $result)) {
-            array_unshift($result, '/');
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns a file contents.
-     * @param string $path Specifies the file path relative the the Library root.
-     * @return string Returns the file contents
-     */
-    public function get($path)
-    {
-        $path = self::validatePath($path);
-        $fullPath = $this->getMediaPath($path);
-        return $this->getStorageDisk()->get($fullPath);
-    }
-
-    /**
-     * Puts a file to the library.
-     * @param string $path Specifies the file path relative the the Library root.
-     * @param string $contents Specifies the file contents.
-     * @return boolean
-     */
-    public function put($path, $contents)
-    {
-        $path = self::validatePath($path);
-        $fullPath = $this->getMediaPath($path);
-        return $this->getStorageDisk()->put($fullPath, $contents);
-    }
-
-    /**
-     * Moves a file to another location.
-     * @param string $oldPath Specifies the original path of the file.
-     * @param string $newPath Specifies the new path of the file.
-     * @return boolean
-     */
-    public function moveFile($oldPath, $newPath, $isRename = false)
-    {
-        $oldPath = self::validatePath($oldPath);
-        $fullOldPath = $this->getMediaPath($oldPath);
-
-        $newPath = self::validatePath($newPath);
-        $fullNewPath = $this->getMediaPath($newPath);
-
-        return $this->getStorageDisk()->move($fullOldPath, $fullNewPath);
-    }
-
-    /**
-     * Copies a folder.
-     * @param string $originalPath Specifies the original path of the folder.
-     * @param string $newPath Specifies the new path of the folder.
-     * @return boolean
-     */
-    public function copyFolder($originalPath, $newPath)
-    {
-        $disk = $this->getStorageDisk();
-
-        $copyDirectory = function ($srcPath, $destPath) use (&$copyDirectory, $disk) {
-            $srcPath = self::validatePath($srcPath);
-            $fullSrcPath = $this->getMediaPath($srcPath);
-
-            $destPath = self::validatePath($destPath);
-            $fullDestPath = $this->getMediaPath($destPath);
-
-            if (!$disk->makeDirectory($fullDestPath)) {
-                return false;
-            }
-
-            $folderContents = $this->scanFolderContents($fullSrcPath);
-
-            foreach ($folderContents['folders'] as $dirInfo) {
-                if (!$copyDirectory($dirInfo->path, $destPath.'/'.basename($dirInfo->path))) {
-                    return false;
-                }
-            }
-
-            foreach ($folderContents['files'] as $fileInfo) {
-                $fullFileSrcPath = $this->getMediaPath($fileInfo->path);
-
-                if (!$disk->copy($fullFileSrcPath, $fullDestPath.'/'.basename($fileInfo->path))) {
-                    return false;
-                }
-            }
-
-            return true;
-        };
-
-        return $copyDirectory($originalPath, $newPath);
-    }
-
-    /**
-     * Moves a folder.
-     * @param string $originalPath Specifies the original path of the folder.
-     * @param string $newPath Specifies the new path of the folder.
-     * @return boolean
-     */
-    public function moveFolder($originalPath, $newPath)
-    {
-        if (Str::lower($originalPath) !== Str::lower($newPath)) {
-            // If there is no risk that the directory was renamed
-            // by just changing the letter case in the name -
-            // copy the directory to the destination path and delete
-            // the source directory.
-
-            if (!$this->copyFolder($originalPath, $newPath)) {
-                return false;
-            }
-
-            $this->deleteFolder($originalPath);
-        }
-        else {
-            // If there's a risk that the directory name was updated
-            // by changing the letter case - swap source and destination
-            // using a temporary directory with random name.
-
-            $tempraryDirPath = $this->generateRandomTmpFolderName(dirname($originalPath));
-
-            if (!$this->copyFolder($originalPath, $tempraryDirPath)) {
-                $this->deleteFolder($tempraryDirPath);
-
-                return false;
-            }
-
-            $this->deleteFolder($originalPath);
-
-            return $this->moveFolder($tempraryDirPath, $newPath);
-        }
-
-        return true;
-    }
-
-    /**
-     * Creates a folder.
-     * @param string $path Specifies the folder path.
-     * @return boolean
-     */
-    public function makeFolder($path)
-    {
-        $path = self::validatePath($path);
-        $fullPath = $this->getMediaPath($path);
-
-        return $this->getStorageDisk()->makeDirectory($fullPath);
-    }
-
-    /**
-     * Resets the Library cache.
-     *
-     * The cache stores the library table of contents locally in order to optimize
-     * the performance when working with remote storages. The default cache TTL is
-     * 10 minutes. The cache is deleted automatically when an item is added, changed
-     * or deleted. This method allows to reset the cache forcibly.
-     */
-    public function resetCache()
-    {
-        Cache::forget(self::CACHE_KEY);
-    }
-
-    /**
-     * Checks if file path doesn't contain any substrings that would pose a security threat.
-     * Throws an exception if the path is not valid.
-     * @param string $path Specifies the path.
-     * @param boolean $normalizeOnly Specifies if only the normalization, without validation should be performed.
-     * @return string Returns a normalized path.
-     */
-    public static function validatePath($path, $normalizeOnly = false)
-    {
-        $path = str_replace('\\', '/', $path);
-        $path = '/'.trim($path, '/');
-
-        if ($normalizeOnly) {
-            return $path;
-        }
-
-        $regexDirectorySeparator = preg_quote('/', '#');
-        $regexDot = preg_quote('.', '#');
-        $regex = [
-            // Checks for parent or current directory reference at beginning of path
-            '(^'.$regexDot.'+?'.$regexDirectorySeparator.')',
-
-            // Check for parent or current directory reference in middle of path
-            '('.$regexDirectorySeparator.$regexDot.'+?'.$regexDirectorySeparator.')',
-
-            // Check for parent or current directory reference at end of path
-            '('.$regexDirectorySeparator.$regexDot.'+?$)',
-        ];
-
-        /*
-         * Combine everything to one regex
-         */
-        $regex = '#'.implode('|', $regex).'#';
-        if (preg_match($regex, $path) !== 0 || strpos($path, '//') !== false) {
-            throw new ApplicationException(Lang::get('cms::lang.media.invalid_path', compact('path')));
-        }
-
-        return $path;
-    }
-
-    /**
-     * Helper that makes a URL for a media file.
-     * @param string $file
-     * @return string
-     */
-    public static function url($file)
-    {
-        return static::instance()->getPathUrl($file);
-    }
-
-    /**
-     * Returns a public file URL.
-     * @param string $path Specifies the file path relative the the Library root.
-     * @return string
-     */
-    public function getPathUrl($path)
-    {
-        $path = $this->validatePath($path);
-
-        return $this->storagePath.$path;
-    }
-
-    /**
-     * Returns a file or folder path with the prefixed storage folder.
-     * @param string $path Specifies a path to process.
-     * @return string Returns a processed string.
-     */
-    protected function getMediaPath($path)
-    {
-        return $this->storageFolder.$path;
-    }
-
-    /**
-     * Returns path relative to the Library root folder.
-     * @param string $path Specifies a path relative to the Library disk root.
-     * @return string Returns the updated path.
-     */
-    protected function getMediaRelativePath($path)
-    {
-        $path = self::validatePath($path, true);
-
-        if (substr($path, 0, $this->storageFolderNameLength) == $this->storageFolder) {
-            return substr($path, $this->storageFolderNameLength);
-        }
-
-        throw new SystemException(sprintf('Cannot convert Media Library path "%s" to a path relative to the Library root.', $path));
-    }
-
-    /**
-     * Determines if the path should be visible (not ignored).
-     * @param string $path Specifies a path to check.
-     * @return boolean Returns TRUE if the path is visible.
-     */
-    protected function isVisible($path)
-    {
-        $baseName = basename($path);
-
-        if (in_array($baseName, $this->ignoreNames)) {
-            return false;
-        }
-
-        foreach ($this->ignorePatterns as $pattern) {
-            if (preg_match('/'.$pattern.'/', $baseName)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Initializes a library item from a path and item type.
-     * @param string $path Specifies the item path relative to the storage disk root.
-     * @param string $itemType Specifies the item type.
-     * @return mixed Returns the MediaLibraryItem object or NULL if the item is not visible.
-     */
-    protected function initLibraryItem($path, $itemType)
-    {
-        $relativePath = $this->getMediaRelativePath($path);
-
-        if (!$this->isVisible($relativePath)) {
-            return;
-        }
-
-        /*
-         * S3 doesn't allow getting the last modified timestamp for folders,
-         * so this feature is disabled - folders timestamp is always NULL.
-         */
-        $lastModified = $itemType == MediaLibraryItem::TYPE_FILE
-            ? $this->getStorageDisk()->lastModified($path)
-            : null;
-
-        /*
-         * The folder size (number of items) doesn't respect filters. That
-         * could be confusing for users, but that's safer than displaying
-         * zero items for a folder that contains files not visible with a
-         * currently applied filter. -ab
-         */
-        $size = $itemType == MediaLibraryItem::TYPE_FILE
-            ? $this->getStorageDisk()->size($path)
-            : $this->getFolderItemCount($path);
-
-        $publicUrl = $this->storagePath.$relativePath;
-
-        return new MediaLibraryItem($relativePath, $size, $lastModified, $itemType, $publicUrl);
-    }
-
-    /**
-     * Returns a number of items on a folder.
-     * @param string $path Specifies the folder path relative to the storage disk root.
-     * @return integer Returns the number of items in the folder.
-     */
-    protected function getFolderItemCount($path)
-    {
-        $folderItems = array_merge(
-            $this->getStorageDisk()->files($path),
-            $this->getStorageDisk()->directories($path)
-        );
-
-        $size = 0;
-        foreach ($folderItems as $folderItem) {
-            if ($this->isVisible($folderItem)) {
-                $size++;
-            }
-        }
-
-        return $size;
-    }
-
-    /**
-     * Fetches the contents of a folder from the Library.
-     * @param string $fullFolderPath Specifies the folder path relative the the storage disk root.
-     * @return array Returns an array containing two elements - 'files' and 'folders', each is an array of MediaLibraryItem objects.
-     */
-    protected function scanFolderContents($fullFolderPath)
-    {
-        $result = [
-            'files' => [],
-            'folders' => []
-        ];
-
-        $files = $this->getStorageDisk()->files($fullFolderPath);
-        foreach ($files as $file) {
-            if ($libraryItem = $this->initLibraryItem($file, MediaLibraryItem::TYPE_FILE)) {
-                $result['files'][] = $libraryItem;
-            }
-        }
-
-        $folders = $this->getStorageDisk()->directories($fullFolderPath);
-        foreach ($folders as $folder) {
-            if ($libraryItem = $this->initLibraryItem($folder, MediaLibraryItem::TYPE_FOLDER)) {
-                $result['folders'][] = $libraryItem;
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Sorts the item list by title, size or last modified date.
-     * @param array $itemList Specifies the item list to sort.
-     * @param mixed $sortSettings Determines the sorting preference.
-     * Supported values are 'title', 'size', 'lastModified' (see SORT_BY_XXX class constants) or an associative array with a 'by' key and a 'direction' key: ['by' => SORT_BY_XXX, 'direction' => SORT_DIRECTION_XXX].
-     */
-    protected function sortItemList(&$itemList, $sortSettings)
-    {
-        $files = [];
-        $folders = [];
-
-        // Convert string $sortBy to array
-        if (is_string($sortSettings)) {
-            $sortSettings = [
-                'by' => $sortSettings,
-                'direction' => self::SORT_DIRECTION_ASC,
-            ];
-        }
-
-        usort($itemList, function ($a, $b) use ($sortSettings) {
-            $result = 0;
-
-            switch ($sortSettings['by']) {
-                case self::SORT_BY_TITLE:
-                    $result = strcasecmp($a->path, $b->path);
-                break;
-                case self::SORT_BY_SIZE:
-                    if ($a->size < $b->size) {
-                        $result = -1;
-                    } else {
-                        $result = $a->size > $b->size ? 1 : 0;
-                    }
-                break;
-                case self::SORT_BY_MODIFIED:
-                    if ($a->lastModified < $b->lastModified) {
-                        $result = -1;
-                    } else {
-                        $result = $a->lastModified > $b->lastModified ? 1 : 0;
-                    }
-                break;
-            }
-
-            // Reverse the polarity of the result to direct sorting in a descending order instead
-            if ($sortSettings['direction'] === self::SORT_DIRECTION_DESC) {
-                $result = 0 - $result;
-            }
-
-            return $result;
-        });
-    }
-
-    /**
-     * Filters item list by file type.
-     * @param array $itemList Specifies the item list to sort.
-     * @param string $filter Determines the document type filtering preference.
-     * Supported values are 'image', 'video', 'audio', 'document' (see FILE_TYPE_XXX constants of MediaLibraryItem class).
-     */
-    protected function filterItemList(&$itemList, $filter)
-    {
-        if (!$filter)
-            return;
-
-        $result = [];
-        foreach ($itemList as $item) {
-            if ($item->getFileType() == $filter) {
-                $result[] = $item;
-            }
-        }
-
-        $itemList = $result;
-    }
-
-    /**
-     * Initializes and returns the Media Library disk.
-     * This method should always be used instead of trying to access the
-     * $storageDisk property directly as initializing the disc requires
-     * communicating with the remote storage.
-     * @return mixed Returns the storage disk object.
-     */
-    protected function getStorageDisk()
-    {
-        if ($this->storageDisk) {
-            return $this->storageDisk;
-        }
-
-        return $this->storageDisk = Storage::disk(
-            Config::get('cms.storage.media.disk', 'local')
-        );
-    }
-
-    /**
-     * Determines if file path contains all words form the search term.
-     * @param string $path Specifies a path to examine.
-     * @param array $words A list of words to check against.
-     * @return boolean
-     */
-    protected function pathMatchesSearch($path, $words)
-    {
-        $path = Str::lower($path);
-
-        foreach ($words as $word) {
-            $word = trim($word);
-            if (!strlen($word)) {
-                continue;
-            }
-
-            if (!Str::contains($path, $word)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    protected function generateRandomTmpFolderName($location)
-    {
-        $temporaryDirBaseName = time();
-
-        $tmpPath = $location.'/tmp-'.$temporaryDirBaseName;
-
-        while ($this->folderExists($tmpPath)) {
-            $temporaryDirBaseName++;
-            $tmpPath = $location.'/tmp-'.$temporaryDirBaseName;
-        }
-
-        return $tmpPath;
+        traceLog('Class Cms\Classes\MediaLibrary has been deprecated, use System\Classes\MediaLibrary instead.');
+        parent::init();
     }
 }
diff --git a/modules/cms/classes/MediaLibraryItem.php b/modules/cms/classes/MediaLibraryItem.php
index 8f594c874..a6244693b 100644
--- a/modules/cms/classes/MediaLibraryItem.php
+++ b/modules/cms/classes/MediaLibraryItem.php
@@ -1,155 +1,19 @@
 <?php namespace Cms\Classes;
 
-use File;
-use Config;
-use October\Rain\Filesystem\Definitions as FileDefinitions;
-use Carbon\Carbon;
+use System\Classes\MediaLibraryItem as SystemMediaLibraryItem;
 
 /**
  * Represents a file or folder in the Media Library.
  *
  * @package october\cms
  * @author Alexey Bobkov, Samuel Georges
+ * @deprecated Use System\Classes\MediaLibraryItem. Remove if year >= 2020.
  */
-class MediaLibraryItem
+class MediaLibraryItem extends SystemMediaLibraryItem
 {
-    const TYPE_FILE = 'file';
-    const TYPE_FOLDER = 'folder';
-
-    const FILE_TYPE_IMAGE = 'image';
-    const FILE_TYPE_VIDEO = 'video';
-    const FILE_TYPE_AUDIO = 'audio';
-    const FILE_TYPE_DOCUMENT = 'document';
-
-    /**
-     * @var string Specifies the item path relative to the Library root.
-     */
-    public $path;
-
-    /**
-     * @var integer Specifies the item size.
-     * For files the item size is measured in bytes. For folders it
-     * contains the number of files in the folder.
-     */
-    public $size;
-
-    /**
-     * @var integer Contains the last modification time (Unix timestamp).
-     */
-    public $lastModified;
-
-    /**
-     * @var string Specifies the item type.
-     */
-    public $type;
-
-    /**
-     * @var string Specifies the public URL of the item.
-     */
-    public $publicUrl;
-
-    /**
-     * @var array Contains a default list of image files and directories to ignore.
-     * Override with config: cms.storage.media.imageExtensions
-     */
-    protected static $imageExtensions;
-
-    /**
-     * @var array Contains a default list of video files and directories to ignore.
-     * Override with config: cms.storage.media.videoExtensions
-     */
-    protected static $videoExtensions;
-
-    /**
-     * @var array Contains a default list of audio files and directories to ignore.
-     * Override with config: cms.storage.media.audioExtensions
-     */
-    protected static $audioExtensions;
-
-    /**
-     * @param string $path
-     * @param int $size
-     * @param int $lastModified
-     * @param string $type
-     * @param string $publicUrl
-     */
-    public function __construct($path, $size, $lastModified, $type, $publicUrl)
+    public function __construct()
     {
-        $this->path = $path;
-        $this->size = $size;
-        $this->lastModified = $lastModified;
-        $this->type = $type;
-        $this->publicUrl = $publicUrl;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isFile()
-    {
-        return $this->type == self::TYPE_FILE;
-    }
-
-    /**
-     * Returns the file type by its name.
-     * The known file types are: image, video, audio, document
-     * @return string Returns the file type or NULL if the item is a folder.
-     */
-    public function getFileType()
-    {
-        if (!$this->isFile()) {
-            return null;
-        }
-
-        if (!self::$imageExtensions) {
-            self::$imageExtensions = array_map('strtolower', Config::get('cms.storage.media.imageExtensions', FileDefinitions::get('imageExtensions')));
-            self::$videoExtensions = array_map('strtolower', Config::get('cms.storage.media.videoExtensions', FileDefinitions::get('videoExtensions')));
-            self::$audioExtensions = array_map('strtolower', Config::get('cms.storage.media.audioExtensions', FileDefinitions::get('audioExtensions')));
-        }
-
-        $extension = strtolower(pathinfo($this->path, PATHINFO_EXTENSION));
-        if (!strlen($extension)) {
-            return self::FILE_TYPE_DOCUMENT;
-        }
-
-        if (in_array($extension, self::$imageExtensions)) {
-            return self::FILE_TYPE_IMAGE;
-        }
-
-        if (in_array($extension, self::$videoExtensions)) {
-            return self::FILE_TYPE_VIDEO;
-        }
-
-        if (in_array($extension, self::$audioExtensions)) {
-            return self::FILE_TYPE_AUDIO;
-        }
-
-        return self::FILE_TYPE_DOCUMENT;
-    }
-
-    /**
-     * Returns the item size as string.
-     * For file-type items the size is the number of bytes. For folder-type items
-     * the size is the number of items contained by the item.
-     * @return string Returns the size as string.
-     */
-    public function sizeToString()
-    {
-        return $this->type == self::TYPE_FILE
-            ? File::sizeToString($this->size)
-            : $this->size.' '.trans('cms::lang.media.folder_size_items');
-    }
-
-    /**
-     * Returns the item last modification date as string.
-     * @return string Returns the item's last modification date as string.
-     */
-    public function lastModifiedAsString()
-    {
-        if (!($date = $this->lastModified)) {
-            return null;
-        }
-
-        return Carbon::createFromTimestamp($date)->toFormattedDateString();
+        traceLog('Class Cms\Classes\MediaLibraryItem has been deprecated, use System\Classes\MediaLibraryItem instead.');
+        parent::__construct(...func_get_args());
     }
 }
diff --git a/modules/cms/controllers/Media.php b/modules/cms/controllers/Media.php
index 9d7b6d0b5..cc6dbfa70 100644
--- a/modules/cms/controllers/Media.php
+++ b/modules/cms/controllers/Media.php
@@ -1,38 +1,22 @@
 <?php namespace Cms\Controllers;
 
-use BackendMenu;
-use Backend\Classes\Controller;
-use Cms\Widgets\MediaManager;
+use Backend\Controllers\Media as MediaController;
 
 /**
  * CMS Media Manager
  *
  * @package october\cms
  * @author Alexey Bobkov, Samuel Georges
+ * @deprecated Use Backend\Controllers\Media. Remove if year >= 2020.
  */
-class Media extends Controller
+class Media extends MediaController
 {
-    /**
-     * @var array Permissions required to view this page.
-     */
-    public $requiredPermissions = ['media.*'];
-
     /**
      * Constructor.
      */
     public function __construct()
     {
+        traceLog('Controller Cms\Controllers\Media has been deprecated, use Backend\Controller\Media instead.');
         parent::__construct();
-
-        BackendMenu::setContext('October.Cms', 'media', true);
-        $this->pageTitle = 'cms::lang.media.menu_label';
-
-        $manager = new MediaManager($this, 'manager');
-        $manager->bindToController();
-    }
-
-    public function index()
-    {
-        $this->bodyClass = 'compact-container';
     }
 }
diff --git a/modules/cms/formwidgets/MediaFinder.php b/modules/cms/formwidgets/MediaFinder.php
index 778fb57b6..a9126231b 100644
--- a/modules/cms/formwidgets/MediaFinder.php
+++ b/modules/cms/formwidgets/MediaFinder.php
@@ -1,10 +1,6 @@
 <?php namespace Cms\FormWidgets;
 
-use Lang;
-use ApplicationException;
-use Cms\Classes\MediaLibrary;
-use Backend\Classes\FormField;
-use Backend\Classes\FormWidgetBase;
+use Backend\FormWidgets\MediaFinder as BackendMediaFinder;
 
 /**
  * Media Finder
@@ -17,102 +13,20 @@ use Backend\Classes\FormWidgetBase;
  *
  * @package october\cms
  * @author Alexey Bobkov, Samuel Georges
+ * @deprecated Use Backend\FormWidgets\MediaFinder. Remove if year >= 2020.
  */
-class MediaFinder extends FormWidgetBase
+class MediaFinder extends BackendMediaFinder
 {
-    //
-    // Configurable properties
-    //
-
     /**
-     * @var string Prompt to display if no record is selected.
+     * Constructor.
      */
-    public $prompt = 'cms::lang.mediafinder.default_prompt';
-
-    /**
-     * @var string Display mode for the selection. Values: file, image.
-     */
-    public $mode = 'file';
-
-    /**
-     * @var int Preview image width
-     */
-    public $imageWidth = null;
-
-    /**
-     * @var int Preview image height
-     */
-    public $imageHeight = null;
-
-    //
-    // Object properties
-    //
-
-    /**
-     * @inheritDoc
-     */
-    protected $defaultAlias = 'media';
-
-    /**
-     * @inheritDoc
-     */
-    public function init()
+    public function __construct()
     {
-        $this->fillFromConfig([
-            'mode',
-            'prompt',
-            'imageWidth',
-            'imageHeight'
-        ]);
+        traceLog('FormWidget Cms\FormWidgets\MediaFinder has been deprecated, use Backend\FormWidgets\MediaFinder instead.');
 
-        if ($this->formField->disabled) {
-            $this->previewMode = true;
-        }
-    }
+        $this->assetPath = '/modules/backend/formwidgets/mediafinder/assets';
+        $this->viewPath = base_path('/modules/backend/formwidgets/mediafinder/partials');
 
-    /**
-     * @inheritDoc
-     */
-    public function render()
-    {
-        $this->prepareVars();
-
-        return $this->makePartial('mediafinder');
-    }
-
-    /**
-     * Prepares the list data
-     */
-    public function prepareVars()
-    {
-        $value = $this->getLoadValue();
-        $this->vars['value'] = $value;
-        $this->vars['imageUrl'] = $value ? MediaLibrary::url($value) : '';
-        $this->vars['field'] = $this->formField;
-        $this->vars['prompt'] = str_replace('%s', '<i class="icon-folder"></i>', trans($this->prompt));
-        $this->vars['mode'] = $this->mode;
-        $this->vars['imageWidth'] = $this->imageWidth;
-        $this->vars['imageHeight'] = $this->imageHeight;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getSaveValue($value)
-    {
-        if ($this->formField->disabled || $this->formField->hidden) {
-            return FormField::NO_SAVE_DATA;
-        }
-
-        return $value;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    protected function loadAssets()
-    {
-        $this->addJs('js/mediafinder.js', 'core');
-        $this->addCss('css/mediafinder.css', 'core');
+        parent::__construct(...func_get_args());
     }
 }
diff --git a/modules/cms/lang/be/lang.php b/modules/cms/lang/be/lang.php
index 61b64fe60..a88134d09 100644
--- a/modules/cms/lang/be/lang.php
+++ b/modules/cms/lang/be/lang.php
@@ -251,72 +251,5 @@ return [
         'manage_layouts' => "Стварэнне, змяненне і выдаленне CMS макетаў",
         'manage_partials' => "Стварэнне, змяненне і выдаленне частковых шаблонаў CMS",
         'manage_themes' => "Актывацыя, дэактывацыя і налады тэмаў CMS",
-        'manage_media' => "Загрузка і кіраванне медыя зместам - выявы, відэа, гукі, дакументы"
-    ],
-    'mediafinder' => [
-        'label' => "Медыя каталог",
-        'default_prompt' => "Націсніце %s кнопку, каб адшукаць медыя файлы"
-    ],
-    'media' => [
-        'invalid_path' => "Няправільны шлях да файлу: \":path\"",
-        'menu_label' => "Медыя",
-        'upload' => "Загрузіць",
-        'move' => "Перамясціць",
-        'delete' => "Выдаліць",
-        'add_folder' => "Дадаць каталог",
-        'search' => "Пошук",
-        'display' => "Паказаць",
-        'filter_everything' => "Усё",
-        'filter_images' => "Выявы",
-        'filter_video' => "Відэа",
-        'filter_audio' => "Аўдыё",
-        'filter_documents' => "Дакументы",
-        'library' => "Бібліятэка",
-        'folder_size_items' => "аб'ект(аў)",
-        'size' => "Памер",
-        'title' => "Назва",
-        'last_modified' => "Час апошняй мадыфікацыі",
-        'public_url' => "Публічны URL",
-        'click_here' => "Націсніце сюды",
-        'thumbnail_error' => "Памылка падчас генерацыі мініяцюры",
-        'return_to_parent' => "Вярнуцца да бацькоўскага каталогу",
-        'return_to_parent_label' => "Падняцца ..",
-        'nothing_selected' => "Нічога не выбрана",
-        'multiple_selected' => "Шматлікія аб'екты выбраны",
-        'uploading_file_num' => "Загрузка :number файла(аў)...",
-        'uploading_complete' => "Загрузка скончаная",
-        'uploading_error' => "Не атымалася загрузіць",
-        'type_blocked' => "Гэты тып файлу заблакіраваны з-за небяспекі",
-        'order_by' => "Сартаваць па",
-        'folder' => "Каталог",
-        'no_files_found' => "Не знойдзена файлаў па Вашым запыце",
-        'delete_empty' => "Калі ласка, вызначце файлы для выдалення",
-        'delete_confirm' => "Выдаліць абраныя аб'екты?",
-        'error_renaming_file' => "Памылка падчас пераіменавання аб'екту",
-        'new_folder_title' => "Новы каталог",
-        'folder_name' => "Імя каталогу",
-        'error_creating_folder' => "Памылка падчас стварэння каталогу",
-        'folder_or_file_exist' => "Каталог альбо файл з такім імем ужо існуе",
-        'move_empty' => "Калі ласка, выберыце аб'екты для перамяшчэння",
-        'move_popup_title' => "Перамясціць файлы альбо каталогі",
-        'move_destination' => "Каталог прызначэння",
-        'please_select_move_dest' => "Калі ласка, выберыце каталог прызначэння",
-        'move_dest_src_match' => "Калі ласка, выберыце іншы каталог прызначэння",
-        'empty_library' => "Медыя бібліятэка пустая. Загрузіце файлы альбо стварыце каталогі, каб пачаць",
-        'insert' => "Уставіць",
-        'crop_and_insert' => "Абрэзаць і ўставіць",
-        'select_single_image' => "Калі ласка, выберыце адну выяву",
-        'selection_not_image' => "Абраны аб'ект не з'яўляецца файлам",
-        'restore' => "Адмяніць усе змяненні",
-        'resize' => "Змяніць памер...",
-        'selection_mode_normal' => "Нармальны",
-        'selection_mode_fixed_ratio' => "Фіксіраваныя суадносіны старонак",
-        'selection_mode_fixed_size' => "Фіксіраваны памер",
-        'height' => "Вышыня",
-        'width' => "Шырыня",
-        'selection_mode' => "Рэжым выбару",
-        'resize_image' => "Змяніць памер",
-        'image_size' => "Памер выявы:",
-        'selected_size' => "Выбрана:"
     ]
 ];
diff --git a/modules/cms/lang/bg/lang.php b/modules/cms/lang/bg/lang.php
index b1f2fa3f1..c3909b90a 100644
--- a/modules/cms/lang/bg/lang.php
+++ b/modules/cms/lang/bg/lang.php
@@ -231,70 +231,5 @@ return [
         'manage_layouts' => 'Управление на оформления',
         'manage_partials' => 'Управление на частични страници',
         'manage_themes' => 'Управление на теми',
-        'manage_media' => 'Управление на медия'
-    ],
-    'mediafinder' => [
-        'default_prompt' => 'Кликнете върху %s бутон за да намерите медия'
-    ],
-    'media' => [
-        'invalid_path' => "Невалиден път за файл е посочено: ':path'.",
-        'menu_label' => 'Медия',
-        'upload' => 'Качи',
-        'move' => 'Премести',
-        'delete' => 'Изтрии',
-        'add_folder' => 'Добави папка',
-        'search' => 'Търсене',
-        'display' => 'Показване',
-        'filter_everything' => 'Всичко',
-        'filter_images' => 'Изображения',
-        'filter_video' => 'Видео',
-        'filter_audio' => 'Аудио',
-        'filter_documents' => 'Документи',
-        'library' => 'Библиотека',
-        'folder_size_items' => 'предмет(и)',
-        'size' => 'Размер',
-        'title' => 'Заглавие',
-        'last_modified' => 'Последно модифициран',
-        'public_url' => 'Обществен URL',
-        'click_here' => 'Натисни тук',
-        'thumbnail_error' => 'Грешка при генериране на умалено изображение.',
-        'return_to_parent' => 'Върнете се към основната папка',
-        'return_to_parent_label' => 'Нагоре ..',
-        'nothing_selected' => 'Нищо не е избрано.',
-        'multiple_selected' => 'Множество предмети избрани.',
-        'uploading_file_num' => 'Качване: брой на файл(ове)...',
-        'uploading_complete' => 'Качването завършено',
-        'uploading_error' => 'Качването неуспешно',
-        'order_by' => 'Подредени по',
-        'folder' => 'Папка',
-        'no_files_found' => 'Не са намерени файлове по заявката ви.',
-        'delete_empty' => 'Моля изберете елементи, за които да бъдат изтрити.',
-        'delete_confirm' => 'Наистина ли искате да изтриете избрания елемент(и)?',
-        'error_renaming_file' => 'Грешка при преименуването на елемента.',
-        'new_folder_title' => 'Нова папка',
-        'folder_name' => 'Име на папка',
-        'error_creating_folder' => 'Грешка при създаване на папка',
-        'folder_or_file_exist' => 'Папка или файл с посоченото име вече съществува.',
-        'move_empty' => 'Моля изберете елементи които да бъдат преместени.',
-        'move_popup_title' => 'Преместване на файлове или папки',
-        'move_destination' => 'Дестинационна папка',
-        'please_select_move_dest' => 'Моля изберете папка за дестинация.',
-        'move_dest_src_match' => 'Моля, изберете друга папка за дестинация.',
-        'empty_library' => 'Медийната библиотека е празна. Качете файлове, или създайте папки, за да започнете.',
-        'insert' => 'Вмъквам',
-        'crop_and_insert' => 'Отрежи и вмъкни',
-        'select_single_image' => 'Моля, изберете едно изображение.',
-        'selection_not_image' => 'Избраният елемент не е изображение.',
-        'restore' => 'Отмяна на всички промени',
-        'resize' => 'Преоразмеряване...',
-        'selection_mode_normal' => 'Normal',
-        'selection_mode_fixed_ratio' => 'Фиксиран  съотношение',
-        'selection_mode_fixed_size' => 'Фиксиран  размер',
-        'height' => 'Височина',
-        'width' => 'Широчина',
-        'selection_mode' => 'Режимът на избиране (селекция)',
-        'resize_image' => 'Преоразмеряване изображение',
-        'image_size' => 'Размер на изображение:',
-        'selected_size' => 'Избран:'
     ]
 ];
diff --git a/modules/cms/lang/cs/lang.php b/modules/cms/lang/cs/lang.php
index 4e3998933..0699e58b0 100644
--- a/modules/cms/lang/cs/lang.php
+++ b/modules/cms/lang/cs/lang.php
@@ -262,73 +262,6 @@ return [
         'manage_partials' => 'Správa dílčích šablon',
         'manage_themes' => 'Správa témat',
         'manage_theme_options' => 'Nastavit možnosti přizpůsobení pro aktivní téma',
-        'manage_media' => 'Správa médií'
-    ],
-    'mediafinder' => [
-        'label' => 'Vyhledávač médií',
-        'default_prompt' => 'Klikněte na tlačítko %s pro hledání souboru'
-    ],
-    'media' => [
-        'invalid_path' => "Chybně zadaná cesta: ':path'.",
-        'menu_label' => 'Média',
-        'upload' => 'Nahrát',
-        'move' => 'Přesunout',
-        'delete' => 'Smazat',
-        'add_folder' => 'Přidat složku',
-        'search' => 'Vyhledat',
-        'display' => 'Zobrazit',
-        'filter_everything' => 'Vše',
-        'filter_images' => 'Obrázky',
-        'filter_video' => 'Video',
-        'filter_audio' => 'Audio',
-        'filter_documents' => 'Dokumenty',
-        'library' => 'Knihovna',
-        'folder_size_items' => 'soubor(ů)',
-        'size' => 'Velikost',
-        'title' => 'Název',
-        'last_modified' => 'Naposledy upraveno',
-        'public_url' => 'Veřejná URL',
-        'click_here' => 'Klikněte zde',
-        'thumbnail_error' => 'Chyba generování náhledu.',
-        'return_to_parent' => 'Zpět do nadřazené složky',
-        'return_to_parent_label' => 'Nahoru ..',
-        'nothing_selected' => 'Nic nevybráno.',
-        'multiple_selected' => 'Vybráno více položek.',
-        'uploading_file_num' => 'Nahrávám :number soubor(y)...',
-        'uploading_complete' => 'Nahrávání kompletní',
-        'uploading_error' => 'Nahrávání se nezdařilo',
-        'type_blocked' => 'Kvůli bezpečnosti je tento typ souborů zablokován.',
-        'order_by' => 'Seřadit dle',
-        'folder' => 'Složka',
-        'no_files_found' => 'Pro tento požadavek nebyly nalezeny žádné soubory.',
-        'delete_empty' => 'Vyberte položky ke smazání.',
-        'delete_confirm' => 'Opravu chcete smazat vybrané položky?',
-        'error_renaming_file' => 'Přejmenování se nezdařilo.',
-        'new_folder_title' => 'Nová složka',
-        'folder_name' => 'Název složky',
-        'error_creating_folder' => 'Chyba vytváření složky',
-        'folder_or_file_exist' => 'Adresář nebo soubor se zadaným názvem již existuje.',
-        'move_empty' => 'Vyberte položky k přesunutí.',
-        'move_popup_title' => 'Přesun souborů nebo složek',
-        'move_destination' => 'Cílová složka',
-        'please_select_move_dest' => 'Prosím vyberte cílovou složku.',
-        'move_dest_src_match' => 'Prosím vyberte jinou cílovou složku.',
-        'empty_library' => 'Knihovna médií je prázdná. Nahrajte prosím soubory, nebo vytvořte složky.',
-        'insert' => 'Vložit',
-        'crop_and_insert' => 'Oříznout & vložit',
-        'select_single_image' => 'Prosím vyberte pouze jeden obrázek.',
-        'selection_not_image' => 'Vybraná položka není obrázek.',
-        'restore' => 'Zpět všechny změny',
-        'resize' => 'Změnit velikost...',
-        'selection_mode_normal' => 'Normální',
-        'selection_mode_fixed_ratio' => 'Pevný poměr stran',
-        'selection_mode_fixed_size' => 'Pevná velikost',
-        'height' => 'Výška',
-        'width' => 'Šířka',
-        'selection_mode' => 'Způsob označování (selection mode)',
-        'resize_image' => 'Změnit velikost obrázku',
-        'image_size' => 'Velikost obrázku:',
-        'selected_size' => 'Vybráno:'
     ],
     'theme_log' => [
         'hint' => 'Tento protokol zobrazuje změny v tématu provedené administrátory v administraci.',
diff --git a/modules/cms/lang/da/lang.php b/modules/cms/lang/da/lang.php
index 34cf1ea31..036aac0cd 100644
--- a/modules/cms/lang/da/lang.php
+++ b/modules/cms/lang/da/lang.php
@@ -245,71 +245,5 @@ return [
         'manage_layouts' => 'Opret, rediger og slet CMS layouts',
         'manage_partials' => 'Opret, rediger og slet CMS partials',
         'manage_themes' => 'aktiver, deaktiver og konfigurer CMS temaer',
-        'manage_media' => 'Upload og administrer media indhold - billeder, video, lyd, dokumenter'
     ],
-    'mediafinder' => [
-        'default_prompt' => 'Tryk på %s knappen for at finde et mediaobjekt'
-    ],
-    'media' => [
-        'invalid_path' => "Ugyldig sti: ':path'.",
-        'menu_label' => 'Media',
-        'upload' => 'Upload',
-        'move' => 'Flyt',
-        'delete' => 'Slet',
-        'add_folder' => 'Tilføj mappe',
-        'search' => 'Søg',
-        'display' => 'Vis',
-        'filter_everything' => 'Alt',
-        'filter_images' => 'Billeder',
-        'filter_video' => 'Video',
-        'filter_audio' => 'Lyd',
-        'filter_documents' => 'Dokumenter',
-        'library' => 'Bibliotek',
-        'folder_size_items' => 'ting',
-        'size' => 'Størrelse',
-        'title' => 'Titel',
-        'last_modified' => 'Sidst redigeret',
-        'public_url' => 'Offentlig URL',
-        'click_here' => 'Tryk her',
-        'thumbnail_error' => 'Fejl ved generering af thumbnail.',
-        'return_to_parent' => 'Gå en mappe tilbage',
-        'return_to_parent_label' => 'Gå op ..',
-        'nothing_selected' => 'Intet er valgt.',
-        'multiple_selected' => 'Flere ting valgt.',
-        'uploading_file_num' => 'Uploader :number fil(er)...',
-        'uploading_complete' => 'Upload færdig',
-        'uploading_error' => 'Upload fejlede',
-        'type_blocked' => 'Filtypen er blokeret af sikkerhedshensyn.',
-        'order_by' => 'Sorter efter',
-        'folder' => 'Mappe',
-        'no_files_found' => 'Ingen filer fundet fra din forespørgsel.',
-        'delete_empty' => 'Vælg venligst filer at slette.',
-        'delete_confirm' => 'Slet de valgte ting?',
-        'error_renaming_file' => 'Fejl ved omdøbning.',
-        'new_folder_title' => 'Ny mappe',
-        'folder_name' => 'Mappenavn',
-        'error_creating_folder' => 'Fejl ved opretning af mappe',
-        'folder_or_file_exist' => 'En mappe eller fil med det angivede navn, findes allerede.',
-        'move_empty' => 'Vælg venligst nogle ting du vil flytte.',
-        'move_popup_title' => 'Flyt filer eller mapper',
-        'move_destination' => 'Destinationmappe',
-        'please_select_move_dest' => 'Vælg venligst en destinationsmappe.',
-        'move_dest_src_match' => 'Vælg venligst en anden destinationsmappe.',
-        'empty_library' => 'Media biblioteket er tomt. Upload filer eller mapper for at starte.',
-        'insert' => 'Indsæt',
-        'crop_and_insert' => 'Beskær & Indsæt',
-        'select_single_image' => 'Vælg venligst et enkelt billede.',
-        'selection_not_image' => 'Det valgte objekt er ikke et billede.',
-        'restore' => 'Fortryd alle ændringer',
-        'resize' => 'Skaler...',
-        'selection_mode_normal' => 'Normal',
-        'selection_mode_fixed_ratio' => 'Fast størrelsesforhold',
-        'selection_mode_fixed_size' => 'Fast størrelse',
-        'height' => 'Højde',
-        'width' => 'Bredde',
-        'selection_mode' => 'Udvælgelsesmetode',
-        'resize_image' => 'Skaler billede',
-        'image_size' => 'Billedstørrelse:',
-        'selected_size' => 'Valgt:'
-    ]
 ];
diff --git a/modules/cms/lang/de/lang.php b/modules/cms/lang/de/lang.php
index 4878afb7e..3c52cfd83 100644
--- a/modules/cms/lang/de/lang.php
+++ b/modules/cms/lang/de/lang.php
@@ -223,69 +223,5 @@ return [
         'manage_layouts' => 'Layouts verwalten',
         'manage_partials' => 'Partials verwalten',
         'manage_themes' => 'Themes verwalten',
-        'manage_media' => 'Medien verwalten',
     ],
-    'mediafinder' => [
-        'default_prompt' => 'Klicke auf %s um eine Mediendatei auszuwählen'
-    ],
-    'media' => [
-        'invalid_path' => "Ungültiger Dateipfad: ':path'.",
-        'menu_label' => 'Medien',
-        'upload' => 'Hochladen',
-        'move' => 'Verschieben',
-        'delete' => 'Löschen',
-        'add_folder' => 'Ordner erstellen',
-        'search' => 'Suchen',
-        'display' => 'Anzeigen',
-        'filter_everything' => 'Alles',
-        'filter_images' => 'Bilder',
-        'filter_video' => 'Video',
-        'filter_audio' => 'Audio',
-        'filter_documents' => 'Dokumente',
-        'library' => 'Sammlung',
-        'folder_size_items' => 'Datei(en)',
-        'size' => 'Größe',
-        'title' => 'Titel',
-        'last_modified' => 'Zuletzt bearbeitet',
-        'public_url' => 'Öffentliche URL',
-        'click_here' => 'Hier drücken',
-        'thumbnail_error' => 'Fehler beim Erstellen des Thumbnails.',
-        'return_to_parent' => 'Zu oberem Ordner zurückkehren',
-        'return_to_parent_label' => 'Stufe hoch ..',
-        'nothing_selected' => 'Nichts ausgewählt.',
-        'multiple_selected' => 'Mehrere Dateien ausgewählt.',
-        'uploading_file_num' => 'Lade :number Datei(en)...',
-        'uploading_complete' => 'Upload vollständig',
-        'order_by' => 'Sortieren nach',
-        'folder' => 'Ordner',
-        'no_files_found' => 'Keine entsprechenden Dateien gefunden.',
-        'delete_empty' => 'Bitte Wählen Sie Dateien zum Löschen aus.',
-        'delete_confirm' => 'Wollen Sie wirklich die gewählte(n) Datei(en) löschen?',
-        'error_renaming_file' => 'Fehler beim Umbenennen.',
-        'new_folder_title' => 'Neuer Ordner',
-        'folder_name' => 'Ordnername',
-        'error_creating_folder' => 'Fehler beim Erstellen des Ordners',
-        'folder_or_file_exist' => 'Ein Ordner oder eine Datei mit dem gewählten Namen existiert bereits.',
-        'move_empty' => 'Bitte wählen Sie Dateien zum Verschieben aus',
-        'move_popup_title' => 'Verschiebe Dateien oder Ordner',
-        'move_destination' => 'Zielordner',
-        'please_select_move_dest' => 'Bitte wählen Sie einen Zielordner.',
-        'move_dest_src_match' => 'Bitte wählen Sie einen anderen Zielordner.',
-        'empty_library' => 'Diese Medienbibliothek ist leer. Laden Sie Dateien hoch oder erstellen Sie Ordner!',
-        'insert' => 'Einfügen',
-        'crop_and_insert' => 'Zuschneiden und Einfügen',
-        'select_single_image' => 'Bitte wählen Sie ein einzelnes Bild.',
-        'selection_not_image' => 'Die gewählte Datei ist kein Bild.',
-        'restore' => 'Alle Änderungen rückgängig machen',
-        'resize' => 'Größe anpassen...',
-        'selection_mode_normal' => 'Normal',
-        'selection_mode_fixed_ratio' => 'Fixes Verhältnis',
-        'selection_mode_fixed_size' => 'Fixe Größe',
-        'height' => 'Höhe',
-        'width' => 'Breite',
-        'selection_mode' => 'Selection mode',
-        'resize_image' => 'Bildgröße anpassen',
-        'image_size' => 'Dimensionen:',
-        'selected_size' => 'Ausgewählt:'
-    ]
 ];
diff --git a/modules/cms/lang/el/lang.php b/modules/cms/lang/el/lang.php
index 23178dc58..e4ac41d5a 100644
--- a/modules/cms/lang/el/lang.php
+++ b/modules/cms/lang/el/lang.php
@@ -245,68 +245,5 @@ return [
         'manage_layouts' => 'Δημιουργία, τροποποίηση και διαγραφή των διατάξεων του CMS',
         'manage_partials' => 'Δημιουργία, τροποποίηση και διαγραφή των τμημάτων του CMS',
         'manage_themes' => 'Ενεργοποίηση, απενεργοποίηση και ρύθμιση των θεμάτων του CMS',
-        'manage_media' => 'Ανέβασμα και διαχείριση περιεχομένου μέσων - εικόνων, βίντεο, ήχων, εγγράφων,//Upload and manage media contents - images, videos, sounds, documents'
     ],
-    'media' => [
-        'invalid_path' => "Ορίστηκε μη έγκυρη διαδρομή αρχείου : ':path'.",
-        'menu_label' => 'Μέσα',
-        'upload' => 'Ανέβασμα',
-        'move' => 'Μετακίνηση',
-        'delete' => 'Διαγραφή',
-        'add_folder' => 'Προσθήκη καταλόγου',
-        'search' => 'Αναζήτηση',
-        'display' => 'Εμφάνιση',
-        'filter_everything' => 'Όλα',
-        'filter_images' => 'Εικόνες',
-        'filter_video' => 'Βίντεο',
-        'filter_audio' => 'Ήχος',
-        'filter_documents' => 'Έγγραφο',
-        'library' => 'Βιβλιοθήκη',
-        'folder_size_items' => 'αντικείμενο(α)',
-        'size' => 'Μέγεθος',
-        'title' => 'Τίτλος',
-        'last_modified' => 'Τελευταία τροποποίηση',
-        'public_url' => 'Δημόσιο URL',
-        'click_here' => 'Κλικ εδώ',
-        'thumbnail_error' => 'Σφάλμα κατά την δημιουργία μικρογραφίας.',
-        'return_to_parent' => 'Επιστροφή στον γονικό κατάλογο',
-        'return_to_parent_label' => 'Πήγαινε επάνω...',
-        'nothing_selected' => 'Δεν επιλέχτηκε τίποτα.',
-        'multiple_selected' => 'Επιλέχτηκαν πολλαπλά αντικείμενα.',
-        'uploading_file_num' => 'Ανέβασμα :number αρχείων...',
-        'uploading_complete' => 'Το ανέβασμα ολοκληρώθηκε',
-        'uploading_error' => 'Το ανέβασμα απέτυχε',
-        'type_blocked' => 'Ο τύπος του αρχείου που χρησιμοποιήθηκε μπλοκαρίστηκε για λόγους ασφαλείας.',
-        'order_by' => 'Ταξινόμηση κατά',
-        'folder' => 'Κατάλογος',
-        'no_files_found' => 'Δεν βρέθηκαν αρχεία από το αίτημα σας.',
-        'delete_empty' => 'παρακαλούμε επιλέξτε αντικείμενά για να τα σβήσετε.',
-        'delete_confirm' => 'Διαγραφή των επιλεγμένων αντικείμενων;',
-        'error_renaming_file' => 'Σφάλμα κατά την μετονομασία του αντικειμένου.',
-        'new_folder_title' => 'Νέος κατάλογος',
-        'folder_name' => 'Όνομα καταλόγου',
-        'error_creating_folder' => 'Σφάλμα κατά την δημιουργία καταλόγου',
-        'folder_or_file_exist' => 'Ένας κατάλογος ή αρχείο με το ίδιο όνομα υπάρχει ήδη.',
-        'move_empty' => 'παρακαλούμε επιλέξτε αντικείμενα για να τα μετακινήσετε.',
-        'move_popup_title' => 'Μετακίνηση αρχείων ή καταλογών.',
-        'move_destination' => 'Κατάλογος προορισμού',
-        'please_select_move_dest' => 'Παρακαλούμε επιλέξτε ένα κατάλογο προορισμού.',
-        'move_dest_src_match' => 'Παρακαλούμε επιλέξτε έναν διαφορετικό κατάλογο προορισμού.',
-        'empty_library' => 'Η βιβλιοθήκη Μέσων είναι άδεια. Ανεβάστε αρχεία ή δημιουργήστε καταλόγους για να ξεκινήσετε.',
-        'insert' => 'Εισαγωγή',
-        'crop_and_insert' => 'Περικοπή & Εισαγωγή',
-        'select_single_image' => 'παρακαλούμε επιλέξτε μόνο μια εικόνα.',
-        'selection_not_image' => 'Το επιλεγμένο αντικείμενο δεν είναι εικόνα.',
-        'restore' => 'Αναίρεση όλων των αλλαγών',
-        'resize' => 'Αλλαγή μεγέθους...',
-        'selection_mode_normal' => 'Κανονικό',
-        'selection_mode_fixed_ratio' => 'Κλειδωμένη αναλογία',
-        'selection_mode_fixed_size' => 'Κλειδωμένο μέγεθος',
-        'height' => 'Ύψος',
-        'width' => 'Πλάτος',
-        'selection_mode' => 'Λειτουργία επιλογής',
-        'resize_image' => 'Αλλαγή μεγέθους εικόνας',
-        'image_size' => 'Μέγεθος εικόνας:',
-        'selected_size' => 'Επιλεγμένο:',
-    ]
 ];
diff --git a/modules/cms/lang/en/lang.php b/modules/cms/lang/en/lang.php
index 392328de1..d96915e4c 100644
--- a/modules/cms/lang/en/lang.php
+++ b/modules/cms/lang/en/lang.php
@@ -260,76 +260,6 @@ return [
         'manage_partials' => 'Create, modify and delete CMS partials',
         'manage_themes' => 'Activate, deactivate and configure CMS themes',
         'manage_theme_options' => 'Configure customization options for the active theme',
-        'manage_media' => 'Upload and manage media contents - images, videos, sounds, documents'
-    ],
-    'mediafinder' => [
-        'label' => 'Media Finder',
-        'default_prompt' => 'Click the %s button to find a media item'
-    ],
-    'media' => [
-        'invalid_path' => "Invalid file path specified: ':path'.",
-        'menu_label' => 'Media',
-        'upload' => 'Upload',
-        'move' => 'Move',
-        'delete' => 'Delete',
-        'add_folder' => 'Add folder',
-        'search' => 'Search',
-        'display' => 'Display',
-        'filter_everything' => 'Everything',
-        'filter_images' => 'Images',
-        'filter_video' => 'Video',
-        'filter_audio' => 'Audio',
-        'filter_documents' => 'Documents',
-        'library' => 'Library',
-        'folder_size_items' => 'item(s)',
-        'size' => 'Size',
-        'title' => 'Title',
-        'last_modified' => 'Last modified',
-        'public_url' => 'URL',
-        'click_here' => 'Click here',
-        'thumbnail_error' => 'Error generating thumbnail.',
-        'return_to_parent' => 'Return to the parent folder',
-        'return_to_parent_label' => 'Go up ..',
-        'nothing_selected' => 'Nothing is selected.',
-        'multiple_selected' => 'Multiple items selected.',
-        'uploading_file_num' => 'Uploading :number file(s)...',
-        'uploading_complete' => 'Upload complete',
-        'uploading_error' => 'Upload failed',
-        'type_blocked' => 'The file type used is blocked for security reasons.',
-        'order_by' => 'Order by',
-        'direction' => 'Direction',
-        'direction_asc' => 'Ascending',
-        'direction_desc' => 'Descending',
-        'folder' => 'Folder',
-        'no_files_found' => 'No files found by your request.',
-        'delete_empty' => 'Please select items to delete.',
-        'delete_confirm' => 'Delete the selected item(s)?',
-        'error_renaming_file' => 'Error renaming the item.',
-        'new_folder_title' => 'New folder',
-        'folder_name' => 'Folder name',
-        'error_creating_folder' => 'Error creating folder',
-        'folder_or_file_exist' => 'A folder or file with the specified name already exists.',
-        'move_empty' => 'Please select items to move.',
-        'move_popup_title' => 'Move files or folders',
-        'move_destination' => 'Destination folder',
-        'please_select_move_dest' => 'Please select a destination folder.',
-        'move_dest_src_match' => 'Please select another destination folder.',
-        'empty_library' => 'It looks a bit empty here. Upload files or create folders to get started.',
-        'insert' => 'Insert',
-        'crop_and_insert' => 'Crop & Insert',
-        'select_single_image' => 'Please select a single image.',
-        'selection_not_image' => 'The selected item is not an image.',
-        'restore' => 'Undo all changes',
-        'resize' => 'Resize...',
-        'selection_mode_normal' => 'Normal',
-        'selection_mode_fixed_ratio' => 'Fixed ratio',
-        'selection_mode_fixed_size' => 'Fixed size',
-        'height' => 'Height',
-        'width' => 'Width',
-        'selection_mode' => 'Selection mode',
-        'resize_image' => 'Resize image',
-        'image_size' => 'Image size:',
-        'selected_size' => 'Selected:'
     ],
     'theme_log' => [
         'hint' => 'This log displays any changes made to the theme by administrators in the back-end area.',
diff --git a/modules/cms/lang/es/lang.php b/modules/cms/lang/es/lang.php
index 82ed409ab..dd54be456 100644
--- a/modules/cms/lang/es/lang.php
+++ b/modules/cms/lang/es/lang.php
@@ -258,73 +258,6 @@ return [
         'manage_layouts' => 'Crear, modificar y eliminar diseños del CMS',
         'manage_partials' => 'Crear, modificar y eliminar parciales del CMS',
         'manage_themes' => 'Activar, desactivar y configurar temas del CMS',
-        'manage_media' => 'Subir y gestionar contenidos multimedia - imágenes, vídeos, sonidos y documentos'		
-    ],
-    'mediafinder' => [
-        'label' => 'Buscador de multimedia',
-        'default_prompt' => 'Haga clic en el botón %s para buscar un elemento multimedia',
-    ],
-    'media' => [
-        'invalid_path' => "Ruta de archivo especificada no válida: ':path'.",
-        'menu_label' => 'Media',
-        'upload' => 'Subir',
-        'move' => 'Mover',
-        'delete' => 'Eliminar',
-        'add_folder' => 'Nueva carpeta',
-        'search' => 'Buscar',
-        'display' => 'Mostrar',
-        'filter_everything' => 'Todo',
-        'filter_images' => 'Imágenes',
-        'filter_video' => 'Vídeo',
-        'filter_audio' => 'Audio',
-        'filter_documents' => 'Documentos',
-        'library' => 'Biblioteca',
-        'folder_size_items' => 'elemento(s)',
-        'size' => 'Tamaño',
-        'title' => 'Título',
-        'last_modified' => 'Última modificación',
-        'public_url' => 'URL pública',
-        'click_here' => 'Haz click aquí',
-        'thumbnail_error' => 'Error generando la miniatura.',
-        'return_to_parent' => 'Volver a la carpeta anterior',
-        'return_to_parent_label' => 'Atrás ..',
-        'nothing_selected' => 'No se ha seleccionado nada.',
-        'multiple_selected' => 'Se han seleccionado varios elementos.',
-        'uploading_file_num' => 'Subiendo :number archivo(s)...',
-        'uploading_complete' => 'Subida completada',
-        'uploading_error' => 'Error al subir',
-        'type_blocked' => 'El tipo de archivo usado ha sido bloqueado por motivos de seguridad.',
-        'order_by' => 'Ordenar por',
-        'folder' => 'Carpeta',
-        'no_files_found' => 'No se han encontrado archivos.',
-        'delete_empty' => 'Por favor, selecciona los elementos que quieres eliminar.',
-        'delete_confirm' => '¿Deseas eliminar los elementos seleccionados?',
-        'error_renaming_file' => 'Error al renombrar el elemento.',
-        'new_folder_title' => 'Nueva carpeta',
-        'folder_name' => 'Nombre de la carpeta',
-        'error_creating_folder' => 'Error al crear la carpeta',
-        'folder_or_file_exist' => 'Ya existe un archivo o carpeta con este nombre.',
-        'move_empty' => 'Por favor, selecciona los elementos que quieres mover.',
-        'move_popup_title' => 'Mover archivos o carpetas',
-        'move_destination' => 'Carpeta de destino',
-        'please_select_move_dest' => 'Por favor, selecciona una carpeta de destino.',
-        'move_dest_src_match' => 'Por favor, selecciona otra carpeta de destino.',
-        'empty_library' => 'La biblioteca de medios está vacía. Sube archivos o crea carpetas para empezar.',
-        'insert' => 'Insertar',
-        'crop_and_insert' => 'Cortar e insertar',
-        'select_single_image' => 'Por favor, selecciona sólo una imagen.',
-        'selection_not_image' => 'El elemento seleccionado no es una imagen.',
-        'restore' => 'Deshacer todos los cambios',
-        'resize' => 'Redimensionar...',
-        'selection_mode_normal' => 'Normal',
-        'selection_mode_fixed_ratio' => 'Aspecto fijo',
-        'selection_mode_fixed_size' => 'Tamaño fijo',
-        'height' => 'Alto',
-        'width' => 'Ancho',
-        'selection_mode' => 'Modo de selección',
-        'resize_image' => 'Redimensionar imagen',
-        'image_size' => 'Tamaño de la imagen:',
-        'selected_size' => 'Selección:'
     ],
     'theme_log' => [
         'hint' => 'Este registro muestra todos los cambios hechos al tema por los administradores en el área de back-end.',
diff --git a/modules/cms/lang/et/lang.php b/modules/cms/lang/et/lang.php
index 0c2f88f1d..2ef5df439 100644
--- a/modules/cms/lang/et/lang.php
+++ b/modules/cms/lang/et/lang.php
@@ -260,73 +260,6 @@ return [
         'manage_layouts' => 'Create, modify and delete CMS layouts',
         'manage_partials' => 'Create, modify and delete CMS partials',
         'manage_themes' => 'Activate, deactivate and configure CMS themes',
-        'manage_media' => 'Upload and manage media contents - images, videos, sounds, documents'
-    ],
-    'mediafinder' => [
-        'label' => 'Media Finder',
-        'default_prompt' => 'Click the %s button to find a media item'
-    ],
-    'media' => [
-        'invalid_path' => "Invalid file path specified: ':path'.",
-        'menu_label' => 'Media',
-        'upload' => 'Upload',
-        'move' => 'Move',
-        'delete' => 'Delete',
-        'add_folder' => 'Add folder',
-        'search' => 'Search',
-        'display' => 'Display',
-        'filter_everything' => 'Everything',
-        'filter_images' => 'Images',
-        'filter_video' => 'Video',
-        'filter_audio' => 'Audio',
-        'filter_documents' => 'Documents',
-        'library' => 'Library',
-        'folder_size_items' => 'item(s)',
-        'size' => 'Size',
-        'title' => 'Title',
-        'last_modified' => 'Last modified',
-        'public_url' => 'Download URL',
-        'click_here' => 'Click here',
-        'thumbnail_error' => 'Error generating thumbnail.',
-        'return_to_parent' => 'Return to the parent folder',
-        'return_to_parent_label' => 'Go up ..',
-        'nothing_selected' => 'Nothing is selected.',
-        'multiple_selected' => 'Multiple items selected.',
-        'uploading_file_num' => 'Uploading :number file(s)...',
-        'uploading_complete' => 'Upload complete',
-        'uploading_error' => 'Upload failed',
-        'type_blocked' => 'The file type used is blocked for security reasons.',
-        'order_by' => 'Order by',
-        'folder' => 'Folder',
-        'no_files_found' => 'No files found by your request.',
-        'delete_empty' => 'Please select items to delete.',
-        'delete_confirm' => 'Delete the selected item(s)?',
-        'error_renaming_file' => 'Error renaming the item.',
-        'new_folder_title' => 'New folder',
-        'folder_name' => 'Folder name',
-        'error_creating_folder' => 'Error creating folder',
-        'folder_or_file_exist' => 'A folder or file with the specified name already exists.',
-        'move_empty' => 'Please select items to move.',
-        'move_popup_title' => 'Move files or folders',
-        'move_destination' => 'Destination folder',
-        'please_select_move_dest' => 'Please select a destination folder.',
-        'move_dest_src_match' => 'Please select another destination folder.',
-        'empty_library' => 'It looks a bit empty here. Upload files or create folders to get started.',
-        'insert' => 'Insert',
-        'crop_and_insert' => 'Crop & Insert',
-        'select_single_image' => 'Please select a single image.',
-        'selection_not_image' => 'The selected item is not an image.',
-        'restore' => 'Undo all changes',
-        'resize' => 'Resize...',
-        'selection_mode_normal' => 'Normal',
-        'selection_mode_fixed_ratio' => 'Fixed ratio',
-        'selection_mode_fixed_size' => 'Fixed size',
-        'height' => 'Height',
-        'width' => 'Width',
-        'selection_mode' => 'Selection mode',
-        'resize_image' => 'Resize image',
-        'image_size' => 'Image size:',
-        'selected_size' => 'Selected:'
     ],
     'theme_log' => [
         'hint' => 'This log displays any changes made to the theme by administrators in the back-end area.',
diff --git a/modules/cms/lang/fa/lang.php b/modules/cms/lang/fa/lang.php
index 030d3a95f..187b17254 100644
--- a/modules/cms/lang/fa/lang.php
+++ b/modules/cms/lang/fa/lang.php
@@ -251,72 +251,5 @@ return [
         'manage_layouts' => 'مدیریت طرح بندی ها',
         'manage_partials' => 'مدیریت بخش ها',
         'manage_themes' => 'مدیریت قالب ها',
-        'manage_media' => 'مدیریت چند رسانه ها'
     ],
-    'mediafinder' => [
-        'label' => 'جستجوگر رسانه',
-        'default_prompt' => '%s را جهت انتخاب فایل چند رسانه ای انتخاب کنید'
-    ],
-    'media' => [
-        'invalid_path' => "آدرس فایل ':path' معتبر نیست.",
-        'menu_label' => 'چند رسانه ای',
-        'upload' => 'ارسال',
-        'move' => 'جابجایی',
-        'delete' => 'حذف',
-        'add_folder' => 'پوشه جدید',
-        'search' => 'جستجو',
-        'display' => 'نمایش',
-        'filter_everything' => 'همه',
-        'filter_images' => 'تصاویر',
-        'filter_video' => 'ویدیو',
-        'filter_audio' => 'صوتی',
-        'filter_documents' => 'اسناد',
-        'library' => 'کتاب خانه',
-        'folder_size_items' => 'مورد(ها)',
-        'size' => 'اندازه',
-        'title' => 'عنوان',
-        'last_modified' => 'آخرین تغییرات',
-        'public_url' => 'آدرس عمومی',
-        'click_here' => 'اینجا کلیک کنید',
-        'thumbnail_error' => 'خطا در ایجاد تصویر بند انگشتی',
-        'return_to_parent' => 'بازگشت به پوشه قبل',
-        'return_to_parent_label' => 'بازگشت ..',
-        'nothing_selected' => 'چیزی انتخاب نشده است.',
-        'multiple_selected' => 'چند مورد انتخاب شده',
-        'uploading_file_num' => 'ارسال :number فایل(ها)...',
-        'uploading_complete' => 'ارسال انجام شد',
-        'uploading_error' => 'خطا در ارسال',
-        'type_blocked' => 'نوع فایل استفاده شده به دلیل مسایل امنیتی مجاز نمی باشد..',
-        'order_by' => 'مرتب سازی با',
-        'folder' => 'پوشه',
-        'no_files_found' => 'فایلی با درخواست شما یافت نشد',
-        'delete_empty' => 'لطفا موارد را جهت حذف انتخاب نمایید',
-        'delete_confirm' => 'آیا از حذف مورد(های) انتخاب شده اطمینان دارید؟',
-        'error_renaming_file' => 'خطا در تغییر نام.',
-        'new_folder_title' => 'پوشه ی جدید',
-        'folder_name' => 'نام پوشه',
-        'error_creating_folder' => 'خطا در ایجاد پوشه',
-        'folder_or_file_exist' => 'پوشه یا فایلی با نام وارد شده از قبل وجود دارد.',
-        'move_empty' => 'لطفا موارد را جهت جابجایی انتخاب نمایید',
-        'move_popup_title' => 'جابحایی فایل یا پوشه ها',
-        'move_destination' => 'پوشه مقصد',
-        'please_select_move_dest' => 'لطفا پوشه مقصد را انتخاب نمائید.',
-        'move_dest_src_match' => 'لطفا پوشه دیگری را انتخاب نمایید.',
-        'empty_library' => 'چیزی یافت نشد.',
-        'insert' => 'قرار دادن',
-        'crop_and_insert' => 'بریدن و افزودن',
-        'select_single_image' => 'لطفا یک تصویر انتخاب نمایید',
-        'selection_not_image' => 'مورد انتخاب شده تصویر نمی باشد',
-        'restore' => 'حذف همه تغییرات',
-        'resize' => 'تغییر اندازه...',
-        'selection_mode_normal' => 'معمولی',
-        'selection_mode_fixed_ratio' => 'نصبت ثابت',
-        'selection_mode_fixed_size' => 'اندازه ثابت',
-        'height' => 'ارتفاع',
-        'width' => 'عرض',
-        'selection_mode' => 'حالت انتخابی',
-        'resize_image' => 'تغییر اندازه تصویر',
-        'image_size' => 'اندازه تصویر:',
-        'selected_size' => 'انتخاب شده:'
-    ]
 ];
diff --git a/modules/cms/lang/fr/lang.php b/modules/cms/lang/fr/lang.php
index 259708cb1..da5cfbabc 100644
--- a/modules/cms/lang/fr/lang.php
+++ b/modules/cms/lang/fr/lang.php
@@ -257,72 +257,5 @@ return [
         'manage_layouts' => 'Créer, modifier et supprimer des maquettes du CMS',
         'manage_partials' => 'Créer, modifier et supprimer des modèles partiels du CMS',
         'manage_themes' => 'Activer, désactiver et configurer les thèmes',
-        'manage_media' => 'Déposer et gérer les contenus media - images, vidéos, sons, documents'
     ],
-    'mediafinder' => [
-        'label' => 'Galerie média',
-        'default_prompt' => 'Cliquez sur le bouton %s pour trouver un élément média'
-    ],
-    'media' => [
-        'invalid_path' => "Le chemin du fichier indiqué est invalide : ':path'.",
-        'menu_label' => 'Média',
-        'upload' => 'Déposer un fichier',
-        'move' => 'Déplacer',
-        'delete' => 'Supprimer',
-        'add_folder' => 'Ajouter un répertoire',
-        'search' => 'Rechercher',
-        'display' => 'Affichage',
-        'filter_everything' => 'Tout',
-        'filter_images' => 'Images',
-        'filter_video' => 'Vidéo',
-        'filter_audio' => 'Audio',
-        'filter_documents' => 'Documents',
-        'library' => 'Librairie',
-        'folder_size_items' => 'Articles(s)',
-        'size' => 'Taille',
-        'title' => 'Titre',
-        'last_modified' => 'Dernière modification',
-        'public_url' => 'Adresse URL publique',
-        'click_here' => 'Cliquer ici',
-        'thumbnail_error' => 'Erreur lors de la création de la miniature.',
-        'return_to_parent' => 'Retourner au répertoire parent',
-        'return_to_parent_label' => 'Monter…',
-        'nothing_selected' => 'Aucune sélection.',
-        'multiple_selected' => 'Plusieurs éléments sélectionnés.',
-        'uploading_file_num' => 'Dépôt de :number fichier(s)…',
-        'uploading_complete' => 'Dépôt des fichiers terminé',
-        'uploading_error' => 'Le dépôt des fichiers a échoué',
-        'type_blocked' => 'Le type de fichier utilisé est bloqué pour des raisons de sécurité.',
-        'order_by' => 'Trier par',
-        'folder' => 'Répertoire',
-        'no_files_found' => 'Aucun fichier trouvé.',
-        'delete_empty' => 'Veuillez sélectionner les éléments à supprimer.',
-        'delete_confirm' => 'Confirmer la suppression de ces éléments ?',
-        'error_renaming_file' => 'Erreur lors du renommage de l’élément.',
-        'new_folder_title' => 'Nouveau répertoire',
-        'folder_name' => 'Nom du répertoire',
-        'error_creating_folder' => 'Erreur lors de la création du répertoire',
-        'folder_or_file_exist' => 'Un répertoire ou un fichier portant ce nom existe déjà.',
-        'move_empty' => 'Veuillez sélectionner les éléments à déplacer.',
-        'move_popup_title' => 'Déplacer des fichiers ou répertoires',
-        'move_destination' => 'Répertoire de destination',
-        'please_select_move_dest' => 'Veuillez sélectionner un répertoire de destination.',
-        'move_dest_src_match' => 'Veuillez sélectionner un autre répertoire de destination.',
-        'empty_library' => 'La librairie multimédia est vide. Pour commencer, télécharger des fichiers ou répertoires.',
-        'insert' => 'Insérer',
-        'crop_and_insert' => 'Rogner et insérer',
-        'select_single_image' => 'Veuillez sélectionner une seule image.',
-        'selection_not_image' => 'L’élément sélectionné n’est pas une image.',
-        'restore' => 'Annuler tous les changements',
-        'resize' => 'Redimensionner…',
-        'selection_mode_normal' => 'Normal',
-        'selection_mode_fixed_ratio' => 'Rapport fixe',
-        'selection_mode_fixed_size' => 'Taille fixe',
-        'height' => 'Hauteur',
-        'width' => 'Largeur',
-        'selection_mode' => 'Mode de sélection',
-        'resize_image' => 'Redimensionner l’image',
-        'image_size' => 'Taille de l’image :',
-        'selected_size' => 'Sélectionnée :'
-    ]
 ];
diff --git a/modules/cms/lang/hu/lang.php b/modules/cms/lang/hu/lang.php
index bcce10bf9..24169b8ef 100644
--- a/modules/cms/lang/hu/lang.php
+++ b/modules/cms/lang/hu/lang.php
@@ -260,76 +260,6 @@ return [
         'manage_partials' => 'Részlapok kezelése',
         'manage_themes' => 'Témák kezelése',
         'manage_theme_options' => 'Aktív téma testreszabása',
-        'manage_media' => 'Média kezelése'
-    ],
-    'mediafinder' => [
-        'label' => 'Média',
-        'default_prompt' => 'Kattintson a(z) %s gombra új média fájl kereséséhez.'
-    ],
-    'media' => [
-        'invalid_path' => "Érvénytelen elérési útvonal: ':path'",
-        'menu_label' => 'Média',
-        'upload' => 'Feltöltés',
-        'move' => 'Áthelyezés',
-        'delete' => 'Törlés',
-        'add_folder' => 'Könyvtár létrehozása',
-        'search' => 'Keresés...',
-        'display' => 'Megjelenítés',
-        'filter_everything' => 'Összes',
-        'filter_images' => 'Kép',
-        'filter_video' => 'Videó',
-        'filter_audio' => 'Audió',
-        'filter_documents' => 'Dokumentum',
-        'library' => 'Média',
-        'folder_size_items' => 'fájl',
-        'size' => 'Méret',
-        'title' => 'Név',
-        'last_modified' => 'Módosítva',
-        'public_url' => 'Webcím',
-        'click_here' => 'Megtekintés',
-        'thumbnail_error' => 'Hiba a bélyegkép létrehozásánál.',
-        'return_to_parent' => 'Vissza a szülő könyvtárhoz',
-        'return_to_parent_label' => 'Eggyel vissza ..',
-        'nothing_selected' => 'Nincs kiválasztva fájl.',
-        'multiple_selected' => 'Több fájl kiválasztva.',
-        'uploading_file_num' => 'Feltöltve :number fájl...',
-        'uploading_complete' => 'Feltöltés sikeresen befejezve',
-        'uploading_error' => 'Feltöltés sikertelen',
-        'type_blocked' => 'A fájltípus blokkolva lett biztonsági okokból.',
-        'order_by' => 'Rendezés',
-        'direction' => 'Irány',
-        'direction_asc' => 'Növekvő',
-        'direction_desc' => 'Csökkenő',
-        'folder' => 'Könyvtár',
-        'no_files_found' => 'Nem található fájl a lekérésben.',
-        'delete_empty' => 'Kérjük válassza ki a törölni kívánt fájlokat.',
-        'delete_confirm' => 'Valóban törölni akarja a kiválasztott fájlokat?',
-        'error_renaming_file' => 'Hiba a fájl átnevezésében.',
-        'new_folder_title' => 'Új könyvtár',
-        'folder_name' => 'Könyvtár neve',
-        'error_creating_folder' => 'Hiba a könyvtár létrehozásánál',
-        'folder_or_file_exist' => 'Már létezik ilyen nevű fájl vagy könyvtár.',
-        'move_empty' => 'Kérjük válasszon ki fájlt az áthelyezéshez.',
-        'move_popup_title' => 'Fájlok vagy könyvtárak áthelyezése',
-        'move_destination' => 'Célkönyvtár',
-        'please_select_move_dest' => 'Kérjük válasszon célkönyvtárat.',
-        'move_dest_src_match' => 'Kérjük válasszon másik célkönyvtárat.',
-        'empty_library' => 'Kezdésként hozzon létre könyvtárat és töltsön fel fájlokat.',
-        'insert' => 'Beillesztés',
-        'crop_and_insert' => 'Vágás és beillesztés',
-        'select_single_image' => 'Kérjük válasszon ki egy képet.',
-        'selection_not_image' => 'A kiválasztott fájl nem kép.',
-        'restore' => 'Összes változtatás visszavonása',
-        'resize' => 'Átméretezés...',
-        'selection_mode_normal' => 'Normál',
-        'selection_mode_fixed_ratio' => 'Rögzített képarány',
-        'selection_mode_fixed_size' => 'Rögzített méret',
-        'height' => 'Magasság',
-        'width' => 'Szélesség',
-        'selection_mode' => 'Kiválasztás módja',
-        'resize_image' => 'Kép átméretezése',
-        'image_size' => 'Kép mérete:',
-        'selected_size' => 'Kiválasztva:'
     ],
     'theme_log' => [
         'hint' => 'Az adminok által elvégzett módosítások az aktív téma fájlaiban, amiket az admin felületen keresztül hajtottak végre.',
diff --git a/modules/cms/lang/it/lang.php b/modules/cms/lang/it/lang.php
index 2b87619a0..72ba54285 100644
--- a/modules/cms/lang/it/lang.php
+++ b/modules/cms/lang/it/lang.php
@@ -245,71 +245,5 @@ return [
         'manage_layouts' => 'Gesstisci layouts',
         'manage_partials' => 'Gestisci viste parziali',
         'manage_themes' => 'Gestisci temi',
-        'manage_media' => 'Gestisci elementi multimediali'
     ],
-    'mediafinder' => [
-        'default_prompt' => 'Fai clic sul pulsante %s per trovare un elemento multimediale'
-    ],
-    'media' => [
-        'invalid_path' => "Percorso del file non valido: ':path'.",
-        'menu_label' => 'Elementi multimediali',
-        'upload' => 'Carica',
-        'move' => 'Sposta',
-        'delete' => 'Elimina',
-        'add_folder' => 'Aggiungi cartella',
-        'search' => 'Cerca',
-        'display' => 'Visualizza',
-        'filter_everything' => 'Tutto',
-        'filter_images' => 'Immagini',
-        'filter_video' => 'Video',
-        'filter_audio' => 'Audio',
-        'filter_documents' => 'Documenti',
-        'library' => 'Libreria',
-        'folder_size_items' => 'elementi',
-        'size' => 'Dimensione',
-        'title' => 'Titolo',
-        'last_modified' => 'Ultima modifica',
-        'public_url' => 'URL pubblico',
-        'click_here' => 'Fai clic qui',
-        'thumbnail_error' => 'Errore durante la generazione dell\'anteprima.',
-        'return_to_parent' => 'Ritorna alla cartella superiore',
-        'return_to_parent_label' => 'Torna su ..',
-        'nothing_selected' => 'Nessun elemento selezionato.',
-        'multiple_selected' => 'Elementi multipli selezionati.',
-        'uploading_file_num' => 'Caricamento in corso di :number file(s)...',
-        'uploading_complete' => 'Caricamento completato',
-        'uploading_error' => 'Caricamento fallito',
-        'type_blocked' => 'Il tipo di file utilizzato è bloccato per questioni di sicurezza.',
-        'order_by' => 'Ordina per',
-        'folder' => 'Cartella',
-        'no_files_found' => 'Nessun file corrisponde alla tua richiesta.',
-        'delete_empty' => 'Seleziona elementi da eliminare.',
-        'delete_confirm' => 'Vuoi davvero eliminare gli elementi selezionati?',
-        'error_renaming_file' => 'Errore durante la rinominazione dell\'elemento',
-        'new_folder_title' => 'Nuova cartella',
-        'folder_name' => 'Nome della cartella',
-        'error_creating_folder' => 'Errore durante la creazione della cartella',
-        'folder_or_file_exist' => 'Una cartella o un file con il nome specificato è già esistente.',
-        'move_empty' => 'Selezione elementi da spostare.',
-        'move_popup_title' => 'Sposta file o cartelle',
-        'move_destination' => 'Cartella di destinazione',
-        'please_select_move_dest' => 'Seleziona una cartella di destinazione.',
-        'move_dest_src_match' => 'Seleziona un\'altra cartella di destinazione.',
-        'empty_library' => 'La libreria è vuota. Carica dei files o crea delle cartelle per iniziare.',
-        'insert' => 'Inserisci',
-        'crop_and_insert' => 'Ritaglia e inserisci',
-        'select_single_image' => 'Seleziona una singola immagine.',
-        'selection_not_image' => 'L\'elemento selezionato non è un\'immagine.',
-        'restore' => 'Annulla tutte le modifiche',
-        'resize' => 'Ridimensiona...',
-        'selection_mode_normal' => 'Normale',
-        'selection_mode_fixed_ratio' => 'Rapporto fisso',
-        'selection_mode_fixed_size' => 'Dimensione fissa',
-        'height' => 'Altezza',
-        'width' => 'Larghezza',
-        'selection_mode' => 'Metodo di selezione',
-        'resize_image' => 'Ridimensiona immagine',
-        'image_size' => 'Dimensione immagine:',
-        'selected_size' => 'Selezionati:'
-    ]
 ];
diff --git a/modules/cms/lang/kr/lang.php b/modules/cms/lang/kr/lang.php
index 15901a39b..ef3d8e302 100644
--- a/modules/cms/lang/kr/lang.php
+++ b/modules/cms/lang/kr/lang.php
@@ -259,73 +259,6 @@ return [
         'manage_layouts' => '레이아웃 관리',
         'manage_partials' => '파셜 관리',
         'manage_themes' => '테마 관리',
-        'manage_media' => '미디어관리와 업로드 - 이미지, 동영상, 소리, 문서'
-    ],
-    'mediafinder' => [
-        'label' => '미디어 탐색기',
-        'default_prompt' => '%s 버튼 클릭하여 미디어 아이템 찾기'
-    ],
-    'media' => [
-        'invalid_path' => "잘못된 경로: ':path'.",
-        'menu_label' => '미디어',
-        'upload' => '업로드',
-        'move' => '이동',
-        'delete' => '삭제',
-        'add_folder' => '폴더 추가',
-        'search' => '검색',
-        'display' => '표시방법',
-        'filter_everything' => '전체표시',
-        'filter_images' => '이미지',
-        'filter_video' => '동영상',
-        'filter_audio' => '소리',
-        'filter_documents' => '문서',
-        'library' => '라이브러리',
-        'folder_size_items' => '갯수',
-        'size' => '용량',
-        'title' => '제목',
-        'last_modified' => '최종변경',
-        'public_url' => '다운로드 URL',
-        'click_here' => '클릭해주세요',
-        'thumbnail_error' => '썸네일 생성 오류.',
-        'return_to_parent' => '상위 폴더로 돌아가기',
-        'return_to_parent_label' => '상위 폴더 ..',
-        'nothing_selected' => '선택없음.',
-        'multiple_selected' => '여러개 선택됨.',
-        'uploading_file_num' => ':number 파일 업로드중...',
-        'uploading_complete' => '업로드 완료',
-        'uploading_error' => '업로드 실패',
-        'type_blocked' => '보안문제로 해당 파일타입은 불가능합니다.',
-        'order_by' => '정렬방법',
-        'folder' => '폴더',
-        'no_files_found' => '요청하신 파일을 찾을 수 없습니다.',
-        'delete_empty' => '삭제할 대상을 선택해 주세요.',
-        'delete_confirm' => '선택하신 대상을 삭제하시겠습니까?',
-        'error_renaming_file' => '이름변경 오류.',
-        'new_folder_title' => '신규 폴더',
-        'folder_name' => '폴더 이름',
-        'error_creating_folder' => '폴더 생성 오류',
-        'folder_or_file_exist' => '해당 이름의 파일이나 폴더가 이미 존재합니다.',
-        'move_empty' => '이동할 대상을 선택하세요.',
-        'move_popup_title' => '파일이나 폴더를 이동',
-        'move_destination' => '목적지 폴더',
-        'please_select_move_dest' => '목적지 폴더를 선택하세요.',
-        'move_dest_src_match' => '다른 목적지 폴더를 선택하세요.',
-        'empty_library' => '라이브러리가 비어있습니다. 파일을 업로드하거나 폴더를 생성하여 시작해보세요.',
-        'insert' => '삽입',
-        'crop_and_insert' => '자르기 & 삽입',
-        'select_single_image' => '한개의 이미지를 선택해주세요.',
-        'selection_not_image' => '선택하신 것은 이미지가 아닙니다.',
-        'restore' => '모든 변경 되돌리기',
-        'resize' => '크기변경...',
-        'selection_mode_normal' => '일반',
-        'selection_mode_fixed_ratio' => '고정 비율',
-        'selection_mode_fixed_size' => '고정 크기',
-        'height' => '높이',
-        'width' => '넓이',
-        'selection_mode' => '선택 모드',
-        'resize_image' => '이미지 크기 변경',
-        'image_size' => '이미지 크기:',
-        'selected_size' => '선택크기:'
     ],
     'theme_log' => [
         'hint' => '백엔드에서 관리자에 의해 변경된 테마의 변경사항에 대한 로그를 표시합니다.',
diff --git a/modules/cms/lang/lt/lang.php b/modules/cms/lang/lt/lang.php
index 9cdaed9d5..35120f9f4 100644
--- a/modules/cms/lang/lt/lang.php
+++ b/modules/cms/lang/lt/lang.php
@@ -257,72 +257,5 @@ return [
         'manage_layouts' => 'Kurti, redaguoti ir trinti CMS išvaizdos šablonus',
         'manage_partials' => 'Kurti, redaguoti ir trinti CMS priedėlius',
         'manage_themes' => 'Aktyvuoti, deaktyvuoti bei konfigūruoti CMS dizainus',
-        'manage_media' => 'Įkelti ir tvarkyti media elementus - paveiksliukus, video, garsus, dokumentus'
     ],
-    'mediafinder' => [
-        'label' => 'Failų Tvarkyklė',
-        'default_prompt' => 'Spauskite %s mygtuką media failų paieškai'
-    ],
-    'media' => [
-        'invalid_path' => "Nurodytas netinkamas kelias: ':path'.",
-        'menu_label' => 'Media',
-        'upload' => 'Įkelti',
-        'move' => 'Perkelti',
-        'delete' => 'Trinti',
-        'add_folder' => 'Pridėti katalogą',
-        'search' => 'Ieškoti',
-        'display' => 'Rodyti',
-        'filter_everything' => 'Viskas',
-        'filter_images' => 'Paveiksliukai',
-        'filter_video' => 'Video',
-        'filter_audio' => 'Audio',
-        'filter_documents' => 'Dokumentai',
-        'library' => 'Biblioteka',
-        'folder_size_items' => 'elementai(as)',
-        'size' => 'Dydis',
-        'title' => 'Pavadinimas',
-        'last_modified' => 'Redaguotas',
-        'public_url' => 'Viešas URL',
-        'click_here' => 'Spauskite čia',
-        'thumbnail_error' => 'Nepavyko atvaizduoti miniatiūros.',
-        'return_to_parent' => 'Grįžti į pirminį katalogą',
-        'return_to_parent_label' => 'Eiti aukštyn ..',
-        'nothing_selected' => 'Nieko nepasirinkote.',
-        'multiple_selected' => 'Pasirinkote keletą elementų.',
-        'uploading_file_num' => 'Įkeliama :number failai(as)...',
-        'uploading_complete' => 'Įkėlimas įvykdytas',
-        'uploading_error' => 'Įkėlimas nepavyko',
-        'type_blocked' => 'Failo tipas yra blokuojamas saugumo sumetimais.',
-        'order_by' => 'Rūšiuoti pagal',
-        'folder' => 'Katalogas',
-        'no_files_found' => 'Pagal Jūsų paiešką failų neradome.',
-        'delete_empty' => 'Pasirinkite emelentus trynimui.',
-        'delete_confirm' => 'Trinti pasirinktus elementus?',
-        'error_renaming_file' => 'Klaida pervadinant elementą.',
-        'new_folder_title' => 'Naujas katalogas',
-        'folder_name' => 'Katalogo pavadinimas',
-        'error_creating_folder' => 'Klaida sukuriant katalogą',
-        'folder_or_file_exist' => 'Katalogas ar failas šiuo pavadinimu jau yra.',
-        'move_empty' => 'Pasirinkite elementus perkėlimui.',
-        'move_popup_title' => 'Perkelti failus ar katalogus',
-        'move_destination' => 'Paskirties katalogas',
-        'please_select_move_dest' => 'Pasirinkite paskirties katalogą.',
-        'move_dest_src_match' => 'Prašome pasirinkti kitą paskirties katalogą.',
-        'empty_library' => 'Media biblioteka tuščiay. Pradžiai įkelkite failus ar sukurkite katalogus.',
-        'insert' => 'Įterpti',
-        'crop_and_insert' => 'Apkirpti ir Įterpti',
-        'select_single_image' => 'Pasirinkite vieną paveiksliuką.',
-        'selection_not_image' => 'pasirinktas elementas nėra paveiksliukas.',
-        'restore' => 'Atstatyti visus pakeitimus',
-        'resize' => 'Keisti išmatavimus...',
-        'selection_mode_normal' => 'Normalus',
-        'selection_mode_fixed_ratio' => 'Fiksuotas sdantykis',
-        'selection_mode_fixed_size' => 'Fiksuotas dydis',
-        'height' => 'Aukštis',
-        'width' => 'Plotis',
-        'selection_mode' => 'Pasirinkimo būdas',
-        'resize_image' => 'Keisti paveiksliuko išmatavimus',
-        'image_size' => 'Paveiksliuko dydis:',
-        'selected_size' => 'Pasirinkta:'
-    ]
 ];
diff --git a/modules/cms/lang/lv/lang.php b/modules/cms/lang/lv/lang.php
index c6aaacf1e..cb895d38c 100644
--- a/modules/cms/lang/lv/lang.php
+++ b/modules/cms/lang/lv/lang.php
@@ -238,69 +238,5 @@ return [
         'manage_layouts' => 'Pārvaldīt izkārtojumus',
         'manage_partials' => 'Pārvaldīt daļas',
         'manage_themes' => 'Pārvaldīt tēmas',
-        'manage_media' => 'Pārvaldīt multividi'
     ],
-    'mediafinder' => [
-        'default_prompt' => 'Klikšķiniet uz %s pogas, lai atrastu multividi'
-    ],
-    'media' => [
-        'invalid_path' => "Norādīts nederīgs ceļš līdz failam: ':path'.",
-        'menu_label' => 'Multimēdija',
-        'upload' => 'Augšupielādēt',
-        'move' => 'Pārvietot',
-        'delete' => 'Dzēst',
-        'add_folder' => 'Pievienot mapi',
-        'search' => 'Meklēt',
-        'display' => 'Attēlot',
-        'filter_everything' => 'Viss',
-        'filter_images' => 'Attēli',
-        'filter_video' => 'Video',
-        'filter_audio' => 'Audio',
-        'filter_documents' => 'Dokumenti',
-        'library' => 'Bibliotēka',
-        'folder_size_items' => 'objekti(s)',
-        'size' => 'Izmērs',
-        'title' => 'Virsraksts',
-        'last_modified' => 'Pēdējoreiz modificēts',
-        'public_url' => 'Publiskā URL',
-        'click_here' => 'Spiest šeit',
-        'thumbnail_error' => 'Kļūda ģenerējot priekšskatījumu.',
-        'return_to_parent' => 'Atgriezties vecākmapē',
-        'return_to_parent_label' => 'Doties augšup ..',
-        'nothing_selected' => 'Nekas nav izvēlēts.',
-        'multiple_selected' => 'Vairāki izvēlēti objekti.',
-        'uploading_file_num' => 'Augšupielādējam :number failu(us)...',
-        'uploading_complete' => 'Augšupielāde pabeigta',
-        'order_by' => 'Kārtot pēc',
-        'folder' => 'Mape',
-        'no_files_found' => 'Jūsu pieprasītie faili netika atrasti.',
-        'delete_empty' => 'Lūdzu izvēlaties objektus, kurus dzēst.',
-        'delete_confirm' => 'Vai tiešām vēlaties izdzēst izvēlēto objektu(us)?',
-        'error_renaming_file' => 'Kļūda pārdēvējot objektu.',
-        'new_folder_title' => 'Jauna mape',
-        'folder_name' => 'Mapes nosaukums',
-        'error_creating_folder' => 'Kļūda izveidojot mapi',
-        'folder_or_file_exist' => 'Mape vai fails ar izvēlēto nosaukumu jau eksistē.',
-        'move_empty' => 'Izvēlēties objektus, kurus pārvietot.',
-        'move_popup_title' => 'Pārvietot failus vai mapes',
-        'move_destination' => 'Mērķdirektorija',
-        'please_select_move_dest' => 'Lūdzu izvēlieties mērķdirektoriju.',
-        'move_dest_src_match' => 'Lūdzu izvēlieties citu mērķdirektoriju.',
-        'empty_library' => 'Multimēdijas bibliotēka ir tukša. Augšupielādējiet failus vai izveidojat mapes, lai sāktu.',
-        'insert' => 'Ievietot',
-        'crop_and_insert' => 'Apgriezt un Ievietot',
-        'select_single_image' => 'Lūdzu izvēlieties vienu attēlu.',
-        'selection_not_image' => 'Izvēlētais objekts nav attēls.',
-        'restore' => 'Atcelt visas izmaiņas',
-        'resize' => 'Mērogot...',
-        'selection_mode_normal' => 'Normāls',
-        'selection_mode_fixed_ratio' => 'Fiksēta attiecība',
-        'selection_mode_fixed_size' => 'Fiksēts izmērs',
-        'height' => 'Augstums',
-        'width' => 'Platums',
-        'selection_mode' => 'Iezīmēšanas režīms',
-        'resize_image' => 'Mērogot attēlu',
-        'image_size' => 'Attēla izmērs:',
-        'selected_size' => 'Izvēlēts:'
-    ]
 ];
diff --git a/modules/cms/lang/nb-no/lang.php b/modules/cms/lang/nb-no/lang.php
index d574f0032..c0d441627 100644
--- a/modules/cms/lang/nb-no/lang.php
+++ b/modules/cms/lang/nb-no/lang.php
@@ -246,71 +246,5 @@ return [
         'manage_layouts' => 'Administrer layouts',
         'manage_partials' => 'Administrer partials',
         'manage_themes' => 'Administrer maler',
-        'manage_media' => 'Last opp og behandle media - bilder, video, lydfiler, dokumenter',
     ],
-    'mediafinder' => [
-        'default_prompt' => 'Klikk på %s knappen for å hente media'
-    ],
-    'media' => [
-        'invalid_path' => "Ugyldig filsti: ':path'.",
-        'menu_label' => 'Media',
-        'upload' => 'Last opp',
-        'move' => 'Flytt',
-        'delete' => 'Slett',
-        'add_folder' => 'Ny mappe',
-        'search' => 'Søk',
-        'display' => 'Vis',
-        'filter_everything' => 'Alle filer',
-        'filter_images' => 'Bilder',
-        'filter_video' => 'Video',
-        'filter_audio' => 'Lyd',
-        'filter_documents' => 'Dokumenter',
-        'library' => 'Bibliotek',
-        'folder_size_items' => 'fil(er)',
-        'size' => 'Størrelse',
-        'title' => 'Tittel',
-        'last_modified' => 'Sist endret',
-        'public_url' => 'URL',
-        'click_here' => 'Klikk her',
-        'thumbnail_error' => 'Kunne ikke lage thumbnail.',
-        'return_to_parent' => 'Gå til forrige mappe',
-        'return_to_parent_label' => 'Gå opp ..',
-        'nothing_selected' => 'Ingenting er valgt.',
-        'multiple_selected' => 'Flere filer er valgt.',
-        'uploading_file_num' => 'Laster opp :number fil(er)...',
-        'uploading_complete' => 'Opplasting fullført',
-        'uploading_error' => 'Opplasting feilet',
-        'type_blocked' => 'Filtypen er blokkert av sikkerhetsgrunner.',
-        'order_by' => 'Sorter etter',
-        'folder' => 'Mappe',
-        'no_files_found' => 'Ingen filer ble funnet.',
-        'delete_empty' => 'Ingen filer er valgt.',
-        'delete_confirm' => 'Vil du virkelig slette valgte fil(er)?',
-        'error_renaming_file' => 'Kunne ikke gi filen nytt navn.',
-        'new_folder_title' => 'Ny mappe',
-        'folder_name' => 'Mappenavn',
-        'error_creating_folder' => 'Kunne ikke opprette ny mappe',
-        'folder_or_file_exist' => 'En fil eller mappe med det navnet eksisterer allerede.',
-        'move_empty' => 'Vennligst velg filer å flytte.',
-        'move_popup_title' => 'Flytt filer eller mapper',
-        'move_destination' => 'Målmappe',
-        'please_select_move_dest' => 'Vennligst velg en målmappe.',
-        'move_dest_src_match' => 'Please select another destination folder.',
-        'empty_library' => 'Mediabiblioteket er tomt. Last opp filer eller opprett mapper for å komme i gang.',
-        'insert' => 'Insert',
-        'crop_and_insert' => 'Crop & Insert',
-        'select_single_image' => 'Vennligst velg ett enkelt bilde.',
-        'selection_not_image' => 'Valgte fil er ikke et bilde.',
-        'restore' => 'Angre endringer',
-        'resize' => 'Endre størrelse...',
-        'selection_mode_normal' => 'Normal',
-        'selection_mode_fixed_ratio' => 'Fast forhold',
-        'selection_mode_fixed_size' => 'Fast størrelse',
-        'height' => 'Høyde',
-        'width' => 'Bredde',
-        'selection_mode' => 'Valgmodus',
-        'resize_image' => 'Endre bildestørrelse',
-        'image_size' => 'Bildestørrelse:',
-        'selected_size' => 'Valgt:'
-    ]
 ];
diff --git a/modules/cms/lang/nl/lang.php b/modules/cms/lang/nl/lang.php
index 03674f37e..ba54e6c67 100644
--- a/modules/cms/lang/nl/lang.php
+++ b/modules/cms/lang/nl/lang.php
@@ -259,73 +259,6 @@ return [
         'manage_layouts' => 'Beheer layouts',
         'manage_partials' => 'Beheer sjablonen',
         'manage_themes' => 'Beheer thema\'s',
-        'manage_media' => 'Beheer media',
-    ],
-    'mediafinder' => [
-        'label' => 'Media zoeker',
-        'default_prompt' => 'Klik op de %s knop om een media item te vinden',
-    ],
-    'media' => [
-        'invalid_path' => 'Ongeldig pad opgegeven: \':path\'.',
-        'menu_label' => 'Media',
-        'upload' => 'Uploaden',
-        'move' => 'Verplaatsen',
-        'delete' => 'Verwijderen',
-        'add_folder' => 'Map toevoegen',
-        'search' => 'Zoeken',
-        'display' => 'Weergeven',
-        'filter_everything' => 'Alles',
-        'filter_images' => 'Afbeeldingen',
-        'filter_video' => 'Video\'s',
-        'filter_audio' => 'Audio',
-        'filter_documents' => 'Documenten',
-        'library' => 'Bibliotheek',
-        'folder_size_items' => 'item(s)',
-        'size' => 'Grootte',
-        'title' => 'Titel',
-        'last_modified' => 'Laatst gewijzigd',
-        'public_url' => 'URL',
-        'click_here' => 'Klik hier',
-        'thumbnail_error' => 'Fout opgetreden bij genereren miniatuurweergave.',
-        'return_to_parent' => 'Terug naar bovenliggende map',
-        'return_to_parent_label' => 'Naar bovenliggende ...',
-        'nothing_selected' => 'Er is niets geselecteerd.',
-        'multiple_selected' => 'Meerdere items geselecteerd.',
-        'uploading_file_num' => 'Uploaden van :number bestanden...',
-        'uploading_complete' => 'Uploaden voltooid',
-        'uploading_error' => 'Upload mislukt',
-        'type_blocked' => 'Het bestandstype is i.v.m. veiligheidsredenen geblokkeerd.',
-        'order_by' => 'Sorteer op',
-        'folder' => 'Map',
-        'no_files_found' => 'Er zijn geen bestanden gevonden.',
-        'delete_empty' => 'Selecteer items om te verwijderen.',
-        'delete_confirm' => 'Weet je zeker dat je de geselecteerde items wilt verwijderen?',
-        'error_renaming_file' => 'Fout bij wijzigen naam.',
-        'new_folder_title' => 'Nieuwe map',
-        'folder_name' => 'Mapnaam',
-        'error_creating_folder' => 'Fout bij maken van map',
-        'folder_or_file_exist' => 'Er bestaat reeds een map of bestand met deze naam.',
-        'move_empty' => 'Selecteer de items om te verplaatsen.',
-        'move_popup_title' => 'Verplaats bestanden of mappen',
-        'move_destination' => 'Doelmap',
-        'please_select_move_dest' => 'Selecteer een doelmap.',
-        'move_dest_src_match' => 'Selecteer een andere doelmap.',
-        'empty_library' => 'De media bibliotheek is leeg. Upload bestanden of maak mappen aan om te beginnen.',
-        'insert' => 'Invoegen',
-        'crop_and_insert' => 'Uitsnijden & Invoegen',
-        'select_single_image' => 'Selecteer één afbeelding.',
-        'selection_not_image' => 'Het geselecteerde item is geen afbeelding.',
-        'restore' => 'Alle wijzigingen ongedaan maken',
-        'resize' => 'Wijzig grootte...',
-        'selection_mode_normal' => 'Normaal',
-        'selection_mode_fixed_ratio' => 'Vaste ratio',
-        'selection_mode_fixed_size' => 'Vaste grootte',
-        'height' => 'Hoogte',
-        'width' => 'Breedte',
-        'selection_mode' => 'Selectie modus',
-        'resize_image' => 'Wijzig grootte van afbeelding',
-        'image_size' => 'Grootte afbeelding:',
-        'selected_size' => 'Geselecteerd:',
     ],
     'theme_log' => [
         'hint' => 'Dit logboek laat alle wijzigingen in het thema zien die aangebracht zijn door de beheerders in de back-end omgeving.',
diff --git a/modules/cms/lang/pl/lang.php b/modules/cms/lang/pl/lang.php
index 942192498..e69932f5b 100644
--- a/modules/cms/lang/pl/lang.php
+++ b/modules/cms/lang/pl/lang.php
@@ -246,71 +246,5 @@ return [
         'manage_layouts' => 'Zarządzaj układami',
         'manage_partials' => 'Zarządzaj blokami',
         'manage_themes' => 'Zarządzaj motywami',
-        'manage_media' => 'Manage mediami'
     ],
-    'mediafinder' => [
-        'default_prompt' => 'Kliknij przycisk %s aby znaleźć element'
-    ],
-    'media' => [
-        'invalid_path' => "Wybrano nieprawidłową ścieżkę pliku: ':path'.",
-        'menu_label' => 'Media',
-        'upload' => 'Prześlij',
-        'move' => 'Przenieś',
-        'delete' => 'Usuń',
-        'add_folder' => 'Dodaj folder',
-        'search' => 'Szukaj',
-        'display' => 'Pokaż',
-        'filter_everything' => 'Wszystko',
-        'filter_images' => 'Obrazki',
-        'filter_video' => 'Filmy',
-        'filter_audio' => 'Dźwięki',
-        'filter_documents' => 'Dokumenty',
-        'library' => 'Biblioteka',
-        'folder_size_items' => 'element(y)',
-        'size' => 'Rozmiar',
-        'title' => 'Tytuł',
-        'last_modified' => 'Data modyfikacji',
-        'public_url' => 'Publiczny URL',
-        'click_here' => 'Kliknij tutaj',
-        'thumbnail_error' => 'Wystąpił błąd przy tworzeniu miniatury.',
-        'return_to_parent' => 'Wróć do folderu nadrzędnego',
-        'return_to_parent_label' => 'Idź w górę ..',
-        'nothing_selected' => 'Nic nie zaznaczono.',
-        'multiple_selected' => 'Wybrano wiele elementów.',
-        'uploading_file_num' => 'Przesyłanie :number pliku(ów)...',
-        'uploading_complete' => 'Przesyłanie zakończone',
-        'uploading_error' => 'Błąd przesyłania pliku',
-        'type_blocked' => 'Typ pliku jest zablokowany ze względów bezpieczeństwa.',
-        'order_by' => 'Sortowanie',
-        'folder' => 'Folder',
-        'no_files_found' => 'Nie znaleziono żadnych pasujących elementów.',
-        'delete_empty' => 'Wybierz elementy do usunięcia.',
-        'delete_confirm' => 'Czy na pewno chcesz usunąć wybrane elementy?',
-        'error_renaming_file' => 'Wystąpił błąd przy zmianie nazwy elementu.',
-        'new_folder_title' => 'Nowy folder',
-        'folder_name' => 'Nazwa folderu',
-        'error_creating_folder' => 'Wystąpił błąd przy tworzeniu folderu',
-        'folder_or_file_exist' => 'Folder lub plik o podanej nazwie już istnieje.',
-        'move_empty' => 'Wybierz elementy do przeniesienia.',
-        'move_popup_title' => 'Przenieś pliki lub foldery',
-        'move_destination' => 'Folder docelowy',
-        'please_select_move_dest' => 'Wybierz folder docelowy.',
-        'move_dest_src_match' => 'Wybierz inny folder docelowy.',
-        'empty_library' => 'Biblioteka Mediów jest pusta. Na początek prześlij pliki lub utwórz foldery.',
-        'insert' => 'Wstaw',
-        'crop_and_insert' => 'Przytnij lub wstaw',
-        'select_single_image' => 'Wybierz pojedynczy obrazek.',
-        'selection_not_image' => 'Wybrany element nie jest obrazkiem.',
-        'restore' => 'Cofnij wszystkie zmiany',
-        'resize' => 'Skaluj...',
-        'selection_mode_normal' => 'Normalny',
-        'selection_mode_fixed_ratio' => 'Zablokuj proporcje',
-        'selection_mode_fixed_size' => 'Zablokuj rozmiar',
-        'height' => 'Wysokość',
-        'width' => 'Szerokość',
-        'selection_mode' => 'Tryb zaznaczenia',
-        'resize_image' => 'Zmień rozmiar obrazka',
-        'image_size' => 'Rozmiar obrazka:',
-        'selected_size' => 'Wybrano:'
-    ]
 ];
diff --git a/modules/cms/lang/pt-br/lang.php b/modules/cms/lang/pt-br/lang.php
index 60662118e..2ef24ed20 100644
--- a/modules/cms/lang/pt-br/lang.php
+++ b/modules/cms/lang/pt-br/lang.php
@@ -245,71 +245,5 @@ return [
         'manage_layouts' => 'Gerenciar esboços',
         'manage_partials' => 'Gerenciar blocos',
         'manage_themes' => 'Gerenciar temas',
-        'manage_media' => 'Gerenciar mídias'
     ],
-    'mediafinder' => [
-        'default_prompt' => 'Clique no botão %s para localizar um arquivo de mídia'
-    ],
-    'media' => [
-        'invalid_path' => "Caminho especificado inválido: ':path'.",
-        'menu_label' => 'Mídias',
-        'upload' => 'Enviar',
-        'move' => 'Mover',
-        'delete' => 'Excluir',
-        'add_folder' => 'Adicionar pasta',
-        'search' => 'Buscar',
-        'display' => 'Exibir',
-        'filter_everything' => 'Tudo',
-        'filter_images' => 'Imagens',
-        'filter_video' => 'Vídeos',
-        'filter_audio' => 'Áudios',
-        'filter_documents' => 'Documentos',
-        'library' => 'Biblioteca',
-        'folder_size_items' => 'item(s)',
-        'size' => 'Tamanho',
-        'title' => 'Título',
-        'last_modified' => 'Última modificação',
-        'public_url' => 'URL pública',
-        'click_here' => 'Clique aqui',
-        'thumbnail_error' => 'Erro ao gerar a miniatura.',
-        'return_to_parent' => 'Retornar ao diretório anterior',
-        'return_to_parent_label' => 'Vá para ..',
-        'nothing_selected' => 'Nenhum item selecionado.',
-        'multiple_selected' => 'Múltiplos itens selecionados.',
-        'uploading_file_num' => 'Enviando :number arquivo(s)...',
-        'uploading_complete' => 'Envio finalizado',
-        'uploading_error' => 'Falha no envio',
-        'type_blocked' => 'O tipo de arquivo utilizado é bloqueado por motivos de segurança.',
-        'order_by' => 'Ordenar por',
-        'folder' => 'Pasta',
-        'no_files_found' => 'Nenhum arquivo encontrado.',
-        'delete_empty' => 'Por favor, selecione um item para excluir.',
-        'delete_confirm' => 'Você deseja mesmo excluir o(s) arquivo(s) selecionado(s)?',
-        'error_renaming_file' => 'Erro ao renomear o arquivo.',
-        'new_folder_title' => 'Nova pasta',
-        'folder_name' => 'Nome da pasta',
-        'error_creating_folder' => 'Erro ao criar a pasta',
-        'folder_or_file_exist' => 'Uma pasta ou arquivo já existe com o nome especificado.',
-        'move_empty' => 'Por favor, selecione um item para mover.',
-        'move_popup_title' => 'Mover arquivos ou pastas',
-        'move_destination' => 'Pasta destino',
-        'please_select_move_dest' => 'Por favor, selecione a pasta destino.',
-        'move_dest_src_match' => 'Por favor, selecione outra pasta destino.',
-        'empty_library' => 'A biblioteca de mídias está vazia. Envie arquivos ou crie pastas para iniciar.',
-        'insert' => 'Inserir',
-        'crop_and_insert' => 'Cortar & Inserir',
-        'select_single_image' => 'Por favor, selecione uma única imagem.',
-        'selection_not_image' => 'O arquivo selecionado não é uma imagem.',
-        'restore' => 'Desfazer todas as alterações',
-        'resize' => 'Redimensionar...',
-        'selection_mode_normal' => 'Normal',
-        'selection_mode_fixed_ratio' => 'Proporção fixa',
-        'selection_mode_fixed_size' => 'Tamanho fixo',
-        'height' => 'Altura',
-        'width' => 'Largura',
-        'selection_mode' => 'Modo de seleção',
-        'resize_image' => 'Redimensionar imagem',
-        'image_size' => 'Tamanho da imagem:',
-        'selected_size' => 'Selecionado:'
-    ]
 ];
diff --git a/modules/cms/lang/pt-pt/lang.php b/modules/cms/lang/pt-pt/lang.php
index 9bc4cbb01..27979ebd7 100644
--- a/modules/cms/lang/pt-pt/lang.php
+++ b/modules/cms/lang/pt-pt/lang.php
@@ -258,73 +258,6 @@ return [
         'manage_layouts' => 'Gerir esboços',
         'manage_partials' => 'Gerir blocos',
         'manage_themes' => 'Gerir temas',
-        'manage_media' => 'Gerir conteúdo multimédia'
-    ],
-    'mediafinder' => [
-        'label' => 'Localizador de multimédia',
-        'default_prompt' => 'Clique no botão %s para localizar um ficheiro multimédia'
-    ],
-    'media' => [
-        'invalid_path' => "Caminho especificado inválido: ':path'.",
-        'menu_label' => 'Conteúdos',
-        'upload' => 'Enviar',
-        'move' => 'Mover',
-        'delete' => 'Excluir',
-        'add_folder' => 'Adicionar pasta',
-        'search' => 'Procurar',
-        'display' => 'Mostrar',
-        'filter_everything' => 'Tudo',
-        'filter_images' => 'Imagens',
-        'filter_video' => 'Vídeos',
-        'filter_audio' => 'Áudios',
-        'filter_documents' => 'Documentos',
-        'library' => 'Biblioteca',
-        'folder_size_items' => 'item(s)',
-        'size' => 'Tamanho',
-        'title' => 'Título',
-        'last_modified' => 'Última modificação',
-        'public_url' => 'URL pública',
-        'click_here' => 'Clique aqui',
-        'thumbnail_error' => 'Erro ao gerar a miniatura.',
-        'return_to_parent' => 'Retornar à diretoria anterior',
-        'return_to_parent_label' => 'Acima ..',
-        'nothing_selected' => 'Nenhum item selecionado.',
-        'multiple_selected' => 'Múltiplos itens selecionados.',
-        'uploading_file_num' => 'Enviando :number ficheiro(s)...',
-        'uploading_complete' => 'Envio finalizado',
-        'uploading_error' => 'Falha no envio',
-        'type_blocked' => 'O tipo de ficheiro utilizado é bloqueado por motivos de segurança.',
-        'order_by' => 'Ordenar por',
-        'folder' => 'Pasta',
-        'no_files_found' => 'Nenhum ficheiro encontrado.',
-        'delete_empty' => 'Por favor, selecione itens para apagar.',
-        'delete_confirm' => 'Deseja apagar o(s) ficheiro(s) selecionado(s)?',
-        'error_renaming_file' => 'Erro ao renomear o ficheiro.',
-        'new_folder_title' => 'Nova pasta',
-        'folder_name' => 'Nome da pasta',
-        'error_creating_folder' => 'Erro ao criar a pasta',
-        'folder_or_file_exist' => 'Uma pasta ou ficheiro já existe com o nome especificado.',
-        'move_empty' => 'Por favor, selecione os itens para mover.',
-        'move_popup_title' => 'Mover ficheiros ou pastas',
-        'move_destination' => 'Pasta destino',
-        'please_select_move_dest' => 'Por favor, selecione a pasta de destino.',
-        'move_dest_src_match' => 'Por favor, selecione outra pasta de destino.',
-        'empty_library' => 'A biblioteca de multimédia, está vazia. Envie ficheiros ou crie pastas para iniciar.',
-        'insert' => 'Inserir',
-        'crop_and_insert' => 'Cortar & Inserir',
-        'select_single_image' => 'Por favor, selecione uma única imagem.',
-        'selection_not_image' => 'O ficheiro selecionado não é uma imagem.',
-        'restore' => 'Desfazer todas as alterações',
-        'resize' => 'Redimensionar...',
-        'selection_mode_normal' => 'Normal',
-        'selection_mode_fixed_ratio' => 'Proporção fixa',
-        'selection_mode_fixed_size' => 'Tamanho fixo',
-        'height' => 'Altura',
-        'width' => 'Largura',
-        'selection_mode' => 'Modo de seleção',
-        'resize_image' => 'Redimensionar imagem',
-        'image_size' => 'Tamanho da imagem:',
-        'selected_size' => 'Selecionado:'
     ],
     'theme_log' => [
         'hint' => 'Este registo mostra as alterações efectuadas ao tema por administradores na área de backend.',
diff --git a/modules/cms/lang/ru/lang.php b/modules/cms/lang/ru/lang.php
index 3c6ec3f18..43e749e4c 100644
--- a/modules/cms/lang/ru/lang.php
+++ b/modules/cms/lang/ru/lang.php
@@ -260,73 +260,6 @@ return [
         'manage_partials' => 'Управление фрагментами',
         'manage_themes' => 'Управление темами',
         'manage_theme_options' => 'Настроить текущую тему CMS',
-        'manage_media' => 'Управление медиафайлами'
-    ],
-    'mediafinder' => [
-        'label' => 'Поиск медиа',
-        'default_prompt' => 'Кликните на кнопку %s, чтобы найти медиафайл'
-    ],
-    'media' => [
-        'invalid_path' => "Указан недопустимый путь к файлу: ':path'.",
-        'menu_label' => 'Медиафайлы',
-        'upload' => 'Загрузить',
-        'move' => 'Переместить',
-        'delete' => 'Удалить',
-        'add_folder' => 'Создать папку',
-        'search' => 'Поиск',
-        'display' => 'Отобразить',
-        'filter_everything' => 'Все файлы',
-        'filter_images' => 'Изображения',
-        'filter_video' => 'Видео',
-        'filter_audio' => 'Музыка',
-        'filter_documents' => 'Документы',
-        'library' => 'Библиотека',
-        'folder_size_items' => 'объектов',
-        'size' => 'Размер',
-        'title' => 'Имя',
-        'last_modified' => 'Последнее изменение',
-        'public_url' => 'Публичный адрес',
-        'click_here' => 'Нажмите здесь',
-        'thumbnail_error' => 'Ошибка создания миниатюры.',
-        'return_to_parent' => 'Вернуться в родительскую папку',
-        'return_to_parent_label' => 'Подняться на уровень выше ..',
-        'nothing_selected' => 'Ничего не выбрано.',
-        'multiple_selected' => 'Выбрано несколько объектов.',
-        'uploading_file_num' => 'Загрузка файлов: :number',
-        'uploading_complete' => 'Загрузка файлов завершена!',
-        'uploading_error' => 'Ошибка загрузки',
-        'type_blocked' => 'Используемый тип файла блокируется по соображениям безопасности.',
-        'order_by' => 'Сортировать по',
-        'folder' => 'Папка',
-        'no_files_found' => 'Ни один из файлов не удовлетворяет вашему запросу.',
-        'delete_empty' => 'Пожалуйста, выберите объекты для удаления.',
-        'delete_confirm' => 'Вы действительно хотите удалить выбранные объекты?',
-        'error_renaming_file' => 'Ошибка изменения имени файла.',
-        'new_folder_title' => 'Новая папка',
-        'folder_name' => 'Название папки',
-        'error_creating_folder' => 'Ошибка создания папки',
-        'folder_or_file_exist' => 'Папка или файл с таким именем уже существует.',
-        'move_empty' => 'Пожалуйста, выберите объекты для перемещения.',
-        'move_popup_title' => 'Перемещение файлов или папок',
-        'move_destination' => 'Папка назначения',
-        'please_select_move_dest' => 'Пожалуйста, выберите папку назначения для перемещения.',
-        'move_dest_src_match' => 'Пожалуйста, выберите другую папку.',
-        'empty_library' => 'Библиотека медиафайлов пуста. Для начала загрузите файлы или создайте папки.',
-        'insert' => 'Вставить',
-        'crop_and_insert' => 'Обрезать и вставить',
-        'select_single_image' => 'Пожалуйста, выберите одно изображение.',
-        'selection_not_image' => 'Выбранный элемент не является изображением.',
-        'restore' => 'Отменить все изменения',
-        'resize' => 'Изменение размера...',
-        'selection_mode_normal' => 'Нормальный',
-        'selection_mode_fixed_ratio' => 'Фиксированное соотношение',
-        'selection_mode_fixed_size' => 'Фиксированный размер',
-        'height' => 'Высота',
-        'width' => 'Ширина',
-        'selection_mode' => 'Режим выделения',
-        'resize_image' => 'Изменение размера изображения',
-        'image_size' => 'Размер изображения:',
-        'selected_size' => 'Выбрано:'
     ],
     'theme_log' => [
         'hint' => 'В этом журнале отображаются изменения, внесенные в тему администраторами во внутренней области CMS.',
diff --git a/modules/cms/lang/sv/lang.php b/modules/cms/lang/sv/lang.php
index 61c66ac90..30adf256e 100644
--- a/modules/cms/lang/sv/lang.php
+++ b/modules/cms/lang/sv/lang.php
@@ -238,69 +238,5 @@ return [
         'manage_layouts' => 'Hantera layouts',
         'manage_partials' => 'Hantera partials',
         'manage_themes' => 'Hantera teman',
-        'manage_media' => 'Hantera media'
     ],
-    'mediafinder' => [
-        'default_prompt' => 'Klicka på %s knappen för att hitta ett mediaföremål'
-    ],
-    'media' => [
-        'invalid_path' => "Felaktig filsökväg angiven: ':path'.",
-        'menu_label' => 'Media',
-        'upload' => 'Ladda upp',
-        'move' => 'Flytta',
-        'delete' => 'Radera',
-        'add_folder' => 'Ny mapp',
-        'search' => 'Sök',
-        'display' => 'Visa',
-        'filter_everything' => 'Allt',
-        'filter_images' => 'Bilder',
-        'filter_video' => 'Videor',
-        'filter_audio' => 'Ljud',
-        'filter_documents' => 'Dokument',
-        'library' => 'Bibliotek',
-        'folder_size_items' => 'föremål',
-        'size' => 'Storlek',
-        'title' => 'Titel',
-        'last_modified' => 'Senast ändrad',
-        'public_url' => 'Publik URL',
-        'click_here' => 'Klicka här',
-        'thumbnail_error' => 'Fel vid generering av thumbnail.',
-        'return_to_parent' => 'Återgå till mappens förälder',
-        'return_to_parent_label' => 'Upp ..',
-        'nothing_selected' => 'Inget är valt.',
-        'multiple_selected' => 'Flera föremål valda.',
-        'uploading_file_num' => 'Laddar upp :number fil(er)...',
-        'uploading_complete' => 'Uppladdning slutförd',
-        'order_by' => 'Ordna efter',
-        'folder' => 'Mapp',
-        'no_files_found' => 'Inga filer kunde hittas baserat på din sökning.',
-        'delete_empty' => 'Vänligen välj föremål att radera.',
-        'delete_confirm' => 'Är du säker att du vill radera de valda föremålen?',
-        'error_renaming_file' => 'Fel vid namnbyte av föremålet.',
-        'new_folder_title' => 'Ny mapp',
-        'folder_name' => 'Mappnamn',
-        'error_creating_folder' => 'Fel vid skapande av mapp',
-        'folder_or_file_exist' => 'En mapp eller fil med det angivna namnet existerar redan.',
-        'move_empty' => 'Vänligen välj föremål att flytta.',
-        'move_popup_title' => 'Flytta filer eller mappar',
-        'move_destination' => 'Destinationsmapp',
-        'please_select_move_dest' => 'Vänligen välj en destinationsmapp.',
-        'move_dest_src_match' => 'Vänligen välj en annan destinationsmapp.',
-        'empty_library' => 'Mediabiblioteket är tomt. Ladda upp filer eller skapa mappar för att börja.',
-        'insert' => 'Infoga',
-        'crop_and_insert' => 'Beskär & infoga',
-        'select_single_image' => 'Vänligen välj en enskild bild.',
-        'selection_not_image' => 'Det valda föremålet är inte en bild.',
-        'restore' => 'Ångra alla ändringar',
-        'resize' => 'Anpassa storlek...',
-        'selection_mode_normal' => 'Normal',
-        'selection_mode_fixed_ratio' => 'Fast proportion',
-        'selection_mode_fixed_size' => 'Fast storlek',
-        'height' => 'Höjd',
-        'width' => 'Bredd',
-        'selection_mode' => 'Urvalsläge',
-        'resize_image' => 'Anpassa bildstorlek',
-        'image_size' => 'Bildstorlek:',
-        'selected_size' => 'Vald:'
-    ]
 ];
diff --git a/modules/cms/lang/tr/lang.php b/modules/cms/lang/tr/lang.php
index 98e02013e..a6b0d5146 100644
--- a/modules/cms/lang/tr/lang.php
+++ b/modules/cms/lang/tr/lang.php
@@ -246,71 +246,5 @@ return [
         'manage_layouts' => 'Şablonları düzenleyebilsin',
         'manage_partials' => 'Parça Kodları düzenleyebilsin',
         'manage_themes' => 'Temaları düzenleyebilsin',
-        'manage_media' => 'Medyaları düzenleyebilsin'
     ],
-    'mediafinder' => [
-        'default_prompt' => 'Bir medya öğesi bulmak için %s butonuna tıklayın'
-    ],
-    'media' => [
-        'invalid_path' => "Geçersiz dosya dizini belirtildi: ':path'.",
-        'menu_label' => 'Medya',
-        'upload' => 'Yükle',
-        'move' => 'Taşı',
-        'delete' => 'Sil',
-        'add_folder' => 'Yeni Klasör',
-        'search' => 'Ara',
-        'display' => 'Görüntüle',
-        'filter_everything' => 'Her şey',
-        'filter_images' => 'Resimler',
-        'filter_video' => 'Video',
-        'filter_audio' => 'Ses',
-        'filter_documents' => 'Belgeler',
-        'library' => 'Kütüphane',
-        'folder_size_items' => 'öğe(ler)',
-        'size' => 'Boyut',
-        'title' => 'Başlık',
-        'last_modified' => 'Son düzenleme tarihi',
-        'public_url' => 'Public URL',
-        'click_here' => 'Buraya tıkla',
-        'thumbnail_error' => 'Önizleme oluşturulurken hata.',
-        'return_to_parent' => 'Ana klasöre geri dön',
-        'return_to_parent_label' => 'Yukarı git..',
-        'nothing_selected' => 'Hiçbir şey seçilmedi.',
-        'multiple_selected' => 'Birden fazla öğe seçildi.',
-        'uploading_file_num' => ':number adet dosya yükleniyor...',
-        'uploading_complete' => 'Yükleme tamamlandı',
-        'uploading_error' => 'Yükleme hatası',
-        'type_blocked' => 'Seçilen dosya türünü güvenlik nedenleriyle izin verilmiyor.',
-        'order_by' => 'Sırala',
-        'folder' => 'Klasör',
-        'no_files_found' => 'İsteğiniz doğrultusunda hiçbir dosya bulunamadı.',
-        'delete_empty' => 'Lütfen silinecek öğeleri seçiniz.',
-        'delete_confirm' => 'Bu öğe veya öğeleri gerçekten silmek istediğinize emin misiniz?',
-        'error_renaming_file' => 'Öğeyi yeniden isimlendirirken hata.',
-        'new_folder_title' => 'Yeni Klasör',
-        'folder_name' => 'Klasör ismi',
-        'error_creating_folder' => 'Klasör oluştururken hata',
-        'folder_or_file_exist' => 'Belirtilen isimde bir klasör ya da dosya zaten mevcut.',
-        'move_empty' => 'Lütfen taşınacak öğeleri seçiniz.',
-        'move_popup_title' => 'Dosyaları veya klasörleri taşı',
-        'move_destination' => 'Hedef klasör',
-        'please_select_move_dest' => 'Lütfen hedef klasörü seçiniz.',
-        'move_dest_src_match' => 'Lütfen başka bir hedef klasör seçiniz.',
-        'empty_library' => 'Medya kütüphanesi boş. Başlamak için dosya yükleyin yada klasör oluşturun.',
-        'insert' => 'Ekle',
-        'crop_and_insert' => 'Kırp ve Ekle',
-        'select_single_image' => 'Lütfen sadece bir tane resim seçiniz.',
-        'selection_not_image' => 'Seçili öğe bir resim değil.',
-        'restore' => 'Tüm değişiklikleri geri al',
-        'resize' => 'Yeniden boyutlandırma...',
-        'selection_mode_normal' => 'Normal',
-        'selection_mode_fixed_ratio' => 'Sabit oran',
-        'selection_mode_fixed_size' => 'Sabit boyut',
-        'height' => 'Yükseklik',
-        'width' => 'Genişlik',
-        'selection_mode' => 'Seçim modu',
-        'resize_image' => 'Resimi yeniden boyutlandırs',
-        'image_size' => 'Resim boyutu:',
-        'selected_size' => 'Seçili:'
-    ]
 ];
diff --git a/modules/cms/lang/uk/lang.php b/modules/cms/lang/uk/lang.php
index 2bea90eec..7632ea263 100644
--- a/modules/cms/lang/uk/lang.php
+++ b/modules/cms/lang/uk/lang.php
@@ -260,73 +260,6 @@ return [
         'manage_partials' => 'Керування фрагментами',
         'manage_themes' => 'Керування темами',
         'manage_theme_options' => 'Налаштувати поточну тему CMS',
-        'manage_media' => 'Керування медіафайлами'
-    ],
-    'mediafinder' => [
-        'label' => 'Пошук медіа',
-        'default_prompt' => 'Натисніть на кнопку %s, щоб знайти медіафайл'
-    ],
-    'media' => [
-        'invalid_path' => 'Вказано неприпустимий шлях до файлу: ":path".',
-        'menu_label' => 'Медіафайли',
-        'upload' => 'Завантажити',
-        'move' => 'Перемістити',
-        'delete' => 'Видалити',
-        'add_folder' => 'Створити папку',
-        'search' => 'Пошук',
-        'display' => 'Показати',
-        'filter_everything' => 'Всі файли',
-        'filter_images' => 'Зображення',
-        'filter_video' => 'Відео',
-        'filter_audio' => 'Музика',
-        'filter_documents' => 'Документи',
-        'library' => 'Бібліотека',
-        'folder_size_items' => 'Об\'єктів',
-        'size' => 'Розмір',
-        'title' => 'Ім\'я',
-        'last_modified' => 'Остання зміна',
-        'public_url' => 'Публічна адреса',
-        'click_here' => 'Натисніть тут',
-        'thumbnail_error' => 'Помилка створення мініатюри.',
-        'return_to_parent' => 'Повернутися до батьківської папки',
-        'return_to_parent_label' => 'Піднятися на рівень вище...',
-        'nothing_selected' => 'Нічого не обрано.',
-        'multiple_selected' => 'Обрано кілька об\'єктів.',
-        'uploading_file_num' => 'Завантаження файлів: :number',
-        'uploading_complete' => 'Завантаження файлів завершено!',
-        'uploading_error' => 'Помилка завантаження',
-        'type_blocked' => 'Тип файлу, який використовується заблокований з міркувань безпеки.',
-        'order_by' => 'Сортувати за',
-        'folder' => 'Папка',
-        'no_files_found' => 'Жоден з файлів не задовольняє вашому запиту.',
-        'delete_empty' => 'Будь ласка, оберіть об\'єкти для видалення.',
-        'delete_confirm' => 'Ви дійсно хочете видалити вибрані об\'єкти?',
-        'error_renaming_file' => 'Помилка зміни імені файлу.',
-        'new_folder_title' => 'Нова папка',
-        'folder_name' => 'Назва папки',
-        'error_creating_folder' => 'Помилка створення папки',
-        'folder_or_file_exist' => 'Папка або файл з таким ім\'ям вже існує.',
-        'move_empty' => 'Будь ласка, оберіть об\'єкти для переміщення.',
-        'move_popup_title' => 'Переміщення файлів або папок',
-        'move_destination' => 'Папка призначення',
-        'please_select_move_dest' => 'Будь ласка, оберіть папку призначення для переміщення.',
-        'move_dest_src_match' => 'Будь ласка, оберіть іншу папку.',
-        'empty_library' => 'Бібліотека медіафайлів порожня. Для початку завантажте файли або створіть папки.',
-        'insert' => 'Вставити',
-        'crop_and_insert' => 'Обрізати і вставити',
-        'select_single_image' => 'Будь ласка, оберіть одне зображення.',
-        'selection_not_image' => 'Обраний елемент не є зображенням.',
-        'restore' => 'Скасувати всі зміни',
-        'resize' => 'Зміна розміру...',
-        'selection_mode_normal' => 'Нормальний',
-        'selection_mode_fixed_ratio' => 'Фіксоване співвідношення',
-        'selection_mode_fixed_size' => 'Фіксований розмір',
-        'height' => 'Висота',
-        'width' => 'Ширина',
-        'selection_mode' => 'Режим виділення',
-        'resize_image' => 'Зміна розміру зображення',
-        'image_size' => 'Розмір зображення:',
-        'selected_size' => 'Обрано:'
     ],
     'theme_log' => [
         'hint' => 'Цей журнал відображає будь-які зміни, внесені до теми адміністраторами в задній частині області CMS.',
diff --git a/modules/cms/lang/zh-cn/lang.php b/modules/cms/lang/zh-cn/lang.php
index c1ad74dcc..03327b28b 100644
--- a/modules/cms/lang/zh-cn/lang.php
+++ b/modules/cms/lang/zh-cn/lang.php
@@ -240,66 +240,5 @@ return [
         'manage_layouts' => '管理布局',
         'manage_partials' => '管理部件',
         'manage_themes' => '管理主题',
-        'manage_media' => '管理媒体'
     ],
-   'media' => [
-        'invalid_path' => "不合法的路径: ':path'.",
-        'menu_label' => '媒体',
-        'upload' => '上传',
-        'move' => '移动',
-        'delete' => '删除',
-        'add_folder' => '增加文件夹',
-        'search' => '搜索',
-        'display' => '显示',
-        'filter_everything' => '所有',
-        'filter_images' => '图片',
-        'filter_video' => '视频',
-        'filter_audio' => '音频',
-        'filter_documents' => '文档',
-        'library' => '库',
-        'folder_size_items' => '个数',
-        'size' => '大小',
-        'title' => '标题',
-        'last_modified' => '最近修改',
-        'public_url' => '公开URL',
-        'click_here' => '点击这里',
-        'thumbnail_error' => '生产缩略图错误.',
-        'return_to_parent' => '返回上层文件夹',
-        'return_to_parent_label' => '返回 ..',
-        'nothing_selected' => '没有选中.',
-        'multiple_selected' => '多选.',
-        'uploading_file_num' => '上传 :number 文件...',
-        'uploading_complete' => '上传完毕',
-        'order_by' => '排序',
-        'folder' => '文件夹',
-        'no_files_found' => '没找到你请求的文件.',
-        'delete_empty' => '请选择删除项.',
-        'delete_confirm' => '你是否想要删除选中项?',
-        'error_renaming_file' => '重命名错误.',
-        'new_folder_title' => '新文件',
-        'folder_name' => '文件夹名',
-        'error_creating_folder' => '新建文件夹错误',
-        'folder_or_file_exist' => '文件夹或文件已经存在.',
-        'move_empty' => '请选择移动项.',
-        'move_popup_title' => '移动文件或文件夹',
-        'move_destination' => '目标文件夹',
-        'please_select_move_dest' => '请选择目标文件夹.',
-        'move_dest_src_match' => '请选择另一个目标文件夹.',
-        'empty_library' => '媒体库是空的. 从上传文件或创建文件夹开始.',
-        'insert' => '插入',
-        'crop_and_insert' => '裁剪并插入',
-        'select_single_image' => '请选择一张图片.',
-        'selection_not_image' => '选择的不是一张图片.',
-        'restore' => '取消所有更改',
-        'resize' => '调整大小...',
-        'selection_mode_normal' => '正常',
-        'selection_mode_fixed_ratio' => '固定比例',
-        'selection_mode_fixed_size' => '固定大小',
-        'height' => '高度',
-        'width' => '宽度',
-        'selection_mode' => '选择模式',
-        'resize_image' => '调整图片',
-        'image_size' => '图片大小:',
-        'selected_size' => '选中:'
-    ]
 ];
diff --git a/modules/cms/lang/zh-tw/lang.php b/modules/cms/lang/zh-tw/lang.php
index e59cb2e27..9cbed535f 100644
--- a/modules/cms/lang/zh-tw/lang.php
+++ b/modules/cms/lang/zh-tw/lang.php
@@ -239,64 +239,4 @@ return [
         'manage_partials' => '管理部件',
         'manage_themes' => '管理主題'
     ],
-   'media' => [
-        'invalid_path' => "不合法的路徑: ':path'.",
-        'menu_label' => '媒體',
-        'upload' => '上傳',
-        'move' => '移動',
-        'delete' => '刪除',
-        'add_folder' => '增加檔案夾',
-        'search' => '搜尋',
-        'display' => '顯示',
-        'filter_everything' => '所有',
-        'filter_images' => '圖片',
-        'filter_video' => '視頻',
-        'filter_audio' => '音頻',
-        'filter_documents' => '文檔',
-        'library' => '庫',
-        'folder_size_items' => '個數',
-        'size' => '大小',
-        'title' => '標題',
-        'last_modified' => '最近修改',
-        'public_url' => '公開URL',
-        'click_here' => '點選這裡',
-        'thumbnail_error' => '生產縮略圖錯誤.',
-        'return_to_parent' => '返回上層檔案夾',
-        'return_to_parent_label' => '返回 ..',
-        'nothing_selected' => '沒有選中.',
-        'multiple_selected' => '多選.',
-        'uploading_file_num' => '上傳 :number 檔案...',
-        'uploading_complete' => '上傳完畢',
-        'order_by' => '排序',
-        'folder' => '檔案夾',
-        'no_files_found' => '沒找到您請求的檔案.',
-        'delete_empty' => '請選擇刪除項.',
-        'delete_confirm' => '您是否想要刪除選中項?',
-        'error_renaming_file' => '重命名錯誤.',
-        'new_folder_title' => '新檔案',
-        'folder_name' => '檔案夾名',
-        'error_creating_folder' => '新建檔案夾錯誤',
-        'folder_or_file_exist' => '檔案夾或檔案已經存在.',
-        'move_empty' => '請選擇移動項.',
-        'move_popup_title' => '移動檔案或檔案夾',
-        'move_destination' => '目標檔案夾',
-        'please_select_move_dest' => '請選擇目標檔案夾.',
-        'move_dest_src_match' => '請選擇另一個目標檔案夾.',
-        'empty_library' => '媒體庫是空的. 從上傳檔案或建立檔案夾開始.',
-        'insert' => '插入',
-        'crop_and_insert' => '裁剪並插入',
-        'select_single_image' => '請選擇一張圖片.',
-        'selection_not_image' => '選擇的不是一張圖片.',
-        'restore' => '取消所有更改',
-        'resize' => '調整大小...',
-        'selection_mode_normal' => '正常',
-        'selection_mode_fixed_ratio' => '固定比例',
-        'selection_mode_fixed_size' => '固定大小',
-        'height' => '高度',
-        'width' => '寬度',
-        'selection_mode' => '選擇模式',
-        'resize_image' => '調整圖片',
-        'image_size' => '圖片大小:',
-        'selected_size' => '選中:'
-    ]
 ];
diff --git a/modules/cms/twig/Extension.php b/modules/cms/twig/Extension.php
index 79725d046..8d6451f83 100644
--- a/modules/cms/twig/Extension.php
+++ b/modules/cms/twig/Extension.php
@@ -59,7 +59,6 @@ class Extension extends Twig_Extension
         return [
             new Twig_SimpleFilter('page', [$this, 'pageFilter'], ['is_safe' => ['html']]),
             new Twig_SimpleFilter('theme', [$this, 'themeFilter'], ['is_safe' => ['html']]),
-            new Twig_SimpleFilter('media', [$this, 'mediaFilter'], ['is_safe' => ['html']]),
         ];
     }
 
@@ -176,16 +175,6 @@ class Extension extends Twig_Extension
         return $this->controller->themeUrl($url);
     }
 
-    /**
-     * Converts supplied file to a URL relative to the media library.
-     * @param string $file Specifies the media-relative file
-     * @return string
-     */
-    public function mediaFilter($file)
-    {
-        return $this->controller->mediaUrl($file);
-    }
-
     /**
      * Opens a layout block.
      * @param string $name Specifies the block name
diff --git a/modules/cms/widgets/MediaManager.php b/modules/cms/widgets/MediaManager.php
index ee12c90e0..acdfb16f1 100644
--- a/modules/cms/widgets/MediaManager.php
+++ b/modules/cms/widgets/MediaManager.php
@@ -1,1414 +1,26 @@
 <?php namespace Cms\Widgets;
 
-use Url;
-use Str;
-use Lang;
-use File;
-use Form;
-use Input;
-use Config;
-use Request;
-use Response;
-use Exception;
-use SystemException;
-use ApplicationException;
-use Backend\Classes\WidgetBase;
-use Cms\Classes\MediaLibrary;
-use Cms\Classes\MediaLibraryItem;
-use October\Rain\Database\Attach\Resizer;
-use October\Rain\Filesystem\Definitions as FileDefinitions;
+use Backend\Widgets\MediaManager as BackendMediaManager;
 
 /**
  * Media Manager widget.
  *
  * @package october\cms
  * @author Alexey Bobkov, Samuel Georges
+ * @deprecated Use Backend\Widgets\MediaManager. Remove if year >= 2020.
  */
-class MediaManager extends WidgetBase
+class MediaManager extends BackendMediaManager
 {
-    const FOLDER_ROOT = '/';
-
-    const VIEW_MODE_GRID = 'grid';
-    const VIEW_MODE_LIST = 'list';
-    const VIEW_MODE_TILES = 'tiles';
-
-    const SELECTION_MODE_NORMAL = 'normal';
-    const SELECTION_MODE_FIXED_RATIO = 'fixed-ratio';
-    const SELECTION_MODE_FIXED_SIZE = 'fixed-size';
-
-    const FILTER_EVERYTHING = 'everything';
-
-    protected $brokenImageHash = null;
-
-    /**
-     * @var boolean Determines whether the bottom toolbar is visible.
-     */
-    public $bottomToolbar = false;
-
-    /**
-     * @var boolean Determines whether the Crop & Insert button is visible.
-     */
-    public $cropAndInsertButton = false;
-
     /**
      * Constructor.
      */
-    public function __construct($controller, $alias)
+    public function __construct()
     {
-        $this->alias = $alias;
+        traceLog('Widget Cms\Widgets\MediaManager has been deprecated, use Backend\Widgets\MediaManager instead.');
 
-        parent::__construct($controller, []);
+        $this->assetPath = '/modules/backend/widgets/mediamanager/assets';
+        $this->viewPath = base_path('/modules/backend/widgets/mediamanager/partials');
 
-        $this->checkUploadPostback();
+        parent::__construct(...func_get_args());
     }
-
-    /**
-     * Adds widget specific asset files. Use $this->addJs() and $this->addCss()
-     * to register new assets to include on the page.
-     * @return void
-     */
-    protected function loadAssets()
-    {
-        $this->addCss('css/mediamanager.css', 'core');
-        $this->addJs('js/mediamanager-browser-min.js', 'core');
-    }
-
-    /**
-     * Renders the widget.
-     * @return string
-     */
-    public function render()
-    {
-        $this->prepareVars();
-
-        return $this->makePartial('body');
-    }
-
-    //
-    // Event handlers
-    //
-
-    public function onSearch()
-    {
-        $this->setSearchTerm(Input::get('search'));
-
-        $this->prepareVars();
-
-        return [
-            '#'.$this->getId('item-list') => $this->makePartial('item-list'),
-            '#'.$this->getId('folder-path') => $this->makePartial('folder-path')
-        ];
-    }
-
-    public function onGoToFolder()
-    {
-        $path = Input::get('path');
-
-        if (Input::get('clearCache')) {
-            MediaLibrary::instance()->resetCache();
-        }
-
-        if (Input::get('resetSearch')) {
-            $this->setSearchTerm(null);
-        }
-
-        $this->setCurrentFolder($path);
-        $this->prepareVars();
-
-        return [
-            '#'.$this->getId('item-list') => $this->makePartial('item-list'),
-            '#'.$this->getId('folder-path') => $this->makePartial('folder-path')
-        ];
-    }
-
-    public function onGenerateThumbnails()
-    {
-        $batch = Input::get('batch');
-        if (!is_array($batch)) {
-            return;
-        }
-
-        $result = [];
-        foreach ($batch as $thumbnailInfo) {
-            $result[] = $this->generateThumbnail($thumbnailInfo);
-        }
-
-        return [
-            'generatedThumbnails'=>$result
-        ];
-    }
-
-    public function onGetSidebarThumbnail()
-    {
-        $path = Input::get('path');
-        $lastModified = Input::get('lastModified');
-
-        $thumbnailParams = $this->getThumbnailParams();
-        $thumbnailParams['width'] = 300;
-        $thumbnailParams['height'] = 255;
-        $thumbnailParams['mode'] = 'auto';
-
-        $path = MediaLibrary::validatePath($path);
-
-        if (!is_numeric($lastModified)) {
-            throw new ApplicationException('Invalid input data');
-        }
-
-        /*
-         * If the thumbnail file exists, just return the thumbnail markup,
-         * otherwise generate a new thumbnail.
-         */
-        $thumbnailPath = $this->thumbnailExists($thumbnailParams, $path, $lastModified);
-        if ($thumbnailPath) {
-            return [
-                'markup' => $this->makePartial('thumbnail-image', [
-                    'isError' => $this->thumbnailIsError($thumbnailPath),
-                    'imageUrl' => $this->getThumbnailImageUrl($thumbnailPath)
-                ])
-            ];
-        }
-
-        $thumbnailInfo = $thumbnailParams;
-        $thumbnailInfo['path'] = $path;
-        $thumbnailInfo['lastModified'] = $lastModified;
-        $thumbnailInfo['id'] = 'sidebar-thumbnail';
-
-        return $this->generateThumbnail($thumbnailInfo, $thumbnailParams, true);
-    }
-
-    public function onChangeView()
-    {
-        $viewMode = Input::get('view');
-        $path = Input::get('path');
-
-        $this->setViewMode($viewMode);
-        $this->setCurrentFolder($path);
-
-        $this->prepareVars();
-
-        return [
-            '#'.$this->getId('item-list') => $this->makePartial('item-list'),
-            '#'.$this->getId('folder-path') => $this->makePartial('folder-path'),
-            '#'.$this->getId('view-mode-buttons') => $this->makePartial('view-mode-buttons')
-        ];
-    }
-
-    public function onSetFilter()
-    {
-        $filter = Input::get('filter');
-        $path = Input::get('path');
-
-        $this->setFilter($filter);
-        $this->setCurrentFolder($path);
-
-        $this->prepareVars();
-
-        return [
-            '#'.$this->getId('item-list') => $this->makePartial('item-list'),
-            '#'.$this->getId('folder-path') => $this->makePartial('folder-path'),
-            '#'.$this->getId('filters') => $this->makePartial('filters')
-        ];
-    }
-
-    public function onSetSorting()
-    {
-        $sortBy = Input::get('sortBy', $this->getSortBy());
-        $sortDirection = Input::get('sortDirection', $this->getSortDirection());
-        $path = Input::get('path');
-
-        $this->setSortBy($sortBy);
-        $this->setSortDirection($sortDirection);
-        $this->setCurrentFolder($path);
-
-        $this->prepareVars();
-
-        return [
-            '#'.$this->getId('item-list') => $this->makePartial('item-list'),
-            '#'.$this->getId('folder-path') => $this->makePartial('folder-path')
-        ];
-    }
-
-    public function onDeleteItem()
-    {
-        $paths = Input::get('paths');
-
-        if (!is_array($paths)) {
-            throw new ApplicationException('Invalid input data');
-        }
-
-        $library = MediaLibrary::instance();
-
-        $filesToDelete = [];
-        foreach ($paths as $pathInfo) {
-            $path = array_get($pathInfo, 'path');
-            $type = array_get($pathInfo, 'type');
-
-            if (!$path || !$type) {
-                throw new ApplicationException('Invalid input data');
-            }
-
-            if ($type === MediaLibraryItem::TYPE_FILE) {
-                /*
-                 * Add to bulk collection
-                 */
-                $filesToDelete[] = $path;
-            }
-            elseif ($type === MediaLibraryItem::TYPE_FOLDER) {
-                /*
-                 * Delete single folder
-                 */
-                $library->deleteFolder($path);
-
-                /*
-                 * Extensibility
-                 */
-                $this->fireSystemEvent('media.folder.delete', [$path]);
-            }
-        }
-
-        if (count($filesToDelete) > 0) {
-            /*
-             * Delete collection of files
-             */
-            $library->deleteFiles($filesToDelete);
-
-            /*
-             * Extensibility
-             */
-            foreach ($filesToDelete as $path) {
-                $this->fireSystemEvent('media.file.delete', [$path]);
-            }
-        }
-
-        $library->resetCache();
-        $this->prepareVars();
-
-        return [
-            '#'.$this->getId('item-list') => $this->makePartial('item-list')
-        ];
-    }
-
-    public function onLoadRenamePopup()
-    {
-        $path = Input::get('path');
-        $path = MediaLibrary::validatePath($path);
-
-        $this->vars['originalPath'] = $path;
-        $this->vars['name'] = basename($path);
-        $this->vars['listId'] = Input::get('listId');
-        $this->vars['type'] = Input::get('type');
-
-        return $this->makePartial('rename-form');
-    }
-
-    public function onApplyName()
-    {
-        $newName = trim(Input::get('name'));
-        if (!strlen($newName)) {
-            throw new ApplicationException(Lang::get('cms::lang.asset.name_cant_be_empty'));
-        }
-
-        if (!$this->validateFileName($newName)) {
-            throw new ApplicationException(Lang::get('cms::lang.asset.invalid_name'));
-        }
-
-        $originalPath = Input::get('originalPath');
-        $originalPath = MediaLibrary::validatePath($originalPath);
-        $newPath = dirname($originalPath).'/'.$newName;
-        $type = Input::get('type');
-
-        if ($type == MediaLibraryItem::TYPE_FILE) {
-            /*
-             * Validate extension
-             */
-            if (!$this->validateFileType($newName)) {
-                throw new ApplicationException(Lang::get('cms::lang.media.type_blocked'));
-            }
-
-            /*
-             * Move single file
-             */
-            MediaLibrary::instance()->moveFile($originalPath, $newPath);
-
-            /*
-             * Extensibility
-             */
-            $this->fireSystemEvent('media.file.rename', [$originalPath, $newPath]);
-        }
-        else {
-            /*
-             * Move single folder
-             */
-            MediaLibrary::instance()->moveFolder($originalPath, $newPath);
-
-            /*
-             * Extensibility
-             */
-            $this->fireSystemEvent('media.folder.rename', [$originalPath, $newPath]);
-        }
-
-        MediaLibrary::instance()->resetCache();
-    }
-
-    public function onCreateFolder()
-    {
-        $name = trim(Input::get('name'));
-        if (!strlen($name)) {
-            throw new ApplicationException(Lang::get('cms::lang.asset.name_cant_be_empty'));
-        }
-
-        if (!$this->validateFileName($name)) {
-            throw new ApplicationException(Lang::get('cms::lang.asset.invalid_name'));
-        }
-
-        $path = Input::get('path');
-        $path = MediaLibrary::validatePath($path);
-
-        $newFolderPath = $path.'/'.$name;
-
-        $library = MediaLibrary::instance();
-
-        if ($library->folderExists($newFolderPath)) {
-            throw new ApplicationException(Lang::get('cms::lang.media.folder_or_file_exist'));
-        }
-
-        /*
-         * Create the new folder
-         */
-        if (!$library->makeFolder($newFolderPath)) {
-            throw new ApplicationException(Lang::get('cms::lang.media.error_creating_folder'));
-        }
-
-        /*
-         * Extensibility
-         */
-        $this->fireSystemEvent('media.folder.create', [$newFolderPath]);
-
-        $library->resetCache();
-
-        $this->prepareVars();
-
-        return [
-            '#'.$this->getId('item-list') => $this->makePartial('item-list')
-        ];
-    }
-
-    public function onLoadMovePopup()
-    {
-        $exclude = Input::get('exclude', []);
-        if (!is_array($exclude)) {
-            throw new ApplicationException('Invalid input data');
-        }
-
-        $folders = MediaLibrary::instance()->listAllDirectories($exclude);
-
-        $folderList = [];
-        foreach ($folders as $folder) {
-            $path = $folder;
-
-            if ($folder == '/') {
-                $name = Lang::get('cms::lang.media.library');
-            }
-            else {
-                $segments = explode('/', $folder);
-                $name = str_repeat('&nbsp;', (count($segments)-1)*4).basename($folder);
-            }
-
-            $folderList[$path] = $name;
-        }
-
-        $this->vars['folders'] = $folderList;
-        $this->vars['originalPath'] = Input::get('path');
-
-        return $this->makePartial('move-form');
-    }
-
-    public function onMoveItems()
-    {
-        $dest = trim(Input::get('dest'));
-        if (!strlen($dest)) {
-            throw new ApplicationException(Lang::get('cms::lang.media.please_select_move_dest'));
-        }
-
-        $dest = MediaLibrary::validatePath($dest);
-        if ($dest == Input::get('originalPath')) {
-            throw new ApplicationException(Lang::get('cms::lang.media.move_dest_src_match'));
-        }
-
-        $files = Input::get('files', []);
-        if (!is_array($files)) {
-            throw new ApplicationException('Invalid input data');
-        }
-
-        $folders = Input::get('folders', []);
-        if (!is_array($folders)) {
-            throw new ApplicationException('Invalid input data');
-        }
-
-        $library = MediaLibrary::instance();
-
-        foreach ($files as $path) {
-            /*
-             * Move a single file
-             */
-            $library->moveFile($path, $dest.'/'.basename($path));
-
-            /*
-             * Extensibility
-             */
-            $this->fireSystemEvent('media.file.move', [$path, $dest]);
-        }
-
-        foreach ($folders as $path) {
-            /*
-             * Move a single folder
-             */
-            $library->moveFolder($path, $dest.'/'.basename($path));
-
-            /*
-             * Extensibility
-             */
-            $this->fireSystemEvent('media.folder.move', [$path, $dest]);
-        }
-
-        $library->resetCache();
-
-        $this->prepareVars();
-
-        return [
-            '#'.$this->getId('item-list') => $this->makePartial('item-list')
-        ];
-    }
-
-    public function onSetSidebarVisible()
-    {
-        $visible = Input::get('visible');
-
-        $this->setSidebarVisible($visible);
-    }
-
-    public function onLoadPopup()
-    {
-        $this->bottomToolbar = Input::get('bottomToolbar', $this->bottomToolbar);
-
-        $this->cropAndInsertButton = Input::get('cropAndInsertButton', $this->cropAndInsertButton);
-
-        return $this->makePartial('popup-body');
-    }
-
-    public function onLoadImageCropPopup()
-    {
-        $path = Input::get('path');
-        $path = MediaLibrary::validatePath($path);
-        $cropSessionKey = md5(Form::getSessionKey());
-        $selectionParams = $this->getSelectionParams();
-
-        $urlAndSize = $this->getCropEditImageUrlAndSize($path, $cropSessionKey);
-        $width = $urlAndSize['dimensions'][0];
-        $height = $urlAndSize['dimensions'][1] ? $urlAndSize['dimensions'][1] : 1;
-
-        $this->vars['currentSelectionMode'] = $selectionParams['mode'];
-        $this->vars['currentSelectionWidth'] = $selectionParams['width'];
-        $this->vars['currentSelectionHeight'] = $selectionParams['height'];
-        $this->vars['cropSessionKey'] = $cropSessionKey;
-        $this->vars['imageUrl'] = $urlAndSize['url'];
-        $this->vars['dimensions'] = $urlAndSize['dimensions'];
-        $this->vars['originalRatio'] = round($width / $height, 5);
-        $this->vars['path'] = $path;
-
-        return $this->makePartial('image-crop-popup-body');
-    }
-
-    public function onEndCroppingSession()
-    {
-        $cropSessionKey = Input::get('cropSessionKey');
-        if (!preg_match('/^[0-9a-z]+$/', $cropSessionKey)) {
-            throw new ApplicationException('Invalid input data');
-        }
-
-        $this->removeCropEditDir($cropSessionKey);
-    }
-
-    public function onCropImage()
-    {
-        $imageSrcPath = trim(Input::get('img'));
-        $selectionData = Input::get('selection');
-        $cropSessionKey = Input::get('cropSessionKey');
-        $path = Input::get('path');
-        $path = MediaLibrary::validatePath($path);
-
-        if (!strlen($imageSrcPath)) {
-            throw new ApplicationException('Invalid input data');
-        }
-
-        if (!preg_match('/^[0-9a-z]+$/', $cropSessionKey)) {
-            throw new ApplicationException('Invalid input data');
-        }
-
-        if (!is_array($selectionData)) {
-            throw new ApplicationException('Invalid input data');
-        }
-
-        $result = $this->cropImage($imageSrcPath, $selectionData, $cropSessionKey, $path);
-
-        $selectionMode = Input::get('selectionMode');
-        $selectionWidth = Input::get('selectionWidth');
-        $selectionHeight = Input::get('selectionHeight');
-
-        $this->setSelectionParams($selectionMode, $selectionWidth, $selectionHeight);
-
-        return $result;
-    }
-
-    public function onResizeImage()
-    {
-        $cropSessionKey = Input::get('cropSessionKey');
-        if (!preg_match('/^[0-9a-z]+$/', $cropSessionKey)) {
-            throw new ApplicationException('Invalid input data');
-        }
-
-        $width = trim(Input::get('width'));
-        if (!strlen($width) || !ctype_digit($width)) {
-            throw new ApplicationException('Invalid input data');
-        }
-
-        $height = trim(Input::get('height'));
-        if (!strlen($height) || !ctype_digit($height)) {
-            throw new ApplicationException('Invalid input data');
-        }
-
-        $path = Input::get('path');
-        $path = MediaLibrary::validatePath($path);
-
-        $params = array(
-            'width' => $width,
-            'height' => $height
-        );
-
-        return $this->getCropEditImageUrlAndSize($path, $cropSessionKey, $params);
-    }
-
-    //
-    // Methods for th internal use
-    //
-
-    protected function prepareVars()
-    {
-        clearstatcache();
-
-        $folder = $this->getCurrentFolder();
-        $viewMode = $this->getViewMode();
-        $filter = $this->getFilter();
-        $sortBy = $this->getSortBy();
-        $sortDirection = $this->getSortDirection();
-        $searchTerm = $this->getSearchTerm();
-        $searchMode = strlen($searchTerm) > 0;
-
-        if (!$searchMode) {
-            $this->vars['items'] = $this->listFolderItems($folder, $filter, ['by' => $sortBy, 'direction' => $sortDirection]);
-        }
-        else {
-            $this->vars['items'] = $this->findFiles($searchTerm, $filter, ['by' => $sortBy, 'direction' => $sortDirection]);
-        }
-
-        $this->vars['currentFolder'] = $folder;
-        $this->vars['isRootFolder'] = $folder == self::FOLDER_ROOT;
-        $this->vars['pathSegments'] = $this->splitPathToSegments($folder);
-        $this->vars['viewMode'] = $viewMode;
-        $this->vars['thumbnailParams'] = $this->getThumbnailParams($viewMode);
-        $this->vars['currentFilter'] = $filter;
-        $this->vars['sortBy'] = $sortBy;
-        $this->vars['sortDirection'] = $sortDirection;
-        $this->vars['searchMode'] = $searchMode;
-        $this->vars['searchTerm'] = $searchTerm;
-        $this->vars['sidebarVisible'] = $this->getSidebarVisible();
-    }
-
-    protected function listFolderItems($folder, $filter, $sortBy)
-    {
-        $filter = $filter !== self::FILTER_EVERYTHING ? $filter : null;
-
-        return MediaLibrary::instance()->listFolderContents($folder, $sortBy, $filter);
-    }
-
-    protected function findFiles($searchTerm, $filter, $sortBy)
-    {
-        $filter = $filter !== self::FILTER_EVERYTHING ? $filter : null;
-
-        return MediaLibrary::instance()->findFiles($searchTerm, $sortBy, $filter);
-    }
-
-    protected function setCurrentFolder($path)
-    {
-        $path = MediaLibrary::validatePath($path);
-
-        $this->putSession('media_folder', $path);
-    }
-
-    protected function getCurrentFolder()
-    {
-        $folder = $this->getSession('media_folder', self::FOLDER_ROOT);
-
-        return $folder;
-    }
-
-    protected function setFilter($filter)
-    {
-        if (!in_array($filter, [
-            self::FILTER_EVERYTHING,
-            MediaLibraryItem::FILE_TYPE_IMAGE,
-            MediaLibraryItem::FILE_TYPE_AUDIO,
-            MediaLibraryItem::FILE_TYPE_DOCUMENT,
-            MediaLibraryItem::FILE_TYPE_VIDEO
-        ])) {
-            throw new ApplicationException('Invalid input data');
-        }
-
-        $this->putSession('media_filter', $filter);
-    }
-
-    protected function getFilter()
-    {
-        return $this->getSession('media_filter', self::FILTER_EVERYTHING);
-    }
-
-    protected function setSearchTerm($searchTerm)
-    {
-        $this->putSession('media_search', trim($searchTerm));
-    }
-
-    protected function getSearchTerm()
-    {
-        return $this->getSession('media_search', null);
-    }
-
-    protected function setSortBy($sortBy)
-    {
-        if (!in_array($sortBy, [
-            MediaLibrary::SORT_BY_TITLE,
-            MediaLibrary::SORT_BY_SIZE,
-            MediaLibrary::SORT_BY_MODIFIED
-        ])) {
-            throw new ApplicationException('Invalid input data');
-        }
-
-        $this->putSession('media_sort_by', $sortBy);
-    }
-
-    protected function getSortBy()
-    {
-        return $this->getSession('media_sort_by', MediaLibrary::SORT_BY_TITLE);
-    }
-
-    protected function setSortDirection($sortDirection)
-    {
-        if (!in_array($sortDirection, [
-            MediaLibrary::SORT_DIRECTION_ASC,
-            MediaLibrary::SORT_DIRECTION_DESC
-        ])) {
-            throw new ApplicationException('Invalid input data');
-        }
-
-        $this->putSession('media_sort_direction', $sortDirection);
-    }
-
-    protected function getSortDirection()
-    {
-        return $this->getSession('media_sort_direction', MediaLibrary::SORT_DIRECTION_ASC);
-    }
-
-    protected function getSelectionParams()
-    {
-        $result = $this->getSession('media_crop_selection_params');
-
-        if ($result) {
-            if (!isset($result['mode'])) {
-                $result['mode'] = MediaManager::SELECTION_MODE_NORMAL;
-            }
-
-            if (!isset($result['width'])) {
-                $result['width'] = null;
-            }
-
-            if (!isset($result['height'])) {
-                $result['height'] = null;
-            }
-
-            return $result;
-        }
-
-        return [
-            'mode'   => MediaManager::SELECTION_MODE_NORMAL,
-            'width'  => null,
-            'height' => null
-        ];
-    }
-
-    protected function setSelectionParams($selectionMode, $selectionWidth, $selectionHeight)
-    {
-        if (!in_array($selectionMode, [
-            MediaManager::SELECTION_MODE_NORMAL,
-            MediaManager::SELECTION_MODE_FIXED_RATIO,
-            MediaManager::SELECTION_MODE_FIXED_SIZE
-        ])) {
-            throw new ApplicationException('Invalid input data');
-        }
-
-        if (strlen($selectionWidth) && !ctype_digit($selectionWidth)) {
-            throw new ApplicationException('Invalid input data');
-        }
-
-        if (strlen($selectionHeight) && !ctype_digit($selectionHeight)) {
-            throw new ApplicationException('Invalid input data');
-        }
-
-        $this->putSession('media_crop_selection_params', [
-            'mode'   => $selectionMode,
-            'width'  => $selectionWidth,
-            'height' => $selectionHeight
-        ]);
-    }
-
-    protected function setSidebarVisible($visible)
-    {
-        $this->putSession('sidebar_visible', !!$visible);
-    }
-
-    protected function getSidebarVisible()
-    {
-        return $this->getSession('sidebar_visible', true);
-    }
-
-    protected function itemTypeToIconClass($item, $itemType)
-    {
-        if ($item->type == MediaLibraryItem::TYPE_FOLDER) {
-            return 'icon-folder';
-        }
-
-        switch ($itemType) {
-            case MediaLibraryItem::FILE_TYPE_IMAGE: return "icon-picture-o";
-            case MediaLibraryItem::FILE_TYPE_VIDEO: return "icon-video-camera";
-            case MediaLibraryItem::FILE_TYPE_AUDIO: return "icon-volume-up";
-            default: return "icon-file";
-        }
-    }
-
-    protected function splitPathToSegments($path)
-    {
-        $path = MediaLibrary::validatePath($path, true);
-        $path = explode('/', ltrim($path, '/'));
-
-        $result = [];
-        while (count($path) > 0) {
-            $folder = array_pop($path);
-
-            $result[$folder] = implode('/', $path).'/'.$folder;
-            if (substr($result[$folder], 0, 1) != '/') {
-                $result[$folder] = '/'.$result[$folder];
-            }
-        }
-
-        return array_reverse($result, true);
-    }
-
-    protected function setViewMode($viewMode)
-    {
-        if (!in_array($viewMode, [
-            self::VIEW_MODE_GRID,
-            self::VIEW_MODE_LIST,
-            self::VIEW_MODE_TILES
-        ])) {
-            throw new ApplicationException('Invalid input data');
-        }
-
-        $this->putSession('view_mode', $viewMode);
-    }
-
-    protected function getViewMode()
-    {
-        return $this->getSession('view_mode', self::VIEW_MODE_GRID);
-    }
-
-    protected function getThumbnailParams($viewMode = null)
-    {
-        $result = [
-            'mode' => 'crop',
-            'ext' => 'png'
-        ];
-
-        if ($viewMode) {
-            if ($viewMode == self::VIEW_MODE_LIST) {
-                $result['width'] = 75;
-                $result['height'] = 75;
-            }
-            else {
-                $result['width'] = 165;
-                $result['height'] = 165;
-            }
-        }
-
-        return $result;
-    }
-
-    protected function getThumbnailImagePath($thumbnailParams, $itemPath, $lastModified)
-    {
-        $itemSignature = md5($itemPath).$lastModified;
-
-        $thumbFile = 'thumb_' .
-            $itemSignature . '_' .
-            $thumbnailParams['width'] . 'x' .
-            $thumbnailParams['height'] . '_' .
-            $thumbnailParams['mode'] . '.' .
-            $thumbnailParams['ext'];
-
-        $partition = implode('/', array_slice(str_split($itemSignature, 3), 0, 3)) . '/';
-
-        $result = $this->getThumbnailDirectory().$partition.$thumbFile;
-
-        return $result;
-    }
-
-    protected function getThumbnailImageUrl($imagePath)
-    {
-        return Url::to('/storage/temp'.$imagePath);
-    }
-
-    protected function thumbnailExists($thumbnailParams, $itemPath, $lastModified)
-    {
-        $thumbnailPath = $this->getThumbnailImagePath($thumbnailParams, $itemPath, $lastModified);
-
-        $fullPath = temp_path(ltrim($thumbnailPath, '/'));
-
-        if (File::exists($fullPath)) {
-            return $thumbnailPath;
-        }
-
-        return false;
-    }
-
-    protected function thumbnailIsError($thumbnailPath)
-    {
-        $fullPath = temp_path(ltrim($thumbnailPath, '/'));
-
-        return hash_file('crc32', $fullPath) == $this->getBrokenImageHash();
-    }
-
-    protected function getLocalTempFilePath($fileName)
-    {
-        $fileName = md5($fileName.uniqid().microtime());
-
-        $mediaFolder = Config::get('cms.storage.media.folder', 'media');
-
-        $path = temp_path() . MediaLibrary::validatePath($mediaFolder, true);
-
-        if (!File::isDirectory($path)) {
-            File::makeDirectory($path, 0777, true, true);
-        }
-
-        return $path.'/'.$fileName;
-    }
-
-    protected function getThumbnailDirectory()
-    {
-        /*
-         * NOTE: Custom routing for /storage/temp/$thumbnailDirectory must be setup
-         * to return the thumbnail if not using default 'public' directory
-         */
-        return MediaLibrary::validatePath(Config::get('cms.storage.media.thumbFolder', 'public'), true) . '/';
-    }
-
-    protected function getPlaceholderId($item)
-    {
-        return 'placeholder'.md5($item->path.'-'.$item->lastModified.uniqid(microtime()));
-    }
-
-    protected function generateThumbnail($thumbnailInfo, $thumbnailParams = null)
-    {
-        $tempFilePath = null;
-        $fullThumbnailPath = null;
-        $thumbnailPath = null;
-        $markup = null;
-
-        try {
-            /*
-             * Get and validate input data
-             */
-            $path = $thumbnailInfo['path'];
-            $width = $thumbnailInfo['width'];
-            $height = $thumbnailInfo['height'];
-            $lastModified = $thumbnailInfo['lastModified'];
-
-            if (!is_numeric($width) || !is_numeric($height) || !is_numeric($lastModified)) {
-                throw new ApplicationException('Invalid input data');
-            }
-
-            if (!$thumbnailParams) {
-                $thumbnailParams = $this->getThumbnailParams();
-                $thumbnailParams['width'] = $width;
-                $thumbnailParams['height'] = $height;
-            }
-
-            $thumbnailPath = $this->getThumbnailImagePath($thumbnailParams, $path, $lastModified);
-            $fullThumbnailPath = temp_path(ltrim($thumbnailPath, '/'));
-
-            /*
-             * Save the file locally
-             */
-            $library = MediaLibrary::instance();
-            $tempFilePath = $this->getLocalTempFilePath($path);
-
-            if (!@File::put($tempFilePath, $library->get($path))) {
-                throw new SystemException('Error saving remote file to a temporary location');
-            }
-
-            /*
-             * Resize the thumbnail and save to the thumbnails directory
-             */
-            $this->resizeImage($fullThumbnailPath, $thumbnailParams, $tempFilePath);
-
-            /*
-             * Delete the temporary file
-             */
-            File::delete($tempFilePath);
-            $markup = $this->makePartial('thumbnail-image', [
-                'isError' => false,
-                'imageUrl' => $this->getThumbnailImageUrl($thumbnailPath)
-            ]);
-        }
-        catch (Exception $ex) {
-            if ($tempFilePath) {
-                File::delete($tempFilePath);
-            }
-
-            if ($fullThumbnailPath) {
-                $this->copyBrokenImage($fullThumbnailPath);
-            }
-
-            $markup = $this->makePartial('thumbnail-image', ['isError' => true]);
-
-            /*
-             * @todo We need to log all types of exceptions here
-             */
-            traceLog($ex->getMessage());
-        }
-
-        if ($markup && ($id = $thumbnailInfo['id'])) {
-            return [
-                'id' => $id,
-                'markup' => $markup
-            ];
-        }
-    }
-
-    protected function resizeImage($fullThumbnailPath, $thumbnailParams, $tempFilePath)
-    {
-        $thumbnailDir = dirname($fullThumbnailPath);
-        if (!File::isDirectory($thumbnailDir)) {
-            if (File::makeDirectory($thumbnailDir, 0777, true) === false) {
-                throw new SystemException('Error creating thumbnail directory');
-            }
-        }
-
-        $targetDimensions = $this->getTargetDimensions($thumbnailParams['width'], $thumbnailParams['height'], $tempFilePath);
-
-        $targetWidth = $targetDimensions[0];
-        $targetHeight = $targetDimensions[1];
-
-        Resizer::open($tempFilePath)
-            ->resize($targetWidth, $targetHeight, [
-                'mode'   => $thumbnailParams['mode'],
-                'offset' => [0, 0]
-            ])
-            ->save($fullThumbnailPath)
-        ;
-
-        File::chmod($fullThumbnailPath);
-    }
-
-    protected function getBrokenImagePath()
-    {
-        return __DIR__.'/mediamanager/assets/images/broken-thumbnail.gif';
-    }
-
-    protected function getBrokenImageHash()
-    {
-        if ($this->brokenImageHash) {
-            return $this->brokenImageHash;
-        }
-
-        $fullPath = $this->getBrokenImagePath();
-        return $this->brokenImageHash = hash_file('crc32', $fullPath);
-    }
-
-    protected function copyBrokenImage($path)
-    {
-        try {
-            $thumbnailDir = dirname($path);
-            if (!File::isDirectory($thumbnailDir)) {
-                if (File::makeDirectory($thumbnailDir, 0777, true) === false)
-                    return;
-            }
-            File::copy($this->getBrokenImagePath(), $path);
-        }
-        catch (Exception $ex) {
-            traceLog($ex->getMessage());
-        }
-    }
-
-    protected function getTargetDimensions($width, $height, $originalImagePath)
-    {
-        $originalDimensions = [$width, $height];
-
-        try {
-            $dimensions = getimagesize($originalImagePath);
-            if (!$dimensions) {
-                return $originalDimensions;
-            }
-
-            if ($dimensions[0] > $width || $dimensions[1] > $height) {
-                return $originalDimensions;
-            }
-
-            return $dimensions;
-        }
-        catch (Exception $ex) {
-            return $originalDimensions;
-        }
-    }
-
-    protected function checkUploadPostback()
-    {
-        $fileName = null;
-        $quickMode = false;
-
-        if (
-            (!($uniqueId = Request::header('X-OCTOBER-FILEUPLOAD')) || $uniqueId != $this->getId()) &&
-            (!$quickMode = post('X_OCTOBER_MEDIA_MANAGER_QUICK_UPLOAD'))
-        ) {
-            return;
-        }
-
-        try {
-            if (!Input::hasFile('file_data')) {
-                throw new ApplicationException('File missing from request');
-            }
-
-            $uploadedFile = Input::file('file_data');
-
-            $fileName = $uploadedFile->getClientOriginalName();
-
-            /*
-             * Convert uppcare case file extensions to lower case
-             */
-            $extension = strtolower($uploadedFile->getClientOriginalExtension());
-            $fileName = File::name($fileName).'.'.$extension;
-
-            /*
-             * File name contains non-latin characters, attempt to slug the value
-             */
-            if (!$this->validateFileName($fileName)) {
-                $fileNameClean = $this->cleanFileName(File::name($fileName));
-                $fileName = $fileNameClean . '.' . $extension;
-            }
-
-            /*
-             * Check for unsafe file extensions
-             */
-            if (!$this->validateFileType($fileName)) {
-                throw new ApplicationException(Lang::get('cms::lang.media.type_blocked'));
-            }
-
-            /*
-             * See mime type handling in the asset manager
-             */
-            if (!$uploadedFile->isValid()) {
-                throw new ApplicationException($uploadedFile->getErrorMessage());
-            }
-
-            $path = $quickMode ? '/uploaded-files' : Input::get('path');
-            $path = MediaLibrary::validatePath($path);
-            $filePath = $path.'/'.$fileName;
-
-            /*
-             * getRealPath() can be empty for some environments (IIS)
-             */
-            $realPath = empty(trim($uploadedFile->getRealPath()))
-                             ? $uploadedFile->getPath() . DIRECTORY_SEPARATOR . $uploadedFile->getFileName()
-                             : $uploadedFile->getRealPath();
-
-            MediaLibrary::instance()->put(
-                $filePath,
-                File::get($realPath)
-            );
-
-            /*
-             * Extensibility
-             */
-            $this->fireSystemEvent('media.file.upload', [$filePath, $uploadedFile]);
-
-            Response::json([
-                'link' => MediaLibrary::url($filePath),
-                'result' => 'success'
-            ])->send();
-        }
-        catch (Exception $ex) {
-            Response::json($ex->getMessage(), 400)->send();
-        }
-
-        exit;
-    }
-
-    /**
-     * Validate a proposed media item file name.
-     * @param string
-     * @return bool
-     */
-    protected function validateFileName($name)
-    {
-        if (!preg_match('/^[0-9a-z@\.\s_\-]+$/i', $name)) {
-            return false;
-        }
-
-        if (strpos($name, '..') !== false) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Check for blocked / unsafe file extensions
-     * @param string
-     * @return bool
-     */
-    protected function validateFileType($name)
-    {
-        $extension = strtolower(File::extension($name));
-
-        $allowedFileTypes = FileDefinitions::get('defaultExtensions');
-
-        if (!in_array($extension, $allowedFileTypes)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Creates a slug form the string. A modified version of Str::slug
-     * with the main difference that it accepts @-signs
-     * @param string
-     * @return string
-     */
-    protected function cleanFileName($name)
-    {
-        $title = Str::ascii($name);
-
-        // Convert all dashes/underscores into separator
-        $flip = $separator = '-';
-        $title = preg_replace('!['.preg_quote($flip).']+!u', $separator, $title);
-
-        // Remove all characters that are not the separator, letters, numbers, whitespace or @.
-        $title = preg_replace('![^'.preg_quote($separator).'\pL\pN\s@]+!u', '', mb_strtolower($title));
-
-        // Replace all separator characters and whitespace by a single separator
-        $title = preg_replace('!['.preg_quote($separator).'\s]+!u', $separator, $title);
-
-        return trim($title, $separator);
-    }
-
-    //
-    // Cropping
-    //
-
-    protected function getCropSessionDirPath($cropSessionKey)
-    {
-        return $this->getThumbnailDirectory().'edit-crop-'.$cropSessionKey;
-    }
-
-    protected function getCropEditImageUrlAndSize($path, $cropSessionKey, $params = null)
-    {
-        $sessionDirectoryPath = $this->getCropSessionDirPath($cropSessionKey);
-        $fullSessionDirectoryPath = temp_path($sessionDirectoryPath);
-        $sessionDirectoryCreated = false;
-
-        if (!File::isDirectory($fullSessionDirectoryPath)) {
-            File::makeDirectory($fullSessionDirectoryPath, 0777, true, true);
-            $sessionDirectoryCreated = true;
-        }
-
-        $tempFilePath = null;
-
-        try {
-            $extension = pathinfo($path, PATHINFO_EXTENSION);
-            $library = MediaLibrary::instance();
-            $originalThumbFileName = 'original.'.$extension;
-
-            /*
-             * If the target dimensions are not provided, save the original image to the
-             * crop session directory and return its URL.
-             */
-            if (!$params) {
-                $tempFilePath = $fullSessionDirectoryPath.'/'.$originalThumbFileName;
-
-                if (!@File::put($tempFilePath, $library->get($path))) {
-                    throw new SystemException('Error saving remote file to a temporary location.');
-                }
-
-                $url = $this->getThumbnailImageUrl($sessionDirectoryPath.'/'.$originalThumbFileName);
-                $dimensions = getimagesize($tempFilePath);
-
-                return [
-                    'url' => $url,
-                    'dimensions' => $dimensions
-                ];
-            }
-            /*
-             * If the target dimensions are provided, resize the original image and
-             * return its URL and dimensions.
-             */
-            else {
-
-                $originalFilePath = $fullSessionDirectoryPath.'/'.$originalThumbFileName;
-                if (!File::isFile($originalFilePath)) {
-                    throw new SystemException('The original image is not found in the cropping session directory.');
-                }
-
-                $resizedThumbFileName = 'resized-'.$params['width'].'-'.$params['height'].'.'.$extension;
-                $tempFilePath = $fullSessionDirectoryPath.'/'.$resizedThumbFileName;
-
-                Resizer::open($originalFilePath)
-                    ->resize($params['width'], $params['height'], [
-                        'mode' => 'exact'
-                    ])
-                    ->save($tempFilePath)
-                ;
-
-                $url = $this->getThumbnailImageUrl($sessionDirectoryPath.'/'.$resizedThumbFileName);
-                $dimensions = getimagesize($tempFilePath);
-
-                return [
-                    'url' => $url,
-                    'dimensions' => $dimensions
-                ];
-            }
-        }
-        catch (Exception $ex) {
-            if ($sessionDirectoryCreated) {
-                @File::deleteDirectory($fullSessionDirectoryPath);
-            }
-
-            if ($tempFilePath) {
-                File::delete($tempFilePath);
-            }
-
-            throw $ex;
-        }
-    }
-
-    protected function removeCropEditDir($cropSessionKey)
-    {
-        $sessionDirectoryPath = $this->getCropSessionDirPath($cropSessionKey);
-        $fullSessionDirectoryPath = temp_path($sessionDirectoryPath);
-
-        if (File::isDirectory($fullSessionDirectoryPath)) {
-            @File::deleteDirectory($fullSessionDirectoryPath);
-        }
-    }
-
-    protected function cropImage($imageSrcPath, $selectionData, $cropSessionKey, $path)
-    {
-        $originalFileName = basename($path);
-
-        $path = rtrim(dirname($path), '/').'/';
-        $fileName = basename($imageSrcPath);
-
-        if (
-            strpos($fileName, '..') !== false ||
-            strpos($fileName, '/') !== false ||
-            strpos($fileName, '\\') !== false
-        ) {
-            throw new SystemException('Invalid image file name.');
-        }
-
-        $selectionParams = ['x', 'y', 'w', 'h'];
-
-        foreach ($selectionParams as $paramName) {
-            if (!array_key_exists($paramName, $selectionData)) {
-                throw new SystemException('Invalid selection data.');
-            }
-
-            if (!is_numeric($selectionData[$paramName])) {
-                throw new SystemException('Invalid selection data.');
-            }
-
-            $selectionData[$paramName] = (int) $selectionData[$paramName];
-        }
-
-        $sessionDirectoryPath = $this->getCropSessionDirPath($cropSessionKey);
-        $fullSessionDirectoryPath = temp_path($sessionDirectoryPath);
-
-        if (!File::isDirectory($fullSessionDirectoryPath)) {
-            throw new SystemException('The image editing session is not found.');
-        }
-
-        /*
-         * Find the image on the disk and resize it
-         */
-        $imagePath = $fullSessionDirectoryPath.'/'.$fileName;
-        if (!File::isFile($imagePath)) {
-            throw new SystemException('The image is not found on the disk.');
-        }
-
-        $extension = pathinfo($originalFileName, PATHINFO_EXTENSION);
-
-        $targetImageName = basename($originalFileName, '.'.$extension).'-'
-            .$selectionData['x'].'-'
-            .$selectionData['y'].'-'
-            .$selectionData['w'].'-'
-            .$selectionData['h'].'-';
-
-        $targetImageName .= time();
-        $targetImageName .= '.'.$extension;
-
-        $targetTmpPath = $fullSessionDirectoryPath.'/'.$targetImageName;
-
-        /*
-         * Crop the image, otherwise copy original to target destination.
-         */
-        if ($selectionData['w'] == 0 || $selectionData['h'] == 0) {
-            File::copy($imagePath, $targetTmpPath);
-        }
-        else {
-            Resizer::open($imagePath)
-                ->crop(
-                    $selectionData['x'],
-                    $selectionData['y'],
-                    $selectionData['w'],
-                    $selectionData['h'],
-                    $selectionData['w'],
-                    $selectionData['h']
-                )
-                ->save($targetTmpPath)
-            ;
-        }
-
-        /*
-         * Upload the cropped file to the Library
-         */
-        $targetFolder = $path.'cropped-images';
-        $targetPath = $targetFolder.'/'.$targetImageName;
-
-        $library = MediaLibrary::instance();
-        $library->put($targetPath, file_get_contents($targetTmpPath));
-
-        return [
-            'publicUrl' => $library->getPathUrl($targetPath),
-            'documentType' => MediaLibraryItem::FILE_TYPE_IMAGE,
-            'itemType' => MediaLibraryItem::TYPE_FILE,
-            'path' => $targetPath,
-            'title' => $targetImageName,
-            'folder' => $targetFolder
-        ];
-   }
 }
diff --git a/modules/cms/widgets/mediamanager/partials/_filters.htm b/modules/cms/widgets/mediamanager/partials/_filters.htm
deleted file mode 100644
index 230206617..000000000
--- a/modules/cms/widgets/mediamanager/partials/_filters.htm
+++ /dev/null
@@ -1,39 +0,0 @@
-<h3 class="section"><?= e(trans('cms::lang.media.display')) ?></h3>
-
-<ul class="nav nav-stacked selector-group">
-    <li role="presentation" <?php if ($currentFilter == Cms\Widgets\MediaManager::FILTER_EVERYTHING): ?>class="active"<?php endif ?>>
-        <a href="#" data-command="set-filter" data-filter="<?= Cms\Widgets\MediaManager::FILTER_EVERYTHING ?>">
-            <i class="icon-recycle"></i>
-
-            <?= e(trans('cms::lang.media.filter_everything')) ?>
-        </a>
-    </li>
-    <li role="presentation" <?php if ($currentFilter == Cms\Classes\MediaLibraryItem::FILE_TYPE_IMAGE): ?>class="active"<?php endif ?>>
-        <a href="#" data-command="set-filter" data-filter="<?= Cms\Classes\MediaLibraryItem::FILE_TYPE_IMAGE ?>">
-            <i class="icon-picture-o"></i>
-
-            <?= e(trans('cms::lang.media.filter_images')) ?>
-        </a>
-    </li>
-    <li role="presentation" <?php if ($currentFilter == Cms\Classes\MediaLibraryItem::FILE_TYPE_VIDEO): ?>class="active"<?php endif ?>>
-        <a href="#" data-command="set-filter" data-filter="<?= Cms\Classes\MediaLibraryItem::FILE_TYPE_VIDEO ?>">
-            <i class="icon-video-camera"></i>
-
-            <?= e(trans('cms::lang.media.filter_video')) ?>
-        </a>
-    </li>
-    <li role="presentation" <?php if ($currentFilter == Cms\Classes\MediaLibraryItem::FILE_TYPE_AUDIO): ?>class="active"<?php endif ?>>
-        <a href="#" data-command="set-filter" data-filter="<?= Cms\Classes\MediaLibraryItem::FILE_TYPE_AUDIO ?>">
-            <i class="icon-volume-up"></i>
-
-            <?= e(trans('cms::lang.media.filter_audio')) ?>
-        </a>
-    </li>
-    <li role="presentation" <?php if ($currentFilter == Cms\Classes\MediaLibraryItem::FILE_TYPE_DOCUMENT): ?>class="active"<?php endif ?>>
-        <a href="#" data-command="set-filter" data-filter="<?= Cms\Classes\MediaLibraryItem::FILE_TYPE_DOCUMENT ?>">
-            <i class="icon-file"></i>
-
-            <?= e(trans('cms::lang.media.filter_documents')) ?>
-        </a>
-    </li>
-</ul>
\ No newline at end of file
diff --git a/modules/cms/widgets/mediamanager/partials/_thumbnail-image.htm b/modules/cms/widgets/mediamanager/partials/_thumbnail-image.htm
deleted file mode 100644
index 2480d5abf..000000000
--- a/modules/cms/widgets/mediamanager/partials/_thumbnail-image.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php if (!$isError): ?>
-    <img src="<?= $imageUrl ?>"/>
-<?php else: ?>
-    <i class="icon-chain-broken" title="<?= e(trans('cms::lang.media.thumbnail_error')) ?>"></i>
-    <p class="thumbnail-error-message"><?= e(trans('cms::lang.media.thumbnail_error')) ?></p>
-<?php endif ?>
\ No newline at end of file
diff --git a/modules/cms/widgets/mediamanager/partials/_view-mode-buttons.htm b/modules/cms/widgets/mediamanager/partials/_view-mode-buttons.htm
deleted file mode 100644
index fc7c31537..000000000
--- a/modules/cms/widgets/mediamanager/partials/_view-mode-buttons.htm
+++ /dev/null
@@ -1,18 +0,0 @@
-<button 
-    type="button" 
-    class="btn btn-default oc-icon-align-justify empty <?= $viewMode == Cms\Widgets\MediaManager::VIEW_MODE_GRID ? 'on' : '' ?>" 
-    data-command="change-view" 
-    data-view="<?= Cms\Widgets\MediaManager::VIEW_MODE_GRID ?>">
-</button>
-<button 
-    type="button"
-    class="btn btn-default oc-icon-th empty <?= $viewMode == Cms\Widgets\MediaManager::VIEW_MODE_LIST ? 'on' : '' ?>"
-    data-command="change-view"
-    data-view="<?= Cms\Widgets\MediaManager::VIEW_MODE_LIST ?>">
-</button>
-<button
-    type="button"
-    class="btn btn-default oc-icon-th-large empty <?= $viewMode == Cms\Widgets\MediaManager::VIEW_MODE_TILES ? 'on' : '' ?>"
-    data-command="change-view"
-    data-view="<?= Cms\Widgets\MediaManager::VIEW_MODE_TILES ?>">
-</button>
\ No newline at end of file
diff --git a/modules/system/classes/MediaLibrary.php b/modules/system/classes/MediaLibrary.php
new file mode 100644
index 000000000..7107eb1e5
--- /dev/null
+++ b/modules/system/classes/MediaLibrary.php
@@ -0,0 +1,760 @@
+<?php namespace System\Classes;
+
+use Str;
+use Lang;
+use Cache;
+use Config;
+use Storage;
+use Request;
+use October\Rain\Filesystem\Definitions as FileDefinitions;
+use ApplicationException;
+use SystemException;
+
+/**
+ * Provides abstraction level for the Media Library operations.
+ * Implements the library caching features and security checks.
+ *
+ * @package october\system
+ * @author Alexey Bobkov, Samuel Georges
+ */
+class MediaLibrary
+{
+    use \October\Rain\Support\Traits\Singleton;
+
+    const CACHE_KEY = 'system-media-library-contents';
+    const SORT_BY_TITLE = 'title';
+    const SORT_BY_SIZE = 'size';
+    const SORT_BY_MODIFIED = 'modified';
+    const SORT_DIRECTION_ASC = 'asc';
+    const SORT_DIRECTION_DESC = 'desc';
+
+    /**
+     * @var string Relative or absolute URL of the Library root folder.
+     */
+    protected $storagePath;
+
+    /**
+     * @var string The root Library folder path.
+     */
+    protected $storageFolder;
+
+    /**
+     * @var mixed A reference to the Media Library disk.
+     */
+    protected $storageDisk;
+
+    /**
+     * @var array Contains a list of files and directories to ignore.
+     * The list can be customized with cms.storage.media.ignore configuration option.
+     */
+    protected $ignoreNames;
+
+    /**
+     * @var array Contains a list of regex patterns to ignore in files and directories.
+     * The list can be customized with cms.storage.media.ignorePatterns configuration option.
+     */
+    protected $ignorePatterns;
+
+    /**
+     * @var int Cache for the storage folder name length.
+     */
+    protected $storageFolderNameLength;
+
+    /**
+     * Initialize this singleton.
+     */
+    protected function init()
+    {
+        $this->storageFolder = self::validatePath(Config::get('cms.storage.media.folder', 'media'), true);
+        $this->storagePath = rtrim(Config::get('cms.storage.media.path', '/storage/app/media'), '/');
+
+        if (!starts_with($this->storagePath, ['//', 'http://', 'https://'])) {
+            $this->storagePath = Request::getBasePath() . $this->storagePath;
+        }
+
+        $this->ignoreNames = Config::get('cms.storage.media.ignore', FileDefinitions::get('ignoreFiles'));
+
+        $this->ignorePatterns = Config::get('cms.storage.media.ignorePatterns', ['^\..*']);
+
+        $this->storageFolderNameLength = strlen($this->storageFolder);
+    }
+
+    /**
+     * Returns a list of folders and files in a Library folder.
+     *
+     * @param string $folder Specifies the folder path relative the the Library root.
+     * @param mixed $sortBy Determines the sorting preference.
+     * Supported values are 'title', 'size', 'lastModified' (see SORT_BY_XXX class constants), FALSE (to disable sorting), or an associative array with a 'by' key and a 'direction' key: ['by' => SORT_BY_XXX, 'direction' => SORT_DIRECTION_XXX].
+     * @param string $filter Determines the document type filtering preference.
+     * Supported values are 'image', 'video', 'audio', 'document' (see FILE_TYPE_XXX constants of MediaLibraryItem class).
+     * @param boolean $ignoreFolders Determines whether folders should be suppressed in the result list.
+     * @return array Returns an array of MediaLibraryItem objects.
+     */
+    public function listFolderContents($folder = '/', $sortBy = 'title', $filter = null, $ignoreFolders = false)
+    {
+        $folder = self::validatePath($folder);
+        $fullFolderPath = $this->getMediaPath($folder);
+
+        /*
+         * Try to load the contents from cache
+         */
+
+        $cached = Cache::get(self::CACHE_KEY, false);
+        $cached = $cached ? @unserialize(@base64_decode($cached)) : [];
+
+        if (!is_array($cached)) {
+            $cached = [];
+        }
+
+        if (array_key_exists($fullFolderPath, $cached)) {
+            $folderContents = $cached[$fullFolderPath];
+        }
+        else {
+            $folderContents = $this->scanFolderContents($fullFolderPath);
+
+            $cached[$fullFolderPath] = $folderContents;
+            Cache::put(
+                self::CACHE_KEY,
+                base64_encode(serialize($cached)),
+                Config::get('cms.storage.media.ttl', 10)
+            );
+        }
+
+        /*
+         * Sort the result and combine the file and folder lists
+         */
+
+        if ($sortBy !== false) {
+            $this->sortItemList($folderContents['files'], $sortBy);
+            $this->sortItemList($folderContents['folders'], $sortBy);
+        }
+
+        $this->filterItemList($folderContents['files'], $filter);
+
+        if (!$ignoreFolders) {
+            $folderContents = array_merge($folderContents['folders'], $folderContents['files']);
+        }
+        else {
+            $folderContents = $folderContents['files'];
+        }
+
+        return $folderContents;
+    }
+
+    /**
+     * Finds files in the Library.
+     * @param string $searchTerm Specifies the search term.
+     * @param mixed $sortBy Determines the sorting preference.
+     * Supported values are 'title', 'size', 'lastModified' (see SORT_BY_XXX class constants), FALSE (to disable sorting), or an associative array with a 'by' key and a 'direction' key: ['by' => SORT_BY_XXX, 'direction' => SORT_DIRECTION_XXX].
+     * @param string $filter Determines the document type filtering preference.
+     * Supported values are 'image', 'video', 'audio', 'document' (see FILE_TYPE_XXX constants of MediaLibraryItem class).
+     * @return array Returns an array of MediaLibraryItem objects.
+     */
+    public function findFiles($searchTerm, $sortBy = 'title', $filter = null)
+    {
+        $words = explode(' ', Str::lower($searchTerm));
+        $result = [];
+
+        $findInFolder = function ($folder) use (&$findInFolder, $words, &$result, $sortBy, $filter) {
+            $folderContents = $this->listFolderContents($folder, $sortBy, $filter);
+
+            foreach ($folderContents as $item) {
+                if ($item->type == MediaLibraryItem::TYPE_FOLDER) {
+                    $findInFolder($item->path);
+                }
+                elseif ($this->pathMatchesSearch($item->path, $words)) {
+                    $result[] = $item;
+                }
+            }
+        };
+
+        $findInFolder('/');
+
+        /*
+         * Sort the result
+         */
+
+        if ($sortBy !== false) {
+            $this->sortItemList($result, $sortBy);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Deletes a file from the Library.
+     * @param array $paths A list of file paths relative to the Library root to delete.
+     */
+    public function deleteFiles($paths)
+    {
+        $fullPaths = [];
+        foreach ($paths as $path) {
+            $path = self::validatePath($path);
+            $fullPaths[] = $this->getMediaPath($path);
+        }
+
+        return $this->getStorageDisk()->delete($fullPaths);
+    }
+
+    /**
+     * Deletes a folder from the Library.
+     * @param string $path Specifies the folder path relative to the Library root.
+     */
+    public function deleteFolder($path)
+    {
+        $path = self::validatePath($path);
+        $fullPaths = $this->getMediaPath($path);
+
+        return $this->getStorageDisk()->deleteDirectory($fullPaths);
+    }
+
+    /**
+     * Determines if a file with the specified path exists in the library.
+     * @param string $path Specifies the file path relative the the Library root.
+     * @return boolean Returns TRUE if the file exists.
+     */
+    public function exists($path)
+    {
+        $path = self::validatePath($path);
+        $fullPath = $this->getMediaPath($path);
+
+        return $this->getStorageDisk()->exists($fullPath);
+    }
+
+    /**
+     * Determines if a folder with the specified path exists in the library.
+     * @param string $path Specifies the folder path relative the the Library root.
+     * @return boolean Returns TRUE if the folder exists.
+     */
+    public function folderExists($path)
+    {
+        $folderName = basename($path);
+        $folderPath = dirname($path);
+
+        $path = self::validatePath($folderPath);
+        $fullPath = $this->getMediaPath($path);
+
+        $folders = $this->getStorageDisk()->directories($fullPath);
+        foreach ($folders as $folder) {
+            if (basename($folder) == $folderName) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns a list of all directories in the Library, optionally excluding some of them.
+     * @param array $exclude A list of folders to exclude from the result list.
+     * The folder paths should be specified relative to the Library root.
+     * @return array
+     */
+    public function listAllDirectories($exclude = [])
+    {
+        $fullPath = $this->getMediaPath('/');
+
+        $folders = $this->getStorageDisk()->allDirectories($fullPath);
+
+        $folders = array_unique($folders, SORT_LOCALE_STRING);
+
+        $result = [];
+
+        foreach ($folders as $folder) {
+            $folder = $this->getMediaRelativePath($folder);
+            if (!strlen($folder)) {
+                $folder = '/';
+            }
+
+            if (Str::startsWith($folder, $exclude)) {
+                continue;
+            }
+
+            $result[] = $folder;
+        }
+
+        if (!in_array('/', $result)) {
+            array_unshift($result, '/');
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns a file contents.
+     * @param string $path Specifies the file path relative the the Library root.
+     * @return string Returns the file contents
+     */
+    public function get($path)
+    {
+        $path = self::validatePath($path);
+        $fullPath = $this->getMediaPath($path);
+        return $this->getStorageDisk()->get($fullPath);
+    }
+
+    /**
+     * Puts a file to the library.
+     * @param string $path Specifies the file path relative the the Library root.
+     * @param string $contents Specifies the file contents.
+     * @return boolean
+     */
+    public function put($path, $contents)
+    {
+        $path = self::validatePath($path);
+        $fullPath = $this->getMediaPath($path);
+        return $this->getStorageDisk()->put($fullPath, $contents);
+    }
+
+    /**
+     * Moves a file to another location.
+     * @param string $oldPath Specifies the original path of the file.
+     * @param string $newPath Specifies the new path of the file.
+     * @return boolean
+     */
+    public function moveFile($oldPath, $newPath, $isRename = false)
+    {
+        $oldPath = self::validatePath($oldPath);
+        $fullOldPath = $this->getMediaPath($oldPath);
+
+        $newPath = self::validatePath($newPath);
+        $fullNewPath = $this->getMediaPath($newPath);
+
+        return $this->getStorageDisk()->move($fullOldPath, $fullNewPath);
+    }
+
+    /**
+     * Copies a folder.
+     * @param string $originalPath Specifies the original path of the folder.
+     * @param string $newPath Specifies the new path of the folder.
+     * @return boolean
+     */
+    public function copyFolder($originalPath, $newPath)
+    {
+        $disk = $this->getStorageDisk();
+
+        $copyDirectory = function ($srcPath, $destPath) use (&$copyDirectory, $disk) {
+            $srcPath = self::validatePath($srcPath);
+            $fullSrcPath = $this->getMediaPath($srcPath);
+
+            $destPath = self::validatePath($destPath);
+            $fullDestPath = $this->getMediaPath($destPath);
+
+            if (!$disk->makeDirectory($fullDestPath)) {
+                return false;
+            }
+
+            $folderContents = $this->scanFolderContents($fullSrcPath);
+
+            foreach ($folderContents['folders'] as $dirInfo) {
+                if (!$copyDirectory($dirInfo->path, $destPath.'/'.basename($dirInfo->path))) {
+                    return false;
+                }
+            }
+
+            foreach ($folderContents['files'] as $fileInfo) {
+                $fullFileSrcPath = $this->getMediaPath($fileInfo->path);
+
+                if (!$disk->copy($fullFileSrcPath, $fullDestPath.'/'.basename($fileInfo->path))) {
+                    return false;
+                }
+            }
+
+            return true;
+        };
+
+        return $copyDirectory($originalPath, $newPath);
+    }
+
+    /**
+     * Moves a folder.
+     * @param string $originalPath Specifies the original path of the folder.
+     * @param string $newPath Specifies the new path of the folder.
+     * @return boolean
+     */
+    public function moveFolder($originalPath, $newPath)
+    {
+        if (Str::lower($originalPath) !== Str::lower($newPath)) {
+            // If there is no risk that the directory was renamed
+            // by just changing the letter case in the name -
+            // copy the directory to the destination path and delete
+            // the source directory.
+
+            if (!$this->copyFolder($originalPath, $newPath)) {
+                return false;
+            }
+
+            $this->deleteFolder($originalPath);
+        }
+        else {
+            // If there's a risk that the directory name was updated
+            // by changing the letter case - swap source and destination
+            // using a temporary directory with random name.
+
+            $tempraryDirPath = $this->generateRandomTmpFolderName(dirname($originalPath));
+
+            if (!$this->copyFolder($originalPath, $tempraryDirPath)) {
+                $this->deleteFolder($tempraryDirPath);
+
+                return false;
+            }
+
+            $this->deleteFolder($originalPath);
+
+            return $this->moveFolder($tempraryDirPath, $newPath);
+        }
+
+        return true;
+    }
+
+    /**
+     * Creates a folder.
+     * @param string $path Specifies the folder path.
+     * @return boolean
+     */
+    public function makeFolder($path)
+    {
+        $path = self::validatePath($path);
+        $fullPath = $this->getMediaPath($path);
+
+        return $this->getStorageDisk()->makeDirectory($fullPath);
+    }
+
+    /**
+     * Resets the Library cache.
+     *
+     * The cache stores the library table of contents locally in order to optimize
+     * the performance when working with remote storages. The default cache TTL is
+     * 10 minutes. The cache is deleted automatically when an item is added, changed
+     * or deleted. This method allows to reset the cache forcibly.
+     */
+    public function resetCache()
+    {
+        Cache::forget(self::CACHE_KEY);
+    }
+
+    /**
+     * Checks if file path doesn't contain any substrings that would pose a security threat.
+     * Throws an exception if the path is not valid.
+     * @param string $path Specifies the path.
+     * @param boolean $normalizeOnly Specifies if only the normalization, without validation should be performed.
+     * @return string Returns a normalized path.
+     */
+    public static function validatePath($path, $normalizeOnly = false)
+    {
+        $path = str_replace('\\', '/', $path);
+        $path = '/'.trim($path, '/');
+
+        if ($normalizeOnly) {
+            return $path;
+        }
+
+        $regexDirectorySeparator = preg_quote('/', '#');
+        $regexDot = preg_quote('.', '#');
+        $regex = [
+            // Checks for parent or current directory reference at beginning of path
+            '(^'.$regexDot.'+?'.$regexDirectorySeparator.')',
+
+            // Check for parent or current directory reference in middle of path
+            '('.$regexDirectorySeparator.$regexDot.'+?'.$regexDirectorySeparator.')',
+
+            // Check for parent or current directory reference at end of path
+            '('.$regexDirectorySeparator.$regexDot.'+?$)',
+        ];
+
+        /*
+         * Combine everything to one regex
+         */
+        $regex = '#'.implode('|', $regex).'#';
+        if (preg_match($regex, $path) !== 0 || strpos($path, '//') !== false) {
+            throw new ApplicationException(Lang::get('system::lang.media.invalid_path', compact('path')));
+        }
+
+        return $path;
+    }
+
+    /**
+     * Helper that makes a URL for a media file.
+     * @param string $file
+     * @return string
+     */
+    public static function url($file)
+    {
+        return static::instance()->getPathUrl($file);
+    }
+
+    /**
+     * Returns a public file URL.
+     * @param string $path Specifies the file path relative the the Library root.
+     * @return string
+     */
+    public function getPathUrl($path)
+    {
+        $path = $this->validatePath($path);
+
+        return $this->storagePath.$path;
+    }
+
+    /**
+     * Returns a file or folder path with the prefixed storage folder.
+     * @param string $path Specifies a path to process.
+     * @return string Returns a processed string.
+     */
+    protected function getMediaPath($path)
+    {
+        return $this->storageFolder.$path;
+    }
+
+    /**
+     * Returns path relative to the Library root folder.
+     * @param string $path Specifies a path relative to the Library disk root.
+     * @return string Returns the updated path.
+     */
+    protected function getMediaRelativePath($path)
+    {
+        $path = self::validatePath($path, true);
+
+        if (substr($path, 0, $this->storageFolderNameLength) == $this->storageFolder) {
+            return substr($path, $this->storageFolderNameLength);
+        }
+
+        throw new SystemException(sprintf('Cannot convert Media Library path "%s" to a path relative to the Library root.', $path));
+    }
+
+    /**
+     * Determines if the path should be visible (not ignored).
+     * @param string $path Specifies a path to check.
+     * @return boolean Returns TRUE if the path is visible.
+     */
+    protected function isVisible($path)
+    {
+        $baseName = basename($path);
+
+        if (in_array($baseName, $this->ignoreNames)) {
+            return false;
+        }
+
+        foreach ($this->ignorePatterns as $pattern) {
+            if (preg_match('/'.$pattern.'/', $baseName)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Initializes a library item from a path and item type.
+     * @param string $path Specifies the item path relative to the storage disk root.
+     * @param string $itemType Specifies the item type.
+     * @return mixed Returns the MediaLibraryItem object or NULL if the item is not visible.
+     */
+    protected function initLibraryItem($path, $itemType)
+    {
+        $relativePath = $this->getMediaRelativePath($path);
+
+        if (!$this->isVisible($relativePath)) {
+            return;
+        }
+
+        /*
+         * S3 doesn't allow getting the last modified timestamp for folders,
+         * so this feature is disabled - folders timestamp is always NULL.
+         */
+        $lastModified = $itemType == MediaLibraryItem::TYPE_FILE
+            ? $this->getStorageDisk()->lastModified($path)
+            : null;
+
+        /*
+         * The folder size (number of items) doesn't respect filters. That
+         * could be confusing for users, but that's safer than displaying
+         * zero items for a folder that contains files not visible with a
+         * currently applied filter. -ab
+         */
+        $size = $itemType == MediaLibraryItem::TYPE_FILE
+            ? $this->getStorageDisk()->size($path)
+            : $this->getFolderItemCount($path);
+
+        $publicUrl = $this->storagePath.$relativePath;
+
+        return new MediaLibraryItem($relativePath, $size, $lastModified, $itemType, $publicUrl);
+    }
+
+    /**
+     * Returns a number of items on a folder.
+     * @param string $path Specifies the folder path relative to the storage disk root.
+     * @return integer Returns the number of items in the folder.
+     */
+    protected function getFolderItemCount($path)
+    {
+        $folderItems = array_merge(
+            $this->getStorageDisk()->files($path),
+            $this->getStorageDisk()->directories($path)
+        );
+
+        $size = 0;
+        foreach ($folderItems as $folderItem) {
+            if ($this->isVisible($folderItem)) {
+                $size++;
+            }
+        }
+
+        return $size;
+    }
+
+    /**
+     * Fetches the contents of a folder from the Library.
+     * @param string $fullFolderPath Specifies the folder path relative the the storage disk root.
+     * @return array Returns an array containing two elements - 'files' and 'folders', each is an array of MediaLibraryItem objects.
+     */
+    protected function scanFolderContents($fullFolderPath)
+    {
+        $result = [
+            'files' => [],
+            'folders' => []
+        ];
+
+        $files = $this->getStorageDisk()->files($fullFolderPath);
+        foreach ($files as $file) {
+            if ($libraryItem = $this->initLibraryItem($file, MediaLibraryItem::TYPE_FILE)) {
+                $result['files'][] = $libraryItem;
+            }
+        }
+
+        $folders = $this->getStorageDisk()->directories($fullFolderPath);
+        foreach ($folders as $folder) {
+            if ($libraryItem = $this->initLibraryItem($folder, MediaLibraryItem::TYPE_FOLDER)) {
+                $result['folders'][] = $libraryItem;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Sorts the item list by title, size or last modified date.
+     * @param array $itemList Specifies the item list to sort.
+     * @param mixed $sortSettings Determines the sorting preference.
+     * Supported values are 'title', 'size', 'lastModified' (see SORT_BY_XXX class constants) or an associative array with a 'by' key and a 'direction' key: ['by' => SORT_BY_XXX, 'direction' => SORT_DIRECTION_XXX].
+     */
+    protected function sortItemList(&$itemList, $sortSettings)
+    {
+        $files = [];
+        $folders = [];
+
+        // Convert string $sortBy to array
+        if (is_string($sortSettings)) {
+            $sortSettings = [
+                'by' => $sortSettings,
+                'direction' => self::SORT_DIRECTION_ASC,
+            ];
+        }
+
+        usort($itemList, function ($a, $b) use ($sortSettings) {
+            $result = 0;
+
+            switch ($sortSettings['by']) {
+                case self::SORT_BY_TITLE:
+                    $result = strcasecmp($a->path, $b->path);
+                break;
+                case self::SORT_BY_SIZE:
+                    if ($a->size < $b->size) {
+                        $result = -1;
+                    } else {
+                        $result = $a->size > $b->size ? 1 : 0;
+                    }
+                break;
+                case self::SORT_BY_MODIFIED:
+                    if ($a->lastModified < $b->lastModified) {
+                        $result = -1;
+                    } else {
+                        $result = $a->lastModified > $b->lastModified ? 1 : 0;
+                    }
+                break;
+            }
+
+            // Reverse the polarity of the result to direct sorting in a descending order instead
+            if ($sortSettings['direction'] === self::SORT_DIRECTION_DESC) {
+                $result = 0 - $result;
+            }
+
+            return $result;
+        });
+    }
+
+    /**
+     * Filters item list by file type.
+     * @param array $itemList Specifies the item list to sort.
+     * @param string $filter Determines the document type filtering preference.
+     * Supported values are 'image', 'video', 'audio', 'document' (see FILE_TYPE_XXX constants of MediaLibraryItem class).
+     */
+    protected function filterItemList(&$itemList, $filter)
+    {
+        if (!$filter)
+            return;
+
+        $result = [];
+        foreach ($itemList as $item) {
+            if ($item->getFileType() == $filter) {
+                $result[] = $item;
+            }
+        }
+
+        $itemList = $result;
+    }
+
+    /**
+     * Initializes and returns the Media Library disk.
+     * This method should always be used instead of trying to access the
+     * $storageDisk property directly as initializing the disc requires
+     * communicating with the remote storage.
+     * @return mixed Returns the storage disk object.
+     */
+    protected function getStorageDisk()
+    {
+        if ($this->storageDisk) {
+            return $this->storageDisk;
+        }
+
+        return $this->storageDisk = Storage::disk(
+            Config::get('cms.storage.media.disk', 'local')
+        );
+    }
+
+    /**
+     * Determines if file path contains all words form the search term.
+     * @param string $path Specifies a path to examine.
+     * @param array $words A list of words to check against.
+     * @return boolean
+     */
+    protected function pathMatchesSearch($path, $words)
+    {
+        $path = Str::lower($path);
+
+        foreach ($words as $word) {
+            $word = trim($word);
+            if (!strlen($word)) {
+                continue;
+            }
+
+            if (!Str::contains($path, $word)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    protected function generateRandomTmpFolderName($location)
+    {
+        $temporaryDirBaseName = time();
+
+        $tmpPath = $location.'/tmp-'.$temporaryDirBaseName;
+
+        while ($this->folderExists($tmpPath)) {
+            $temporaryDirBaseName++;
+            $tmpPath = $location.'/tmp-'.$temporaryDirBaseName;
+        }
+
+        return $tmpPath;
+    }
+}
diff --git a/modules/system/classes/MediaLibraryItem.php b/modules/system/classes/MediaLibraryItem.php
new file mode 100644
index 000000000..073db4f60
--- /dev/null
+++ b/modules/system/classes/MediaLibraryItem.php
@@ -0,0 +1,155 @@
+<?php namespace System\Classes;
+
+use File;
+use Config;
+use October\Rain\Filesystem\Definitions as FileDefinitions;
+use Carbon\Carbon;
+
+/**
+ * Represents a file or folder in the Media Library.
+ *
+ * @package october\system
+ * @author Alexey Bobkov, Samuel Georges
+ */
+class MediaLibraryItem
+{
+    const TYPE_FILE = 'file';
+    const TYPE_FOLDER = 'folder';
+
+    const FILE_TYPE_IMAGE = 'image';
+    const FILE_TYPE_VIDEO = 'video';
+    const FILE_TYPE_AUDIO = 'audio';
+    const FILE_TYPE_DOCUMENT = 'document';
+
+    /**
+     * @var string Specifies the item path relative to the Library root.
+     */
+    public $path;
+
+    /**
+     * @var integer Specifies the item size.
+     * For files the item size is measured in bytes. For folders it
+     * contains the number of files in the folder.
+     */
+    public $size;
+
+    /**
+     * @var integer Contains the last modification time (Unix timestamp).
+     */
+    public $lastModified;
+
+    /**
+     * @var string Specifies the item type.
+     */
+    public $type;
+
+    /**
+     * @var string Specifies the public URL of the item.
+     */
+    public $publicUrl;
+
+    /**
+     * @var array Contains a default list of image files and directories to ignore.
+     * Override with config: cms.storage.media.imageExtensions
+     */
+    protected static $imageExtensions;
+
+    /**
+     * @var array Contains a default list of video files and directories to ignore.
+     * Override with config: cms.storage.media.videoExtensions
+     */
+    protected static $videoExtensions;
+
+    /**
+     * @var array Contains a default list of audio files and directories to ignore.
+     * Override with config: cms.storage.media.audioExtensions
+     */
+    protected static $audioExtensions;
+
+    /**
+     * @param string $path
+     * @param int $size
+     * @param int $lastModified
+     * @param string $type
+     * @param string $publicUrl
+     */
+    public function __construct($path, $size, $lastModified, $type, $publicUrl)
+    {
+        $this->path = $path;
+        $this->size = $size;
+        $this->lastModified = $lastModified;
+        $this->type = $type;
+        $this->publicUrl = $publicUrl;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isFile()
+    {
+        return $this->type == self::TYPE_FILE;
+    }
+
+    /**
+     * Returns the file type by its name.
+     * The known file types are: image, video, audio, document
+     * @return string Returns the file type or NULL if the item is a folder.
+     */
+    public function getFileType()
+    {
+        if (!$this->isFile()) {
+            return null;
+        }
+
+        if (!self::$imageExtensions) {
+            self::$imageExtensions = array_map('strtolower', Config::get('cms.storage.media.imageExtensions', FileDefinitions::get('imageExtensions')));
+            self::$videoExtensions = array_map('strtolower', Config::get('cms.storage.media.videoExtensions', FileDefinitions::get('videoExtensions')));
+            self::$audioExtensions = array_map('strtolower', Config::get('cms.storage.media.audioExtensions', FileDefinitions::get('audioExtensions')));
+        }
+
+        $extension = strtolower(pathinfo($this->path, PATHINFO_EXTENSION));
+        if (!strlen($extension)) {
+            return self::FILE_TYPE_DOCUMENT;
+        }
+
+        if (in_array($extension, self::$imageExtensions)) {
+            return self::FILE_TYPE_IMAGE;
+        }
+
+        if (in_array($extension, self::$videoExtensions)) {
+            return self::FILE_TYPE_VIDEO;
+        }
+
+        if (in_array($extension, self::$audioExtensions)) {
+            return self::FILE_TYPE_AUDIO;
+        }
+
+        return self::FILE_TYPE_DOCUMENT;
+    }
+
+    /**
+     * Returns the item size as string.
+     * For file-type items the size is the number of bytes. For folder-type items
+     * the size is the number of items contained by the item.
+     * @return string Returns the size as string.
+     */
+    public function sizeToString()
+    {
+        return $this->type == self::TYPE_FILE
+            ? File::sizeToString($this->size)
+            : $this->size.' '.trans('system::lang.media.folder_size_items');
+    }
+
+    /**
+     * Returns the item last modification date as string.
+     * @return string Returns the item's last modification date as string.
+     */
+    public function lastModifiedAsString()
+    {
+        if (!($date = $this->lastModified)) {
+            return null;
+        }
+
+        return Carbon::createFromTimestamp($date)->toFormattedDateString();
+    }
+}
diff --git a/modules/system/lang/be/lang.php b/modules/system/lang/be/lang.php
index 8cc5edc69..8aa27bbc2 100644
--- a/modules/system/lang/be/lang.php
+++ b/modules/system/lang/be/lang.php
@@ -315,5 +315,9 @@ return [
         'manage_editor' => "Кіраванне перавагамі рэдакатару коду",
         'view_the_dashboard' => "Прагледзець панэль кіравання",
         'manage_branding' => "Наладзіць панэль кіравання"
-    ]
+    ],
+    'media' => [
+        'invalid_path' => "Няправільны шлях да файлу: \":path\"",
+        'folder_size_items' => "аб'ект(аў)",
+    ],
 ];
diff --git a/modules/system/lang/bg/lang.php b/modules/system/lang/bg/lang.php
index 6c3883255..4d8975e1e 100644
--- a/modules/system/lang/bg/lang.php
+++ b/modules/system/lang/bg/lang.php
@@ -302,5 +302,9 @@ return [
         'manage_editor' => 'Управление на предпочитанията на редактор на код',
         'view_the_dashboard' => 'Преглед на таблото',
         'manage_branding' => 'Персонализиране на админ панела'
-    ]
+    ],
+    'media' => [
+        'invalid_path' => "Невалиден път за файл е посочено: ':path'.",
+        'folder_size_items' => 'предмет(и)',
+    ],
 ];
diff --git a/modules/system/lang/cs/lang.php b/modules/system/lang/cs/lang.php
index 7f8dd0c7b..d139e750c 100644
--- a/modules/system/lang/cs/lang.php
+++ b/modules/system/lang/cs/lang.php
@@ -337,5 +337,9 @@ return [
         'log_requests_comment' => 'Požadavky prohlížeče, které mohou vyžadovat pozornost, například chyby 404.',
         'log_theme' => 'Zaznamenávat změny témat',
         'log_theme_comment' => 'Když dojde ke změně tématu pomocí administrace.',
-    ]
+    ],
+    'media' => [
+        'invalid_path' => "Chybně zadaná cesta: ':path'.",
+        'folder_size_items' => 'soubor(ů)',
+    ],
 ];
diff --git a/modules/system/lang/da/lang.php b/modules/system/lang/da/lang.php
index 58968c13d..a3b67fc7c 100644
--- a/modules/system/lang/da/lang.php
+++ b/modules/system/lang/da/lang.php
@@ -312,5 +312,9 @@ return [
         'manage_editor' => 'Administrer kode redigeringsværktøjets indstillinger',
         'view_the_dashboard' => 'Vis administratorpanelet',
         'manage_branding' => 'Tilpas backenden'
-    ]
+    ],
+    'media' => [
+        'invalid_path' => "Ugyldig sti: ':path'.",
+        'folder_size_items' => 'ting',
+    ],
 ];
diff --git a/modules/system/lang/de/lang.php b/modules/system/lang/de/lang.php
index 7b8a6088e..a8cf5ec6a 100644
--- a/modules/system/lang/de/lang.php
+++ b/modules/system/lang/de/lang.php
@@ -231,5 +231,9 @@ return [
         'manage_editor' => 'Code-Editor-Einstellungen verwalten',
         'view_the_dashboard' => 'Dashboard einsehen',
         'manage_branding' => 'Backend individualisieren'
-    ]
+    ],
+    'media' => [
+        'invalid_path' => "Ungültiger Dateipfad: ':path'.",
+        'folder_size_items' => 'Datei(en)',
+    ],
 ];
diff --git a/modules/system/lang/el/lang.php b/modules/system/lang/el/lang.php
index 75ce357ca..de8cd1b7e 100644
--- a/modules/system/lang/el/lang.php
+++ b/modules/system/lang/el/lang.php
@@ -312,5 +312,9 @@ return [
         'manage_editor' => 'Διαχείριση προτιμήσεων του επεξεργαστεί κώδικα',
         'view_the_dashboard' => 'Προβολή του πίνακα ελέγχου',
         'manage_branding' => 'Προσαρμογή του back-end',
-    ]
+    ],
+    'media' => [
+        'invalid_path' => "Ορίστηκε μη έγκυρη διαδρομή αρχείου : ':path'.",
+        'folder_size_items' => 'αντικείμενο(α)',
+    ],
 ];
diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php
index 62643ba0d..8becbefdf 100644
--- a/modules/system/lang/en/lang.php
+++ b/modules/system/lang/en/lang.php
@@ -423,5 +423,9 @@ return [
         'log_requests_comment' => 'Browser requests that may require attention, such as 404 errors.',
         'log_theme' => 'Log theme changes',
         'log_theme_comment' => 'When a change is made to the theme using the back-end.',
-    ]
+    ],
+    'media' => [
+        'invalid_path' => "Invalid file path specified: ':path'.",
+        'folder_size_items' => 'item(s)',
+    ],
 ];
diff --git a/modules/system/lang/es/lang.php b/modules/system/lang/es/lang.php
index e619cf84c..70d89c6a1 100644
--- a/modules/system/lang/es/lang.php
+++ b/modules/system/lang/es/lang.php
@@ -311,5 +311,9 @@ return [
         'manage_editor' => 'Gestionar preferencias editor código',
         'view_the_dashboard' => 'Ver el Escritorio',
         'manage_branding' => 'Perzonalizar el back-end'
-    ]
+    ],
+    'media' => [
+        'invalid_path' => "Ruta de archivo especificada no válida: ':path'.",
+        'folder_size_items' => 'elemento(s)',
+    ],
 ];
diff --git a/modules/system/lang/et/lang.php b/modules/system/lang/et/lang.php
index 7b228a1c1..9dde159b1 100644
--- a/modules/system/lang/et/lang.php
+++ b/modules/system/lang/et/lang.php
@@ -363,5 +363,9 @@ return [
         'log_requests_comment' => 'Süsteemi juurdepääsu päringud, mis võiksid vajada tähelepanu (nt 404)',
         'log_theme' => 'Logi teema muudatusi',
         'log_theme_comment' => 'Teema muudatused, mida tehakse haldusliideses.',
-    ]
+    ],
+    'media' => [
+        'invalid_path' => "Invalid file path specified: ':path'.",
+        'folder_size_items' => 'item(s)',
+    ],
 ];
diff --git a/modules/system/lang/fa/lang.php b/modules/system/lang/fa/lang.php
index db422cf5b..ebd0a7309 100644
--- a/modules/system/lang/fa/lang.php
+++ b/modules/system/lang/fa/lang.php
@@ -316,5 +316,9 @@ return [
         'manage_editor' => 'مدیریت تنظیمات ویرایشگر کد',
         'view_the_dashboard' => 'نمایش صفحه مدیریت',
         'manage_branding' => 'شخصی سازی قسمت مدیریت'
-    ]
+    ],
+    'media' => [
+        'invalid_path' => "آدرس فایل ':path' معتبر نیست.",
+        'folder_size_items' => 'مورد(ها)',
+    ],
 ];
diff --git a/modules/system/lang/fr/lang.php b/modules/system/lang/fr/lang.php
index 3f51f19f0..67fdfced3 100644
--- a/modules/system/lang/fr/lang.php
+++ b/modules/system/lang/fr/lang.php
@@ -316,5 +316,9 @@ return [
         'manage_editor' => 'Gérer les préférences de l’éditeur de code',
         'view_the_dashboard' => 'Voir le tableau de bord',
         'manage_branding' => 'Personnaliser l’interface d’administration'
-    ]
+    ],
+    'media' => [
+        'invalid_path' => "Le chemin du fichier indiqué est invalide : ':path'.",
+        'folder_size_items' => 'Articles(s)',
+    ],
 ];
diff --git a/modules/system/lang/hu/lang.php b/modules/system/lang/hu/lang.php
index 7cf1f022c..45c0f511e 100644
--- a/modules/system/lang/hu/lang.php
+++ b/modules/system/lang/hu/lang.php
@@ -385,5 +385,9 @@ return [
         'log_requests_comment' => 'Rossz vagy átirányított kérelmek eltárolása.',
         'log_theme' => 'Téma változtatások naplózása',
         'log_theme_comment' => 'A fájlokban történt változtatások eltárolása.'
-    ]
+    ],
+    'media' => [
+        'invalid_path' => "Érvénytelen elérési útvonal: ':path'",
+        'folder_size_items' => 'fájl',
+    ],
 ];
diff --git a/modules/system/lang/it/lang.php b/modules/system/lang/it/lang.php
index 448c7bc8a..59aabc540 100644
--- a/modules/system/lang/it/lang.php
+++ b/modules/system/lang/it/lang.php
@@ -312,5 +312,9 @@ return [
         'manage_editor' => 'Gestisci preferenze editor di codice',
         'view_the_dashboard' => 'Visualizza la dashboard',
         'manage_branding' => 'Personalizza il pannello di controllo'
-    ]
+    ],
+    'media' => [
+        'invalid_path' => "Percorso del file non valido: ':path'.",
+        'folder_size_items' => 'elementi',
+    ],
 ];
diff --git a/modules/system/lang/kr/lang.php b/modules/system/lang/kr/lang.php
index 1a54d5a21..1588d57df 100644
--- a/modules/system/lang/kr/lang.php
+++ b/modules/system/lang/kr/lang.php
@@ -324,5 +324,9 @@ return [
         'log_requests_comment' => '404같은 주의가 필요한 브라우저 요청 기록',
         'log_theme' => '테마 변경 기록',
         'log_theme_comment' => '백엔드를 사용한 테마변경 기록',
-    ]
+    ],
+    'media' => [
+        'invalid_path' => "잘못된 경로: ':path'.",
+        'folder_size_items' => '갯수',
+    ],
 ];
diff --git a/modules/system/lang/lt/lang.php b/modules/system/lang/lt/lang.php
index a16950d2e..019ab2d4b 100644
--- a/modules/system/lang/lt/lang.php
+++ b/modules/system/lang/lt/lang.php
@@ -350,5 +350,9 @@ return [
         'manage_editor' => 'Tvarkyti kodo redaktoriaus nustatymus',
         'view_the_dashboard' => 'Skydelis',
         'manage_branding' => 'Redaguoti posistemę'
-    ]
+    ],
+    'media' => [
+        'invalid_path' => "Nurodytas netinkamas kelias: ':path'.",
+        'folder_size_items' => 'elementai(as)',
+    ],
 ];
diff --git a/modules/system/lang/lv/lang.php b/modules/system/lang/lv/lang.php
index 2344f8ba7..7b7629ab0 100644
--- a/modules/system/lang/lv/lang.php
+++ b/modules/system/lang/lv/lang.php
@@ -286,5 +286,9 @@ return [
         'manage_other_administrators' => 'Pārvaldīt citus administrātorus',
         'view_the_dashboard' => 'Skatīt mērinstrumentu paneli',
         'manage_branding' => 'Pielāgot back-end'
-    ]
+    ],
+    'media' => [
+        'invalid_path' => "Norādīts nederīgs ceļš līdz failam: ':path'.",
+        'folder_size_items' => 'objekti(s)',
+    ],
 ];
diff --git a/modules/system/lang/nb-no/lang.php b/modules/system/lang/nb-no/lang.php
index 7cd099534..6681f46d1 100644
--- a/modules/system/lang/nb-no/lang.php
+++ b/modules/system/lang/nb-no/lang.php
@@ -312,5 +312,9 @@ return [
         'manage_editor' => 'Administrer kodeeditor-innstillinger',
         'view_the_dashboard' => 'Se dashboard',
         'manage_branding' => 'Tilpasse backend'
-    ]
+    ],
+    'media' => [
+        'invalid_path' => "Ugyldig filsti: ':path'.",
+        'folder_size_items' => 'fil(er)',
+    ],
 ];
diff --git a/modules/system/lang/nl/lang.php b/modules/system/lang/nl/lang.php
index 2813cdfd4..5bf572fe6 100644
--- a/modules/system/lang/nl/lang.php
+++ b/modules/system/lang/nl/lang.php
@@ -366,5 +366,9 @@ return [
         'log_requests_comment' => 'Verzoeken van browsers die aandacht benodigd hebben, zoals bijvoorbeeld 404 fouten.',
         'log_theme' => 'Bijhouden van thema wijzigingen',
         'log_theme_comment' => 'Wanneer er een wijziging zijn gemaakt binnen het thema (vanuit de back-end omgeving).',
-    ]
+    ],
+    'media' => [
+        'invalid_path' => 'Ongeldig pad opgegeven: \':path\'.',
+        'folder_size_items' => 'item(s)',
+    ],
 ];
diff --git a/modules/system/lang/pl/lang.php b/modules/system/lang/pl/lang.php
index a7a41b41a..004976d25 100644
--- a/modules/system/lang/pl/lang.php
+++ b/modules/system/lang/pl/lang.php
@@ -312,5 +312,9 @@ return [
         'manage_editor' => 'Zarządzaj ustawieniami edytora kodu',
         'view_the_dashboard' => 'Zobacz kokpit',
         'manage_branding' => 'Personalizuj zaplecze'
-    ]
+    ],
+    'media' => [
+        'invalid_path' => "Wybrano nieprawidłową ścieżkę pliku: ':path'.",
+        'folder_size_items' => 'element(y)',
+    ],
 ];
diff --git a/modules/system/lang/pt-br/lang.php b/modules/system/lang/pt-br/lang.php
index 72cad5cee..5facd0923 100644
--- a/modules/system/lang/pt-br/lang.php
+++ b/modules/system/lang/pt-br/lang.php
@@ -313,4 +313,8 @@ return [
         'view_the_dashboard' => 'Visualizar o painel',
         'manage_branding' => 'Personalizar o painel'
     ],
+    'media' => [
+        'invalid_path' => "Caminho especificado inválido: ':path'.",
+        'folder_size_items' => 'item(s)',
+    ],
 ];
diff --git a/modules/system/lang/pt-pt/lang.php b/modules/system/lang/pt-pt/lang.php
index f85dad613..743a4c244 100644
--- a/modules/system/lang/pt-pt/lang.php
+++ b/modules/system/lang/pt-pt/lang.php
@@ -362,5 +362,9 @@ return [
         'log_requests_comment' => 'Requisições que requerem a sua atenção, por exemplo erros 404.',
         'log_theme' => 'Registar alterações de tema',
         'log_theme_comment' => 'Quado uma alteração é efectuada no tema utilizando o backend.',
-    ]
+    ],
+    'media' => [
+        'invalid_path' => "Caminho especificado inválido: ':path'.",
+        'folder_size_items' => 'item(s)',
+    ],
 ];
diff --git a/modules/system/lang/ru/lang.php b/modules/system/lang/ru/lang.php
index 391ec0de0..90516e3b3 100644
--- a/modules/system/lang/ru/lang.php
+++ b/modules/system/lang/ru/lang.php
@@ -331,4 +331,8 @@ return [
         'log_theme' => 'Сохранять изменения темы',
         'log_theme_comment' => 'Изменения которые внесены средствами CMS.'
     ],
+    'media' => [
+        'invalid_path' => "Указан недопустимый путь к файлу: ':path'.",
+        'folder_size_items' => 'объектов',
+    ],
 ];
diff --git a/modules/system/lang/sv/lang.php b/modules/system/lang/sv/lang.php
index 151129810..616273c7d 100644
--- a/modules/system/lang/sv/lang.php
+++ b/modules/system/lang/sv/lang.php
@@ -296,5 +296,9 @@ return [
         'manage_editor' => 'Hantera inställningar för kodredigerare',
         'view_the_dashboard' => 'Visa kontrollpanelen',
         'manage_branding' => 'Anpassa back-end',
-    ]
+    ],
+    'media' => [
+        'invalid_path' => "Felaktig filsökväg angiven: ':path'.",
+        'folder_size_items' => 'föremål',
+    ],
 ];
diff --git a/modules/system/lang/tr/lang.php b/modules/system/lang/tr/lang.php
index 2f9115260..d09b84fd9 100644
--- a/modules/system/lang/tr/lang.php
+++ b/modules/system/lang/tr/lang.php
@@ -312,5 +312,9 @@ return [
         'manage_editor' => 'Kod editör ayarlarını düzenleyebilir',
         'view_the_dashboard' => 'Panoyu görüntüleyebilir',
         'manage_branding' => 'Yönetim Panelini özelleştirebilsin'
-    ]
+    ],
+    'media' => [
+        'invalid_path' => "Geçersiz dosya dizini belirtildi: ':path'.",
+        'folder_size_items' => 'öğe(ler)',
+    ],
 ];
diff --git a/modules/system/lang/uk/lang.php b/modules/system/lang/uk/lang.php
index 81f3659e9..689affd1e 100644
--- a/modules/system/lang/uk/lang.php
+++ b/modules/system/lang/uk/lang.php
@@ -331,4 +331,8 @@ return [
         'log_theme' => 'Зберігати зміни теми',
         'log_theme_comment' => 'Зміни які внесені засобами CMS.'
     ],
+    'media' => [
+        'invalid_path' => 'Вказано неприпустимий шлях до файлу: ":path".',
+        'folder_size_items' => 'Об\'єктів',
+    ],
 ];
diff --git a/modules/system/lang/zh-cn/lang.php b/modules/system/lang/zh-cn/lang.php
index 640197207..df9124ec8 100644
--- a/modules/system/lang/zh-cn/lang.php
+++ b/modules/system/lang/zh-cn/lang.php
@@ -289,5 +289,9 @@ return [
         'manage_editor' => '管理代码编辑器偏好设置',
         'view_the_dashboard' => '查看仪表盘',
         'manage_branding' => '自定义后台'
-    ]
+    ],
+   'media' => [
+        'invalid_path' => "不合法的路径: ':path'.",
+        'folder_size_items' => '个数',
+    ],
 ];
diff --git a/modules/system/lang/zh-tw/lang.php b/modules/system/lang/zh-tw/lang.php
index 815d9699e..4769515aa 100644
--- a/modules/system/lang/zh-tw/lang.php
+++ b/modules/system/lang/zh-tw/lang.php
@@ -260,5 +260,9 @@ return [
         'manage_other_administrators' => '管理其他管理員',
         'view_the_dashboard' => '查看儀表板',
         'manage_branding' => '自訂後台'
-    ]
+    ],
+   'media' => [
+        'invalid_path' => "不合法的路徑: ':path'.",
+        'folder_size_items' => '個數',
+    ],
 ];
diff --git a/modules/system/twig/Extension.php b/modules/system/twig/Extension.php
index 6d921d037..0a152d1c6 100644
--- a/modules/system/twig/Extension.php
+++ b/modules/system/twig/Extension.php
@@ -6,6 +6,7 @@ use Twig_TokenParser;
 use Twig_SimpleFilter;
 use Twig_SimpleFunction;
 use ApplicationException;
+use System\Classes\MediaLibary;
 use System\Classes\MarkupManager;
 
 /**
@@ -56,6 +57,7 @@ class Extension extends Twig_Extension
     {
         $filters = [
             new Twig_SimpleFilter('app', [$this, 'appFilter'], ['is_safe' => ['html']]),
+            new Twig_SimpleFilter('media', [$this, 'mediaFilter'], ['is_safe' => ['html']]),
         ];
 
         /*
@@ -92,4 +94,14 @@ class Extension extends Twig_Extension
     {
         return Url::to($url);
     }
+
+    /**
+     * Converts supplied file to a URL relative to the media library.
+     * @param string $file Specifies the media-relative file
+     * @return string
+     */
+    public function mediaFilter($file)
+    {
+        return MediaLibrary::url($file);
+    }
 }
diff --git a/tests/unit/cms/classes/MediaLibraryTest.php b/tests/unit/system/classes/MediaLibraryTest.php
similarity index 97%
rename from tests/unit/cms/classes/MediaLibraryTest.php
rename to tests/unit/system/classes/MediaLibraryTest.php
index 5ce1ecb67..b549231a0 100644
--- a/tests/unit/cms/classes/MediaLibraryTest.php
+++ b/tests/unit/system/classes/MediaLibraryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use Cms\Classes\MediaLibrary;
+use System\Classes\MediaLibrary;
 
 class MediaLibraryTest extends TestCase // @codingStandardsIgnoreLine
 {