Merge "Align root icons with the action bar icon."