diff --git a/api/templates/default/images/accounts.svg b/api/templates/default/images/accounts.svg
new file mode 100644
index 0000000000..55b90e15a5
--- /dev/null
+++ b/api/templates/default/images/accounts.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+ <path d="m14 18h4v3h-4zm2 4h1l2 7-3 3-3-3 2-7zm8-14a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8zm-4.4863 9.166c1.7e-4 1.2169 0.20298 5.982-1.0059 5.998 0.47857 1.5808 1.2001 3.7568 1.7578 4.7051 4.7904-0.2735 8.7344-0.88476 8.7344-0.88476l-3.25-8.1035s-2.7953-1.1474-6.2363-1.7148zm-7.0273 0.0234c-3.3306 0.57539-6.2363 1.6914-6.2363 1.6914l-3.25 8.1035s3.9208 0.6139 8.7344 0.88671c0.55783-0.94744 1.279-3.1254 1.7578-4.707-1.203-0.016-1.0079-4.7296-1.0059-5.9746z" fill="#62686a"/>
+</svg>
diff --git a/api/templates/default/images/group.svg b/api/templates/default/images/group.svg
new file mode 100644
index 0000000000..a4a9e7481e
--- /dev/null
+++ b/api/templates/default/images/group.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+ <path d="M16 0a5 5 0 0 0-5 5 5 5 0 0 0 5 5 5 5 0 0 0 5-5 5 5 0 0 0-5-5zM7.895 2.053a4.21 4.21 0 1 0 0 8.421 4.211 4.211 0 0 0 2.71-1.03A6.96 6.96 0 0 1 9 5c0-.925.184-1.81.516-2.621a4.21 4.21 0 0 0-1.622-.326zm16.105 0a4.211 4.211 0 0 0-1.518.32c.333.813.517 1.7.517 2.627a6.96 6.96 0 0 1-1.648 4.492 4.21 4.21 0 0 0 2.648.983 4.21 4.21 0 1 0 0-8.422zM16 12c-2.498 0-5.528.15-7 1l1 8 3 1.951V31c.733.678 1.984 1 3 1s2.267-.322 3-1v-8.049L22 21l1-8c-1.473-.85-4.503-1-7-1zm-9.118.178C5.023 12.22 3.048 12.395 2 13l.841 6.736L5.37 21.38v6.78c.617.57 1.67.841 2.525.841s1.91-.27 2.527-.842V23.66l-2.29-1.49zm18.234.002-1.248 9.99-2.394 1.557v4.431c.617.571 1.67.842 2.525.842s1.908-.271 2.526-.842v-6.78l2.527-1.642.842-6.736c-1.028-.594-2.95-.774-4.778-.82z" fill="#62686a"/>
+</svg>
diff --git a/api/templates/default/images/personal.svg b/api/templates/default/images/personal.svg
new file mode 100644
index 0000000000..34dbec8347
--- /dev/null
+++ b/api/templates/default/images/personal.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+ <path d="m16 12c-2.4973 0-5.5277 0.14994-7 1l1 8 3 1.9512v8.0488c0.73303 0.67797 1.9842 1 3 1s2.267-0.32203 3-1v-8.0488l3-1.9512 1-8c-1.4723-0.85006-4.5027-1-7-1zm5-7a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#62686a"/>
+</svg>
diff --git a/api/templates/default/images/single.svg b/api/templates/default/images/single.svg
new file mode 100644
index 0000000000..796db8690d
--- /dev/null
+++ b/api/templates/default/images/single.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+ <path d="m25.143 9.1428a9.1429 9.1429 0 0 1-9.1429 9.1429 9.1429 9.1429 0 0 1-9.1429-9.1429 9.1429 9.1429 0 0 1 9.1429-9.1428 9.1429 9.1429 0 0 1 9.1429 9.1428zm4.7846 11.909m0.9297 9.7882-3.7148-9.2607s-5.6268-2.3162-11.142-2.3162c-5.1235 0-11.142 2.3162-11.142 2.3162l-3.7148 9.2607s7.3952 1.1601 14.857 1.1601c7.3932 0 14.857-1.1601 14.857-1.1601z" fill="#62686a"/>
+</svg>
diff --git a/api/templates/default/images/users.svg b/api/templates/default/images/users.svg
new file mode 100644
index 0000000000..99f030f9fd
--- /dev/null
+++ b/api/templates/default/images/users.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+ <path d="M18.632 11.19c.073.434 0 1.683 0 2.139 0 .34-.113.778-.32 1.26.864.593 1.877.995 3.022.995 1.664 0 3.06-.837 4.107-1.9a43.202 43.202 0 0 0 3.893-.593c-.636-.596-1.273-1.725-1.827-2.931.03-.147.05-.282.05-.394 0-.354.057-1.327 0-1.664-.496-2.853-3.21-4.986-6.223-4.986-2.44 0-4.65 1.34-5.674 3.36 1.527 1.152 2.641 2.8 2.972 4.714zm-2.026 5.887c-.79.816-1.793 1.564-2.976 2.056 3.818.543 7.037 1.89 7.037 1.89l1.458 3.703H32l-2.667-6.649s-4.04-1.663-8-1.663c-1.588 0-3.297.312-4.727.663zm4.728 10.973-2.667-6.649s-4.04-1.663-8-1.663c-3.679 0-8 1.663-8 1.663l-2.668 6.65s5.31.832 10.667.832c5.309 0 10.667-.833 10.667-.833zm-10.667-9.973c3.81 0 6.22-3.563 6.22-4.988 0-.354.062-1.326 0-1.663-.493-2.854-3.208-4.986-6.22-4.986-3.053 0-5.776 2.077-6.223 4.986-.046.3 0 1.348 0 1.663.001 1.427 2.412 4.988 6.223 4.988z" fill="#62686a"/>
+</svg>
diff --git a/pixelegg/css/mobile.less b/pixelegg/css/mobile.less
index 62972a9bf6..c11c64f5ec 100644
--- a/pixelegg/css/mobile.less
+++ b/pixelegg/css/mobile.less
@@ -285,7 +285,7 @@
 						background-image: url(../../api/templates/default/images/logout.svg);
 					}
 					a#topmenu_current_user{
