More hardcoded icon paths removed