Update PNG fallback filenames and templates to match