diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index 847d82abbe..28b11c15e4 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -3739,8 +3739,8 @@ tr.dialogHeader td, tr.dialogHeader2 td, tr.dialogHeader3 td, tr.dialogHeader4 t
 tr.dialogOperators td, .dialogFooterToolbar {
     padding: 5px 0 5px 0px;
 }
-.dialogFooterToolbar td {
-    padding: 5px 5px 0px 0px;
+.dialogFooterToolbar, .dialogFooterToolbar td {
+    padding-top: 10px !important;
 }
 .dialogHeader {
     vertical-align: middle;
@@ -3749,7 +3749,7 @@ tr.dialogOperators td, .dialogFooterToolbar {
 }
 
 tr.dialogHeader2 td {
-    padding-top: 15px;
+    padding-top: 10px !important;
 }
 
 /*readonly widget style*/
diff --git a/calendar/templates/default/edit.xet b/calendar/templates/default/edit.xet
index 8edd40aa7c..86ab40221e 100644
--- a/calendar/templates/default/edit.xet
+++ b/calendar/templates/default/edit.xet
@@ -204,13 +204,13 @@
 				<column width="50"/>
 			</columns>
 			<rows>
-				<row class="dialogHeader" height="28">
+				<row class="dialogHeader">
 					<description value="Title"/>
 					<textbox id="title" needed="1" maxlength="255" tabindex="1" class="et2_fullWidth" span="5"/>
 					<description font_style="n" id="id"/>
 					<appicon/>
 				</row>
-				<row class="dialogHeader2" height="28">
+				<row class="dialogHeader2">
                     <description for="start" value="Start"/>
 					<date-time id="start" needed="1" class="required" onchange="app.calendar.edit_start_change"/>
 					<description for="duration" value="Duration" id="calendar_edit_duration" />
@@ -220,7 +220,7 @@
 					</menulist>
 					<date-time id="end" onchange="app.calendar.edit_update_participant"/>
 				</row>
-				<row class="dialogHeader2" height="28">
+				<row class="dialogHeader2">
 					<label value="Options"/>
 					<checkbox statustext="Event will occupy the whole day" label="whole day" id="whole_day" onchange="app.calendar.set_alarmOptions_WD"/>
 					<checkbox label="Private" id="public" options="0,1" statustext="Mark event as private to hide title and description"/>
@@ -233,7 +233,7 @@
 					</hbox>
 					<description/>
 				</row>
-				<row class="dialogHeader3" height="28">
+				<row class="dialogHeader3">
 					<label for="location" value="Location"/>
 					<hbox span="2">
 						<textbox id="location" maxlength="255" class="et2_fullWidth"/>