Improved icon + bug fix in onResume()