diff --git a/html/themes/breezy/icons/48/apps/mail-template.png b/html/themes/breezy/icons/48/apps/mail-template.png
new file mode 100644
index 0000000000000000000000000000000000000000..39406c71b48a590d17f900d938af57f8f437a947
Binary files /dev/null and b/html/themes/breezy/icons/48/apps/mail-template.png differ
diff --git a/html/themes/breezy/icons/48/apps/tasks-dashboard.png b/html/themes/breezy/icons/48/apps/tasks-dashboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..b222757a9fd4e5fbeb1894fa2fc57992aff1b3d3
Binary files /dev/null and b/html/themes/breezy/icons/48/apps/tasks-dashboard.png differ
diff --git a/html/themes/breezy/icons/48/apps/tasks.png b/html/themes/breezy/icons/48/apps/tasks.png
new file mode 100644
index 0000000000000000000000000000000000000000..41d0b9c912301e3be30841c90f834c24e10fc6eb
Binary files /dev/null and b/html/themes/breezy/icons/48/apps/tasks.png differ
diff --git a/plugins/addons/mailtemplate/class_mailTemplate.inc b/plugins/addons/mailtemplate/class_mailTemplate.inc
index 7010fddf40c6c70d4e67da8b3ba1aaddde4fed1e..2298a80123be10375b43521351643780f64eb526 100644
--- a/plugins/addons/mailtemplate/class_mailTemplate.inc
+++ b/plugins/addons/mailtemplate/class_mailTemplate.inc
@@ -33,7 +33,7 @@ class mailTemplate extends simplePlugin
       'plObjectType'  => ['mailTemplate' => [
         'name'        => _('Mail Template'),
         'ou'          => get_ou('mailTemplateRDN'),
-        'icon'        => 'geticon.php?context=applications&icon=dsa&size=16',
+        'icon'        => 'geticon.php?context=applications&icon=mail-template&size=48',
       ]],
       'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     ];
diff --git a/plugins/addons/tasks/class_tasks.inc b/plugins/addons/tasks/class_tasks.inc
index 2cf626fc0c6d21ff744aa6a46c6f58ba91f44267..8dad71aebcfd5bca93ffbc7b24140ef787f77804 100644
--- a/plugins/addons/tasks/class_tasks.inc
+++ b/plugins/addons/tasks/class_tasks.inc
@@ -34,7 +34,7 @@ class tasks extends simplePlugin
       'plObjectType'  => ['tasks' => [
         'name'        => _('Tasks'),
         'ou'          => get_ou('tasksRDN'),
-        'icon'        => 'geticon.php?context=applications&icon=dsa&size=16',
+        'icon'        => 'geticon.php?context=applications&icon=tasks&size=48',
       ]],
       'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     ];
diff --git a/plugins/addons/tasks/class_tasksGranular.inc b/plugins/addons/tasks/class_tasksGranular.inc
index fec3e35248b928cf0d803ee7e8f8d68833475fdc..56dcedf3fff45ac05cc8f40529633a7c704495d7 100644
--- a/plugins/addons/tasks/class_tasksGranular.inc
+++ b/plugins/addons/tasks/class_tasksGranular.inc
@@ -33,7 +33,7 @@ class tasksGranular extends simplePlugin
       'plObjectType'  => ['tasksGranular' => [
         'name'        => _('TasksGranular'),
         'ou'          => get_ou('tasksRDN'),
-        'icon'        => 'geticon.php?context=applications&icon=dsa&size=16',
+        'icon'        => 'geticon.php?context=applications&icon=tasks&size=48',
       ]],
       'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     ];
diff --git a/plugins/addons/tasks/class_tasksMail.inc b/plugins/addons/tasks/class_tasksMail.inc
index 51b111731b93214b77d61279669c9d8634922ff7..881f90ae2aea8e0cc9048ff25c245bdf9ab7ea0a 100644
--- a/plugins/addons/tasks/class_tasksMail.inc
+++ b/plugins/addons/tasks/class_tasksMail.inc
@@ -28,8 +28,7 @@ class tasksMail extends simplePlugin
     return [
       'plShortName'   => _('Tasks Mail'),
       'plDescription' => _('Tasks Mail Object'),
-      'plIcon'        => 'geticon.php?context=applications&icon=supann&size=48',
-      'plSmallIcon'   => 'geticon.php?context=applications&icon=supann-status&size=16',
+      'plIcon'        => 'geticon.php?context=applications&icon=tasks&size=48',
       'plPriority'    => 42,
       'plObjectClass' => ['fdTasksMail'],
       'plFilter'      => '(objectClass=fdTasksMail)',
diff --git a/plugins/admin/mailtemplate/class_mailTemplateManagement.inc b/plugins/admin/mailtemplate/class_mailTemplateManagement.inc
index f211ee33e68752f8e80ee13fe67b105787ee904d..cfbcd572d98b735b3f4b089df4c3d5cf56014a3b 100644
--- a/plugins/admin/mailtemplate/class_mailTemplateManagement.inc
+++ b/plugins/admin/mailtemplate/class_mailTemplateManagement.inc
@@ -34,7 +34,7 @@ class mailTemplateManagement extends management
       'plShortName'   => _('Mail Template'),
       'plTitle'       => _('Mail Template'),
       'plDescription' => _('Manages mails templates'),
-      'plIcon'        => 'geticon.php?context=types&icon=user&size=48',
+      'plIcon'        => 'geticon.php?context=applications&icon=mail-template&size=48',
       'plManages'     => ['mailTemplate'],
       'plSection'     => 'conf',
       'plPriority'    => 30,
diff --git a/plugins/admin/tasks/class_tasksDashboard.inc b/plugins/admin/tasks/class_tasksDashboard.inc
index 735a07e88845d290d13363a3052db1254dde68ec..0b0b0b6dc18cc32e77a463299df2b2243ff5410c 100644
--- a/plugins/admin/tasks/class_tasksDashboard.inc
+++ b/plugins/admin/tasks/class_tasksDashboard.inc
@@ -51,7 +51,7 @@ class tasksDashboard extends management
       'plShortName'   => _('Tasks Dashboard'),
       'plDescription' => _('Provide a reporting mechanism for tasks'),
       'plTitle'       => _('Tasks Dashboard'),
-      'plIcon'        => 'geticon.php?context=applications&icon=argonaut&size=48',
+      'plIcon'        => 'geticon.php?context=applications&icon=tasks-dashboard&size=48',
       'plSection'     => ['reporting' => ['name' => _('Reporting'), 'priority' => 40]],
       'plPriority'    => 10,
       'plManages'     => ['tasksGranular'],
diff --git a/plugins/admin/tasks/class_tasksManagement.inc b/plugins/admin/tasks/class_tasksManagement.inc
index 0b95d5ca7268d908eec82568cdfcb8f1af983a01..821b34bcb4c62e9c018a3a16f66dffefa644182e 100644
--- a/plugins/admin/tasks/class_tasksManagement.inc
+++ b/plugins/admin/tasks/class_tasksManagement.inc
@@ -42,7 +42,7 @@ class tasksManagement extends management
       'plShortName'   => _('Tasks'),
       'plDescription' => _('Provide a mechanism to create and manage tasks'),
       'plTitle'       => _('Tasks'),
-      'plIcon'        => 'geticon.php?context=applications&icon=argonaut&size=48',
+      'plIcon'        => 'geticon.php?context=applications&icon=tasks&size=48',
       'plSection'     => 'conf',
       'plPriority'    => 40,
       'plManages'     => ['tasks'],