diff --git a/core/img/actions/add.png b/core/img/actions/add.png
index 3c051e4d73..8ae17cfe11 100644
Binary files a/core/img/actions/add.png and b/core/img/actions/add.png differ
diff --git a/core/img/actions/add.svg b/core/img/actions/add.svg
index 250746e166..ecbab6f13a 100644
--- a/core/img/actions/add.svg
+++ b/core/img/actions/add.svg
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="matrix(-.70711 -.70711 .70711 -.70711 -724.85 752.16)">
-  <path d="m1.6361 1040.9 2.8284-2.8284 3.5355 3.5355 3.5355-3.5355 2.8284 2.8284-3.5355 3.5355 3.5356 3.5356-2.8284 2.8284-3.5356-3.5356-3.5357 3.5354-2.8281-2.8281 3.5354-3.5357z"/>
+ <g transform="matrix(-0.70711,-0.70711,0.70711,-0.70711,-724.84998,753.15998)">
+  <path d="m3.7547,1041.6,1.4142-1.4142,3.5355,3.5355,3.5355-3.5355,1.4142,1.4142-3.5355,3.5355,3.5355,3.5356-1.4142,1.4142-3.5355-3.5356-3.5164,3.5547-1.4333-1.4333,3.5355-3.5356z"/>
  </g>
 </svg>
diff --git a/core/img/actions/close.png b/core/img/actions/close.png
index 3389c66e03..ece33258e5 100644
Binary files a/core/img/actions/close.png and b/core/img/actions/close.png differ
diff --git a/core/img/actions/close.svg b/core/img/actions/close.svg
index ef564bfd48..4471dbc630 100644
--- a/core/img/actions/close.svg
+++ b/core/img/actions/close.svg
@@ -1,6 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="translate(0 -1036.4)">
-  <path d="m3 1040.4 1-1 4 3 4-3 1 1-3 4 3 4-1 1-4-3-4 3-1-1 3-4z"/>
- </g>
+ <path d="M12.95,11.536,11.536,12.95,8,9.4142,4.4645,12.95,3.0503,11.536,6.5858,8,3.0503,4.4644,4.4645,3.0502,8,6.5858,11.516,3.0311,12.95,4.4644,9.4143,8z" fill="#000"/>
 </svg>
diff --git a/core/img/actions/delete-hover.png b/core/img/actions/delete-hover.png
index 48e6c089c9..3f8cb6eff9 100644
Binary files a/core/img/actions/delete-hover.png and b/core/img/actions/delete-hover.png differ
diff --git a/core/img/actions/delete-hover.svg b/core/img/actions/delete-hover.svg
index 9e5150359d..9583ec15b3 100644
--- a/core/img/actions/delete-hover.svg
+++ b/core/img/actions/delete-hover.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path d="m8 1c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-2.8438 2.75l2.8438 2.8438 2.844-2.8438 1.406 1.4062-2.8438 2.8438 2.8438 2.844-1.406 1.406-2.844-2.8438-2.8438 2.8438-1.4062-1.406 2.8438-2.844-2.8438-2.8438 1.4062-1.4062z" fill="#d40000"/>
+ <path d="m6.5 1-0.5 1h-3c-0.554 0-1 0.446-1 1v1h12v-1c0-0.554-0.446-1-1-1h-3l-0.5-1zm-3.5 4 0.875 9c0.061 0.549 0.5729 1 1.125 1h6c0.55232 0 1.064-0.45102 1.125-1l0.875-9z" fill-rule="evenodd" fill="#d40000"/>
 </svg>
