Merge "Updated tether icons" into honeycomb