diff --git a/mail/templates/pixelegg/images/mail_forward.png b/mail/templates/pixelegg/images/mail_forward.png
index 23d4674ef8..8625ae0250 100755
Binary files a/mail/templates/pixelegg/images/mail_forward.png and b/mail/templates/pixelegg/images/mail_forward.png differ
diff --git a/mail/templates/pixelegg/images/mail_forward_attach.png b/mail/templates/pixelegg/images/mail_forward_attach.png
index c66c518438..d8efa1e887 100644
Binary files a/mail/templates/pixelegg/images/mail_forward_attach.png and b/mail/templates/pixelegg/images/mail_forward_attach.png differ
diff --git a/mail/templates/pixelegg/images/mail_forward_attach.svg b/mail/templates/pixelegg/images/mail_forward_attach.svg
index b83401726f..bd885eadcd 100644
--- a/mail/templates/pixelegg/images/mail_forward_attach.svg
+++ b/mail/templates/pixelegg/images/mail_forward_attach.svg
@@ -5,45 +5,17 @@
 	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
 <g>
 	<g>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="#62686A" d="M24.648,13.194l-6.342-8.341
-			c-1.829-1.829-4.792-1.832-6.616-0.008l-1.677,1.678l0.011,2.975H4.833C2.164,9.498,0,11.665,0,14.338v4.322
-			c0,2.673,2.164,4.84,4.833,4.84h5.24l0.011,2.973l1.642,1.643c1.83,1.828,4.792,1.832,6.616,0.007l6.312-8.312
-			C26.48,17.984,26.477,15.023,24.648,13.194z M22.008,18.483l-4.992,6.991c-1.094,1.095-2.872,1.094-3.969-0.004l-0.008-4.874H5.8
-			c-1.602,0-2.9-1.3-2.9-2.903v-2.388c0-1.604,1.299-2.903,2.9-2.903h7.225l-0.008-4.909c1.096-1.095,2.871-1.093,3.969,0.005
-			l5.018,7.017C23.102,15.611,23.104,17.389,22.008,18.483z"/>
+		<path fill="#62686A" d="M27.314,13.194l-6.342-8.341c-1.828-1.829-4.792-1.832-6.617-0.008L12.68,6.523l0.011,2.975H7.5
+			c-2.669,0-4.833,2.167-4.833,4.84v4.322c0,2.673,2.164,4.84,4.833,4.84h5.24l0.011,2.973l1.642,1.645
+			c1.83,1.826,4.792,1.832,6.616,0.007l6.312-8.312C29.146,17.984,29.145,15.023,27.314,13.194z M24.675,18.482l-4.991,6.992
+			c-1.095,1.094-2.873,1.094-3.97-0.006l-0.008-4.874H8.467c-1.602,0-2.9-1.3-2.9-2.901v-2.388c0-1.604,1.299-2.903,2.9-2.903h7.225
+			l-0.008-4.909c1.095-1.095,2.871-1.093,3.968,0.005l5.019,7.017C25.77,15.611,25.771,17.389,24.675,18.482z"/>
 	</g>
 </g>
 <g>
