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 @@
             <et2-hbox  class="mailPreviewHeaders">
                 <et2-description  id="mail_displaysubject" readonly="true" hoverAction="app.mail.modifyMessageSubjectDialog" hoverActionTitle="Modify subject of this message"></et2-description>
                 <et2-hbox  class="mailPreviewHeaders smimeIcons">
-                    <et2-image  id="smime_signature" src="smime_sign" statustext="Smime signed message" disabled="!@smime=smime_sign" align="right" width="24"></et2-image>
-                    <et2-image  id="smime_encryption" src="smime_encrypt" statustext="Smime encrypted message" disabled="!@smime=smime_encrypt" align="right" width="24"></et2-image>
+                    <et2-image  id="smime_signature" src="smime_sign" statustext="Smime signed message" hidden="!@smime=smime_sign" align="right" width="24"></et2-image>
+                    <et2-image  id="smime_encryption" src="smime_encrypt" statustext="Smime encrypted message" hidden="!@smime=smime_encrypt" align="right" width="24"></et2-image>
                 </et2-hbox>
             </et2-hbox>
             <et2-vbox  width="100%" class="mailPreviewHeaders onlyPrint">
diff --git a/mail/templates/default/images/smime_encrypt.svg b/mail/templates/default/images/smime_encrypt.svg
index 9947efb9eb..6c3572e30d 100644
--- a/mail/templates/default/images/smime_encrypt.svg
+++ b/mail/templates/default/images/smime_encrypt.svg
@@ -1,4 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <path d="M7.363 0C4.98 0 3 1.98 3 4.363v23.273C3 30.02 4.98 32 7.363 32H11v-2H7.363A2.358 2.358 0 0 1 5 27.636V4.363A2.358 2.358 0 0 1 7.363 2h17.273A2.358 2.358 0 0 1 27 4.363v23.273c0 .8-.396 1.503-1 1.93v2.207c1.729-.582 3-2.229 3-4.137V4.363C29 1.98 27.02 0 24.636 0zM9 5a1 1 0 0 0-1 1 1 1 0 0 0 1 1h14a1 1 0 0 0 1-1 1 1 0 0 0-1-1zm0 5a1 1 0 0 0-1 1 1 1 0 0 0 1 1h14a1 1 0 0 0 1-1 1 1 0 0 0-1-1zm9.5 4a4.512 4.512 0 0 0-4.5 4.5V20c-1.108 0-2 .892-2 2v8c0 1.108.892 2 2 2h9c1.108 0 2-.892 2-2v-8c0-1.108-.892-2-2-2v-1.5c0-2.476-2.024-4.5-4.5-4.5zm0 2c1.402 0 2.5 1.098 2.5 2.5V20h-5v-1.5c0-1.402 1.098-2.5 2.5-2.5zm0 7a2 2 0 0 1 2 2 2 2 0 0 1-1 1.727V28c0 .554-.446 1-1 1s-1-.446-1-1v-1.273a2 2 0 0 1-1-1.727 2 2 0 0 1 2-2z" fill="#62686a"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="32"
+   height="32"
+   viewBox="0 0 32 32"
+   id="svg1"
+   sodipodi:docname="smime_encrypt.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="21.6875"
+     inkscape:cx="15.976945"
+     inkscape:cy="16"
+     inkscape:window-width="1392"
+     inkscape:window-height="1067"
+     inkscape:window-x="3347"
+     inkscape:window-y="87"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1" />
+  <path
+     d="M7.363 0C4.98 0 3 1.98 3 4.363v23.273C3 30.02 4.98 32 7.363 32H11v-2H7.363A2.358 2.358 0 0 1 5 27.636V4.363A2.358 2.358 0 0 1 7.363 2h17.273A2.358 2.358 0 0 1 27 4.363v23.273c0 .8-.396 1.503-1 1.93v2.207c1.729-.582 3-2.229 3-4.137V4.363C29 1.98 27.02 0 24.636 0zM9 5a1 1 0 0 0-1 1 1 1 0 0 0 1 1h14a1 1 0 0 0 1-1 1 1 0 0 0-1-1zm0 5a1 1 0 0 0-1 1 1 1 0 0 0 1 1h14a1 1 0 0 0 1-1 1 1 0 0 0-1-1zm9.5 4a4.512 4.512 0 0 0-4.5 4.5V20c-1.108 0-2 .892-2 2v8c0 1.108.892 2 2 2h9c1.108 0 2-.892 2-2v-8c0-1.108-.892-2-2-2v-1.5c0-2.476-2.024-4.5-4.5-4.5zm0 2c1.402 0 2.5 1.098 2.5 2.5V20h-5v-1.5c0-1.402 1.098-2.5 2.5-2.5zm0 7a2 2 0 0 1 2 2 2 2 0 0 1-1 1.727V28c0 .554-.446 1-1 1s-1-.446-1-1v-1.273a2 2 0 0 1-1-1.727 2 2 0 0 1 2-2z"
+     fill="#62686a"
+     id="path1"
+     style="fill:#000000;fill-opacity:1;stroke-width:1;stroke-dasharray:none" />
 </svg>
