diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 191a19a284..f04af84f5d 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1234,7 +1234,7 @@ class mail_ui
 			'infolog' => array(
 				'caption' => 'InfoLog',
 				'hint' => 'Save as InfoLog',
-				'icon' => 'infolog/navbar',
+				'icon' => $GLOBALS['egw_info']['user']['preferences']['common']['template_set'] =='pixelegg' ? 'infolog' : 'infolog/navbar',
 				'group' => ++$group,
 				'onExecute' => 'javaScript:app.mail.mail_integrate',
 				'popup' => Link::get_registry('infolog', 'add_popup'),
@@ -1245,7 +1245,7 @@ class mail_ui
 				'caption' => 'Tracker',
 				'hint' => 'Save as ticket',
 				'group' => $group,
-				'icon' => 'tracker/navbar',
+				'icon' => $GLOBALS['egw_info']['user']['preferences']['common']['template_set'] =='pixelegg' ? 'tracker' : 'tracker/navbar',
 				'onExecute' => 'javaScript:app.mail.mail_integrate',
 				'popup' => Link::get_registry('tracker', 'add_popup'),
 				'mail_import' => Api\Hooks::single(array('location' => 'mail_import'),'tracker'),
@@ -1254,7 +1254,7 @@ class mail_ui
 			'calendar' => array(
 				'caption' => 'Calendar',
 				'hint' => 'Save as Calendar',
-				'icon' => 'calendar/navbar',
+				'icon' => $GLOBALS['egw_info']['user']['preferences']['common']['template_set'] =='pixelegg' ? 'calendar' : 'calendar/navbar',
 				'group' => $group,
 				'onExecute' => 'javaScript:app.mail.mail_integrate',
 				'popup' => Link::get_registry('calendar', 'add_popup'),
@@ -1286,7 +1286,7 @@ class mail_ui
 						'caption' => 'Filemanager',
 						'hint' => 'Save to filemanager',
 						'group' => $group,
-						'icon' => 'filemanager/navbar',
+						'icon' =>  $GLOBALS['egw_info']['user']['preferences']['common']['template_set'] =='pixelegg' ? 'filemanager' : 'filemanager/navbar',
 						'onExecute' => 'javaScript:app.mail.mail_save2fm',
 						'allowOnMultiple' => true,
 					),
diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index 54821f79cf..69379665ee 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/navbar" onclick="app.mail.saveAttachmentHandler(widget,'saveOneToVfs', ${row})" label="Save to filemanager"/>
+								<buttononly id="${row}[saveAsVFS]" value="save" image="filemanager" 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 23c5894d24..5a83f1417b 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/navbar" onclick="app.mail.saveAttachmentHandler(widget,'saveOneToVfs', ${row})" label="Save to filemanager"/>
+								<buttononly id="${row}[saveAsVFS]" image="filemanager" 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/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index a306285173..82c5938232 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -2859,18 +2859,6 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon {
   border: 1px solid transparent;
   border-radius: 2px;
 }
-div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item td.sub_item_icon {
-  /*filter grey*/
-  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale");
-  -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  /*filter: url(grayscale.svg);  Firefox 4+ */
-  filter: gray;
-  /* IE 6-9 */
-}
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item td.sub_item_hk div.sub_item_hk {
   color: #373f3f;
 }
@@ -2878,18 +2866,6 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub
   background-color: #ffc200 !important;
   background-image: none !important;
 }
-div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected td.sub_item_icon {
-  /*filter grey*/
-  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale");
-  -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  /*filter: url(grayscale.svg);  Firefox 4+ */
-  filter: gray;
-  /* IE 6-9 */
-}
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl div.sub_sep {
   border-top: 1px solid #E6E6E6;
 }
diff --git a/pixelegg/css/monochrome.css b/pixelegg/css/monochrome.css
index 7aa2c5c094..22dec6c9e4 100644
--- a/pixelegg/css/monochrome.css
+++ b/pixelegg/css/monochrome.css
@@ -2848,18 +2848,6 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon {
   border: 1px solid transparent;
   border-radius: 2px;
 }
