diff --git a/application/dashboard.class.inc.php b/application/dashboard.class.inc.php
index 4346623e6..1d277d472 100644
--- a/application/dashboard.class.inc.php
+++ b/application/dashboard.class.inc.php
@@ -491,7 +491,7 @@ abstract class Dashboard
 		$("#attr_auto_reload_sec").prop('disabled', !$(this).is(':checked'));
 	} );
 
-	$('#select_layout').buttonset();
+	$('#select_layout').controlgroup();
 	$('#select_dashlet').droppable({
 		accept: '.dashlet',
 		drop: function(event, ui) {
diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index 01314f7e3..368110be6 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -39,7 +39,7 @@ class NiceWebPage extends WebPage
 		{
 			$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-migrate.prod.min.js');
 		}
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-ui-1.11.4.custom.min.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-ui.custom.min.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/utils.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/hovertip.js');
 		// table sorting
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 92229fbf2..bf27d16b2 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
@@ -87,7 +87,7 @@
 		{% else %}
 				<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/jquery-migrate.prod.min.js'|add_itop_version }}"></script>
 		{% endif %}
-		<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/jquery-ui-1.11.4.custom.min.js'|add_itop_version }}"></script>
+		<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/jquery-ui.custom.min.js'|add_itop_version }}"></script>
 		<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/jquery.magnific-popup.min.js'|add_itop_version }}"></script>
 		<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/jquery.iframe-transport.js'|add_itop_version }}"></script>
 		<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/jquery.fileupload.js'|add_itop_version }}"></script>
diff --git a/js/extkeywidget.js b/js/extkeywidget.js
index e3f670135..9ec036eeb 100644
--- a/js/extkeywidget.js
+++ b/js/extkeywidget.js
@@ -155,7 +155,7 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
 			}
 
 			return $("<li>")
-				.append("<d>"+val+"</d>")
+				.append("<div>"+val+"</div>")
 				.appendTo(ul);
 		};
 
diff --git a/js/forms-json-utils.js b/js/forms-json-utils.js
index dd2d0904f..d95f21862 100644
--- a/js/forms-json-utils.js
+++ b/js/forms-json-utils.js
@@ -226,7 +226,9 @@ function ReportFieldValidationStatus(sFieldId, sFormId, bValid, sExplain)
 
 			$('#v_'+sFieldId).tooltip({
 				items: 'span',
-				tooltipClass: 'form_field_error',
+				classes: {
+					"ui-tooltip": "form_field_error"
+				},
 				content: function() {
 					return $(this).find('img').attr('data-tooltip'); // As opposed to the default 'content' handler, do not escape the contents of 'title'
 				}
diff --git a/js/simple_graph.js b/js/simple_graph.js
index 96210d684..4cb5f2c55 100644
--- a/js/simple_graph.js
+++ b/js/simple_graph.js
@@ -898,7 +898,9 @@ $(function()
 					return sTooltipContent;
 				},
 				items: '.popupMenuTarget',
-				tooltipClass: 'tooltip-simple-graph',
+				classes: {
+					'ui-tooltip': 'tooltip-simple-graph'
+				},
 				position: {
 					using: function( position, feedback ) { 
 						$(this).css( position );  
diff --git a/js/tabularfieldsselector.js b/js/tabularfieldsselector.js
index 0b59da7c2..8000d4e78 100644
--- a/js/tabularfieldsselector.js
+++ b/js/tabularfieldsselector.js
@@ -409,7 +409,9 @@ $(function()
 					return sTooltipContent;
 				},
 				items: '.tfs_advanced',
-				tooltipClass: 'tooltip-tfs',
+				classes: {
+					'ui-tooltip': 'tooltip-tfs'
+				},
 				position: {
 					my: "center bottom-10",
 					at: "center  top",					
diff --git a/sources/renderer/console/fieldrenderer/consoleselectobjectfieldrenderer.class.inc.php b/sources/renderer/console/fieldrenderer/consoleselectobjectfieldrenderer.class.inc.php
index a96b1a5ee..dba9522bb 100644
--- a/sources/renderer/console/fieldrenderer/consoleselectobjectfieldrenderer.class.inc.php
+++ b/sources/renderer/console/fieldrenderer/consoleselectobjectfieldrenderer.class.inc.php
@@ -217,7 +217,9 @@ EOF
 			oValidationElement.html('<img src="../images/validation_error.png" style="vertical-align:middle" data-tooltip="'+sExplain+'"/>');
 			oValidationElement.tooltip({
 				items: 'span',
-				tooltipClass: 'form_field_error',
+				classes: {
+			        "ui-tooltip": "form_field_error"
+			    },
 				content: function() {
 					return $(this).find('img').attr('data-tooltip'); // As opposed to the default 'content' handler, do not escape the contents of 'title'
 				}
diff --git a/sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php b/sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php
index 3478fd439..a9e5dd4a3 100644
--- a/sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php
+++ b/sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php
@@ -361,7 +361,9 @@ EOF
 			oValidationElement.html('<img src="../images/validation_error.png" style="vertical-align:middle" data-tooltip="'+sExplain+'"/>');
 			oValidationElement.tooltip({
 				items: 'span',
-				tooltipClass: 'form_field_error',
+				classes: {
+			        'ui-tooltip': 'form_field_error'
+			    },
 				content: function() {
 					return $(this).find('img').attr('data-tooltip'); // As opposed to the default 'content' handler, do not escape the contents of 'title'
 				}
diff --git a/test/attributeset_widget_poc.html b/test/attributeset_widget_poc.html
index aec1eca77..2bdf5e69e 100644
--- a/test/attributeset_widget_poc.html
+++ b/test/attributeset_widget_poc.html
@@ -30,7 +30,7 @@ var aDictEntries = {"Core:AttributeSet:placeholder": "click to add"};
 
 <script src="../js/utils.js"></script>
 <script src="../js/jquery.min.js"></script>
-<script src="../js/jquery-ui-1.11.4.custom.min.js"></script>
+<script src="../js/jquery-ui.custom.min.js"></script>
 <script src="../js/selectize.min.js"></script>
 <script src="../js/jquery.itop-set-widget.js"></script>