added some width support and refactoring icon sets to not pull default's that are not included.