{{#unless template}}
    {{#if label}}
        {{#if yieldInLabel}}
            {{#if labelWrapperClass}}
                <div class="{{labelWrapperClass}}">
                    {{partial 'components/formgroup/control-within-label'}}
                </div>
            {{else}}
                {{partial 'components/formgroup/control-within-label'}}
            {{/if}}
        {{else}}
            {{#if labelWrapperClass}}
                <div class="{{labelWrapperClass}}">
                    {{em-form-label text=label viewName=labelViewName}}
                    {{#if addonIcon}}
                      <span class="input-group-addon"><i class="fa fa-{{addonIcon}}"></i></span>
                    {{/if}}
                    {{partial 'components/formgroup/form-group-control'}}
                </div>
            {{else}}
                {{em-form-label text=label viewName=labelViewName}}
                {{partial 'components/formgroup/form-group-control'}}
            {{/if}}
        {{/if}}
    {{else}}
        {{partial 'components/formgroup/form-group-control'}}
    {{/if}}

    {{#if v_icons}}
        <span class="form-control-feedback"><i class="{{v_icon}}"></i></span>
    {{/if}}

    {{!Currently no errors when layout is inline}}
    {{#unless form.isInline}}
        {{#if canShowErrors}}
            {{em-form-control-help text=help viewName=helpViewName}}
        {{/if}}
    {{/unless}}
{{else}}
    {{yield}}
{{/unless}}

{{#unless template}}
    {{#if label}}
        {{#if yieldInLabel}}
            {{#if labelWrapperClass}}
                <div class="{{labelWrapperClass}}">
                    {{partial 'components/formgroup/control-within-label'}}
                </div>
            {{else}}
                {{partial 'components/formgroup/control-within-label'}}
            {{/if}}
        {{else}}
            {{#if labelWrapperClass}}
                <div class="{{labelWrapperClass}}">
                    {{em-form-label text=label viewName=labelViewName}}
                    {{partial 'components/formgroup/form-group-control'}}
                </div>
            {{else}}
                {{em-form-label text=label viewName=labelViewName}}
                {{partial 'components/formgroup/form-group-control'}}
            {{/if}}
        {{/if}}
    {{else}}
        {{partial 'components/formgroup/form-group-control'}}
    {{/if}}

    {{#if v_icons}}
        <span class="form-control-feedback"><i class="{{v_icon}}"></i></span>
    {{/if}}

    {{!Currently no errors when layout is inline}}
    {{#unless form.isInline}}
        {{#if canShowErrors}}
            {{em-form-control-help text=help viewName=helpViewName}}
        {{/if}}
    {{/unless}}
{{else}}
    {{yield}}
{{/unless}}

Revert "add support for addon icon (requires FontAwesome)"
Revert "add support for addon icon (requires FontAwesome)"

This reverts commit 7542e9d84d13d324abae28f4748115eb94a270b0.
