diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 3de301c1a..9e7e5129e 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -38,7 +38,7 @@ img_files = {
  {"UNIMG", SRC_PROGS .. "/fs/unimg/unimg"},
  {"3D/HOUSE.3DS", "common/3d/house.3ds"},
  {"File Managers/ICONS.INI", "common/File Managers/icons.ini"},
- {"GAMES/FLPYBIRD", SRC_PROGS .. "/games/flappybird/Release/flappybird"},
+ {"GAMES/FLPYBIRD", SRC_PROGS .. "/games/floppybird/Release/floppybird"},
  {"FONTS/TAHOMA.KF", "common/fonts/tahoma.kf"},
  -- {"LIB/ICONV.OBJ", "common/lib/iconv.obj"},
  {"LIB/KMENU.OBJ", "common/lib/kmenu.obj"},
diff --git a/data/ca_ES/settings/icon.ini b/data/ca_ES/settings/icon.ini
index b60c6876d..a8147e67d 100644
--- a/data/ca_ES/settings/icon.ini
+++ b/data/ca_ES/settings/icon.ini
@@ -165,7 +165,7 @@ ico=21
 x=68
 y=-135
 [17]
-name=FLAPPY-BIRD
+name=FLOPPY-BIRD
 path=/SYS/GAMES/FLPYBIRD
 param=
 ico=49
diff --git a/data/common/File Managers/icons.ini b/data/common/File Managers/icons.ini
index 95fecf529..e211975f0 100644
--- a/data/common/File Managers/icons.ini	
+++ b/data/common/File Managers/icons.ini	
@@ -237,8 +237,6 @@ pcx=70
 png=70
 pdf=73
 mid=74
-mid=74
-midi=74
 midi=74
 3ds=78
 stl=78
diff --git a/data/en_US/settings/icon.ini b/data/en_US/settings/icon.ini
index 2e48115a0..346abde93 100644
--- a/data/en_US/settings/icon.ini
+++ b/data/en_US/settings/icon.ini
@@ -165,7 +165,7 @@ ico=21
 x=68
 y=-135
 [17]
-name=FLAPPY-BIRD
+name=FLOPPY-BIRD
 path=/SYS/GAMES/FLPYBIRD
 param=
 ico=49
diff --git a/data/es_ES/settings/icon.ini b/data/es_ES/settings/icon.ini
index 2e48115a0..346abde93 100644
--- a/data/es_ES/settings/icon.ini
+++ b/data/es_ES/settings/icon.ini
@@ -165,7 +165,7 @@ ico=21
 x=68
 y=-135
 [17]
-name=FLAPPY-BIRD
+name=FLOPPY-BIRD
 path=/SYS/GAMES/FLPYBIRD
 param=
 ico=49
diff --git a/data/et_EE/settings/icon.ini b/data/et_EE/settings/icon.ini
index 7bddfd2d8..41bd61fd2 100644
--- a/data/et_EE/settings/icon.ini
+++ b/data/et_EE/settings/icon.ini
@@ -165,7 +165,7 @@ ico=21
 x=68
 y=-135
 [17]
-name=FLAPPY-BIRD
+name=FLOPPY-BIRD
 path=/SYS/GAMES/FLPYBIRD
 param=
 ico=49
diff --git a/data/it_IT/settings/icon.ini b/data/it_IT/settings/icon.ini
index 2e48115a0..346abde93 100644
--- a/data/it_IT/settings/icon.ini
+++ b/data/it_IT/settings/icon.ini
@@ -165,7 +165,7 @@ ico=21
 x=68
 y=-135
 [17]
-name=FLAPPY-BIRD
+name=FLOPPY-BIRD
 path=/SYS/GAMES/FLPYBIRD
 param=
 ico=49
diff --git a/data/ru_RU/settings/icon.ini b/data/ru_RU/settings/icon.ini
index 095f76663..176d4966d 100644
--- a/data/ru_RU/settings/icon.ini
+++ b/data/ru_RU/settings/icon.ini
@@ -165,7 +165,7 @@ ico=21
 x=68
 y=-135
 [17]
-name=FLAPPY-BIRD
+name=FLOPPY-BIRD
 path=/SYS/GAMES/FLPYBIRD
 param=
 ico=49
diff --git a/programs/games/flappybird/Release/flappybird b/programs/games/flappybird/Release/flappybird
deleted file mode 100644
index 92f528dbe..000000000
Binary files a/programs/games/flappybird/Release/flappybird and /dev/null differ
diff --git a/programs/games/flappybird/README.md b/programs/games/floppybird/README.md
similarity index 64%
rename from programs/games/flappybird/README.md
rename to programs/games/floppybird/README.md
index ccaf4fc62..27536db02 100644
--- a/programs/games/flappybird/README.md
+++ b/programs/games/floppybird/README.md
@@ -1,7 +1,7 @@
-## Flappy Bird for KolibriOS
+## Floppy Bird for KolibriOS
 
 * [Forum topic](http://board.kolibrios.org/viewtopic.php?f=41&t=4471) <br>
-* [Directory in official KolibriOS SVN repository](http://websvn.kolibrios.org/listing.php?repname=Kolibri+OS&path=%2Fprograms%2Fgames%2Fflappybird%2F&#a1f3183a01c0fffa57fec6704cbfc0b3d)
+* [Directory in official KolibriOS GIT repository] kolibrios\programs\games\floppybird
 
 <img src="https://i.ibb.co/kMsv8pB/menu.jpg" alt="Screenshot" width="400"> <img src="https://i.ibb.co/7NP1yHZ/screen1.jpg" alt="Screenshot" width="400">
 <img src="https://i.ibb.co/Y2FwxDG/screen2.jpg" alt="Screenshot" width="400"> <img src="https://i.ibb.co/3W8yCYn/gameover.jpg" alt="Screenshot" width="400">
diff --git a/programs/games/floppybird/Release/floppybird b/programs/games/floppybird/Release/floppybird
new file mode 100644
index 000000000..0a513fb0c
Binary files /dev/null and b/programs/games/floppybird/Release/floppybird differ
diff --git a/programs/games/flappybird/flappybird.vcxproj b/programs/games/floppybird/flappybird.vcxproj
similarity index 97%
rename from programs/games/flappybird/flappybird.vcxproj
rename to programs/games/floppybird/flappybird.vcxproj
index f24b1a35f..93b439cb5 100644
--- a/programs/games/flappybird/flappybird.vcxproj
+++ b/programs/games/floppybird/flappybird.vcxproj
@@ -8,7 +8,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{0556BA3E-9447-4000-8613-91AD1CD750D7}</ProjectGuid>
-    <RootNamespace>flappybird</RootNamespace>
+    <RootNamespace>floppybird</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -57,7 +57,7 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="flappybird.cpp" />
+    <ClCompile Include="floppybird.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="smalllibc\smalllibc.vcxproj">
diff --git a/programs/games/flappybird/flappybird.vcxproj.filters b/programs/games/floppybird/flappybird.vcxproj.filters
similarity index 96%
rename from programs/games/flappybird/flappybird.vcxproj.filters
rename to programs/games/floppybird/flappybird.vcxproj.filters
index af11905d5..d798c5512 100644
--- a/programs/games/flappybird/flappybird.vcxproj.filters
+++ b/programs/games/floppybird/flappybird.vcxproj.filters
@@ -15,7 +15,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="flappybird.cpp">
+    <ClCompile Include="floppybird.cpp">
       <Filter>Файлы исходного кода</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/programs/games/flappybird/flappybird.cpp b/programs/games/floppybird/floppybird.cpp
similarity index 99%
rename from programs/games/flappybird/flappybird.cpp
rename to programs/games/floppybird/floppybird.cpp
index 7aa583447..2e1952621 100644
--- a/programs/games/flappybird/flappybird.cpp
+++ b/programs/games/floppybird/floppybird.cpp
@@ -3,7 +3,7 @@
 #include "images.hpp"
 
 //Global const strings
-const char HEADER_STRING[] = "Flappy bird";
+const char HEADER_STRING[] = "Floppy bird";
 const char CONTROL_STRING[] = "SPACEBAR TO JUMP";
 const char GAMEOVER_STRING[] = "GAMEOVER";
 const char ANY_KEY_STRING[] = "Press any key for restart";
diff --git a/programs/games/flappybird/flappybird.sln b/programs/games/floppybird/floppybird.sln
similarity index 87%
rename from programs/games/flappybird/flappybird.sln
rename to programs/games/floppybird/floppybird.sln
index 923726e2e..b540c5702 100644
--- a/programs/games/flappybird/flappybird.sln
+++ b/programs/games/floppybird/floppybird.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flappybird", "flappybird.vcxproj", "{0556BA3E-9447-4000-8613-91AD1CD750D7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "floppybird", "floppybird.vcxproj", "{0556BA3E-9447-4000-8613-91AD1CD750D7}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0D291390-1953-4E1F-BBE2-57F12AFF3214} = {0D291390-1953-4E1F-BBE2-57F12AFF3214}
 	EndProjectSection
diff --git a/programs/games/flappybird/images.hpp b/programs/games/floppybird/images.hpp
similarity index 100%
rename from programs/games/flappybird/images.hpp
rename to programs/games/floppybird/images.hpp
diff --git a/programs/games/flappybird/smalllibc/doexe2.asm b/programs/games/floppybird/smalllibc/doexe2.asm
similarity index 100%
rename from programs/games/flappybird/smalllibc/doexe2.asm
rename to programs/games/floppybird/smalllibc/doexe2.asm
diff --git a/programs/games/flappybird/smalllibc/func.cpp b/programs/games/floppybird/smalllibc/func.cpp
similarity index 100%
rename from programs/games/flappybird/smalllibc/func.cpp
rename to programs/games/floppybird/smalllibc/func.cpp
diff --git a/programs/games/flappybird/smalllibc/func.h b/programs/games/floppybird/smalllibc/func.h
similarity index 100%
rename from programs/games/flappybird/smalllibc/func.h
rename to programs/games/floppybird/smalllibc/func.h
diff --git a/programs/games/flappybird/smalllibc/init.asm b/programs/games/floppybird/smalllibc/init.asm
similarity index 100%
rename from programs/games/flappybird/smalllibc/init.asm
rename to programs/games/floppybird/smalllibc/init.asm
diff --git a/programs/games/flappybird/smalllibc/kosFile.cpp b/programs/games/floppybird/smalllibc/kosFile.cpp
similarity index 100%
rename from programs/games/flappybird/smalllibc/kosFile.cpp
rename to programs/games/floppybird/smalllibc/kosFile.cpp
diff --git a/programs/games/flappybird/smalllibc/kosFile.h b/programs/games/floppybird/smalllibc/kosFile.h
similarity index 100%
rename from programs/games/flappybird/smalllibc/kosFile.h
rename to programs/games/floppybird/smalllibc/kosFile.h
diff --git a/programs/games/flappybird/smalllibc/kosSyst.cpp b/programs/games/floppybird/smalllibc/kosSyst.cpp
similarity index 100%
rename from programs/games/flappybird/smalllibc/kosSyst.cpp
rename to programs/games/floppybird/smalllibc/kosSyst.cpp
diff --git a/programs/games/flappybird/smalllibc/kosSyst.h b/programs/games/floppybird/smalllibc/kosSyst.h
similarity index 100%
rename from programs/games/flappybird/smalllibc/kosSyst.h
rename to programs/games/floppybird/smalllibc/kosSyst.h
diff --git a/programs/games/flappybird/smalllibc/math2.cpp b/programs/games/floppybird/smalllibc/math2.cpp
similarity index 100%
rename from programs/games/flappybird/smalllibc/math2.cpp
rename to programs/games/floppybird/smalllibc/math2.cpp
diff --git a/programs/games/flappybird/smalllibc/mcsmemm.cpp b/programs/games/floppybird/smalllibc/mcsmemm.cpp
similarity index 100%
rename from programs/games/flappybird/smalllibc/mcsmemm.cpp
rename to programs/games/floppybird/smalllibc/mcsmemm.cpp
diff --git a/programs/games/flappybird/smalllibc/mcsmemm.h b/programs/games/floppybird/smalllibc/mcsmemm.h
similarity index 100%
rename from programs/games/flappybird/smalllibc/mcsmemm.h
rename to programs/games/floppybird/smalllibc/mcsmemm.h
diff --git a/programs/games/flappybird/smalllibc/mymath.h b/programs/games/floppybird/smalllibc/mymath.h
similarity index 100%
rename from programs/games/flappybird/smalllibc/mymath.h
rename to programs/games/floppybird/smalllibc/mymath.h
diff --git a/programs/games/flappybird/smalllibc/purecall.cpp b/programs/games/floppybird/smalllibc/purecall.cpp
similarity index 100%
rename from programs/games/flappybird/smalllibc/purecall.cpp
rename to programs/games/floppybird/smalllibc/purecall.cpp
diff --git a/programs/games/flappybird/smalllibc/smalllibc.vcxproj b/programs/games/floppybird/smalllibc/smalllibc.vcxproj
similarity index 100%
rename from programs/games/flappybird/smalllibc/smalllibc.vcxproj
rename to programs/games/floppybird/smalllibc/smalllibc.vcxproj
diff --git a/programs/games/flappybird/smalllibc/smalllibc.vcxproj.filters b/programs/games/floppybird/smalllibc/smalllibc.vcxproj.filters
similarity index 100%
rename from programs/games/flappybird/smalllibc/smalllibc.vcxproj.filters
rename to programs/games/floppybird/smalllibc/smalllibc.vcxproj.filters
diff --git a/programs/games/flappybird/smalllibc/sprintf.cpp b/programs/games/floppybird/smalllibc/sprintf.cpp
similarity index 100%
rename from programs/games/flappybird/smalllibc/sprintf.cpp
rename to programs/games/floppybird/smalllibc/sprintf.cpp
diff --git a/programs/media/kiv/trunk/kiv.asm b/programs/media/kiv/trunk/kiv.asm
index ddd4ca2cb..ba4c5bccc 100644
--- a/programs/media/kiv/trunk/kiv.asm
+++ b/programs/media/kiv/trunk/kiv.asm
@@ -1631,7 +1631,7 @@ proc generate_window_header
         push    eax ebx esi edi
         mov     esi, [last_name_component]
         mov     edi, window_header
-        mov     [window_header_len], 4    ; [,/,],
+        mov     [window_header_len], 8    ; [,/,],
 
         mov     byte[edi], '['
         inc     edi