diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index e8c6c09d4f..3a2813f8fd 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -51,8 +51,8 @@ img_files = {
  {"NETWORK/FTPC.INI", PROGS .. "/network/ftpc/ftpc.ini"},
  {"NETWORK/FTPD.INI", "common/network/ftpd.ini"},
  {"NETWORK/USERS.INI", "common/network/users.ini"},
- {"NETWORK/TL_SYS_16.PNG", PROGS .. "/network/ftpc/tl_sys_16.png"},
- {"NETWORK/TL_NOD_16.PNG", PROGS .. "/network/ftpc/tl_nod_16.png"},
+ {"NETWORK/FTPC_SYS.PNG", PROGS .. "/network/ftpc/ftp_sys.png"},
+ {"NETWORK/FTPC_NOD.PNG", PROGS .. "/network/ftpc/ftp_nod.png"},
  {"SETTINGS/APP.INI", "common/settings/app.ini"},
  {"SETTINGS/APP_PLUS.INI", "common/settings/app_plus.ini"},
  {"SETTINGS/ASSOC.INI", "common/settings/assoc.ini"},
@@ -400,12 +400,12 @@ tup.append_table(img_files, {
  {"DEVELOP/test_gets", PROGS .. "/develop/libraries/console_coff/examples/test_gets"},
  {"DEVELOP/THREAD", PROGS .. "/develop/examples/thread/trunk/thread"},
  {"DEVELOP/INFO/ASM.SYN", PROGS .. "/other/t_edit/info/asm.syn"},
- {"DEVELOP/INFO/CPP_KOL_CLA.SYN", PROGS .. "/other/t_edit/info/cpp_kol_cla.syn"},
- {"DEVELOP/INFO/CPP_KOL_DAR.SYN", PROGS .. "/other/t_edit/info/cpp_kol_dar.syn"},
- {"DEVELOP/INFO/CPP_KOL_DEF.SYN", PROGS .. "/other/t_edit/info/cpp_kol_def.syn"},
+ {"DEVELOP/INFO/CPP_CLA.SYN", PROGS .. "/other/t_edit/info/cpp_kol_cla.syn"},
+ {"DEVELOP/INFO/CPP_DAR.SYN", PROGS .. "/other/t_edit/info/cpp_kol_dar.syn"},
+ {"DEVELOP/INFO/CPP_DEF.SYN", PROGS .. "/other/t_edit/info/cpp_kol_def.syn"},
  {"DEVELOP/INFO/DEFAULT.SYN", PROGS .. "/other/t_edit/info/default.syn"},
  {"DEVELOP/INFO/HTML.SYN", PROGS .. "/other/t_edit/info/html.syn"},
- {"DEVELOP/INFO/INI_FILES.SYN", PROGS .. "/other/t_edit/info/ini_files.syn"},
+ {"DEVELOP/INFO/INI.SYN", PROGS .. "/other/t_edit/info/ini_files.syn"},
  {"File Managers/KFAR", PROGS .. "/fs/kfar/trunk/kfar"},
  {"File Managers/KFM", PROGS .. "/fs/kfm/trunk/kfm"},
  {"File Managers/OPENDIAL", PROGS .. "/fs/opendial/opendial"},
diff --git a/programs/media/kiv/trunk/kivicons.bmp b/programs/media/kiv/trunk/kivicons.bmp
index 816ae2a34c..0934d19542 100644
Binary files a/programs/media/kiv/trunk/kivicons.bmp and b/programs/media/kiv/trunk/kivicons.bmp differ
diff --git a/programs/network/ftpc/tl_nod_16.png b/programs/network/ftpc/ftpc_nod.png
similarity index 100%
rename from programs/network/ftpc/tl_nod_16.png
rename to programs/network/ftpc/ftpc_nod.png
diff --git a/programs/network/ftpc/tl_sys_16.png b/programs/network/ftpc/ftpc_sys.png
similarity index 100%
rename from programs/network/ftpc/tl_sys_16.png
rename to programs/network/ftpc/ftpc_sys.png
diff --git a/programs/network/ftpc/gui.inc b/programs/network/ftpc/gui.inc
index 6212253a82..fd09682295 100755
--- a/programs/network/ftpc/gui.inc
+++ b/programs/network/ftpc/gui.inc
@@ -78,7 +78,7 @@ gui: ;//////////////////////////////////////////////////////////////////////////
 		or dword[tree2.style], 8 ;tl_cursor_pos_limited
 		
         ; read icons
-        load_image_file 'tl_sys_16.png', icon_tl_sys
+        load_image_file 'ftpc_sys.png', icon_tl_sys
 
         mov     [filestruct.ptr], eax
         mov     [filestruct.subfn], 0
@@ -92,7 +92,7 @@ gui: ;//////////////////////////////////////////////////////////////////////////
 
       @@:
         ; read nodes icon file
-        load_image_file 'tl_nod_16.png', icon_tl_nod
+        load_image_file 'ftpc_nod.png', icon_tl_nod
 
         mov     [filestruct.ptr], eax
         ;mov    [filestruct.subfn], 0
diff --git a/programs/other/t_edit/info/build.bat b/programs/other/t_edit/info/build.bat
index 45e663fc4d..110cc1d55d 100644
--- a/programs/other/t_edit/info/build.bat
+++ b/programs/other/t_edit/info/build.bat
@@ -1,16 +1,16 @@
 @fasm.exe -m 16384 %1asm_syn.asm %2asm.syn
 @kpack %2asm.syn
-@fasm.exe -m 16384 %1cpp_kol_cla_syn.asm %2cpp_kol_cla.syn
+@fasm.exe -m 16384 %1cpp_kol_cla_syn.asm %2cpp_cla.syn
 @kpack %2cpp_kol_cla.syn
-@fasm.exe -m 16384 %1cpp_kol_dar_syn.asm %2cpp_kol_dar.syn
+@fasm.exe -m 16384 %1cpp_kol_dar_syn.asm %2cpp_dar.syn
 @kpack %2cpp_kol_dar.syn
-@fasm.exe -m 16384 %1cpp_kol_def_syn.asm %2cpp_kol_def.syn
+@fasm.exe -m 16384 %1cpp_kol_def_syn.asm %2cpp_def.syn
 @kpack %2cpp_kol_def.syn
 @fasm.exe -m 16384 %1default_syn.asm %2default.syn
 @kpack %2default.syn
 @fasm.exe -m 16384 %1html_syn.asm %2html.syn
 @kpack %2html.syn
-@fasm.exe -m 16384 %1ini_files_syn.asm %2ini_files.syn
+@fasm.exe -m 16384 %1ini_files_syn.asm %2ini.syn
 @fasm.exe -m 16384 %1voc_eng_rus_syn.asm %2voc_eng_rus.syn
 @kpack %2voc_eng_rus.syn
 @fasm.exe -m 16384 %1win_const_syn.asm %2win_const.syn
diff --git a/programs/other/t_edit/t_edit.ini b/programs/other/t_edit/t_edit.ini
index 07ec24b135..4c9d699d78 100644
--- a/programs/other/t_edit/t_edit.ini
+++ b/programs/other/t_edit/t_edit.ini
@@ -31,17 +31,17 @@ but_convert_866_1251=1
 [Options]
 syntax_0=asm.syn
 ext_0=asm
-syntax_1=cpp_kol_dar.syn
+syntax_1=cpp_dar.syn
 ext_1=cpp
 syntax_2=html.syn
 ext_2=htm
-syntax_3=ini_files.syn
+syntax_3=ini.syn
 ext_3=ini
 syntax_4=asm.syn
 ext_4=inc
-syntax_5=cpp_kol_dar.syn
+syntax_5=cpp_dar.syn
 ext_5=h
 syntax_6=html.syn
 ext_6=html
-syntax_7=ini_files.syn
+syntax_7=ini.syn
 ext_7=INI
\ No newline at end of file