Various updates

Including icons and configuration settings