The other part of the issue where the keyboard layout icon does not
match theme is not resolved with this commit.