diff --git a/calendar/templates/mobile/app.css b/calendar/templates/mobile/app.css
index fc5942d38c..42e832a016 100644
--- a/calendar/templates/mobile/app.css
+++ b/calendar/templates/mobile/app.css
@@ -2547,7 +2547,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 /*ui-widget*/
 /*edit series*/
 button#series {
-  background-image: url('../../../default/images/edit.svg') !important;
+  background-image: url('../../../api/templates/default/images/edit.svg') !important;
   /*.border_normal;*/
   /*.box_shadow_standard_light;*/
   /*.rounded (3px);*/
@@ -2592,7 +2592,7 @@ button#series:hover {
   box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
 }
 button#series:hover {
-  background-image: url('../../../default/images/edit.svg') !important;
+  background-image: url('../../../api/templates/default/images/edit.svg') !important;
   background-color: #b3e4a6 !important;
 }
 button#series:active {
@@ -2600,7 +2600,7 @@ button#series:active {
 }
 /*edit exception*/
 button#exception {
-  background-image: url('../../../default/images/edit.svg') !important;
+  background-image: url('../../../api/templates/default/images/edit.svg') !important;
   /*.border_normal;*/
   /*.box_shadow_standard_light;*/
   /*.rounded (3px);*/
@@ -2645,7 +2645,7 @@ button#exception:hover {
   box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
 }
 button#exception:hover {
-  background-image: url('../../../default/images/edit.svg') !important;
+  background-image: url('../../../api/templates/default/images/edit.svg') !important;
   background-color: #b3e4a6 !important;
 }
 button#exception:active {
@@ -2771,7 +2771,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
 #calendar-sidebox_header_go {
   width: 20px;
   height: 20px;
-  background-image: url('../../../default/images/check.svg');
+  background-image: url('../../../api/templates/default/images/check.svg');
   text-indent: 140%;
   border: none;
   border-radius: 0px;
@@ -2784,7 +2784,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
 #calendar-sidebox_header_today {
   width: 2em;
   height: 2em;
-  background-image: url('../../../default/images/bullet.svg');
+  background-image: url('../../../api/templates/default/images/bullet.svg');
   text-indent: 140%;
   border: none;
   border-radius: 0px;
@@ -2846,10 +2846,10 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
   background: none;
 }
 #calendar-toolbar_toolbar #toolbar-weekend span.slideSwitch_container span.on {
-  background-image: url(../../../default/images/7_day_view.svg);
+  background-image: url(../../../api/templates/default/images/7_day_view.svg);
 }
 #calendar-toolbar_toolbar #toolbar-weekend span.slideSwitch_container span.off {
-  background-image: url(../../../default/images/5_day_view.svg);
+  background-image: url(../../../api/templates/default/images/5_day_view.svg);
 }
 /* ########################################################################################
 /* * Calendar END */
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index a80f3fe947..ec8c6f775e 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -2535,7 +2535,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 /*ui-widget*/
 /*edit series*/
 button#series {
-  background-image: url('../../../default/images/edit.svg') !important;
+  background-image: url('../../../api/templates/default/images/edit.svg') !important;
   /*.border_normal;*/
   /*.box_shadow_standard_light;*/
   /*.rounded (3px);*/
@@ -2580,7 +2580,7 @@ button#series:hover {
   box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
 }
 button#series:hover {
-  background-image: url('../../../default/images/edit.svg') !important;
+  background-image: url('../../../api/templates/default/images/edit.svg') !important;
   background-color: #b3e4a6 !important;
 }
 button#series:active {
@@ -2588,7 +2588,7 @@ button#series:active {
 }
 /*edit exception*/
 button#exception {
-  background-image: url('../../../default/images/edit.svg') !important;
+  background-image: url('../../../api/templates/default/images/edit.svg') !important;
   /*.border_normal;*/
   /*.box_shadow_standard_light;*/
   /*.rounded (3px);*/
@@ -2633,7 +2633,7 @@ button#exception:hover {
   box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
 }
 button#exception:hover {
-  background-image: url('../../../default/images/edit.svg') !important;
+  background-image: url('../../../api/templates/default/images/edit.svg') !important;
   background-color: #b3e4a6 !important;
 }
 button#exception:active {
@@ -2759,7 +2759,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
 #calendar-sidebox_header_go {
   width: 20px;
   height: 20px;
