Add Icon & resolve bug for default value of popup