diff --git a/view/theme/frio/templates/field_checkbox.tpl b/view/theme/frio/templates/field_checkbox.tpl
index 787a82ebdc..1fde3634ab 100644
--- a/view/theme/frio/templates/field_checkbox.tpl
+++ b/view/theme/frio/templates/field_checkbox.tpl
@@ -4,6 +4,8 @@
-
\ No newline at end of file
+
diff --git a/view/theme/frio/templates/field_colorinput.tpl b/view/theme/frio/templates/field_colorinput.tpl
index 886d647e9c..704db346d2 100644
--- a/view/theme/frio/templates/field_colorinput.tpl
+++ b/view/theme/frio/templates/field_colorinput.tpl
@@ -6,6 +6,8 @@
{{if $field.4}}{{$field.4}}{{/if}}
- {{$field.3}}
+ {{if $field.3}}
+ {{$field.3}}
+ {{/if}}
diff --git a/view/theme/frio/templates/field_custom.tpl b/view/theme/frio/templates/field_custom.tpl
index 20f529278d..158073a64e 100644
--- a/view/theme/frio/templates/field_custom.tpl
+++ b/view/theme/frio/templates/field_custom.tpl
@@ -2,5 +2,7 @@
{{$field.2}}
- {{$field.3}}
+ {{if $field.3}}
+ {{$field.3}}
+ {{/if}}
diff --git a/view/theme/frio/templates/field_fileinput.tpl b/view/theme/frio/templates/field_fileinput.tpl
index 721a6535fb..c5f8ac86d2 100644
--- a/view/theme/frio/templates/field_fileinput.tpl
+++ b/view/theme/frio/templates/field_fileinput.tpl
@@ -6,6 +6,8 @@
{{if $field.4}}{{$field.4}}{{/if}}
- {{$field.3}}
+ {{if $field.3}}
+ {{$field.3}}
+ {{/if}}
diff --git a/view/theme/frio/templates/field_input.tpl b/view/theme/frio/templates/field_input.tpl
index bbd7535e54..62a7d72e83 100644
--- a/view/theme/frio/templates/field_input.tpl
+++ b/view/theme/frio/templates/field_input.tpl
@@ -2,6 +2,8 @@
diff --git a/view/theme/frio/templates/field_intcheckbox.tpl b/view/theme/frio/templates/field_intcheckbox.tpl
index 8863d14c4d..f898c87faf 100644
--- a/view/theme/frio/templates/field_intcheckbox.tpl
+++ b/view/theme/frio/templates/field_intcheckbox.tpl
@@ -2,6 +2,8 @@
- {{$field.4}}
+ {{if $field.4}}
+ {{$field.4}}
+ {{/if}}
diff --git a/view/theme/frio/templates/field_openid.tpl b/view/theme/frio/templates/field_openid.tpl
index 8081f9cf11..66f8c9e809 100644
--- a/view/theme/frio/templates/field_openid.tpl
+++ b/view/theme/frio/templates/field_openid.tpl
@@ -2,6 +2,8 @@
diff --git a/view/theme/frio/templates/field_password.tpl b/view/theme/frio/templates/field_password.tpl
index 31defaf33c..7bef420a18 100644
--- a/view/theme/frio/templates/field_password.tpl
+++ b/view/theme/frio/templates/field_password.tpl
@@ -2,6 +2,8 @@
diff --git a/view/theme/frio/templates/field_radio.tpl b/view/theme/frio/templates/field_radio.tpl
index 42c145e3a8..725e1c96af 100644
--- a/view/theme/frio/templates/field_radio.tpl
+++ b/view/theme/frio/templates/field_radio.tpl
@@ -4,7 +4,9 @@
-
\ No newline at end of file
+
diff --git a/view/theme/frio/templates/field_select.tpl b/view/theme/frio/templates/field_select.tpl
index 9c03151214..594b91002e 100644
--- a/view/theme/frio/templates/field_select.tpl
+++ b/view/theme/frio/templates/field_select.tpl
@@ -4,5 +4,7 @@
- {{$field.3}}
-
\ No newline at end of file
+ {{if $field.3}}
+ {{$field.3}}
+ {{/if}}
+
diff --git a/view/theme/frio/templates/field_select_raw.tpl b/view/theme/frio/templates/field_select_raw.tpl
index d4f4768603..52b63079c1 100644
--- a/view/theme/frio/templates/field_select_raw.tpl
+++ b/view/theme/frio/templates/field_select_raw.tpl
@@ -4,5 +4,7 @@
- {{$field.3}}
-
\ No newline at end of file
+ {{if $field.3}}
+ {{$field.3}}
+ {{/if}}
+
diff --git a/view/theme/frio/templates/field_textarea.tpl b/view/theme/frio/templates/field_textarea.tpl
index 8ef56babb7..1aea484de7 100644
--- a/view/theme/frio/templates/field_textarea.tpl
+++ b/view/theme/frio/templates/field_textarea.tpl
@@ -2,6 +2,8 @@
-
{{$field.3}}
+ {{if $field.3}}
+
{{$field.3}}
+ {{/if}}
diff --git a/view/theme/frio/templates/field_themeselect.tpl b/view/theme/frio/templates/field_themeselect.tpl
index 3b2cb780c8..fc1f7243af 100644
--- a/view/theme/frio/templates/field_themeselect.tpl
+++ b/view/theme/frio/templates/field_themeselect.tpl
@@ -5,6 +5,8 @@
+ {{if $field.3}}
{{$field.3}}
+ {{/if}}
{{if $field.5=="preview"}}{{/if}}
-
\ No newline at end of file
+
diff --git a/view/theme/frio/templates/field_yesno.tpl b/view/theme/frio/templates/field_yesno.tpl
index 85096c70e3..47649fe676 100644
--- a/view/theme/frio/templates/field_yesno.tpl
+++ b/view/theme/frio/templates/field_yesno.tpl
@@ -14,6 +14,8 @@
+ {{if $field.3}}
{{$field.3}}
+ {{/if}}