Shift image resources to Images.xassets
Revamp