diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 4e7ad3c041..6a4c12f1ed 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -250,6 +250,7 @@ extra_files = {
  {"kolibrios/lib/swresample-1.dll", "common/lib/swresample-1.dll"},
  {"kolibrios/lib/i915_dri.drv", "common/lib/i915_dri.drv"},
  {"kolibrios/media/fplay", "common/media/fplay"},
+ {"kolibrios/media/fplay_run", "common/media/fplay_run"},
  {"kolibrios/media/updf", "common/media/updf"},
  {"kolibrios/media/vttf", "common/media/vttf"},
  {"kolibrios/media/zsea/zsea.ini", PROGS .. "/media/zsea/zSea.ini"},
diff --git a/data/common/File Managers/kfar.ini b/data/common/File Managers/kfar.ini
index a04493de39..92a2dbbff0 100644
--- a/data/common/File Managers/kfar.ini	
+++ b/data/common/File Managers/kfar.ini	
@@ -39,17 +39,17 @@ fb2=/sys/fb2read
 mht=/sys/network/WebView
 kla=/sys/games/klavisha
 pdf=/kolibrios/media/updf
-avi=/kolibrios/media/fplay
-mpg=/kolibrios/media/fplay
-mov=/kolibrios/media/fplay
-flv=/kolibrios/media/fplay
-wmv=/kolibrios/media/fplay
-vob=/kolibrios/media/fplay
-mkv=/kolibrios/media/fplay
-mp4=/kolibrios/media/fplay
-mpeg=/kolibrios/media/fplay
-3gp=/kolibrios/media/fplay
-webm=/kolibrios/media/fplay
+avi=/kolibrios/media/fplay_run
+mpg=/kolibrios/media/fplay_run
+mov=/kolibrios/media/fplay_run
+flv=/kolibrios/media/fplay_run
+wmv=/kolibrios/media/fplay_run
+vob=/kolibrios/media/fplay_run
+mkv=/kolibrios/media/fplay_run
+mp4=/kolibrios/media/fplay_run
+mpeg=/kolibrios/media/fplay_run
+3gp=/kolibrios/media/fplay_run
+webm=/kolibrios/media/fplay_run
 sh=/sys/shell
 smc=/kolibrios/emul/zsnes
 mcr=/kolibrios/emul/psx4all
diff --git a/data/common/File Managers/kfm.ini b/data/common/File Managers/kfm.ini
index 70ac45e870..49ac753df2 100644
--- a/data/common/File Managers/kfm.ini	
+++ b/data/common/File Managers/kfm.ini	
@@ -182,17 +182,17 @@ asc /sys/3d/view3ds
 lif /kolibrios/demos/life2
 skn /sys/skincfg
 pdf /kolibrios/media/updf
-avi /kolibrios/media/fplay
-mpg /kolibrios/media/fplay
-mov /kolibrios/media/fplay
-flv /kolibrios/media/fplay
-wmv /kolibrios/media/fplay
-vob /kolibrios/media/fplay
-mkv /kolibrios/media/fplay
-mp4 /kolibrios/media/fplay
-mpeg /kolibrios/media/fplay
-3gp /kolibrios/media/fplay
-webm /kolibrios/media/fplay
+avi /kolibrios/media/fplay_run
+mpg /kolibrios/media/fplay_run
+mov /kolibrios/media/fplay_run
+flv /kolibrios/media/fplay_run
+wmv /kolibrios/media/fplay_run
+vob /kolibrios/media/fplay_run
+mkv /kolibrios/media/fplay_run
+mp4 /kolibrios/media/fplay_run
+mpeg /kolibrios/media/fplay_run
+3gp /kolibrios/media/fplay_run
+webm /kolibrios/media/fplay_run
 smc=/kolibrios/emul/zsnes
 mcr=/kolibrios/emul/psx4all
 nes=/kolibrios/emul/fceu/fceu
diff --git a/data/common/icons16.png b/data/common/icons16.png
index 8d5eefdb66..5e78ba1d1c 100644
Binary files a/data/common/icons16.png and b/data/common/icons16.png differ
diff --git a/data/common/media/fplay_run b/data/common/media/fplay_run
new file mode 100644
index 0000000000..8208aad54a
Binary files /dev/null and b/data/common/media/fplay_run differ
diff --git a/data/common/settings/assoc.ini b/data/common/settings/assoc.ini
index 2b9b97ff91..83cb23fc24 100644
--- a/data/common/settings/assoc.ini
+++ b/data/common/settings/assoc.ini
@@ -42,7 +42,7 @@ exec=/kolibrios/emul/dosbox/dosbox
 icon=11
 
 [FPlay]
-exec=/kolibrios/media/fplay
+exec=/kolibrios/media/fplay_run
 icon=40
 
 [AC97snd]
diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c
index 2caaade08c..5b7a2c42a3 100644
--- a/programs/cmm/eolite/Eolite.c
+++ b/programs/cmm/eolite/Eolite.c
@@ -156,8 +156,8 @@ void main()
 
 	Libimg_LoadImage(#icons16_default, "/sys/icons16.png");
 	Libimg_LoadImage(#icons16_selected, "/sys/icons16.png");
-	Libimg_ReplaceColor(icons16_selected.image, icons16_selected.w, icons16_selected.h, 0xffFFFfff, 0xFF94AECE);
-	Libimg_ReplaceColor(icons16_selected.image, icons16_selected.w, icons16_selected.h, 0xffCACBD6, 0xFF7692B5);
+	Libimg_ReplaceColor(icons16_selected.image, icons16_selected.w, icons16_selected.h, 0xffFFFfff, col_selec);
+	Libimg_ReplaceColor(icons16_selected.image, icons16_selected.w, icons16_selected.h, 0xffCACBD6, MixColors(col_selec, 0, 200));
 
 	//Libimg_LoadImage(#icons32_default, "/sys/icons32.png");
 	//Libimg_LoadImage(#icons32_selected, "/sys/icons32.png");
diff --git a/programs/cmm/lib/kolibri.h b/programs/cmm/lib/kolibri.h
index 3483afe2ba..1892e73897 100644
--- a/programs/cmm/lib/kolibri.h
+++ b/programs/cmm/lib/kolibri.h
@@ -513,13 +513,13 @@ inline fastcall void PutPixel( EBX,ECX,EDX)
 	$int 0x40
 }
 
-void DefineButton(dword x,y,w,h,EDX,ESI)
+:void DefineButton(dword x,y,w,h,id,color)
 {
 	EAX = 8;
-	$push edx
-	EDX += BT_DEL;
+	EDX = id + BT_DEL;
 	$int 0x40;
-	$pop edx
+	EDX = id;
+	ESI = color;
 	EBX = x<<16+w;
 	ECX = y<<16+h;
 	$int 0x40