Icons improvements