diff --git a/frontend/src/components/atemschutz/AtemschutzDashboardCard.tsx b/frontend/src/components/atemschutz/AtemschutzDashboardCard.tsx
index 952651a..7c32163 100644
--- a/frontend/src/components/atemschutz/AtemschutzDashboardCard.tsx
+++ b/frontend/src/components/atemschutz/AtemschutzDashboardCard.tsx
@@ -6,10 +6,9 @@ import {
   Card,
   CardContent,
   CircularProgress,
-  Link,
   Typography,
 } from '@mui/material';
-import { Link as RouterLink } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
 import { useQuery } from '@tanstack/react-query';
 import { atemschutzApi } from '../../services/atemschutz';
 import { useCountUp } from '../../hooks/useCountUp';
@@ -22,6 +21,7 @@ interface AtemschutzDashboardCardProps {
 const AtemschutzDashboardCard: React.FC<AtemschutzDashboardCardProps> = ({
   hideWhenEmpty = false,
 }) => {
+  const navigate = useNavigate();
   const { data: stats, isLoading, isError } = useQuery<AtemschutzStats>({
     queryKey: ['atemschutz-stats'],
     queryFn: () => atemschutzApi.getStats(),
@@ -68,7 +68,7 @@ const AtemschutzDashboardCard: React.FC<AtemschutzDashboardCardProps> = ({
   if (hideWhenEmpty && allGood) return null;
 
   return (
-    <Card sx={{ height: '100%' }}>
+    <Card sx={{ height: '100%', cursor: 'pointer' }} onClick={() => navigate('/atemschutz')}>
       <CardContent>
         <Typography variant="h6" gutterBottom>
           Atemschutz
@@ -124,18 +124,6 @@ const AtemschutzDashboardCard: React.FC<AtemschutzDashboardCardProps> = ({
             Alle Atemschutzträger einsatzbereit
           </Typography>
         )}
-
-        {/* Link to management page */}
-        <Box sx={{ mt: 2 }}>
-          <Link
-            component={RouterLink}
-            to="/atemschutz"
-            underline="hover"
-            variant="body2"
-          >
-            Zur Verwaltung
-          </Link>
-        </Box>
       </CardContent>
     </Card>
   );
diff --git a/frontend/src/components/dashboard/AusruestungsanfrageWidget.tsx b/frontend/src/components/dashboard/AusruestungsanfrageWidget.tsx
index 905d476..0587116 100644
--- a/frontend/src/components/dashboard/AusruestungsanfrageWidget.tsx
+++ b/frontend/src/components/dashboard/AusruestungsanfrageWidget.tsx
@@ -55,12 +55,15 @@ function AusruestungsanfrageWidget() {
           <Typography variant="body2" color="text.secondary">Keine Anfragen vorhanden.</Typography>
         ) : (
           <Box sx={{ display: 'flex', gap: 1, flexWrap: 'wrap' }}>
-            <Chip label={`${overview.pending_count} Offen`} size="small" color={overview.pending_count > 0 ? 'warning' : 'default'} variant="outlined" />
-            <Chip label={`${overview.approved_count} Genehmigt`} size="small" color={overview.approved_count > 0 ? 'info' : 'default'} variant="outlined" />
             {overview.unhandled_count > 0 && (
               <Chip label={`${overview.unhandled_count} Neu`} size="small" color="error" variant="outlined" />
             )}
-            <Chip label={`${overview.total_count} Gesamt`} size="small" variant="outlined" />
+            {overview.pending_count > 0 && (
+              <Chip label={`${overview.pending_count} Offen`} size="small" color="warning" variant="outlined" />
+            )}
+            {overview.approved_count > 0 && (
+              <Chip label={`${overview.approved_count} Genehmigt`} size="small" color="info" variant="outlined" />
+            )}
           </Box>
         )}
       </CardContent>
diff --git a/frontend/src/components/dashboard/BestellungenWidget.tsx b/frontend/src/components/dashboard/BestellungenWidget.tsx
index 684eb9b..f3e8c03 100644
--- a/frontend/src/components/dashboard/BestellungenWidget.tsx
+++ b/frontend/src/components/dashboard/BestellungenWidget.tsx
@@ -1,4 +1,4 @@
-import { Card, CardContent, Typography, Box, Chip, List, ListItem, ListItemText, Divider, Skeleton } from '@mui/material';
+import { Card, CardContent, Typography, Box, Chip, Skeleton } from '@mui/material';
 import { LocalShipping } from '@mui/icons-material';
 import { useQuery } from '@tanstack/react-query';
 import { useNavigate } from 'react-router-dom';
@@ -20,13 +20,18 @@ function BestellungenWidget() {
     (o) => !['abgeschlossen'].includes(o.status)
   );
 
+  // Group open orders by status, keep only non-zero counts
+  const statusCounts = (Object.keys(BESTELLUNG_STATUS_LABELS) as BestellungStatus[])
+    .filter((s) => s !== 'abgeschlossen')
+    .map((s) => ({ status: s, count: openOrders.filter((o) => o.status === s).length }))
+    .filter((s) => s.count > 0);
+
   if (isLoading) {
     return (
       <Card>
         <CardContent>
           <Typography variant="h6" gutterBottom>Bestellungen</Typography>
-          <Skeleton variant="rectangular" height={60} />
-          <Skeleton variant="rectangular" height={60} sx={{ mt: 1 }} />
+          <Skeleton variant="rectangular" height={40} />
         </CardContent>
       </Card>
     );
@@ -45,61 +50,27 @@ function BestellungenWidget() {
     );
   }
 
-  if (openOrders.length === 0) {
-    return (
-      <Card>
-        <CardContent>
-          <Typography variant="h6" gutterBottom>Bestellungen</Typography>
-          <Box sx={{ display: 'flex', alignItems: 'center', gap: 1, color: 'text.secondary' }}>
-            <LocalShipping fontSize="small" />
-            <Typography variant="body2">Keine offenen Bestellungen</Typography>
-          </Box>
-        </CardContent>
-      </Card>
-    );
-  }
-
   return (
-    <Card>
+    <Card sx={{ cursor: 'pointer', '&:hover': { bgcolor: 'action.hover' } }} onClick={() => navigate('/bestellungen')}>
       <CardContent>
-        <Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', mb: 1 }}>
+        <Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', mb: 1.5 }}>
           <Typography variant="h6">Bestellungen</Typography>
-          <Chip label={`${openOrders.length} offen`} size="small" color="primary" />
+          <LocalShipping fontSize="small" color="action" />
         </Box>
-        <List dense disablePadding>
-          {openOrders.slice(0, 5).map((order, idx) => (
-            <Box key={order.id}>
-              {idx > 0 && <Divider />}
-              <ListItem
-                disablePadding
-                sx={{ cursor: 'pointer', py: 0.5, '&:hover': { bgcolor: 'action.hover' } }}
-                onClick={() => navigate(`/bestellungen/${order.id}`)}
-              >
-                <ListItemText
-                  primary={order.bezeichnung}
-                  secondary={order.lieferant_name || 'Kein Lieferant'}
-                  primaryTypographyProps={{ variant: 'body2', noWrap: true }}
-                  secondaryTypographyProps={{ variant: 'caption' }}
-                />
-                <Chip
-                  label={BESTELLUNG_STATUS_LABELS[order.status as BestellungStatus]}
-                  color={BESTELLUNG_STATUS_COLORS[order.status as BestellungStatus]}
-                  size="small"
-                  sx={{ ml: 1 }}
-                />
-              </ListItem>
-            </Box>
-          ))}
-        </List>
-        {openOrders.length > 5 && (
-          <Typography
-            variant="caption"
-            color="primary"
-            sx={{ cursor: 'pointer', mt: 1, display: 'block' }}
-            onClick={() => navigate('/bestellungen')}
-          >
-            Alle {openOrders.length} Bestellungen anzeigen
-          </Typography>
+        {statusCounts.length === 0 ? (
+          <Typography variant="body2" color="text.secondary">Keine offenen Bestellungen</Typography>
+        ) : (
+          <Box sx={{ display: 'flex', flexWrap: 'wrap', gap: 1 }}>
+            {statusCounts.map(({ status, count }) => (
+              <Chip
+                key={status}
+                label={`${count} ${BESTELLUNG_STATUS_LABELS[status]}`}
+                color={BESTELLUNG_STATUS_COLORS[status]}
+                size="small"
+                variant="outlined"
+              />
+            ))}
+          </Box>
         )}
       </CardContent>
     </Card>
diff --git a/frontend/src/components/equipment/EquipmentDashboardCard.tsx b/frontend/src/components/equipment/EquipmentDashboardCard.tsx
index 06dba80..8216569 100644
--- a/frontend/src/components/equipment/EquipmentDashboardCard.tsx
+++ b/frontend/src/components/equipment/EquipmentDashboardCard.tsx
@@ -6,10 +6,9 @@ import {
   Card,
   CardContent,
   CircularProgress,
-  Link,
   Typography,
 } from '@mui/material';
-import { Link as RouterLink } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
 import { useQuery } from '@tanstack/react-query';
 import { equipmentApi } from '../../services/equipment';
 import { useCountUp } from '../../hooks/useCountUp';
@@ -22,6 +21,7 @@ interface EquipmentDashboardCardProps {
 const EquipmentDashboardCard: React.FC<EquipmentDashboardCardProps> = ({
   hideWhenEmpty = false,
 }) => {
+  const navigate = useNavigate();
   const { data: stats, isLoading, isError } = useQuery<EquipmentStats>({
     queryKey: ['equipment-stats'],
     queryFn: () => equipmentApi.getStats(),
@@ -68,7 +68,7 @@ const EquipmentDashboardCard: React.FC<EquipmentDashboardCardProps> = ({
   if (hideWhenEmpty && allGood) return null;
 
   return (
-    <Card sx={{ height: '100%' }}>
+    <Card sx={{ height: '100%', cursor: 'pointer' }} onClick={() => navigate('/ausruestung')}>
       <CardContent>
         <Typography variant="h6" gutterBottom>
           Ausrüstung
@@ -134,18 +134,6 @@ const EquipmentDashboardCard: React.FC<EquipmentDashboardCardProps> = ({
             Alle Ausrüstung einsatzbereit
           </Typography>
         )}
-
-        {/* Link to management page */}
-        <Box sx={{ mt: 2 }}>
-          <Link
-            component={RouterLink}
-            to="/ausruestung"
-            underline="hover"
-            variant="body2"
-          >
-            Zur Verwaltung
-          </Link>
-        </Box>
       </CardContent>
     </Card>
   );
diff --git a/frontend/src/components/vehicles/VehicleDashboardCard.tsx b/frontend/src/components/vehicles/VehicleDashboardCard.tsx
index b2152a3..dfc29ab 100644
--- a/frontend/src/components/vehicles/VehicleDashboardCard.tsx
+++ b/frontend/src/components/vehicles/VehicleDashboardCard.tsx
@@ -6,10 +6,9 @@ import {
   Card,
   CardContent,
   CircularProgress,
-  Link,
   Typography,
 } from '@mui/material';
-import { Link as RouterLink } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
 import { useQuery } from '@tanstack/react-query';
 import { vehiclesApi } from '../../services/vehicles';
 import { equipmentApi } from '../../services/equipment';
@@ -24,6 +23,7 @@ interface VehicleDashboardCardProps {
 const VehicleDashboardCard: React.FC<VehicleDashboardCardProps> = ({
   hideWhenEmpty = false,
 }) => {
+  const navigate = useNavigate();
   const { data: stats, isLoading: statsLoading, isError: statsError } = useQuery<VehicleStats>({
     queryKey: ['vehicle-stats'],
     queryFn: () => vehiclesApi.getStats(),
@@ -85,7 +85,7 @@ const VehicleDashboardCard: React.FC<VehicleDashboardCardProps> = ({
   if (hideWhenEmpty && allGood) return null;
 
   return (
-    <Card sx={{ height: '100%' }}>
+    <Card sx={{ height: '100%', cursor: 'pointer' }} onClick={() => navigate('/fahrzeuge')}>
       <CardContent>
         <Typography variant="h6" gutterBottom>
           Fahrzeuge
@@ -143,18 +143,6 @@ const VehicleDashboardCard: React.FC<VehicleDashboardCardProps> = ({
             Alle Fahrzeuge einsatzbereit
           </Typography>
         )}
-
-        {/* Link to management page */}
-        <Box sx={{ mt: 2 }}>
-          <Link
-            component={RouterLink}
-            to="/fahrzeuge"
-            underline="hover"
-            variant="body2"
-          >
-            Zur Verwaltung
-          </Link>
-        </Box>
       </CardContent>
     </Card>
   );