diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 9f7390757d..615083d9c1 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -3519,7 +3519,7 @@ td.lettersearch {
   float: right;
   width: 24px;
   height: 24px;
-  background-image: url(../images/delete.png);
+  background-image: url(../images/delete.svg);
   background-repeat: no-repeat;
   background-position: center;
   background-size: 12px;
@@ -3563,7 +3563,7 @@ td.lettersearch {
   float: right;
   width: 24px;
   height: 24px;
-  background-image: url(../images/search.png);
+  background-image: url(../images/search.svg);
   background-repeat: no-repeat;
   background-position: center;
   background-size: 12px;
@@ -3614,7 +3614,7 @@ td.lettersearch {
   float: right;
   width: 24px;
   height: 24px;
-  background-image: url(../images/close.png);
+  background-image: url(../images/close.svg);
   background-repeat: no-repeat;
   background-position: center;
   background-size: 12px;
@@ -3680,7 +3680,7 @@ td.lettersearch {
   background: rgba(103, 159, 210, 0.2);
 }
 #egwpopup div#egwpopup_header .egwpopup_deleteall {
-  background-image: url(../images/delete.png);
+  background-image: url(../images/delete.svg);
   width: 12px;
   height: 12px;
   background-position: center;
@@ -3705,7 +3705,7 @@ td.lettersearch {
   z-index: 200;
   width: 26px;
   height: 16px;
-  top: 9px;
+  top: 11px;
   position: fixed;
   right: 109px;
   border: 1px solid #656565;
@@ -4935,7 +4935,7 @@ td.message span.message {
 ###################################################*/
 /*#egw_fw_topmenu_addons{}*/
 #egw_fw_logout {
-  background-image: url(../images/logout.png);
+  background-image: url(../images/logout.svg);
   background-size: 16px 16px;
   background-position: center center;
   background-repeat: no-repeat;
@@ -4971,7 +4971,7 @@ td.message span.message {
   box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
 }
 #egw_fw_print {
-  background-image: url(../images/print.png);
+  background-image: url(../images/print.svg);
   background-size: 16px 16px;
   background-position: center center;
   background-repeat: no-repeat;
@@ -5070,7 +5070,7 @@ td.message span.message {
   position: fixed;
   right: 80px;
   top: 5px;
-  background-image: url(../images/add.png);
+  background-image: url(../images/add.svg);
   background-repeat: no-repeat;
   background-size: 20px 20px;
   background-position: 4px 4px;
diff --git a/pixelegg/css/monochrome.css b/pixelegg/css/monochrome.css
index 55392375cc..c403120e27 100644
--- a/pixelegg/css/monochrome.css
+++ b/pixelegg/css/monochrome.css
@@ -3508,7 +3508,7 @@ td.lettersearch {
   float: right;
   width: 24px;
   height: 24px;
-  background-image: url(../images/delete.png);
+  background-image: url(../images/delete.svg);
   background-repeat: no-repeat;
   background-position: center;
   background-size: 12px;
@@ -3552,7 +3552,7 @@ td.lettersearch {
   float: right;
   width: 24px;
   height: 24px;
-  background-image: url(../images/search.png);
+  background-image: url(../images/search.svg);
   background-repeat: no-repeat;
   background-position: center;
   background-size: 12px;
@@ -3603,7 +3603,7 @@ td.lettersearch {
   float: right;
   width: 24px;
   height: 24px;
-  background-image: url(../images/close.png);
+  background-image: url(../images/close.svg);
   background-repeat: no-repeat;
   background-position: center;
   background-size: 12px;
@@ -3669,7 +3669,7 @@ td.lettersearch {
   background: rgba(103, 159, 210, 0.2);
 }
 #egwpopup div#egwpopup_header .egwpopup_deleteall {
-  background-image: url(../images/delete.png);
+  background-image: url(../images/delete.svg);
   width: 12px;
   height: 12px;
   background-position: center;
@@ -3694,7 +3694,7 @@ td.lettersearch {
   z-index: 200;
   width: 26px;
   height: 16px;
-  top: 9px;
+  top: 11px;
   position: fixed;
   right: 109px;
   border: 1px solid #656565;
@@ -4924,7 +4924,7 @@ td.message span.message {
 ###################################################*/
 /*#egw_fw_topmenu_addons{}*/
 #egw_fw_logout {
-  background-image: url(../images/logout.png);
+  background-image: url(../images/logout.svg);
   background-size: 16px 16px;
   background-position: center center;
   background-repeat: no-repeat;
@@ -4960,7 +4960,7 @@ td.message span.message {
   box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
 }
 #egw_fw_print {
-  background-image: url(../images/print.png);
+  background-image: url(../images/print.svg);
   background-size: 16px 16px;
   background-position: center center;
   background-repeat: no-repeat;
@@ -5059,7 +5059,7 @@ td.message span.message {
   position: fixed;
   right: 80px;
   top: 5px;
-  background-image: url(../images/add.png);
+  background-image: url(../images/add.svg);
   background-repeat: no-repeat;
   background-size: 20px 20px;
   background-position: 4px 4px;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index ee75bdfd00..2e3ea4ec06 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -3519,7 +3519,7 @@ td.lettersearch {
   float: right;
   width: 24px;
   height: 24px;
-  background-image: url(../images/delete.png);
+  background-image: url(../images/delete.svg);
   background-repeat: no-repeat;
   background-position: center;
   background-size: 12px;
@@ -3563,7 +3563,7 @@ td.lettersearch {
   float: right;
   width: 24px;
   height: 24px;
-  background-image: url(../images/search.png);
+  background-image: url(../images/search.svg);
   background-repeat: no-repeat;
   background-position: center;
   background-size: 12px;
@@ -3614,7 +3614,7 @@ td.lettersearch {
   float: right;
   width: 24px;
   height: 24px;
-  background-image: url(../images/close.png);
+  background-image: url(../images/close.svg);
   background-repeat: no-repeat;
   background-position: center;
   background-size: 12px;
@@ -3680,7 +3680,7 @@ td.lettersearch {
   background: rgba(103, 159, 210, 0.2);
 }
 #egwpopup div#egwpopup_header .egwpopup_deleteall {
-  background-image: url(../images/delete.png);
+  background-image: url(../images/delete.svg);
   width: 12px;
   height: 12px;
   background-position: center;
@@ -3705,7 +3705,7 @@ td.lettersearch {
   z-index: 200;
   width: 26px;
   height: 16px;
-  top: 9px;
+  top: 11px;
   position: fixed;
   right: 109px;
   border: 1px solid #656565;
@@ -4935,7 +4935,7 @@ td.message span.message {
 ###################################################*/
 /*#egw_fw_topmenu_addons{}*/
 #egw_fw_logout {
-  background-image: url(../images/logout.png);
+  background-image: url(../images/logout.svg);
   background-size: 16px 16px;
   background-position: center center;
   background-repeat: no-repeat;
@@ -4971,7 +4971,7 @@ td.message span.message {
   box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
 }
 #egw_fw_print {
-  background-image: url(../images/print.png);
+  background-image: url(../images/print.svg);
   background-size: 16px 16px;
   background-position: center center;
   background-repeat: no-repeat;
@@ -5070,7 +5070,7 @@ td.message span.message {
   position: fixed;
   right: 80px;
   top: 5px;
-  background-image: url(../images/add.png);
+  background-image: url(../images/add.svg);
   background-repeat: no-repeat;
   background-size: 20px 20px;
   background-position: 4px 4px;
diff --git a/pixelegg/less/layout_messages.less b/pixelegg/less/layout_messages.less
index d5d225265a..46b27dc622 100755
--- a/pixelegg/less/layout_messages.less
+++ b/pixelegg/less/layout_messages.less
@@ -70,7 +70,7 @@
 			float: right;
 			width: 24px;
 			height: 24px;
-			background-image: url(../images/delete.png);
+			background-image: url(../images/delete.svg);
 			background-repeat: no-repeat;
 			background-position: center;
 			background-size: 12px;
@@ -112,7 +112,7 @@
 					float: right;
 					width: 24px;
 					height: 24px;
-					background-image: url(../images/search.png);
+					background-image: url(../images/search.svg);
 					background-repeat: no-repeat;
 					background-position: center;
 					background-size: 12px;
@@ -161,7 +161,7 @@
 				float: right;
 				width: 24px;
 				height: 24px;
-				background-image: url(../images/close.png);
+				background-image: url(../images/close.svg);
 				background-repeat: no-repeat;
 				background-position: center;
 				background-size: 12px;
@@ -220,7 +220,7 @@
 			}
 		}
 		.egwpopup_deleteall {
-			background-image: url(../images/delete.png);
+			background-image: url(../images/delete.svg);
 			width: 12px;
 			height: 12px;
 			background-position: center;
@@ -248,7 +248,7 @@
 	z-index: 200;
 	width: 26px;
 	height: 16px;
-	top: 9px;
+	top: 11px;
 	position: fixed;
 	right: 109px;
 	border: 1px solid #656565;
diff --git a/pixelegg/less/layout_raster_buttons.less b/pixelegg/less/layout_raster_buttons.less
index 24819ae327..25ed6a40ed 100644
--- a/pixelegg/less/layout_raster_buttons.less
+++ b/pixelegg/less/layout_raster_buttons.less
@@ -29,7 +29,7 @@
 
 // Button Logout
 #egw_fw_logout {
-    background-image: url(../images/logout.png);
+    background-image: url(../images/logout.svg);
     background-size: 16px 16px;
     background-position: center center;
     background-repeat: no-repeat;
@@ -59,7 +59,7 @@
 // Button Print
 
 #egw_fw_print {
-    background-image: url(../images/print.png);
+    background-image: url(../images/print.svg);
     background-size: 16px 16px;
     background-position: center center;
     background-repeat: no-repeat;
@@ -173,7 +173,7 @@
 			right: 80px;
 			top: 5px;
 
-			background-image: url(../images/add.png);
+			background-image: url(../images/add.svg);
 			background-repeat: no-repeat;
 			background-size: 20px 20px;
 			background-position: 4px 4px;
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index 28430892b0..e1ce2161f9 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -3530,7 +3530,7 @@ td.lettersearch {
   float: right;
   width: 24px;
   height: 24px;
-  background-image: url(../images/delete.png);
+  background-image: url(../images/delete.svg);
   background-repeat: no-repeat;
   background-position: center;
   background-size: 12px;
@@ -3574,7 +3574,7 @@ td.lettersearch {
   float: right;
   width: 24px;
   height: 24px;
-  background-image: url(../images/search.png);
+  background-image: url(../images/search.svg);
   background-repeat: no-repeat;
   background-position: center;
   background-size: 12px;
@@ -3625,7 +3625,7 @@ td.lettersearch {
   float: right;
   width: 24px;
   height: 24px;
-  background-image: url(../images/close.png);
+  background-image: url(../images/close.svg);
   background-repeat: no-repeat;
   background-position: center;
   background-size: 12px;
@@ -3691,7 +3691,7 @@ td.lettersearch {
   background: rgba(103, 159, 210, 0.2);
 }
 #egwpopup div#egwpopup_header .egwpopup_deleteall {
-  background-image: url(../images/delete.png);
+  background-image: url(../images/delete.svg);
   width: 12px;
   height: 12px;
   background-position: center;
@@ -3716,7 +3716,7 @@ td.lettersearch {
   z-index: 200;
   width: 26px;
   height: 16px;
-  top: 9px;
+  top: 11px;
   position: fixed;
   right: 109px;
   border: 1px solid #656565;
@@ -4946,7 +4946,7 @@ td.message span.message {
 ###################################################*/
 /*#egw_fw_topmenu_addons{}*/
 #egw_fw_logout {
-  background-image: url(../images/logout.png);
+  background-image: url(../images/logout.svg);
   background-size: 16px 16px;
   background-position: center center;
   background-repeat: no-repeat;
@@ -4982,7 +4982,7 @@ td.message span.message {
   box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
 }
 #egw_fw_print {
-  background-image: url(../images/print.png);
+  background-image: url(../images/print.svg);
   background-size: 16px 16px;
   background-position: center center;
   background-repeat: no-repeat;
@@ -5081,7 +5081,7 @@ td.message span.message {
   position: fixed;
   right: 80px;
   top: 5px;
-  background-image: url(../images/add.png);
+  background-image: url(../images/add.svg);
   background-repeat: no-repeat;
   background-size: 20px 20px;
   background-position: 4px 4px;