From 7d111ab58dbd21330602319d66844c2bd76f9833 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Mon, 5 Aug 2019 10:59:26 +0200
Subject: [PATCH] Make app action icons colored again

---
 mail/inc/class.mail_compose.inc.php | 6 +++---
 mail/inc/class.mail_ui.inc.php      | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index 0c265f89d2..4db6fe1c77 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -165,7 +165,7 @@ class mail_compose
 			),
 			'to_infolog' => array(
 				'caption' => 'Infolog',
-				'icon' => 'to_infolog',
+				'icon' => 'infolog/navbar',
 				'group' => ++$group,
 				'checkbox' => true,
 				'hint' => 'check to save as infolog on send',
@@ -174,7 +174,7 @@ class mail_compose
 			),
 			'to_tracker' => array(
 				'caption' => 'Tracker',
-				'icon' => 'to_tracker',
+				'icon' => 'tracker/navbar',
 				'group' => $group,
 				'checkbox' => true,
 				'hint' => 'check to save as tracker entry on send',
@@ -183,7 +183,7 @@ class mail_compose
 			),
 			'to_calendar' => array(
 				'caption' => 'Calendar',
-				'icon' => 'to_calendar',
+				'icon' => 'calendar/navbar',
 				'group' => $group,
 				'checkbox' => true,
 				'hint' => 'check to save as calendar event on send',
diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 0d6e167a89..f3684beb83 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1242,7 +1242,7 @@ class mail_ui
 			'infolog' => array(
 				'caption' => 'InfoLog',
 				'hint' => 'Save as InfoLog',
-				'icon' => $GLOBALS['egw_info']['user']['preferences']['common']['template_set'] =='pixelegg' ? 'infolog' : 'infolog/navbar',
+				'icon' => 'infolog/navbar',
 				'group' => ++$group,
 				'onExecute' => 'javaScript:app.mail.mail_integrate',
 				'popup' => Link::get_registry('infolog', 'add_popup'),
@@ -1253,7 +1253,7 @@ class mail_ui
 				'caption' => 'Tracker',
 				'hint' => 'Save as ticket',
 				'group' => $group,
-				'icon' => $GLOBALS['egw_info']['user']['preferences']['common']['template_set'] =='pixelegg' ? 'tracker' : 'tracker/navbar',
+				'icon' => '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'),
@@ -1262,7 +1262,7 @@ class mail_ui
 			'calendar' => array(
 				'caption' => 'Calendar',
 				'hint' => 'Save as Calendar',
-				'icon' => $GLOBALS['egw_info']['user']['preferences']['common']['template_set'] =='pixelegg' ? 'calendar' : 'calendar/navbar',
+				'icon' => 'calendar/navbar',
 				'group' => $group,
 				'onExecute' => 'javaScript:app.mail.mail_integrate',
 				'popup' => Link::get_registry('calendar', 'add_popup'),
@@ -1294,7 +1294,7 @@ class mail_ui
 						'caption' => 'Filemanager',
 						'hint' => 'Save to filemanager',
 						'group' => $group,
-						'icon' =>  $GLOBALS['egw_info']['user']['preferences']['common']['template_set'] =='pixelegg' ? 'filemanager' : 'filemanager/navbar',
+						'icon' => 'filemanager/navbar',
 						'onExecute' => 'javaScript:app.mail.mail_save2fm',
 						'allowOnMultiple' => true,
 					),