Merged complete and flatui icon fix