diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index 4db6fe1c77..2a41455a3d 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -149,7 +149,7 @@ class mail_compose
 			),
 			'selectFromVFSForCompose' => array(
 				'caption' => 'VFS',
-				'icon' => 'filemanager',
+				'icon' => 'filemanager/navbar',
 				'group' => ++$group,
 				'onExecute' => 'javaScript:app.mail.compose_triggerWidget',
 				'hint' => 'Select file(s) from VFS',
diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index 69379665ee..54821f79cf 100644
--- a/mail/templates/default/display.xet
+++ b/mail/templates/default/display.xet
@@ -81,7 +81,7 @@
 								<description class="useEllipsis et2_link" id="${row}[filename]" extra_link_target="$row_cont[windowName]" extra_link_popup="$row_cont[popup]" expose_view="true" mime="$row_cont[type]" no_lang="1" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
 								<description align="right" id="${row}[size]" />
 								<buttononly id="${row}[save]" value="save" image="fileexport" onclick="app.mail.saveAttachmentHandler(widget,'downloadOneAsFile', ${row})" label="Save to disk"/>
-								<buttononly id="${row}[saveAsVFS]" value="save" image="filemanager" onclick="app.mail.saveAttachmentHandler(widget,'saveOneToVfs', ${row})" label="Save to filemanager"/>
+								<buttononly id="${row}[saveAsVFS]" value="save" image="filemanager/navbar" onclick="app.mail.saveAttachmentHandler(widget,'saveOneToVfs', ${row})" label="Save to filemanager"/>
 								<buttononly  class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" value="save_all" image="mail/save_all" onclick="app.mail.saveAttachmentHandler(widget,'saveAllToVfs', ${row})" label="Save all attachments to filemanager"/>
 								<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" value="save_zip" image="mail/save_zip" onclick="app.mail.saveAttachmentHandler(widget,'downloadAllToZip', ${row})" label="Save as Zip"/>
 							</row>
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index 5a83f1417b..23c5894d24 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -65,7 +65,7 @@
 								<description class="et2_link useEllipsis" id="${row}[filename]" extra_link_target="$row_cont[windowName]" extra_link_popup="$row_cont[popup]" no_lang="1" expose_view="true" mime="$row_cont[type]" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
 								<description align="right" id="${row}[size]"/>
 								<buttononly id="${row}[save]" image="fileexport" onclick="app.mail.saveAttachmentHandler(widget,'downloadOneAsFile', ${row})" label="Save to disk"/>
-								<buttononly id="${row}[saveAsVFS]" image="filemanager" onclick="app.mail.saveAttachmentHandler(widget,'saveOneToVfs', ${row})" label="Save to filemanager"/>
+								<buttononly id="${row}[saveAsVFS]" image="filemanager/navbar" onclick="app.mail.saveAttachmentHandler(widget,'saveOneToVfs', ${row})" label="Save to filemanager"/>
 								<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" image="mail/save_all" onclick="app.mail.saveAttachmentHandler(widget,'saveAllToVfs', ${row})" label="Save all attachments to filemanager"/>
 								<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" image="mail/save_zip" onclick="app.mail.saveAttachmentHandler(widget,'downloadAllToZip', ${row})" label="Save as Zip"/>
 							</row>
diff --git a/mail/templates/mobile/app.css b/mail/templates/mobile/app.css
index a8ce0c6170..78d94c735e 100644
--- a/mail/templates/mobile/app.css
+++ b/mail/templates/mobile/app.css
@@ -1652,7 +1652,7 @@ span.status_img {
   width: 12px;
   height: 12px;
   background-repeat: no-repeat;
-  background-image: url(../pixelegg/images/kmmsgread.png);
+  background-image: url(../pixelegg/images/kmmsgread.svg);
   background-size: 12px 12px;
 }
 tr.deleted span.status_img {
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 04bb4f5f9e..acbae26a72 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -86,7 +86,7 @@ span.status_img {
   width: 12px;
   height: 12px;
   background-repeat: no-repeat;
-  background-image: url(../default/images/kmmsgread.png);
+  background-image: url(../default/images/kmmsgread.svg);
 }
 tr.deleted span.status_img {
   background-image: url(../default/images/kmmsgdel.png);
@@ -1640,7 +1640,7 @@ span.status_img {
   width: 12px;
   height: 12px;
   background-repeat: no-repeat;
-  background-image: url(../pixelegg/images/kmmsgread.png);
+  background-image: url(../pixelegg/images/kmmsgread.svg);
   background-size: 12px 12px;
 }
 tr.deleted span.status_img {
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index e822495108..c4d47dad7a 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -734,7 +734,7 @@ span.status_img {
 	width: 12px;
 	height: 12px;
 	background-repeat: no-repeat;
-	background-image: url(../pixelegg/images/kmmsgread.png);
+	background-image: url(../pixelegg/images/kmmsgread.svg);
 	background-size: 12px 12px;
 }
 
diff --git a/mail/templates/pixelegg/images/filemanager.png b/mail/templates/pixelegg/images/filemanager.png
deleted file mode 100755
index fe30f9317f..0000000000
Binary files a/mail/templates/pixelegg/images/filemanager.png and /dev/null differ
diff --git a/mail/templates/pixelegg/images/filemanager.svg b/mail/templates/pixelegg/images/filemanager.svg
deleted file mode 100644
index c4e1251a72..0000000000
--- a/mail/templates/pixelegg/images/filemanager.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="filemanager_navbar" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" width="28.348px" height="28.348px" viewBox="0 0 28.348 28.348" enable-background="new 0 0 28.348 28.348"
-	 xml:space="preserve">
-<g>
-	<g>
-		<path fill="#696969" d="M11.469,1.107l0.07,0.619l0.112,0.994l0.994-0.113l12.088-1.371l-0.177,2.089l-21.3,2.417L2.319,2.145
-			L11.469,1.107 M12.35,0L1.061,1.281l1.447,5.553l22.977-2.607l0.349-4.122l-13.3,1.509L12.35,0L12.35,0z"/>
-	</g>
-	<g>
-		<path fill="#696969" d="M27.316,5.842L26.854,18.58l-9.268,1.053l-3.928,0.445l-9.246,1.049L1.425,8.78L27.316,5.842
-			 M28.357,4.718L0.187,7.914l3.461,14.307l10.123-1.15l3.927-0.445l10.123-1.148L28.357,4.718L28.357,4.718z"/>
-	</g>
-</g>
-<path fill="#696969" d="M20.539,18.726c-5.21,0.19-8.343-2.188-10.989-4.831c0,6.284,5.457,11.23,10.989,11.288v3.165l7.809-6.406
-	l-7.809-6.407V18.726z"/>
-</svg>
diff --git a/mail/templates/pixelegg/images/kmmsgread.png b/mail/templates/pixelegg/images/kmmsgread.png
deleted file mode 100755
index 651f6d2e47..0000000000
Binary files a/mail/templates/pixelegg/images/kmmsgread.png and /dev/null differ