CB-6976 replaces new template icons and splash screens