Fixes for keyboard toggle button and associated scrollview
Highlighted icon states