diff --git a/build-plugin.sh b/build-plugin.sh
index 24bafb6..b1f4ce1 100755
--- a/build-plugin.sh
+++ b/build-plugin.sh
@@ -2,7 +2,7 @@
 set -eu
 
 PLUGIN="u-navigator"
-VERSION="2026.06.23.r034"
+VERSION="2026.06.23.r035"
 PKG_DIR="packages"
 WORK_DIR=".plugin-build"
 PKG_NAME="${PLUGIN}-${VERSION}.tgz"
diff --git a/packages/u-navigator-2026.06.23.r034.tgz b/packages/u-navigator-2026.06.23.r034.tgz
deleted file mode 100644
index 9cc475f..0000000
Binary files a/packages/u-navigator-2026.06.23.r034.tgz and /dev/null differ
diff --git a/packages/u-navigator-2026.06.23.r035.tgz b/packages/u-navigator-2026.06.23.r035.tgz
new file mode 100644
index 0000000..f428027
Binary files /dev/null and b/packages/u-navigator-2026.06.23.r035.tgz differ
diff --git a/plugin-root/usr/local/emhttp/plugins/u-navigator/U-Navigator.page b/plugin-root/usr/local/emhttp/plugins/u-navigator/U-Navigator.page
index e1dcb7a..a533eeb 100644
--- a/plugin-root/usr/local/emhttp/plugins/u-navigator/U-Navigator.page
+++ b/plugin-root/usr/local/emhttp/plugins/u-navigator/U-Navigator.page
@@ -1,4 +1,4 @@
-Menu="Navigator"
+Menu="Tools"
 Title="U-Navigator"
 Icon="u-navigator/u-navigator.svg"
 ---
diff --git a/plugin-root/usr/local/emhttp/plugins/u-navigator/U-NavigatorNav.page b/plugin-root/usr/local/emhttp/plugins/u-navigator/U-NavigatorNav.page
new file mode 100644
index 0000000..b575ce9
--- /dev/null
+++ b/plugin-root/usr/local/emhttp/plugins/u-navigator/U-NavigatorNav.page
@@ -0,0 +1,63 @@
+Menu="Buttons:99"
+Title="Navigator"
+Icon="icon-u-folder"
+Code="f07b"
+---
+<script>
+(() => {
+  const targetHref = '/Tools/U-Navigator';
+  const targetText = 'NAVIGATOR';
+
+  function normalize(text) {
+    return String(text || '').trim().toUpperCase();
+  }
+
+  function injectUNavigatorNav() {
+    if (document.querySelector('a[href="/Tools/U-Navigator"], a[data-u-navigator-nav="true"]')) {
+      return;
+    }
+
+    const links = [...document.querySelectorAll('a')];
+    const toolsLink = links.find((link) => {
+      const text = normalize(link.textContent);
+      const href = link.getAttribute('href') || '';
+      return text === 'WERKZEUGE' || text === 'TOOLS' || href === '/Tools';
+    });
+
+    if (!toolsLink) {
+      return;
+    }
+
+    const wrapper = toolsLink.parentElement?.tagName === 'LI' ? toolsLink.parentElement : toolsLink;
+    const isListItem = wrapper.tagName === 'LI';
+    const item = isListItem ? document.createElement('li') : document.createElement('a');
+    const link = isListItem ? document.createElement('a') : item;
+    link.className = toolsLink.className || '';
+    link.href = targetHref;
+    link.textContent = targetText;
+    link.setAttribute('data-u-navigator-nav', 'true');
+    link.classList.remove('active', 'selected', 'on');
+
+    if (isListItem) {
+      item.className = wrapper.className || '';
+      item.classList.remove('active', 'selected', 'on');
+      item.appendChild(link);
+    }
+
+    if (location.pathname === targetHref) {
+      toolsLink.classList.remove('active', 'selected', 'on');
+      wrapper.classList?.remove('active', 'selected', 'on');
+      link.classList.add('active');
+      item.classList?.add('active');
+    }
+
+    wrapper.insertAdjacentElement('afterend', item);
+  }
+
+  if (document.readyState === 'loading') {
+    document.addEventListener('DOMContentLoaded', injectUNavigatorNav);
+  } else {
+    injectUNavigatorNav();
+  }
+})();
+</script>
diff --git a/u-navigator.plg b/u-navigator.plg
index abc171b..cc4593e 100644
--- a/u-navigator.plg
+++ b/u-navigator.plg
@@ -1,14 +1,14 @@
 <!DOCTYPE PLUGIN [
 <!ENTITY name "u-navigator">
 <!ENTITY author "Michael Roll">
-<!ENTITY version "2026.06.23.r034">
+<!ENTITY version "2026.06.23.r035">
 <!ENTITY package "&name;-&version;.tgz">
 <!ENTITY pluginURL "https://git.casaderoll.de/michael/Unraid-Navigator/raw/branch/main/u-navigator.plg">
 <!ENTITY support "https://git.casaderoll.de/michael/Unraid-Navigator">
 <!ENTITY icon "folder-open">
 <!ENTITY description "Unraid File Navigator: Dynamix-integrierter Dateimanager mit mehreren Explorer-Fenstern, Symbol- und Listenansicht, Rechtsklickmenue, Eigenschaften, Uploads sowie Move/Copy-Jobs.">
 ]>
