merged icons paths
icons cleanup