-  background-image: url('../../../default/images/check.svg');
+  background-image: url('../../../api/templates/default/images/check.svg');
   text-indent: 140%;
   border: none;
   border-radius: 0px;
@@ -2772,7 +2772,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
 #calendar-sidebox_header_today {
   width: 2em;
   height: 2em;
-  background-image: url('../../../default/images/bullet.svg');
+  background-image: url('../../../api/templates/default/images/bullet.svg');
   text-indent: 140%;
   border: none;
   border-radius: 0px;
@@ -2834,10 +2834,10 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
   background: none;
 }
 #calendar-toolbar_toolbar #toolbar-weekend span.slideSwitch_container span.on {
-  background-image: url(../../../default/images/7_day_view.svg);
+  background-image: url(../../../api/templates/default/images/7_day_view.svg);
 }
 #calendar-toolbar_toolbar #toolbar-weekend span.slideSwitch_container span.off {
-  background-image: url(../../../default/images/5_day_view.svg);
+  background-image: url(../../../api/templates/default/images/5_day_view.svg);
 }
 /* ########################################################################################
 /* * Calendar END */
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index 3528cc32e5..8a298e465d 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -993,18 +993,18 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 /*ui-widget*/
  /*edit series*/
 button#series {
-    background-image:url('../../../pixelegg/../default/images/edit.svg') !important;
+    background-image:url('../../../api/templates/default/images/edit.svg') !important;
     .Complete_Button_text_icon_before;
     .Complete_Button_save_apply_copy;
-    &:hover {background-image:url('../../../pixelegg/../default/images/edit.svg') !important; background-color: @color_positive_action_active !important;}
+    &:hover {background-image:url('../../../api/templates/default/images/edit.svg') !important; background-color: @color_positive_action_active !important;}
     &:active {background-color: @color_positive_action_active !important;}
 }
 /*edit exception*/
 button#exception {
-        background-image:url('../../../pixelegg/../default/images/edit.svg') !important;
+        background-image:url('../../../api/templates/default/images/edit.svg') !important;
     .Complete_Button_text_icon_before;
     .Complete_Button_save_apply_copy;
-    &:hover {background-image:url('../../../pixelegg/../default/images/edit.svg') !important;background-color: @color_positive_action_active !important;}
+    &:hover {background-image:url('../../../api/templates/default/images/edit.svg') !important;background-color: @color_positive_action_active !important;}
     &:active {background-color: @color_positive_action_active !important;}
 }
 
@@ -1162,7 +1162,7 @@ div#calendar-container {
 	width: 20px;
 	height: 20px;
 
-	background-image: url('../../../pixelegg/../default/images/check.svg');
+	background-image: url('../../../api/templates/default/images/check.svg');
     text-indent: 140%;
     border: none;
     border-radius: 0px;
@@ -1175,7 +1175,7 @@ div#calendar-container {
 #calendar-sidebox_header_today {
 	width: 2em;
 	height: 2em;
-	background-image: url('../../../pixelegg/../default/images/bullet.svg');
+	background-image: url('../../../api/templates/default/images/bullet.svg');
     text-indent: 140%;
     border: none;
     border-radius: 0px;
@@ -1240,10 +1240,10 @@ div#calendar-container {
 		}
 	}
   #toolbar-weekend span.slideSwitch_container span.on {
-	background-image: url(../../../pixelegg/../default/images/7_day_view.svg);
+	background-image: url(../../../api/templates/default/images/7_day_view.svg);
   }
   #toolbar-weekend span.slideSwitch_container span.off {
-	background-image: url(../../../pixelegg/../default/images/5_day_view.svg);
+	background-image: url(../../../api/templates/default/images/5_day_view.svg);
   }
 }
 
diff --git a/filemanager/templates/mobile/app.css b/filemanager/templates/mobile/app.css
index 7bfbff99f1..7614decb40 100644
--- a/filemanager/templates/mobile/app.css
+++ b/filemanager/templates/mobile/app.css
@@ -394,7 +394,7 @@ div#stylite-filemanager-upload .dialogFooterToolbar button:active {
   box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
 }
 #filemanager-index_new_wrapper .ui-icon-triangle-1-s {
-  background-image: url(../../../default/images/add.svg);
+  background-image: url(../../../api/templates/default/images/add.svg);
   background-size: 12px;
   background-repeat: no-repeat;
   background-position: center;
