diff --git a/core/displayablegraph.class.inc.php b/core/displayablegraph.class.inc.php
index 8d249308b..d17b6044d 100644
--- a/core/displayablegraph.class.inc.php
+++ b/core/displayablegraph.class.inc.php
@@ -1446,8 +1446,7 @@ class DisplayableGraph extends SimpleGraph
 <<<EOF
  <div id="ds_flash" class="search_box">
 	<form id="dh_flash" class="search_form_handler closed">
-	<h2 class="sf_title"><span class="sft_long">$sSftShort</span><span class="sft_short">$sSftShort</span><span class="sft_toggler fas 
-	fa-caret-down pull-right" title="$sSearchToggle"></span></h2>
+	<h2 class="sf_title"><span class="sft_long">$sSftShort</span><span class="sft_short">$sSftShort</span><span class="sft_toggler fas fa-caret-down pull-right" title="$sSearchToggle"></span></h2>
 	<div id="dh_flash_criterion_outer" class="sf_criterion_area"><div class="sf_criterion_row">
 EOF
 		);
diff --git a/datamodels/2.x/itop-hub-connector/js/hub.js b/datamodels/2.x/itop-hub-connector/js/hub.js
index c7e056f4e..cf0cf66b8 100644
--- a/datamodels/2.x/itop-hub-connector/js/hub.js
+++ b/datamodels/2.x/itop-hub-connector/js/hub.js
@@ -171,8 +171,7 @@ $(function()
 		},
 		_reportError: function(sMessage)
 		{
-			$('#hub-installation-progress-text').html('<span style="color:red; font-size:12pt; line-height:18pt;"><i class="fas' +
-				' fa-exclamation-triangle"></i> '+this.options.labels.rollback+'</span><br/><span style="color:#666; display:block; padding:10px;max-height:10em; overflow: auto;padding-top:0; margin-top:10px; text-align:left;">'+sMessage+'</span>');
+			$('#hub-installation-progress-text').html('<span style="color:red; font-size:12pt; line-height:18pt;"><i class="fas'+' fa-exclamation-triangle"></i> '+this.options.labels.rollback+'</span><br/><span style="color:#666; display:block; padding:10px;max-height:10em; overflow: auto;padding-top:0; margin-top:10px; text-align:left;">'+sMessage+'</span>');
 			$('#hub_start_installation').val('Go Back to iTop');
 			$('#hub_start_installation').prop('disabled', false);
 			$('#hub-installation-progress').hide();
diff --git a/datamodels/2.x/itop-portal-base/portal/templates/errors/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/templates/errors/layout.html.twig
index ab92c7cbd..a9a54506c 100644
--- a/datamodels/2.x/itop-portal-base/portal/templates/errors/layout.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/templates/errors/layout.html.twig
@@ -42,11 +42,9 @@
 			<p>{{ error_message }}</p>
 			<p>{{ 'Error:HTTP:GetHelp'|dict_format(constant('ITOP_APPLICATION_SHORT')) }}</p>
 			<p>
-				<a class="btn btn-default" href="#" onclick="history.back(); return false;"><span class="fas fa-arrow-left"></span> {{
-                    'Page:GoPreviousPage'|dict_s }}</a>
+				<a class="btn btn-default" href="#" onclick="history.back(); return false;"><span class="fas fa-arrow-left"></span> {{ 'Page:GoPreviousPage'|dict_s }}</a>
 				<a class="btn btn-default" href=""><span class="fas fa-redo"></span> {{ 'Page:ReloadPage'|dict_s }}</a>
-				<a class="btn btn-default" href="{{ app.url_generator.generate('p_home') }}"><span class="fas fa-home"></span> {{
-                    'Page:GoPortalHome'|dict_s }}</a>
+				<a class="btn btn-default" href="{{ app.url_generator.generate('p_home') }}"><span class="fas fa-home"></span> {{ 'Page:GoPortalHome'|dict_s }}</a>
 			</p>
 		</div>
 
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 b7b5a1871..d3c7c2297 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
@@ -210,8 +210,7 @@
 								{% endblock %}
 								{% if bUserConnected %}
 									<li role="separator" class="divider"></li>
-									<li><a href="{{ app.url_generator.generate('p_user_profile_brick') }}"><span class="brick_icon fas
-									fa-user fa-2x fa-fw"></span>{{ 'Brick:Portal:UserProfile:Navigation:Dropdown:MyProfil'|dict_s }}</a></li>
+                                    <li><a href="{{ app.url_generator.generate('p_user_profile_brick') }}"><span class="brick_icon fas fa-user fa-2x fa-fw"></span>{{ 'Brick:Portal:UserProfile:Navigation:Dropdown:MyProfil'|dict_s }}</a></li>
 									{% for aPortal in app['combodo.portal.instance.conf'].portals %}
 										{% if aPortal.id != app['combodo.portal.instance.conf'].properties.id %}
 											{% set sIconClass = (aPortal.id == 'backoffice') ? 'far fa-list-alt' : 'fas fa-external-link-alt' %}
@@ -222,9 +221,7 @@
 									{% if app['combodo.portal.instance.conf'].portals|length > 1 %}
 										<li role="separator" class="divider"></li>
 									{% endif %}
-									<li><a href="{{ app['combodo.absolute_url'] }}pages/logoff.php"><span class="brick_icon fas
-									fa-sign-out-alt fa-2x fa-fw"></span>{{ 'Brick:Portal:UserProfile:Navigation:Dropdown:Logout'|dict_s
-                                            }}</a></li>
+									<li><a href="{{ app['combodo.absolute_url'] }}pages/logoff.php"><span class="brick_icon fas fa-sign-out-alt fa-2x fa-fw"></span>{{ 'Brick:Portal:UserProfile:Navigation:Dropdown:Logout'|dict_s }}</a></li>
 								{% endif %}
 							</ul>
 						</div>
