diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index 2257a15a27..efd8ce1b32 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -154,6 +154,10 @@ div.calendar_conflicts {
 	max-height: 540px;
 	overflow-y: auto;
 }
+.calendar_conflicts img {
+	width: 22px;
+	height: 22px;
+}
 
 /* Loader - hide sizing behind overlay*/
 #egw-loadin-prompt_calendar::before {
diff --git a/calendar/templates/default/conflicts.xet b/calendar/templates/default/conflicts.xet
index c551b7f735..cbd5f8c19e 100644
--- a/calendar/templates/default/conflicts.xet
+++ b/calendar/templates/default/conflicts.xet
@@ -25,10 +25,10 @@
 				</rows>
 			</grid>
 		</box>
-		<hbox>
-			<button label="Ignore conflict" id="button[ignore]" statustext="Saves the event ignoring the conflict"/>
-			<button id="button[reedit]" label="Re-Edit event" statustext="Allows to edit the event again"/>
-			<button label="Freetime search" id="button[freetime]" statustext="Find free timeslots where the selected participants are available for the given timespan"/>
+		<hbox class="dialogFooterToolbar">
+			<button label="Ignore conflict" id="button[ignore]" image="check" background_image="1" statustext="Saves the event ignoring the conflict"/>
+			<button id="button[reedit]" label="Re-Edit event" image="edit" background_image="1" statustext="Allows to edit the event again"/>
+			<button label="Freetime search" id="button[freetime]" image="search" background_image="1" statustext="Find free timeslots where the selected participants are available for the given timespan"/>
 		</hbox>
 	</template>
 </overlay>
diff --git a/calendar/templates/default/freetimesearch.xet b/calendar/templates/default/freetimesearch.xet
index 6839fd690d..af0d2a5bb0 100644
--- a/calendar/templates/default/freetimesearch.xet
+++ b/calendar/templates/default/freetimesearch.xet
@@ -61,8 +61,8 @@
 						<select-dow rows="10" id="weekdays" statustext="Weekdays to use in search" class="calendar_freetime_dow"/>
 					</hbox>
 				</row>
-				<row>
-					<button label="New search" id="search" statustext="new search with the above parameters"/>
+				<row class="dialogFooterToolbar">
+					<button label="New search" id="search" image="search" background_image="1" statustext="new search with the above parameters"/>
 					<hbox>
 						<menulist>
 							<menupopup no_lang="1" id="search_window" statustext="how far to search (from startdate)"/>
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 9861150461..fb7a271410 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -163,6 +163,11 @@ div.calendar_conflicts {
   max-height: 540px;
   overflow-y: auto;
 }
+.calendar_conflicts img {
+	width: 22px;
+	height: 22px;
+}
+
 /* Loader - hide sizing behind overlay*/
 #egw-loadin-prompt_calendar::before {
   opacity: 1;