Added new icons, used savedInstanceState for other options (hopefully this fixes loading hang eventually)