better error handling and new activity Icons