Each style can have its own "graphic sets", what you want to do is copy all data from the "images/general/default" to "images/general/custom"; and set the "General Images" dropdown in your style to "custom"; now any "global" changes from an upgrade go in the default folder, and any customizations are retained in your "custom" folder.