Add icons for #120 and fixed #128