Dynamic icon + cleanup