diff --git a/.replit b/.replit
index bc23a6a..f96723c 100644
--- a/.replit
+++ b/.replit
@@ -19,6 +19,10 @@ externalPort = 80
 localPort = 33035
 externalPort = 3001
 
+[[ports]]
+localPort = 35979
+externalPort = 6000
+
 [[ports]]
 localPort = 40417
 externalPort = 8000
diff --git a/client/src/pages/general-planning.tsx b/client/src/pages/general-planning.tsx
index 9f69fa0..f4ff2ad 100644
--- a/client/src/pages/general-planning.tsx
+++ b/client/src/pages/general-planning.tsx
@@ -8,7 +8,7 @@ import { Button } from "@/components/ui/button";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
-import { ChevronLeft, ChevronRight, Calendar, MapPin, Users, AlertTriangle, Car, Edit, CheckCircle2, Plus, Trash2, Clock, Copy } from "lucide-react";
+import { ChevronLeft, ChevronRight, Calendar, MapPin, Users, AlertTriangle, Car, Edit, CheckCircle2, Plus, Trash2, Clock, Copy, Circle } from "lucide-react";
 import { Badge } from "@/components/ui/badge";
 import { Skeleton } from "@/components/ui/skeleton";
 import {
@@ -717,19 +717,19 @@ export default function GeneralPlanning() {
                     })()}
                   </div>
 
-                  {/* Select guardia disponibile */}
+                  {/* Select guardia (tutte, evidenziate in rosso se impegnate) */}
                   {(() => {
-                    // Filtra guardie: mostra solo con ore ordinarie se toggle è off
+                    // Mostra TUTTE le guardie, ma filtra solo per ore ordinarie/straordinario
                     const filteredGuards = availableGuards?.filter(g => 
-                      g.isAvailable && (showOvertimeGuards || !g.requiresOvertime)
+                      showOvertimeGuards || !g.requiresOvertime
                     ) || [];
                     
-                    const hasOvertimeGuards = availableGuards?.some(g => g.requiresOvertime && g.isAvailable) || false;
+                    const hasOvertimeGuards = availableGuards?.some(g => g.requiresOvertime) || false;
                     
                     return (
                       <div className="space-y-2">
                         <div className="flex items-center justify-between">
-                          <Label htmlFor="guard-select">Guardia Disponibile</Label>
+                          <Label htmlFor="guard-select">Guardia</Label>
                           {!isLoadingGuards && hasOvertimeGuards && (
                             <Button
                               variant="outline"
@@ -758,15 +758,20 @@ export default function GeneralPlanning() {
                                 {filteredGuards.length > 0 ? (
                                   filteredGuards.map((guard) => (
                                     <SelectItem key={guard.guardId} value={guard.guardId}>
-                                      {guard.guardName} ({guard.badgeNumber}) - {guard.ordinaryHoursRemaining}h ord.
-                                      {guard.requiresOvertime && ` + ${guard.overtimeHoursRemaining}h strao.`}
-                                      {guard.requiresOvertime && " 🔸"}
+                                      <div className={`flex items-center gap-1.5 ${guard.isAvailable ? "" : "text-destructive font-medium"}`}>
+                                        {!guard.isAvailable && <Circle className="h-3 w-3 fill-current" />}
+                                        <span>
+                                          {guard.guardName} ({guard.badgeNumber}) - {guard.ordinaryHoursRemaining}h ord.
+                                          {guard.requiresOvertime && ` + ${guard.overtimeHoursRemaining}h strao.`}
+                                          {guard.requiresOvertime && " 🔸"}
+                                        </span>
+                                      </div>
                                     </SelectItem>
                                   ))
                                 ) : (
                                   <SelectItem value="no-guards" disabled>
                                     {showOvertimeGuards 
-                                      ? "Nessuna guardia disponibile" 
+                                      ? "Nessuna guardia" 
                                       : "Nessuna guardia con ore ordinarie (prova 'Mostra Straordinario')"}
                                   </SelectItem>
                                 )}
@@ -774,7 +779,7 @@ export default function GeneralPlanning() {
                             </Select>
                             {filteredGuards.length === 0 && !showOvertimeGuards && hasOvertimeGuards && (
                               <p className="text-xs text-muted-foreground">
-                                ℹ️ Alcune guardie disponibili richiedono straordinario. Clicca "Mostra Straordinario" per vederle.
+                                ℹ️ Alcune guardie richiedono straordinario. Clicca "Mostra Straordinario" per vederle.
                               </p>
                             )}
                             {filteredGuards.length > 0 && selectedGuardId && (