Final: Android icon, back button fixes