Large amount of refactoring to cred icons
Fixes #159