MOB-2591 icons clean up