diff --git a/src/osha/oira/ploneintranet/z3cform/templates/checkbox_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/checkbox_input.pt
index e99d4dc2..1b546afc 100644
--- a/src/osha/oira/ploneintranet/z3cform/templates/checkbox_input.pt
+++ b/src/osha/oira/ploneintranet/z3cform/templates/checkbox_input.pt
@@ -4,11 +4,11 @@
       tal:omit-tag=""
       i18n:domain="nuplone"
 >
-  <fieldset class="group ${view/@@dependencies}">
-    <legend>${python: view.items[0]['label']}</legend>
-    <label class="pat-checklist"
-           tal:repeat="item view/items"
-    ><input class="${view/klass}"
+  <fieldset class="pat-toggle-switch group ${view/@@dependencies}">
+    <p class="legend">
+      ${python: view.items[0]['label']}
+    </p>
+    <label tal:repeat="item view/items">${view/field/label_content|nothing}<input class="${view/klass}"
              id="${view/id}"
              checked="${python:'checked' if checked else None}"
              disabled="${view/disabled}"
@@ -27,5 +27,18 @@
            type="hidden"
            value="1"
     />
+    <dfn class="help-icon pat-tooltip tooltip-inactive"
+         aria-expanded="false"
+         data-pat-tooltip="class: info; trigger: click; source: content; position-list: tl"
+         tal:define="
+           hidden python:view.mode == 'hidden';
+           description view/field/description;
+         "
+         tal:condition="python:description and not hidden"
+         tal:content="description"
+    >
+    </dfn>
+
   </fieldset>
+
 </html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/checkboxlist_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/checkboxlist_input.pt
index 89c4ce61..8a036240 100644
--- a/src/osha/oira/ploneintranet/z3cform/templates/checkboxlist_input.pt
+++ b/src/osha/oira/ploneintranet/z3cform/templates/checkboxlist_input.pt
@@ -1,40 +1,47 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
       xmlns:tal="http://xml.zope.org/namespaces/tal"
-      tal:omit-tag=""
-      i18n:domain="nuplone"
       tal:define="
         dependencies nocall:view/@@dependencies;
         data_pat_depends python:dependencies.data_pat_depends;
       "
+      tal:omit-tag=""
+      i18n:domain="nuplone"
 >
   <fieldset class="group ${python: dependencies.ploneintranet_classes}"
             data-pat-depends="${data_pat_depends}"
   >
-    <legend>${view/label}</legend>
-    <label class="pat-checklist"
-           tal:repeat="item view/items"
-    ><input class="${view/klass}"
-             id="${view/id}"
-             checked="${python:'checked' if checked else None}"
-             disabled="${view/disabled}"
-             name="${item/name}"
-             readonly="${view/readonly}"
-             type="checkbox"
-             value="${item/value}"
-             tal:define="
-               checked item/checked;
-             "
-      /><tal:label replace="item/label"
-                 i18n:domain="plone"
-                 i18n:translate=""
-      /></label>
-    <tal:error condition="view/error"
-               replace="structure view/error/render|nothing"
-    />
-    <input name="${view/name}-empty-marker"
-           type="hidden"
-           value="1"
-    />
+    <p class="legend">${view/label}</p>
+    <div class="pat-checklist">
+      <label tal:repeat="item view/items">
+        ${item/label}
+        <input id="${item/id}"
+               checked="${python:'checked' if checked else None}"
+               disabled="${view/disabled}"
+               name="${item/name}"
+               readonly="${view/readonly}"
+               type="checkbox"
+               value="${item/value}"
+               tal:define="
+                 checked item/checked;
+               "
+        />
+      </label>
+      <tal:error condition="view/error"
+                 replace="structure view/error/render|nothing"
+      />
+      <input name="${view/name}-empty-marker"
+             type="hidden"
+             value="1"
+      />
+    </div>
+    <dfn class="infoPanel"
+         title="Information"
+         tal:define="
+           description view/field/description;
+         "
+         tal:condition="description"
+         i18n:attributes="title"
+    >${description}</dfn>
   </fieldset>
 </html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/radio_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/radio_input.pt
index c0104494..e10d4a34 100644
--- a/src/osha/oira/ploneintranet/z3cform/templates/radio_input.pt
+++ b/src/osha/oira/ploneintranet/z3cform/templates/radio_input.pt
@@ -5,10 +5,30 @@
       i18n:domain="nuplone"
 >
   <fieldset class="group ${view/@@dependencies}${python:' error' if view.error is not None else ''}">
