From 082d6aa7917693a3a47104a741cb9d1587634258 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Mon, 22 Aug 2022 16:19:13 +0200
Subject: [PATCH] WIP Mobile template: Fix some of apps add buttons

---
 addressbook/templates/mobile/index.xet |    8 +-
 admin/templates/mobile/app.css         |    1 +
 admin/templates/mobile/index.xet       |    6 +-
 infolog/templates/mobile/app.css       |    1 +
 infolog/templates/mobile/index.xet     |    9 +-
 mail/templates/mobile/app.css          | 1952 +-----------------------
 mail/templates/mobile/app.less         |    2 +-
 mail/templates/mobile/index.xet        |    3 +-
 pixelegg/css/mobile.css                |   70 +-
 pixelegg/mobile/fw_mobile.css          |   79 +-
 pixelegg/mobile/fw_mobile.less         |    6 +-
 preferences/templates/mobile/app.css   |   23 +-
 timesheet/templates/mobile/app.css     |    1 +
 timesheet/templates/mobile/index.xet   |    6 +-
 14 files changed, 70 insertions(+), 2097 deletions(-)

diff --git a/addressbook/templates/mobile/index.xet b/addressbook/templates/mobile/index.xet
index f57dba1b28..96a6a4414e 100644
--- a/addressbook/templates/mobile/index.xet
+++ b/addressbook/templates/mobile/index.xet
@@ -2,15 +2,11 @@
 <!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
 <!-- $Id$ -->
 <overlay>
-	<template id="addressbook.index.left" template="" lang="" group="0" version="1.3.001">
-
-	</template>
 	<template id="addressbook.index.right_add" template="" lang="" group="0" version="1.7.001">
 		<hbox>
 			<menulist>
 				<menupopup align="right" label="Type" id="col_filter[tid]" empty_label="All"/>
 			</menulist>
-			<buttononly class="plus_button" align="right" parent_node="addressbook-index_plus_button_container" statustext="Add a new contact" id="plus_button" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit'),'850','440','_blank','addressbook',null,true); return false;"/>
 		</hbox>
 	</template>
 	<template id="addressbook.index.rows" template="" lang="" group="0" version="1.9.005">
@@ -71,7 +67,9 @@
 					<template align="right" id="addressbook.index.right_add"/>
 				</row>
 				<row>
-					<description width="0" id="plus_button_container" />
+					<hbox>
+						<buttononly class="plus_button" size="large" statustext="Add a new contact" id="plus_button" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit'),'850','440','_blank','addressbook',null,true); return false;"/>
+					</hbox>
 				</row>
 				<row>
 					<nextmatch id="nm" template="addressbook.index.rows" header_right="addressbook.index.right_add" span="all"/>
diff --git a/admin/templates/mobile/app.css b/admin/templates/mobile/app.css
index fd0a41707c..4c18333240 100644
--- a/admin/templates/mobile/app.css
+++ b/admin/templates/mobile/app.css
@@ -34,3 +34,4 @@
     display: none;
   }
 }
+/*# sourceMappingURL=app.css.map */
\ No newline at end of file
diff --git a/admin/templates/mobile/index.xet b/admin/templates/mobile/index.xet
index 9b930610e7..4c2b719358 100644
--- a/admin/templates/mobile/index.xet
+++ b/admin/templates/mobile/index.xet
@@ -2,9 +2,6 @@
 <!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
 <!-- $Id$ -->
 <overlay>
-	<template id="admin.index.add" template="" lang="" group="0" version="1.9.001">
-		<buttononly class="plus_button" id="add" parent_node="admin-index_plus_button_container" onclick='app.admin.account({id:"add"})'/>
-	</template>
 	<template id="admin.index.rows" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
 			<columns>
@@ -68,7 +65,8 @@
 	<template id="admin.index" template="" lang="" group="0" version="1.9.001">
 		<tree autoloading="admin_ui::ajax_tree" id="tree" onclick="app.admin.run" parent_node="admin_tree_target" std_images="bullet"/>
 		<description id="plus_button_container"/>
-		<nextmatch id="nm" template="admin.index.rows" header_right="admin.index.add"/>
+		<buttononly class="plus_button" id="add" onclick='app.admin.account({id:"add"})'/>
+		<nextmatch id="nm" template="admin.index.rows"/>
 		<nextmatch id="groups" template="admin.index.group"/>
 		<iframe frameborder="1" height="100%" id="iframe" scrolling="auto" width="100%" disabled="true"/>
 		<box id="ajax_target" height="99%" disabled="true"/>
diff --git a/infolog/templates/mobile/app.css b/infolog/templates/mobile/app.css
index facdb66a47..b348d06523 100644
--- a/infolog/templates/mobile/app.css
+++ b/infolog/templates/mobile/app.css
@@ -111,3 +111,4 @@
     right: 0;
   }
 }
+/*# sourceMappingURL=app.css.map */
\ No newline at end of file
diff --git a/infolog/templates/mobile/index.xet b/infolog/templates/mobile/index.xet
index 5674934e87..442dc6fa4e 100644
--- a/infolog/templates/mobile/index.xet
+++ b/infolog/templates/mobile/index.xet
@@ -2,9 +2,6 @@
 <!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
 <!-- $Id$ -->
 <overlay>
-	<template id="infolog.index.header_right" template="" lang="" group="0" version="1.9.001">
-		<button class="plus_button" parent_node="infolog-index_plus_button_container" statustext="Add a new ToDo" id="add[task]" onclick="app.infolog.add_with_extras(widget,'task','$cont[action]','$cont[action_id]');"/>
-	</template>
 	<template id="infolog.index.dates" template="" lang="" group="0" version="1.9.001">
 		<hbox>
 			<date id="startdate" label="Start"/>
@@ -52,6 +49,7 @@
 		</grid>
 	</template>
 	<template id="infolog.index" template="" lang="" group="0" version="1.9.005">
+		<button class="plus_button" statustext="Add a new ToDo" id="add[task]" onclick="app.infolog.add_with_extras(widget,'task','$cont[action]','$cont[action_id]');"/>
 		<grid width="100%" border="0" spacing="0" padding="0">
 			<columns>
 				<column width="70%"/>
@@ -69,10 +67,7 @@
 					<template id="header_right"/>
 				</row>
 				<row>
-					<description id="plus_button_container"/>
-				</row>
-				<row>
-					<nextmatch id="nm" template="infolog.index.rows" header_right='infolog.index.header_right' header_left="infolog.index.dates" span="all"/>
+					<nextmatch id="nm" template="infolog.index.rows" header_left="infolog.index.dates" span="all"/>
 				</row>
 				<row>
 					<hbox class=" ">
diff --git a/mail/templates/mobile/app.css b/mail/templates/mobile/app.css
index c10d2110a0..38dd773a1b 100644
--- a/mail/templates/mobile/app.css
+++ b/mail/templates/mobile/app.css
@@ -10,1957 +10,7 @@
  * @package Mail
  * @version $Id: app.less 55033 2016-02-16 18:49:17Z hnategh $
  */
