Code improvements
Added option for add html icon