diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 478d93765f..fbd5101248 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -193,7 +193,7 @@ extra_files = {
  {"kolibrios/games/knight", "common/games/knight"},
  {"kolibrios/games/LaserTank/", "common/games/LaserTank/*"},
  {"kolibrios/games/lrl/", "common/games/lrl/*"},
- {"kolibrios/games/megamaze", build_type .. "/games/megamaze"},
+ {"kolibrios/games/megamaze", "common/games/megamaze"},
  {"kolibrios/games/mun/data/", "common/games/mun/data/*"},
  {"kolibrios/games/mun/libc.dll", "common/games/mun/libc.dll"},
  {"kolibrios/games/mun/mun", "common/games/mun/mun"}, 
diff --git a/data/eng/games/megamaze b/data/common/games/megamaze
similarity index 100%
rename from data/eng/games/megamaze
rename to data/common/games/megamaze
diff --git a/data/common/icons32.png b/data/common/icons32.png
index d2b666cbb3..604171853f 100644
Binary files a/data/common/icons32.png and b/data/common/icons32.png differ
diff --git a/data/common/settings/docky.ini b/data/common/settings/docky.ini
index 1a6708c0f0..1066af6469 100644
--- a/data/common/settings/docky.ini
+++ b/data/common/settings/docky.ini
@@ -34,7 +34,7 @@ $=1
 [KGB]
 path=mgb
 param=
-icon=11
+icon=38
 
 [CPUid]
 path=cpuid
diff --git a/data/common/settings/syspanel.ini b/data/common/settings/syspanel.ini
index 0885cad5e5..f1286b0614 100644
--- a/data/common/settings/syspanel.ini
+++ b/data/common/settings/syspanel.ini
@@ -23,7 +23,7 @@ Debug Board=/sys/develop/board,19
 NetStat=/sys/network/netstat,33
 SysMonitor=gmon,57
 Processes=cpu,60
-Clipboard=/sys/develop/clipview,55
+Clipboard=/sys/develop/clipview,83
 
 
 [Testing]
diff --git a/data/eng/settings/icon.ini b/data/eng/settings/icon.ini
index dcecd759c4..9c887dd4a0 100644
--- a/data/eng/settings/icon.ini
+++ b/data/eng/settings/icon.ini
@@ -89,10 +89,10 @@ ico=66
 x=-135
 y=-67
 [0C]
-name=MBLOCKS
-path=/SYS/GAMES/MBLOCKS
+name=TETRIS
+path=/SYS/GAMES/TETRIS
 param=
-ico=11
+ico=47
 x=-67
 y=-135
 [0D]
diff --git a/data/et/games/megamaze b/data/et/games/megamaze
deleted file mode 100644
index f602706117..0000000000
Binary files a/data/et/games/megamaze and /dev/null differ
diff --git a/data/et/settings/icon.ini b/data/et/settings/icon.ini
index eff4e75069..47de9d35d3 100644
--- a/data/et/settings/icon.ini
+++ b/data/et/settings/icon.ini
@@ -88,10 +88,10 @@ ico=66
 x=-135
 y=-67
 [0C]
-name=MBLOCKS
-path=/SYS/GAMES/MBLOCKS
+name=TETRIS
+path=/SYS/GAMES/TETRIS
 param=
-ico=11
+ico=47
 x=-67
 y=-135
 [0D]
diff --git a/data/it/games/megamaze b/data/it/games/megamaze
deleted file mode 100644
index f602706117..0000000000
Binary files a/data/it/games/megamaze and /dev/null differ
diff --git a/data/it/settings/icon.ini b/data/it/settings/icon.ini
index dcecd759c4..9c887dd4a0 100644
--- a/data/it/settings/icon.ini
+++ b/data/it/settings/icon.ini
@@ -89,10 +89,10 @@ ico=66
 x=-135
 y=-67
 [0C]
-name=MBLOCKS
-path=/SYS/GAMES/MBLOCKS
+name=TETRIS
+path=/SYS/GAMES/TETRIS
 param=
-ico=11
+ico=47
 x=-67
 y=-135
 [0D]
diff --git a/data/rus/games/megamaze b/data/rus/games/megamaze
deleted file mode 100644
index f602706117..0000000000
Binary files a/data/rus/games/megamaze and /dev/null differ
diff --git a/data/rus/settings/icon.ini b/data/rus/settings/icon.ini
index 32103bfbf8..d6aabf5a68 100644
--- a/data/rus/settings/icon.ini
+++ b/data/rus/settings/icon.ini
@@ -89,10 +89,10 @@ ico=66
 x=-135
 y=-67
 [0C]
-name=MBLOCKS
-path=/SYS/GAMES/MBLOCKS
+name=TETRIS
+path=/SYS/GAMES/TETRIS
 param=
-ico=11
+ico=47
 x=-67
 y=-135
 [0D]
diff --git a/data/sp/games/megamaze b/data/sp/games/megamaze
deleted file mode 100644
index f602706117..0000000000
Binary files a/data/sp/games/megamaze and /dev/null differ
diff --git a/data/sp/settings/icon.ini b/data/sp/settings/icon.ini
index dcecd759c4..9c887dd4a0 100644
--- a/data/sp/settings/icon.ini
+++ b/data/sp/settings/icon.ini
@@ -89,10 +89,10 @@ ico=66
 x=-135
 y=-67
 [0C]
-name=MBLOCKS
-path=/SYS/GAMES/MBLOCKS
+name=TETRIS
+path=/SYS/GAMES/TETRIS
 param=
-ico=11
+ico=47
 x=-67
 y=-135
 [0D]