Svg icon api sass function and upgrade of all styles

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

39 files changed, 307 insertions, 243 deletions

diff --git a/core/Controller/SvgController.php b/core/Controller/SvgController.php
index 6fba2f050b3..26cead8913e 100644
--- a/core/Controller/SvgController.php
+++ b/core/Controller/SvgController.php
@@ -55,12 +55,13 @@ class SvgController extends Controller {
 	 *
 	 * Generate svg from filename with the requested color
 	 *
+	 * @param string $folder
 	 * @param string $fileName
 	 * @param string $color
 	 * @return DataDisplayResponse|NotFoundException
 	 */
-	public function getSvgFromCore(string $fileName, string $color = 'ffffff') {
-		$path = $this->serverRoot . "/core/img/actions/$fileName.svg";
+	public function getSvgFromCore(string $folder, string $fileName, string $color = 'ffffff') {
+		$path = $this->serverRoot . "/core/img/$folder/$fileName.svg";
 		return $this->getSvg($path, $color);
 	}
 
@@ -70,11 +71,18 @@ class SvgController extends Controller {
 	 *
 	 * Generate svg from filename with the requested color
 	 *
+	 * @param string $app
 	 * @param string $fileName
 	 * @param string $color
 	 * @return DataDisplayResponse|NotFoundException
 	 */
 	public function getSvgFromApp(string $app, string $fileName, string $color = 'ffffff') {
+
+		if ($app === 'settings') {
+			$path = $this->serverRoot . "/settings/img/$fileName.svg";
+			return $this->getSvg($path, $color);
+		}
+
 		$appPath = \OC_App::getAppWebPath($app);
 		if (!$appPath) {
 			return new NotFoundResponse();
diff --git a/core/css/functions.scss b/core/css/functions.scss
new file mode 100644
index 00000000000..d7192ebe1ce
--- /dev/null
+++ b/core/css/functions.scss
@@ -0,0 +1,43 @@
+/**
+ * @copyright Copyright (c) 2018, John Molakvoæ (skjnldsv@protonmail.com)
+ *
+ * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+ 
+/**
+ * SVG COLOR API
+ * 
+ * @param string $icon the icon filename
+ * @param string $dir the icon folder within /core/img if $core or app name
+ * @param string $color the desired color in hexadecimal
+ * @param bool [$core] search icon in core
+ *
+ * @returns string the url to the svg api endpoint
+ */
+ @function icon-color($icon, $dir, $color, $core: false) {
+	// remove # from color
+	$index: str-index($color, '#');
+	@if $index {
+		$color: str-slice($color, 2);
+	}
+	@if $core {
+		@return url('#{$webroot}/svg/core/#{$dir}/#{$icon}/#{$color}?v=1');
+	}
+	@return url('#{$webroot}/svg/#{$dir}/#{$icon}/#{$color}?v=1');
+}
\ No newline at end of file
diff --git a/core/css/header.scss b/core/css/header.scss
index e218f86fa9b..a3566f9a21e 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -322,7 +322,6 @@ nav[role='navigation'] {
 }
 
 /* Apps management */
-
 #apps {
 	max-height: calc(100vh - 100px);
 	overflow: auto;
@@ -336,7 +335,6 @@ nav[role='navigation'] {
 }
 
 /* USER MENU -----------------------------------------------------------------*/
-
 #settings {
 	display: inline-block;
 	height: 100%;
@@ -405,6 +403,7 @@ nav[role='navigation'] {
 	}
 }
 
+/* Settings menu */
 #expanddiv {
 	&.menu {
 		right: 17px;
@@ -438,6 +437,7 @@ nav[role='navigation'] {
 	}
 }
 
+/* Apps menu */
 #appmenu {
 	display: inline-block;
 	width: auto;
@@ -585,3 +585,57 @@ nav[role='navigation'] {
 		top: 50px;
 	}
 }
+
+/* SEARCHBOX --------------------------------------------------------------- */
+.searchbox {
+	position: relative;
+	display: flex;
+	align-items: center;
+	input[type='search'] {
+		position: relative;
+		font-size: 1.2em;
+		padding: 3px;
+		padding-left: 25px;
+		padding-right: 20px;
+		background-color: transparent;
+		color: var(--color-primary-text);
+		border: 0;
+		border-radius: var(--border-radius);
+		height: 34px;
+		width: 0;
+		cursor: pointer;
+		-webkit-transition: all 100ms;
+		transition: all 100ms;
+		opacity: .6;
+		&:focus, &:active, &:valid {
+			background-position-x: 6px;
+			color: var(--color-primary-text);
+			width: 155px;
+			cursor: text;
+			background-color: var(--color-primary) !important;
+			border: 1px solid var(--color-primary-text-dark) !important;
+		}
+		&:hover, &:focus, &:active {
+			opacity: 1;
+		}
+		& ~ .icon-close-white {
+			display: inline;
+			position: absolute;
+			width: 30px;
+			height: 100%;
+			right: 0;
+			top: 0;
+			margin: 0;
+			&, &:focus, &:active, &:hover {
+				border: none;
+				background-color: transparent;
+			}
+		}
+		&:not(:valid) ~ .icon-close-white {
+			display: none;
+		}
+		&::-webkit-search-cancel-button {
+			-webkit-appearance: none;
+		}
+	}
+}
\ No newline at end of file
diff --git a/core/css/icons.scss b/core/css/icons.scss
index c78d8eba7cf..6be063e2b3b 100644
--- a/core/css/icons.scss
+++ b/core/css/icons.scss
@@ -1,15 +1,30 @@
 /**
- * @copyright Copyright (c) 2016, John Molakvoæ <skjnldsv@protonmail.com>
- * @copyright Copyright (c) 2016, Joas Schilling <coding@schilljs.com>
- * @copyright Copyright (c) 2016, Lukas Reschke <lukas@statuscode.ch>
- * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl>
- * @copyright Copyright (c) 2016, Vincent Chan <plus.vincchan@gmail.com>
- * @copyright Copyright (c) 2015, Thomas Müller <thomas.mueller@tmit.eu>
- * @copyright Copyright (c) 2015, Hendrik Leppelsack <hendrik@leppelsack.de>
- * @copyright Copyright (c) 2015, Jan-Christoph Borchardt <hey@jancborchardt.net>
+ * @copyright Copyright (c) 2018, John Molakvoæ (skjnldsv@protonmail.com)
+ *
+ * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
+ * @author Joas Schilling <coding@schilljs.com>
+ * @author Lukas Reschke <lukas@statuscode.ch>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Vincent Chan <plus.vincchan@gmail.com>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Hendrik Leppelsack <hendrik@leppelsack.de>
+ * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
  *
  * @license GNU AGPL version 3 or any later version
  *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 /* GLOBAL ------------------------------------------------------------------- */
@@ -101,549 +116,544 @@ img, object, video, button, textarea, input, select, div[contenteditable='true']
 	}
 }
 
-/* ICONS -------------------------------------------------------------------- */
+/* ICONS ------------------------------------------------------------------- */
 .icon-add {
-	background-image: url('../img/actions/add.svg?v=1');
+	background-image: icon-color('add', 'actions', $color-black, 'core');
 }
 
 .icon-address {
-	background-image: url('../img/actions/address.svg?v=1');
+	background-image: icon-color('address', 'actions', $color-black, 'core');
 }
 .icon-address-white {
-	background-image: url('#{$webroot}/svg/address/fff?v=1');
+	background-image: icon-color('address', 'actions', $color-white, 'core');
 }
 
 .icon-audio {
-	background-image: url('../img/actions/audio.svg?v=1');
+	background-image: icon-color('audio', 'actions', $color-black, 'core');
 }
 
-/* TODO: to be deprecated; use .icon-audio.icon-white.icon-shadow */
 .icon-audio-white {
-	background-image: url('../img/actions/audio.svg?v=2');
-	filter: invert(100%) drop-shadow(1px 1px 4px var(--color-box-shadow));
+	background-image: icon-color('audio', 'actions', $color-white, 'core');
+	filter: drop-shadow(1px 1px 4px var(--color-box-shadow));
 }
 
 .icon-audio-off {
-	background-image: url('../img/actions/audio-off.svg?v=1');
+	background-image: icon-color('audio-off', 'actions', $color-black, 'core');
 }
 
-/* TODO: to be deprecated; use .icon-audio-off.icon-white.icon-shadow */
 .icon-audio-off-white {
-	background-image: url('../img/actions/audio-off.svg?v=1');
-	filter: invert(100%) drop-shadow(1px 1px 4px var(--color-box-shadow));
+	background-image: icon-color('audio-off', 'actions', $color-white, 'core');
+	filter: drop-shadow(1px 1px 4px var(--color-box-shadow));
 }
 
+.icon-caret-white,
 .icon-caret {
-	background-image: url('../img/actions/caret.svg?v=1');
+	background-image: icon-color('caret', 'actions', $color-white, 'core');
 }
 
 .icon-caret-dark {
-	background-image: url('../img/actions/caret-dark.svg?v=1');
+	background-image: icon-color('caret', 'actions', $color-black, 'core');
 }
 
 .icon-checkmark {
-	background-image: url('../img/actions/checkmark.svg?v=1');
+	background-image: icon-color('checkmark', 'actions', $color-black, 'core');
 	
 }
 
 .icon-checkmark-white {
-	background-image: url('#{$webroot}/svg/icon-checkmark/fff?v=1');
+	background-image: icon-color('checkmark', 'actions', $color-white, 'core');
 }
 
 .icon-checkmark-color {
-	background-image: url('#{$webroot}/svg/icon-checkmark/#{$color-success}?v=1');
+	background-image: icon-color('checkmark', 'actions', $color-success, 'core');
 }
 
 .icon-clippy {
-	background-image: url('../img/actions/clippy.svg?v=2');
+	background-image: icon-color('clippy', 'actions', $color-black, 'core');
 }
 
 .icon-close {
-	background-image: url('../img/actions/close.svg?v=1');
+	background-image: icon-color('close', 'actions', $color-black, 'core');
 }
 
 .icon-close-white {
-	background-image: url('#{$webroot}/svg/close/fff?v=1');
+	background-image: icon-color('close', 'actions', $color-white, 'core');
 }
 
 .icon-comment {
-	background-image: url('../img/actions/comment.svg?v=1');
+	background-image: icon-color('comment', 'actions', $color-black, 'core');
 }
 
 .icon-confirm {
-	background-image: url('../img/actions/confirm.svg?v=2');
+	background-image: icon-color('confirm', 'actions', $color-black, 'core');
 }
 
 .icon-confirm-fade {
-	background-image: url('../img/actions/confirm-fade.svg?v=2');
+	background-image: icon-color('confirm-fade', 'actions', $color-black, 'core');
 }
 
 .icon-confirm-white {
-	background-image: url('#{$webroot}/svg/icon-confirm/fff?v=1');
+	background-image: icon-color('confirm', 'actions', $color-white, 'core');
 }
 
 .icon-delete {
-	background-image: url('../img/actions/delete.svg?v=1');
+	background-image: icon-color('delete', 'actions', $color-black, 'core');
 	&.no-permission {
 		&:hover,
 		&:focus {
-			background-image: url('../img/actions/delete.svg?v=1');
+			background-image: icon-color('delete', 'actions', $color-black, 'core');
 		}
 	}
 	&:hover,
 	&:focus {
-		background-image: url('#{$webroot}/svg/icon-delete/d40000?v=1');
+		background-image: icon-color('delete', 'actions', $color-error, 'core');
 		filter: initial;
 	}
 }
 
 .icon-delete-white {
-	background-image: url('#{$webroot}/svg/icon-delete/fff?v=1');
+	background-image: icon-color('delete', 'actions', $color-white, 'core');
 	&.no-permission {
 		&:hover,
 		&:focus {
-			background-image: url('#{$webroot}/svg/icon-delete/fff?v=1');
+			background-image: icon-color('delete', 'actions', $color-white, 'core');
 		}
 	}
 	&:hover,
 	&:focus {
-		background-image: url('#{$webroot}/svg/icon-delete/d40000?v=1');
+		background-image: icon-color('delete', 'actions', $color-error, 'core');
 	}
 }
 
 .icon-details {
-	background-image: url('../img/actions/details.svg?v=1');
+	background-image: icon-color('details', 'actions', $color-black, 'core');
 }
 
 .icon-download {
-	background-image: url('../img/actions/download.svg?v=1');
+	background-image: icon-color('download', 'actions', $color-black, 'core');
 }
 
 .icon-download-white {
-	background-image: url('#{$webroot}/svg/icon-download/fff?v=1');
+	background-image: icon-color('download', 'actions', $color-white, 'core');
 }
 
 .icon-edit {
-	background-image: url('../img/actions/edit.svg?v=1');
+	background-image: icon-color('edit', 'actions', $color-black, 'core');
 }
 
 .icon-error {
-	background-image: url('../img/actions/error.svg?v=1');
+	background-image: icon-color('error', 'actions', $color-black, 'core');
 }
 
 .icon-error-white {
-	background-image: url('#{$webroot}/svg/icon-error/fff?v=1');
+	background-image: icon-color('error', 'actions', $color-white, 'core');
 }
 
 .icon-error-color {
-	background-image: url('#{$webroot}/svg/icon-error/d40000?v=1');
+	background-image: icon-color('error', 'actions', $color-error, 'core');
 }
 
 .icon-external {
-	background-image: url('../img/actions/external.svg?v=1');
+	background-image: icon-color('external', 'actions', $color-black, 'core');
 }
 
 .icon-fullscreen {
-	background-image: url('../img/actions/fullscreen.svg?v=1');
+	background-image: icon-color('fullscreen', 'actions', $color-black, 'core');
 }
 
-/* TODO: to be deprecated; use .icon-fullscreen.icon-white.icon-shadow */
 .icon-fullscreen-white {
-	background-image: url('../img/actions/fullscreen.svg?v=1');
-	filter: invert(100%) drop-shadow(1px 1px 4px var(--color-box-shadow));
+	background-image: icon-color('fullscreen', 'actions', $color-white, 'core');
+	filter: drop-shadow(1px 1px 4px var(--color-box-shadow));
 }
 
 .icon-history {
-	background-image: url('../img/actions/history.svg?v=1');
+	background-image: icon-color('history', 'actions', $color-black, 'core');
 }
 
 .icon-info {
-	background-image: url('../img/actions/info.svg?v=1');
+	background-image: icon-color('info', 'actions', $color-black, 'core');
 }
 
 .icon-info-white {
-	background-image: url('#{$webroot}/svg/icon-info/fff?v=1');
+	background-image: icon-color('info', 'actions', $color-white, 'core');
 }
 
 .icon-logout {
-	background-image: url('../img/actions/logout.svg?v=1');
+	background-image: icon-color('logout', 'actions', $color-black, 'core');
 }
 
 .icon-mail {
-	background-image: url('../img/actions/mail.svg?v=1');
+	background-image: icon-color('mail', 'actions', $color-black, 'core');
 }
 
 .icon-menu {
-	background-image: url('../img/actions/menu.svg?v=1');
+	background-image: icon-color('menu', 'actions', $color-black, 'core');
 }
 
 .icon-more {
-	background-image: url('../img/actions/more.svg?v=1');
+	background-image: icon-color('more', 'actions', $color-black, 'core');
 }
 
 .icon-more-white {
-	background-image: url('#{$webroot}/svg/more/fff?v=1');
+	background-image: icon-color('more', 'actions', $color-white)
 }
 
 .icon-password {
-	background-image: url('../img/actions/password.svg?v=1');
+	background-image: icon-color('password', 'actions', $color-black, 'core');
 }
 
 .icon-pause {
-	background-image: url('../img/actions/pause.svg?v=1');
+	background-image: icon-color('pause', 'actions', $color-black, 'core');
 }
 
 .icon-play {
-	background-image: url('../img/actions/play.svg?v=1');
+	background-image: icon-color('play', 'actions', $color-black, 'core');
 }
 
 .icon-play-add {
-	background-image: url('../img/actions/play-add.svg?v=1');
+	background-image: icon-color('play-add', 'actions', $color-black, 'core');
 }
 
 .icon-play-next {
-	background-image: url('../img/actions/play-next.svg?v=1');
+	background-image: icon-color('play-next', 'actions', $color-black, 'core');
 }
 
 .icon-play-previous {
-	background-image: url('../img/actions/play-previous.svg?v=1');
+	background-image: icon-color('play-previous', 'actions', $color-black, 'core');
 }
 
 .icon-public {
-	background-image: url('../img/actions/public.svg?v=1');
+	background-image: icon-color('public', 'actions', $color-black, 'core');
 }
 
 .icon-quota {
-	background-image: url('../img/actions/quota.svg?v=1');
+	background-image: icon-color('quota', 'actions', $color-black, 'core');
 }
 
 .icon-rename {
-	background-image: url('../img/actions/rename.svg?v=1');
+	background-image: icon-color('rename', 'actions', $color-black, 'core');
 }
 
 .icon-screen {
-	background-image: url('../img/actions/screen.svg?v=1');
+	background-image: icon-color('screen', 'actions', $color-black, 'core');
 }
 
-/* TODO: to be deprecated; use .icon-screen.icon-white.icon-shadow */
 .icon-screen-white {
-	background-image: url('../img/actions/screen.svg?v=1');
-	filter: invert(100%) drop-shadow(1px 1px 4px var(--color-box-shadow));
+	background-image: icon-color('screen', 'actions', $color-white, 'core');
+	filter: drop-shadow(1px 1px 4px var(--color-box-shadow));
 }
 
 .icon-screen-off {
-	background-image: url('../img/actions/screen-off.svg?v=1');
+	background-image: icon-color('screen-off', 'actions', $color-black, 'core');
 }
 
-/* TODO: to be deprecated; use .icon-screen-off.icon-white.icon-shadow */
 .icon-screen-off-white {
-	background-image: url('../img/actions/screen-off.svg?v=1');
-	filter: invert(100%) drop-shadow(1px 1px 4px var(--color-box-shadow));
+	background-image: icon-color('screen-off', 'actions', $color-white, 'core');
+	filter: drop-shadow(1px 1px 4px var(--color-box-shadow));
 }
 
 .icon-search {
-	background-image: url('../img/actions/search.svg?v=1');
+	background-image: icon-color('search', 'actions', $color-black, 'core');
 }
 
 .icon-search-white {
-	background-image: url('#{$webroot}/svg/search/fff?v=1');
+	background-image: icon-color('search', 'actions', $color-white, 'core');
 }
 
+/* default icon have a .5 opacity */
 .icon-settings {
-	background-image: url('../img/actions/settings.svg?v=1');
+	background-image: icon-color('settings', 'actions', $color-black, 'core');
 }
 
 .icon-settings-dark {
-	background-image: url('../img/actions/settings-dark.svg?v=1');
+	background-image: icon-color('settings-dark', 'actions', $color-black, 'core');
 }
 
 .icon-settings-white {
-	background-image: url('#{$webroot}/svg/settings-dark/fff?v=1');
+	background-image: icon-color('settings-dark', 'actions', $color-white, 'core');
 }
 
 /* always use icon-shared, AdBlock blocks icon-share */
 .icon-shared,
 .icon-share {
-	background-image: url('../img/actions/share.svg?v=1');
+	background-image: icon-color('share', 'actions', $color-black, 'core');
 }
 
 .icon-sound {
-	background-image: url('../img/actions/sound.svg?v=1');
+	background-image: icon-color('sound', 'actions', $color-black, 'core');
 }
 
 .icon-sound-off {
-	background-image: url('../img/actions/sound-off.svg?v=1');
+	background-image: icon-color('sound-off', 'actions', $color-black, 'core');
 }
 
 .icon-favorite {
-	background-image: url('../img/actions/star-dark.svg?v=1');
+	background-image: icon-color('star-dark', 'actions', $color-black, 'core');
 }
 
 .icon-star {
-	background-image: url('../img/actions/star.svg?v=1');
+	background-image: icon-color('star', 'actions', $color-black, 'core');
 }
 
 .icon-star-dark {
-	background-image: url('../img/actions/star-dark.svg?v=1');
+	background-image: icon-color('star-dark', 'actions', $color-black, 'core');
 }
 
 .icon-starred {
 	&:hover,
 	&:focus {
-		background-image: url('../img/actions/star.svg?v=1');
+		background-image: icon-color('star', 'actions', $color-black, 'core');
 	}
-	background-image: url('../img/actions/starred.svg?v=1');
+	background-image: icon-color('starred', 'actions', $color-black, 'core');
 }
 
 .icon-star {
 	&:hover,
 	&:focus {
-		background-image: url('../img/actions/starred.svg?v=1');
+		background-image: icon-color('starred', 'actions', $color-black, 'core');
 	}
 }
 
 .icon-tag {
-	background-image: url('../img/actions/tag.svg?v=1');
+	background-image: icon-color('tag', 'actions', $color-black, 'core');
 }
 
 .icon-timezone {
-	background-image: url('../img/actions/timezone.svg?v=1');
+	background-image: icon-color('timezone', 'actions', $color-black, 'core');
 }
 
 .icon-toggle {
-	background-image: url('../img/actions/toggle.svg?v=1');
+	background-image: icon-color('toggle', 'actions', $color-black, 'core');
 }
 
 .icon-toggle-background {
-	background-image: url('../img/actions/toggle-background.svg?v=1');
+	background-image: icon-color('toggle-background', 'actions', $color-black, 'core');
 }
 
 .icon-toggle-pictures {
-	background-image: url('../img/actions/toggle-pictures.svg?v=1');
+	background-image: icon-color('toggle-pictures', 'actions', $color-black, 'core');
 }
 
 .icon-triangle-e {
-	background-image: url('../img/actions/triangle-e.svg?v=1');
+	background-image: icon-color('triangle-e', 'actions', $color-black, 'core');
 }
 
 .icon-triangle-n {
-	background-image: url('../img/actions/triangle-n.svg?v=1');
+	background-image: icon-color('triangle-n', 'actions', $color-black, 'core');
 }
 
 .icon-triangle-s {
-	background-image: url('../img/actions/triangle-s.svg?v=1');
+	background-image: icon-color('triangle-s', 'actions', $color-black, 'core');
 }
 
 .icon-upload {
-	background-image: url('../img/actions/upload.svg?v=1');
+	background-image: icon-color('upload', 'actions', $color-black, 'core');
 }
 
 .icon-upload-white {
-	background-image: url('#{$webroot}/svg/upload/fff?v=1');
+	background-image: icon-color('upload', 'actions', $color-white, 'core');
 }
 
 .icon-user {
-	background-image: url('../img/actions/user.svg?v=1');
+	background-image: icon-color('user', 'actions', $color-black, 'core');
 }
 
 .icon-video {
-	background-image: url('../img/actions/video.svg?v=1');
+	background-image: icon-color('video', 'actions', $color-black, 'core');
 }
 
-/* TODO: to be deprecated; use .icon-video-off.icon-white.icon-shadow */
 .icon-video-white {
-	background-image: url('../img/actions/video.svg?v=2');
-	filter: invert(100%) drop-shadow(1px 1px 4px var(--color-box-shadow));
+	background-image: icon-color('video', 'actions', $color-white, 'core');
+	filter: drop-shadow(1px 1px 4px var(--color-box-shadow));
 }
 
 .icon-video-off {
-	background-image: url('../img/actions/video-off.svg?v=1');
+	background-image: icon-color('video-off', 'actions', $color-black, 'core');
 }
 
-/* TODO: to be deprecated; use .icon-video-off.icon-white.icon-shadow */
 .icon-video-off-white {
-	background-image: url('../img/actions/video-off.svg?v=1');
-	filter: invert(100%) drop-shadow(1px 1px 4px var(--color-box-shadow));
+	background-image: icon-color('video-off', 'actions', $color-white, 'core');
+	filter: drop-shadow(1px 1px 4px var(--color-box-shadow));
 }
 
 .icon-video-switch {
-	background-image: url('../img/actions/video-switch.svg?v=1');
+	background-image: icon-color('video-switch', 'actions', $color-black, 'core');
 }
 
 .icon-view-close {
-	background-image: url('../img/actions/view-close.svg?v=1');
+	background-image: icon-color('view-close', 'actions', $color-black, 'core');
 }
 
 .icon-view-download {
-	background-image: url('../img/actions/view-download.svg?v=1');
+	background-image: icon-color('view-download', 'actions', $color-black, 'core');
 }
 
 .icon-view-next {
-	background-image: url('../img/actions/arrow-right.svg?v=1');
+	background-image: icon-color('arrow-right', 'actions', $color-black, 'core');
 }
 
 .icon-view-pause {
-	background-image: url('../img/actions/view-pause.svg?v=1');
+	background-image: icon-color('view-pause', 'actions', $color-black, 'core');
 }
 
 .icon-view-play {
-	background-image: url('../img/actions/view-play.svg?v=1');
+	background-image: icon-color('view-play', 'actions', $color-black, 'core');
 }
 
 .icon-view-previous {
-	background-image: url('../img/actions/arrow-left.svg?v=1');
+	background-image: icon-color('arrow-left', 'actions', $color-black, 'core');
 }
 
 .icon-disabled-user {
-	background-image: url('../img/actions/disabled-user.svg?v=1');
+	background-image: icon-color('disabled-user', 'actions', $color-black, 'core');
 }
 
 .icon-disabled-users {
-	background-image: url('../img/actions/disabled-users.svg?v=1');
+	background-image: icon-color('disabled-users', 'actions', $color-black, 'core');
 }
 
 .icon-user-admin {
-	background-image: url('../img/actions/user-admin.svg?v=1');
+	background-image: icon-color('user-admin', 'actions', $color-black, 'core');
 }
 
 /* PLACES ------------------------------------------------------------------- */
 .icon-calendar {
-	background-image: url('../img/places/calendar.svg?v=1');
+	background-image: icon-color('calendar', 'places', $color-white, 'core');
 }
 
 .icon-calendar-dark {
-	background-image: url('../img/places/calendar-dark.svg?v=1');
+	background-image: icon-color('calendar', 'places', $color-black, 'core');
 }
 
 .icon-contacts {
-	background-image: url('../img/places/contacts.svg?v=1');
+	background-image: icon-color('contacts', 'places', $color-white, 'core');
 }
 
 .icon-contacts-dark {
-	background-image: url('../img/places/contacts-dark.svg?v=1');
+	background-image: icon-color('contacts', 'places', $color-black, 'core');
 }
 
 .icon-files {
-	background-image: url('../img/places/files.svg?v=1');
+	background-image: icon-color('files', 'places', $color-white, 'core');
 }
 
 .icon-files-dark {
-	background-image: url('../img/places/files-dark.svg?v=1');
+	background-image: icon-color('files', 'places', $color-black, 'core');
 }
 
 .icon-file,
 .icon-filetype-text {
-	background-image: url('../img/filetypes/text.svg?v=1');
+	background-image: icon-color('text', 'filetypes', $color-black, 'core');
 }
 
 .icon-folder,
 .icon-filetype-folder {
-	background-image: url('../img/filetypes/folder.svg?v=1');
+	background-image: icon-color('folder', 'filetypes', $color-black, 'core');
 }
 
 .icon-filetype-folder-drag-accept {
-	background-image: url('../img/filetypes/folder-drag-accept.svg?v=1') !important;
+	background-image: icon-color('folder-drag-accept', 'filetypes', $color-black) !important;
 }
 
 .icon-home {
-	background-image: url('../img/places/home.svg?v=1');
+	background-image: icon-color('home', 'places', $color-black, 'core');
 }
 
 .icon-link {
-	background-image: url('../img/places/link.svg?v=1');
+	background-image: icon-color('link', 'places', $color-black, 'core');
 }
 
 .icon-music {
-	background-image: url('../img/places/music.svg?v=1');
+	background-image: icon-color('music', 'places', $color-black, 'core');
 }
 
 .icon-picture {
-	background-image: url('../img/places/picture.svg?v=1');
+	background-image: icon-color('picture', 'places', $color-black, 'core');
 }
 
 /* CLIENTS ------------------------------------------------------------------- */
 
 .icon-desktop {
-	background-image: url('../img/clients/desktop.svg?v=1');
+	background-image: icon-color('desktop', 'clients', $color-black, 'core');
 }
 
 .icon-phone {
-	background-image: url('../img/clients/phone.svg?v=1');
+	background-image: icon-color('phone', 'clients', $color-black, 'core');
 }
 
 .icon-tablet {
-	background-image: url('../img/clients/tablet.svg?v=1');
+	background-image: icon-color('tablet', 'clients', $color-black, 'core');
 }
 
 /* APP CATEGORIES ------------------------------------------------------------------- */
 .icon-category-installed {
-	background-image: url('../img/actions/user.svg?v=1');
+	background-image: icon-color('user', 'actions', $color-black, 'core');
 }
 
 .icon-category-enabled {
-	background-image: url('../img/actions/checkmark.svg?v=1');
+	background-image: icon-color('checkmark', 'actions', $color-black, 'core');
 }
 
 .icon-category-disabled {
-	background-image: url('../img/actions/close.svg?v=1');
+	background-image: icon-color('close', 'actions', $color-black, 'core');
 }
 
 .icon-category-app-bundles {
-	background-image: url('../img/categories/bundles.svg?v=1');
+	background-image: icon-color('bundles', 'categories', $color-black, 'core');
 }
 
 .icon-category-updates {
-	background-image: url('../img/actions/download.svg?v=1');
+	background-image: icon-color('download', 'actions', $color-black, 'core');
 }
 
 .icon-category-files {
-	background-image: url('../img/categories/files.svg?v=1');
+	background-image: icon-color('files', 'categories', $color-black, 'core');
 }
 
 .icon-category-social {
-	background-image: url('../img/categories/social.svg?v=1');
+	background-image: icon-color('social', 'categories', $color-black, 'core');
 }
 
 .icon-category-office {
-	background-image: url('../img/categories/office.svg?v=1');
+	background-image: icon-color('office', 'categories', $color-black, 'core');
 }
 
 .icon-category-auth {
-	background-image: url('../img/categories/auth.svg?v=1');
+	background-image: icon-color('auth', 'categories', $color-black, 'core');
 }
 
 .icon-category-monitoring {
-	background-image: url('../img/categories/monitoring.svg?v=1');
+	background-image: icon-color('monitoring', 'categories', $color-black, 'core');
 }
 
 .icon-category-multimedia {
-	background-image: url('../img/categories/multimedia.svg?v=1');
+	background-image: icon-color('multimedia', 'categories', $color-black, 'core');
 }
 
 .icon-category-organization {
-	background-image: url('../img/categories/organization.svg?v=1');
+	background-image: icon-color('organization', 'categories', $color-black, 'core');
 }
 
 .icon-category-customization {
-	background-image: url('../img/categories/customization.svg?v=1');
+	background-image: icon-color('customization', 'categories', $color-black, 'core');
 }
 
 .icon-category-integration {
-	background-image: url('../img/categories/integration.svg?v=1');
+	background-image: icon-color('integration', 'categories', $color-black, 'core');
 }
 
 .icon-category-tools {
-	background-image: url('../img/actions/settings-dark.svg?v=1');
+	background-image: icon-color('settings-dark', 'actions', $color-black, 'core');
 }
 
 .icon-category-games {
-	background-image: url('../img/categories/games.svg?v=1');
+	background-image: icon-color('games', 'categories', $color-black, 'core');
 }
 
 .icon-category-security {
-	background-image: url('../img/actions/password.svg?v=1');
+	background-image: icon-color('password', 'actions', $color-black, 'core');
 }
 
 .icon-category-search {
-	background-image: url('../img/actions/search.svg?v=1');
+	background-image: icon-color('search', 'actions', $color-black, 'core');
 }
diff --git a/core/css/styles.scss b/core/css/styles.scss
index 6ff8d30a590..eac6af307a2 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -160,59 +160,6 @@ body {
 	border-radius: var(--border-radius);
 }
 
-/* Searchbox */
-
-.searchbox {
-	position: relative;
-	input[type='search'] {
-		position: relative;
-		font-size: 1.2em;
-		padding: 3px;
-		padding-left: 25px;
-		padding-right: 20px;
-		background: transparent url('../img/actions/search-white.svg?v=1') no-repeat center center;
-		color: var(--color-primary-text);
-		border: 0;
-		border-radius: var(--border-radius);
-		margin-top: 9px;
-		width: 0;
-		cursor: pointer;
-		-webkit-transition: all 100ms;
-		transition: all 100ms;
-		opacity: .6;
-		&:focus, &:active, &:valid {
-			background-position-x: 6px;
-			color: var(--color-primary-text);
-			width: 155px;
-			cursor: text;
-			background-color: var(--color-primary) !important;
-			border: 1px solid var(--color-primary-text-dark) !important;
-		}
-		&:hover, &:focus, &:active {
-			opacity: 1;
-		}
-		& ~ .icon-close-white {
-			display: inline;
-			position: absolute;
-			width: 30px;
-			height: 100%;
-			right: 0;
-			top: 0;
-			margin: 0;
-			&, &:focus, &:active, &:hover {
-				border: none;
-				background-color: transparent;
-			}
-		}
-		&:not(:valid) ~ .icon-close-white {
-			display: none;
-		}
-		&::-webkit-search-cancel-button {
-			-webkit-appearance: none;
-		}
-	}
-}
-
 /* CONTENT ------------------------------------------------------------------ */
 
 #controls {
diff --git a/core/css/variables.scss b/core/css/variables.scss
index 43e3c6b97bb..0207a82c4b7 100644
--- a/core/css/variables.scss
+++ b/core/css/variables.scss
@@ -1,4 +1,26 @@
-// SCSS darken/lighten function override
+/**
+ * @copyright Copyright (c) 2018, John Molakvoæ (skjnldsv@protonmail.com)
+ *
+ * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+ 
+ // SCSS darken/lighten function override
 @function nc-darken($color, $value) {
 	@return darken($color, $value);
 }
@@ -27,6 +49,9 @@ $color-primary-element-light: lighten($color-primary-element, 15%) !default;
 $color-error: #e9322d;
 $color-warning: #eca700;
 $color-success: #46ba61;
+// used for svg
+$color-white: #000 !default;
+$color-black: #fff !default;
 
 // rgb(118, 118, 118) / #767676
 // min. color contrast for normal text on white background according to WCAG AA
diff --git a/core/img/actions/audio-off-white.svg b/core/img/actions/audio-off-white.svg
deleted file mode 100644
index d0699a959d0..00000000000
--- a/core/img/actions/audio-off-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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-white.svg b/core/img/actions/audio-white.svg
deleted file mode 100644
index 209177deb3f..00000000000
--- a/core/img/actions/audio-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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/caret-dark.svg b/core/img/actions/caret-dark.svg
deleted file mode 100644
index 89ce37bc3e7..00000000000
--- a/core/img/actions/caret-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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 a7c34f699c7..89ce37bc3e7 100644
--- a/core/img/actions/caret.svg
+++ b/core/img/actions/caret.svg
@@ -1 +1 @@
-<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>
+<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/checkmark-color.svg b/core/img/actions/checkmark-color.svg
deleted file mode 100644
index 89f6960834d..00000000000
--- a/core/img/actions/checkmark-color.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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="#46ba61" stroke-width="2" fill="none"/></svg>
diff --git a/core/img/actions/checkmark-white.svg b/core/img/actions/checkmark-white.svg
deleted file mode 100644
index 6190902ea2d..00000000000
--- a/core/img/actions/checkmark-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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/close-white.svg b/core/img/actions/close-white.svg
deleted file mode 100644
index f24a6914b0f..00000000000
--- a/core/img/actions/close-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewbox="0 0 16 16"><path fill="#fff" d="m14 12.3-1.7 1.7-4.3-4.3-4.3 4.3-1.7-1.7 4.3-4.3-4.3-4.3 1.7-1.7 4.3 4.3 4.3-4.3 1.7 1.7-4.3 4.3z"/></svg>
diff --git a/core/img/actions/confirm-white.svg b/core/img/actions/confirm-white.svg
deleted file mode 100644
index 98a41adefe5..00000000000
--- a/core/img/actions/confirm-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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/delete-hover.svg b/core/img/actions/delete-hover.svg
deleted file mode 100644
index 286f060d462..00000000000
--- a/core/img/actions/delete-hover.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 15a364c1006..00000000000
--- a/core/img/actions/delete-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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/download-white.svg b/core/img/actions/download-white.svg
deleted file mode 100644
index b6de7996024..00000000000
--- a/core/img/actions/download-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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/error-color.svg b/core/img/actions/error-color.svg
deleted file mode 100644
index 19957ad7c73..00000000000
--- a/core/img/actions/error-color.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 9558c998c30..00000000000
--- a/core/img/actions/error-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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/fullscreen-white.svg b/core/img/actions/fullscreen-white.svg
deleted file mode 100644
index c920885bf6b..00000000000
--- a/core/img/actions/fullscreen-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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/info-white.svg b/core/img/actions/info-white.svg
deleted file mode 100644
index 92f6e44add2..00000000000
--- a/core/img/actions/info-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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/screen-off-white.svg b/core/img/actions/screen-off-white.svg
deleted file mode 100644
index a022b933808..00000000000
--- a/core/img/actions/screen-off-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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-white.svg b/core/img/actions/screen-white.svg
deleted file mode 100644
index e279dc48270..00000000000
--- a/core/img/actions/screen-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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/search-white.svg b/core/img/actions/search-white.svg
deleted file mode 100644
index 73aa5d3fa2f..00000000000
--- a/core/img/actions/search-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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/settings-white.svg b/core/img/actions/settings-white.svg
deleted file mode 100644
index ba8d925d8a4..00000000000
--- a/core/img/actions/settings-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 0 16 16" width="16" version="1.1"><path fill="#fff" d="m6.94 0.5c-0.24 0-0.44 0.2-0.44 0.44v1.26c-0.5 0.14-1.05 0.35-1.53 0.65l-0.91-0.91c-0.16-0.18-0.46-0.19-0.62 0l-1.5 1.5c-0.18 0.17-0.18 0.46 0 0.62l0.91 0.91c-0.284 0.48-0.5 1-0.65 1.53h-1.26c-0.24 0-0.44 0.2-0.44 0.44v2.12c0 0.25 0.19 0.44 0.44 0.44h1.26c0.14 0.54 0.36 1.05 0.65 1.53l-0.91 0.91c-0.18 0.17-0.18 0.45 0 0.62l1.5 1.5c0.18 0.18 0.46 0.18 0.62 0l0.91-0.91c0.48 0.285 1 0.5 1.53 0.65v1.26c0 0.25 0.2 0.44 0.44 0.44h2.12c0.24 0 0.45-0.2 0.44-0.44v-1.26c0.54-0.14 1.05-0.36 1.53-0.65l0.91 0.91c0.17 0.18 0.45 0.18 0.62 0l1.5-1.5c0.18-0.17 0.18-0.45 0-0.62l-0.91-0.91c0.29-0.48 0.5-1 0.65-1.53h1.26c0.24 0 0.45-0.2 0.44-0.44v-2.12c0-0.24-0.2-0.44-0.44-0.44h-1.26c-0.14-0.54-0.36-1.05-0.65-1.53l0.91-0.91c0.18-0.17 0.18-0.45 0-0.62l-1.5-1.5c-0.17-0.18-0.45-0.18-0.62 0l-0.91 0.91c-0.48-0.29-1-0.5-1.53-0.65v-1.26c0-0.24-0.2-0.44-0.44-0.44h-2.12zm1.06 4a3.5 3.5 0 0 1 3.5 3.5 3.5 3.5 0 0 1 -3.5 3.5 3.5 3.5 0 0 1 -3.5 -3.5 3.5 3.5 0 0 1 3.5 -3.5z"/></svg>
diff --git a/core/img/actions/upload-white.svg b/core/img/actions/upload-white.svg
deleted file mode 100644
index 3bd04bb8de6..00000000000
--- a/core/img/actions/upload-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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/video-off-white.svg b/core/img/actions/video-off-white.svg
deleted file mode 100644
index 95e39de06d4..00000000000
--- a/core/img/actions/video-off-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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-white.svg b/core/img/actions/video-white.svg
deleted file mode 100644
index f24bb373add..00000000000
--- a/core/img/actions/video-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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/places/calendar-dark.svg b/core/img/places/calendar-dark.svg
deleted file mode 100644
index 020ae8fe6ca..00000000000
--- a/core/img/places/calendar-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16"><path d="m4 1c-0.5 0-1 0.5-1 1v2c0 0.5 0.5 1 1 1s1-0.5 1-1v-2c0-0.5-0.5-1-1-1zm8 0c-0.5 0-1 0.5-1 1v2c0 0.5 0.5 1 1 1s1-0.5 1-1v-2c0-0.5-0.5-1-1-1zm-6.5 2v1c0 0.831-0.5 1.5-1.5 1.5s-1.5-0.5-1.5-1.5v-0.9375c-0.8841 0.227-1.5 1.0247-1.5 1.9375v8c0 1.108 0.892 2 2 2h10c1.108 0 2-0.892 2-2v-8c0-0.9128-0.61588-1.7105-1.5-1.9375v0.9375c0 0.831-0.5 1.5-1.5 1.5s-1.5-0.5-1.5-1.5v-1zm7.5 5v5h-10v-5z"/></svg>
diff --git a/core/img/places/calendar.svg b/core/img/places/calendar.svg
index 0d6e85a3ac0..020ae8fe6ca 100644
--- a/core/img/places/calendar.svg
+++ b/core/img/places/calendar.svg
@@ -1 +1 @@
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16"><path fill="#fff" d="m4 1c-0.5 0-1 0.5-1 1v2c0 0.5 0.5 1 1 1s1-0.5 1-1v-2c0-0.5-0.5-1-1-1zm8 0c-0.5 0-1 0.5-1 1v2c0 0.5 0.5 1 1 1s1-0.5 1-1v-2c0-0.5-0.5-1-1-1zm-6.5 2v1c0 0.831-0.5 1.5-1.5 1.5s-1.5-0.5-1.5-1.5v-0.9375c-0.8841 0.227-1.5 1.0247-1.5 1.9375v8c0 1.108 0.892 2 2 2h10c1.108 0 2-0.892 2-2v-8c0-0.9128-0.61588-1.7105-1.5-1.9375v0.9375c0 0.831-0.5 1.5-1.5 1.5s-1.5-0.5-1.5-1.5v-1zm7.5 5v5h-10v-5z"/></svg>
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16"><path d="m4 1c-0.5 0-1 0.5-1 1v2c0 0.5 0.5 1 1 1s1-0.5 1-1v-2c0-0.5-0.5-1-1-1zm8 0c-0.5 0-1 0.5-1 1v2c0 0.5 0.5 1 1 1s1-0.5 1-1v-2c0-0.5-0.5-1-1-1zm-6.5 2v1c0 0.831-0.5 1.5-1.5 1.5s-1.5-0.5-1.5-1.5v-0.9375c-0.8841 0.227-1.5 1.0247-1.5 1.9375v8c0 1.108 0.892 2 2 2h10c1.108 0 2-0.892 2-2v-8c0-0.9128-0.61588-1.7105-1.5-1.9375v0.9375c0 0.831-0.5 1.5-1.5 1.5s-1.5-0.5-1.5-1.5v-1zm7.5 5v5h-10v-5z"/></svg>
diff --git a/core/img/places/contacts-dark.svg b/core/img/places/contacts-dark.svg
deleted file mode 100644
index 5bc91dc59ab..00000000000
--- a/core/img/places/contacts-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewbox="0 0 16 16" height="16" width="16" version="1.1"><path d="m9 1c-1.746 0-3 1.43-3 2.8 0 1.4 0.1 2.4 0.8 3.5 0.224 0.29 0.485 0.35 0.7 0.6 0.135 0.5 0.24 1 0.1 1.5-0.436 0.153-0.85 0.332-1.27 0.5-0.51-0.273-1.1-0.5-1.61-0.7-0.07-0.28-0.02-0.487 0.05-0.75 0.12-0.125 0.23-0.18 0.36-0.3 0.37-0.45 0.39-1.21 0.39-1.75 0-0.8-0.72-1.4-1.5-1.4-0.87 0-1.5 0.72-1.5 1.4h-0.02c0 0.7 0.05 1.2 0.4 1.75 0.1 0.15 0.242 0.175 0.35 0.3 0.0674 0.25 0.121 0.5 0.05 0.75-0.64 0.223-1.244 0.5-1.8 0.8-0.42 0.3-0.233 0.182-0.5 1.15-0.124 0.5 1.3 0.73 2.32 0.81-0.05 0.275-0.12 0.64-0.32 1.34-0.32 1.25 4.353 1.7 6 1.7 2.43 0 6.313-0.456 5.98-1.7-0.52-1.94-0.208-1.71-0.98-2.3-1.09-0.654-2.452-1.167-3.6-1.6-0.15-0.557-0.04-0.97 0.1-1.5 0.235-0.25 0.5-0.36 0.72-0.6 0.69-0.884 0.78-2.424 0.78-3.5 0-1.586-1.43-2.8-3-2.8z"/></svg>
diff --git a/core/img/places/contacts.svg b/core/img/places/contacts.svg
index 205224878e7..5bc91dc59ab 100644
--- a/core/img/places/contacts.svg
+++ b/core/img/places/contacts.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewbox="0 0 16 16" height="16" width="16" version="1.1"><path fill="#fff" d="m9 1c-1.746 0-3 1.43-3 2.8 0 1.4 0.1 2.4 0.8 3.5 0.224 0.29 0.485 0.35 0.7 0.6 0.135 0.5 0.24 1 0.1 1.5-0.436 0.153-0.85 0.332-1.27 0.5-0.51-0.273-1.1-0.5-1.61-0.7-0.07-0.28-0.02-0.487 0.05-0.75 0.12-0.125 0.23-0.18 0.36-0.3 0.37-0.45 0.39-1.21 0.39-1.75 0-0.8-0.72-1.4-1.5-1.4-0.87 0-1.5 0.72-1.5 1.4h-0.02c0 0.7 0.05 1.2 0.4 1.75 0.1 0.15 0.242 0.175 0.35 0.3 0.0674 0.25 0.121 0.5 0.05 0.75-0.64 0.223-1.244 0.5-1.8 0.8-0.42 0.3-0.233 0.182-0.5 1.15-0.124 0.5 1.3 0.73 2.32 0.81-0.05 0.275-0.12 0.64-0.32 1.34-0.32 1.25 4.353 1.7 6 1.7 2.43 0 6.313-0.456 5.98-1.7-0.52-1.94-0.208-1.71-0.98-2.3-1.09-0.654-2.452-1.167-3.6-1.6-0.15-0.557-0.04-0.97 0.1-1.5 0.235-0.25 0.5-0.36 0.72-0.6 0.69-0.884 0.78-2.424 0.78-3.5 0-1.586-1.43-2.8-3-2.8z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewbox="0 0 16 16" height="16" width="16" version="1.1"><path d="m9 1c-1.746 0-3 1.43-3 2.8 0 1.4 0.1 2.4 0.8 3.5 0.224 0.29 0.485 0.35 0.7 0.6 0.135 0.5 0.24 1 0.1 1.5-0.436 0.153-0.85 0.332-1.27 0.5-0.51-0.273-1.1-0.5-1.61-0.7-0.07-0.28-0.02-0.487 0.05-0.75 0.12-0.125 0.23-0.18 0.36-0.3 0.37-0.45 0.39-1.21 0.39-1.75 0-0.8-0.72-1.4-1.5-1.4-0.87 0-1.5 0.72-1.5 1.4h-0.02c0 0.7 0.05 1.2 0.4 1.75 0.1 0.15 0.242 0.175 0.35 0.3 0.0674 0.25 0.121 0.5 0.05 0.75-0.64 0.223-1.244 0.5-1.8 0.8-0.42 0.3-0.233 0.182-0.5 1.15-0.124 0.5 1.3 0.73 2.32 0.81-0.05 0.275-0.12 0.64-0.32 1.34-0.32 1.25 4.353 1.7 6 1.7 2.43 0 6.313-0.456 5.98-1.7-0.52-1.94-0.208-1.71-0.98-2.3-1.09-0.654-2.452-1.167-3.6-1.6-0.15-0.557-0.04-0.97 0.1-1.5 0.235-0.25 0.5-0.36 0.72-0.6 0.69-0.884 0.78-2.424 0.78-3.5 0-1.586-1.43-2.8-3-2.8z"/></svg>
diff --git a/core/img/places/default-app-icon.svg b/core/img/places/default-app-icon.svg
index ba8d925d8a4..0db6804a923 100644
--- a/core/img/places/default-app-icon.svg
+++ b/core/img/places/default-app-icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 0 16 16" width="16" version="1.1"><path fill="#fff" d="m6.94 0.5c-0.24 0-0.44 0.2-0.44 0.44v1.26c-0.5 0.14-1.05 0.35-1.53 0.65l-0.91-0.91c-0.16-0.18-0.46-0.19-0.62 0l-1.5 1.5c-0.18 0.17-0.18 0.46 0 0.62l0.91 0.91c-0.284 0.48-0.5 1-0.65 1.53h-1.26c-0.24 0-0.44 0.2-0.44 0.44v2.12c0 0.25 0.19 0.44 0.44 0.44h1.26c0.14 0.54 0.36 1.05 0.65 1.53l-0.91 0.91c-0.18 0.17-0.18 0.45 0 0.62l1.5 1.5c0.18 0.18 0.46 0.18 0.62 0l0.91-0.91c0.48 0.285 1 0.5 1.53 0.65v1.26c0 0.25 0.2 0.44 0.44 0.44h2.12c0.24 0 0.45-0.2 0.44-0.44v-1.26c0.54-0.14 1.05-0.36 1.53-0.65l0.91 0.91c0.17 0.18 0.45 0.18 0.62 0l1.5-1.5c0.18-0.17 0.18-0.45 0-0.62l-0.91-0.91c0.29-0.48 0.5-1 0.65-1.53h1.26c0.24 0 0.45-0.2 0.44-0.44v-2.12c0-0.24-0.2-0.44-0.44-0.44h-1.26c-0.14-0.54-0.36-1.05-0.65-1.53l0.91-0.91c0.18-0.17 0.18-0.45 0-0.62l-1.5-1.5c-0.17-0.18-0.45-0.18-0.62 0l-0.91 0.91c-0.48-0.29-1-0.5-1.53-0.65v-1.26c0-0.24-0.2-0.44-0.44-0.44h-2.12zm1.06 4a3.5 3.5 0 0 1 3.5 3.5 3.5 3.5 0 0 1 -3.5 3.5 3.5 3.5 0 0 1 -3.5 -3.5 3.5 3.5 0 0 1 3.5 -3.5z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 0 16 16" width="16" version="1.1"><path d="m6.94 0.5c-0.24 0-0.44 0.2-0.44 0.44v1.26c-0.5 0.14-1.05 0.35-1.53 0.65l-0.91-0.91c-0.16-0.18-0.46-0.19-0.62 0l-1.5 1.5c-0.18 0.17-0.18 0.46 0 0.62l0.91 0.91c-0.284 0.48-0.5 1-0.65 1.53h-1.26c-0.24 0-0.44 0.2-0.44 0.44v2.12c0 0.25 0.19 0.44 0.44 0.44h1.26c0.14 0.54 0.36 1.05 0.65 1.53l-0.91 0.91c-0.18 0.17-0.18 0.45 0 0.62l1.5 1.5c0.18 0.18 0.46 0.18 0.62 0l0.91-0.91c0.48 0.285 1 0.5 1.53 0.65v1.26c0 0.25 0.2 0.44 0.44 0.44h2.12c0.24 0 0.45-0.2 0.44-0.44v-1.26c0.54-0.14 1.05-0.36 1.53-0.65l0.91 0.91c0.17 0.18 0.45 0.18 0.62 0l1.5-1.5c0.18-0.17 0.18-0.45 0-0.62l-0.91-0.91c0.29-0.48 0.5-1 0.65-1.53h1.26c0.24 0 0.45-0.2 0.44-0.44v-2.12c0-0.24-0.2-0.44-0.44-0.44h-1.26c-0.14-0.54-0.36-1.05-0.65-1.53l0.91-0.91c0.18-0.17 0.18-0.45 0-0.62l-1.5-1.5c-0.17-0.18-0.45-0.18-0.62 0l-0.91 0.91c-0.48-0.29-1-0.5-1.53-0.65v-1.26c0-0.24-0.2-0.44-0.44-0.44h-2.12zm1.06 4a3.5 3.5 0 0 1 3.5 3.5 3.5 3.5 0 0 1 -3.5 3.5 3.5 3.5 0 0 1 -3.5 -3.5 3.5 3.5 0 0 1 3.5 -3.5z"/></svg>
diff --git a/core/img/places/files-dark.svg b/core/img/places/files-dark.svg
deleted file mode 100644
index 15365027902..00000000000
--- a/core/img/places/files-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" version="1.1" height="16"><path d="m1.5 2c-0.25 0-0.5 0.25-0.5 0.5v11c0 0.26 0.24 0.5 0.5 0.5h13c0.26 0 0.5-0.241 0.5-0.5v-9c0-0.25-0.25-0.5-0.5-0.5h-6.5l-2-2z"/></svg>
diff --git a/core/img/places/files.svg b/core/img/places/files.svg
index 003e8b3fb80..15365027902 100644
--- a/core/img/places/files.svg
+++ b/core/img/places/files.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" version="1.1" height="16"><path fill="#fff" d="m1.5 2c-0.25 0-0.5 0.25-0.5 0.5v11c0 0.26 0.24 0.5 0.5 0.5h13c0.26 0 0.5-0.241 0.5-0.5v-9c0-0.25-0.25-0.5-0.5-0.5h-6.5l-2-2z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" version="1.1" height="16"><path d="m1.5 2c-0.25 0-0.5 0.25-0.5 0.5v11c0 0.26 0.24 0.5 0.5 0.5h13c0.26 0 0.5-0.241 0.5-0.5v-9c0-0.25-0.25-0.5-0.5-0.5h-6.5l-2-2z"/></svg>
diff --git a/core/img/places/music.svg b/core/img/places/music.svg
index 26fe2017f18..5746247ea78 100644
--- a/core/img/places/music.svg
+++ b/core/img/places/music.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewbox="0 0 16 16" width="16" version="1.1" height="16"><path fill="#fff" d="m12.97 0.5c-0.26 0-4.795 1-7.17 1.5-0.47 0.1-0.8 0.53-0.8 1v8c-0.56-0.06-1.144 0.0625-1.65 0.34-1.226 0.67-1.7 2.06-1.066 3.11 0.64 1.05 2.15 1.35 3.37 0.68 0.846-0.45 1.346-1.28 1.346-2.13v-8l5-1v6.016c-0.56-0.058-1.144 0.0625-1.65 0.34-1.226 0.67-1.7 2.06-1.066 3.11 0.64 1.046 2.15 1.35 3.37 0.68 0.846-0.466 1.346-1.296 1.346-2.146v-10.525c0-0.565-0.466-0.975-1.03-0.975z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewbox="0 0 16 16" width="16" version="1.1" height="16"><path d="m12.97 0.5c-0.26 0-4.795 1-7.17 1.5-0.47 0.1-0.8 0.53-0.8 1v8c-0.56-0.06-1.144 0.0625-1.65 0.34-1.226 0.67-1.7 2.06-1.066 3.11 0.64 1.05 2.15 1.35 3.37 0.68 0.846-0.45 1.346-1.28 1.346-2.13v-8l5-1v6.016c-0.56-0.058-1.144 0.0625-1.65 0.34-1.226 0.67-1.7 2.06-1.066 3.11 0.64 1.046 2.15 1.35 3.37 0.68 0.846-0.466 1.346-1.296 1.346-2.146v-10.525c0-0.565-0.466-0.975-1.03-0.975z"/></svg>
diff --git a/core/img/places/picture.svg b/core/img/places/picture.svg
index 738f1b3b505..ffb0840ac0e 100644
--- a/core/img/places/picture.svg
+++ b/core/img/places/picture.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewbox="0 0 16 16" width="16" version="1.1" height="16"><path fill="#fff" d="m1.5 2c-0.2 0-0.5 0.3-0.5 0.5v11c0 0.2 0.3 0.5 0.5 0.5h13c0.2 0 0.5-0.3 0.5-0.5v-11c0-0.2-0.3-0.5-0.5-0.5zm0.5 1h12v5l-1-1-3 4-3-3-4 4h-1zm2.5 1c-0.83 0-1.5 0.67-1.5 1.5s0.67 1.5 1.5 1.5 1.5-0.67 1.5-1.5-0.67-1.5-1.5-1.5z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewbox="0 0 16 16" width="16" version="1.1" height="16"><path d="m1.5 2c-0.2 0-0.5 0.3-0.5 0.5v11c0 0.2 0.3 0.5 0.5 0.5h13c0.2 0 0.5-0.3 0.5-0.5v-11c0-0.2-0.3-0.5-0.5-0.5zm0.5 1h12v5l-1-1-3 4-3-3-4 4h-1zm2.5 1c-0.83 0-1.5 0.67-1.5 1.5s0.67 1.5 1.5 1.5 1.5-0.67 1.5-1.5-0.67-1.5-1.5-1.5z"/></svg>
diff --git a/core/routes.php b/core/routes.php
index 9538a591600..4ac51dc2364 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -61,7 +61,8 @@ $application->registerRoutes($this, [
 		['name' => 'OCJS#getConfig', 'url' => '/core/js/oc.js', 'verb' => 'GET'],
 		['name' => 'Preview#getPreviewByFileId', 'url' => '/core/preview', 'verb' => 'GET'],
 		['name' => 'Preview#getPreview', 'url' => '/core/preview.png', 'verb' => 'GET'],
-		['name' => 'Svg#getSvgFromCore', 'url' => '/svg/{fileName}/{color}', 'verb' => 'GET'],
+		['name' => 'Svg#getSvgFromCore', 'url' => '/svg/core/{folder}/{fileName}/{color}', 'verb' => 'GET'],
+		['name' => 'Svg#getSvgFromSettings', 'url' => '/svg/settings/{folder}/{fileName}/{color}', 'verb' => 'GET'],
 		['name' => 'Svg#getSvgFromApp', 'url' => '/svg/{app}/{fileName}/{color}', 'verb' => 'GET'],
 		['name' => 'Css#getCss', 'url' => '/css/{appName}/{fileName}', 'verb' => 'GET'],
 		['name' => 'Js#getJs', 'url' => '/js/{appName}/{fileName}', 'verb' => 'GET'],
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 3cac14b4ab3..b9eab8f4149 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -105,7 +105,7 @@
 						<?php p($l->t('Search'));?>
 					</label>
 					<input id="searchbox" type="search" name="query"
-						value="" required class="hidden"
+						value="" required class="hidden icon-search-white"
 						autocomplete="off">
 					<button class="icon-close-white" type="reset"><span class="hidden-visually"><?php p($l->t('Reset search'));?></span></button>
 				</form>