diff --git a/modules/backend/formwidgets/fileupload/assets/css/fileupload.css b/modules/backend/formwidgets/fileupload/assets/css/fileupload.css
index 2b3b9cc8c..28b83b783 100644
--- a/modules/backend/formwidgets/fileupload/assets/css/fileupload.css
+++ b/modules/backend/formwidgets/fileupload/assets/css/fileupload.css
@@ -282,6 +282,7 @@ html:not(.touch) .field-fileupload .attachment-item .uploader-toolbar a.uploader
 html:not(.touch) .field-fileupload .attachment-item .uploader-toolbar a.uploader-remove:hover {
   color: #c73f26;
 }
+html:not(.touch) .field-fileupload .attachment-item .uploader-toolbar a.uploader-config,
 html:not(.touch) .field-fileupload .attachment-item .uploader-toolbar a.uploader-file-link {
   display: inline-block;
 }
diff --git a/modules/backend/formwidgets/fileupload/assets/less/fileupload.less b/modules/backend/formwidgets/fileupload/assets/less/fileupload.less
index 8d2fd9b75..982ae7fd9 100644
--- a/modules/backend/formwidgets/fileupload/assets/less/fileupload.less
+++ b/modules/backend/formwidgets/fileupload/assets/less/fileupload.less
@@ -312,6 +312,7 @@ html:not(.touch) {
                         }
                     }
 
+                    &.uploader-config,
                     &.uploader-file-link {
                         display: inline-block;
                     }
