Merge "Replace the globe+airplane icon with gblobe+x icon" into sc-dev