diff --git a/themes/grav/templates/forms/fields/file/file.html.twig b/themes/grav/templates/forms/fields/file/file.html.twig
index 1d58bf1b..f16e1a9e 100644
--- a/themes/grav/templates/forms/fields/file/file.html.twig
+++ b/themes/grav/templates/forms/fields/file/file.html.twig
@@ -35,10 +35,11 @@
             {% set blueprint_name = type ~ '/' ~ blueprint_name %}
         {% endif %}
         {% set blueprint = base64_encode(blueprint_name) %}
-        {% set real_path = value.thumb ?? global.admin.getPagePathFromToken(path) %}
-        {% set remove = global.file_url_remove ? global.file_url_remove : (global.base_url_relative ~ '/media.json') %}
-        {% set remove = uri.addNonce(
-            remove ~
+        {% set real_path = value.thumb ?? global.context.media[path].relativePath ?? global.form.getPagePathFromToken(path) ?? global.admin.getPagePathFromToken(path) %}
+
+        {% set remove = remove ?: uri.addNonce(
+            global.file_url_remove ~
+            '/media.json' ~
             '/route' ~ config.system.param_sep ~ base64_encode(global.base_path ~ '/' ~ real_path) ~
             '/task' ~ config.system.param_sep ~ 'removeFileFromBlueprint' ~
             '/proute' ~ config.system.param_sep ~ base64_encode(route) ~
@@ -59,14 +60,36 @@
 {% set limit = not field.multiple ? 1 : files.limit %}
 
 {% block input %}
-    {% set upload_limit = config.system.media.upload_limit  / 1024 / 1024 %}
+    {% set form_max_filesize = form_max_filesize ?: config.system.media.upload_limit  / 1024 / 1024 %}
     {% set page_can_upload = exists or (type == 'page' and not exists and not (field.destination starts with '@self' or field.destination starts with 'self@')) %}
-    {% if type is not defined or page_can_upload %}
+    {% if form or (type is not defined or page_can_upload) %}
 
-    {% set settings = {name: field.name, paramName: (scope ~ field.name)|fieldName ~ (files.multiple ? '[]' : ''), limit: limit, filesize: upload_limit, accept: files.accept, resolution: files.resolution, resizeWidth: files.resizeWidth, resizeHeight: files.resizeHeight, resizeQuality: files.resizeQuality } %}
+    {% block prepend %}{% endblock %}
+    {% set settings = {name: field.name, paramName: (scope ~ field.name)|fieldName ~ (files.multiple ? '[]' : ''), limit: limit, filesize: form_max_filesize, accept: files.accept, resolution: files.resolution, resizeWidth: files.resizeWidth, resizeHeight: files.resizeHeight, resizeQuality: files.resizeQuality } %}
+    {% set dropzoneSettings = field.dropzone %}
+    {% if form.getMediaTaskRoute() %}
+        {% set file_url_add = base_url_relative ~ form.getMediaTaskRoute({}, 'json') %}
+        {% set file_task_add = {task: 'media.upload', name: field.name, '__form-name__': form.name, '__unique_form_id__': form.uniqueid} %}
 
-    <div class="form-input-wrapper dropzone files-upload {% if field.fancy is not same as(false) %}form-input-file{% endif %} {{ field.size|default('xlarge') }}" data-grav-file-settings="{{ settings|json_encode|e('html_attr') }}" {% if file_url_add %}data-file-url-add="{{ file_url_add }}"{% endif %} {% if file_url_remove %}data-file-url-remove="{{ file_url_remove }}"{% endif %}>
-        <input
+        {% set file_url_remove = base_url_relative ~ form.getMediaTaskRoute({}, 'json') %}
+        {% set file_task_remove = {task: 'media.delete', name: field.name, '__form-name__': form.name, '__unique_form_id__': form.uniqueid} %}
+    {% else %}
+        {% set file_url_remove = file_url_remove ?: base_url_relative %}
+    {% endif %}
+
+    <div class="{{ form_field_wrapper_classes ?: 'form-input-wrapper' }} {{ field.classes }} dropzone files-upload {% if field.fancy is not same as(false) %}form-input-file{% endif %} {{ field.size }}"
+         data-grav-file-settings="{{ settings|json_encode|e('html_attr') }}"
+         data-dropzone-options="{{ dropzoneSettings|json_encode|e('html_attr') }}"
+         {% if file_task_add %}
+             data-file-post-add="{{ file_task_add|json_encode|e('html_attr') }}"
+             data-file-post-remove="{{ file_task_remove|json_encode|e('html_attr') }}"
+         {% endif %}
+         {% if file_url_add %}data-file-url-add="{{ file_url_add }}"{% endif %}
+         {% if file_url_remove %}data-file-url-remove="{{ file_url_remove }}"{% endif %}
+    >
+
+    {% block file_extras %}{% endblock %}
+    <input
             {# required attribute structures #}
             {% block input_attributes %}
                 type="file"
@@ -74,14 +97,15 @@
                 {% if files.accept %}accept="{{ files.accept|join(',') }}"{% endif %}
                 {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
                 {% if field.random_name %}random="true"{% endif %}
+                {% if required %}required="required"{% endif %}
                 {{ parent() }}
             {% endblock %}
-        />
+    />
 
-        {% for path, file in value %}
-            {{ macro.preview(path, file, _context) }}
-        {% endfor %}
-        {% include 'forms/fields/hidden/hidden.html.twig' with {field: {name: '_json.' ~ field.name}, value:value|raw|json_encode} %}
+    {% for path, file in value %}
+        {{ macro.preview(path, file, _context) }}
+    {% endfor %}
+    {% include 'forms/fields/hidden/hidden.html.twig' with {field: {name: '_json.' ~ field.name}, value: value|json_encode} %}
     </div>
 
     {% else %}