Merge "Update get flow about the icons and chip UI"