added icon switching