support icon changes and minor modifications