Moved images into assets, replaced deprecated APIs