diff --git a/administrator/components/com_media/config.xml b/administrator/components/com_media/config.xml
index 5e0ade0601fe4..42c270bb8e21e 100644
--- a/administrator/components/com_media/config.xml
+++ b/administrator/components/com_media/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
-	<fieldset 
+	<fieldset
 		name="component"
 		label="COM_MEDIA_FIELDSET_OPTIONS_LABEL">
 		<field
@@ -9,14 +9,14 @@
 			label="COM_MEDIA_FIELD_LEGAL_EXTENSIONS_LABEL"
 			description="COM_MEDIA_FIELD_LEGAL_EXTENSIONS_DESC"
 			size="50"
-			default="bmp,csv,doc,gif,ico,jpg,jpeg,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,BMP,CSV,DOC,GIF,ICO,JPG,JPEG,ODG,ODP,ODS,ODT,PDF,PNG,PPT,TXT,XCF,XLS"
+			default="bmp,csv,doc,gif,ico,jpg,jpeg,odg,odp,ods,odt,pdf,png,ppt,svg,txt,webp,webm,xcf,xls,BMP,CSV,DOC,GIF,ICO,JPG,JPEG,ODG,ODP,ODS,ODT,PDF,PNG,PPT,SVG,TXT,XCF,XLS,WEBP,WEBM"
 		/>
 
 		<field
 			name="upload_maxsize"
 			type="number"
 			label="COM_MEDIA_FIELD_MAXIMUM_SIZE_LABEL"
-			description="COM_MEDIA_FIELD_MAXIMUM_SIZE_DESC" 
+			description="COM_MEDIA_FIELD_MAXIMUM_SIZE_DESC"
 			validate="number"
 			min="0"
 			size="50"
@@ -24,8 +24,8 @@
 		/>
 
 		<field
-			name="spacer1" 
-			type="spacer" 
+			name="spacer1"
+			type="spacer"
 			label="COM_MEDIA_FOLDERS_PATH_LABEL"
 			class="text"
 		/>
@@ -34,7 +34,7 @@
 			name="file_path"
 			type="text"
 			label="COM_MEDIA_FIELD_PATH_FILE_FOLDER_LABEL"
-			description="COM_MEDIA_FIELD_PATH_FILE_FOLDER_DESC" 
+			description="COM_MEDIA_FIELD_PATH_FILE_FOLDER_DESC"
 			size="50"
 			default="images"
 		/>
@@ -79,7 +79,7 @@
 			label="COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_LABEL"
 			description="COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_DESC"
 			size="50"
-			default="bmp,gif,jpg,png"
+			default="bmp,gif,jpg,png,svg,webp"
 			showon="restrict_uploads:1"
 		/>
 
@@ -87,7 +87,7 @@
 			name="ignore_extensions"
 			type="text"
 			label="COM_MEDIA_FIELD_IGNORED_EXTENSIONS_LABEL"
-			description="COM_MEDIA_FIELD_IGNORED_EXTENSIONS_DESC" 
+			description="COM_MEDIA_FIELD_IGNORED_EXTENSIONS_DESC"
 			size="50"
 		/>
 
@@ -97,7 +97,7 @@
 			label="COM_MEDIA_FIELD_LEGAL_MIME_TYPES_LABEL"
 			description="COM_MEDIA_FIELD_LEGAL_MIME_TYPES_DESC"
 			size="50"
-			default="image/jpeg,image/gif,image/png,image/bmp,application/msword,application/excel,application/pdf,application/powerpoint,text/plain,application/x-zip"
+			default="image/jpeg,image/gif,image/png,image/bmp,application/msword,application/excel,application/pdf,application/powerpoint,text/plain,application/x-zip,image/svg+xml,image/webp,video/webm"
 			showon="restrict_uploads:1"
 		/>
 
diff --git a/administrator/components/com_media/models/list.php b/administrator/components/com_media/models/list.php
index b4b86bf7c5321..c8df571046259 100644
--- a/administrator/components/com_media/models/list.php
+++ b/administrator/components/com_media/models/list.php
@@ -163,7 +163,9 @@ public function getList()
 						case 'bmp':
 						case 'jpeg':
 						case 'ico':
-							$info = @getimagesize($tmp->path);
+						case 'svg':
+						case 'webp':
+						$info = @getimagesize($tmp->path);
 							$tmp->width  = @$info[0];
 							$tmp->height = @$info[1];
 							$tmp->type   = @$info[2];
@@ -198,6 +200,7 @@ public function getList()
 
 						// Video
 						case 'mp4':
+						case 'webm':
 							$tmp->icon_32 = 'media/mime-icon-32/' . $ext . '.png';
 							$tmp->icon_16 = 'media/mime-icon-16/' . $ext . '.png';
 							$videos[] = $tmp;