Reorganize OSK a bit
Merge pull request #5939 from raven02/patch-18

Reorganize OSK button a bit , nothing new