handle icon_name property too

Change-Id: Idfdc24201b2d4cde0e451daf237d102c71a8b2f4