diff --git a/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/i18n/icalendar.properties b/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/i18n/icalendar.properties
index 1920931295ddb..d78ed14e95859 100644
--- a/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/i18n/icalendar.properties
+++ b/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/i18n/icalendar.properties
@@ -32,7 +32,8 @@ thing-type.config.icalendar.eventfilter.datetimeRound.label = Round to Date/Time
 thing-type.config.icalendar.eventfilter.datetimeRound.description = Setting this will round start and end date/time to the unit down (e.g. if unit is day: start and end will be rounded to 0:00 day time)
 thing-type.config.icalendar.eventfilter.datetimeStart.label = Start
 thing-type.config.icalendar.eventfilter.datetimeStart.description = Start date/time amount to find events relative to "now" (inclusive)
-thing-type.config.icalendar.eventfilter.datetimeUnit.label = Date or Time Unit for Start and End
+thing-type.config.icalendar.eventfilter.datetimeUnit.label = Date/Time Unit
+thing-type.config.icalendar.eventfilter.datetimeUnit.description = Date or time unit for start and end
 thing-type.config.icalendar.eventfilter.datetimeUnit.option.MINUTE = minute
 thing-type.config.icalendar.eventfilter.datetimeUnit.option.HOUR = hour
 thing-type.config.icalendar.eventfilter.datetimeUnit.option.DAY = day
@@ -41,6 +42,7 @@ thing-type.config.icalendar.eventfilter.group.datetime_based.label = Date and Ti
 thing-type.config.icalendar.eventfilter.group.general.label = General Filter Options
 thing-type.config.icalendar.eventfilter.group.text_based.label = Text based Filter
 thing-type.config.icalendar.eventfilter.maxEvents.label = Maximum Matches
+thing-type.config.icalendar.eventfilter.maxEvents.description = Maximum matches found by this filter
 thing-type.config.icalendar.eventfilter.refreshTime.label = Refresh Time
 thing-type.config.icalendar.eventfilter.refreshTime.description = The frequency in minutes the channels get refreshed
 thing-type.config.icalendar.eventfilter.textEventField.label = Event Field
@@ -65,23 +67,30 @@ channel-group-type.icalendar.result.description = A resulting event found by fil
 
 channel-type.icalendar.event_current_end.label = Current Event End
 channel-type.icalendar.event_current_end.description = End of the currently present event
+channel-type.icalendar.event_current_end.state.pattern = %1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS
 channel-type.icalendar.event_current_presence.label = Current Event Presence
 channel-type.icalendar.event_current_presence.description = Current presence of an event
 channel-type.icalendar.event_current_start.label = Current Event Start
 channel-type.icalendar.event_current_start.description = Start of the currently present event
+channel-type.icalendar.event_current_start.state.pattern = %1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS
 channel-type.icalendar.event_current_title.label = Current Event Title
 channel-type.icalendar.event_current_title.description = Title of the currently present event
 channel-type.icalendar.event_next_end.label = Next Event End
 channel-type.icalendar.event_next_end.description = End of the next event in calendar
+channel-type.icalendar.event_next_end.state.pattern = %1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS
 channel-type.icalendar.event_next_start.label = Next Event Start
 channel-type.icalendar.event_next_start.description = Start of the next event in calendar
+channel-type.icalendar.event_next_start.state.pattern = %1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS
 channel-type.icalendar.event_next_title.label = Next Event Title
 channel-type.icalendar.event_next_title.description = Title of the next starting event in calendar
 channel-type.icalendar.last_update.label = Last Update
 channel-type.icalendar.last_update.description = The time the calendar was updated successfully last time
+channel-type.icalendar.last_update.state.pattern = %1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS
 channel-type.icalendar.result_end.label = End of Result
 channel-type.icalendar.result_end.description = End of the found result in calendar
+channel-type.icalendar.result_end.state.pattern = %1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS
 channel-type.icalendar.result_start.label = Start of Result
 channel-type.icalendar.result_start.description = Start of the found result in calendar
+channel-type.icalendar.result_start.state.pattern = %1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS
 channel-type.icalendar.result_title.label = Title of Result
 channel-type.icalendar.result_title.description = Title of the found result in calendar
diff --git a/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/thing/thing-types.xml
index 65c9feb0fd6bc..756d6c3e36efc 100644
--- a/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/thing/thing-types.xml
@@ -68,13 +68,13 @@
 		<item-type>DateTime</item-type>
 		<label>Current Event Start</label>
 		<description>Start of the currently present event</description>
-		<state readOnly="true"/>
+		<state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/>
 	</channel-type>
 	<channel-type id="event_current_end">
 		<item-type>DateTime</item-type>
 		<label>Current Event End</label>
 		<description>End of the currently present event</description>
-		<state readOnly="true"/>
+		<state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/>
 	</channel-type>
 	<channel-type id="event_current_presence">
 		<item-type>Switch</item-type>
@@ -92,26 +92,26 @@
 		<item-type>DateTime</item-type>
 		<label>Next Event Start</label>
 		<description>Start of the next event in calendar</description>
-		<state readOnly="true"/>
+		<state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/>
 	</channel-type>
 	<channel-type id="event_next_end">
 		<item-type>DateTime</item-type>
 		<label>Next Event End</label>
 		<description>End of the next event in calendar</description>
-		<state readOnly="true"/>
+		<state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/>
 	</channel-type>
 
 	<channel-type id="result_start">
 		<item-type>DateTime</item-type>
 		<label>Start of Result</label>
 		<description>Start of the found result in calendar</description>
-		<state readOnly="true"/>
+		<state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/>
 	</channel-type>
 	<channel-type id="result_end">
 		<item-type>DateTime</item-type>
 		<label>End of Result</label>
 		<description>End of the found result in calendar</description>
-		<state readOnly="true"/>
+		<state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/>
 	</channel-type>
 	<channel-type id="result_title">
 		<item-type>String</item-type>
@@ -123,7 +123,7 @@
 		<item-type>DateTime</item-type>
 		<label>Last Update</label>
 		<description>The time the calendar was updated successfully last time</description>
-		<state readOnly="true"/>
+		<state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/>
 	</channel-type>
 	<channel-group-type id="result">
 		<label>Result Event</label>
@@ -156,6 +156,7 @@
 
 			<parameter name="maxEvents" type="integer" required="true" min="0" groupName="general">
 				<label>Maximum Matches</label>
+				<description>Maximum matches found by this filter</description>
 			</parameter>
 			<parameter name="refreshTime" type="integer" required="true" min="1" groupName="general" unit="min">
 				<label>Refresh Time</label>
@@ -171,7 +172,8 @@
 					<option value="WEEK">week</option>
 				</options>
 				<default>HOUR</default>
-				<label>Date or Time Unit for Start and End</label>
+				<label>Date/Time Unit</label>
+				<description>Date or time unit for start and end</description>
 			</parameter>
 			<parameter name="datetimeStart" type="integer" groupName="datetime_based">
 				<label>Start</label>