diff --git a/public/css/app.css b/public/css/app.css
index 6b878cd..5ecf2e9 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -34,11 +34,32 @@ div.label-smaller {
     display: inline-block;
 }
 
-.tooltip-button {
+button.is-small.tooltip-button {
     border: 0;
-    margin-left: 0.2rem;
+    font-size: 0.65rem;
 }
 
+h1, h2, h3, h4, h5, h6 {
+    &.is-1,
+    &.is-2,
+    &.is-3 {
+        & > button.is-small.tooltip-button {
+            margin-top: 0.5rem;
+        }
+    }
+
+    &.is-4 {
+        & > button.is-small.tooltip-button {
+            margin-top: 0.2rem;
+        }
+    }
+
+    & > button.is-small.tooltip-button {
+        margin-top: 0.3rem;
+    }
+}
+
+
 button.clone-field {
     float: right;
     margin-top: 0.5rem;
@@ -229,4 +250,4 @@ div .field.with-tooltip .control {
     & button {
         margin-left: 0.5rem;
     }
-}
\ No newline at end of file
+}
diff --git a/view/download.twig b/view/download.twig
index ce0e7fd..bc63d20 100644
--- a/view/download.twig
+++ b/view/download.twig
@@ -1,8 +1,9 @@
-{% from '_macros' import fileUrl %}
+{% from '_macros' import fileUrl, renderTooltip %}
 <div class="column {{ column is not empty ? column : 'is-full' }}">
     <div class="field">
         <div class="control">
             <a href="{{ fileUrl(href)  }}" target="_blank">{{ label }}</a>
+            {{ renderTooltip(tooltip) }}
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/fieldset.twig b/view/fieldset.twig
index ba65c75..7c92049 100644
--- a/view/fieldset.twig
+++ b/view/fieldset.twig
@@ -1,4 +1,4 @@
-{% from '_macros' import renderError %}
+{% from '_macros' import renderError, renderTooltip %}
 
 {% if backgroundName is not empty %}
     <div class="has-background-{{ backgroundName }}">
@@ -12,6 +12,7 @@
     <div class="column {{ column is not empty ? column : 'is-full' }} fieldset-content">
         <div class="label fieldset-label">
             {{ label }}
+            {{ renderTooltip(tooltip) }}
         </div>
         <div class="columns{% if scrollable is empty %} is-multiline{% else %} is-scrollable{% endif %}">
             {% if tablestyle is not empty %}<div class="next-is-double"></div>{% endif %}
@@ -24,4 +25,4 @@
 
 {% if (backgroundName is not empty or backgroundNumber is not empty) %}
     </div>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/view/image.twig b/view/image.twig
index 17024c8..6c225ac 100644
--- a/view/image.twig
+++ b/view/image.twig
@@ -1,7 +1,8 @@
-{% from '_macros' import fileUrl , renderError %}
+{% from '_macros' import fileUrl , renderError, renderTooltip %}
 <div class="column {{ column is not empty ? column : 'is-full' }}">
     <div class="field">
         <div class="label {{ labelsmall is not empty ? 'label-smaller' }}">{{ label }}</div>
+        {{ renderTooltip(tooltip) }}
         <div class="control">
             <img src="{{ fileUrl(src) }}" style="{{ width is defined ? 'width:'~width~'px;' }} {{ height is defined ? 'height:'~height~'px;' }}" alt="{{ alt is defined ? alt : label }}">
         </div>
diff --git a/view/signature.twig b/view/signature.twig
index 98f4901..5c4a812 100644
--- a/view/signature.twig
+++ b/view/signature.twig
@@ -1,4 +1,4 @@
-{% from '_macros' import renderError %}
+{% from '_macros' import renderError, renderTooltip %}
 <div class="column {{ column is not empty ? column : 'is-full' }}">
 
     {% if value %}
@@ -17,7 +17,9 @@
     <div class="signature-pad {{ value is not empty ? 'hidden'}}" data-replacepad="{{ id_string }}" {{ width is defined ? ('data-width="'~width~'"') | raw }} {{ height is defined ? ('data-height="'~height~'"') | raw }}>
         <div class="field">
             <div class="control">
-                <div class="label {{ labelsmall is not empty ? 'label-smaller' }}">{{ label }} {{ is_required ? '*' }}</div>
+                <div class="label {{ labelsmall is not empty ? 'label-smaller' }}">{{ label }} {{ is_required ? '*' }}
+                    {{ renderTooltip(tooltip) }}
+                </div>
                 <input type="hidden" id="{{ id }}" name="{{ id }}" value="{{ value }}" class="form-input"/>
                 <canvas></canvas>
             </div>
diff --git a/view/textinput.twig b/view/textinput.twig
index c19b79c..6510289 100644
--- a/view/textinput.twig
+++ b/view/textinput.twig
@@ -8,8 +8,8 @@
                     {%- if label is not empty -%}
                         {{ label }} {{ is_required ? '*' }}
                     {%- endif  -%}
+                    {{ renderTooltip(tooltip) }}
                 </label>
-                {{ renderTooltip(tooltip) }}
                 <div class="control is-cloneable">
                     <input
                             type="text"