diff --git a/timesheet/templates/mobile/edit.xet b/timesheet/templates/mobile/edit.xet
new file mode 100644
index 0000000000..4fff6068ca
--- /dev/null
+++ b/timesheet/templates/mobile/edit.xet
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!-- $Id: edit.xet 52376 2015-04-01 20:03:04Z nathangray $ -->
+<overlay>
+	<template id="timesheet.edit.general" template="" lang="" group="0" version="1.7.002">
+		<grid width="100%">
+			<columns>
+				<column width = "120"/>
+				<column width="600"/>
+			</columns>
+			<rows>
+				<row>
+					<description value="Project" for="ts_project"/>
+					<hbox disabled="@pm_integration=none">
+						<link-entry id="pm_id" onchange="app.timesheet.pm_id_changed" only_app='projectmanager' blur='None' class="et2_fullWidth"/>
+					</hbox>
+					<hbox disabled="@pm_integration=full" span="all">
+						<textbox blur="@ts_project_blur" id="ts_project" size="65" maxlength="80" class="et2_fullWidth"/>
+					</hbox>
+				</row>
+				<row disabled="@ts_viewtype">
+					<description value="Unitprice" for="ts_unitprice"/>
+					<hbox disabled="@pm_integration=none" >
+						<textbox type="float" id="ts_unitprice" span="all" size="10"/>
+						<projectmanager-pricelist id="pl_id" class="et2_fullWidth" onchange="window.app.timesheet.et2.getWidgetById('ts_unitprice').set_value(this.options[this.selectedIndex].text.lastIndexOf('(') &lt; 0 ? '' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf('(')+1,-1));" options="None"/>
+					</hbox>
+				</row>
+				<row class="row" disabled="!@ts_viewtype">
+					<description value="comment"/>
+					<textbox multiline="true" id="ts_description_short" rows="5" cols="50" class="et2_fullWidth"/>
+				</row>
+				<row class="row" disabled="@ts_viewtype">
+					<description value="Quantity" for="ts_quantity"/>
+					<textbox type="float" blur="@ts_quantity_blur" statustext="empty if identical to duration" id="ts_quantity" precision="3" class="et2_fullWidth"/>
+				</row>
+				<row class="row" disabled="@ts_viewtype">
+					<description value="Category" for="cat_id"/>
+					<menulist span="all">
+						<menupopup type="select-cat" id="cat_id" options="None,,,timesheet"  class="et2_fullWidth"/>
+					</menulist>
+				</row>
+			</rows>
+		</grid>
+	</template>
+	<template id="timesheet.edit.notes" template="" lang="" group="0" version="1.5.001">
+		<textbox multiline="true" id="ts_description" rows="9" cols="70" class="et2_fullWidth"  height="100%"/>
+	</template>
+	<template id="timesheet.edit.links" template="" lang="" group="0" version="0.1.001">
+		<grid width="100%">
+			<columns>
+				<column width="600"/>
+			</columns>
+			<rows>
+				<row disabled="@view">
+					<link-to id="link_to"/>
+				</row>
+				<row class="th">
+					<description value="Existing links"/>
+				</row>
+				<row>        
+					<link-list id="link_to"/>
+				</row>
+			</rows>
+		</grid>
+	</template>
+	<template id="timesheet.edit.customfields" template="" lang="" group="0" version="1.5.001">
+		<grid width="100%">
+			<columns>
+				<column width = "120"/>
+				<column width="600"/>
+			</columns>
+			<rows>
+				<row>
+					<box width="100%" overflow="auto">
+						<customfields options="@info_type"/>
+					</box>
+				</row>
+			</rows>
+		</grid>
+	</template>
+	<template id="timesheet.edit" template="" lang="" group="0" version="1.9.002">
+		<grid border="1" width="100%">
+			<columns>
+				<column width = "120"/>
+				<column width="600"/>
+			</columns>
+			<rows>
+				<row disabled="@hidebuttons" class="dialogHeadbar" >
+					<hbox  span="all" width="100%">
+						<button statustext="Saves this entry and add a new one" label="Save &amp; New" id="button[save_new]" image="save_new" background_image="1"/>
+						<button statustext="Saves the changes made" id="button[save]" image="save" background_image="1"/>
+						<button statustext="Applies the changes made" id="button[apply]" image="apply" background_image="1"/>
+						<button statustext="Delete this entry" id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this entry','Delete')" image="delete" background_image="1"/>
+					</hbox>
+				</row>
+				<row disabled="!@showsearchbuttons" class="dialogHeadbar">
+					<hbox span="all" width="100%">
+						<button label="Search" id="button[search]" image="search" background_image="1"/>
+						<button label="Cancel" id="button[cancelsearch]" image="cancel" background_image="1"/>
+					</hbox>
+				</row>
+				<row disabled="@ts_viewtype">
+					<description value="Title"/>
+					<textbox blur="@ts_title_blur" id="ts_title" size="65" maxlength="255" class="et2_fullWidth et2_required" tabindex="1"/>
+				</row>
+				<row>
+					<description value="Date"/>
+					<hbox>
+						<date id="ts_start" needed="1" options=",8" width="90%"/>
+						<textbox align="right" type="integer" id="ts_id" readonly="true"/>
+					</hbox>
+				</row>
+				<row>
+					<description value="Starttime"/>
+					<date-timeonly id="start_time" options="H:i"  class="et2_fullWidth"/>
+				</row>
+				<row>
+					<description value="Duration" for="ts_duration"/>
+					<date-duration id="ts_duration" options=",hm" class="et2_fullWidth" />
+				</row>
+				<row>
+					<description value="or endtime" class="et2_noWrap"/>
+					<date-timeonly id="end_time" options="H:i" class="et2_fullWidth"/>
+				</row>
+				<row>
+					<description value="Status"/>
+					<menulist>
+						<menupopup statustext="select a status of the timesheet" id="ts_status"  class="et2_fullWidth" options="please select" />
+					</menulist>
+				</row>
+				<row>
+					<tabbox id="tabs" span="all" width="100%" align_tabs="v">
+						<tabs>
+							<tab id="notes" label="Description"/>
+							<tab id="general" label="Details"/>
+							<tab id="links" label="Links"/>
+							<tab id="customfields" label="Custom Fields"/>
+						</tabs>
+						<tabpanels class="dialog-main-timeframe">
+							<template id="timesheet.edit.notes"/>
+							<template id="timesheet.edit.general"/>
+							<template id="timesheet.edit.links"/>
+							<template id="timesheet.edit.customfields"/>
+						</tabpanels>
+					</tabbox>
+				</row>
+				<row>
+					<details title="Ownership">
+						<grid width="100%">
+							<columns>
+								<column width = "120"/>
+								<column width="600"/>
+							</columns>
+							<rows>
+								<row>
+									<description value="User" for="ts_owner"/>
+									<menulist >
+										<menupopup id="ts_owner" no_lang="1" class="et2_fullWidth"/>
+									</menulist>
+								</row>
+								<row disabled="!@ts_modified">
+									<description value="Last modified"/>
+									<menulist>
+										<menupopup type="select-account" id="ts_modifier" readonly="true"/>
+									</menulist>	
+								</row>
+								<row>
+									<description/>
+									<date-time id="ts_modified" readonly="true" align="left"/>
+								</row>
+							</rows>
+						</grid>
+					</details>
+				</row>
+			</rows>
+		</grid>
+	</template>
+</overlay>
diff --git a/timesheet/templates/pixelegg/app.css b/timesheet/templates/pixelegg/app.css
index 59a21a1098..e93096ec8f 100755
--- a/timesheet/templates/pixelegg/app.css
+++ b/timesheet/templates/pixelegg/app.css
@@ -185,6 +185,9 @@ tr.dialogOperators td,
 }
 /* tablets and smartphones  */
 @media only screen and (max-device-width: 1024px) {
+  #timesheet-edit_button\[save_new\] {
+    vertical-align: bottom;
+  }
   #timesheet-index table.egwGridView_outer tbody label[id^='timesheet-index'][id$='ts_start]'] > time {
     font-weight: bold;
     float: left;
