Merge "Updating Settings icons in side menu Bug: 3362749" into honeycomb