diff --git a/views/macros.njk b/views/macros.njk
index 8b6638d..b7baa89 100644
--- a/views/macros.njk
+++ b/views/macros.njk
@@ -32,7 +32,7 @@
     <input type="hidden" name="csrf" value="{{ getCSRFToken() }}">
 {% endmacro %}
 
-{% macro field(_locals, type, name, value, placeholder, hint, validation_attributes='', extraData='') %}
+{% macro field(_locals, type, name, value, placeholder, hint, validation_attributes='', extraData='', icon=null) %}
     {% set validation = _locals.validation() %}
     {% set validation = validation[name] if validation[name] or null %}
     {% set previousFormData = _locals.previousFormData() %}
@@ -45,42 +45,53 @@
         <input type="hidden" name="{{ name }}" value="{{ value }}">
     {% else %}
         <div class="form-field{{ ' inline' if type == 'checkbox' }}">
-            {% if type == 'duration' %}
-                <div class="input-group">
-                    {% for f in extraData %}
-                        <div class="time-input">
-                            {% if previousFormData[name] %}
-                                {% set v = value[f] %}
-                            {% else %}
-                                {% set v = (value % 60) if f == 's' else (((value - value % 60) / 60 % 60) if f == 'm' else ((value - value % 3600) / 3600 if f == 'h')) %}
-                            {% endif %}
-                            <input type="number" name="{{ name }}[{{ f }}]" id="field-{{ name }}-{{ f }}"
-                                   value="{{ v }}"
-                                   min="0" {{ 'max=60' if (f == 's' or f == 'm') }}
-                                    {{ validation_attributes }}>
-                            <label for="field-{{ name }}-{{ f }}">{{ f }}</label>
-                        </div>
-                    {% endfor %}
-                </div>
-            {% elseif type == 'select' %}
-                <select name="{{ name }}" id="field-{{ name }}" {{ validation_attributes|safe }}>
-                    {% for option in extraData %}
-                        <option value="{% if option.display === undefined or option.value !== undefined %}{{ option.value | default(option) }}{% endif %}"
-                                {{ 'selected' if value == (option.value | default(option)) }}>{{ option.display | default(option) }}</option>
-                    {% endfor %}
-                </select>
-                <i data-feather="chevron-down"></i>
-            {% elseif type == 'textarea' %}
-                <textarea name="{{ name }}" id="field-{{ name }}"
-                    {{ validation_attributes|safe }}>{{ value }}</textarea>
-            {% else %}
-                <input type="{{ type }}" name="{{ name }}" id="field-{{ name }}"
-                        {% if type != 'checkbox' %} value="{{ value }}" {% endif %}
-                        {{ 'checked' if (type == 'checkbox' and value == 'on') }}
-                        {{ validation_attributes|safe }}>
-            {% endif %}
+            <div class="control">
+                {% if icon != null %}
+                    {% if icon.startsWith('fa') %}
+                        <i class="{{ icon }} feather icon"></i>
+                    {% else %}
+                        <i data-feather="{{ icon }}" class="icon"></i>
+                    {% endif %}
+                {% endif %}
+
+                {% if type == 'duration' %}
+                    <div class="input-group">
+                        {% for f in extraData %}
+                            <div class="time-input">
+                                {% if previousFormData[name] %}
+                                    {% set v = value[f] %}
+                                {% else %}
+                                    {% set v = (value % 60) if f == 's' else (((value - value % 60) / 60 % 60) if f == 'm' else ((value - value % 3600) / 3600 if f == 'h')) %}
+                                {% endif %}
+                                <input type="number" name="{{ name }}[{{ f }}]" id="field-{{ name }}-{{ f }}"
+                                       value="{{ v }}"
+                                       min="0" {{ 'max=60' if (f == 's' or f == 'm') }}
+                                        {{ validation_attributes }}>
+                                <label for="field-{{ name }}-{{ f }}">{{ f }}</label>
+                            </div>
+                        {% endfor %}
+                    </div>
+                {% elseif type == 'select' %}
+                    <select name="{{ name }}" id="field-{{ name }}" {{ validation_attributes|safe }}>
+                        {% for option in extraData %}
+                            <option value="{% if option.display === undefined or option.value !== undefined %}{{ option.value | default(option) }}{% endif %}"
+                                    {{ 'selected' if value == (option.value | default(option)) }}>{{ option.display | default(option) }}</option>
+                        {% endfor %}
+                    </select>
+                    <i data-feather="chevron-down"></i>
+                {% elseif type == 'textarea' %}
+                    <textarea name="{{ name }}" id="field-{{ name }}"
+                    {{ validation_attributes|safe }}>{{ value }}</textarea>
+                {% else %}
+                    <input type="{{ type }}" name="{{ name }}" id="field-{{ name }}"
+                            {% if type != 'checkbox' %} value="{{ value }}" {% endif %}
+                            {{ 'checked' if (type == 'checkbox' and value == 'on') }}
+                            {{ validation_attributes|safe }}>
+                {% endif %}
+
+                <label for="field-{{ name }}{{ '-' + extraData[0] if type == 'duration' }}">{{ placeholder }}</label>
+            </div>
 
-            <label for="field-{{ name }}{{ '-' + extraData[0] if type == 'duration' }}">{{ placeholder }}</label>
             {{ fieldError(_locals, name) }}
             {% if hint %}
                 <div class="hint"><i data-feather="info"></i> {{ hint }}</div>