New icon + small fixes