clean:
add: icon order
change: fieldset -> cfieldset
Merge branch 'develop' into new_wizard
Merge branch 'new_wizard' into develop