-    <legend>${view/label}
-      <sup class="required"
-           tal:condition="view/required"
-      >*</sup></legend>
+    <p class="legend">${view/label}</p>
+    <div class="pat-checklist">
+      <label tal:repeat="item view/items">
+        ${item/label}
+        <input id="${item/id}"
+               checked="${python:'checked' if checked else None}"
+               disabled="${view/disabled}"
+               name="${item/name}"
+               readonly="${view/readonly}"
+               type="radio"
+               value="${item/value}"
+               tal:define="
+                 checked item/checked;
+               "
+        />
+      </label>
+      <tal:error condition="view/error"
+                 replace="structure view/error/render|nothing"
+      />
+      <input name="${view/name}-empty-marker"
+             type="hidden"
+             value="1"
+      />
+    </div>
     <dfn class="infoPanel"
          title="Information"
          tal:define="
@@ -17,28 +37,6 @@
          tal:condition="description"
          i18n:attributes="title"
     >${description}</dfn>
-    <label class="pat-checklist"
-           tal:repeat="item view/items"
-    ><input id="${item/id}"
-             checked="${python:'checked' if checked else None}"
-             disabled="${view/disabled}"
-             name="${item/name}"
-             readonly="${view/readonly}"
-             type="radio"
-             value="${item/value}"
-             tal:define="
-               checked item/checked;
-             "
-      /><tal:label replace="item/label"
-                 i18n:domain="plone"
-                 i18n:translate=""
-      /></label>
-    <tal:error condition="view/error"
-               replace="structure view/error/render|nothing"
-    />
-    <input name="${view/name}-empty-marker"
-           type="hidden"
-           value="1"
-    />
+
   </fieldset>
 </html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/text_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/text_input.pt
index 28e912d2..8ffe609f 100644
--- a/src/osha/oira/ploneintranet/z3cform/templates/text_input.pt
+++ b/src/osha/oira/ploneintranet/z3cform/templates/text_input.pt
@@ -6,7 +6,7 @@
 >
 
   <label title="${view/field/description}">
-    <span tal:replace="view/label"></span>
+    ${view/label}
     <input class="${view/klass}"
            id="${view/id}"
            disabled="${view/disabled}"
@@ -18,12 +18,17 @@
            type="${view/type|string:text}"
            value="${view/value}"
     />
+    <dfn class="help-icon pat-tooltip tooltip-inactive"
+         aria-expanded="false"
+         data-pat-tooltip="class: info; trigger: click; source: content; position-list: tl"
+         tal:define="
+           hidden python:view.mode == 'hidden';
+           description view/field/description;
+         "
+         tal:condition="python:description and not hidden"
+         tal:content="description"
+    >
+    </dfn>
+
   </label>
-  <section class="help"
-           tal:condition="view/error"
-  >
-    <div class="pat-message warning"
-         tal:content="structure view/error/render"
-    ></div>
-  </section>
 </html>
diff --git a/src/osha/oira/ploneintranet/z3cform/templates/textarea_input.pt b/src/osha/oira/ploneintranet/z3cform/templates/textarea_input.pt
index 8cd148ee..c051b338 100644
--- a/src/osha/oira/ploneintranet/z3cform/templates/textarea_input.pt
+++ b/src/osha/oira/ploneintranet/z3cform/templates/textarea_input.pt
@@ -7,7 +7,7 @@
       i18n:domain="nuplone"
 >
   <label title="${view/field/description}">
-    <span tal:replace="view/label"></span>
+    ${view/label}
     <textarea class="${view/klass}"
               id="${view/id}"
               cols="${view/cols}"
@@ -16,13 +16,18 @@
               readonly="${view/readonly}"
               rows="${view/rows}"
     >${view/value}</textarea>
+    <dfn class="help-icon pat-tooltip tooltip-inactive"
+         aria-expanded="false"
+         data-pat-tooltip="class: info; trigger: click; source: content; position-list: tl"
+         tal:define="
+           hidden python:view.mode == 'hidden';
+           description view/field/description;
+         "
+         tal:condition="python:description and not hidden"
+         tal:content="description"
+    >
+    </dfn>
+
   </label>
-  <section class="help"
-           tal:condition="view/error"
-  >
-    <div class="pat-message warning"
-         tal:content="structure view/error/render"
-    ></div>
-  </section>
 
 </html>
