diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index caa1fc99c1..33ba398a50 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -75,35 +75,35 @@ tr.mail.deleted  td:first-child{
 	width: 12px;
 	height: 12px;
 	background-repeat: no-repeat;
-	background-image: url(../default/images/kmmsgread.png);
+	background-image: url(../default/images/kmmsgread.svg);
 }
 
 tr.deleted .status_img {
-	background-image: url(../default/images/kmmsgdel.png);
+	background-image: url(../default/images/kmmsgdel.svg);
 }
 
 tr.unseen .status_img {
-	background-image: url(../default/images/kmmsgunseen.png);
+	background-image: url(../default/images/kmmsgunseen.svg);
 }
 
 tr.flagged_seen .status_img {
-	background-image: url(../default/images/read_flagged_small.png) !important;
+	background-image: url(../default/images/read_flagged_small.svg) !important;
 }
 
 tr.flagged_unseen .status_img {
-	background-image: url(../default/images/unread_flagged_small.png) !important;
+	background-image: url(../default/images/unread_flagged_small.svg) !important;
 }
 
 tr.recent .status_img {
-	background-image: url(../default/images/kmmsgnew.png) !important;
+	background-image: url(../default/images/kmmsgnew.svg) !important;
 }
 
 tr.replied .status_img {
-	background-image: url(../default/images/kmmsgreplied.png) !important;
+	background-image: url(../default/images/mail_reply.svg) !important;
 }
 
 tr.forwarded .status_img {
-	background-image: url(../default/images/kmmsgforwarded.png) !important;
+	background-image: url(../default/images/mail_forward.svg) !important;
 }
 
 .subjectBold
