[FIX] Update icon and make components more specific