Beta/Android: icon and text tweaks