diff --git a/core/img/actions/delete.png b/core/img/actions/delete.png
index 3389c66e03..e891b370cc 100644
Binary files a/core/img/actions/delete.png and b/core/img/actions/delete.png differ
diff --git a/core/img/actions/delete.svg b/core/img/actions/delete.svg
index ef564bfd48..f0a3cd4db8 100644
--- a/core/img/actions/delete.svg
+++ b/core/img/actions/delete.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="translate(0 -1036.4)">
-  <path d="m3 1040.4 1-1 4 3 4-3 1 1-3 4 3 4-1 1-4-3-4 3-1-1 3-4z"/>
- </g>
+ <path d="m6.5 1-0.5 1h-3c-0.554 0-1 0.446-1 1v1h12v-1c0-0.554-0.446-1-1-1h-3l-0.5-1zm-3.5 4 0.875 9c0.061 0.549 0.5729 1 1.125 1h6c0.55232 0 1.064-0.45102 1.125-1l0.875-9z" fill-rule="evenodd"/>
 </svg>
diff --git a/core/img/actions/download.png b/core/img/actions/download.png
index 0f71a5a776..1f8e1a4f7e 100644
Binary files a/core/img/actions/download.png and b/core/img/actions/download.png differ
diff --git a/core/img/actions/download.svg b/core/img/actions/download.svg
index a469c3b8a0..0d698bca8d 100644
--- a/core/img/actions/download.svg
+++ b/core/img/actions/download.svg
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
  <g transform="translate(0 -1036.4)">
-  <path d="m6 1037.4h4l1 7h4l-7 7-7-7h4z"/>
+  <path d="m6,1037.4,4,0,0,7,5,0-7,7-7-7,5,0z"/>
  </g>
 </svg>
diff --git a/core/img/actions/upload.png b/core/img/actions/upload.png
index f6a0c4cfa8..a6969c23fa 100644
Binary files a/core/img/actions/upload.png and b/core/img/actions/upload.png differ
diff --git a/core/img/actions/upload.svg b/core/img/actions/upload.svg
index eae4515c72..80231797c9 100644
--- a/core/img/actions/upload.svg
+++ b/core/img/actions/upload.svg
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="translate(0 -1036.4)">
-  <path d="m10 1051.4h-4l-1-7h-4l7-7 7 7h-4z"/>
- </g>
+ <path d="M10,12,6,12,6,6,2,6,8,0,14,6,10,6z"/>
+ <path fill="#000" d="m0,11,0,5,16,0,0-5-2,0,0,3-12,0,0-3z"/>
 </svg>
diff --git a/core/img/actions/view-close.png b/core/img/actions/view-close.png
index 8422b73346..c21f6ee30e 100644
Binary files a/core/img/actions/view-close.png and b/core/img/actions/view-close.png differ
diff --git a/core/img/actions/view-close.svg b/core/img/actions/view-close.svg
index 1d5b1a9f49..89d1fab88d 100644
--- a/core/img/actions/view-close.svg
+++ b/core/img/actions/view-close.svg
@@ -1,6 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="translate(0 -1020.4)">
-  <path d="m6 1028.4 2-2 8 7 8-7 2 2-7 8 7 8-2 2-8-7-8 7-2-2 7-8z" fill="#fff"/>
- </g>
+ <path fill="#FFF" d="m23.071,6.1013,2.8278,2.8278-7.0713,7.0717,7.071,7.0704-2.8279,2.8283-7.0714-7.0704l-7.0713,7.071-2.8282-2.828,7.0705-7.071-7.1084-7.0316,2.8665-2.8679,7.0709,7.0705z"/>
 </svg>
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 5a3872e66e..31ec8cfacf 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -1110,8 +1110,9 @@ class View {
 					if ($results) {
 						foreach ($results as $result) {
 							$internalPath = $result['path'];
-							$result['path'] = $relativeMountPoint . $result['path'];
-							$files[] = new FileInfo($mountPoint . $result['path'], $storage, $internalPath, $result);
+							$result['path'] = rtrim($relativeMountPoint . $result['path'], '/');
+							$path = rtrim($mountPoint . $internalPath, '/');
+							$files[] = new FileInfo($path, $storage, $internalPath, $result);
 						}
 					}
 				}