Merge pull request #1791 from xillibit/k30_bugs16

#1788 Different Language issues (J! 2.5.x & J! 3.1.1)
Quick icon displayed not in right place