CHANGED:clean up the DICT_KEYs and favoriteIcon definition