diff --git a/modules/segmenti/actions.php b/modules/segmenti/actions.php
index 339b67cfa..d38a40e38 100644
--- a/modules/segmenti/actions.php
+++ b/modules/segmenti/actions.php
@@ -12,11 +12,11 @@ switch (post('op')) {
             $note = post('note');
 			$predefined = $post['predefined'];
 			 
-			if (count($dbo->query("SELECT id FROM zz_segments WHERE id_module =  \"$id_module_\"")==0))
+			if (count($dbo->fetchArray("SELECT id FROM zz_segments WHERE id_module = \"$id_module_\""))==0)
 				$predefined = 1;
 			
 			if ($predefined)
-				$dbo->query("UPDATE zz_segments SET predefined =  0 WHERE id_module =  \"$id_module_\"");
+				$dbo->query("UPDATE zz_segments SET predefined = 0 WHERE id_module = \"$id_module_\"");
 			
             $query = "UPDATE zz_segments SET name=\"$name\", pattern=\"$pattern\", id_module=\"$id_module_\", note=\"$note\", predefined=\"$predefined\" WHERE id=\"$id_record\"";
 
@@ -35,11 +35,11 @@ switch (post('op')) {
             $note = post('note');
 			$predefined = $post['predefined'];
 			
-			if (count($dbo->query("SELECT id FROM zz_segments WHERE id_module =  \"$id_module_\"")==0))
-				$predefined = 1;
-			
+			if (count($dbo->fetchArray("SELECT id FROM zz_segments WHERE id_module = \"$id_module_\""))==0)
+            	$predefined = 1;
+
 			if ($predefined)
-				$dbo->query("UPDATE zz_segments SET predefined =  0 WHERE id_module =  \"$id_module_\"");
+				$dbo->query("UPDATE zz_segments SET predefined = 0 WHERE id_module = \"$id_module_\"");
 			 
             $dbo->query("INSERT INTO zz_segments( name,  pattern, id_module, note, predefined ) VALUES ( \"$name\", \"$pattern\", \"$id_module_\", \"$note\", \"$predefined\" )");
             $id_record = $dbo->last_inserted_id();
diff --git a/modules/segmenti/edit.php b/modules/segmenti/edit.php
index f47c8dc80..7443a09aa 100644
--- a/modules/segmenti/edit.php
+++ b/modules/segmenti/edit.php
@@ -28,7 +28,7 @@
 					<?php
 						($records[0]['n_sezionali']<2) ? $records[0]['predefined']=1 : '';
 					?>
-					{[ "type": "checkbox", "label": "<?php echo tr('Predefinito'); ?>", "name": "predefined", "value": "$predefined$", "help": "<?php echo tr('Seleziona per rendere il segmento predefinito.'); ?>", "placeholder": "<?php echo tr('Segmento predefinito'); ?>", "extra": "<?php echo ($records[0]['n_sezionali']<2) ? 'readonly' : ''; ?>"  ]}
+					{[ "type": "checkbox", "label": "<?php echo tr('Predefinito'); ?>", "name": "predefined", "value": "$predefined$", "help": "<?php echo tr('Seleziona per rendere il segmento predefinito.'); ?>", "placeholder": "<?php echo tr('Segmento predefinito'); ?>", "extra": "<?php echo ($records[0]['predefined']) ? 'readonly' : ''; ?>"  ]}
 				</div>
 					
 			</div>
@@ -74,8 +74,8 @@
 
 	$array = preg_match('/(?<=FROM)\s([^\s]+)\s/', $records[0]['options'], $table);
 
-   $righe = $dbo->fetchArray("SELECT COUNT(*) AS tot FROM ".$table[0]." WHERE id_segment = ".prepare($id_record));
-   $tot = $righe[0]['tot'];
+   	$righe = $dbo->fetchArray("SELECT COUNT(*) AS tot FROM ".$table[0]." WHERE id_segment = ".prepare($id_record));
+   	$tot = $righe[0]['tot'];
 	
     if ($tot > 0) {
 
@@ -88,17 +88,8 @@
 
     	echo "</div>";
 
-    } else if ($records[0]['n_sezionali']<2) {
-
-    	echo "<div class='alert alert-danger' style='margin:0px;'>";
-    	
-    	echo tr("Questo è l'unico segmento per il modulo '_MODULO_'. Il comando elimina è stato disattivato.", [
-        	'_MODULO_' => $records[0]['modulo'],                  
-        ]);
-
-    	echo "</div>";
-
-    }else if ($records[0]['predefined']) {
+    }
+    else if ($records[0]['predefined']) {
 
     	echo "<div class='alert alert-danger' style='margin:0px;'>";
     	
@@ -109,18 +100,21 @@
     	echo "</div>";
 
     }
-	
-	
-	
-	else{
- ?>
-<form action="" method="post" role="form" id="form-delete">
-	<input type="hidden" name="backto" value="record-list">
-	<input type="hidden" name="op" value="delete">
-	<input type="hidden" name="id_record" value="<?php echo $id_record; ?>">
-	<button type="button" class="btn-link" onclick="if( confirm('Eliminare questo segmento?') ){ $('#form-delete').submit(); }"><span class="text-danger"><i class="fa fa-trash-o"></i> Elimina segmento</span></button>
-</form>
-<?php
-    }
-?>
+    else if ($records[0]['n_sezionali']<2) {
 
+    	echo "<div class='alert alert-danger' style='margin:0px;'>";
+    	
+    	echo tr("Questo è l'unico segmento per il modulo '_MODULO_'. Il comando elimina è stato disattivato.", [
+        	'_MODULO_' => $records[0]['modulo'],                  
+        ]);
+
+    	echo "</div>";
+    }
+	else{
+    	echo '
+			<a class="btn btn-danger ask" data-backto="record-list">
+			    <i class="fa fa-trash"></i> '.tr('Elimina').'
+			</a>';
+
+    }
+?>
\ No newline at end of file
diff --git a/update/2_4.sql b/update/2_4.sql
index 9ff6318d7..9ead503dd 100644
--- a/update/2_4.sql
+++ b/update/2_4.sql
@@ -183,7 +183,7 @@ UPDATE `co_documenti` SET `id_segment`='2' WHERE `idtipodocumento` IN (SELECT `i
 
 -- Innesto modulo segmenti sotto "Strumenti"
 INSERT INTO `zz_modules` (`id`, `name`, `title`, `directory`, `options`, `options2`, `icon`, `version`, `compatibility`, `order`, `parent`, `default`, `enabled`) VALUES
-(NULL, 'Segmenti', 'Segmenti', 'segmenti', '{	"main_query": [	{	"type": "table", "fields": "Modulo, Nome,  Maschera, Note", "query": "SELECT `id`,  `name` AS `Nome`, (SELECT name FROM zz_modules WHERE id = zz_segments.id_module) AS Modulo,  `pattern` AS `Maschera`, `note` AS `Note`  FROM `zz_segments` HAVING 2=2 ORDER BY name, id_module"}	]}', '', 'fa fa-database', '2.4', '2.4', 1, 36, 1, 1);
+(NULL, 'Segmenti', 'Segmenti', 'segmenti', '{	"main_query": [	{	"type": "table", "fields": "Modulo, Nome,  Maschera, Note, Predefinito", "query": "SELECT `id`,  (IF(predefined=1, ''S&igrave;'', ''No'')) AS `Predefinito`, `name` AS `Nome`, (SELECT name FROM zz_modules WHERE id = zz_segments.id_module) AS Modulo,  `pattern` AS `Maschera`, `note` AS `Note`  FROM `zz_segments` HAVING 2=2 ORDER BY name, id_module"}	]}', '', 'fa fa-database', '2.4', '2.4', 1, 36, 1, 1);
 
 -- Aggiorno widget Fatturato con i sezionali
 UPDATE `zz_widgets` SET `query` = 'SELECT CONCAT_WS(" ", REPLACE(REPLACE(REPLACE(FORMAT(SUM((SELECT SUM(subtotale+iva-sconto) FROM co_righe_documenti WHERE iddocumento=co_documenti.id)+iva_rivalsainps+rivalsainps+bollo-ritenutaacconto), 2), ",", "#"), ".", ","), "#", "."), "&euro;") AS dato FROM co_documenti WHERE idtipodocumento IN (SELECT id FROM co_tipidocumento WHERE dir="entrata") |segment| AND data >= "|period_start|" AND data <= "|period_end|" AND 1=1' WHERE `zz_widgets`.`name` = 'Fatturato';