Start modify IconProvider implementation based on received comments