Reorganize OSK button
Merge pull request #5942 from raven02/patch-20

 Reorganize OSK buttons