diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
index fec1297b180547701ada3ce416c047da187b8bc4..b9e41a352bcb615bc8330b92ccaa6b8327b51851 100644
--- a/apps/files/lib/helper.php
+++ b/apps/files/lib/helper.php
@@ -22,6 +22,7 @@ class Helper
 	public static function determineIcon($file) {
 		if($file['type'] === 'dir') {
 			$dir = $file['directory'];
+			$icon = \OC_Helper::mimetypeIcon('dir');
 			$absPath = \OC\Files\Filesystem::getView()->getAbsolutePath($dir.'/'.$file['name']);
 			$mount = \OC\Files\Filesystem::getMountManager()->find($absPath);
 			if (!is_null($mount)) {
@@ -29,14 +30,13 @@ class Helper
 				if (!is_null($sid)) {
 					$sid = explode(':', $sid);
 					if ($sid[0] === 'shared') {
-						return \OC_Helper::mimetypeIcon('dir-shared');
+						$icon = \OC_Helper::mimetypeIcon('dir-shared');
 					}
 					if ($sid[0] !== 'local' and $sid[0] !== 'home') {
-						return \OC_Helper::mimetypeIcon('dir-external');
+						$icon = \OC_Helper::mimetypeIcon('dir-external');
 					}
 				}
 			}
-			$icon = \OC_Helper::mimetypeIcon('dir');
 		}else{
 			if($file['isPreviewAvailable']) {
 				$pathForPreview = $file['directory'] . '/' . $file['name'];
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index e7a5f5024b8de4c2ae684d5340d68f23f6f32407..fe61dd4d5a048d0a128597744c9ceaf31ae5a9c9 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -32,7 +32,8 @@ function determineIcon($file, $sharingRoot, $sharingToken) {
 	if($file['isPreviewAvailable']) {
 		return OCP\publicPreview_icon($relativePath, $sharingToken) . '&c=' . $file['etag'];
 	}
-	return OCP\mimetype_icon($file['mimetype']);
+	$icon = OCP\mimetype_icon($file['mimetype']);
+	return substr($icon, 0, -3) . 'svg';
 }
 
 if (isset($_GET['t'])) {