added modifier
fixed icon bug