Merge "Preserve icon for "manage space""