diff --git a/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig
index 0646a2a1b..4dbc37147 100644
--- a/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig
@@ -135,7 +135,7 @@
         <script type="text/javascript" src="{{ app['combodo.portal.base.absolute_url'] ~ 'lib/typeahead/js/typeahead.bundle.min.js'|add_itop_version }}"></script>
         <script type="text/javascript" src="{{ app['combodo.portal.base.absolute_url'] ~ 'lib/handlebars/js/handlebars.min-768ddbd.js'|add_itop_version }}"></script>
 
-        <script type="text/javascript" src="{{ app['combodo.portal.base.absolute_url'] ~ 'js/portal_leave_handler.js'|add_itop_version }}"></script>
+        <script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/leave_handler.js'|add_itop_version }}"></script>
 
         {# Selectize for sets #}
         <script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/selectize.js'|add_itop_version }}"></script>
@@ -543,7 +543,12 @@
                 });
 
                 // Initialize confirmation message handler when a form with touched fields is closed
-                oBodyElem.portal_leave_handler({'message': '{{ 'Portal:Form:Close:Warning'|dict_s }}'});
+                oBodyElem.leave_handler({
+                    'message': '{{ 'Portal:Form:Close:Warning'|dict_s }}',
+                    'extra_events': {
+                        'body': ['hide.bs.modal']
+                    }
+                });
                 {% endblock %}
 			});
 		</script>
diff --git a/sources/Application/WebPage/iTopWebPage.php b/sources/Application/WebPage/iTopWebPage.php
index 3bffcef6f..48cedba88 100644
--- a/sources/Application/WebPage/iTopWebPage.php
+++ b/sources/Application/WebPage/iTopWebPage.php
@@ -321,7 +321,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,
@@ -374,6 +374,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