Refactored Icon Path into a separate Manager. Resolve #41