Merge "Convert IconView class to Kotlin" into main