Cleanup and added icons