Merge image resource changes for 1.6.1 release

Update for better retina support