Last changes, making sure all activities have icons etc.