Change how icon paths or determined for #167