diff --git a/assets/src/css/style.css b/assets/src/css/style.css
index 5d225410d..d4cbd0f55 100755
--- a/assets/src/css/style.css
+++ b/assets/src/css/style.css
@@ -1152,23 +1152,13 @@ kbd{
     background: radial-gradient(circle, rgba(255,255,255,1) 0%, rgba(229,229,229,1) 34%, rgba(204,204,204,1) 100%);
 }
 
-.legend {
-    clear: left;
-}
-
-.legend > .icon{
-    width: 18px;
-    height: 18px;
+.icon{
+    width: 15px;
+    height: 15px;
     line-height: 30px;
-    border-radius: 18px;
-    float: left;
-    margin-right: 6px;
-    margin-bottom: 4px;
-    box-shadow: 0px 0px 3px #0000006c;
-}
-
-.legend > .text{
-    float: left;
+    border-radius: 15px;
+    margin-top: 3px;
+    box-shadow: 0px 0px 1px black;
 }
 
 @media (max-width: 480px) {
diff --git a/modules/dashboard/edit.php b/modules/dashboard/edit.php
index ce34af535..f83c67a64 100755
--- a/modules/dashboard/edit.php
+++ b/modules/dashboard/edit.php
@@ -109,7 +109,7 @@ foreach ($stati_intervento as $stato) {
             <li>
                 <input type="checkbox" id="stato_'.$stato['id'].'" class="dashboard_stato" value="'.$stato['id'].'" '.$attr.'>
                 <label for="stato_'.$stato['id'].'">
-                    '.$stato['descrizione'].'<span style="position:relative;right:-7px;bottom:-3px;width:15px;height:15px;display:inline-block;border-radius:50%;background-color:'.$stato['colore'].';"></span>
+                    '.$stato['descrizione']. '&nbsp;<span class="icon pull-right" style="background-color:'.$stato['colore'].';"></span>
                 </label>
             </li>';
 }
@@ -182,7 +182,7 @@ foreach ($tecnici_disponibili as $tecnico) {
             <li>
                 <input type="checkbox" id="tecnico_'.$tecnico['id'].'" class="dashboard_tecnico" value="'.$tecnico['id'].'" '.$attr.'>
                 <label for="tecnico_'.$tecnico['id'].'">
-                    '.$tecnico['ragione_sociale'].'<span style="position:relative;right:-7px;bottom:-3px;width:15px;height:15px;display:inline-block;border-radius:50%;background-color:'.$tecnico['colore'].';"></span>
+                    '.$tecnico['ragione_sociale']. '&nbsp;<span class="icon pull-right" style="background-color:'.$tecnico['colore'].';"></span>
                 </label>
             </li>';
 }
diff --git a/modules/scadenzario/controller_before.php b/modules/scadenzario/controller_before.php
index 4f7de6c2d..23e8581ad 100644
--- a/modules/scadenzario/controller_before.php
+++ b/modules/scadenzario/controller_before.php
@@ -1,31 +1,31 @@
 <?php
 
 echo '
-    <div class="pull-left">
-        <h5>'.tr('Legenda').':</h5>
+    <div class="row">
+        <h5>'.tr('Legenda'). ':</h5>
 
-        <div class="legend">
-            <div class="icon" style="background-color:#CCFFCC;"></div>
-            <div class="text">Scadenza pagata</div>
+        <div class="col-md-6">
+            <span class="pull-left icon" style="background-color:#CCFFCC;"></span>
+            <span class="text">&nbsp;'.tr('Scadenza pagata'). '</span>
         </div>
-        <div class="legend">
-            <div class="icon" style="background-color:#ec5353;"></div>
-            <div class="text">Data concordata superata</div>
+        <div class="col-md-6">
+            <span class="pull-left icon" style="background-color:#ec5353;"></span>
+            <span class="text">&nbsp;' . tr('Data concordata superata') . '</span>
         </div>
-        <div class="legend">
-            <div class="icon" style="background-color:#b3d2e3;"></div>
-            <div class="text">Data concordata</div>
+        <div class="col-md-6">
+            <span class="pull-left icon" style="background-color:#b3d2e3;"></span>
+            <span class="text">&nbsp;' . tr('Data concordata') . '</span>
         </div>
-        <div class="legend">
-            <div class="icon" style="background-color:#f08080;"></div>
-            <div class="text">Scaduta</div>
+        <div class="col-md-6">
+            <span class="pull-left icon" style="background-color:#f08080;"></span>
+            <span class="text">&nbsp;' . tr('Scaduta') . '</span>
         </div>
-        <div class="legend">
-            <div class="icon" style="background-color:#f9f9c6;"></div>
-            <div class="text">Scadenza entro 10 giorni</div>
+        <div class="col-md-6">
+            <span class="pull-left icon" style="background-color:#f9f9c6;"></span>
+            <span class="text">&nbsp;' . tr('Scadenza entro 10 giorni') . '</span>
         </div>
-        <div class="legend">
-            <div class="icon" style="background-color:#ffffff;"></div>
-            <div class="text">Scadenza futura</div>
+        <div class="col-md-6">
+            <span class="pull-left icon" style="background-color:#ffffff;"></span>
+            <span class="text">&nbsp;Scadenza futura</span>
         </div>
     </div>';
\ No newline at end of file
diff --git a/update/2_5_2.sql b/update/2_5_2.sql
index 1779df5dc..23e415f26 100644
--- a/update/2_5_2.sql
+++ b/update/2_5_2.sql
@@ -162,7 +162,7 @@ ORDER BY
     `matricola`" WHERE `name` = 'Impianti';
 
 
--- Opzioni possibili per stampa del Contratto
+-- Opzioni possibili per stampa "Contratto"
 UPDATE `zz_prints` SET `available_options` = '{\"pricing\":\"Visualizzare i prezzi\", \"hide-total\": \"Nascondere i totali delle righe\", \"show-only-total\": \"Visualizzare solo i totali del documento\", \"hide-header\": \"Nascondere intestazione\", \"hide-footer\": \"Nascondere footer\", \"last-page-footer\": \"Visualizzare footer solo su ultima pagina\", \"hide-item-number\": \"Nascondere i codici degli articoli\"}' WHERE `zz_prints`.`name` = 'Contratto';
 
 -- Aggiornamento icone per AdminLTE 3