128 files changed, 384 insertions, 299 deletions
diff --git a/apps/files/img/add-color.png b/apps/files/img/add-color.png
index 2211eb6e0bc..f2819c3aca6 100644
--- a/apps/files/img/add-color.png
+++ b/apps/files/img/add-color.png
diff --git a/apps/files/img/add-color.svg b/apps/files/img/add-color.svg
index acf5543c43f..cb4596ac1e5 100644
--- a/apps/files/img/add-color.svg
+++ b/apps/files/img/add-color.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1">
- <g transform="matrix(-.70711 -.70711 .70711 -.70711 -724.85 753.16)" fill="#00d400">
-  <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" fill="#00d400"/>
- </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewbox="0 0 16 16"><path fill="#00d400" d="M9.02 13.98h-2v-5h-5v-2h5v-5h2v5l5-.028V8.98h-5z"/></svg>
diff --git a/apps/files/img/delete.svg b/apps/files/img/delete.svg
index c20929aaa18..53f0b020eb9 100644
--- a/apps/files/img/delete.svg
+++ b/apps/files/img/delete.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M6.5 1L6 2H3c-.554 0-1 .446-1 1v1h12V3c0-.554-.446-1-1-1h-3l-.5-1zM3 5l.875 9c.06.55.573 1 1.125 1h6c.552 0 1.064-.45 1.125-1L13 5z" fill-rule="evenodd"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M6.5 1L6 2H3c-.554 0-1 .446-1 1v1h12V3c0-.554-.446-1-1-1h-3l-.5-1zM3 5l.875 9c.06.55.573 1 1.125 1h6c.552 0 1.064-.45 1.125-1L13 5z"/></svg>
diff --git a/apps/files/img/share.svg b/apps/files/img/share.svg
index c0ad9522369..014392d5a57 100644
--- a/apps/files/img/share.svg
+++ b/apps/files/img/share.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M12.228 1a2.457 2.457 0 0 0-2.46 2.454c0 .075.01.15.016.224L5.05 6.092a2.445 2.445 0 0 0-1.596-.586A2.453 2.453 0 0 0 1 7.96a2.453 2.453 0 0 0 2.454 2.455 2.45 2.45 0 0 0 1.46-.477l4.865 2.474c-.004.044-.01.09-.01.134a2.457 2.457 0 1 0 .804-1.818l-4.696-2.4c.02-.123.035-.25.035-.378 0-.072-.01-.144-.015-.214l4.74-2.414A2.457 2.457 0 1 0 12.228.99z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"><circle cx="3.5" cy="8" r="2.5"/><circle cy="12.5" cx="12.5" r="2.5"/><circle cx="12.5" cy="3.5" r="2.5"/><path d="m3.5 8 9 4.5m-9-4.5 9-4.5" stroke="#000" stroke-width="2" fill="none"/></svg>
diff --git a/apps/files_external/3rdparty/composer.json b/apps/files_external/3rdparty/composer.json
index f1613f0c70b..307a062c7e0 100644
--- a/apps/files_external/3rdparty/composer.json
+++ b/apps/files_external/3rdparty/composer.json
@@ -8,7 +8,7 @@
 		"classmap-authoritative": true
 	},
 	"require": {
-		"icewind/smb": "2.0.2",
+		"icewind/smb": "2.0.3",
 		"icewind/streams": "0.5.2"
 	}
 }
diff --git a/apps/files_external/3rdparty/composer.lock b/apps/files_external/3rdparty/composer.lock
index 0cf5cabdc19..e00a7bd80e4 100644
--- a/apps/files_external/3rdparty/composer.lock
+++ b/apps/files_external/3rdparty/composer.lock
@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "85f8c3519f909ded38d917d3901f2709",
+    "content-hash": "b6a304e8ab2effa3791b513007fadcbc",
     "packages": [
         {
             "name": "icewind/smb",
-            "version": "v2.0.2",
+            "version": "v2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/icewind1991/SMB.git",
-                "reference": "6691355d9314ac3a8cb9ec9446e4c26e8aab09d0"
+                "reference": "8394551bf29a37b884edb33dae8acde369177f32"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/icewind1991/SMB/zipball/6691355d9314ac3a8cb9ec9446e4c26e8aab09d0",
-                "reference": "6691355d9314ac3a8cb9ec9446e4c26e8aab09d0",
+                "url": "https://api.github.com/repos/icewind1991/SMB/zipball/8394551bf29a37b884edb33dae8acde369177f32",
+                "reference": "8394551bf29a37b884edb33dae8acde369177f32",
                 "shasum": ""
             },
             "require": {
@@ -45,7 +45,7 @@
                 }
             ],
             "description": "php wrapper for smbclient and libsmbclient-php",
