diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index f9ca86ddff..1d4b23d048 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -582,7 +582,7 @@ tup.append_table(img_files, {
  {"TMPDISK", PROGS .. "/cmm/tmpdisk/tmpdisk.com"},
  {"DEVELOP/CLIPVIEW", PROGS .. "/cmm/clipview/clipview.com"},
  {"File Managers/EOLITE", PROGS .. "/cmm/eolite/Eolite.com"},
- {"FONT_VIEWER", PROGS .. "/cmm/kf_font_viewer/font_viewer.com"},
+ {"KF_VIEW", PROGS .. "/cmm/kf_font_viewer/font_viewer.com"},
  {"GAMES/CLICKS", PROGS .. "/games/clicks/trunk/clicks.com"},
  {"GAMES/MBLOCKS", PROGS .. "/cmm/mblocks/mblocks.com"},
  {"DEVELOP/DIFF", PROGS .. "/cmm/diff/diff.com"},
diff --git a/data/common/File Managers/fNav/fnav.set b/data/common/File Managers/fNav/fnav.set
index 973049db0c..b525b59eee 100644
--- a/data/common/File Managers/fNav/fnav.set	
+++ b/data/common/File Managers/fNav/fnav.set	
@@ -1 +1 @@
-/sys/TinyPad:              asm, inc, ini, txt, mac, log, dat
/sys/media/kiv:            gif, bmp, png, tga, jpg, ico, cur, tif, tiff, jpeg, ppm, pgm, pbm, pnm, pcx, wbmp, xcf
/sys/Network/Webview:      htm, html, mht, xhtml
/sys/fb2read:              fb2
/sys/develop/cObj:         obj
/sys/skincfg:              skn
/sys/rtfRead:              rtf
/sys/develop/t_edit:       cpp, h, c, c--, pas, set, ext
/sys/media/pixie/pixie:    mp3
/sys/media/AC97SND:        wav, xm
/sys/media/MIDAMP:         mid
/sys/media/listplay:       m3u, lap, asf
/sys/shell:                sh
/sys/3d/view3ds:           3ds, asc
/sys/graph:                cvs
/sys/unz:                  zip, 7z
/kolibrios/media/updf:     pdf, xps
/kolibrios/media/fplay:    avi, mpg, mov, flv, wmv, vob, mkv, mp4, mpeg, 3gp, webm
/kolibrios/emul/zsnes:     smc
/kolibrios/emul/psx4all:   mcr
/kolibrios/emul/fceu/fceu: nes
/kolibrios/emul/e80/e80:   sna
/kolibrios/emul/gameboy:   gb, gbc
/kolibrios/emul/pokemini:  min
/sys/develop/heed:
\ No newline at end of file
+/sys/TinyPad:              asm, inc, txt, mac, log, dat
/sys/media/kiv:            gif, bmp, png, tga, jpg, ico, cur, tif, tiff, jpeg, ppm, pgm, pbm, pnm, pcx, wbmp, xcf
/sys/Network/Webview:      htm, html, mht, xhtml
/sys/fb2read:              fb2
/sys/develop/cObj:         obj
/sys/skincfg:              skn
/sys/rtfRead:              rtf
/sys/develop/t_edit:       cpp, h, c, c--, pas, set, ext, ini
/sys/media/pixie/pixie:    mp3
/sys/media/AC97SND:        wav, xm
/sys/media/MIDAMP:         mid
/sys/media/listplay:       m3u, lap, asf
/sys/shell:                sh
/sys/3d/view3ds:           3ds, asc
/sys/graph:                cvs
/sys/unz:                  zip, 7z
/kolibrios/media/updf:     pdf
/kolibrios/media/fplay:    avi, mpg, mov, flv, wmv, vob, mkv, mp4, mpeg, divx, 3gp, webm
/kolibrios/emul/zsnes:     smc
/kolibrios/emul/psx4all:   mcr
/kolibrios/emul/fceu/fceu: nes
/kolibrios/emul/e80/e80:   sna
/kolibrios/emul/gameboy:   gb, gbc
/kolibrios/emul/pokemini:  min
/sys/develop/heed:
\ No newline at end of file
diff --git a/data/common/File Managers/kfar.ini b/data/common/File Managers/kfar.ini
index cce212ab49..b0065fcbcf 100644
--- a/data/common/File Managers/kfar.ini	
+++ b/data/common/File Managers/kfar.ini	
@@ -59,6 +59,7 @@ gb=/kolibrios/emul/gameboy
 gbc=/kolibrios/emul/gameboy
 min=/kolibrios/emul/pokemini
 nc=/kolibrios/utils/cnc_editor/cnc_editor
+kf=/sys/KF_VIEW
 
 [Menu]
 AsmMenu1=&Edit,/sys/TinyPad
diff --git a/data/common/File Managers/kfm.ini b/data/common/File Managers/kfm.ini
index 3560db40b9..01a9123963 100644
--- a/data/common/File Managers/kfm.ini	
+++ b/data/common/File Managers/kfm.ini	
@@ -181,6 +181,7 @@ rtf /sys/rtfread
 asc /sys/3d/view3ds
 lif /kolibrios/demos/life2
 skn /sys/skincfg
+kf /sys/KF_VIEW
 pdf /kolibrios/media/updf
 avi /kolibrios/media/fplay_run
 mpg /kolibrios/media/fplay_run
diff --git a/data/common/icons32.png b/data/common/icons32.png
index f89e0c9aac..9b054344f7 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 864fb93ea4..44a2cab8c8 100644
--- a/data/common/settings/app_plus.ini
+++ b/data/common/settings/app_plus.ini
@@ -1,7 +1,7 @@
 [Config]
 window_width=600
-cell_w=82
-cell_h=78
+cell_w=73
+cell_h=71
 window_title=KolibriOS Additional Software
 
 [Media]
@@ -9,6 +9,8 @@ zSea=/kolibrios/media/zsea/zsea,46
 FPlay=/kolibrios/media/fplay,40
 GrafX2=/kolibrios/grafx2/grafx2,48
 uPDF=/sys/lod|*pdf* /kolibrios/media/updf,73
+IconEdit=/sys/media/iconedit,98
+EasyShot=/sys/easyshot,2
 
 [Misc]
 DosBox=/kolibrios/emul/dosbox/dosbox,11
@@ -18,6 +20,11 @@ CncEditor=/kolibrios/utils/cnc_editor/cnc_editor,15
 Life=/kolibrios/demos/life2,13
 Calc+=/kolibrios/utils/calcplus,4
 TinyBasic=/kolibrios/develop/TinyBasic/TinyBasic,91
+Notes=/sys/notes,117
+FtpClient=/sys/network/ftpc,45
+VncViewer=/sys/network/ftpc,77
+Timer=/sys/demos/timer,119
+ASCII View=/sys/asciivju,118
 
 [3D Tools]
 Info3DsPro=/kolibrios/3d/info3ds/info3ds,75
diff --git a/data/common/settings/assoc.ini b/data/common/settings/assoc.ini
index 82e3cfba80..ae5124faa3 100644
--- a/data/common/settings/assoc.ini
+++ b/data/common/settings/assoc.ini
@@ -76,7 +76,7 @@ icon=98
 [Assoc]
 /=/sys/file managers/eolite
 
-kf=/sys/FONT_VIEWER
+kf=/sys/KF_VIEW
 
 txt=$TinyPad
 asm=$TinyPad
@@ -104,6 +104,7 @@ mpeg=$FPlay
 mov=$FPlay
 webm=$FPlay
 3gp=$FPlay
+divx=$FPlay
 
 png=$KIV
 jpg=$KIV
diff --git a/programs/other/t_edit/t_edit.ini b/programs/other/t_edit/t_edit.ini
index f540e275c9..012366732f 100644
--- a/programs/other/t_edit/t_edit.ini
+++ b/programs/other/t_edit/t_edit.ini
@@ -22,5 +22,5 @@ syntax_5=cpp_kol_dar.syn
 ext_5=h
 syntax_6=html.syn
 ext_6=html
-syntax_7=html.syn
+syntax_7=ini_files.syn
 ext_7=INI
\ No newline at end of file