merge mas

1. Add icons to header tabs
2. Fix migrate resources bug where user couldn't close the dialogue