Icon Picker code improvements
Better handling of button parse when no icon