diff --git a/modules/backend/formwidgets/fileupload/partials/_file_multi.htm b/modules/backend/formwidgets/fileupload/partials/_file_multi.htm
index 7e4027d27..7c947dd0f 100644
--- a/modules/backend/formwidgets/fileupload/partials/_file_multi.htm
+++ b/modules/backend/formwidgets/fileupload/partials/_file_multi.htm
@@ -55,21 +55,29 @@
                     {{#description}}
                         <p><abbr title="{{description}}">{{description}}</abbr></p>
                     {{/description}}
-                    <a
-                        href="javascript:;" 
-                        class="uploader-remove oc-icon-times"
-                        data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
-                        data-request-data="file_id: {{id}}"></a>
-                    <a
-                        href="javascript:;" 
-                        class="uploader-config oc-icon-cog"
-                        data-control="popup"
-                        data-handler="<?= $this->getEventHandler('onLoadAttachmentConfig') ?>"
-                        data-request-data="file_id: {{id}}"></a>
-                    <a
-                        href="{{path}}"
-                        class="uploader-file-link oc-icon-paper-clip"
-                        target="_blank"></a>
+
+                    <?php if (!$this->previewMode): ?>
+                        <a
+                            href="javascript:;"
+                            class="uploader-remove oc-icon-times"
+                            data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
+                            data-request-data="file_id: {{id}}"></a>
+                    <?php endif ?>
+
+                    <div class="controls">
+                        <?php if (!$this->previewMode): ?>
+                            <a
+                                href="javascript:;"
+                                class="uploader-config oc-icon-cog"
+                                data-control="popup"
+                                data-handler="<?= $this->getEventHandler('onLoadAttachmentConfig') ?>"
+                                data-request-data="file_id: {{id}}"></a>
+                        <?php endif ?>
+                        <a
+                            href="{{path}}"
+                            class="uploader-file-link oc-icon-paper-clip"
+                            target="_blank"></a>
+                    </div>
                 </div>
                 <div class="uploader-loading"></div>
             </div>
diff --git a/modules/backend/formwidgets/fileupload/partials/_file_single.htm b/modules/backend/formwidgets/fileupload/partials/_file_single.htm
index b7e05f793..733672ef2 100644
--- a/modules/backend/formwidgets/fileupload/partials/_file_single.htm
+++ b/modules/backend/formwidgets/fileupload/partials/_file_single.htm
@@ -47,23 +47,30 @@
             {{#description}}
                 <p><abbr title="{{description}}">{{description}}</abbr></p>
             {{/description}}
-            <a
-                href="javascript:;"
-                class="uploader-remove oc-icon-times"
-                data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
-                data-request-data="file_id: {{id}}"></a>
 
-            <a
-                href="javascript:;"
-                class="uploader-config oc-icon-cog"
-                data-control="popup"
-                data-handler="<?= $this->getEventHandler('onLoadAttachmentConfig') ?>"
-                data-request-data="file_id: {{id}}"></a>
+            <?php if (!$this->previewMode): ?>
+                <a
+                    href="javascript:;"
+                    class="uploader-remove oc-icon-times"
+                    data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
+                    data-request-data="file_id: {{id}}"></a>
+            <?php endif ?>
 
-            <a
-                href="{{path}}"
-                class="uploader-file-link oc-icon-paper-clip"
-                target="_blank"></a>
+            <div class="controls">
+                <?php if (!$this->previewMode): ?>
+                    <a
+                        href="javascript:;"
+                        class="uploader-config oc-icon-cog"
+                        data-control="popup"
+                        data-handler="<?= $this->getEventHandler('onLoadAttachmentConfig') ?>"
+                        data-request-data="file_id: {{id}}"></a>
+                <?php endif ?>
+
+                <a
+                    href="{{path}}"
+                    class="uploader-file-link oc-icon-paper-clip"
+                    target="_blank"></a>
+            </div>
         </div>
 
     </script>
diff --git a/modules/backend/formwidgets/fileupload/partials/_image_multi.htm b/modules/backend/formwidgets/fileupload/partials/_image_multi.htm
index 2bae4ad9f..00b685a13 100644
--- a/modules/backend/formwidgets/fileupload/partials/_image_multi.htm
+++ b/modules/backend/formwidgets/fileupload/partials/_image_multi.htm
@@ -56,21 +56,23 @@
                     {{#description}}
                         <p><abbr title="{{description}}">{{description}}</abbr></p>
                     {{/description}}
+
                     <?php if (!$this->previewMode): ?>
-                    <a
-                        href="javascript:;"
-                        class="uploader-remove oc-icon-times"
-                        data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
-                        data-request-data="file_id: {{id}}"></a>
-                    <?php endif ?>
-                    <div class="controls">
-                        <?php if (!$this->previewMode): ?>
                         <a
                             href="javascript:;"
-                            class="uploader-config oc-icon-cog"
-                            data-control="popup"
-                            data-handler="<?= $this->getEventHandler('onLoadAttachmentConfig') ?>"
+                            class="uploader-remove oc-icon-times"
+                            data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
                             data-request-data="file_id: {{id}}"></a>
+                    <?php endif ?>
+
+                    <div class="controls">
+                        <?php if (!$this->previewMode): ?>
+                            <a
+                                href="javascript:;"
+                                class="uploader-config oc-icon-cog"
+                                data-control="popup"
+                                data-handler="<?= $this->getEventHandler('onLoadAttachmentConfig') ?>"
+                                data-request-data="file_id: {{id}}"></a>
                         <?php endif ?>
 
                         <a
diff --git a/modules/backend/formwidgets/fileupload/partials/_image_single.htm b/modules/backend/formwidgets/fileupload/partials/_image_single.htm
index 419698bf4..c17bbe6d5 100644
--- a/modules/backend/formwidgets/fileupload/partials/_image_single.htm
+++ b/modules/backend/formwidgets/fileupload/partials/_image_single.htm
@@ -49,20 +49,24 @@
             {{#description}}
                 <p><abbr title="{{description}}">{{description}}</abbr></p>
             {{/description}}
-            <a
-                href="javascript:;"
-                class="uploader-remove oc-icon-times"
-                data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
-                data-request-data="file_id: {{id}}"></a>
 
-            <div class="controls">
+            <?php if (!$this->previewMode): ?>
                 <a
                     href="javascript:;"
-                    class="uploader-config oc-icon-cog"
-                    data-control="popup"
-                    data-handler="<?= $this->getEventHandler('onLoadAttachmentConfig') ?>"
+                    class="uploader-remove oc-icon-times"
+                    data-request="<?= $this->getEventHandler('onRemoveAttachment') ?>"
                     data-request-data="file_id: {{id}}"></a>
+            <?php endif ?>
 
+            <div class="controls">
+                <?php if (!$this->previewMode): ?>
+                    <a
+                        href="javascript:;"
+                        class="uploader-config oc-icon-cog"
+                        data-control="popup"
+                        data-handler="<?= $this->getEventHandler('onLoadAttachmentConfig') ?>"
+                        data-request-data="file_id: {{id}}"></a>
+                <?php endif ?>
                 <a
                     href="{{path}}"
                     class="uploader-file-link oc-icon-paperclip"
diff --git a/modules/system/assets/js/framework.js b/modules/system/assets/js/framework.js
index cc26fea0f..06c7e71e4 100644
--- a/modules/system/assets/js/framework.js
+++ b/modules/system/assets/js/framework.js
@@ -204,7 +204,7 @@ if (window.jQuery === undefined)
                 if (data['X_OCTOBER_ERROR_FIELDS']) {
                     var isFirstInvalidField = true
                     $.each(data['X_OCTOBER_ERROR_FIELDS'], function(fieldName, fieldMessages){
-                        var fieldElement = form.find('[name="'+fieldName+'"], [name$="['+fieldName+']"]').filter(':enabled').first()
+                        var fieldElement = form.find('[name="'+fieldName+'"], [name="'+fieldName+'[]"], [name$="['+fieldName+']"], [name$="['+fieldName+'][]"]').filter(':enabled').first()
                         if (fieldElement.length > 0) {
 
                             var _event = jQuery.Event('ajaxInvalidField')
@@ -244,6 +244,7 @@ if (window.jQuery === undefined)
 
         if (loading) loading.show()
 
+        $(window).trigger('ajaxBeforeSend')
         $el.trigger('ajaxPromise')
         return $.ajax(requestOptions)
             .fail(function(jqXHR, textStatus, errorThrown){