@@ -252,12 +249,10 @@
 									<span class="caret"></span>
 								</a>
 								<ul class="dropdown-menu user_options" aria-labelledby="user_options">
-									<li><a href="{{ app.url_generator.generate('p_user_profile_brick') }}"><span class="brick_icon fas
-									fa-user fa-lg fa-fw"></span>{{ 'Brick:Portal:UserProfile:Navigation:Dropdown:MyProfil'|dict_s }}</a></li>
+									<li><a href="{{ app.url_generator.generate('p_user_profile_brick') }}"><span class="brick_icon fas fa-user fa-lg fa-fw"></span>{{ 'Brick:Portal:UserProfile:Navigation:Dropdown:MyProfil'|dict_s }}</a></li>
 									{% for aPortal in app['combodo.portal.instance.conf'].portals %}
 										{% if aPortal.id != app['combodo.portal.instance.conf'].properties.id %}
-											{% set sGlyphiconClass = (aPortal.id == 'backoffice') ? 'far fa-list-alt' :
-                                                'fas fa-external-link-alt' %}
+											{% set sGlyphiconClass = (aPortal.id == 'backoffice') ? 'far fa-list-alt' : 'fas fa-external-link-alt' %}
 											<li><a href="{{ aPortal.url }}" {% if app['combodo.portal.instance.conf'].properties.allowed_portals.opening_mode == 'tab' %}target="_blank"{% endif %} title="{{ aPortal.label|dict_s }}"><span class="brick_icon {{ sGlyphiconClass }} fa-lg fa-fw"></span>{{ aPortal.label|dict_s }}</a></li>
 										{% endif %}
 									{% endfor %}
@@ -265,8 +260,7 @@
 									{% if app['combodo.portal.instance.conf'].portals|length > 1 %}
 										<li role="separator" class="divider"></li>
 									{% endif %}
-									<li><a href="{{ app['combodo.absolute_url'] }}pages/logoff.php"><span class="brick_icon fas
-									fa-sign-out-alt fa-lg fa-fw"></span>{{ 'Brick:Portal:UserProfile:Navigation:Dropdown:Logout'|dict_s }}</a></li>
+									<li><a href="{{ app['combodo.absolute_url'] }}pages/logoff.php"><span class="brick_icon fas fa-sign-out-alt fa-lg fa-fw"></span>{{ 'Brick:Portal:UserProfile:Navigation:Dropdown:Logout'|dict_s }}</a></li>
 								</ul>
 							</div>
 						</div>
diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js
index 3607c6cbc..2dd528ef0 100644
--- a/js/search/search_form_criteria.js
+++ b/js/search/search_form_criteria.js
@@ -379,8 +379,7 @@ $(function()
 
 			// Prepare base DOM structure
 			this.element
-				.append('<div class="sfc_header"><div class="sfc_title"></div><span class="sfc_toggle"><a class="fas fa-caret-down"' +
-					' href="#"></a></span></div>')
+				.append('<div class="sfc_header"><div class="sfc_title"></div><span class="sfc_toggle"><a class="fas fa-caret-down"' + ' href="#"></a></span></div>')
 				.append('<div class="sfc_form_group"><div class="sfc_fg_operators"></div><div class="sfc_fg_buttons"></div></div>');
 
 			// Bind events
@@ -490,10 +489,8 @@ $(function()
 				.append('<button type="button" name="search" class="sfc_fg_button sfc_fg_search">' + Dict.S('UI:Button:Search') + '</button>')
 				.append('<button type="button" name="apply" class="sfc_fg_button sfc_fg_apply">' + Dict.S('UI:Button:Apply') + '</button>')
 				.append('<button type="button" name="cancel" class="sfc_fg_button sfc_fg_cancel">' + Dict.S('UI:Button:Cancel') + '</button>')
-				.append('<button type="button" name="more" class="sfc_fg_button sfc_fg_more">' + Dict.S('UI:Button:More') + '<span' +
-					' class="fas fa-angle-double-down"></span></button>')
-				.append('<button type="button" name="less" class="sfc_fg_button sfc_fg_less">' + Dict.S('UI:Button:Less') + '<span' +
-					' class="fas fa-angle-double-up"></span></button>');
+				.append('<button type="button" name="more" class="sfc_fg_button sfc_fg_more">' + Dict.S('UI:Button:More') + '<span' + ' class="fas fa-angle-double-down"></span></button>')
+				.append('<button type="button" name="less" class="sfc_fg_button sfc_fg_less">' + Dict.S('UI:Button:Less') + '<span' + ' class="fas fa-angle-double-up"></span></button>');
 
 			// Events
 			this.element.find('.sfc_fg_button').on('click', function(oEvent){
diff --git a/pages/schema.php b/pages/schema.php
index 20e569b07..c9d6348e2 100644
--- a/pages/schema.php
+++ b/pages/schema.php
@@ -498,7 +498,7 @@ function DisplayRelatedClassesGraph($oPage, $sClass)
 EOF
         );
         $oPage->add_ready_script(
-            <<<EOF
+            <<<JS
 
 var data = $sData;
 var dataref = $sDataReferencing;
@@ -721,11 +721,9 @@ field.filter(function(d) {
 			.style("opacity","1");
 		divD3.style("left", (d3.event.pageX - 7*d['tooltip_data']['class'].length/2) + "px");
 		divD3.style("top", (d3.event.pageY - 65) + "px");
-		divD3.html( '<div id="tooltipD3_top">' + d['tooltip_data']['class'] + '</div><span id="tooltipD3_left"> <i class="fas 
-		fa-caret-left"></i> '
+		divD3.html( '<div id="tooltipD3_top">' + d['tooltip_data']['class'] + '</div><span id="tooltipD3_left"> <i class="fas fa-caret-left"></i> '
 		 			+  ( (d.related_position < 0) ? d['tooltip_data']['to_remote'] : d['tooltip_data']['to_me'] ) +  '</span><span id="tooltipD3_right"> <br/>'
-		 			+ ( (d.related_position < 0) ? d['tooltip_data']['to_me'] : d['tooltip_data']['to_remote'] ) + ' <i class="fas 
-		 			fa-caret-right"></i></span>');
+		 			+ ( (d.related_position < 0) ? d['tooltip_data']['to_me'] : d['tooltip_data']['to_remote'] ) + ' <i class="fas fa-caret-right"></i></span>');
 	})
 	.on('mouseout',function(d){
 		divD3.transition()
@@ -762,7 +760,7 @@ field.filter(function(d) {
     .attr("xlink:href", function(d, i) { return d.icon })
 	.attr("transform", "translate(-12, -24)");
 			
-EOF
+JS
         );
     }
     catch(Exception $e)