Subspace cleanup, moved icon location to inside of object to specify order by key