Fix grunticon and classic-theme demo

Build: Update references to grunticon paths

Fixes gh-6941

Build: Refine code that fixes the path for the combined CSS

Fixes gh-6677