Cleaning up the icons/resources a bit