diff --git a/timesheet/templates/default/app.css b/timesheet/templates/default/app.css
index 558c83535d..baea48db29 100644
--- a/timesheet/templates/default/app.css
+++ b/timesheet/templates/default/app.css
@@ -4,6 +4,13 @@
  * @version: $Id$
  */
 
+// Header classes
+tr.dialogHeader td, tr.dialogHeader2 td, tr.dialogHeader3 td, tr.dialogHeader4 td,
+tr.dialogOperators td,.dialogFooterToolbar {
+	padding: 5px 0 5px 0;
+	vertical-align: middle;
+}
+
 .timesheet_titleSum,.timesheet_titleDetails { font-weight: bold; }
 
 div#timesheet-edit.et2_container
diff --git a/timesheet/templates/default/edit.xet b/timesheet/templates/default/edit.xet
index d084a43ace..9da0b29369 100644
--- a/timesheet/templates/default/edit.xet
+++ b/timesheet/templates/default/edit.xet
@@ -96,21 +96,21 @@
 				<column width="4"/>
 			</columns>
 			<rows>
-				<row disabled="@ts_viewtype">
+				<row class="dialogHeader" disabled="@ts_viewtype">
 					<description value="Title" for="ts_title"/>
 					<textbox blur="@ts_title_blur" id="ts_title" size="65" maxlength="80" class="et2_fullWidth" tabindex="1" span="3"/>
 					<appicon src="timesheet"/>
 					<textbox type="integer" id="ts_id" readonly="true" class="timesheet_timesheetId"/>
 					<description />
 				</row>
-				<row>
+				<row class="dialogHeader2">
 					<description value="Date" for="ts_start"/>
 					<date id="ts_start" needed="1" options=",8" class="et2_fullWidth"/>
 					<description value="Starttime"/>
 					<date-timeonly id="start_time" options="H:i"  class="et2_fullWidth" span="3"/>
 					<description/>
 				</row>
-				<row class="row">
+				<row class="dialogHeader2">
 					<description value="Duration" for="ts_duration"/>
 					<date-duration id="ts_duration" options=",hm" class="et2_fullWidth noWrap" />
 					<description value="or endtime" class="noWrap"/>
@@ -136,7 +136,7 @@
 						</tabpanels>
 					</tabbox>
 				</row>
-				<row>
+				<row class="dialogOperators">
 					<description value="User" for="ts_owner"/>
 					<menulist >
 						<menupopup id="ts_owner" no_lang="1" class="et2_fullWidth"/>
@@ -147,7 +147,7 @@
 					</menulist>
 					<description/>
 				</row>
-				<row disabled="!@ts_modified">
+				<row class="dialogOperators" disabled="!@ts_modified">
 					<description value="Last modified"/>
 					<hbox width="100%" class="timesheet_modifier">
 						<menulist>
@@ -157,7 +157,7 @@
 					</hbox>
 					<description span="all"/>
 				</row>
-				<row>
+				<row class="dialogFooterToolbar">
 					<hbox orient="0" span="all">
 						<hbox>
 							<button statustext="Edit this entry" label="Edit" id="button[edit]" image="edit" background_image="1"/>