some rearranging, refactoring on Global shape group handling in IconSources and Drawables