fixed icon ordering bugs (at cost of performance?)