diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 21cf21932..a2e4c06da 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -32,12 +32,13 @@ img_files = {
  {"File Managers/KFM.INI", "common/File Managers/kfm.ini"},
  {"File Managers/BUTTONS.BMP", PROGS .. "/fs/kfm/trunk/buttons.bmp"},
  {"File Managers/ICONS.BMP", PROGS .. "/fs/kfm/trunk/icons.bmp"},
+ {"File Managers/FNAV/ABOUT.TXT", "common/File Managers/fNav/About.txt"},
  {"File Managers/FNAV/FNAV", "common/File Managers/fNav/fNav.kex"},
  {"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"},      
+ {"File Managers/FNAV/FNAV_ICN.PNG", "common/File Managers/fNav/fnav_icn.png"},
  {"FONTS/LITT.CHR", PROGS .. "/demos/bgitest/trunk/FONTS/LITT.CHR"},
  {"FONTS/TAHOMA.KF", "common/fonts/tahoma.kf"},
  {"GAMES/SNAKE.INI", PROGS .. "/games/snake/trunk/snake.ini"},
@@ -82,7 +83,6 @@ if build_type == "rus" then tup.append_table(img_files, {
  {"SETTINGS/GAME_CENTER.INI", "rus/settings/game_center.ini"},
  {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"},
  {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/rus/example.asm"},
- {"File Managers/FNAV/ABOUT.TXT", "rus/File Managers/fNav/About.txt"},
  {"RUN", "rus/RUN"},
  {"PIPETKA", build_type .. "/pipetka"},
  {"File Managers/KFAR.INI", build_type .. "/File Managers/kfar.ini"},
@@ -96,7 +96,6 @@ if build_type == "rus" then tup.append_table(img_files, {
  {"SETTINGS/GAME_CENTER.INI", "common/settings/game_center.ini"},
  {"SETTINGS/.shell", PROGS .. "/system/shell/bin/eng/.shell"},
  {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"},
- {"File Managers/FNAV/ABOUT.TXT", "common/File Managers/fNav/About.txt"},
  {"RUN", "eng/RUN"}, 
  {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"},
  {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"}, 
@@ -105,7 +104,6 @@ if build_type == "rus" then tup.append_table(img_files, {
  {"SETTINGS/GAME_CENTER.INI", "common/settings/game_center.ini"},
  {"SETTINGS/.shell", PROGS .. "/system/shell/bin/eng/.shell"},
  {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"},
- {"File Managers/FNAV/ABOUT.TXT", "common/File Managers/fNav/About.txt"},
  {"RUN", "sp/RUN"},
  {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"},
  {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"}, 
@@ -114,7 +112,6 @@ if build_type == "rus" then tup.append_table(img_files, {
  {"SETTINGS/GAME_CENTER.INI", "common/settings/game_center.ini"},
  {"SETTINGS/.shell", PROGS .. "/system/shell/bin/eng/.shell"},
  {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"},
- {"File Managers/FNAV/ABOUT.TXT", "common/File Managers/fNav/About.txt"},
  {"RUN", "it/RUN"},
  {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey_it.ini"},
  {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"},
@@ -123,7 +120,6 @@ if build_type == "rus" then tup.append_table(img_files, {
  {"SETTINGS/GAME_CENTER.INI", "common/settings/game_center.ini"},
  {"SETTINGS/.shell", PROGS .. "/system/shell/bin/eng/.shell"},
  {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"},
- {"File Managers/FNAV/ABOUT.TXT", "common/File Managers/fNav/About.txt"},
  {"RUN", "common/RUN"},
  {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"},
  {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"},
@@ -262,7 +258,6 @@ extra_files = {
  {"kolibrios/media/zsea/buttons/buttons.png", PROGS .. "/media/zsea/buttons.png"},
  {"kolibrios/res/skins/", "../skins/authors.txt"},
  {"kolibrios/settings/app_plus.ini", "common/settings/app_plus.ini"},
- {"kolibrios/utils/fNav/", "common/File Managers/fNav/*"},
  {"kolibrios/res/wallpapers/in_the_wind.png", "common/wallpapers/in_the_wind.png"},
  {"kolibrios/res/wallpapers/deink.png", "common/wallpapers/deink.png"},
  }
diff --git a/data/common/icons32.png b/data/common/icons32.png
index ac754657b..370955503 100644
Binary files a/data/common/icons32.png and b/data/common/icons32.png differ
diff --git a/data/common/settings/app_plus.ini b/data/common/settings/app_plus.ini
index 63128ce0f..62b8bea90 100644
--- a/data/common/settings/app_plus.ini
+++ b/data/common/settings/app_plus.ini
@@ -13,7 +13,7 @@ uPDF=/sys/lod|*pdf* /kolibrios/media/updf,73
 [Misc]
 DosBox=/kolibrios/emul/dosbox/dosbox,11
 Dicty=/kolibrios/utils/DICTY.KEX,79
-fNav=/kolibrios/utils/fNav/fNav.kex,45
+fNav=/sys/File managers/fNav/fNav,45
 Life=/kolibrios/demos/life2,13
 Calc+=/kolibrios/utils/calcplus,4