replace more icons, take 2