Refactored services and added duplication safety for icons