@@ -194,7 +197,7 @@ tr.dialogOperators td,
     width: 90px;
     white-space: nowrap;
     text-overflow: ellipsis;
-    font-size: 8pt;
+    font-size: 9pt;
   }
   #timesheet-index table.egwGridView_outer tbody tr.timesheetRow td {
     position: relative;
@@ -202,7 +205,7 @@ tr.dialogOperators td,
   #timesheet-index table.egwGridView_outer tbody span[id^='timesheet-index'][id$='cat_id]'] {
     position: absolute;
     bottom: 5px;
-    font-size: 8pt;
+    font-size: 9pt;
   }
   #timesheet-index table.egwGridView_outer tbody span[id^='timesheet-index'][id$='ts_description]'] {
     height: 30px;
@@ -211,7 +214,7 @@ tr.dialogOperators td,
     text-overflow: ellipsis;
   }
   #timesheet-index table.egwGridView_outer tbody div.timesheet3Col {
-    font-size: 8pt;
+    font-size: 9pt;
   }
   #timesheet-index table.egwGridView_outer tbody span[id^='timesheet-index'][id$='ts_duration]'] {
     font-weight: bold;
diff --git a/timesheet/templates/pixelegg/app.less b/timesheet/templates/pixelegg/app.less
index b389d05303..a7f4109772 100755
--- a/timesheet/templates/pixelegg/app.less
+++ b/timesheet/templates/pixelegg/app.less
@@ -155,6 +155,9 @@ span.timesheet_titleDetails {font-weight: bold;}
 
 /* tablets and smartphones  */
 @media only screen and (max-device-width:1024px) {
+	#timesheet-edit_button\[save_new\] {
+		vertical-align: bottom;
+	}
 	#timesheet-index {
 		table.egwGridView_outer tbody {
 			label[id^='timesheet-index'][id$='ts_start]'] > time{