-/**
- * EGroupware: CSS with less preprocessor
- *
- * Mail
- *
- * Please do NOT change app.css directly, instead change app.less and compile it!
- *
- * @link http://www.egroupware.org
- * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @author Stefan Reinhard <stefan.reinhard@pixelegg.de>
- * @package mail
- */
-textarea {
-  font-family: monospace, sans-serif;
-  font-size: 110%;
-}
-.defaultProfile {
-  color: #000000;
-  font-weight: bold !important;
-}
-.quoted1 {
-  color: #660066;
-}
-.quoted2 {
-  color: #007777;
-}
-.quoted3 {
-  color: #990000;
-}
-.quoted4 {
-  color: #000099;
-}
-.quoted5 {
-  color: #bb6600;
-}
-tr.mail div {
-  cursor: default;
-  white-space: nowrap;
-}
-tr.mail td:first-child {
-  border-left: 6px solid white;
-}
-tr.mail a {
-  cursor: pointer;
-  white-space: nowrap;
-}
-/**
-	No styling on recent, sometimes recent & unseen are cleared seperately causing confusion when the row doesn't change
-
-tr.recent div,
-tr.recent span,
-tr.recent time,
-tr.recent a,
- */
-tr.unseen div,
-tr.unseen span,
-tr.unseen time,
-tr.unseen a {
-  color: #003075;
-  font-weight: bold;
-}
-tr.mail.label1 td:first-child {
-  border-left: 6px solid #ff0080 !important;
-}
-tr.mail.label2 td:first-child {
-  border-left: 6px solid #ff8000 !important;
-}
-tr.mail.label3 td:first-child {
-  border-left: 6px solid #008000 !important;
-}
-tr.mail.label4 td:first-child {
-  border-left: 6px solid #0000ff !important;
-}
-tr.mail.label5 td:first-child {
-  border-left: 6px solid #8000ff !important;
-}
-tr.mail.flagged td:first-child {
-  border-left: 6px solid #ff0000 !important;
-}
-tr.mail.prio_high td:first-child {
-  border-left: 6px solid #ac0000 !important;
-}
-tr.mail.deleted td:first-child {
-  border-left: 6px solid silver;
-  text-decoration: line-through;
-}
-.status_img {
-  display: inline-block;
-  width: 12px;
-  height: 12px;
-  background-repeat: no-repeat;
-  background-image: url(../default/images/kmmsgread.svg);
-}
-tr.deleted .status_img {
-  background-image: url(../default/images/kmmsgdel.svg);
-}
-tr.unseen .status_img {
-  background-image: url(../default/images/kmmsgunseen.svg);
-}
-tr.flagged_seen .status_img {
-  background-image: url(../default/images/read_flagged_small.svg) !important;
-}
-tr.flagged_unseen .status_img {
-  background-image: url(../default/images/unread_flagged_small.svg) !important;
-}
-tr.recent .status_img {
-  background-image: url(../default/images/kmmsgnew.svg) !important;
-}
-tr.replied .status_img {
-  background-image: url(../default/images/mail_reply.svg) !important;
-}
-tr.forwarded .status_img {
-  background-image: url(../default/images/mail_forward.svg) !important;
-}
-.subjectBold {
-  font-size: 12px;
-  font-weight: bold;
-  font-family: Arial;
-}
-.subject {
-  font-size: 12px;
-  font-family: Arial;
-}
-.bodypreview {
-  white-space: nowrap;
-  max-height: 18px;
-  font-size: 12px;
-  font-weight: normal !important;
-  font-family: Arial;
-  color: grey !important;
-  overflow: hidden;
-  padding-top: 5px;
-}
-TR.sieveRowActive {
-  font-size: 11px;
-  height: 20px;
-  padding: 0;
-  background: White;
-}
-A.sieveRowActive {
-  font-size: 11px;
-  height: 14px;
-  padding: 0;
-}
-TR.sieveRowInActive {
-  font-size: 11px;
-  height: 20px;
-  padding: 0;
-  background: White;
-  color: Silver;
-}
-A.sieveRowInActive {
-  font-size: 11px;
-  height: 14px;
-  padding: 0;
-  color: Silver;
-}
-.bodyDIV {
-  position: absolute;
-  background-color: white;
-  top: 134px;
-  bottom: 0px;
-  width: 100%;
-  border-top: 1px solid #efefdf;
-}
-.bodyDIVAttachment {
-  bottom: 80px;
-}
-table tr.attachmentRow > td {
-  vertical-align: middle;
-}
-table tr.attachmentRow > td > img {
-  background: transparent;
-  padding-left: 5px;
-  cursor: pointer;
-}
-#mail-compose_attachments.egwGridView_grid {
-  display: table !important;
-}
-#attachmentSpanAllDIV {
-  background-color: #efefdf;
-  height: 260px;
-  overflow: auto;
-}
-#attachmentDIV {
-  position: fixed;
-  background-color: #efefdf;
-  bottom: 0px;
-  min-height: 80px;
-  max-height: 239px;
-  width: 100%;
-  border-top: 1px solid silver;
-  overflow: auto;
-}
-#popupattachmentDIV {
-  background-color: #efefdf;
-  bottom: 0px;
-  min-height: 80px;
-  max-height: 239px;
-  width: 100%;
-  border-top: 1px solid silver;
-  overflow: auto;
-}
-pre {
-  white-space: pre-wrap;
-  /* Mozilla, since 1999 */
-  white-space: -o-pre-wrap;
-  /* Opera 7 */
-  width: 99%;
-}
-/*
- avoid the vertical scrollbar within the sidebox section (triggered by the vertical dimension of the tree)
-*/
-.divSidebox {
-  overflow: hidden;
-}
-.textSidebox {
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-/*
- avoid the vertical scrollbar within the actual tablecontainer (of the tree)
-*/
-.containerTableStyle {
-  width: 100%;
-  overflow: hidden;
-  overflow-y: auto;
-}
-.dtree {
-  font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-  font-size: 11px;
-  color: #666;
-  white-space: nowrap;
-}
-.dtree div {
-  width: 100%;
-}
-.dtree img {
-  border: 0px;
-  vertical-align: middle;
-}
-.dtree a {
-  color: #333;
-  text-decoration: none;
-}
-.dtree a.node,
-.dtree a.nodeSel {
-  white-space: nowrap;
-  padding: 1px 2px 1px 2px;
-}
-.dtree a.node:hover,
-.dtree a.nodeSel:hover {
-  color: #333;
-  text-decoration: underline;
-}
-.dtree a.nodeSel {
-  background-color: #c0d2ec;
-}
-.dtree .clip {
-  overflow: hidden;
-}
-.dtree table,
-.dtree tr,
-.dtree td {
-  border: none;
-}
-.dtree table {
-  overflow: hidden;
-  width: 100%;
-  display: table-row;
-}
-.useEllipsis {
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-  word-wrap: break-word;
-  max-width: 0px;
-}
-#mail-index {
-  position: relative;
-}
-/*Keeps the scrollbar in the window in Firefox*/
-#mail-index table.egwGridView_outer {
-  -moz-margin-end: 10px;
-}
-.mail-index_quotabox {
-  display: inline-block;
-}
-.mail-index_vacation {
-  display: inline-block;
-  vertical-align: top;
-}
-.mail-index_vacation > div {
-  text-align: center;
-  line-height: 110%;
-}
-.mail-index_vacation > div > span {
-  color: red;
-}
-#mail-index_mailPreview_blank {
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  background-color: white;
-  z-index: 10;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: 200%;
-}
-#mail-index_mailPreview_blank::part(base) {
-  justify-content: center;
-  align-items: center;
-}
-#mail-index_mailPreview_blank[disabled] {
-  display: none;
-}
-.mail_DisplayNone {
-  display: none !important;
-}
-.mail-index_quotaDisplayNone {
-  display: none !important;
-}
-.mail-index_QuotaGreen,
-.mail-index_QuotaYellow,
-.mail-index_QuotaRed {
-  width: 100px !important;
-}
-.mail-index_QuotaGreen > div {
-  background-color: green !important;
-}
-.mail-index_QuotaYellow > div {
-  background-color: yellow !important;
-}
-.mail-index_QuotaRed > div {
-  background-color: red !important;
-}
-/*
- influence the tree display and scrolling behavior
-*/
-#mail-tree_target {
-  min-height: 35px;
-  display: block;
-  display: -moz-inline-stack;
-  display: -moz-box;
-  width: 100%;
-  overflow: hidden;
-  overflow-y: auto;
-  z-index: 100;
-}
-/*
- we need the the image displayed with our buttons on the left side
-*/
-input[type=button] {
-  background-position: left;
-}
-#mail-index_messageIFRAME {
-  width: 100%;
-  height: 100%;
-  border: 0;
-}
-/*********************************
- ************  mailCompose  ******
- *********************************/
-div.mailUploadSection {
-  border-top: 1px solid silver;
-  margin-top: 16px;
-  width: 99%;
-}
-div.mailUploadSection > div.et2_hbox {
-  margin-top: -10px;
-  margin-left: 6px;
-  margin-right: -12px;
-  background-color: white;
-  display: table-caption;
-}
-div.mailUploadSection > div.et2_hbox > label {
-  padding-left: 4px;
-  white-space: nowrap;
-}
-#mail-compose_filemode {
-  margin-left: 6px;
-}
-#mail-compose_expiration > input {
-  min-width: 15ex;
-}
-#mail-compose_selectFromVFSForCompose {
-  width: 20px;
-  float: none;
-  background-color: transparent;
-  background-size: 18px;
-  padding: 0;
-  background-position: center;
-  border: none;
-}
-#mail-index_button\[mailcreate\],
-#composeToolbar-send {
-  color: white;
-  background-color: #189800;
-}
-.mail-compose_composeToolbar {
-  border-left: 1px solid silver;
-  border-top: 1px solid silver;
-  border-right: 1px solid gray;
-  border-bottom: 1px solid gray;
-  background-color: #c0d2ec;
-  background-position: center;
-  background-repeat: repeat-x;
-}
-.mail-compose_composeToolbarr > span {
-  padding: 10px;
-  white-space: nowrap;
-}
-.mail-compose_composeToolbar > span.priority {
-  border-right: none;
-}
-.compose_egw_icons {
-  height: 24px;
-  width: 24px;
-  vertical-align: middle;
-}
-div.mail-compose_fileselector {
-  width: auto;
-  margin-top: 3px;
-}
-.mail-compose_fileselector span.et2_file_span {
-  background-repeat: no-repeat;
-  background-image: url(../default/images/attach.svg);
-  background-size: inherit;
-  background-position: left;
-}
-.mail-compose_fileselector div.progress {
-  display: none;
-}
-#mail-compose_button\[send\] {
-  text-align: left;
-  font-weight: bold;
-  padding-left: 30px;
-  width: 80px;
-  background-image: url(../default/images/mail_send.svg) !important;
-  background-position: left;
-  background-repeat: no-repeat;
-}
-.mailDisplay {
-  position: relative;
-  background-color: white;
-  width: 100%;
-  height: 100%;
-}
-#mail-index_mail-index-preview {
-  overflow: hidden;
-  position: relative;
-  background-color: white;
-  width: calc(100% - 1em);
-  margin-left: 1em;
-}
-.previewWrapper {
-  height: 100%;
-}
-.previewWrapper .et2_details.et2_details_expanded .et2_details_wrapper {
-  display: block;
-  position: absolute;
-  top: 4em;
-  box-shadow: 1px 1px 2px 1px silver;
-  width: calc(100% - 6em);
-  padding: 1em;
-  background: white;
-  max-height: 12em;
-  overflow-y: auto;
-}
-#mail-index_mailPreview .th {
-  display: none;
-}
-#mail-index_mailPreview > div,
-#mail-index_mailPreview > * {
-  padding-left: 8px !important;
-}
-#mail-index_mailPreview_subject,
-#mail-display_mail_displaysubject {
-  margin-bottom: 0.5em;
-  font-size: 1.2em;
-}
-et2-details.details::part(summary),
-et2-details.attachments::part(summary) {
-  padding-left: 1em;
-}
-.mailDisplay et2-details::part(base),
-.previewWrapper et2-details::part(base) {
-  border: none;
-}
-.mailPreviewHeaders et2-details::part(header) {
-  padding: 0;
-}
-#mail-index_mailPreview .et2_email > span {
-  display: inline;
-}
-.maildisplayAllAdresses {
-  max-height: 245px !important;
-  overflow: scroll;
-  overflow-x: hidden;
-}
-#mail-compose_composeToolbar {
-  padding: 0px !important;
-  border: none;
-}
-#mail-compose_composeToolbar > button {
-  padding: 0.2em 0.4em;
-}
-#mail-compose_composeToolbar > img {
-  width: 16px;
-  padding: 0px;
-  height: 16px !important;
-}
-#mail-compose_composeToolbar > button > span > img {
-  width: 16px;
-  padding: 0px;
-  height: 16px !important;
-}
-#mail-compose_composeToolbar > button {
-  padding: 0.2em 0.4em;
-}
-#mail-compose_to div.ms-sel-ctn,
-#mail-compose_cc .ms-sel-ctn,
-#mail-compose_bcc .ms-sel-ctn {
-  max-height: 75px;
-}
-#mail-display_toolbar > button > span {
-  padding: 0.2em 0.4em;
-}
-#mail-display_toolbar > button > span > img {
-  width: 16px;
-  padding: 0px;
-  height: 16px !important;
-}
-#mail-display_toolbar .et2_button_icon,
-.previewAttachmentArea .et2_button_icon,
-#mail-display_mail_displayattachments .et2_button_icon {
-  width: 16px;
-  height: 16px;
-}
-.mailPreviewIcons {
-  position: absolute;
-  right: 0;
-  top: 0;
-}
-#mail-index_toolbar {
-  padding: 0px;
-  height: 35px;
-}
-#mail-index_toolbar > button > span {
-  padding: 0.2em 0.4em;
-}
-#mail-index_toolbar > button > span > img {
-  width: 16px;
-  padding: 0px;
-  height: 16px !important;
-}
-#mail-index_toolbar > #toolbar-actionlist {
-  width: auto;
-}
-#mail-index_mailPreviewContainer {
-  position: absolute;
-  top: 9em;
-  bottom: 0;
-  left: 0px;
-  right: 5px;
-}
-#mail-index_previewAttachmentArea {
-  background-color: #f0f0f0;
-  max-height: 3.6em;
-  max-width: 50%;
-  overflow: scroll;
-  overflow-x: hidden;
-  border: 1px solid grey;
-  opacity: 1;
-  -moz-opacity: 1;
-  filter: alpha(opacity=100);
-  display: inline-block !important;
-  width: 100%;
-  vertical-align: text-top;
-}
-#mail-index_previewAttachmentArea.noContent {
-  border: 0px !important;
-  display: none !important;
-}
-#mail-display {
-  padding: 5px;
-}
-.mailDisplayContainer {
-  height: 100%;
-  padding-top: 1em;
-  border-top: 1px solid silver;
-  margin-top: 1em;
-}
-.mailDisplayBody {
-  height: 100%;
-  width: 100%;
-  background-color: white;
-  padding: 0px;
-  margin: 0px;
-}
-.mailDisplayAttachments {
-  height: 114px;
-  position: fixed;
-  bottom: 8px;
-  border-top: 1px solid grey;
-  opacity: 1;
-  -moz-opacity: 1;
-  filter: alpha(opacity=100);
-  overflow-y: auto;
-}
-#mail-display_mailDisplayBodySrc {
-  height: 100%;
-}
-.mailDisplayHeaders {
-  overflow: hidden;
-  right: 8px;
-  font-size: 14px;
-}
-.mailDisplayHeaderSection {
-  position: absolute;
-  top: 12px;
-}
-div.mailDisplayHeaders > span:first-child,
-div.mailPreviewHeaders > span:first-child {
-  width: 7em;
-  display: inline-block;
-}
-div.mailDisplayHeaders et2-select-email,
-div.mailPreviewHeaders et2-select-email {
-  display: inline-block;
-}
-#mail-display_toolbar {
-  display: inline-flex;
-}
-div.mailComposeHeaders > span:first-child {
-  width: 8em;
-}
-div.mailDisplayHeaders div.mail_extraEmails {
-  display: inline-block;
-  max-height: 1.3em;
-  max-width: 50%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  vertical-align: top;
-}
-div.mailDisplayHeaders div.mail_extraEmails.visible {
-  position: fixed;
-  left: 7em;
-  display: block;
-  max-height: 8em;
-  min-width: 30em;
-  z-index: 999;
-  overflow-y: auto;
-  background-color: white;
-  box-shadow: 5px 5px 5px #aaa;
-  border: 1px solid gray;
-}
-.mailComposeBody {
-  white-space: normal !important;
-}
-#mail-compose_mail_plaintext {
-  white-space: pre-wrap !important;
-}
-.mailPreviewHeaders {
-  font-size: 0.875rem;
-  position: relative;
-}
-.mailPreviewHeaders :first-child,
-.mailDisplayHeaders :first-child {
-  color: #7a7a7a;
-}
-.mailPreviewHeaders et2-lavatar {
-  flex: 0 0 auto;
-}
-div.mailPreviewHeaders div.mail_extraEmails {
-  display: inline-block;
-  max-height: 1.3em;
-  max-width: 50%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  vertical-align: top;
-}
-#mail-index #mail-index_mailPreview #mail-index_mailPreviewHeadersSubject {
-  width: 90%;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  white-space: nowrap;
-}
-#mail-index #mail-index_mailPreview #mail-index_mailPreviewHeadersSubject > span:not(:first-child) {
-  white-space: nowrap;
-  display: inline;
-}
-#mail-index_mail-index-header_right {
-  display: inline-flex;
-}
-div.mailPreviewHeaders div.mail_extraEmails.visible,
-div.mailPreviewHeaders #mail-index_previewAttachmentArea.visible {
-  position: absolute;
-  left: 7em;
-  display: block;
-  max-height: 8em;
-  min-width: 30em;
-  z-index: 1;
-  overflow-y: auto;
-  background-color: white;
-  box-shadow: 5px 5px 5px #aaa;
-  border: 1px solid gray;
-}
-.mail_extraEmails > a {
-  display: inline;
-  margin: 5px 5px 0 0;
-}
-.mail_extraEmails.visible > a {
-  display: list-item;
-  border-bottom: 1px solid gray;
-}
-/**
- * Lock div for tree to prevent further clicks
- */
-#mail-index_nm\[foldertree\] {
-  position: relative;
-}
-#mail_folder_lock_div {
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 10000;
-  background-position: left top;
-  background-repeat: no-repeat;
-}
-.mail_subscription_header,
-.mail_folder_management_header {
-  font-weight: bold;
-  font-size: 150%;
-  padding-bottom: 20px;
-}
-#mail-subscribe table.et2_grid tr td,
-#mail-folder_management table.et2_grid tr td {
-  padding: 0px;
-}
-#mail-subscribe table.et2_grid tr td et2-box,
-#mail-folder_management table.et2_grid tr td .mail_subscription_header {
-  height: 500px;
-  overflow: auto;
-}
-.mail_importMessageFile {
-  width: 40%;
-}
-#mail-importMessage .dialogHeader {
-  font-weight: bold;
-  font-size: 150%;
-}
-blockquote {
-  margin: 0;
-  border-left: 2px solid gray;
-  padding-left: 7px;
-  margin-left: 0;
-  color: black;
-}
-blockquote blockquote {
-  border-color: blue !important;
-}
-blockquote blockquote blockquote {
-  border-color: purple !important;
-}
-blockquote blockquote blockquote blockquote {
-  border-color: green !important;
-}
-blockquote blockquote blockquote blockquote blockquote {
-  border-color: orange !important;
-}
-blockquote blockquote blockquote blockquote blockquote blockquote {
-  border-color: gray !important;
-}
-/* MAIL PRINT */
-@media print {
-  html {
-    height: auto !important;
-  }
-  html *,
-  .td_display {
-    border-right: none !important;
-    border-left: none !important;
-  }
-  /* set font size for printing of text mail body and all headers, attachments */
-  .td_display pre,
-  .mailDisplayHeaders,
-  .mailDisplayAttachments * {
-    font-size: 10pt !important;
-    font-family: arial;
-  }
-  #mail-display_mail_displaysubject {
-    font-weight: bold;
-  }
-  .mailDisplayHeaders {
-    border-bottom: 0.1em solid #d7d7d7;
-    padding-top: 4px;
-    padding-bottom: 4px;
-  }
-  #mail-display_mailDisplayBodySrc {
-    display: none;
-  }
-  .tmpPrintDiv {
-    margin-top: 10px;
-    margin-bottom: 30px;
-    display: block;
-    overflow: visible;
-    height: auto;
-  }
-  .tmpPrintDiv td,
-  textarea {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-  }
-  .tmpPrintDiv .td_display {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    color: black;
-    background-color: #FFFFFF;
-  }
-  pre {
-    width: 99% !important;
-  }
-  .mailDisplayContainer {
-    border-top: none;
-    overflow: visible !important;
-    position: static !important;
-  }
-  .mailDisplayAttachments {
-    border: none;
-    overflow: visible !important;
-    position: inherit !important;
-  }
-  .et2_button {
-    display: none;
-  }
-  div.mailDisplay .mailDisplayHeaders .mail_extraEmails {
-    max-height: 100%;
-    max-width: 80%;
-  }
-  div.mailDisplayHeaders > span:first-child {
-    vertical-align: top;
-  }
-  div.mailDisplayHeaders {
-    padding-top: 10px;
-  }
-  .mailDisplayContainer.mailvelopeTopContainer {
-    top: 190px;
-  }
-  .mailDisplayContainer.mailvelopeTopContainer > iframe {
-    position: static;
-    min-width: 860px;
-  }
-  .mail_extraEmails > a {
-    display: inline-block;
-  }
-  .et2_email:after {
-    content: " | ";
-  }
-  .et2_email:last-child:after {
-    content: "";
-  }
-}
-/* MOBILE and tablets (Portrait & Landscape) View --------------*/
-/* tablets and smartphones (portrait) ----------- */
-/* Smartphones (landscape) ----------- */
-/* Mobile (landscape) Tablet----------- */
-span#mail-compose_cc_expander,
-span#mail-compose_bcc_expander,
-span#mail-compose_folder_expander,
-span#mail-compose_replyto_expander {
-  float: left;
-  width: 100%;
-  margin: 3px;
-  margin-right: 12px;
-  text-align: center;
-  padding: 0;
-}
-/*Make file uploads in compose dialog invisible*/
-.mail-compose_toolbar_assist div.mail-compose_fileselector,
-#mail-compose_selectFromVFSForCompose,
-.mail-compose_toolbar_assist {
-  display: none;
-}
-/*Make file uploads in compose dialog invisible*/
-.mail-compose_toolbar_assist div.mail-compose_fileselector,
-#mail-compose_selectFromVFSForCompose,
-.mail-compose_toolbar_assist {
-  display: none;
-}
-div.mailComposeHeaderSection > table {
-  padding-top: 35px;
-}
-.mail-index-extra-iframe {
-  position: relative;
-  z-index: 999;
-  width: 100%;
-  height: 100%;
-}
-/*Avoid getting scrollbar on form area, let scrolling be handled by tree*/
-#mail-subscribe {
-  overflow: hidden;
-}
-.sieve-title {
-  font-size: 12pt;
-  vertical-align: middle;
-}
-.sieve-title .ruleID::before {
-  content: '#';
-}
-#mail-index_nm.et2_nextmatch .egwGridView_outer thead tr {
-  border-left: 12px solid transparent;
-}
-#mail-compose_mailaccount {
-  max-width: 100% !important;
-}
-.header_row_right.vertical_splitter {
-  float: left;
-}
-.header_row_right.vertical_splitter div#mail-index_mail-index-vacationnotice .et2_vbox {
-  margin-right: 0;
-}
-et2-box.smime_cert_notverified {
-  border-top: 4px solid #8dff95 !important;
-}
-et2-image.smime_cert_notverified {
-  background: #8dff95;
-}
-et2-box.smime_cert_verified {
-  border-top: 4px solid #1ab82c !important;
-}
-et2-box.smime_cert_unknownemail {
-  border-top: 4px solid #a28cff !important;
-}
-et2-image.smime_cert_verified {
-  background: #1ab82c;
-}
-et2-box.smime_cert_notvalid {
-  border-top: 4px solid #e90052 !important;
-}
-et2-image.smime_cert_notvalid {
-  background: #e90052;
-}
-et2-image.smime_cert_unknownemail {
-  background: #a28cff;
-}
-.mailPreviewHeaders.smimeIcons et2-image {
-  width: 24px;
-}
-.mailPreviewHeaders.smimeIcons {
-  display: flex;
-  justify-content: end;
-}
-#mail-compose tr.mailComposeHeaders {
-  border-top: 1px solid silver;
-}
-#mail-compose tr.mailComposeHeaders .et2_selectbox,
-#mail-compose tr.mailComposeHeaders .et2_taglist .ms-ctn,
-#mail-compose tr.mailComposeHeaders .et2_taglist .ms-sel-ctn input,
-#mail-compose tr.mailComposeHeaders input {
-  border: none;
-  outline: none;
-}
-#mail-compose tr.mailComposeHeaders .et2_taglist .ms-ctn-focus {
-  border: none;
-  box-shadow: none;
-}
-.et2_vbox.et2_box_widget.mailComposeBodySection .mailComposeHtmlContainer .tox.tox-tinymce {
-  width: 100%;
-}
-#mail-compose_subject {
-  padding: 10px 0 10px 0;
-}
-div#mail-index_nm.splitter-pane {
-  min-height: 100px;
-}
-#mail-index_mailSplitter .splitter-bar-horizontal {
-  background: white;
-}
-#calendar-meeting table.et2_grid.meetingRequest td {
-  padding-left: 8px !important;
-}
-#mail-index_mailPreview_mailPreviewContainer {
-  height: 100%;
-  padding-top: 1em;
-  border-top: 1px solid silver;
-  margin-top: 1em;
-}
-#mail-index_nm .mail.row et2-url-email_ro {
-  width: fit-content;
-}
-#mail-index_nm .et2_label.et2_vfs {
-  text-align: center;
-}
-.et2_nextmatch .egwGridView_outer .egwGridView_scrollarea tbody tr.row_category td:first-child > div {
-  margin-left: 0px;
-  margin-right: 2px;
-  padding: 0px;
-}
-#mail-index_nm tbody tr et2-lavatar {
-  max-width: 3.7em;
-  min-width: 3.7em !important;
-}
-.previewWrapper .firstColumnTitle {
-  max-width: 4em;
-  text-align: end;
-}
-.mailPreviewHeaders et2-select-email::part(control) {
-  border: none;
-}
-#popupMainDiv {
-  height: 99%;
-  padding: 5px;
-}
-#popupMainDiv .et2_grid tr td {
-  padding: 5px 0;
-}
-/*##############################################
-#            #                               #
-#            #                               #
-#            #                               #
-#            #                               #
-#            #                               #
-#            #                               #
-#            #                               #
-#            #       iframe                  #
-#            #                               #
-#            #                               #
-#            #                               #
-#            #                               #
-#            #                               #
-#            #                               #
-##############################################
-*/
-/*Border around iframe*/
-iframe#mail-display_mailDisplayBodySrc {
-  height: 99%;
-  /*border: 4px solid yellow;*/
-}
-body {
-  background-color: white;
-}
-#mail-index {
-  /* Keeps the scrollbar in the window in chrome */
-  margin-right: -10px;
-}
-#mail-index div#mail-index_nm div.nextmatch_header div.filters select {
-  margin-top: 9px;
-}
-#mail-index div#mail-index_nm tr.mail td img {
-  max-height: 50px;
-  -webkit-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
-  -moz-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
-  box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
-  border: 0px solid rgba(0, 0, 0, 0.9);
-}
-#mail-index div#mail-index_nm tr.mail div span {
-  -webkit-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
-  -moz-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
-  box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
-}
-#mail-index div.splitter-bar {
-  border-right: 0;
-  border-top: 0;
-  border-bottom: 0;
-  margin-left: 4px;
-}
-#mail-index div.splitter-bar-horizontal {
-  border-top: 1px solid #B4B4B4;
-  border-left: 0;
-}
-#mail-index #mail-index_mailPreview {
-  margin: 0;
-}
-#mail-index #mail-index_mailPreview #mail-index_mailPreviewHeadersFrom {
-  width: 50%;
-}
-#mail-index #mail-index_mailPreview #mail-index_mailPreviewHeadersTo {
-  width: 50%;
-}
-#mail-index #mail-index_mailPreview #mail-index_mailPreviewHeadersDate {
-  position: absolute;
-  right: 0px;
-  margin: 3px 5px 0 0;
-}
-#mail-index #mail-index_mailPreview #mail-index_mailPreviewHeadersSubject {
-  text-overflow: ellipsis;
-  overflow: hidden;
-  white-space: nowrap;
-}
-#mail-index #mail-index_mailPreview #mail-index_mailPreviewHeadersSubject > span {
-  white-space: nowrap;
-}
-#mail-index #mail-index_mailPreview .mail-d-h1 {
-  position: relative;
-  padding-bottom: 15px;
-  border-bottom: 1px solid silver;
-  font-size: 12pt;
-  padding-top: 10px;
-  font-weight: bold;
-}
-#mail-index #mail-index_mailPreview .mail-d-h1 span {
-  font-size: 12pt;
-}
-#mail-index #mail-index_mailPreview .mail-d-h2 {
-  padding-top: 5px;
-  font-size: 10pt;
-  color: grey;
-}
-#mail-index #mail-index_mailPreview .mail-d-h2 a,
-#mail-index #mail-index_mailPreview .mail-d-h2 span,
-#mail-index #mail-index_mailPreview .mail-d-h2 .et2_label {
-  color: grey;
-  font-size: 10pt;
-}
-#mail-index #mail-index_mailPreview .mail-d-h2 a#mail-display_FROM > * {
-  color: black;
-  padding-top: 15px;
-  font-size: 12pt;
-}
-#mail-index #mail-index_mailPreview .et2_details {
-  width: 100%;
-  display: block;
-}
-#mail-index #mail-index_mailPreview .et2_details.et2_details_expanded {
-  width: 100%;
-  display: block;
-}
-#mail-index #mail-index_mailPreview span.et2_details_title {
-  color: #26537c;
-  font-size: 10pt;
-}
-/*##############################################
-#            #                               #
-#            #                               #
-#            #                               #
-#            #                               #
-#            #                               #
-#            #                               #
-#            #                               #
-#   Side     #                               #
-#   bar      #                               #
-#            #                               #
-#            #                               #
-#            #                               #
-#            #                               #
-#            #                               #
-############################################## */
-.egw_fw_ui_category_content span#mail-tree_target {
-  max-height: 50%;
-}
-.egw_fw_ui_category_content .dtree {
-  font-family: Verdana, "Lucida Grande", Helvetica, Sans-Serif;
-}
-.egw_fw_ui_category_content .standartTreeRow_lor {
-  background-color: rgba(153, 204, 255, 0.4);
-  color: #1E1E1E;
-  text-decoration: none;
-}
-/* ##################################################################################
- *       E-Mail Dialog "Compose"
- *
- * ##################################################################################
- */
-/*###########################################
-#                                           #
-#                                           #
-#############################################
-#                                           #
-#                                           #
-#                                           #
-#                                           #
-#                                           #
-#                   dialog                  #
-#                                           #
-#                                           #
-#############################################
-#                                           #
-#    buttons                                #
-#                                           #
-#                                           #
-##############################################*/
-#mail-compose_mail_plaintext {
-  white-space: pre-wrap !important;
-}
-#mail-compose {
-  padding: 5px;
-  max-height: 99%;
-  /*// ###############################################################################*/
-  /*// Mail Header*/
-}
-#mail-compose .mailComposeHeaders:first-child {
-  /*background-color: @gray-0;*/
-  /*.gradient_thead;*/
-}
-#mail-compose .mailComposeBodySection {
-  margin-top: -4px;
-}
-#mail-compose .et2_toolbar button.toolbar_toggled:hover {
-  background-color: white !important;
-}
-#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_tracker:hover,
-#mail-compose #mail-compose_composeToolbar button#composeToolbar-disposition:hover {
-  background-color: rgba(153, 204, 255, 0.4);
-  box-shadow: none;
-}
-#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_tracker:not(.toolbar_toggled),
-#mail-compose #mail-compose_composeToolbar button#composeToolbar-disposition:not(.toolbar_toggled) {
-  filter: grayscale(1) contrast(0.9999) opacity(0.9);
-}
-#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_calendar:hover,
-#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_infolog:hover {
-  background-color: rgba(153, 204, 255, 0.4);
-  box-shadow: none;
-}
-#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_calendar:not(.toolbar_toggled),
-#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_infolog:not(.toolbar_toggled) {
-  filter: grayscale(1) contrast(0.9999) opacity(0.7);
-}
-#mail-compose table.et2_grid {
-  display: inline-block;
-}
-#mail-compose tr.mailComposeHeaders {
-  border-bottom: 1px solid #c1c1c0;
-}
-#mail-compose .mailComposeHeaders,
-#mail-compose .mailComposeHeadersSection {
-  margin: 2px 0;
-  width: 98%;
-  /*Von*/
-  /*An*/
-  /*Kopie*/
-  /*Betreff*/
-  /*HTML Box*/
-}
-#mail-compose .mailComposeHeaders span,
-#mail-compose .mailComposeHeadersSection span {
-  text-align: right;
-  padding-right: 5px;
-}
-#mail-compose .mailComposeHeaders span.ms-close-btn,
-#mail-compose .mailComposeHeadersSection span.ms-close-btn,
-#mail-compose .mailComposeHeaders span.ms-edit-btn,
-#mail-compose .mailComposeHeadersSection span.ms-edit-btn,
-#mail-compose .mailComposeHeaders span.ms-check-btn,
-#mail-compose .mailComposeHeadersSection span.ms-check-btn {
-  padding-right: 0px;
-}
-#mail-compose .mailComposeHeaders div,
-#mail-compose .mailComposeHeadersSection div {
-  max-width: 770px;
-}
-#mail-compose .mailComposeHeaders span.ui-state-error,
-#mail-compose .mailComposeHeadersSection span.ui-state-error {
-  color: #AE1D00;
-}
-#mail-compose .mailComposeHeaders div.ms-res-item-active,
-#mail-compose .mailComposeHeadersSection div.ms-res-item-active {
-  background: #0C5DA5;
-}
-#mail-compose .mailComposeHeaders div.ms-res-item-active span,
-#mail-compose .mailComposeHeadersSection div.ms-res-item-active span {
-  color: #FFFFFF;
-}
-#mail-compose .mailComposeHeaders select#mail-compose_mailaccount,
-#mail-compose .mailComposeHeadersSection select#mail-compose_mailaccount {
-  width: 100%;
-  height: 30px;
-}
-#mail-compose .mailComposeHeaders #mail-compose_to input,
-#mail-compose .mailComposeHeadersSection #mail-compose_to input {
-  width: auto;
-}
-#mail-compose .mailComposeHeaders #mail-compose_cc_expander,
-#mail-compose .mailComposeHeadersSection #mail-compose_cc_expander,
-#mail-compose .mailComposeHeaders #mail-compose_bcc_expander,
-#mail-compose .mailComposeHeadersSection #mail-compose_bcc_expander,
-#mail-compose .mailComposeHeaders #mail-compose_folder_expander,
-#mail-compose .mailComposeHeadersSection #mail-compose_folder_expander,
-#mail-compose .mailComposeHeaders #mail-compose_replyto_expander,
-#mail-compose .mailComposeHeadersSection #mail-compose_replyto_expander {
-  background: transparent;
-  border: none;
-  color: #26537c;
-  text-decoration: underline;
-  float: none;
-  width: auto;
-  white-space: nowrap;
-  text-align: left;
-  cursor: pointer;
-}
-#mail-compose .mailComposeHeaders input#mail-compose_subject,
-#mail-compose .mailComposeHeadersSection input#mail-compose_subject {
-  max-width: 716px;
-  padding: 4px 0px 4px 5px;
-}
-#mail-compose .mailComposeHeaders input#mail-compose_mimeType,
-#mail-compose .mailComposeHeadersSection input#mail-compose_mimeType {
-  margin-left: 12px;
-}
-#mail-compose fieldset.mailSignature {
-  font-size: 0.8em;
-  border: none;
-  margin: 8px 0;
-}
-#mail-compose fieldset.mailSignature span {
-  margin: 0px 8px;
-}
-#mail-compose div.mailUploadSection {
-  border-top: 0px solid silver;
-  margin-top: 16px;
-  width: 99%;
-}
-#mail-compose div.mailUploadSection div.et2_hbox {
-  margin: -11px 0 5px -4px;
-}
-#mail-compose div.mailUploadSection div.et2_hbox label {
-  margin-right: 10%;
-}
-#mail-compose div.mailUploadSection #mail-compose_attachments {
-  border-top: 1px solid silver;
-}
-#mail-compose fieldset.mailUploadSection {
-  border-top: 0px solid silver;
-  font-size: 0.8em;
-  margin: 8px 0;
-  border-bottom: none;
-  border-left: none;
-  border-right: none;
-  width: 99%;
-}
-/* ##################################################################################
- *       E-Mail Dialog "Ansehen"
- *          Preview
- * ##################################################################################
- */
-#mail-display {
-  padding: 5px;
-}
-#mail-display .mailDisplayAttachments {
-  max-height: 12%;
-  position: fixed;
-  border: 0px solid #560EAD;
-  border-bottom: 0px;
-  opacity: 1;
-  -moz-opacity: 1;
-  margin-left: 10px;
-  width: 98%;
-}
-#mail-display .mailDisplayAttachments img {
-  width: 16px;
-}
-#mail-display .mail_DisplayNone {
-  display: none;
-}
-/**
-* et2_toolbar
-*/
-.et2_toolbar-dropdown {
-  background: #E6E6E6 !important;
-  background-color: #E6E6E6 !important;
-}
-.et2_toolbar-dropdown button {
-  background: #E6E6E6 !important;
-  background-color: #E6E6E6 !important;
-}
-.et2_toolbar-dropdown-menulist button {
-  background: #E6E6E6 !important;
-  background-color: #E6E6E6 !important;
-}
-div.ui-toolbar-menulist {
-  border: 1px solid rgba(0, 0, 0, 0.15);
-}
-.ui-toolbar-menulist h {
-  padding-bottom: 7px;
-  margin: 0;
-}
-.ui-toolbar-menulist div {
-  background-color: #E6E6E6 !important;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-}
-.et2_toolbar_actionlist .et2_toolbar-dropdown {
-  background-color: #fafafa !important;
-}
-.et2_toolbar_actionlist .et2_toolbar-dropdown .et2_dropdown {
-  -webkit-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
-  -moz-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
-  box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
-  border: none !important;
-  height: 24px !important;
-}
-.et2_toolbar_actionlist .et2_toolbar-dropdown .et2_dropdown button {
-  -webkit-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
-  -moz-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
-  box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
-  min-height: auto;
-}
-.et2_toolbar_actionlist .et2_toolbar-dropdown .et2_dropdown button img {
-  width: 16px;
-  height: 16px;
-  vertical-align: text-bottom;
-}
-.et2_toolbar_actionlist .et2_toolbar-dropdown .et2_button_icon {
-  height: 12px;
-}
-div#displayToolbar-menulist .et2_dropdown {
-  -webkit-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
-  -moz-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
-  box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
-  border: none !important;
-}
-div#displayToolbar-menulist .et2_dropdown button {
-  -webkit-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
-  -moz-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
-  box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
-}
-div#displayToolbar-menulist img {
-  width: 20px;
-  height: 20px;
-}
-/* ##################################################################################
- *     Dialog: Subscripe Folder
- *
- * ##################################################################################
- */
-#mail-subscribe table.et2_grid tr td,
-#mail-folder_management table.et2_grid tr td {
-  padding: 0px;
-  /*Label*/
-}
-#mail-subscribe table.et2_grid tr td .mail_subscription_header,
-#mail-folder_management table.et2_grid tr td .mail_subscription_header {
-  /*line-height: 270%;*/
-  margin: 0.6em 0 0;
-  font-weight: lighter;
-  line-height: 2em;
-  font-weight: bold;
-  font-size: 150%;
-  padding-bottom: 20px;
-}
-#mail-subscribe table.et2_grid tr td et2-box,
-#mail-folder_management table.et2_grid tr td et2-box {
-  margin-top: 16px;
-  height: 484px;
-  overflow: auto;
-}
-#mail-subscribe .selectedTreeRow,
-#mail-folder_management .selectedTreeRow,
-#mail-subscribe .selectedTreeRow_lor,
-#mail-folder_management .selectedTreeRow_lor {
-  background-color: rgba(102, 153, 204, 0.7);
-  color: #1E1E1E;
-  text-decoration: none;
-}
-#mail-subscribe .standartTreeRow_lor,
-#mail-folder_management .standartTreeRow_lor {
-  background-color: rgba(153, 204, 255, 0.4);
-  color: #1E1E1E;
-  text-decoration: none;
-}
-.mail_subscription_header,
-.mail_folder_management_header {
-  font-weight: bold;
-  font-size: 150%;
-  padding-bottom: 20px;
-}
-/* ##################################################################################
- *       E-Mail
- *
- * ##################################################################################
- */
-/* felamimail uses the styledefinitions below to format navButton/navSeparator */
-tr.navbarBackground {
-  background-color: #dddddd;
-}
-div.navButton {
-  background-color: #dddddd;
-  float: left;
-  padding: 2px;
-  margin: 2px;
-  border: solid #dddddd 1px;
-}
-div.navButton:hover,
-div.navButtonHover {
-  background-color: #eeeeee;
-  float: left;
-  padding: 2px;
-  margin: 2px;
-  border: solid white 1px;
-  border-right: solid black 1px;
-  border-bottom: solid black 1px;
-  position: relative;
-}
-div.navButton:active,
-div.navButtonActive {
-  background-color: #dddddd;
-  float: left;
-  padding: 2px;
-  margin: 2px;
-  border: solid white 1px;
-  border-left: solid black 1px;
-  border-top: solid black 1px;
-  position: relative;
-}
-div.navSeparator {
-  background-color: #dddddd;
-  float: left;
-  padding: 0px;
-  margin: 2px;
-  border: solid silver 1px;
-  height: 24px;
-  position: relative;
-}
-/* Fixes z-index problem with the calendar year selection (displays behind selectboxes)*/
-.calendar .combo {
-  z-index: 1 !important;
-}
-textarea {
-  font-family: monospace, sans-serif;
-  font-size: 110%;
-}
-.defaultProfile {
-  color: #000000;
-  font-weight: bold !important;
-}
-.quoted1 {
-  color: #660066;
-}
-.quoted2 {
-  color: #007777;
-}
-.quoted3 {
-  color: #990000;
-}
-.quoted4 {
-  color: #000099;
-}
-.quoted5 {
-  color: #bb6600;
-}
-tr.mail div {
-  cursor: default;
-  white-space: normal;
-  text-overflow: ellipsis;
-}
-tr.mail div span {
-  text-overflow: ellipsis;
-  white-space: noWrap;
-}
-tr.mail a {
-  cursor: pointer;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-tr.recent div,
-tr.recent span,
-tr.recent time,
-tr.recent a,
-tr.unseen div,
-tr.unseen span,
-tr.unseen time,
-tr.unseen a {
-  color: #003075;
-  font-weight: bold;
-}
-tr.mail.label1 td:first-child {
-  border-left: 6px solid #ff0080 !important;
-}
-tr.mail.label2 td:first-child {
-  border-left: 6px solid #ff8000 !important;
-}
-tr.mail.label3 td:first-child {
-  border-left: 6px solid #008000 !important;
-}
-tr.mail.label4 td:first-child {
-  border-left: 6px solid #0000ff !important;
-}
-tr.mail.label5 td:first-child {
-  border-left: 6px solid #8000ff !important;
-}
-tr.mail.flagged td:first-child {
-  border-left: 6px solid #ff0000 !important;
-}
-tr.mail.prio_high td:first-child {
-  border-left: 6px solid #ac0000 !important;
-}
-tr.mail.deleted td:first-child {
-  border-left: 6px solid silver;
-  text-decoration: line-through;
-}
-.status_img {
-  display: inline-block;
-  width: 16px;
-  height: 16px;
-  background-repeat: no-repeat;
-  background-size: 16px 16px;
-}
-.subjectBold {
-  font-size: 12px;
-  font-weight: bold;
-  font-family: Arial;
-}
-.subject {
-  font-size: 12px;
-  font-family: Arial;
-}
-TR.sieveRowActive {
-  font-size: 11px;
-  height: 20px;
-  padding: 0;
-  background: White;
-}
-A.sieveRowActive {
-  font-size: 11px;
-  height: 14px;
-  padding: 0;
-}
-TR.sieveRowInActive {
-  font-size: 11px;
-  height: 20px;
-  padding: 0;
-  background: White;
-  color: Silver;
-}
-A.sieveRowInActive {
-  font-size: 11px;
-  height: 14px;
-  padding: 0;
-  color: Silver;
-}
-.bodyDIV {
-  position: absolute;
-  background-color: white;
-  top: 134px;
-  bottom: 0px;
-  width: 100%;
-  border-top: 1px solid #efefdf;
-}
-.bodyDIVAttachment {
-  bottom: 80px;
-}
-#attachmentSpanAllDIV {
-  background-color: #efefdf;
-  height: 260px;
-  overflow: auto;
-}
-#attachmentDIV {
-  position: fixed;
-  background-color: #efefdf;
-  bottom: 0px;
-  min-height: 80px;
-  max-height: 239px;
-  width: 100%;
-  border-top: 1px solid silver;
-  overflow: auto;
-}
-#popupattachmentDIV {
-  background-color: #efefdf;
-  bottom: 0px;
-  min-height: 80px;
-  max-height: 239px;
-  width: 100%;
-  border-top: 1px solid silver;
-  overflow: auto;
-}
-pre {
-  white-space: pre-wrap;
-  /* Mozilla, since 1999 */
-  white-space: -o-pre-wrap;
-  /* Opera 7 */
-  width: 99%;
-}
-/*
- avoid the vertical scrollbar within the sidebox section (triggered by the vertical dimension of the tree)
-*/
-.divSidebox {
-  overflow: hidden;
-}
-.textSidebox {
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-/*
- avoid the vertical scrollbar within the actual tablecontainer (of the tree)
-*/
-.containerTableStyle {
-  width: 100%;
-  overflow: hidden;
-  overflow-y: auto;
-}
-.dtree {
-  font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-  font-size: 11px;
-  color: #666;
-  white-space: nowrap;
-}
-.dtree div {
-  width: 100%;
-}
-.dtree img {
-  border: 0px;
-  vertical-align: middle;
-}
-.dtree a {
-  color: #333;
-  text-decoration: none;
-}
-.dtree a.node,
-.dtree a.nodeSel {
-  white-space: nowrap;
-  padding: 1px 2px 1px 2px;
-}
-.dtree a.node:hover,
-.dtree a.nodeSel:hover {
-  color: #333;
-  text-decoration: underline;
-}
-.dtree a.nodeSel {
-  background-color: #c0d2ec;
-}
-.dtree .clip {
-  overflow: hidden;
-}
-.dtree table,
-.dtree tr,
-.dtree td {
-  border: none;
-}
-.dtree table {
-  overflow: hidden;
-  width: 100%;
-  display: table-row;
-}
-.useEllipsis {
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-  word-wrap: break-word;
-}
-#mail-index {
-  position: relative;
-}
-/*
- influence the tree display and scrolling behavior
-*/
-#mail-tree_target {
-  min-height: 35px;
-  max-height: 450px;
-  display: block;
-  display: -moz-inline-stack;
-  display: -moz-box;
-  width: 100%;
-  overflow: hidden;
-  overflow-y: auto;
-  z-index: 100;
-}
-/*
- we need the the image displayed with our buttons on the left side
-*/
-input[type=button] {
-  background-position: left;
-}
-#mail-index_messageIFRAME {
-  width: 100%;
-  height: 100%;
-  border: 0;
-}
-#mail-index_button[id*="mailcreate"] {
-  width: 99%;
-  text-align: left;
-  font-weight: bold;
-  padding-left: 25px;
-  background-image: url(../default/images/write_mail.png) !important;
-  background-position: left;
-  background-repeat: no-repeat;
-}
-.mailDisplay {
-  position: relative;
-  background-color: transparent;
-  width: 100%;
-}
-#mail-index_mail-index-header_right {
-  display: inline-flex;
-}
-#mail-index_mailPreview {
-  overflow: hidden;
-  position: relative;
-  margin-top: 5px;
-}
-#mail-compose_fileselector {
-  width: 245px !important;
-}
-.mailPreviewIcons {
-  position: absolute;
-  right: 0;
-  top: 0;
-}
-#mail-index_mailPreviewContainer {
-  position: absolute;
-  border-top: 1px solid silver;
-  bottom: 0;
-  left: 0px;
-  right: 5px;
-}
-/*#######################################################*/
-/*# ICON # ICON # ICON # ICON #ICON # ICON# ICON # ICON #*/
-/*#######################################################*/
-/*Toolbar der Email*/
-#mail-display_toolbar {
-  padding: 0px;
-}
-#mail-display_toolbar > button > span {
-  padding: 0.2em 0.4em;
-}
-#mail-display_toolbar > button > span > img {
-  width: 16px;
-  padding: 0px;
-  height: auto;
-}
-#mail-index_toolbar {
-  background: none;
-  height: 35px;
-}
-/*AN / To*/
-div.mailPreviewHeaders div.mail_extraEmails {
-  display: inline-block;
-  max-height: 1.3em;
-  max-width: 50%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-div.mailPreviewHeaders div.mail_extraEmails img.et2_button_icon {
-  width: 24px;
-  height: 24px;
-}
-div.mailPreviewHeaders img.et2_button_icon {
-  background-color: inherit;
-}
-#mail-index_previewAttachmentArea {
-  background-color: #fafafa;
-  max-height: 3.6em;
-  border: none;
-  max-width: 80%;
-}
-#mail-index_previewAttachmentArea img {
-  width: 16px;
-  height: 16px;
-}
-#mail-index_previewAttachmentArea td {
-  padding: 2px;
-}
-#mail-index_previewAttachmentArea.noContent {
-  border: 0px !important;
-}
-/* Button after field*/
-#mail-index_mailPreviewHeadersAttachments {
-  padding-top: 5px;
-}
-#mail-index_mailPreviewHeadersAttachments img.et2_button_icon {
-  width: 16px;
-  height: 16px;
-  background-color: #fafafa;
-  left: -6px;
-  top: 1px;
-}
-/*######################################################*/
-/*Diplay : View                                         */
-.mailDisplayHeaders {
-  overflow: hidden;
-}
-.mailDisplayHeaderSection {
-  position: absolute;
-  top: 12px;
-}
-div.mailDisplayHeaders > div:first-parent {
-  overflow: hidden;
-}
-div.mailDisplayHeaders > span:first-child,
-div.mailComposeHeaders > span:first-child,
-div.mailPreviewHeaders > span:first-child {
-  width: 7em;
-  display: inline-block;
-}
-div.mailComposeHeaders > span:first-child {
-  width: 8em;
-}
-div.mailDisplayHeaders div.mail_extraEmails {
-  display: inline-block;
-  max-height: 1.3em;
-  max-width: 50%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-div.mailDisplayHeaders div.mail_extraEmails.visible {
-  position: fixed;
-  left: 7em;
-  display: block;
-  max-height: 8em;
-  min-width: 30em;
-  z-index: 999;
-  overflow-y: auto;
-  background-color: white;
-}
-#mail-importMessage .et2_button_icon {
-  height: auto;
-  width: 24px;
-}
-div.mailComposeHeaderSection > table {
-  padding-top: 10px;
-}
-/* transition delay breaks splitter resize, because it doesn't get the right height
-	in a right time. So we reduce the delay to 0.1 to fix the timing issue.
-	The delay should not be set to 0 or none because it wil conflict with blueimp gallery plugin (Expose).
-*/
-:hover {
-  -webkit-transition: all 0.1s ease-out;
-  -moz-transition: all 0.1s ease-out;
-  -o-transition: all 0.1s ease-out;
-  transition: all 0.1s ease-out;
-}
-#mail-index_button\[mailcreate\],
-#composeToolbar-send {
-  color: #5B5B5B;
-  background-color: white;
-}
-/* width */
-table#mail-index_previewAttachmentArea::-webkit-scrollbar {
-  width: 5px;
-}
-/* Track */
-table#mail-index_previewAttachmentArea::-webkit-scrollbar-track {
-  background: #f2f2f2;
-}
-/* Handle */
-table#mail-index_previewAttachmentArea::-webkit-scrollbar-thumb {
-  background: #c1c2c1;
-}
-/* Handle on hover */
-table#mail-index_previewAttachmentArea::-webkit-scrollbar-thumb:hover {
-  background: #555;
-}
-#mail-index_nm.et2_nextmatch .egwGridView_outer thead tr {
-  border-left: 12px solid #B4B4B4;
-}
-#mail-index_nm.et2_nextmatch .egwGridView_outer thead tr.row_category td:first-child > div {
-  margin-left: 0px;
-  padding-left: 0px;
-}
+@import "../default/app.css";
 /* import */
 /* tablets and smartphones  */
 @media all {
diff --git a/mail/templates/mobile/app.less b/mail/templates/mobile/app.less
index f9d12e74fc..3c4f64eda8 100644
--- a/mail/templates/mobile/app.less
+++ b/mail/templates/mobile/app.less
@@ -15,7 +15,7 @@
 
 @import (reference) "../../../pixelegg/less/def_buttons.less";
 @import (reference) "../../../pixelegg/less/def_mobile.less";
-@import "../pixelegg/app.less";
+@import "../default/app.css";
 /* import */
 /* tablets and smartphones  */
 @media all {
diff --git a/mail/templates/mobile/index.xet b/mail/templates/mobile/index.xet
index 825ebe2a6b..c65261f1fb 100644
--- a/mail/templates/mobile/index.xet
+++ b/mail/templates/mobile/index.xet
@@ -42,12 +42,11 @@
 	<template id="mail.index" template="" lang="" group="0" version="1.9.001">
 		<tree autoloading="mail.mail_ui.ajax_foldertree" id="nm[foldertree]" onclick="app.mail.mail_changeFolder" parent_node="mail-tree_target"/>
 		<html id="msg"/>
-		<buttononly id="composeButton" class="plus_button" onclick="app.mail.mail_compose(false);" parent_node="mail-index_msg"/>
-		<buttononly id="button[mailcreate]" onclick="app.mail.mail_compose(false);" label="Compose" parent_node="mail-index_buttonmailcreate"/>
 		<hbox class="mail-index_vacation"><vbox>
 			<description id="nm[vacationnotice]" class="@nm[vacationclass]"/>
 			<description id="nm[vacationrange]" class="@nm[vacationrangeclass]"/></vbox>
 		</hbox>
 		<nextmatch id="nm" onselect="app.mail.mail_preview" template="mail.index.rows" right_header="mail.index.header_right"/>
+		<buttononly id="button[mailcreate]" class="plus_button" onclick="app.mail.mail_compose(false);" size="large" image="plus" circle="true"/>
 	</template>
 </overlay>
diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 21fe912ca8..6581aba141 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -1060,18 +1060,6 @@
                     margin: 2px !important;
                     min-height: 19px;*/
   }
-  div.ui-toolbar-menulist {
-    position: absolute;
-    height: inherit;
-    z-index: 999 !important;
-    overflow: hidden !important;
-    border: solid black 1px;
-    padding: 0 !important;
-    margin-top: 3px !important;
-  }
-  .ui-toolbar-menulist > h {
-    padding-bottom: 7px;
-  }
   .ui-toolbar-menulistHeader {
     font-size: xx-small;
     height: 100%;
@@ -1142,34 +1130,6 @@
   .et2_toolbar span.et2_checkbox_slideSwitch.switchOn {
     filter: none;
   }
-  /*#################################### ADMIN PART #####################################################*/
-  iframe#admin-index_iframe {
-    background-color: yellow;
-  }
-  table.egwGridView_grid img {
-    /*filter grey*/
-    /*filter grey*/
-    filter: none;
-    -webkit-filter: initial;
-    -moz-filter: initial;
-    -ms-filter: initial;
-    -o-filter: initial;
-    /*filter: url(grayscale.svg);  Firefox 4+ */
-    filter: initial;
-    /* IE 6-9 */
-  }
-  .admin_aclAPP {
-    /*filter grey*/
-    filter: none;
-    -webkit-filter: initial;
-    -moz-filter: initial;
-    -ms-filter: initial;
-    -o-filter: initial;
-    /*filter: url(grayscale.svg);  Firefox 4+ */
-    filter: initial;
-    /* IE 6-9 */
-  }
-  /*#################################### END ADMIN PART #####################################################*/
 }
 /*#################################### Media Queries #####################################################*/
 @media only screen and (min-width: 980px) and (max-width: 1279px) {
@@ -3221,9 +3181,16 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub
   color: #373f3f;
 }
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected {
-  background-color: rgba(153, 204, 255, 0.4) !important;
+  background-color: hsl(200, 98%, 39%) !important;
   background-image: none !important;
 }
