Fix bug in not setting icon_class properly