-	<g>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="#62686A" d="M65.377,22.319l-6.342-8.341
-			c-1.828-1.829-4.791-1.832-6.615-0.008l-1.678,1.678l0.011,2.975h-5.19c-2.67,0-4.834,2.167-4.834,4.84v4.322
-			c0,2.673,2.164,4.84,4.834,4.84h5.239l0.011,2.973l1.643,1.643c1.83,1.828,4.791,1.832,6.615,0.007l6.312-8.312
-			C67.209,27.109,67.205,24.148,65.377,22.319z M62.736,27.608L57.744,34.6c-1.094,1.095-2.871,1.094-3.969-0.004l-0.008-4.874
-			h-7.238c-1.602,0-2.9-1.3-2.9-2.903v-2.388c0-1.604,1.299-2.903,2.9-2.903h7.225l-0.008-4.909
-			c1.096-1.095,2.871-1.093,3.969,0.005l5.018,7.017C63.83,24.736,63.832,26.514,62.736,27.608z"/>
-	</g>
-</g>
-<g>
-	<path fill="#62686A" d="M42.938,40.625c-4.239,0-7.688-3.448-7.688-7.688c0-4.24,3.448-7.688,7.688-7.688
-		c4.239,0,7.688,3.448,7.688,7.688C50.626,37.177,47.178,40.625,42.938,40.625z"/>
-	<path fill="#62686A" d="M42.938,25.75c3.963,0,7.188,3.225,7.188,7.188s-3.225,7.188-7.188,7.188S35.75,36.9,35.75,32.938
-		S38.976,25.75,42.938,25.75 M42.938,24.75c-4.521,0-8.188,3.666-8.188,8.188c0,4.522,3.667,8.188,8.188,8.188
-		c4.521,0,8.188-3.666,8.188-8.188C51.126,28.415,47.46,24.75,42.938,24.75L42.938,24.75z"/>
-</g>
-<path fill="#FEFEFE" d="M43.229,38.428c-1.47,1.446-3.834,1.441-5.295-0.021c-1.461-1.461-1.467-3.824-0.02-5.294l0,0l4.651-4.651
-	l0.664-0.665l0.666-0.665c1.1-1.102,2.885-1.102,3.986,0s1.102,2.887,0,3.987l-0.664,0.665l-0.665,0.664l-2.331,2.332l-0.838,0.836
-	L41.901,37.1l-0.002-0.002c-0.736,0.713-1.909,0.708-2.636-0.019c-0.728-0.727-0.731-1.901-0.019-2.636l-0.002-0.002l0.664-0.665
-	l0.818-0.817l0.839-0.838l1.002-1.002l0.779-0.781l0.754-0.753l0.461-0.46l0.664,0.664l-0.645,0.645l-0.685,0.686L42.5,32.515
-	l-0.719,0.717l-0.708,0.709l-0.5,0.501l-0.666,0.664c-0.367,0.367-0.367,0.962,0,1.328c0.366,0.368,0.962,0.368,1.329,0l1.165-1.164
-	l0.709-0.709l0.719-0.717l0.729-0.731l1.175-1.175l0.155-0.154l0.664-0.665l0.665-0.664l-0.002-0.002
-	c0.007-0.007,0.017-0.012,0.023-0.019c0.733-0.734,0.733-1.924,0-2.658c-0.734-0.734-1.925-0.734-2.659,0
-	c-0.007,0.008-0.012,0.016-0.019,0.022l-0.002-0.001l-0.664,0.664l-0.665,0.664l-0.154,0.154l-1.175,1.176l-1.548,1.547
-	l-1.774,1.775c-1.101,1.101-1.101,2.887,0,3.988c1.102,1.102,2.886,1.102,3.987,0l1.775-1.775l4.205-4.207l0.664-0.663l0.665,0.663
-	l-0.665,0.666L43.229,38.428L43.229,38.428z"/>
-<g>
-	<polygon fill="#62686A" points="25.531,10.275 25.531,6.375 21.725,6.375 21.725,4.375 25.531,4.375 25.531,0.5 27.594,0.5 
-		27.594,4.375 31.5,4.375 31.5,6.375 27.594,6.375 27.594,10.275 	"/>
-	<path fill="#62686A" d="M27.094,1v2.875v1h1H31v1h-2.906h-1v1v2.9h-1.062v-2.9v-1h-1h-2.807v-1h2.807h1v-1V1H27.094 M28.094,0
-		h-3.062v3.875h-3.807v3h3.807v3.9h3.062v-3.9H32v-3h-3.906V0L28.094,0z"/>
+	<polygon fill="#62686A" points="26.632,8.527 26.632,5.291 23.473,5.291 23.473,3.63 26.632,3.63 26.632,0.415 28.343,0.415 
+		28.343,3.63 31.585,3.63 31.585,5.291 28.343,5.291 28.343,8.527 	"/>
+	<path fill="#62686A" d="M27.928,0.83v2.386v0.83h0.83h2.412v0.83h-2.412h-0.83v0.83v2.407h-0.881V5.706v-0.83h-0.83h-2.329v-0.83
+		h2.329h0.83v-0.83V0.83H27.928 M28.758,0h-2.541v3.216h-3.16v2.49h3.16v3.237h2.541V5.706H32v-2.49h-3.242V0L28.758,0z"/>
 </g>
 </svg>
diff --git a/mail/templates/pixelegg/images/mail_reply.png b/mail/templates/pixelegg/images/mail_reply.png
index e990dae99e..c560953b65 100755
Binary files a/mail/templates/pixelegg/images/mail_reply.png and b/mail/templates/pixelegg/images/mail_reply.png differ