-						background-image: url(../../api/templates/default/images/users.png);
+						background-image: url(../../api/templates/default/images/users.svg);
 					}
 				}
 			}
diff --git a/pixelegg/css/monochrome.css b/pixelegg/css/monochrome.css
index 84662c922e..6e1af1e6be 100644
--- a/pixelegg/css/monochrome.css
+++ b/pixelegg/css/monochrome.css
@@ -2179,7 +2179,7 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
   opacity: 0.5;
 }
 #loginMainDiv div#centerBox form table.divLoginbox span.field_icons.username {
-  background-image: url(../../api/templates/default/images/personal.png);
+  background-image: url(../../api/templates/default/images/personal.svg);
 }
 #loginMainDiv div#centerBox form table.divLoginbox span.field_icons.password {
   background-image: url(../../api/templates/default/images/password.svg);
@@ -4371,7 +4371,7 @@ span.overlayContainer img.overlay {
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_current_user {
   background-repeat: no-repeat;
-  background-image: url(../../api/templates/default/images/users.png);
+  background-image: url(../../api/templates/default/images/users.svg);
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_logout {
   background-repeat: no-repeat;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 42ea81c535..70bb09f111 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -2189,7 +2189,7 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
   opacity: 0.5;
 }
 #loginMainDiv div#centerBox form table.divLoginbox span.field_icons.username {
-  background-image: url(../../api/templates/default/images/personal.png);
+  background-image: url(../../api/templates/default/images/personal.svg);
 }
 #loginMainDiv div#centerBox form table.divLoginbox span.field_icons.password {
   background-image: url(../../api/templates/default/images/password.svg);
@@ -4381,7 +4381,7 @@ span.overlayContainer img.overlay {
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_current_user {
   background-repeat: no-repeat;
-  background-image: url(../../api/templates/default/images/users.png);
+  background-image: url(../../api/templates/default/images/users.svg);
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_logout {
   background-repeat: no-repeat;
diff --git a/pixelegg/less/layout_loginPage.less b/pixelegg/less/layout_loginPage.less
index 488cdad196..5d1583b645 100644
--- a/pixelegg/less/layout_loginPage.less
+++ b/pixelegg/less/layout_loginPage.less
@@ -355,7 +355,7 @@ div#loginMainDiv.stockLoginBackground {
 					z-index: 100;
 					opacity:0.5;
 				}
-				span.field_icons.username {background-image: url(../../api/templates/default/images/personal.png);}
+				span.field_icons.username {background-image: url(../../api/templates/default/images/personal.svg);}
 				span.field_icons.password {background-image: url(../../api/templates/default/images/password.svg);}
 				span.field_icons.remember_me {background-image: none;z-index:0;width: 230px;padding-left: 31px;}
 				span.field_icons.domain {background-image: url(../../api/templates/default/images/internet.png);}
diff --git a/pixelegg/less/layout_raster_header.less b/pixelegg/less/layout_raster_header.less
index 339b0e34f7..98cea87dd8 100644
--- a/pixelegg/less/layout_raster_header.less
+++ b/pixelegg/less/layout_raster_header.less
@@ -225,7 +225,7 @@
 				/*Search*/
 				a#topmenu_current_user{
 					background-repeat: no-repeat;
-					background-image: url(../../api/templates/default/images/users.png);
+					background-image: url(../../api/templates/default/images/users.svg);
 				}
 				/*logout*/
 				a#topmenu_logout{