Workspace addicon cleanup