diff --git a/mail/templates/default/images/smime_sign.svg b/mail/templates/default/images/smime_sign.svg
index 4878471ba7..1449431a42 100644
--- a/mail/templates/default/images/smime_sign.svg
+++ b/mail/templates/default/images/smime_sign.svg
@@ -1,4 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <path d="M7.363 0C4.98 0 3 1.98 3 4.363v23.273C3 30.02 4.98 32 7.363 32H12v-2H7.363A2.358 2.358 0 0 1 5 27.636V4.363A2.358 2.358 0 0 1 7.363 2h17.273A2.358 2.358 0 0 1 27 4.363v23.273c0 1.186-.865 2.16-2 2.334v2.01c2.217-.19 4-2.083 4-4.344V4.363C29 1.98 27.02 0 24.636 0zM9 5a1 1 0 0 0-1 1 1 1 0 0 0 1 1h14a1 1 0 0 0 1-1 1 1 0 0 0-1-1zm0 5a1 1 0 0 0-1 1 1 1 0 0 0 1 1h14a1 1 0 0 0 1-1 1 1 0 0 0-1-1zm8.75 4c-.808 0-1.367.43-1.727.805a2.848 2.848 0 0 0-.816-.131 2.18 2.18 0 0 0-1.086.283c-.696.395-.957 1.042-1.078 1.545-.511.117-1.174.378-1.576 1.072-.401.68-.3 1.37-.149 1.858-.382.358-.818.908-.818 1.705 0 .795.438 1.348.818 1.7-.148.49-.25 1.186.155 1.872.401.686 1.06.944 1.568 1.063.12.498.384 1.15 1.084 1.546.03.017.063.03.094.045l-1.158 3.721 1.826-.736 1.107 1.637.045.016 1.18-3.793c.164.042.34.066.531.066.6 0 1.064-.237 1.41-.512l2.186 4.182.85-1.928 2.11.445.046-.021-2.114-4.047c.106-.214.174-.429.221-.621.508-.12 1.169-.38 1.57-1.068.403-.685.302-1.376.153-1.866.38-.354.818-.906.818-1.703s-.437-1.35-.818-1.705c.15-.49.252-1.178-.155-1.866-.398-.686-1.058-.945-1.568-1.062-.12-.503-.386-1.154-1.092-1.55a2.166 2.166 0 0 0-1.074-.278c-.303 0-.576.058-.815.129-.36-.374-.918-.803-1.728-.803z" fill="#62686a"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="32"
+   height="32"
+   viewBox="0 0 32 32"
+   id="svg1"
+   sodipodi:docname="smime_sign.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="21.6875"
+     inkscape:cx="15.976945"
+     inkscape:cy="16"
+     inkscape:window-width="1392"
+     inkscape:window-height="1067"
+     inkscape:window-x="3390"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1" />
+  <path
+     d="M7.363 0C4.98 0 3 1.98 3 4.363v23.273C3 30.02 4.98 32 7.363 32H12v-2H7.363A2.358 2.358 0 0 1 5 27.636V4.363A2.358 2.358 0 0 1 7.363 2h17.273A2.358 2.358 0 0 1 27 4.363v23.273c0 1.186-.865 2.16-2 2.334v2.01c2.217-.19 4-2.083 4-4.344V4.363C29 1.98 27.02 0 24.636 0zM9 5a1 1 0 0 0-1 1 1 1 0 0 0 1 1h14a1 1 0 0 0 1-1 1 1 0 0 0-1-1zm0 5a1 1 0 0 0-1 1 1 1 0 0 0 1 1h14a1 1 0 0 0 1-1 1 1 0 0 0-1-1zm8.75 4c-.808 0-1.367.43-1.727.805a2.848 2.848 0 0 0-.816-.131 2.18 2.18 0 0 0-1.086.283c-.696.395-.957 1.042-1.078 1.545-.511.117-1.174.378-1.576 1.072-.401.68-.3 1.37-.149 1.858-.382.358-.818.908-.818 1.705 0 .795.438 1.348.818 1.7-.148.49-.25 1.186.155 1.872.401.686 1.06.944 1.568 1.063.12.498.384 1.15 1.084 1.546.03.017.063.03.094.045l-1.158 3.721 1.826-.736 1.107 1.637.045.016 1.18-3.793c.164.042.34.066.531.066.6 0 1.064-.237 1.41-.512l2.186 4.182.85-1.928 2.11.445.046-.021-2.114-4.047c.106-.214.174-.429.221-.621.508-.12 1.169-.38 1.57-1.068.403-.685.302-1.376.153-1.866.38-.354.818-.906.818-1.703s-.437-1.35-.818-1.705c.15-.49.252-1.178-.155-1.866-.398-.686-1.058-.945-1.568-1.062-.12-.503-.386-1.154-1.092-1.55a2.166 2.166 0 0 0-1.074-.278c-.303 0-.576.058-.815.129-.36-.374-.918-.803-1.728-.803z"
+     fill="#62686a"
+     id="path1"
+     style="fill:#000000;fill-opacity:1" />
 </svg>
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index 3d21234110..ec38f88573 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -20,8 +20,8 @@
                         <et2-hbox  class="mailPreviewHeaders">
                             <et2-description  id="subject" readonly="true" hoverAction="app.mail.modifyMessageSubjectDialog" hoverActionTitle="Modify subject of this message"></et2-description>
                             <et2-hbox  class="mailPreviewHeaders smimeIcons">
