Use same images for normal and plain
Rebuild baseapp