Reorganizing some declarations so we can hackily customize in other apps

A better way to do this would be just to strip out the image property
for bar button items.