diff --git a/src/bundle/Resources/views/themes/admin/content_type/field_types.html.twig b/src/bundle/Resources/views/themes/admin/content_type/field_types.html.twig
index cbab11fa22..067f97612a 100644
--- a/src/bundle/Resources/views/themes/admin/content_type/field_types.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content_type/field_types.html.twig
@@ -22,13 +22,13 @@
 
 {% block ezboolean_field_definition_edit %}
     <div class="ezboolean-default-value{% if group_class is not empty %} {{ group_class }}{% endif %}">
-        {{- form_row(form.defaultValue, {'label_attr': {'class': 'checkbox-inline'}}) -}}
+        {{- form_row(form.defaultValue) -}}
     </div>
 {% endblock %}
 
 {% block ezcountry_field_definition_edit %}
     <div class="ezcountry-settings is-multiple{% if group_class is not empty %} {{ group_class }}{% endif %}">
-        {{- form_row(form.isMultiple, {'label_attr': {'class': 'checkbox-inline'}}) -}}
+        {{- form_row(form.isMultiple) -}}
     </div>
 
     <div class="ezcountry-default-value{% if group_class is not empty %} {{ group_class }}{% endif %}">
@@ -44,11 +44,11 @@
 
 {% block ezdatetime_field_definition_edit %}
     <div class="ezdatetime-settings use-seconds{% if group_class is not empty %} {{ group_class }}{% endif %}">
-        {{- form_row(form.useSeconds, {'label_attr': {'class': 'checkbox-inline'}}) -}}
+        {{- form_row(form.useSeconds) -}}
     </div>
 
     <div class="ezdatetime-settings default-type{% if group_class is not empty %} {{ group_class }}{% endif %}">
-        {{- form_row(form.defaultType, {'label_attr': {'class': 'radio-inline'}}) -}}
+        {{- form_row(form.defaultType) -}}
     </div>
 
     <div class="ezdatetime-settings date-interval{% if group_class is not empty %} {{ group_class }}{% endif %}">
@@ -58,7 +58,7 @@
 
 {% block eztime_field_definition_edit %}
     <div class="eztime-settings use-seconds{% if group_class is not empty %} {{ group_class }}{% endif %}">
-        {{- form_row(form.useSeconds, {'label_attr': {'class': 'checkbox-inline'}}) -}}
+        {{- form_row(form.useSeconds) -}}
     </div>
 
     <div class="eztime-settings default-type{% if group_class is not empty %} {{ group_class }}{% endif %}">
@@ -88,7 +88,7 @@
     </div>
 
     <div class="ezimage-validator is-alternative-text-required"{% if group_class is not empty %} {{ group_class }}{% endif %}>
-        {{ form_row(form.isAlternativeTextRequired, {'label_attr': {'class': 'checkbox-inline'}}) }}
+        {{ form_row(form.isAlternativeTextRequired) }}
     </div>
 {% endblock %}
 
@@ -110,7 +110,7 @@
 
 {% block ezisbn_field_definition_edit %}
     <div class="ezisbn-settings is-isbn13{% if group_class is not empty %} {{ group_class }}{% endif %}">
-        {{- form_row(form.isISBN13, {'label_attr': {'class': 'checkbox-inline'}}) -}}
+        {{- form_row(form.isISBN13) -}}
     </div>
 
     <div class="ezisbn-default-value{% if group_class is not empty %} {{ group_class }}{% endif %}">
@@ -168,7 +168,7 @@
 
 {% block ezselection_field_definition_edit %}
     <div class="ezselection-settings is-multiple{% if group_class is not empty %} {{ group_class }}{% endif %}">
-        {{- form_row(form.isMultiple, {'label_attr': {'class': 'checkbox-inline'}}) -}}
+        {{- form_row(form.isMultiple) -}}
     </div>
 
     <div class="ezselection-settings options{% if group_class is not empty %} {{ group_class }}{% endif %}">
@@ -237,19 +237,19 @@
 {% block ezuser_field_definition_edit %}
     <div class="ibexa-field ibexa-field--user ibexa-user">
         <div class="ibexa-user__settings {% if group_class is not empty %} {{ group_class }}{% endif %}">
-            {{- form_row(form.requireAtLeastOneUpperCaseCharacter, {'label_attr': {'class': 'checkbox-inline'}}) -}}
+            {{- form_row(form.requireAtLeastOneUpperCaseCharacter) -}}
         </div>
 
         <div class="ibexa-user__settings {% if group_class is not empty %} {{ group_class }}{% endif %}">
-            {{- form_row(form.requireAtLeastOneLowerCaseCharacter, {'label_attr': {'class': 'checkbox-inline'}}) -}}
+            {{- form_row(form.requireAtLeastOneLowerCaseCharacter) -}}
         </div>
 
         <div class="ibexa-user__settings {% if group_class is not empty %} {{ group_class }}{% endif %}">
-            {{- form_row(form.requireAtLeastOneNumericCharacter, {'label_attr': {'class': 'checkbox-inline'}}) -}}
+            {{- form_row(form.requireAtLeastOneNumericCharacter) -}}
         </div>
 
         <div class="ibexa-user__settings {% if group_class is not empty %} {{ group_class }}{% endif %}">
-            {{- form_row(form.requireAtLeastOneNonAlphanumericCharacter, {'label_attr': {'class': 'checkbox-inline'}}) -}}
+            {{- form_row(form.requireAtLeastOneNonAlphanumericCharacter) -}}
         </div>
 
         <div class="ibexa-user__settings text-rows{% if group_class is not empty %} {{ group_class }}{% endif %}">
@@ -265,7 +265,7 @@
         </div>
 
         <div class="ibexa-user__settings {% if group_class is not empty %} {{ group_class }}{% endif %}">
-            {{- form_row(form.requireNewPassword, {'label_attr': {'class': 'checkbox-inline'}}) -}}
+            {{- form_row(form.requireNewPassword) -}}
         </div>
     </div>
 {% endblock %}