-<PLUGIN name="U-Navigator" author="&author;" version="&version;" launch="Navigator/U-Navigator" pluginURL="&pluginURL;" support="&support;" icon="&icon;" description="&description;" overview="&description;" Overview="&description;">
+<PLUGIN name="U-Navigator" author="&author;" version="&version;" launch="Tools/U-Navigator" pluginURL="&pluginURL;" support="&support;" icon="&icon;" description="&description;" overview="&description;" Overview="&description;">
 
 <DESCRIPTION>&description;</DESCRIPTION>
 <SUPPORT>&support;</SUPPORT>
@@ -24,14 +24,13 @@
 
 <FILE Name="/boot/config/plugins/&name;/&package;">
 <URL>https://git.casaderoll.de/michael/Unraid-Navigator/raw/branch/main/packages/&package;</URL>
-<MD5>6407145791c8baae3dfc04a6aa45c8c4</MD5>
+<MD5>e2a3296496baf42be1d6695613c30275</MD5>
 </FILE>
 
 <FILE Run="/bin/bash">
 <INLINE>
 mkdir -p /boot/config/plugins/&name;
 tar -xzf /boot/config/plugins/&name;/&package; -C /
-rm -f /usr/local/emhttp/plugins/&name;/U-NavigatorNav.page
 find /boot/config/plugins/&name; -type f -name "&name;-*.tgz" ! -name "&package;" -delete
 echo ""
 echo "-----------------------------------------------------------"
diff --git a/u-navigator.plg.in b/u-navigator.plg.in
index bce7041..bc5ec15 100644
--- a/u-navigator.plg.in
+++ b/u-navigator.plg.in
@@ -8,7 +8,7 @@
 <!ENTITY icon "folder-open">
 <!ENTITY description "Unraid File Navigator: Dynamix-integrierter Dateimanager mit mehreren Explorer-Fenstern, Symbol- und Listenansicht, Rechtsklickmenue, Eigenschaften, Uploads sowie Move/Copy-Jobs.">
 ]>
-<PLUGIN name="U-Navigator" author="&author;" version="&version;" launch="Navigator/U-Navigator" pluginURL="&pluginURL;" support="&support;" icon="&icon;" description="&description;" overview="&description;" Overview="&description;">
+<PLUGIN name="U-Navigator" author="&author;" version="&version;" launch="Tools/U-Navigator" pluginURL="&pluginURL;" support="&support;" icon="&icon;" description="&description;" overview="&description;" Overview="&description;">
 
 <DESCRIPTION>&description;</DESCRIPTION>
 <SUPPORT>&support;</SUPPORT>
@@ -31,7 +31,6 @@
 <INLINE>
 mkdir -p /boot/config/plugins/&name;
 tar -xzf /boot/config/plugins/&name;/&package; -C /
-rm -f /usr/local/emhttp/plugins/&name;/U-NavigatorNav.page
 find /boot/config/plugins/&name; -type f -name "&name;-*.tgz" ! -name "&package;" -delete
 echo ""
 echo "-----------------------------------------------------------"