Mock data fix, icon variations, attribution, etc.