SONAR-5173 Improve rendering of icons