-            "time": "2017-08-16T16:08:57+00:00"
+            "time": "2017-10-18T16:21:10+00:00"
         },
         {
             "name": "icewind/streams",
diff --git a/apps/files_external/3rdparty/composer/autoload_classmap.php b/apps/files_external/3rdparty/composer/autoload_classmap.php
index 4c596a44418..257bdb64eb5 100644
--- a/apps/files_external/3rdparty/composer/autoload_classmap.php
+++ b/apps/files_external/3rdparty/composer/autoload_classmap.php
@@ -22,6 +22,7 @@ return array(
     'Icewind\\SMB\\Exception\\ForbiddenException' => $vendorDir . '/icewind/smb/src/Exception/ForbiddenException.php',
     'Icewind\\SMB\\Exception\\HostDownException' => $vendorDir . '/icewind/smb/src/Exception/HostDownException.php',
     'Icewind\\SMB\\Exception\\InvalidHostException' => $vendorDir . '/icewind/smb/src/Exception/InvalidHostException.php',
+    'Icewind\\SMB\\Exception\\InvalidParameterException' => $vendorDir . '/icewind/smb/src/Exception/InvalidParameterException.php',
     'Icewind\\SMB\\Exception\\InvalidPathException' => $vendorDir . '/icewind/smb/src/Exception/InvalidPathException.php',
     'Icewind\\SMB\\Exception\\InvalidRequestException' => $vendorDir . '/icewind/smb/src/Exception/InvalidRequestException.php',
     'Icewind\\SMB\\Exception\\InvalidResourceException' => $vendorDir . '/icewind/smb/src/Exception/InvalidResourceException.php',
@@ -30,6 +31,8 @@ return array(
     'Icewind\\SMB\\Exception\\NoRouteToHostException' => $vendorDir . '/icewind/smb/src/Exception/NoRouteToHostException.php',
     'Icewind\\SMB\\Exception\\NotEmptyException' => $vendorDir . '/icewind/smb/src/Exception/NotEmptyException.php',
     'Icewind\\SMB\\Exception\\NotFoundException' => $vendorDir . '/icewind/smb/src/Exception/NotFoundException.php',
+    'Icewind\\SMB\\Exception\\OutOfSpaceException' => $vendorDir . '/icewind/smb/src/Exception/OutOfSpaceException.php',
+    'Icewind\\SMB\\Exception\\RevisionMismatchException' => $vendorDir . '/icewind/smb/src/Exception/RevisionMismatchException.php',
     'Icewind\\SMB\\Exception\\TimedOutException' => $vendorDir . '/icewind/smb/src/Exception/TimedOutException.php',
     'Icewind\\SMB\\FileInfo' => $vendorDir . '/icewind/smb/src/FileInfo.php',
     'Icewind\\SMB\\IFileInfo' => $vendorDir . '/icewind/smb/src/IFileInfo.php',
diff --git a/apps/files_external/3rdparty/composer/autoload_static.php b/apps/files_external/3rdparty/composer/autoload_static.php
index 459de971c4e..62be2df6a0d 100644
--- a/apps/files_external/3rdparty/composer/autoload_static.php
+++ b/apps/files_external/3rdparty/composer/autoload_static.php
@@ -52,6 +52,7 @@ class ComposerStaticInit98fe9b281934250b3a93f69a5ce843b3
         'Icewind\\SMB\\Exception\\ForbiddenException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/ForbiddenException.php',
         'Icewind\\SMB\\Exception\\HostDownException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/HostDownException.php',
         'Icewind\\SMB\\Exception\\InvalidHostException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/InvalidHostException.php',
+        'Icewind\\SMB\\Exception\\InvalidParameterException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/InvalidParameterException.php',
         'Icewind\\SMB\\Exception\\InvalidPathException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/InvalidPathException.php',
         'Icewind\\SMB\\Exception\\InvalidRequestException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/InvalidRequestException.php',
         'Icewind\\SMB\\Exception\\InvalidResourceException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/InvalidResourceException.php',
@@ -60,6 +61,8 @@ class ComposerStaticInit98fe9b281934250b3a93f69a5ce843b3
         'Icewind\\SMB\\Exception\\NoRouteToHostException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/NoRouteToHostException.php',
         'Icewind\\SMB\\Exception\\NotEmptyException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/NotEmptyException.php',
         'Icewind\\SMB\\Exception\\NotFoundException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/NotFoundException.php',
+        'Icewind\\SMB\\Exception\\OutOfSpaceException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/OutOfSpaceException.php',
+        'Icewind\\SMB\\Exception\\RevisionMismatchException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/RevisionMismatchException.php',
         'Icewind\\SMB\\Exception\\TimedOutException' => __DIR__ . '/..' . '/icewind/smb/src/Exception/TimedOutException.php',
         'Icewind\\SMB\\FileInfo' => __DIR__ . '/..' . '/icewind/smb/src/FileInfo.php',
         'Icewind\\SMB\\IFileInfo' => __DIR__ . '/..' . '/icewind/smb/src/IFileInfo.php',
diff --git a/apps/files_external/3rdparty/composer/installed.json b/apps/files_external/3rdparty/composer/installed.json
index aafe1591fa8..6855971a9f1 100644
--- a/apps/files_external/3rdparty/composer/installed.json
+++ b/apps/files_external/3rdparty/composer/installed.json
@@ -44,17 +44,17 @@
     },
     {
         "name": "icewind/smb",
-        "version": "v2.0.2",
-        "version_normalized": "2.0.2.0",
+        "version": "v2.0.3",
+        "version_normalized": "2.0.3.0",
         "source": {
             "type": "git",
             "url": "https://github.com/icewind1991/SMB.git",
-            "reference": "6691355d9314ac3a8cb9ec9446e4c26e8aab09d0"
+            "reference": "8394551bf29a37b884edb33dae8acde369177f32"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/icewind1991/SMB/zipball/6691355d9314ac3a8cb9ec9446e4c26e8aab09d0",
-            "reference": "6691355d9314ac3a8cb9ec9446e4c26e8aab09d0",
+            "url": "https://api.github.com/repos/icewind1991/SMB/zipball/8394551bf29a37b884edb33dae8acde369177f32",
+            "reference": "8394551bf29a37b884edb33dae8acde369177f32",
             "shasum": ""
         },
         "require": {
@@ -64,7 +64,7 @@
         "require-dev": {
             "phpunit/phpunit": "^4.8"
         },
-        "time": "2017-08-16T16:08:57+00:00",
+        "time": "2017-10-18T16:21:10+00:00",
         "type": "library",
         "installation-source": "source",
         "autoload": {
diff --git a/apps/files_external/3rdparty/icewind/smb/src/ErrorCodes.php b/apps/files_external/3rdparty/icewind/smb/src/ErrorCodes.php
index 03bd574c185..d36cdaf2c7d 100644
--- a/apps/files_external/3rdparty/icewind/smb/src/ErrorCodes.php
+++ b/apps/files_external/3rdparty/icewind/smb/src/ErrorCodes.php
@@ -15,7 +15,7 @@ class ErrorCodes {
 	const BadHostName = 'NT_STATUS_BAD_NETWORK_NAME';
 	const Unsuccessful = 'NT_STATUS_UNSUCCESSFUL';
 	const ConnectionRefused = 'NT_STATUS_CONNECTION_REFUSED';
-	const NoLogonServers =  'NT_STATUS_NO_LOGON_SERVERS';
+	const NoLogonServers = 'NT_STATUS_NO_LOGON_SERVERS';
 
 	const PathNotFound = 'NT_STATUS_OBJECT_PATH_NOT_FOUND';
 	const NoSuchFile = 'NT_STATUS_NO_SUCH_FILE';
@@ -26,4 +26,6 @@ class ErrorCodes {
 	const FileIsADirectory = 'NT_STATUS_FILE_IS_A_DIRECTORY';
 	const NotADirectory = 'NT_STATUS_NOT_A_DIRECTORY';
 	const SharingViolation = 'NT_STATUS_SHARING_VIOLATION';
+	const InvalidParameter = 'NT_STATUS_INVALID_PARAMETER';
+	const RevisionMismatch = 'NT_STATUS_REVISION_MISMATCH';
 }
diff --git a/apps/files_external/3rdparty/icewind/smb/src/Exception/Exception.php b/apps/files_external/3rdparty/icewind/smb/src/Exception/Exception.php
index 7ac528198a9..93f2c1b3e2e 100644
--- a/apps/files_external/3rdparty/icewind/smb/src/Exception/Exception.php
+++ b/apps/files_external/3rdparty/icewind/smb/src/Exception/Exception.php
@@ -14,7 +14,7 @@ class Exception extends \Exception {
 			$message .= ' for ' . $path;
 		}
 
-		return new Exception($message, $error);
+		return new Exception($message, is_string($error) ? 0 : $error);
 	}
 
 	/**
diff --git a/apps/files_external/3rdparty/icewind/smb/src/Exception/InvalidParameterException.php b/apps/files_external/3rdparty/icewind/smb/src/Exception/InvalidParameterException.php
new file mode 100644
index 00000000000..163b571183d
--- /dev/null
+++ b/apps/files_external/3rdparty/icewind/smb/src/Exception/InvalidParameterException.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright (c) 2014 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Licensed under the MIT license:
+ * http://opensource.org/licenses/MIT
+ */
+
+namespace Icewind\SMB\Exception;
+
+class InvalidParameterException extends InvalidRequestException {}
diff --git a/apps/files_external/3rdparty/icewind/smb/src/Exception/OutOfSpaceException.php b/apps/files_external/3rdparty/icewind/smb/src/Exception/OutOfSpaceException.php
new file mode 100644
index 00000000000..4c5517a1404
--- /dev/null
+++ b/apps/files_external/3rdparty/icewind/smb/src/Exception/OutOfSpaceException.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright (c) 2014 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Licensed under the MIT license:
+ * http://opensource.org/licenses/MIT
+ */
+
+namespace Icewind\SMB\Exception;
+
+class OutOfSpaceException extends InvalidRequestException {
+}
diff --git a/apps/files_external/3rdparty/icewind/smb/src/Exception/RevisionMismatchException.php b/apps/files_external/3rdparty/icewind/smb/src/Exception/RevisionMismatchException.php
new file mode 100644
index 00000000000..e898b5a2347
--- /dev/null
+++ b/apps/files_external/3rdparty/icewind/smb/src/Exception/RevisionMismatchException.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright (c) 2014 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Licensed under the MIT license:
+ * http://opensource.org/licenses/MIT
+ */
+
+namespace Icewind\SMB\Exception;
+
+use Throwable;
+
+class RevisionMismatchException extends Exception {
+	public function __construct($message = 'Protocol version mismatch', $code = 0, Throwable $previous = null) {
+		parent::__construct($message, $code, $previous);
+	}
+}
diff --git a/apps/files_external/3rdparty/icewind/smb/src/NativeState.php b/apps/files_external/3rdparty/icewind/smb/src/NativeState.php
index 7ddce831853..45e0441d252 100644
--- a/apps/files_external/3rdparty/icewind/smb/src/NativeState.php
+++ b/apps/files_external/3rdparty/icewind/smb/src/NativeState.php
@@ -31,6 +31,7 @@ class NativeState {
 		17  => '\Icewind\SMB\Exception\AlreadyExistsException',
 		20  => '\Icewind\SMB\Exception\InvalidTypeException',
 		21  => '\Icewind\SMB\Exception\InvalidTypeException',
+		28  => '\Icewind\SMB\Exception\OutOfSpaceException',
 		39  => '\Icewind\SMB\Exception\NotEmptyException',
 		110 => '\Icewind\SMB\Exception\TimedOutException',
 		111 => '\Icewind\SMB\Exception\ConnectionRefusedException',
diff --git a/apps/files_external/3rdparty/icewind/smb/src/NotifyHandler.php b/apps/files_external/3rdparty/icewind/smb/src/NotifyHandler.php
index 6ad565555bf..20ada5cf320 100644
--- a/apps/files_external/3rdparty/icewind/smb/src/NotifyHandler.php
+++ b/apps/files_external/3rdparty/icewind/smb/src/NotifyHandler.php
@@ -9,6 +9,8 @@
 namespace Icewind\SMB;
 
 
+use Icewind\SMB\Exception\Exception;
+
 class NotifyHandler implements INotifyHandler {
 	/**
 	 * @var Connection
@@ -22,6 +24,12 @@ class NotifyHandler implements INotifyHandler {
 
 	private $listening = true;
 
+	// todo replace with static once <5.6 support is dropped
+	// see error.h
+	private static $exceptionMap = [
+		ErrorCodes::RevisionMismatch => '\Icewind\SMB\Exception\RevisionMismatchException',
+	];
+
 	/**
 	 * @param Connection $connection
 	 * @param string $path
@@ -43,6 +51,7 @@ class NotifyHandler implements INotifyHandler {
 		stream_set_blocking($this->connection->getOutputStream(), 0);
 		$lines = [];
 		while (($line = $this->connection->readLine())) {
+			$this->checkForError($line);
 			$lines[] = $line;
 		}
 		stream_set_blocking($this->connection->getOutputStream(), 1);
@@ -59,6 +68,7 @@ class NotifyHandler implements INotifyHandler {
 	public function listen($callback) {
 		if ($this->listening) {
 			$this->connection->read(function ($line) use ($callback) {
+				$this->checkForError($line);
 				$change = $this->parseChangeLine($line);
 				if ($change) {
 					return $callback($change);
@@ -80,6 +90,13 @@ class NotifyHandler implements INotifyHandler {
 		}
 	}
 
+	private function checkForError($line) {
+		if (substr($line, 0, 16) === 'notify returned ') {
+			$error = substr($line, 16);
+			throw Exception::fromMap(self::$exceptionMap, $error, 'Notify is not supported with the used smb version');
+		}
+	}
+
 	public function stop() {
 		$this->listening = false;
 		$this->connection->close();
diff --git a/apps/files_external/3rdparty/icewind/smb/src/Parser.php b/apps/files_external/3rdparty/icewind/smb/src/Parser.php
index 5cc5acbdf56..3142f9c29e0 100644
--- a/apps/files_external/3rdparty/icewind/smb/src/Parser.php
+++ b/apps/files_external/3rdparty/icewind/smb/src/Parser.php
@@ -30,6 +30,7 @@ class Parser {
 	// todo replace with static once <5.6 support is dropped
 	// see error.h
 	private static $exceptionMap = [
+		ErrorCodes::LogonFailure      => '\Icewind\SMB\Exception\AuthenticationException',
 		ErrorCodes::PathNotFound      => '\Icewind\SMB\Exception\NotFoundException',
 		ErrorCodes::ObjectNotFound    => '\Icewind\SMB\Exception\NotFoundException',
 		ErrorCodes::NoSuchFile        => '\Icewind\SMB\Exception\NotFoundException',
@@ -38,7 +39,8 @@ class Parser {
 		ErrorCodes::DirectoryNotEmpty => '\Icewind\SMB\Exception\NotEmptyException',
 		ErrorCodes::FileIsADirectory  => '\Icewind\SMB\Exception\InvalidTypeException',
 		ErrorCodes::NotADirectory     => '\Icewind\SMB\Exception\InvalidTypeException',
-		ErrorCodes::SharingViolation  => '\Icewind\SMB\Exception\FileInUseException'
+		ErrorCodes::SharingViolation  => '\Icewind\SMB\Exception\FileInUseException',
+		ErrorCodes::InvalidParameter  => '\Icewind\SMB\Exception\InvalidParameterException'
 	];
 
 	/**
diff --git a/apps/files_external/3rdparty/icewind/smb/src/RawConnection.php b/apps/files_external/3rdparty/icewind/smb/src/RawConnection.php
index e9349716430..42923f09eda 100644
--- a/apps/files_external/3rdparty/icewind/smb/src/RawConnection.php
+++ b/apps/files_external/3rdparty/icewind/smb/src/RawConnection.php
@@ -7,6 +7,7 @@
 
 namespace Icewind\SMB;
 
+use Icewind\SMB\Exception\ConnectException;
 use Icewind\SMB\Exception\ConnectionException;
 
 class RawConnection {
@@ -25,6 +26,9 @@ class RawConnection {
 	 *
 	 * $pipes[0] holds STDIN for smbclient
 	 * $pipes[1] holds STDOUT for smbclient
+	 * $pipes[3] holds the authfile for smbclient
+	 * $pipes[4] holds the stream for writing files
+	 * $pipes[5] holds the stream for reading files
 	 */
 	private $pipes;
 
@@ -33,32 +37,44 @@ class RawConnection {
 	 */
 	private $process;
 
-	public function __construct($command, $env = array()) {
+	/**
+	 * @var resource|null $authStream
+	 */
+	private $authStream = null;
+
+	private $connected = false;
+
+	public function __construct($command, array $env = []) {
 		$this->command = $command;
 		$this->env = $env;
-		$this->connect();
 	}
 
-	private function connect() {
-		$descriptorSpec = array(
-			0 => array('pipe', 'r'), // child reads from stdin
-			1 => array('pipe', 'w'), // child writes to stdout
-			2 => array('pipe', 'w'), // child writes to stderr
-			3 => array('pipe', 'r'), // child reads from fd#3
-			4 => array('pipe', 'r'), // child reads from fd#4
-			5 => array('pipe', 'w')  // child writes to fd#5
-		);
+	public function connect() {
+		if (is_null($this->getAuthStream())) {
+			throw new ConnectException('Authentication not set before connecting');
+		}
+
+		$descriptorSpec = [
+			0 => ['pipe', 'r'], // child reads from stdin
+			1 => ['pipe', 'w'], // child writes to stdout
+			2 => ['pipe', 'w'], // child writes to stderr
+			3 => $this->getAuthStream(), // child reads from fd#3
+			4 => ['pipe', 'r'], // child reads from fd#4
+			5 => ['pipe', 'w']  // child writes to fd#5
+		];
+
 		setlocale(LC_ALL, Server::LOCALE);
-		$env = array_merge($this->env, array(
+		$env = array_merge($this->env, [
 			'CLI_FORCE_INTERACTIVE' => 'y', // Needed or the prompt isn't displayed!!
-			'LC_ALL' => Server::LOCALE,
-			'LANG' => Server::LOCALE,
-			'COLUMNS' => 8192 // prevent smbclient from line-wrapping it's output
-		));
+			'LC_ALL'                => Server::LOCALE,
+			'LANG'                  => Server::LOCALE,
+			'COLUMNS'               => 8192 // prevent smbclient from line-wrapping it's output
+		]);
 		$this->process = proc_open($this->command, $descriptorSpec, $this->pipes, '/', $env);
 		if (!$this->isValid()) {
 			throw new ConnectionException();
 		}
+		$this->connected = true;
 	}
 
 	/**
@@ -129,7 +145,7 @@ class RawConnection {
 	}
 
 	public function getAuthStream() {
-		return $this->pipes[3];
+		return $this->authStream;
 	}
 
 	public function getFileInputStream() {
@@ -143,14 +159,10 @@ class RawConnection {
 	public function writeAuthentication($user, $password) {
 		$auth = ($password === false)
 			? "username=$user"
-			: "username=$user\npassword=$password";
+			: "username=$user\npassword=$password\n";
 
-		if (fwrite($this->getAuthStream(), $auth) === false) {
-			fclose($this->getAuthStream());
-			return false;
-		}
-		fclose($this->getAuthStream());
-		return true;
+		$this->authStream = fopen('php://temp', 'w+');
+		fwrite($this->getAuthStream(), $auth);
 	}
 
 	public function close($terminate = true) {
@@ -163,8 +175,8 @@ class RawConnection {
 				$status = proc_get_status($this->process);
 				$ppid = $status['pid'];
 				$pids = preg_split('/\s+/', `ps -o pid --no-heading --ppid $ppid`);
-				foreach($pids as $pid) {
-					if(is_numeric($pid)) {
+				foreach ($pids as $pid) {
+					if (is_numeric($pid)) {
 						//9 is the SIGKILL signal
 						posix_kill($pid, 9);
 					}
diff --git a/apps/files_external/3rdparty/icewind/smb/src/Server.php b/apps/files_external/3rdparty/icewind/smb/src/Server.php
index 12692eb4c6e..21cc605ed1f 100644
--- a/apps/files_external/3rdparty/icewind/smb/src/Server.php
+++ b/apps/files_external/3rdparty/icewind/smb/src/Server.php
@@ -134,6 +134,7 @@ class Server {
 		);
 		$connection = new RawConnection($command);
 		$connection->writeAuthentication($this->getUser(), $this->getPassword());
+		$connection->connect();
 		$output = $connection->readAll();
 		$parser = new Parser($this->timezoneProvider);
 
diff --git a/apps/files_external/3rdparty/icewind/smb/src/Share.php b/apps/files_external/3rdparty/icewind/smb/src/Share.php
index ba8bbbbb8ca..542eaf0887e 100644
--- a/apps/files_external/3rdparty/icewind/smb/src/Share.php
+++ b/apps/files_external/3rdparty/icewind/smb/src/Share.php
@@ -68,8 +68,9 @@ class Share extends AbstractShare {
 		);
 		$connection = new Connection($command, $this->parser);
 		$connection->writeAuthentication($this->server->getUser(), $this->server->getPassword());
+		$connection->connect();
 		if (!$connection->isValid()) {
-			throw new ConnectionException();
+			throw new ConnectionException($connection->readLine());
 		}
 		return $connection;
 	}
@@ -88,7 +89,6 @@ class Share extends AbstractShare {
 
 	protected function reconnect() {
 		$this->connection->reconnect();
-		$this->connection->writeAuthentication($this->server->getUser(), $this->server->getPassword());
 		if (!$this->connection->isValid()) {
 			throw new ConnectionException();
 		}
@@ -318,9 +318,9 @@ class Share extends AbstractShare {
 		$modeString = '';
 		$modeMap = array(
 			FileInfo::MODE_READONLY => 'r',
-			FileInfo::MODE_HIDDEN => 'h',
-			FileInfo::MODE_ARCHIVE => 'a',
-			FileInfo::MODE_SYSTEM => 's'
+			FileInfo::MODE_HIDDEN   => 'h',
+			FileInfo::MODE_ARCHIVE  => 'a',
+			FileInfo::MODE_SYSTEM   => 's'
 		);
 		foreach ($modeMap as $modeByte => $string) {
 			if ($mode & $modeByte) {
@@ -413,6 +413,7 @@ class Share extends AbstractShare {
 		}
 		$path = str_replace('/', '\\', $path);
 		$path = str_replace('"', '^"', $path);
+		$path = ltrim($path, '\\');
 		return '"' . $path . '"';
 	}
 
diff --git a/core/css/guest.css b/core/css/guest.css
index 9bacf5a6bb5..f6dbfee08aa 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -130,28 +130,29 @@ form #datadirField legend {
 }
 
 /* Buttons and input */
-#submit-wrapper {
+#submit-wrapper,
+#reset-password-wrapper {
 	position: relative; /* Make the wrapper the containing block of its
 						   absolutely positioned descendant icons */
 }
-#submit-wrapper .icon-confirm-white {
+
+#submit-wrapper .submit-icon,
+#reset-password-wrapper .submit-icon {
 	position: absolute;
 	top: 23px;
 	right: 23px;
+	pointer-events: none; /* The submit icon is positioned on the submit button.
+							 From the user point of view the icon is part of the
+							 button, so the clicks on the icon have to be
+							 applied to the button instead. */
 }
+
 #submit-wrapper .icon-loading-small {
 	position: absolute;
 	top: 22px;
 	right: 24px;
 }
 
-#submit-wrapper #submit-icon {
-	pointer-events: none; /* The submit icon is positioned on the submit button.
-							 From the user point of view the icon is part of the
-							 button, so the clicks on the icon have to be
-							 applied to the button instead. */
-}
-
 input, textarea, select, button, div[contenteditable=true] {
 	font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
 }
@@ -385,13 +386,22 @@ form .warning input[type='checkbox']+label {
 #remember_login {
 	margin: 18px 5px 0 16px !important;
 }
-.remember-login-container {
+.remember-login-container,
+.lost-password-container {
 	display: inline-block;
 	margin: 10px 0;
 	text-align: center;
 	width: 100%;
 	text-shadow: 0 0 2px rgba(0, 0, 0, .4); // better readability on bright background
 }
+.lost-password-container #lost-password,
+.lost-password-container #lost-password-back {
+	display: inline-block;
+	padding: 12px;
+	margin-top: -6px;
+	color: #fff;
+	opacity: .7;
+}
 #forgot-password {
 	padding: 11px;
 	float: right;
diff --git a/core/img/actions/add.svg b/core/img/actions/add.svg
index 91e5fe64ca1..130516e99d2 100644
--- a/core/img/actions/add.svg
+++ b/core/img/actions/add.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M9.02 13.98h-2v-5h-5v-2h5v-5h2v5l5-.028V8.98h-5z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewbox="0 0 16 16"><path d="M9.02 13.98h-2v-5h-5v-2h5v-5h2v5l5-.028V8.98h-5z"/></svg>
diff --git a/core/img/actions/address.svg b/core/img/actions/address.svg
index 2e4c19c125b..2479c393b7b 100644
--- a/core/img/actions/address.svg
+++ b/core/img/actions/address.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xml:space="preserve" height="16" width="16" enable-background="new 0 0 100 100" y="0px" x="0px" viewBox="0 0 16 16"><path d="m8.2945 1c-2.6478 0-4.7945 2.1469-4.7945 4.7945 0 2.6479 4.7945 9.2055 4.7945 9.2055s4.7945-6.5576 4.7945-9.2055c0-2.6476-2.147-4.7945-4.7945-4.7945zm0 7.4793c-1.4828 0-2.6847-1.2019-2.6847-2.6851 0-1.4828 1.2019-2.6844 2.6847-2.6844 1.4832 0 2.6847 1.2015 2.6847 2.6844 0.000345 1.4832-1.2015 2.6851-2.6847 2.6851z" stroke-width=".46667"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" version="1.1" height="16"><circle stroke-width="2" stroke="#000" cy="6" cx="8" r="4" fill="none"/><path d="m4 9h8l-4 6z"/></svg>
diff --git a/core/img/actions/audio-off-white.svg b/core/img/actions/audio-off-white.svg
index 1968e4c7cfc..d0699a959d0 100644
--- a/core/img/actions/audio-off-white.svg
+++ b/core/img/actions/audio-off-white.svg
@@ -1,10 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16">
- <defs>
-  <filter id="a" style="color-interpolation-filters:sRGB" height="1.3148" width="1.4203" y="-.15742" x="-.21014">
-   <feGaussianBlur stdDeviation="0.91827834"/>
-  </filter>
- </defs>
- <path opacity=".5" d="m8 1c-1.108 0-2 0.892-2 2v4c0 0.0535 0.0115 0.1038 0.0156 0.1562l3.9844-3.9824v-0.1738c0-1.108-0.892-2-2-2zm4.486 1.5137c-0.127 0-0.256 0.0233-0.377 0.0722-0.119 0.0488-0.232 0.1232-0.33 0.2207l-8.486 8.4844c-0.1959 0.196-0.293 0.453-0.293 0.709s0.0971 0.511 0.293 0.707c0.1958 0.196 0.4509 0.293 0.707 0.293s0.5131-0.097 0.709-0.293l8.484-8.4863c0.098-0.0975 0.172-0.2103 0.221-0.3301v-0.0019c0.147-0.361 0.073-0.7883-0.221-1.0821-0.196-0.1958-0.451-0.2929-0.707-0.2929zm-8.486 2.4863c-0.554 0-1 0.446-1 1v1a4.988 4.988 0 0 0 0.6719 2.5l1.5078-1.5078c-0.1093-0.3119-0.1797-0.6421-0.1797-0.9922v-1c0-0.554-0.446-1-1-1zm8.973 0.8594l-2.161 2.1582c-0.301 0.8367-0.9577 1.4934-1.7944 1.7949l-2.0742 2.0745a4.988 4.988 0 0 0 0.0566 0.013v1.1h-1.1699l-0.4141 0.414c-0.125 0.125-0.2683 0.222-0.416 0.307v1.279h6v-2h-2v-1.1c2.287-0.46 4-2.473 4-4.9v-1c0-0.0498-0.02-0.0928-0.027-0.1406z" filter="url(#a)"/>
- <path fill="#fff" d="m8 1c-1.108 0-2 0.892-2 2v4c0 0.0535 0.0115 0.1038 0.0156 0.1562l3.9844-3.9824v-0.1738c0-1.108-0.892-2-2-2zm4.486 1.5137c-0.127 0-0.256 0.0233-0.377 0.0722-0.119 0.0488-0.232 0.1232-0.33 0.2207l-8.486 8.4844c-0.1959 0.196-0.293 0.453-0.293 0.709s0.0971 0.511 0.293 0.707c0.1958 0.196 0.4509 0.293 0.707 0.293s0.5131-0.097 0.709-0.293l8.484-8.4863c0.098-0.0975 0.172-0.2103 0.221-0.3301v-0.0019c0.147-0.361 0.073-0.7883-0.221-1.0821-0.196-0.1958-0.451-0.2929-0.707-0.2929zm-8.486 2.4863c-0.554 0-1 0.446-1 1v1a4.988 4.988 0 0 0 0.6719 2.5l1.5078-1.5078c-0.1093-0.3119-0.1797-0.6421-0.1797-0.9922v-1c0-0.554-0.446-1-1-1zm8.973 0.8594l-2.161 2.1582c-0.301 0.8367-0.9577 1.4934-1.7944 1.7949l-2.0742 2.0745a4.988 4.988 0 0 0 0.0566 0.013v1.1h-1.1699l-0.4141 0.414c-0.125 0.125-0.2683 0.222-0.416 0.307v1.279h6v-2h-2v-1.1c2.287-0.46 4-2.473 4-4.9v-1c0-0.0498-0.02-0.0928-0.027-0.1406z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"><path fill="#fff" d="m5 3v3.5c0 0.21626 0.0337 0.40866 0.082028 0.58984l3.9178-3.9179v-0.1719c0-2.673-4-2.6707-4 0zm5.2832 0.3027-7.9803 7.9803c-0.91785 0.91785 0.50035 2.3441 1.414 1.4141l7.9803-7.9802c0.916-0.9163-0.493-2.3349-1.414-1.4141zm-8.283 2.6973c0 1.2904 0.3648 2.371 0.9374 3.2344l1.4492-1.4492c-0.2349-0.4922-0.3867-1.0781-0.3867-1.7852 0-1.3274-2-1.326-2 0zm9.9721-0.14453-5.9723 5.9727v1.1719h-1.1718l-0.40427 0.4043c-0.12553 0.13-0.2681 0.24231-0.42381 0.334v1.2617h6v-2h-2v-1.625c2.1244-0.466 4-2.3973 4-5.375 0-0.055-0-0.0941-0.028-0.1445z"/></svg>
diff --git a/core/img/actions/audio-off.svg b/core/img/actions/audio-off.svg
index 8cf7fbcb5ca..9fd0bea2d71 100644
--- a/core/img/actions/audio-off.svg
+++ b/core/img/actions/audio-off.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16">
- <path d="m8 1c-1.108 0-2 0.892-2 2v4c0 0.0535 0.0115 0.1038 0.0156 0.1562l3.9844-3.9824v-0.1738c0-1.108-0.892-2-2-2zm4.486 1.5137c-0.127 0-0.256 0.0233-0.377 0.0722-0.119 0.0488-0.232 0.1232-0.33 0.2207l-8.486 8.4844c-0.1959 0.196-0.293 0.453-0.293 0.709s0.0971 0.511 0.293 0.707c0.1958 0.196 0.4509 0.293 0.707 0.293s0.5131-0.097 0.709-0.293l8.484-8.4863c0.098-0.0975 0.172-0.2103 0.221-0.3301v-0.0019c0.147-0.361 0.073-0.7883-0.221-1.0821-0.196-0.1958-0.451-0.2929-0.707-0.2929zm-8.486 2.4863c-0.554 0-1 0.446-1 1v1a4.988 4.988 0 0 0 0.6719 2.5l1.5078-1.5078c-0.1093-0.3119-0.1797-0.6421-0.1797-0.9922v-1c0-0.554-0.446-1-1-1zm8.973 0.8594l-2.161 2.1582c-0.301 0.8367-0.9577 1.4934-1.7944 1.7949l-2.0742 2.0745a4.988 4.988 0 0 0 0.0566 0.013v1.1h-1.1699l-0.4141 0.414c-0.125 0.125-0.2683 0.222-0.416 0.307v1.279h6v-2h-2v-1.1c2.287-0.46 4-2.473 4-4.9v-1c0-0.0498-0.02-0.0928-0.027-0.1406z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"><path d="m5 3v3.5c0 0.21626 0.0337 0.40866 0.082028 0.58984l3.9178-3.9179v-0.1719c0-2.673-4-2.6707-4 0zm5.2832 0.3027-7.9803 7.9803c-0.91785 0.91785 0.50035 2.3441 1.414 1.4141l7.9803-7.9802c0.916-0.9163-0.493-2.3349-1.414-1.4141zm-8.283 2.6973c0 1.2904 0.3648 2.371 0.9374 3.2344l1.4492-1.4492c-0.2349-0.4922-0.3867-1.0781-0.3867-1.7852 0-1.3274-2-1.326-2 0zm9.9721-0.14453-5.9723 5.9727v1.1719h-1.1718l-0.40427 0.4043c-0.12553 0.13-0.2681 0.24231-0.42381 0.334v1.2617h6v-2h-2v-1.625c2.1244-0.466 4-2.3973 4-5.375 0-0.055-0-0.0941-0.028-0.1445z"/></svg>
diff --git a/core/img/actions/audio-white.svg b/core/img/actions/audio-white.svg
index ac5d888a51c..209177deb3f 100644
--- a/core/img/actions/audio-white.svg
+++ b/core/img/actions/audio-white.svg
@@ -1,10 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16">
- <defs>
-  <filter id="a" style="color-interpolation-filters:sRGB" height="1.3086" width="1.432" y="-.15429" x="-0.216">
-   <feGaussianBlur stdDeviation="0.90000044"/>
-  </filter>
- </defs>
- <path opacity=".5" d="m8 1c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm-4 4c-0.554 0-1 0.446-1 1v1a4.988 4.988 0 0 0 4 4.9v1.1h-2v2h6v-2h-2v-1.1c2.287-0.46 4-2.473 4-4.9v-1c0-0.554-0.446-1-1-1s-1 0.446-1 1v1c0 1.662-1.338 3-3 3s-3-1.338-3-3v-1c0-0.554-0.446-1-1-1z" fill-rule="evenodd" filter="url(#a)"/>
- <path fill="#fff" d="m8 1c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm-4 4c-0.554 0-1 0.446-1 1v1a4.988 4.988 0 0 0 4 4.9v1.1h-2v2h6v-2h-2v-1.1c2.287-0.46 4-2.473 4-4.9v-1c0-0.554-0.446-1-1-1s-1 0.446-1 1v1c0 1.662-1.338 3-3 3s-3-1.338-3-3v-1c0-0.554-0.446-1-1-1z" fill-rule="evenodd"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"><path fill="#fff" d="m6 3v3.5c0 2.6667 4 2.6667 4 0v-3.5c0-2.6661-4-2.6669-4 0zm-3 3c0 2.9759 1.8757 4.907 4 5.375v1.625h-2v2h6v-2h-2v-1.625c2.124-0.466 4-2.3973 4-5.375 0-1.3333-2-1.3333-2 0 0 4.6515-6 4.654-6 0 0-1.3277-2-1.3437-2 0z"/></svg>
diff --git a/core/img/actions/audio.svg b/core/img/actions/audio.svg
index fa55c949a9d..6c10a4db150 100644
--- a/core/img/actions/audio.svg
+++ b/core/img/actions/audio.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" viewBox="0 0 16 16"><path d="M8 1c-1.108 0-2 .892-2 2v4c0 1.108.892 2 2 2s2-.892 2-2V3c0-1.108-.892-2-2-2zM4 5c-.554 0-1 .446-1 1v1a4.988 4.988 0 0 0 4 4.9V13H5v2h6v-2H9v-1.1c2.287-.46 4-2.473 4-4.9V6c0-.554-.446-1-1-1s-1 .446-1 1v1c0 1.662-1.338 3-3 3S5 8.662 5 7V6c0-.554-.446-1-1-1z" fill-rule="evenodd"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"><path d="m6 3v3.5c0 2.6667 4 2.6667 4 0v-3.5c0-2.6661-4-2.6669-4 0zm-3 3c0 2.9759 1.8757 4.907 4 5.375v1.625h-2v2h6v-2h-2v-1.625c2.124-0.466 4-2.3973 4-5.375 0-1.3333-2-1.3333-2 0 0 4.6515-6 4.654-6 0 0-1.3277-2-1.3437-2 0z"/></svg>
diff --git a/core/img/actions/caret-dark.svg b/core/img/actions/caret-dark.svg
index 87c895e15bb..89ce37bc3e7 100644
--- a/core/img/actions/caret-dark.svg
+++ b/core/img/actions/caret-dark.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1"><path style="block-progression:tb;text-transform:none;text-indent:0" d="M4 6l4 4 4-3.994z" color="#000"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewbox="0 0 16 16"><path d="M4 6l4 4 4-3.994z"/></svg>
diff --git a/core/img/actions/caret.svg b/core/img/actions/caret.svg
index 21a97f8be40..a7c34f699c7 100644
--- a/core/img/actions/caret.svg
+++ b/core/img/actions/caret.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="10" width="10" version="1"><path style="block-progression:tb;text-transform:none;text-indent:0" d="M1 3l4 4 4-3.994z" fill="#fff" color="#000"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewbox="0 0 16 16"><path d="M4 6l4 4 4-3.994z" fill="#fff" /></svg>
diff --git a/core/img/actions/checkbox-mark-white.svg b/core/img/actions/checkbox-mark-white.svg
index 1441e8666fb..349cb6ca2c9 100644
--- a/core/img/actions/checkbox-mark-white.svg
+++ b/core/img/actions/checkbox-mark-white.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m0 0v16h16v-16h-16zm11.924 4.0664l1.4336 1.4297-6.3652 6.3652-4.2422-4.2441 1.4141-1.4121 2.8281 2.8301 4.9316-4.9688z" fill="#fff"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path fill="#fff" d="m0 0v16h16v-16h-16zm11.924 4.0664l1.4336 1.4297-6.3652 6.3652-4.2422-4.2441 1.4141-1.4121 2.8281 2.8301 4.9316-4.9688z"/></svg>
diff --git a/core/img/actions/checkbox-mark.svg b/core/img/actions/checkbox-mark.svg
index 1013b6cc3f2..dbfa0afc214 100644
--- a/core/img/actions/checkbox-mark.svg
+++ b/core/img/actions/checkbox-mark.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M11.924 4.066l-4.932 4.97-2.828-2.83L2.75 7.618l4.242 4.243 6.365-6.365-1.433-1.432z" fill="#fff"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M11.924 4.066l-4.932 4.97-2.828-2.83L2.75 7.618l4.242 4.243 6.365-6.365-1.433-1.432z" fill="#fff"/></svg>
diff --git a/core/img/actions/checkbox-mixed-white.svg b/core/img/actions/checkbox-mixed-white.svg
index 6909d0fc04c..45727d5eb43 100644
--- a/core/img/actions/checkbox-mixed-white.svg
+++ b/core/img/actions/checkbox-mixed-white.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m0 0v16h16v-16h-16zm4 7h8v2h-8v-2z" fill="#fff"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="m0 0v16h16v-16h-16zm4 7h8v2h-8v-2z" fill="#fff"/></svg>
diff --git a/core/img/actions/checkbox-mixed.svg b/core/img/actions/checkbox-mixed.svg
index 308baae3920..2f3fd3fa82d 100644
--- a/core/img/actions/checkbox-mixed.svg
+++ b/core/img/actions/checkbox-mixed.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M4 7v2h8V7H4z" fill="#fff"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M4 7v2h8V7H4z" fill="#fff"/></svg>
diff --git a/core/img/actions/checkmark-color.svg b/core/img/actions/checkmark-color.svg
index 0a3c762771a..ad8f1e4885a 100644
--- a/core/img/actions/checkmark-color.svg
+++ b/core/img/actions/checkmark-color.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" viewBox="-0.5 -0.5 16 16" width="16" overflow="visible"><path d="M6.09 12.5L1.14 7.55l1.413-1.414L6.09 9.67l6.344-6.382 1.433 1.434z" fill="#00d400"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"><path d="m2.35 7.3 4 4l7.3-7.3" stroke="#00d400" stroke-width="2" fill="none"/></svg>
diff --git a/core/img/actions/checkmark-white.svg b/core/img/actions/checkmark-white.svg
index 299e1518b00..6190902ea2d 100644
--- a/core/img/actions/checkmark-white.svg
+++ b/core/img/actions/checkmark-white.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" viewBox="-0.5 -0.5 16 16" width="16" overflow="visible"><path d="M6.09 12.5L1.14 7.55l1.413-1.414L6.09 9.67l6.345-6.382 1.433 1.434z" fill="#fff"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"><path d="m2.35 7.3 4 4l7.3-7.3" stroke="white" stroke-width="2" fill="none"/></svg>
diff --git a/core/img/actions/checkmark.png b/core/img/actions/checkmark.png
index eb938698fd2..37face163ea 100644
--- a/core/img/actions/checkmark.png
+++ b/core/img/actions/checkmark.png
diff --git a/core/img/actions/checkmark.svg b/core/img/actions/checkmark.svg
index 689e202d6a6..3501b5a4252 100644
--- a/core/img/actions/checkmark.svg
+++ b/core/img/actions/checkmark.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" viewBox="-0.5 -0.5 16 16" width="16" overflow="visible"><path d="M6.09 12.5L1.14 7.55l1.413-1.414L6.09 9.67l6.344-6.382 1.433 1.434z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"><path d="m2.35 7.3 4 4l7.3-7.3" stroke="#000" stroke-width="2" fill="none"/></svg>
diff --git a/core/img/actions/clippy.svg b/core/img/actions/clippy.svg
index af496f39386..0d2e6550eaa 100644
--- a/core/img/actions/clippy.svg
+++ b/core/img/actions/clippy.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16">
- <path opacity=".5" d="m13 15h-11l0.0005-10h11v3.0002l1-0.0004 0.0005-5.0001c0.000058-0.5834-0.4165-1.0002-1.0005-1.0001l-3.467 0.0005c0.0008-1.183-0.9492-2.0001-2.1325-2.0001s-2.1333 0.8171-2.1333 2.0004h-3.2c-0.5834 0-1.0662 0.4166-1.0662 0.9999l-0.0005 12c-0.0000243 0.584 0.4833 1 1.0667 1l10.933-0.0005c0.584-0.001 1-0.416 1-1v-3h-1zm-8.8005-12h1.0672c0.5833 0 1.0666-0.4162 1.0666-0.9996 0-0.5833 0.4834-0.9337 1.0667-0.9337s1.0667 0.3504 1.0667 0.9337c0 0.5834 0.5333 0.9996 1.0666 0.9996h1.2667c0.517 0 1.2 0.4166 1.2 1h-9c-0.0004-0.65 0.5988-1 1.1988-1zm-1.1995 8h2v-1h-2zm7.9998-2v-2l-4 3 3.9998 3v-2l5.0002-0.00005v-2l-4.9998-0.00005zm-8 4h4v-1h-4zm6-7h-6v1h6zm-3 2h-3v1h3z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewbox="0 0 16 16"><path d="m13 15h-11l0.0005-10h11v3.0002l1-0.0004 0.0005-5.0001c0.000058-0.5834-0.4165-1.0002-1.0005-1.0001l-3.467 0.0005c0.0008-1.183-0.9492-2.0001-2.1325-2.0001s-2.1333 0.8171-2.1333 2.0004h-3.2c-0.5834 0-1.0662 0.4166-1.0662 0.9999l-0.0005 12c-0.0000243 0.584 0.4833 1 1.0667 1l10.933-0.0005c0.584-0.001 1-0.416 1-1v-3h-1zm-8.8005-12h1.0672c0.5833 0 1.0666-0.4162 1.0666-0.9996 0-0.5833 0.4834-0.9337 1.0667-0.9337s1.0667 0.3504 1.0667 0.9337c0 0.5834 0.5333 0.9996 1.0666 0.9996h1.2667c0.517 0 1.2 0.4166 1.2 1h-9c-0.0004-0.65 0.5988-1 1.1988-1zm-1.1995 8h2v-1h-2zm7.9998-2v-2l-4 3 3.9998 3v-2l5.0002-0.00005v-2l-4.9998-0.00005zm-8 4h4v-1h-4zm6-7h-6v1h6zm-3 2h-3v1h3z"/></svg>
diff --git a/core/img/actions/close-white.svg b/core/img/actions/close-white.svg
index cd2a8c62468..49231d7d62f 100644
--- a/core/img/actions/close-white.svg
+++ b/core/img/actions/close-white.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1">
- <path fill="#fff" d="m12.95 11.536l-1.414 1.414-3.536-3.536-3.535 3.536-1.415-1.414 3.536-3.536-3.536-3.536 1.415-1.414 3.535 3.536 3.516-3.555 1.434 1.434-3.536 3.535z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewbox="0 0 16 16"><path fill="#fff" d="m12.95 11.536l-1.414 1.414-3.536-3.536-3.535 3.536-1.415-1.414 3.536-3.536-3.536-3.536 1.415-1.414 3.535 3.536 3.516-3.555 1.434 1.434-3.536 3.535z"/></svg>
diff --git a/core/img/actions/close.svg b/core/img/actions/close.svg
index c58fe6379f3..549c1ce76ee 100644
--- a/core/img/actions/close.svg
+++ b/core/img/actions/close.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1">
- <path d="m12.95 11.536l-1.414 1.414-3.536-3.536-3.535 3.536-1.415-1.414 3.536-3.536-3.536-3.536 1.415-1.414 3.535 3.536 3.516-3.555 1.434 1.434-3.536 3.535z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewbox="0 0 16 16"><path d="m12.95 11.536l-1.414 1.414-3.536-3.536-3.535 3.536-1.415-1.414 3.536-3.536-3.536-3.536 1.415-1.414 3.535 3.536 3.516-3.555 1.434 1.434-3.536 3.535z"/></svg>
diff --git a/core/img/actions/comment.png b/core/img/actions/comment.png
index 0dec289e38b..2cf94b5c986 100644
--- a/core/img/actions/comment.png
+++ b/core/img/actions/comment.png
diff --git a/core/img/actions/comment.svg b/core/img/actions/comment.svg
index 2e4ee63a88e..abc7bc39ece 100644
--- a/core/img/actions/comment.svg
+++ b/core/img/actions/comment.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" viewbox="0 0 16 16"><path d="M8 1.5C3.582 1.5 0 3.962 0 7s3.582 5.5 8 5.5c.25 0 .49-.016.734-.03L13 16v-4.703c1.83-1.008 3-2.56 3-4.297 0-3.038-3.582-5.5-8-5.5z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewbox="0 0 16 16"><path d="M8 1.5C3.582 1.5 0 3.962 0 7s3.582 5.5 8 5.5c.25 0 .49-.016.734-.03L13 16v-4.703c1.83-1.008 3-2.56 3-4.297 0-3.038-3.582-5.5-8-5.5z"/></svg>
diff --git a/core/img/actions/confirm-white.svg b/core/img/actions/confirm-white.svg
index 266f2bc1abc..98a41adefe5 100644
--- a/core/img/actions/confirm-white.svg
+++ b/core/img/actions/confirm-white.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1">
- <path d="m8.6328 0.63477c-0.2556 0-0.5112 0.0971-0.707 0.29296-0.3918 0.39177-0.3918 1.0224 0 1.4141l4.6582 4.6582h-11.584c-0.554 0-1 0.446-1 1s0.446 1 1 1h11.586l-4.6583 4.658c-0.3917 0.392-0.3917 1.023 0 1.414 0.3918 0.392 1.0224 0.392 1.4141 0l6.3632-6.363v-0.002h0.002c0.093-0.093 0.166-0.2041 0.217-0.3281l0.002-0.0019v-0.002c0.02-0.0508 0.019-0.1053 0.031-0.1582 0.016-0.0718 0.043-0.14 0.043-0.2168 0-0.0714-0.027-0.1341-0.041-0.2012-0.012-0.0578-0.012-0.1202-0.033-0.1738v-0.002c-0.001-0.0013-0.002-0.0026-0.002-0.0039-0.051-0.1233-0.124-0.2335-0.217-0.3261-0.001-0.0007-0.001-0.0013-0.002-0.002l-6.3632-6.3633c-0.1959-0.19583-0.4534-0.29293-0.709-0.29293z" fill-rule="evenodd" fill="#fff"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewbox="0 0 16 16" width="16" version="1.1" height="16"><path fill="#fff" d="m8.5 0.5c-0.8974 0-1.3404 1.0909-0.6973 1.7168l4.7837 4.7832h-11.573c-1.3523-0.019125-1.3523 2.0191 0 2h11.572l-4.7832 4.7832c-0.98163 0.94251 0.47155 2.3957 1.4141 1.4141l6.4911-6.49c0.387-0.3878 0.391-1.0228 0-1.414l-6.4906-6.4903c-0.1883-0.1935-0.4468-0.30268-0.7168-0.3027z"/></svg>
diff --git a/core/img/actions/confirm.svg b/core/img/actions/confirm.svg
index fd954cdcb1f..42e302c4a4a 100644
--- a/core/img/actions/confirm.svg
+++ b/core/img/actions/confirm.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16">
- <path d="m8.6328 0.63477c-0.2556 0-0.5112 0.0971-0.707 0.29296-0.3918 0.39177-0.3918 1.0224 0 1.4141l4.6582 4.6582h-11.584c-0.554 0-1 0.446-1 1s0.446 1 1 1h11.586l-4.6583 4.658c-0.3917 0.392-0.3917 1.023 0 1.414 0.3918 0.392 1.0224 0.392 1.4141 0l6.3632-6.363v-0.002h0.002c0.093-0.093 0.166-0.2041 0.217-0.3281l0.002-0.0019v-0.002c0.02-0.0508 0.019-0.1053 0.031-0.1582 0.016-0.0718 0.043-0.14 0.043-0.2168 0-0.0714-0.027-0.1341-0.041-0.2012-0.012-0.0578-0.012-0.1202-0.033-0.1738v-0.002c-0.001-0.0013-0.002-0.0026-0.002-0.0039-0.051-0.1233-0.124-0.2335-0.217-0.3261-0.001-0.0007-0.001-0.0013-0.002-0.002l-6.3632-6.3633c-0.1959-0.19583-0.4534-0.29293-0.709-0.29293z" fill-rule="evenodd"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewbox="0 0 16 16" width="16" version="1.1" height="16"><path d="m8.5 0.5c-0.8974 0-1.3404 1.0909-0.6973 1.7168l4.7837 4.7832h-11.573c-1.3523-0.019125-1.3523 2.0191 0 2h11.572l-4.7832 4.7832c-0.98163 0.94251 0.47155 2.3957 1.4141 1.4141l6.4911-6.49c0.387-0.3878 0.391-1.0228 0-1.414l-6.4906-6.4903c-0.1883-0.1935-0.4468-0.30268-0.7168-0.3027z"/></svg>
diff --git a/core/img/actions/delete-hover.svg b/core/img/actions/delete-hover.svg
index faf2f5293ff..286f060d462 100644
--- a/core/img/actions/delete-hover.svg
+++ b/core/img/actions/delete-hover.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path fill="#d40000" d="M6.5 1L6 2H3c-.554 0-1 .446-1 1v1h12V3c0-.554-.446-1-1-1h-3l-.5-1zM3 5l.875 9c.06.55.573 1 1.125 1h6c.552 0 1.064-.45 1.125-1L13 5z" fill-rule="evenodd"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path fill="#d40000" d="M6.5 1L6 2H3c-.554 0-1 .446-1 1v1h12V3c0-.554-.446-1-1-1h-3l-.5-1zM3 5l.875 9c.06.55.573 1 1.125 1h6c.552 0 1.064-.45 1.125-1L13 5z" fill-rule="evenodd"/></svg>
diff --git a/core/img/actions/delete-white.svg b/core/img/actions/delete-white.svg
index 2e8836c7025..15a364c1006 100644
--- a/core/img/actions/delete-white.svg
+++ b/core/img/actions/delete-white.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M6.5 1L6 2H3c-.554 0-1 .446-1 1v1h12V3c0-.554-.446-1-1-1h-3l-.5-1zM3 5l.875 9c.06.55.573 1 1.125 1h6c.552 0 1.064-.45 1.125-1L13 5z" fill-rule="evenodd" fill="#fff"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M6.5 1L6 2H3c-.554 0-1 .446-1 1v1h12V3c0-.554-.446-1-1-1h-3l-.5-1zM3 5l.875 9c.06.55.573 1 1.125 1h6c.552 0 1.064-.45 1.125-1L13 5z" fill="#fff"/></svg>
diff --git a/core/img/actions/delete.svg b/core/img/actions/delete.svg
index c20929aaa18..53f0b020eb9 100644
--- a/core/img/actions/delete.svg
+++ b/core/img/actions/delete.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M6.5 1L6 2H3c-.554 0-1 .446-1 1v1h12V3c0-.554-.446-1-1-1h-3l-.5-1zM3 5l.875 9c.06.55.573 1 1.125 1h6c.552 0 1.064-.45 1.125-1L13 5z" fill-rule="evenodd"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M6.5 1L6 2H3c-.554 0-1 .446-1 1v1h12V3c0-.554-.446-1-1-1h-3l-.5-1zM3 5l.875 9c.06.55.573 1 1.125 1h6c.552 0 1.064-.45 1.125-1L13 5z"/></svg>
diff --git a/core/img/actions/details.svg b/core/img/actions/details.svg
index 464ed4175da..02d44921d4c 100644
--- a/core/img/actions/details.svg
+++ b/core/img/actions/details.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1"><path d="M5 7.474c.155.382.325.69.644.246.407-.268 1.76-1.427 1.662-.342-.368 2.017-.834 4.017-1.17 6.04-.393 1.114.634 2.067 1.637 1.31 1.078-.502 1.99-1.287 2.927-2.01-.144-.323-.25-.79-.596-.347-.468.24-1.47 1.318-1.696.472.315-2.18.975-4.295 1.365-6.462.397-1.005-.364-2.223-1.4-1.363C7.117 5.634 6.083 6.6 5 7.474zM9.46.005C8.15-.017 7.553 2.147 8.815 2.68c1.023.378 2.077-.714 1.79-1.75-.098-.542-.598-.97-1.147-.93z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M5 7.474c.155.382.325.69.644.246.407-.268 1.76-1.427 1.662-.342-.368 2.017-.834 4.017-1.17 6.04-.393 1.114.634 2.067 1.637 1.31 1.078-.502 1.99-1.287 2.927-2.01-.144-.323-.25-.79-.596-.347-.468.24-1.47 1.318-1.696.472.315-2.18.975-4.295 1.365-6.462.397-1.005-.364-2.223-1.4-1.363C7.117 5.634 6.083 6.6 5 7.474zM9.46.005C8.15-.017 7.553 2.147 8.815 2.68c1.023.378 2.077-.714 1.79-1.75-.098-.542-.598-.97-1.147-.93z"/></svg>
diff --git a/core/img/actions/download-white.svg b/core/img/actions/download-white.svg
index d4fc9549dea..b6de7996024 100644
--- a/core/img/actions/download-white.svg
+++ b/core/img/actions/download-white.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path fill="#fff" d="M6 1h4v7h5l-7 7-7-7h5z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path fill="#fff" d="M6 1h4v7h5l-7 7-7-7h5z"/></svg>
diff --git a/core/img/actions/download.png b/core/img/actions/download.png
index 6808969b30b..19c20d3b032 100644
--- a/core/img/actions/download.png
+++ b/core/img/actions/download.png
diff --git a/core/img/actions/download.svg b/core/img/actions/download.svg
index 77d9cd05eb8..dd2389b2afa 100644
--- a/core/img/actions/download.svg
+++ b/core/img/actions/download.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M6 1h4v7h5l-7 7-7-7h5z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M6 1h4v7h5l-7 7-7-7h5z"/></svg>
diff --git a/core/img/actions/edit.svg b/core/img/actions/edit.svg
index a8ab7162a46..8e00aab086c 100644
--- a/core/img/actions/edit.svg
+++ b/core/img/actions/edit.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1"><path style="block-progression:tb;text-transform:none;text-indent:0" d="M2.35 1.002A.45.45 0 0 0 2 1.44V14.56c0 .232.206.44.432.44H13.57a.452.452 0 0 0 .432-.438V4.42a.458.458 0 0 0-.055-.192l-3.312-3.2a.427.427 0 0 0-.135-.026H2.43a.424.424 0 0 0-.08 0zM4 3h6v1H4V3zm0 3h5v1H4V6zm0 3h8v1H4V9zm0 3h4v1H4v-1z" color="#000"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="16" width="16" viewBox="0 0 16 16"><path d="m2.5 1c-0.277 0-0.5 0.223-0.5 0.5v13c0 0.277 0.223 0.5 0.5 0.5h11c0.277 0 0.5-0.223 0.5-0.5v-10.5l-3-3h-8.5zm1.5 2h6v1h-6v-1zm0 3h5v1h-5v-1zm0 3h8v1h-8v-1zm0 3h4v1h-4v-1z"/></svg>
diff --git a/core/img/actions/error-color.svg b/core/img/actions/error-color.svg
index 1dd9c6798e8..19957ad7c73 100644
--- a/core/img/actions/error-color.svg
+++ b/core/img/actions/error-color.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M5.516 2L2 5.516v4.968L5.516 14h4.968L14 10.484V5.516L10.484 2H5.516zM7 4h2v5H7V4zm0 6h2v2H7v-2z" fill="#d40000"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M5.516 2L2 5.516v4.968L5.516 14h4.968L14 10.484V5.516L10.484 2H5.516zM7 4h2v5H7V4zm0 6h2v2H7v-2z" fill="#d40000"/></svg>
diff --git a/core/img/actions/error-white.svg b/core/img/actions/error-white.svg
index fdcc46f21b2..9558c998c30 100644
--- a/core/img/actions/error-white.svg
+++ b/core/img/actions/error-white.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M5.516 2L2 5.516v4.968L5.516 14h4.968L14 10.484V5.516L10.484 2H5.516zM7 4h2v5H7V4zm0 6h2v2H7v-2z" fill="#fff"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M5.516 2L2 5.516v4.968L5.516 14h4.968L14 10.484V5.516L10.484 2H5.516zM7 4h2v5H7V4zm0 6h2v2H7v-2z" fill="#fff"/></svg>
diff --git a/core/img/actions/error.svg b/core/img/actions/error.svg
index 3bbf23a5f55..20a92c67fe2 100644
--- a/core/img/actions/error.svg
+++ b/core/img/actions/error.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M5.516 2L2 5.516v4.968L5.516 14h4.968L14 10.484V5.516L10.484 2H5.516zM7 4h2v5H7V4zm0 6h2v2H7v-2z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M5.516 2L2 5.516v4.968L5.516 14h4.968L14 10.484V5.516L10.484 2H5.516zM7 4h2v5H7V4zm0 6h2v2H7v-2z"/></svg>
diff --git a/core/img/actions/external.svg b/core/img/actions/external.svg
index 6df1551c455..5b3bc716c0f 100644
--- a/core/img/actions/external.svg
+++ b/core/img/actions/external.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M7.452 1.62l2.38 2.256-3.57 3.386L8.64 9.52l3.57-3.387 2.38 2.257V1.618h-7.14zM2.69 2.746c-.66 0-1.19.504-1.19 1.13v9.028c0 .625.53 1.128 1.19 1.128h9.522c.66 0 1.19-.503 1.19-1.128V9.52l-1.19-1.13v4.515h-9.52v-9.03h4.76l-1.19-1.128H2.69z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M7.452 1.62l2.38 2.256-3.57 3.386L8.64 9.52l3.57-3.387 2.38 2.257V1.618h-7.14zM2.69 2.746c-.66 0-1.19.504-1.19 1.13v9.028c0 .625.53 1.128 1.19 1.128h9.522c.66 0 1.19-.503 1.19-1.128V9.52l-1.19-1.13v4.515h-9.52v-9.03h4.76l-1.19-1.128H2.69z"/></svg>
diff --git a/core/img/actions/fullscreen-white.svg b/core/img/actions/fullscreen-white.svg
index 887cd99ee5f..c920885bf6b 100644
--- a/core/img/actions/fullscreen-white.svg
+++ b/core/img/actions/fullscreen-white.svg
@@ -1,10 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16">
- <defs>
-  <filter id="a" style="color-interpolation-filters:sRGB" height="1.36" width="1.36" y="-.18" x="-.18">
-   <feGaussianBlur stdDeviation="1.05"/>
-  </filter>
- </defs>
- <path opacity=".5" d="m8 1c-0.554 0-1 0.446-1 1s0.446 1 1 1h5v5c0 0.554 0.446 1 1 1s1-0.446 1-1v-6c0-0.554-0.446-1-1-1h-6zm-6 6c-0.554 0-1 0.446-1 1v6c0 0.554 0.446 1 1 1h6c0.554 0 1-0.446 1-1s-0.446-1-1-1h-5v-5c0-0.554-0.446-1-1-1z" fill-rule="evenodd" filter="url(#a)"/>
- <path fill-rule="evenodd" fill="#fff" d="m8 1c-0.554 0-1 0.446-1 1s0.446 1 1 1h5v5c0 0.554 0.446 1 1 1s1-0.446 1-1v-6c0-0.554-0.446-1-1-1h-6zm-6 6c-0.554 0-1 0.446-1 1v6c0 0.554 0.446 1 1 1h6c0.554 0 1-0.446 1-1s-0.446-1-1-1h-5v-5c0-0.554-0.446-1-1-1z"/>
-</svg>
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16"><defs><filter id="a" height="21"><feGaussianBlur stdDeviation="1" in="SourceAlpha"/><feComponentTransfer><feFuncA slope="0.5" type="linear"/></feComponentTransfer><feMerge><feMergeNode/><feMergeNode in="SourceGraphic"/></feMerge></filter></defs><path filter="url(#a)" d="m8 1c-0.554 0-1 0.446-1 1s0.446 1 1 1h5v5c0 0.554 0.446 1 1 1s1-0.446 1-1v-6c0-0.554-0.446-1-1-1h-6zm-6 6c-0.554 0-1 0.446-1 1v6c0 0.554 0.446 1 1 1h6c0.554 0 1-0.446 1-1s-0.446-1-1-1h-5v-5c0-0.554-0.446-1-1-1z" fill="#fff"/></svg>
diff --git a/core/img/actions/fullscreen.svg b/core/img/actions/fullscreen.svg
index 8bf215779db..bd3adc29baf 100644
--- a/core/img/actions/fullscreen.svg
+++ b/core/img/actions/fullscreen.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16">
- <path d="m8 1c-0.554 0-1 0.446-1 1s0.446 1 1 1h5v5c0 0.554 0.446 1 1 1s1-0.446 1-1v-6c0-0.554-0.446-1-1-1h-6zm-6 6c-0.554 0-1 0.446-1 1v6c0 0.554 0.446 1 1 1h6c0.554 0 1-0.446 1-1s-0.446-1-1-1h-5v-5c0-0.554-0.446-1-1-1z" fill-rule="evenodd"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="m8 1c-0.554 0-1 0.446-1 1s0.446 1 1 1h5v5c0 0.554 0.446 1 1 1s1-0.446 1-1v-6c0-0.554-0.446-1-1-1h-6zm-6 6c-0.554 0-1 0.446-1 1v6c0 0.554 0.446 1 1 1h6c0.554 0 1-0.446 1-1s-0.446-1-1-1h-5v-5c0-0.554-0.446-1-1-1z"/></svg>
diff --git a/core/img/actions/history.svg b/core/img/actions/history.svg
index 42d5e70e584..25b633c7bff 100644
--- a/core/img/actions/history.svg
+++ b/core/img/actions/history.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="17" width="17"><path d="M9.525 2.08c-3.95 0-6.535 3.447-6.364 6.72H1l3.904 3.92 4.08-3.874H6.837C6.6 7.146 8 5.732 9.526 5.754c1.595.024 2.8 1.23 2.8 2.734.09 1.594-1.63 3.428-3.966 2.53 0 1.23.003 2.545 0 3.765 4.19.83 7.64-2.51 7.64-6.25C16 4.97 13.08 2.08 9.525 2.08z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="m9.025 1.08c-3.95 0-6.535 3.447-6.364 6.72h-2.161l3.904 3.92 4.08-3.874h-2.147c-0.237-1.7 1.163-3.114 2.689-3.092 1.595 0.024 2.8 1.23 2.8 2.734 0.09 1.594-1.63 3.428-3.966 2.53 0 1.23 0.003 2.545 0 3.765 4.19 0.83 7.64-2.51 7.64-6.25 0-3.563-2.92-6.453-6.475-6.453z"/></svg>
diff --git a/core/img/actions/info-white.svg b/core/img/actions/info-white.svg
index e289aacc420..92f6e44add2 100644
--- a/core/img/actions/info-white.svg
+++ b/core/img/actions/info-white.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1"><path color="#000" fill="none" d="M-62.897-32.993h163.31v97.986h-163.31z"/><path d="M5 7.474c.155.382.325.69.644.246.407-.268 1.76-1.427 1.662-.342-.368 2.017-.834 4.017-1.17 6.04-.393 1.114.634 2.067 1.637 1.31 1.078-.502 1.99-1.287 2.927-2.01-.144-.323-.25-.79-.596-.347-.468.24-1.47 1.318-1.696.472.315-2.18.975-4.295 1.365-6.462.397-1.005-.364-2.223-1.4-1.363C7.117 5.634 6.083 6.6 5 7.474zM9.46.005C8.15-.017 7.553 2.147 8.815 2.68c1.023.378 2.077-.714 1.79-1.75-.098-.542-.598-.97-1.147-.93z" fill="#fff"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M5 7.474c.155.382.325.69.644.246.407-.268 1.76-1.427 1.662-.342-.368 2.017-.834 4.017-1.17 6.04-.393 1.114.634 2.067 1.637 1.31 1.078-.502 1.99-1.287 2.927-2.01-.144-.323-.25-.79-.596-.347-.468.24-1.47 1.318-1.696.472.315-2.18.975-4.295 1.365-6.462.397-1.005-.364-2.223-1.4-1.363C7.117 5.634 6.083 6.6 5 7.474zM9.46.005C8.15-.017 7.553 2.147 8.815 2.68c1.023.378 2.077-.714 1.79-1.75-.098-.542-.598-.97-1.147-.93z" fill="#fff"/></svg>
diff --git a/core/img/actions/info.svg b/core/img/actions/info.svg
index 35926af30de..02d44921d4c 100644
--- a/core/img/actions/info.svg
+++ b/core/img/actions/info.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1"><path color="#000" fill="none" d="M-62.897-32.993h163.31v97.986h-163.31z"/><path d="M5 7.474c.155.382.325.69.644.246.407-.268 1.76-1.427 1.662-.342-.368 2.017-.834 4.017-1.17 6.04-.393 1.114.634 2.067 1.637 1.31 1.078-.502 1.99-1.287 2.927-2.01-.144-.323-.25-.79-.596-.347-.468.24-1.47 1.318-1.696.472.315-2.18.975-4.295 1.365-6.462.397-1.005-.364-2.223-1.4-1.363C7.117 5.634 6.083 6.6 5 7.474zM9.46.005C8.15-.017 7.553 2.147 8.815 2.68c1.023.378 2.077-.714 1.79-1.75-.098-.542-.598-.97-1.147-.93z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M5 7.474c.155.382.325.69.644.246.407-.268 1.76-1.427 1.662-.342-.368 2.017-.834 4.017-1.17 6.04-.393 1.114.634 2.067 1.637 1.31 1.078-.502 1.99-1.287 2.927-2.01-.144-.323-.25-.79-.596-.347-.468.24-1.47 1.318-1.696.472.315-2.18.975-4.295 1.365-6.462.397-1.005-.364-2.223-1.4-1.363C7.117 5.634 6.083 6.6 5 7.474zM9.46.005C8.15-.017 7.553 2.147 8.815 2.68c1.023.378 2.077-.714 1.79-1.75-.098-.542-.598-.97-1.147-.93z"/></svg>
diff --git a/core/img/actions/logout.svg b/core/img/actions/logout.svg
index 4159e85b89b..f6c83c9ff65 100644
--- a/core/img/actions/logout.svg
+++ b/core/img/actions/logout.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1"><path style="block-progression:tb;text-transform:none;text-indent:0" d="M8 0c-.47 0-.96.542-.95 1v6c-.007.528.422 1 .95 1s.958-.472.95-1V1A.967.967 0 0 0 8 0zM4.656 2.5a.952.952 0 0 0-.25.094c-3 1.57-3.918 4.798-3.125 7.47A6.907 6.907 0 0 0 7.97 15c3.358 0 5.876-2.15 6.718-4.78.84-2.634-.058-5.825-3.125-7.595-.434-.254-1.06-.09-1.313.343-.254.434-.09 1.06.344 1.313 2.39 1.38 2.882 3.495 2.28 5.376-.6 1.88-2.343 3.437-4.905 3.437-2.577 0-4.3-1.65-4.876-3.594-.578-1.944-.047-4.05 2.187-5.22a.98.98 0 0 0 .457-1.105.98.98 0 0 0-.987-.675.978.978 0 0 0-.094 0z" color="#000"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><g stroke-width="2" stroke="#000" stroke-linecap="round" fill="none"><path d="m10.75 3.9862a5.5 5.5 0 0 1 2.563 6.1868 5.5 5.5 0 0 1 -5.3131 4.077 5.5 5.5 0 0 1 -5.3127 -4.077 5.5 5.5 0 0 1 2.5627 -6.1867"/><path d="m8 1.7637v5.972"/></g></svg>
diff --git a/core/img/actions/mail.svg b/core/img/actions/mail.svg
index a6626a585c6..14148ecc791 100644
--- a/core/img/actions/mail.svg
+++ b/core/img/actions/mail.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1"><path d="M.89 3a.887.887 0 0 0-.89.89v8.222c0 .492.396.888.89.888h14.22c.494 0 .89-.396.89-.888V3.89a.887.887 0 0 0-.89-.89zm.75 1.028L7.72 10.11h.528l6.11-6.082.612.61-3.64 3.696 2.75 2.805-.61.61-2.805-2.805L8.64 11H7.36L5.335 8.945l-2.806 2.833-.61-.64 2.777-2.804L1.028 4.64z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="16" width="16" viewBox="0 0 16 16"><path d="m0.89 3c-0.4924 0-0.89 0.4-0.89 0.89v8.2202c0 0.493 0.4 0.89 0.89 0.89h14.22c0.492 0 0.89-0.4 0.89-0.89v-8.2202c0-0.4924-0.4-0.89-0.89-0.89zm0.75 1.0278 6.0827 6.0817h0.52773l6.1102-6.0817 0.611 0.6109-3.6384 3.6934 2.75 2.8047-0.61102 0.61092-2.8052-2.8047-2.0275 2.0549h-1.2776l-2.0271-2.0553-2.8053 2.8323-0.6111-0.639 2.7774-2.8046-3.666-3.6932z"/></svg>
diff --git a/core/img/actions/menu.svg b/core/img/actions/menu.svg
index 222b39eaaa0..6f3a3e37755 100644
--- a/core/img/actions/menu.svg
+++ b/core/img/actions/menu.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M2 2v2h12V2zm0 5v2h12V7zm0 5v2h12v-2z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M2 2v2h12V2zm0 5v2h12V7zm0 5v2h12v-2z"/></svg>
diff --git a/core/img/actions/more-white.svg b/core/img/actions/more-white.svg
index bae78cf0a49..bed27ebf9e5 100644
--- a/core/img/actions/more-white.svg
+++ b/core/img/actions/more-white.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1"><path color="#000" fill="none" d="M-62.897-32.993h163.31v97.986h-163.31z"/><path d="M3 6a2 2 0 1 0 0 4 2 2 0 0 0 0-4zm5 0a2 2 0 1 0 0 4 2 2 0 0 0 0-4zm5 0a2 2 0 1 0 0 4 2 2 0 0 0 0-4z" fill-rule="evenodd" fill="#fff"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M3 6a2 2 0 1 0 0 4 2 2 0 0 0 0-4zm5 0a2 2 0 1 0 0 4 2 2 0 0 0 0-4zm5 0a2 2 0 1 0 0 4 2 2 0 0 0 0-4z" fill="#fff"/></svg>
diff --git a/core/img/actions/more.svg b/core/img/actions/more.svg
index 48c499ef7b7..c510e70d7da 100644
--- a/core/img/actions/more.svg
+++ b/core/img/actions/more.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1"><path color="#000" fill="none" d="M-62.897-32.993h163.31v97.986h-163.31z"/><path d="M3 6a2 2 0 1 0 0 4 2 2 0 0 0 0-4zm5 0a2 2 0 1 0 0 4 2 2 0 0 0 0-4zm5 0a2 2 0 1 0 0 4 2 2 0 0 0 0-4z" fill-rule="evenodd"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M3 6a2 2 0 1 0 0 4 2 2 0 0 0 0-4zm5 0a2 2 0 1 0 0 4 2 2 0 0 0 0-4zm5 0a2 2 0 1 0 0 4 2 2 0 0 0 0-4z"/></svg>
diff --git a/core/img/actions/password.png b/core/img/actions/password.png
index afe3e31a658..c713f827aba 100644
--- a/core/img/actions/password.png
+++ b/core/img/actions/password.png
diff --git a/core/img/actions/password.svg b/core/img/actions/password.svg
index 3d161917f6e..edd1edf6c03 100644
--- a/core/img/actions/password.svg
+++ b/core/img/actions/password.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" viewBox="0 0 71 100"><path d="M35.5 6.25c-13.807 0-25 11.193-25 25v12.5H4.25V87.5h62.5V43.75H60.5v-12.5c0-13.807-11.194-25-25-25zm0 12.5c6.904 0 12.5 5.596 12.5 12.5v12.5H23v-12.5c0-6.904 5.596-12.5 12.5-12.5z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16" width="16" height="16"><path d="m8 1c-2.319 0-3.967 1.8644-4 4v2.5h-1.5v7.5h11v-7.5h-1.5v-2.5c0-2.27-1.8-3.9735-4-4zm0 2c1.25 0 2 0.963 2 2v2.5h-4v-2.5c0-1.174 0.747-2 2-2z"/></svg>
diff --git a/core/img/actions/pause-big.svg b/core/img/actions/pause-big.svg
index 2d6f54f606f..855d288a9c6 100644
--- a/core/img/actions/pause-big.svg
+++ b/core/img/actions/pause-big.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M1 1v14h5V1zm9 0v14h5V1z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16" width="16" height="16"><path d="M1 1v14h5V1zm9 0v14h5V1z"/></svg>
diff --git a/core/img/actions/pause.svg b/core/img/actions/pause.svg
index eb9b5b47fa8..706b62d93be 100644
--- a/core/img/actions/pause.svg
+++ b/core/img/actions/pause.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M3 3v10h4V3H3zm6 0v10h4V3H9z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16" width="16" height="16"><path d="M3 3v10h4V3H3zm6 0v10h4V3H9z"/></svg>
diff --git a/core/img/actions/play-add.svg b/core/img/actions/play-add.svg
index 300e5a9e7de..c5f3acf3b63 100644
--- a/core/img/actions/play-add.svg
+++ b/core/img/actions/play-add.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M2 1l11 6-11 6zM11 9v2H9v2h2v2h2v-2h2v-2h-2V9z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16" width="16" height="16"><path d="M2 1l11 6-11 6zM11 9v2H9v2h2v2h2v-2h2v-2h-2V9z"/></svg>
diff --git a/core/img/actions/play-big.svg b/core/img/actions/play-big.svg
index 8769f885a72..3ad3ed390eb 100644
--- a/core/img/actions/play-big.svg
+++ b/core/img/actions/play-big.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M0 0l16 8-16 8z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16" width="16" height="16"><path d="M0 0l16 8-16 8z"/></svg>
diff --git a/core/img/actions/play-next.svg b/core/img/actions/play-next.svg
index d57509b343c..68a9336262b 100644
--- a/core/img/actions/play-next.svg
+++ b/core/img/actions/play-next.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M7 2l7 6-7 6z"/><path d="M2 2l7 6-7 6z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16" width="16" height="16"><path d="M7 2l7 6-7 6z"/><path d="M2 2l7 6-7 6z"/></svg>
diff --git a/core/img/actions/play-previous.svg b/core/img/actions/play-previous.svg
index e5d69b8da09..3f05be1bf7f 100644
--- a/core/img/actions/play-previous.svg
+++ b/core/img/actions/play-previous.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M9 2L2 8l7 6z"/><path d="M14 2L7 8l7 6z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16" width="16" height="16"><path d="M9 2L2 8l7 6z"/><path d="M14 2L7 8l7 6z"/></svg>
diff --git a/core/img/actions/play.svg b/core/img/actions/play.svg
index 5d19ae3e05e..336d336888e 100644
--- a/core/img/actions/play.svg
+++ b/core/img/actions/play.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M2 2l12 6-12 6z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16" width="16" height="16"><path d="M2 2l12 6-12 6z"/></svg>
diff --git a/core/img/actions/public.svg b/core/img/actions/public.svg
index 627810f106a..6ed1ade02dd 100644
--- a/core/img/actions/public.svg
+++ b/core/img/actions/public.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><g color="#000"><path style="block-progression:tb;text-transform:none;text-indent:0" d="M5.99 5.318a3.332 3.332 0 0 0 0 4.693c.116.118.226.22.355.315l1.383-1.383A1.4 1.4 0 0 1 7.33 6.66l3.352-3.352c.568-.57 1.442-.57 2.01 0s.57 1.442 0 2.01l-1.13 1.132c.34.725.464 1.518.377 2.304l2.094-2.095c1.288-1.29 1.288-3.406 0-4.694s-3.405-1.288-4.693 0L5.99 5.318z"/><path style="block-progression:tb;text-transform:none;text-indent:0" d="M10.01 10.68a3.332 3.332 0 0 0 0-4.692 3.126 3.126 0 0 0-.355-.314L8.272 7.057A1.4 1.4 0 0 1 8.67 9.34l-3.35 3.35c-.57.57-1.444.57-2.013.002s-.568-1.442 0-2.01L4.44 9.55a4.288 4.288 0 0 1-.38-2.305L1.967 9.34c-1.288 1.29-1.288 3.405 0 4.693s3.405 1.29 4.693 0l3.35-3.352z"/></g></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16" height="16" width="16"><path d="m9.2363 2.166-3.1816 3.1836c-0.7071 0.7072-1.0378 1.6182-0.9883 2.457 0.05 0.8389 0.4333 1.5841 0.9883 2.1387l1.4121-1.416c-0.5672-0.5672-0.5444-1.2192 0.002-1.7656l3.1812-3.1817c0.52536-0.52536 1.2507-0.52318 1.772-0.002 0.48245 0.5556 0.52732 1.2382-0.004 1.7695l-0.82 0.8203c0.555 0.785 0.645 1.3663 0.593 2.2344l1.641-1.6406c1.2374-1.2374 1.2371-3.3645 0-4.6016-1.236-1.2361-3.342-1.2113-4.5957 0.004zm0.7071 3.8848-1.4141 1.418c0 0 0.003-00 0.004 0 0.55 0.55 0.50736 1.2582-0.004 1.7695l-3.1816 3.1817c-0.696 0.59192-1.2985 0.47105-1.7696 0-0.62636-0.62636-0.5-1.2681 0-1.768l0.85-0.8473c-0.556-0.7835-0.6484-1.365-0.5976-2.2324l-1.666 1.666c-1.2393 1.2393-1.2357 3.36 0 4.5957 1.2353 1.2353 3.362 1.2356 4.5976 0l3.1817-3.182c0.7086-0.7083 1.0396-1.6184 0.9906-2.4586-0.048-0.8401-0.432-1.5864-0.9887-2.1407z"/></svg>
diff --git a/core/img/actions/rename.svg b/core/img/actions/rename.svg
index 6d0d4811c2d..a9cf878bc43 100644
--- a/core/img/actions/rename.svg
+++ b/core/img/actions/rename.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M12.594 1.344C12.062 1.314 11.5 1.5 11 2l3 3c1.5-1.5.188-3.563-1.406-3.656zM10 3l-7 7-2 5 5-2 7-7-3-3zm-6.5 7.5l2 2L3 14l-1-1 1.5-2.5z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16" height="16" width="16"><path d="M12.594 1.344C12.062 1.314 11.5 1.5 11 2l3 3c1.5-1.5.188-3.563-1.406-3.656zM10 3l-7 7-2 5 5-2 7-7-3-3zm-6.5 7.5l2 2L3 14l-1-1 1.5-2.5z"/></svg>
diff --git a/core/img/actions/screen-off-white.svg b/core/img/actions/screen-off-white.svg
index dca13c32b75..a022b933808 100644
--- a/core/img/actions/screen-off-white.svg
+++ b/core/img/actions/screen-off-white.svg
@@ -1,10 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16">
- <defs>
-  <filter id="a" style="color-interpolation-filters:sRGB" height="1.3602" width="1.3598" y="-.18008" x="-.17992">
-   <feGaussianBlur stdDeviation="1.0495605"/>
-  </filter>
- </defs>
- <path opacity=".5" d="m12.986 1.0117v0.00195c-0.255 0-0.51103 0.095216-0.70703 0.29102l-9.986 9.9844c-0.3918 0.392-0.3918 1.024 0 1.416 0.3917 0.392 1.0242 0.392 1.416 0l9.984-9.9862c0.392-0.392 0.392-1.0223 0-1.4141-0.196-0.1958-0.45103-0.29297-0.70703-0.29297zm-10.986 0.9883c-0.554 0-1 0.446-1 1v8c0 0.15223 0.03927 0.29296 0.09961 0.42188 0.09087-0.30747 0.24693-0.59837 0.48633-0.83789v-0.002l1.4141-1.414v-5.168h5.1699l2-2h-8.17zm12.893 0.56641c-0.08943 0.31553-0.24744 0.61463-0.49219 0.85938l-1.401 1.4004v5.1738h-5.1719l-2 2h1.1719v1h-2v2h6v-2h-2v-1h5c0.554 0 1-0.446 1-1v-8c0-0.1573-0.043-0.3014-0.107-0.4336z" fill-rule="evenodd" filter="url(#a)"/>
- <path d="m12.986 1.0117v0.00195c-0.255 0-0.51103 0.095216-0.70703 0.29102l-9.986 9.9844c-0.3918 0.392-0.3918 1.024 0 1.416 0.3917 0.392 1.0242 0.392 1.416 0l9.984-9.9862c0.392-0.392 0.392-1.0223 0-1.4141-0.196-0.1958-0.45103-0.29297-0.70703-0.29297zm-10.986 0.9883c-0.554 0-1 0.446-1 1v8c0 0.15223 0.03927 0.29296 0.09961 0.42188 0.09087-0.30747 0.24693-0.59837 0.48633-0.83789v-0.002l1.4141-1.414v-5.168h5.1699l2-2h-8.17zm12.893 0.56641c-0.08943 0.31553-0.24744 0.61463-0.49219 0.85938l-1.401 1.4004v5.1738h-5.1719l-2 2h1.1719v1h-2v2h6v-2h-2v-1h5c0.554 0 1-0.446 1-1v-8c0-0.1573-0.043-0.3014-0.107-0.4336z" fill-rule="evenodd" fill="#fff"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"><defs><filter id="a" height="21"><feGaussianBlur stdDeviation="1" in="SourceAlpha"/><feComponentTransfer><feFuncA slope="0.5" type="linear"/></feComponentTransfer><feMerge><feMergeNode/><feMergeNode in="SourceGraphic"/></feMerge></filter></defs><path filter="url(#a)" fill="#fff" d="m12.986 1.0117v0.00195c-0.255 0-0.51103 0.095216-0.70703 0.29102l-9.986 9.9844c-0.3918 0.392-0.3918 1.024 0 1.416 0.3917 0.392 1.0242 0.392 1.416 0l9.984-9.9862c0.392-0.392 0.392-1.0223 0-1.4141-0.196-0.1958-0.45103-0.29297-0.70703-0.29297zm-10.986 0.9883c-0.554 0-1 0.446-1 1v8c0 0.15223 0.03927 0.29296 0.09961 0.42188 0.09087-0.30747 0.24693-0.59837 0.48633-0.83789v-0.002l1.4141-1.414v-5.168h5.1699l2-2h-8.17zm12.893 0.56641c-0.08943 0.31553-0.24744 0.61463-0.49219 0.85938l-1.401 1.4004v5.1738h-5.1719l-2 2h1.1719v1h-2v2h6v-2h-2v-1h5c0.554 0 1-0.446 1-1v-8c0-0.1573-0.043-0.3014-0.107-0.4336z"/></svg>
diff --git a/core/img/actions/screen-off.svg b/core/img/actions/screen-off.svg
index 54b4218ba2c..68423d33f82 100644
--- a/core/img/actions/screen-off.svg
+++ b/core/img/actions/screen-off.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16">
- <path fill-rule="evenodd" d="m12.986 1.0117v0.002c-0.255 0-0.511 0.0952-0.707 0.291l-9.986 9.9843c-0.3918 0.392-0.3918 1.024 0 1.416 0.3917 0.392 1.0242 0.392 1.416 0l9.984-9.9862c0.392-0.392 0.392-1.0223 0-1.4141-0.196-0.1958-0.451-0.293-0.707-0.293zm-10.986 0.9883c-0.554 0-1 0.446-1 1v8c0 0.152 0.0393 0.293 0.0996 0.422 0.0909-0.308 0.2469-0.598 0.4863-0.838v-0.002l1.4141-1.414v-5.168h5.1699l2.0001-2h-8.17zm12.893 0.5664c-0.09 0.3155-0.248 0.6146-0.493 0.8594l-1.4 1.4004v5.1738h-5.1719l-2 2h1.1719v1h-2v2h6v-2h-2v-1h5c0.554 0 1-0.446 1-1v-8c0-0.1573-0.043-0.3014-0.107-0.4336z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"><path d="m12.986 1.0117v0.002c-0.255 0-0.511 0.0952-0.707 0.291l-9.986 9.9843c-0.3918 0.392-0.3918 1.024 0 1.416 0.3917 0.392 1.0242 0.392 1.416 0l9.984-9.9862c0.392-0.392 0.392-1.0223 0-1.4141-0.196-0.1958-0.451-0.293-0.707-0.293zm-10.986 0.9883c-0.554 0-1 0.446-1 1v8c0 0.152 0.0393 0.293 0.0996 0.422 0.0909-0.308 0.2469-0.598 0.4863-0.838v-0.002l1.4141-1.414v-5.168h5.1699l2.0001-2h-8.17zm12.893 0.5664c-0.09 0.3155-0.248 0.6146-0.493 0.8594l-1.4 1.4004v5.1738h-5.1719l-2 2h1.1719v1h-2v2h6v-2h-2v-1h5c0.554 0 1-0.446 1-1v-8c0-0.1573-0.043-0.3014-0.107-0.4336z"/></svg>
diff --git a/core/img/actions/screen-white.svg b/core/img/actions/screen-white.svg
index 20372949afb..e279dc48270 100644
--- a/core/img/actions/screen-white.svg
+++ b/core/img/actions/screen-white.svg
@@ -1,10 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16">
- <defs>
-  <filter id="a" style="color-interpolation-filters:sRGB" height="1.3738" width="1.3471" y="-.18692" x="-.17357">
-   <feGaussianBlur stdDeviation="1.0125"/>
-  </filter>
- </defs>
- <path opacity=".5" d="m2 2c-0.554 0-1 0.446-1 1v8c0 0.554 0.446 1 1 1h5v1h-2v2h6v-2h-2v-1h5c0.554 0 1-0.446 1-1v-8c0-0.554-0.446-1-1-1zm1 2h10v6h-10z" fill-rule="evenodd" filter="url(#a)"/>
- <path d="m2 2c-0.554 0-1 0.446-1 1v8c0 0.554 0.446 1 1 1h5v1h-2v2h6v-2h-2v-1h5c0.554 0 1-0.446 1-1v-8c0-0.554-0.446-1-1-1zm1 2h10v6h-10z" fill-rule="evenodd" fill="#fff"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"><defs><filter id="a" height="21"><feGaussianBlur stdDeviation="1" in="SourceAlpha"/><feComponentTransfer><feFuncA slope="0.5" type="linear"/></feComponentTransfer><feMerge><feMergeNode/><feMergeNode in="SourceGraphic"/></feMerge></filter></defs><path filter="url(#a)" fill="#fff" d="m2 2c-0.554 0-1 0.446-1 1v8c0 0.554 0.446 1 1 1h5v1h-2v2h6v-2h-2v-1h5c0.554 0 1-0.446 1-1v-8c0-0.554-0.446-1-1-1zm1 2h10v6h-10z"/></svg>
diff --git a/core/img/actions/screen.svg b/core/img/actions/screen.svg
index b4005ca5d14..6f1301a7797 100644
--- a/core/img/actions/screen.svg
+++ b/core/img/actions/screen.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16">
- <path fill-rule="evenodd" d="m2 2c-0.554 0-1 0.446-1 1v8c0 0.554 0.446 1 1 1h5v1h-2v2h6v-2h-2v-1h5c0.554 0 1-0.446 1-1v-8c0-0.554-0.446-1-1-1zm1 2h10v6h-10z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"><path d="m2 2c-0.554 0-1 0.446-1 1v8c0 0.554 0.446 1 1 1h5v1h-2v2h6v-2h-2v-1h5c0.554 0 1-0.446 1-1v-8c0-0.554-0.446-1-1-1zm1 2h10v6h-10z"/></svg>
diff --git a/core/img/actions/search-white.svg b/core/img/actions/search-white.svg
index ca9121881f3..73aa5d3fa2f 100644
--- a/core/img/actions/search-white.svg
+++ b/core/img/actions/search-white.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1"><path color="#000" fill="none" d="M-62.897-32.993h163.31v97.986h-163.31z"/><path d="M6 1a5 5 0 0 0 0 10 4.91 4.91 0 0 0 2.656-.78l4.47 4.624A.463.463 0 0 0 13.5 15a.59.59 0 0 0 .406-.188l.938-1.062c.192-.22.195-.536 0-.72L10.25 8.626C10.728 7.86 11 6.97 11 6a5 5 0 0 0-5-5zm0 2a3 3 0 1 1 0 6 3 3 0 0 1 0-6z" fill="#fff" color="#000"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16" height="16" width="16"><g stroke="#fff" stroke-width="2" fill="none"><ellipse rx="4" ry="4" cy="6" cx="6"/><path d="m14.3 14.25-5.65-5.65"/></g></svg>
diff --git a/core/img/actions/search.svg b/core/img/actions/search.svg
index 2dbb3fa8943..2645523663e 100644
--- a/core/img/actions/search.svg
+++ b/core/img/actions/search.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1"><path color="#000" fill="none" d="M-62.897-32.993h163.31v97.986h-163.31z"/><path opacity=".5" d="M6 1a5 5 0 0 0 0 10 4.91 4.91 0 0 0 2.656-.78l4.47 4.624A.463.463 0 0 0 13.5 15a.59.59 0 0 0 .406-.188l.938-1.062c.192-.22.195-.536 0-.72L10.25 8.626C10.728 7.86 11 6.97 11 6a5 5 0 0 0-5-5zm0 2a3 3 0 1 1 0 6 3 3 0 0 1 0-6z" color="#000"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16" height="16" width="16"><g stroke="#000" stroke-width="2" fill="none"><ellipse rx="4" ry="4" cy="6" cx="6"/><path d="m14.3 14.25-5.65-5.65"/></g></svg>
diff --git a/core/img/actions/settings-dark.svg b/core/img/actions/settings-dark.svg
index 2160b673e30..eab6923b40f 100644
--- a/core/img/actions/settings-dark.svg
+++ b/core/img/actions/settings-dark.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1"><path d="M6.938 0A.43.43 0 0 0 6.5.438v1.25a5.818 5.818 0 0 0-1.53.656l-.907-.906a.436.436 0 0 0-.625 0l-1.5 1.5a.436.436 0 0 0 0 .624l.906.907c-.285.48-.514.976-.656 1.53H.938a.43.43 0 0 0-.438.438v2.125C.5 8.81.69 9 .938 9h1.25a5.82 5.82 0 0 0 .656 1.53l-.907.908a.436.436 0 0 0 0 .625l1.5 1.5c.176.176.45.176.625 0l.907-.907c.48.285.976.514 1.53.656v1.25c0 .25.19.438.437.438h2.125a.43.43 0 0 0 .438-.438v-1.25a5.82 5.82 0 0 0 1.53-.657l.907.907c.176.175.45.175.625 0l1.5-1.5a.436.436 0 0 0 0-.625l-.906-.906A5.79 5.79 0 0 0 13.812 9h1.25a.43.43 0 0 0 .438-.438V6.437A.43.43 0 0 0 15.062 6h-1.25a5.79 5.79 0 0 0-.656-1.532l.906-.906a.436.436 0 0 0 0-.625l-1.5-1.5a.436.436 0 0 0-.625 0l-.906.906a5.816 5.816 0 0 0-1.53-.656V.437A.43.43 0 0 0 9.063 0zM8 4.157a3.344 3.344 0 0 1 0 6.686 3.344 3.344 0 0 1 0-6.686z" display="block"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="16" width="16" viewBox="0 0 16 16"><path d="m6.938 0.5a0.43 0.43 0 0 0 -0.438 0.438v1.25a5.818 5.818 0 0 0 -1.53 0.656l-0.907-0.906a0.436 0.436 0 0 0 -0.625 0l-1.5 1.5a0.436 0.436 0 0 0 0 0.624l0.906 0.907c-0.285 0.48-0.514 0.976-0.656 1.53h-1.25a0.43 0.43 0 0 0 -0.438 0.438v2.125c0 0.248 0.19 0.438 0.438 0.438h1.25a5.82 5.82 0 0 0 0.656 1.53l-0.907 0.908a0.436 0.436 0 0 0 0 0.625l1.5 1.5c0.176 0.176 0.45 0.176 0.625 0l0.907-0.907c0.48 0.285 0.976 0.514 1.53 0.656v1.25c0 0.25 0.19 0.438 0.437 0.438h2.125a0.43 0.43 0 0 0 0.438 -0.438v-1.25a5.82 5.82 0 0 0 1.53 -0.657l0.907 0.907c0.176 0.175 0.45 0.175 0.625 0l1.5-1.5a0.436 0.436 0 0 0 0 -0.625l-0.906-0.906a5.79 5.79 0 0 0 0.657 -1.531h1.25a0.43 0.43 0 0 0 0.438 -0.438v-2.125a0.43 0.43 0 0 0 -0.438 -0.437h-1.25a5.79 5.79 0 0 0 -0.656 -1.532l0.906-0.906a0.436 0.436 0 0 0 0 -0.625l-1.5-1.5a0.436 0.436 0 0 0 -0.625 0l-0.906 0.906a5.816 5.816 0 0 0 -1.53 -0.656v-1.25a0.43 0.43 0 0 0 -0.438 -0.437zm1.062 4.157a3.344 3.344 0 0 1 0 6.6861 3.344 3.344 0 0 1 0 -6.6861z"/></svg>
diff --git a/core/img/actions/settings-white.svg b/core/img/actions/settings-white.svg
index 2371d204964..81f6ada1e44 100644
--- a/core/img/actions/settings-white.svg
+++ b/core/img/actions/settings-white.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1"><path d="M6.938 0A.43.43 0 0 0 6.5.438v1.25a5.818 5.818 0 0 0-1.53.656l-.907-.906a.436.436 0 0 0-.625 0l-1.5 1.5a.436.436 0 0 0 0 .624l.906.907c-.285.48-.514.976-.656 1.53H.938a.43.43 0 0 0-.438.438v2.125C.5 8.81.69 9 .938 9h1.25a5.82 5.82 0 0 0 .656 1.53l-.907.908a.436.436 0 0 0 0 .625l1.5 1.5c.176.176.45.176.625 0l.907-.907c.48.285.976.514 1.53.656v1.25c0 .25.19.438.437.438h2.125a.43.43 0 0 0 .438-.438v-1.25a5.82 5.82 0 0 0 1.53-.657l.907.907c.176.175.45.175.625 0l1.5-1.5a.436.436 0 0 0 0-.625l-.906-.906A5.79 5.79 0 0 0 13.812 9h1.25a.43.43 0 0 0 .438-.438V6.437A.43.43 0 0 0 15.062 6h-1.25a5.79 5.79 0 0 0-.656-1.532l.906-.906a.436.436 0 0 0 0-.625l-1.5-1.5a.436.436 0 0 0-.625 0l-.906.906a5.816 5.816 0 0 0-1.53-.656V.437A.43.43 0 0 0 9.063 0zM8 4.157a3.344 3.344 0 0 1 0 6.686 3.344 3.344 0 0 1 0-6.686z" display="block" fill="#fff"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="16" width="16" viewBox="0 0 16 16"><path fill="#fff" d="m6.938 0.5a0.43 0.43 0 0 0 -0.438 0.438v1.25a5.818 5.818 0 0 0 -1.53 0.656l-0.907-0.906a0.436 0.436 0 0 0 -0.625 0l-1.5 1.5a0.436 0.436 0 0 0 0 0.624l0.906 0.907c-0.285 0.48-0.514 0.976-0.656 1.53h-1.25a0.43 0.43 0 0 0 -0.438 0.438v2.125c0 0.248 0.19 0.438 0.438 0.438h1.25a5.82 5.82 0 0 0 0.656 1.53l-0.907 0.908a0.436 0.436 0 0 0 0 0.625l1.5 1.5c0.176 0.176 0.45 0.176 0.625 0l0.907-0.907c0.48 0.285 0.976 0.514 1.53 0.656v1.25c0 0.25 0.19 0.438 0.437 0.438h2.125a0.43 0.43 0 0 0 0.438 -0.438v-1.25a5.82 5.82 0 0 0 1.53 -0.657l0.907 0.907c0.176 0.175 0.45 0.175 0.625 0l1.5-1.5a0.436 0.436 0 0 0 0 -0.625l-0.906-0.906a5.79 5.79 0 0 0 0.657 -1.531h1.25a0.43 0.43 0 0 0 0.438 -0.438v-2.125a0.43 0.43 0 0 0 -0.438 -0.437h-1.25a5.79 5.79 0 0 0 -0.656 -1.532l0.906-0.906a0.436 0.436 0 0 0 0 -0.625l-1.5-1.5a0.436 0.436 0 0 0 -0.625 0l-0.906 0.906a5.816 5.816 0 0 0 -1.53 -0.656v-1.25a0.43 0.43 0 0 0 -0.438 -0.437zm1.062 4.157a3.344 3.344 0 0 1 0 6.6861 3.344 3.344 0 0 1 0 -6.6861z"/></svg>
diff --git a/core/img/actions/settings.svg b/core/img/actions/settings.svg
index 52a11d4ded7..898e3d22328 100644
--- a/core/img/actions/settings.svg
+++ b/core/img/actions/settings.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1"><path d="M6.938 0A.43.43 0 0 0 6.5.438v1.25a5.818 5.818 0 0 0-1.53.656l-.907-.906a.436.436 0 0 0-.625 0l-1.5 1.5a.436.436 0 0 0 0 .624l.906.907c-.285.48-.514.976-.656 1.53H.938a.43.43 0 0 0-.438.438v2.125C.5 8.81.69 9 .938 9h1.25a5.82 5.82 0 0 0 .656 1.53l-.907.908a.436.436 0 0 0 0 .625l1.5 1.5c.176.176.45.176.625 0l.907-.907c.48.285.976.514 1.53.656v1.25c0 .25.19.438.437.438h2.125a.43.43 0 0 0 .438-.438v-1.25a5.82 5.82 0 0 0 1.53-.657l.907.907c.176.175.45.175.625 0l1.5-1.5a.436.436 0 0 0 0-.625l-.906-.906A5.79 5.79 0 0 0 13.812 9h1.25a.43.43 0 0 0 .438-.438V6.437A.43.43 0 0 0 15.062 6h-1.25a5.79 5.79 0 0 0-.656-1.532l.906-.906a.436.436 0 0 0 0-.625l-1.5-1.5a.436.436 0 0 0-.625 0l-.906.906a5.816 5.816 0 0 0-1.53-.656V.437A.43.43 0 0 0 9.063 0zM8 4.157a3.344 3.344 0 0 1 0 6.686 3.344 3.344 0 0 1 0-6.686z" display="block" opacity=".5"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="16" width="16" viewBox="0 0 16 16"><path opacity=".5" d="m6.938 0.5a0.43 0.43 0 0 0 -0.438 0.438v1.25a5.818 5.818 0 0 0 -1.53 0.656l-0.907-0.906a0.436 0.436 0 0 0 -0.625 0l-1.5 1.5a0.436 0.436 0 0 0 0 0.624l0.906 0.907c-0.285 0.48-0.514 0.976-0.656 1.53h-1.25a0.43 0.43 0 0 0 -0.438 0.438v2.125c0 0.248 0.19 0.438 0.438 0.438h1.25a5.82 5.82 0 0 0 0.656 1.53l-0.907 0.908a0.436 0.436 0 0 0 0 0.625l1.5 1.5c0.176 0.176 0.45 0.176 0.625 0l0.907-0.907c0.48 0.285 0.976 0.514 1.53 0.656v1.25c0 0.25 0.19 0.438 0.437 0.438h2.125a0.43 0.43 0 0 0 0.438 -0.438v-1.25a5.82 5.82 0 0 0 1.53 -0.657l0.907 0.907c0.176 0.175 0.45 0.175 0.625 0l1.5-1.5a0.436 0.436 0 0 0 0 -0.625l-0.906-0.906a5.79 5.79 0 0 0 0.657 -1.531h1.25a0.43 0.43 0 0 0 0.438 -0.438v-2.125a0.43 0.43 0 0 0 -0.438 -0.437h-1.25a5.79 5.79 0 0 0 -0.656 -1.532l0.906-0.906a0.436 0.436 0 0 0 0 -0.625l-1.5-1.5a0.436 0.436 0 0 0 -0.625 0l-0.906 0.906a5.816 5.816 0 0 0 -1.53 -0.656v-1.25a0.43 0.43 0 0 0 -0.438 -0.437zm1.062 4.157a3.344 3.344 0 0 1 0 6.6861 3.344 3.344 0 0 1 0 -6.6861z"/></svg>
diff --git a/core/img/actions/share.png b/core/img/actions/share.png
index 8cc66f08f5d..5c088bb0823 100644
--- a/core/img/actions/share.png
+++ b/core/img/actions/share.png
diff --git a/core/img/actions/share.svg b/core/img/actions/share.svg
index c0ad9522369..014392d5a57 100644
--- a/core/img/actions/share.svg
+++ b/core/img/actions/share.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M12.228 1a2.457 2.457 0 0 0-2.46 2.454c0 .075.01.15.016.224L5.05 6.092a2.445 2.445 0 0 0-1.596-.586A2.453 2.453 0 0 0 1 7.96a2.453 2.453 0 0 0 2.454 2.455 2.45 2.45 0 0 0 1.46-.477l4.865 2.474c-.004.044-.01.09-.01.134a2.457 2.457 0 1 0 .804-1.818l-4.696-2.4c.02-.123.035-.25.035-.378 0-.072-.01-.144-.015-.214l4.74-2.414A2.457 2.457 0 1 0 12.228.99z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"><circle cx="3.5" cy="8" r="2.5"/><circle cy="12.5" cx="12.5" r="2.5"/><circle cx="12.5" cy="3.5" r="2.5"/><path d="m3.5 8 9 4.5m-9-4.5 9-4.5" stroke="#000" stroke-width="2" fill="none"/></svg>
diff --git a/core/img/actions/shared.svg b/core/img/actions/shared.svg
index c0ad9522369..014392d5a57 100644
--- a/core/img/actions/shared.svg
+++ b/core/img/actions/shared.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M12.228 1a2.457 2.457 0 0 0-2.46 2.454c0 .075.01.15.016.224L5.05 6.092a2.445 2.445 0 0 0-1.596-.586A2.453 2.453 0 0 0 1 7.96a2.453 2.453 0 0 0 2.454 2.455 2.45 2.45 0 0 0 1.46-.477l4.865 2.474c-.004.044-.01.09-.01.134a2.457 2.457 0 1 0 .804-1.818l-4.696-2.4c.02-.123.035-.25.035-.378 0-.072-.01-.144-.015-.214l4.74-2.414A2.457 2.457 0 1 0 12.228.99z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"><circle cx="3.5" cy="8" r="2.5"/><circle cy="12.5" cx="12.5" r="2.5"/><circle cx="12.5" cy="3.5" r="2.5"/><path d="m3.5 8 9 4.5m-9-4.5 9-4.5" stroke="#000" stroke-width="2" fill="none"/></svg>
diff --git a/core/img/actions/sound-off.svg b/core/img/actions/sound-off.svg
index 030a61e6571..4c464085ecd 100644
--- a/core/img/actions/sound-off.svg
+++ b/core/img/actions/sound-off.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M1 6v4h3l3 3h1V3H7L4 6z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M1 6v4h3l3 3h1V3H7L4 6z"/></svg>
diff --git a/core/img/actions/sound.svg b/core/img/actions/sound.svg
index e5624308f11..7c0f981fd50 100644
--- a/core/img/actions/sound.svg
+++ b/core/img/actions/sound.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M1 6v4h3l3 3h1V3H7L4 6zM13.25 3l-.78.625C13.433 4.825 14 6.34 14 8s-.566 3.175-1.53 4.375l.78.625C14.348 11.63 15 9.892 15 8s-.652-3.63-1.75-5zm-1.563 1.25l-.812.656C11.563 5.763 12 6.816 12 8s-.437 2.237-1.125 3.094l.813.656C12.51 10.723 13 9.42 13 8s-.49-2.723-1.313-3.75zM10.126 5.5l-.78.625C9.754 6.638 10 7.29 10 8s-.245 1.36-.656 1.875l.78.625a4.008 4.008 0 0 0 0-5z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M1 6v4h3l3 3h1V3H7L4 6zM13.25 3l-.78.625C13.433 4.825 14 6.34 14 8s-.566 3.175-1.53 4.375l.78.625C14.348 11.63 15 9.892 15 8s-.652-3.63-1.75-5zm-1.563 1.25l-.812.656C11.563 5.763 12 6.816 12 8s-.437 2.237-1.125 3.094l.813.656C12.51 10.723 13 9.42 13 8s-.49-2.723-1.313-3.75zM10.126 5.5l-.78.625C9.754 6.638 10 7.29 10 8s-.245 1.36-.656 1.875l.78.625a4.008 4.008 0 0 0 0-5z"/></svg>
diff --git a/core/img/actions/star-dark.svg b/core/img/actions/star-dark.svg
index 6edb7ea5000..16a7ac53ba7 100644
--- a/core/img/actions/star-dark.svg
+++ b/core/img/actions/star-dark.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="22" width="22"><path d="M11.017.06l2.946 7.384L22 8.077l-6.11 5.082L17.77 21l-6.72-4.242-6.876 4.213 1.957-7.703L0 8.03l7.932-.52z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16" width="16" height="16"><path d="m8 0.5 2.2 5.3 5.8 0.45-4.5 3.75 1.5 5.5-5-3.1-5 3.1 1.5-5.5-4.5-3.75 5.8-0.45z"/></svg>
diff --git a/core/img/actions/star.png b/core/img/actions/star.png
index 61727fc3f19..7d83aa5d91c 100644
--- a/core/img/actions/star.png
+++ b/core/img/actions/star.png
diff --git a/core/img/actions/star.svg b/core/img/actions/star.svg
index 32d8dd4717b..d9c306e78ff 100644
--- a/core/img/actions/star.svg
+++ b/core/img/actions/star.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="22" width="22"><path d="M11.017.06l2.946 7.384L22 8.077l-6.11 5.082L17.77 21l-6.72-4.242-6.876 4.213 1.957-7.703L0 8.03l7.932-.52z" opacity=".5"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16" width="16" height="16"><path opacity=".5" d="m8 0.5 2.2 5.3 5.8 0.45-4.5 3.75 1.5 5.5-5-3.1-5 3.1 1.5-5.5-4.5-3.75 5.8-0.45z"/></svg>
diff --git a/core/img/actions/starred.png b/core/img/actions/starred.png
index aa5bced7751..66eb8a43240 100644
--- a/core/img/actions/starred.png
+++ b/core/img/actions/starred.png
diff --git a/core/img/actions/starred.svg b/core/img/actions/starred.svg
index a993aff42a8..5635ea94e85 100644
--- a/core/img/actions/starred.svg
+++ b/core/img/actions/starred.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="22" width="22"><path fill="#FC0" d="M11.017.06l2.946 7.384L22 8.077l-6.11 5.082L17.77 21l-6.72-4.242-6.876 4.213 1.957-7.703L0 8.03l7.932-.52z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16" width="16" height="16"><path fill="#FC0" d="m8 0.5 2.2 5.3 5.8 0.45-4.5 3.75 1.5 5.5-5-3.1-5 3.1 1.5-5.5-4.5-3.75 5.8-0.45z"/></svg>
diff --git a/core/img/actions/tag.png b/core/img/actions/tag.png
index 6a466b367b3..981e043eb60 100644
--- a/core/img/actions/tag.png
+++ b/core/img/actions/tag.png
diff --git a/core/img/actions/tag.svg b/core/img/actions/tag.svg
index 464ab936a74..a13909ed9b5 100644
--- a/core/img/actions/tag.svg
+++ b/core/img/actions/tag.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1" viewBox="0 0 16 16"><path color="#000" fill="none" d="M-62.897-32.993h163.31v97.986h-163.31z"/><path d="M6.186.96L1.38.975c-.273 0-.347.21-.348.346l-.015 4.802 8.723 8.722a.498.498 0 0 0 .71 0l4.456-4.457a.5.5 0 0 0 .002-.71v.01L6.54 1.318 6.186.964zM4.02 2.814a1.144 1.144 0 0 1 1.143 1.144A1.144 1.144 0 0 1 4.02 5.1a1.144 1.144 0 0 1-1.145-1.143A1.144 1.144 0 0 1 4.02 2.813z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="m1 1.5v4.5l8.85 8.888c0.1606 0.1613 0.43 0.1463 0.6044-0.0281l4.405-4.405c0.1744-0.1744 0.189-0.4434 0.028-0.6044l-8.888-8.85h-4.5c-0.28-0-0.5 0.2201-0.5 0.5zm2.3 1.8c0.5-0.5 1.3-0.5 1.8 0s0.5 1.3 0 1.8-1.3 0.5-1.8 0-0.5-1.3 0-1.8z"/></svg>
diff --git a/core/img/actions/toggle-filelist.svg b/core/img/actions/toggle-filelist.svg
index 10bc79fa063..575d5bb3e06 100644
--- a/core/img/actions/toggle-filelist.svg
+++ b/core/img/actions/toggle-filelist.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1"><rect rx=".5" ry=".5" height="4" width="4" y="1" x="1"/><rect rx=".5" ry=".5" height="1" width="9" y="2" x="6"/><rect rx=".5" ry=".5" height="4" width="4" y="6" x="1"/><rect rx=".5" ry=".5" height="1" width="9" y="7" x="6"/><rect rx=".5" ry=".5" height="4" width="4" y="11" x="1"/><rect rx=".5" ry=".5" height="1" width="9" y="12" x="6"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><rect rx=".5" ry=".5" height="4" width="4" y="1" x="1"/><rect rx=".5" ry=".5" height="1" width="9" y="2" x="6"/><rect rx=".5" ry=".5" height="4" width="4" y="6" x="1"/><rect rx=".5" ry=".5" height="1" width="9" y="7" x="6"/><rect rx=".5" ry=".5" height="4" width="4" y="11" x="1"/><rect rx=".5" ry=".5" height="1" width="9" y="12" x="6"/></svg>
diff --git a/core/img/actions/toggle-pictures.svg b/core/img/actions/toggle-pictures.svg
index 270cf4b2d3b..a43cc60ceab 100644
--- a/core/img/actions/toggle-pictures.svg
+++ b/core/img/actions/toggle-pictures.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1"><rect rx=".5" ry=".5" height="6" width="6" y="1" x="1"/><rect rx=".5" ry=".5" height="6" width="6" y="1" x="9"/><rect rx=".5" ry=".5" height="6" width="6" y="9" x="9"/><rect rx=".5" ry=".5" height="6" width="6" y="9" x="1"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><rect rx=".5" ry=".5" height="6" width="6" y="1" x="1"/><rect rx=".5" ry=".5" height="6" width="6" y="1" x="9"/><rect rx=".5" ry=".5" height="6" width="6" y="9" x="9"/><rect rx=".5" ry=".5" height="6" width="6" y="9" x="1"/></svg>
diff --git a/core/img/actions/toggle.svg b/core/img/actions/toggle.svg
index 1f3de01ff34..847759d4e04 100644
--- a/core/img/actions/toggle.svg
+++ b/core/img/actions/toggle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 0 16 16" width="16" overflow="visible"><path d="M8 3C4.89 3 2.073 4.72 0 7.5 2.073 10.28 4.89 12 8 12c3.11 0 5.927-1.72 8-4.5C13.927 4.72 11.11 3 8 3zm0 1.5a3 3 0 1 1 0 6 3 3 0 0 1 0-6zM8 6a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3z" fill="#222"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path opacity="0.5" d="M8 3C4.89 3 2.073 4.72 0 7.5 2.073 10.28 4.89 12 8 12c3.11 0 5.927-1.72 8-4.5C13.927 4.72 11.11 3 8 3zm0 1.5a3 3 0 1 1 0 6 3 3 0 0 1 0-6zM8 6a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3z"/></svg>
diff --git a/core/img/actions/triangle-e.svg b/core/img/actions/triangle-e.svg
index a5413943eeb..c17cd0480b8 100644
--- a/core/img/actions/triangle-e.svg
+++ b/core/img/actions/triangle-e.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path style="block-progression:tb;text-transform:none;text-indent:0" d="M6 12l4-4-3.994-4z" color="#000"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M6 12l4-4-3.994-4z"/></svg>
diff --git a/core/img/actions/triangle-n.svg b/core/img/actions/triangle-n.svg
index 4a7f92209f1..eae6e466b57 100644
--- a/core/img/actions/triangle-n.svg
+++ b/core/img/actions/triangle-n.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path style="block-progression:tb;text-transform:none;text-indent:0" d="M12 10L8 6 4 9.994z" color="#000"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M12 10L8 6 4 9.994z"/></svg>
diff --git a/core/img/actions/triangle-s.svg b/core/img/actions/triangle-s.svg
index 0de5901af9a..b1dff4ff21f 100644
--- a/core/img/actions/triangle-s.svg
+++ b/core/img/actions/triangle-s.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path style="block-progression:tb;text-transform:none;text-indent:0" d="M4 6l4 4 4-3.994z" color="#000"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M4 6l4 4 4-3.994z"/></svg>
diff --git a/core/img/actions/upload-white.svg b/core/img/actions/upload-white.svg
index 56350e598a1..3bd04bb8de6 100644
--- a/core/img/actions/upload-white.svg
+++ b/core/img/actions/upload-white.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path fill="#fff" d="M8 1L2 7h4v4h4V7h4zM2 13v2h12v-2z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path fill="#fff" d="M8 1L2 7h4v4h4V7h4zM2 13v2h12v-2z"/></svg>
diff --git a/core/img/actions/upload.svg b/core/img/actions/upload.svg
index eecbd0fe902..92ca79205de 100644
--- a/core/img/actions/upload.svg
+++ b/core/img/actions/upload.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M8 1L2 7h4v4h4V7h4zM2 13v2h12v-2z"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M8 1L2 7h4v4h4V7h4zM2 13v2h12v-2z"/></svg>
diff --git a/core/img/actions/user.svg b/core/img/actions/user.svg
index 4f83dbb7138..d561a994039 100644
--- a/core/img/actions/user.svg
+++ b/core/img/actions/user.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1"><path color="#000" fill="none" d="M-62.897-32.993h163.31v97.986h-163.31z"/><path style="block-progression:tb;text-transform:none;text-indent:0" d="M8.404 1c-1.732 0-3.2 1.266-3.2 2.9.012.516.058 1.153.366 2.5v.033l.034.034c.1.283.243.445.433.666s.417.482.633.7l.067.067c.043.186.095.387.133.567.103.478.093.817.067.933-.744.26-1.67.572-2.5.933-.466.203-.888.384-1.233.6-.345.217-.688.38-.8.867-.16.633-.2.754-.4 1.533-.027.21.083.43.267.534C3.78 14.68 6.096 15.01 8.405 15s4.606-.356 6.066-1.133c.117-.074.143-.11.133-.234-.043-.69-.08-1.367-.133-1.766a.537.537 0 0 0-.133-.267c-.464-.554-1.157-.892-1.967-1.233-.74-.312-1.607-.635-2.466-1-.05-.107-.096-.42 0-.9.025-.13.066-.268.1-.4.08-.09.143-.165.233-.267.19-.218.396-.447.566-.667s.31-.408.4-.666l.034-.034c.348-1.406.348-1.992.366-2.5V3.9c0-1.634-1.468-2.9-3.2-2.9z" color="#000"/></svg>
-\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="m8 1c-1.5904 0-3 1.2822-3 2.9 0 1.3943 0.082446 2.1318 0.77973 3.2324 0.22302 0.28625 0.43972 0.51842 0.65526 0.76757 0.040265 0.186 0.08888 0.3864 0.12446 0.5664 0.096449 0.478 0.08879 0.81759 0.064444 0.93359-0.69668 0.26-1.5642 0.57064-2.3414 0.93164-0.43636 0.203-0.83189 0.38556-1.155 0.60156-0.32306 0.217-0.64374 0.38018-0.74861 0.86718-0.14982 0.633-0.18794 0.75225-0.37522 1.5312-0.025283 0.21 0.07846 0.43116 0.25076 0.53516 1.4026 0.807 3.5994 1.138 5.7456 1.133 2.116-0.0045 4.3624-0.33713 5.7453-1.1328 0.17229-0.104 0.27604-0.32516 0.25076-0.53516-0.187-0.779-0.225-0.898-0.375-1.531-0.105-0.487-0.426-0.65-0.749-0.867-0.323-0.216-0.718-0.399-1.155-0.602-0.777-0.3609-1.644-0.6716-2.3407-0.9316-0.0243-0.116-0.0324-0.4556 0.0641-0.9336 0.0355-0.18 0.0842-0.3804 0.1244-0.5664 0.2349-0.2491 0.4572-0.5303 0.6552-0.7675 0.69-0.8845 0.78-2.1571 0.78-3.2325 0-1.5874-1.4316-2.9-3-2.9z"/></svg>
diff --git a/core/img/actions/verified.svg b/core/img/actions/verified.svg
index 2f9e34e2394..6c336022f43 100644
--- a/core/img/actions/verified.svg
+++ b/core/img/actions/verified.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1">
- <path d="m8 0a3 3 0 0 0 -2.8281 2.0098 3 3 0 0 0 -0.1719 -0.0098 3 3 0 0 0 -3 3 3 3 0 0 0 0.0059 0.1719 3 3 0 0 0 -2.0059 2.8281 3 3 0 0 0 2.0098 2.828 3 3 0 0 0 -0.0098 0.172 3 3 0 0 0 3 3 3 3 0 0 0 0.1719 -0.006 3 3 0 0 0 2.8281 2.006 3 3 0 0 0 2.828 -2.01 3 3 0 0 0 0.172 0.01 3 3 0 0 0 3 -3 3 3 0 0 0 -0.006 -0.172 3 3 0 0 0 2.006 -2.828 3 3 0 0 0 -2.01 -2.8281 3 3 0 0 0 0.01 -0.1719 3 3 0 0 0 -3 -3 3 3 0 0 0 -0.172 0.0059 3 3 0 0 0 -2.828 -2.0059zm2.934 4.5625 1.433 1.4336-5.7772 5.7789-2.9511-2.9508 1.414-1.414 1.5371 1.5351 4.3442-4.3828z" fill-rule="evenodd" fill="#0082c9"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="m8 0a3 3 0 0 0 -2.828 2 3 3 0 0 0 -0.172 -0 3 3 0 0 0 -3 3 3 3 0 0 0 0 0.172 3 3 0 0 0 -2 2.828 3 3 0 0 0 2 2.828 3 3 0 0 0 -0 0.172 3 3 0 0 0 3 3 3 3 0 0 0 0.172 -0 3 3 0 0 0 2.828 2 3 3 0 0 0 2.828 -2.01 3 3 0 0 0 0.172 0.01 3 3 0 0 0 3 -3 3 3 0 0 0 -0 -0.172 3 3 0 0 0 2 -2.828 3 3 0 0 0 -2.01 -2.828 3 3 0 0 0 0.01 -0.172 3 3 0 0 0 -3 -3 3 3 0 0 0 -0.172 0 3 3 0 0 0 -2.828 -2zm2.934 4.5625 1.433 1.4336-5.7772 5.7789-2.9511-2.9508 1.414-1.414 1.5371 1.5351 4.3442-4.3828z" fill="#0082c9"/></svg>
diff --git a/core/img/actions/verify.svg b/core/img/actions/verify.svg
index 5ad11481055..7f7168c3c8b 100644
--- a/core/img/actions/verify.svg
+++ b/core/img/actions/verify.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1">
- <path d="m8 0a3 3 0 0 0 -2.8281 2.0098 3 3 0 0 0 -0.1719 -0.0098 3 3 0 0 0 -3 3 3 3 0 0 0 0.0059 0.1719 3 3 0 0 0 -2.0059 2.8281 3 3 0 0 0 2.0098 2.828 3 3 0 0 0 -0.0098 0.172 3 3 0 0 0 3 3 3 3 0 0 0 0.1719 -0.006 3 3 0 0 0 2.8281 2.006 3 3 0 0 0 2.828 -2.01 3 3 0 0 0 0.172 0.01 3 3 0 0 0 3 -3 3 3 0 0 0 -0.006 -0.172 3 3 0 0 0 2.006 -2.828 3 3 0 0 0 -2.01 -2.8281 3 3 0 0 0 0.01 -0.1719 3 3 0 0 0 -3 -3 3 3 0 0 0 -0.172 0.0059 3 3 0 0 0 -2.828 -2.0059zm2.934 4.5625 1.433 1.4336-5.7772 5.7789-2.9511-2.9508 1.414-1.414 1.5371 1.5351 4.3442-4.3828z" fill-rule="evenodd" fill="#969696"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="m8 0a3 3 0 0 0 -2.828 2 3 3 0 0 0 -0.172 -0 3 3 0 0 0 -3 3 3 3 0 0 0 0 0.172 3 3 0 0 0 -2 2.828 3 3 0 0 0 2 2.828 3 3 0 0 0 -0 0.172 3 3 0 0 0 3 3 3 3 0 0 0 0.172 -0 3 3 0 0 0 2.828 2 3 3 0 0 0 2.828 -2.01 3 3 0 0 0 0.172 0.01 3 3 0 0 0 3 -3 3 3 0 0 0 -0 -0.172 3 3 0 0 0 2 -2.828 3 3 0 0 0 -2.01 -2.828 3 3 0 0 0 0.01 -0.172 3 3 0 0 0 -3 -3 3 3 0 0 0 -0.172 0 3 3 0 0 0 -2.828 -2zm2.934 4.5625 1.433 1.4336-5.7772 5.7789-2.9511-2.9508 1.414-1.414 1.5371 1.5351 4.3442-4.3828z" fill="#969696"/></svg>
diff --git a/core/img/actions/verifying.svg b/core/img/actions/verifying.svg
index beb824b7eec..3a18115d7a5 100644
--- a/core/img/actions/verifying.svg
+++ b/core/img/actions/verifying.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1">
- <path d="m8 0a3 3 0 0 0 -2.8281 2.0098 3 3 0 0 0 -0.1719 -0.0098 3 3 0 0 0 -3 3 3 3 0 0 0 0.0059 0.1719 3 3 0 0 0 -2.0059 2.8281 3 3 0 0 0 2.0098 2.828 3 3 0 0 0 -0.0098 0.172 3 3 0 0 0 3 3 3 3 0 0 0 0.1719 -0.006 3 3 0 0 0 2.8281 2.006 3 3 0 0 0 2.828 -2.01 3 3 0 0 0 0.172 0.01 3 3 0 0 0 3 -3 3 3 0 0 0 -0.006 -0.172 3 3 0 0 0 2.006 -2.828 3 3 0 0 0 -2.01 -2.8281 3 3 0 0 0 0.01 -0.1719 3 3 0 0 0 -3 -3 3 3 0 0 0 -0.172 0.0059 3 3 0 0 0 -2.828 -2.0059zm-0.0352 3.4922c0.58455-0.00435 1.1821 0.096216 1.7559 0.33398 0.69638 0.28822 1.2735 0.7423 1.7246 1.2832l1.055-1.0547v3.375h-3.375l1.125-1.125c-0.2925-0.3924-0.6924-0.7131-1.1777-0.9141-1.4351-0.5944-3.0794 0.0942-3.6739 1.5293l-1.5644-0.6504c0.7133-1.7221 2.3772-2.7643 4.1308-2.7773zm-4.4648 5.3437h3.375l-0.98438 0.98438c0.2773 0.3207 0.6189 0.5997 1.0371 0.7737 1.4351 0.594 3.0793-0.095 3.6743-1.5295l1.5625 0.65039c-0.951 2.2961-3.5905 3.3941-5.8867 2.4431-0.6318-0.261-1.1678-0.651-1.5996-1.125l-1.1777 1.178v-3.3751z" fill-rule="evenodd" fill="#0082c9"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="m8 0a3 3 0 0 0 -2.828 2 3 3 0 0 0 -0.172 -0 3 3 0 0 0 -3 3 3 3 0 0 0 0 0.172 3 3 0 0 0 -2 2.828 3 3 0 0 0 2 2.828 3 3 0 0 0 -0 0.172 3 3 0 0 0 3 3 3 3 0 0 0 0.172 -0 3 3 0 0 0 2.828 2 3 3 0 0 0 2.828 -2.01 3 3 0 0 0 0.172 0.01 3 3 0 0 0 3 -3 3 3 0 0 0 -0 -0.172 3 3 0 0 0 2 -2.828 3 3 0 0 0 -2.01 -2.828 3 3 0 0 0 0.01 -0.172 3 3 0 0 0 -3 -3 3 3 0 0 0 -0.172 0 3 3 0 0 0 -2.828 -2zm-0.0352 3.4922c0.58455-0.00435 1.1821 0.096216 1.7559 0.33398 0.69638 0.28822 1.2735 0.7423 1.7246 1.2832l1.055-1.0547v3.375h-3.375l1.125-1.125c-0.2925-0.3924-0.6924-0.7131-1.1777-0.9141-1.4351-0.5944-3.0794 0.0942-3.6739 1.5293l-1.5644-0.6504c0.7133-1.7221 2.3772-2.7643 4.1308-2.7773zm-4.4648 5.3437h3.375l-0.98438 0.98438c0.2773 0.3207 0.6189 0.5997 1.0371 0.7737 1.4351 0.594 3.0793-0.095 3.6743-1.5295l1.5625 0.65039c-0.951 2.2961-3.5905 3.3941-5.8867 2.4431-0.6318-0.261-1.1678-0.651-1.5996-1.125l-1.1777 1.178v-3.3751z" fill="#0082c9"/></svg>
diff --git a/core/img/actions/video-off-white.svg b/core/img/actions/video-off-white.svg
index dbd3120a33a..95e39de06d4 100644
--- a/core/img/actions/video-off-white.svg
+++ b/core/img/actions/video-off-white.svg
@@ -1,10 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16">
- <defs>
-  <filter id="a" style="color-interpolation-filters:sRGB" height="1.3818" width="1.3405" y="-.19090" x="-.17027">
-   <feGaussianBlur stdDeviation="0.99326857"/>
-  </filter>
- </defs>
- <path opacity=".5" d="m13.486 1.5137c-0.255 0-0.511 0.0971-0.707 0.2929l-10.486 10.484c-0.3918 0.392-0.3918 1.024 0 1.416 0.3917 0.392 1.0242 0.392 1.416 0l10.484-10.486c0.392-0.392 0.392-1.0226 0-1.4144-0.196-0.1958-0.451-0.2929-0.707-0.2929zm-10.486 1.4863c-1.108 0-2 0.892-2 2v6c0 0.368 0.1054 0.706 0.2773 1.002 0.0849-0.149 0.1825-0.292 0.3086-0.418l8.3457-8.3457c-0.2792-0.1477-0.5926-0.2383-0.9316-0.2383h-6zm12 0.8066c-0.034 0.0401-0.062 0.0835-0.1 0.1211l-9.0699 9.0723h3.1699c1.108 0 2-0.892 2-2v-1.334l4 3.334v-9.1934z" filter="url(#a)"/>
- <path fill="#fff" d="m13.486 1.5137c-0.255 0-0.511 0.0971-0.707 0.2929l-10.486 10.484c-0.3918 0.392-0.3918 1.024 0 1.416 0.3917 0.392 1.0242 0.392 1.416 0l10.484-10.486c0.392-0.392 0.392-1.0226 0-1.4144-0.196-0.1958-0.451-0.2929-0.707-0.2929zm-10.486 1.4863c-1.108 0-2 0.892-2 2v6c0 0.368 0.1054 0.706 0.2773 1.002 0.0849-0.149 0.1825-0.292 0.3086-0.418l8.3457-8.3457c-0.2792-0.1477-0.5926-0.2383-0.9316-0.2383h-6zm12 0.8066c-0.034 0.0401-0.062 0.0835-0.1 0.1211l-9.0699 9.0723h3.1699c1.108 0 2-0.892 2-2v-1.334l4 3.334v-9.1934z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><defs><filter id="a" height="21"><feGaussianBlur stdDeviation="1" in="SourceAlpha"/><feComponentTransfer><feFuncA slope="0.5" type="linear"/></feComponentTransfer><feMerge><feMergeNode/><feMergeNode in="SourceGraphic"/></feMerge></filter></defs><path fill="#fff" filter="url(#a)" d="m13.486 1.5137c-0.255 0-0.511 0.0971-0.707 0.2929l-10.486 10.484c-0.3918 0.392-0.3918 1.024 0 1.416 0.3917 0.392 1.0242 0.392 1.416 0l10.484-10.486c0.392-0.392 0.392-1.0226 0-1.4144-0.196-0.1958-0.451-0.2929-0.707-0.2929zm-10.486 1.4863c-1.108 0-2 0.892-2 2v6c0 0.368 0.1054 0.706 0.2773 1.002 0.0849-0.149 0.1825-0.292 0.3086-0.418l8.3457-8.3457c-0.2792-0.1477-0.5926-0.2383-0.9316-0.2383h-6zm12 0.8066c-0.034 0.0401-0.062 0.0835-0.1 0.1211l-9.0699 9.0723h3.1699c1.108 0 2-0.892 2-2v-1.334l4 3.334v-9.1934z"/></svg>
diff --git a/core/img/actions/video-off.svg b/core/img/actions/video-off.svg
index cb61fe51986..2065fe43234 100644
--- a/core/img/actions/video-off.svg
+++ b/core/img/actions/video-off.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16">
- <path d="m13.486 1.5137c-0.255 0-0.511 0.0971-0.707 0.2929l-10.486 10.484c-0.3918 0.392-0.3918 1.024 0 1.416 0.3917 0.392 1.0242 0.392 1.416 0l10.484-10.486c0.392-0.392 0.392-1.0226 0-1.4144-0.196-0.1958-0.451-0.2929-0.707-0.2929zm-10.486 1.4863c-1.108 0-2 0.892-2 2v6c0 0.368 0.1054 0.706 0.2773 1.002 0.0849-0.149 0.1825-0.292 0.3086-0.418l8.3457-8.3457c-0.2792-0.1477-0.5926-0.2383-0.9316-0.2383h-6zm12 0.8066c-0.034 0.0401-0.062 0.0835-0.1 0.1211l-9.0699 9.0723h3.1699c1.108 0 2-0.892 2-2v-1.334l4 3.334v-9.1934z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="m13.486 1.5137c-0.255 0-0.511 0.0971-0.707 0.2929l-10.486 10.484c-0.3918 0.392-0.3918 1.024 0 1.416 0.3917 0.392 1.0242 0.392 1.416 0l10.484-10.486c0.392-0.392 0.392-1.0226 0-1.4144-0.196-0.1958-0.451-0.2929-0.707-0.2929zm-10.486 1.4863c-1.108 0-2 0.892-2 2v6c0 0.368 0.1054 0.706 0.2773 1.002 0.0849-0.149 0.1825-0.292 0.3086-0.418l8.3457-8.3457c-0.2792-0.1477-0.5926-0.2383-0.9316-0.2383h-6zm12 0.8066c-0.034 0.0401-0.062 0.0835-0.1 0.1211l-9.0699 9.0723h3.1699c1.108 0 2-0.892 2-2v-1.334l4 3.334v-9.1934z"/></svg>
diff --git a/core/img/actions/video-white.svg b/core/img/actions/video-white.svg
index 59dc1b25321..f24bb373add 100644
--- a/core/img/actions/video-white.svg
+++ b/core/img/actions/video-white.svg
@@ -1,10 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16">
- <defs>
-  <filter id="a" style="color-interpolation-filters:sRGB" height="1.432" width="1.3086" y="-.216" x="-.15429">
-   <feGaussianBlur stdDeviation="0.9"/>
-  </filter>
- </defs>
- <path opacity=".5" d="m3 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h6c1.108 0 2-0.892 2-2v-1.334l4 3.334v-10l-4 3.334v-1.334c0-1.108-0.892-2-2-2z" filter="url(#a)"/>
- <path d="m3 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h6c1.108 0 2-0.892 2-2v-1.334l4 3.334v-10l-4 3.334v-1.334c0-1.108-0.892-2-2-2z" fill="#fff"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><defs><filter id="a" height="21"><feGaussianBlur stdDeviation="1" in="SourceAlpha"/><feComponentTransfer><feFuncA slope="0.5" type="linear"/></feComponentTransfer><feMerge><feMergeNode/><feMergeNode in="SourceGraphic"/></feMerge></filter></defs><path fill="#fff" filter="url(#a)" d="M3 3c-1.108 0-2 .892-2 2v6c0 1.108.892 2 2 2h6c1.108 0 2-.892 2-2V9.666L15 13V3l-4 3.334V5c0-1.108-.892-2-2-2z"/></svg>
diff --git a/core/img/actions/video.svg b/core/img/actions/video.svg
index 002198dc0ab..6bffcb5e89b 100644
--- a/core/img/actions/video.svg
+++ b/core/img/actions/video.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" viewBox="0 0 16 16"><path d="M3 3c-1.108 0-2 .892-2 2v6c0 1.108.892 2 2 2h6c1.108 0 2-.892 2-2V9.666L15 13V3l-4 3.334V5c0-1.108-.892-2-2-2z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M3 3c-1.108 0-2 .892-2 2v6c0 1.108.892 2 2 2h6c1.108 0 2-.892 2-2V9.666L15 13V3l-4 3.334V5c0-1.108-.892-2-2-2z"/></svg>
diff --git a/core/js/login.js b/core/js/login.js
index 81ef25ef2d4..012b4e0280e 100644
--- a/core/js/login.js
+++ b/core/js/login.js
@@ -12,12 +12,17 @@
  */
 OC.Login = _.extend(OC.Login || {}, {
 	onLogin: function () {
-		$('#submit-icon')
-			.removeClass('icon-confirm-white')
-			.addClass('icon-loading-small');
-		$('#submit')
-			.attr('value', t('core', 'Logging in …'));
-		return true;
+		// Only if password reset form is not active
+		if($('form[name=login][action]').length === 0) {
+			$('#submit-wrapper .submit-icon')
+				.removeClass('icon-confirm-white')
+				.addClass('icon-loading-small-dark');
+			$('#submit')
+				.attr('value', t('core', 'Logging in …'));
+			$('.login-additional').fadeOut();
+			return true;
+		}
+		return false;
 	},
 
 	rememberLogin: function(){
diff --git a/core/js/lostpassword.js b/core/js/lostpassword.js
index 1923b73a179..446d70d991e 100644
--- a/core/js/lostpassword.js
+++ b/core/js/lostpassword.js
@@ -14,12 +14,54 @@ OC.Lostpassword = {
 
 	init : function() {
 		$('#lost-password').click(OC.Lostpassword.resetLink);
-		$('#reset-password #submit').click(OC.Lostpassword.resetPassword);
+		$('#lost-password-back').click(OC.Lostpassword.backToLogin);
+		$('form[name=login]').submit(OC.Lostpassword.onSendLink);
+		OC.Lostpassword.resetButtons();
+	},
+
+	resetButtons : function() {
+		$('#reset-password-wrapper .submit-icon')
+			.addClass('icon-confirm-white')
+			.removeClass('icon-loading-small-dark');
+		$('#reset-password-submit')
+			.attr('value', t('core', 'Reset password'))
+			.prop('disabled', false);
+		$('#user').prop('disabled', false);
+		$('.login-additional').fadeIn();
+	},
+
+	backToLogin : function(event) {
+		event.preventDefault();
+
+		$('#reset-password-wrapper').slideUp().fadeOut();
+		$('#lost-password').slideDown().fadeIn();
+		$('#lost-password-back').hide();
+		$('.remember-login-container').slideDown().fadeIn();
+		$('#submit-wrapper').slideDown().fadeIn();
+		$('.groupbottom').slideDown().fadeIn();
+		$('#user').parent().addClass('grouptop');
+		$('#password').attr('required', true);
+		$('form[name=login]').removeAttr('action');
+		$('#user').focus();
 	},
 
 	resetLink : function(event){
 		event.preventDefault();
-		if (!$('#user').val().length){
+
+		$('#lost-password').hide();
+		$('#lost-password-back').slideDown().fadeIn();
+		$('.remember-login-container').slideUp().fadeOut();
+		$('#submit-wrapper').slideUp().fadeOut();
+		$('.groupbottom').slideUp().fadeOut(function(){
+			$('#user').parent().removeClass('grouptop');
+		});
+		$('#reset-password-wrapper').slideDown().fadeIn();
+		$('#password').attr('required', false);
+		$('form[name=login]').attr('action', 'lostpassword/email');
+		$('#user').focus();
+
+		// Generate a browser warning for required fields if field empty
+		if ($('#user').val().length === 0) {
 			$('#submit').trigger('click');
 		} else {
 			if (OC.config.lost_password_link === 'disabled') {
@@ -27,19 +69,37 @@ OC.Lostpassword = {
 			} else if (OC.config.lost_password_link) {
 				window.location = OC.config.lost_password_link;
 			} else {
-				$.post(
-					OC.generateUrl('/lostpassword/email'),
-					{
-						user : $('#user').val()
-					},
-					OC.Lostpassword.sendLinkDone
-				).fail(function() {
-					OC.Lostpassword.sendLinkError(OC.Lostpassword.sendErrorMsg);
-				});
+				OC.Lostpassword.onSendLink();
 			}
 		}
 	},
 
+	onSendLink: function (event) {
+		// Only if password reset form is active
+		if($('form[name=login][action]').length === 1) {
+			if (event) {
+				event.preventDefault();
+			}
+			$('#reset-password-wrapper .submit-icon')
+				.removeClass('icon-confirm-white')
+				.addClass('icon-loading-small-dark');
+			$('#reset-password-submit')
+				.attr('value', t('core', 'Sending email …'))
+				.prop('disabled', true);
+			$('#user').prop('disabled', true);
+			$('.login-additional').fadeOut();
+			$.post(
+				OC.generateUrl('/lostpassword/email'),
+				{
+					user : $('#user').val()
+				},
+				OC.Lostpassword.sendLinkDone
+			).fail(function() {
+				OC.Lostpassword.sendLinkError(OC.Lostpassword.sendErrorMsg);
+			});
+		}
+	},
+
 	sendLinkDone : function(result){
 		var sendErrorMsg;
 
@@ -60,13 +120,14 @@ OC.Lostpassword = {
 		// update is the better success message styling
 		node.addClass('update').css({width:'auto'});
 		node.html(OC.Lostpassword.sendSuccessMsg);
+		OC.Lostpassword.resetButtons();
 	},
 
 	sendLinkError : function(msg){
 		var node = OC.Lostpassword.getSendStatusNode();
 		node.addClass('warning');
 		node.html(msg);
-		OC.Lostpassword.init();
+		OC.Lostpassword.resetButtons();
 	},
 
 	getSendStatusNode : function(){
diff --git a/core/templates/login.php b/core/templates/login.php
index 0801b3746df..82827bbef03 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -51,11 +51,7 @@ script('core', 'merged-login');
 			<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
 		</p>
 
-		<?php if (!empty($_['invalidpassword']) && !empty($_['canResetPassword'])) { ?>
-		<a id="lost-password" class="warning" href="<?php p($_['resetPasswordLink']); ?>">
-			<?php p($l->t('Wrong password. Reset it?')); ?>
-		</a>
-		<?php } else if (!empty($_['invalidpassword'])) { ?>
+		<?php if (!empty($_['invalidpassword'])) { ?>
 			<p class="warning">
 				<?php p($l->t('Wrong password.')); ?>
 			</p>
@@ -63,9 +59,16 @@ script('core', 'merged-login');
 
 		<div id="submit-wrapper">
 			<input type="submit" id="submit" class="login primary" title="" value="<?php p($l->t('Log in')); ?>" disabled="disabled" />
-			<div id="submit-icon" class="icon-confirm-white"></div>
+			<div class="submit-icon icon-confirm-white"></div>
 		</div>
 
+		<?php if (!empty($_['canResetPassword'])) { ?>
+		<div id="reset-password-wrapper" style="display: none;">
+			<input type="submit" id="reset-password-submit" class="login primary" title="" value="<?php p($l->t('Reset password')); ?>" disabled="disabled" />
+			<div class="submit-icon icon-confirm-white"></div>
+		</div>
+		<?php } ?>
+
 		<div class="login-additional">
 			<div class="remember-login-container">
 				<?php if ($_['rememberLoginState'] === 0) { ?>
@@ -75,6 +78,16 @@ script('core', 'merged-login');
 				<?php } ?>
 				<label for="remember_login"><?php p($l->t('Stay logged in')); ?></label>
 			</div>
+			<?php if (!empty($_['canResetPassword'])) { ?>
+			<div class="lost-password-container">
+				<a id="lost-password" href="<?php p($_['resetPasswordLink']); ?>">
+					<?php p($l->t('Forgot password?')); ?>
+				</a>
+				<a id="lost-password-back" href="" style="display:none;">
+					<?php p($l->t('Back to log in')); ?>
+				</a>
+			</div>
+			<?php } ?>
 		</div>
 
 		<input type="hidden" name="timezone_offset" id="timezone_offset"/>
diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php
index 15df808684b..79ce7ee3247 100644
--- a/lib/private/Files/ObjectStore/ObjectStoreStorage.php
+++ b/lib/private/Files/ObjectStore/ObjectStoreStorage.php
@@ -364,7 +364,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
 			$fileId = $this->getCache()->put($path, $stat);
 			try {
 				//read an empty file from memory
-				$this->objectStore->writeObject($this->getURN($fileId), fopen('php://memory', 'r'));
+				$this->file_put_contents($path, ' ');
 			} catch (\Exception $ex) {
 				$this->getCache()->remove($path);
 				$this->logger->logException($ex, [
@@ -392,7 +392,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
 		$stat['storage_mtime'] = $mTime;
 
 		// run path based detection first, to use file extension because $tmpFile is only a random string
-		$mimetypeDetector =  \OC::$server->getMimeTypeDetector();
+		$mimetypeDetector = \OC::$server->getMimeTypeDetector();
 		$mimetype = $mimetypeDetector->detectPath($path);
 		if ($mimetype === 'application/octet-stream') {
 			$mimetype = $mimetypeDetector->detect($tmpFile);
diff --git a/lib/private/Files/ObjectStore/S3ObjectTrait.php b/lib/private/Files/ObjectStore/S3ObjectTrait.php
index b418219c29b..9c5cf9ccc6c 100644
--- a/lib/private/Files/ObjectStore/S3ObjectTrait.php
+++ b/lib/private/Files/ObjectStore/S3ObjectTrait.php
@@ -52,9 +52,15 @@ trait S3ObjectTrait {
 			'Key' => $urn
 		]);
 		$request = \Aws\serialize($command);
+		$headers = [];
+		foreach ($request->getHeaders() as $key => $values) {
+			foreach ($values as $value) {
+				$headers[] = "$key: $value";
+			}
+		}
 		$opts = [
 			'http' => [
-				'header' => $request->getHeaders()
+				'header' => $headers
 			]
 		];
 
diff --git a/lib/private/Log.php b/lib/private/Log.php
index 6b97a3a028e..a41c728df0d 100644
--- a/lib/private/Log.php
+++ b/lib/private/Log.php
@@ -352,7 +352,7 @@ class Log implements ILogger {
 		$msg .= ': ' . json_encode($data);
 		$this->log($level, $msg, $context);
 		if (!is_null($this->crashReporters)) {
-			$this->crashReporters->delegateReport($exception);
+			$this->crashReporters->delegateReport($exception, $context);
 		}
 	}
 
diff --git a/lib/private/Repair/NC11/CleanPreviewsBackgroundJob.php b/lib/private/Repair/NC11/CleanPreviewsBackgroundJob.php
index 9efe01508a6..e713f4dc63a 100644
--- a/lib/private/Repair/NC11/CleanPreviewsBackgroundJob.php
+++ b/lib/private/Repair/NC11/CleanPreviewsBackgroundJob.php
@@ -30,6 +30,7 @@ use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
 use OCP\ILogger;
+use OCP\IUserManager;
 
 class CleanPreviewsBackgroundJob extends QueuedJob {
 	/** @var IRootFolder */
@@ -44,6 +45,9 @@ class CleanPreviewsBackgroundJob extends QueuedJob {
 	/** @var ITimeFactory */
 	private $timeFactory;
 
+	/** @var IUserManager */
+	private $userManager;
+
 	/**
 	 * CleanPreviewsBackgroundJob constructor.
 	 *
@@ -51,19 +55,26 @@ class CleanPreviewsBackgroundJob extends QueuedJob {
 	 * @param ILogger $logger
 	 * @param IJobList $jobList
 	 * @param ITimeFactory $timeFactory
+	 * @param IUserManager $userManager
 	 */
 	public function __construct(IRootFolder $rootFolder,
 								ILogger $logger,
 								IJobList $jobList,
-								ITimeFactory $timeFactory) {
+								ITimeFactory $timeFactory,
+								IUserManager $userManager) {
 		$this->rootFolder = $rootFolder;
 		$this->logger = $logger;
 		$this->jobList = $jobList;
 		$this->timeFactory = $timeFactory;
+		$this->userManager = $userManager;
 	}
 
 	public function run($arguments) {
 		$uid = $arguments['uid'];
+		if (!$this->userManager->userExists($uid)) {
+			$this->logger->info('User no longer exists, skip user ' . $uid);
+			return;
+		}
 		$this->logger->info('Started preview cleanup for ' . $uid);
 		$empty = $this->cleanupPreviews($uid);
 
diff --git a/lib/private/Support/CrashReport/Registry.php b/lib/private/Support/CrashReport/Registry.php
index bdf18b492fd..670cea3da0e 100644
--- a/lib/private/Support/CrashReport/Registry.php
+++ b/lib/private/Support/CrashReport/Registry.php
@@ -45,10 +45,12 @@ class Registry implements IRegistry {
 	 * Delegate crash reporting to all registered reporters
 	 *
 	 * @param Exception|Throwable $exception
+	 * @param array $context
 	 */
-	public function delegateReport($exception) {
+	public function delegateReport($exception, array $context = []) {
+		/** @var IReporter $reporter */
 		foreach ($this->reporters as $reporter) {
-			$reporter->report($exception);
+			$reporter->report($exception, $context);
 		}
 	}
 
diff --git a/lib/public/Support/CrashReport/IRegistry.php b/lib/public/Support/CrashReport/IRegistry.php
index 66c527092bb..62432c782ab 100644
--- a/lib/public/Support/CrashReport/IRegistry.php
+++ b/lib/public/Support/CrashReport/IRegistry.php
@@ -43,6 +43,7 @@ interface IRegistry {
 	 *
 	 * @since 13.0.0
 	 * @param Exception|Throwable $exception
+	 * @param array $context
 	 */
-	public function delegateReport($exception);
+	public function delegateReport($exception, array $context = []);
 }
diff --git a/lib/public/Support/CrashReport/IReporter.php b/lib/public/Support/CrashReport/IReporter.php
index 03c4f47e3b2..4700f275df4 100644
--- a/lib/public/Support/CrashReport/IReporter.php
+++ b/lib/public/Support/CrashReport/IReporter.php
@@ -35,6 +35,7 @@ interface IReporter {
 	 *
 	 * @since 13.0.0
 	 * @param Exception|Throwable $exception
+	 * @param array $context
 	 */
-	public function report($exception);
+	public function report($exception, array $context = []);
 }
diff --git a/tests/acceptance/features/bootstrap/LoginPageContext.php b/tests/acceptance/features/bootstrap/LoginPageContext.php
index 61f12f54be6..560dd83f308 100644
--- a/tests/acceptance/features/bootstrap/LoginPageContext.php
+++ b/tests/acceptance/features/bootstrap/LoginPageContext.php
@@ -66,7 +66,7 @@ class LoginPageContext implements Context, ActorAwareInterface {
 	 * @return Locator
 	 */
 	public static function wrongPasswordMessage() {
-		return Locator::forThe()->xpath("//*[@class = 'warning' and normalize-space() = 'Wrong password. Reset it?']")->
+		return Locator::forThe()->xpath("//*[@class = 'warning' and normalize-space() = 'Wrong password.']")->
 				describedAs("Wrong password message in Login page");
 	}
 
diff --git a/tests/lib/LoggerTest.php b/tests/lib/LoggerTest.php
index 76f33849deb..54336da105c 100644
--- a/tests/lib/LoggerTest.php
+++ b/tests/lib/LoggerTest.php
@@ -90,7 +90,7 @@ class LoggerTest extends TestCase {
 		$e = new \Exception('test');
 		$this->registry->expects($this->once())
 			->method('delegateReport')
-			->with($e);
+			->with($e, []);
 
 		$this->logger->logException($e);
 
@@ -109,7 +109,7 @@ class LoggerTest extends TestCase {
 		$e = new \Exception('test');
 		$this->registry->expects($this->once())
 			->method('delegateReport')
-			->with($e);
+			->with($e, []);
 
 		$this->logger->logException($e);
 
@@ -128,7 +128,7 @@ class LoggerTest extends TestCase {
 		$e = new \Exception('test');
 		$this->registry->expects($this->once())
 			->method('delegateReport')
-			->with($e);
+			->with($e, []);
 
 		$this->logger->logException($e);
 
@@ -147,7 +147,7 @@ class LoggerTest extends TestCase {
 		$e = new \Exception('test');
 		$this->registry->expects($this->once())
 			->method('delegateReport')
-			->with($e);
+			->with($e, []);
 
 		$this->logger->logException($e);
 
diff --git a/tests/lib/Repair/NC11/CleanPreviewsBackgroundJobTest.php b/tests/lib/Repair/NC11/CleanPreviewsBackgroundJobTest.php
index e3fb22f0825..c0e2f0ce1b5 100644
--- a/tests/lib/Repair/NC11/CleanPreviewsBackgroundJobTest.php
+++ b/tests/lib/Repair/NC11/CleanPreviewsBackgroundJobTest.php
@@ -30,6 +30,7 @@ use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
 use OCP\ILogger;
+use OCP\IUserManager;
 use Test\TestCase;
 
 class CleanPreviewsBackgroundJobTest extends TestCase {
@@ -48,6 +49,9 @@ class CleanPreviewsBackgroundJobTest extends TestCase {
 	/** @var CleanPreviewsBackgroundJob */
 	private $job;
 
+	/** @var  IUserManager|\PHPUnit_Framework_MockObject_MockObject */
+	private $userManager;
+
 	public function setUp() {
 		parent::setUp();
 
@@ -55,12 +59,17 @@ class CleanPreviewsBackgroundJobTest extends TestCase {
 		$this->logger = $this->createMock(ILogger::class);
 		$this->jobList = $this->createMock(IJobList::class);
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
+		$this->userManager = $this->createMock(IUserManager::class);
+
+		$this->userManager->expects($this->any())->method('userExists')->willReturn(true);
 
 		$this->job = new CleanPreviewsBackgroundJob(
 			$this->rootFolder,
 			$this->logger,
 			$this->jobList,
-			$this->timeFactory);
+			$this->timeFactory,
+			$this->userManager
+		);
 	}
 
 	public function testCleanupPreviewsUnfinished() {
diff --git a/version.php b/version.php
index 8222977fb49..ccd2ba94f4c 100644
--- a/version.php
+++ b/version.php
@@ -29,10 +29,10 @@
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
 
-$OC_Version = array(13, 0, 0, 5);
+$OC_Version = array(13, 0, 0, 6);
 
 // The human readable string
-$OC_VersionString = '13.0.0 alpha';
+$OC_VersionString = '13.0.0 Beta 1';
 
 $OC_VersionCanBeUpgradedFrom = [
 	'nextcloud' => [