diff --git a/src/HTMLBuilder/Handler/DateHandler.php b/src/HTMLBuilder/Handler/DateHandler.php
index 20f13aa6e..eef0f8ded 100644
--- a/src/HTMLBuilder/Handler/DateHandler.php
+++ b/src/HTMLBuilder/Handler/DateHandler.php
@@ -55,8 +55,28 @@ class DateHandler implements HandlerInterface
 
         // Generazione del codice HTML di default
         if (empty($result)) {
-            $result = '
+            if (empty($values['label'])) {
+                $result = '
+<div class="form-group">';
+            }
+
+            if (empty($values['icon-before']) || empty($values['icon-after'])) {
+                $result .= '
+    <div class="input-group">';
+            }
+
+            $result .= '
     <input |attr|>';
+
+            if (empty($values['icon-before']) || empty($values['icon-after'])) {
+                $result .= '
+    </div>';
+            }
+
+            if (empty($values['label'])) {
+                $result .= '
+</div>';
+            }
         }
 
         return $result;