diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index ad72410ebb..905460f100 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -2199,7 +2199,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);
@@ -3537,7 +3537,7 @@ div.admin-config form > table td b {
   background-image: url(../../api/templates/default/images/dialog_error.png);
 }
 .info_message {
-  background-image: url(../../api/templates/default/images/dialog_info.png);
+  background-image: url(../../api/templates/default/images/dialog_info.svg);
 }
 .info_message .discard {
   float: right;
@@ -3551,12 +3551,16 @@ div.admin-config form > table td b {
  */
 body .egw_message_wrapper {
   background-color: #d9d9d9;
-  right: 33%;
+  right: 0 !important;
+  max-width: 25%;
+  min-width: 25%;
   box-shadow: 2px 3px 13px #666666;
   -moz-box-shadow: 2px 3px 13px #666666;
   -webkit-box-shadow: 2px 3px 13px #666666;
   -khtml-box-shadow: 2px 3px 13px #666666;
-  top: 0px;
+  bottom: 0;
+  max-height: 60%;
+  overflow-y: auto;
   z-index: 100000;
 }
 body .egw_message_wrapper > div:last-child {
@@ -4391,7 +4395,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;
@@ -4559,7 +4563,7 @@ span.overlayContainer img.overlay {
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header .notifyTabDiv:hover {
   background-color: #1E1E1E;
 }
-#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header:hover {
+#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header:hover:not(.egw_fw_ui_tab_header_active) {
   background-color: rgba(153, 204, 255, 0.4);
   padding-bottom: 0px;
   border-top: 7px solid transparent;
@@ -4569,11 +4573,9 @@ span.overlayContainer img.overlay {
   max-width: fit-content !important;
 }
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header:hover .egw_fw_ui_tab_close_button {
+  top: 0px;
   background-image: url(../../api/templates/default/images/close.svg);
 }
-#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header:hover:not(.egw_fw_ui_tab_header_active) .egw_fw_ui_tab_close_button {
-  top: 8px;
-}
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header h1 {
   font-size: 12px;
   line-height: 1em;
@@ -4611,6 +4613,9 @@ span.overlayContainer img.overlay {
   background-color: #ffffff;
   padding-top: 0px;
 }
+#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active:hover .egw_fw_ui_tab_close_button {
+  top: 2px;
+}
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active img.egw_fw_ui_tab_icon {
   padding-top: 3px;
   display: inline-block;
@@ -6057,7 +6062,7 @@ table.egwGridView_grid tbody td table.customfields tbody tr td .et2_textbox_ro {
   /*white-space: inherit;*/
 }
 table.egwGridView_grid tbody td[align="right"] {
-  padding: 3px 5px 3px 0;
+  padding: 1px 5px 3px 0;
 }
 table.egwGridView_grid > tr {
   border-bottom: 1px solid;
@@ -7342,7 +7347,7 @@ img.et2_button_icon[src*="svg"]:hover {
     background-image: url(../../api/templates/default/images/logout.svg);
   }
   body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_current_user {
-    background-image: url(../../api/templates/default/images/users.png);
+    background-image: url(../../api/templates/default/images/users.svg);
   }
   body #egw_fw_basecontainer #egw_fw_userinfo {
     height: 50px;
diff --git a/pixelegg/css/monochrome.css b/pixelegg/css/monochrome.css
index 6e1af1e6be..f7d4b049c3 100644
--- a/pixelegg/css/monochrome.css
+++ b/pixelegg/css/monochrome.css
@@ -3517,7 +3517,7 @@ div.admin-config form > table td b {
   background-image: url(../../api/templates/default/images/dialog_error.png);
 }
 .info_message {
-  background-image: url(../../api/templates/default/images/dialog_info.png);
+  background-image: url(../../api/templates/default/images/dialog_info.svg);
 }
 .info_message .discard {
   float: right;
@@ -3531,12 +3531,16 @@ div.admin-config form > table td b {
  */
 body .egw_message_wrapper {
   background-color: #d9d9d9;
-  right: 33%;
+  right: 0 !important;
+  max-width: 25%;
+  min-width: 25%;
   box-shadow: 2px 3px 13px #666666;
   -moz-box-shadow: 2px 3px 13px #666666;
   -webkit-box-shadow: 2px 3px 13px #666666;
   -khtml-box-shadow: 2px 3px 13px #666666;
-  top: 0px;
+  bottom: 0;
+  max-height: 60%;
+  overflow-y: auto;
   z-index: 100000;
 }
 body .egw_message_wrapper > div:last-child {
@@ -4539,7 +4543,7 @@ span.overlayContainer img.overlay {
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header .notifyTabDiv:hover {
   background-color: #1E1E1E;
 }
-#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header:hover {
+#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header:hover:not(.egw_fw_ui_tab_header_active) {
   background-color: rgba(153, 204, 255, 0.4);
   padding-bottom: 0px;
   border-top: 7px solid transparent;
@@ -4549,11 +4553,9 @@ span.overlayContainer img.overlay {
   max-width: fit-content !important;
 }
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header:hover .egw_fw_ui_tab_close_button {
+  top: 0px;
   background-image: url(../../api/templates/default/images/close.svg);
 }
-#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header:hover:not(.egw_fw_ui_tab_header_active) .egw_fw_ui_tab_close_button {
-  top: 8px;
-}
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header h1 {
   font-size: 12px;
   line-height: 1em;
@@ -4591,6 +4593,9 @@ span.overlayContainer img.overlay {
   background-color: #ffffff;
   padding-top: 0px;
 }
+#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active:hover .egw_fw_ui_tab_close_button {
+  top: 2px;
+}
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active img.egw_fw_ui_tab_icon {
   padding-top: 3px;
   display: inline-block;
@@ -6037,7 +6042,7 @@ table.egwGridView_grid tbody td table.customfields tbody tr td .et2_textbox_ro {
   /*white-space: inherit;*/
 }
 table.egwGridView_grid tbody td[align="right"] {
-  padding: 3px 5px 3px 0;
+  padding: 1px 5px 3px 0;
 }
 table.egwGridView_grid > tr {
   border-bottom: 1px solid;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 40bec68853..c8ed06ecfa 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -6052,7 +6052,7 @@ table.egwGridView_grid tbody td table.customfields tbody tr td .et2_textbox_ro {
   /*white-space: inherit;*/
 }
 table.egwGridView_grid tbody td[align="right"] {
-  padding: 3px 5px 3px 0;
+  padding: 1px 5px 3px 0;
 }
 table.egwGridView_grid > tr {
   border-bottom: 1px solid;
diff --git a/pixelegg/less/layout_table.less b/pixelegg/less/layout_table.less
index e0a76d8a33..ee514bc5a2 100755
--- a/pixelegg/less/layout_table.less
+++ b/pixelegg/less/layout_table.less
@@ -247,8 +247,8 @@ table.egwGridView_grid{
     }
 	// right aligned columns need to be padded right, not left
 	td[align="right"] {
-		padding: 3px 5px 3px 0;
-	}
+      padding: 1px 5px 3px 0;
+    }
 
 
     }
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index 84e24f7a0c..26c1cd0993 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -2210,7 +2210,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);
@@ -3548,7 +3548,7 @@ div.admin-config form > table td b {
   background-image: url(../../api/templates/default/images/dialog_error.png);
 }
 .info_message {
-  background-image: url(../../api/templates/default/images/dialog_info.png);
+  background-image: url(../../api/templates/default/images/dialog_info.svg);
 }
 .info_message .discard {
   float: right;
@@ -3562,12 +3562,16 @@ div.admin-config form > table td b {
  */
 body .egw_message_wrapper {
   background-color: #d9d9d9;
-  right: 33%;
+  right: 0 !important;
+  max-width: 25%;
+  min-width: 25%;
   box-shadow: 2px 3px 13px #666666;
   -moz-box-shadow: 2px 3px 13px #666666;
   -webkit-box-shadow: 2px 3px 13px #666666;
   -khtml-box-shadow: 2px 3px 13px #666666;
-  top: 0px;
+  bottom: 0;
+  max-height: 60%;
+  overflow-y: auto;
   z-index: 100000;
 }
 body .egw_message_wrapper > div:last-child {
@@ -4402,7 +4406,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;
@@ -4570,7 +4574,7 @@ span.overlayContainer img.overlay {
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header .notifyTabDiv:hover {
   background-color: #1E1E1E;
 }
-#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header:hover {
+#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header:hover:not(.egw_fw_ui_tab_header_active) {
   background-color: rgba(153, 204, 255, 0.4);
   padding-bottom: 0px;
   border-top: 7px solid transparent;
@@ -4580,11 +4584,9 @@ span.overlayContainer img.overlay {
   max-width: fit-content !important;
 }
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header:hover .egw_fw_ui_tab_close_button {
+  top: 0px;
   background-image: url(../../api/templates/default/images/close.svg);
 }
-#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header:hover:not(.egw_fw_ui_tab_header_active) .egw_fw_ui_tab_close_button {
-  top: 8px;
-}
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header h1 {
   font-size: 12px;
   line-height: 1em;
@@ -4622,6 +4624,9 @@ span.overlayContainer img.overlay {
   background-color: #ffffff;
   padding-top: 0px;
 }
+#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active:hover .egw_fw_ui_tab_close_button {
+  top: 2px;
+}
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active img.egw_fw_ui_tab_icon {
   padding-top: 3px;
   display: inline-block;
@@ -6068,7 +6073,7 @@ table.egwGridView_grid tbody td table.customfields tbody tr td .et2_textbox_ro {
   /*white-space: inherit;*/
 }
 table.egwGridView_grid tbody td[align="right"] {
-  padding: 3px 5px 3px 0;
+  padding: 1px 5px 3px 0;
 }
 table.egwGridView_grid > tr {
   border-bottom: 1px solid;
@@ -7150,7 +7155,7 @@ img.et2_button_icon[src*="svg"]:hover {
     background-image: url(../../api/templates/default/images/logout.svg);
   }
   body #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_current_user {
-    background-image: url(../../api/templates/default/images/users.png);
+    background-image: url(../../api/templates/default/images/users.svg);
   }
   body #egw_fw_basecontainer #egw_fw_userinfo {
     height: 50px;