Isolation the logic for doing complex transfers into a separate file
Add new icons