diff --git a/administrator/components/com_media/models/list.php b/administrator/components/com_media/models/list.php
index ef6848a639362..8d1b4c5f25efa 100644
--- a/administrator/components/com_media/models/list.php
+++ b/administrator/components/com_media/models/list.php
@@ -190,6 +190,14 @@ public function getList()
 							$images[] = $tmp;
 							break;
 
+						// SVG
+						case 'svg':
+							$tmp->mime = 'image/svg+xml'
+							$tmp->icon_32 = $tmp->path;
+							$tmp->icon_16 = $tmp->path;
+							$images[] = $tmp;
+							break;
+
 						// Video
 						case 'mp4':
 							$tmp->icon_32 = 'media/mime-icon-32/' . $ext . '.png';
diff --git a/administrator/components/com_media/views/imageslist/tmpl/default_image.php b/administrator/components/com_media/views/imageslist/tmpl/default_image.php
index 543c003fd8cd2..62cce9250505e 100644
--- a/administrator/components/com_media/views/imageslist/tmpl/default_image.php
+++ b/administrator/components/com_media/views/imageslist/tmpl/default_image.php
@@ -19,7 +19,13 @@
 <li class="imgOutline thumbnail height-80 width-80 center">
 	<a class="img-preview" href="javascript:ImageManager.populateFields('<?php echo $this->escape($this->_tmp_img->path_relative); ?>')" title="<?php echo $this->escape($this->_tmp_img->name); ?>" >
 		<div class="height-50">
-			<?php echo JHtml::_('image', $this->baseURL . '/' . $this->escape($this->_tmp_img->path_relative), JText::sprintf('COM_MEDIA_IMAGE_TITLE', $this->escape($this->_tmp_img->title), JHtml::_('number.bytes', $this->_tmp_img->size)), array('width' => $this->_tmp_img->width_60, 'height' => $this->_tmp_img->height_60)); ?>
+			<?php
+			if ($this->_tmp_img->mime == 'image/svg+xml') {
+				echo JHtml::_('image', $this->baseURL . '/' . $this->escape($this->_tmp_img->path_relative), JText::sprintf('COM_MEDIA_IMAGE_TITLE', $this->escape($this->_tmp_img->title), JHtml::_('number.bytes', $this->_tmp_img->size)));
+			} else {
+				echo JHtml::_('image', $this->baseURL . '/' . $this->escape($this->_tmp_img->path_relative), JText::sprintf('COM_MEDIA_IMAGE_TITLE', $this->escape($this->_tmp_img->title), JHtml::_('number.bytes', $this->_tmp_img->size)), array('width' => $this->_tmp_img->width_60, 'height' => $this->_tmp_img->height_60));
+			}
+			?>
 		</div>
 		<div class="small">
 			<?php echo JHtml::_('string.truncate', $this->escape($this->_tmp_img->name), 10, false); ?>
diff --git a/administrator/templates/isis/html/com_media/imageslist/default_image.php b/administrator/templates/isis/html/com_media/imageslist/default_image.php
index 5f1597b350b21..b6ce7066ad698 100644
--- a/administrator/templates/isis/html/com_media/imageslist/default_image.php
+++ b/administrator/templates/isis/html/com_media/imageslist/default_image.php
@@ -20,7 +20,13 @@
 	<a class="img-preview" href="javascript:ImageManager.populateFields('<?php echo $this->escape($this->_tmp_img->path_relative); ?>')" title="<?php echo $this->escape($this->_tmp_img->name); ?>" >
 		<div class="imgThumb">
 			<div class="imgThumbInside">
-			<?php echo JHtml::_('image', $this->baseURL . '/' . $this->escape($this->_tmp_img->path_relative), JText::sprintf('COM_MEDIA_IMAGE_TITLE', $this->_tmp_img->title, JHtml::_('number.bytes', $this->_tmp_img->size)), array('width' => $this->_tmp_img->width_60, 'height' => $this->_tmp_img->height_60)); ?>
+			<?php
+			if ($this->_tmp_img->mime == 'image/svg+xml') {
+				echo JHtml::_('image', $this->baseURL . '/' . $this->escape($this->_tmp_img->path_relative), JText::sprintf('COM_MEDIA_IMAGE_TITLE', $this->_tmp_img->title, JHtml::_('number.bytes', $this->_tmp_img->size)));
+			} else {
+				echo JHtml::_('image', $this->baseURL . '/' . $this->escape($this->_tmp_img->path_relative), JText::sprintf('COM_MEDIA_IMAGE_TITLE', $this->_tmp_img->title, JHtml::_('number.bytes', $this->_tmp_img->size)), array('width' => $this->_tmp_img->width_60, 'height' => $this->_tmp_img->height_60));
+			}
+			?>
 			</div>
 		</div>
 		<div class="imgDetails small">