Add idle icon setter
Merge branch 'dev'