diff --git a/api/src/Image.php b/api/src/Image.php
index 2642e510df..d90db155a5 100644
--- a/api/src/Image.php
+++ b/api/src/Image.php
@@ -340,8 +340,8 @@ class Image
'mail/prio_high' => 'exclamation-diamond',
'mail/prio_low' => 'arrow-down-square',
'mail/read_flagged_small' => 'flag',
- 'mail/smime_encrypt' => 'building-lock',
- 'mail/smime_sign' => 'database-lock',
+ //'mail/smime_encrypt' => 'building-lock', // old icons are better/easier to understand, need to be adapted to new BI style
+ //'mail/smime_sign' => 'database-lock',
'mail/source' => 'code',
'mail/spam_list_domain_add' => 'house-add',
'mail/spam_list_domain_remove' => 'house-dash',
diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index 3a6b149a4e..77e1a9d915 100644
--- a/mail/templates/default/display.xet
+++ b/mail/templates/default/display.xet
@@ -9,8 +9,8 @@