Also, put in a fix for a crash related to failing while loading the vector image for the media picker button.