Rework icons a bit