-div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item td.sub_item_icon {
-  /*filter grey*/
-  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale");
-  -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  /*filter: url(grayscale.svg);  Firefox 4+ */
-  filter: gray;
-  /* IE 6-9 */
-}
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item td.sub_item_hk div.sub_item_hk {
   color: #373f3f;
 }
@@ -2867,18 +2855,6 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub
   background-color: #ffc200 !important;
   background-image: none !important;
 }
-div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected td.sub_item_icon {
-  /*filter grey*/
-  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale");
-  -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  /*filter: url(grayscale.svg);  Firefox 4+ */
-  filter: gray;
-  /* IE 6-9 */
-}
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl div.sub_sep {
   border-top: 1px solid #E6E6E6;
 }
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 5742f8959e..b09e2a93a9 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -2859,18 +2859,6 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon {
   border: 1px solid transparent;
   border-radius: 2px;
 }
-div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item td.sub_item_icon {
-  /*filter grey*/
-  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale");
-  -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  /*filter: url(grayscale.svg);  Firefox 4+ */
-  filter: gray;
-  /* IE 6-9 */
-}
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item td.sub_item_hk div.sub_item_hk {
   color: #373f3f;
 }
@@ -2878,18 +2866,6 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub
   background-color: #ffc200 !important;
   background-image: none !important;
 }
-div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected td.sub_item_icon {
-  /*filter grey*/
-  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale");
-  -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  /*filter: url(grayscale.svg);  Firefox 4+ */
-  filter: gray;
-  /* IE 6-9 */
-}
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl div.sub_sep {
   border-top: 1px solid #E6E6E6;
 }
diff --git a/pixelegg/images/tracker.svg b/pixelegg/images/tracker.svg
new file mode 100644
index 0000000000..fd7deb8fed
--- /dev/null
+++ b/pixelegg/images/tracker.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
+<svg version="1.1" id="tracker_navbar" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="28.347px" height="28.347px" viewBox="0 0 28.347 28.347" enable-background="new 0 0 28.347 28.347" xml:space="preserve">
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#696969" d="M26.438,13.903L14.903,1.783v7.273h-0.879L7.099,1.783v7.273H2.194
+	v9.695h4.905v7.272l6.925-7.272h0.879v7.272L26.438,13.903z M8.39,21.175v-4.363H3.743v-5.816H8.39V6.631l7.062,7.272L8.39,21.175z"
+	/>
+</svg>
diff --git a/pixelegg/less/layout_dhtmlSubmenu.less b/pixelegg/less/layout_dhtmlSubmenu.less
index 2ed4db7207..4a1aefbd11 100644
--- a/pixelegg/less/layout_dhtmlSubmenu.less
+++ b/pixelegg/less/layout_dhtmlSubmenu.less
@@ -20,7 +20,7 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon{
     table.dhtmlxMebu_SubLevelArea_Tbl{
         tr.sub_item  {
 			td.sub_item_icon {
-				.img_filter_gray;
+
 			}
 			td.sub_item_hk div.sub_item_hk {
 				color: #373f3f;
@@ -28,7 +28,7 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon{
 		}
 		tr.sub_item_selected  {
 			td.sub_item_icon {
-				.img_filter_gray;
+				
 			}
 			background-color: @egw_color_1_a !important;
 			background-image: none !important;
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index 02bdde1d5d..63dcddf3ae 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -2870,18 +2870,6 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon {
   border: 1px solid transparent;
   border-radius: 2px;
 }
-div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item td.sub_item_icon {
-  /*filter grey*/
-  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale");
-  -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  /*filter: url(grayscale.svg);  Firefox 4+ */
-  filter: gray;
-  /* IE 6-9 */
-}
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item td.sub_item_hk div.sub_item_hk {
   color: #373f3f;
 }
@@ -2889,18 +2877,6 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub
   background-color: #ffc200 !important;
   background-image: none !important;
 }
-div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected td.sub_item_icon {
-  /*filter grey*/
-  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale");
-  -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%);
-  /*filter: url(grayscale.svg);  Firefox 4+ */
-  filter: gray;
-  /* IE 6-9 */
-}
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl div.sub_sep {
   border-top: 1px solid #E6E6E6;
 }