Clean up.

Removed 'icon' from ve-button and 'label' from ve-option.
Instead one should use {{#}}{{/}} to add such.