New icon/upstream changes