Android: More touchscreen and icon tweaks