diff --git a/sources/application/WebPage/iTopWebPage.php b/sources/application/WebPage/iTopWebPage.php
index 2f68b2621..4b5fd3951 100644
--- a/sources/application/WebPage/iTopWebPage.php
+++ b/sources/application/WebPage/iTopWebPage.php
@@ -285,7 +285,7 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage
 		// Date picker options
 		$aPickerOptions = array(
 			'showOn' => 'button',
-			'buttonText' => '<i class="fas fa-calendar-alt"></i>',
+			'buttonText' => '', // N°6455 class will be added after JQuery UI widget
 			'dateFormat' => AttributeDate::GetFormat()->ToDatePicker(),
 			'constrainInput' => false,
 			'changeMonth' => true,
@@ -338,6 +338,7 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage
 	    // Note: Trigger image is wrapped in a span so we can display it we want 
 		$(".date-pick").datepicker($sJSDatePickerOptions)
 		    .next("img").wrap("<span>");
+		$("button.ui-datepicker-trigger").addClass('fas fa-calendar-alt');
 	
 		// Hack for the date and time picker addon issue on Chrome (see #1305)
 		// The workaround is to instantiate the widget on demand