Remove keyboard icon, improve languages support