diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 679e9ffab7..95a80ad0d4 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -28,13 +28,6 @@ img_files = {
  {"UNIMG", PROGS .. "/fs/unimg/unimg"},
  {"3D/HOUSE.3DS", "common/3d/house.3ds"},
  {"File Managers/ICONS.INI", "common/File Managers/icons.ini"},
- {"File Managers/FNAV/ABOUT.TXT", "common/File Managers/fNav/ABOUT.TXT"},
- {"File Managers/FNAV/FNAV", "common/File Managers/fNav/FNAV"},
- {"File Managers/FNAV/FNAV.EXT", "common/File Managers/fNav/FNAV.EXT"},
- {"File Managers/FNAV/FNAV.SET", "common/File Managers/fNav/FNAV.SET"},
- {"File Managers/FNAV/FNAV_CUR.PNG", "common/File Managers/fNav/FNAV_CUR.PNG"},
- {"File Managers/FNAV/FNAV_FNT.PNG", "common/File Managers/fNav/FNAV_FNT.PNG"},
- {"File Managers/FNAV/FNAV_ICN.PNG", "common/File Managers/fNav/FNAV_ICN.PNG"},
  {"GAMES/FLPYBIRD", PROGS .. "/games/flappybird/Release/flappybird"},
  {"FONTS/TAHOMA.KF", "common/fonts/tahoma.kf"},
  -- {"LIB/ICONV.OBJ", "common/lib/iconv.obj"},
@@ -295,6 +288,7 @@ extra_files = {
  {"kolibrios/utils/kfm/kfm.ini", "common/File Managers/kfm.ini"},
  {"kolibrios/utils/kfm/kfm_keys_eng.txt", PROGS .. "/fs/kfm/trunk/docs/english/kfm_keys.txt"},
  {"kolibrios/utils/kfm/kfm_keys_rus.txt", PROGS .. "/fs/kfm/trunk/docs/russian/dos_kolibri/kfm_keys.txt"},
+ {"kolibrios/utils/fNav/", "common/File Managers/fNav/*"},
  {"kolibrios/utils/NDN/", "common/File Managers/ndn/*"},
  {"kolibrios/utils/NDN/COLORS/", "common/File Managers/ndn/COLORS/*"},
  {"kolibrios/utils/NDN/XLT/", "common/File Managers/ndn/XLT/*"},
diff --git a/data/ca/settings/menu.dat b/data/ca/settings/menu.dat
index ebdcf5b443..ac4ef7026a 100644
--- a/data/ca/settings/menu.dat
+++ b/data/ca/settings/menu.dat
@@ -78,9 +78,9 @@
 05 Guardar imatge RD     |rdsave
 #8  **** ARCHIUS ****
 24 KFAR                  |File Managers/kfar
-20 fNav                  |File Managers/fNav/fNav
 05 KFM2                  |File Managers/kfm2
 50 Eolite                |File Managers/Eolite
+20 fNav                * |/kolibrios/utils/fNav/fNav
 #9 **** PROCÉS DE DADES ****
 16 Calculadora           |calc
 03 Tinypad               |tinypad
diff --git a/data/common/settings/app_plus.ini b/data/common/settings/app_plus.ini
index b14d8d7afd..4aeb481de7 100644
--- a/data/common/settings/app_plus.ini
+++ b/data/common/settings/app_plus.ini
@@ -26,8 +26,8 @@ Globe=/k/3D/TEXTURES1,78
 Guide=network/webview|/kolibrios/res/guide/guide.htm,92
 DosBox=/k/emul/dosbox/dosbox,11
 Dicty=/k/utils/DICTY.KEX,79
-fNav=File managers/fNav/fNav,93
-TextEdit=/kolibrios/utils/t_edit,58
+fNav=/k/utils/fNav/fNav,93
+TextEdit=/k/utils/tedit/t_edit,58
 CncEditor=/k/utils/cnc_editor/cnc_editor,15
 Life=/k/demos/life2,13
 Calc+=/k/utils/calcplus,4
diff --git a/data/eng/settings/menu.dat b/data/eng/settings/menu.dat
index 754b5e6c95..aa45dadc5d 100644
--- a/data/eng/settings/menu.dat
+++ b/data/eng/settings/menu.dat
@@ -81,8 +81,8 @@
 #8 **** FM
 50 Eolite               |File Managers/Eolite
 05 KFM2                 |File Managers/kfm2
-20 fNav                 |File Managers/fNav/fNav
 64 KFAR                 |File Managers/kfar
+20 fNav               * |/kolibrios/utils/fNav/fNav
 65 NDN                * |/kolibrios/utils/ndn/ndn
 05 Classic KFM        * |/kolibrios/utils/kfm/kfm
 #9 **** ACCESSIBILITY
diff --git a/data/et/settings/menu.dat b/data/et/settings/menu.dat
index 16d6bd5ac9..56cc761240 100644
--- a/data/et/settings/menu.dat
+++ b/data/et/settings/menu.dat
@@ -75,8 +75,8 @@
 #10  **** WORK WITH FILES ****
 50 Eolite                |File Managers/Eolite
 05 KFM2                  |File Managers/kfm2
-20 fNav                  |File Managers/fNav/fNav
 64 KFAR                  |File Managers/kfar
+20 fNav               *  |/kolibrios/utils/fNav/fNav
 65 NDN                *  |/kolibrios/utils/ndn/ndn
 #11 **** DATA PROCESSING ****
 16 Kalkulaator           |calc
diff --git a/data/it/settings/menu.dat b/data/it/settings/menu.dat
index 1e96269fb4..fd6279e1bc 100644
--- a/data/it/settings/menu.dat
+++ b/data/it/settings/menu.dat
@@ -74,8 +74,8 @@
 #10 **** FM
 50 Eolite                |File Managers/Eolite
 05 KFM2                  |File Managers/kfm2
-20 fNav                  |File Managers/fNav/fNav
 64 KFAR                  |File Managers/kfar
+20 fNav               *  |/kolibrios/utils/fNav/fNav
 65 NDN                *  |/kolibrios/utils/ndn/ndn
 #11 **** DATA PROCESSING
 16 Calcolatrice          |calc
diff --git a/data/rus/settings/menu.dat b/data/rus/settings/menu.dat
index 3a40b50ea8..fc79a7ac86 100644
--- a/data/rus/settings/menu.dat
+++ b/data/rus/settings/menu.dat
@@ -79,8 +79,8 @@
 #8 **** ‘¨á⥬  > ”Œ
 50 Eolite               |File Managers/Eolite
 05 KFM2                 |File Managers/kfm2
-20 fNav                 |File Managers/fNav/fNav
 64 KFAR                 |File Managers/kfar
+20 fNav               * |/kolibrios/utils/fNav/fNav
 65 NDN                * |/kolibrios/utils/ndn/ndn
 05 Classic KFM        * |/kolibrios/utils/kfm/kfm
 #9 **** ‘¨á⥬  > ‘¯¥æ.¢®§¬®¦­®áâ¨
diff --git a/data/sp/settings/menu.dat b/data/sp/settings/menu.dat
index 98fc54ec6c..c31c36ef50 100644
--- a/data/sp/settings/menu.dat
+++ b/data/sp/settings/menu.dat
@@ -88,8 +88,8 @@
 #10  **** ARCHIVOS
 50 Eolite                |File Managers/Eolite
 05 KFM2                  |File Managers/kfm2
-20 fNav                  |File Managers/fNav/fNav
 24 KFAR                  |File Managers/kfar
+20 fNav               *  |/kolibrios/utils/fNav/fNav
 24 NDN                *  |/kolibrios/utils/ndn/ndn
 #11 **** PROCESO DE DATOS
 16 Calculadora           |calc