Fix classes are set directly into the svg icons

[rolznz]

This makes the icons hard to replace and hard to customize.

Instead we could return functions that create svg icons, that accept a classname.