diff --git a/public/themes/bootstrap/scss/_bootstrap.scss b/public/themes/bootstrap/scss/_bootstrap.scss
index d5831fd27c..b51dfc8c8d 100644
--- a/public/themes/bootstrap/scss/_bootstrap.scss
+++ b/public/themes/bootstrap/scss/_bootstrap.scss
@@ -33,7 +33,7 @@
 @import "../../../../node_modules/bootstrap/scss/close";
 //@import "../../../../node_modules/bootstrap/scss/toasts";
 @import "../../../../node_modules/bootstrap/scss/modal";
-//@import "../../../../node_modules/bootstrap/scss/tooltip";
+@import "../../../../node_modules/bootstrap/scss/tooltip";
 //@import "../../../../node_modules/bootstrap/scss/popover";
 //@import "../../../../node_modules/bootstrap/scss/carousel";
 @import "../../../../node_modules/bootstrap/scss/spinners";
diff --git a/public/themes/bootstrap/scss/_common.scss b/public/themes/bootstrap/scss/_common.scss
index 5963a2a3dd..2ad036a2c0 100644
--- a/public/themes/bootstrap/scss/_common.scss
+++ b/public/themes/bootstrap/scss/_common.scss
@@ -1275,23 +1275,6 @@ input#auto_increment_opt {
   position: absolute;
 }
 
