Merge "Fixed a bug where the order of the icons was wrong" into oc-mr1-dev