Fixed #309 by changing icon renderer

And also added a default class for all icons "btn-icon"
Merge branch '309_Icon-renderer'