-                                <et2-image  id="smime_signature" src="smime_sign" statustext="Smime signed message" disabled="!@smime=smime_sign" align="right" width="24"></et2-image>
-                                <et2-image  id="smime_encryption" src="smime_encrypt" statustext="Smime encrypted message" disabled="!@smime=smime_encrypt" align="right" width="24"></et2-image>
+                                <et2-image  id="smime_signature" src="smime_sign" statustext="Smime signed message" hidden="!@smime=smime_sign" align="right" width="24"></et2-image>
+                                <et2-image  id="smime_encryption" src="smime_encrypt" statustext="Smime encrypted message" hidden="!@smime=smime_encrypt" align="right" width="24"></et2-image>
                             </et2-hbox>
                         </et2-hbox>
                         <et2-hbox  width="100%" class="mailPreviewHeaders">
diff --git a/mail/templates/mobile/view.xet b/mail/templates/mobile/view.xet
index 63454f98b7..dfc3603b3f 100644
--- a/mail/templates/mobile/view.xet
+++ b/mail/templates/mobile/view.xet
@@ -12,8 +12,8 @@
 			<et2-hbox  class="mailPreviewHeaders">
 				<et2-description  id="subject" readonly="true" hoverAction="app.mail.modifyMessageSubjectDialog" hoverActionTitle="Modify subject of this message"></et2-description>
 				<et2-hbox  class="mailPreviewHeaders smimeIcons">
-					<et2-image  id="smime_signature" src="smime_sign" statustext="Smime signed message" disabled="!@smime=smime_sign" align="right" width="24"></et2-image>
-					<et2-image  id="smime_encryption" src="smime_encrypt" statustext="Smime encrypted message" disabled="!@smime=smime_encrypt" align="right" width="24"></et2-image>
+					<et2-image  id="smime_signature" src="smime_sign" statustext="Smime signed message" hidden="!@smime=smime_sign" align="right" width="24"></et2-image>
+					<et2-image  id="smime_encryption" src="smime_encrypt" statustext="Smime encrypted message" hidden="!@smime=smime_encrypt" align="right" width="24"></et2-image>
 				</et2-hbox>
 			</et2-hbox>
 			<et2-hbox  width="100%" class="mailPreviewHeaders">