+div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected td.sub_item_icon img.sub_icon {
+  filter: invert(1) brightness(5);
+}
+div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected div.sub_item_text,
+div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected td.sub_item_hk div.sub_item_hk {
+  color: hsl(0, 0%, 100%);
+}
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl div.sub_sep {
   border-top: 1px solid #E6E6E6;
 }
@@ -3325,9 +3292,6 @@ table.dialog-main-view {
   color: #000000;
   border-bottom: 3px solid #696969;
 }
-.dialogHeader img[src*="navbar"] {
-  padding: 0 0 0 15px;
-}
 .dialogHeader input[type="radio"],
 .dialogHeader input.et2_radiobox {
   -webkit-appearance: none;
@@ -3505,9 +3469,6 @@ div#etemplate\.tab_widget {
 .dialogFooterToolbar td {
   padding: 5px 5px 0px 0px;
 }
-.dialogFooterToolbar td:first-child {
-  padding-left: 5px;
-}
 .dialogFooterToolbar button {
   min-width: 86px;
   height: 24px;
@@ -4292,10 +4253,8 @@ span.overlayContainer img.overlay {
   z-index: 1001;
   top: 46px;
   background: white;
-  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;
+  box-shadow: 0 2px 8px hsla(240, 3.8%, 46.1%, 0.12);
+  border: 1px solid hsl(240, 6%, 90%);
 }
 #egw_fw_header #egw_fw_topmenu a.powered_by {
   width: calc(100% - 20px);
@@ -4392,13 +4351,16 @@ span.overlayContainer img.overlay {
   border-top: #E6E6E6;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:hover {
-  background: rgba(153, 204, 255, 0.4);
-  color: #FFFFFF;
+  background: hsl(200, 98%, 39%);
+  color: hsl(0, 0%, 100%);
+}
+#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:hover a {
+  filter: invert(1) brightness(5);
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a {
   color: #000000;
   text-decoration: none;
-  font-size: 12px;
+  font-size: 11px;
   padding-left: 26px;
   line-height: 1.5em;
   display: inline-block;
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index 4ceb462cef..fe6c7c2fba 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -1071,18 +1071,6 @@
                     margin: 2px !important;
                     min-height: 19px;*/
   }
-  div.ui-toolbar-menulist {
-    position: absolute;
-    height: inherit;
-    z-index: 999 !important;
-    overflow: hidden !important;
-    border: solid black 1px;
-    padding: 0 !important;
-    margin-top: 3px !important;
-  }
-  .ui-toolbar-menulist > h {
-    padding-bottom: 7px;
-  }
   .ui-toolbar-menulistHeader {
     font-size: xx-small;
     height: 100%;
@@ -1153,34 +1141,6 @@
   .et2_toolbar span.et2_checkbox_slideSwitch.switchOn {
     filter: none;
   }
-  /*#################################### ADMIN PART #####################################################*/
-  iframe#admin-index_iframe {
-    background-color: yellow;
-  }
-  table.egwGridView_grid img {
-    /*filter grey*/
-    /*filter grey*/
-    filter: none;
-    -webkit-filter: initial;
-    -moz-filter: initial;
-    -ms-filter: initial;
-    -o-filter: initial;
-    /*filter: url(grayscale.svg);  Firefox 4+ */
-    filter: initial;
-    /* IE 6-9 */
-  }
-  .admin_aclAPP {
-    /*filter grey*/
-    filter: none;
-    -webkit-filter: initial;
-    -moz-filter: initial;
-    -ms-filter: initial;
-    -o-filter: initial;
-    /*filter: url(grayscale.svg);  Firefox 4+ */
-    filter: initial;
-    /* IE 6-9 */
-  }
-  /*#################################### END ADMIN PART #####################################################*/
 }
 /*#################################### Media Queries #####################################################*/
 @media only screen and (min-width: 980px) and (max-width: 1279px) {
@@ -3232,9 +3192,16 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub
   color: #373f3f;
 }
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected {
-  background-color: rgba(153, 204, 255, 0.4) !important;
+  background-color: hsl(200, 98%, 39%) !important;
   background-image: none !important;
 }
+div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected td.sub_item_icon img.sub_icon {
+  filter: invert(1) brightness(5);
+}
+div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected div.sub_item_text,
+div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected td.sub_item_hk div.sub_item_hk {
+  color: hsl(0, 0%, 100%);
+}
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl div.sub_sep {
   border-top: 1px solid #E6E6E6;
 }
@@ -3336,9 +3303,6 @@ table.dialog-main-view {
   color: #000000;
   border-bottom: 3px solid #696969;
 }
-.dialogHeader img[src*="navbar"] {
-  padding: 0 0 0 15px;
-}
 .dialogHeader input[type="radio"],
 .dialogHeader input.et2_radiobox {
   -webkit-appearance: none;
@@ -3516,9 +3480,6 @@ div#etemplate\.tab_widget {
 .dialogFooterToolbar td {
   padding: 5px 5px 0px 0px;
 }
-.dialogFooterToolbar td:first-child {
-  padding-left: 5px;
-}
 .dialogFooterToolbar button {
   min-width: 86px;
   height: 24px;
@@ -4303,10 +4264,8 @@ span.overlayContainer img.overlay {
   z-index: 1001;
   top: 46px;
   background: white;
-  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;
+  box-shadow: 0 2px 8px hsla(240, 3.8%, 46.1%, 0.12);
+  border: 1px solid hsl(240, 6%, 90%);
 }
 #egw_fw_header #egw_fw_topmenu a.powered_by {
   width: calc(100% - 20px);
@@ -4403,13 +4362,16 @@ span.overlayContainer img.overlay {
   border-top: #E6E6E6;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:hover {
-  background: rgba(153, 204, 255, 0.4);
-  color: #FFFFFF;
+  background: hsl(200, 98%, 39%);
+  color: hsl(0, 0%, 100%);
+}
+#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:hover a {
+  filter: invert(1) brightness(5);
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a {
   color: #000000;
   text-decoration: none;
-  font-size: 12px;
+  font-size: 11px;
   padding-left: 26px;
   line-height: 1.5em;
   display: inline-block;
@@ -8498,7 +8460,7 @@ table.egwGridView_grid img.et2_appicon {
   body .ui-dialog .ui-dialog-titlebar .ui-dialog-titlebar-close {
     display: none;
   }
-  body button.plus_button {
+  body et2-button.plus_button {
     position: fixed !important;
     right: 15px;
     bottom: 15px;
@@ -8515,10 +8477,13 @@ table.egwGridView_grid img.et2_appicon {
     margin: 0;
     padding: 0;
   }
-  body button.plus_button:hover,
-  body button.plus_button:active {
+  body et2-button.plus_button:hover,
+  body et2-button.plus_button:active {
     background-color: #0c5da5;
   }
+  body et2-button.plus_button::part(base) {
+    display: none;
+  }
   body .et2_nextmatch .nextmatch_sortheader {
     padding-right: 0px;
     margin-right: 0px;
diff --git a/pixelegg/mobile/fw_mobile.less b/pixelegg/mobile/fw_mobile.less
index c9009923da..e5e7083810 100644
--- a/pixelegg/mobile/fw_mobile.less
+++ b/pixelegg/mobile/fw_mobile.less
@@ -630,7 +630,7 @@
 				display: none;
 			}
 		}
-		button.plus_button {
+		et2-button.plus_button {
 			position: fixed !important;
 			right: 15px;
 			bottom: 15px;
@@ -650,6 +650,7 @@
 				background-color: #0c5da5;
 			}
 		}
+		et2-button.plus_button::part(base) {display: none;}
 		.et2_nextmatch {
 			.nextmatch_sortheader {
 				padding-right: 0px;
@@ -878,6 +879,9 @@
 
 					&:focus{
 						outline:none;
+					}
+					et2-favorites {
+
 					}
 					div[name="favorite"] {
 
diff --git a/preferences/templates/mobile/app.css b/preferences/templates/mobile/app.css
index 2d991ab26e..1051075c9d 100644
--- a/preferences/templates/mobile/app.css
+++ b/preferences/templates/mobile/app.css
@@ -24,7 +24,7 @@ table.prefTable {
   width: 100%;
 }
 table.prefTable tbody tr.prefRow:first-child > .prefHelpColumn {
-  background-image: url(../../../api/templates/default/images/hint.png);
+  background-image: url(../../../api/templates/default/images/dialog_info.png);
   background-repeat: no-repeat;
   background-position: center;
   height: 99%;
@@ -43,7 +43,7 @@ tr.prefRow > td.prefValueColumn {
 }
 /*.prefValueColumn {border-right:none !important;}*/
 .prefHelpColumn {
-  border: none !important;
+  border-left: 1px solid #e6e6e6 !important;
   padding: 0 !important;
 }
 .prefHelp {
@@ -70,14 +70,13 @@ tr.prefRow:hover .prefHelp {
 }
 .prefValue {
   margin-right: 5px;
-  width: 49%;
+  width: 99%;
 }
-.prefDefault {
-  float: right;
-  width: 48%;
+span.prefDefault {
   overflow-x: hidden;
   text-overflow: ellipsis;
-  max-width: 300px;
+  padding-bottom: 5px;
+  color: silver;
 }
 .prefValue textarea,
 textarea.prefValue {
@@ -89,6 +88,7 @@ textarea.prefValue {
   font-size: 150%;
   margin-top: 10px;
   margin-right: 5px;
+  position: relative;
 }
 .prefType {
   width: 49%;
@@ -105,9 +105,6 @@ textarea.prefValue {
 .prefValueColumn select.prefValue {
   white-space: pre-line;
 }
-#preferences_settings_country_chzn {
-  width: 49% !important;
-}
 /**
  * 2FA setup
  */
@@ -130,6 +127,9 @@ img.qrCode {
   font-style: italic;
   font-size: 120%;
 }
+table.prefTable tbody tr.prefRow .prefHelpColumn {
+  border-bottom: none;
+}
 .prefHelp {
   width: 100%;
   height: 60px;
@@ -161,4 +161,5 @@ div#preferences-settings_tabs {
     height: 60px !important;
     background-position: center !important;
   }
-}
\ No newline at end of file
+}
+/*# sourceMappingURL=app.css.map */
\ No newline at end of file
diff --git a/timesheet/templates/mobile/app.css b/timesheet/templates/mobile/app.css
index d615fd7cbd..f08c5d2ace 100644
--- a/timesheet/templates/mobile/app.css
+++ b/timesheet/templates/mobile/app.css
@@ -56,3 +56,4 @@
     word-break: break-all;
   }
 }
+/*# sourceMappingURL=app.css.map */
\ No newline at end of file
diff --git a/timesheet/templates/mobile/index.xet b/timesheet/templates/mobile/index.xet
index 1d63f5df46..b51ebb09b9 100644
--- a/timesheet/templates/mobile/index.xet
+++ b/timesheet/templates/mobile/index.xet
@@ -10,9 +10,6 @@
 			<date statustext="Leave it empty for a full week" id="enddate"/>
 		</hbox>
 	</template>
-	<template id="timesheet.index.add" template="" lang="" group="0" version="1.7.001">
-		<buttononly id="add"  class="plus_button" onclick="egw.open('timesheet');" parent_node="timesheet-index_plus_button_container"/>
-	</template>
 	<template id="timesheet.index.rows" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
 			<columns>
@@ -52,6 +49,7 @@
 	</template>
 	<template id="timesheet.index" template="" lang="" group="0" version="1.9.001">
 		<description id="plus_button_container"/>
-		<nextmatch id="nm" options="timesheet.index.rows" header_right="timesheet.index.add" header_left="timesheet.index.dates"/>
+		<nextmatch id="nm" options="timesheet.index.rows" header_left="timesheet.index.dates"/>
+		<buttononly id="add"  class="plus_button" onclick="egw.open('timesheet');" />
 	</template>
 </overlay>