diff --git a/mail/templates/pixelegg/images/certified_message.png b/mail/templates/pixelegg/images/certified_message.png
new file mode 100644
index 0000000000..26986214b3
Binary files /dev/null and b/mail/templates/pixelegg/images/certified_message.png differ
diff --git a/mail/templates/pixelegg/images/certified_message.svg b/mail/templates/pixelegg/images/certified_message.svg
new file mode 100644
index 0000000000..927309210a
--- /dev/null
+++ b/mail/templates/pixelegg/images/certified_message.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<path fill="#62686A" d="M24.307,6.144c0,0.392-0.22,0.708-0.492,0.708H8.186c-0.272,0-0.493-0.317-0.493-0.708l0,0
+	c0-0.392,0.22-0.708,0.493-0.708h15.628C24.087,5.436,24.307,5.752,24.307,6.144L24.307,6.144z"/>
+<path fill="#62686A" d="M24.307,9.739c0,0.392-0.22,0.708-0.492,0.708H8.186c-0.272,0-0.493-0.317-0.493-0.708l0,0
+	c0-0.392,0.22-0.708,0.493-0.708h15.628C24.087,9.03,24.307,9.347,24.307,9.739L24.307,9.739z"/>
+<g id="Zwischenstaatliche_Fernstraße">
+	<g id="Schildchen_3_-_Blau">
+		<path fill="#62686A" d="M27.573,0.125H4.428c-0.312,0-0.563,0.252-0.563,0.563v28.406c0,0.311,0.252,0.562,0.563,0.562h7.916
+			v-1.127H4.991V1.251H27.01v27.278h-0.744v1.128h1.309c0.311,0,0.562-0.253,0.562-0.562V0.688
+			C28.137,0.377,27.884,0.125,27.573,0.125z"/>
+		<path fill="#62686A" d="M26.015,20.066c0-0.87-0.47-1.473-0.88-1.862c0.161-0.534,0.271-1.288-0.166-2.039
+			c-0.428-0.75-1.137-1.033-1.686-1.161c-0.13-0.549-0.415-1.261-1.174-1.694c-0.335-0.196-0.74-0.302-1.156-0.302
+			c-0.326,0-0.621,0.063-0.877,0.141c-0.387-0.408-0.986-0.878-1.857-0.878c-0.869,0-1.471,0.47-1.858,0.879
+			c-0.257-0.078-0.551-0.142-0.877-0.142c-0.416,0-0.82,0.106-1.168,0.309c-0.749,0.431-1.031,1.139-1.161,1.688
+			c-0.55,0.128-1.261,0.413-1.694,1.171c-0.431,0.743-0.321,1.496-0.159,2.029c-0.411,0.392-0.881,0.992-0.881,1.862
+			c0,0.869,0.472,1.474,0.881,1.86c-0.16,0.535-0.271,1.293,0.164,2.043c0.432,0.75,1.142,1.033,1.688,1.162
+			c0.13,0.545,0.413,1.255,1.166,1.689c0.342,0.2,0.747,0.307,1.163,0.307c0.327,0,0.621-0.065,0.878-0.143
+			c0.385,0.409,0.987,0.88,1.856,0.88s1.473-0.469,1.859-0.878c0.256,0.075,0.551,0.141,0.877,0.141
+			c0.414,0,0.816-0.106,1.164-0.307c0.752-0.431,1.036-1.143,1.166-1.689c0.546-0.131,1.257-0.415,1.689-1.167
+			c0.433-0.748,0.323-1.503,0.162-2.038C25.544,21.54,26.015,20.937,26.015,20.066z"/>
+	</g>
+</g>
+<polygon fill="#62686A" points="15.139,30.13 16.33,31.919 16.378,31.936 17.939,26.841 14.731,25.856 13.175,30.936 "/>
+<polygon fill="#62686A" points="22.999,29.767 25.27,30.254 25.318,30.23 21.701,23.193 18.472,24.854 22.084,31.875 "/>
+</svg>
diff --git a/mail/templates/pixelegg/images/smimeEncryption.png b/mail/templates/pixelegg/images/smimeEncryption.png
index b7193f6737..5488859c53 100644
Binary files a/mail/templates/pixelegg/images/smimeEncryption.png and b/mail/templates/pixelegg/images/smimeEncryption.png differ
diff --git a/mail/templates/pixelegg/images/smimeEncryption.svg b/mail/templates/pixelegg/images/smimeEncryption.svg
index 1138a06f9c..d3978ef56c 100644
--- a/mail/templates/pixelegg/images/smimeEncryption.svg
+++ b/mail/templates/pixelegg/images/smimeEncryption.svg
@@ -3,17 +3,17 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<path fill="#62686A" d="M24.307,6.144c0,0.392-0.22,0.708-0.492,0.708H8.186c-0.272,0-0.493-0.317-0.493-0.708l0,0
-	c0-0.392,0.22-0.708,0.493-0.708h15.628C24.087,5.436,24.307,5.752,24.307,6.144L24.307,6.144z"/>
-<path fill="#62686A" d="M24.307,9.739c0,0.392-0.22,0.708-0.492,0.708H8.186c-0.272,0-0.493-0.317-0.493-0.708l0,0
-	c0-0.392,0.22-0.708,0.493-0.708h15.628C24.087,9.03,24.307,9.347,24.307,9.739L24.307,9.739z"/>
-<path fill="#62686A" d="M27.573,0.125H4.428c-0.312,0-0.563,0.252-0.563,0.563v28.406c0,0.311,0.252,0.562,0.563,0.562h9.837v-1.127
-	H4.991V1.251H27.01v27.278h-0.744v1.128h1.309c0.311,0,0.562-0.253,0.562-0.562V0.688C28.137,0.377,27.884,0.125,27.573,0.125z"/>
+<path fill="#62686A" d="M27.573,0.125H4.428c-0.312,0-0.563,0.252-0.563,0.563v28.406c0,0.311,0.252,0.562,0.563,0.562H4.5v0.001
+	h7.417v2.219h15.021v-2.219h0.375h0.263c0.312,0,0.562-0.253,0.562-0.562V0.688C28.137,0.377,27.884,0.125,27.573,0.125z"/>
 <g>
