reintroduce icons + cleanup