diff --git a/administrator/language/en-GB/en-GB.com_media.ini b/administrator/language/en-GB/en-GB.com_media.ini
index f4be2db3fb22e..8c5f927905460 100644
--- a/administrator/language/en-GB/en-GB.com_media.ini
+++ b/administrator/language/en-GB/en-GB.com_media.ini
@@ -74,3 +74,50 @@ COM_MEDIA_TOGGLE_INFO="Toggle item info"
 COM_MEDIA_TOGGLE_LIST_VIEW="Toggle between grid and table views"
 COM_MEDIA_TOGGLE_SELECT_ITEM="Toggle select item"
 COM_MEDIA_UPDLOAD_SUCCESS="Item uploaded."
+COM_MEDIA_INCREASE_GRID="Increase grid size"
+COM_MEDIA_ALIGN="Image Float"
+COM_MEDIA_ALIGN_DESC="This will apply the classes 'float-left', 'pull-center' or 'float-right' to the '<figure>' or '<img>' element."
+COM_MEDIA_BROWSE_FILES="Browse Files"
+COM_MEDIA_CAPTION="Caption"
+COM_MEDIA_CAPTION_CLASS_DESC="This will apply the entered class to the '<figcaption>' element. For example: 'text-left', 'text-right', 'text-center'."
+COM_MEDIA_CAPTION_CLASS_LABEL="Caption Class"
+COM_MEDIA_CLEAR_LIST="Clear List"
+COM_MEDIA_CREATE_FOLDER="Create Folder"
+COM_MEDIA_CURRENT_PROGRESS="Current progress"
+COM_MEDIA_DESCFTP="To upload, change and delete media files, Joomla! will most likely need your FTP account details. Please enter them in the form fields below."
+COM_MEDIA_DESCFTPTITLE="FTP Login Details"
+COM_MEDIA_DETAIL_VIEW="Detail View"
+COM_MEDIA_DIRECTORY="Folder"
+COM_MEDIA_DIRECTORY_UP="Folder Up"
+COM_MEDIA_ERROR_BAD_REQUEST="Bad Request"
+COM_MEDIA_ERROR_FILE_EXISTS="File already exists."
+COM_MEDIA_ERROR_UNABLE_TO_BROWSE_FOLDER_WARNDIRNAME="Unable to browse:&#160;%s. Folder name must only have alphanumeric characters and no spaces."
+COM_MEDIA_ERROR_UNABLE_TO_CREATE_FOLDER_WARNDIRNAME="Unable to create folder. Folder name must only have alphanumeric characters and no spaces."
+COM_MEDIA_ERROR_UNABLE_TO_DELETE="Unable to delete:&#160;"
+COM_MEDIA_ERROR_UNABLE_TO_DELETE_FILE_WARNFILENAME="Unable to delete:&#160;%s. File name must only have alphanumeric characters and no spaces."
+COM_MEDIA_ERROR_UNABLE_TO_DELETE_FOLDER_NOT_EMPTY="Unable to delete:&#160;%s. Folder is not empty!"
+COM_MEDIA_ERROR_UNABLE_TO_DELETE_FOLDER_WARNDIRNAME="Unable to delete:&#160;%s. Folder name must only have alphanumeric characters and no spaces."
+COM_MEDIA_ERROR_UNABLE_TO_UPLOAD_FILE="Unable to upload file."
+COM_MEDIA_ERROR_WARNFILETOOLARGE="This file is too large to upload."
+COM_MEDIA_ERROR_WARNUPLOADTOOLARGE="Total size of upload exceeds the limit."
+COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_LABEL="Path to Image Folder"
+COM_MEDIA_FILES="Files"
+COM_MEDIA_FILESIZE="File size"
+COM_MEDIA_IMAGE_DESCRIPTION="Image Description"
+COM_MEDIA_IMAGE_URL="Image URL"
+COM_MEDIA_INSERT="Insert"
+COM_MEDIA_INSERT_IMAGE="Insert Image"
+COM_MEDIA_MAXIMUM_SIZE="Maximum Size"
+COM_MEDIA_MEDIA="Media"
+COM_MEDIA_NO_IMAGES_FOUND="No Images Found"
+COM_MEDIA_NOT_SET="Not Set"
+COM_MEDIA_OVERALL_PROGRESS="Overall Progress"
+COM_MEDIA_PIXEL_DIMENSIONS="Pixel Dimensions (w x h)"
+COM_MEDIA_START_UPLOAD="Start Upload"
+COM_MEDIA_THUMBNAIL_VIEW="Thumbnail View"
+COM_MEDIA_TITLE="Image Title"
+COM_MEDIA_UP="Up"
+COM_MEDIA_UPLOAD="Upload"
+COM_MEDIA_UPLOAD_COMPLETE="Upload Complete"
+COM_MEDIA_UPLOAD_FILE="Upload file"
+COM_MEDIA_UPLOAD_SUCCESSFUL="Upload Successful"
diff --git a/language/en-GB/en-GB.com_media.ini b/language/en-GB/en-GB.com_media.ini
deleted file mode 100644
index 2629b242f9189..0000000000000
--- a/language/en-GB/en-GB.com_media.ini
+++ /dev/null
@@ -1,88 +0,0 @@
-; Joomla! Project
-; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
-; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
-; Note : All ini files need to be saved as UTF-8
-
-COM_MEDIA_ACTIN_RENAME="Rename item"
-COM_MEDIA_ACTION_DELETE="Delete item"
-COM_MEDIA_ACTION_EDIT="Edit item"
-COM_MEDIA_ACTION_PREVIEW="Preview item"
-COM_MEDIA_ACTION_SHARE="Get a sharable link"
-COM_MEDIA_ALIGN="Image Float"
-COM_MEDIA_ALIGN_DESC="This will apply the classes 'float-left', 'pull-center' or 'float-right' to the '<figure>' or '<img>' element."
-COM_MEDIA_BROWSE_FILES="Browse Files"
-COM_MEDIA_CAPTION="Caption"
-COM_MEDIA_CAPTION_CLASS_DESC="This will apply the entered class to the '<figcaption>' element. For example: 'text-left', 'text-right', 'text-center'."
-COM_MEDIA_CAPTION_CLASS_LABEL="Caption Class"
-COM_MEDIA_CLEAR_LIST="Clear List"
-COM_MEDIA_CONFIGURATION="Media: Options"
-COM_MEDIA_CREATE_FOLDER="Create Folder"
-COM_MEDIA_CURRENT_PROGRESS="Current progress"
-COM_MEDIA_DECREASE_GRID="Decrease grid size"
-COM_MEDIA_DESCFTP="To upload, change and delete media files, Joomla! will most likely need your FTP account details. Please enter them in the form fields below."
-COM_MEDIA_DESCFTPTITLE="FTP Login Details"
-COM_MEDIA_DETAIL_VIEW="Detail View"
-COM_MEDIA_DIRECTORY="Folder"
-COM_MEDIA_DIRECTORY_UP="Folder Up"
-COM_MEDIA_ERROR_BAD_REQUEST="Bad Request"
-COM_MEDIA_ERROR_FILE_EXISTS="File already exists."
-COM_MEDIA_ERROR_UNABLE_TO_BROWSE_FOLDER_WARNDIRNAME="Unable to browse:&#160;%s. Folder name must only have alphanumeric characters and no spaces."
-COM_MEDIA_ERROR_UNABLE_TO_CREATE_FOLDER_WARNDIRNAME="Unable to create folder. Folder name must only have alphanumeric characters and no spaces."
-COM_MEDIA_ERROR_UNABLE_TO_DELETE="Unable to delete:&#160;"
-COM_MEDIA_ERROR_UNABLE_TO_DELETE_FILE_WARNFILENAME="Unable to delete:&#160;%s. File name must only have alphanumeric characters and no spaces."
-COM_MEDIA_ERROR_UNABLE_TO_DELETE_FOLDER_NOT_EMPTY="Unable to delete:&#160;%s. Folder is not empty!"
-COM_MEDIA_ERROR_UNABLE_TO_DELETE_FOLDER_WARNDIRNAME="Unable to delete:&#160;%s. Folder name must only have alphanumeric characters and no spaces."
-COM_MEDIA_ERROR_UNABLE_TO_UPLOAD_FILE="Unable to upload file."
-COM_MEDIA_ERROR_WARNFILETOOLARGE="This file is too large to upload."
-COM_MEDIA_ERROR_WARNUPLOADTOOLARGE="Total size of upload exceeds the limit."
-COM_MEDIA_FIELD_CHECK_MIME_DESC="Use MIME Magic or Fileinfo to try to verify files. Try disabling this if you get invalid mime type errors."
-COM_MEDIA_FIELD_CHECK_MIME_LABEL="Check MIME Types"
-COM_MEDIA_FIELD_IGNORED_EXTENSIONS_DESC="Ignored file extensions for MIME type checking and restricted uploads."
-COM_MEDIA_FIELD_IGNORED_EXTENSIONS_LABEL="Ignored Extensions"
-COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_DESC="A comma separated list of illegal MIME types to upload (blacklist)."
-COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_LABEL="Illegal MIME Types"
-COM_MEDIA_FIELD_LEGAL_EXTENSIONS_DESC="Extensions (file types) you are allowed to upload (comma separated)."
-COM_MEDIA_FIELD_LEGAL_EXTENSIONS_LABEL="Legal Extensions (File Types)"
-COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_DESC="Image extensions (file types) you are allowed to upload (comma separated). These are used to check for valid image headers."
-COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_LABEL="Legal Image Extensions (File Types)"
-COM_MEDIA_FIELD_LEGAL_MIME_TYPES_DESC="A comma separated list of legal MIME types to upload."
-COM_MEDIA_FIELD_LEGAL_MIME_TYPES_LABEL="Legal MIME Types"
-COM_MEDIA_FIELD_MAXIMUM_SIZE_DESC="Use zero for no limit. Note: your server has a maximum limit."
-COM_MEDIA_FIELD_MAXIMUM_SIZE_LABEL="Maximum Size (in MB)"
-COM_MEDIA_FIELD_PATH_FILE_FOLDER_DESC="Enter the path to the file folder relative to root."
-COM_MEDIA_FIELD_PATH_FILE_FOLDER_LABEL="Path to File Folder"
-COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_DESC="Enter the path to the image folder relative to root."
-COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_LABEL="Path to Image Folder"
-COM_MEDIA_FIELD_RESTRICT_UPLOADS_DESC="Restrict uploads for lower than manager users to images if Fileinfo or MIME Magic isn't installed."
-COM_MEDIA_FIELD_RESTRICT_UPLOADS_LABEL="Restrict Uploads"
-COM_MEDIA_FILES="Files"
-COM_MEDIA_FILESIZE="File size"
-COM_MEDIA_FOLDER="Folder"
-COM_MEDIA_FOLDERS="Folders"
-COM_MEDIA_IMAGE_DESCRIPTION="Image Description"
-COM_MEDIA_IMAGE_URL="Image URL"
-COM_MEDIA_INCREASE_GRID="Increase grid size"
-COM_MEDIA_INSERT="Insert"
-COM_MEDIA_INSERT_IMAGE="Insert Image"
-COM_MEDIA_MAXIMUM_SIZE="Maximum Size"
-COM_MEDIA_MEDIA="Media"
-COM_MEDIA_NAME="Image Name"
-COM_MEDIA_NO_IMAGES_FOUND="No Images Found"
-COM_MEDIA_NOT_SET="Not Set"
-COM_MEDIA_OPEN_ITEM_ACTIONS="Open item actions"
-COM_MEDIA_OVERALL_PROGRESS="Overall Progress"
-COM_MEDIA_PIXEL_DIMENSIONS="Pixel Dimensions (w x h)"
-COM_MEDIA_SELECT_ALL="Toggle select all"
-COM_MEDIA_START_UPLOAD="Start Upload"
-COM_MEDIA_THUMBNAIL_VIEW="Thumbnail View"
-COM_MEDIA_TITLE="Image Title"
-COM_MEDIA_TOGGLE_INFO="Toggle item info"
-COM_MEDIA_TOGGLE_LIST_VIEW="Toggle between grid and table views"
-COM_MEDIA_TOGGLE_SELECT_ITEM="Toggle select item"
-COM_MEDIA_UP="Up"
-COM_MEDIA_UPLOAD="Upload"
-COM_MEDIA_UPLOAD_COMPLETE="Upload Complete"
-COM_MEDIA_UPLOAD_FILE="Upload file"
-COM_MEDIA_UPLOAD_SUCCESSFUL="Upload Successful"
-COM_MEDIA_SHARE="Share the file"
-COM_MEDIA_SHARE_DESC="Share the file with others. Anyone with link can view the file"
diff --git a/package-lock.json b/package-lock.json
index da98334528479..ac1cb44e8af5a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3249,8 +3249,7 @@
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -3274,15 +3273,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
           "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3299,22 +3296,19 @@
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
           "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -3445,8 +3439,7 @@
           "version": "2.0.3",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -3460,7 +3453,6 @@
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -3477,7 +3469,6 @@
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -3486,15 +3477,13 @@
           "version": "0.0.8",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
           "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -3515,7 +3504,6 @@
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -3604,8 +3592,7 @@
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
           "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -3619,7 +3606,6 @@
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3715,8 +3701,7 @@
           "version": "5.1.2",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
           "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -3758,7 +3743,6 @@
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -3780,7 +3764,6 @@
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -3829,15 +3812,13 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
           "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },