New icons and fixes the flow