@@ -214,7 +214,6 @@ table tr.attachmentRow > td > img {
 
 pre {
  white-space: pre-wrap; /* Mozilla, since 1999 */
- white-space: -pre-wrap; /* Opera 4-6 */
  white-space: -o-pre-wrap; /* Opera 7 */
  width: 99%;
 }
@@ -409,7 +408,6 @@ div.mailUploadSection > div.et2_hbox > label {
 	border-right: 1px solid gray;
 	border-bottom: 1px solid gray;
 	background-color: #c0d2ec;
-	background-image: url(../../../phpgwapi/templates/default/images/egw_action/header_overlay.png);
 	background-position: center;
 	background-repeat: repeat-x;
 }
@@ -431,7 +429,7 @@ div.mail-compose_fileselector {
 }
 .mail-compose_fileselector span.et2_file_span {
 	background-repeat: no-repeat;
-	background-image: url(../default/images/attach.png);
+	background-image: url(../default/images/attach.svg);
 	background-size: inherit;
 	background-position: left;
 }
@@ -443,7 +441,7 @@ div.mail-compose_fileselector {
 	font-weight: bold;
 	padding-left: 30px;
 	width: 80px;
-	background-image: url(../default/images/mail_send.png) !important;
+	background-image: url(../default/images/mail_send.svg) !important;
 	background-position: left;
 	background-repeat: no-repeat;
 }
@@ -901,7 +899,7 @@ and (orientation : portrait) {
 /* Smartphones (landscape) ----------- */
 @media only screen
 and (min-width : 321px)
-and (max-device-width:768){
+and (max-device-width:768px){
 	#mail-index div#mail-index_nm tr.mail.row {
 
 	}
diff --git a/mail/templates/default/images/kmmsgforwarded.png b/mail/templates/default/images/kmmsgforwarded.png
deleted file mode 100644
index a791fb1da4..0000000000
Binary files a/mail/templates/default/images/kmmsgforwarded.png and /dev/null differ
diff --git a/mail/templates/default/images/kmmsgreplied.png b/mail/templates/default/images/kmmsgreplied.png
deleted file mode 100755
index 29d2ccf09a..0000000000
Binary files a/mail/templates/default/images/kmmsgreplied.png and /dev/null differ
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 2518f17f37..a56ede07ef 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -89,22 +89,22 @@ tr.mail.deleted td:first-child {
   width: 12px;
   height: 12px;
   background-repeat: no-repeat;
-  background-image: url(../default/images/kmmsgread.png);
+  background-image: url(../default/images/kmmsgread.svg);
 }
 tr.deleted .status_img {
-  background-image: url(../default/images/kmmsgdel.png);
+  background-image: url(../default/images/kmmsgdel.svg);
 }
 tr.unseen .status_img {
-  background-image: url(../default/images/kmmsgunseen.png);
+  background-image: url(../default/images/kmmsgunseen.svg);
 }
 tr.flagged_seen .status_img {
-  background-image: url(../default/images/read_flagged_small.png) !important;
+  background-image: url(../default/images/read_flagged_small.svg) !important;
 }
 tr.flagged_unseen .status_img {
-  background-image: url(../default/images/unread_flagged_small.png) !important;
+  background-image: url(../default/images/unread_flagged_small.svg) !important;
 }
 tr.recent .status_img {
-  background-image: url(../default/images/kmmsgnew.png) !important;
+  background-image: url(../default/images/kmmsgnew.svg) !important;
 }
 tr.replied .status_img {
   background-image: url(../default/images/kmmsgreplied.png) !important;
@@ -204,8 +204,6 @@ table tr.attachmentRow > td > img {
 pre {
   white-space: pre-wrap;
   /* Mozilla, since 1999 */
-  white-space: -pre-wrap;
-  /* Opera 4-6 */
   white-space: -o-pre-wrap;
   /* Opera 7 */
   width: 99%;
@@ -429,7 +427,7 @@ div.mail-compose_fileselector {
 }
 .mail-compose_fileselector span.et2_file_span {
   background-repeat: no-repeat;
-  background-image: url(../default/images/attach.png);
+  background-image: url(../default/images/attach.svg);
   background-size: inherit;
   background-position: left;
 }
@@ -441,7 +439,7 @@ div.mail-compose_fileselector {
   font-weight: bold;
   padding-left: 30px;
   width: 80px;
-  background-image: url(../default/images/mail_send.png) !important;
+  background-image: url(../default/images/mail_send.svg) !important;
   background-position: left;
   background-repeat: no-repeat;
 }
@@ -1604,30 +1602,8 @@ tr.mail.deleted td:first-child {
   width: 16px;
   height: 16px;
   background-repeat: no-repeat;
-  background-image: url(../api/templates/default/images/kmmsgread.svg);
   background-size: 16px 16px;
 }
-tr.deleted .status_img {
-  background-image: url(../api/templates/default/images/kmmsgdel.svg);
-}
-tr.unseen .status_img {
-  background-image: url(../api/templates/default/images/kmmsgunseen.svg);
-}
-tr.flagged_seen .status_img {
-  background-image: url(../api/templates/default/images/read_flagged_small.svg) !important;
-}
-tr.flagged_unseen .status_img {
-  background-image: url(../api/templates/default/images/unread_flagged_small.svg) !important;
-}
-tr.recent .status_img {
-  background-image: url(../api/templates/default/images/kmmsgnew.svg) !important;
-}
-tr.replied .status_img {
-  background-image: url(../api/templates/default/images/mail_reply.svg) !important;
-}
-tr.forwarded .status_img {
-  background-image: url(../api/templates/default/images/mail_forward.svg) !important;
-}
 .subjectBold {
   font-size: 12px;
   font-weight: bold;
@@ -1803,7 +1779,7 @@ input[type=button] {
   text-align: left;
   font-weight: bold;
   padding-left: 25px;
-  background-image: url(../api/templates/default/images/write_mail.png) !important;
+  background-image: url(../default/images/write_mail.png) !important;
   background-position: left;
   background-repeat: no-repeat;
 }
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index d0bd5452b1..f666ac25a7 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -641,38 +641,9 @@ tr.mail.deleted td:first-child {
 	width: 16px;
 	height: 16px;
 	background-repeat: no-repeat;
-	background-image: url(../api/templates/default/images/kmmsgread.svg);
 	background-size: 16px 16px;
 }
 
-tr.deleted .status_img {
-	background-image: url(../api/templates/default/images/kmmsgdel.svg);
-}
-
-tr.unseen .status_img {
-	background-image: url(../api/templates/default/images/kmmsgunseen.svg);
-}
-
-tr.flagged_seen .status_img {
-	background-image: url(../api/templates/default/images/read_flagged_small.svg) !important;
-}
-
-tr.flagged_unseen .status_img {
-	background-image: url(../api/templates/default/images/unread_flagged_small.svg) !important;
-}
-
-tr.recent .status_img {
-	background-image: url(../api/templates/default/images/kmmsgnew.svg) !important;
-}
-
-tr.replied .status_img {
-	background-image: url(../api/templates/default/images/mail_reply.svg) !important;
-}
-
-tr.forwarded .status_img {
-	background-image: url(../api/templates/default/images/mail_forward.svg) !important;
-}
-
 .subjectBold
 {
 	font-size: 12px;
@@ -877,7 +848,7 @@ input[type=button] {
 	text-align: left;
 	font-weight: bold;
 	padding-left: 25px;
-	background-image: url(../api/templates/default/images/write_mail.png) !important;
+	background-image: url(../default/images/write_mail.png) !important;
 	background-position: left;
 	background-repeat: no-repeat;
 }