Merge "Fix roam icon issues in Austria" into nyc-dev