Add icons and fix onResume bug