diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index e3ec16fe0c..91bfc26327 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -1,5 +1,18 @@
 /* $Id$ */
 
+/*Media print classes*/
+@media print{
+	.th td, .row_on td, .row_off td {
+		border: none !important;
+	}
+	img.calendar_print_button {
+		display: none !important;
+	}
+	tr.calendar_print_cat {
+		border-bottom: 1px solid gray;
+	}
+}
+
 /* Header classes */
 tr.dialogHeader td, tr.dialogHeader2 td, tr.dialogHeader3 td, tr.dialogHeader4 td,
 tr.dialogOperators td,.dialogFooterToolbar {
@@ -632,3 +645,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .calendar_freetime_header { font-size: 120%; font-weight: bold; }
 .calendar_freetime_timeframe { position: relative;}
 .calendar_freetime_dow { position: absolute; }
+
+img.calendar_print_button, img.calendar_print_appicon {
+	height: 24px;
+	width: 24px;
+}
\ No newline at end of file
diff --git a/calendar/templates/default/print.participants.xet b/calendar/templates/default/print.participants.xet
deleted file mode 100644
index 6b841d9f27..0000000000
--- a/calendar/templates/default/print.participants.xet
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id$ -->
-<overlay>
-	<template id="calendar.print.participants" template="" lang="" group="0" version="1.6.001">
-		<grid width="100%" height="200" overflow="auto" id="participants">
-			<columns>
-				<column width="95"/>
-				<column/>
-				<column/>
-				<column disabled="@hide_status_recurrence"/>
-				<column/>
-			</columns>
-			<rows>
-				<row>
-					<description span="all"/>
-				</row>
-				<row class="th">
-					<description value="Type"/>
-					<description value="Participants"/>
-					<description value="Quantity"/>
-					<description value="All future"/>
-					<description value="Status"/>
-				</row>
-				<row valign="top">
-					<description id="${row}[app]"/>
-					<description rows="1" cols="2" id="${row}[title]" no_lang="1"/>
-					<int id="${row}[quantity]" options="1,,3" readonly="true"/>
-					<checkbox id="${row}[status_recurrence]" align="center" readonly="true"/>
-					<menulist>
-						<menupopup id="${row}[status]" no_lang="1" onchange="1"/>
-					</menulist>
-				</row>
-			</rows>
-		</grid>
-	</template>
-</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/print.xet b/calendar/templates/default/print.xet
index 974f5a33a7..71f3014187 100644
--- a/calendar/templates/default/print.xet
+++ b/calendar/templates/default/print.xet
@@ -40,7 +40,7 @@
 				<column/>
 			</columns>
 			<rows>
-				<row class="th">
+				<row class="th" height="28">
 					<description span="all" value="Existing links"/>
 				</row>
 				<row class="row_off" valign="top">
@@ -57,20 +57,23 @@
 					<column/>
 				</columns>
 				<rows>
-					<row class="th">
-						<image src="print" onclick="window.print();"/>
-						<description class="bold" value="Calendar" options="bold"/>
+					<row>
+						<hbox>
+							<image src="print" onclick="window.print();" class="calendar_print_button"/>
+							<appicon class="calendar_print_appicon"/>
+						</hbox>
 					</row>
 					<row class="th" height="28">
-						<description value="Title"/>
-						<textbox id="title" size="80" maxlength="255" readonly="true" span="all"/>
+						<description value="Title" class="bold" options="bold"/>
+						<textbox id="title" size="80" maxlength="255" readonly="true" span="all" class="bold"/>
 					</row>
 					<row class="row">
 						<description width="95" options=",,,start" value="Start"/>
-						<hbox options="0,0">
-							<date-time id="start" readonly="true"/>
-							<checkbox label="whole day" id="whole_day" options=",, ,disable" statustext="Event will occupy the whole day" align="center" readonly="true"/>
-						</hbox>
+						<date-time id="start" readonly="true"/>
+					</row>
+					<row class="row">
+						<description width="0" options=",,,whole_day" value="whole day"/>
+						<checkbox id="whole_day" options=",, ," statustext="Event will occupy the whole day" readonly="true"/>
 					</row>
 					<row class="row">
 						<description width="0" options=",,,duration" value="Duration"/>
@@ -85,21 +88,21 @@
 						<description options=",,,location" value="Location" width="0"/>
 						<textbox maxlength="255" id="location" class="calendar_inputFullWidth" readonly="true"/>
 					</row>
-					<row class="row_off">
+					<row class="row">
 						<description options=",,,priority" value="Priority" width="0"/>
 						<menulist>
 							<menupopup type="select-priority" id="priority" readonly="true"/>
 						</menulist>
 					</row>
 					<row class="row">
-						<description value="Options" width="0"/>
-						<checkbox id="non_blocking" options=",, ,disable" statustext="A non blocking event will not conflict with other events" label="non blocking" readonly="true"/>
+						<description value="Non blocking" width="0"/>
+						<checkbox id="non_blocking" options="1,0, ," statustext="A non blocking event will not conflict with other events" readonly="true"/>
 					</row>
 					<row class="row">
-						<description/>
-						<checkbox id="public" options="0,1" label="Private" readonly="true"/>
+						<description value="Private"/>
+						<checkbox id="public" options="0,1" readonly="true"/>
 					</row>
-					<row class="row">
+					<row class="row calendar_print_cat">
 						<description value="Categories"/>
 						<menulist>
 							<menupopup type="select-cat" id="category" readonly="true"/>
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 5cea362c9e..7e5b467e45 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -12,6 +12,20 @@
  * @version $Id$
  */
 /* $Id: app.css 48463 2014-09-04 13:37:46Z ralfbecker $ */
+/*Media print classes*/
+@media print {
+  .th td,
+  .row_on td,
+  .row_off td {
+    border: none !important;
+  }
+  img.calendar_print_button {
+    display: none !important;
+  }
+  tr.calendar_print_cat {
+    border-bottom: 1px solid gray;
+  }
+}
 /* Header classes */
 tr.dialogHeader td,
 tr.dialogHeader2 td,
@@ -641,6 +655,11 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .calendar_freetime_dow {
   position: absolute;
 }
+img.calendar_print_button,
+img.calendar_print_appicon {
+  height: 24px;
+  width: 24px;
+}
 /*generell*/
 .egw_fw_content_browser_iframe img[src$="svg"] {
   background-color: #828282 !important;