-	<path fill="none" stroke="#62686A" stroke-miterlimit="10" d="M24.04,20.489v-0.927c0-2.075-1.684-4-3.76-4
-		c-2.075,0-3.759,1.924-3.759,4v0.927h-1.46v10.034h10.438V20.489H24.04z M18.113,19.74c0-1.466,0.801-2.594,2.183-2.594
-		c1.381,0,2.187,1.144,2.187,2.609l0.049,0.733h-4.469L18.113,19.74z"/>
-	<path fill="none" stroke="#62686A" stroke-miterlimit="10" d="M20.98,27.013c0,0.386-0.314,0.698-0.699,0.698l0,0
-		c-0.386,0-0.7-0.312-0.7-0.698v-2.158c0-0.386,0.314-0.699,0.7-0.699l0,0c0.385,0,0.699,0.313,0.699,0.699V27.013z"/>
+	<path fill="#FFFFFF" d="M24.133,18.384v-1.154c0-2.583-2.098-4.979-4.684-4.979c-2.58,0-4.677,2.395-4.677,4.979v1.154h-1.819
+		v12.491h12.994V18.384H24.133z M16.754,17.45c0-1.825,0.998-3.227,2.717-3.227s2.723,1.422,2.723,3.246l0.061,0.913h-5.562
+		L16.754,17.45z"/>
+	<path fill="#62686A" d="M20.322,26.507c0,0.479-0.391,0.867-0.869,0.867l0,0c-0.482,0-0.873-0.389-0.873-0.867v-2.688
+		c0-0.48,0.391-0.869,0.873-0.869l0,0c0.479,0,0.869,0.389,0.869,0.869V26.507z"/>
 </g>
+<path fill="#FFFFFF" d="M24.307,6.144c0,0.392-0.22,0.708-0.492,0.708H8.186c-0.272,0-0.493-0.317-0.493-0.708l0,0
+	c0-0.392,0.22-0.708,0.493-0.708h15.628C24.087,5.436,24.307,5.752,24.307,6.144L24.307,6.144z"/>
+<path fill="#FFFFFF" d="M24.307,9.739c0,0.392-0.22,0.708-0.492,0.708H8.186c-0.272,0-0.493-0.317-0.493-0.708l0,0
+	c0-0.392,0.22-0.708,0.493-0.708h15.628C24.087,9.03,24.307,9.347,24.307,9.739L24.307,9.739z"/>
 </svg>