diff --git a/filemanager/templates/pixelegg/app.css b/filemanager/templates/pixelegg/app.css
index 374d2cee46..4986e71fb9 100755
--- a/filemanager/templates/pixelegg/app.css
+++ b/filemanager/templates/pixelegg/app.css
@@ -382,7 +382,7 @@ div#stylite-filemanager-upload .dialogFooterToolbar button:active {
   box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
 }
 #filemanager-index_new_wrapper .ui-icon-triangle-1-s {
-  background-image: url(../../../default/images/add.svg);
+  background-image: url(../../../api/templates/default/images/add.svg);
   background-size: 12px;
   background-repeat: no-repeat;
   background-position: center;
diff --git a/filemanager/templates/pixelegg/app.less b/filemanager/templates/pixelegg/app.less
index 3f16a31c67..74f6f1f979 100644
--- a/filemanager/templates/pixelegg/app.less
+++ b/filemanager/templates/pixelegg/app.less
@@ -118,7 +118,7 @@ div#stylite-filemanager-upload {
 }
 #filemanager-index_new_wrapper {
 	.ui-icon-triangle-1-s {
-		background-image: url(../../../pixelegg/../default/images/add.svg);
+		background-image: url(../../../api/templates/default/images/add.svg);
 		background-size: 12px;
 		background-repeat: no-repeat;
 		background-position: center;
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 788bd0e4ff..321df5a989 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -1605,29 +1605,29 @@ tr.mail.deleted td:first-child {
   width: 16px;
   height: 16px;
   background-repeat: no-repeat;
-  background-image: url(../default/images/kmmsgread.svg);
+  background-image: url(../api/templates/default/images/kmmsgread.svg);
   background-size: 16px 16px;
 }
 tr.deleted .status_img {
-  background-image: url(../default/images/kmmsgdel.svg);
+  background-image: url(../api/templates/default/images/kmmsgdel.svg);
 }
 tr.unseen .status_img {
-  background-image: url(../default/images/kmmsgunseen.svg);
+  background-image: url(../api/templates/default/images/kmmsgunseen.svg);
 }
 tr.flagged_seen .status_img {
-  background-image: url(../default/images/read_flagged_small.svg) !important;
+  background-image: url(../api/templates/default/images/read_flagged_small.svg) !important;
 }
 tr.flagged_unseen .status_img {
-  background-image: url(../default/images/unread_flagged_small.svg) !important;
+  background-image: url(../api/templates/default/images/unread_flagged_small.svg) !important;
 }
 tr.recent .status_img {
-  background-image: url(../default/images/kmmsgnew.svg) !important;
+  background-image: url(../api/templates/default/images/kmmsgnew.svg) !important;
 }
 tr.replied .status_img {
-  background-image: url(../default/images/mail_reply.svg) !important;
+  background-image: url(../api/templates/default/images/mail_reply.svg) !important;
 }
 tr.forwarded .status_img {
-  background-image: url(../default/images/mail_forward.svg) !important;
+  background-image: url(../api/templates/default/images/mail_forward.svg) !important;
 }
 .subjectBold {
   font-size: 12px;
@@ -1804,7 +1804,7 @@ input[type=button] {
   text-align: left;
   font-weight: bold;
   padding-left: 25px;
-  background-image: url(../default/images/write_mail.png) !important;
+  background-image: url(../api/templates/default/images/write_mail.png) !important;
   background-position: left;
   background-repeat: no-repeat;
 }
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index a683413756..d0bd5452b1 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -641,36 +641,36 @@ tr.mail.deleted td:first-child {
 	width: 16px;
 	height: 16px;
 	background-repeat: no-repeat;
-	background-image: url(../pixelegg/../default/images/kmmsgread.svg);
+	background-image: url(../api/templates/default/images/kmmsgread.svg);
 	background-size: 16px 16px;
 }
 
 tr.deleted .status_img {
-	background-image: url(../pixelegg/../default/images/kmmsgdel.svg);
+	background-image: url(../api/templates/default/images/kmmsgdel.svg);
 }
 
 tr.unseen .status_img {
-	background-image: url(../pixelegg/../default/images/kmmsgunseen.svg);
+	background-image: url(../api/templates/default/images/kmmsgunseen.svg);
 }
 
 tr.flagged_seen .status_img {
-	background-image: url(../pixelegg/../default/images/read_flagged_small.svg) !important;
+	background-image: url(../api/templates/default/images/read_flagged_small.svg) !important;
 }
 
 tr.flagged_unseen .status_img {
-	background-image: url(../pixelegg/../default/images/unread_flagged_small.svg) !important;
+	background-image: url(../api/templates/default/images/unread_flagged_small.svg) !important;
 }
 
 tr.recent .status_img {
-	background-image: url(../pixelegg/../default/images/kmmsgnew.svg) !important;
+	background-image: url(../api/templates/default/images/kmmsgnew.svg) !important;
 }
 
 tr.replied .status_img {
-	background-image: url(../pixelegg/../default/images/mail_reply.svg) !important;
+	background-image: url(../api/templates/default/images/mail_reply.svg) !important;
 }
 
 tr.forwarded .status_img {
-	background-image: url(../pixelegg/../default/images/mail_forward.svg) !important;
+	background-image: url(../api/templates/default/images/mail_forward.svg) !important;
 }
 
 .subjectBold
@@ -877,7 +877,7 @@ input[type=button] {
 	text-align: left;
 	font-weight: bold;
 	padding-left: 25px;
-	background-image: url(../pixelegg/../default/images/write_mail.png) !important;
+	background-image: url(../api/templates/default/images/write_mail.png) !important;
 	background-position: left;
 	background-repeat: no-repeat;
 }
diff --git a/preferences/templates/mobile/app.css b/preferences/templates/mobile/app.css
index 8b3e0e8a49..2d991ab26e 100644
--- a/preferences/templates/mobile/app.css
+++ b/preferences/templates/mobile/app.css
@@ -32,12 +32,14 @@ table.prefTable tbody tr.prefRow:first-child > .prefHelpColumn {
 tr.prefRow:hover {
   background-color: #f0f0ff;
 }
-td.prefName {
-  width: 50%;
+.prefName .et2_label:first-child {
+  padding-top: 2px;
 }
 tr.prefRow > td {
-  vertical-align: bottom;
-  /* otherwise help will cover bigger prefValue */
+  vertical-align: top;
+}
+tr.prefRow > td.prefValueColumn {
+  vertical-align: middle;
 }
 /*.prefValueColumn {border-right:none !important;}*/
 .prefHelpColumn {
@@ -159,4 +161,4 @@ div#preferences-settings_tabs {
     height: 60px !important;
     background-position: center !important;
   }
-}
+}
\ No newline at end of file
diff --git a/preferences/templates/pixelegg/app.css b/preferences/templates/pixelegg/app.css
index 7f8683b59f..68c2bdc17c 100755
--- a/preferences/templates/pixelegg/app.css
+++ b/preferences/templates/pixelegg/app.css
@@ -150,7 +150,7 @@ table.prefTable {
   width: 100%;
 }
 table.prefTable tbody tr.prefRow:first-child > .prefHelpColumn {
-  background-image: url(../../../default/images/dialog_info.png);
+  background-image: url(../../../api/templates/default/images/dialog_info.png);
 }
 .prefHelp {
   position: absolute;
@@ -197,7 +197,7 @@ textarea.prefValue {
 /*Preferences APP Settings / right*/
 .prefApp::after,
 .prefType::after {
-  background-image: url(../default/images/setup.png);
+  background-image: url(../api/templates/default/images/setup.png);
   background-repeat: no-repeat;
   background-size: contain;
   position: absolute;
diff --git a/preferences/templates/pixelegg/app.less b/preferences/templates/pixelegg/app.less
index 11c191b373..c79d617c23 100755
--- a/preferences/templates/pixelegg/app.less
+++ b/preferences/templates/pixelegg/app.less
@@ -45,7 +45,7 @@ table.prefTable {
 	width: 100%;
 }
 table.prefTable tbody tr.prefRow:first-child > .prefHelpColumn {
-	background-image:url(../../../pixelegg/../default/images/dialog_info.png);
+	background-image:url(../../../api/templates/default/images/dialog_info.png);
 }
 .prefHelp {
 	position: absolute;
@@ -86,7 +86,7 @@ tr.prefRow:hover .prefHelp {
 
 /*Preferences APP / left */ /*Preferences APP Settings / right*/
 .prefApp::after, .prefType::after {
-  background-image: url(../pixelegg/../default/images/setup.png);
+  background-image: url(../api/templates/default/images/setup.png);
   background-repeat: no-repeat;
   background-size: contain;
   position: absolute;
@@ -120,4 +120,4 @@ tr.prefRow:hover .prefHelp {
 			padding:5px;
 		}
 	}
-}
+}
\ No newline at end of file