Small changes (incl icon fix)