Added app icon, and fixed issue with last screen behaviour