Refactored Source and Abstracted icon registration