Merge "Rename badge icon method" into oc-dev