Build: Refine code that fixes the path for the combined CSS

Fixes gh-6677
Build: Update references to grunticon paths

Closes gh-7202
Fixes gh-6941