Merge error fix, icon fix