-.tooltip {
-  background: #333 !important;
-  opacity: 0.8 !important;
-  z-index: 9999;
-  border: 1px solid $black !important;
-  border-radius: 0.3em !important;
-  text-shadow: -1px -1px $black !important;
-  font-size: 0.8em !important;
-  font-weight: bold !important;
-  padding: 1px 3px !important;
-
-  * {
-    background: none !important;
-    color: $white !important;
-  }
-}
-
 .cDrop {
   right: 0;
   position: absolute;
diff --git a/resources/js/global.d.ts b/resources/js/global.d.ts
index 8dee89562b..b6df7ce475 100644
--- a/resources/js/global.d.ts
+++ b/resources/js/global.d.ts
@@ -23,19 +23,6 @@ interface JQuery {
 
     filterByValue: (value: any) => any;
 
-    uiTooltip(): JQuery;
-    uiTooltip(methodName: 'destroy'): void;
-    uiTooltip(methodName: 'disable'): void;
-    uiTooltip(methodName: 'enable'): void;
-    uiTooltip(methodName: 'open'): void;
-    uiTooltip(methodName: 'close'): void;
-    uiTooltip(methodName: 'widget'): JQuery;
-    uiTooltip(methodName: string): JQuery;
-    uiTooltip(options: JQueryUI.TooltipOptions): JQuery;
-    uiTooltip(optionLiteral: string, optionName: string): any;
-    uiTooltip(optionLiteral: string, options: JQueryUI.TooltipOptions): any;
-    uiTooltip(optionLiteral: string, optionName: string, optionValue: any): JQuery;
-
     tablesorter: any;
 }
 
diff --git a/resources/js/src/modules/functions.ts b/resources/js/src/modules/functions.ts
index 4a49b1c68b..fef7589b1a 100644
--- a/resources/js/src/modules/functions.ts
+++ b/resources/js/src/modules/functions.ts
@@ -2825,6 +2825,10 @@ export function showIndexEditDialog ($outer) {
  *                    in the whole body
  **/
 export function showHints ($div: JQuery<HTMLElement> | undefined = undefined) {
+    if ($('#no_hint').length > 0) {
+        return;
+    }
+
     var $newDiv = $div;
     if ($newDiv === undefined || ! ($newDiv instanceof $) || $newDiv.length === 0) {
         $newDiv = $('body');
diff --git a/resources/js/src/modules/tooltip.ts b/resources/js/src/modules/tooltip.ts
deleted file mode 100644
index c592fec972..0000000000
--- a/resources/js/src/modules/tooltip.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import $ from 'jquery';
-
-/**
- * Create a jQuery UI tooltip
- *
- * @param $elements jQuery object representing the elements
- * @param {string} item the item (see https://api.jqueryui.com/tooltip/#option-items)
- * @param myContent content of the tooltip
- * @param {Object} additionalOptions to override the default options
- */
-export default function tooltip ($elements, item, myContent, additionalOptions = {}): void {
-    if ($('#no_hint').length > 0) {
-        return;
-    }
-
-    const defaultOptions = {
-        content: myContent,
-        items: item,
-        tooltipClass: 'tooltip',
-        track: true,
-        show: false,
-        hide: false
-    };
-
-    $elements.uiTooltip($.extend(true, defaultOptions, additionalOptions));
-}
diff --git a/resources/js/src/name-conflict-fixes.ts b/resources/js/src/name-conflict-fixes.ts
deleted file mode 100644
index 834556669f..0000000000
--- a/resources/js/src/name-conflict-fixes.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import $ from 'jquery';
-
-// @ts-ignore
-$.widget.bridge('uiTooltip', $.ui.tooltip);
diff --git a/src/Header.php b/src/Header.php
index ec2711c728..1555b0ffb0 100644
--- a/src/Header.php
+++ b/src/Header.php
@@ -84,7 +84,6 @@ class Header
         $this->scripts->addFile('vendor/jquery/jquery-migrate.min.js');
         $this->scripts->addFile('vendor/sprintf.js');
         $this->scripts->addFile('vendor/jquery/jquery-ui.min.js');
-        $this->scripts->addFile('name-conflict-fixes.js');
         $this->scripts->addFile('vendor/bootstrap/bootstrap.bundle.min.js');
         $this->scripts->addFile('vendor/js.cookie.min.js');
         $this->scripts->addFile('vendor/jquery/jquery.validate.min.js');
diff --git a/src/Scripts.php b/src/Scripts.php
index 87847c9b2f..34f51fd6a2 100644
--- a/src/Scripts.php
+++ b/src/Scripts.php
@@ -77,7 +77,6 @@ class Scripts
     {
         return ! str_contains($filename, 'vendor')
             && ! str_contains($filename, 'runtime.js')
-            && ! str_contains($filename, 'name-conflict-fixes.js')
             && ! str_contains($filename, 'index.php')
             && ! str_contains($filename, 'shared.js')
             && ! str_contains($filename, 'datetimepicker.js')
diff --git a/tests/unit/HeaderTest.php b/tests/unit/HeaderTest.php
index c13bb80fdf..488f5a079f 100644
--- a/tests/unit/HeaderTest.php
+++ b/tests/unit/HeaderTest.php
@@ -278,7 +278,6 @@ class HeaderTest extends AbstractTestCase
             ['name' => 'vendor/jquery/jquery-migrate.min.js', 'fire' => 0],
             ['name' => 'vendor/sprintf.js', 'fire' => 0],
             ['name' => 'vendor/jquery/jquery-ui.min.js', 'fire' => 0],
-            ['name' => 'name-conflict-fixes.js', 'fire' => 0],
             ['name' => 'vendor/bootstrap/bootstrap.bundle.min.js', 'fire' => 0],
             ['name' => 'vendor/js.cookie.min.js', 'fire' => 0],
             ['name' => 'vendor/jquery/jquery.validate.min.js', 'fire' => 0],
diff --git a/webpack.config.cjs b/webpack.config.cjs
index 0e0b5bc35f..573cf17668 100644
--- a/webpack.config.cjs
+++ b/webpack.config.cjs
@@ -42,7 +42,6 @@ module.exports = [
             'makegrid': rootPath + '/resources/js/src/makegrid.ts',
             'menu_resizer': rootPath + '/resources/js/src/menu_resizer.ts',
             'multi_column_sort': rootPath + '/resources/js/src/multi_column_sort.ts',
-            'name-conflict-fixes': rootPath + '/resources/js/src/name-conflict-fixes.ts',
             'normalization': rootPath + '/resources/js/src/normalization.ts',
             'replication': rootPath + '/resources/js/src/replication.ts',
             'server/databases': rootPath + '/resources/js/src/server/databases.ts',